IPFire-SCM January 2014

ipfire-scm@lists.ipfire.org

1 participants
89 discussions

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 277060a472c826541885b40392e0d5a96ba1cf97
by git＠ipfire.org 07 Jan '14

07 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, fifteen has been updated via 277060a472c826541885b40392e0d5a96ba1cf97 (commit) from 5ca9ea6a28511653ca1c6d42725c15723ef89104 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 277060a472c826541885b40392e0d5a96ba1cf97 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 7 16:14:30 2014 +0100 mysql: Fix compiling with -fno-strict-aliasing. ----------------------------------------------------------------------- Summary of changes: lfs/mysql | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/mysql b/lfs/mysql index 5fcd7b3..aa5c357 100644 --- a/lfs/mysql +++ b/lfs/mysql @@ -32,7 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mysql -PAK_VER = 2 +PAK_VER = 3 + +CFLAGS += -fno-strict-aliasing ############################################################################### # Top-level Rules @@ -75,7 +77,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && C_EXTRA_FLAGS=-fno-strict-aliasing cd $(DIR_APP) && ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/sbin \ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 5ca9ea6a28511653ca1c6d42725c15723ef89104
by git＠ipfire.org 06 Jan '14

06 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, fifteen has been updated via 5ca9ea6a28511653ca1c6d42725c15723ef89104 (commit) via ce7c5249bfbad7b5a1ac6106621cc27a75d3ad4c (commit) from 1fbb415adad359bb9d07467214af904dc0e4b422 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5ca9ea6a28511653ca1c6d42725c15723ef89104 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 6 22:12:35 2014 +0100 fifteen: Add openvpn. This needs to be shipped any way because of the updated openssl library and the changed set of ciphers that comes with that. commit ce7c5249bfbad7b5a1ac6106621cc27a75d3ad4c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 6 22:11:47 2014 +0100 openvpn: Support Camellia cipher. ----------------------------------------------------------------------- Summary of changes: .../{oldcore/53 => core/fifteen}/filelists/openvpn | 0 html/cgi-bin/ovpnmain.cgi | 34 +++++++++++++--------- 2 files changed, 21 insertions(+), 13 deletions(-) copy config/rootfiles/{oldcore/53 => core/fifteen}/filelists/openvpn (100%) Difference in files: diff --git a/config/rootfiles/core/fifteen/filelists/openvpn b/config/rootfiles/core/fifteen/filelists/openvpn new file mode 120000 index 0000000..493f3f7 --- /dev/null +++ b/config/rootfiles/core/fifteen/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index dac3e2e..52dc6e4 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -4574,6 +4574,9 @@ END $selected{'DCIPHER'}{'AES-128-CBC'} = ''; $selected{'DCIPHER'}{'AES-192-CBC'} = ''; $selected{'DCIPHER'}{'AES-256-CBC'} = ''; + $selected{'DCIPHER'}{'CAMELLIA-128-CBC'} = ''; + $selected{'DCIPHER'}{'CAMELLIA-192-CBC'} = ''; + $selected{'DCIPHER'}{'CAMELLIA-256-CBC'} = ''; $selected{'DCIPHER'}{$cgiparams{'DCIPHER'}} = 'SELECTED'; $checked{'DCOMPLZO'}{'off'} = ''; $checked{'DCOMPLZO'}{'on'} = ''; @@ -4642,19 +4645,24 @@ END <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'comp-lzo'}</td> <td><input type='checkbox' name='DCOMPLZO' $checked{'DCOMPLZO'}{'on'} /></td> <td class='boldbase' nowrap='nowrap'>$Lang::tr{'cipher'}</td> - <td><select name='DCIPHER'><option value='DES-CBC' $selected{'DCIPHER'}{'DES-CBC'}>DES-CBC</option> - <option value='DES-EDE-CBC' $selected{'DCIPHER'}{'DES-EDE-CBC'}>DES-EDE-CBC</option> - <option value='DES-EDE3-CBC' $selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC</option> - <option value='DESX-CBC' $selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC</option> - <option value='RC2-CBC' $selected{'DCIPHER'}{'RC2-CBC'}>RC2-CBC</option> - <option value='RC2-40-CBC' $selected{'DCIPHER'}{'RC2-40-CBC'}>RC2-40-CBC</option> - <option value='RC2-64-CBC' $selected{'DCIPHER'}{'RC2-64-CBC'}>RC2-64-CBC</option> - <option value='BF-CBC' $selected{'DCIPHER'}{'BF-CBC'}>BF-CBC</option> - <option value='CAST5-CBC' $selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC</option> - <option value='AES-128-CBC' $selected{'DCIPHER'}{'AES-128-CBC'}>AES-128-CBC</option> - <option value='AES-192-CBC' $selected{'DCIPHER'}{'AES-192-CBC'}>AES-192-CBC</option> - <option value='AES-256-CBC' $selected{'DCIPHER'}{'AES-256-CBC'}>AES-256-CBC</option></select></td></tr> - <tr><td colspan='4'><hr /></td></tr> + <td><select name='DCIPHER'> + <option value='CAMELLIA-256-CBC' $selected{'DCIPHER'}{'CAMELLIA-256-CBC'}>CAMELLIA-256-CBC</option> + <option value='CAMELLIA-192-CBC' $selected{'DCIPHER'}{'CAMELLIA-192-CBC'}>CAMELLIA-192-CBC</option> + <option value='CAMELLIA-128-CBC' $selected{'DCIPHER'}{'CAMELLIA-128-CBC'}>CAMELLIA-128-CBC</option> + <option value='AES-256-CBC' $selected{'DCIPHER'}{'AES-256-CBC'}>AES-256-CBC</option> + <option value='AES-192-CBC' $selected{'DCIPHER'}{'AES-192-CBC'}>AES-192-CBC</option> + <option value='AES-128-CBC' $selected{'DCIPHER'}{'AES-128-CBC'}>AES-128-CBC</option> + <option value='CAST5-CBC' $selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC</option> + <option value='RC2-64-CBC' $selected{'DCIPHER'}{'RC2-64-CBC'}>RC2-64-CBC</option> + <option value='RC2-40-CBC' $selected{'DCIPHER'}{'RC2-40-CBC'}>RC2-40-CBC</option> + <option value='RC2-CBC' $selected{'DCIPHER'}{'RC2-CBC'}>RC2-CBC</option> + <option value='BF-CBC' $selected{'DCIPHER'}{'BF-CBC'}>BF-CBC</option> + <option value='DES-CBC' $selected{'DCIPHER'}{'DES-CBC'}>DES-CBC</option> + <option value='DES-EDE-CBC' $selected{'DCIPHER'}{'DES-EDE-CBC'}>DES-EDE-CBC</option> + <option value='DES-EDE3-CBC' $selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC</option> + <option value='DESX-CBC' $selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC</option> + </select></td></tr> + <tr><td colspan='4'><hr /></td></tr> END ; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 1fbb415adad359bb9d07467214af904dc0e4b422
by git＠ipfire.org 06 Jan '14

06 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, fifteen has been updated via 1fbb415adad359bb9d07467214af904dc0e4b422 (commit) from 3bdc1a4e426950914554fbe97e0d8ecf8d529d5c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1fbb415adad359bb9d07467214af904dc0e4b422 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 6 21:53:58 2014 +0100 apache2: Fix directory permissions of themes. ----------------------------------------------------------------------- Summary of changes: lfs/apache2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/apache2 b/lfs/apache2 index a3c7ada..50c94a6 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -100,8 +100,8 @@ ifeq "$(PASS)" "C" chmod 755 /srv/web/ipfire/html /srv/web/ipfire/html/{index.cgi,redirect.cgi,dial.cgi,images,include,themes,themes/*,themes/*/*} ln -svf ipfire /srv/web/ipfire/html/themes/ipfire-rounded - # Reset permissions of redirect templates directories - find /srv/web/ipfire/html/redirect-templates -type d | xargs chmod -v 755 + # Reset permissions of redirect templates and theme directories + find /srv/web/ipfire/html/{redirect-templates,themes} -type d | xargs chmod -v 755 else @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/httpd-2.2.2-config-1.patch hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 3bdc1a4e426950914554fbe97e0d8ecf8d529d5c
by git＠ipfire.org 06 Jan '14

