X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fcredits.cgi;h=d61019ef1ca9c8d851b993300e434321860d27f9;hb=2e99ab8bf8a1dc79d1c411281bd82a19acf1c9dc;hp=75e59b18d66be403ae59721690a22257c2ad9b2b;hpb=b431bfce486adcccac747c21882a6f735583104e;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 75e59b18d..d61019ef1 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -39,16 +39,12 @@ require "${General::swroot}/header.pl";
 
 print <<END
 <p>$Lang::tr{'donation-text'}</p>
-	<div align="center">
-		<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-			<input type="hidden" name="cmd" value="_s-xclick">
-			<input type="hidden" name="hosted_button_id" value="10781833">
-			<input type="image" src=$Lang::tr{'donation-link'} border="0" name="submit" alt="PayPal - The safer, easier way to pay online.">
-			<img alt="" border="0" src="https://www.paypal.com/de_DE/i/scr/pixel.gif" width="1" height="1">
-		</form>
-	</div>
-<br />
 
+<div align="center">
+	<a href="http://www.ipfire.org/donate">
+		<strong>$Lang::tr{'donation'}</strong>
+	</a>
+</div>
 END
 ;
 &Header::closebox();
@@ -56,12 +52,11 @@ END
 &Header::openbox('100%', 'left', $Lang::tr{'credits'});
 
 print <<END
-<br /><center><b><a href='http://www.ipfire.org/' target="_blank">http://www.ipfire.org/</a></b></center>
-<br />
-<p>
-	<b>IPFire is based on IPCop and Smoothwall. Many thanks to its developers.</b><br />
-	<b>We want to say thank you to all of the developers who ever contributed anything to IPFire.</b>
-</p>
+<br>
+<center>
+	$Lang::tr{'visit us at'}: <b><a href='http://www.ipfire.org/' target="_blank">http://www.ipfire.org/</a></b>
+</center>
+<br><hr><br>
 
 <p><b>Development:</b><br />
 
@@ -73,8 +68,6 @@ Christian Schmidt
 (<a href='mailto:christian.schmidt\@ipfire.org'>christian.schmidt\@ipfire.org</a>) - Vice Project Leader <br />
 Stefan Schantl
 (<a href='mailto:stefan.schantl\@ipfire.org'>stefan.schantl\@ipfire.org</a>)<br />
-Jan Paul T&uuml;cking
-(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\@ipfire.org</a>)<br />
 Heiner Schmeling
 (<a href='mailto:heiner.schmeling\@ipfire.org'>heiner.schmeling\@ipfire.org</a>)<br />
 Ronald Wiesinger
@@ -94,28 +87,21 @@ Peter Pfeiffer
 (<a href='mailto:peter.pfeifer\@ipfire.org'>peter.pfeifer\@ipfire.org</a>)<br />
 Peter Sch&auml;lchli
 (<a href='mailto:peter.schaelchli\@ipfire.org'>peter.schaelchli\@ipfire.org</a>)<br />
-</p>
-<p>Some parts of the distribution are left ajar on third-party software, that is licensed under the GPL, too.<br />
-There are: Advanced Proxy with URL-Filter and Update-Accelerator, ZERINA, Connection Scheduler, Hddtemp and Wake-on-LAN.<br />
-Distributed by Marco Sondermann, Ufuk Altinkaynak, Thomas Eichstaedt and Olaf Westrik.</p>
-<p>
-
-This product includes GeoLite data created by MaxMind, available from <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>.
+Jan Paul T&uuml;cking
+(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\@ipfire.org</a>)<br />
 </p>
 END
 ;
 &Header::closebox();
 
-&Header::openbox('100%', 'left', 'General Public License v3');
-if ( -e "/usr/share/doc/licenses/GPLv3" )  {
-	print '<textarea rows="25" cols="75" readonly="true">';
-	print `cat "/usr/share/doc/licenses/GPLv3"`;
-	print '</textarea>';
-}
-else {
-	print '<br /><a href="http://www.gnu.org/licenses/gpl-3.0.txt" target="_blank">GENERAL PUBLIC LICENSE</a><br />';
-}
-
+&Header::openbox("100%", "left", $Lang::tr{'other'});
+print <<END
+	<p>
+		This product includes GeoLite data created by MaxMind, available from
+		<a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>.
+	</p>
+END
+;
 &Header::closebox();
 
 &Header::closebigbox();