Remove assignements of "icon" template parameter.

We don't display the icon anymore, so don't set it.

git-svn-id: http://simplesamlphp.googlecode.com/svn/trunk@2112 44740490-163a-0410-bde0-09ae8108e29a

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 " />

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 " />

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';
 

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');
 ?>
 

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) {

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();
 

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;

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;
 
 

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;

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;

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');

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();
 }
 

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');
 

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();
 

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');
 ?>

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" />

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');
 ?>
 

templates/httpredirect-debug.php

@@ -1,5 +1,4 @@
 <?php 
-	$this->data['icon'] = 'debug.png';
 	$this->data['autofocus'] = 'sendlink';
 	$this->includeAtTemplateBase('includes/header.php'); 
 ?>

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'); 
 ?>
 

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';
 	}

templates/post-debug.php

@@ -1,5 +1,4 @@
 <?php 
-	$this->data['icon'] = 'debug.png';
 	$this->data['autofocus'] = 'sendbutton';
 	$this->includeAtTemplateBase('includes/header.php'); 
 

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();

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();
 
 

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();