diff --git a/dictionaries/errors.definition.json b/dictionaries/errors.definition.json
index c1b1866f71a09c5fc5c670a51f127a7f7797e4c9..fdea1a8a4e867536431f4661672d0f3e279fee66 100644
--- a/dictionaries/errors.definition.json
+++ b/dictionaries/errors.definition.json
@@ -21,7 +21,7 @@
"en": "E-mail address:"
},
"report_explain": {
- "en": "Explain what you did when this error occured..."
+ "en": "Explain what you did when this error occurred..."
},
"report_submit": {
"en": "Send error report"
@@ -36,7 +36,7 @@
"en": "Error creating request"
},
"descr_CREATEREQUEST": {
- "en": "An error occured when trying to create the SAML request."
+ "en": "An error occurred when trying to create the SAML request."
},
"title_DISCOPARAMS": {
"en": "Bad request to discovery service"
@@ -48,19 +48,19 @@
"en": "Could not create authentication response"
},
"descr_GENERATEAUTHNRESPONSE": {
- "en": "When this identity provider tried to create an authentication response, an error occured."
+ "en": "When this identity provider tried to create an authentication response, an error occurred."
},
"title_LDAPERROR": {
"en": "LDAP Error"
},
"descr_LDAPERROR": {
- "en": "LDAP is the user database, and when you try to login, we need to contact an LDAP database. An error occured when we tried it this time."
+ "en": "LDAP is the user database, and when you try to login, we need to contact an LDAP database. An error occurred when we tried it this time."
},
"title_LOGOUTREQUEST": {
"en": "Error processing the Logout Request"
},
"descr_LOGOUTREQUEST": {
- "en": "An error occured when trying to process the Logout Request."
+ "en": "An error occurred when trying to process the Logout Request."
},
"title_METADATA": {
"en": "Error loading metadata"
@@ -90,7 +90,7 @@
"en": "Error processing request from Service Provider"
},
"descr_PROCESSAUTHNREQUEST": {
- "en": "This Identity Provider received an Authentication Request from a Service Provider, but an error occured when trying to process the request."
+ "en": "This Identity Provider received an Authentication Request from a Service Provider, but an error occurred when trying to process the request."
},
"title_SLOSERVICEPARAMS": {
"en": "No SAML message provided"
diff --git a/dictionaries/status.definition.json b/dictionaries/status.definition.json
index 6044192b40e90327af34ec96387cb346b47f718d..09942ff4b95c87c1d2fd6b26196e484f2283e4f6 100644
--- a/dictionaries/status.definition.json
+++ b/dictionaries/status.definition.json
@@ -11,8 +11,8 @@
"header_diagnostics": {
"en": "SimpleSAMLphp Diagnostics"
},
- "some_error_occured": {
- "en": "Some error occured"
+ "some_error_occurred": {
+ "en": "Some error occurred"
},
"intro": {
"en": "Hi, this is the status page of simpleSAMLphp. Here you can see if your session is timed out, how long it lasts until it times out and all the attributes that is attached to your session."
diff --git a/dictionaries/status.translation.json b/dictionaries/status.translation.json
index 804bb1fcb0d3dc9e1eb7482ccd4950f8a40975c4..5aebfde03fcd58164c47704ee937c98c37056b5d 100644
--- a/dictionaries/status.translation.json
+++ b/dictionaries/status.translation.json
@@ -99,7 +99,7 @@
"et": "SimpleSAMLphp diagnostika",
"he": "\u05d0\u05d9\u05d1\u05d7\u05d5\u05df SimpleSAMLphp"
},
- "some_error_occured": {
+ "some_error_occurred": {
"no": "En feil har oppst\u00e5tt",
"nn": "Ein feilsituasjon oppsto",
"sv": "Ett fel har intr\u00e4ffat",
diff --git a/lib/SimpleSAML/IdP.php b/lib/SimpleSAML/IdP.php
index a8a2d1f6e8883b4f41e2c2c00bf2697b7d8f0640..82e001fa2d151be22f475e839376da6151c8ade7 100644
--- a/lib/SimpleSAML/IdP.php
+++ b/lib/SimpleSAML/IdP.php
@@ -486,7 +486,7 @@ class SimpleSAML_IdP {
*
* @param string $assocId The association that is terminated.
* @param string|NULL $relayState The RelayState from the start of the logout.
- * @param SimpleSAML_Error_Exception|NULL $error The error that occured during session termination (if any).
+ * @param SimpleSAML_Error_Exception|NULL $error The error that occurred during session termination (if any).
*/
public function handleLogoutResponse($assocId, $relayState, SimpleSAML_Error_Exception $error = NULL) {
assert('is_string($assocId)');
diff --git a/lib/SimpleSAML/IdP/LogoutHandler.php b/lib/SimpleSAML/IdP/LogoutHandler.php
index 44a393d21c7822e224d8a8a0c3265a2149cabebb..60a53499f85dcab0baf3a47c1ecb6871f3297949 100644
--- a/lib/SimpleSAML/IdP/LogoutHandler.php
+++ b/lib/SimpleSAML/IdP/LogoutHandler.php
@@ -44,7 +44,7 @@ abstract class SimpleSAML_IdP_LogoutHandler {
*
* @param string $assocId The association that is terminated.
* @param string|NULL $relayState The RelayState from the start of the logout.
- * @param SimpleSAML_Error_Exception|NULL $error The error that occured during session termination (if any).
+ * @param SimpleSAML_Error_Exception|NULL $error The error that occurred during session termination (if any).
*/
public function onResponse($assocId, $relayState, SimpleSAML_Error_Exception $error = NULL) {
assert('is_string($assocId)');
diff --git a/lib/SimpleSAML/IdP/LogoutIFrame.php b/lib/SimpleSAML/IdP/LogoutIFrame.php
index 94124cb39d8860884bbdfe1095b36d054b748879..094c1a4b4540790e2207eae206ad7e6bbb89bff3 100644
--- a/lib/SimpleSAML/IdP/LogoutIFrame.php
+++ b/lib/SimpleSAML/IdP/LogoutIFrame.php
@@ -60,7 +60,7 @@ class SimpleSAML_IdP_LogoutIFrame extends SimpleSAML_IdP_LogoutHandler {
*
* @param string $assocId The association that is terminated.
* @param string|NULL $relayState The RelayState from the start of the logout.
- * @param SimpleSAML_Error_Exception|NULL $error The error that occured during session termination (if any).
+ * @param SimpleSAML_Error_Exception|NULL $error The error that occurred during session termination (if any).
*/
public function onResponse($assocId, $relayState, SimpleSAML_Error_Exception $error = NULL) {
assert('is_string($assocId)');
diff --git a/lib/SimpleSAML/IdP/LogoutTraditional.php b/lib/SimpleSAML/IdP/LogoutTraditional.php
index bdef21c540163f71e21a5497280017f2be3d850a..5a4846608ca34a8ce995b3b0945d486b34c9bfdf 100644
--- a/lib/SimpleSAML/IdP/LogoutTraditional.php
+++ b/lib/SimpleSAML/IdP/LogoutTraditional.php
@@ -66,7 +66,7 @@ class SimpleSAML_IdP_LogoutTraditional extends SimpleSAML_IdP_LogoutHandler {
*
* @param string $assocId The association that is terminated.
* @param string|NULL $relayState The RelayState from the start of the logout.
- * @param SimpleSAML_Error_Exception|NULL $error The error that occured during session termination (if any).
+ * @param SimpleSAML_Error_Exception|NULL $error The error that occurred during session termination (if any).
*/
public function onResponse($assocId, $relayState, SimpleSAML_Error_Exception $error = NULL) {
assert('is_string($assocId)');
diff --git a/lib/SimpleSAML/Logger.php b/lib/SimpleSAML/Logger.php
index f786ccb1657ce29c92a96c06d1d2b5c9e2f53beb..ea7a72777cb886a48344e4f41ed8c9d5f3beac71 100644
--- a/lib/SimpleSAML/Logger.php
+++ b/lib/SimpleSAML/Logger.php
@@ -159,7 +159,7 @@ class SimpleSAML_Logger {
}
} elseif (self::$loggingHandler === FALSE) {
- /* Some error occured while initializing logging. */
+ /* Some error occurred while initializing logging. */
if (empty(self::$earlyLog)) {
/* This is the first message. */
error_log('--- Log message(s) while initializing logging ------------------------');
diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index d3c3909fb2a38a26949f335c873be4c79bc9d464..5a38cd60bf992d36f7ccedeb427917e26d54488e 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -1247,7 +1247,7 @@ class SimpleSAML_Utilities {
/**
* Retrieve last error message.
*
- * This function retrieves the last error message. If no error has occured,
+ * This function retrieves the last error message. If no error has occurred,
* '[No error message found]' will be returned. If the required function isn't available,
* '[Cannot get error message]' will be returned.
*
diff --git a/lib/SimpleSAML/XML/Errors.php b/lib/SimpleSAML/XML/Errors.php
index 9c4ccb7d1ed9a0f8f8b691e49871aefaf86ea7ac..9cd6d7ea9b4e4817088fd26429765b26ef6b36a3 100644
--- a/lib/SimpleSAML/XML/Errors.php
+++ b/lib/SimpleSAML/XML/Errors.php
@@ -69,17 +69,17 @@ class SimpleSAML_XML_Errors {
/**
* End error logging.
*
- * @return An array with the LibXMLErrors which has occured since begin() was called.
+ * @return An array with the LibXMLErrors which has occurred since begin() was called.
*/
public static function end() {
/* Check whether the error access functions are present. */
if(!function_exists('libxml_use_internal_errors')) {
- /* Pretend that no errors occured. */
+ /* Pretend that no errors occurred. */
return array();
}
- /* Add any errors which may have occured. */
+ /* Add any errors which may have occurred. */
self::addErrors();
diff --git a/modules/authYubiKey/lib/Auth/Source/YubiKey.php b/modules/authYubiKey/lib/Auth/Source/YubiKey.php
index 38d5546a3b5dfefdc72eb9ad0cedfb4efb37fac1..1381ee68fb3900b910ffe57b6789b0f41ba762a3 100644
--- a/modules/authYubiKey/lib/Auth/Source/YubiKey.php
+++ b/modules/authYubiKey/lib/Auth/Source/YubiKey.php
@@ -139,7 +139,7 @@ class sspmod_authYubiKey_Auth_Source_YubiKey extends SimpleSAML_Auth_Source {
/* Attempt to log in. */
$attributes = $source->login($otp);
} catch (SimpleSAML_Error_Error $e) {
- /* An error occured during login. Check if it is because of the wrong
+ /* An error occurred during login. Check if it is because of the wrong
* username/password - if it is, we pass that error up to the login form,
* if not, we let the generic error handler deal with it.
*/
@@ -147,7 +147,7 @@ class sspmod_authYubiKey_Auth_Source_YubiKey extends SimpleSAML_Auth_Source {
return 'WRONGUSERPASS';
}
- /* Some other error occured. Rethrow exception and let the generic error
+ /* Some other error occurred. Rethrow exception and let the generic error
* handler deal with it.
*/
throw $e;
diff --git a/modules/consentAdmin/templates/consentadmin.php b/modules/consentAdmin/templates/consentadmin.php
index 07e6d3185ab4c98b5635963f317dfcdec967554d..31075be1e06ac40ee2f8db5c0002e304d1bd1c57 100755
--- a/modules/consentAdmin/templates/consentadmin.php
+++ b/modules/consentAdmin/templates/consentadmin.php
@@ -54,7 +54,7 @@ span.showhide {
</style>
- <!-- <h2><?php if (isset($this->data['header'])) { echo $this->t($this->data['header']); } else { echo "Some error occured"; } ?></h2> -->
+ <!-- <h2><?php if (isset($this->data['header'])) { echo $this->t($this->data['header']); } else { echo "Some error occurred"; } ?></h2> -->
<h2><?php echo $this->t('consentadmin_header') ?></h2>
<p>
<?php echo $this->t('consentadmin_description1') ?> </p>
diff --git a/modules/oauth/bin/demo.php b/modules/oauth/bin/demo.php
index e4021e76ce72f3cbf4f8e1aef6ec2e2198563dc5..1f45b0b6bdfabf46478729724b75f00ee8a8de73 100755
--- a/modules/oauth/bin/demo.php
+++ b/modules/oauth/bin/demo.php
@@ -54,7 +54,7 @@ try {
echo 'Your user ID is : ' . $userdata['eduPersonPrincipalName'][0] . "\n";
} catch(Exception $e) {
- echo 'Error occured: ' . $e->getMessage() . "\n\n";
+ echo 'Error occurred: ' . $e->getMessage() . "\n\n";
}
diff --git a/templates/status.php b/templates/status.php
index 3ecc008623f1b9f591f01af707c05b4ed62f3033..401f2e823ccd7bafa50faa65ba906b27448cb40c 100644
--- a/templates/status.php
+++ b/templates/status.php
@@ -8,7 +8,7 @@ if(array_key_exists('header', $this->data)) {
$this->includeAtTemplateBase('includes/header.php');
?>
-<h2><?php if (isset($this->data['header'])) { echo($this->data['header']); } else { echo($this->t('{status:some_error_occured}')); } ?></h2>
+<h2><?php if (isset($this->data['header'])) { echo($this->data['header']); } else { echo($this->t('{status:some_error_occurred}')); } ?></h2>
<p><?php echo($this->t('{status:intro}')); ?></p>
diff --git a/www/auth/login-radius.php b/www/auth/login-radius.php
index 6e17d3880d1c6972a8558a63108fbec38b419d07..73e24b601e5ed5a1a31d6dd51414d20e1471c3de 100644
--- a/www/auth/login-radius.php
+++ b/www/auth/login-radius.php
@@ -29,13 +29,13 @@ if (isset($_POST['username'])) {
if (! radius_add_server($radius, $config->getValue('auth.radius.hostname'), $config->getValue('auth.radius.port'),
$config->getValue('auth.radius.secret'), 5, 3)) {
- SimpleSAML_Logger::critical('AUTH - radius: Problem occured when connecting to Radius server: '.radius_strerror($radius));
- throw new Exception('Problem occured when connecting to Radius server: ' . radius_strerror($radius));
+ SimpleSAML_Logger::critical('AUTH - radius: Problem occurred when connecting to Radius server: '.radius_strerror($radius));
+ throw new Exception('Problem occurred when connecting to Radius server: ' . radius_strerror($radius));
}
if (! radius_create_request($radius,RADIUS_ACCESS_REQUEST)) {
- SimpleSAML_Logger::critical('AUTH - radius: Problem occured when creating the Radius request: '.radius_strerror($radius));
- throw new Exception('Problem occured when creating the Radius request: ' . radius_strerror($radius));
+ SimpleSAML_Logger::critical('AUTH - radius: Problem occurred when creating the Radius request: '.radius_strerror($radius));
+ throw new Exception('Problem occurred when creating the Radius request: ' . radius_strerror($radius));
}
radius_put_attr($radius,RADIUS_USER_NAME,$_POST['username']);