Image check/replace

- Replace images which don't allow commercial use.
- Replace images with unknown origin.

Fixes issue 257.

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

COPYING

@@ -5,16 +5,6 @@ http://creativecommons.org/licenses/LGPL/2.1/
 Note that some of the embedded libraries may be using other licenses.
 In example xmlseclibs uses BSD license.
 
-If you will be using simpleSAMLphp in a commercial context, please do not use the embedded default template which contains some icons with license that are limited to non-commercial use.
-
-Some of the icons used in SimpleSAMLphp are CC/GPL icons from the Gnome projects:
-http://jimmac.musichall.cz/icons.php
-
-And some are Creative Commons icons NoCommercial from Mattahan (Paul Davey)
-http://www.iconarchive.com/category/application/buuf-icons-by-mattahan.html
-
-If you are going to use simpleSAMLphp in a commercial context, and you want to use the default template, ask on the mailinglist on how to remove the icons.
-
 --
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999

modules/InfoCard/templates/temp-getcardform.php

@@ -8,7 +8,7 @@
 	$this->includeAtTemplateBase('includes/header.php'); 
 	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 " />
+		<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: left; margin: 15px " />
 		<h2><?php echo $this->t('error_header'); ?></h2>
 		
 		<p><?php echo $this->t($this->data['error']); ?> </p>

modules/InfoCard/templates/temp-login.php

@@ -8,7 +8,7 @@
 	$this->includeAtTemplateBase('includes/header.php'); 
 	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 " />
+		<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: left; margin: 15px " />
 		<h2><?php echo $this->t('error_header'); ?></h2>
 		
 		<p><?php echo $this->t($this->data['error']); ?> </p>

modules/authYubiKey/templates/yubikeylogin.php

