diff --git a/modules/consent/www/getconsent.php b/modules/consent/www/getconsent.php
index 658e4ee822e7f14665e8312ea029846dddd0f99b..b4cb0fda5e28ae40a350cc0e2f00d8337407b36c 100644
--- a/modules/consent/www/getconsent.php
+++ b/modules/consent/www/getconsent.php
@@ -126,21 +126,21 @@ $t->data['noData'] = array('StateId' => $id);
$t->data['attributes'] = $attributes;
$t->data['checked'] = $state['consent:checked'];
-$srcName = htmlspecialchars(is_array($srcName) ? $t->t($srcName) : $srcName);
-$dstName = htmlspecialchars(is_array($dstName) ? $t->t($dstName) : $dstName);
+$srcName = htmlspecialchars(is_array($srcName) ? \SimpleSAML\Locale\Translate::t($srcName) : $srcName);
+$dstName = htmlspecialchars(is_array($dstName) ? \SimpleSAML\Locale\Translate::t($dstName) : $dstName);
-$t->data['consent_attributes_header'] = $t->t(
+$t->data['consent_attributes_header'] = \SimpleSAML\Locale\Translate::t(
'{consent:consent:consent_attributes_header}',
array('SPNAME' => $dstName, 'IDPNAME' => $srcName)
);
-$t->data['consent_accept'] = $t->t(
+$t->data['consent_accept'] = \SimpleSAML\Locale\Translate::t(
'{consent:consent:consent_accept}',
array('SPNAME' => $dstName, 'IDPNAME' => $srcName)
);
if (array_key_exists('descr_purpose', $state['Destination'])) {
- $t->data['consent_purpose'] = $t->t(
+ $t->data['consent_purpose'] = \SimpleSAML\Locale\Translate::t(
'{consent:consent:consent_purpose}',
array(
'SPNAME' => $dstName,
@@ -203,7 +203,7 @@ $t->show();
/**
* Recursive attribute array listing function
*
- * @param SimpleSAML_XHTML_Template $t Template object
+ * @param \SimpleSAML\XHTML\Template $t Template object
* @param array $attributes Attributes to be presented
* @param string $nameParent Name of parent element
*
@@ -215,7 +215,7 @@ function present_attributes($t, $attributes, $nameParent)
$alternate = array('odd', 'even');
$i = 0;
- $summary = 'summary="' . $t->t('{consent:consent:table_summary}') . '"';
+ $summary = 'summary="' . \SimpleSAML\Locale\Translate::t('{consent:consent:table_summary}') . '"';
if (strlen($nameParent) > 0) {
$parentStr = strtolower($nameParent) . '_';
@@ -223,7 +223,7 @@ function present_attributes($t, $attributes, $nameParent)
} else {
$parentStr = '';
$str = '<table id="table_with_attributes" class="attributes" '. $summary .'>';
- $str .= "\n" . '<caption>' . $t->t('{consent:consent:table_caption}') .
+ $str .= "\n" . '<caption>' . \SimpleSAML\Locale\Translate::t('{consent:consent:table_caption}') .
'</caption>';
}
@@ -283,7 +283,7 @@ function present_attributes($t, $attributes, $nameParent)
$str .= '... ';
$str .= '<a class="consent_showattributelink" href="javascript:SimpleSAML_show(\'hidden_' . $hiddenId;
$str .= '\'); SimpleSAML_hide(\'visible_' . $hiddenId . '\');">';
- $str .= $t->t('{consent:consent:show_attribute}');
+ $str .= \SimpleSAML\Locale\Translate::t('{consent:consent:show_attribute}');
$str .= '</a>';
$str .= '</div>';
}
diff --git a/modules/consent/www/noconsent.php b/modules/consent/www/noconsent.php
index 4ac9f5e8f5f3fb29c3faa253a6673ebd25a06d14..998a67d69f24151edc4f8623b90dea0a64c1acd9 100644
--- a/modules/consent/www/noconsent.php
+++ b/modules/consent/www/noconsent.php
@@ -54,9 +54,9 @@ $t->data['resumeFrom'] = $resumeFrom;
$t->data['aboutService'] = $aboutService;
$t->data['logoutLink'] = $logoutLink;
-$dstName = htmlspecialchars(is_array($dstName) ? $t->t($dstName) : $dstName);
+$dstName = htmlspecialchars(is_array($dstName) ? \SimpleSAML\Locale\Translate::t($dstName) : $dstName);
-$t->data['noconsent_text'] = $t->t('{consent:consent:noconsent_text}', array('SPNAME' => $dstName));
-$t->data['noconsent_abort'] = $t->t('{consent:consent:abort}', array('SPNAME' => $dstName));
+$t->data['noconsent_text'] = \SimpleSAML\Locale\Translate::t('{consent:consent:noconsent_text}', array('SPNAME' => $dstName));
+$t->data['noconsent_abort'] = \SimpleSAML\Locale\Translate::t('{consent:consent:abort}', array('SPNAME' => $dstName));
$t->show();
diff --git a/modules/core/www/frontpage_auth.php b/modules/core/www/frontpage_auth.php
index 5ed037ceaaec24a72dae4bf3be75f96fd998038f..3d45dfc5015c0633667a3068e9d6d0667b1aa454 100644
--- a/modules/core/www/frontpage_auth.php
+++ b/modules/core/www/frontpage_auth.php
@@ -36,7 +36,7 @@ $t->data['pageid'] = 'frontpage_auth';
$t->data['isadmin'] = $isadmin;
$t->data['loginurl'] = $loginurl;
-$t->data['header'] = $t->t('{core:frontpage:page_title}');
+$t->data['header'] = \SimpleSAML\Locale\Translate::t('{core:frontpage:page_title}');
$t->data['links'] = $links;
$t->data['links_welcome'] = $links_welcome;
$t->data['links_config'] = $links_config;
diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
index 3566cf613c36cae4e5134c18eecd80415bb4fd86..fd0561b7bc8e804f3657e4f44e1025105bb3c60e 100644
--- a/modules/core/www/frontpage_config.php
+++ b/modules/core/www/frontpage_config.php
@@ -160,7 +160,7 @@ $funcmatrix[] = array(
$t = new \SimpleSAML\XHTML\Template($config, 'core:frontpage_config.tpl.php');
$t->data['pageid'] = 'frontpage_config';
-$t->data['header'] = $t->t('{core:frontpage:page_title}');
+$t->data['header'] = \SimpleSAML\Locale\Translate::t('{core:frontpage:page_title}');
$t->data['isadmin'] = $isadmin;
$t->data['loginurl'] = $loginurl;
$t->data['warnings'] = $warnings;
diff --git a/modules/core/www/frontpage_federation.php b/modules/core/www/frontpage_federation.php
index b3e2602c1aa81e3ecb73ddc1237145fcfeba1d74..2e96ebce205672d2c3717f99d1081be8a5f50aac 100644
--- a/modules/core/www/frontpage_federation.php
+++ b/modules/core/www/frontpage_federation.php
@@ -96,7 +96,7 @@ foreach ($metaentries['remote'] as $key => $value) {
$t = new \SimpleSAML\XHTML\Template($config, 'core:frontpage_federation.tpl.php');
-$language = $t->getLanguage();
+$language = \SimpleSAML\Locale\Language::getLanguage();
$defaultLanguage = $config->getString('language.default', 'en');
$translators = array(
@@ -156,9 +156,9 @@ $t->data['links_welcome'] = $links_welcome;
$t->data['links_config'] = $links_config;
$t->data['links_auth'] = $links_auth;
$t->data['links_federation'] = $links_federation;
-$t->data['header'] = $t->t('{core:frontpage:page_title}');
+$t->data['header'] = \SimpleSAML\Locale\Translate::t('{core:frontpage:page_title}');
-$t->data['metadata_url'] = SimpleSAML\Module::getModuleURL('core/show_metadata.php');
+$t->data['metadata_url'] = \SimpleSAML\Module::getModuleURL('core/show_metadata.php');
$t->data['metaentries'] = $metaentries;
$t->data['mtype'] = $mtype;
diff --git a/modules/core/www/frontpage_welcome.php b/modules/core/www/frontpage_welcome.php
index 6ec1517492fd2e438d8d375d47c0fbd901d8f407..fb472afba1c0abbacf3c4b7707819e0c76891424 100644
--- a/modules/core/www/frontpage_welcome.php
+++ b/modules/core/www/frontpage_welcome.php
@@ -42,7 +42,7 @@ $t->data['links_welcome'] = $links_welcome;
$t->data['links_config'] = $links_config;
$t->data['links_auth'] = $links_auth;
$t->data['links_federation'] = $links_federation;
-$t->data['header'] = $t->t('{core:frontpage:page_title}');
+$t->data['header'] = \SimpleSAML\Locale\Translate::t('{core:frontpage:page_title}');
diff --git a/modules/core/www/idp/logout-iframe.php b/modules/core/www/idp/logout-iframe.php
index e2be5bd7905fb937468bf586a60bf638b6971904..b8f85a363964e39d23bb2f692b5b9299e58f0f1b 100644
--- a/modules/core/www/idp/logout-iframe.php
+++ b/modules/core/www/idp/logout-iframe.php
@@ -122,7 +122,7 @@ if ($type === 'nojs') {
$t = new \SimpleSAML\XHTML\Template($globalConfig, $template_id);
$t->data['auth_state'] = $id;
-$t->data['header'] = $t->t('{logout:progress}');
+$t->data['header'] = \SimpleSAML\Locale\Translate::t('{logout:progress}');
/**
* @deprecated The "id" variable will be removed. Please use "auth_state" instead.
diff --git a/modules/core/www/login.php b/modules/core/www/login.php
index d67a44b42ca4f8ab337700237cb87ec3b7143feb..a09082ad7c4987cbc9ea444aa58bd1c7ac825328 100644
--- a/modules/core/www/login.php
+++ b/modules/core/www/login.php
@@ -1,7 +1,7 @@
<?php
-$config = SimpleSAML_Configuration::getInstance();
-$sources = SimpleSAML_Configuration::getOptionalConfig('authsources.php')->toArray();
+$config = \SimpleSAML\Configuration::getInstance();
+$sources = \SimpleSAML\Configuration::getOptionalConfig('authsources.php')->toArray();
//delete admin
if (isset($sources['admin'])) {
@@ -14,9 +14,9 @@ if (count($sources)==1) {
}
if (!array_key_exists('as', $_REQUEST)) {
- $t = new SimpleSAML_XHTML_Template($config, 'core:login.twig');
+ $t = new \SimpleSAML\XHTML\Template($config, 'core:login.twig');
- $t->data['loginurl'] = SimpleSAML\Utils\Auth::getAdminLoginURL();
+ $t->data['loginurl'] = \SimpleSAML\Utils\Auth::getAdminLoginURL();
$t->data['sources'] = $sources;
$t->show();
exit();
@@ -29,18 +29,18 @@ if (array_key_exists('logout', $_REQUEST)) {
$as->logout($config->getBasePath().'logout.php');
}
-if (array_key_exists(SimpleSAML_Auth_State::EXCEPTION_PARAM, $_REQUEST)) {
+if (array_key_exists(\SimpleSAML\Auth\State::EXCEPTION_PARAM, $_REQUEST)) {
// This is just a simple example of an error
- $state = SimpleSAML_Auth_State::loadExceptionState();
- assert('array_key_exists(SimpleSAML_Auth_State::EXCEPTION_DATA, $state)');
- $e = $state[SimpleSAML_Auth_State::EXCEPTION_DATA];
+ $state = \SimpleSAML\Auth\State::loadExceptionState();
+ assert('array_key_exists(\SimpleSAML\Auth\State::EXCEPTION_DATA, $state)');
+ $e = $state[\SimpleSAML\Auth\State::EXCEPTION_DATA];
throw $e;
}
if (!$as->isAuthenticated()) {
- $url = SimpleSAML\Module::getModuleURL('core/login.php', array('as' => $asId));
+ $url = \SimpleSAML\Module::getModuleURL('core/login.php', array('as' => $asId));
$params = array(
'ErrorURL' => $url,
'ReturnTo' => $url,
@@ -49,9 +49,9 @@ if (!$as->isAuthenticated()) {
}
$attributes = $as->getAttributes();
-$session = SimpleSAML_Session::getSessionFromRequest();
+$session = \SimpleSAML\Session::getSessionFromRequest();
-$t = new SimpleSAML_XHTML_Template($config, 'auth_status.twig', 'attributes');
+$t = new \SimpleSAML\XHTML\Template($config, 'auth_status.twig', 'attributes');
$t->data['header'] = '{status:header_saml20_sp}';
diff --git a/modules/core/www/loginuserpass.php b/modules/core/www/loginuserpass.php
index ff5955e58f5c35de9c071533209e7d73a5f9047e..067c80285bb5b48a6e2f1ed2597eaef40b6cf252 100644
--- a/modules/core/www/loginuserpass.php
+++ b/modules/core/www/loginuserpass.php
@@ -11,35 +11,35 @@
// Retrieve the authentication state
if (!array_key_exists('AuthState', $_REQUEST)) {
- throw new \SimpleSAML\Error\BadRequest('Missing AuthState parameter.');
+ throw new \SimpleSAML\Error\BadRequest('Missing AuthState parameter.');
}
$authStateId = $_REQUEST['AuthState'];
$state = \SimpleSAML\Auth\State::loadState($authStateId, \SimpleSAML\Module\core\Auth\UserPassBase::STAGEID);
$source = \SimpleSAML\Auth\Source::getById($state[\SimpleSAML\Module\core\Auth\UserPassBase::AUTHID]);
-if ($source === NULL) {
- throw new \Exception('Could not find authentication source with id ' . $state[\SimpleSAML\Module\core\Auth\UserPassBase::AUTHID]);
+if ($source === null) {
+ throw new \Exception('Could not find authentication source with id ' . $state[\SimpleSAML\Module\core\Auth\UserPassBase::AUTHID]);
}
if (array_key_exists('username', $_REQUEST)) {
- $username = $_REQUEST['username'];
+ $username = $_REQUEST['username'];
} elseif ($source->getRememberUsernameEnabled() && array_key_exists($source->getAuthId() . '-username', $_COOKIE)) {
- $username = $_COOKIE[$source->getAuthId() . '-username'];
+ $username = $_COOKIE[$source->getAuthId() . '-username'];
} elseif (isset($state['core:username'])) {
- $username = (string)$state['core:username'];
+ $username = (string)$state['core:username'];
} else {
- $username = '';
+ $username = '';
}
if (array_key_exists('password', $_REQUEST)) {
- $password = $_REQUEST['password'];
+ $password = $_REQUEST['password'];
} else {
- $password = '';
+ $password = '';
}
-$errorCode = NULL;
-$errorParams = NULL;
+$errorCode = null;
+$errorParams = null;
$queryParams = array();
if (isset($state['error'])) {
@@ -49,38 +49,38 @@ if (isset($state['error'])) {
}
if (!empty($_REQUEST['username']) || !empty($password)) {
- // Either username or password set - attempt to log in
+ // Either username or password set - attempt to log in
- if (array_key_exists('forcedUsername', $state)) {
- $username = $state['forcedUsername'];
- }
+ if (array_key_exists('forcedUsername', $state)) {
+ $username = $state['forcedUsername'];
+ }
- if ($source->getRememberUsernameEnabled()) {
- $sessionHandler = \SimpleSAML\SessionHandler::getSessionHandler();
- $params = $sessionHandler->getCookieParams();
- $params['expire'] = time();
- $params['expire'] += (isset($_REQUEST['remember_username']) && $_REQUEST['remember_username'] == 'Yes' ? 31536000 : -300);
- \SimpleSAML\Utils\HTTP::setCookie($source->getAuthId() . '-username', $username, $params, FALSE);
- }
+ if ($source->getRememberUsernameEnabled()) {
+ $sessionHandler = \SimpleSAML\SessionHandler::getSessionHandler();
+ $params = $sessionHandler->getCookieParams();
+ $params['expire'] = time();
+ $params['expire'] += (isset($_REQUEST['remember_username']) && $_REQUEST['remember_username'] == 'Yes' ? 31536000 : -300);
+ \SimpleSAML\Utils\HTTP::setCookie($source->getAuthId() . '-username', $username, $params, false);
+ }
if ($source->isRememberMeEnabled()) {
if (array_key_exists('remember_me', $_REQUEST) && $_REQUEST['remember_me'] === 'Yes') {
- $state['RememberMe'] = TRUE;
+ $state['RememberMe'] = true;
$authStateId = \SimpleSAML\Auth\State::saveState($state, \SimpleSAML\Module\core\Auth\UserPassBase::STAGEID);
}
}
- try {
- \SimpleSAML\Module\core\Auth\UserPassBase::handleLogin($authStateId, $username, $password);
- } catch (\SimpleSAML\Error\Error $e) {
- /* Login failed. Extract error code and parameters, to display the error. */
- $errorCode = $e->getErrorCode();
- $errorParams = $e->getParameters();
- $state['error']= array(
- 'code' => $errorCode,
+ try {
+ \SimpleSAML\Module\core\Auth\UserPassBase::handleLogin($authStateId, $username, $password);
+ } catch (\SimpleSAML\Error\Error $e) {
+ /* Login failed. Extract error code and parameters, to display the error. */
+ $errorCode = $e->getErrorCode();
+ $errorParams = $e->getParameters();
+ $state['error']= array(
+ 'code' => $errorCode,
'params' => $errorParams
);
- $authStateId = SimpleSAML_Auth_State::saveState($state, sspmod_core_Auth_UserPassBase::STAGEID);
+ $authStateId = \SimpleSAML\Auth\State::saveState($state, \SimpleSAML\Module\core\Auth\UserPassBase::STAGEID);
$queryParams = array('AuthState' => $authStateId);
}
if (isset($state['error'])){
@@ -92,20 +92,22 @@ $globalConfig = \SimpleSAML\Configuration::getInstance();
$t = new \SimpleSAML\XHTML\Template($globalConfig, 'core:loginuserpass.php');
$t->data['stateparams'] = array('AuthState' => $authStateId);
if (array_key_exists('forcedUsername', $state)) {
- $t->data['username'] = $state['forcedUsername'];
- $t->data['forceUsername'] = TRUE;
- $t->data['rememberUsernameEnabled'] = FALSE;
- $t->data['rememberUsernameChecked'] = FALSE;
+ $t->data['username'] = $state['forcedUsername'];
+ $t->data['forceUsername'] = true;
+ $t->data['rememberUsernameEnabled'] = false;
+ $t->data['rememberUsernameChecked'] = false;
$t->data['rememberMeEnabled'] = $source->isRememberMeEnabled();
$t->data['rememberMeChecked'] = $source->isRememberMeChecked();
} else {
- $t->data['username'] = $username;
- $t->data['forceUsername'] = FALSE;
- $t->data['rememberUsernameEnabled'] = $source->getRememberUsernameEnabled();
- $t->data['rememberUsernameChecked'] = $source->getRememberUsernameChecked();
+ $t->data['username'] = $username;
+ $t->data['forceUsername'] = false;
+ $t->data['rememberUsernameEnabled'] = $source->getRememberUsernameEnabled();
+ $t->data['rememberUsernameChecked'] = $source->getRememberUsernameChecked();
$t->data['rememberMeEnabled'] = $source->isRememberMeEnabled();
$t->data['rememberMeChecked'] = $source->isRememberMeChecked();
- if (isset($_COOKIE[$source->getAuthId() . '-username'])) $t->data['rememberUsernameChecked'] = TRUE;
+ if (isset($_COOKIE[$source->getAuthId() . '-username'])) {
+ $t->data['rememberUsernameChecked'] = true;
+ }
}
$t->data['links'] = $source->getLoginLinks();
$t->data['errorcode'] = $errorCode;
@@ -116,9 +118,9 @@ if (!empty($queryParams)) {
}
if (isset($state['SPMetadata'])) {
- $t->data['SPMetadata'] = $state['SPMetadata'];
+ $t->data['SPMetadata'] = $state['SPMetadata'];
} else {
- $t->data['SPMetadata'] = NULL;
+ $t->data['SPMetadata'] = null;
}
$t->show();
diff --git a/modules/core/www/loginuserpassorg.php b/modules/core/www/loginuserpassorg.php
index 5051dbb29c1032aa4961ad6c176aa856970db4c4..371290fd06eba34dea9ed4d205cc01b7350bf582 100644
--- a/modules/core/www/loginuserpassorg.php
+++ b/modules/core/www/loginuserpassorg.php
@@ -11,46 +11,46 @@
// Retrieve the authentication state
if (!array_key_exists('AuthState', $_REQUEST)) {
- throw new \SimpleSAML\Error\BadRequest('Missing AuthState parameter.');
+ throw new \SimpleSAML\Error\BadRequest('Missing AuthState parameter.');
}
$authStateId = $_REQUEST['AuthState'];
$state = \SimpleSAML\Auth\State::loadState($authStateId, \SimpleSAML\Module\core\Auth\UserPassOrgBase::STAGEID);
$source = \SimpleSAML\Auth\Source::getById($state[\SimpleSAML\Module\core\Auth\UserPassOrgBase::AUTHID]);
-if ($source === NULL) {
- throw new \Exception('Could not find authentication source with id ' . $state[\SimpleSAML\Module\core\Auth\UserPassOrgBase::AUTHID]);
+if ($source === null) {
+ throw new \Exception('Could not find authentication source with id ' . $state[\SimpleSAML\Module\core\Auth\UserPassOrgBase::AUTHID]);
}
$organizations = \SimpleSAML\Module\core\Auth\UserPassOrgBase::listOrganizations($authStateId);
if (array_key_exists('username', $_REQUEST)) {
- $username = $_REQUEST['username'];
+ $username = $_REQUEST['username'];
} elseif ($source->getRememberUsernameEnabled() && array_key_exists($source->getAuthId() . '-username', $_COOKIE)) {
- $username = $_COOKIE[$source->getAuthId() . '-username'];
+ $username = $_COOKIE[$source->getAuthId() . '-username'];
} elseif (isset($state['core:username'])) {
- $username = (string)$state['core:username'];
+ $username = (string)$state['core:username'];
} else {
- $username = '';
+ $username = '';
}
if (array_key_exists('password', $_REQUEST)) {
- $password = $_REQUEST['password'];
+ $password = $_REQUEST['password'];
} else {
- $password = '';
+ $password = '';
}
if (array_key_exists('organization', $_REQUEST)) {
- $organization = $_REQUEST['organization'];
+ $organization = $_REQUEST['organization'];
} elseif ($source->getRememberOrganizationEnabled() && array_key_exists($source->getAuthId() . '-organization', $_COOKIE)) {
- $organization = $_COOKIE[$source->getAuthId() . '-organization'];
+ $organization = $_COOKIE[$source->getAuthId() . '-organization'];
} elseif (isset($state['core:organization'])) {
- $organization = (string)$state['core:organization'];
+ $organization = (string)$state['core:organization'];
} else {
- $organization = '';
+ $organization = '';
}
-$errorCode = NULL;
-$errorParams = NULL;
+$errorCode = null;
+$errorParams = null;
$queryParams = array();
if (isset($state['error'])) {
@@ -59,54 +59,54 @@ if (isset($state['error'])) {
$queryParams = array('AuthState' => $authStateId);
}
-if ($organizations === NULL || !empty($organization)) {
- if (!empty($username) || !empty($password)) {
+if ($organizations === null || !empty($organization)) {
+ if (!empty($username) || !empty($password)) {
- if ($source->getRememberUsernameEnabled()) {
- $sessionHandler = \SimpleSAML\SessionHandler::getSessionHandler();
- $params = $sessionHandler->getCookieParams();
- $params['expire'] = time();
- $params['expire'] += (isset($_REQUEST['remember_username']) && $_REQUEST['remember_username'] == 'Yes' ? 31536000 : -300);
- \SimpleSAML\Utils\HTTP::setCookie($source->getAuthId() . '-username', $username, $params, false);
- }
+ if ($source->getRememberUsernameEnabled()) {
+ $sessionHandler = \SimpleSAML\SessionHandler::getSessionHandler();
+ $params = $sessionHandler->getCookieParams();
+ $params['expire'] = time();
+ $params['expire'] += (isset($_REQUEST['remember_username']) && $_REQUEST['remember_username'] == 'Yes' ? 31536000 : -300);
+ \SimpleSAML\Utils\HTTP::setCookie($source->getAuthId() . '-username', $username, $params, false);
+ }
if ($source->getRememberOrganizationEnabled()) {
- $sessionHandler = SimpleSAML_SessionHandler::getSessionHandler();
+ $sessionHandler = \SimpleSAML\SessionHandler::getSessionHandler();
$params = $sessionHandler->getCookieParams();
$params['expire'] = time();
$params['expire'] += (isset($_REQUEST['remember_organization']) && $_REQUEST['remember_organization'] == 'Yes' ? 31536000 : -300);
setcookie($source->getAuthId() . '-organization', $organization, $params['expire'], $params['path'], $params['domain'], $params['secure'], $params['httponly']);
}
- try {
- \SimpleSAML\Module\core\Auth\UserPassOrgBase::handleLogin($authStateId, $username, $password, $organization);
- } catch (\SimpleSAML\Error\Error $e) {
- // Login failed. Extract error code and parameters, to display the error
- $errorCode = $e->getErrorCode();
- $errorParams = $e->getParameters();
+ try {
+ \SimpleSAML\Module\core\Auth\UserPassOrgBase::handleLogin($authStateId, $username, $password, $organization);
+ } catch (\SimpleSAML\Error\Error $e) {
+ // Login failed. Extract error code and parameters, to display the error
+ $errorCode = $e->getErrorCode();
+ $errorParams = $e->getParameters();
$state['error']= array(
'code' => $errorCode,
'params' => $errorParams
);
- $authStateId = SimpleSAML_Auth_State::saveState($state, sspmod_core_Auth_UserPassOrgBase::STAGEID);
+ $authStateId = \SimpleSAML\Auth\State::saveState($state, \SimpleSAML\Module\core\Auth\UserPassOrgBase::STAGEID);
$queryParams = array('AuthState' => $authStateId);
- }
+ }
if (isset($state['error'])){
unset($state['error']);
}
- }
+ }
}
$globalConfig = \SimpleSAML\Configuration::getInstance();
$t = new \SimpleSAML\XHTML\Template($globalConfig, 'core:loginuserpass.php');
$t->data['stateparams'] = array('AuthState' => $authStateId);
$t->data['username'] = $username;
-$t->data['forceUsername'] = FALSE;
+$t->data['forceUsername'] = false;
$t->data['rememberUsernameEnabled'] = $source->getRememberUsernameEnabled();
$t->data['rememberUsernameChecked'] = $source->getRememberUsernameChecked();
$t->data['rememberMeEnabled'] = false;
$t->data['rememberMeChecked'] = false;
-if (isset($_COOKIE[$source->getAuthId() . '-username'])) $t->data['rememberUsernameChecked'] = TRUE;
+if (isset($_COOKIE[$source->getAuthId() . '-username'])) $t->data['rememberUsernameChecked'] = true;
$t->data['rememberOrganizationEnabled'] = $source->getRememberOrganizationEnabled();
$t->data['rememberOrganizationChecked'] = $source->getRememberOrganizationChecked();
if (isset($_COOKIE[$source->getAuthId() . '-organization'])) $t->data['rememberOrganizationChecked'] = true;
@@ -118,15 +118,15 @@ if (!empty($queryParams)) {
$t->data['queryParams'] = $queryParams;
}
-if ($organizations !== NULL) {
- $t->data['selectedOrg'] = $organization;
- $t->data['organizations'] = $organizations;
+if ($organizations !== null) {
+ $t->data['selectedOrg'] = $organization;
+ $t->data['organizations'] = $organizations;
}
if (isset($state['SPMetadata'])) {
- $t->data['SPMetadata'] = $state['SPMetadata'];
+ $t->data['SPMetadata'] = $state['SPMetadata'];
} else {
- $t->data['SPMetadata'] = NULL;
+ $t->data['SPMetadata'] = null;
}
$t->show();
diff --git a/modules/core/www/no_cookie.php b/modules/core/www/no_cookie.php
index 24d6b3e8868e7d9ec3d3d3515699dde3eea384ae..b6b3533f5ab4961a8b01493e7928e069b452eac5 100644
--- a/modules/core/www/no_cookie.php
+++ b/modules/core/www/no_cookie.php
@@ -10,8 +10,8 @@ if (isset($_REQUEST['retryURL'])) {
$globalConfig = \SimpleSAML\Configuration::getInstance();
$t = new \SimpleSAML\XHTML\Template($globalConfig, 'core:no_cookie.tpl.php');
-$t->data['header'] = htmlspecialchars($t->t('{core:no_cookie:header}'));
-$t->data['description'] = htmlspecialchars($t->t('{core:no_cookie:description}'));
-$t->data['retry'] = htmlspecialchars($t->t('{core:no_cookie:retry}'));
+$t->data['header'] = htmlspecialchars(\SimpleSAML\Locale\Translate::t('{core:no_cookie:header}'));
+$t->data['description'] = htmlspecialchars(\SimpleSAML\Locale\Translate::t('{core:no_cookie:description}'));
+$t->data['retry'] = htmlspecialchars(\SimpleSAML\Locale\Translate::t('{core:no_cookie:retry}'));
$t->data['retryURL'] = $retryURL;
$t->show();
diff --git a/modules/discopower/lib/PowerIdPDisco.php b/modules/discopower/lib/PowerIdPDisco.php
index 487b3f14b56a265ce6dbc4c59818bfa16029374b..41209b55bf870827ebcd9b76a499f9e650ad2b8b 100644
--- a/modules/discopower/lib/PowerIdPDisco.php
+++ b/modules/discopower/lib/PowerIdPDisco.php
@@ -256,19 +256,19 @@ class PowerIdPDisco extends \SimpleSAML\XHTML\IdPDisco
$t = new \SimpleSAML\XHTML\Template($this->config, 'discopower:disco.tpl.php', 'disco');
$discoPowerTabs = array(
- 'denmark' => $t->noop('{discopower:tabs:denmark}'),
- 'edugain' => $t->noop('{discopower:tabs:edugain}'),
- 'finland' => $t->noop('{discopower:tabs:finland}'),
- 'greece' => $t->noop('{discopower:tabs:greece}'),
- 'southafrica' => $t->noop('{discopower:tabs:southafrica}'),
- 'iceland' => $t->noop('{discopower:tabs:iceland}'),
- 'incommon' => $t->noop('{discopower:tabs:incommon}'),
- 'kalmar' => $t->noop('{discopower:tabs:kalmar}'),
- 'misc' => $t->noop('{discopower:tabs:misc}'),
- 'norway' => $t->noop('{discopower:tabs:norway}'),
- 'sweden' => $t->noop('{discopower:tabs:sweden}'),
- 'switzerland' => $t->noop('{discopower:tabs:switzerland}'),
- 'ukacessfederation' => $t->noop('{discopower:tabs:ukacessfederation}'),
+ 'denmark' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:denmark}'),
+ 'edugain' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:edugain}'),
+ 'finland' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:finland}'),
+ 'greece' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:greece}'),
+ 'southafrica' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:southafrica}'),
+ 'iceland' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:iceland}'),
+ 'incommon' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:incommon}'),
+ 'kalmar' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:kalmar}'),
+ 'misc' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:misc}'),
+ 'norway' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:norway}'),
+ 'sweden' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:sweden}'),
+ 'switzerland' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:switzerland}'),
+ 'ukacessfederation' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:ukacessfederation}'),
);
$t->data['return'] = $this->returnURL;
@@ -335,7 +335,7 @@ class PowerIdPDisco extends \SimpleSAML\XHTML\IdPDisco
}
}
- if ((translation === false) && array_key_exists('name', $entity)) {
+ if (($translation === false) && array_key_exists('name', $entity)) {
if (is_array($entity['name'])) {
$translation = $t->getTranslator()->getPreferredTranslation($entity['name']);
} else {
diff --git a/modules/multiauth/www/selectsource.php b/modules/multiauth/www/selectsource.php
index 93faebdfaf4e0277f079e92b290de08a12ed3358..79ceef925a954e7d630872bc8d09aa026102f68d 100644
--- a/modules/multiauth/www/selectsource.php
+++ b/modules/multiauth/www/selectsource.php
@@ -51,7 +51,7 @@ $globalConfig = \SimpleSAML\Configuration::getInstance();
$t = new \SimpleSAML\XHTML\Template($globalConfig, 'multiauth:selectsource.php');
$defaultLanguage = $globalConfig->getString('language.default', 'en');
-$language = $t->getLanguage();
+$language = \SimpleSAML\Locale\Language::getLanguage();
$sources = $state[\SimpleSAML\Module\multiauth\Auth\Source\MultiAuth::SOURCESID];
foreach ($sources as $key => $source){
diff --git a/modules/oauth/lib/Registry.php b/modules/oauth/lib/Registry.php
index f8e5f0b2cd3cde0c27effd91685d55b8a0db7bd8..71e7249596e6af219c364c72e456da75e9f2171d 100644
--- a/modules/oauth/lib/Registry.php
+++ b/modules/oauth/lib/Registry.php
@@ -40,9 +40,9 @@ class Registry
protected function requireStandardField($request, $key)
{
if (!array_key_exists('field_' . $key, $request))
- throw new Exception('Required field [' . $key . '] was missing.');
+ throw new \Exception('Required field [' . $key . '] was missing.');
if (empty($request['field_' . $key]))
- throw new Exception('Required field [' . $key . '] was empty.');
+ throw new \Exception('Required field [' . $key . '] was empty.');
}
public function checkForm($request)
diff --git a/templates/includes/header.php b/templates/includes/header.php
index 1144bcd6e1b38050e706c853de3f457c143f0142..b58d4a1920a21f75dd520d9ddb980eee772dbbb5 100644
--- a/templates/includes/header.php
+++ b/templates/includes/header.php
@@ -82,7 +82,7 @@ if (!empty($jquery)) {
}
}
-if (isset($this->data['clipboard.js'])) { =======
+if (isset($this->data['clipboard.js'])) {
echo '<script type="text/javascript" src="/' . $this->data['baseurlpath'] .
'resources/clipboard.min.js"></script>' . "\n";
}
diff --git a/www/index.php b/www/index.php
index 632aee60a53952d065f649828816e57bacaf7a2d..b5b456c7a8c3828829d28652896aae3aac3a1595 100644
--- a/www/index.php
+++ b/www/index.php
@@ -2,7 +2,7 @@
require_once('_include.php');
-$config = SimpleSAML_Configuration::getInstance();
+$config = \SimpleSAML\Configuration::getInstance();
if ($config->getBoolean('usenewui', false)) {
\SimpleSAML\Utils\HTTP::redirectTrustedURL(SimpleSAML\Module::getModuleURL('core/login.php'));