X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fcredits.cgi;h=5482b309eed265df9aa967bc25f886035f706e4c;hb=847e6102c1163ca82f36d870cad0adb43e944ae4;hp=160f3b98f299f92fdeb4de972a5323c7fbae1e58;hpb=6b9f1b888458608580d3645c35b16ffa99af782a;p=people%2Fpmueller%2Fipfire-2.x.git
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 160f3b98f2..5482b309ee 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -36,13 +36,34 @@ require "${General::swroot}/header.pl";
&Header::openbigbox('100%', 'center');
&Header::openbox('100%', 'left', 'Version');
-print "This is IPFire ".`cat /opt/pakfire/etc/pakfire.conf | grep "version =" | cut -d\\" -f2`;
+print "This is ".`cat /etc/system-release`;
+print " - Pakfire ".`cat /opt/pakfire/etc/pakfire.conf | grep "version =" | cut -d\\" -f2`;
+print "
".`uname -a`;
+print "
";
+&Header::closebox();
+
+&Header::openbox('100%', 'left', $Lang::tr{'donation'});
+
+print <$Lang::tr{'donation-text'}
+
+
+
+END
+;
&Header::closebox();
&Header::openbox('100%', 'left', $Lang::tr{'credits'});
print <http://www.ipfire.org/
+
http://www.ipfire.org/
IPFire is based on IPCop and Smoothwall. Many thanks to its developers.
@@ -57,21 +78,27 @@ Vice Project Leader - Christian Schmidt
(maniacikarus\@ipfire.org)
Developer - Arne Fitzenreiter
(arne\@ipfire.org)
-Developer - Heiner Schmeling
+Developer - Stefan Schantl
+(stevee\@ipfire.org)
+Developer - Jan Paul Tücking
+(earl\@ipfire.org)
+Developer & Webmaster - Heiner Schmeling
(cm\@ipfire.org)
-Developer - Sven Nierlein
-(affect\@versatel.de)
-Developer - Rene Zingel
-(linuxadmin\@ipfire.org)
-Sponsor - Karsten Rechenbach
-(space\@ipfire.org)
-Tester - Ronald Wiesinger
+Developer (Addons) - Peter Pfeiffer
+(peterman\@ipfire.org)
+Supporter, Wiki-Admin & Sponsor - Ronald Wiesinger
(rowie\@ipfire.org)
-Tester - Silvio Rechenbach
+Supporter & Wiki-Admin - Silvio Rechenbach
(exciter\@ipfire.org)
+Sponsor - Peter Schaelchli
+(scp\@ipfire.org)
+Sponsor - Sven Nierlein
+(affect\@versatel.de)
+Sponsor - Rene Zingel
+(linuxadmin\@ipfire.org)
Some parts of the distribution are left ajar on third-party software, that is licensed under the GPL, too.
-There are: Advanced Proxy with URL-Filter and Update-Accelerator, ZERINA, Connection Scheduler, mbmon-Graphs, Hddtemp and Wake-on-LAN.
+There are: Advanced Proxy with URL-Filter and Update-Accelerator, ZERINA, Connection Scheduler, Hddtemp and Wake-on-LAN.
Distributed by Marco Sondermann, Ufuk Altinkaynak, Thomas Eichstaedt and Olaf Westrik.
END
;
@@ -83,7 +110,7 @@ print <
+ Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -700,60 +727,7 @@ an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- 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
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- Copyright (C)
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-.
+ END OF TERMS AND CONDITIONS
END