06 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, fifteen has been updated via 3bdc1a4e426950914554fbe97e0d8ecf8d529d5c (commit) from 49da7d797547095ee8a13b079c63661e8e4aa1ad (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3bdc1a4e426950914554fbe97e0d8ecf8d529d5c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 6 19:10:27 2014 +0100 openssl: Update to 1.0.1f. ----------------------------------------------------------------------- Summary of changes: lfs/openssl | 5 +- src/patches/openssl-1.0.1e-fix_pod_syntax-1.patch | 393 ---------------------- 2 files changed, 2 insertions(+), 396 deletions(-) delete mode 100644 src/patches/openssl-1.0.1e-fix_pod_syntax-1.patch Difference in files: diff --git a/lfs/openssl b/lfs/openssl index e75101f..4d4516c 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 1.0.1e +VER = 1.0.1f THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -51,7 +51,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 66bf6f10f060d561929de96f9dfe5b8c +$(DL_FILE)_MD5 = f26b09c028a0541cab33da697d522b25 install : $(TARGET) @@ -85,7 +85,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1-beta2-build.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1e-cryptodev.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1e-fix_parallel_build-1.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1e-fix_pod_syntax-1.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1e-weak-ciphers.patch cd $(DIR_APP) && find crypto/ -name Makefile -exec \ diff --git a/src/patches/openssl-1.0.1e-fix_pod_syntax-1.patch b/src/patches/openssl-1.0.1e-fix_pod_syntax-1.patch deleted file mode 100644 index ba25afe..0000000 --- a/src/patches/openssl-1.0.1e-fix_pod_syntax-1.patch +++ /dev/null @@ -1,393 +0,0 @@ -Submitted By: Martin Ward <macros_the_black at ntlworld dot com> -Date: 2013-06-18 -Initial Package Version: 1.0.1e -Upstream Status: Unknown -Origin: self, based on fedora -Description: Fixes install with perl-5.18. - -diff -Naur openssl-1.0.1e.orig/doc/apps/cms.pod openssl-1.0.1e/doc/apps/cms.pod ---- openssl-1.0.1e.orig/doc/apps/cms.pod 2013-06-06 14:35:15.867871879 +0100 -+++ openssl-1.0.1e/doc/apps/cms.pod 2013-06-06 14:35:25.791747119 +0100 -@@ -450,28 +450,28 @@ - - =over 4 - --=item 0 -+=item C<0> - - the operation was completely successfully. - --=item 1 -+=item C<1> - - an error occurred parsing the command options. - --=item 2 -+=item C<2> - - one of the input files could not be read. - --=item 3 -+=item C<3> - - an error occurred creating the CMS file or when reading the MIME - message. - --=item 4 -+=item C<4> - - an error occurred decrypting or verifying the message. - --=item 5 -+=item C<5> - - the message was verified correctly but an error occurred writing out - the signers certificates. -diff -Naur openssl-1.0.1e.orig/doc/apps/smime.pod openssl-1.0.1e/doc/apps/smime.pod ---- openssl-1.0.1e.orig/doc/apps/smime.pod 2013-06-06 14:35:15.867871879 +0100 -+++ openssl-1.0.1e/doc/apps/smime.pod 2013-06-06 14:35:25.794747082 +0100 -@@ -308,28 +308,28 @@ - - =over 4 - --=item 0 -+=item C<0> - - the operation was completely successfully. - --=item 1 -+=item C<1> - - an error occurred parsing the command options. - --=item 2 -+=item C<2> - - one of the input files could not be read. - --=item 3 -+=item C<3> - - an error occurred creating the PKCS#7 file or when reading the MIME - message. - --=item 4 -+=item C<4> - - an error occurred decrypting or verifying the message. - --=item 5 -+=item C<5> - - the message was verified correctly but an error occurred writing out - the signers certificates. -diff -Naur openssl-1.0.1e.orig/doc/crypto/X509_STORE_CTX_get_error.pod openssl-1.0.1e/doc/crypto/X509_STORE_CTX_get_error.pod ---- openssl-1.0.1e.orig/doc/crypto/X509_STORE_CTX_get_error.pod 2013-06-06 14:35:15.874871791 +0100 -+++ openssl-1.0.1e/doc/crypto/X509_STORE_CTX_get_error.pod 2013-06-06 14:37:13.826388940 +0100 -@@ -278,6 +278,8 @@ - an application specific error. This will never be returned unless explicitly - set by an application. - -+=back -+ - =head1 NOTES - - The above functions should be used instead of directly referencing the fields -diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_accept.pod openssl-1.0.1e/doc/ssl/SSL_accept.pod ---- openssl-1.0.1e.orig/doc/ssl/SSL_accept.pod 2013-06-06 14:35:15.871871829 +0100 -+++ openssl-1.0.1e/doc/ssl/SSL_accept.pod 2013-06-06 14:35:25.796747057 +0100 -@@ -44,12 +44,12 @@ - - =over 4 - --=item 1 -+=item C<1> - - The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been - established. - --=item 0 -+=item C<0> - - The TLS/SSL handshake was not successful but was shut down controlled and - by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the -diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_clear.pod openssl-1.0.1e/doc/ssl/SSL_clear.pod ---- openssl-1.0.1e.orig/doc/ssl/SSL_clear.pod 2013-06-06 14:35:15.871871829 +0100 -+++ openssl-1.0.1e/doc/ssl/SSL_clear.pod 2013-06-06 14:35:25.803746969 +0100 -@@ -56,12 +56,12 @@ - - =over 4 - --=item 0 -+=item C<0> - - The SSL_clear() operation could not be performed. Check the error stack to - find out the reason. - --=item 1 -+=item C<1> - - The SSL_clear() operation was successful. - -diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_COMP_add_compression_method.pod openssl-1.0.1e/doc/ssl/SSL_COMP_add_compression_method.pod ---- openssl-1.0.1e.orig/doc/ssl/SSL_COMP_add_compression_method.pod 2013-06-06 14:35:15.870871842 +0100 -+++ openssl-1.0.1e/doc/ssl/SSL_COMP_add_compression_method.pod 2013-06-06 14:35:25.806746931 +0100 -@@ -53,11 +53,11 @@ - - =over 4 - --=item 0 -+=item C<0> - - The operation succeeded. - --=item 1 -+=item C<1> - - The operation failed. Check the error queue to find out the reason. - -diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_connect.pod openssl-1.0.1e/doc/ssl/SSL_connect.pod ---- openssl-1.0.1e.orig/doc/ssl/SSL_connect.pod 2013-06-06 14:35:15.869871854 +0100 -+++ openssl-1.0.1e/doc/ssl/SSL_connect.pod 2013-06-06 14:35:25.808746906 +0100 -@@ -41,12 +41,12 @@ - - =over 4 - --=item 1 -+=item C<1> - - The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been - established. - --=item 0 -+=item C<0> - - The TLS/SSL handshake was not successful but was shut down controlled and - by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the -diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_add_session.pod openssl-1.0.1e/doc/ssl/SSL_CTX_add_session.pod ---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_add_session.pod 2013-06-06 14:35:15.871871829 +0100 -+++ openssl-1.0.1e/doc/ssl/SSL_CTX_add_session.pod 2013-06-06 14:35:25.816746805 +0100 -@@ -52,13 +52,13 @@ - - =over 4 - --=item 0 -+=item C<0> - - The operation failed. In case of the add operation, it was tried to add - the same (identical) session twice. In case of the remove operation, the - session was not found in the cache. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_load_verify_locations.pod openssl-1.0.1e/doc/ssl/SSL_CTX_load_verify_locations.pod ---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_load_verify_locations.pod 2013-06-06 14:35:15.870871842 +0100 -+++ openssl-1.0.1e/doc/ssl/SSL_CTX_load_verify_locations.pod 2013-06-06 14:35:25.818746780 +0100 -@@ -100,13 +100,13 @@ - - =over 4 - --=item 0 -+=item C<0> - - The operation failed because B<CAfile> and B<CApath> are NULL or the - processing at one of the locations specified failed. Check the error - stack to find out the reason. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_client_CA_list.pod openssl-1.0.1e/doc/ssl/SSL_CTX_set_client_CA_list.pod ---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_client_CA_list.pod 2013-06-06 14:35:15.871871829 +0100 -+++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_client_CA_list.pod 2013-06-06 14:35:25.821746742 +0100 -@@ -66,11 +66,11 @@ - - =over 4 - --=item 1 -+=item C<1> - - The operation succeeded. - --=item 0 -+=item C<0> - - A failure while manipulating the STACK_OF(X509_NAME) object occurred or - the X509_NAME could not be extracted from B<cacert>. Check the error stack -diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_session_id_context.pod openssl-1.0.1e/doc/ssl/SSL_CTX_set_session_id_context.pod ---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_session_id_context.pod 2013-06-06 14:35:15.871871829 +0100 -+++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_session_id_context.pod 2013-06-06 14:35:25.828746654 +0100 -@@ -64,13 +64,13 @@ - - =over 4 - --=item 0 -+=item C<0> - - The length B<sid_ctx_len> of the session id context B<sid_ctx> exceeded - the maximum allowed length of B<SSL_MAX_SSL_SESSION_ID_LENGTH>. The error - is logged to the error stack. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_ssl_version.pod openssl-1.0.1e/doc/ssl/SSL_CTX_set_ssl_version.pod ---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_ssl_version.pod 2013-06-06 14:35:15.871871829 +0100 -+++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_ssl_version.pod 2013-06-06 14:35:25.831746617 +0100 -@@ -42,11 +42,11 @@ - - =over 4 - --=item 0 -+=item C<0> - - The new choice failed, check the error stack to find out the reason. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_use_psk_identity_hint.pod openssl-1.0.1e/doc/ssl/SSL_CTX_use_psk_identity_hint.pod ---- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2013-06-06 14:35:15.870871842 +0100 -+++ openssl-1.0.1e/doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2013-06-06 14:36:42.456783309 +0100 -@@ -81,6 +81,8 @@ - - Return values from the server callback are interpreted as follows: - -+=over -+ - =item > 0 - - PSK identity was found and the server callback has provided the PSK -@@ -94,9 +96,11 @@ - connection will fail with decryption_error before it will be finished - completely. - --=item 0 -+=item C<0> - - PSK identity was not found. An "unknown_psk_identity" alert message - will be sent and the connection setup fails. - -+=back -+ - =cut -diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_do_handshake.pod openssl-1.0.1e/doc/ssl/SSL_do_handshake.pod ---- openssl-1.0.1e.orig/doc/ssl/SSL_do_handshake.pod 2013-06-06 14:35:15.869871854 +0100 -+++ openssl-1.0.1e/doc/ssl/SSL_do_handshake.pod 2013-06-06 14:35:25.839746516 +0100 -@@ -45,12 +45,12 @@ - - =over 4 - --=item 1 -+=item C<1> - - The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been - established. - --=item 0 -+=item C<0> - - The TLS/SSL handshake was not successful but was shut down controlled and - by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the -diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_read.pod openssl-1.0.1e/doc/ssl/SSL_read.pod ---- openssl-1.0.1e.orig/doc/ssl/SSL_read.pod 2013-06-06 14:35:15.871871829 +0100 -+++ openssl-1.0.1e/doc/ssl/SSL_read.pod 2013-06-06 14:35:25.847746415 +0100 -@@ -86,7 +86,7 @@ - The read operation was successful; the return value is the number of - bytes actually read from the TLS/SSL connection. - --=item 0 -+=item C<0> - - The read operation was not successful. The reason may either be a clean - shutdown due to a "close notify" alert sent by the peer (in which case -diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_session_reused.pod openssl-1.0.1e/doc/ssl/SSL_session_reused.pod ---- openssl-1.0.1e.orig/doc/ssl/SSL_session_reused.pod 2013-06-06 14:35:15.871871829 +0100 -+++ openssl-1.0.1e/doc/ssl/SSL_session_reused.pod 2013-06-06 14:35:25.849746390 +0100 -@@ -27,11 +27,11 @@ - - =over 4 - --=item 0 -+=item C<0> - - A new session was negotiated. - --=item 1 -+=item C<1> - - A session was reused. - -diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_set_fd.pod openssl-1.0.1e/doc/ssl/SSL_set_fd.pod ---- openssl-1.0.1e.orig/doc/ssl/SSL_set_fd.pod 2013-06-06 14:35:15.869871854 +0100 -+++ openssl-1.0.1e/doc/ssl/SSL_set_fd.pod 2013-06-06 14:35:25.852746353 +0100 -@@ -35,11 +35,11 @@ - - =over 4 - --=item 0 -+=item C<0> - - The operation failed. Check the error stack to find out why. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_set_session.pod openssl-1.0.1e/doc/ssl/SSL_set_session.pod ---- openssl-1.0.1e.orig/doc/ssl/SSL_set_session.pod 2013-06-06 14:35:15.870871842 +0100 -+++ openssl-1.0.1e/doc/ssl/SSL_set_session.pod 2013-06-06 14:35:25.855746315 +0100 -@@ -37,11 +37,11 @@ - - =over 4 - --=item 0 -+=item C<0> - - The operation failed; check the error stack to find out the reason. - --=item 1 -+=item C<1> - - The operation succeeded. - -diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_shutdown.pod openssl-1.0.1e/doc/ssl/SSL_shutdown.pod ---- openssl-1.0.1e.orig/doc/ssl/SSL_shutdown.pod 2013-06-06 14:35:15.870871842 +0100 -+++ openssl-1.0.1e/doc/ssl/SSL_shutdown.pod 2013-06-06 14:35:25.857746290 +0100 -@@ -92,12 +92,12 @@ - - =over 4 - --=item 1 -+=item C<1> - - The shutdown was successfully completed. The "close notify" alert was sent - and the peer's "close notify" alert was received. - --=item 0 -+=item C<0> - - The shutdown is not yet finished. Call SSL_shutdown() for a second time, - if a bidirectional shutdown shall be performed. -diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_write.pod openssl-1.0.1e/doc/ssl/SSL_write.pod ---- openssl-1.0.1e.orig/doc/ssl/SSL_write.pod 2013-06-06 14:35:15.870871842 +0100 -+++ openssl-1.0.1e/doc/ssl/SSL_write.pod 2013-06-06 14:35:25.865746189 +0100 -@@ -79,7 +79,7 @@ - The write operation was successful, the return value is the number of - bytes actually written to the TLS/SSL connection. - --=item 0 -+=item C<0> - - The write operation was not successful. Probably the underlying connection - was closed. Call SSL_get_error() with the return value B<ret> to find out, hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 49da7d797547095ee8a13b079c63661e8e4aa1ad
by git＠ipfire.org 06 Jan '14

06 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, fifteen has been updated via 49da7d797547095ee8a13b079c63661e8e4aa1ad (commit) from 95e9415ada2cd29399eec02c2748ca22792ec0a4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 49da7d797547095ee8a13b079c63661e8e4aa1ad Author: Alexander Marx <amarx(a)ipfire.org> Date: Mon Jan 6 13:18:05 2014 +0100 Firewall: added check if firewallrules need to be updated when editing services or servicegroups ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/fwhosts.cgi | 47 ++++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-) Difference in files: diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index 3e59a9d..ae135ab 100755 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -239,20 +239,12 @@ if ($fwhostsettings{'ACTION'} eq 'updateservice') foreach my $key (sort keys %customservicegrp){ if($customservicegrp{$key}[2] eq $fwhostsettings{'oldsrvname'}){ $customservicegrp{$key}[2] = $fwhostsettings{'SRV_NAME'}; + &checkrulereload($customservicegrp{$key}[0]); } } &General::writehasharray("$configsrvgrp", \%customservicegrp); - $needrules='on'; - } - if($count gt 0 && $fwhostsettings{'oldsrvport'} ne $fwhostsettings{'SRV_PORT'} ){ - $needrules='on'; - } - if($count gt 0 && $fwhostsettings{'oldsrvprot'} ne $fwhostsettings{'PROT'} ){ - $needrules='on'; - } - if($count gt 0 && $fwhostsettings{'oldsrvicmp'} ne $fwhostsettings{'ICMP'} ){ - $needrules='on'; } + &checkrulereload($fwhostsettings{'SRV_NAME'}); $fwhostsettings{'SRV_NAME'} = ''; $fwhostsettings{'SRV_PORT'} = ''; $fwhostsettings{'PROT'} = ''; @@ -266,9 +258,6 @@ if ($fwhostsettings{'ACTION'} eq 'updateservice') $fwhostsettings{'ICMP'} = $fwhostsettings{'oldsrvicmp'}; $fwhostsettings{'updatesrv'}= 'on'; } - if($needrules eq 'on'){ - &General::firewall_config_changed(); - } &addservice; } # save @@ -751,7 +740,6 @@ if ($fwhostsettings{'ACTION'} eq 'saveservicegrp') { my $prot; my $port; - my $count=0; my $tcpcounter=0; my $udpcounter=0; &General::readhasharray("$configsrvgrp", \%customservicegrp ); @@ -818,9 +806,7 @@ if ($fwhostsettings{'ACTION'} eq 'saveservicegrp') &General::writehasharray("$configsrvgrp", \%customservicegrp ); $fwhostsettings{'updatesrvgrp'}='on'; } - if ($count gt 0){ - &General::firewall_config_changed(); - } + &checkrulereload($fwhostsettings{'SRVGRP_NAME'}); &addservicegrp; &viewtableservicegrp; } @@ -1938,6 +1924,33 @@ sub checkservicegroup } return $errormessage; } +sub checkrulereload +{ + my $search=shift; + &General::readhasharray("$fwconfigfwd", \%fwfwd); + &General::readhasharray("$fwconfiginp", \%fwinp); + &General::readhasharray("$fwconfigout", \%fwout); + + #check if service or servicegroup is used in rules + foreach my $key (keys %fwfwd){ + if($search eq $fwfwd{$key}[15]){ + &General::firewall_config_changed(); + return; + } + } + foreach my $key (keys %fwinp){ + if($search eq $fwinp{$key}[15]){ + &General::firewall_config_changed(); + return; + } + } + foreach my $key (keys %fwout){ + if($search eq $fwout{$key}[15]){ + &General::firewall_config_changed(); + return; + } + } +} sub error { if ($errormessage) { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 95e9415ada2cd29399eec02c2748ca22792ec0a4
by git＠ipfire.org 06 Jan '14

06 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, fifteen has been updated via 95e9415ada2cd29399eec02c2748ca22792ec0a4 (commit) from 73cb6627fc3d44ecade787f3fd80cc91d53a42f8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 95e9415ada2cd29399eec02c2748ca22792ec0a4 Author: Alexander Marx <amarx(a)ipfire.org> Date: Mon Jan 6 13:23:48 2014 +0100 firewall: Fix colouring when IPsec VPN subnets are denoted in CIDR. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/firewall.cgi | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index b313d4b..e7884ca 100755 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -1351,6 +1351,7 @@ sub getcolor #Check if IP is part of a IPsec N2N network foreach my $key (sort keys %ipsecconf){ my ($a,$b) = split("/",$ipsecconf{$key}[11]); + $b=&General::iporsubtodec($b); if (&General::IpInSubnet($c,$a,$b)){ $tdcolor="style='background-color: $Header::colourvpn;color:white;'"; return; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 73cb6627fc3d44ecade787f3fd80cc91d53a42f8
by git＠ipfire.org 06 Jan '14