@@ -10,7 +10,7 @@ $this->includeAtTemplateBase('includes/header.php');
 if ($this->data['errorcode'] !== NULL) {
 ?>
 	<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 " />
+		<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: left; margin: 15px " />
 		<h2><?php echo $this->t('{login:error_header}'); ?></h2>
 		<p><b><?php echo $this->t('{errors:title_' . $this->data['errorcode'] . '}'); ?></b></p>
 		<p><?php echo $this->t('{errors:descr_' . $this->data['errorcode'] . '}'); ?></p>

modules/core/templates/loginuserpass.php

@@ -14,7 +14,7 @@ $this->includeAtTemplateBase('includes/header.php');
 if ($this->data['errorcode'] !== NULL) {
 ?>
 	<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 " />
+		<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: left; margin: 15px " />
 		<h2><?php echo $this->t('{login:error_header}'); ?></h2>
 		<p><b><?php echo $this->t('{errors:title_' . $this->data['errorcode'] . '}'); ?></b></p>
 		<p><?php echo $this->t('{errors:descr_' . $this->data['errorcode'] . '}'); ?></p>
@@ -29,7 +29,7 @@ if ($this->data['errorcode'] !== NULL) {
 	<form action="?" method="post" name="f">
 	<table>
 		<tr>
-			<td rowspan="3"><img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/pencil.png" alt="" /></td>
+			<td rowspan="3"><img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-authentication.48x48.png" alt="" /></td>
 			<td style="padding: .3em;"><?php echo $this->t('{login:username}'); ?></td>
 			<td>
 <?php

modules/core/templates/logout-iframe.php

@@ -72,7 +72,7 @@ if ($type === 'embed') {
 
 if ($from !== NULL) {
 
-	echo('<div><img style="float: left; margin-right: 12px" src="/' . $this->data['baseurlpath'] . 'resources/icons/checkmark48.png" alt="Successful logout" />');
+	echo('<div><img style="float: left; margin-right: 12px" src="/' . $this->data['baseurlpath'] . 'resources/icons/checkmark.48x48.png" alt="Successful logout" />');
 	echo('<p style="padding-top: 16px; ">' . $this->t('{logout:loggedoutfrom}', array('%SP%' => '<strong>' .htmlspecialchars($from).'</strong>')) . '</p>');
 	echo('<p style="height: 0px; clear: left;"></p>');
 	echo('</div>');
@@ -156,7 +156,7 @@ if ($nFailed > 0) {
 	$displayStyle = 'display: none;';
 }
 echo('<div id="logout-failed-message" style="margin-top: 1em; border: 1px solid #ccc; padding: 1em; background: #eaeaea;' . $displayStyle . '">');
-echo('<img src="/' . $this->data['baseurlpath'] . 'resources/icons/caution.png" alt="" style="float: left; margin-right: 5px;" />');
+echo('<img src="/' . $this->data['baseurlpath'] . 'resources/icons/experience/gtk-dialog-warning.48x48.png" alt="" style="float: left; margin-right: 5px;" />');
 echo('<p>' . $this->t('{logout:failedsps}') . '</p>');
 echo('<form method="get" action="logout-iframe-done.php" target="_top">');
 echo('<input type="hidden" name="id" value="' . $id . '" />');

modules/discopower/www/style.css

@@ -13,7 +13,7 @@
 
 }
 .inlinesearch input {
-	background-image:url('icons/magnify.png');
+	background-image:url('../../resources/icons/silk/magnifier.png');
 	background-repeat:no-repeat;
 	background-position:center left;
 	border: 1px solid #ccc;
@@ -39,7 +39,7 @@ a.metaentry {
 	cursor: hand;
 }
 a.metaentry.favourite {
-	background-image:url('icons/heart.png');
+	background-image:url('../../resources/icons/silk/heart.png');
 	background-repeat:no-repeat;
 	background-position:center left;
 
@@ -48,7 +48,7 @@ a.metaentry:hover {
 	border: 1px solid #ccc;
 	background: #eee;
 
-	background-image:url('icons/star.png');
+	background-image:url('../../resources/icons/silk/star.png');
 	background-repeat:no-repeat;
 	background-position:center left;
 }

modules/statistics/templates/statistics-tpl.php

@@ -99,7 +99,7 @@ echo('<p>' . $this->data['available.rules'][$this->data['selected.rule']]['descr
 
 // Report settings
 echo '<table class="selecttime" style="width: 100%; border: 1px solid #ccc; background: #eee; margin: 1px 0px; padding: 0px">';
-echo('<tr><td style="width: 50px; padding: 0px"><img style="margin: 0px" src="' . SimpleSAML_Module::getModuleURL("statistics/resources/report.png") . '" alt="Report settings" /></td>');
+echo('<tr><td style="width: 50px; padding: 0px"><img style="margin: 0px" src="../../resources/icons/crystal_project/kchart.32x32.png" alt="Report settings" /></td>');
 
 // Select report
 echo '<td>';
@@ -150,7 +150,7 @@ echo '</table>';
 
 // Select time and date
 echo '<table class="selecttime" style="width: 100%; border: 1px solid #ccc; background: #eee; margin: 1px 0px; padding: 0px">';
-echo('<tr><td style="width: 50px; padding: 0px"><img style="margin: 0px" src="' . SimpleSAML_Module::getModuleURL("statistics/resources/calendar.png") . '" alt="Select date and time" /></td>');
+echo('<tr><td style="width: 50px; padding: 0px"><img style="margin: 0px" src="../../resources/icons/crystal_project/date.32x32.png" alt="Select date and time" /></td>');
 
 
 

modules/themefeidernd/themes/feidernd/core/loginuserpass.php

@@ -47,7 +47,7 @@
 if ($this->data['errorcode'] !== NULL) {
 ?>
 	<div style="border: 1px solid #500;  background: #880b17; ">
-		<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/bomb.png" style="float: left; margin: 15px " />
+		<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: left; margin: 15px " />
 		<h2><?php echo $this->t('{login:error_header}'); ?></h2>
 		<p><b><?php echo $this->t('{errors:title_' . $this->data['errorcode'] . '}'); ?></b></p>
 		<p><?php echo $this->t('{errors:descr_' . $this->data['errorcode'] . '}'); ?></p>
@@ -59,7 +59,7 @@ if ($this->data['errorcode'] !== NULL) {
 <!--
 	<?php if (isset($this->data['error'])) { ?>
 		<div style="border: 1px solid #500;  background: #880b17; ">
-		<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/bomb.png" style="float: left; margin: 15px " />
+		<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: left; margin: 15px " />
 		<h2><?php echo $this->t('{error:error_header}'); ?></h2>
 		
 		<p style="padding: .2em"><?php echo $this->t($this->data['error']); ?> </p>
@@ -72,7 +72,7 @@ if ($this->data['errorcode'] !== NULL) {
 if ($this->data['errorcode'] !== NULL) {
 ?>
 	<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 " />
+		<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: left; margin: 15px " />
 		<h2><?php echo $this->t('{login:error_header}'); ?></h2>
 		<p><b><?php echo $this->t('{errors:title_' . $this->data['errorcode'] . '}'); ?></b></p>
 		<p><?php echo $this->t('{errors:descr_' . $this->data['errorcode'] . '}'); ?></p>

templates/admin-config.php

@@ -43,14 +43,14 @@ if(array_key_exists('files', $this->data)) {
 		foreach($notices as $i) {
 			$type = $i['type'];
 			if($type === 'error') {
-				$image = 'bomb.png';
+				$image = 'silk/exclamation.png';
 			} elseif($type === 'warning') {
-				$image = 'caution.png';
+				$image = 'silk/error.png';
 			}
 			$imageUrl = '/' . $this->data['baseurlpath'] . 'resources/icons/' . $image;
 
 			echo('<p>');
-			echo('<img style="display: inline; float: left; width: 1.7em; height: 1.7em;" src="' . htmlspecialchars($imageUrl) . '" alt="' . htmlspecialchars($type) . '" />');
+			echo('<img style="display: inline; float: left;" src="' . htmlspecialchars($imageUrl) . '" alt="' . htmlspecialchars($type) . '" />');
 			echo(htmlspecialchars($i['message']));
 			echo('</p>');
 		}

templates/admin-metadatalist.php

@@ -45,7 +45,7 @@ $this->includeAtTemplateBase('includes/header.php');
 				echo '<h4 style="padding-left: 2em; clear: both;" onclick="document.getElementById(\'metadatasection-' . $encodedEntityID . '\').style.display=\'block\';">' . htmlspecialchars($name) . '</h4>';
 				
 				if ($warning) {
-					echo '<div><img src="/' . $baseurl . 'resources/icons/caution.png" style="float: left; margin-right: 1em" />';
+					echo '<div><img src="/' . $baseurl . 'resources/icons/experience/gtk-dialog-warning.48x48.png" style="float: left; margin-right: 1em" />';
 					echo $t->t('metaover_errorentry') . '</div>';
 				}
 				

templates/login-ldapmulti.php

@@ -5,7 +5,7 @@
 
 		<?php 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 " />
+		<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: left; margin: 15px " />
 		<h2><?php echo $this->t('error_header'); ?></h2>
 		
 		<p><?php echo htmlspecialchars($this->data['error']); ?> </p>
@@ -22,7 +22,7 @@
 
 		<table>
 			<tr>
-				<td rowspan="3"><img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/pencil.png" /></td>
+				<td rowspan="3"><img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-authentication.48x48.png" /></td>
 				<td style="padding: .3em;"><?php echo $this->t('username'); ?></td>
 				<td><input type="text" tabindex="1" name="username" 
 					<?php if (isset($this->data['username'])) {

templates/login.php

@@ -7,7 +7,7 @@
 
 	<?php 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 " />
+		<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: left; margin: 15px " />
 		<h2><?php echo $this->t('error_header'); ?></h2>
 		
 		<p><?php echo $this->t($this->data['error']); ?> </p>
@@ -22,7 +22,7 @@
 
 	<table>
 		<tr>
-			<td rowspan="2"><img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/pencil.png" /></td>
+			<td rowspan="2"><img src="/<?php echo $this->data['baseurlpath']; ?>resources/experience/gtk-dialog-authentication.48x48.png" /></td>
 			<td style="padding: .3em;"><?php echo $this->t('username'); ?></td>
 			
 			

templates/selectidp-links.php

@@ -40,7 +40,7 @@ foreach ($this->data['idplist'] AS $idpentry) {
 		if (!empty($this->data['preferredidp']) && array_key_exists($this->data['preferredidp'], $this->data['idplist'])) {
 			$idpentry = $this->data['idplist'][$this->data['preferredidp']];
 			echo '<div class="preferredidp">';
-			echo '	<img src="/' . $this->data['baseurlpath'] .'resources/icons/star.png" style="float: right" alt="'.$this->t('icon_prefered_idp').'" />';
+			echo '	<img src="/' . $this->data['baseurlpath'] .'resources/icons/experience/gtk-about.64x64.png" style="float: right" alt="'.$this->t('icon_prefered_idp').'" />';
 
 			if(array_key_exists('icon', $idpentry) && $idpentry['icon'] !== NULL) {
 				$iconUrl = SimpleSAML_Utilities::resolveURL($idpentry['icon']);

www/resources/default.css

@@ -233,7 +233,7 @@ dl dd {
 
 div.caution {
 	background-color:  #FF9;
-	background-image: url('icons/caution.png');
+	background-image: url('icons/experience/gtk-dialog-warning.48x48.png');
 	background-repeat: no-repeat;
 	border: thin solid #444;
 	padding: .2em .2em .2em 60px;

www/resources/icons/crystal_project/readme.txt

@@ -0,0 +1,17 @@
+These images are from the Crystal theme, licensed under the GNU LGPL.
+
+See: http://www.everaldo.com/crystal/
+
+
+Original readme:
+
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+This copyright and license notice covers the images in this directory.
+************************************************************************
+
+TITLE:	Crystal Project Icons
+AUTHOR:	Everaldo Coelho
+SITE:	http://www.everaldo.com
+CONTACT: everaldo@everaldo.com
+
+Copyright (c)  2006-2007  Everaldo Coelho.

www/resources/icons/experience/readme.txt

@@ -0,0 +1,6 @@
+The icons in this directory is from the eXperience theme by
+David Christian Berg. The icons are released under the GNU GPL.
+
+See:
+- http://art.gnome.org/themes/icon
+- http://art.gnome.org/download/themes/icon/1096/ICON-EXperience.tar.gz