From ba67f0f0e306d9f29245e440688fcf71912368e7 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Mon, 5 Jan 2026 13:53:52 +0200 Subject: [PATCH] fix typos found by codespell and typos --- Changes.md | 6 ++--- config/ConfAssistant-template.php | 2 +- config/Diagnostics-template.php | 2 +- config/Master-template.php | 6 ++--- core/AbstractProfile.php | 2 +- core/DeploymentManaged.php | 2 +- core/DeviceConfig.php | 4 ++-- core/DeviceXMLmain.php | 2 +- core/EntityWithDBProperties.php | 4 ++-- core/ExternalEduroamDBData.php | 6 ++--- core/ExternalNothing.php | 2 +- core/Federation.php | 4 ++-- core/IdPlist.php | 4 ++-- core/ProfileSilverbullet.php | 4 ++-- core/UserAPI.php | 4 ++-- core/UserManagement.php | 24 ++++++++++---------- core/UserNetAPI.php | 4 ++-- core/common/OutsideComm.php | 2 +- core/common/X509.php | 2 +- core/diag/RFC5997Tests.php | 5 ++-- devices/Devices-template.php | 2 +- devices/eap_config/DeviceXML.php | 4 ++-- devices/ms/DeviceW8W10.php | 6 ++--- devices/ms/Files/README | 2 +- devices/ms/Files/common.inc | 6 ++--- devices/ms/Files/geant_link.inc | 4 ++-- docker/MSP/daemon/scripts/blacklisted.py | 2 +- signer/HOWTO | 4 ++-- signer/mobileconfig_proxy_sign-template | 2 +- signer/ms_windows_proxy_sign-template | 2 +- translation/nl_NL/web_admin.po | 2 +- tutorials/Configuration.md | 2 +- utils/Update_eduroamDB1_2/config.php | 4 ++-- utils/Update_eduroamDB1_2/sync_databases.php | 2 +- utils/test_openroaming.php | 2 +- web/admin/duplicate_profile.php | 4 ++-- web/admin/duplicate_profile_result.php | 10 ++++---- web/admin/inc/manageDBLink.inc.php | 2 +- web/admin/overview_federation.php | 2 +- web/diag/action_realmcheck.php | 6 ++--- web/diag/magicTelepath.php | 2 +- web/lib/admin/OptionDisplay.php | 4 ++-- web/lib/admin/Wizard.php | 4 ++-- web/skins/modern/div_user_welcome.php | 2 +- web/skins/modern/user/js/cat_js.php | 8 +++---- web/skins/msp/div_user_welcome.php | 2 +- web/skins/msp/user/js/cat_js.php | 8 +++---- 47 files changed, 95 insertions(+), 96 deletions(-) diff --git a/Changes.md b/Changes.md index 22cdc4bc3..74c8cef92 100644 --- a/Changes.md +++ b/Changes.md @@ -92,7 +92,7 @@ Changes in 2.1.2 - [FEATURE #13] add TIMEOUTS constant to config/Diagnostics.php to eliminate very long delays in testing sites - this requires updating your instance following the Diagnostics-template.php -- [FEATURE #14] Improvemens to the linux python installed, in particular add support +- [FEATURE #14] Improvements to the linux python installed, in particular add support for Tkinker and yad provided by https://github.com/sdasda7777 - [FEATURE #15] Removing the Registered Trademark character form the eduroam profile name in Windows @@ -101,7 +101,7 @@ Changes in 2.1.2 the deprecated FILTER_SANITIZE_STRING usage - [BUGFIX #2] replaced slow SQL queries in Managed IdP area with much faster ones - [BUGFIX #3] fixed blocking of Ajax requests caused by php sessions -- [BUGFIX #4] added several mising indexes in tables +- [BUGFIX #4] added several missing indexes in tables - [BUGFIX #5] reduced number of database queries in overrvier_federation.php Changes in 2.1 @@ -309,7 +309,7 @@ Upgrade path notice: it is not possible to upgrade directly from 1.0 to 1.2 overview page - [FEATURE #5] federation customisation: name, logo, custom invitation texts and more -- [FEATURE #6] deprecated NSISArray has been replaced with nsArry +- [FEATURE #6] deprecated NSISArray has been replaced with nsArray - [FEATURE #7] Support for UTF-8 installer has been added (this requires nsis v3) - [FEATURE #8] also check for SHA-1 signatures and warn if found - [FEATURE #9] implement skin selection system. For details read diff --git a/config/ConfAssistant-template.php b/config/ConfAssistant-template.php index 85649035b..a4ade57ed 100644 --- a/config/ConfAssistant-template.php +++ b/config/ConfAssistant-template.php @@ -122,7 +122,7 @@ class ConfAssistant * "testing" controls which instance of eduPKI we are using and also * the requested expiry time of the certificates (1y for testing, 5y for production) * "max_expiry" set to true means that we will be requesting certificates - * with maximum avaliable validity, controlled by eduPKI defaults (at the moment + * with maximum available validity, controlled by eduPKI defaults (at the moment * the expiry date of the CA certificate) */ const eduPKI = [ diff --git a/config/Diagnostics-template.php b/config/Diagnostics-template.php index 4b0313217..7cb1b3b57 100644 --- a/config/Diagnostics-template.php +++ b/config/Diagnostics-template.php @@ -124,7 +124,7 @@ class Diagnostics 'secret' => '1q2w3e4r5t0O9I8U7Y6TaZ', ]; const TIMEOUTS = [ - 'ajax_radius_tests' => 15000, // miliseconds + 'ajax_radius_tests' => 15000, // milliseconds 'crl_download' => 10, // seconds ]; } diff --git a/config/Master-template.php b/config/Master-template.php index 47e7ebd62..602ac2085 100644 --- a/config/Master-template.php +++ b/config/Master-template.php @@ -175,7 +175,7 @@ class Master 'certfilename' => NULL, 'keyfilename' => NULL, 'keypass' => NULL, - 'notify_nro' => false, // normally should be set to TRUE abd causes + 'notify_nro' => false, // normally should be set to TRUE and cause // notifications being sent to NRO admins when // important changes are made ]; @@ -280,8 +280,8 @@ class Master * We are now prepared to use a local cache database. For the eduroam case a daily * update is sufficient and is done by the utils/update_monitor_copy.php. In this case * the EXTERNAL is actually a local DB, and EXTERNAL_SOURCE is used as the actual - * source for caching. You may use the EXTERNAL as a real extermal database and - * do not worry about setting aything in EXTERNAL_SOURCE + * source for caching. You may use the EXTERNAL as a real external database and + * do not worry about setting anything in EXTERNAL_SOURCE * * The code for the consortium "eduroam" is already written and may serve as template. See the functions in question. */ // Marking this as readonly currently has no effect, as we only ever do SELECTs on that database diff --git a/core/AbstractProfile.php b/core/AbstractProfile.php index fc0011e39..cb9208693 100644 --- a/core/AbstractProfile.php +++ b/core/AbstractProfile.php @@ -705,7 +705,7 @@ public function setRealm(string $realm) * register new supported EAP method for this profile * * @param \core\common\EAP $type The EAP Type, as defined in class EAP - * @param int $preference preference of this EAP Type. If a preference value is re-used, the order of EAP types of the same preference level is undefined. + * @param int $preference preference of this EAP Type. If a preference value is reused, the order of EAP types of the same preference level is undefined. * @return void */ public function addSupportedEapMethod(\core\common\EAP $type, $preference) diff --git a/core/DeploymentManaged.php b/core/DeploymentManaged.php index 7ca8aa99c..8f1d75203 100644 --- a/core/DeploymentManaged.php +++ b/core/DeploymentManaged.php @@ -890,7 +890,7 @@ public function setRADIUSconfig($onlyone = 0, $notify = 0, $torevoke = "") $response = array(); foreach ($toPost as $key => $value) { $this->loggerInstance->debug(1, 'toPost ' . $toPost[$key] . "\n"); - // temporarly one server $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]); + // temporarily one server $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]); /*if ($key == 2) { $response['res[2]'] = 'OK'; } else { */ diff --git a/core/DeviceConfig.php b/core/DeviceConfig.php index 5df06b733..76e944231 100644 --- a/core/DeviceConfig.php +++ b/core/DeviceConfig.php @@ -370,7 +370,7 @@ final protected function copyFile($source_name, $output_name = NULL) final protected function saveCertificateFiles($format) { switch ($format) { - case "der": // fall-thorugh, same treatment + case "der": // fall-through, same treatment case "pem": $iterator = 0; $caFiles = []; @@ -682,7 +682,7 @@ private function saveInfoFile($blob) { $finfo = new \finfo(FILEINFO_MIME_TYPE); $mime = $finfo->buffer($blob); - $ext = isset($this->mime_extensions[$mime]) ? $this->mime_extensions[$mime] : 'usupported'; + $ext = isset($this->mime_extensions[$mime]) ? $this->mime_extensions[$mime] : 'unsupported'; $this->loggerInstance->debug(5, "saveInfoFile: $mime : $ext\n"); $fileHandle = fopen('local-info.'.$ext, "w"); if ($fileHandle === FALSE) { diff --git a/core/DeviceXMLmain.php b/core/DeviceXMLmain.php index d0ee0c297..11d6b5176 100644 --- a/core/DeviceXMLmain.php +++ b/core/DeviceXMLmain.php @@ -180,7 +180,7 @@ public function setChild($name, $value, $namespace = NULL, $type = NULL) * * @param $node \SimpleXMLElement DOM object to which the node is to be attached * @param $name the tag name of the child node to be attached - * @param $object the XXX object which is to be transfored to the DOM object + * @param $object the XXX object which is to be transformed to the DOM object * and attached as a child to the $node * @param $namespace of the child * @param $root Boolean - if true treat the node as the tree root, i.e do not diff --git a/core/EntityWithDBProperties.php b/core/EntityWithDBProperties.php index 2f7b26209..2dcc4b074 100644 --- a/core/EntityWithDBProperties.php +++ b/core/EntityWithDBProperties.php @@ -155,14 +155,14 @@ private function getRelevantIdentifier() * are not considered. * * @param string $optionName optionally, the name of the attribute that is to be retrieved - * @param string$omittedOptionName optionally drop attibutes with that name + * @param string$omittedOptionName optionally drop attributes with that name * @return array of arrays of attributes which were set for this IdP */ public function getAttributes(string $optionName = NULL, string $omittedOptionName = NULL) { if ($optionName !== NULL) { if ($optionName === $omittedOptionName) { - throw new Exception("The attibute to be shown has the same name as that to be omitted"); + throw new Exception("The attribute to be shown has the same name as that to be omitted"); } $returnarray = []; foreach ($this->attributes as $theAttr) { diff --git a/core/ExternalEduroamDBData.php b/core/ExternalEduroamDBData.php index 33d0942e6..c12e02d1e 100644 --- a/core/ExternalEduroamDBData.php +++ b/core/ExternalEduroamDBData.php @@ -173,8 +173,8 @@ public function countAllServiceProviders() { * separate institution names as written in the eduroam DB into array * * @param string $collapsed - '#' separated list of names - each name has - * two-letter language prefic followed by ':' - * @return array $nameList - tle list contains both separate per-lang entires + * two-letter language prefix followed by ':' + * @return array $nameList - tle list contains both separate per-lang entries * and a joint one, just names no lang info - this used for comparison with CAT institution names */ public static function dissectCollapsedInstitutionNames($collapsed) { @@ -307,7 +307,7 @@ public function listExternalEntitiesByRealm($realm, $fields = []) { /** * retrieves the list of identifiers (external and local) of all institutions - * which have the admin email listed in the externam DB, thos that are synced to an + * which have the admin email listed in the external DB, those that are synced to an * existing CAT institution will also have the local identifier (else NULL) * * @param string $userEmail diff --git a/core/ExternalNothing.php b/core/ExternalNothing.php index de78e5b51..6a499667d 100644 --- a/core/ExternalNothing.php +++ b/core/ExternalNothing.php @@ -126,7 +126,7 @@ public function listExternalTlsServersInstitution($tld, $include_not_ready=FALSE /** * retrieves the list of identifiers (external and local) of all institutions - * which have the admin email listed in the externam DB, thos that are synced to an + * which have the admin email listed in the external DB, those that are synced to an * existing CAT institution will also have the local identifier (else NULL) * * @param string $userEmail diff --git a/core/Federation.php b/core/Federation.php index f820b7e23..5a58df053 100644 --- a/core/Federation.php +++ b/core/Federation.php @@ -905,7 +905,7 @@ public static function isFlatAdminStructure($fedname) { /** * Loads existing admins in all institutions of a given federation and check if some have been - * inactive for a time longet that allowed threshold. Marks institutions as 0 - all good + * inactive for a time longer that allowed threshold. Marks institutions as 0 - all good * or 1 - inactive admin(s) found * Sets the results in $this->adminLogins array */ @@ -920,7 +920,7 @@ public function loadAdminsLogins() { } else { $inactivityTimestamp = time() - $inactivityOverride[0]['value'] * 24 * 3600; } - // $active shows the time difference between the moment when a login thime would be considered as inactive + // $active shows the time difference between the moment when a login would be considered as inactive // and the start of the recording system. If this is negative then we we cannot tell that someone who // was not recorded was not actually active within the allowed period $active = $inactivityTimestamp - strtotime(\config\ConfAssistant::ADMIN_LOGINS['startday']); diff --git a/core/IdPlist.php b/core/IdPlist.php index 8319e3103..fbb83aa61 100644 --- a/core/IdPlist.php +++ b/core/IdPlist.php @@ -127,10 +127,10 @@ public static function listAllIdentityProviders($activeOnly = 0, $country = "") } /** - * outputs a full list of IdPs containing the fllowing data: + * outputs a full list of IdPs containing the following data: * institution_is, institution name in all available languages, * list of production profiles. - * For eache profile the profile identifier, profile name in all languages + * For each profile the profile identifier, profile name in all languages * and redirect values (empty rediret value means that no redirect has been * set). * diff --git a/core/ProfileSilverbullet.php b/core/ProfileSilverbullet.php index af6ea5223..ac681ae58 100644 --- a/core/ProfileSilverbullet.php +++ b/core/ProfileSilverbullet.php @@ -192,7 +192,7 @@ public function updateCache($device, $path, $mime, $integerEapType, $openRoaming * register new supported EAP method for this profile * * @param \core\common\EAP $type The EAP Type, as defined in class EAP - * @param int $preference preference of this EAP Type. If a preference value is re-used, the order of EAP types of the same preference level is undefined. + * @param int $preference preference of this EAP Type. If a preference value is reused, the order of EAP types of the same preference level is undefined. * @return void * @throws Exception */ @@ -252,7 +252,7 @@ public function getUserExpiryDate($userId) { * * @param int $userId the numerical user ID of the user in question * @param boolean $testActivity set true if we are only interested in checking - * user existance in auth database + * user existence in auth database * @return array */ public function getUserAuthRecords($userId, $testActivity = false) { diff --git a/core/UserAPI.php b/core/UserAPI.php index fd6fa0ece..dd556e9f5 100644 --- a/core/UserAPI.php +++ b/core/UserAPI.php @@ -492,10 +492,10 @@ public function orderIdentityProviders($country, $currentLocation) } /** - * outputs a full list of IdPs containing the fllowing data: + * outputs a full list of IdPs containing the following data: * institution_is, institution name in all available languages, * list of production profiles. - * For eache profile the profile identifier, profile name in all languages + * For each profile the profile identifier, profile name in all languages * and redirect values (empty rediret value means that no redirect has been * set). * diff --git a/core/UserManagement.php b/core/UserManagement.php index a97493c62..468a096a3 100644 --- a/core/UserManagement.php +++ b/core/UserManagement.php @@ -57,7 +57,7 @@ class UserManagement extends \core\common\Entity private $databaseHandle; public $currentInstitutions; public $newUser = false; - public $hasPotenialNewInst = false; + public $hasPotentialNewInst = false; /** * Class constructor. Nothing special to be done when constructing. @@ -391,7 +391,7 @@ public function listRecentlyExpiredInvitations() public function listInstitutionsByAdmin() { $edugain = $_SESSION['eduGAIN']; - // get the list of local identifers of institutions managed by this user + // get the list of local identifiers of institutions managed by this user // it will be returned as $this->currentInstitutions $this->getCurrentInstitutionsByAdmin(); if (count($this->currentInstitutions) == 0) { @@ -403,7 +403,7 @@ public function listInstitutionsByAdmin() return $this->currentInstitutions; } // now add additional institutions based on the external DB - // proceed only if user has been authenticated fron an eduGAIN IdP + // proceed only if user has been authenticated from an eduGAIN IdP if ($edugain == false) { return $this->currentInstitutions; } @@ -412,7 +412,7 @@ public function listInstitutionsByAdmin() // get the list of identifiers in the external DB with this user listed as the admin and linked to CAT institutions $extInstList = $externalDB->listExternalEntitiesByUserEmail($email); $extInstListTmp = $extInstList; - // we begin by removing entites in $extInstList which are already managed by this user and synced - + // we begin by removing entities in $extInstList which are already managed by this user and synced - // these require no further checking foreach ($extInstListTmp as $country => $extInstCountryList) { $len = count($extInstCountryList); @@ -508,11 +508,11 @@ private function doExternalDBAutoregisterNew($extInstCountryList, $fed) { } foreach ($extInstCountryList as $extInst) { common\Logging::debug_s(4, "Testing ".$extInst['external_db_id']." for potential new inst\n"); - if ($extInst['inst_id'] != null) { // there alreay exeists a CAT institution synced to this one + if ($extInst['inst_id'] != null) { // there already exeists a CAT institution synced to this one continue; } $country = strtoupper($fed->tld); - // now run checks against creating dupplicates in CAT DB + // now run checks against creating duplicates in CAT DB $disectedNames = ExternalEduroamDBData::dissectCollapsedInstitutionNames($extInst['name']); $names = $disectedNames['joint']; $realms = ExternalEduroamDBData::dissectCollapsedInstitutionRealms($extInst['realm']); @@ -566,7 +566,7 @@ private function listCatInstitutionsByPairwiseId() { return []; } - // get realm from pariwise-id + // get realm from pairwise-id if (preg_match('/^pairwise-id:[^@]+@([^!]+)!/', $userId, $matches) == 0) { return []; } @@ -644,8 +644,8 @@ public function checkForCatMatch($extId, $ROid) { /** * get the list of current institutions of the given admin * - * This method does not rerurn anything but sets $this->currentInstitutions - * it only fillsh the 'existing' block, leaving the other two for other methods + * This method does not return anything but sets $this->currentInstitutions + * it only fills the 'existing' block, leaving the other two for other methods * to deal with */ private function getCurrentInstitutionsByAdmin() { @@ -657,7 +657,7 @@ private function getCurrentInstitutionsByAdmin() { 'entitlement' => [] ]; $userId = $_SESSION['user']; - // get the list of local identifers of institutions managed by this user + // get the list of local identifiers of institutions managed by this user $institutions = $this->databaseHandle->exec("SELECT ownership.institution_id as inst_id, ownership.blesslevel AS blesslevel FROM ownership WHERE user_id = ? ORDER BY institution_id", "s", $userId); // SELECT -> resource, not boolean $catInstList = $institutions->fetch_all(); @@ -676,9 +676,9 @@ private function getCurrentInstitutionsByAdmin() { /** * given arrays of realms and names check if there already are institutions in CAT that - * could be a match - this is for ellimination and against creating duplicates + * could be a match - this is for elimination and against creating duplicates * still this is not perfect, no realms given and institutions with a slightly different - * name will return no-match and thus open possibility for dupplicates + * name will return no-match and thus open possibility for duplicates * * @param array $namesToTest * @param array $realmsToTest diff --git a/core/UserNetAPI.php b/core/UserNetAPI.php index 255a42949..0768b347b 100644 --- a/core/UserNetAPI.php +++ b/core/UserNetAPI.php @@ -202,10 +202,10 @@ public function jsonListProfiles($idpIdentifier, $sort = 0) } /** - * outputs a full list of IdPs containing the fllowing data: + * outputs a full list of IdPs containing the following data: * institution_is, institution name in all available languages, * list of production profiles. - * For eache profile the profile identifier, profile name in all languages + * For each profile the profile identifier, profile name in all languages * and redirect values (empty rediret value means that no redirect has been * set). * @return array of identity providers with attributes diff --git a/core/common/OutsideComm.php b/core/common/OutsideComm.php index 3bc7101ad..3e07b023d 100644 --- a/core/common/OutsideComm.php +++ b/core/common/OutsideComm.php @@ -298,7 +298,7 @@ public static function adminInvitationMail($targets, $introtext, $newtoken, $idp OutsideComm::INVITE_CONTEXTS[0] => sprintf(_("a %s of the %s %s \"%s\" has invited you to manage the %s together with them."), Entity::$nomenclature_fed, \config\ConfAssistant::CONSORTIUM['display_name'], Entity::$nomenclature_participant, $idpPrettyName, Entity::$nomenclature_participant), OutsideComm::INVITE_CONTEXTS[1] => sprintf(_("a %s %s has invited you to manage the future %s \"%s\" (%s). The organisation will be a %s."), \config\ConfAssistant::CONSORTIUM['display_name'], Entity::$nomenclature_fed, Entity::$nomenclature_participant, $idpPrettyName, strtoupper($federation->tld), $prettyPrintType), OutsideComm::INVITE_CONTEXTS[2] => sprintf(_("a %s %s has invited you to manage the %s \"%s\". This is a %s."), \config\ConfAssistant::CONSORTIUM['display_name'], Entity::$nomenclature_fed, Entity::$nomenclature_participant, $idpPrettyName, $prettyPrintType), - OutsideComm::INVITE_CONTEXTS[3] => sprintf(_("You have succesfully invited yourself to manage %s %s.\n If this mail is not the result of an action taken by you then please report this to your %s %s administrator.\n"), Entity::$nomenclature_participant, $idpPrettyName, \config\ConfAssistant::CONSORTIUM['display_name'], Entity::$nomenclature_fed), + OutsideComm::INVITE_CONTEXTS[3] => sprintf(_("You have successfully invited yourself to manage %s %s.\n If this mail is not the result of an action taken by you then please report this to your %s %s administrator.\n"), Entity::$nomenclature_participant, $idpPrettyName, \config\ConfAssistant::CONSORTIUM['display_name'], Entity::$nomenclature_fed), ]; $validity = sprintf(_("This invitation is valid for 24 hours from now, i.e. until %s."), strftime("%x %X %Z", time() + 86400)); // need some nomenclature diff --git a/core/common/X509.php b/core/common/X509.php index 42f955715..65c8dc1e3 100644 --- a/core/common/X509.php +++ b/core/common/X509.php @@ -142,7 +142,7 @@ private function typeOfCertificate($myca, &$out) // default: not a CA unless convinced otherwise $out['ca'] = 0; // we need to resolve this ambiguity $out['basicconstraints_set'] = 0; - // if no basicContraints are set at all, this is a problem in itself + // if no basicConstraints are set at all, this is a problem in itself // is this a CA? or not? Treat as server, but add a warning... if (isset($mydetails['extensions']['basicConstraints'])) { $out['ca'] = preg_match('/^CA:TRUE/', $mydetails['extensions']['basicConstraints']); diff --git a/core/diag/RFC5997Tests.php b/core/diag/RFC5997Tests.php index f11f3a7c9..7c6fb366b 100644 --- a/core/diag/RFC5997Tests.php +++ b/core/diag/RFC5997Tests.php @@ -41,7 +41,7 @@ class RFC5997Tests extends AbstractTest const PACKET_TYPE_STATUS_SERVER = "\xc"; const PACKET_TYPE_ACCESS_ACCEPT = "\x2"; - const PACKET_LENGTH = "\x0\x2b"; // only calid for string CAT in NAS-Id + const PACKET_LENGTH = "\x0\x2b"; // only valid for string CAT in NAS-Id const ATTRIBUTE_NAS_IDENTIFIER = "\x20"; const LENGTH_NAS_IDENTIFIER = "\x5"; // only valid for string CAT const VALUE_NAS_IDENTIFIER = "CAT"; @@ -143,7 +143,6 @@ public function statusServerCheck() throw new Exception("Received incorrect Response-Authenticator. Something is very wrong."); } // we don't validate Message-Authenticator, as it is optional in RFC5997 - // and we have checked Response-Authenticaor. + // and we have checked Response-Authenticator. return AbstractTest::RETVAL_OK; } -} \ No newline at end of file diff --git a/devices/Devices-template.php b/devices/Devices-template.php index d640280d9..bc634f2cc 100644 --- a/devices/Devices-template.php +++ b/devices/Devices-template.php @@ -82,7 +82,7 @@ class Devices extends \core\common\Entity { * The default is unset, so it is not listed in the Options array. * - 'hs20' - if defined and equal to 1 will mark the device as potentially supporting * Hotspot 2.0. - * - 'device_options' - this is an array of strings pointing to device-sepecific options, + * - 'device_options' - this is an array of strings pointing to device-specific options, * for instance possible strings are 'geteduroam' or 'geantlink'. If the corresponding * option, like device-specific:geteduroam has the flag set to 'SPECIFIC' * then the options selection in the admin interface will only show such an diff --git a/devices/eap_config/DeviceXML.php b/devices/eap_config/DeviceXML.php index d0343abf1..54be23d08 100644 --- a/devices/eap_config/DeviceXML.php +++ b/devices/eap_config/DeviceXML.php @@ -392,10 +392,10 @@ private function getProviderLogo() /** * Scales a logo to the desired byte imag size if necessary. - * If the image size is below tha alowed maximum, nothing is done; + * If the image size is below the allowed maximum, nothing is done; * if the image is larger than we run a series of scaling iterations to sizes * specified in $maxPixelSize and the moment we manage to end up below the $maxByte - * we returm the scaled blob - we always use png as the output format since it seems + * we return the scaled blob - we always use png as the output format since it seems * to behave best in scaling. * * @param string $blob the image data diff --git a/devices/ms/DeviceW8W10.php b/devices/ms/DeviceW8W10.php index 4e65705ce..626f9ba69 100644 --- a/devices/ms/DeviceW8W10.php +++ b/devices/ms/DeviceW8W10.php @@ -95,7 +95,7 @@ public function writeInstaller() $delProfiles[] = $ssid.' (TKIP)'; } } - // the two lines below remove the eduroam® profiles we used to install, this is a temporary hack untill a better solution is implemented + // the two lines below remove the eduroam® profiles we used to install, this is a temporary hack until a better solution is implemented $delProfiles[] = 'eduroam®'; $delProfiles[] = 'eduroam® via partner'; // this removes the profile container that we used in CAT 2.1 and removed in 2.1.1 @@ -128,7 +128,7 @@ private function createProfileDir() /** * If separateHS20profiles is true then we should be saving OID and SSID - * profiles separately. OID profiles should be considered optionl, i.e. + * profiles separately. OID profiles should be considered optional, i.e. * the installer should not report installation failure (??). If we decide * that such installation failures should be silent then it is enough if * these profiles are marked as hs20 and no "nohs" profiles are created @@ -297,7 +297,7 @@ private function saveProfile($profile, $profileNumber = NULL, $hs20 = false) } /** - * Selects the appropriate handler for a given EAP type and retirns + * Selects the appropriate handler for a given EAP type and returns * an initiated object * * @return a profile object diff --git a/devices/ms/Files/README b/devices/ms/Files/README index d64ea03ff..05c840d86 100644 --- a/devices/ms/Files/README +++ b/devices/ms/Files/README @@ -27,7 +27,7 @@ Various utilities to be included in the installer code: WLANSetEAPUserData - EAP credential loading utility from https://github.com/rozmansi/WLANSetEAPUserData check_wired.cmd - utility to check status of wired 802.1X subsystem wlan_test.exe - utility for checking wireless status of Windows - install_wired.cmd - install wired profile - a wrappr around netsh + install_wired.cmd - install wired profile - a wrapper around netsh Graphics: cat32.ico - CAT EXE icon diff --git a/devices/ms/Files/common.inc b/devices/ms/Files/common.inc index 8d99f5d15..25b501589 100644 --- a/devices/ms/Files/common.inc +++ b/devices/ms/Files/common.inc @@ -1119,7 +1119,7 @@ FileWriteUTF16LE $9 "$tlsFingerprint$\r$\n\ FunctionEnd -Function writePeapUserProfle +Function writePeapUserProfile !insertmacro debug_cat 4 "Creating PEAP user profile" FileOpen $9 "$TEMP\user_cred.xml" w FileWriteUTF16LE $9 '$\r$\n\ @@ -1186,7 +1186,7 @@ Function InstallWirelessCred Call writeTlsUserProfile !endif !ifdef PEAP - Call writePeapUserProfle + Call writePeapUserProfile !endif !ifdef TTLS Call writeTtlsUserProfile @@ -1564,7 +1564,7 @@ Function InstallWiredUserCredentials ${If} $install_wired_credentials == 0 Goto WiredEnd ${EndIf} - Call writePeapUserProfle + Call writePeapUserProfile Call InstallWiredCred WiredEnd: FunctionEnd diff --git a/devices/ms/Files/geant_link.inc b/devices/ms/Files/geant_link.inc index 2f24a4c15..931f55ee1 100644 --- a/devices/ms/Files/geant_link.inc +++ b/devices/ms/Files/geant_link.inc @@ -94,9 +94,9 @@ Function InstallGEANTLink IfSilent +2 MessageBox MB_OK "" !insertmacro debug_cat 1 "Run GEANTLink installer" - !insertmacro debug_cat 3 'Execute: msiexec.exe /i "$OUTDIR\GEANTLink-$Platform.msi" REBOOT=Supress' + !insertmacro debug_cat 3 'Execute: msiexec.exe /i "$OUTDIR\GEANTLink-$Platform.msi" REBOOT=Suppress' ClearErrors - ExecWait '$Msiexec.exe /i "$TEMP\GEANTLink-$Platform.msi" /qb REBOOT=Supress' $0 + ExecWait '$Msiexec.exe /i "$TEMP\GEANTLink-$Platform.msi" /qb REBOOT=Suppress' $0 !insertmacro debug_cat 4 "GEANTLink returned $0" StrCmp $0 0 Cont2 ${If} $0 == 3010 diff --git a/docker/MSP/daemon/scripts/blacklisted.py b/docker/MSP/daemon/scripts/blacklisted.py index 21d922f8f..d2835be9d 100755 --- a/docker/MSP/daemon/scripts/blacklisted.py +++ b/docker/MSP/daemon/scripts/blacklisted.py @@ -78,7 +78,7 @@ def init_log(): logger.info('%s with serial %s waiting (added %d mins ago)', _clientcn, _serial, _inmin) continue if not os.path.isfile(CONF_DIR + 'site_' + _suffix): - logger.info('%s with serial %s still waiting (added %d mins ago) because deployment is not acitve', + logger.info('%s with serial %s still waiting (added %d mins ago) because deployment is not active', _clientcn, _serial, _inmin) continue _content = ''.join(bl_template) % { diff --git a/signer/HOWTO b/signer/HOWTO index aeeae5a93..08764bf36 100644 --- a/signer/HOWTO +++ b/signer/HOWTO @@ -74,7 +74,7 @@ ms_windows_sign will require defining URL and NAME values When you an an exe on version Windows as administrator, you will see a warning window with some information about the exe. This window will show you the program name, this is the string taken from the NAME, and the O of the certificate. - Not sure when the URL can get used, but we suggest uou define it anyway. + Not sure when the URL can get used, but we suggest you define it anyway. for instance you might define URL=http://www.eduroam.org NAME="eduroam configurator" @@ -88,7 +88,7 @@ ms_windows_sign will require defining URL and NAME values If you have kept the certificate file names as in this HOWTO then nothing else needs to be modified, otherwise you need to set file names to their proper values. -Both scripts should be readable and executable (but not writeable) by the Apache process. +Both scripts should be readable and executable (but not writable) by the Apache process. Enable signing ~~~~~~~~~~~~~~ diff --git a/signer/mobileconfig_proxy_sign-template b/signer/mobileconfig_proxy_sign-template index d572a8f6c..4911404e9 100755 --- a/signer/mobileconfig_proxy_sign-template +++ b/signer/mobileconfig_proxy_sign-template @@ -21,7 +21,7 @@ # This script is a part of the eduroam CAT softwareand covered by the approapriate license # This is an example signer working with pkcs11proxy and accessing hardware or software tokens -# plugged into remote machines. This script is set to use two servers but yoy can define more, if you like. +# plugged into remote machines. This script is set to use two servers but you can define more, if you like. # PREFIX may come handy if your software is located in one place PREFIX=/usr/local/share/cat-signer diff --git a/signer/ms_windows_proxy_sign-template b/signer/ms_windows_proxy_sign-template index 751d82ffc..92ee3d1de 100755 --- a/signer/ms_windows_proxy_sign-template +++ b/signer/ms_windows_proxy_sign-template @@ -21,7 +21,7 @@ # This script is a part of the eduroam CAT softwareand covered by the approapriate license # This is an example signer working with pkcs11proxy and accessing hardware or software tokens -# plugged into remote machines. This script is set to use two servers but yoy can define more, if you like. +# plugged into remote machines. This script is set to use two servers but you can define more, if you like. # PREFIX may come handy if your software is located in one place PREFIX=/usr/local/share/cat-signer diff --git a/translation/nl_NL/web_admin.po b/translation/nl_NL/web_admin.po index 44e584f85..d20c0d008 100644 --- a/translation/nl_NL/web_admin.po +++ b/translation/nl_NL/web_admin.po @@ -1415,7 +1415,7 @@ msgstr "Jouw attributen" #: web/admin/edit_user_result.php:28 msgid "User Attributes - Summary of submitted data" -msgstr "Gebruikersattibuten - Overzicht van verstrekte gegevens" +msgstr "Gebruikersattributen - Overzicht van verstrekte gegevens" #. what are we supposed to do? #: web/admin/edit_user_result.php:32 diff --git a/tutorials/Configuration.md b/tutorials/Configuration.md index 70e46b389..3ce592cb2 100644 --- a/tutorials/Configuration.md +++ b/tutorials/Configuration.md @@ -94,7 +94,7 @@ Installing CAT 4. create the devices/Devices.php file from the supplied template 5. on a MySQL/MariaDB server, create the databases as per the schema definition in schema/schema.sql 6. make sure that you can connect to that database -7. make sure that the var/installer_cache, var/silverbullet and var/tmp directories exists and are writeable to the Apache web server user +7. make sure that the var/installer_cache, var/silverbullet and var/tmp directories exists and are writable to the Apache web server user 8. make sure that simpleSAMLphp is installed 9. make sure that simpleSAMLphp openid module is enabled and google (or any IdP of your choice) is uncommented in authsources 10. create a symlink web/external/jquery/jquery.js pointing to the most current version of jQuery. When installing CAT from composer, the most recent version will be available in vendor/components/jquery/jquery.min.js (the version shipped inside the distribution may not be the most current one!) diff --git a/utils/Update_eduroamDB1_2/config.php b/utils/Update_eduroamDB1_2/config.php index a9638fe29..808d96e6d 100644 --- a/utils/Update_eduroamDB1_2/config.php +++ b/utils/Update_eduroamDB1_2/config.php @@ -3,7 +3,7 @@ $databases = [ 'eduroam' => "eduroam1_1_tmp", // this is the local copy of eduroam (v1) database created by update_monitor_copy.php 'eduroamv2' => "eduroam2_1_tmp", // this is the local copy of eduroam (v2) database created by update_monitor_copy.php - 'cat' => "cat_twoln_214_test2", // this is the curent production CAT database where we need to put in new identifiers - 'eduroam_new' => "monitor_copy2_test_xxx" // this is the resulting monitor_copy database containing all data required by CAT it must exist but tables will be created by the sript + 'cat' => "cat_twoln_214_test2", // this is the current production CAT database where we need to put in new identifiers + 'eduroam_new' => "monitor_copy2_test_xxx" // this is the resulting monitor_copy database containing all data required by CAT it must exist but tables will be created by the script ]; diff --git a/utils/Update_eduroamDB1_2/sync_databases.php b/utils/Update_eduroamDB1_2/sync_databases.php index 1d7cc1483..3e628f414 100644 --- a/utils/Update_eduroamDB1_2/sync_databases.php +++ b/utils/Update_eduroamDB1_2/sync_databases.php @@ -3,7 +3,7 @@ * This a one-time procedure required to resync CAT with eduroamv2 institition * identifiers * - * First run update_monitor_copy.php with resultung databases set to the ones listed below + * First run update_monitor_copy.php with resulting databases set to the ones listed below * Next run this script * */ diff --git a/utils/test_openroaming.php b/utils/test_openroaming.php index 2260087b4..5d0d31247 100644 --- a/utils/test_openroaming.php +++ b/utils/test_openroaming.php @@ -11,7 +11,7 @@ require_once dirname(dirname(__FILE__)) . "/config/_config.php"; /** - * The sctipt will be called from crontab + * The script will be called from crontab * * list all profiles * foreach profile create the profile object diff --git a/web/admin/duplicate_profile.php b/web/admin/duplicate_profile.php index 6eb440699..064929a4e 100644 --- a/web/admin/duplicate_profile.php +++ b/web/admin/duplicate_profile.php @@ -20,9 +20,9 @@ */ /** - * This page is used to preapre creation of a duplicate of a RADIUS profile by + * This page is used to prepare creation of a duplicate of a RADIUS profile by * its administrator. - * The new profile will have the display names replaces with one velue set by + * The new profile will have the display names replaced with one value set by * the admin during duplication. The production-ready flag will be removed. * * @author Tomasz Wolniewicz diff --git a/web/admin/duplicate_profile_result.php b/web/admin/duplicate_profile_result.php index 7e8b60f3c..c41a6d5ca 100644 --- a/web/admin/duplicate_profile_result.php +++ b/web/admin/duplicate_profile_result.php @@ -21,7 +21,7 @@ /** * This page is used create a duplicate of a RADIUS profile by its administrator. - * The new profile will have the display names replaces with one velue set by + * The new profile will have the display names replaces with one value set by * the admin during duplication. The production-ready flag will be removed. * * @author Tomasz Wolniewicz @@ -37,10 +37,10 @@ $auth->authenticate(); -function copyRow($row, $feldsArray, $table, $dbHandle) { +function copyRow($row, $fieldsArray, $table, $dbHandle) { $fieldsList = implode(',', array_keys($row)); foreach ($row as $key => $value) { - if ($feldsArray[$key] == 's') { + if ($fieldsArray[$key] == 's') { if ($value === null) { $row[$key] = 'NULL'; } else { @@ -55,8 +55,8 @@ function copyRow($row, $feldsArray, $table, $dbHandle) { $dbHandle->exec($insert); } -function runSelect($profileId, $feldsArray, $table, $dbHandle) { - $fieldsList = implode(',', array_keys($feldsArray)); +function runSelect($profileId, $fieldsArray, $table, $dbHandle) { + $fieldsList = implode(',', array_keys($fieldsArray)); $query = 'SELECT '.$fieldsList.' FROM '.$table.' WHERE profile_id=?'; return $dbHandle->exec($query, "i", $profileId); } diff --git a/web/admin/inc/manageDBLink.inc.php b/web/admin/inc/manageDBLink.inc.php index e031c2de7..628e6a202 100644 --- a/web/admin/inc/manageDBLink.inc.php +++ b/web/admin/inc/manageDBLink.inc.php @@ -67,7 +67,7 @@ header("Location: ../overview_federation.php"); exit; } - // okay, they did sumbit an inst. It's either a (string) handle from a promising + // okay, they did submit an inst. It's either a (string) handle from a promising // candidate, or "other" as selected from the drop-down list if ($_POST['inst_link'] != "other") { $my_inst->setExternalDBId($validator->string(filter_input(INPUT_POST, 'inst_link')), $fedId); // validator will do additional checks diff --git a/web/admin/overview_federation.php b/web/admin/overview_federation.php index 0b17c239e..dced957c2 100644 --- a/web/admin/overview_federation.php +++ b/web/admin/overview_federation.php @@ -37,7 +37,7 @@ //$OpenRoamingSymbol = "OpenRoaming"; $OpenRoamingSymbol = "OR"; $fedArray = []; -$stausIcons = [ +$statusIcons = [ \core\IdP::PROFILES_SHOWTIME => ['img' => 'Tabler/checks-green.svg', 'text' => _("At least one profile is fully configured and visible in the user interface")], \core\IdP::PROFILES_CONFIGURED => ['img' => 'Tabler/check-green.svg', 'text' => _("At least one profile is fully configured but none are set as production-ready therefore the institution is not visible in the user interface")], ]; diff --git a/web/diag/action_realmcheck.php b/web/diag/action_realmcheck.php index 4dfd9f155..5d697ae9d 100644 --- a/web/diag/action_realmcheck.php +++ b/web/diag/action_realmcheck.php @@ -969,11 +969,11 @@ function run_openroaming() { "._("Live login test").""; $prof_compl = $my_profile->getEapMethodsinOrderOfPreference(1); if (count($prof_compl) > 0) { - $passwordReqired = FALSE; + $passwordRequired = FALSE; $clientCertRequired = FALSE; foreach ($prof_compl as $eap) { if ($eap->isPasswordRequired()) { - $passwordReqired = TRUE; + $passwordRequired = TRUE; } if ($eap->isClientCertRequired()) { $clientCertRequired = TRUE; @@ -988,7 +988,7 @@ function run_openroaming() { "; // if any password based EAP methods are available enable this section - if ($passwordReqired) { + if ($passwordRequired) { echo ""; echo ""; diff --git a/web/diag/magicTelepath.php b/web/diag/magicTelepath.php index 43e29f793..89ab39764 100644 --- a/web/diag/magicTelepath.php +++ b/web/diag/magicTelepath.php @@ -25,7 +25,7 @@ $nro = htmlspecialchars(strip_tags(filter_input(INPUT_GET,'nro'))); \core\CAT::sessionStart(); $languageObject = new core\common\Language(); -$languageObject->setTextDomain("diagonstics"); +$languageObject->setTextDomain("diagnostics"); $telepath = new \core\diag\Telepath($realm, $nro, $visited); $telepathArray = $telepath->magic(); diff --git a/web/lib/admin/OptionDisplay.php b/web/lib/admin/OptionDisplay.php index 145b82d5e..490fbfe7e 100644 --- a/web/lib/admin/OptionDisplay.php +++ b/web/lib/admin/OptionDisplay.php @@ -491,9 +491,9 @@ private function prefillText(int $rowid, string $optionName, string $optionValue $retval .= "$displayedVariant"; break; case \core\Options::TYPECODE_STRING: - // fall-thorugh is intentional; mostly identical HTML code for the three types + // fall-through is intentional; mostly identical HTML code for the three types case \core\Options::TYPECODE_INTEGER: - // fall-thorugh is intentional; mostly identical HTML code for the three types + // fall-through is intentional; mostly identical HTML code for the three types case \core\Options::TYPECODE_TEXT: $displayedVariant = $optionValue; // for all three types, value tag and actual display are identical $retval .= "$displayedVariant"; diff --git a/web/lib/admin/Wizard.php b/web/lib/admin/Wizard.php index d42ce6d3f..b4488cb2d 100644 --- a/web/lib/admin/Wizard.php +++ b/web/lib/admin/Wizard.php @@ -22,7 +22,7 @@ namespace web\lib\admin; /** - * This class contains methods for displaing "wizard" help information for + * This class contains methods for displaying "wizard" help information for * novice admins. During the first setup the messages are showm in-line. * Later only help icons are displayed and corresponding hints are displayed * in an overlay window @@ -50,7 +50,7 @@ public function __construct($wizardStyle) { /** * Depending on the wizardStyle setting either display help in a fixed window * or display the "i" icon pointing to the help text in a hidden window - * The text itself is taken from the helppMessage object indexed bu the $ubject + * The text itself is taken from the helppMessage object indexed by the $ubject * * @param string $subject * @param array $options diff --git a/web/skins/modern/div_user_welcome.php b/web/skins/modern/div_user_welcome.php index c6d678f8b..13923e4cc 100644 --- a/web/skins/modern/div_user_welcome.php +++ b/web/skins/modern/div_user_welcome.php @@ -19,7 +19,7 @@ * /copyright.php after deploying the software */ ?> -
+
textTemplates->templates[web\lib\user\WELCOME_ABOARD_HEADING] ?>

"+guiTexts.continue+""; @@ -575,7 +575,7 @@ function handleGuessOs(recognisedDevice) { if (recognisedDevice.device_customtext != '0' || recognisedDevice.eap_customtext != '0' || recognisedDevice.message != '0') { - $("#g_"+recognisedOS+",#g_or_"+recognisedOS).addClass('hasAdditonalInfo'); + $("#g_"+recognisedOS+",#g_or_"+recognisedOS).addClass('hasAdditionalInfo'); i_div = $("#info_g_"+recognisedOS); /* if ($(this).hasClass("dev_or") && $("#openroaming_check").prop("checked") == false) { diff --git a/web/skins/msp/div_user_welcome.php b/web/skins/msp/div_user_welcome.php index c6d678f8b..13923e4cc 100644 --- a/web/skins/msp/div_user_welcome.php +++ b/web/skins/msp/div_user_welcome.php @@ -19,7 +19,7 @@ * /copyright.php after deploying the software */ ?> -

+
textTemplates->templates[web\lib\user\WELCOME_ABOARD_HEADING] ?>

"+guiTexts.continue+""; @@ -575,7 +575,7 @@ function handleGuessOs(recognisedDevice) { if (recognisedDevice.device_customtext != '0' || recognisedDevice.eap_customtext != '0' || recognisedDevice.message != '0') { - $("#g_"+recognisedOS+",#g_or_"+recognisedOS).addClass('hasAdditonalInfo'); + $("#g_"+recognisedOS+",#g_or_"+recognisedOS).addClass('hasAdditionalInfo'); i_div = $("#info_g_"+recognisedOS); /* if ($(this).hasClass("dev_or") && $("#openroaming_check").prop("checked") == false) {

"._("Password-based EAP types")."
"._("Real (inner) username:")."
"._("Anonymous outer ID (optional):")."