06 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, fifteen has been updated via 73cb6627fc3d44ecade787f3fd80cc91d53a42f8 (commit) via d0f8bbc13e5d1158b86a58c1744a81e36c899aa8 (commit) via f4d5310decf8cd8f16d92bfe0457cc8fb87fc663 (commit) via f0dc00d80f0b97059df52b624e1a982a6dad5bcd (commit) via 9566c8f52cd96ae3dee000f72028eb80a31bca16 (commit) from f4b373993fb60809901e7c45d690f569b0d8867c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 73cb6627fc3d44ecade787f3fd80cc91d53a42f8 Author: Alexander Marx <amarx(a)ipfire.org> Date: Mon Jan 6 05:58:40 2014 +0100 SQUID: fixed length of FAKE_REFERRER field commit d0f8bbc13e5d1158b86a58c1744a81e36c899aa8 Author: Alexander Marx <amarx(a)ipfire.org> Date: Mon Jan 6 05:19:44 2014 +0100 Firewall: reaktivated targetport-check. now there's an errromessage in case of wrong portnumber commit f4d5310decf8cd8f16d92bfe0457cc8fb87fc663 Author: Alexander Marx <amarx(a)ipfire.org> Date: Mon Jan 6 05:03:40 2014 +0100 Firewall: deleted subnet from source and target addresses if manually used commit f0dc00d80f0b97059df52b624e1a982a6dad5bcd Author: Alexander Marx <amarx(a)ipfire.org> Date: Sun Jan 5 21:45:54 2014 +0100 Firewall: fix last commit. commit 9566c8f52cd96ae3dee000f72028eb80a31bca16 Author: Alexander Marx <amarx(a)ipfire.org> Date: Sun Jan 5 16:00:47 2014 +0100 Firewall: Bugfix - when creating a rule which leads to an error, the rule action (Accept/Drop/Reject) is set to default ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/firewall.cgi | 29 ++++++++++++++--------------- html/cgi-bin/proxy.cgi | 4 ++-- 2 files changed, 16 insertions(+), 17 deletions(-) Difference in files: diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 29b70b4..b313d4b 100755 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -659,6 +659,8 @@ sub checktarget if (&General::validport($_)){ push (@values,$_); }else{ + $errormessage=$Lang::tr{'fwdfw err tgt_port'}; + return $errormessage; } } } @@ -1426,6 +1428,11 @@ sub newrule open (CONN1,"/var/ipfire/red/local-ipaddress"); my $redip = <CONN1>; close(CONN1); + if (! $fwdfwsettings{'RULE_ACTION'} && $fwdfwsettings{'POLICY'} eq 'MODE2'){ + $fwdfwsettings{'RULE_ACTION'}='DROP'; + }elsif(! $fwdfwsettings{'RULE_ACTION'} && $fwdfwsettings{'POLICY'} eq 'MODE1'){ + $fwdfwsettings{'RULE_ACTION'}='ACCEPT'; + } $checked{'grp1'}{$fwdfwsettings{'grp1'}} = 'CHECKED'; $checked{'grp2'}{$fwdfwsettings{'grp2'}} = 'CHECKED'; $checked{'grp3'}{$fwdfwsettings{'grp3'}} = 'CHECKED'; @@ -1548,6 +1555,11 @@ sub newrule } } } + # Split manual source and target address and delete the subnet + my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}}); + if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp1'}}=$sip;} + my ($dip,$dcidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp2'}}); + if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;} &Header::openbox('100%', 'left', $Lang::tr{'fwdfw addrule'}); &Header::closebox(); &Header::openbox('100%', 'left', $Lang::tr{'fwdfw source'}); @@ -1833,23 +1845,9 @@ END END &Header::closebox; - - $checked{"RULE_ACTION"} = (); - foreach ("ACCEPT", "DROP", "REJECT") { - $checked{"RULE_ACTION"}{$_} = ""; - } - - if($fwdfwsettings{'updatefwrule'} eq 'on') { - $checked{"RULE_ACTION"}{$fwdfwsettings{'RULE_ACTION'}} = "checked"; - } elsif ($fwdfwsettings{'POLICY'} eq 'MODE1') { - $checked{"RULE_ACTION"}{"ACCEPT"} = "checked"; - } elsif ($fwdfwsettings{'POLICY'} eq 'MODE2') { - $checked{"RULE_ACTION"}{"DROP"} = "checked"; - } - + $checked{"RULE_ACTION"}{$fwdfwsettings{'RULE_ACTION'}} = 'CHECKED'; print <<END; <hr><br> - <center> <table width="80%" border="0"> <tr> @@ -2027,6 +2025,7 @@ END <input type='hidden' name='oldorange' value='$fwdfwsettings{'oldorange'}' /> <input type='hidden' name='oldnat' value='$fwdfwsettings{'oldnat'}' /> <input type='hidden' name='oldruletype' value='$fwdfwsettings{'oldruletype'}' /> + <input type='hidden' name='nat' value='$fwdfwsettings{'nat'}' /> <input type='hidden' name='ACTION' value='saverule' ></form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value'reset'></td></td> </table></form> END diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index acb4f97..6f78deb 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -1678,8 +1678,8 @@ print <<END <td class='base'>$Lang::tr{'advproxy fake referer'}: <img src='/blob.gif' alt='*' /></td> </tr> <tr> - <td><input type='text' name='FAKE_USERAGENT' value='$proxysettings{'FAKE_USERAGENT'}' size='56' /></td> - <td><input type='text' name='FAKE_REFERER' value='$proxysettings{'FAKE_REFERER'}' size='56' /></td> + <td><input type='text' name='FAKE_USERAGENT' value='$proxysettings{'FAKE_USERAGENT'}' size='40%' /></td> + <td><input type='text' name='FAKE_REFERER' value='$proxysettings{'FAKE_REFERER'}' size='40%' /></td> </tr> </table> <hr size='1'> hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. f4b373993fb60809901e7c45d690f569b0d8867c
by git＠ipfire.org 06 Jan '14

06 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, fifteen has been updated via f4b373993fb60809901e7c45d690f569b0d8867c (commit) via 75474c3c493c3f2f4a4ab793910557fffc4182d3 (commit) from 9027a25d92afbbb4486c17deac66b4c439e80520 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f4b373993fb60809901e7c45d690f569b0d8867c Merge: 75474c3 9027a25 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jan 6 08:56:31 2014 +0100 Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen commit 75474c3c493c3f2f4a4ab793910557fffc4182d3 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jan 6 08:53:30 2014 +0100 apache: Add message for generating host certs. On rpi this need 3.5 minutes so it is better to show that this need a while. ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/apache | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Difference in files: diff --git a/src/initscripts/init.d/apache b/src/initscripts/init.d/apache index 4c73a7f..5405d77 100644 --- a/src/initscripts/init.d/apache +++ b/src/initscripts/init.d/apache @@ -9,12 +9,14 @@ case "$1" in start) - boot_mesg "Starting Apache daemon..." if [ -f /etc/httpd/server.key -a -f /etc/httpd/server.crt -a -f /etc/httpd/server.csr ]; then /usr/local/bin/httpscert read >/dev/null 2>&1 else + boot_mesg "Generating https host certificate... this may take some minutes..." /usr/local/bin/httpscert new >/dev/null 2>&1 + evaluate_retval fi + boot_mesg "Starting Apache daemon..." /usr/sbin/apachectl -k start evaluate_retval ;; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 9027a25d92afbbb4486c17deac66b4c439e80520
by git＠ipfire.org 05 Jan '14

