]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b684b13)
Hinzugefügt:
authorms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Fri, 14 Jul 2006 16:28:20 +0000 (16:28 +0000)
committerms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Fri, 14 Jul 2006 16:28:20 +0000 (16:28 +0000)
  * Errorseite von Linuxadmin.
Geändert:
  * Bisschen an der make.sh aufgeräumt und verbessert.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@208 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

html/html/images/urlfilter/bg_cool_tux.jpg [new file with mode: 0644] patch | blob
html/html/images/urlfilter/bgcool.gif [new file with mode: 0644] patch | blob
html/html/images/urlfilter/gmg_tux_ip_fire.gif [new file with mode: 0644] patch | blob
html/html/redirect.cgi patch | blob | blame | history
make.sh patch | blob | blame | history

diff --git a/html/html/images/urlfilter/bg_cool_tux.jpg b/html/html/images/urlfilter/bg_cool_tux.jpg
new file mode 100644 (file)
index 0000000..b2bc751
Binary files /dev/null and b/html/html/images/urlfilter/bg_cool_tux.jpg differ
diff --git a/html/html/images/urlfilter/bgcool.gif b/html/html/images/urlfilter/bgcool.gif
new file mode 100644 (file)
index 0000000..abfec16
Binary files /dev/null and b/html/html/images/urlfilter/bgcool.gif differ
diff --git a/html/html/images/urlfilter/gmg_tux_ip_fire.gif b/html/html/images/urlfilter/gmg_tux_ip_fire.gif
new file mode 100644 (file)
index 0000000..15ede82
Binary files /dev/null and b/html/html/images/urlfilter/gmg_tux_ip_fire.gif differ
diff --git a/html/html/redirect.cgi b/html/html/redirect.cgi
index c7b6a608f3685fc0333396f46726a99f7e519dc3..6d3aca85b923b2db4abedc1347052f0b4f8543ed 100644 (file)
--- a/html/html/redirect.cgi
+++ b/html/html/redirect.cgi
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 #
-# $Id: redirect.cgi,v 0.1 2004/09/26 00:00:00 marco Exp $
+# $Id: redirect.cgi,v 0.2 2006/06/12 00:00:00 modyfy bye linuxadmin
 #
 
 use CGI qw(param);
@@ -36,10 +36,12 @@ print "Connection: close\n";
 print "Content-type: text/html\n\n";
 
 print <<END
+
 <html>
 <head>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title></title>
+<title>ACCESS MESSAGE</title>
 </head>
 
 END
@@ -53,30 +55,31 @@ END
 ;
 } else {
 print <<END
-<body bgcolor="#FFFFFF">
+<img src="http://$netsettings{'GREEN_ADDRESS'}:81//images/logo_ipfire.gif" ALT="IPFire-Logo">
+<body bgcolor="#455B72">
 END
 ;
 }
 
 print <<END
 
-<center>
 
-<table width="80%" cellspacing="10" cellpadding="5" border="0">
+<center>
 
+<table width="80%" cellspacing="10" cellpadding="5" border="1">
 <tr>
-       <td bgcolor="#C0C0C0" align="right">
-               <font face="verdana, arial, sans serif" color="#000000" size="1">
-               <b>$category</b>
+               <td nowrap align="right" background="http://$netsettings{'GREEN_ADDRESS'}:81//images/urlfilter/bgcool.gif">
+               <font face="verdana, arial, sans serif" color="#CC000000" size="1">
+               <b> INFO: $category</b>
                </font>
        </td>
 </tr>
 <tr>
        <td bgcolor="#F4F4F4" align="center">
-               <table width="100%" cellspacing="20" cellpadding="20" border="0">
+               <table width="100%" cellspacing="20" cellpadding="18" border="1">
                        <tr>
-                               <td nowrap bgcolor="#FF0000" align="center">
-                                       <font face="verdana, arial, sans serif" color="#FFFFFF" size="6">
+                               <td nowrap align="center" background="http://$netsettings{'GREEN_ADDRESS'}:81//images/urlfilter/bgcool.gif">
+                                       <font face="verdana, arial, sans serif" color="#CC000000" size="5">
                                        <b>$msgtext1</b>
                                        </font>
                                </td>
@@ -116,19 +119,20 @@ print <<END
 </table>
 
 <tr>
-       <td bgcolor="#C0C0C0" align="right">
-               <font face="verdana,arial,sans serif" color="#FFFFFF" size="1">Web Filtering by
+       <td nowrap align="right" background="http://$netsettings{'GREEN_ADDRESS'}:81//images/urlfilter/bgcool.gif">
+               <font face="verdana,arial,sans serif" color="#656565" size="1">Web Filtering by
                </font>
-               <a href="http://www.ipcop.org" target="_blank"><b>
-               <font face="verdana,arial,sans serif" color="#FFFFFF" size="1">IPCop</b></a> and
+               <a href="http://www.ipfire.eu" target="_blank"><b>
+               <font face="verdana,arial,sans serif" color="#656565" size="1">IPFire</b></a> and
                <a href="http://www.squidguard.org" target="_blank"><b>
-               <font face="verdana,arial,sans serif" color="#FFFFFF" size="1">SquidGuard
+               <font face="verdana,arial,sans serif" color="#656565" size="1">SquidGuard
                </font></b></a>
        </td>
 </tr>
 
 </table>
 
+<img src="http://$netsettings{'GREEN_ADDRESS'}:81//images/urlfilter/bg_cool_tux.jpg">
 </center>
 
 </body>
diff --git a/make.sh b/make.sh
index 1dc85f45104af469e5e6c11365aa98f9b4d8290a..86c9dbaba2afa0d905e5943188cee040fcba1ceb 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -700,8 +700,8 @@ buildipcop() {
   ipcopmake samba
   ipcopmake sudo
   ipcopmake mc
-  ipcopmake pwlib
-  ipcopmake openh323
+#  ipcopmake pwlib
+#  ipcopmake openh323
   ipcopmake wget
   ipcopmake wput
   ipcopmake bridge-utils
@@ -725,7 +725,7 @@ buildipcop() {
   ipcopmake zaptel
   ipcopmake libpri
   ipcopmake bristuff
-#  ipcopmake asterisk
+  ipcopmake asterisk
   ipcopmake mpg123
   echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE
   ipcopmake lame
@@ -1113,15 +1113,12 @@ gettoolchain)
        wget $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5 >& /dev/null
        if [ $? -ne 0 ]; then
                echo "`date -u '+%b %e %T'`: error downloading toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
-#      else
-#              if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then
-#                      echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
-#                      echo "`date -u '+%b %e %T'`: Uncompressing toolchain" | tee -a $LOGFILE
-#                      cd $BASEDIR && tar xfz cache/$PACKAGE.tar.gz -C .
-#                      rm -f $BASEDIR/cache/$PACKAGE.{tar.gz,md5}
-#              else
-#                      exiterror "$PACKAGE.md5 did not match, check downloaded package"
-#              fi
+       else
+               if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then
+                       echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
+               else
+                       exiterror "$PACKAGE.md5 did not match, check downloaded package"
+               fi
        fi
        ;;
 paks)
@@ -1137,7 +1134,7 @@ commit)
        echo "Upload the changed files:"
        svn commit
        ./make.sh sync
-       svn up > /dev/null
+       svn up
        ;;
 make)
        echo "Do a complete compile:"   
IPFire 2.x development tree