From 5015959fda5aa35813acecd50671054e835b1ab9 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 6 Aug 2018 11:43:06 +0200
Subject: [PATCH] Fix deprecation notices
---
modules/adfs/www/idp/metadata.php | 2 +-
modules/core/www/frontpage_config.php | 9 +-
modules/core/www/frontpage_federation.php | 105 +++++++++++-----------
modules/saml/www/sp/metadata.php | 2 +-
www/saml2/idp/metadata.php | 2 +-
www/shib13/idp/metadata.php | 2 +-
6 files changed, 63 insertions(+), 59 deletions(-)
diff --git a/modules/adfs/www/idp/metadata.php b/modules/adfs/www/idp/metadata.php
index 0bfd0a932..652da7e2f 100644
--- a/modules/adfs/www/idp/metadata.php
+++ b/modules/adfs/www/idp/metadata.php
@@ -155,7 +155,7 @@ try {
}
$t->data['certdata'] = $certdata;
$t->data['header'] = 'adfs-idp'; // TODO: Replace with headerString in 2.0
- $t->data['headerString'] = $t->noop('metadata_adfs-idp');
+ $t->data['headerString'] = \SimpleSAML\Locale\Translate::noop('metadata_adfs-idp');
$t->data['metaurl'] = \SimpleSAML\Utils\HTTP::getSelfURLNoQuery();
$t->data['metadata'] = htmlspecialchars($metaxml);
$t->data['metadataflat'] = htmlspecialchars($metaflat);
diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
index 32ac5f613..be6ed2cd1 100644
--- a/modules/core/www/frontpage_config.php
+++ b/modules/core/www/frontpage_config.php
@@ -159,8 +159,9 @@ $funcmatrix[] = array(
);
$t = new \SimpleSAML\XHTML\Template($config, 'core:frontpage_config.tpl.php');
+$translator = $t->getTranslator();
$t->data['pageid'] = 'frontpage_config';
-$t->data['header'] = $t->getTranslator()->t('{core:frontpage:page_title}');
+$t->data['header'] = $translator->t('{core:frontpage:page_title}');
$t->data['isadmin'] = $isadmin;
$t->data['loginurl'] = $loginurl;
$t->data['warnings'] = $warnings;
@@ -176,9 +177,9 @@ $t->data['links_federation'] = $links_federation;
$t->data['enablematrix'] = $enablematrix;
$t->data['funcmatrix'] = $funcmatrix;
$t->data['requiredmap'] = array(
- 'recommended' => $t->noop('{core:frontpage:recommended}'),
- 'required' => $t->noop('{core:frontpage:required}'),
- 'optional' => $t->noop('{core:frontpage:optional}'),
+ 'recommended' => $translator->noop('{core:frontpage:recommended}'),
+ 'required' => $translator->noop('{core:frontpage:required}'),
+ 'optional' => $translator->noop('{core:frontpage:optional}'),
);
$t->data['version'] = $config->getVersion();
$t->data['directory'] = dirname(dirname(dirname(dirname(__FILE__))));
diff --git a/modules/core/www/frontpage_federation.php b/modules/core/www/frontpage_federation.php
index 658147dca..1cf9dd566 100644
--- a/modules/core/www/frontpage_federation.php
+++ b/modules/core/www/frontpage_federation.php
@@ -17,25 +17,25 @@ $links_config = array();
$links_auth = array();
$links_federation = array();
-if($config->getBoolean('idpdisco.enableremember', FALSE)) {
- $links_federation[] = array(
- 'href' => 'cleardiscochoices.php',
- 'text' => '{core:frontpage:link_cleardiscochoices}',
- );
+if ($config->getBoolean('idpdisco.enableremember', false)) {
+ $links_federation[] = array(
+ 'href' => 'cleardiscochoices.php',
+ 'text' => '{core:frontpage:link_cleardiscochoices}',
+ );
}
$links_federation[] = array(
- 'href' => \SimpleSAML\Utils\HTTP::getBaseURL() . 'admin/metadata-converter.php',
- 'text' => '{core:frontpage:link_xmlconvert}',
+ 'href' => \SimpleSAML\Utils\HTTP::getBaseURL() . 'admin/metadata-converter.php',
+ 'text' => '{core:frontpage:link_xmlconvert}',
);
$allLinks = array(
- 'links' => &$links,
- 'welcome' => &$links_welcome,
- 'config' => &$links_config,
- 'auth' => &$links_auth,
- 'federation' => &$links_federation,
+ 'links' => &$links,
+ 'welcome' => &$links_welcome,
+ 'config' => &$links_config,
+ 'auth' => &$links_auth,
+ 'federation' => &$links_federation,
);
\SimpleSAML\Module::callHooks('frontpage', $allLinks);
@@ -50,37 +50,39 @@ $metaentries = array('hosted' => $metadataHosted, 'remote' => array() );
if ($isadmin) {
- $metaentries['remote']['saml20-idp-remote'] = $metadata->getList('saml20-idp-remote');
- $metaentries['remote']['shib13-idp-remote'] = $metadata->getList('shib13-idp-remote');
+ $metaentries['remote']['saml20-idp-remote'] = $metadata->getList('saml20-idp-remote');
+ $metaentries['remote']['shib13-idp-remote'] = $metadata->getList('shib13-idp-remote');
}
-if ($config->getBoolean('enable.saml20-idp', FALSE) === true) {
- try {
- $metaentries['hosted']['saml20-idp'] = $metadata->getMetaDataCurrent('saml20-idp-hosted');
- $metaentries['hosted']['saml20-idp']['metadata-url'] = $config->getBasePath() .
- 'saml2/idp/metadata.php?output=xhtml';
- if ($isadmin)
- $metaentries['remote']['saml20-sp-remote'] = $metadata->getList('saml20-sp-remote');
- } catch(Exception $e) {
- \SimpleSAML\Logger::error('Federation: Error loading saml20-idp: ' . $e->getMessage());
+if ($config->getBoolean('enable.saml20-idp', false) === true) {
+ try {
+ $metaentries['hosted']['saml20-idp'] = $metadata->getMetaDataCurrent('saml20-idp-hosted');
+ $metaentries['hosted']['saml20-idp']['metadata-url'] =
+ $config->getBasePath().'saml2/idp/metadata.php?output=xhtml';
+ if ($isadmin)
+ $metaentries['remote']['saml20-sp-remote'] = $metadata->getList('saml20-sp-remote');
+ } catch(Exception $e) {
+ \SimpleSAML\Logger::error('Federation: Error loading saml20-idp: '.$e->getMessage());
}
}
-if ($config->getBoolean('enable.shib13-idp', FALSE) === true) {
- try {
- $metaentries['hosted']['shib13-idp'] = $metadata->getMetaDataCurrent('shib13-idp-hosted');
- $metaentries['hosted']['shib13-idp']['metadata-url'] = $config->getBasePath() .
- 'shib13/idp/metadata.php?output=xhtml';
- if ($isadmin)
- $metaentries['remote']['shib13-sp-remote'] = $metadata->getList('shib13-sp-remote');
- } catch(Exception $e) {
+if ($config->getBoolean('enable.shib13-idp', false) === true) {
+ try {
+ $metaentries['hosted']['shib13-idp'] = $metadata->getMetaDataCurrent('shib13-idp-hosted');
+ $metaentries['hosted']['shib13-idp']['metadata-url'] =
+ $config->getBasePath().'shib13/idp/metadata.php?output=xhtml';
+ if ($isadmin)
+ $metaentries['remote']['shib13-sp-remote'] = $metadata->getList('shib13-sp-remote');
+ } catch(Exception $e) {
\SimpleSAML\Logger::error('Federation: Error loading shib13-idp: ' . $e->getMessage());
}
}
-if ($config->getBoolean('enable.adfs-idp', FALSE) === true) {
+if ($config->getBoolean('enable.adfs-idp', false) === true) {
try {
$metaentries['hosted']['adfs-idp'] = $metadata->getMetaDataCurrent('adfs-idp-hosted');
- $metaentries['hosted']['adfs-idp']['metadata-url'] = \SimpleSAML\Module::getModuleURL('adfs/idp/metadata.php',
- array('output' => 'xhtml'));
+ $metaentries['hosted']['adfs-idp']['metadata-url'] = \SimpleSAML\Module::getModuleURL(
+ 'adfs/idp/metadata.php',
+ array('output' => 'xhtml')
+ );
if ($isadmin)
$metaentries['remote']['adfs-sp-remote'] = $metadata->getList('adfs-sp-remote');
} catch(Exception $e) {
@@ -89,14 +91,15 @@ if ($config->getBoolean('enable.adfs-idp', FALSE) === true) {
}
foreach ($metaentries['remote'] as $key => $value) {
- if (empty($value)) {
- unset($metaentries['remote'][$key]);
- }
+ if (empty($value)) {
+ unset($metaentries['remote'][$key]);
+ }
}
$t = new \SimpleSAML\XHTML\Template($config, 'core:frontpage_federation.tpl.php');
+$translator = $t->getTranslator();
-$language = $t->getTranslator()->getLanguage()->getLanguage();
+$language = $translator->getLanguage()->getLanguage();
$defaultLanguage = $config->getString('language.default', 'en');
$translators = array(
@@ -132,18 +135,18 @@ foreach ($metaentries['remote'] as $key => $set) {
# look up translated string
$mtype = array(
- 'saml20-sp-remote' => $t->noop('{admin:metadata_saml20-sp}'),
- 'saml20-sp-hosted' => $t->noop('{admin:metadata_saml20-sp}'),
- 'saml20-idp-remote' => $t->noop('{admin:metadata_saml20-idp}'),
- 'saml20-idp-hosted' => $t->noop('{admin:metadata_saml20-idp}'),
- 'shib13-sp-remote' => $t->noop('{admin:metadata_shib13-sp}'),
- 'shib13-sp-hosted' => $t->noop('{admin:metadata_shib13-sp}'),
- 'shib13-idp-remote' => $t->noop('{admin:metadata_shib13-idp}'),
- 'shib13-idp-hosted' => $t->noop('{admin:metadata_shib13-idp}'),
- 'adfs-sp-remote' => $t->noop('{admin:metadata_adfs-sp}'),
- 'adfs-sp-hosted' => $t->noop('{admin:metadata_adfs-sp}'),
- 'adfs-idp-remote' => $t->noop('{admin:metadata_adfs-idp}'),
- 'adfs-idp-hosted' => $t->noop('{admin:metadata_adfs-idp}'),
+ 'saml20-sp-remote' => $translator->noop('{admin:metadata_saml20-sp}'),
+ 'saml20-sp-hosted' => $translator->noop('{admin:metadata_saml20-sp}'),
+ 'saml20-idp-remote' => $translator->noop('{admin:metadata_saml20-idp}'),
+ 'saml20-idp-hosted' => $translator->noop('{admin:metadata_saml20-idp}'),
+ 'shib13-sp-remote' => $translator->noop('{admin:metadata_shib13-sp}'),
+ 'shib13-sp-hosted' => $translator->noop('{admin:metadata_shib13-sp}'),
+ 'shib13-idp-remote' => $translator->noop('{admin:metadata_shib13-idp}'),
+ 'shib13-idp-hosted' => $translator->noop('{admin:metadata_shib13-idp}'),
+ 'adfs-sp-remote' => $translator->noop('{admin:metadata_adfs-sp}'),
+ 'adfs-sp-hosted' => $translator->noop('{admin:metadata_adfs-sp}'),
+ 'adfs-idp-remote' => $translator->noop('{admin:metadata_adfs-idp}'),
+ 'adfs-idp-hosted' => $translator->noop('{admin:metadata_adfs-idp}'),
);
$t->data['pageid'] = 'frontpage_federation';
@@ -156,7 +159,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->getTranslator()->t('{core:frontpage:page_title}');
+$t->data['header'] = $translator->t('{core:frontpage:page_title}');
$t->data['metadata_url'] = \SimpleSAML\Module::getModuleURL('core/show_metadata.php');
$t->data['metaentries'] = $metaentries;
diff --git a/modules/saml/www/sp/metadata.php b/modules/saml/www/sp/metadata.php
index 395bc3552..7ed92b3c3 100644
--- a/modules/saml/www/sp/metadata.php
+++ b/modules/saml/www/sp/metadata.php
@@ -265,7 +265,7 @@ if (array_key_exists('output', $_REQUEST) && $_REQUEST['output'] == 'xhtml') {
$t->data['clipboard.js'] = true;
$t->data['header'] = 'saml20-sp'; // TODO: Replace with headerString in 2.0
- $t->data['headerString'] = $t->noop('metadata_saml20-sp');
+ $t->data['headerString'] = \SimpleSAML\Locale\Translate::noop('metadata_saml20-sp');
$t->data['metadata'] = htmlspecialchars($xml);
$t->data['metadataflat'] = '$metadata['.var_export($entityId, true).'] = '.var_export($metaArray20, true).';';
$t->data['metaurl'] = $source->getMetadataURL();
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index 097b45ae0..77f9e20f0 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -226,7 +226,7 @@ try {
}
$t->data['certdata'] = $certdata;
$t->data['header'] = 'saml20-idp'; // TODO: Replace with headerString in 2.0
- $t->data['headerString'] = $t->noop('metadata_saml20-idp');
+ $t->data['headerString'] = \SimpleSAML\Locale\Translate::noop('metadata_saml20-idp');
$t->data['metaurl'] = HTTP::getSelfURLNoQuery();
$t->data['metadata'] = htmlspecialchars($metaxml);
$t->data['metadataflat'] = htmlspecialchars($metaflat);
diff --git a/www/shib13/idp/metadata.php b/www/shib13/idp/metadata.php
index 060ba6bcd..628a7f1d6 100644
--- a/www/shib13/idp/metadata.php
+++ b/www/shib13/idp/metadata.php
@@ -89,7 +89,7 @@ try {
$t->data['clipboard.js'] = true;
$t->data['header'] = 'shib13-idp'; // TODO: Replace with headerString in 2.0
- $t->data['headerString'] = $t->noop('metadata_shib13-idp');
+ $t->data['headerString'] = \SimpleSAML\Locale\Translate::noop('metadata_shib13-idp');
$t->data['metaurl'] = \SimpleSAML\Utils\HTTP::addURLParameters(
\SimpleSAML\Utils\HTTP::getSelfURLNoQuery(),
array('output' => 'xml')
--
GitLab