05 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, fifteen has been updated via 9027a25d92afbbb4486c17deac66b4c439e80520 (commit) via 4234ca5d64f8e34c40ee48c58599f00cb3a15862 (commit) via 0051027b79220c17a8eb5e05dcf79e1549c94489 (commit) via 935f311ed9dc4c67d7e603f6b08a45d1225422c8 (commit) via 8a39dd30e3d7f8386d15db6960926d75148610be (commit) via fe9f7588151c5f98a73f5718cd19b1743ff1d6c2 (commit) via dd2ef3b2370e89a79dc01ada8aa1f00d8f0615ee (commit) via 121628ea689844c3e6618d0e7ae4b83f8b3cbea6 (commit) via 3f653a29ae0e030a36fe4a49652fc0411eed782c (commit) via f14e224b1c98924dd46f50fa3539c7b799ebc35d (commit) via 802d795488a1387e8b564201894d3db39681d08b (commit) via b3f7b96824062f9fa3d9222a4b7e117ae20c949f (commit) via a4b9426b0f5f965128fc745013e26b3d1cd316a9 (commit) via ff972c82761ab198819dc268b154b7b4cc0b06df (commit) via c3f00878dded2e80bfaba67627d2826ad8d49f89 (commit) via 697a4d5217b10429a40a5224ac65b680485dc080 (commit) via f880f8a22528ff0e896eb2a3e1bfdaa676493966 (commit) via 926241aea24a60dce858c863aac39d6be83b23df (commit) via eb6389d09de11b2aad940d5bbacb5e2a28ce79fa (commit) via 865c76157580b18551df1033781fbf3b8fccc8e6 (commit) via ceda40f2bcd67c7e0b3215e0c32eec21ca59811c (commit) via af731c7dc5e4d947893bcd1427d14195665bcb4f (commit) from 1dc44471365cccef7ab2b3ec766c0d0c26f86475 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9027a25d92afbbb4486c17deac66b4c439e80520 Merge: 4234ca5 935f311 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 21:16:17 2014 +0100 Merge remote-tracking branch 'ms/fifteen-theme' into fifteen commit 4234ca5d64f8e34c40ee48c58599f00cb3a15862 Author: Alexander Marx <amarx(a)ipfire.org> Date: Sun Jan 5 15:18:24 2014 +0100 Firewall: cleanup of unused JS variables. commit 0051027b79220c17a8eb5e05dcf79e1549c94489 Author: Alexander Marx <amarx(a)ipfire.org> Date: Fri Jan 3 09:13:33 2014 +0100 Firewall: Bugfix - when creating a SNAT rule and using a service or servicegroup there was an errormessage displayed commit 935f311ed9dc4c67d7e603f6b08a45d1225422c8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 21:07:41 2014 +0100 Add an alternative default theme with rounded corners. commit 8a39dd30e3d7f8386d15db6960926d75148610be Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 19:38:14 2014 +0100 fifteen: Add all updated themes and CGI files to the updater. commit fe9f7588151c5f98a73f5718cd19b1743ff1d6c2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 19:36:06 2014 +0100 ipfire theme: Show hostname in title by default. commit dd2ef3b2370e89a79dc01ada8aa1f00d8f0615ee Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 19:32:23 2014 +0100 ipfire-theme: Update path to jQuery. commit 121628ea689844c3e6618d0e7ae4b83f8b3cbea6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 19:31:32 2014 +0100 GUI: Remove the blend effects option. commit 3f653a29ae0e030a36fe4a49652fc0411eed782c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 19:25:46 2014 +0100 ipfire-legacy theme: Update web resource paths. commit f14e224b1c98924dd46f50fa3539c7b799ebc35d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 19:18:55 2014 +0100 ipfire theme: Update file paths to web resource files. commit 802d795488a1387e8b564201894d3db39681d08b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 19:06:08 2014 +0100 header.pl: Include required perl module. commit b3f7b96824062f9fa3d9222a4b7e117ae20c949f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 19:02:09 2014 +0100 ipfire theme: Remove lowercase stylization. commit a4b9426b0f5f965128fc745013e26b3d1cd316a9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 18:58:27 2014 +0100 Rename ipfire-new theme to ipfire. commit ff972c82761ab198819dc268b154b7b4cc0b06df Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 18:58:02 2014 +0100 Rename old default theme to ipfire-legacy. commit c3f00878dded2e80bfaba67627d2826ad8d49f89 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 18:51:22 2014 +0100 ipfire-new: Update footer. commit 697a4d5217b10429a40a5224ac65b680485dc080 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 18:15:40 2014 +0100 ipfire-new: Cleanup CSS code. Lots of code that was either redudant, unused or unnecessary has been removed or has been cleaned up. commit f880f8a22528ff0e896eb2a3e1bfdaa676493966 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 15:10:27 2014 +0100 ipfire-new: Re-indent CSS file. commit 926241aea24a60dce858c863aac39d6be83b23df Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 14:59:24 2014 +0100 speedmeter: Convert bytes to bits. I assumed that it was computes in bits (hence the variable names). commit eb6389d09de11b2aad940d5bbacb5e2a28ce79fa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 14:50:34 2014 +0100 ipfire-new: Fix positioning of the page headline. commit 865c76157580b18551df1033781fbf3b8fccc8e6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 14:40:06 2014 +0100 speedmeter: Show speeds in Bit/s, kBit/s, MBit/s, ... Also clean up the dirty HTML code. commit ceda40f2bcd67c7e0b3215e0c32eec21ca59811c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 14:15:11 2014 +0100 ipfire-new: Fix encoding of refreshInetInfo.js. commit af731c7dc5e4d947893bcd1427d14195665bcb4f Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Sun Jan 5 14:04:59 2014 +0100 New theme for the IPFire web user interface ----------------------------------------------------------------------- Summary of changes: config/cfgroot/header.pl | 5 +- config/rootfiles/core/fifteen/filelists/files | 6 +- config/rootfiles/core/fifteen/update.sh | 3 + doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 2 + doc/language_issues.fr | 2 + doc/language_issues.nl | 2 + doc/language_issues.pl | 2 + doc/language_issues.ru | 2 + doc/language_issues.tr | 2 + doc/language_missings | 4 + html/cgi-bin/firewall.cgi | 12 +- html/cgi-bin/gui.cgi | 21 +- html/html/themes/darkdos/include/functions.pl | 10 - .../themes/{ipfire => ipfire-legacy}/images/n1.gif | Bin .../themes/{ipfire => ipfire-legacy}/images/n2.gif | Bin .../themes/{ipfire => ipfire-legacy}/images/n3.gif | Bin .../themes/{ipfire => ipfire-legacy}/images/n4.gif | Bin .../themes/{ipfire => ipfire-legacy}/images/n5.gif | Bin .../themes/{ipfire => ipfire-legacy}/images/n6.gif | Bin .../{ipfire => ipfire-legacy}/images/spacer.gif | Bin .../{ipfire => ipfire-legacy}/include/colors.txt | 0 .../{ipfire => ipfire-legacy}/include/functions.pl | 12 +- .../{ipfire => ipfire-legacy}/include/style.css | 14 +- html/html/themes/ipfire/images/tux2.png | Bin 0 -> 9640 bytes .../themes/ipfire/include/css/style-rounded.css | 130 +++++ html/html/themes/ipfire/include/css/style.css | 261 ++++++++++ html/html/themes/ipfire/include/functions.pl | 529 +++++++-------------- .../themes/ipfire/include/js/refreshInetInfo.js | 69 +++ html/html/themes/maniac/include/functions.pl | 10 - langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + lfs/apache2 | 1 + 34 files changed, 688 insertions(+), 415 deletions(-) rename html/html/themes/{ipfire => ipfire-legacy}/images/n1.gif (100%) copy html/html/themes/{ipfire => ipfire-legacy}/images/n2.gif (100%) copy html/html/themes/{ipfire => ipfire-legacy}/images/n3.gif (100%) rename html/html/themes/{ipfire => ipfire-legacy}/images/n4.gif (100%) copy html/html/themes/{ipfire => ipfire-legacy}/images/n5.gif (100%) copy html/html/themes/{ipfire => ipfire-legacy}/images/n6.gif (100%) rename html/html/themes/{ipfire => ipfire-legacy}/images/spacer.gif (100%) copy html/html/themes/{ipfire => ipfire-legacy}/include/colors.txt (100%) copy html/html/themes/{ipfire => ipfire-legacy}/include/functions.pl (96%) rename html/html/themes/{ipfire => ipfire-legacy}/include/style.css (91%) create mode 100644 html/html/themes/ipfire/images/tux2.png create mode 100644 html/html/themes/ipfire/include/css/style-rounded.css create mode 100644 html/html/themes/ipfire/include/css/style.css create mode 100644 html/html/themes/ipfire/include/js/refreshInetInfo.js Difference in files: diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 299d766..bf92507 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -12,6 +12,7 @@ package Header; use CGI(); +use File::Basename; use HTML::Entities(); use Socket; use Time::Local; @@ -88,9 +89,11 @@ if ( -d "/var/ipfire/langs/${language}/" ) { }; }; +our $THEME_NAME = $settings{'THEME'}; + require "${swroot}/langs/en.pl"; require "${swroot}/langs/${language}.pl"; -eval `/bin/cat /srv/web/ipfire/html/themes/$settings{'THEME'}/include/functions.pl`; +eval `/bin/cat /srv/web/ipfire/html/themes/$THEME_NAME/include/functions.pl`; sub orange_used () { if ($ethsettings{'CONFIG_TYPE'} =~ /^[24]$/) { diff --git a/config/rootfiles/core/fifteen/filelists/files b/config/rootfiles/core/fifteen/filelists/files index 345521b..0f3a7e9 100644 --- a/config/rootfiles/core/fifteen/filelists/files +++ b/config/rootfiles/core/fifteen/filelists/files @@ -2,6 +2,7 @@ etc/system-release etc/issue etc/rc.d/init.d/network srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/gui.cgi srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/netinternal.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi @@ -11,8 +12,9 @@ srv/web/ipfire/cgi-bin/speed.cgi srv/web/ipfire/cgi-bin/urlfilter.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/html/themes/darkdos -srv/web/ipfire/html/themes/ipfire/include/functions.pl -srv/web/ipfire/html/themes/maniac/include/functions.pl +srv/web/ipfire/html/themes/ipfire +srv/web/ipfire/html/themes/ipfire-legacy +srv/web/ipfire/html/themes/maniac var/ipfire/backup/bin/backup.pl var/ipfire/backup/exclude var/ipfire/backup/include diff --git a/config/rootfiles/core/fifteen/update.sh b/config/rootfiles/core/fifteen/update.sh index d2f2fc2..4a56972 100644 --- a/config/rootfiles/core/fifteen/update.sh +++ b/config/rootfiles/core/fifteen/update.sh @@ -32,6 +32,9 @@ do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done +# Remove the old default theme +rm -rf /srv/web/ipfire/html/themes/ipfire + # Stop services diff --git a/doc/language_issues.de b/doc/language_issues.de index 8b46d6f..bcc0214 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -133,6 +133,7 @@ WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home +WARNING: translation string unused: display webinterface effects WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed diff --git a/doc/language_issues.en b/doc/language_issues.en index d4281e0..1eccc80 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -155,6 +155,7 @@ WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home +WARNING: translation string unused: display webinterface effects WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed diff --git a/doc/language_issues.es b/doc/language_issues.es index 9ae2c0a..6b6424a 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -148,6 +148,7 @@ WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home +WARNING: translation string unused: display webinterface effects WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed @@ -828,6 +829,7 @@ WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: snat new source ip address WARNING: untranslated string: static routes +WARNING: untranslated string: support donation WARNING: untranslated string: system information WARNING: untranslated string: tor WARNING: untranslated string: tor accounting diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 7e5a1f5..2f7f60d 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -148,6 +148,7 @@ WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home +WARNING: translation string unused: display webinterface effects WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed @@ -819,6 +820,7 @@ WARNING: untranslated string: server restart WARNING: untranslated string: snat new source ip address WARNING: untranslated string: snort working WARNING: untranslated string: static routes +WARNING: untranslated string: support donation WARNING: untranslated string: system information WARNING: untranslated string: tor WARNING: untranslated string: tor accounting diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 10e12db..d543069 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -150,6 +150,7 @@ WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home +WARNING: translation string unused: display webinterface effects WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed @@ -737,6 +738,7 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: snat new source ip address +WARNING: untranslated string: support donation WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 9ae2c0a..6b6424a 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -148,6 +148,7 @@ WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home +WARNING: translation string unused: display webinterface effects WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed @@ -828,6 +829,7 @@ WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: snat new source ip address WARNING: untranslated string: static routes +WARNING: untranslated string: support donation WARNING: untranslated string: system information WARNING: untranslated string: tor WARNING: untranslated string: tor accounting diff --git a/doc/language_issues.ru b/doc/language_issues.ru index f46ba7a..5a1296b 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -147,6 +147,7 @@ WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home +WARNING: translation string unused: display webinterface effects WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed @@ -800,6 +801,7 @@ WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: snat new source ip address WARNING: untranslated string: static routes +WARNING: untranslated string: support donation WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 5bd50a0..299c74d 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -155,6 +155,7 @@ WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home +WARNING: translation string unused: display webinterface effects WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed @@ -742,6 +743,7 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: snat new source ip address +WARNING: untranslated string: support donation WARNING: untranslated string: tor directory port WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: urlfilter redirect template diff --git a/doc/language_missings b/doc/language_missings index e3e5c8e..86f45b0 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -307,6 +307,7 @@ < snat new source ip address < snort working < static routes +< support donation < system information < tor < tor 0 = disabled @@ -740,6 +741,7 @@ < Set time on boot < snat new source ip address < static routes +< support donation < system information < tor < tor 0 = disabled @@ -1126,6 +1128,7 @@ < server restart < snat new source ip address < static routes +< support donation < tor < tor 0 = disabled < tor accounting @@ -1516,6 +1519,7 @@ < server restart < snat new source ip address < static routes +< support donation < tor < tor 0 = disabled < tor accounting diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 71ca752..29b70b4 100755 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -158,11 +158,6 @@ print<<END; // dropdown menu changes. \$("select").change(function() { var id = \$(this).attr("name"); - - // When using SNAT or DNAT, check "USE NAT" Checkbox - if (id === 'snat' || id === 'dnat') { - \$('#USE_NAT').prop('checked', true); - } \$('#' + id).prop("checked", true); }); }); @@ -731,7 +726,7 @@ sub checkrule if($fwdfwsettings{'USE_NAT'} eq 'ON'){ #if no dest port is given in nat area, take target host port if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'grp3'} eq 'TGT_PORT' && $fwdfwsettings{'dnatport'} eq ''){$fwdfwsettings{'dnatport'}=$fwdfwsettings{'TGT_PORT'};} - if($fwdfwsettings{'TGT_PORT'} eq ''){ + if($fwdfwsettings{'TGT_PORT'} eq '' && $fwdfwsettings{'dnatport'} ne '' && ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP')){ $errormessage=$Lang::tr{'fwdfw dnat porterr2'}; } #check if port given in nat area is a single valid port or portrange @@ -1447,6 +1442,7 @@ sub newrule $checked{'TIME_SAT'}{$fwdfwsettings{'TIME_SAT'}} = 'CHECKED'; $checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} = 'CHECKED'; $checked{'USE_NAT'}{$fwdfwsettings{'USE_NAT'}} = 'CHECKED'; + $checked{'nat'}{$fwdfwsettings{'nat'}} = 'CHECKED'; $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected'; $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected'; $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected'; @@ -1594,7 +1590,7 @@ END <td width='5%'></td> <td width='40%'> <label> - <input type='radio' name='nat' id='dnat' value='dnat' checked> + <input type='radio' name='nat' value='dnat' $checked{'nat'}{'dnat'}> $Lang::tr{'fwdfw dnat'} </label> </td> @@ -1627,7 +1623,7 @@ END <td width='5%'></td> <td width='40%'> <label> - <input type='radio' name='nat' id='snat' value='snat' $checked{'nat'}{'snat'}> + <input type='radio' name='nat' value='snat' $checked{'nat'}{'snat'}> $Lang::tr{'fwdfw snat'} </label> </td> diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi index 5abf88e..9804615 100644 --- a/html/cgi-bin/gui.cgi +++ b/html/cgi-bin/gui.cgi @@ -36,7 +36,6 @@ my %checked=(); my $errormessage=''; -$cgiparams{'FX'} = 'off'; $cgiparams{'SPEED'} = 'off'; $cgiparams{'WINDOWWITHHOSTNAME'} = 'off'; $cgiparams{'REBOOTQUESTION'} = 'off'; @@ -90,7 +89,6 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") $mainsettings{'WINDOWWITHHOSTNAME'} = $cgiparams{'WINDOWWITHHOSTNAME'}; $mainsettings{'REBOOTQUESTION'} = $cgiparams{'REBOOTQUESTION'}; $mainsettings{'PPPUPDOWNBEEP'} = $cgiparams{'PPPUPDOWNBEEP'}; - $mainsettings{'FX'} = $cgiparams{'FX'}; $mainsettings{'SPEED'} = $cgiparams{'SPEED'}; $mainsettings{'THEME'} = $cgiparams{'theme'}; $mainsettings{'REFRESHINDEX'} = $cgiparams{'REFRESHINDEX'}; @@ -101,7 +99,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") if ($mainsettings{'WINDOWWITHHOSTNAME'}) { $cgiparams{'WINDOWWITHHOSTNAME'} = $mainsettings{'WINDOWWITHHOSTNAME'}; } else { - $cgiparams{'WINDOWWITHHOSTNAME'} = 'off'; + $cgiparams{'WINDOWWITHHOSTNAME'} = 'on'; } if ($mainsettings{'REBOOTQUESTION'}) { @@ -116,12 +114,6 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") $cgiparams{'PPPUPDOWNBEEP'} = 'on'; } - if ($mainsettings{'FX'}) { - $cgiparams{'FX'} = $mainsettings{'FX'}; - } else { - $cgiparams{'FX'} = 'on'; - } - if ($mainsettings{'THEME'}) { $cgiparams{'THEME'} = $mainsettings{'THEME'}; } else { @@ -146,11 +138,10 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") # Default settings if ($cgiparams{'ACTION'} eq "$Lang::tr{'restore defaults'}") { - $cgiparams{'WINDOWWITHHOSTNAME'} = 'off'; + $cgiparams{'WINDOWWITHHOSTNAME'} = 'on'; $cgiparams{'REBOOTQUESTION'} = 'on'; $cgiparams{'PPPUPDOWNBEEP'} = 'on'; $cgiparams{'REFRESHINDEX'} = 'off'; - $cgiparams{'FX'} = 'on'; $cgiparams{'SPEED'} = 'on'; $cgiparams{'THEME'} = 'ipfire'; } @@ -171,10 +162,6 @@ $checked{'REFRESHINDEX'}{'off'} = ''; $checked{'REFRESHINDEX'}{'on'} = ''; $checked{'REFRESHINDEX'}{$cgiparams{'REFRESHINDEX'}} = "checked='checked'"; -$checked{'FX'}{'off'} = ''; -$checked{'FX'}{'on'} = ''; -$checked{'FX'}{$cgiparams{'FX'}} = "checked='checked'"; - $checked{'SPEED'}{'off'} = ''; $checked{'SPEED'}{'on'} = ''; $checked{'SPEED'}{$cgiparams{'SPEED'}} = "checked='checked'"; @@ -197,10 +184,6 @@ print <<END <td colspan='2'><p><b>$Lang::tr{'display'}</b></td> </tr> <tr> - <td><input type='checkbox' name='FX' $checked{'FX'}{'on'} /></td> - <td>$Lang::tr{'display webinterface effects'}</td> -</tr> -<tr> <td><input type='checkbox' name='WINDOWWITHHOSTNAME' $checked{'WINDOWWITHHOSTNAME'}{'on'} /></td> <td>$Lang::tr{'display hostname in window title'}</td> </tr> diff --git a/html/html/themes/darkdos/include/functions.pl b/html/html/themes/darkdos/include/functions.pl index 82e9b0a..737e051 100644 --- a/html/html/themes/darkdos/include/functions.pl +++ b/html/html/themes/darkdos/include/functions.pl @@ -149,16 +149,6 @@ sub openpage { <head> <title>$title</title> $extrahead -END -; - if ($settings{'FX'} ne 'off') { - print <<END - <meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5,Transition=12)" /> - <meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5,Transition=12)" /> -END -; - } - print <<END <link rel="shortcut icon" href="/favicon.ico" /> <link rel="stylesheet" type="text/css" href="/themes/darkdos/include/style.css" /> <script language="javascript" type="text/javascript"> diff --git a/html/html/themes/ipfire-legacy/images/n1.gif b/html/html/themes/ipfire-legacy/images/n1.gif new file mode 100644 index 0000000..6eb5161 Binary files /dev/null and b/html/html/themes/ipfire-legacy/images/n1.gif differ diff --git a/html/html/themes/ipfire-legacy/images/n2.gif b/html/html/themes/ipfire-legacy/images/n2.gif new file mode 100644 index 0000000..b92a19d Binary files /dev/null and b/html/html/themes/ipfire-legacy/images/n2.gif differ diff --git a/html/html/themes/ipfire-legacy/images/n3.gif b/html/html/themes/ipfire-legacy/images/n3.gif new file mode 100644 index 0000000..6627c91 Binary files /dev/null and b/html/html/themes/ipfire-legacy/images/n3.gif differ diff --git a/html/html/themes/ipfire-legacy/images/n4.gif b/html/html/themes/ipfire-legacy/images/n4.gif new file mode 100644 index 0000000..8698525 Binary files /dev/null and b/html/html/themes/ipfire-legacy/images/n4.gif differ diff --git a/html/html/themes/ipfire-legacy/images/n5.gif b/html/html/themes/ipfire-legacy/images/n5.gif new file mode 100644 index 0000000..a032242 Binary files /dev/null and b/html/html/themes/ipfire-legacy/images/n5.gif differ diff --git a/html/html/themes/ipfire-legacy/images/n6.gif b/html/html/themes/ipfire-legacy/images/n6.gif new file mode 100644 index 0000000..ed1781c Binary files /dev/null and b/html/html/themes/ipfire-legacy/images/n6.gif differ diff --git a/html/html/themes/ipfire-legacy/images/spacer.gif b/html/html/themes/ipfire-legacy/images/spacer.gif new file mode 100644 index 0000000..5bfd67a Binary files /dev/null and b/html/html/themes/ipfire-legacy/images/spacer.gif differ diff --git a/html/html/themes/ipfire-legacy/include/colors.txt b/html/html/themes/ipfire-legacy/include/colors.txt new file mode 100644 index 0000000..6d7dd1c --- /dev/null +++ b/html/html/themes/ipfire-legacy/include/colors.txt @@ -0,0 +1,25 @@ +color1=#CD5B45 +color2=#EE6A50 +color3=#FF7256 +color4=#EE9572 +color5=#FFA07A +color6=#CDAF95 +color7=#EECBAD +color8=#FFDAB9 +color9=#FFE4C4 +color10=#FFCCCC +color11=#0000FF +color12=#00FF00 +color13=#FF0000 +color14=#FFD700 +color15=#CCCCCC +color16=#40E0D0 +color17=#90EE90 +color18=#F4A460 +color19=#EAE9EE +color20=#D6D6D6 +color21=#FFFFFF +color22=#F0F0F0 +color23=#FF00FF +color24=#6464FF +color25=#FF6464 diff --git a/html/html/themes/ipfire-legacy/include/functions.pl b/html/html/themes/ipfire-legacy/include/functions.pl new file mode 100644 index 0000000..1401030 --- /dev/null +++ b/html/html/themes/ipfire-legacy/include/functions.pl @@ -0,0 +1,404 @@ +#!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# 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 <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +sub showmenu() { + print <<EOF + <div id="menu"> + <ul> +EOF +; + foreach my $k1 ( sort keys %$menu ) { + if (! $menu->{$k1}{'enabled'}) { + next; + } + my $link = getlink($menu->{$k1}); + if ($link eq '') { + next; + } + if (! is_menu_visible($link)) { + next; + } + if ($menu->{$k1}->{'selected'}) { + print "<li><a href=\"$link\" class=\"active\">$menu->{$k1}{'caption'}</a></li>"; + } else { + print "<li><a href=\"$link\">$menu->{$k1}{'caption'}</a></li>"; + } + } + print <<EOF + </ul> + </div> +EOF +; +} + +sub getselected($) { + my $root = shift; + if (!$root) { + return 0; + } + + foreach my $item (%$root) { + if ($root->{$item}{'selected'}) { + return $root->{$item}; + } + } +} + +sub showsubsection($$) { + my $root = shift; + + if (! $root) { + return; + } + my $selected = getselected($root); + if (! $selected) { + return; + } + my $submenus = $selected->{'subMenu'}; + if (! $submenus) { + return; + } + + print <<EOF + <h4><span>Side</span>menu</h4> + <ul class="links"> +EOF +; + foreach my $item (sort keys %$submenus) { + my $hash = $submenus->{$item}; + if (! $hash->{'enabled'}) { + next; + } + my $link = getlink($hash); + if ($link eq '') { + next; + } + if (! is_menu_visible($link)) { + next; + } + if ($hash->{'selected'}) { + print '<li class="selected">'; + } else { + print '<li>'; + } + + print "<a href=\"$link\">$hash->{'caption'}</a></li>"; + } + + print <<EOF + </ul> +EOF +; +} + + +sub showsubsubsection($) { + my $root = shift; + if (!$root) { + return; + } + my $selected = getselected($root); + if (! $selected) { + return + } + if (! $selected->{'subMenu'}) { + return + } + + showsubsection($selected->{'subMenu'}, 'menu-subtop'); +} + +sub openpage { + my $title = shift; + my $boh = shift; + my $extrahead = shift; + + @URI=split ('\?', $ENV{'REQUEST_URI'} ); + &General::readhash("${swroot}/main/settings", \%settings); + &genmenu(); + + my $h2 = gettitle($menu); + + $title = "IPFire - $title"; + if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { + $title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"; + } + + print <<END +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> + <title>$title</title> + $extrahead + <link rel="shortcut icon" href="/favicon.ico" /> + <link rel="stylesheet" type="text/css" href="/themes/ipfire-legacy/include/style.css" /> + <script language="javascript" type="text/javascript"> + + function swapVisibility(id) { + el = document.getElementById(id); + if(el.style.display != 'block') { + el.style.display = 'block' + } + else { + el.style.display = 'none' + } + } + </script> +END +; +if ($settings{'SPEED'} ne 'off') { +print <<END + <script type="text/javascript" src="/include/jquery.js"></script> + <script type="text/javascript"> + var t_current; + var t_last; + var rxb_current; + var rxb_last; + var txb_current; + var txb_last; + function refreshInetInfo() { + \$.ajax({ + url: '/cgi-bin/speed.cgi', + success: function(xml){ + t_current = new Date(); + var t_diff = t_current - t_last; + t_last = t_current; + + rxb_current = \$("rxb",xml).text(); + var rxb_diff = rxb_current - rxb_last; + rxb_last = rxb_current; + + var rx_kbs = rxb_diff/t_diff; + rx_kbs = Math.round(rx_kbs*10)/10; + + txb_current = \$("txb",xml).text(); + var txb_diff = txb_current - txb_last; + txb_last = txb_current; + + var tx_kbs = txb_diff/t_diff; + tx_kbs = Math.round(tx_kbs*10)/10; + + \$("#rx_kbs").text(rx_kbs + ' kb/s'); + \$("#tx_kbs").text(tx_kbs + ' kb/s'); + } + }); + window.setTimeout("refreshInetInfo()", 3000); + } + \$(document).ready(function(){ + refreshInetInfo(); + }); + </script> + </head> + <body> +END +; +} +else { +print "</head><body>";} +print <<END + + +<div id="header"> + + <div id="header_inner" class="fixed"> + + <div id="logo"> +END +; + if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { + print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; + } else { + print "<h1><span>IPFire</span></h1><br />"; + } + print <<END + <h2>$h2</h2> + </div> + +END +; + &showmenu(); + +print <<END + </div> +</div> + +<div id="main"> + <div id="main_inner" class="fixed"> + <div id="primaryContent_2columns"> + <div id="columnA_2columns"> +END +; +} + +sub openpagewithoutmenu { + my $title = shift; + my $boh = shift; + my $extrahead = shift; + + @URI=split ('\?', $ENV{'REQUEST_URI'} ); + &General::readhash("${swroot}/main/settings", \%settings); + &genmenu(); + + my $h2 = gettitle($menu); + + $title = "IPFire - $title"; + if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { + $title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"; + } + + print <<END +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> + <title>$title</title> + $extrahead +END +; + if ($settings{'FX'} ne 'off') { + print <<END + <meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5,Transition=12)" /> + <meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5,Transition=12)" /> +END +; + } + print <<END + <link rel="shortcut icon" href="/favicon.ico" /> + <link rel="stylesheet" type="text/css" href="/include/style.css" /> + <script language="javascript" type="text/javascript"> + + function swapVisibility(id) { + el = document.getElementById(id); + if(el.style.display != 'block') { + el.style.display = 'block' + } + else { + el.style.display = 'none' + } + } + </script> + + </head> + <body> + + +<div id="header"> + + <div id="header_inner" class="fixed"> + + <div id="logo"> + <h1><span>IPFire</span></h1> + <h2>$h2</h2> + </div> + </div> +</div> + +<div id="main"> + <div id="main_inner" class="fixed"> + <div id="primaryContent_2columns"> + <div id="columnA_2columns"> +END +; +} + +sub closepage () { + my $status = &connectionstatus(); + my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`; + $uptime =~ s/year(s|)/$Lang::tr{'year'}/; + $uptime =~ s/month(s|)/$Lang::tr{'month'}/; + $uptime =~ s/day(s|)/$Lang::tr{'day'}/; + $uptime =~ s/user(s|)/$Lang::tr{'user'}/; + $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; + + print <<END + </div> + </div> + + <div id="secondaryContent_2columns"> + + <div id="columnC_2columns"> +END +; + &showsubsection($menu); + &showsubsubsection($menu); + + print <<END + </div> + </div> + <br class="clear" /> + <div id="footer" class="fixed"> + <b>Status:</b> $status <b>Uptime:</b> $uptime +END +; +if ($settings{'SPEED'} ne 'off') { +print <<END + <br /> + <b>$Lang::tr{'bandwidth usage'}:</b> + $Lang::tr{'incoming'}: <span id="rx_kbs"></span> $Lang::tr{'outgoing'}: <span id="tx_kbs"></span> + +END +; +} +print <<END + </div> + </div> +</div> +</body> +</html> +END +; +} + +sub openbigbox +{ +} + +sub closebigbox +{ +} + +sub openbox +{ + $width = $_[0]; + $align = $_[1]; + $caption = $_[2]; + + print <<END + + <div class="post" align="$align"> +END +; + + if ($caption) { print "<h3>$caption</h3>\n"; } else { print " "; } +} + +sub closebox +{ + print <<END + </div> + <br class="clear" /> +  +END +; +} + +1; diff --git a/html/html/themes/ipfire-legacy/include/style.css b/html/html/themes/ipfire-legacy/include/style.css new file mode 100644 index 0000000..d2c458e --- /dev/null +++ b/html/html/themes/ipfire-legacy/include/style.css @@ -0,0 +1,441 @@ +/* + + Nonzero1.0 by nodethirtythree design + http://www.nodethirtythree.com + missing in a maze + +*/ + +/* This controls the width of the fluid width layouts */ + +div.fluid +{ +width: 90% !important; +} + +/* This controls the width of the fixed width layouts */ + +div.fixed +{ +width: 950px !important; +} + +/* Basic Stuff */ + +* +{ +margin: 0em; +padding: 0em; +} + +body +{ +background-color: #fff; +color: #585858; +font-size: 9pt; +font-family: "trebuchet ms", helvetica, sans-serif; +} + +h1,h2,h3,h4,h5,h6 +{ +font-weight: normal; +letter-spacing: -1px; +text-transform: lowercase; +text-align: left; +} + +h3,h4,h5,h6 +{ +color: #66000F; +} + +h1 span +{ +font-weight: bold; +} + +h3 span +{ +font-weight: bold; +} + +h4 span +{ +font-weight: bold; +} + +br.clear +{ +clear: both; +} + +img +{ +padding: 3px; +#border: solid 1px #e1e1e1; +} + +img.floatTL +{ +float: left; +margin-right: 1.5em; +margin-bottom: 1.5em; +margin-top: 0.5em; +} + +a +{ +text-decoration: underline; +color: #D90000; +} + +a:hover +{ +text-decoration: none; +} + +ul.links +{ +list-style: none; +} + +ul.links li +{ +line-height: 2em; +} + +ul.links li.first +{ +} + +p +{ +line-height: 1.8em; +} + +/* Header */ + +#header +{ +width:100%; +height:122px; +background: #440000 url('../images/n1.gif') repeat-x; +} + +#header_inner +{ +position: relative; +width: 950px; +height:122px; +margin: 0 auto; +} + +/* Logo */ + +#logo +{ +position: absolute; +bottom: 0.6em; +} + +#logo h1 +{ +display: inline; +color: #fff; +font-size: 2.6em; +} + +#logo h2 +{ +display: inline; +padding-left: 0.5em; +color: #E5CCD0; +font-size: 1.0em; +} + +/* Menu */ + +#menu +{ +position: absolute; +right: 0em; +bottom: 0em; +} + +#menu ul +{ +list-style: none; +} + +#menu li +{ +float: left; +} + +#menu li a +{ +margin-left: 0.5em; +display: block; +padding: 1.1em 1.4em 1.0em 1.4em; +background: #fff url('../images/n4.gif') repeat-x; +border: solid 1px #fff; +color: #616161; +font-weight: bold; +font-size: 1.0em; +text-transform: lowercase; +text-decoration: none; +} + +#menu li a.active +{ +background: #CA2F2F url('../images/n3.gif') repeat-x; +color: #fff; +border: solid 1px #A94B4B; +} + +/* Main */ + +#main +{ +background: #fff url('../images/n2.gif') 0px 1px repeat-x; +} + +#main_inner p +{ +text-align: justify; +margin-bottom: 2.0em; +} + +#main_inner ul +{ +margin-bottom: 2.0em; +} + +#main_inner +{ +position: relative; +width: 950px; +margin: 0 auto; +padding-top: 3.5em; +} + +#main_inner h3,h4 +{ +border-bottom: dotted 1px #E1E1E1; +position: relative; +} + +#main_inner h3 +{ +font-size: 2.1em; +padding-bottom: 0.1em; +margin-bottom: 0.8em; +} + +#main_inner h4 +{ +font-size: 1.2em; +padding-bottom: 0.175em; +margin-bottom: 1.4em; +margin-top: 0.95em; +} + +#main_inner .post +{ +position: relative; +} + +#main_inner .post h3 +{ +position: relative; +font-size: 1.7em; +padding-bottom: 0.4em; +} + +#main_inner .post ul.post_info +{ +list-style: none; +position: absolute; +top: 3em; +font-size: 0.8em; +} + +#main_inner .post ul.post_info li +{ +background-position: 0em 0.2em; +background-repeat: no-repeat; +display: inline; +padding-left: 18px; +} + +#main_inner .post ul.post_info li.date +{ +background-image: url('../images/n5.gif'); +} + +#main_inner .post ul.post_info li.comments +{ +background-image: url('../images/n6.gif'); +margin-left: 1.1em; +} + +/* Footer */ + +#footer +{ +width: 950px; +margin: 0 auto; +text-align: center; +clear: both; +border-top: dotted 1px #E1E1E1; +margin-top: 1.0em; +margin-bottom: 1.0em; +padding-top: 1.0em; +text-transform: lowercase; +} + +/* Search */ + +input +{ +margin: 0.2em; +} + +input.button +{ +background: #CA2F2F url('../images/n3.gif') repeat-x; +color: #fff; +border: solid 1px #A94B4B; +font-weight: bold; +text-transform: lowercase; +font-size: 0.8em; +height: 2.0em; +} + +input.text +{ +border: solid 1px #F1F1F1; +font-size: 1.0em; +padding: 0.25em 0.25em 0.25em 0.25em; +} + +#search +{ +position: relative; +width: 100%; +margin-bottom: 2.0em; +} + +#search input.text +{ +position: absolute; +top: 0em; +left: 0em; +width: 9.5em; +} + +#search input.button +{ +position: absolute; +top: 0em; +right: 0em; +min-width: 2.0em; +max-width: 2.5em; +} + +/* LAYOUT - 3 COLUMNS */ + + /* Primary content */ + + #primaryContent_3columns + { + position: relative; + margin-right: 34em; + } + + #columnA_3columns + { + position: relative; + float: left; + width: 100%; + margin-right: -34em; + padding-right: 2em; + } + + /* Secondary Content */ + + #secondaryContent_3columns + { + float: right; + } + + #columnB_3columns + { + width: 13.0em; + float: left; + padding: 0em 2em 0.5em 2em; + border-left: dotted 1px #E1E1E1; + } + + #columnC_3columns + { + width: 13.0em; + float: left; + padding: 0em 0em 0.5em 2em; + border-left: dotted 1px #E1E1E1; + } + +/* LAYOUT - 2 COLUMNS */ + + /* Primary content */ + + #primaryContent_2columns + { + position: relative; + margin-right: 17em; + } + + #columnA_2columns + { + position: relative; + float: left; + width: 100%; + margin-right: -17em; + padding-right: 2em; + } + + /* Secondary Content */ + + #secondaryContent_2columns + { + float: right; + } + + #columnC_2columns + { + width: 13.0em; + float: left; + padding: 0em 0em 0.5em 2em; + border-left: dotted 1px #E1E1E1; + } + +/* LAYOUT - COLUMNLESS */ + + /* Primary content */ + + #primaryContent_columnless + { + position: relative; + } + + #columnA_columnless + { + position: relative; + width: 100%; + } + +/* FOOTER COLORIZE BANDWIDTH */ + +#rx_kbs { color: green; } + +#tx_kbs { color: red; } diff --git a/html/html/themes/ipfire/images/n1.gif b/html/html/themes/ipfire/images/n1.gif deleted file mode 100644 index 6eb5161..0000000 Binary files a/html/html/themes/ipfire/images/n1.gif and /dev/null differ diff --git a/html/html/themes/ipfire/images/n4.gif b/html/html/themes/ipfire/images/n4.gif deleted file mode 100644 index 8698525..0000000 Binary files a/html/html/themes/ipfire/images/n4.gif and /dev/null differ diff --git a/html/html/themes/ipfire/images/spacer.gif b/html/html/themes/ipfire/images/spacer.gif deleted file mode 100644 index 5bfd67a..0000000 Binary files a/html/html/themes/ipfire/images/spacer.gif and /dev/null differ diff --git a/html/html/themes/ipfire/images/tux2.png b/html/html/themes/ipfire/images/tux2.png new file mode 100644 index 0000000..cd84ad5 Binary files /dev/null and b/html/html/themes/ipfire/images/tux2.png differ diff --git a/html/html/themes/ipfire/include/css/style-rounded.css b/html/html/themes/ipfire/include/css/style-rounded.css new file mode 100644 index 0000000..cfc7df5 --- /dev/null +++ b/html/html/themes/ipfire/include/css/style-rounded.css @@ -0,0 +1,130 @@ + +.bigbox { + margin-top: 1em; + border-radius: 8px 8px 8px 8px; + -webkit-border-radius: 8px 8px 8px 8px; +} + +#main_inner .post { + border-radius: 8px 8px 8px 8px; + -webkit-border-radius: 8px 8px 8px 8px; +} + +#cssmenu a { + border-radius: 8px 8px 8px 8px; + -webkit-border-radius: 8px 8px 8px 8px; +} + +#cssmenu .has-sub ul li a { + border-radius: 7px 7px 7px 7px; +} + +#cssmenu .has-sub ul li:hover a { + box-shadow: inset 0 5px 1px rgba(0, 0, 0, 0.15); + -webkit-box-shadow: inset 0 5px 1px rgba(0, 0, 0, 0.15); +} + +/* Table */ +/* when using class='bordered' after tabletag */ + +table { + *border-collapse: collapse; /* IE7 and lower */ + border-spacing: 0; +} + +.bordered th{ + border-top: 1px solid grey; + border-bottom: 1px solid grey; + background: #cccccc; +} + +.bordered th:first-child{ + -moz-border-radius: 6px 0 0 0; + -webkit-border-radius: 6px 0 0 0; + border-radius: 6px 0 0 0; + border-left: 1px solid grey; + border-top: 1px solid grey; + border-bottom: 1px solid grey; +} + +.bordered th:last-child { + -moz-border-radius: 0 6px 0 0; + -webkit-border-radius: 0 6px 0 0; + border-radius: 0 6px 0 0; + border-right: 1px solid grey; + border-top: 1px solid grey; + border-bottom: 1px solid grey; +} + +.bordered th:only-child{ + -moz-border-radius: 6px 6px 0 0; + -webkit-border-radius: 6px 6px 0 0; + border-radius: 6px 6px 0 0; + border: 1px solid grey; +} + +.bordered tr:first-child td:first-child{ + -moz-border-radius: 6px 0 0 0; + -webkit-border-radius: 6px 0 0 0; + border-radius: 6px 0 0 0; + border-left: 1px solid grey; + border-top: 1px solid grey; +} + +.bordered tr:first-child td:last-child{ + -moz-border-radius: 0 6px 0 0; + -webkit-border-radius: 0 6px 0 0; + border-radius: 0 6px 0 0; + border-top: 1px solid grey; +} + +.bordered tr:first-child td:only-child{ + -moz-border-radius: 6px 6px 0 0; + -webkit-border-radius: 6px 6px 0 0; + border-radius: 6px 6px 0 0; + border-left: 1px solid grey; + border-right: 1px solid grey; + border-top: 1px solid grey; +} + +.bordered tr:first-child td{ + border-top: 1px solid grey; +} + +.bordered tr:last-child{ + border-left: 1px solid grey; + border-right: 1px solid grey; +} + +.bordered tr:last-child td:first-child { + -moz-border-radius: 0 0 0 6px; + -webkit-border-radius: 0 0 0 6px; + border-radius: 0 0 0 6px; + border-bottom: 1px solid grey; +} + +.bordered tr:last-child td:last-child { + -moz-border-radius: 0 0 6px 0; + -webkit-border-radius: 0 0 6px 0; + border-radius: 0 0 6px 0; + border-bottom: 1px solid grey; +} + +.bordered tr:last-child td:only-child { + -moz-border-radius: 0 0 6px 6px; + -webkit-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; + border-bottom: 1px solid grey; +} + +.bordered tr:last-child td { + border-bottom: 1px solid grey; +} + +.bordered td:first-child { + border-left: 1px solid grey; +} + +.bordered td:last-child { + border-right: 1px solid grey; +} diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css new file mode 100644 index 0000000..02b3fed --- /dev/null +++ b/html/html/themes/ipfire/include/css/style.css @@ -0,0 +1,261 @@ + +/* This controls the width of the fixed width layouts */ + +.fixed { + width: 910px !important; +} + +/* Basic Stuff */ + +* { + margin: 0; + padding: 0; +} + +html { + height: 100%; +} + +body { + /* SVG as background image (IE9/Chrome/Safari/Opera) */ + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2ODQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMTAwJSIgeTE9IjEwMCUiIHgyPSIxMDAlIiB5Mj0iMCUiPgo8c3RvcCBzdG9wLWNvbG9yPSIjMDAwMDAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjODgwNDAwIiBvZmZzZXQ9IjU3JSIvPgo8L2xpbmVhckdyYWRpZW50Pgo8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2c2ODQpIiAvPgo8L3N2Zz4=); + + background-image: linear-gradient( + bottom, + #000000 0%, + #880400 57% + ); + background-image: -o-linear-gradient( + bottom, + #000000 0%, + #880400 57% + ); + background-image: -moz-linear-gradient( + bottom, + #000000 0%, + #880400 57% + ); + background-image: -webkit-linear-gradient( + bottom, + #000000 0%, + #880400 57 + ); + background-image: -ms-linear-gradient( + bottom, + #000000 0%, + #880400 57% + ); + background-image: -webkit-gradient( + linear, + left bottom, + left top, + color-stop(0, #000000), + color-stop(0.57, #880400) + ); + background-attachment: fixed; + + font-size: 9pt; + font-family: "trebuchet ms", helvetica, sans-serif; +} + +h1, h2, h3, h4, h5, h6 { + font-size: 20px; + font-weight: normal; + letter-spacing: -1px; + text-align: left; +} + +h2, h3, h4, h5, h6 { + color: #66000F; +} + +br.clear { + clear: both; +} + +img { + padding: 3px; +} + +a { + text-decoration: underline; + color: #d90000; +} + +a:hover { + text-decoration: none; +} + +p { + line-height: 1.8em; +} + +hr { + margin: 0.3em 0 0.3em 0; +} + +iframe { + border: 0; +} + +.pull-right { + float: right !important; +} + +/* Header */ + +#header { + height: 70px; + margin: 0 auto; +} + +/* Logo */ + +#logo { + height: 65px; + margin-top: 1em; + background: url('../../images/tux2.png') no-repeat; +} + +#logo h1 { + color: #fff; + font-size: 3.6em; + font-weight: bold; + padding-left: 1.7em; +} + +/* Main */ + +.bigbox { + margin: 0 auto; + margin-top: 0.5em; + padding: 1.5em 2em 0 2em; + background: #fff url('../../images/n2.gif') 0px 0px repeat-x; + border: 1px solid black; + + border-radius: 3px 3px 3px 3px; + -webkit-border-radius: 3px 3px 3px 3px; +} + +#main_inner { + padding-bottom: 1.5em; +} + +#main_inner p { + text-align: justify; + margin-bottom: 2em; +} + +#main_inner ul { + margin-bottom: 2em; +} + +#main_inner h1 { + font-size: 1.8em; + margin-bottom: 1em; +} + +#main_inner .post { + border: 1px solid silver; + padding: 1em 2em 1em 2em; + margin-bottom: 1em; + clear: both; +} + +#main_inner .post h2 { + border-bottom: dotted 1px #e1e1e1; + font-size: 1.7em; + margin-bottom: 1em; +} + +#footer { + height: 2.5em; + margin-bottom: 1em; +} + +#footer a { + color: inherit; + text-decoration: none; +} + +#footer a:hover { + text-decoration: underline; +} + +input { + margin: 0.2em; +} + +input.button { + background: #ca2f2f url('../../images/n3.gif') repeat-x; + color: #fff; + border: solid 1px #a94b4b; + font-weight: bold; + font-size: 0.8em; + height: 2.0em; +} + +input.text { + border: solid 1px #f1f1f1; + padding: 0.25em; +} + +#traffic { + float: right; + min-width: 20em; + line-height: 32px; +} + +/* Menu */ +#cssmenu { + margin: 0 auto; + margin-top: 0; + padding-top: 0; + font-weight: 600; + height: 32px; + border: 1px solid black; +} + +#cssmenu a { + color: #111111; + display: inline-block; + line-height: 32px; + padding: 0 1em; + text-decoration: none; +} + +#cssmenu ul { + list-style: none; +} + +#cssmenu > ul > li { + display: inline-block; +} + +#cssmenu > ul > li.active a, #cssmenu > ul > li:hover > a { + color: white; + background: #aaaaaa; +} + +#cssmenu .has-sub:hover > ul { + display: block; +} + +#cssmenu .has-sub ul { + display: none; + position: absolute; +} + +#cssmenu .has-sub ul li a { + min-width: 12em; + background: #ffffff; + color: grey; + display: block; + line-height: 40%; + padding: 12px 5px; + border: 1px solid black; +} + +#cssmenu .has-sub ul li:hover a { + background: #dddddd; +} diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index 2707593..0ead967 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -18,397 +18,232 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # # # ############################################################################### +# # +# Theme file for IPfire (based on ipfire theme) # +# Author kay-michael köhler kmk <michael(a)koehler.tk> # +# # +# Version 1.0 March, 6th 2013 # +############################################################################### +# # +# Modyfied theme by a.marx(a)ipfire.org January 2014 # +# # +# Cleanup code, deleted unused code and rewrote the rest to get a new working # +# IPFire default theme. # +############################################################################### -sub showmenu() { - print <<EOF - <div id="menu"> - <ul> -EOF -; - foreach my $k1 ( sort keys %$menu ) { - if (! $menu->{$k1}{'enabled'}) { - next; - } - my $link = getlink($menu->{$k1}); - if ($link eq '') { - next; - } - if (! is_menu_visible($link)) { - next; - } - if ($menu->{$k1}->{'selected'}) { - print "<li><a href=\"$link\" class=\"active\">$menu->{$k1}{'caption'}</a></li>"; - } else { - print "<li><a href=\"$link\">$menu->{$k1}{'caption'}</a></li>"; - } - } - print <<EOF - </ul> - </div> -EOF -; -} +require "${General::swroot}/lang.pl"; -sub getselected($) { - my $root = shift; - if (!$root) { - return 0; - } - - foreach my $item (%$root) { - if ($root->{$item}{'selected'}) { - return $root->{$item}; - } - } +############################################################################### +# +# print menu html elements for submenu entries +# @param submenu entries +sub showsubmenu() { + my $submenus = shift; + + print "<ul>"; + foreach my $item (sort keys %$submenus) { + $link = getlink($submenus->{$item}); + next if (!is_menu_visible($link) or $link eq ''); + + my $subsubmenus = $submenus->{$item}->{'subMenu'}; + + if ($subsubmenus) { + print '<li class="has-sub ">'; + } else { + print '<li>'; + } + print '<a href="'.$link.'">'.$submenus->{$item}->{'caption'}.'</a>'; + + &showsubmenu($subsubmenus) if ($subsubmenus); + print '</li>'; + } + print "</ul>" } -sub showsubsection($$) { - my $root = shift; - - if (! $root) { - return; - } - my $selected = getselected($root); - if (! $selected) { - return; - } - my $submenus = $selected->{'subMenu'}; - if (! $submenus) { - return; - } - - print <<EOF - <h4><span>Side</span>menu</h4> - <ul class="links"> -EOF -; - foreach my $item (sort keys %$submenus) { - my $hash = $submenus->{$item}; - if (! $hash->{'enabled'}) { - next; - } - my $link = getlink($hash); - if ($link eq '') { - next; - } - if (! is_menu_visible($link)) { - next; - } - if ($hash->{'selected'}) { - print '<li class="selected">'; - } else { - print '<li>'; - } - - print "<a href=\"$link\">$hash->{'caption'}</a></li>"; - } - - print <<EOF - </ul> +############################################################################### +# +# print menu html elements +sub showmenu() { + print '<div id="cssmenu" class="bigbox fixed">'; + + if ($settings{'SPEED'} ne 'off') { + print <<EOF; + <div id='traffic'> + <strong>Traffic:</strong> + In <span id='rx_kbs'>--.-- Bit/s</span>   + Out <span id='tx_kbs'>--.-- Bit/s</span> + </div> EOF -; -} + } + print "<ul>"; + foreach my $k1 ( sort keys %$menu ) { + $link = getlink($menu->{$k1}); + next if (!is_menu_visible($link) or $link eq ''); + print '<li class="has-sub "><a><span>'.$menu->{$k1}->{'caption'}.'</span></a>'; + my $submenus = $menu->{$k1}->{'subMenu'}; + &showsubmenu($submenus) if ($submenus); + print "</li>"; + } -sub showsubsubsection($) { - my $root = shift; - if (!$root) { - return; - } - my $selected = getselected($root); - if (! $selected) { - return - } - if (! $selected->{'subMenu'}) { - return - } - - showsubsection($selected->{'subMenu'}, 'menu-subtop'); + print "</ul></div>"; } +############################################################################### +# +# print page opening html layout +# @param page title +# @param boh +# @param extra html code for html head section +# @param suppress menu option, can be numeric 1 or nothing. +# menu will be suppressed if param is 1 sub openpage { - my $title = shift; - my $boh = shift; - my $extrahead = shift; - - @URI=split ('\?', $ENV{'REQUEST_URI'} ); - &General::readhash("${swroot}/main/settings", \%settings); - &genmenu(); - - my $h2 = gettitle($menu); - - $title = "IPFire - $title"; - if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { - $title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"; - } - - print <<END -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> -<html xmlns='http://www.w3.org/1999/xhtml'> -<head> - <title>$title</title> - $extrahead -END -; - if ($settings{'FX'} ne 'off') { - print <<END - <meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5,Transition=12)" /> - <meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5,Transition=12)" /> -END -; - } - print <<END - <link rel="shortcut icon" href="/favicon.ico" /> - <link rel="stylesheet" type="text/css" href="/themes/ipfire/include/style.css" /> - <script language="javascript" type="text/javascript"> - - function swapVisibility(id) { - el = document.getElementById(id); - if(el.style.display != 'block') { - el.style.display = 'block' - } - else { - el.style.display = 'none' - } - } - </script> + my $title = shift; + my $boh = shift; + my $extrahead = shift; + my $suppressMenu = shift; + my @tmp = split(/\./, basename($0)); + my $scriptName = @tmp[0]; + + @URI=split ('\?', $ENV{'REQUEST_URI'} ); + &General::readhash("${swroot}/main/settings", \%settings); + &genmenu(); + + my $headline = "IPFire"; + if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { + $headline = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}"; + } + + my @stylesheets = ("style.css"); + if ($THEME_NAME eq "ipfire-rounded") { + push(@stylesheets, "style-rounded.css"); + } + +print <<END; +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html> + <head> + <title>$headline - $title</title> + $extrahead + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <link rel="shortcut icon" href="/favicon.ico" /> + <script type="text/javascript" src="/include/jquery.js"></script> END -; + + foreach my $stylesheet (@stylesheets) { + print "<link href=\"/themes/ipfire/include/css/$stylesheet\" rel=\"stylesheet\" type=\"text/css\" />\n"; + } + if ($settings{'SPEED'} ne 'off') { print <<END - <script type="text/javascript" src="/include/jquery.js"></script> - <script type="text/javascript"> - var t_current; - var t_last; - var rxb_current; - var rxb_last; - var txb_current; - var txb_last; - function refreshInetInfo() { - \$.ajax({ - url: '/cgi-bin/speed.cgi', - success: function(xml){ - t_current = new Date(); - var t_diff = t_current - t_last; - t_last = t_current; - - rxb_current = \$("rxb",xml).text(); - var rxb_diff = rxb_current - rxb_last; - rxb_last = rxb_current; - - var rx_kbs = rxb_diff/t_diff; - rx_kbs = Math.round(rx_kbs*10)/10; - - txb_current = \$("txb",xml).text(); - var txb_diff = txb_current - txb_last; - txb_last = txb_current; - - var tx_kbs = txb_diff/t_diff; - tx_kbs = Math.round(tx_kbs*10)/10; - - \$("#rx_kbs").text(rx_kbs + ' kb/s'); - \$("#tx_kbs").text(tx_kbs + ' kb/s'); - } - }); - window.setTimeout("refreshInetInfo()", 3000); - } - \$(document).ready(function(){ - refreshInetInfo(); - }); - </script> - </head> - <body> + <script type="text/javascript" src="/themes/ipfire/include/js/refreshInetInfo.js"></script> END ; } -else { -print "</head><body>";} -print <<END - -<div id="header"> - - <div id="header_inner" class="fixed"> - - <div id="logo"> +print <<END + </head> + <body> + <div id="header" class="fixed"> + <div id="logo"> END ; - if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { - print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; - } else { - print "<h1><span>IPFire</span></h1><br />"; - } - print <<END - <h2>$h2</h2> - </div> + if ($settings{'WINDOWWITHHOSTNAME'} ne 'off') { + print "<h1>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</h1>"; + } else { + print "<h1>IPFire</h1>"; + } +print <<END + </div> + </div> END ; - &showmenu(); -print <<END - </div> -</div> +&showmenu() if ($suppressMenu != 1); -<div id="main"> - <div id="main_inner" class="fixed"> - <div id="primaryContent_2columns"> - <div id="columnA_2columns"> +print <<END + <div class="bigbox fixed"> + <div id="main_inner" class="fixed"> + <h1>$title</h1> END ; } +############################################################################### +# +# print page opening html layout without menu +# @param page title +# @param boh +# @param extra html code for html head section sub openpagewithoutmenu { - my $title = shift; - my $boh = shift; - my $extrahead = shift; - - @URI=split ('\?', $ENV{'REQUEST_URI'} ); - &General::readhash("${swroot}/main/settings", \%settings); - &genmenu(); - - my $h2 = gettitle($menu); - - $title = "IPFire - $title"; - if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { - $title = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"; - } - - print <<END -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> -<html xmlns='http://www.w3.org/1999/xhtml'> -<head> - <title>$title</title> - $extrahead -END -; - if ($settings{'FX'} ne 'off') { - print <<END - <meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5,Transition=12)" /> - <meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5,Transition=12)" /> -END -; - } - print <<END - <link rel="shortcut icon" href="/favicon.ico" /> - <link rel="stylesheet" type="text/css" href="/include/style.css" /> - <script language="javascript" type="text/javascript"> - - function swapVisibility(id) { - el = document.getElementById(id); - if(el.style.display != 'block') { - el.style.display = 'block' - } - else { - el.style.display = 'none' - } - } - </script> - - </head> - <body> - - -<div id="header"> - - <div id="header_inner" class="fixed"> - - <div id="logo"> - <h1><span>IPFire</span></h1> - <h2>$h2</h2> - </div> - </div> -</div> - -<div id="main"> - <div id="main_inner" class="fixed"> - <div id="primaryContent_2columns"> - <div id="columnA_2columns"> -END -; + openpage(shift,shift,shift,1); + return; } -sub closepage () { - my $status = &connectionstatus(); - my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`; - $uptime =~ s/year(s|)/$Lang::tr{'year'}/; - $uptime =~ s/month(s|)/$Lang::tr{'month'}/; - $uptime =~ s/day(s|)/$Lang::tr{'day'}/; - $uptime =~ s/user(s|)/$Lang::tr{'user'}/; - $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; - - print <<END - </div> - </div> - - <div id="secondaryContent_2columns"> - - <div id="columnC_2columns"> -END -; - &showsubsection($menu); - &showsubsubsection($menu); - - print <<END - </div> - </div> - <br class="clear" /> - <div id="footer" class="fixed"> - <b>Status:</b> $status <b>Uptime:</b> $uptime -END -; -if ($settings{'SPEED'} ne 'off') { -print <<END - <br /> - <b>$Lang::tr{'bandwidth usage'}:</b> - $Lang::tr{'incoming'}: <span id="rx_kbs"></span> $Lang::tr{'outgoing'}: <span id="tx_kbs"></span> +############################################################################### +# +# print page closing html layout -END -; -} -print <<END - </div> - </div> -</div> +sub closepage () { + open(FILE, "</etc/system-release"); + my $system_release = <FILE>; + $system_release =~ s/core/Core Update/; + close(FILE); + +print <<END; + </div> + </div> + + <div id="footer" class='bigbox fixed'> + <span class="pull-right"> + <a href="http://www.ipfire.org/" target="_blank"><strong>IPFire.org</strong></a> • + <a href="http://www.ipfire.org/donate" target="_blank">$Lang::tr{'support donation'}</a> + </span> + + <strong>$system_release</strong> + </div> </body> </html> END ; } -sub openbigbox -{ +############################################################################### +# +# print big box opening html layout +sub openbigbox { } -sub closebigbox -{ +############################################################################### +# +# print big box closing html layout +sub closebigbox { } -sub openbox -{ - $width = $_[0]; - $align = $_[1]; - $caption = $_[2]; - - print <<END - - <div class="post" align="$align"> -END -; - - if ($caption) { print "<h3>$caption</h3>\n"; } else { print " "; } +############################################################################### +# +# print box opening html layout +# @param page width +# @param page align +# @param page caption +sub openbox { + $width = $_[0]; + $align = $_[1]; + $caption = $_[2]; + + print "<div class='post' align='$align'>\n"; + + if ($caption) { + print "<h2>$caption</h2>\n"; + } } -sub closebox -{ - print <<END - </div> - <br class="clear" /> -  -END -; +############################################################################### +# +# print box closing html layout +sub closebox { + print "</div>"; } 1; diff --git a/html/html/themes/ipfire/include/js/refreshInetInfo.js b/html/html/themes/ipfire/include/js/refreshInetInfo.js new file mode 100644 index 0000000..259f86e --- /dev/null +++ b/html/html/themes/ipfire/include/js/refreshInetInfo.js @@ -0,0 +1,69 @@ +/* refreshInetInfo.js +* functions for retrieving status information via jQuery +* Modified: March 6th, 2013 by michael(a)koehler.tk +* Authors: IPFire Team (info(a)ipfire.org) + Kay-Michael Köhler (michael(a)koehler.tk) +* Visit http://www.ipfire.org/ +*/ + +var t_current; +var t_last = 0; +var rxb_current; +var rxb_last = 0; +var txb_current; +var txb_last = 0; + +$(document).ready(function(){ + refreshInetInfo(); +}); + +function refreshInetInfo() { + $.ajax({ + url: '/cgi-bin/speed.cgi', + success: function(xml) { + t_current = new Date(); + var t_diff = t_current - t_last; + + rxb_current = $("rxb", xml).text(); + var rxb_diff = rxb_current - rxb_last; + rxb_last = rxb_current; + + var rx_bits = rxb_diff * 8192 / t_diff; + var rx_fmt = format_bytes(rx_bits); + + txb_current = $("txb", xml).text(); + var txb_diff = txb_current - txb_last; + txb_last = txb_current; + + var tx_bits = txb_diff * 8192 / t_diff; + var tx_fmt = format_bytes(tx_bits); + + if (t_last != 0) { + $("#rx_kbs").text(rx_fmt); + $("#tx_kbs").text(tx_fmt); + } + + t_last = t_current; + } + }); + + window.setTimeout("refreshInetInfo()", 2000); +} + +function format_bytes(bytes) { + var units = ["Bit/s", "kBit/s", "MBit/s", "GBit/s", "TBit/s"]; + + var unit = units[0]; + for (var i = 1; i < units.length; i++) { + if (bytes < 1024) + break; + + unit = units[i]; + bytes /= 1024; + } + + // Round the output. + bytes = bytes.toFixed(2); + + return bytes + " " + unit; +} diff --git a/html/html/themes/ipfire/include/style.css b/html/html/themes/ipfire/include/style.css deleted file mode 100644 index 2461a14..0000000 --- a/html/html/themes/ipfire/include/style.css +++ /dev/null @@ -1,441 +0,0 @@ -/* - - Nonzero1.0 by nodethirtythree design - http://www.nodethirtythree.com - missing in a maze - -*/ - -/* This controls the width of the fluid width layouts */ - -div.fluid -{ -width: 90% !important; -} - -/* This controls the width of the fixed width layouts */ - -div.fixed -{ -width: 950px !important; -} - -/* Basic Stuff */ - -* -{ -margin: 0em; -padding: 0em; -} - -body -{ -background-color: #fff; -color: #585858; -font-size: 9pt; -font-family: "trebuchet ms", helvetica, sans-serif; -} - -h1,h2,h3,h4,h5,h6 -{ -font-weight: normal; -letter-spacing: -1px; -text-transform: lowercase; -text-align: left; -} - -h3,h4,h5,h6 -{ -color: #66000F; -} - -h1 span -{ -font-weight: bold; -} - -h3 span -{ -font-weight: bold; -} - -h4 span -{ -font-weight: bold; -} - -br.clear -{ -clear: both; -} - -img -{ -padding: 3px; -#border: solid 1px #e1e1e1; -} - -img.floatTL -{ -float: left; -margin-right: 1.5em; -margin-bottom: 1.5em; -margin-top: 0.5em; -} - -a -{ -text-decoration: underline; -color: #D90000; -} - -a:hover -{ -text-decoration: none; -} - -ul.links -{ -list-style: none; -} - -ul.links li -{ -line-height: 2em; -} - -ul.links li.first -{ -} - -p -{ -line-height: 1.8em; -} - -/* Header */ - -#header -{ -width:100%; -height:122px; -background: #440000 url('/themes/ipfire/images/n1.gif') repeat-x; -} - -#header_inner -{ -position: relative; -width: 950px; -height:122px; -margin: 0 auto; -} - -/* Logo */ - -#logo -{ -position: absolute; -bottom: 0.6em; -} - -#logo h1 -{ -display: inline; -color: #fff; -font-size: 2.6em; -} - -#logo h2 -{ -display: inline; -padding-left: 0.5em; -color: #E5CCD0; -font-size: 1.0em; -} - -/* Menu */ - -#menu -{ -position: absolute; -right: 0em; -bottom: 0em; -} - -#menu ul -{ -list-style: none; -} - -#menu li -{ -float: left; -} - -#menu li a -{ -margin-left: 0.5em; -display: block; -padding: 1.1em 1.4em 1.0em 1.4em; -background: #fff url('/themes/ipfire/images/n4.gif') repeat-x; -border: solid 1px #fff; -color: #616161; -font-weight: bold; -font-size: 1.0em; -text-transform: lowercase; -text-decoration: none; -} - -#menu li a.active -{ -background: #CA2F2F url('/themes/ipfire/images/n3.gif') repeat-x; -color: #fff; -border: solid 1px #A94B4B; -} - -/* Main */ - -#main -{ -background: #fff url('/themes/ipfire/images/n2.gif') 0px 1px repeat-x; -} - -#main_inner p -{ -text-align: justify; -margin-bottom: 2.0em; -} - -#main_inner ul -{ -margin-bottom: 2.0em; -} - -#main_inner -{ -position: relative; -width: 950px; -margin: 0 auto; -padding-top: 3.5em; -} - -#main_inner h3,h4 -{ -border-bottom: dotted 1px #E1E1E1; -position: relative; -} - -#main_inner h3 -{ -font-size: 2.1em; -padding-bottom: 0.1em; -margin-bottom: 0.8em; -} - -#main_inner h4 -{ -font-size: 1.2em; -padding-bottom: 0.175em; -margin-bottom: 1.4em; -margin-top: 0.95em; -} - -#main_inner .post -{ -position: relative; -} - -#main_inner .post h3 -{ -position: relative; -font-size: 1.7em; -padding-bottom: 0.4em; -} - -#main_inner .post ul.post_info -{ -list-style: none; -position: absolute; -top: 3em; -font-size: 0.8em; -} - -#main_inner .post ul.post_info li -{ -background-position: 0em 0.2em; -background-repeat: no-repeat; -display: inline; -padding-left: 18px; -} - -#main_inner .post ul.post_info li.date -{ -background-image: url('/themes/ipfire/images/n5.gif'); -} - -#main_inner .post ul.post_info li.comments -{ -background-image: url('/themes/ipfire/images/n6.gif'); -margin-left: 1.1em; -} - -/* Footer */ - -#footer -{ -width: 950px; -margin: 0 auto; -text-align: center; -clear: both; -border-top: dotted 1px #E1E1E1; -margin-top: 1.0em; -margin-bottom: 1.0em; -padding-top: 1.0em; -text-transform: lowercase; -} - -/* Search */ - -input -{ -margin: 0.2em; -} - -input.button -{ -background: #CA2F2F url('/themes/ipfire/images/n3.gif') repeat-x; -color: #fff; -border: solid 1px #A94B4B; -font-weight: bold; -text-transform: lowercase; -font-size: 0.8em; -height: 2.0em; -} - -input.text -{ -border: solid 1px #F1F1F1; -font-size: 1.0em; -padding: 0.25em 0.25em 0.25em 0.25em; -} - -#search -{ -position: relative; -width: 100%; -margin-bottom: 2.0em; -} - -#search input.text -{ -position: absolute; -top: 0em; -left: 0em; -width: 9.5em; -} - -#search input.button -{ -position: absolute; -top: 0em; -right: 0em; -min-width: 2.0em; -max-width: 2.5em; -} - -/* LAYOUT - 3 COLUMNS */ - - /* Primary content */ - - #primaryContent_3columns - { - position: relative; - margin-right: 34em; - } - - #columnA_3columns - { - position: relative; - float: left; - width: 100%; - margin-right: -34em; - padding-right: 2em; - } - - /* Secondary Content */ - - #secondaryContent_3columns - { - float: right; - } - - #columnB_3columns - { - width: 13.0em; - float: left; - padding: 0em 2em 0.5em 2em; - border-left: dotted 1px #E1E1E1; - } - - #columnC_3columns - { - width: 13.0em; - float: left; - padding: 0em 0em 0.5em 2em; - border-left: dotted 1px #E1E1E1; - } - -/* LAYOUT - 2 COLUMNS */ - - /* Primary content */ - - #primaryContent_2columns - { - position: relative; - margin-right: 17em; - } - - #columnA_2columns - { - position: relative; - float: left; - width: 100%; - margin-right: -17em; - padding-right: 2em; - } - - /* Secondary Content */ - - #secondaryContent_2columns - { - float: right; - } - - #columnC_2columns - { - width: 13.0em; - float: left; - padding: 0em 0em 0.5em 2em; - border-left: dotted 1px #E1E1E1; - } - -/* LAYOUT - COLUMNLESS */ - - /* Primary content */ - - #primaryContent_columnless - { - position: relative; - } - - #columnA_columnless - { - position: relative; - width: 100%; - } - -/* FOOTER COLORIZE BANDWIDTH */ - -#rx_kbs { color: green; } - -#tx_kbs { color: red; } diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl index 0bb1d6e..47dbcb0 100644 --- a/html/html/themes/maniac/include/functions.pl +++ b/html/html/themes/maniac/include/functions.pl @@ -149,16 +149,6 @@ sub openpage { <head> <title>$title</title> $extrahead -END -; - if ($settings{'FX'} ne 'off') { - print <<END - <meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5,Transition=12)" /> - <meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5,Transition=12)" /> -END -; - } - print <<END <link rel="shortcut icon" href="/favicon.ico" /> <link rel="stylesheet" type="text/css" href="/themes/maniac/include/style.css" /> <script language="javascript" type="text/javascript"> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index d89a4bd..01cd3f6 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1946,6 +1946,7 @@ 'successfully refreshed updates list' => 'Update-Liste erfolgreich aktualisiert.', 'summaries kept' => 'Zusammenfassungen aufheben für', 'sunday' => 'Sonntag', +'support donation' => 'Unterstützen Sie das IPFire-Projekt mit Ihrer Spende', 'swap' => 'Swap', 'swap usage per' => 'Nutzung von Auslagerungsspeicher (Swap) pro', 'system' => 'System', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 5754c7d..dc38129 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1980,6 +1980,7 @@ 'successfully refreshed updates list' => 'Successfully refreshed updates list.', 'summaries kept' => 'Keep summaries for', 'sunday' => 'Sunday', +'support donation' => 'Support the IPFire project with your donation', 'swap' => 'Swap', 'swap usage per' => 'Swap usage per', 'system' => 'System', diff --git a/lfs/apache2 b/lfs/apache2 index f50332b..a3c7ada 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -98,6 +98,7 @@ ifeq "$(PASS)" "C" chmod -R 755 /srv/web/ipfire/cgi-bin chmod -R 644 /srv/web/ipfire/html chmod 755 /srv/web/ipfire/html /srv/web/ipfire/html/{index.cgi,redirect.cgi,dial.cgi,images,include,themes,themes/*,themes/*/*} + ln -svf ipfire /srv/web/ipfire/html/themes/ipfire-rounded # Reset permissions of redirect templates directories find /srv/web/ipfire/html/redirect-templates -type d | xargs chmod -v 755 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 1dc44471365cccef7ab2b3ec766c0d0c26f86475
by git＠ipfire.org 05 Jan '14

05 Jan '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, fifteen has been updated via 1dc44471365cccef7ab2b3ec766c0d0c26f86475 (commit) from 63e3da5935ee846b9e1e29f624bd299518194d35 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1dc44471365cccef7ab2b3ec766c0d0c26f86475 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 5 02:42:21 2014 +0100 general-functions.pl: Format output of age(). The output of the age() function was a bit messy with some translations. It was now much simplified and it now shows the time in a standardized format. ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 72 +++++++++++-------------------------- doc/language_issues.de | 5 +++ doc/language_issues.en | 5 +++ doc/language_issues.es | 5 --- doc/language_issues.fr | 5 --- doc/language_issues.nl | 5 --- doc/language_issues.pl | 5 --- doc/language_issues.ru | 5 --- doc/language_issues.tr | 5 +++ langs/en/cgi-bin/en.pl | 2 +- 10 files changed, 36 insertions(+), 78 deletions(-) Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 9d9ee5d..9a5e671 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -229,68 +229,36 @@ sub writehashpart close FILE; } -sub age -{ +sub age { my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, - $atime, $mtime, $ctime, $blksize, $blocks) = stat $_[0]; - my $now = time; - my $timestring = ''; - my $dset = 0; # Day is set, when > 0 - my $hset = 0; # Hour is set, when > 0 - my $mset = 0; # Minute is set, when > 0 - - my $totalsecs = $now - $mtime; - my $days = int($totalsecs / 86400); - my $totalhours = int($totalsecs / 3600); - my $hours = $totalhours % 24; - my $totalmins = int($totalsecs / 60); - my $mins = $totalmins % 60; - my $secs = $totalsecs % 60; + $atime, $mtime, $ctime, $blksize, $blocks) = stat $_[0]; + my $totalsecs = time() - $mtime; + my @s = (); - if ($days > 1) { - ${timestring} .= ${days}.' '.$Lang::tr{'days'}.', '; - $dset = 1; - } - elsif ($days == 1) { - ${timestring} .= ${days}.' '.$Lang::tr{'day'}.', '; - $dset = 1; + my $secs = $totalsecs % 60; + $totalsecs /= 60; + if ($secs > 0) { + push(@s, "${secs}s"); } - if (($hours > 1) && !($dset)) { - ${timestring} .= ${hours}.' '.$Lang::tr{'hours'}.', '; - $hset = 1; - } - elsif (($hours == 1) && !($dset)) { - ${timestring} .= ${hours}.' '.$Lang::tr{'hour'}.', '; - $hset = 1; - } - elsif ($dset) { - ${timestring} .= ${hours}.' '.$Lang::tr{'age shour'}.', '; - $hset = 1; + my $min = $totalsecs % 60; + $totalsecs /= 60; + if ($min > 0) { + push(@s, "${min}m"); } - if ((($mins > 1) || ($mins == 0)) && !($dset || $hset)) { - ${timestring} .= ${mins}.' '.$Lang::tr{'minutes'}.', '; - $mset = 1; - } - elsif (($mins == 1) && !($dset || $hset)) { - ${timestring} .= ${mins}.' '.$Lang::tr{'minute'}.', '; - $mset = 1; - } - else { - ${timestring} .= ${mins}.' '.$Lang::tr{'age sminute'}.', '; - $mset = 1; + my $hrs = $totalsecs % 24; + $totalsecs /= 24; + if ($hrs > 0) { + push(@s, "${hrs}h"); } - if ((($secs > 1) || ($secs == 0)) && !($dset || $hset || $mset)) { - ${timestring} .= ${secs}.' '.$Lang::tr{'age seconds'}; - } - elsif (($secs == 1) && !($dset || $hset || $mset)) { - ${timestring} .= $secs.' '.$Lang::tr{'age second'}; + my $days = int($totalsecs); + if ($days > 0) { + push(@s, "${days}d"); } - else { ${timestring} .= $secs.' '.$Lang::tr{'age ssecond'}; } - return ${timestring}; + return join(" ", reverse(@s)); } sub validip diff --git a/doc/language_issues.de b/doc/language_issues.de index b07ee32..8b46d6f 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -40,6 +40,11 @@ WARNING: translation string unused: advproxy errmsg password incorrect WARNING: translation string unused: advproxy no cre groups WARNING: translation string unused: advproxy ssadvanced proxy WARNING: translation string unused: advproxy update notification +WARNING: translation string unused: age second +WARNING: translation string unused: age seconds +WARNING: translation string unused: age shour +WARNING: translation string unused: age sminute +WARNING: translation string unused: age ssecond WARNING: translation string unused: alcatelusb help WARNING: translation string unused: alcatelusb upload WARNING: translation string unused: all interfaces diff --git a/doc/language_issues.en b/doc/language_issues.en index 314643d..d4281e0 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -41,6 +41,11 @@ WARNING: translation string unused: advproxy no cre groups WARNING: translation string unused: advproxy ssadvanced proxy WARNING: translation string unused: advproxy update information WARNING: translation string unused: advproxy update notification +WARNING: translation string unused: age second +WARNING: translation string unused: age seconds +WARNING: translation string unused: age shour +WARNING: translation string unused: age sminute +WARNING: translation string unused: age ssecond WARNING: translation string unused: alcatelusb help WARNING: translation string unused: alcatelusb upload WARNING: translation string unused: all interfaces diff --git a/doc/language_issues.es b/doc/language_issues.es index 09ebf81..9ae2c0a 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -557,11 +557,6 @@ WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent -WARNING: untranslated string: age second -WARNING: untranslated string: age seconds -WARNING: untranslated string: age shour -WARNING: untranslated string: age sminute -WARNING: untranslated string: age ssecond WARNING: untranslated string: attention WARNING: untranslated string: bytes WARNING: untranslated string: ccd add diff --git a/doc/language_issues.fr b/doc/language_issues.fr index c37425e..7e5a1f5 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -559,11 +559,6 @@ WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent -WARNING: untranslated string: age second -WARNING: untranslated string: age seconds -WARNING: untranslated string: age shour -WARNING: untranslated string: age sminute -WARNING: untranslated string: age ssecond WARNING: untranslated string: attention WARNING: untranslated string: bytes WARNING: untranslated string: ccd add diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 55fd951..10e12db 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -560,11 +560,6 @@ WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent -WARNING: untranslated string: age second -WARNING: untranslated string: age seconds -WARNING: untranslated string: age shour -WARNING: untranslated string: age sminute -WARNING: untranslated string: age ssecond WARNING: untranslated string: bytes WARNING: untranslated string: ccd iroute2 WARNING: untranslated string: default ip diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 09ebf81..9ae2c0a 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -557,11 +557,6 @@ WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent -WARNING: untranslated string: age second -WARNING: untranslated string: age seconds -WARNING: untranslated string: age shour -WARNING: untranslated string: age sminute -WARNING: untranslated string: age ssecond WARNING: untranslated string: attention WARNING: untranslated string: bytes WARNING: untranslated string: ccd add diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 200ab29..f46ba7a 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -551,11 +551,6 @@ WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent -WARNING: untranslated string: age second -WARNING: untranslated string: age seconds -WARNING: untranslated string: age shour -WARNING: untranslated string: age sminute -WARNING: untranslated string: age ssecond WARNING: untranslated string: attention WARNING: untranslated string: bytes WARNING: untranslated string: ccd add diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 30a7a8a..5bd50a0 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -41,6 +41,11 @@ WARNING: translation string unused: advproxy no cre groups WARNING: translation string unused: advproxy ssadvanced proxy WARNING: translation string unused: advproxy update information WARNING: translation string unused: advproxy update notification +WARNING: translation string unused: age second +WARNING: translation string unused: age seconds +WARNING: translation string unused: age shour +WARNING: translation string unused: age sminute +WARNING: translation string unused: age ssecond WARNING: translation string unused: alcatelusb help WARNING: translation string unused: alcatelusb upload WARNING: translation string unused: all interfaces diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 30bf70a..5754c7d 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1166,7 +1166,7 @@ 'hostname not set' => 'Hostname not set.', 'hosts config added' => 'Hosts config added', 'hosts config changed' => 'Hosts config changed', -'hour' => 'hour', +'hour' => 'Hour', 'hour-graph' => 'Hour', 'hours' => 'hours', 'hours2' => 'Hours', hooks/post-receive -- IPFire 2.x development tree

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM January 2014