From 05c2cf704a948a42acbf3a75004e085f31d7e0db Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Wed, 13 Jan 2010 12:16:02 +0000
Subject: [PATCH] Remove assignements of "icon" template parameter.
We don't display the icon anymore, so don't set it.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2112 44740490-163a-0410-bde0-09ae8108e29a
---
modules/InfoCard/templates/temp-getcardform.php | 1 -
modules/InfoCard/templates/temp-login.php | 1 -
modules/authYubiKey/templates/yubikeylogin.php | 1 -
modules/consent/templates/noconsent.php | 1 -
modules/core/templates/loginuserpass.php | 1 -
modules/core/www/authenticate.php | 1 -
modules/core/www/frontpage_auth.php | 1 -
modules/core/www/frontpage_config.php | 1 -
modules/core/www/frontpage_federation.php | 1 -
modules/core/www/frontpage_welcome.php | 1 -
modules/multiauth/templates/selectsource.php | 1 -
modules/oauth/www/authorize.php | 1 -
modules/openid/templates/consumer.php | 1 -
modules/openid/www/openidtest.php | 1 -
templates/admin-metadatalist.php | 1 -
templates/error.php | 1 -
templates/errorreport.php | 1 -
templates/httpredirect-debug.php | 1 -
templates/login-ldapmulti.php | 1 -
templates/login.php | 1 -
templates/post-debug.php | 1 -
www/example-simple/saml2-example.php | 1 -
www/example-simple/shib13-example.php | 1 -
www/example-simple/wsfed-example.php | 1 -
24 files changed, 24 deletions(-)
diff --git a/modules/InfoCard/templates/temp-getcardform.php b/modules/InfoCard/templates/temp-getcardform.php
index bf8f728ec..8525c3ea0 100644
--- a/modules/InfoCard/templates/temp-getcardform.php
+++ b/modules/InfoCard/templates/temp-getcardform.php
@@ -6,7 +6,6 @@
* DESCRIPTION: InfoCard module template.
*/
$this->includeAtTemplateBase('includes/header.php');
- if (!array_key_exists('icon', $this->data)) $this->data['icon'] = 'lock.png';
if (isset($this->data['error'])) { ?>
<div style="border-left: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8; background: #f5f5f5">
<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/bomb.png" style="float: left; margin: 15px " />
diff --git a/modules/InfoCard/templates/temp-login.php b/modules/InfoCard/templates/temp-login.php
index 70cd74f74..25f0d93b5 100644
--- a/modules/InfoCard/templates/temp-login.php
+++ b/modules/InfoCard/templates/temp-login.php
@@ -6,7 +6,6 @@
* DESCRIPTION: InfoCard module template.
*/
$this->includeAtTemplateBase('includes/header.php');
- if (!array_key_exists('icon', $this->data)) $this->data['icon'] = 'lock.png';
if (isset($this->data['error'])) { ?>
<div style="border-left: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8; background: #f5f5f5">
<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/bomb.png" style="float: left; margin: 15px " />
diff --git a/modules/authYubiKey/templates/yubikeylogin.php b/modules/authYubiKey/templates/yubikeylogin.php
index c9e8d7a07..029f5aac6 100644
--- a/modules/authYubiKey/templates/yubikeylogin.php
+++ b/modules/authYubiKey/templates/yubikeylogin.php
@@ -1,5 +1,4 @@
<?php
-$this->data['icon'] = 'lock.png';
$this->data['header'] = $this->t('{authYubiKey:yubikey:header}');
$this->data['autofocus'] = 'otp';
diff --git a/modules/consent/templates/noconsent.php b/modules/consent/templates/noconsent.php
index d115b0db2..f96b44542 100644
--- a/modules/consent/templates/noconsent.php
+++ b/modules/consent/templates/noconsent.php
@@ -1,6 +1,5 @@
<?php
$this->data['header'] = $this->t('{consent:consent:noconsent_title}');;
- $this->data['icon'] = 'bomb_l.png';
$this->includeAtTemplateBase('includes/header.php');
?>
diff --git a/modules/core/templates/loginuserpass.php b/modules/core/templates/loginuserpass.php
index 771c4134f..97fef2fd7 100644
--- a/modules/core/templates/loginuserpass.php
+++ b/modules/core/templates/loginuserpass.php
@@ -1,5 +1,4 @@
<?php
-$this->data['icon'] = 'lock.png';
$this->data['header'] = $this->t('{login:user_pass_header}');
if (strlen($this->data['username']) > 0) {
diff --git a/modules/core/www/authenticate.php b/modules/core/www/authenticate.php
index 2cc6b84f6..bbf00eedf 100644
--- a/modules/core/www/authenticate.php
+++ b/modules/core/www/authenticate.php
@@ -52,6 +52,5 @@ $t->data['remaining'] = $session->remainingTime();
$t->data['sessionsize'] = $session->getSize();
$t->data['attributes'] = $attributes;
$t->data['logouturl'] = SimpleSAML_Utilities::selfURLNoQuery() . '?logout';
-$t->data['icon'] = 'bino.png';
$t->show();
diff --git a/modules/core/www/frontpage_auth.php b/modules/core/www/frontpage_auth.php
index fa1bc296b..506bf2e9a 100644
--- a/modules/core/www/frontpage_auth.php
+++ b/modules/core/www/frontpage_auth.php
@@ -60,7 +60,6 @@ $t->data['pageid'] = 'frontpage_auth';
$t->data['isadmin'] = $isadmin;
$t->data['loginurl'] = $loginurl;
$t->data['header'] = 'simpleSAMLphp installation page';
-$t->data['icon'] = 'compass_l.png';
$t->data['links'] = $links;
diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
index cdcec795b..856144e75 100644
--- a/modules/core/www/frontpage_config.php
+++ b/modules/core/www/frontpage_config.php
@@ -134,7 +134,6 @@ $t->data['pageid'] = 'frontpage_config';
$t->data['isadmin'] = $isadmin;
$t->data['loginurl'] = $loginurl;
$t->data['header'] = 'simpleSAMLphp installation page';
-$t->data['icon'] = 'compass_l.png';
$t->data['warnings'] = $warnings;
diff --git a/modules/core/www/frontpage_federation.php b/modules/core/www/frontpage_federation.php
index 893acbd57..51d779cfa 100644
--- a/modules/core/www/frontpage_federation.php
+++ b/modules/core/www/frontpage_federation.php
@@ -140,7 +140,6 @@ $t->data['pageid'] = 'frontpage_federation';
$t->data['isadmin'] = $isadmin;
$t->data['loginurl'] = $loginurl;
$t->data['header'] = 'simpleSAMLphp installation page';
-$t->data['icon'] = 'compass_l.png';
$t->data['links'] = $links;
diff --git a/modules/core/www/frontpage_welcome.php b/modules/core/www/frontpage_welcome.php
index 169f22e4b..bd905f882 100644
--- a/modules/core/www/frontpage_welcome.php
+++ b/modules/core/www/frontpage_welcome.php
@@ -52,7 +52,6 @@ $t->data['pageid'] = 'frontpage_welcome';
$t->data['isadmin'] = $isadmin;
$t->data['loginurl'] = $loginurl;
$t->data['header'] = 'simpleSAMLphp installation page';
-$t->data['icon'] = 'compass_l.png';
$t->data['links'] = $links;
$t->data['links_welcome'] = $links_welcome;
diff --git a/modules/multiauth/templates/selectsource.php b/modules/multiauth/templates/selectsource.php
index 6cf7fa031..5d5290cd1 100644
--- a/modules/multiauth/templates/selectsource.php
+++ b/modules/multiauth/templates/selectsource.php
@@ -1,5 +1,4 @@
<?php
-$this->data['icon'] = 'lock.png';
$this->data['header'] = $this->t('{multiauth:multiauth:select_source_header}');
$this->includeAtTemplateBase('includes/header.php');
diff --git a/modules/oauth/www/authorize.php b/modules/oauth/www/authorize.php
index 49a5e2e35..e0a9bb0f2 100644
--- a/modules/oauth/www/authorize.php
+++ b/modules/oauth/www/authorize.php
@@ -49,7 +49,6 @@ if (isset($_REQUEST['oauth_callback'])) {
$t->data['sessionsize'] = $session->getSize();
$t->data['attributes'] = $attributes;
$t->data['logouturl'] = SimpleSAML_Utilities::selfURLNoQuery() . '?logout';
- $t->data['icon'] = 'bino.png';
$t->show();
}
diff --git a/modules/openid/templates/consumer.php b/modules/openid/templates/consumer.php
index 8471693c6..8a709ce06 100644
--- a/modules/openid/templates/consumer.php
+++ b/modules/openid/templates/consumer.php
@@ -1,7 +1,6 @@
<?php
$this->data['header'] = 'OpenID Login';
-$this->data['icon'] = 'openid.png';
$this->data['autofocus'] = 'openid-identifier';
$this->includeAtTemplateBase('includes/header.php');
diff --git a/modules/openid/www/openidtest.php b/modules/openid/www/openidtest.php
index 4f6d946ac..c02d02b62 100644
--- a/modules/openid/www/openidtest.php
+++ b/modules/openid/www/openidtest.php
@@ -24,7 +24,6 @@ $t->data['header'] = '{openid:dictopenid:openidtestpage}';
$t->data['remaining'] = $session->remainingTime();
$t->data['sessionsize'] = $session->getSize();
$t->data['attributes'] = $attributes;
-$t->data['icon'] = 'bino.png';
$t->data['logouturl'] = NULL;
$t->show();
diff --git a/templates/admin-metadatalist.php b/templates/admin-metadatalist.php
index ad3f9738b..1dd67fb89 100644
--- a/templates/admin-metadatalist.php
+++ b/templates/admin-metadatalist.php
@@ -1,6 +1,5 @@
<?php
$this->data['header'] = $this->t('metaover_header');
-$this->data['icon'] = 'bino.png';
$this->includeAtTemplateBase('includes/header.php');
?>
diff --git a/templates/error.php b/templates/error.php
index 3c36f67fb..8c8b9cea5 100644
--- a/templates/error.php
+++ b/templates/error.php
@@ -1,6 +1,5 @@
<?php
$this->data['header'] = $this->t('error_header');
- $this->data['icon'] = 'bomb_l.png';
$this->data['head'] = '
<meta name="robots" content="noindex, nofollow" />
diff --git a/templates/errorreport.php b/templates/errorreport.php
index 417ba92f8..c6d22cc7f 100644
--- a/templates/errorreport.php
+++ b/templates/errorreport.php
@@ -1,6 +1,5 @@
<?php
$this->data['header'] = $this->t('errorreport_header');
- $this->data['icon'] = 'bomb_l.png';
$this->includeAtTemplateBase('includes/header.php');
?>
diff --git a/templates/httpredirect-debug.php b/templates/httpredirect-debug.php
index b65338b24..065857f48 100644
--- a/templates/httpredirect-debug.php
+++ b/templates/httpredirect-debug.php
@@ -1,5 +1,4 @@
<?php
- $this->data['icon'] = 'debug.png';
$this->data['autofocus'] = 'sendlink';
$this->includeAtTemplateBase('includes/header.php');
?>
diff --git a/templates/login-ldapmulti.php b/templates/login-ldapmulti.php
index 1273a4ed1..528e2f023 100644
--- a/templates/login-ldapmulti.php
+++ b/templates/login-ldapmulti.php
@@ -1,5 +1,4 @@
<?php
- if (!array_key_exists('icon', $this->data)) $this->data['icon'] = 'lock.png';
$this->includeAtTemplateBase('includes/header.php');
?>
diff --git a/templates/login.php b/templates/login.php
index e317aa5ac..5af13151b 100644
--- a/templates/login.php
+++ b/templates/login.php
@@ -1,5 +1,4 @@
<?php
- if (!array_key_exists('icon', $this->data)) $this->data['icon'] = 'lock.png';
if (!isset($this->data['autofocus'])) {
$this->data['autofocus'] = 'username';
}
diff --git a/templates/post-debug.php b/templates/post-debug.php
index a1d4a9c21..fabf353b3 100644
--- a/templates/post-debug.php
+++ b/templates/post-debug.php
@@ -1,5 +1,4 @@
<?php
- $this->data['icon'] = 'debug.png';
$this->data['autofocus'] = 'sendbutton';
$this->includeAtTemplateBase('includes/header.php');
diff --git a/www/example-simple/saml2-example.php b/www/example-simple/saml2-example.php
index d37d8f38d..7dd041364 100644
--- a/www/example-simple/saml2-example.php
+++ b/www/example-simple/saml2-example.php
@@ -72,7 +72,6 @@ $t->data['header'] = '{status:header_saml20_sp}';
$t->data['remaining'] = $session->remainingTime();
$t->data['sessionsize'] = $session->getSize();
$t->data['attributes'] = $attributes;
-$t->data['icon'] = 'bino.png';
$t->data['logouturl'] = '/' . $config->getBaseURL() . 'saml2/sp/initSLO.php?RelayState=/' .
$config->getBaseURL() . 'logout.php';
$t->show();
diff --git a/www/example-simple/shib13-example.php b/www/example-simple/shib13-example.php
index 39e650e1b..94f1b7ae4 100644
--- a/www/example-simple/shib13-example.php
+++ b/www/example-simple/shib13-example.php
@@ -74,7 +74,6 @@ $t->data['sessionsize'] = $session->getSize();
$t->data['attributes'] = $attributes;
$t->data['attributes'] = $session->getAttributes();
$t->data['logout'] = null;
-$et->data['icon'] = 'bino.png';
$t->show();
diff --git a/www/example-simple/wsfed-example.php b/www/example-simple/wsfed-example.php
index 3136f61af..a7c5610c2 100644
--- a/www/example-simple/wsfed-example.php
+++ b/www/example-simple/wsfed-example.php
@@ -20,7 +20,6 @@ $t->data['header'] = '{status:header_wsfed}';
$t->data['remaining'] = $session->remainingTime();
$t->data['sessionsize'] = $session->getSize();
$t->data['attributes'] = $attributes;
-$t->data['icon'] = 'bino.png';
$t->data['logouturl'] = '/' . $config->getBaseURL() . 'wsfed/sp/initSLO.php?RelayState=/' . $config->getBaseURL() . 'logout.php';
$t->show();
--
GitLab