Geändert:

  * QoS.cgi weiter ausgebaut.
  * Kein PostgreSQL mehr. - Kann man ggf. nachinstallieren.

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

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 29e449ce804d943771dde689f6297b11fc868d22..135b9e2f805fcd87472569e56f21a1c83847f9b9 100644 (file)
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -91,37 +91,6 @@ $qossettings{'DOPORT'} = '';
 &Header::getcgihash(\%qossettings);
 
 &Header::openpage('QoS', 1, '');
-
-print <<END
-<script type="text/javascript">
-<!--
-function BorderOn (id) { id.className='btnOn'  }
-function BorderOff(id) { id.className='btnOff' }
-//-->
-</script>
-<style type=text/css>
-.btnOn {
-       border-right: #D5F0FF 2px Inset;
-       border-top: #D5F0FF 2px Inset;
-       border-left: #D5F0FF 2px Inset;
-       border-bottom: #D5F0FF 2px Inset;
-       text-align: Center;
-       text-decoration: None;
-       background-color: #FFFFFF;
-}
-.btnOff {
-       border-right: #D5F0FF 2px Outset;
-       border-top: #D5F0FF 2px Outset;
-       border-left: #D5F0FF 2px Outset;
-       border-bottom: #D5F0FF 2px Outset;
-       text-align: Center;
-       text-decoration: None;
-       background-color: #FFFFFF;
-}
-</style>
-END
-;
-
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 ############################################################################################################################
@@ -491,7 +460,7 @@ END
                <tr><td width='40%' align='right'>Uploadstandardklasse:         <td width='40%' align='left'>$qossettings{'DEFCLASS_OUT'}
                <tr><td width='40%' align='right'>ACKs:                         <td width='40%' align='left'>$qossettings{'ACK'}
                <tr><td colspan='3' width='100%'><hr>
-               <tr><td colspan='3' width='100%' align='center'><input type='submit' name='ACTION' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)' value='Parentklasse hinzufuegen'><input type='submit' name='ACTION' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)' value='Erweiterte Einstellungen'>
+               <tr><td colspan='3' width='100%' align='center'><input type='submit' name='ACTION' value='Parentklasse hinzufuegen'><input type='submit' name='ACTION' value='Erweiterte Einstellungen'>
        </form>
 END
 ;
