X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fcredits.cgi;h=6770cc5a43e52f898558e0ff40e6658e3f90fc25;hp=75e59b18d66be403ae59721690a22257c2ad9b2b;hb=f6a1d9e929041315d122ddd0babed554bdaeb23f;hpb=5db5319e404da77b8ff488f8955da38f61b74c18

diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 75e59b18d6..6770cc5a43 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -39,83 +39,115 @@ 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="https://www.ipfire.org/donate">
+		<strong>$Lang::tr{'donation'}</strong>
+	</a>
+</div>
 END
 ;
 &Header::closebox();
 
-&Header::openbox('100%', 'left', $Lang::tr{'credits'});
+&Header::openbox('100%', 'left',);
 
 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>
-
-<p><b>Development:</b><br />
+<br>
+<center>
+	$Lang::tr{'visit us at'}: <b><a href='https://www.ipfire.org/' target="_blank">https://www.ipfire.org/</a></b>
+</center>
+<br><br>
 
-Arne Fitzenreiter
-(<a href='mailto:arne.fitzenreiter\@ipfire.org'>arne.fitzenreiter\@ipfire.org</a>)  - Maintainer IPFire 2.x <br />
-Michael Tremer
-(<a href='mailto:michael.tremer\@ipfire.org'>michael.tremer\@ipfire.org</a>) - Project Leader <br />
-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
-(<a href='mailto:ronald.wiesinger\@ipfire.org'>ronald.wiesinger\@ipfire.org</a>)<br />
-Silvio Rechenbach
-(<a href='mailto:silvio.rechenbach\@ipfire.org'>silvio.rechenbach\@ipfire.org</a>)<br />
-Dirk Wagner
-(<a href='mailto:dirk.wagner\@ipfire.org'>dirk.wagner\@ipfire.org</a>)<br />
-Erik Kapfer
-(<a href='mailto:erik.kapfer\@ipfire.org'>erik.kapfer\@ipfire.org</a>)<br />
-Alfred Haas
-(<a href='mailto:alfred.haas\@ipfire.org'>alfred.haas\@ipfire.org</a>)<br />
-
-<p><b>Inactive:</b><br />
-
-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>.
+	<!-- CONTRIBUTORS -->
+Michael Tremer,
+Arne Fitzenreiter,
+Christian Schmidt,
+Alexander Marx,
+Matthias Fischer,
+Stefan Schantl,
+Jan Paul Tücking,
+Jonatan Schlag,
+Erik Kapfer,
+Peter Müller,
+Dirk Wagner,
+Marcel Lorenz,
+Alf Høgemark,
+Ben Schweikert,
+Peter Pfeiffer,
+Daniel Glanzmann,
+Heiner Schmeling,
+Daniel Weismüller,
+Timo Eissler,
+Jan Lentfer,
+Marcus Scholz,
+Ersan Yildirim,
+Joern-Ingo Weigert,
+Wolfgang Apolinarski,
+Alfred Haas,
+Lars Schuhmacher,
+Rene Zingel,
+Sascha Kilian,
+Ronald Wiesinger,
+Stephan Feddersen,
+Justin Luth,
+Michael Eitelwein,
+Bernhard Bitsch,
+Dominik Hassler,
+Larsen,
+Stéphane Pautrel,
+Gabriel Rolland,
+Anton D. Seliverstov,
+Bernhard Bittner,
+David Kleuker,
+Hans Horsten,
+Jakub Ratajczak,
+Jorrit de Jonge,
+Jörn-Ingo Weigert,
+Przemek Zdroik,
+Alexander Rudolf Gruber,
+Andrew Bellows,
+Axel Gembe,
+Bernhard Held,
+Christoph Anderegg,
+Daniel Aleksandersen,
+Douglas Duckworth,
+Eberhard Beilharz,
+Ersan Yildirim Ersan,
+Gerd Hoerst,
+H. Horsten,
+Heino Gutschmidt,
+Jan Behrens,
+Jochen Kauz,
+Julian McConnell,
+Kay-Michael Köhler,
+Kim Wölfel,
+Logan Schmidt,
+Nico Prenzel,
+Osmar Gonzalez,
+Paul T. Simmons,
+Rob Brewer,
+Robert Möker,
+Stefan Ernst,
+Stefan Ferstl,
+Thomas Ebert,
+Tim FitzGeorge,
+Timmothy Wilson,
+Umberto Parma
+	<!-- END -->
 </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();