Merge remote-tracking branch 'ms/ccache-update' into kernel-update

[people/teissler/ipfire-2.x.git] / html / cgi-bin / credits.cgi

diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index ff56efa8476d21cd986c67823ec3ddf3ef574e6f..3ae2f71884ba00dbac18400c4691cfa67c0f5479 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2011  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -35,13 +35,6 @@ require "${General::swroot}/header.pl";
 
 &Header::openbigbox('100%', 'center');
 
-&Header::openbox('100%', 'left', 'Version');
-print "This is ".`cat /etc/system-release`;
-print " - Pakfire ".`cat /opt/pakfire/etc/pakfire.conf | grep "version =" | cut -d\\" -f2`;
-print "<br />".`uname -a`;
-print "<br /><br /><br /><br />";
-&Header::closebox();
-
 &Header::openbox('100%', 'left', $Lang::tr{'donation'});
 
 print <<END
@@ -49,9 +42,9 @@ print <<END
        <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">
+                       <input type="hidden" name="hosted_button_id" value="HHBTSN9QRWPAY">
+                       <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.paypalobjects.com/de_DE/i/scr/pixel.gif" width="1" height="1">
                </form>
        </div>
 <br />
@@ -72,34 +65,43 @@ print <<END
 
 <p><b>Development:</b><br />
 
-Project Leader - Michael Tremer
-(<a href='mailto:mitch\@ipfire.org'>mitch\@ipfire.org</a>)<br />
-Vice Project Leader - Christian Schmidt
-(<a href='mailto:maniacikarus\@ipfire.org'>maniacikarus\@ipfire.org</a>)<br />
-Maintainer IPFire 2.x - Arne Fitzenreiter
-(<a href='mailto:arne\@ipfire.org'>arne\@ipfire.org</a>)<br />
-Developer - Stefan Schantl
-(<a href='mailto:Stevee\@ipfire.org'>stevee\@ipfire.org</a>)<br />
-Developer - Jan Paul T&uuml;cking
-(<a href='mailto:earl\@ipfire.org'>earl\@ipfire.org</a>)<br />
-Developer & Webmaster - Heiner Schmeling
-(<a href='mailto:cm\@ipfire.org'>cm\@ipfire.org</a>)<br />
-Developer (Addons) - Peter Pfeiffer
-(<a href='mailto:peterman\@ipfire.org'>peterman\@ipfire.org</a>)<br />
-Supporter, Wiki-Admin & Sponsor - Ronald Wiesinger
-(<a href='mailto:rowie\@ipfire.org'>rowie\@ipfire.org</a>)<br />
-Supporter & Wiki-Admin - Silvio Rechenbach
-(<a href='mailto:exciter\@ipfire.org'>exciter\@ipfire.org</a>)<br />
-Sponsor - Peter Schaelchli
-(<a href='mailto:scp\@ipfire.org'>scp\@ipfire.org</a>)<br />
-Sponsor - Sven Nierlein
-(<a href='mailto:affect\@ipfire.org'>affect\@versatel.de</a>)<br />
-Sponsor  - Rene Zingel
-(<a href='mailto:linuxadmin\@ipfire.org'>linuxadmin\@ipfire.org</a>)<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>.
+</p>
 END
 ;
 &Header::closebox();