diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 29e449ce8..135b9e2f8 100644 --- 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 -; - &Header::openbigbox('100%', 'left', '', $errormessage); ############################################################################################################################ @@ -491,7 +460,7 @@ END Uploadstandardklasse: $qossettings{'DEFCLASS_OUT'} ACKs: $qossettings{'ACK'}
- + END ; @@ -865,7 +834,6 @@ END if ( $classline[0] eq $qossettings{'RED_DEV'} ) { print < $classline[0] $classline[1] $classline[2] @@ -908,7 +876,6 @@ END @subclassline = split( /\;/, $subclassentry ); if ( $subclassline[1] eq $classline[1] ) { print < Subklasse: $subclassline[2] $subclassline[3] @@ -916,12 +883,29 @@ END $subclassline[5] $subclassline[6] $subclassline[7] - -   -   -   - + + +
+ + +
+
+ + + +
+
+ + + +
+
+ + + +
+
END ; } @@ -935,7 +919,6 @@ END if ( $classline[0] eq $qossettings{'IMQ_DEV'} ) { print < $classline[0] $classline[1] $classline[2] @@ -978,7 +961,6 @@ END @subclassline = split( /\;/, $subclassentry ); if ( $subclassline[1] eq $classline[1] ) { print < Subklasse: $subclassline[2] $subclassline[3] @@ -986,12 +968,29 @@ END $subclassline[5] $subclassline[6] $subclassline[7] - -   -   -   - - + + +
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
END ; } @@ -1060,7 +1059,6 @@ END if ( $l7ruleline[1] eq $qossettings{'IMQ_DEV'} ) { print < $l7ruleline[1] $l7ruleline[0] $l7ruleline[2] @@ -1118,7 +1116,6 @@ END if ( $portruleline[1] eq $qossettings{'RED_DEV'} ) { print < $portruleline[1] $portruleline[0] $portruleline[2] @@ -1127,15 +1124,28 @@ END $portruleline[5] $portruleline[6] - - - - - - -   - - + +
+ + + + + + + + +
+
+ + + + + + + + +
+
END ; } @@ -1147,7 +1157,6 @@ END if ( $portruleline[1] eq $qossettings{'IMQ_DEV'} ) { print < $portruleline[1] $portruleline[0] $portruleline[2] @@ -1156,15 +1165,28 @@ END $portruleline[5] $portruleline[6] - - - - - - -   - - + +
+ + + + + + + + +
+
+ + + + + + + + +
+
END ; } diff --git a/lfs/xampp b/lfs/xampp index 88daaace0..6ed5b7fa2 100644 --- 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 3ac7cd337..01b5c8acb 100644 --- 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