@@ -865,7 +834,6 @@ END
                        if ( $classline[0] eq $qossettings{'RED_DEV'} )
                        {
                                print <<END
-                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                <tr><td align='center' bgcolor='#EAEAEA'>$classline[0]
                                    <td align='center' bgcolor='#EAEAEA'>$classline[1]
                                    <td align='center' bgcolor='#EAEAEA'>$classline[2]
@@ -908,7 +876,6 @@ END
                                        @subclassline = split( /\;/, $subclassentry );
                                        if ( $subclassline[1] eq $classline[1] ) {
                                                print <<END
-                                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                        <tr><td align='center' bgcolor='#FFFFFF'>Subklasse:
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[2]
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[3]
@@ -916,12 +883,29 @@ END
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[5]
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[6]
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[7]
-                                                           <td align='right'  bgcolor='#FAFAFA'><input type='hidden' name='CLASS' value='$subclassline[2]'>
-                                                               <button type='submit' name='DOSCLASS' value='Bearbeiten' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/edit.gif' width="20" height="20" alt="Klasse bearbeiten"></button>&nbsp;
-                                                               <button type='submit' name='ACTION' value='Level7-Regel hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/addgreen.gif' width="20" height="20" alt="Level7-Regel hinzufuegen"></button>&nbsp;
-                                                               <button type='submit' name='ACTION' value='Port-Regel hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/add.gif' width="20" height="20" alt="Port-Regel hinzufuegen"></button>&nbsp;
-                                                               <button type='submit' name='DOSCLASS' value='Loeschen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/delete.gif' width="20" height="20" alt="Klasse loeschen"></button>
+                                                           <td align='right'  bgcolor='#FAFAFA'>
+                                               <table border='0'><tr>
+                                               <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                       <input type='hidden' name='CLASS' value='$subclassline[2]'>
+                                                       <input type='hidden' name='DOSCLASS' value='Bearbeiten'>
+                                                       <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
+                                               </form>
+                                               <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                       <input type='hidden' name='CLASS' value='$subclassline[2]'>
+                                                       <input type='hidden' name='ACTION' value='Level7-Regel hinzufuegen'>
+                                                       <input type='image' alt='Level7-Regel hinzufuegen' src='/images/addgreen.gif'>
+                                               </form>
+                                               <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                       <input type='hidden' name='CLASS' value='$subclassline[2]'>
+                                                       <input type='hidden' name='ACTION' value='Port-Regel hinzufuegen'>
+                                                       <input type='image' alt='Port-Regel hinzufuegen' src='/images/add.gif'>
                                                </form>
+                                               <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                       <input type='hidden' name='CLASS' value='$subclassline[2]'>
+                                                       <input type='hidden' name='DOSCLASS' value='Loeschen'>
+                                                       <input type='image' alt='Loeschen' src='/images/delete.gif'>
+                                               </form>
+                                               </table>
 END
 ;
                                        }
@@ -935,7 +919,6 @@ END
                        if ( $classline[0] eq $qossettings{'IMQ_DEV'} )
                        {
                                print <<END
-                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                <tr><td align='center' bgcolor='#EAEAEA'>$classline[0]
                                    <td align='center' bgcolor='#EAEAEA'>$classline[1]
                                    <td align='center' bgcolor='#EAEAEA'>$classline[2]
@@ -978,7 +961,6 @@ END
                                        @subclassline = split( /\;/, $subclassentry );
                                        if ( $subclassline[1] eq $classline[1] ) {
                                                print <<END
-                                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                        <tr><td align='center' bgcolor='#FFFFFF'>Subklasse:
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[2]
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[3]
@@ -986,12 +968,29 @@ END
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[5]
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[6]
                                                            <td align='center' bgcolor='#FAFAFA'>$subclassline[7]
-                                                           <td align='right'  bgcolor='#FAFAFA'><input type='hidden' name='CLASS' value='$subclassline[2]'>
-                                                               <button type='submit' name='DOSCLASS' value='Bearbeiten' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/edit.gif' width="20" height="20" alt="Klasse bearbeiten"></button>&nbsp;
-                                                               <button type='submit' name='ACTION' value='Level7-Regel hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/addgreen.gif' width="20" height="20" alt="Level7-Regel hinzufuegen"></button>&nbsp;
-                                                               <button type='submit' name='ACTION' value='Port-Regel hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/add.gif' width="20" height="20" alt="Port-Regel hinzufuegen"></button>&nbsp;
-                                                               <button type='submit' name='DOSCLASS' value='Loeschen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/delete.gif' width="20" height="20" alt="Klasse loeschen"></button>
-                                               </form>
+                                                           <td align='right'  bgcolor='#FAFAFA'>
+                                                       <table border='0'><tr>
+                                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                               <input type='hidden' name='CLASS' value='$subclassline[2]'>
+                                                               <input type='hidden' name='DOSCLASS' value='Bearbeiten'>
+                                                               <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
+                                                       </form>
+                                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                               <input type='hidden' name='CLASS' value='$subclassline[2]'>
+                                                               <input type='hidden' name='ACTION' value='Level7-Regel hinzufuegen'>
+                                                               <input type='image' alt='Level7-Regel hinzufuegen' src='/images/addgreen.gif'>
+                                                       </form>
+                                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                               <input type='hidden' name='CLASS' value='$subclassline[2]'>
+                                                               <input type='hidden' name='ACTION' value='Port-Regel hinzufuegen'>
+                                                               <input type='image' alt='Port-Regel hinzufuegen' src='/images/add.gif'>
+                                                       </form>
+                                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                               <input type='hidden' name='CLASS' value='$subclassline[2]'>
+                                                               <input type='hidden' name='DOSCLASS' value='Loeschen'>
+                                                               <input type='image' alt='Loeschen' src='/images/delete.gif'>
+                                                       </form>
+                                                       </table>
 END
 ;
                                        }
@@ -1060,7 +1059,6 @@ END
                        if ( $l7ruleline[1] eq $qossettings{'IMQ_DEV'} )
                        {
                                print <<END
-                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                <tr><td align='center' bgcolor='#EAEAEA'>$l7ruleline[1]
                                    <td align='center' bgcolor='#EAEAEA'>$l7ruleline[0]
                                    <td align='center' bgcolor='#EAEAEA'>$l7ruleline[2]
@@ -1118,7 +1116,6 @@ END
                        if ( $portruleline[1] eq $qossettings{'RED_DEV'} )
                        {
                                print <<END
-                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                <tr><td align='center' bgcolor='#EAEAEA'>$portruleline[1]
                                    <td align='center' bgcolor='#EAEAEA'>$portruleline[0]
                                    <td align='center' bgcolor='#EAEAEA'>$portruleline[2]
@@ -1127,15 +1124,28 @@ END
                                    <td align='center' bgcolor='#EAEAEA'>$portruleline[5]
                                    <td align='center' bgcolor='#EAEAEA'>$portruleline[6]
                                    <td align='right'  bgcolor='#EAEAEA'>
-                                       <input type='hidden' name='CLASS' value='$portruleline[0]'>
-                                       <input type='hidden' name='PPROT' value='$portruleline[2]'>
-                                       <input type='hidden' name='QIP' value='$portruleline[3]'>
-                                       <input type='hidden' name='QPORT' value='$portruleline[4]'>
-                                       <input type='hidden' name='DIP' value='$portruleline[5]'>
-                                       <input type='hidden' name='DPORT' value='$portruleline[6]'>
-                                       <button type='submit' name='DOPORT' value='Bearbeiten' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/edit.gif' width="20" height="20" alt="Klasse bearbeiten"></button>&nbsp;
-                                       <button type='submit' name='DOPORT' value='Loeschen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/delete.gif' width="20" height="20" alt="Klasse loeschen"></button>
-                               </form>
+                                   <table border='0'><tr>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$portruleline[0]'>
+                                               <input type='hidden' name='PPROT' value='$portruleline[2]'>
+                                               <input type='hidden' name='QIP' value='$portruleline[3]'>
+                                               <input type='hidden' name='QPORT' value='$portruleline[4]'>
+                                               <input type='hidden' name='DIP' value='$portruleline[5]'>
+                                               <input type='hidden' name='DPORT' value='$portruleline[6]'>
+                                               <input type='hidden' name='DOPORT' value='Bearbeiten'>
+                                               <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
+                                       </form>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$portruleline[0]'>
+                                               <input type='hidden' name='PPROT' value='$portruleline[2]'>
+                                               <input type='hidden' name='QIP' value='$portruleline[3]'>
+                                               <input type='hidden' name='QPORT' value='$portruleline[4]'>
+                                               <input type='hidden' name='DIP' value='$portruleline[5]'>
+                                               <input type='hidden' name='DPORT' value='$portruleline[6]'>
+                                               <input type='hidden' name='DOPORT' value='Loeschen'>
+                                               <input type='image' alt='Loeschen' src='/images/delete.gif'>
+                                       </form>
+                                   </table>
 END
 ;
                        }
@@ -1147,7 +1157,6 @@ END
                        if ( $portruleline[1] eq $qossettings{'IMQ_DEV'} )
                        {
                                print <<END
-                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                <tr><td align='center' bgcolor='#EAEAEA'>$portruleline[1]
                                    <td align='center' bgcolor='#EAEAEA'>$portruleline[0]
                                    <td align='center' bgcolor='#EAEAEA'>$portruleline[2]
@@ -1156,15 +1165,28 @@ END
                                    <td align='center' bgcolor='#EAEAEA'>$portruleline[5]
                                    <td align='center' bgcolor='#EAEAEA'>$portruleline[6]
                                    <td align='right'  bgcolor='#EAEAEA'>
-                                       <input type='hidden' name='CLASS' value='$portruleline[0]'>
-                                       <input type='hidden' name='PPROT' value='$portruleline[2]'>
-                                       <input type='hidden' name='QIP' value='$portruleline[3]'>
-                                       <input type='hidden' name='QPORT' value='$portruleline[4]'>
-                                       <input type='hidden' name='DIP' value='$portruleline[5]'>
-                                       <input type='hidden' name='DPORT' value='$portruleline[6]'>
-                                       <button type='submit' name='DOPORT' value='Bearbeiten' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/edit.gif' width="20" height="20" alt="Klasse bearbeiten"></button>&nbsp;
-                                       <button type='submit' name='DOPORT' value='Loeschen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/delete.gif' width="20" height="20" alt="Klasse loeschen"></button>
-                               </form>
+                                   <table border='0'><tr>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$portruleline[0]'>
+                                               <input type='hidden' name='PPROT' value='$portruleline[2]'>
+                                               <input type='hidden' name='QIP' value='$portruleline[3]'>
+                                               <input type='hidden' name='QPORT' value='$portruleline[4]'>
+                                               <input type='hidden' name='DIP' value='$portruleline[5]'>
+                                               <input type='hidden' name='DPORT' value='$portruleline[6]'>
+                                               <input type='hidden' name='DOPORT' value='Bearbeiten'>
+                                               <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
+                                       </form>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$portruleline[0]'>
+                                               <input type='hidden' name='PPROT' value='$portruleline[2]'>
+                                               <input type='hidden' name='QIP' value='$portruleline[3]'>
+                                               <input type='hidden' name='QPORT' value='$portruleline[4]'>
+                                               <input type='hidden' name='DIP' value='$portruleline[5]'>
+                                               <input type='hidden' name='DPORT' value='$portruleline[6]'>
+                                               <input type='hidden' name='DOPORT' value='Loeschen'>
+                                               <input type='image' alt='Loeschen' src='/images/delete.gif'>
+                                       </form>
+                                   </table>
 END
 ;
                        }

diff --git a/lfs/xampp b/lfs/xampp
index 88daaace08c8d5a0d2a50c30b018a159ee1425de..6ed5b7fa2206a48db8c7f54ea39213ae6fa7a102 100644 (file)
--- a/lfs/xampp
+++ b/lfs/xampp
@@ -95,10 +95,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -C /opt 
        cd $(DIR_SRC) && tar zxf $(DIR_DL)/xampp-linux-devel-$(VER).tar.gz -C /opt
        cd $(DIR_SRC) && tar zxf $(DIR_DL)/Python-AddOn-1.3.tar.gz -C /tmp
-       cd $(DIR_SRC) && tar zxf $(DIR_DL)/PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz -C /tmp
+#      cd $(DIR_SRC) && tar zxf $(DIR_DL)/PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz -C /tmp
        cd $(DIR_SRC) && tar zxf $(DIR_DL)/wwget-beta-for-ipfire.tar.gz -C /opt/lampp/htdocs
-       cd /tmp/PostGreSQL-AddOn-1.0-pgsql8.1 && ./INSTALL
-       rm -rf /tmp/PostGreSQL-AddOn-1.0-pgsql8.1
+#      cd /tmp/PostGreSQL-AddOn-1.0-pgsql8.1 && ./INSTALL
+#      rm -rf /tmp/PostGreSQL-AddOn-1.0-pgsql8.1
        cd /tmp/Python-AddOn-1.3 && cp -fr lampp/bin /opt/lampp
        cd /tmp/Python-AddOn-1.3 && cp -fr lampp/cgi-bin /opt/lampp
        cd /tmp/Python-AddOn-1.3 && cp -fr lampp/etc /opt/lampp
@@ -110,7 +110,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd /tmp/Python-AddOn-1.3 && cp -fr lampp/modules /opt/lampp
        # cd /tmp/Python-AddOn-1.3 && cp -fr lampp/share /opt/lampp
        rm -rf /tmp/Python-AddOn-1.3
-       grep etc/python.conf /opt/lampp/etc/httpd.conf || echo -e "Include etc/python.conf" /opt/lampp/etc/httpd.conf
+       grep etc/python.conf /opt/lampp/etc/httpd.conf || echo -e "Include etc/python.conf" >> /opt/lampp/etc/httpd.conf
        chown -R nobody.nobody /opt/lampp/htdocs
        ln -fs /opt/lampp/lib/mysql/libmysqlclient.* /usr/lib
        ldconfig

diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386
index 3ac7cd3371018f0f7ba1724deea85dbc205a9721..01b5c8acb9415811a1dd15fff61de7e5241f6152 100644 (file)
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -22182,6 +22182,12 @@ lib/modules/2.4.31-smp/misc/fcclassic.o.gz
 etc/fcron.allow
 etc/fcron.conf
 etc/fcron.deny
+etc/fcron.cyclic
+etc/fcron.daily
+etc/fcron.hourly
+etc/fcron.minutely
+etc/fcron.monthly
+etc/fcron.weekly
 usr/bin/fcronsighup
 usr/bin/fcrontab
 usr/sbin/fcron