IPFire-SCM August 2014

ipfire-scm@lists.ipfire.org

1 participants
43 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2fc5124b7ea5dd6b7035574e68be0f6441aec77e
by git＠ipfire.org 11 Aug '14

11 Aug '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, next has been updated via 2fc5124b7ea5dd6b7035574e68be0f6441aec77e (commit) from 8ed77b039fd0373fdc07ec79877caf34b8264cd2 (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 2fc5124b7ea5dd6b7035574e68be0f6441aec77e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 11 11:49:31 2014 +0200 proxy: Allow HTTP Basic authentication against Active Directory servers Some clients may not support NTLMv2. Basic authentication can now be activated. This is dangerous as it sends the credentials in cleartext to the proxy server. ----------------------------------------------------------------------- Summary of changes: doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 1 + doc/language_missings | 4 ++++ html/cgi-bin/proxy.cgi | 30 +++++++++++++++++++++++++++++- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 10 files changed, 41 insertions(+), 1 deletion(-) Difference in files: diff --git a/doc/language_issues.es b/doc/language_issues.es index 57df9d6..e256975 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -598,6 +598,7 @@ WARNING: untranslated string: administrator password WARNING: untranslated string: administrator username WARNING: untranslated string: advproxy AUTH method ntlm WARNING: untranslated string: advproxy AUTH method ntlm auth +WARNING: untranslated string: advproxy basic authentication WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy diff --git a/doc/language_issues.fr b/doc/language_issues.fr index d2344ed..62dd5d5 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -608,6 +608,7 @@ WARNING: untranslated string: administrator password WARNING: untranslated string: administrator username WARNING: untranslated string: advproxy AUTH method ntlm WARNING: untranslated string: advproxy AUTH method ntlm auth +WARNING: untranslated string: advproxy basic authentication WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 607d680..7360d4f 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -664,6 +664,7 @@ WARNING: untranslated string: administrator password WARNING: untranslated string: administrator username WARNING: untranslated string: advproxy AUTH method ntlm WARNING: untranslated string: advproxy AUTH method ntlm auth +WARNING: untranslated string: advproxy basic authentication WARNING: untranslated string: advproxy group access control WARNING: untranslated string: advproxy group required WARNING: untranslated string: atm device diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 57df9d6..e256975 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -598,6 +598,7 @@ WARNING: untranslated string: administrator password WARNING: untranslated string: administrator username WARNING: untranslated string: advproxy AUTH method ntlm WARNING: untranslated string: advproxy AUTH method ntlm auth +WARNING: untranslated string: advproxy basic authentication WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 03e48b7..d7d3d26 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -601,6 +601,7 @@ WARNING: untranslated string: administrator password WARNING: untranslated string: administrator username WARNING: untranslated string: advproxy AUTH method ntlm WARNING: untranslated string: advproxy AUTH method ntlm auth +WARNING: untranslated string: advproxy basic authentication WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy diff --git a/doc/language_issues.tr b/doc/language_issues.tr index b920727..623df98 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -667,6 +667,7 @@ WARNING: untranslated string: administrator password WARNING: untranslated string: administrator username WARNING: untranslated string: advproxy AUTH method ntlm WARNING: untranslated string: advproxy AUTH method ntlm auth +WARNING: untranslated string: advproxy basic authentication WARNING: untranslated string: advproxy group access control WARNING: untranslated string: advproxy group required WARNING: untranslated string: bytes diff --git a/doc/language_missings b/doc/language_missings index 57c0870..376a460 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -19,6 +19,7 @@ < adsl settings < advproxy AUTH method ntlm < advproxy AUTH method ntlm auth +< advproxy basic authentication < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy @@ -566,6 +567,7 @@ < adsl settings < advproxy AUTH method ntlm < advproxy AUTH method ntlm auth +< advproxy basic authentication < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy @@ -1106,6 +1108,7 @@ < adsl settings < advproxy AUTH method ntlm < advproxy AUTH method ntlm auth +< advproxy basic authentication < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy @@ -1622,6 +1625,7 @@ < adsl settings < advproxy AUTH method ntlm < advproxy AUTH method ntlm auth +< advproxy basic authentication < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 9abcb91..772852b 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -267,6 +267,7 @@ $proxysettings{'LDAP_BINDDN_USER'} = ''; $proxysettings{'LDAP_BINDDN_PASS'} = ''; $proxysettings{'LDAP_GROUP'} = ''; $proxysettings{'NTLM_AUTH_GROUP'} = ''; +$proxysettings{'NTLM_AUTH_BASIC'} = 'off'; $proxysettings{'NTLM_DOMAIN'} = ''; $proxysettings{'NTLM_PDC'} = ''; $proxysettings{'NTLM_BDC'} = ''; @@ -895,6 +896,10 @@ $checked{'NTLM_USER_ACL'}{'positive'} = ''; $checked{'NTLM_USER_ACL'}{'negative'} = ''; $checked{'NTLM_USER_ACL'}{$proxysettings{'NTLM_USER_ACL'}} = "checked='checked'"; +$checked{'NTLM_AUTH_BASIC'}{'on'} = ''; +$checked{'NTLM_AUTH_BASIC'}{'off'} = ''; +$checked{'NTLM_AUTH_BASIC'}{$proxysettings{'NTLM_AUTH_BASIC'}} = "checked='checked'"; + $checked{'RADIUS_ENABLE_ACL'}{'off'} = ''; $checked{'RADIUS_ENABLE_ACL'}{'on'} = ''; $checked{'RADIUS_ENABLE_ACL'}{$proxysettings{'RADIUS_ENABLE_ACL'}} = "checked='checked'"; @@ -2003,6 +2008,14 @@ if ($proxysettings{'AUTH_METHOD'} eq 'ntlm-auth') { print <<END; <hr size ='1'> <table width='100%'> + <td width='20%' class='base'>$Lang::tr{'advproxy basic authentication'}:</td> + <td width='40%'><input type='checkbox' name='NTLM_AUTH_BASIC' $checked{'NTLM_AUTH_BASIC'}{'on'} /></td> + <td colspan='2'> </td> + </table> + + <hr size='1' /> + + <table width='100%'> <tr> <td colspan='4'><b>$Lang::tr{'advproxy group access control'}</b></td> </tr> @@ -3376,7 +3389,22 @@ END } print FILE "\n"; - print FILE "auth_param ntlm children $proxysettings{'AUTH_CHILDREN'}\n"; + print FILE "auth_param ntlm children $proxysettings{'AUTH_CHILDREN'}\n\n"; + + # BASIC authentication + if ($proxysettings{'NTLM_AUTH_BASIC'} eq "on") { + print FILE "auth_param basic program /usr/bin/ntlm_auth --helper-protocol=squid-2.5-basic"; + if ($proxysettings{'NTLM_AUTH_GROUP'}) { + my $ntlm_auth_group = $proxysettings{'NTLM_AUTH_GROUP'}; + $ntlm_auth_group =~ s/\\/\+/; + + print FILE " --require-membership-of=\"$ntlm_auth_group\""; + } + print FILE "\n"; + print FILE "auth_param basic children 10\n"; + print FILE "auth_param basic realm IPFire Web Proxy Server\n"; + print FILE "auth_param basic credentialsttl 2 hours\n\n"; + } } if ($proxysettings{'AUTH_METHOD'} eq 'radius') diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 37a2431..6c46f70 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -196,6 +196,7 @@ 'advproxy back to main page' => 'Zurück zur Hauptseite', 'advproxy banned ip clients' => 'Gesperrte IP-Adressen (eine pro Zeile)', 'advproxy banned mac clients' => 'Gesperrte MAC-Adressen (eine pro Zeile)', +'advproxy basic authentication' => 'Erlaube HTTP-Basic-Authentifizierung', 'advproxy cache management' => 'Cacheverwaltung', 'advproxy cache replacement policy' => 'Cache Ersetzungsrichtlinie', 'advproxy cache-digest' => 'Cache-Digest-Erstellung aktivieren', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index ef6b5df..b537868 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -196,6 +196,7 @@ 'advproxy back to main page' => 'Back to main page', 'advproxy banned ip clients' => 'Banned IP addresses (one per line)', 'advproxy banned mac clients' => 'Banned MAC addresses (one per line)', +'advproxy basic authentication' => 'Allow HTTP Basic authentication', 'advproxy cache management' => 'Cache management', 'advproxy cache replacement policy' => 'Cache replacement policy', 'advproxy cache-digest' => 'Enable Cache-Digest Generation', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8ed77b039fd0373fdc07ec79877caf34b8264cd2
by git＠ipfire.org 11 Aug '14

11 Aug '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, next has been updated via 8ed77b039fd0373fdc07ec79877caf34b8264cd2 (commit) from 0eba3dc448e17d49299781706ff1f44f51413f3f (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 8ed77b039fd0373fdc07ec79877caf34b8264cd2 Author: Axel Gembe <ago(a)multipixs.com> Date: Mon Aug 11 12:23:58 2014 +0800 general-functions.pl: validdomainname misinterprets RFC1035 The function validdomainname checks that each part of a domain name is at least 2 characters in length, but RFC1035 only makes a restriction on a "label" being at most 63 characters in length. This change allows reverse DNS zones like 2.168.192.in-addr.arpa to be added to the DNS forward configuration, which was incorrectly prevented before. Signed-off-by: Axel Gembe <ago(a)multipixs.com> ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 66286ed..8ed87fc 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -627,9 +627,8 @@ sub validdomainname my @parts = split (/\./, $domainname); # Split hostname at the '.' foreach $part (@parts) { - # Each part should be at least two characters in length - # but no more than 63 characters - if (length ($part) < 2 || length ($part) > 63) { + # Each part should be no more than 63 characters in length + if (length ($part) < 1 || length ($part) > 63) { return 0;} # Only valid characters are a-z, A-Z, 0-9 and - if ($part !~ /^[a-zA-Z0-9-]*$/) { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0eba3dc448e17d49299781706ff1f44f51413f3f
by git＠ipfire.org 08 Aug '14

08 Aug '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, next has been updated via 0eba3dc448e17d49299781706ff1f44f51413f3f (commit) via 4b12aa414c0ae63e135d3ec36737152fff44f6d9 (commit) from 4616ecceced8208c695e697395f0b916d875fb91 (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 0eba3dc448e17d49299781706ff1f44f51413f3f Author: Timo Eissler <timo(a)eissler.pro> Date: Thu Aug 7 20:11:22 2014 +0200 firewall: updated rootfiles commit 4b12aa414c0ae63e135d3ec36737152fff44f6d9 Author: Timo Eissler <timo(a)eissler.pro> Date: Thu Aug 7 19:00:58 2014 +0200 firewall: fix faulty masquerading packets ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/initscripts | 4 +-- config/rootfiles/common/i586/initscripts | 4 +-- lfs/initscripts | 1 - src/initscripts/init.d/firewall | 31 +++++++++++++++++++--- .../init.d/networking/red.down/20-firewall | 3 +++ .../init.d/networking/red.up/20-firewall | 3 +++ 6 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 src/initscripts/init.d/networking/red.down/20-firewall create mode 100644 src/initscripts/init.d/networking/red.up/20-firewall Difference in files: diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 7657fe6..dfe2e48 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -73,13 +73,13 @@ etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq etc/rc.d/init.d/networking/red.down/10-ipsec etc/rc.d/init.d/networking/red.down/10-miniupnpd etc/rc.d/init.d/networking/red.down/10-ovpn -etc/rc.d/init.d/networking/red.down/20-RL-firewall +etc/rc.d/init.d/networking/red.down/20-firewall #etc/rc.d/init.d/networking/red.up etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq etc/rc.d/init.d/networking/red.up/10-miniupnpd etc/rc.d/init.d/networking/red.up/10-multicast -etc/rc.d/init.d/networking/red.up/20-RL-firewall +etc/rc.d/init.d/networking/red.up/20-firewall etc/rc.d/init.d/networking/red.up/23-RS-snort etc/rc.d/init.d/networking/red.up/24-RS-qos etc/rc.d/init.d/networking/red.up/27-RS-squid diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 458b966..622886f 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -75,13 +75,13 @@ etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq etc/rc.d/init.d/networking/red.down/10-ipsec etc/rc.d/init.d/networking/red.down/10-miniupnpd etc/rc.d/init.d/networking/red.down/10-ovpn -etc/rc.d/init.d/networking/red.down/20-RL-firewall +etc/rc.d/init.d/networking/red.down/20-firewall #etc/rc.d/init.d/networking/red.up etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq etc/rc.d/init.d/networking/red.up/10-miniupnpd etc/rc.d/init.d/networking/red.up/10-multicast -etc/rc.d/init.d/networking/red.up/20-RL-firewall +etc/rc.d/init.d/networking/red.up/20-firewall etc/rc.d/init.d/networking/red.up/23-RS-snort etc/rc.d/init.d/networking/red.up/24-RS-qos etc/rc.d/init.d/networking/red.up/27-RS-squid diff --git a/lfs/initscripts b/lfs/initscripts index 02f9743..ab870dc 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -187,7 +187,6 @@ $(TARGET) : /etc/rc.d/init.d/networking/red.up/24-RS-qos ln -sf ../../squid /etc/rc.d/init.d/networking/red.up/27-RS-squid ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq - ln -sf ../../firewall /etc/rc.d/init.d/networking/red.down/20-RL-firewall for i in green blue orange; do \ ln -sf any /etc/rc.d/init.d/networking/$$i; \ diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index f77bc02..0d80e7c 100644 --- a/src/initscripts/init.d/firewall +++ b/src/initscripts/init.d/firewall @@ -277,10 +277,16 @@ iptables_init() { /usr/sbin/firewall-policy # Install firewall rules for the red interface. - iptables_red + iptables_red_up + + # If red has not been brought up yet, we will + # add the blocking rules for MASQUERADE + if [ ! -e "/var/ipfire/red/active" ]; then + iptables_red_down + fi } -iptables_red() { +iptables_red_up() { iptables -F REDINPUT iptables -F REDFORWARD iptables -t nat -F REDNAT @@ -358,6 +364,18 @@ iptables_red() { /usr/local/bin/firewallctrl } +iptables_red_down() { + # Prohibit packets to reach the masquerading rule + # while the wan interface is down - this is required to + # circumvent udp related NAT issues + # http://forum.ipfire.org/index.php?topic=11127.0 + iptables -F REDFORWARD + iptables -A REDFORWARD -o $IFACE -j DROP + + # Reload all rules. + /usr/local/bin/firewallctrl +} + # See how we were called. case "$1" in start) @@ -388,9 +406,9 @@ case "$1" in /etc/sysconfig/firewall.local start fi ;; - reload) + reload|up) boot_mesg "Reloading firewall" - iptables_red + iptables_red_up evaluate_retval # run local firewall configuration, if present @@ -398,6 +416,11 @@ case "$1" in /etc/sysconfig/firewall.local reload fi ;; + down) + boot_mesg "Disabling firewall access to RED" + iptables_red_down + evaluate_retval + ;; restart) # run local firewall configuration, if present if [ -x /etc/sysconfig/firewall.local ]; then diff --git a/src/initscripts/init.d/networking/red.down/20-firewall b/src/initscripts/init.d/networking/red.down/20-firewall new file mode 100644 index 0000000..d21c97c --- /dev/null +++ b/src/initscripts/init.d/networking/red.down/20-firewall @@ -0,0 +1,3 @@ +#!/bin/bash + +exec /etc/rc.d/init.d/firewall down diff --git a/src/initscripts/init.d/networking/red.up/20-firewall b/src/initscripts/init.d/networking/red.up/20-firewall new file mode 100644 index 0000000..ca52b4b --- /dev/null +++ b/src/initscripts/init.d/networking/red.up/20-firewall @@ -0,0 +1,3 @@ +#!/bin/bash + +exec /etc/rc.d/init.d/firewall up hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4616ecceced8208c695e697395f0b916d875fb91
by git＠ipfire.org 08 Aug '14

08 Aug '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, next has been updated via 4616ecceced8208c695e697395f0b916d875fb91 (commit) via 2b23289ca2d15cc53cf8617ca8932d1ebb28b7ab (commit) via 4d3e174578dade4cb110ec7f370beb449fcaa48d (commit) from 935c2f233b730a010b241029f559e837d93a7ea7 (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 4616ecceced8208c695e697395f0b916d875fb91 Merge: 935c2f2 2b23289 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Aug 8 08:51:53 2014 +0200 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/81/update.sh | 54 ++++---------------------------------- 1 file changed, 5 insertions(+), 49 deletions(-) Difference in files: diff --git a/config/rootfiles/core/81/update.sh b/config/rootfiles/core/81/update.sh index 67244c6..16a559e 100644 --- a/config/rootfiles/core/81/update.sh +++ b/config/rootfiles/core/81/update.sh @@ -25,74 +25,30 @@ /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # Remove old core updates from pakfire cache to save space... -core=80 +core=81 for (( i=1; i<=$core; i++ )) do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done # Stop services -/etc/init.d/ipsec stop # Remove old strongswan files -rm -f \ - /etc/strongswan.d/charon/unity.conf \ - /usr/lib/ipsec/plugins/libstrongswan-unity.so \ - /usr/share/strongswan/templates/config/plugins/unity.conf - -rm -f /usr/local/bin/setddns.pl # Extract files extract_files # Start services -/etc/init.d/dnsmasq restart -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - +/etc/init.d/apache restart # Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# Uninstall the libgpg-error package. -rm -f \ - /opt/pakfire/db/installed/meta-libgpg-error \ - /opt/pakfire/db/rootfiles/libgpg-error - -# Fix broken proxy configuration permissions -chown -R nobody.nobody \ - /var/ipfire/proxy/advanced \ - /var/ipfire/proxy/acl-1.4 \ - /var/ipfire/proxy/enable \ - /var/ipfire/proxy/settings \ - /var/ipfire/proxy/squid.conf \ - /var/ipfire/proxy/transparent - -# Regenerate squid configuration file -sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi - -# Generate ddns configuration file -sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi - -# Update crontab -sed -i /var/spool/cron/root.orig -e "/setddns.pl/d" - -grep -q /usr/bin/ddns /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig - -# Update dynamic DNS records every five minutes. -# Force an update once a month -*/5 * * * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all -3 2 1 * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all --force -EOF - -fcrontab -z &>/dev/null +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" sync # This update need a reboot... -#touch /var/run/need_reboot - +touch /var/run/need_reboot +^^ # Finish /etc/init.d/fireinfo start sendprofile hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2b23289ca2d15cc53cf8617ca8932d1ebb28b7ab
by git＠ipfire.org 08 Aug '14

08 Aug '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, master has been updated via 2b23289ca2d15cc53cf8617ca8932d1ebb28b7ab (commit) via 4d3e174578dade4cb110ec7f370beb449fcaa48d (commit) from a0e747dafc027d57976c799e23c17f5825a9739a (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 2b23289ca2d15cc53cf8617ca8932d1ebb28b7ab Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Aug 8 08:14:29 2014 +0200 core81: set need reboot flag and restart apache. commit 4d3e174578dade4cb110ec7f370beb449fcaa48d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Aug 7 04:31:58 2014 +0200 core81: change updatescript for core81. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/81/update.sh | 54 ++++---------------------------------- 1 file changed, 5 insertions(+), 49 deletions(-) Difference in files: diff --git a/config/rootfiles/core/81/update.sh b/config/rootfiles/core/81/update.sh index 67244c6..16a559e 100644 --- a/config/rootfiles/core/81/update.sh +++ b/config/rootfiles/core/81/update.sh @@ -25,74 +25,30 @@ /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # Remove old core updates from pakfire cache to save space... -core=80 +core=81 for (( i=1; i<=$core; i++ )) do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done # Stop services -/etc/init.d/ipsec stop # Remove old strongswan files -rm -f \ - /etc/strongswan.d/charon/unity.conf \ - /usr/lib/ipsec/plugins/libstrongswan-unity.so \ - /usr/share/strongswan/templates/config/plugins/unity.conf - -rm -f /usr/local/bin/setddns.pl # Extract files extract_files # Start services -/etc/init.d/dnsmasq restart -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - +/etc/init.d/apache restart # Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# Uninstall the libgpg-error package. -rm -f \ - /opt/pakfire/db/installed/meta-libgpg-error \ - /opt/pakfire/db/rootfiles/libgpg-error - -# Fix broken proxy configuration permissions -chown -R nobody.nobody \ - /var/ipfire/proxy/advanced \ - /var/ipfire/proxy/acl-1.4 \ - /var/ipfire/proxy/enable \ - /var/ipfire/proxy/settings \ - /var/ipfire/proxy/squid.conf \ - /var/ipfire/proxy/transparent - -# Regenerate squid configuration file -sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi - -# Generate ddns configuration file -sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi - -# Update crontab -sed -i /var/spool/cron/root.orig -e "/setddns.pl/d" - -grep -q /usr/bin/ddns /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig - -# Update dynamic DNS records every five minutes. -# Force an update once a month -*/5 * * * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all -3 2 1 * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all --force -EOF - -fcrontab -z &>/dev/null +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" sync # This update need a reboot... -#touch /var/run/need_reboot - +touch /var/run/need_reboot +^^ # Finish /etc/init.d/fireinfo start sendprofile hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core81, updated. 2b23289ca2d15cc53cf8617ca8932d1ebb28b7ab
by git＠ipfire.org 08 Aug '14

08 Aug '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, core81 has been updated via 2b23289ca2d15cc53cf8617ca8932d1ebb28b7ab (commit) from 4d3e174578dade4cb110ec7f370beb449fcaa48d (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 2b23289ca2d15cc53cf8617ca8932d1ebb28b7ab Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Aug 8 08:14:29 2014 +0200 core81: set need reboot flag and restart apache. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/81/update.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/81/update.sh b/config/rootfiles/core/81/update.sh index 743a1d3..16a559e 100644 --- a/config/rootfiles/core/81/update.sh +++ b/config/rootfiles/core/81/update.sh @@ -39,6 +39,7 @@ done extract_files # Start services +/etc/init.d/apache restart # Update Language cache #perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" @@ -46,8 +47,8 @@ extract_files sync # This update need a reboot... -#touch /var/run/need_reboot - +touch /var/run/need_reboot +^^ # Finish /etc/init.d/fireinfo start sendprofile hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 935c2f233b730a010b241029f559e837d93a7ea7
by git＠ipfire.org 07 Aug '14

07 Aug '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, next has been updated via 935c2f233b730a010b241029f559e837d93a7ea7 (commit) via 4851bc81f33058d814028ab91f4badf46739f373 (commit) via a6df80269bb2aaf10c45658d0d2a7058d8456d9a (commit) via c330d115bf0ab7232679151dd8a79fe59ebe1b27 (commit) via 458064c5196c7350313ef2753f17210607031c04 (commit) via a0e747dafc027d57976c799e23c17f5825a9739a (commit) via 5ecf77e7305d72db7c1e6d617d0317b161f25267 (commit) via b0507bff11ae99438291e35d1d36096b1cf9c008 (commit) via 4c658a270eca30cc9b91dc639da5c69326013045 (commit) via 9188f6142c7681ad46cf9acbfc42c2780f951f6c (commit) via 5ffd14f1407ca9be93a2edd65d7151567927fbb4 (commit) via a0a3d81c123cece4c25227c71c983a45594715e7 (commit) via b283b2cf8ffbeea1ab19237ca82db95a45efbb47 (commit) via c2f80e67a711eee43dd5c815defc689fc7604b64 (commit) via 5354d0f5c902f208d755b3b8a06f5896d4d2c975 (commit) via 93899a216f7f03b8e1d5092fdd20afd07b0bedae (commit) via 156311fbcd67f00002fe658e1ee4b20154bf014a (commit) via 06dbe99dbb1c37de8fc94b6f2dc6e53ef1d7d022 (commit) via 1f080b34bac4fbaa88d2b460ece53d460fff6ec5 (commit) via 5fe185f83c98d86cdbca470ecbea5c1365cae3f9 (commit) via b3f401fba4b69ea06a1987a971f8f7ff59b3ee33 (commit) from 80a5cc5609f717be24c2ca5f3f60b46412dc11cd (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 935c2f233b730a010b241029f559e837d93a7ea7 Merge: 80a5cc5 4851bc8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 7 21:06:13 2014 +0200 Merge remote-tracking branch 'ms/ddns.cgi-fixes' into next Conflicts: html/cgi-bin/ddns.cgi commit 4851bc81f33058d814028ab91f4badf46739f373 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Jul 26 18:26:37 2014 +0200 ddns.cgi: Support hostname details without seperating dots. To keep compatiblity with the settings file of the old DDNS update script (setddns.pl) we keept the storrage of the hostname information in two parts (hostname and domain) and connected both with a dot to get a valid FQDN again. OpenDNS and may some other providers do not use a dotted format for this information, so one of these two values were empty. We now can handle such cases in a right way. commit a6df80269bb2aaf10c45658d0d2a7058d8456d9a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 7 20:58:33 2014 +0200 ddns.cgi: Fix CGI clearing all settings. commit c330d115bf0ab7232679151dd8a79fe59ebe1b27 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 7 20:40:14 2014 +0200 ddns.cgi: Fix coding style. commit 458064c5196c7350313ef2753f17210607031c04 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 7 20:33:10 2014 +0200 ddns.cgi: Allow enabling/disabling entries. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/ddns | 3 + config/rootfiles/core/80/filelists/files | 1 + config/rootfiles/core/{80 => 81}/exclude | 0 config/rootfiles/core/{80 => 81}/filelists/ddns | 0 .../{oldcore/63 => core/81}/filelists/files | 4 +- config/rootfiles/core/{80 => 81}/filelists/lzo | 0 .../{oldcore/36 => core/81}/filelists/openssh | 0 .../{oldcore/28 => core/81}/filelists/openssl | 0 config/rootfiles/core/{80 => 81}/meta | 0 config/rootfiles/core/{80 => 81}/update.sh | 0 html/cgi-bin/ddns.cgi | 88 ++++---- html/cgi-bin/ids.cgi | 6 +- lfs/check_mk_agent | 2 +- lfs/ddns | 6 +- lfs/lzo | 5 +- lfs/openssl | 4 +- lfs/tor | 6 +- make.sh | 4 +- src/paks/check_mk_agent/uninstall.sh | 1 + ...3-Add-a-program-prefix-to-syslog-messages.patch | 25 --- src/patches/lzo-2.06-CVE-2014-4607.patch | 245 +++++++++++++++++++++ 21 files changed, 310 insertions(+), 90 deletions(-) copy config/rootfiles/core/{80 => 81}/exclude (100%) copy config/rootfiles/core/{80 => 81}/filelists/ddns (100%) copy config/rootfiles/{oldcore/63 => core/81}/filelists/files (50%) copy config/rootfiles/core/{80 => 81}/filelists/lzo (100%) copy config/rootfiles/{oldcore/36 => core/81}/filelists/openssh (100%) copy config/rootfiles/{oldcore/28 => core/81}/filelists/openssl (100%) copy config/rootfiles/core/{80 => 81}/meta (100%) copy config/rootfiles/core/{80 => 81}/update.sh (100%) delete mode 100644 src/patches/ddns-003-Add-a-program-prefix-to-syslog-messages.patch create mode 100755 src/patches/lzo-2.06-CVE-2014-4607.patch Difference in files: diff --git a/config/rootfiles/common/ddns b/config/rootfiles/common/ddns index 2f0bdf7..f93965c 100644 --- a/config/rootfiles/common/ddns +++ b/config/rootfiles/common/ddns @@ -60,4 +60,7 @@ usr/lib/python2.7/site-packages/ddns/system.pyo #usr/share/locale/uz@Latn/LC_MESSAGES #usr/share/locale/uz(a)Latn/LC_MESSAGES/ddns.mo #usr/share/locale/vi/LC_MESSAGES/ddns.mo +#usr/share/locale/zh +#usr/share/locale/zh/LC_MESSAGES +#usr/share/locale/zh/LC_MESSAGES/ddns.mo #var/ipfire/ddns/ddns.conf.sample diff --git a/config/rootfiles/core/80/filelists/files b/config/rootfiles/core/80/filelists/files index a12048d..cdddaac 100644 --- a/config/rootfiles/core/80/filelists/files +++ b/config/rootfiles/core/80/filelists/files @@ -8,6 +8,7 @@ etc/rc.d/init.d/firewall etc/rc.d/init.d/networking/red.up/30-ddns etc/rc.d/init.d/rngd srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/netexternal.cgi diff --git a/config/rootfiles/core/81/exclude b/config/rootfiles/core/81/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/core/81/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/81/filelists/ddns b/config/rootfiles/core/81/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/core/81/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/81/filelists/files b/config/rootfiles/core/81/filelists/files new file mode 100644 index 0000000..4b0ae1e --- /dev/null +++ b/config/rootfiles/core/81/filelists/files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/firewall +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi diff --git a/config/rootfiles/core/81/filelists/lzo b/config/rootfiles/core/81/filelists/lzo new file mode 120000 index 0000000..8e11e78 --- /dev/null +++ b/config/rootfiles/core/81/filelists/lzo @@ -0,0 +1 @@ +../../../common/lzo \ No newline at end of file diff --git a/config/rootfiles/core/81/filelists/openssh b/config/rootfiles/core/81/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/81/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/81/filelists/openssl b/config/rootfiles/core/81/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/81/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/81/meta b/config/rootfiles/core/81/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/81/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/81/update.sh b/config/rootfiles/core/81/update.sh new file mode 100644 index 0000000..67244c6 --- /dev/null +++ b/config/rootfiles/core/81/update.sh @@ -0,0 +1,101 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=80 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services +/etc/init.d/ipsec stop + +# Remove old strongswan files +rm -f \ + /etc/strongswan.d/charon/unity.conf \ + /usr/lib/ipsec/plugins/libstrongswan-unity.so \ + /usr/share/strongswan/templates/config/plugins/unity.conf + +rm -f /usr/local/bin/setddns.pl + +# Extract files +extract_files + +# Start services +/etc/init.d/dnsmasq restart +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + + +# Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Uninstall the libgpg-error package. +rm -f \ + /opt/pakfire/db/installed/meta-libgpg-error \ + /opt/pakfire/db/rootfiles/libgpg-error + +# Fix broken proxy configuration permissions +chown -R nobody.nobody \ + /var/ipfire/proxy/advanced \ + /var/ipfire/proxy/acl-1.4 \ + /var/ipfire/proxy/enable \ + /var/ipfire/proxy/settings \ + /var/ipfire/proxy/squid.conf \ + /var/ipfire/proxy/transparent + +# Regenerate squid configuration file +sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi + +# Generate ddns configuration file +sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi + +# Update crontab +sed -i /var/spool/cron/root.orig -e "/setddns.pl/d" + +grep -q /usr/bin/ddns /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig + +# Update dynamic DNS records every five minutes. +# Force an update once a month +*/5 * * * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all +3 2 1 * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all --force +EOF + +fcrontab -z &>/dev/null + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Don't report the exitcode last command +exit 0 diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index aeb0cd7..55841b2 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -89,7 +89,6 @@ close (FILE); # Save General Settings. # if ($settings{'ACTION'} eq $Lang::tr{'save'}) { - # Open /var/ipfire/ddns/settings for writing. open(FILE, ">$settingsfile") or die "Unable to open $settingsfile."; @@ -104,9 +103,6 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { # Close file after writing. close(FILE); - # Unset given CGI parmas. - undef %settings; - # Update ddns config file. &GenerateDDNSConfigFile(); } @@ -115,7 +111,6 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { # Toggle enable/disable field. Field is in second position # if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { - # Open /var/ipfire/ddns/config for writing. open(FILE, ">$datafile") or die "Unable to open $datafile."; @@ -127,23 +122,19 @@ if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { # Read file line by line. foreach my $line (@current) { - # Remove newlines. chomp($line); if ($settings{'ID'} eq $id) { - # Splitt lines (splitting element is a single ",") and save values into temp array. @temp = split(/\,/,$line); # Check if we want to toggle ENABLED or WILDCARDS. if ($settings{'ENABLED'} ne '') { - # Update ENABLED. print FILE "$temp[0],$temp[1],$temp[2],$temp[3],$temp[4],$temp[5],$temp[6],$settings{'ENABLED'}\n"; } } else { - # Print unmodified line. print FILE "$line\n"; } @@ -151,13 +142,11 @@ if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { # Increase $id. $id++; } + undef $settings{'ID'}; # Close file after writing. close(FILE); - # Unset given CGI params. - undef %settings; - # Write out logging notice. &General::log($Lang::tr{'ddns hostname modified'}); @@ -169,7 +158,6 @@ if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { # Add new accounts, or edit existing ones. # if (($settings{'ACTION'} eq $Lang::tr{'add'}) || ($settings{'ACTION'} eq $Lang::tr{'update'})) { - # Check if a hostname has been given. if ($settings{'HOSTNAME'} eq '') { $errormessage = $Lang::tr{'hostname not set'}; @@ -187,19 +175,23 @@ if (($settings{'ACTION'} eq $Lang::tr{'add'}) || ($settings{'ACTION'} eq $Lang:: # Check if a password has been typed in. # freedns.afraid.org does not require this field. - if (($settings{'PASSWORD'} eq '') && ($settings{'SERVICE'} ne 'freedns.afraid.org')) { + if (($settings{'PASSWORD'} eq '') && ($settings{'SERVICE'} ne 'freedns.afraid.org') && ($settings{'SERVICE'} ne 'regfish.com')) { $errormessage = $Lang::tr{'password not set'}; } # Go furter if there was no error. - if ( ! $errormessage) { - + if (!$errormessage) { # Splitt hostname field into 2 parts for storrage. my($hostname, $domain) = split(/\./, $settings{'HOSTNAME'}, 2); + # Handle enabled checkbox. When the checkbox is selected a "on" will be returned, + # if the checkbox is not checked nothing is returned in this case we set the value to "off". + if ($settings{'ENABLED'} ne 'on') { + $settings{'ENABLED'} = 'off'; + } + # Handle adding new accounts. if ($settings{'ACTION'} eq $Lang::tr{'add'}) { - # Open /var/ipfire/ddns/config for writing. open(FILE, ">>$datafile") or die "Unable to open $datafile."; @@ -215,11 +207,8 @@ if (($settings{'ACTION'} eq $Lang::tr{'add'}) || ($settings{'ACTION'} eq $Lang:: # Write out notice to logfile. &General::log($Lang::tr{'ddns hostname added'}); - # Update ddns config file. - # Handle account edditing. } elsif ($settings{'ACTION'} eq $Lang::tr{'update'}) { - # Open /var/ipfire/ddns/config for writing. open(FILE, ">$datafile") or die "Unable to open $datafile."; @@ -230,7 +219,6 @@ if (($settings{'ACTION'} eq $Lang::tr{'add'}) || ($settings{'ACTION'} eq $Lang:: # Read file line by line. foreach my $line (@current) { - if ($settings{'ID'} eq $id) { print FILE "$settings{'SERVICE'},$hostname,$domain,$settings{'PROXY'},$settings{'WILDCARDS'},$settings{'LOGIN'},$settings{'PASSWORD'},$settings{'ENABLED'}\n"; } else { @@ -247,9 +235,7 @@ if (($settings{'ACTION'} eq $Lang::tr{'add'}) || ($settings{'ACTION'} eq $Lang:: # Write out notice to logfile. &General::log($Lang::tr{'ddns hostname modified'}); } - - # Unset given CGI params. - undef %settings; + undef $settings{'ID'}; # Update ddns config file. &GenerateDDNSConfigFile(); @@ -260,7 +246,6 @@ if (($settings{'ACTION'} eq $Lang::tr{'add'}) || ($settings{'ACTION'} eq $Lang:: # Remove existing accounts. # if ($settings{'ACTION'} eq $Lang::tr{'remove'}) { - # Open /var/ipfire/ddns/config for writing. open(FILE, ">$datafile") or die "Unable to open $datafile."; @@ -271,7 +256,6 @@ if ($settings{'ACTION'} eq $Lang::tr{'remove'}) { # Read file line by line. foreach my $line (@current) { - # Write back every line, except the one we want to drop # (identified by the ID) unless ($settings{'ID'} eq $id) { @@ -281,13 +265,11 @@ if ($settings{'ACTION'} eq $Lang::tr{'remove'}) { # Increase id. $id++; } + undef $settings{'ID'}; # Close file after writing. close(FILE); - # Unset given CGI params. - undef %settings; - # Write out notice to logfile. &General::log($Lang::tr{'ddns hostname removed'}); @@ -299,15 +281,12 @@ if ($settings{'ACTION'} eq $Lang::tr{'remove'}) { # Read items for editing. # if ($settings{'ACTION'} eq $Lang::tr{'edit'}) { - my $id = 0; my @temp; # Read file line by line. foreach my $line (@current) { - if ($settings{'ID'} eq $id) { - # Remove newlines. chomp($line); @@ -331,10 +310,12 @@ if ($settings{'ACTION'} eq $Lang::tr{'edit'}) { $settings{'PASSWORD'} = $temp[6]; $settings{'ENABLED'} = $temp[7]; } - # Increase $id. - $id++; + # Increase $id. + $id++; } + + &GenerateDDNSConfigFile(); } # @@ -347,9 +328,10 @@ if ($settings{'ACTION'} eq $Lang::tr{'instant update'}) { # # Set default values. # -if (! $settings{'ACTION'}) { +if (!$settings{'ACTION'}) { $settings{'SERVICE'} = 'dyndns.org'; $settings{'ENABLED'} = 'on'; + $settings{'ID'} = ''; } &Header::openpage($Lang::tr{'dynamic dns'}, 1, ''); @@ -363,7 +345,9 @@ $checked{'BEHINDROUTER'}{'RED_IP'} = ''; $checked{'BEHINDROUTER'}{'FETCH_IP'} = ''; $checked{'BEHINDROUTER'}{$settings{'BEHINDROUTER'}} = "checked='checked'"; -$checked{'ENABLED'}{'on'} = ($settings{'ENABLED'} eq '' ) ? '' : "checked='checked'"; +$checked{'ENABLED'}{'on'} = ''; +$checked{'ENABLED'}{'off'} = ''; +$checked{'ENABLED'}{$settings{'ENABLED'}} = "checked='checked'"; # Show box for errormessages.. if ($errormessage) { @@ -413,18 +397,15 @@ my $buttontext = $Lang::tr{'add'}; # Change buttontext and headline if we edit an account. if ($settings{'ACTION'} eq $Lang::tr{'edit'}) { - # Rename button and print headline for updating. $buttontext = $Lang::tr{'update'}; &Header::openbox('100%', 'left', $Lang::tr{'edit an existing host'}); } else { - # Otherwise use default button text and show headline for adding a new account. &Header::openbox('100%', 'left', $Lang::tr{'add a host'}); } print <<END - <form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='ID' value='$settings{'ID'}' /> <table width='100%'> @@ -440,7 +421,6 @@ END # Loop to print the providerlist. foreach my $provider (@providers) { - # Check if the current provider needs to be selected. if ($provider eq $settings{'SERVICE'}) { $selected = 'selected'; @@ -460,7 +440,7 @@ print <<END <tr> <td class='base'>$Lang::tr{'enabled'}</td> - <td><input type='checkbox' name='ENABLED' value='on' $checked{'ENABLED'}{'on'} /></td> + <td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td> <td class='base'>$Lang::tr{'username'}</td> <td><input type='text' name='LOGIN' value='$settings{'LOGIN'}' /></td> </tr> @@ -516,17 +496,32 @@ END chomp(@current); my @temp = split(/\,/,$line); + # Handle hostname details. Only connect the values with a dott if both are available. + my $hostname=""; + + if (($temp[1]) && ($temp[2])) { + $hostname="$temp[1].$temp[2]"; + } else { + $hostname="$temp[1]"; + } + # Generate value for enable/disable checkbox. - my $sync = "<font color='blue'>"; + my $sync = ''; my $gif = ''; my $gdesc = ''; if ($temp[7] eq "on") { $gif = 'on.gif'; $gdesc = $Lang::tr{'click to disable'}; - $sync = (&General::DyndnsServiceSync ($ip,$temp[1], $temp[2]) ? "<font color='green'>": "<font color='red'>") ; + + # Check if the given hostname is a FQDN before doing a nslookup. + if (&General::validfqdn($hostname)) { + $sync = (&General::DyndnsServiceSync ($ip,$temp[1], $temp[2]) ? "<font color='green'>": "<font color='red'>") ; + } + $toggle_enabled = 'off'; } else { + $sync = "<font color='blue'>"; $gif = 'off.gif'; $gdesc = $Lang::tr{'click to enable'}; $toggle_enabled = 'on'; @@ -648,6 +643,7 @@ sub GenerateDDNSConfigFile { while (<SETTINGS>) { my $line = $_; + chomp($line); # Generate array based on the line content (seperator is a single or multiple space's) my @settings = split(/,/, $line); @@ -657,7 +653,7 @@ sub GenerateDDNSConfigFile { next unless ($provider ~~ @providers); # Skip disabled entries. - next if ($enabled eq "off"); + next unless ($enabled eq "on"); # Handle hostname details. Only connect the values with a dott if both are available. if (($hostname) && ($domain)) { @@ -674,8 +670,8 @@ sub GenerateDDNSConfigFile { if ($provider ~~ ["dns.lightningwirelabs.com", "entrydns.net", "regfish.com"] && $username eq "token") { $use_token = 1; - # Handle token auth for freedns.afraid.org. - } elsif ($provider eq "freedns.afraid.org" && $password eq "") { + # Handle token auth for freedns.afraid.org and regfish.com. + } elsif ($provider ~~ ["freedns.afraid.org", "regfish.com"] && $password eq "") { $use_token = 1; $password = $username; diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 5a28daa..ff72b78 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -263,11 +263,11 @@ if (-e "/etc/snort/snort.conf") { ####################### End added for snort rules control ################################# if ($snortsettings{'RULES'} eq 'subscripted') { - $url=" http://www.snort.org/sub-rules/snortrules-snapshot-2961.tar.gz/$snortsettin…'OINKCODE'}"; + $url=" https://www.snort.org/rules/snortrules-snapshot-2961.tar.gz?oinkcode=$snort…'OINKCODE'}"; } elsif ($snortsettings{'RULES'} eq 'registered') { - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2960.tar.gz/$snortsettin…'OINKCODE'}"; + $url=" https://www.snort.org/rules/snortrules-snapshot-2961.tar.gz?oinkcode=$snort…'OINKCODE'}"; } elsif ($snortsettings{'RULES'} eq 'community') { - $url=" http://s3.amazonaws.com/snort-org/www/rules/community/community-rules.tar.gz"; + $url=" https://www.snort.org/rules/community"; } else { $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"; } diff --git a/lfs/check_mk_agent b/lfs/check_mk_agent index 541d7d6..5326471 100644 --- a/lfs/check_mk_agent +++ b/lfs/check_mk_agent @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/check_mk-${VER} TARGET = $(DIR_INFO)/$(THISAPP) PROG = check_mk_agent -PAK_VER = 3 +PAK_VER = 4 DEPS = "" diff --git a/lfs/ddns b/lfs/ddns index 975c8c3..b94b3a1 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -24,7 +24,7 @@ include Config -VER = 003 +VER = 004 THISAPP = ddns-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9ff8ab5fa716859b51f63b0a241f1337 +$(DL_FILE)_MD5 = ff77cb72d0cb06c73bde70419b15bae8 install : $(TARGET) @@ -71,8 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns-003-Add-a-program-prefix-to-syslog-messages.patch - cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire cd $(DIR_APP) && make $(MAKETUNING) diff --git a/lfs/lzo b/lfs/lzo index 1745f4c..19ad090 100644 --- a/lfs/lzo +++ b/lfs/lzo @@ -24,7 +24,7 @@ include Config -VER = 2.08 +VER = 2.06 THISAPP = lzo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fcec64c26a0f4f4901468f360029678f +$(DL_FILE)_MD5 = 95380bd4081f85ef08c5209f4107e9f8 install : $(TARGET) @@ -70,6 +70,7 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/lzo-2.06-CVE-2014-4607.patch cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/openssl b/lfs/openssl index 12cea68..0f0b823 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 1.0.1h +VER = 1.0.1i THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -51,7 +51,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8d6d684a9430d5cc98a62a5d8fbda8cf +$(DL_FILE)_MD5 = c8dc151a671b9b92ff3e4c118b174972 install : $(TARGET) diff --git a/lfs/tor b/lfs/tor index 6f9e502..0cc2957 100644 --- a/lfs/tor +++ b/lfs/tor @@ -24,7 +24,7 @@ include Config -VER = 0.2.4.22 +VER = 0.2.4.23 THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 7 +PAK_VER = 8 DEPS = "libevent2" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5a7eee0d9df87233255d78b25c6f8270 +$(DL_FILE)_MD5 = 9e39928e310612c3bffee727f554c63f install : $(TARGET) diff --git a/make.sh b/make.sh index 88e710b..739fc53 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.15" # Version number -CORE="80" # Core Level (Filename) -PAKFIRE_CORE="80" # Core Level (PAKFIRE) +CORE="81" # Core Level (Filename) +PAKFIRE_CORE="81" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir diff --git a/src/paks/check_mk_agent/uninstall.sh b/src/paks/check_mk_agent/uninstall.sh index 3a0860a..51449f5 100644 --- a/src/paks/check_mk_agent/uninstall.sh +++ b/src/paks/check_mk_agent/uninstall.sh @@ -22,6 +22,7 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes make_backup ${NAME} remove_files diff --git a/src/patches/ddns-003-Add-a-program-prefix-to-syslog-messages.patch b/src/patches/ddns-003-Add-a-program-prefix-to-syslog-messages.patch deleted file mode 100644 index 978db85..0000000 --- a/src/patches/ddns-003-Add-a-program-prefix-to-syslog-messages.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 21fd4b8d26d01d622185ab8de971a9ee934220a3 Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Thu, 24 Jul 2014 13:23:36 +0200 -Subject: [PATCH] Add a program prefix to syslog messages. - ---- - src/ddns/__init__.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/ddns/__init__.py b/src/ddns/__init__.py -index 22764e6..6fe3a33 100644 ---- a/src/ddns/__init__.py -+++ b/src/ddns/__init__.py -@@ -42,6 +42,8 @@ def setup_logging(): - handler = logging.handlers.SysLogHandler(address="/dev/log", - facility=logging.handlers.SysLogHandler.LOG_DAEMON - ) -+ formatter = logging.Formatter("ddns[%(process)d]: %(message)s") -+ handler.setFormatter(formatter) - handler.setLevel(logging.INFO) - rootlogger.addHandler(handler) - --- -1.9.3 - diff --git a/src/patches/lzo-2.06-CVE-2014-4607.patch b/src/patches/lzo-2.06-CVE-2014-4607.patch new file mode 100755 index 0000000..d22c406 --- /dev/null +++ b/src/patches/lzo-2.06-CVE-2014-4607.patch @@ -0,0 +1,245 @@ +diff --git a/minilzo/minilzo.c b/minilzo/minilzo.c +index 34ce0f0..ecfdf66 100644 +--- a/minilzo/minilzo.c ++++ b/minilzo/minilzo.c +@@ -3547,6 +3547,8 @@ DO_COMPRESS ( const lzo_bytep in , lzo_uint in_len, + #undef TEST_LBO + #undef NEED_IP + #undef NEED_OP ++#undef TEST_IV ++#undef TEST_OV + #undef HAVE_TEST_IP + #undef HAVE_TEST_OP + #undef HAVE_NEED_IP +@@ -3561,6 +3563,7 @@ DO_COMPRESS ( const lzo_bytep in , lzo_uint in_len, + # if (LZO_TEST_OVERRUN_INPUT >= 2) + # define NEED_IP(x) \ + if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x)) goto input_overrun ++# define TEST_IV(x) if ((x) > (lzo_uint)0 - (511)) goto input_overrun + # endif + #endif + +@@ -3572,6 +3575,7 @@ DO_COMPRESS ( const lzo_bytep in , lzo_uint in_len, + # undef TEST_OP + # define NEED_OP(x) \ + if ((lzo_uint)(op_end - op) < (lzo_uint)(x)) goto output_overrun ++# define TEST_OV(x) if ((x) > (lzo_uint)0 - (511)) goto output_overrun + # endif + #endif + +@@ -3602,11 +3606,13 @@ DO_COMPRESS ( const lzo_bytep in , lzo_uint in_len, + # define HAVE_NEED_IP 1 + #else + # define NEED_IP(x) ((void) 0) ++# define TEST_IV(x) ((void) 0) + #endif + #if defined(NEED_OP) + # define HAVE_NEED_OP 1 + #else + # define NEED_OP(x) ((void) 0) ++# define TEST_OV(x) ((void) 0) + #endif + + #if defined(HAVE_TEST_IP) || defined(HAVE_NEED_IP) +@@ -3687,6 +3693,7 @@ DO_DECOMPRESS ( const lzo_bytep in , lzo_uint in_len, + { + t += 255; + ip++; ++ TEST_IV(t); + NEED_IP(1); + } + t += 15 + *ip++; +@@ -3835,6 +3842,7 @@ match: + { + t += 255; + ip++; ++ TEST_OV(t); + NEED_IP(1); + } + t += 31 + *ip++; +@@ -3879,6 +3887,7 @@ match: + { + t += 255; + ip++; ++ TEST_OV(t); + NEED_IP(1); + } + t += 7 + *ip++; +@@ -4073,6 +4082,8 @@ lookbehind_overrun: + #undef TEST_LBO + #undef NEED_IP + #undef NEED_OP ++#undef TEST_IV ++#undef TEST_OV + #undef HAVE_TEST_IP + #undef HAVE_TEST_OP + #undef HAVE_NEED_IP +@@ -4087,6 +4098,7 @@ lookbehind_overrun: + # if (LZO_TEST_OVERRUN_INPUT >= 2) + # define NEED_IP(x) \ + if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x)) goto input_overrun ++# define TEST_IV(x) if ((x) > (lzo_uint)0 - (511)) goto input_overrun + # endif + #endif + +@@ -4098,6 +4110,7 @@ lookbehind_overrun: + # undef TEST_OP + # define NEED_OP(x) \ + if ((lzo_uint)(op_end - op) < (lzo_uint)(x)) goto output_overrun ++# define TEST_OV(x) if ((x) > (lzo_uint)0 - (511)) goto output_overrun + # endif + #endif + +@@ -4128,11 +4141,13 @@ lookbehind_overrun: + # define HAVE_NEED_IP 1 + #else + # define NEED_IP(x) ((void) 0) ++# define TEST_IV(x) ((void) 0) + #endif + #if defined(NEED_OP) + # define HAVE_NEED_OP 1 + #else + # define NEED_OP(x) ((void) 0) ++# define TEST_OV(x) ((void) 0) + #endif + + #if defined(HAVE_TEST_IP) || defined(HAVE_NEED_IP) +@@ -4213,6 +4228,7 @@ DO_DECOMPRESS ( const lzo_bytep in , lzo_uint in_len, + { + t += 255; + ip++; ++ TEST_IV(t); + NEED_IP(1); + } + t += 15 + *ip++; +@@ -4361,6 +4377,7 @@ match: + { + t += 255; + ip++; ++ TEST_OV(t); + NEED_IP(1); + } + t += 31 + *ip++; +@@ -4405,6 +4422,7 @@ match: + { + t += 255; + ip++; ++ TEST_OV(t); + NEED_IP(1); + } + t += 7 + *ip++; +diff --git a/src/lzo1_d.ch b/src/lzo1_d.ch +index 40a5bfd..c442d9c 100644 +--- a/src/lzo1_d.ch ++++ b/src/lzo1_d.ch +@@ -76,6 +76,8 @@ + #undef TEST_LBO + #undef NEED_IP + #undef NEED_OP ++#undef TEST_IV ++#undef TEST_OV + #undef HAVE_TEST_IP + #undef HAVE_TEST_OP + #undef HAVE_NEED_IP +@@ -91,6 +93,7 @@ + # if (LZO_TEST_OVERRUN_INPUT >= 2) + # define NEED_IP(x) \ + if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x)) goto input_overrun ++# define TEST_IV(x) if ((x) > (lzo_uint)0 - (511)) goto input_overrun + # endif + #endif + +@@ -102,6 +105,7 @@ + # undef TEST_OP /* don't need both of the tests here */ + # define NEED_OP(x) \ + if ((lzo_uint)(op_end - op) < (lzo_uint)(x)) goto output_overrun ++# define TEST_OV(x) if ((x) > (lzo_uint)0 - (511)) goto output_overrun + # endif + #endif + +@@ -135,11 +139,13 @@ + # define HAVE_NEED_IP 1 + #else + # define NEED_IP(x) ((void) 0) ++# define TEST_IV(x) ((void) 0) + #endif + #if defined(NEED_OP) + # define HAVE_NEED_OP 1 + #else + # define NEED_OP(x) ((void) 0) ++# define TEST_OV(x) ((void) 0) + #endif + + +diff --git a/src/lzo1b_d.ch b/src/lzo1b_d.ch +index fe5f361..36b4b6b 100644 +--- a/src/lzo1b_d.ch ++++ b/src/lzo1b_d.ch +@@ -187,6 +187,7 @@ match: + { + t += 255; + ip++; ++ TEST_OV(t); + NEED_IP(1); + } + t += (M4_MIN_LEN - M3_MIN_LEN) + *ip++; +diff --git a/src/lzo1f_d.ch b/src/lzo1f_d.ch +index 9e942f5..0c2199e 100644 +--- a/src/lzo1f_d.ch ++++ b/src/lzo1f_d.ch +@@ -84,6 +84,7 @@ DO_DECOMPRESS ( const lzo_bytep in , lzo_uint in_len, + { + t += 255; + ip++; ++ TEST_IV(t); + NEED_IP(1); + } + t += 31 + *ip++; +@@ -138,6 +139,7 @@ match: + { + t += 255; + ip++; ++ TEST_OV(t); + NEED_IP(1); + } + t += 31 + *ip++; +diff --git a/src/lzo1x_d.ch b/src/lzo1x_d.ch +index 49cf326..c804cc7 100644 +--- a/src/lzo1x_d.ch ++++ b/src/lzo1x_d.ch +@@ -120,6 +120,7 @@ DO_DECOMPRESS ( const lzo_bytep in , lzo_uint in_len, + { + t += 255; + ip++; ++ TEST_IV(t); + NEED_IP(1); + } + t += 15 + *ip++; +@@ -273,6 +274,7 @@ match: + { + t += 255; + ip++; ++ TEST_OV(t); + NEED_IP(1); + } + t += 31 + *ip++; +@@ -317,6 +319,7 @@ match: + { + t += 255; + ip++; ++ TEST_OV(t); + NEED_IP(1); + } + t += 7 + *ip++; +diff --git a/src/lzo2a_d.ch b/src/lzo2a_d.ch +index 48e51ca..954f07e 100644 +--- a/src/lzo2a_d.ch ++++ b/src/lzo2a_d.ch +@@ -131,6 +131,7 @@ DO_DECOMPRESS ( const lzo_bytep in , lzo_uint in_len, + { + t += 255; + ip++; ++ TEST_OV(t); + NEED_IP(1); + } + t += *ip++; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 80a5cc5609f717be24c2ca5f3f60b46412dc11cd
by git＠ipfire.org 07 Aug '14

07 Aug '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, next has been updated via 80a5cc5609f717be24c2ca5f3f60b46412dc11cd (commit) via d6413caa722ca750234a0227b36a6cd9ec51071e (commit) from 89e9f46e5bbce78e0b528d183a7ed805ae998f1a (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 80a5cc5609f717be24c2ca5f3f60b46412dc11cd Merge: 89e9f46 d6413ca Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 7 15:11:47 2014 +0200 Merge remote-tracking branch 'amarx/ACCOUNTING' into next commit d6413caa722ca750234a0227b36a6cd9ec51071e Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Aug 7 15:10:11 2014 +0200 squid-accounting: get trafficdata from LAST month, when month has changed ----------------------------------------------------------------------- Summary of changes: src/squid-accounting/acct.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/src/squid-accounting/acct.pl b/src/squid-accounting/acct.pl index 59898b7..d535901 100755 --- a/src/squid-accounting/acct.pl +++ b/src/squid-accounting/acct.pl @@ -209,7 +209,7 @@ sub sendbill { my $cur = $_[2]; my @now = localtime(time); $now[5] = $now[5] + 1900; - my $actmonth = $now[4]+1; + my $actmonth = $now[4]; my $month = '0'.$actmonth if $actmonth < 10; my $actyear = $now[5]; my ($from,$till)=&ACCT::getmonth($actmonth,$actyear); #FIXME month and year as variables! hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 89e9f46e5bbce78e0b528d183a7ed805ae998f1a
by git＠ipfire.org 07 Aug '14

07 Aug '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, next has been updated via 89e9f46e5bbce78e0b528d183a7ed805ae998f1a (commit) via 908555842cdeb364a5c28ecfc4d901432f6afd33 (commit) via f808e5891c7ec7cedca1480f962ea3ff98fc4c38 (commit) via a5f5ccfc4f49b825e17ae1334aa13512b1d41bc2 (commit) via 983d471f93f7e71be27d94a416112e18842678e0 (commit) via 1cdea84a909dcb47e6dbab447705d11450bb5e42 (commit) via 18a66b95dff02a0962b6e85cdcbfa8021dcc7c53 (commit) via f38af1a976e76b901556c0e48561f2720e6e3b0a (commit) via db8a01e0277fa3cfe82a37b49f9d7c29b749c795 (commit) via 83ef9c40ef86a4d3c18b81295b5866862fad5257 (commit) from 194314b2500101fc906d2834fc42e9832c392059 (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 89e9f46e5bbce78e0b528d183a7ed805ae998f1a Merge: 9085558 a5f5ccf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 7 14:59:17 2014 +0200 Merge remote-tracking branch 'amarx/ACCOUNTING' into next Conflicts: make.sh commit 908555842cdeb364a5c28ecfc4d901432f6afd33 Merge: f808e58 983d471 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 7 14:50:42 2014 +0200 Merge remote-tracking branch 'ms/firewall-no-nat' into next Conflicts: doc/language_issues.nl doc/language_issues.tr commit f808e5891c7ec7cedca1480f962ea3ff98fc4c38 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 7 14:49:50 2014 +0200 Add batctl and libnl-3. commit a5f5ccfc4f49b825e17ae1334aa13512b1d41bc2 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Wed Aug 6 15:10:41 2014 +0200 squid-accounting: create billpreview file as temporary file commit 983d471f93f7e71be27d94a416112e18842678e0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 6 14:37:21 2014 +0200 firewall-no-nat: Use network masks to identify the subnets. In the POSTROUTING chains of the NAT table, there is no more information about on which interface the packet has arrived (green0, etc.). commit 1cdea84a909dcb47e6dbab447705d11450bb5e42 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Wed Aug 6 13:50:42 2014 +0200 squid-accounting: changed permissions on acct-lib.pl commit 18a66b95dff02a0962b6e85cdcbfa8021dcc7c53 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Wed Aug 6 13:41:54 2014 +0200 squid-accounting: change permissions and reread languagefiles on uninstall commit f38af1a976e76b901556c0e48561f2720e6e3b0a Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Wed Aug 6 08:59:43 2014 +0200 Per-PDF-API2: new perl module used by squid-accounting commit db8a01e0277fa3cfe82a37b49f9d7c29b749c795 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Wed Aug 6 08:58:43 2014 +0200 Squid-accounting: new addon for measuring proxy traffic per user/ip commit 83ef9c40ef86a4d3c18b81295b5866862fad5257 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat May 17 14:08:52 2014 +0200 firewall: Allow to disable masquerading. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/batctl | 2 + config/rootfiles/common/libnl-3 | 204 ++ config/rootfiles/packages/perl-PDF-API2 | 176 ++ config/rootfiles/packages/squid-accounting | 13 + doc/language_issues.es | 6 + doc/language_issues.fr | 6 + doc/language_issues.nl | 6 + doc/language_issues.pl | 6 + doc/language_issues.ru | 6 + doc/language_issues.tr | 6 + doc/language_missings | 24 + html/cgi-bin/optionsfw.cgi | 70 +- langs/de/cgi-bin/de.pl | 6 + langs/en/cgi-bin/en.pl | 6 + lfs/{libpng => batctl} | 12 +- lfs/{fontconfig => libnl-3} | 9 +- lfs/{perl-DBI => perl-PDF-API2} | 10 +- lfs/squid-accounting | 71 + make.sh | 4 + src/initscripts/init.d/firewall | 25 +- src/paks/{perl-DBI => squid-accounting}/install.sh | 10 + .../{libdaemon => squid-accounting}/uninstall.sh | 5 +- src/paks/{apcupsd => squid-accounting}/update.sh | 0 src/squid-accounting/EX-squid-accounting.menu | 5 + src/squid-accounting/accounting.cgi | 2194 ++++++++++++++++++++ src/squid-accounting/acct-lib.pl | 923 ++++++++ src/squid-accounting/acct.de.pl | 134 ++ src/squid-accounting/acct.en.pl | 134 ++ src/squid-accounting/acct.pl | 265 +++ .../config/backup/includes/squid-accounting | 5 + lfs/teamspeak => src/squid-accounting/dbinstall.pl | 47 +- 31 files changed, 4342 insertions(+), 48 deletions(-) create mode 100644 config/rootfiles/common/batctl create mode 100644 config/rootfiles/common/libnl-3 create mode 100644 config/rootfiles/packages/perl-PDF-API2 create mode 100644 config/rootfiles/packages/squid-accounting copy lfs/{libpng => batctl} (94%) copy lfs/{fontconfig => libnl-3} (96%) copy lfs/{perl-DBI => perl-PDF-API2} (95%) create mode 100644 lfs/squid-accounting copy src/paks/{perl-DBI => squid-accounting}/install.sh (83%) copy src/paks/{libdaemon => squid-accounting}/uninstall.sh (94%) copy src/paks/{apcupsd => squid-accounting}/update.sh (100%) create mode 100755 src/squid-accounting/EX-squid-accounting.menu create mode 100755 src/squid-accounting/accounting.cgi create mode 100644 src/squid-accounting/acct-lib.pl create mode 100644 src/squid-accounting/acct.de.pl create mode 100644 src/squid-accounting/acct.en.pl create mode 100755 src/squid-accounting/acct.pl create mode 100644 src/squid-accounting/config/backup/includes/squid-accounting copy lfs/teamspeak => src/squid-accounting/dbinstall.pl (60%) mode change 100644 => 100755 Difference in files: diff --git a/config/rootfiles/common/batctl b/config/rootfiles/common/batctl new file mode 100644 index 0000000..a4f49c2 --- /dev/null +++ b/config/rootfiles/common/batctl @@ -0,0 +1,2 @@ +usr/sbin/batctl +#usr/share/man/man8/batctl.8 diff --git a/config/rootfiles/common/libnl-3 b/config/rootfiles/common/libnl-3 new file mode 100644 index 0000000..0ad3c36 --- /dev/null +++ b/config/rootfiles/common/libnl-3 @@ -0,0 +1,204 @@ +#etc/libnl +etc/libnl/classid +etc/libnl/pktloc +#usr/include/libnl3 +#usr/include/libnl3/netlink +#usr/include/libnl3/netlink/addr.h +#usr/include/libnl3/netlink/attr.h +#usr/include/libnl3/netlink/cache-api.h +#usr/include/libnl3/netlink/cache.h +#usr/include/libnl3/netlink/cli +#usr/include/libnl3/netlink/cli/addr.h +#usr/include/libnl3/netlink/cli/class.h +#usr/include/libnl3/netlink/cli/cls.h +#usr/include/libnl3/netlink/cli/ct.h +#usr/include/libnl3/netlink/cli/exp.h +#usr/include/libnl3/netlink/cli/link.h +#usr/include/libnl3/netlink/cli/neigh.h +#usr/include/libnl3/netlink/cli/qdisc.h +#usr/include/libnl3/netlink/cli/route.h +#usr/include/libnl3/netlink/cli/rule.h +#usr/include/libnl3/netlink/cli/tc.h +#usr/include/libnl3/netlink/cli/utils.h +#usr/include/libnl3/netlink/data.h +#usr/include/libnl3/netlink/errno.h +#usr/include/libnl3/netlink/fib_lookup +#usr/include/libnl3/netlink/fib_lookup/lookup.h +#usr/include/libnl3/netlink/fib_lookup/request.h +#usr/include/libnl3/netlink/genl +#usr/include/libnl3/netlink/genl/ctrl.h +#usr/include/libnl3/netlink/genl/family.h +#usr/include/libnl3/netlink/genl/genl.h +#usr/include/libnl3/netlink/genl/mngt.h +#usr/include/libnl3/netlink/handlers.h +#usr/include/libnl3/netlink/hash.h +#usr/include/libnl3/netlink/hashtable.h +#usr/include/libnl3/netlink/idiag +#usr/include/libnl3/netlink/idiag/idiagnl.h +#usr/include/libnl3/netlink/idiag/meminfo.h +#usr/include/libnl3/netlink/idiag/msg.h +#usr/include/libnl3/netlink/idiag/req.h +#usr/include/libnl3/netlink/idiag/vegasinfo.h +#usr/include/libnl3/netlink/list.h +#usr/include/libnl3/netlink/msg.h +#usr/include/libnl3/netlink/netfilter +#usr/include/libnl3/netlink/netfilter/ct.h +#usr/include/libnl3/netlink/netfilter/exp.h +#usr/include/libnl3/netlink/netfilter/log.h +#usr/include/libnl3/netlink/netfilter/log_msg.h +#usr/include/libnl3/netlink/netfilter/netfilter.h +#usr/include/libnl3/netlink/netfilter/nfnl.h +#usr/include/libnl3/netlink/netfilter/queue.h +#usr/include/libnl3/netlink/netfilter/queue_msg.h +#usr/include/libnl3/netlink/netlink-compat.h +#usr/include/libnl3/netlink/netlink-kernel.h +#usr/include/libnl3/netlink/netlink.h +#usr/include/libnl3/netlink/object-api.h +#usr/include/libnl3/netlink/object.h +#usr/include/libnl3/netlink/route +#usr/include/libnl3/netlink/route/act +#usr/include/libnl3/netlink/route/act/mirred.h +#usr/include/libnl3/netlink/route/action.h +#usr/include/libnl3/netlink/route/addr.h +#usr/include/libnl3/netlink/route/class.h +#usr/include/libnl3/netlink/route/classifier.h +#usr/include/libnl3/netlink/route/cls +#usr/include/libnl3/netlink/route/cls/basic.h +#usr/include/libnl3/netlink/route/cls/cgroup.h +#usr/include/libnl3/netlink/route/cls/ematch +#usr/include/libnl3/netlink/route/cls/ematch.h +#usr/include/libnl3/netlink/route/cls/ematch/cmp.h +#usr/include/libnl3/netlink/route/cls/ematch/meta.h +#usr/include/libnl3/netlink/route/cls/ematch/nbyte.h +#usr/include/libnl3/netlink/route/cls/ematch/text.h +#usr/include/libnl3/netlink/route/cls/fw.h +#usr/include/libnl3/netlink/route/cls/police.h +#usr/include/libnl3/netlink/route/cls/u32.h +#usr/include/libnl3/netlink/route/link +#usr/include/libnl3/netlink/route/link.h +#usr/include/libnl3/netlink/route/link/api.h +#usr/include/libnl3/netlink/route/link/bonding.h +#usr/include/libnl3/netlink/route/link/bridge.h +#usr/include/libnl3/netlink/route/link/can.h +#usr/include/libnl3/netlink/route/link/inet.h +#usr/include/libnl3/netlink/route/link/info-api.h +#usr/include/libnl3/netlink/route/link/ip6tnl.h +#usr/include/libnl3/netlink/route/link/ipgre.h +#usr/include/libnl3/netlink/route/link/ipip.h +#usr/include/libnl3/netlink/route/link/ipvti.h +#usr/include/libnl3/netlink/route/link/macvlan.h +#usr/include/libnl3/netlink/route/link/sit.h +#usr/include/libnl3/netlink/route/link/veth.h +#usr/include/libnl3/netlink/route/link/vlan.h +#usr/include/libnl3/netlink/route/link/vxlan.h +#usr/include/libnl3/netlink/route/neighbour.h +#usr/include/libnl3/netlink/route/neightbl.h +#usr/include/libnl3/netlink/route/nexthop.h +#usr/include/libnl3/netlink/route/pktloc.h +#usr/include/libnl3/netlink/route/qdisc +#usr/include/libnl3/netlink/route/qdisc.h +#usr/include/libnl3/netlink/route/qdisc/cbq.h +#usr/include/libnl3/netlink/route/qdisc/dsmark.h +#usr/include/libnl3/netlink/route/qdisc/fifo.h +#usr/include/libnl3/netlink/route/qdisc/fq_codel.h +#usr/include/libnl3/netlink/route/qdisc/htb.h +#usr/include/libnl3/netlink/route/qdisc/netem.h +#usr/include/libnl3/netlink/route/qdisc/plug.h +#usr/include/libnl3/netlink/route/qdisc/prio.h +#usr/include/libnl3/netlink/route/qdisc/red.h +#usr/include/libnl3/netlink/route/qdisc/sfq.h +#usr/include/libnl3/netlink/route/qdisc/tbf.h +#usr/include/libnl3/netlink/route/route.h +#usr/include/libnl3/netlink/route/rtnl.h +#usr/include/libnl3/netlink/route/rule.h +#usr/include/libnl3/netlink/route/tc-api.h +#usr/include/libnl3/netlink/route/tc.h +#usr/include/libnl3/netlink/socket.h +#usr/include/libnl3/netlink/types.h +#usr/include/libnl3/netlink/utils.h +#usr/include/libnl3/netlink/version.h +#usr/lib/libnl +#usr/lib/libnl-3.a +#usr/lib/libnl-3.la +#usr/lib/libnl-3.so +usr/lib/libnl-3.so.200 +usr/lib/libnl-3.so.200.20.0 +#usr/lib/libnl-cli-3.a +#usr/lib/libnl-cli-3.la +#usr/lib/libnl-cli-3.so +usr/lib/libnl-cli-3.so.200 +usr/lib/libnl-cli-3.so.200.20.0 +#usr/lib/libnl-genl-3.a +#usr/lib/libnl-genl-3.la +#usr/lib/libnl-genl-3.so +usr/lib/libnl-genl-3.so.200 +usr/lib/libnl-genl-3.so.200.20.0 +#usr/lib/libnl-idiag-3.a +#usr/lib/libnl-idiag-3.la +#usr/lib/libnl-idiag-3.so +usr/lib/libnl-idiag-3.so.200 +usr/lib/libnl-idiag-3.so.200.20.0 +#usr/lib/libnl-nf-3.a +#usr/lib/libnl-nf-3.la +#usr/lib/libnl-nf-3.so +usr/lib/libnl-nf-3.so.200 +usr/lib/libnl-nf-3.so.200.20.0 +#usr/lib/libnl-route-3.a +#usr/lib/libnl-route-3.la +#usr/lib/libnl-route-3.so +usr/lib/libnl-route-3.so.200 +usr/lib/libnl-route-3.so.200.20.0 +#usr/lib/libnl/cli +#usr/lib/libnl/cli/cls +#usr/lib/libnl/cli/cls/basic.a +#usr/lib/libnl/cli/cls/basic.la +usr/lib/libnl/cli/cls/basic.so +#usr/lib/libnl/cli/cls/cgroup.a +#usr/lib/libnl/cli/cls/cgroup.la +usr/lib/libnl/cli/cls/cgroup.so +#usr/lib/libnl/cli/qdisc +#usr/lib/libnl/cli/qdisc/bfifo.a +#usr/lib/libnl/cli/qdisc/bfifo.la +usr/lib/libnl/cli/qdisc/bfifo.so +#usr/lib/libnl/cli/qdisc/blackhole.a +#usr/lib/libnl/cli/qdisc/blackhole.la +usr/lib/libnl/cli/qdisc/blackhole.so +#usr/lib/libnl/cli/qdisc/fq_codel.a +#usr/lib/libnl/cli/qdisc/fq_codel.la +usr/lib/libnl/cli/qdisc/fq_codel.so +#usr/lib/libnl/cli/qdisc/htb.a +#usr/lib/libnl/cli/qdisc/htb.la +usr/lib/libnl/cli/qdisc/htb.so +#usr/lib/libnl/cli/qdisc/ingress.a +#usr/lib/libnl/cli/qdisc/ingress.la +usr/lib/libnl/cli/qdisc/ingress.so +#usr/lib/libnl/cli/qdisc/pfifo.a +#usr/lib/libnl/cli/qdisc/pfifo.la +usr/lib/libnl/cli/qdisc/pfifo.so +#usr/lib/libnl/cli/qdisc/plug.a +#usr/lib/libnl/cli/qdisc/plug.la +usr/lib/libnl/cli/qdisc/plug.so +#usr/lib/pkgconfig/libnl-3.0.pc +#usr/lib/pkgconfig/libnl-cli-3.0.pc +#usr/lib/pkgconfig/libnl-genl-3.0.pc +#usr/lib/pkgconfig/libnl-nf-3.0.pc +#usr/lib/pkgconfig/libnl-route-3.0.pc +#usr/sbin/genl-ctrl-list +usr/sbin/nl-class-add +usr/sbin/nl-class-delete +usr/sbin/nl-class-list +usr/sbin/nl-classid-lookup +usr/sbin/nl-cls-add +usr/sbin/nl-cls-delete +usr/sbin/nl-cls-list +usr/sbin/nl-link-list +usr/sbin/nl-pktloc-lookup +usr/sbin/nl-qdisc-add +usr/sbin/nl-qdisc-delete +usr/sbin/nl-qdisc-list +#usr/share/man/man8/genl-ctrl-list.8 +#usr/share/man/man8/nl-classid-lookup.8 +#usr/share/man/man8/nl-pktloc-lookup.8 +#usr/share/man/man8/nl-qdisc-add.8 +#usr/share/man/man8/nl-qdisc-delete.8 +#usr/share/man/man8/nl-qdisc-list.8 diff --git a/config/rootfiles/packages/perl-PDF-API2 b/config/rootfiles/packages/perl-PDF-API2 new file mode 100644 index 0000000..c594d82 --- /dev/null +++ b/config/rootfiles/packages/perl-PDF-API2 @@ -0,0 +1,176 @@ +usr/lib/perl5/site_perl/5.12.3/PDF +usr/lib/perl5/site_perl/5.12.3/PDF/API2 +usr/lib/perl5/site_perl/5.12.3/PDF/API2.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Annotation.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Array.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Bool.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Dict.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/File.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Filter +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Filter.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Filter/ASCII85Decode.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Filter/ASCIIHexDecode.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Filter/FlateDecode.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Filter/LZWDecode.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Filter/RunLengthDecode.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Literal.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Name.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Null.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Number.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Objind.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Page.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Pages.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/String.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Basic/PDF/Utils.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Content +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Content.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Content/Text.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Lite.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Matrix.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/NamedDestination.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Outline.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Outlines.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Page.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/BaseFont.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/CIDFont +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/CIDFont.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/CIDFont/CJKFont +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/CIDFont/CJKFont.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/CIDFont/CJKFont/adobemingstdlightacro.data +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/CIDFont/CJKFont/adobemyungjostdmediumacro.data +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/CIDFont/CJKFont/adobesongstdlightacro.data +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/CIDFont/CJKFont/kozgopromediumacro.data +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/CIDFont/CJKFont/kozminproregularacro.data +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/CIDFont/CMap +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/CIDFont/CMap/japanese.cmap +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/CIDFont/CMap/korean.cmap +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/CIDFont/CMap/simplified.cmap +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/CIDFont/CMap/traditional.cmap +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/CIDFont/TrueType +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/CIDFont/TrueType.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/CIDFont/TrueType/FontFile.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/ColorSpace +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/ColorSpace.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/ColorSpace/DeviceN.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/ColorSpace/Indexed +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/ColorSpace/Indexed.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/ColorSpace/Indexed/ACTFile.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/ColorSpace/Indexed/Hue.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/ColorSpace/Indexed/WebColor.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/ColorSpace/Separation.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Colors.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/ExtGState.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/BdFont.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/bankgothic.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/courier.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/courierbold.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/courierboldoblique.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/courieroblique.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/georgia.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/georgiabold.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/georgiabolditalic.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/georgiaitalic.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/helvetica.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/helveticabold.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/helveticaboldoblique.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/helveticaoblique.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/symbol.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/timesbold.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/timesbolditalic.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/timesitalic.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/timesroman.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/trebuchet.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/trebuchetbold.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/trebuchetbolditalic.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/trebuchetitalic.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/verdana.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/verdanabold.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/verdanabolditalic.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/verdanaitalic.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/webdings.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/wingdings.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/CoreFont/zapfdingbats.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/Postscript.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Font/SynFont.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Glyphs.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/PaperSizes.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Pattern.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/Shading.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/UniFont.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Form +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Form.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Form/BarCode +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Form/BarCode.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Form/BarCode/codabar.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Form/BarCode/code128.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Form/BarCode/code3of9.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Form/BarCode/ean13.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Form/BarCode/int2of5.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Form/Hybrid.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Image +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Image.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Image/GD.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Image/GIF.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Image/JPEG.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Image/PNG.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Image/PNM.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Image/TIFF.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/uniglyph.txt +usr/lib/perl5/site_perl/5.12.3/PDF/API2/UniWrap.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Util.pm +usr/lib/perl5/site_perl/5.12.3/PDF/API2/Win32.pm +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/PDF +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/PDF/API2 +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/PDF/API2/.packlist +#usr/share/man/man3/PDF::API2.3 +#usr/share/man/man3/PDF::API2::Annotation.3 +#usr/share/man/man3/PDF::API2::Basic::PDF::Array.3 +#usr/share/man/man3/PDF::API2::Basic::PDF::Bool.3 +#usr/share/man/man3/PDF::API2::Basic::PDF::Dict.3 +#usr/share/man/man3/PDF::API2::Basic::PDF::File.3 +#usr/share/man/man3/PDF::API2::Basic::PDF::Filter.3 +#usr/share/man/man3/PDF::API2::Basic::PDF::Filter::RunLengthDecode.3 +#usr/share/man/man3/PDF::API2::Basic::PDF::Name.3 +#usr/share/man/man3/PDF::API2::Basic::PDF::Null.3 +#usr/share/man/man3/PDF::API2::Basic::PDF::Number.3 +#usr/share/man/man3/PDF::API2::Basic::PDF::Objind.3 +#usr/share/man/man3/PDF::API2::Basic::PDF::Page.3 +#usr/share/man/man3/PDF::API2::Basic::PDF::Pages.3 +#usr/share/man/man3/PDF::API2::Basic::PDF::String.3 +#usr/share/man/man3/PDF::API2::Basic::PDF::Utils.3 +#usr/share/man/man3/PDF::API2::Content.3 +#usr/share/man/man3/PDF::API2::Lite.3 +#usr/share/man/man3/PDF::API2::NamedDestination.3 +#usr/share/man/man3/PDF::API2::Outline.3 +#usr/share/man/man3/PDF::API2::Page.3 +#usr/share/man/man3/PDF::API2::Resource.3 +#usr/share/man/man3/PDF::API2::Resource::BaseFont.3 +#usr/share/man/man3/PDF::API2::Resource::CIDFont.3 +#usr/share/man/man3/PDF::API2::Resource::CIDFont::CJKFont.3 +#usr/share/man/man3/PDF::API2::Resource::CIDFont::TrueType.3 +#usr/share/man/man3/PDF::API2::Resource::ColorSpace.3 +#usr/share/man/man3/PDF::API2::Resource::ColorSpace::Indexed::ACTFile.3 +#usr/share/man/man3/PDF::API2::Resource::ColorSpace::Separation.3 +#usr/share/man/man3/PDF::API2::Resource::ExtGState.3 +#usr/share/man/man3/PDF::API2::Resource::Font.3 +#usr/share/man/man3/PDF::API2::Resource::Font::BdFont.3 +#usr/share/man/man3/PDF::API2::Resource::Font::CoreFont.3 +#usr/share/man/man3/PDF::API2::Resource::Font::SynFont.3 +#usr/share/man/man3/PDF::API2::Resource::UniFont.3 +#usr/share/man/man3/PDF::API2::Resource::XObject.3 +#usr/share/man/man3/PDF::API2::Resource::XObject::Form.3 +#usr/share/man/man3/PDF::API2::Resource::XObject::Form::BarCode.3 +#usr/share/man/man3/PDF::API2::Resource::XObject::Form::BarCode::code128.3 +#usr/share/man/man3/PDF::API2::Resource::XObject::Image.3 +#usr/share/man/man3/PDF::API2::Resource::XObject::Image::TIFF.3 +#usr/share/man/man3/PDF::API2::Util.3 diff --git a/config/rootfiles/packages/squid-accounting b/config/rootfiles/packages/squid-accounting new file mode 100644 index 0000000..73a75ef --- /dev/null +++ b/config/rootfiles/packages/squid-accounting @@ -0,0 +1,13 @@ +etc/fcron.hourly/squid-accounting +var/log/accounting.log +srv/web/ipfire/cgi-bin/accounting.cgi +srv/web/ipfire/html/accounting/logo +usr/local/bin/acct.pl +var/ipfire/accounting +var/ipfire/accounting/dbinstall.pl +var/ipfire/accounting/bill +var/ipfire/accounting/acct-lib.pl +var/ipfire/addon-lang/acct.de.pl +var/ipfire/addon-lang/acct.en.pl +var/ipfire/menu.d/EX-squid-accounting.menu +var/ipfire/backup/addons/includes/squid-accounting diff --git a/doc/language_issues.es b/doc/language_issues.es index 70bff8e..57df9d6 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -867,6 +867,12 @@ WARNING: untranslated string: last WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: mac filter +WARNING: untranslated string: masquerade blue +WARNING: untranslated string: masquerade green +WARNING: untranslated string: masquerade orange +WARNING: untranslated string: masquerading +WARNING: untranslated string: masquerading disabled +WARNING: untranslated string: masquerading enabled WARNING: untranslated string: maximum WARNING: untranslated string: messages WARNING: untranslated string: minimum diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 158b544..d2344ed 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -878,6 +878,12 @@ WARNING: untranslated string: last WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: mac filter +WARNING: untranslated string: masquerade blue +WARNING: untranslated string: masquerade green +WARNING: untranslated string: masquerade orange +WARNING: untranslated string: masquerading +WARNING: untranslated string: masquerading disabled +WARNING: untranslated string: masquerading enabled WARNING: untranslated string: maximum WARNING: untranslated string: messages WARNING: untranslated string: minimum diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 358958b..607d680 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -688,6 +688,12 @@ WARNING: untranslated string: gen dh WARNING: untranslated string: generate dh key WARNING: untranslated string: imei WARNING: untranslated string: imsi +WARNING: untranslated string: masquerade blue +WARNING: untranslated string: masquerade green +WARNING: untranslated string: masquerade orange +WARNING: untranslated string: masquerading +WARNING: untranslated string: masquerading disabled +WARNING: untranslated string: masquerading enabled WARNING: untranslated string: messages WARNING: untranslated string: model WARNING: untranslated string: modem hardware details diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 70bff8e..57df9d6 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -867,6 +867,12 @@ WARNING: untranslated string: last WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: mac filter +WARNING: untranslated string: masquerade blue +WARNING: untranslated string: masquerade green +WARNING: untranslated string: masquerade orange +WARNING: untranslated string: masquerading +WARNING: untranslated string: masquerading disabled +WARNING: untranslated string: masquerading enabled WARNING: untranslated string: maximum WARNING: untranslated string: messages WARNING: untranslated string: minimum diff --git a/doc/language_issues.ru b/doc/language_issues.ru index b3c765e..03e48b7 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -863,6 +863,12 @@ WARNING: untranslated string: last WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: mac filter +WARNING: untranslated string: masquerade blue +WARNING: untranslated string: masquerade green +WARNING: untranslated string: masquerade orange +WARNING: untranslated string: masquerading +WARNING: untranslated string: masquerading disabled +WARNING: untranslated string: masquerading enabled WARNING: untranslated string: maximum WARNING: untranslated string: messages WARNING: untranslated string: minimum diff --git a/doc/language_issues.tr b/doc/language_issues.tr index abb23af..b920727 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -688,6 +688,12 @@ WARNING: untranslated string: gen dh WARNING: untranslated string: generate dh key WARNING: untranslated string: imei WARNING: untranslated string: imsi +WARNING: untranslated string: masquerade blue +WARNING: untranslated string: masquerade green +WARNING: untranslated string: masquerade orange +WARNING: untranslated string: masquerading +WARNING: untranslated string: masquerading disabled +WARNING: untranslated string: masquerading enabled WARNING: untranslated string: messages WARNING: untranslated string: model WARNING: untranslated string: modem hardware details diff --git a/doc/language_missings b/doc/language_missings index cab98e0..57c0870 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -341,6 +341,12 @@ < least preferred < lifetime < mac filter +< masquerade blue +< masquerade green +< masquerade orange +< masquerading +< masquerading disabled +< masquerading enabled < maximum < MB read < MB written @@ -882,6 +888,12 @@ < least preferred < lifetime < mac filter +< masquerade blue +< masquerade green +< masquerade orange +< masquerading +< masquerading disabled +< masquerading enabled < maximum < MB read < MB written @@ -1407,6 +1419,12 @@ < least preferred < lifetime < mac filter +< masquerade blue +< masquerade green +< masquerade orange +< masquerading +< masquerading disabled +< masquerading enabled < maximum < MB read < MB written @@ -1923,6 +1941,12 @@ < least preferred < lifetime < mac filter +< masquerade blue +< masquerade green +< masquerade orange +< masquerading +< masquerading disabled +< masquerading enabled < maximum < MB read < MB written diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi index 00fa1b4..34e0cdc 100644 --- a/html/cgi-bin/optionsfw.cgi +++ b/html/cgi-bin/optionsfw.cgi @@ -70,6 +70,17 @@ if ($errormessage) { &Header::closebox(); } +# Set new defaults +if (!$settings{'MASQUERADE_GREEN'}) { + $settings{'MASQUERADE_GREEN'} = 'on'; +} +if (!$settings{'MASQUERADE_ORANGE'}) { + $settings{'MASQUERADE_ORANGE'} = 'on'; +} +if (!$settings{'MASQUERADE_BLUE'}) { + $settings{'MASQUERADE_BLUE'} = 'on'; +} + $checked{'DROPNEWNOTSYN'}{'off'} = ''; $checked{'DROPNEWNOTSYN'}{'on'} = ''; $checked{'DROPNEWNOTSYN'}{$settings{'DROPNEWNOTSYN'}} = "checked='checked'"; @@ -112,12 +123,69 @@ $checked{'SHOWDROPDOWN'}{$settings{'SHOWDROPDOWN'}} = "checked='checked'"; $selected{'FWPOLICY'}{$settings{'FWPOLICY'}}= 'selected'; $selected{'FWPOLICY1'}{$settings{'FWPOLICY1'}}= 'selected'; $selected{'FWPOLICY2'}{$settings{'FWPOLICY2'}}= 'selected'; +$selected{'MASQUERADE_GREEN'}{'off'} = ''; +$selected{'MASQUERADE_GREEN'}{'on'} = ''; +$selected{'MASQUERADE_GREEN'}{$settings{'MASQUERADE_GREEN'}} = 'selected="selected"'; +$selected{'MASQUERADE_ORANGE'}{'off'} = ''; +$selected{'MASQUERADE_ORANGE'}{'on'} = ''; +$selected{'MASQUERADE_ORANGE'}{$settings{'MASQUERADE_ORANGE'}} = 'selected="selected"'; +$selected{'MASQUERADE_BLUE'}{'off'} = ''; +$selected{'MASQUERADE_BLUE'}{'on'} = ''; +$selected{'MASQUERADE_BLUE'}{$settings{'MASQUERADE_BLUE'}} = 'selected="selected"'; &Header::openbox('100%', 'center',); print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>"; -print <<END +print <<END; <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <table width='95%' cellspacing='0'> + <tr bgcolor='$color{'color20'}'> + <td colspan='2' align='left'><b>$Lang::tr{'masquerading'}</b></td> + </tr> + <tr> + <td align='left' width='60%'>$Lang::tr{'masquerade green'}</td> + <td> + <select name='MASQUERADE_GREEN'> + <option value='on' $selected{'MASQUERADE_GREEN'}{'on'}>$Lang::tr{'masquerading enabled'}</option> + <option value='off' $selected{'MASQUERADE_GREEN'}{'off'}>$Lang::tr{'masquerading disabled'}</option> + </select> + </td> + </tr> +END + + if (&Header::orange_used()) { + print <<END; + <tr> + <td align='left' width='60%'>$Lang::tr{'masquerade orange'}</td> + <td> + <select name='MASQUERADE_ORANGE'> + <option value='on' $selected{'MASQUERADE_ORANGE'}{'on'}>$Lang::tr{'masquerading enabled'}</option> + <option value='off' $selected{'MASQUERADE_ORANGE'}{'off'}>$Lang::tr{'masquerading disabled'}</option> + </select> + </td> + </tr> +END + } + + if (&Header::blue_used()) { + print <<END; + <tr> + <td align='left' width='60%'>$Lang::tr{'masquerade blue'}</td> + <td> + <select name='MASQUERADE_BLUE'> + <option value='on' $selected{'MASQUERADE_BLUE'}{'on'}>$Lang::tr{'masquerading enabled'}</option> + <option value='off' $selected{'MASQUERADE_BLUE'}{'off'}>$Lang::tr{'masquerading disabled'}</option> + </select> + </td> + </tr> +END + } + + print <<END + </table> + + <br> + <table width='95%' cellspacing='0'> <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw logging'}</b></td></tr> <tr><td align='left' width='60%'>$Lang::tr{'drop newnotsyn'}</td><td align='left'>on <input type='radio' name='DROPNEWNOTSYN' value='on' $checked{'DROPNEWNOTSYN'}{'on'} />/ diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 736cdf6..37a2431 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1438,6 +1438,12 @@ 'map to guest' => 'Map to Guest', 'march' => 'März', 'marked' => 'Markiert', +'masquerade blue' => 'NAT auf BLAU', +'masquerade green' => 'NAT auf GREEN', +'masquerade orange' => 'NAT auf ORANGE', +'masquerading' => 'Masquerading/NAT', +'masquerading disabled' => 'NAT ausgeschaltet', +'masquerading enabled' => 'NAT eingeschaltet', 'max bandwith' => 'Maximale Bandbreite', 'max incoming size' => 'Max. eingehende Größe (kB):', 'max lease time' => 'Max. Haltezeit in min:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index ba9e134..ef6b5df 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1468,6 +1468,12 @@ 'map to guest' => 'Map to Guest', 'march' => 'March', 'marked' => 'Marked', +'masquerade blue' => 'Masquerade BLUE', +'masquerade green' => 'Masquerade GREEN', +'masquerade orange' => 'Masquerade ORANGE', +'masquerading' => 'Masquerading', +'masquerading disabled' => 'Masquerading disabled', +'masquerading enabled' => 'Masquerading enabled', 'max bandwith' => 'Maximum bandwith', 'max incoming size' => 'Max incoming size (KB):', 'max lease time' => 'Max lease time (mins):', diff --git a/lfs/batctl b/lfs/batctl new file mode 100644 index 0000000..6a66982 --- /dev/null +++ b/lfs/batctl @@ -0,0 +1,79 @@ +############################################################################### +# # +# 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/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2014.3.0 + +THISAPP = batctl-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 7d2b8c129424c014d020c4b1a2add31b + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install PREFIX=/usr + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libnl-3 b/lfs/libnl-3 new file mode 100644 index 0000000..3bb7f52 --- /dev/null +++ b/lfs/libnl-3 @@ -0,0 +1,80 @@ +############################################################################### +# # +# 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/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 3.2.25 + +THISAPP = libnl-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 03f74d0cd5037cadc8cdfa313bbd195c + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/perl-PDF-API2 b/lfs/perl-PDF-API2 new file mode 100644 index 0000000..8b0af9a --- /dev/null +++ b/lfs/perl-PDF-API2 @@ -0,0 +1,82 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# # +# 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/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.020 + +THISAPP = PDF-API2-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = perl-PDF-API2 +PAK_VER = 1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = c0d20bfd03883b5b2b2a7fd47455249a + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/squid-accounting b/lfs/squid-accounting new file mode 100644 index 0000000..6f0fdc3 --- /dev/null +++ b/lfs/squid-accounting @@ -0,0 +1,71 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.1 + +THISAPP = squid-accounting-$(VER) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = squid-accounting +PAK_VER = 2 + +DEPS = "perl-DBI perl-DBD-SQLite perl-File-ReadBackwards perl-PDF-API2 sendEmail" + +############################################################################### +# Top-level Rules +############################################################################### + +install : $(TARGET) + +check : + +download : + +md5 : + +dist: + @$(PAK) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && mkdir $(DIR_APP) && cp -R $(DIR_SRC)/src/squid-accounting/ $(DIR_APP) + cd $(DIR_APP) + mkdir -p /var/ipfire/accounting/bill + mkdir -p /srv/web/ipfire/html/accounting/logo + +#Touch Logfile + touch /var/log/accounting.log + chmod 777 /var/log/accounting.log +#Set permissions for logo and graphs + chmod -R 777 /srv/web/ipfire/html/accounting + + + install -v -m 755 $(DIR_APP)/squid-accounting/accounting.cgi /srv/web/ipfire/cgi-bin/ + install -v -m 755 $(DIR_APP)/squid-accounting/acct.pl /usr/local/bin/ + install -v -m 644 $(DIR_APP)/squid-accounting/acct-lib.pl /var/ipfire/accounting/ + install -v -m 655 $(DIR_APP)/squid-accounting/acct.de.pl /var/ipfire/addon-lang/ + install -v -m 655 $(DIR_APP)/squid-accounting/acct.en.pl /var/ipfire/addon-lang/ + install -v -m 655 $(DIR_APP)/squid-accounting/EX-squid-accounting.menu /var/ipfire/menu.d/ + install -v -m 755 $(DIR_APP)/squid-accounting/dbinstall.pl /var/ipfire/accounting/ + install -v -m 644 $(DIR_APP)/squid-accounting/config/backup/includes/squid-accounting \ + /var/ipfire/backup/addons/includes/squid-accounting + +#activate hourly logging of proxy logfile + ln -sf /usr/local/bin/acct.pl /etc/fcron.hourly/squid-accounting + + chown -R nobody.nobody /var/ipfire/accounting + @rm -rf $(DIR_APP) + @$(POSTBUILD) + diff --git a/make.sh b/make.sh index 65ca37d..88e710b 100755 --- a/make.sh +++ b/make.sh @@ -478,6 +478,7 @@ buildipfire() { ipfiremake fireinfo ipfiremake libnet ipfiremake libnl + ipfiremake libnl-3 ipfiremake libidn ipfiremake nasm ipfiremake libjpeg @@ -810,6 +811,9 @@ buildipfire() { ipfiremake sslscan ipfiremake owncloud ipfiremake bacula + ipfiremake batctl + ipfiremake perl-PDF-API2 + ipfiremake squid-accounting } buildinstaller() { diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index 23d0c23..f77bc02 100644 --- a/src/initscripts/init.d/firewall +++ b/src/initscripts/init.d/firewall @@ -327,10 +327,31 @@ iptables_red() { # Outgoing masquerading (don't masqerade IPSEC (mark 50)) iptables -t nat -A REDNAT -m mark --mark 50 -o $IFACE -j RETURN - if [ "$IFACE" != "$GREEN_DEV" ]; then - iptables -t nat -A REDNAT -o $IFACE -j MASQUERADE + if [ "$IFACE" = "$GREEN_DEV" ]; then + MASQUERADE_GREEN="off" fi + local NO_MASQ_NETWORKS + + if [ "${MASQUERADE_GREEN}" = "off" ]; then + NO_MASQ_NETWORKS="${NO_MASQ_NETWORKS} ${GREEN_NETADDRESS}/${GREEN_NETMASK}" + fi + + if [ "${MASQUERADE_BLUE}" = "off" ]; then + NO_MASQ_NETWORKS="${NO_MASQ_NETWORKS} ${BLUE_NETADDRESS}/${BLUE_NETMASK}" + fi + + if [ "${MASQUERADE_ORANGE}" = "off" ]; then + NO_MASQ_NETWORKS="${NO_MASQ_NETWORKS} ${ORANGE_NETADDRESS}/${ORANGE_NETMASK}" + fi + + local network + for network in ${NO_MASQ_NETWORKS}; do + iptables -t nat -A REDNAT -s "${network}" -o "${IFACE}" -j RETURN + done + + # Masquerade everything else + iptables -t nat -A REDNAT -o $IFACE -j MASQUERADE fi # Reload all rules. diff --git a/src/paks/squid-accounting/install.sh b/src/paks/squid-accounting/install.sh new file mode 100644 index 0000000..f20b85f --- /dev/null +++ b/src/paks/squid-accounting/install.sh @@ -0,0 +1,35 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2009 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} + +#Generate SQLite DB if it does not exist +if [ ! -f /var/ipfire/accounting/acct.db ]; then + perl /var/ipfire/accounting/dbinstall.pl + chmod 644 /var/ipfire/accounting/acct.db + chown nobody.nobody /var/ipfire/accounting/acct.db +fi +rm -f /var/ipfire/accounting/dbinstall.pl +/usr/local/bin/update-lang-cache diff --git a/src/paks/squid-accounting/uninstall.sh b/src/paks/squid-accounting/uninstall.sh new file mode 100644 index 0000000..841124b --- /dev/null +++ b/src/paks/squid-accounting/uninstall.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2014 IPFire-Team <alexander.marx(a)ipfire.org> # +# # +############################################################################ + +. /opt/pakfire/lib/functions.sh +make_backup ${NAME} +remove_files +/usr/local/bin/update-lang-cache diff --git a/src/paks/squid-accounting/update.sh b/src/paks/squid-accounting/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/squid-accounting/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh diff --git a/src/squid-accounting/EX-squid-accounting.menu b/src/squid-accounting/EX-squid-accounting.menu new file mode 100755 index 0000000..8779398 --- /dev/null +++ b/src/squid-accounting/EX-squid-accounting.menu @@ -0,0 +1,5 @@ + $sublogs->{'32.proxy'} = {'caption' => $Lang::tr{'acct menu'}, + 'uri' => '/cgi-bin/accounting.cgi', + 'title' => $Lang::tr{'acct menu'}, + 'enabled' => 1, + }; diff --git a/src/squid-accounting/accounting.cgi b/src/squid-accounting/accounting.cgi new file mode 100755 index 0000000..eabb0c2 --- /dev/null +++ b/src/squid-accounting/accounting.cgi @@ -0,0 +1,2194 @@ +#!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2014 IPFire Team <alexander.marx(a)ipfire.org> # +# # +# 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/>. # +# # +############################################################################### + + +use Time::Local; +use File::Find; +use File::Path; +use GD::Graph::area; +use GD::Graph::bars; +use LWP::UserAgent; +use POSIX; +use locale; + +# enable only the following on debugging purpose +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; + +require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/lang.pl"; +require "${General::swroot}/header.pl"; +require "${General::swroot}/accounting/acct-lib.pl"; + +unless (-e "${General::swroot}/accounting/settings.conf") { system("touch ${General::swroot}/accounting/settings.conf"); } + +my $settingsfile="${General::swroot}/accounting/settings.conf"; +my $proxyenabled="${General::swroot}/proxy/enable"; +my $logopath="/srv/web/ipfire/html/accounting/logo"; +my %settings=(); +my %mainsettings; +my %color; +my %cgiparams=(); +my ($sec,$min,$hour,$mday,$mon,$year,$wday,$ydat,$isdst)=localtime(); +my $dbh; +my %checked=(); +my $errormessage=''; +my @ips; +my $count=0; +my $col; +my $proxlog=$Lang::tr{'stopped'}; +my $proxsrv=$Lang::tr{'stopped'}; + +&Header::getcgihash(\%cgiparams); +&General::readhash("${General::swroot}/main/settings", \%mainsettings); +&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); +&General::readhash("$settingsfile", \%settings) if(-f $settingsfile); + +#Find out which lang is set (used later to set decimal separator correctly) +my $uplang=uc($mainsettings{'LANGUAGE'}); +setlocale LC_NUMERIC,"$mainsettings{'LANGUAGE'}_$uplang"; + +if ($cgiparams{'BILLVIEW'} eq "show"){ + my $file=$cgiparams{'file'}; + my $name=$cgiparams{'name'}; + open(DLFILE, "<$file") or die "Unable to open $file: $!"; + my @fileholder = <DLFILE>; + print "Content-Type:application/pdf\n"; + my @fileinfo = stat("$file"); + print "Content-Length:$fileinfo[7]\n"; + print "Content-Disposition:attachment;filename='$name';\n\n"; + print @fileholder; + exit (0); +} +if ($cgiparams{'BILLACTION'} eq "open_preview"){ + #Generate preview Bill + my $rggrp=$cgiparams{'txt_billgroup'}; + my $address_cust = &ACCT::getTaAddress($rggrp,'CUST'); + my $address_host = &ACCT::getTaAddress($rggrp,'HOST'); + my $billpos = &ACCT::getextrabillpos($rggrp); + my $mwst=$settings{'MWST'}; + my $cur = $settings{'CURRENCY'}; + my @now = localtime(time); + $now[5] = $now[5] + 1900; + my $actmonth = $now[4]+1; + my $actyear = $now[5]; + my ($from,$till)=&ACCT::getmonth($actmonth,$actyear); + my @billar = &ACCT::GetTaValues($from,$till,$rggrp); + my $tempfile=&ACCT::pdf2(\@billar,$actmonth,$actyear,$mwst,$address_cust,$address_host,$billpos,$rggrp,$cur,"on"); + #Show PDF preview + open(DLFILE, "<$tempfile") or die "Unable to open tmp.pdf: $!"; + my @fileholder = <DLFILE>; + print "Content-Type:application/pdf\n"; + my @fileinfo = stat($tempfile); + print "Content-Length:$fileinfo[7]\n"; + print "Content-Disposition:attachment;filename='tmp.pdf';\n\n"; + print @fileholder; + unlink ($tempfile); + exit (0); +} + +&Header::showhttpheaders(); + +if ($cgiparams{'ACTION'} eq "$Lang::tr{'acct config'}"){ #ConfigButton from Menu + &configsite; +} +if ($cgiparams{'ACTION'} eq "$Lang::tr{'acct addresses'}"){ #AddressmgmntButton from Menu + &addressmgmnt; +} +if ($cgiparams{'ACTION'} eq "$Lang::tr{'acct billgroup'}"){ #BillgroupButton from Menu + &billgroupsite; +} +if ($cgiparams{'ACTION'} eq "$Lang::tr{'acct maintenance'}"){ #MaintenanceButton from Menu + &expertsite; +} +if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ #SaveButton on configsite + my @val=split('\r\n',$cgiparams{'txt_skipurls'}); + my $skipurls; + foreach my $line (@val){ + $skipurls.="|".$line; + } + $skipurls=$skipurls."|"; + $skipurls=~ s/\|\|/\|/g; + my @txt=split('\r\n',$cgiparams{'txt_mailtxt'}); + my $mailtxt; + foreach my $txt (@txt){ + $mailtxt.="|".$txt; + } + #Check fields + if ($cgiparams{'USEMAIL'} eq 'on'){ + $errormessage=&checkmailsettings; + }elsif($cgiparams{'USEMAIL'} ne 'on'){ + $cgiparams{'txt_mailserver'}=''; + $cgiparams{'txt_mailport'}=''; + $cgiparams{'txt_mailuser'}=''; + $cgiparams{'txt_mailpass'}=''; + $cgiparams{'mail_tls'}=''; + $cgiparams{'txt_mailsender'}=''; + $cgiparams{'txt_mailsubject'}=''; + $mailtxt=''; + } + if(!$errormessage){ + open (TXT, ">$settingsfile") or die("Die Datei konnte nicht geöffnet werden: $!\n"); + close TXT; + $settings{'LOG'} = $cgiparams{'logging'}; + $settings{'EXPERT'} = $cgiparams{'expert'}; + $settings{'MULTIUSER'} = $cgiparams{'multiuser'}; + $settings{'MWST'} = $cgiparams{'txt_mwst'}; + $settings{'CURRENCY'} = $cgiparams{'txt_currency'}; + $settings{'SKIPURLS'} = $skipurls; + $settings{'USEMAIL'} = $cgiparams{'USEMAIL'}; + $settings{'MAILSRV'} = $cgiparams{'txt_mailserver'}; + $settings{'MAILPORT'} = $cgiparams{'txt_mailport'}; + $settings{'MAILUSER'} = $cgiparams{'txt_mailuser'}; + $settings{'MAILPASS'} = $cgiparams{'txt_mailpass'}; + $settings{'TLS'} = $cgiparams{'mail_tls'}; + $settings{'MAILSENDER'} = $cgiparams{'txt_mailsender'}; + $settings{'MAILSUB'} = $cgiparams{'txt_mailsubject'}; + $settings{'MAILTXT'} = $mailtxt; + &General::writehash("$settingsfile", \%settings); + }else{ + $cgiparams{'update'}='on'; + &configsite; + } +} +if ($cgiparams{'ACTION'} eq "$Lang::tr{'acct view'}"){ #If special month and year is given on mainsite + &mainsite($cgiparams{'month'},$cgiparams{'year'}); + exit 0; +} +if ($cgiparams{'ACTION'} eq "$Lang::tr{'acct commit'}"){ #Maintenance function + &ACCT::logger($settings{'LOG'},"Clear DB (all data) committed).\n"); + &ACCT::cleardbtraf; + &expertsite; +} +if ($cgiparams{'ACTION2'} eq "$Lang::tr{'acct commit'}"){ #Maintenance function + &ACCT::logger($settings{'LOG'},"Clear DB (only traffic data) committed).\n"); + &ACCT::cleardb; + &expertsite; +} +if ($cgiparams{'ACTION1'} eq "$Lang::tr{'acct commit'}"){ #Maintenance Function + #Get Timestamp + my ($a,$b)=&ACCT::getmonth($cgiparams{'expmonth'},$cgiparams{'expyear'}); + &ACCT::delbefore(($a-1)); + &expertsite; +} +if ($cgiparams{'ACTION'} eq "viewgraph"){ #Graph icon on hosttable (viewhosttable) + &graphsite($cgiparams{'month'},$cgiparams{'year'},$cgiparams{'host'}); +} +if ($cgiparams{'ACTION1'} eq "$Lang::tr{'save'}"){ #SaveButton when adding Address + $errormessage=&checkaddress; + + if ($errormessage){ + &addressmgmnt($errormessage); + }else{ + &ACCT::writeaddr( + $cgiparams{'txt_company'}, + $cgiparams{'rdo_companytype'}, + $cgiparams{'txt_name1'}, + $cgiparams{'txt_str'}, + $cgiparams{'txt_str_nr'}, + $cgiparams{'txt_plz'}, + $cgiparams{'txt_city'}, + $cgiparams{'txt_bank'}, + $cgiparams{'txt_iban'}, + $cgiparams{'txt_bic'}, + $cgiparams{'txt_blz'}, + $cgiparams{'txt_kto'}, + $cgiparams{'txt_email'}, + $cgiparams{'txt_inet'}, + $cgiparams{'txt_hrb'}, + $cgiparams{'txt_ustid'}, + $cgiparams{'txt_tel'}, + $cgiparams{'txt_fax'}, + ); + &ACCT::logger($settings{'LOG'},"Created new address $cgiparams{'txt_company'} as $cgiparams{'rdo_companytype'}.\n"); + %cgiparams=(); + } + &addressmgmnt; +} +if ($cgiparams{'ACTION'} eq "edit_addr"){ #Pencil icon in Address overwiev on Addressmgmnt site + $cgiparams{'update'} = 'on'; + $cgiparams{'oldcompname'}=$cgiparams{'txt_company'}; + &addressmgmnt; +} +if ($cgiparams{'ACTION'} eq "$Lang::tr{'update'}"){ #UpdateButton when editing Address + $cgiparams{'update'} = 'on'; + $errormessage=&checkaddress; + if ($errormessage){ + &addressmgmnt($errormessage); + }else{ + &ACCT::updateaddr( + $cgiparams{'rdo_companytype'}, + $cgiparams{'txt_company'}, + $cgiparams{'txt_name1'}, + $cgiparams{'txt_str'}, + $cgiparams{'txt_str_nr'}, + $cgiparams{'txt_plz'}, + $cgiparams{'txt_city'}, + $cgiparams{'txt_bank'}, + $cgiparams{'txt_iban'}, + $cgiparams{'txt_bic'}, + $cgiparams{'txt_blz'}, + $cgiparams{'txt_kto'}, + $cgiparams{'txt_email'}, + $cgiparams{'txt_inet'}, + $cgiparams{'txt_hrb'}, + $cgiparams{'txt_ustid'}, + $cgiparams{'txt_tel'}, + $cgiparams{'txt_fax'}, + $cgiparams{'oldcompname'} + ); + my $res=&ACCT::getbillgroups; + foreach my $line (@$res){ + my($name,$host,$cust)=@$line; + if($host eq $cgiparams{'oldcompname'}){ + &ACCT::updatebillgrouphost($cgiparams{'oldcompname'},$cgiparams{'txt_company'}); + }elsif ($cust eq $cgiparams{'oldcompname'}){ + &ACCT::updatebillgroupcust($cgiparams{'oldcompname'},$cgiparams{'txt_company'}); + } + } + + &ACCT::logger($settings{'LOG'},"Edited address $cgiparams{'oldcompname'}.\n"); + %cgiparams=(); + } + &addressmgmnt; +} +if ($cgiparams{'ACTION'} eq "del_addr"){ #Trash icon in Address overview on Addressmgmnt site + my $res=&ACCT::checkbillgrp; + foreach my $line (@$res){ + my ($grp,$host,$cust) = @$line; + if ($cgiparams{'txt_company'} eq $host){ + $errormessage="$Lang::tr{'acct err hostdel'} $grp"; + } + if ($cgiparams{'txt_company'} eq $cust){ + $errormessage="$Lang::tr{'acct err custdel'} $grp"; + } + } + if (! $errormessage){ + &ACCT::deladdr($cgiparams{'txt_company'}); + &ACCT::logger($settings{'LOG'},"Deleted address $cgiparams{'txt_company'}.\n"); + } + $cgiparams{'txt_company'}=''; + &addressmgmnt; +} +if ($cgiparams{'BILLACTION'} eq "$Lang::tr{'save'}"){ #SaveButton when adding BillingGroups + #check if a group with the same name already exists in DB + my $res=&ACCT::getbillgroups; + foreach my $row (@$res) { + my ($group)=@$row; + if ($group eq $cgiparams{'txt_billgroup'}){ + $errormessage.=$Lang::tr{'acct billgroupexists'}; + } + } + #Check if a selected user is in another group already + if ($settings{'MULTIUSER'} ne 'on'){ + #split hosts into array + my @user=split(/\|/,$cgiparams{'sel_hosts'}); + my $res=&ACCT::checkusergrp; + foreach my $val (@$res){ + my ($grp,$usr)=@$val; + foreach my $wanted (@user){ + if($usr eq $wanted){ + $errormessage.="$usr $Lang::tr{'acct usermulti'} $grp<br>"; + } + } + } + } + #validate namefield + if(!&validtextfield($cgiparams{'txt_billgroup'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'name'}<br>"; + } + #FIXME: Validate CENT amount (num with .) + #if used colon, replace with . + $cgiparams{'txt_cent'} =~ tr/,/./; + if(!&validnumfield($cgiparams{'txt_cent'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct cent'}<br>"; + } + #fill array + my @ips=split (/\|/,$cgiparams{'sel_hosts'}); + + #Check if we use extra bill positions + if($cgiparams{'txt_amount'} || $cgiparams{'txt_name'}|| $cgiparams{'txt_price'}){ + if (!$cgiparams{'txt_amount'} || !$cgiparams{'txt_name'} || !$cgiparams{'txt_price'}){ + $errormessage.="$Lang::tr{'acct invalid billpos'}<br>"; + } + #check all fields + if (!$errormessage){ + if(! &validnumfield($cgiparams{'txt_amount'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct amount'}<br>"; + }elsif(! &validtextfield($cgiparams{'txt_name'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct name'}<br>"; + }elsif(! &validnumfield($cgiparams{'txt_price'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct price pp'}<br>"; + } + } + } + + if ($errormessage){ + &billgroupsite($errormessage); + }else{ + #check if we use extra positions + if ($cgiparams{'txt_amount'}){ + &ACCT::savebillpos( + $cgiparams{'txt_posbillgroup'}, + $cgiparams{'txt_amount'}, + $cgiparams{'txt_name'}, + $cgiparams{'txt_price'}); + &ACCT::logger($settings{'LOG'},"Saved new fixed billposition $cgiparams{'txt_name'} into billgroup $cgiparams{'txt_posbillgroup'} .\n"); + } + + #save new group + &ACCT::savebillgroup( + $cgiparams{'txt_billgroup'}, + $cgiparams{'txt_billtext1'}, + $cgiparams{'dd_host'}, + $cgiparams{'dd_cust'}, + $cgiparams{'txt_cent'}, + \@ips); + &ACCT::logger($settings{'LOG'},"Saved new billgroup $cgiparams{'txt_billgroup'}.\n"); + %cgiparams=(); + } + &billgroupsite; +} +if ($cgiparams{'BILLACTION'} eq "$Lang::tr{'update'}"){ #UpdateButton when editing BillingGroups + + + my $filename=$cgiparams{'uploaded_file'}; + if($filename){ + #First check if logo dir exists + if (! -d "$logopath/$cgiparams{'logo_grp'}"){ + mkpath("$logopath/$cgiparams{'logo_grp'}",0,01777); + } + #Save File + my ($filehandle) = CGI::upload('uploaded_file'); + open (UPLOADFILE, ">$logopath/$cgiparams{'logo_grp'}/logo.png"); + binmode $filehandle; + while ( <$filehandle> ) { + print UPLOADFILE; + } + close (UPLOADFILE); + + #Check dimensions of uploaded file + open (PNG , "<$logopath/$cgiparams{'logo_grp'}/logo.png") ; + local $/; + my $PNG1=<PNG> ; + close(PNG) ; + my ($width,$height)=&ACCT::pngsize($PNG1) ; + + if (! &validnumfield($width)){ + $errormessage.="$Lang::tr{'acct invalid png'}<br>"; + unlink("$logopath/$cgiparams{'logo_grp'}/logo.png"); + }elsif($width > 400 || $height > 150){ + $errormessage.="$Lang::tr{'acct invalid pngsize'} width: $width height: $height<br>"; + unlink("$logopath/$cgiparams{'logo_grp'}/logo.png"); + } + + } + #Check if a group with the same name already exists in DB + my $res=&ACCT::getbillgroups; + foreach my $row (@$res) { + my ($group)=@$row; + if (($group eq $cgiparams{'txt_billgroup'}) && ($cgiparams{'oldname'} ne $cgiparams{'txt_billgroup'})){ + $errormessage.=$Lang::tr{'acct billgroupexists'}; + } + } + #Check if a selected user is in another group already + if ($settings{'MULTIUSER'} ne 'on'){ + #split hosts into array + my @user=split(/\|/,$cgiparams{'sel_hosts'}); + my $res=&ACCT::checkusergrp; + foreach my $val (@$res){ + my ($grp,$usr)=@$val; + foreach my $wanted (@user){ + if($usr eq $wanted && $grp ne $cgiparams{'txt_billgroup'}){ + $errormessage.="$usr $Lang::tr{'acct usermulti'} $grp<br>"; + } + } + } + } + #Validate namefield + if(!&validtextfield($cgiparams{'txt_billgroup'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'name'}"; + } + #Validate CENT amount (num with .) + #if used colon, replace with . + $cgiparams{'txt_cent'} =~ tr/,/./; + if(!&validnumfield($cgiparams{'txt_cent'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct cent'}<br>"; + } + + #Fill array + my @ips=split ( /\|/,$cgiparams{'sel_hosts'}); + + #Check if we use extra bill positions + if($cgiparams{'txt_amount'} || $cgiparams{'txt_name'}|| $cgiparams{'txt_price'}){ + if (!$cgiparams{'txt_amount'} || !$cgiparams{'txt_name'} || !$cgiparams{'txt_price'}){ + $errormessage.="$Lang::tr{'acct invalid billpos'}<br>"; + } + #Check all fields + if (!$errormessage){ + if(! &validnumfield($cgiparams{'txt_amount'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct amount'}<br>"; + }elsif(! &validtextfield($cgiparams{'txt_name'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct name'}<br>"; + }elsif(! &validnumfield($cgiparams{'txt_price'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct price pp'}<br>"; + } + } + } + #Check if we added some CC mail recipients + if($cgiparams{'txt_ccmail'}){ + $cgiparams{'txt_ccmail'}=~ s/ //g; + #Split line into single addresses and check each one + my @ccaddr = split(",",$cgiparams{'txt_ccmail'}); + foreach my $cc (@ccaddr){ + if (! &General::validemail($cc)){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct ccmail'} $cc<br>"; + } + } + } + if ($errormessage){ + $cgiparams{'update'} = 'on'; + &billgroupsite(); + }else{ + #update fixedbillpositions if defined + if ($cgiparams{'oldname'} ne $cgiparams{'txt_billgroup'}){ + &ACCT::updatebillpos($cgiparams{'oldname'},$cgiparams{'txt_billgroup'}); + } + #Check if we use extra positions + if ($cgiparams{'txt_amount'}){ + &ACCT::savebillpos( + $cgiparams{'txt_billgroup'}, + $cgiparams{'txt_amount'}, + $cgiparams{'txt_name'}, + $cgiparams{'txt_price'}); + } + #Check if we have NEW cc Mails + if($cgiparams{'txt_ccmail'} ne $cgiparams{'oldccmail'}){ + &ACCT::updateccaddr($cgiparams{'txt_ccmail'},$cgiparams{'dd_cust'}); + } + &ACCT::deletebillgroup($cgiparams{'oldname'}); + &ACCT::savebillgroup( + $cgiparams{'txt_billgroup'}, + $cgiparams{'txt_billtext1'}, + $cgiparams{'dd_host'}, + $cgiparams{'dd_cust'}, + $cgiparams{'txt_cent'}, + \@ips); + %cgiparams=(); + } + &billgroupsite; +} +if ($cgiparams{'BILLACTION'} eq "edit_billgroup"){ #Pencil icon in Billgroup table + $cgiparams{'update'} = 'on'; + &billgroupsite; +} +if ($cgiparams{'BILLACTION'} eq "delete_billgroup"){ #Trash icon in Billgroup table + &deletefiles($cgiparams{'txt_billgroup'}); + &ACCT::delbillpos($cgiparams{'txt_billgroup'}); + &ACCT::deletebillgroup($cgiparams{'txt_billgroup'}); + &ACCT::logger($settings{'LOG'},"Deleted billgroup $cgiparams{'txt_billgroup'}.\n"); + &billgroupsite; +} +if ($cgiparams{'BILLACTION'} eq "open_billgroup"){ #Folder icon on billgrouptable (viewtablebillgroup) + &billoverview($cgiparams{'txt_billgroup'}); +} +if ($cgiparams{'BILLPOS'} eq "delpos"){ #Trash icon in Billpos table + $cgiparams{'update'} = 'on'; + &ACCT::delbillpos_single($cgiparams{'txt_billpos'},$cgiparams{'txt_billgroup'}); + &ACCT::logger($settings{'LOG'},"Deleted fixed billposition $cgiparams{'txt_billpos'} from billgroup $cgiparams{'txt_billgroup'}.\n"); + &billgroupsite; +} +if ($cgiparams{'BILLPOS'} eq "$Lang::tr{'save'}"){ #Savebutton in Billpos table + $cgiparams{'update'}='on'; + #Check if we use extra bill positions + if($cgiparams{'txt_amount'} || $cgiparams{'txt_name'}|| $cgiparams{'txt_price'}){ + if (!$cgiparams{'txt_amount'} || !$cgiparams{'txt_name'} || !$cgiparams{'txt_price'}){ + $errormessage.="$Lang::tr{'acct invalid billpos'}<br>"; + } + #check all fields + if (!$errormessage){ + #if used colon, replace with . + $cgiparams{'txt_price'} =~ tr/,/./; + if(! &validnumfield($cgiparams{'txt_amount'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct amount'}<br>"; + }elsif(! &validtextfield($cgiparams{'txt_name'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct name'}<br>"; + }elsif(! &validnumfield($cgiparams{'txt_price'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct price pp'}<br>"; + } + } + } + if ($errormessage){ + &billgroupsite($errormessage); + }else{ + #check if we use extra positions + if ($cgiparams{'txt_amount'}){ + &ACCT::savebillpos( + $cgiparams{'txt_billgroup'}, + $cgiparams{'txt_amount'}, + $cgiparams{'txt_name'}, + $cgiparams{'txt_price'}); + } + &ACCT::logger($settings{'LOG'},"Added fixed billposition $cgiparams{'txt_amount'} $cgiparams{'txt_name'} with price $cgiparams{'txt_price'} to billgroup $cgiparams{'txt_billgroup'}.\n"); + } + %cgiparams=(); + &billgroupsite; +} + + +#Check if we already have settings +if ( -z $settingsfile){ + &configsite; +}else{ + &mainsite(($mon+1),($year+1900)); + exit 0; +} + +sub configsite{ + my $proxymessage=''; + my $blockactivation=''; + #If update set fieldvalues new + if($cgiparams{'update'} eq 'on'){ + $settings{'USEMAIL'} = 'on'; + $settings{'MAILSRV'} = $cgiparams{'txt_mailserver'}; + $settings{'MAILPORT'} = $cgiparams{'txt_mailport'}; + $settings{'MAILUSER'} = $cgiparams{'txt_mailuser'}; + $settings{'MAILPASS'} = $cgiparams{'txt_mailpass'}; + $settings{'MAILSUB'} = $cgiparams{'txt_mailsubject'}; + $settings{'MAILTXT'} = $cgiparams{'txt_mailtxt'}; + } + #find preselections + $checked{'expert'}{$settings{'EXPERT'}} = 'CHECKED'; + $checked{'logging'}{$settings{'LOG'}} = 'CHECKED'; + $checked{'multiuser'}{$settings{'MULTIUSER'}} = 'CHECKED'; + $checked{'usemail'}{$settings{'USEMAIL'}} = 'CHECKED'; + $checked{'mail_tls'}{$settings{'TLS'}} = 'CHECKED'; + + #Open site + &Header::openpage($Lang::tr{'acct settings'}, 1, ''); + &Header::openbigbox('100%', 'center'); + &error; + &Header::openbox('100%', 'left', $Lang::tr{'acct config'}); + + #### JAVA SCRIPT #### + print<<END; +<script> + \$(document).ready(function() { + // Show/Hide elements when NAT checkbox is checked. + if (\$("#MAIL").attr("checked")) { + + } else { + \$(".MAILSRV").hide(); + } + + // Show NAT area when "use nat" checkbox is clicked + \$("#MAIL").change(function() { + \$(".MAILSRV").toggle(); + + }); + }); +</script> +END +####################### + $settings{'SKIPURLS'} =~ tr/|/\r\n/; + $settings{'MAILTXT'} =~ tr/|/\r\n/; + my $col="style='background-color:$color{'color22'}'"; + print<<END; + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <table style='width:100%'> + <tr> + <th colspan='3'></th> + </tr> + <tr> + <td style='width:24em'>$Lang::tr{'acct logging'}</td> + <td><input type='checkbox' name='logging' $checked{'logging'}{'on'}></td> + <td></td> + </tr> + <tr> + <td>$Lang::tr{'acct expert'}</td> + <td><input type='checkbox' name='expert' $checked{'expert'}{'on'}></td> + <td></td> + </tr> + <tr> + <td>$Lang::tr{'acct multiuser'}</td> + <td><input type='checkbox' name='multiuser' $checked{'multiuser'}{'on'}></td> + <td></td> + <tr> + <tr> + <td>$Lang::tr{'acct mwst'}</td> + <td><input type='text' name='txt_mwst' value='$settings{'MWST'}' style='width:22em;'></td> + <td></td> + <tr> + <td>$Lang::tr{'acct currency'}</td> + <td><input type='text' name='txt_currency' value='$settings{'CURRENCY'}' style='width:22em;'></td> + <td></td> + + <tr> + <td valign='top'>$Lang::tr{'acct skipurl'}</td> + <td style='padding-left:0.2em;'><textarea name="txt_skipurls" cols="20" rows="6" style='width:22em;'>$settings{'SKIPURLS'}</textarea></td> + <td></td> + </tr> + <tr> + <td>$Lang::tr{'acct usemail'}</td> + <td><label><input type='checkbox' name='USEMAIL' id='MAIL' $checked{'usemail'}{'on'}></label></td> + <td></td> + </tr> + </table><br> + + <div class="MAILSRV"> + <table style='width:100%;'> + <tr> + <td style='width:24em'>$Lang::tr{'acct mailaddr'}</td> + <td><input type='text' name='txt_mailserver' value='$settings{'MAILSRV'}' style='width:22em;'></td> + </tr> + <tr> + <td>$Lang::tr{'acct mailport'}</td> + <td><input type='text' name='txt_mailport' value='$settings{'MAILPORT'}' size='3'></td> + </tr> + <tr> + <td>$Lang::tr{'acct mailuser'}<img src='/blob.gif' alt='*' /></td> + <td><input type='text' name='txt_mailuser' value='$settings{'MAILUSER'}' style='width:22em;'></td> + </tr> + <tr> + <td>$Lang::tr{'acct mailpass'}<img src='/blob.gif' alt='*' /></td> + <td><input type='password' name='txt_mailpass' value='$settings{'MAILPASS'}' style='width:22em;' ></td> + </tr> + <tr> + <td>$Lang::tr{'acct tls'}</td> + <td><input type='checkbox' name='mail_tls' $checked{'mail_tls'}{'on'}></td> + </tr> + <tr> + <td>$Lang::tr{'acct mailsender'}</td> + <td><input type='text' name='txt_mailsender' value='$settings{'MAILSENDER'}' style='width:22em;'></td> + </tr> + <tr> + <td colspan='2'> </td> + </tr> + <tr> + <td>$Lang::tr{'acct subject'}</td> + <td><input type='text' name='txt_mailsubject' value='$settings{'MAILSUB'}' style='width:22em;'></td> + </tr> + <tr> + <td valign='top' >$Lang::tr{'acct mailtxt'}</td> + <td style='padding-left:0.2em;'><textarea name="txt_mailtxt" cols="34" rows="6" style='width: 22em;'>$settings{'MAILTXT'}</textarea></td> + + </table> + </div> + + + <table style='width:100%;'> + <tr> + <td colspan='3' display:inline align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}'></td> + </tr> + </table> + <br> + </form> +END +&Header::closebox(); +#BackButton + print<<END; + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <table style='width:100%;'> + <tr> + <td></td> + <td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'back'}'></td> + </tr> + </table> + </form> +END + &Header::closebigbox(); + &Header::closepage(); + exit 0; +} + +sub deletefiles{ + my $grp=shift; + rmtree ("$logopath/$grp"); + rmtree ("${General::swroot}/accounting/bill/$grp"); +} + +sub mainsite{ + my $mon=$_[0]; + my $year=$_[1]; + if ($_[0]){$mon=$_[0];} + &Header::openpage($Lang::tr{'acct title'}, 1, ''); + &Header::openbigbox('100%', 'center'); + &checkproxy; + &statusbox; + &menu; + &viewtablehosts(($mon),$year); + &Header::closebigbox(); + &Header::closepage(); +} + +sub expertsite{ + &Header::openpage($Lang::tr{'acct maintenance'}, 1, ''); + &Header::openbigbox('100%', 'center'); + + #Get size of Databasefile + my $sizedb= -s "/var/ipfire/accounting/acct.db"; + $sizedb = sprintf"%.2f", $sizedb/(1024*1024); + #Get size of Directory, where all bills are stored + my $sizerrd = 0; + find(sub { $sizerrd += -s if -f $_ }, "${General::swroot}/accounting/bill"); + $sizerrd = sprintf"%.2f", $sizerrd/(1024*1024); + + &ACCT::connectdb; + #Get latest and earliest entry of DB + my ($min,$max) = &ACCT::getminmax; + $min=&getdate($min); + $max=&getdate($max); + #Print status table + &Header::openbox('100%', 'left', $Lang::tr{'acct status'}); + print<<END; + <table style='width:100%;' cellspacong='0' class='tbl'> + <tr> + <th align='left' width='30%'>$Lang::tr{'name'}</th> + <th align='left'>$Lang::tr{'acct value'}</th> + </tr> + <tr> + <td>$Lang::tr{'acct dbsize'}</td> + <td>$sizedb MB</td> + </tr> + <tr> + <td>$Lang::tr{'acct rrdsize'}</td> + <td>$sizerrd MB</td> + </tr> + <tr> + <td>$Lang::tr{'acct oldestdb'}</td> + <td>$min</td> + </tr> + <tr> + <td>$Lang::tr{'acct latestdb'}</td> + <td>$max</td> + </tr> + </table> + <br> +END + &Header::closebox(); + #print Database maintenance table + &Header::openbox('100%', 'left', $Lang::tr{'acct dbmaintenance'}); + print<<END; + <br> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <table style='width:100%;' cellspacing='0' class='tbl'> + <tr> + <th>$Lang::tr{'acct task'}</th> + <th>$Lang::tr{'acct parameter'}</th> + <th>$Lang::tr{'acct action'}</th> + </tr> + <tr> + <td>$Lang::tr{'acct emptydb'}</td> + <td></td> + <td><input type='submit' name='ACTION2' value='$Lang::tr{'acct commit'}' style='width:10em'></td> + </tr> + <tr> + <td>$Lang::tr{'acct emptydbtraf'}</td> + <td></td> + <td><input type='submit' name='ACTION' value='$Lang::tr{'acct commit'}' style='width:10em'></td> + </tr> + <tr> + <td>$Lang::tr{'acct delbefore'} (ACCT,ACCT_HIST)</td> + <td><select name='expmonth'> +END + for(my $i=1;$i<13;$i++){ + print"<option>$i</option>"; + } + print"</select><select name='expyear'>"; + for(my $i=2014;$i<=($year+1900);$i++){ + print"<option>$i</option>"; + } + print<<END; + </select></td> + <td><input type='submit' name='ACTION1' value='$Lang::tr{'acct commit'}' style='width:10em'></td> + </tr> + </table> + </form> +END + &Header::closebox(); +#BackButton + print<<END; + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <table style='width:100%;'> + <tr> + <td></td> + <td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'back'}'></td> + </tr> + </table> + </form> +END + + + &Header::closebigbox(); + &Header::closepage(); + &ACCT::closedb; + exit 0; +} + +sub getdate{ + #GET : Timestamp in seconds since 1.1.1970 + #GIVES: Date in Format dd.mm.yyyy HH:MM:SS + my $val = $_[0]; + my $y=sprintf("%02d",(localtime($val))[5]-100); + my $Y=sprintf("%04d",(localtime($val))[5]+1900); + my $m=sprintf("%02d",(localtime($val))[4]+1); + my $d=sprintf("%02d",(localtime($val))[3]); + my $H=sprintf("%02d",(localtime($val))[2]); + my $M=sprintf("%02d",(localtime($val))[1]); + my $S=sprintf("%02d",(localtime($val))[0]); + + return "$d.$m.$Y $H:$M:$S"; +} + +sub menu{ + &Header::openbox('100%', 'left', $Lang::tr{'menu'}); + print<<END; + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <table style='width: 100%;'> + <tr> + <td style='display:inline;'> + <input type='submit' name='ACTION' value='$Lang::tr{'acct config'}'> + <input type='submit' name='ACTION' value='$Lang::tr{'acct addresses'}'> + <input type='submit' name='ACTION' value='$Lang::tr{'acct billgroup'}'> +END + if ($settings{'EXPERT'} eq 'on'){ + print "<input type='submit' name='ACTION' value='$Lang::tr{'acct maintenance'}'>"; + } + print<<END; + </td> + </tr> + </table> + </form> +END + &Header::closebox(); +} + +sub graphsite{ + my $grmon=$_[0]; + my $gryear=$_[1]; + my $grhost=$_[2]; + + &Header::openpage("$Lang::tr{'acct host detail'} $grhost", 1, ''); + &Header::openbigbox('100%', 'center'); + &Header::openbox('100%', 'left', ); + + &generatemonthgraph($grmon,$gryear,$grhost); + + &Header::closebox(); + &Header::closebigbox(); + &Header::closepage(); + exit 0; +} + +sub generatemonthgraph{ + my $grmon=$_[0]; + my $gryear=$_[1]; + my $grhost=$_[2]; + my ($from,$till) = &ACCT::getmonth($grmon,$gryear); + my @values=(); + my $sth; + my $cnt=0; + #If we want to show Data from within last 2 months, get DATA from ACCT + if ( ! $grmon < ($mon+1) && $gryear == ($year+1900)){ + $sth=&ACCT::getmonthgraphdata("ACCT",$from,$till,$grhost); + }else{ + #If we want to show data from a date older than last two months, use ACCT_HIST + $sth=&ACCT::getmonthgraphdata("ACCT_HIST",$from,$till,$grhost); + } + foreach( @$sth ) { + $cnt++; + foreach my $i (0..$#$_) { + push (@{$values[$i]},($_->[$i])); + } + } + + for my $graph (GD::Graph::area->new(600,200)) + { + my $name = $cgiparams{'host'}; + $graph->set( + bgclr => 'white', + fgclr => 'black', + boxclr => '#eeeeee', + accentclr => 'dblue', + valuesclr => '#ffff77', + labelclr => 'black', + axislabelcl =>'black', + legendclr =>'black', + valuesclr =>'black', + textclr =>'black', + dclrs => [qw(lgreen lred)], + x_label => $Lang::tr{'date'}, + y_label => $Lang::tr{'acct mb'}, + title => $name, + y_long_ticks => 1, + #x_label_skip => 3, #skip every 3 x-axis title + x_label_position => 0, + transparent => 0, + ); + + $graph->set_legend("$Lang::tr{'acct traffic'}"); + $graph->set(x_labels_vertical => 1, values_vertical => 1); + my $gd=$graph->plot(\@values); + open(IMG, '>/srv/web/ipfire/html/accounting/tmpgraph.png') or die $!; + binmode IMG; + print IMG $gd->png; + } + #Show Box with monthly graph for this host + &Header::openbox('100%', 'left', $Lang::tr{'acct traffic monthly'}); + print "<center><img src='/accounting/tmpgraph.png' alt='$grhost'></center>"; + print "<b>$cgiparams{'traffic'}</b>"; + &Header::closebox(); + print<<END; + <table style='width:100%;'> + <tr> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'back'}'></td> + </form> + </tr> + </table> +END +} + +sub generatehourgraph{ + my $grmon=$_[0]; + my $gryear=$_[1]; + my $grhost=$_[2]; + my ($from,$till) = &ACCT::getmonth($grmon,$gryear); + my @values=(); + my $sth; + my $cnt=0; + #If we want to show Data from within last 2 months, get DATA from ACCT + if ( ! $grmon < ($mon+1) && $gryear == ($year+1900)){ + $sth=&ACCT::getgraphdata("ACCT",$from,$till,$grhost); + }else{ + #If we want to show data from a date older than last two months, use ACCT_HIST + $sth=&ACCT::getgraphdata("ACCT_HIST",$from,$till,$grhost); + } + foreach( @$sth ) { + $cnt++; + foreach my $i (0..$#$_) { + #print "$_->[$i] " + if ($i == 1){ + push (@{$values[$i]},($_->[$i]/1024/1024)); + }else{ + push (@{$values[$i]},$_->[$i]); + } + } + } + + print"<br><br><br>"; + + for my $graph (GD::Graph::area->new(600,200)) + { + my $name = $cgiparams{'host'}; + print STDERR "Processing $name mit sosse\n"; + + $graph->set( + x_label => 'X Label', + y_label => 'Y label', + title => 'An Area Graph', + #y_max_value => 40, + #y_tick_number => 8, + #y_label_skip => 2, + #accent_treshold => 41, + transparent => 0, + ); + + $graph->set_legend( 'one', 'two' ); + my $gd=$graph->plot(\@values); + open(IMG, '>/srv/web/ipfire/html/test/file.png') or die $!; + binmode IMG; + print IMG $gd->png; + } + sleep 1; + print "<img src='/test/file.png' alt='Tanzmaus'>"; +} + +sub statusbox{ + my $bgcolor1=''; + my $bgcolor2=''; + my $message; + if ($proxsrv eq $Lang::tr{'stopped'}){ + $bgcolor1="bgcolor='${Header::colourred}' align='center'"; + $message="<br>$Lang::tr{'acct proxy_enable'}"; + }else{ + $bgcolor1="bgcolor='${Header::colourgreen}' align='center'"; + } + if ($proxlog eq $Lang::tr{'stopped'}){ + $bgcolor2="bgcolor='${Header::colourred}' align='center'"; + $message=$message."<br>$Lang::tr{'acct proxylog_enable'}"; + }else{ + $bgcolor2="bgcolor='${Header::colourgreen}' align='center'"; + } + &Header::openbox('100%', 'left', ); + print<<EOF; + <center><table width='50%' class='tbl'> + <tr> + <th>$Lang::tr{'service'}</th> + <th>$Lang::tr{'status'}</th> + </tr> + <tr> + <td bgcolor='$color{'color22'}'>$Lang::tr{'proxy'}</td> + <td $bgcolor1><font color='white'>$proxsrv</td> + <tr> + <tr> + <td bgcolor='$color{'color20'}'>$Lang::tr{'logging'}</td> + <td $bgcolor2><font color='white'>$proxlog</td> + </tr> +EOF + if ($message){ + print"<tr><td colspan='2'><font color='red'>$message<br>$Lang::tr{'acct nodata'}</td></tr>"; + } + print"</table>"; + &Header::closebox(); +} + +sub calcbytes{ + #GET: Value (bytes) + #GIVES: Value (in MB,GB,TB) With Type ("MB","GB","TB") + my $val=$_[0]; + my $type; + if (($val/1024) < 1024){ + #Calc KB + $val=sprintf "%.2f",$val/1024; + $type=$Lang::tr{'acct kb'}; + }elsif (($val/(1024*1024)) < 1024){ + #Calc MB + $val=sprintf "%.2f",$val/(1024*1024); + $type=$Lang::tr{'acct mb'}; + }elsif(($val/(1024*1024*1024)) < 1024){ + #Calc GB + $val=sprintf "%.2f",$val/(1024*1024*1024); + $type=$Lang::tr{'acct gb'}; + }elsif(($val/(1024*1024*1024*1024)) < 1024){ + #Calc TB + $val=sprintf "%.2f",$val/(1024*1024*1024*1024); + $type=$Lang::tr{'acct tb'}; + } + return ($val,$type); +} + +sub addressmgmnt{ + #This function shows the site "address management" + &Header::openpage("$Lang::tr{'acct addresses'}", 1, ''); + &Header::openbigbox('100%', 'center'); + &error; + my $col1; + my $host=0; + my $cust=0; + #Get all Addresses from DB + my $res = &ACCT::getaddresses; + +&Header::openbox('100%', 'left',$Lang::tr{'acct edit_addr'} ); + +#When no address preselected, set COMPANYTYPE to "CUST" +if ($cgiparams{'rdo_companytype'} eq ''){ + $cgiparams{'rdo_companytype'} = 'CUST'; +} +$checked{'rdo_companytype'}{$cgiparams{'rdo_companytype'}} = 'CHECKED'; + +#NEW AddressBox +print<<END; + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <table style=width:100%;'> + <tr> + <td style='width:8em;'></td> + <td></td> + <td colspan='2'><font size="1">$Lang::tr{'acct hint_hoster'}:</font></td> + </tr> + <tr> + <td>$Lang::tr{'acct companytype'}</td> + <td> + <input type='radio' name='rdo_companytype' value='CUST' $checked{'rdo_companytype'}{'CUST'}>$Lang::tr{'acct customer'}   + <input type='radio' name='rdo_companytype' value='HOST' $checked{'rdo_companytype'}{'HOST'}>$Lang::tr{'acct hoster'}</td> + <td style='width:8em;'>$Lang::tr{'acct bank'}</td> + <td> + <input type='text' name='txt_bank' value='$cgiparams{'txt_bank'}' style='width:25em;'></td> + </tr> + <tr> + <td>$Lang::tr{'acct company'}</td> + <td> + <input type='text' name='txt_company' value='$cgiparams{'txt_company'}' style='width:25em;'></td> + <td>$Lang::tr{'acct iban'}<img src='/blob.gif' alt='*' /></td> + <td> + <input type='text' name='txt_iban' value='$cgiparams{'txt_iban'}' style='width:25em;'></td> + </tr> + <tr> + <td>$Lang::tr{'acct name1'}<img src='/blob.gif' alt='*' /></td> + <td> + <input type='text' name='txt_name1' value='$cgiparams{'txt_name1'}' style='width:25em;'></td> + <td>$Lang::tr{'acct bic'}<img src='/blob.gif' alt='*' /></td> + <td> + <input type='text' name='txt_bic' maxlength='8' value='$cgiparams{'txt_bic'}' style='width:25em;'></td> + </tr> + <tr> + <td>$Lang::tr{'acct str'}</td> + <td align='left'> + <input type='text' name='txt_str' value='$cgiparams{'txt_str'}' style='width:25em;'></td> + <td>$Lang::tr{'acct blz'}</td> + <td> + <input type='text' name='txt_blz' maxlength='8' value='$cgiparams{'txt_blz'}' style='width:25em;'></td> + </tr> + <tr> + <td>$Lang::tr{'acct str_nr'}</td> + <td><input type='text' name='txt_str_nr' value='$cgiparams{'txt_str_nr'}' style='width:25em;'></td> + <td>$Lang::tr{'acct kto'}</td> + <td> + <input type='text' name='txt_kto' value='$cgiparams{'txt_kto'}' style='width:25em;'></td> + </tr> + + + <tr> + <td>$Lang::tr{'acct plz'}</td> + <td> + <input type='text' name='txt_plz' value='$cgiparams{'txt_plz'}' style='width:25em;'></td> + <td>$Lang::tr{'acct email'}</td> + <td><input type='text' name='txt_email' value='$cgiparams{'txt_email'}' style='width:25em;'></td> + </tr> + <tr> + <td>$Lang::tr{'acct city'}</td> + <td><input type='text' name='txt_city' value='$cgiparams{'txt_city'}' style='width:25em;'></td> + <td>$Lang::tr{'acct inet'}<img src='/blob.gif' alt='*' /></td> + <td> + <input type='text' name='txt_inet' value='$cgiparams{'txt_inet'}' style='width:25em;'></td> + </tr> + <tr> + <td></td> + <td></td> + <td>$Lang::tr{'acct hrb'}<img src='/blob.gif' alt='*' /></td> + <td> + <input type='text' name='txt_hrb' value='$cgiparams{'txt_hrb'}' style='width:25em;'></td> + </tr> + <tr> + <td></td> + <td></td> + <td>$Lang::tr{'acct ustid'}</td> + <td><input type='text' name='txt_ustid' value='$cgiparams{'txt_ustid'}' style='width:25em;'></td> + </tr> + <tr> + <td></td> + <td></td> + <td>$Lang::tr{'acct tel'}<img src='/blob.gif' alt='*' /></td> + <td> + <input type='text' name='txt_tel' value='$cgiparams{'txt_tel'}' style='width:25em;'></td> + </tr> + <tr> + <td></td> + <td></td> + <td>$Lang::tr{'acct fax'}<img src='/blob.gif' alt='*' /></td> + <td> + <input type='text' name='txt_fax' value='$cgiparams{'txt_fax'}' style='width:25em;'></td> + </tr> + <tr> + <td colspan='6'><img src='/blob.gif' alt='*' /><font size="1">$Lang::tr{'acct optional'}</font></td> + </tr> + <tr> +END + if($cgiparams{'update'} eq 'on'){ + print"<input type='hidden' name='oldcompname' value='$cgiparams{'oldcompname'}'>"; + print "<td colspan='6' align='right' display:inline><input type='submit' name='ACTION' value='$Lang::tr{'update'}'></td>"; + }else{ + print "<td colspan='6' align='right' display:inline><input type='submit' name='ACTION1' value='$Lang::tr{'save'}'></td>"; + } + print"</tr></table></form>"; +&Header::closebox(); +#Upper BackButton +print<<END; + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <table style='width:100%;'> + <tr> + <td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'back'}'></td> + </tr> + </table> + </form> +END +#Check if we need to show HOSTBOX and/or CUSTBOX +foreach my $row (@$res) { + my ($gr,$comp,$type,$name1,$str,$nr,$plz,$city,$bank,$iban,$bic,$blz,$kto,$email,$inet,$hrb,$ustid,$tel,$fax) = @$row; + if ($type eq 'HOST'){ + $host=1; + } + if ($type eq 'CUST'){ + $cust=1; + } +} +#Show HOSTER Addresses if any + if ($host){ + $count=0; + #EXISTING HOST BOX + &Header::openbox('100%', 'left',$Lang::tr{'acct exst_host_addr'} ); + my $float; + print "<table style='width:100%'>"; + foreach my $row (@$res) { + #SET colors for tablerows + $col="style='background-color:$color{'color22'}'"; + $col1="style='background-color:#e2d8d8'"; + my ($gr,$comp,$type,$name1,$str,$nr,$plz,$city,$bank,$iban,$bic,$blz,$kto,$email,$inet,$hrb,$ustid,$tel,$fax) = @$row; + if ($cgiparams{'oldcompname'} eq $comp){ + $col="style='background-color:yellow'"; + $col1="style='background-color:yellow'"; + } + if ($type eq 'HOST'){ + $count++; + if($count % 2){ + print"<tr><td width='50%' valign='top' align='center'>"; + }else{ + print"</td><td width='50%' valign='top' align='center'>"; + } + print<<END; + <table style='width:90%;' cellspacing='0' class='tbl'> + <tr> + <th align='left' width='50%'>$Lang::tr{'acct company'}</th> + <th align='left' width='10%' >$Lang::tr{'acct bank'}</th> + <th width='38%' ></th> + <th align='right' width='1%' style="PADDING: 0px"> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='image' src='/images/edit.gif' alt=$Lang::tr{'acct edit'} title='$Lang::tr{'acct edit'}' /> + <input type='hidden' name='ACTION' value='edit_addr'> + <input type='hidden' name='rdo_companytype' value='$type'> + <input type='hidden' name='txt_company' value='$comp'> + <input type='hidden' name='txt_name1' value='$name1'> + <input type='hidden' name='txt_str' value='$str'> + <input type='hidden' name='txt_str_nr' value='$nr'> + <input type='hidden' name='txt_plz' value='$plz'> + <input type='hidden' name='txt_city' value='$city'> + <input type='hidden' name='txt_bank' value='$bank'> + <input type='hidden' name='txt_iban' value='$iban'> + <input type='hidden' name='txt_bic' value='$bic'> + <input type='hidden' name='txt_blz' value='$blz'> + <input type='hidden' name='txt_kto' value='$kto'> + <input type='hidden' name='txt_email' value='$email'> + <input type='hidden' name='txt_inet' value='$inet'> + <input type='hidden' name='txt_hrb' value='$hrb'> + <input type='hidden' name='txt_ustid' value='$ustid'> + <input type='hidden' name='txt_tel' value='$tel'> + <input type='hidden' name='txt_fax' value='$fax'> + </form></th> + <th width='1%' style="PADDING: 0px"> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='image' src='/images/delete.gif' alt=$Lang::tr{'acct deladr'} title=$Lang::tr{'acct deladr'} /> + <input type='hidden' name='txt_company' value='$comp'> + <input type='hidden' name='ACTION' value='del_addr'> + </form> + </th> + </tr> + <tr> + <td $col><b>$comp</b></td> + <td $col1></td> + <td colspan='3' $col1></td> + </tr> + <tr> + <td $col>$name1</td> + <td $col1 width='35%'>$Lang::tr{'acct bank'}</td> + <td colspan='3' $col1>$bank</td> + </tr> + <tr> + <td $col></td> + <td $col1>$Lang::tr{'acct iban'}</td> + <td colspan='3' $col1>$iban</td> + </tr> + <tr> + <td $col>$str $nr</td> + <td $col1>$Lang::tr{'acct bic'}</td> + <td colspan='3' $col1>$bic</td> + </tr> + <tr> + <td $col>$plz $city</td> + <td $col1>$Lang::tr{'acct blz'}</td> + <td colspan='3' $col1>$blz</td> + </tr> + <tr> + <td $col></td> + <td $col1>$Lang::tr{'acct kto'}</td> + <td colspan='3' $col1>$kto</td> + </tr> + </table> + <br> + </td> +END + if (! $count % 2){ + print"</tr>"; + } + } + } + if ( ($count % 2)){ + print"<td width='50%' valign='top' align='center'></td></tr>"; + } + print "</table>"; + &Header::closebox(); + }else{ + &Header::openbox('100%', 'left',$Lang::tr{'acct exst_host_addr'} ); + print $Lang::tr{'acct host empty'}; + &Header::closebox(); + } +#Show CUSTOMER Addresses if any + if($cust){ + $count=0; + #EXISTING CUSTOMER BOX + &Header::openbox('100%', 'left',$Lang::tr{'acct exst_cust_addr'} ); + print "<table style='width:100%;'><tr>"; + foreach my $row (@$res) { + #SET colors for tablerows + $col="style='background-color:$color{'color22'}'"; + my ($gr,$comp,$type,$name1,$str,$nr,$plz,$city,$bank,$iban,$bic,$blz,$kto,$email,$inet,$hrb,$ustid,$tel,$fax) = @$row; + if ($cgiparams{'oldcompname'} eq $comp){ + $col="style='background-color:yellow'"; + } + if ($type eq 'CUST'){ + $count++; + print"<td width='15%' valign='top' align='center'>"; + + print<<END; + <table style='width:90%;' cellspacing='0' class='tbl'> + <tr> + <th align='left'> + $Lang::tr{'acct company'} + </th> + <th width='1%' style="PADDING: 0px"> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='image' src='/images/edit.gif' alt='$Lang::tr{'acct edit'}' title='$Lang::tr{'acct edit'}' /> + <input type='hidden' name='ACTION' value='edit_addr'> + <input type='hidden' name='rdo_companytype' value='$type'> + <input type='hidden' name='txt_company' value='$comp'> + <input type='hidden' name='txt_name1' value='$name1'> + <input type='hidden' name='txt_str' value='$str'> + <input type='hidden' name='txt_str_nr' value='$nr'> + <input type='hidden' name='txt_plz' value='$plz'> + <input type='hidden' name='txt_city' value='$city'> + <input type='hidden' name='txt_bank' value='$bank'> + <input type='hidden' name='txt_iban' value='$iban'> + <input type='hidden' name='txt_bic' value='$bic'> + <input type='hidden' name='txt_blz' value='$blz'> + <input type='hidden' name='txt_kto' value='$kto'> + <input type='hidden' name='txt_email' value='$email'> + <input type='hidden' name='txt_inet' value='$inet'> + <input type='hidden' name='txt_hrb' value='$hrb'> + <input type='hidden' name='txt_ustid' value='$ustid'> + <input type='hidden' name='txt_tel' value='$tel'> + <input type='hidden' name='txt_fax' value='$fax'> + </form> + </th> + <th width='1%' style="padding: 0px"> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='image' src='/images/delete.gif' alt=$Lang::tr{'acct deladr'} title=$Lang::tr{'acct deladr'} /> + <input type='hidden' name='ACTION' value='del_addr' /> + <input type='hidden' name='txt_company' value='$comp' /> + </form> + </th> + </tr> + <tr> + <td colspan='3' $col><b>$comp</b></td> + </tr> + <tr> + <td colspan='3' $col>$name1</td> + </tr> + <tr> + <td colspan='3' $col>$str $nr</td> + </tr> + <tr> + <td colspan='3' $col>$plz $city</td> + </tr> + </table><br> + </td> + +END + if(! ($count % 3)) { + print"</tr><tr>"; + } + } + + } + if ($count %2){ + print"<td width='15%' valign='top' align='center'></td></tr>"; + } + print"</table>"; + &Header::closebox(); + }else{ + &Header::openbox('100%', 'left',$Lang::tr{'acct exst_cust_addr'} ); + print $Lang::tr{'acct cust empty'}; + &Header::closebox(); + } + &Header::closebigbox(); + &Header::closepage(); + exit 0; +} + +sub checkfield{ + my $field=$_[0]; + my $fieldvalue=$_[1]; + my $errormessage=$_[2]; + + if (!&validtextfield($fieldvalue)){ + if(!$fieldvalue){ + $errormessage.="$Lang::tr{'acct empty field'} $field<br>"; + }else{ + $errormessage.="$Lang::tr{'acct invalid'} $field<br>"; + } + } + return $errormessage; +} + +sub checkaddress{ + #Check if an address with the same name alread exists + if ($cgiparams{'update'} ne 'on'){ + my $res=&ACCT::getaddresses; + foreach my $row (@$res) { + my ($anz,$name)=@$row; + if ($name eq $cgiparams{'txt_company'}){ + $errormessage.=$Lang::tr{'acct companyexists'}; + } + } + } + #Check Companyfield + $errormessage=&checkfield($Lang::tr{'acct company'},$cgiparams{'txt_company'},$errormessage); + + #Check Name1 + if($cgiparams{'txt_name1'}){ + $errormessage=&checkfield($Lang::tr{'acct name1'},$cgiparams{'txt_name1'},$errormessage); + } + + #Check Name2 + if($cgiparams{'txt_name2'}){ + $errormessage=&checkfield($Lang::tr{'acct name2'},$cgiparams{'txt_name2'},$errormessage); + } + + #Check STREET + $errormessage=&checkfield($Lang::tr{'acct str'},$cgiparams{'txt_str'},$errormessage); + + #Check STREET-NR + if (! $cgiparams{'txt_str_nr'}){ + $errormessage.="$Lang::tr{'acct empty field'} $Lang::tr{'acct str_nr'}<br>"; + }else{ + if(! &validalphanumfield($cgiparams{'txt_str_nr'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct str_nr'}<br>"; + } + } + + #Check POSTAL-CODE + if (! $cgiparams{'txt_plz'}){ + $errormessage.="$Lang::tr{'acct empty field'} $Lang::tr{'acct plz'}<br>"; + }else{ + if(! &validnumfield($cgiparams{'txt_plz'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct plz'}<br>"; + } + } + + #Check CITY + $errormessage=&checkfield($Lang::tr{'acct city'},$cgiparams{'txt_city'},$errormessage); + + #Check E-MAIL + if(! $cgiparams{'txt_email'}){ + $errormessage.="$Lang::tr{'acct empty field'} $Lang::tr{'acct email'}<br>"; + }else{ + if (! &General::validemail($cgiparams{'txt_email'})){ + $errormessage.="<br>$Lang::tr{'acct invalid'} $Lang::tr{'acct email'}"; + } + } + + #Check all fields required for companytype "HOST" + if ($cgiparams{'rdo_companytype'} eq 'HOST'){ + #Check BANK + $errormessage=&checkfield($Lang::tr{'acct bank'},$cgiparams{'txt_bank'},$errormessage); + + #Check IBAN - optional + if($cgiparams{'txt_iban'}){ + if(!&validalphanumfield($cgiparams{'txt_iban'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct iban'}<br>"; + } + } + if($cgiparams{'txt_bic'}){ + if(!&validalphanumfield($cgiparams{'txt_bic'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct bic'}<br>"; + } + } + if(($cgiparams{'txt_iban'} && $cgiparams{'txt_blz'})||(!$cgiparams{'txt_iban'} && $cgiparams{'txt_blz'})){ + #Check BLZ + if(! &validnumfield($cgiparams{'txt_blz'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct blz'}<br>"; + } + #Check BANKACCOUNT + if($cgiparams{'txt_kto'}){ + if(! &validnumfield($cgiparams{'txt_kto'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct kto'}<br>"; + } + }elsif(!$cgiparams{'txt_kto'}){ + $errormessage.="$Lang::tr{'acct empty field'} $Lang::tr{'acct kto'}<br>"; + } + }elsif(!$cgiparams{'txt_iban'} && !$cgiparams{'txt_blz'}){ + $errormessage.="$Lang::tr{'acct empty field'} $Lang::tr{'acct blz'}<br>"; + #Check BANKACCOUNT + if($cgiparams{'txt_kto'}){ + if(! &validnumfield($cgiparams{'txt_kto'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct kto'}<br>"; + } + }elsif(!$cgiparams{'txt_kto'}){ + $errormessage.="$Lang::tr{'acct empty field'} $Lang::tr{'acct kto'}<br>"; + } + } + + #Check Internet + if($cgiparams{'txt_inet'}){ + if ($cgiparams{'txt_inet'} =~ m/([a-z]+:\/\/)??([a-z0-9\-]+\.){1}(([a-z0-9\-]+\.){0,})([a-z0-9\-]+){1}/o) { + $cgiparams{'txt_inet'}=$2.$3.$5; + } else { + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct inet'}<br>"; + } + } + #Check Hrb + if($cgiparams{'txt_hrb'}){ + $errormessage=&checkfield($Lang::tr{'acct hrb'},$cgiparams{'txt_hrb'},$errormessage); + } + + } + + #Check Phone + if($cgiparams{'txt_tel'}){ + if (!&validphonefield($cgiparams{'txt_tel'})){ + $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct tel'}<br>"; + } + } + + return $errormessage; +} + +sub checkproxy{ + if(-f "${General::swroot}/proxy/enable"){ + $proxsrv=$Lang::tr{'running'}; + }else{ + $proxsrv=$Lang::tr{'stopped'}; + } + my $srce = "${General::swroot}/proxy/squid.conf"; + my $string1 = 'access\.log'; + open(FH, $srce); + while(my $line = <FH>) { + if($line =~ m/$string1/) { + $proxlog=$Lang::tr{'running'}; + } + } + close FH; + return; +} + +sub validtextfield{ + #GET: Input from a Textfield + #GIVES: True if valid, false if not valid + my $remark = $_[0]; + + # Each part should be at least two characters in length + # but no more than 63 characters + if (length ($remark) < 1 || length ($remark) > 255) { + return 0;} + # Only valid characters are a-z, A-Z, 0-9 and - + if ($remark !~ /^[a-zäöüA-ZÖÄÜ0-9-.:;\&\|\ß_()\/\s]*$/) { + return 0;} + # First character can only be a letter or a digit + if (substr ($remark, 0, 1) !~ /^[a-zäöüA-ZÖÄÜ0-9(]*$/) { + return 0;} + # Last character can only be a letter or a digit + if (substr ($remark, -1, 1) !~ /^[a-zöäüA-ZÖÄÜ0-9.:;_)]*$/) { + return 0;} + return 1; +} + +sub validnumfield{ + #GET: Input from a numeric field + #GIVES: True if valid, false if not valid + my $num = $_[0]; + + # Each part should be at least two characters in length + # but no more than 63 characters + if (length ($num) < 1 || length ($num) > 255) { + return 0;} + # Only valid characters are a-z, A-Z, 0-9 and - + if ($num !~ /^[0-9.]*$/) { + return 0;} + # First character can only be a letter or a digit + if (substr ($num, 0, 1) !~ /^[0-9]*$/) { + return 0;} + # Last character can only be a letter or a digit + if (substr ($num, -1, 1) !~ /^[0-9]*$/) { + return 0;} + return 1; +} + +sub validphonefield{ + #GET: Input from a numeric field + #GIVES: True if valid, false if not valid + my $num = $_[0]; + + # Each part should be at least two characters in length + # but no more than 63 characters + if (length ($num) < 1 || length ($num) > 255) { + return 0;} + # Only valid characters are a-z, A-Z, 0-9 and - + if ($num !~ /^[0-9-()\+ ]*$/) { + return 0;} + # First character can only be a letter or a digit + if (substr ($num, 0, 1) !~ /^[0-9(\+]*$/) { + return 0;} + # Last character can only be a digit + if (substr ($num, -1, 1) !~ /^[0-9]*$/) { + return 0;} + return 1; +} + +sub validalphanumfield{ + #GET: Input from a numeric field + #GIVES: True if valid, false if not valid + my $remark = $_[0]; + + # Each part should be at least two characters in length + # but no more than 63 characters + if (length ($remark) < 1 || length ($remark) > 255) { + return 0;} + # Only valid characters are a-z, A-Z, 0-9 and - + if ($remark !~ /^[0-9a-zA-Z]*$/) { + return 0;} + # First character can only be a letter or a digit + if (substr ($remark, 0, 1) !~ /^[0-9A-Za-z]*$/) { + return 0;} + # Last character can only be a letter or a digit + if (substr ($remark, -1, 1) !~ /^[0-9a-zA-Z]*$/) { + return 0;} + return 1; +} + +sub error{ + if ($errormessage) { + &Header::openbox('100%', 'left', $Lang::tr{'error messages'}); + print "<class name='base'>$errormessage\n"; + print " </class>\n"; + &Header::closebox(); + } +} + +sub billgroupsite{ + &Header::openpage("$Lang::tr{'acct billgroup'}", 1, ''); + &Header::openbigbox('100%', 'center'); + &error; + my $host; + my $cust; + my @oldhosts; + my $grp; + my $mailrcpt; + my $ccmailrcpt; + #Get addresses from DB + my $res = &ACCT::getaddresses; + #Check if we need to show NEW-BillGROUP-BOX or Hint + foreach my $row (@$res) { + my ($gr,$comp,$type,$name1,$str,$nr,$plz,$city,$bank,$iban,$bic,$blz,$kto,$email,$inet,$hrb,$ust,$tel,$fax,$ccmail) = @$row; + $grp=$gr; + $mailrcpt=$email; + $ccmailrcpt=$ccmail; + if ($type eq 'HOST'){ + $host=1; + } + if ($type eq 'CUST'){ + $cust=1; + } + } +if ($host && $cust){ + #Fill CCMAIL + if (!$cgiparams{'txt_ccmail'}){ + $cgiparams{'txt_ccmail'}=$ccmailrcpt; + } + &Header::openbox('100%', 'left',"$Lang::tr{'acct edit_addr'}" ); + print<<END; + <form method='post' action='$ENV{'SCRIPT_NAME'}' ENCTYPE='multipart/form-data'> + <table style='width:100%;'> + <tr> + <td style='width: 22em;'>$Lang::tr{'name'}</td> + <td><input type='text' name='txt_billgroup' value='$cgiparams{'txt_billgroup'}' style='width: 24em;'></td> + </tr> + <tr> + <td><br></td> + </tr> + <tr> + <td valign='top'>$Lang::tr{'acct billtext1'}<img src='/blob.gif' alt='*' /></td> + <td><textarea name='txt_billtext1' cols='40' rows='5' style='width: 24em;' maxlength='300'>$cgiparams{'txt_billtext1'}</textarea></td> + </tr> + <tr><td><br></td></tr> +END + #Print Dropdown Menu for HOSTER and CUSTOMER + print "<tr><td>$Lang::tr{'acct hoster'}</td><td><select name='dd_host' style='width: 24.3em;'>"; + foreach my $row (@$res) { + my ($gr,$comp,$type) = @$row; + if ($type eq 'HOST'){ + if($cgiparams{'dd_host'} eq $comp){ + print"<option selected>$comp</option>"; + }else{ + print"<option>$comp</option>"; + } + } + } + print "</select></td></tr><tr><td><br></td></tr>"; + print "<tr><td>$Lang::tr{'acct customer'}</td><td><select name='dd_cust' style='width: 24.3em;'>"; + foreach my $row (@$res) { + my ($gr,$comp,$type) = @$row; + if ($type eq 'CUST'){ + if($cgiparams{'dd_cust'} eq $comp){ + print"<option selected>$comp</option>"; + }else{ + print"<option>$comp</option>"; + } + } + } + print "</select></td></tr>"; + print "<tr><td><br></td></tr>"; + #Print multiselectbox for hosts/users which should be part of this group + my $hosts=&ACCT::gethosts; + print"<tr><td valign='top'>$Lang::tr{'acct members'}</td><td><select name='sel_hosts' multiple size='8' style='width: 24em;' >"; + #If update, split $cgiparams{'sel_hosts'} and preselect values from selectbox + if($cgiparams{'update'} eq 'on'){ + $cgiparams{'oldname'}=$cgiparams{'txt_billgroup'}; + @oldhosts=split(/\|/,$cgiparams{'sel_hosts'}); + } + foreach my $row (@$hosts) { + my ($val)=@$row; + my $sel=0; + foreach my $old (@oldhosts){ + if ($old eq $val){ + $sel=1; + } + } + if ($sel){ + print"<option selected>$val</option>"; + }else{ + print"<option>$val</option>"; + } + } + print"</select></td></tr>"; + print "<tr><td><br></td></tr>"; + #set right decimal seperator for cent value + setlocale(LC_NUMERIC,"$mainsettings{'LANGUAGE'}_$uplang"); + my $val=sprintf"%.3f",$cgiparams{'txt_cent'}; + print"<tr><td>$Lang::tr{'acct cent'}</td><td><input type='text' name='txt_cent' value='$val' size='3'>$settings{'CURRENCY'} </td></tr>"; + #Optional note + print"<tr><td colspan='2' align='left'><img src='/blob.gif' alt='*' /><font size='1'>$Lang::tr{'acct optional'}</font></td></tr>"; + print"<tr><td colspan='2' align='right'><br><br>"; + print"</td></tr></table>"; + + #LOGO Upload if update eq 'on' + if ($cgiparams{'update'} eq 'on'){ + print<<END; + <table style='width:100%;'> + <tr> + <td style='width: 22em;'>$Lang::tr{'acct logo upload'}</td> + <td><INPUT TYPE="file" NAME="uploaded_file" SIZE=30 MAXLENGTH=80></td> + <input type='hidden' name='logo_grp' value='$cgiparams{'txt_billgroup'}' /> + </tr> + <tr> + <td><br>$Lang::tr{'acct logo'}</td> +END + #Show Logo in webinterface with 1/2 size if set + if (-f "$logopath/$cgiparams{'txt_billgroup'}/logo.png"){ + print"<td><img src='/accounting/logo/$cgiparams{'txt_billgroup'}/logo.png' alt='$logopath/$cgiparams{'txt_billgroup'}/logo.png' width='25%' height='25%' /></td></tr>"; + }else{ + print"<td><br>$Lang::tr{'no'}</td></tr>"; + } + #Show optional CC Mailadresses + print<<END; + <tr> + <td><br>$Lang::tr{'acct mailrcpt'}</td> + <td><br>$mailrcpt</td> + </tr> + <tr> + <td><br>$Lang::tr{'acct ccmail'}</td> + <td><br><input type='text' name='txt_ccmail' value='$cgiparams{'txt_ccmail'}' style='width: 24.3em;'></td> + </tr> + + + +END + print"</table>"; + } + print"<table style='width:100%;'><tr><td align='right'>"; + #Print SAVE or EDIT Button + if($cgiparams{'update'} eq 'on'){ + print "<input type='submit' name='BILLACTION' value='$Lang::tr{'update'}'>"; + print "<input type='hidden' name='oldname' value='$cgiparams{'oldname'}'>"; + print "<input type='hidden' name='oldccmail' value='$ccmailrcpt'>"; + }else{ + print "<input type='submit' name='BILLACTION' value='$Lang::tr{'save'}'>"; + } + print"</td></tr></table><br></form><br>"; + &Header::closebox(); +#BackButton + print<<END; + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <table style='width:100%;'> + <tr> + <td align='right'> + <input type='submit' name='ACTION' value='$Lang::tr{'back'}'> + </td> + </tr> + </table> + </form> +END + #Show Box for fixed positions if update + if ($cgiparams{'update'} eq 'on'){ + &viewtablebillpos($cgiparams{'txt_billgroup'}); + } + if($grp >0){ + &viewtablebillgroups; + } + +}else{ + &Header::openbox('100%', 'left',"$Lang::tr{'hint'}" ); + print "$Lang::tr{'acct hint billgrp'}"; + &Header::closebox(); + #BackButton +print<<END; + <table style='width:100%;'> + <tr> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'back'}'></td> + </form> + </tr> + </table> +END +} + &Header::closebigbox(); + &Header::closepage(); + exit 0; +} + +sub viewtablebillgroups{ + $count=0; + &Header::openbox('100%', 'left',"$Lang::tr{'acct billgroup'}" ); + #Get DATA from table BILLINGGRP + my $res = &ACCT::getbillgroups; + + #Print table billinggroup + print<<END; + <table style='width:100%;' cellspacing='0' class='tbl'> + <tr> + <th align='left'>$Lang::tr{'name'}</th> + <th align='left'>$Lang::tr{'acct hoster'}</th> + <th align='left'>$Lang::tr{'acct customer'}</th> + <th align='left'>$Lang::tr{'acct members'}</th> + <th align='left' colspan='5'></th> + </tr> +END + foreach my $line (@$res){ + $count++; + if($count % 2){ + $col="style='background-color:$color{'color22'}'"; + }else{ + $col="style='background-color:$color{'color20'}'"; + } + my ($name,$host,$cust,$txt,$amount,$cent) = @$line; + print<<END; + <tr> + <td $col>$name</td> + <td $col>$host</td> + <td $col>$cust</td> + <td $col>$amount</td> + <td width='1%' $col> +END + my $members=&ACCT::listhosts($name); + my @mem=split(/\|/,$members); + my $msg; + foreach my $m (@mem){ + $msg.=$m."\n"; + } + print"<img src='/images/computer.png' alt=$Lang::tr{'acct members'} title='".$msg."' /></td>"; + print<<END; + + <td width='1%' $col> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='image' src='/images/edit.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' /> + <input type='hidden' name='BILLACTION' value='edit_billgroup'> + <input type='hidden' name='txt_billgroup' value='$name'> + <input type='hidden' name='txt_billtext1' value='$txt'> + <input type='hidden' name='dd_host' value='$host'> + <input type='hidden' name='dd_cust' value='$cust'> + <input type='hidden' name='sel_hosts' value='$members'> + <input type='hidden' name='txt_cent' value='$cent'> + </form> + </td> + + <td width='1%' $col> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='image' src='/images/folder-open.png' alt='$Lang::tr{'edit'}' title='$Lang::tr{'acct billarchive'}' /> + <input type='hidden' name='BILLACTION' value='open_billgroup'> + <input type='hidden' name='txt_billgroup' value='$name'> + </form> + </td> + + <td width='1%' $col> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='image' src='/images/document-new.png' alt='$Lang::tr{'acct preview'}' title='$Lang::tr{'acct preview'}' /> + <input type='hidden' name='BILLACTION' value='open_preview'> + <input type='hidden' name='txt_billgroup' value='$name'> + </form> + </td> + <td width='1%' $col> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='image' src='/images/delete.gif' alt=$Lang::tr{'delete'} title="$Lang::tr{'delete'}" /> + <input type='hidden' name='BILLACTION' value='delete_billgroup'> + <input type='hidden' name='txt_billgroup' value='$name'> + </form> + </td> + </tr> +END + } + print "</table>"; + &ACCT::closedb; + &Header::closebox(); +} + +sub viewtablehosts{ + $dbh=&ACCT::connectdb; + &Header::openbox('100%', 'left', $Lang::tr{'acct hosts'}); + my $mon=$_[0]; + my $year=$_[1]; + my ($from,$till)=&ACCT::getmonth($mon,$year); + $count=0; + #Menu to display another month + print<<END; + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <table style='width:100%;'> + <tr> + <td style='width:5%; text-align:center;'>$Lang::tr{'acct month'}</td> + <td style='width:10%; text-align: center;'>$Lang::tr{'acct year'}</td> + <td></td> + </tr> + <tr> + <td><select name='month'> +END + for (my $i=1;$i<13;$i++){ + if(($_[0]) eq $i){ + print"<option selected>$i</option>"; + }else{ + print"<option>$i</option>"; + } + } + print<<END; + </select></td> + <td style='text-align: center;'><select name='year'> +END + for (my $j=2014;$j<=($year);$j++){ + if(($_[1]) eq $j){ + print"<option selected>$j</option>"; + }else{ + print"<option>$j</option>"; + } + } + print<<END; + </select></td> + <td><input type='submit' name='ACTION' value='$Lang::tr{'acct view'}'></td> + </tr> + </table></form> + <br> +END + #View table with all hosts + print<<END; + <table style='width:100%;' class='tbl'> + <tr> + <th>$Lang::tr{'name'}</th> + <th>$Lang::tr{'acct traffic'}</th> + <th>$Lang::tr{'from'}</th> + <th>$Lang::tr{'to'}</th> + <th></th> + </tr> +END + my $res = $dbh->selectall_arrayref("SELECT SUM(BYTES),min(TIME_RUN),max(TIME_RUN),NAME from ACCT where TIME_RUN between ".$from." and ".$till." group by NAME;"); + my $sumbytes; + my $type; + my $lineval; + if (@$res){ + foreach my $row (@$res) { + $count++; + $lineval=''; + $type=''; + if($count % 2){ + $col="background-color:$color{'color22'};"; + }else{ + $col="background-color:$color{'color20'};"; + } + my ($bytes, $mintime, $maxtime, $name) = @$row; + $sumbytes +=$bytes; + ($lineval,$type) = &calcbytes($bytes); + #Print Line + print"<tr><td style='$col'>$name</td><td style='$col text-align: right;'>$lineval $type</td><td style='$col text-align: center;'>".&getdate($mintime)."</td><td style='$col text-align: center;'>".&getdate($maxtime)."</td>"; + print<<END; + <td style='$col'> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='image' src='/images/utilities-system-monitor.png' alt="$Lang::tr{'status'}" title="$Lang::tr{'status'}" /> + <input type='hidden' name='ACTION' value='viewgraph'> + <input type='hidden' name='host' value='$name'> + <input type='hidden' name='month' value='$mon'> + <input type='hidden' name='year' value='$year'> + <input type='hidden' name='traffic' value="$Lang::tr{'acct sum'} $Lang::tr{'acct traffic'} $lineval $type"> + </form> + + </td> + </tr> +END + } + }else{ + print "<tr><td colspan='5'><center>$Lang::tr{'acct no data'}</td></tr>"; + } + print "</table>"; + &Header::closebox(); + &ACCT::closedb; +} + +sub viewtablebillpos{ + my $grp=$_[0]; + #BOX for extra billpositions + &Header::openbox('100%', 'left',"$Lang::tr{'acct fix billpos'} $grp" ); + #Table for optional billpositions + print<<END; + <center><table style='width:65%' cellspacing='0' class='tbl' border='0'> + <tr> + <th align='left'>$Lang::tr{'acct amount'}</th> + <th align='left' style='padding-left:1.2em'>$Lang::tr{'acct name'}</th> + <th align='left'>$Lang::tr{'acct price pp'}</th> + <th></th> + </tr> +END + #Fill Table for extra billpositions if any + if ($cgiparams{'update'} eq 'on'){ + my $res = &ACCT::getextrabillpos($cgiparams{'txt_billgroup'}); + $count=0; + foreach my $line (@$res){ + $count++; + if($count % 2){ + $col="style='background-color:$color{'color22'}'"; + }else{ + $col="style='background-color:$color{'color20'}'"; + } + my ($grp,$amnt,$pos,$price) = @$line; + setlocale(LC_NUMERIC,"$mainsettings{'LANGUAGE'}_$uplang"); + my $locale_price=sprintf"%.2f",$price; + print "<tr><form method='post' action='$ENV{'SCRIPT_NAME'}'><td $col style='padding-right:1.2em' align='right'>$amnt</td><td $col style='padding-left:1.2em'>$pos</td><td $col style='padding-right:1.2em' align='right'>$locale_price $settings{'CURRENCY'}</td>"; + print "<td $col><input type='image' src='/images/delete.gif' alt=$Lang::tr{'delete'} title=$Lang::tr{'delete'} >"; + print "<input type='hidden' name='BILLPOS' value='delpos'>"; + print "<input type='hidden' name='txt_billgroup' value='$grp'>"; + print "<input type='hidden' name='txt_billpos' value='$pos'></form></tr>"; + } + } + print<<END; + <tr> + + <td ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='text' name='txt_amount' value='$cgiparams{'txt_amount'}' size='3'></td> + <td><input type='text' name='txt_name' value='$cgiparams{'txt_name'}' size='40'></td> + <td ><input type='text' name='txt_price' value='$cgiparams{'txt_price'}' size='6'></td> + <td></td> + </tr> + </table><br> + <table style='width:100%'> + <tr> + <td align='right'><input type='submit' name='BILLPOS' value='$Lang::tr{'save'}'></td> + <input type='hidden' name='txt_billgroup' value='$grp'> + </form> + </tr> + </table></form> +END + + &Header::closebox(); +} + +sub billoverview{ + my $grp=shift; + my $col; + my $count=0; + #Open site + &Header::openpage($Lang::tr{'acct billoverview'}, 1, ''); + &Header::openbigbox('100%', 'center'); + &Header::openbox('100%', 'left', $grp); + my $res=&ACCT::getbills($grp); + + if (@$res > 0){ + print<<END; + <table style='width:100%' cellspacing='0' class='tbl' border='0'> + <tr> + <th>$Lang::tr{'acct nr'}</th> + <th>$Lang::tr{'acct path'}</th> + <th>$Lang::tr{'name'}</th> + <th>$Lang::tr{'acct generated'}</th> + <th></th> + </tr> + +END + foreach my $row (@$res){ + $count++; + if($count % 2){ + $col="style='background-color:$color{'color22'}'"; + }else{ + $col="style='background-color:$color{'color20'}'"; + } + my ($no,$path,$name,$date,$dbgrp) = @$row; + + print "<tr><td $col>$no</td><td $col>$path</td><td $col>$name</td><td $col>$date</td><td $col>"; + print "<form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='image' src='/images/updbooster/updxl-src-adobe.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' />"; + print "<input type='hidden' name='BILLVIEW' value='show'>"; + my $file="$path/$name"; + print "<input type='hidden' name='file' value='$file'>"; + print "<input type='hidden' name='name' value='$name'>"; + print"</form></td></tr>"; + } + print "</table><br>"; + }else{ + print "<center>$Lang::tr{'acct no data'}"; + } + &Header::closebox(); + + #BackButton +print<<END; + <table style='width:100%'> + <tr> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'back'}'></td> + </form> + </tr> + </table> +END + &Header::closebigbox(); + &Header::closepage(); + exit 0; +} + +sub checkmailsettings{ + #Check if mailserver is an ip address or a domain + if ($cgiparams{'txt_mailserver'} =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/){ + if (! &General::validip($cgiparams{'txt_mailserver'})){ + $errormessage.="$Lang::tr{'acct invalid mailip'} $cgiparams{'txt_mailserver'}<br>"; + } + }elsif(! &General::validfqdn($cgiparams{'txt_mailserver'})){ + $errormessage.="$Lang::tr{'acct invalid mailfqdn'} $cgiparams{'txt_mailserver'}<br>"; + } + #Check valid mailserverport + if($cgiparams{'txt_mailport'} < 1 || $cgiparams{'txt_mailport'} > 65535){ + $errormessage.="$Lang::tr{'acct invalid mailport'} $cgiparams{'txt_mailport'}<br>"; + } + #Check valid sender + if(! $cgiparams{'txt_mailsender'}){ + $errormessage.="$Lang::tr{'acct empty field'} $Lang::tr{'acct mailsender'}<br>"; + }else{ + if (! &General::validemail($cgiparams{'txt_mailsender'})){ + $errormessage.="<br>$Lang::tr{'acct invalid'} $Lang::tr{'acct mailsender'}<br>"; + } + } + return $errormessage; +} diff --git a/src/squid-accounting/acct-lib.pl b/src/squid-accounting/acct-lib.pl new file mode 100644 index 0000000..f0081b7 --- /dev/null +++ b/src/squid-accounting/acct-lib.pl @@ -0,0 +1,923 @@ +#!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2014 IPFire Team <alexander.marx(a)ipfire.org> # +# # +# 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/>. # +# # +############################################################################### +package ACCT; + +use DBI; +use POSIX; +use Time::Local; +use PDF::API2; +use utf8; +use Encode; +use File::Copy; +use File::Temp qw/ tempfile tempdir /; + +############################################################################### +my $dbh; +my $dsn="dbi:SQLite:dbname=/var/ipfire/accounting/acct.db"; +my ($sec,$min,$hour,$mday,$mon,$year,$wday,$ydat,$isdst)=localtime(); +my %mainsettings; +############################################################################### + +&General::readhash("/var/ipfire/main/settings", \%mainsettings); +my $uplang=uc($mainsettings{'LANGUAGE'}); + +############# +# Functions # +############# + +sub connectdb { + $dbh = DBI->connect($dsn, "", "",{RaiseError => 1, AutoCommit => 1})or die "ERROR $!"; + return $dbh; +} + +sub closedb { + $dbh->disconnect(); + return $dbh; +} + +sub getminmax { + my $min; + my $max; + $dbh=&connectdb; + my $sth = $dbh->prepare('Select min(TIME_RUN),max(TIME_RUN) from ACCT;'); + $sth->execute; + while ( my @row = $sth->fetchrow_array ) { + $min=$row[0]; + $max=$row[1]; + } + $dbh->disconnect(); + return ($min,$max); +} + +sub cleardbtraf { + &connectdb; + $dbh->do("DELETE FROM ACCT;"); + $dbh->do("DELETE FROM ACCT_HIST;"); + &closedb; +} + +sub cleardb { + &connectdb; + $dbh->do("DELETE FROM ACCT;"); + $dbh->do("DELETE FROM ACCT_HIST;"); + $dbh->do("DELETE FROM ACCT_ADDR "); + $dbh->do("DELETE FROM BILLINGGRP"); + $dbh->do("DELETE FROM BILLINGHOST"); + &closedb; +} + +sub delbefore { + my $till=$_[0]; + &connectdb; + $dbh->do("DELETE FROM ACCT WHERE TIME_RUN < ".$till.";"); + $dbh->do("DELETE FROM ACCT_HIST WHERE TIME_RUN < date('".$till."','unixepoch');"); + &closedb; +} + +sub movedbdata { + $dbh->do("insert into ACCT_HIST select datetime(TIME_RUN,'unixepoch'),NAME,SUM(BYTES) from ACCT where date(TIME_RUN,'unixepoch') < date('now','-2 months') group by NAME,date(TIME_RUN,'unixepoch');"); + $dbh->do("DELETE FROM ACCT WHERE datetime(TIME_RUN,'unixepoch') < date('now','-2 months');"); +} + +sub gethourgraphdata { + my $table=$_[0]; + my $from=$_[1]; + my $till=$_[2]; + my $name=$_[3]; + my $res; + $dbh=connectdb; + if ($table eq 'ACCT'){ + $res = $dbh->selectall_arrayref( "SELECT TIME_RUN,BYTES FROM ACCT WHERE TIME_RUN BETWEEN ".$from." AND ".$till." AND NAME = '".$name."';"); + }else{ + $res = $dbh->selectall_arrayref( "SELECT TIME_RUN,BYTES FROM ACCT_HIST WHERE TIME_RUN BETWEEN date(".$from.",'unixepoch') AND date(".$till.",'unixepoch') AND NAME = '".$name."';"); + } + return $res; +} + +sub getmonthgraphdata { + my $table=$_[0]; + my $from=$_[1]; + my $till=$_[2]; + my $name=$_[3]; + my $res; + $dbh=connectdb; + if ($table eq 'ACCT'){ + $res = $dbh->selectall_arrayref( "SELECT strftime('%d.%m.%Y',xx.tag),(SELECT SUM(BYTES)/1024/1024 FROM ACCT WHERE date(TIME_RUN,'unixepoch') <= xx.tag and NAME = '".$name."') kum_bytes FROM (SELECT date(TIME_RUN,'unixepoch') tag,SUM(BYTES)/1024/1024 sbytes FROM ACCT WHERE NAME='".$name."' and TIME_RUN between ".$from." and ".$till." GROUP by date(TIME_RUN,'unixepoch')) xx;"); + }else{ + $res = $dbh->selectall_arrayref( "SELECT TIME_RUN, (SELECT SUM(BYTES)/1024/1024 FROM ACCT_HIST WHERE TIME_RUN <= ah.TIME_RUN and NAME = '".$name."') kum_bytes FROM ACCT_HIST ah WHERE TIME_RUN BETWEEN date(".$from.",'unixepoch') AND date(".$till.",'unixepoch') AND NAME = '".$name."' group by TIME_RUN;"); + } + $dbh=closedb; + return $res; +} + +sub writeaddr { + my $comp = $_[0]; + my $type = $_[1]; + my $name1 = $_[2]; + my $str = $_[3]; + my $nr = $_[4]; + my $post = $_[5]; + my $city = $_[6]; + my $bank = $_[7]; + my $iban = $_[8]; + my $bic = $_[9]; + my $blz = $_[10]; + my $kto = $_[11]; + my $mail = $_[12]; + my $inet = $_[13]; + my $hrb = $_[14]; + my $ustid = $_[15]; + my $tel = $_[16]; + my $fax = $_[17]; + $dbh=&connectdb; + #COMPANY,TYPE,NAME1,STR,NR,POSTCODE,CITY,BANK,IBAN,BLZ,ACCOUNT,EMAIL,INTERNET,HRB,USTID,TEL,FAX + my $sql = "INSERT INTO ACCT_ADDR (COMPANY,TYPE,NAME1,STR,NR,POSTCODE,CITY,BANK,IBAN,BIC,BLZ,ACCOUNT,EMAIL,INTERNET,HRB,USTID,TEL,FAX) VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + my $sth = $dbh->prepare( $sql ); + $sth->execute( $comp,$type,$name1,$str,$nr,$post,$city,$bank,$iban,$bic,$blz,$kto,$mail,$inet,$hrb,$ustid,$tel,$fax ); + $dbh=&closedb; +} + +sub updateaddr { + my $type = $_[0]; + my $comp = $_[1]; + my $name1 = $_[2]; + my $str = $_[3]; + my $nr = $_[4]; + my $post = $_[5]; + my $city = $_[6]; + my $bank = $_[7]; + my $iban = $_[8]; + my $bic = $_[9]; + my $blz = $_[10]; + my $kto = $_[11]; + my $mail = $_[12]; + my $inet = $_[13]; + my $hrb = $_[14]; + my $ustid = $_[15]; + my $tel = $_[16]; + my $fax = $_[17]; + my $oldname = $_[18]; + $dbh=&connectdb; + $dbh->do("UPDATE ACCT_ADDR SET COMPANY=?,TYPE=?,NAME1=?,STR=?,NR=?,POSTCODE=?,CITY=?,BANK=?,IBAN=?,BIC=?,BLZ=?,ACCOUNT=?,EMAIL=?,INTERNET=?,HRB=?,USTID=?,TEL=?,FAX=? WHERE COMPANY=?", undef,$comp,$type,$name1,$str,$nr,$post,$city,$bank,$iban,$bic,$blz,$kto,$mail,$inet,$hrb,$ustid,$tel,$fax,$oldname)or die "Could not UPDATE Address."; + $dbh=&closedb; +} + +sub deladdr { + my $comp = $_[0]; + $dbh=&connectdb; + $dbh->do("DELETE FROM ACCT_ADDR WHERE COMPANY=?", undef,$comp )or die "Could not delete address $comp!"; + $dbh=&closedb; +} + +sub getaddresses { + $dbh=&connectdb; + my $res=$dbh->selectall_arrayref("SELECT (SELECT COUNT(NAME) FROM BILLINGGRP GROUP BY NAME),* FROM ACCT_ADDR ORDER BY COMPANY;"); + $dbh=&closedb; + return $res; +} + +sub gethosts{ + $dbh=&connectdb; + my $res =$dbh->selectall_arrayref("SELECT NAME from ACCT GROUP BY NAME ORDER BY NAME;"); + $dbh=&closedb; + return $res; +} + +sub getbillgroups { + $dbh=connectdb; + my $res=$dbh->selectall_arrayref("SELECT NAME,HOST,CUST,BILLTEXT,(SELECT COUNT(HOST) FROM BILLINGHOST WHERE BILLINGGRP.NAME=BILLINGHOST.GRP),CENT FROM BILLINGGRP ORDER BY NAME;"); + return $res; + $dbh->disconnect(); +} + +sub getextrabillpos { + my $grp=$_[0]; + $dbh=&connectdb; + my $res=$dbh->selectall_arrayref("SELECT * from BILLPOS WHERE GRP =?", undef,$grp); + $dbh=&closedb; + return $res; +} + +sub savebillgroup { + my $grp=$_[0]; + my $txt=$_[1]; + my $host=$_[2]; + my $cust=$_[3]; + my $ust=$_[4]; + my @ips=@{$_[5]}; + $dbh=&connectdb; + my $sql = "INSERT INTO BILLINGGRP (NAME,BILLTEXT,HOST,CUST,CENT) VALUES (?,?,?,?,?)"; + my $sth = $dbh->prepare( $sql ); + $sth->execute( $grp,$txt,$host,$cust,$ust ); + foreach my $ip (@ips){ + my $sql = "INSERT INTO BILLINGHOST (GRP,HOST) VALUES (?,?)"; + my $sth = $dbh->prepare( $sql ) or die "Could not prepare insert into BILLINGHOST $!"; + $sth->execute( $grp,$ip ) or die "Could not execute INSERT into BILLINGHOST $!"; + } + $dbh=&closedb; +} + +sub updatebillgrouphost { + my $oldgrp=$_[0]; + my $newgrp=$_[1]; + $dbh=&connectdb; + my $sql = "UPDATE BILLINGGRP SET HOST=? WHERE HOST=?;"; + my $sth = $dbh->prepare( $sql ); + $sth->execute( $newgrp,$oldgrp ); + $dbh=&closedb; +} + +sub updatebillgroupcust { + my $oldgrp=$_[0]; + my $newgrp=$_[1]; + $dbh=&connectdb; + my $sql = "UPDATE BILLINGGRP SET CUST=? WHERE CUST=?;"; + my $sth = $dbh->prepare( $sql ); + $sth->execute( $newgrp,$oldgrp ); + $dbh=&closedb; +} + +sub deletebillgroup { + my $name=shift; + $dbh=connectdb; + $dbh->do("DELETE FROM BILLINGGRP WHERE NAME=?;", undef,$name); + $dbh->do("DELETE FROM BILLINGHOST WHERE GRP=?;", undef,$name); + &closedb; +} + +sub savebillpos { + my $grp=$_[0]; + my $amnt=$_[1]; + my $pos=$_[2]; + my $price=$_[3]; + $dbh=&connectdb; + my $sql = "INSERT INTO BILLPOS (GRP,AMOUNT,POS,PRICE) VALUES (?,?,?,?)"; + my $sth = $dbh->prepare( $sql )or die "Could not prepare insert into BILLINGPOS $!"; + $sth->execute( $grp,$amnt,$pos,$price ) or die "Could not execute INSERT into BILLINGHOST $!"; + $dbh->disconnect(); +} + +sub updatebillpos { + my $oldgrp=shift; + my $newgrp=shift; + $dbh=&connectdb; + my $sql = "UPDATE BILLPOS SET GRP=? WHERE GRP=?;"; + my $sth = $dbh->prepare( $sql ); + $sth->execute( $newgrp,$oldgrp ); + my $sql1 = "UPDATE BILLS SET GRP=? WHERE GRP=?;"; + my $sth1 = $dbh->prepare( $sql1 ); + $sth1->execute( $newgrp,$oldgrp ); + $dbh=&closedb; + #Now rename directories + rename ("/srv/web/ipfire/html/accounting/logo/$oldgrp","/srv/web/ipfire/html/accounting/logo/$newgrp"); + rename ("/var/ipfire/accounting/bill/$oldgrp","/var/ipfire/accounting/bill/$newgrp") + +} + +sub delbillpos_single { + my $pos=$_[0]; + my $grp=$_[1]; + my $sql = "DELETE FROM BILLPOS WHERE GRP=? AND POS=?;"; + $dbh=&connectdb; + my $sth = $dbh->prepare( $sql )or die "Could not prepare DELETE POS from BILLINGPOS $!"; + $sth->execute( $grp,$pos ) or die "Could not execute DELETE from BILLINGHOST $!"; + $dbh=&closedb; +} + +sub delbillpos { + my $grp=$_[0]; + my $sql = "DELETE FROM BILLPOS WHERE GRP=?;"; + $dbh=&connectdb; + my $sth = $dbh->prepare( $sql )or die "Could not prepare DELETE POS from BILLINGPOS $!"; + $sth->execute( $grp ) or die "Could not execute DELETE from BILLINGHOST $!"; + $dbh=&closedb; +} + +sub listhosts{ + my $name=$_[0]; + my $a; + my $res=$dbh->selectall_arrayref("SELECT * FROM BILLINGHOST WHERE GRP='".$name."';"); + foreach my $gzu (@$res){ + my ($x,$y)=@$gzu; + $a.= "|$y"; + } + return $a; +} + +sub checkusergrp { + $dbh=connectdb; + my $res=$dbh->selectall_arrayref("SELECT * FROM BILLINGHOST;"); + $dbh->disconnect(); + return $res; +} + +sub getmonth{ + #GET : 1. month 2. year + #GIVES: 1.day of given month AND last day of given month in seconds since 1.1.1970 + ($sec,$min,$hour,$mday,$mon,$year,$wday,$ydat,$isdst)=localtime(); + my $jahr=$_[1]; + my $monat=$_[0]-1 if($_[0]); + my $tag=1; + my $time1=timelocal(0,0,0,$tag,$monat,$jahr); + my $time2=timelocal(0,0,0,$tag,($monat+1),$jahr); + --$time2; + return ($time1,$time2); +} + +sub GetTaValues { + $dbh=&connectdb; + my $from = $_[0]; #unixtimestamp + my $till = $_[1]; #unixtimestamp + my $grp = $_[2]; #Billgroupname + my $all = $dbh->selectall_arrayref("SELECT bh.HOST,SUM(ac.BYTES) sbytes,bh.GRP FROM ACCT ac ,BILLINGHOST bh WHERE ac.NAME=bh.HOST AND bh.GRP=? AND ac.TIME_RUN between ? AND ? GROUP BY bh.GRP,bh.HOST;", undef, $grp, $from, $till) or die "Could not fetch Groupdata $!"; + my $nri1 = @$all; + my @return; + my $cnt=0; + if ($nri1 eq "0"){ + $return[$cnt]="999"; + } + else + { + foreach my $row (@$all){ + my ($bytes,$billgrp,$host) = @$row; + $return[$cnt]="$bytes,$billgrp,$host"; + $cnt++; + } + } + &closedb; + return @return; +} + +sub getTaAddress { + my $grp=$_[0]; + my $type=$_[1]; + $dbh=&connectdb; + my $res = $dbh->selectall_arrayref("select * from ACCT_ADDR,BILLINGGRP where (BILLINGGRP.HOST=ACCT_ADDR.COMPANY AND BILLINGGRP.NAME=? AND ACCT_ADDR.TYPE=?) or (BILLINGGRP.CUST=ACCT_ADDR.COMPANY and BILLINGGRP.NAME=? AND ACCT_ADDR.TYPE=?);", undef, $grp,$type,$grp,$type); + &closedb; + return $res; +} + +sub checkbillgrp { + my $comp=$_[0]; + $dbh=&connectdb; + my $res=$dbh->selectall_arrayref("SELECT NAME,HOST,CUST FROM BILLINGGRP;"); + &closedb; + return $res; +} + +sub pdf2 { + my @billar = @{$_[0]}; #DATA from sendbill (just host/values) + my $month = $_[1]; + $month = '0'.$month if $month < 10; + my $year = $_[2]; + my $mwst = $_[3]; + my @address_cust= @{$_[4]}; #Array which contains customer and hoster adresses and some additional info from billgroup + my @address_host= @{$_[5]}; + my @billpos = @{$_[6]}; + my $grp = $_[7]; + my $cur = $_[8]; #(Eur,USD,...) + my $preview = $_[9]; + my $no = &getBillNr; + my $name = $month."-".$year."-".$no.".pdf"; + my $path ="/var/ipfire/accounting/bill/"; + my $filename = "$path/$grp/$name"; + my @summen; #Used for counting the sums + my $x = 500; + my $y = 1; + my $zwsum; + my $pages = 0; + my $anzbillpos = @billpos; + my $anz = (@billar+$anzbillpos)/18; #Total pages + $anz = ceil($anz); #round the $anz value + my $aktpage=1; + my $sum=0; + my $sum1=0; + my $lines; + my $title; + my $txt; + my $txt1; + my $txt2; + my $txt3; + my $txt4; + my $txt5; + my $fnt; + my $fnt1; + my $fulldate = strftime('%d.%m.%Y',localtime(time())); + my($company_host,$type_host,$name1_host,$str_host,$str_nr_host,$plz_host,$city_host,$bank,$iban,$bic,$blz,$kto,$email,$internet,$hrb,$stnr,$tel_host,$fax_host,$ccmail,$billgrp,$text,$host,$cust,$cent); + my($company_cust,$type_cust,$name1_cust,$str_cust,$str_nr_cust,$plz_cust,$city_cust); + + #First of all check if directory exists, else create it + if(! -d "$path/$grp" && $preview ne 'on'){ + mkdir("$path/$grp",0777); + } + + #Check if we are creating a preview or a real bill + if($preview eq 'on'){ + $filename="$path/".tempfile( SUFFIX => ".pdf", ); + } + #################################################################### + #Prepare DATA from arrays + #################################################################### + #Get HOSTER for this grp + foreach my $addrline (@address_host){ + ($company_host,$type_host,$name1_host,$str_host,$str_nr_host,$plz_host,$city_host,$bank,$iban,$bic,$blz,$kto,$email,$internet,$hrb,$stnr,$tel_host,$fax_host,$ccmail,$billgrp,$text,$host,$cust,$cent)=@$addrline; + } + #Get CUST for this grp + foreach my $addrline_cust (@address_cust){ + ($company_cust,$type_cust,$name1_cust,$str_cust,$str_nr_cust,$plz_cust,$city_cust)=@$addrline_cust; + } + + + #Generate PDF File + my $pdf = PDF::API2->new(-file => $filename); + $pdf->mediabox('A4'); + my $page = $pdf->page; + $fnt = $pdf->corefont('Helvetica'); + $fnt1 = $pdf->corefont('HelveticaBold'); + + #Set lines + $lines = $page->gfx; + $title = $page->gfx; + $lines->strokecolor('grey'); + $lines->linewidth('0.5'); + + #Fill BILL DATA into PDF + setlocale(LC_ALL, "$mainsettings{'LANGUAGE'}_$uplang"); + foreach (@billar) { + my ($a1,$a2) = split( /\,/, $_ ); + $a2=sprintf"%.2f",($a2/1024/1024); + my $sum=(($a2)*$cent); + $sum = sprintf"%.2f",($sum); + # Seitenwechsel ermitteln + if ($y % 18 == 0) { + $txt1->translate(390, 120); + $txt1->text($Lang::tr{'acct pdf zwsum'}); #Pos + $zwsum=sprintf("%.2f",($zwsum)); + $txt1->translate(540, 120); + $txt1->text_right("$zwsum".decode('utf8',$cur)); #Pos + $zwsum=0; + $pages++; + $aktpage++; + $x=500; + $page=$pdf->page; + #draw lines + $lines = $page->gfx; + $title = $page->gfx; + $lines->strokecolor('grey'); + $lines->linewidth('0.5'); + } + + #TITLES + $title->linewidth(14); + $title->move(385, 168); + $title->line(545, 168); #Title of SUMBOX + $title->move(60, 523); + $title->line(545, 523);#Bottom horiz. line of Title + + # Generate Tables + $lines->move(59, 745); + $lines->line(545, 745); + $lines->move(59, 563); + $lines->line(545, 563); + + # Addressbox + $lines->move(61, 710); + $lines->line(61, 715, 66, 715); #TL + $lines->move(61, 610); + $lines->line(61, 605, 66, 605); #BL + $lines->move(285, 715); + $lines->line(290, 715, 290, 710); #TR + $lines->move(290, 610); + $lines->line(290, 605, 285, 605); #BR + + # Table for positions + $lines->move(60, 530); + $lines->line(60, 200); #First vert. line POS + $lines->move(90, 523); + $lines->line(90, 200); #Second vert. line + $lines->move(280, 523); + $lines->line(280, 200); #third vert. line + $lines->move(385, 523); + $lines->line(385, 200); #third vert. line + $lines->move(430, 523); + $lines->line(430, 200); #fourth vert. line + $lines->move(545, 530); + $lines->line(545, 200); #fifth vert. line + $lines->move(60, 200); + $lines->line(545, 200); #Bottom horizontal line + + #SUM BOX + $lines->move(385, 175); + $lines->line(385, 115); #Left vert. line of SUMBOX + $lines->move(545, 175); + $lines->line(545, 115); #Right vert. line of SUMBOX + $lines->move(385, 115); + $lines->line(545, 115); #Bottom horiz. line of SUMBOX + + #Lines on right side after sender and after "bank" + $lines->move(420, 723); + $lines->line(545, 723);# Line "Sender" + $lines->move(420, 648); + $lines->line(545, 648);# Line "Bank" + $lines->move(420, 600); + $lines->line(545, 600);# Line HRB/USTID + + #Make lines Visible + $lines->stroke; + $title->stroke; + if (-f "/srv/web/ipfire/html/accounting/logo/$grp/logo.png"){ + #Image LOGO + my $gfx = $page->gfx; + my $image = $pdf->image_png("/srv/web/ipfire/html/accounting/logo/$grp/logo.png"); + my $width= $image->width; + my $height= $image->height; + $gfx->image($image, (545+($width/2))-$width, 750,0.5); + } + + #Set Fonts + $txt = $page->text; + $txt1 = $page->text; + $txt2 = $page->text; + $txt3 = $page->text; + $txt4 = $page->text; + $txt5 = $page->text; + $txt->textstart; #Begin Text + $txt->font($fnt, 10); #Set fontsize for font1 + $txt1->font($fnt, 8); #Set fontsize for font2 + $txt2->font($fnt1, 10); #Set fontsize for font3 + $txt3->font($fnt1, 16); #Set fontsize for font4 + $txt4->font($fnt, 6); #Set fontsize for font5 + $txt5->font($fnt1, 6); #Set fontsize for font6 + + #if $cent not set, set it to 0.5 + if(!$cent){$cent='0.005';} + + #if MWst not set, set it to 19% + if(!$mwst){$mwst='19';} + + # Titles + $txt1->translate(65,520); + $txt1->text($Lang::tr{'acct pos'}); #Pos + $txt1->translate(95, 520); + $txt1->text($Lang::tr{'acct name'}); #Host/Name + $txt1->translate(285, 520); + $txt1->text($Lang::tr{'acct amount'}); #Traffic + $txt1->translate(390, 520); + $txt1->text($Lang::tr{'acct cent1'}); #Price /MB + $txt1->translate(435, 520); + $txt1->text($Lang::tr{'acct pdf price'}); #Sum + + #################################################################### + #Fill Recipient address + my $rec_name= "$company_cust"; + my $rec_name1="$name1_cust"; + my $rec_str = "$str_cust $str_nr_cust"; + my $rec_city = "$plz_cust $city_cust"; + #INSERT RECIPIENT + my $o=675; + $txt2->translate(78, 685); + $txt2->text(decode('utf8',$rec_name)); + if($rec_name1){ + $txt1->translate(78, $o); + $txt1->text(decode('utf8',$rec_name1)); + $o=$o-15; + }else{ + $o=$o-15; + } + $txt1->translate(78, $o); + $txt1->text(decode('utf8',$rec_str)); + $o=$o-10; + $txt1->translate(78, $o); + $txt1->text(decode('utf8',$rec_city)); + + # INSERT SENDER + my $send_name= "$company_host"; + my $send_str = "$str_host $str_nr_host"; + my $send_city = "$plz_host $city_host"; + my $send_bank ="$bank"; + + $txt5->translate(420, 725); + $txt5->text(decode('utf8',$Lang::tr{'acct pdf prov'})); + $txt5->translate(420, 715); + $txt5->text(decode('utf8',$send_name)); + my $j=705; + if($name1_host){ + $txt4->translate(420, $j); + $txt4->text(decode('utf8',$name1_host)); + $j=$j-8; + } + $txt4->translate(420, $j); + $txt4->text(decode('utf8',$send_str)); #STR + $j=$j-8; + $txt4->translate(420, $j); + $txt4->text(decode('utf8',$send_city)); #PLZ.City + #Print optional Values tel,fax + my $i=680; + if($tel_host){ + $txt4->translate(420, $i); + $txt4->text($Lang::tr{'acct tel'}); #Tel + $txt4->translate(480, $i); + $txt4->text($tel_host); #Telnr + $i=$i-8; + } + if($fax_host){ + $txt4->translate(420, $i); + $txt4->text($Lang::tr{'acct fax'}); #Fax + $txt4->translate(480, $i); + $txt4->text($fax_host); #Faxnr + $i=$i-8; + } + if($internet){ + $txt4->translate(420, $i); + $txt4->text($Lang::tr{'acct inet'}); #Internet + $txt4->translate(480, $i); + $txt4->text($internet); #www-address + $i=$i-8; + } + $txt5->translate(420, 650); + $txt5->text(decode('utf8',$Lang::tr{'acct bank'})); #"BANK" + $txt4->lead(7); + $txt4->translate(420, 640); + $txt4->paragraph(decode('utf8',$bank), 130, 20, -align => "justify"); #Bankname + if($iban){ + $txt4->translate(420, 625); + $txt4->text($Lang::tr{'acct iban'}); #iban + $txt4->translate(480, 625); + $txt4->text(decode('utf8',$iban)); #iban + $txt4->translate(420, 619); + $txt4->text($Lang::tr{'acct bic'}); #bic + $txt4->translate(480, 619); + $txt4->text(decode('utf8',$bic)); #bic + } + if($blz){ + $txt4->translate(420, 613); + $txt4->text($Lang::tr{'acct blz'}); #blz + $txt4->translate(420, 607); + $txt4->text($Lang::tr{'acct kto'}); #kto + $txt4->translate(480, 613); + $txt4->text(decode('utf8',$blz)); #blz + $txt4->translate(480, 607); + $txt4->text(decode('utf8',$kto)); #kto + } + + #Print USTID and optional HRB + $txt4->translate(420, 590); + $txt4->text($Lang::tr{'acct ustid'}); #USTID + $txt4->translate(480, 590); + $txt4->text($stnr); #ustid + if($hrb){ + $txt4->translate(420, 580); + $txt4->text($Lang::tr{'acct hrb'}); #USTID + $txt4->translate(480, 580); + $txt4->text($hrb); #ustid + } + ################################################################ + + #Print Date, Pages .... + $txt3->translate(59, 545); + $txt3->text($Lang::tr{'acct pdf billtxt'}); + $txt1->translate(160, 545); + $txt1->text("$no $Lang::tr{'acct billnr'}"); + $txt1->translate(60, 532); + $txt1->text("$Lang::tr{'acct pdf time'} $month/$year"); + $txt1->translate(545, 550); + $txt1->text_right("$Lang::tr{'acct pdf date'} $fulldate"); + $txt1->translate(545, 532); + $txt1->text_right("$Lang::tr{'acct pdf page'} $aktpage / $anz"); + + if ($a1 eq '999'){last;} + #Print DATA from array to Position table + $txt1->translate(80, $x); + $txt1->text_right($y); + $txt1->translate(95, $x); + $txt1->text($a1); + $txt1->translate(380, $x); + $txt1->text_right("$a2 MB"); + $txt1->translate(425, $x); + $txt1->text_right("$cent ".decode('utf8',$cur)); + $txt1->translate(540, $x); + $txt1->text_right("$sum ".decode('utf8',$cur)); + + #Build SUMMARY + $summen[$y-1]="$y,$a2,$sum"; + $zwsum=$zwsum+$sum; + $x=$x-15; + $y++; + } + #Print extra billpositions + foreach my $line (@billpos){ + my ($grp,$amount,$art,$price)=@$line; + #Print DATA from array to Position table + $txt1->translate(80, $x); + $txt1->text_right($y); + $txt1->translate(95, $x); + $txt1->text(decode('utf8',$art)); + $txt1->translate(380, $x); + $txt1->text_right($amount." pcs"); + $txt1->translate(540, $x); + $txt1->text_right("$price ".decode('utf8',$cur)); + #Build SUMMARY + my $zu=$amount * $price; + $summen[$y-1]="$y,'0',$zu"; + $zwsum=$zwsum+$zu; + $x=$x-15; + $y++; + } + foreach (@summen){ + my ($a1,$a2,$a3) = split( /\,/, $_ ); + $sum=$sum+$a2; + $sum1=$sum1+$a3; + } + + # Last Line in positiontable prints the sum of all traffic (therefor txt2 which is BOLD) + $txt2->translate(95, 205); + $txt2->text($Lang::tr{'acct pdf sum1'}); #SUM + $txt2->translate(427, 205); + $txt2->text_right($cent); #cent + $txt2->translate(380, 205); + $txt2->text_right("$sum MB"); #MB + $sum1=sprintf("%.2f",($sum1)); + $txt2->translate(540, 205); + $txt2->text_right("$sum1 ".decode('utf8',$cur)); #SUM Eur + $txt->translate(390, 150); + $txt->text($Lang::tr{'acct pdf sum1'}); + $txt->translate(540, 150); + $txt->text_right("$sum1 ".decode('utf8',$cur)); + $txt->translate(390, 135); + my $endsum=$sum1; + $txt->text("$Lang::tr{'acct mwst_name'} $mwst%"); + my $sum1=sprintf("%.2f",($sum1/100*$mwst)); + $txt->translate(540, 135); + $txt->text_right("$sum1 ".decode('utf8',$cur)); + $txt2->translate(390, 120); + $txt2->text($Lang::tr{'acct sum total'}); + my $endsum=sprintf("%.2f",($sum1+$endsum)); + $txt2->translate(540, 120); + $txt2->text_right("$endsum ".decode('utf8',$cur)); + + #Print the optional Billtext if any + $txt4->translate(60, 170); + $txt4->paragraph(decode('utf8',$text), 300, 40, -align => "justify"); #Bankname + + #Watermark if preview + if ($preview eq 'on'){ + my $eg_trans = $pdf->egstate(); + $eg_trans->transparency(0.9); + $txt5->egstate($eg_trans); + $txt5->textlabel(80, 400, $fnt, 60, "PDF preview", -rotate => 40); + $txt5->textlabel(150, 330, $fnt, 60, "IPFire accounting", -rotate => 40); + } + + $txt->textend; #END Text + $pdf->save; #Save pdf + $pdf->end( ); #END + if ($preview ne 'on'){ + &fillBill($path.$grp,$name,$no,$grp); + } + if($preview eq 'on'){ + return $filename; + } + return '0'; +} + +sub getBillNr { + $dbh=&connectdb; + my $year1=$year+1900; + my $no1; + my $res=$dbh->selectall_arrayref("SELECT MAX(NO) FROM BILLS;"); + foreach my $row (@$res){ + ($no1) = @$row; + } + if(!$no1){$no1=$year1."1000";} + $no1++; + return $no1; +} + +sub fillBill { + my $path=$_[0]; + my $name=$_[1]; + my $no=$_[2]; + my $grp=$_[3]; + my $sth = $dbh->prepare("INSERT INTO BILLS (NO,GRP,PATH,NAME,DATE) VALUES (?,?,?,?,?);"); + my $year1=$year+1900; + ++$mon; + $sth->execute($no,$grp,$path,$name,"$mday.$mon.$year1"); + $sth->finish(); + $dbh->disconnect(); +} + +sub getbills { + my $grp=shift; + $dbh=&connectdb; + my $res=$dbh->selectall_arrayref("SELECT * FROM BILLS WHERE GRP=?;",undef, $grp); + $dbh->disconnect(); + return $res; +} + +sub pngsize { + my $Buffer = shift; + my ($width,$height) = ( undef, undef ); + + if ($Buffer =~ /IHDR(.{8})/) { + my $PNG = $1; + ($width,$height) = unpack( "NN", $PNG ); + } else { + $width=$Lang::tr{'acct invalid png'}; + }; + return ($width,$height); +} + +sub gifsize { + my ($GIF)=@_; + my ($type,$a,$b,$c,$d,$s,$width,$height) ; + $type=substr($GIF,0,6); + if(!($type =~ m/GIF8[7,9]a/) || (length($s=substr($GIF, 6, 4))!=4) ){ + return; + } + ($a,$b,$c,$d)=unpack("C"x4,$s); + + $width= $b<<8|$a; + $height= $d<<8|$c; + return ($width,$height); +} + +sub jpegsize { + my ($JPEG)=@ _ ; + my ($count)=2 ; + my ($length)=length($JPEG) ; + my ($ch)="" ; + my ($c1,$c2,$a,$b,$c,$d,$width,$height) ; + + while (($ch ne "\xda") && ($count<$length)) { + while (($ch ne "\xff") && ($count < $length)) { + $ch=substr($JPEG,$count,1); + $count++; + } + + while (($ch eq "\xff") && ($count<$length)) { + $ch=substr($JPEG,$count,1); + $count++; + } + + if ((ord($ch) >= 0xC0) && (ord($ch) <= 0xC3)) { + $count+=3; + ($a,$b,$c,$d)=unpack("C"x4,substr($JPEG,$count,4)); + $width=$c<<8|$d; + $height=$a<<8|$b; + return($width,$height); + }else { + ($c1,$c2)= unpack("C"x2,substr($JPEG,$count,2)); + $count += $c1<<8|$c2; + } + } +} + +sub time{ + ($sec,$min,$hour,$mday,$mon,$year,$wday,$ydat,$isdst)=localtime(); + $hour=sprintf("%02d",$hour); + $min=sprintf("%02d",$min); + $sec=sprintf("%02d",$sec); + $year +=1900; + $mday=sprintf("%02d",$mday); + $mon=sprintf("%02d",$mon+1); + my $res="$mday.$mon.$year $hour:$min:$sec - "; + return $res; +} + +sub logger{ + my $settings=shift; + my $msg=shift; + #open LOGFILE + if ($settings eq 'on'){ + open ACCTLOG,">>/var/log/accounting.log" || print "could not open /var/log/accounting.log "; + print ACCTLOG &time."$msg"; + close (ACCTLOG); + } +} + +sub updateccaddr { + my $addr=shift; + my $cust=shift; + $dbh=&connectdb; + $dbh->do("UPDATE ACCT_ADDR SET CCMAIL=? WHERE COMPANY=? ;",undef, $addr, $cust); + $dbh->disconnect(); +} +return 1; diff --git a/src/squid-accounting/acct.de.pl b/src/squid-accounting/acct.de.pl new file mode 100644 index 0000000..2110cf7 --- /dev/null +++ b/src/squid-accounting/acct.de.pl @@ -0,0 +1,134 @@ +# Added for Squid accounting +%tr = ( +%tr, +'acct action' => 'Aktion', +'acct activate' => 'Aktivieren', +'acct addresses' => 'Adressverwaltung', +'acct bank' => 'Bank', +'acct bic' => 'BIC', +'acct billarchive' => 'Rechnungsarchiv', +'acct billgroup' => 'Rechnungsgruppen', +'acct billgroupexists' => 'Eine Abrechnungsgruppe mit diesem Namen existiert bereits', +'acct billtext1' => 'Rechnungstext', +'acct billnr' => '(Rechnungsnummer immer angeben)', +'acct billoverview' => 'Rechnungsübersicht', +'acct blz' => 'BLZ', +'acct ccmail' => 'E-Mail Kopie an', +'acct currency' => 'Währung (EUR,USD)', +'acct traffic' => 'Traffic', +'acct amount' => 'Anzahl', +'acct cent' => 'Preis je MB (z.B 0.003)', +'acct cent1' => 'Preis MB', +'acct city' => 'Ort', +'acct config' => 'Konfiguration', +'acct commit' => 'Ausführen', +'acct company' => 'Firma', +'acct companyexists' => 'Eine Firma mit diesem Namen existiert bereits', +'acct companytype' => 'Typ', +'acct customer' => 'Kunde', +'acct cust empty' => 'Noch keine Kunden-Adressen angelegt', +'acct dbsize' => 'Datenbankgröße', +'acct dbmaintenance' => 'Datenbank-Wartung', +'acct delbefore' => 'Alle Einträge löschen vor', +'acct deladr' => 'Löschen', +'acct edit' => 'Bearbeiten', +'acct edit_addr' => 'Anlegen/Bearbeiten', +'acct email' => 'E-Mail', +'acct emptydb' => 'Datenbank leeren (alles)', +'acct emptydbtraf' => 'Datenbank leeren (nur Trafficdaten)', +'acct empty field' => 'Feld darf nicht leer sein: ', +'acct entries' => 'Einträge', +'acct err custdel' => 'Die Adresse kann nicht gelöscht werden, weil sie als Kunde in einer Rechnungsgruppe verwendet wird - Rechnungsgruppe', +'acct err hostdel' => 'Die Adresse kann nicht gelöscht werden, weil sie als Hoster in einer Rechnungsgruppe verwendet wird - Rechnungsgruppe', +'acct exst_cust_addr' => 'Kunden-Adressen', +'acct exst_host_addr' => 'Hoster-Adressen', +'acct expert' => 'Wartungsbereich aktivieren', +'acct expdelbefore' => 'Löschen', +'acct fax' => 'Fax', +'acct fix billpos' => 'Feste Rechnungspositionen der Rechnungsgruppe', +'acct gb' => 'GB', +'acct generated' => 'Erzeugt', +'acct hint billgrp' => 'Bitte zuerst mindestens eine Hoster-Adresse und eine Kunden-Adresse anlegen', +'acct hint_hoster' => 'Muss nur ausgefüllt werden, wenn Typ "Hoster"', +'acct hrb' => 'HRB-Nr', +'acct hoster' => 'Hoster', +'acct hosts' => 'Hostübersicht', +'acct host empty' => 'Noch keine Hoster-Adressen angelegt', +'acct host detail' => 'Host-Details', +'acct iban' => 'IBAN', +'acct inet' => 'Internet', +'acct interval' => 'Checkintervall', +'acct invalid' => 'Ungültiger Wert für', +'acct invalid billpos' => 'Es müssen alle Felder für Extra-Rechnungspositionen ausgefüllt sein', +'acct invalid mailip' => 'Ungültige IP-Adresse für Mailserver', +'acct invalid mailfqdn' => 'Ungültiger FQDN für Mailserver', +'acct invalid mailport' => 'Ungültiger Port für Mailserver', +'acct invalid png' => 'Ungültige PNG Datei', +'acct invalid pngsize' => 'Ungültige PNG Größe', +'acct kb' => 'KB', +'acct kto' => 'KTO', +'acct latestdb' => 'Letzter DB-Eintrag', +'acct logging' => 'Logging (/var/log/accounting.log) aktivieren', +'acct logo' => 'Aktuelles Logo', +'acct logo upload' => 'Logo Hochladen (PNG, max. 400x150)', +'acct maintenance' => 'Wartung', +'acct mailaddr' => 'Mailserver-Adresse', +'acct mailport' => 'Mailserver-Port', +'acct mailuser' => 'Benutzername', +'acct mailpass' => 'Passwort', +'acct mailrcpt' => 'E-Mail-Empfänger', +'acct mailsender' => 'E-Mail Absender', +'acct mailtxt' => 'Text der Rechnungsmails', +'acct mb' => 'MB', +'acct members' => 'Mitglieder', +'acct menu' => 'Proxy-Abrechnung', +'acct month' => 'Monat', +'acct multiuser' => 'User dürfen in mehreren Gruppen sein', +'acct mwst_name' => 'USt.', +'acct mwst' => 'Mehrwertsteuer in %', +'acct name1' => 'Name 1', +'acct name2' => 'Name 2', +'acct nr' => 'RG-Nr.', +'acct oldestdb' => 'Erster DB-Eintrag', +'acct optional' => 'Diese Felder sind optional', +'acct parameter' => 'Parameter', +'acct path' => 'Pfad', +'acct pdf billtxt' => 'Rechnung', +'acct pdf date' => 'Datum', +'acct pdf zwsum' => 'Zwischensumme', +'acct pdf page' => 'Seite', +'acct pdf prov' => 'Absender', +'acct pdf sum1' => 'Summe', +'acct pdf price' => 'Preis', +'acct pdf time' => 'Abrechnung', +'acct plz' => 'PLZ', +'acct preview' => 'Rechnungsvorschau', +'acct price pp' => 'Einzelpreis', +'acct proxy_enable' => 'Bitte zuerst Proxy aktivieren', +'acct pos' => 'Pos.', +'acct sum total' => 'Gesamtsumme', +'acct name' => 'Bezeichnung', +'acct no data' => 'Keine Daten vorhanden', +'acct rrdsize' => 'Größe des Rechnungs-Verzeichnisses', +'acct settings' => 'Accounting-Einstellungen', +'acct skipurl' => 'Diese URLs nicht bewerten', +'acct status' => 'Status', +'acct str' => 'Straße', +'acct str_nr' => 'Nr.', +'acct subject' => 'Betreff der Rechnungsmails', +'acct sum' => 'Summe', +'acct task' => 'Aufgabe', +'acct tb' => 'TB', +'acct tel' => 'Telefon', +'acct tls' => 'Benutze TLS', +'acct traffic monthly' => 'Monatliches Datenvolumen', +'acct title' => 'Webproxy-Abrechnung', +'acct usemail' => 'Mailversand aktivieren', +'acct usermulti' => 'befindet sich bereits in Gruppe', +'acct ustid' => 'USt-ID', +'acct edit settings' => 'Einstellungen bearbeiten', +'acct value' => 'Wert', +'acct view' => 'Anzeigen', +'acct year' => 'Jahr' +); +# End Squid accounting diff --git a/src/squid-accounting/acct.en.pl b/src/squid-accounting/acct.en.pl new file mode 100644 index 0000000..bdbf5b2 --- /dev/null +++ b/src/squid-accounting/acct.en.pl @@ -0,0 +1,134 @@ +# Added for Squid accounting +%tr = ( +%tr, +'acct action' => 'Action', +'acct activate' => 'Activate', +'acct addresses' => 'Address Management', +'acct bank' => 'Bank', +'acct bic' => 'BIC', +'acct billarchive' => 'Bill Archive', +'acct billgroup' => 'Billing Groups', +'acct billgroupexists' => 'A billing group with this name already exists', +'acct billtext1' => 'Bill text', +'acct billnr' => '(always state bill number)', +'acct billoverview' => 'Bill overview', +'acct blz' => 'Bank code', +'acct ccmail' => 'E-Mail CC-Addresses', +'acct currency' => 'Currency (EUR,USD)', +'acct traffic' => 'Traffic', +'acct amount' => 'Amount', +'acct cent' => 'Price/MB (e.g. 0.003)', +'acct cent1' => 'Price MB', +'acct city' => 'City', +'acct config' => 'Configuration', +'acct commit' => 'Execute', +'acct company' => 'Company', +'acct companyexists' => 'A Company with this name already exists', +'acct companytype' => 'Type', +'acct customer' => 'Customer', +'acct cust empty' => 'No Customer addresses defined', +'acct dbsize' => 'Database size', +'acct dbmaintenance' => 'Database maintenance', +'acct delbefore' => 'Delete all entries before', +'acct deladr' => 'Delete', +'acct edit' => 'Edit', +'acct edit_addr' => 'Add / Edit', +'acct email' => 'E-Mail', +'acct emptydb' => 'Erase Database (all data)', +'acct emptydbtraf' => 'Erase Database (only traffic data)', +'acct empty field' => 'Field must not be empty: ', +'acct entries' => 'Entries', +'acct err custdel' => 'Address can not be deleted. It is defined as customer in a Bill group - Bill group', +'acct err hostdel' => 'Address can not be deleted. It is defined as provider in a Bill group - Bill group', +'acct exst_cust_addr' => 'Customer addresses', +'acct exst_host_addr' => 'Provider addresses', +'acct expert' => 'Activate maintenance area', +'acct expdelbefore' => 'Delete', +'acct fax' => 'Faximile', +'acct fix billpos' => 'Fixed bill positions of bill group', +'acct gb' => 'GB', +'acct generated' => 'Generated', +'acct hint billgrp' => 'You have to define a provider and a customer address first', +'acct hint_hoster' => 'Has only to be filled when type "provider"', +'acct hrb' => 'HRB-No', +'acct hoster' => 'Provider', +'acct hosts' => 'Host Overview', +'acct host empty' => 'No provider addresses defined', +'acct host detail' => 'Host Details', +'acct iban' => 'IBAN', +'acct inet' => 'Internet', +'acct interval' => 'Checkintervall', +'acct invalid' => 'Invalid value for', +'acct invalid billpos' => 'You have to fill in all fields for fixed bill positions', +'acct invalid mailip' => 'Invalid IP address for mailserver', +'acct invalid mailfqdn' => 'Invalid FQDN for mailserver', +'acct invalid mailport' => 'Invalid port for mailserver', +'acct invalid png' => 'Invalid PNG file', +'acct invalid pngsize' => 'Invalid PNG size', +'acct kb' => 'KB', +'acct kto' => 'Account Number', +'acct latestdb' => 'Last DB entry', +'acct logging' => 'Activate Logging (/var/log/accounting.log)', +'acct logo' => 'Actual Logo', +'acct logo upload' => 'Upload Logo (PNG, max. 400x150)', +'acct maintenance' => 'Maintenance', +'acct mailaddr' => 'Mailserver address', +'acct mailport' => 'Mailserver port', +'acct mailuser' => 'Username', +'acct mailpass' => 'Password', +'acct mailrcpt' => 'E-Mail Recipient', +'acct mailsender' => 'E-Mail Sender', +'acct mailtxt' => 'Text for bill mail', +'acct mb' => 'MB', +'acct members' => 'Members', +'acct menu' => 'Proxy Accounting', +'acct month' => 'Month', +'acct multiuser' => 'User can be in multiple groups', +'acct mwst_name' => 'VAT', +'acct mwst' => 'Tax rate', +'acct name1' => 'Name 1', +'acct name2' => 'Name 2', +'acct nr' => 'RG-No.', +'acct oldestdb' => 'Fist DB Entry', +'acct optional' => 'These fields are optional', +'acct parameter' => 'Parameter', +'acct path' => 'Path', +'acct pdf billtxt' => 'Bill', +'acct pdf date' => 'Date', +'acct pdf zwsum' => 'subtotal', +'acct pdf page' => 'Page', +'acct pdf prov' => 'Sender', +'acct pdf sum1' => 'Sum', +'acct pdf price' => 'Price', +'acct pdf time' => 'Accounting', +'acct plz' => 'Postcode', +'acct preview' => 'Bill preview', +'acct price pp' => 'Unit price', +'acct proxy_enable' => 'Please actiavte proxy first', +'acct pos' => 'Pos.', +'acct sum total' => 'Total', +'acct name' => 'Description', +'acct no data' => 'No Data available', +'acct rrdsize' => 'Size of Bill directory', +'acct settings' => 'Accounting settings', +'acct skipurl' => 'Skip these URLs (Intranet)', +'acct status' => 'Status', +'acct str' => 'Steet', +'acct str_nr' => 'No.', +'acct subject' => 'Subject', +'acct sum' => 'Sum', +'acct task' => 'Task', +'acct tb' => 'TB', +'acct tel' => 'Telephone', +'acct tls' => 'Use TLS', +'acct traffic monthly' => 'Monthly data volume', +'acct title' => 'Webproxy Accounting', +'acct usemail' => 'Send bills via Mail', +'acct usermulti' => 'is already in group', +'acct ustid' => 'USt-ID', +'acct edit settings' => 'Edit settings', +'acct value' => 'Value', +'acct view' => 'Show', +'acct year' => 'Year' +); +# End Squid accounting diff --git a/src/squid-accounting/acct.pl b/src/squid-accounting/acct.pl new file mode 100755 index 0000000..59898b7 --- /dev/null +++ b/src/squid-accounting/acct.pl @@ -0,0 +1,265 @@ +#!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2014 IPFire Team <alexander.marx(a)ipfire.org> # +# # +# 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/>. # +# # +############################################################################### + + +########### +# Modules # +########### + +use Time::Local; +use File::ReadBackwards; +use strict; +#use warnings; + +require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/accounting/acct-lib.pl"; +require "${General::swroot}/lang.pl"; + +############# +# Variables # +############# + +my $count = 0; +my $dbh; +my $logfile = "/var/log/squid/access.log"; +my $line = ''; +my $checktime = 3600; #1 hour = 3600 sec +my $starttime = time; +my ($time,$elapsed,$ip,$state,$bytes,$method,$url,$user,$peerstate,$type); #split logfileline into variables +my $name; +my $name1; +my $settingsfile = "${General::swroot}/accounting/settings.conf"; +my $proxyenabled = "${General::swroot}/proxy/enable"; +my %counter = (); +my %counterip = (); +my %settings = (); +my %toplist = (); +my ($sec,$min,$hour,$mday,$mon,$year,$wday,$ydat,$isdst)=localtime(); +my $skipurlcount=0; +my $skipurlsum=0; +&General::readhash("$settingsfile", \%settings); +my $skipurl=$settings{'SKIPURLS'}; +$skipurl="'".$skipurl."'"; +my ($mini,$max)=&ACCT::getminmax; +my $now = localtime; +my $proxylog; +my $proxysrv; + +######## +# Main # +######## + +&checkproxy; + +#If we have a disabled file and the proxy is off, we don't need to check anything, exit! +if((! -f $proxyenabled || $proxylog eq $Lang::tr{'stopped'}) && -f "${General::swroot}/accounting/disabled"){ + &ACCT::logger($settings{'LOG'}," Proxy or proxylogging disabled - exiting with no data collection\n"); + exit 0; +} +#If proxy was turned off within last hour, we need to check missing minutes and write a disabled file +if ((! -f $proxyenabled || $proxylog eq $Lang::tr{'stopped'}) && ! -f "${General::swroot}/accounting/disabled"){ + $checktime = (time-$max); + open (FH,">${General::swroot}/accounting/disabled"); + close (FH); + &ACCT::logger($settings{'LOG'}," Proxy or proxylogging was disabled during last hour - just checking meantime and disabling data collection\n"); +} + +#If proxy is on, we are doing a normal run. maybe we had a disabled file, so delete it here +if (-f $proxyenabled && $proxylog eq $Lang::tr{'running'}){ + #check if we are running again after the was shutdown and reenabled + if (-f "${General::swroot}/accounting/disabled"){ + unlink("${General::swroot}/accounting/disabled"); + } + #Find out if the month changed + $dbh=&ACCT::connectdb; + my $m=sprintf("%d",(localtime((time-3600)))[4]+1); + &ACCT::logger($settings{'LOG'},"month before one hour $m, now is ".($mon+1)."\n"); + if ($m < ($mon+1) || $m == '12' && ($mon+1) == '1'){ + #Logrotate + my $year1=$year+1900; + system ("tar", "cfz", "/var/log/accounting-$m-$year1.tar.gz", "/var/log/accounting.log"); + unlink ("/var/log/accounting.log"); + open (FH,">/var/log/accounting.log"); + close (FH); + chmod 0755, "/var/log/accounting.log"; + #move all db entries older than 2 months to second table and cumulate them hourly + &ACCT::movedbdata; + &ACCT::logger($settings{'LOG'},"New Month. Old trafficvalues moved to ACCT_HIST Table\n"); + if ($settings{'USEMAIL'} eq 'on'){ + &ACCT::logger($settings{'LOG'},"Mailserver is activated - Now sending bills via mail...\n"); + my $res=&ACCT::getbillgroups; + foreach my $line (@$res){ + my ($grp) = @$line; + &sendbill($grp,$settings{'MWST'},$settings{'CURRENCY'}); + } + }else{ + &ACCT::logger($settings{'LOG'},"Mailserver is deactivated - We are NOT sending bills via mail...\n"); + } + } + + &ACCT::logger($settings{'LOG'},"Start reading last hour of access.log\n"); + &readlog; + &fill_db; + &ACCT::closedb; + $skipurlsum=sprintf("%.2f",$skipurlsum/(1024*1024)); + &ACCT::logger($settings{'LOG'},"skipped: $skipurlcount Adressen\n"); + &ACCT::logger($settings{'LOG'},"skipped: $skipurlsum MB\n") if ($skipurl); +} +############# +# functions # +############# + +sub checkproxy{ + if(-f "${General::swroot}/proxy/enable"){ + $proxysrv=$Lang::tr{'running'}; + }else{ + $proxysrv=$Lang::tr{'stopped'}; + } + my $srce = "${General::swroot}/proxy/squid.conf"; + my $string1 = 'access\.log'; + open(FH, $srce); + while(my $line = <FH>) { + if($line =~ m/$string1/) { + $proxylog=$Lang::tr{'running'}; + } + } + close FH; + return; +} + +sub readlog{ + my $url1; + my $user1; + $count = 0; + my $urlcnt=0; + &ACCT::logger($settings{'LOG'},"Start: $now. Reading data back till: ".localtime(($starttime-$checktime)).".\n"); + #Open Logfile and begin to read the file backwards + my $bw = File::ReadBackwards->new( $logfile ) or die "can't read $logfile $!" ; + while( defined( $line = $bw->readline ) ) { + undef $url1; + chomp $line; + #Divide $line into single variables to get timestamp and check if we are within hte desired timerange + ($time,$elapsed,$ip,$state,$bytes,$method,$url,$user,$peerstate,$type)=split(m/\s+/, $line); + $count += $bytes; + $time = substr($time, 0, -4); + if (($time > ($starttime-$checktime))){ + #Skip DENIED stated lines (can be reactivated later) + next if ($state =~ m/DENIED/); + + #extract site name + if ($url =~ m/([a-z]+:\/\/)??([a-z0-9\-]+\.){1}(([a-z0-9\-]+\.){0,})([a-z0-9\-]+){1}(:[0-9]+)?\/(.*)/o) { + $url=$2.$3.$5; + } else { + my ($a,$b)=split(":",$url); + $url=$a; + } + + #Skip special URLs like intranet and webservers from local network + if ($url =~ m/$skipurl/o) { + $skipurlcount++; + $skipurlsum+=$bytes; + next; + }; + + #Increase urlcounter + $urlcnt++; + + #Get Data for accounting + $counter{$user}{'bytes'} += $bytes if ($user ne '-'); + $counter{$ip}{'bytes'} += $bytes; + }else{ + #If we are out of timewindow, break + last; + } + } + $count=sprintf("%.2f",$count/(1024*1024)); + &ACCT::logger($settings{'LOG'},"got $count MB from $urlcnt URLs this run.\n"); + $bw->close; +} +sub fill_db{ + my $tim=time(); + #Fill ACCT table with accounting information + foreach my $name (sort keys %counter){ + foreach my $bytes (keys %{ $counter{$name} }) { + $dbh->do("insert into ACCT (TIME_RUN,NAME,BYTES) values ('$tim','$name','$counter{$name}{$bytes}');"); + } + } +} +sub sendbill { + my $rggrp=$_[0]; + my $mwst=$_[1]; + my $cur = $_[2]; + my @now = localtime(time); + $now[5] = $now[5] + 1900; + my $actmonth = $now[4]+1; + my $month = '0'.$actmonth if $actmonth < 10; + my $actyear = $now[5]; + my ($from,$till)=&ACCT::getmonth($actmonth,$actyear); #FIXME month and year as variables! + my @billar = &ACCT::GetTaValues($from,$till,$rggrp); + my $address_cust = &ACCT::getTaAddress($rggrp,'CUST'); + my $address_host = &ACCT::getTaAddress($rggrp,'HOST'); + my $billpos = &ACCT::getextrabillpos($rggrp); + my $no = &ACCT::getBillNr; + my $back = &ACCT::pdf2(\@billar,$actmonth,$actyear,$mwst,$address_cust,$address_host,$billpos,$rggrp,$cur); + my ($company_cust,$type_cust,$name1_cust,$str_cust,$str_nr_cust,$plz_cust,$city_cust,$bank,$iban,$bic,$blz,$kto,$email,$internet,$hrb,$stnr,$tel_host,$fax_host,$ccmail,$billgrp,$text,$host,$cust,$cent); + + foreach my $addrline_cust (@$address_cust){ + ($company_cust,$type_cust,$name1_cust,$str_cust,$str_nr_cust,$plz_cust,$city_cust,$bank,$iban,$bic,$blz,$kto,$email,$internet,$hrb,$stnr,$tel_host,$fax_host,$ccmail,$billgrp,$text,$host,$cust,$cent)=@$addrline_cust; + } + + if ($back eq '0'){ + &ACCT::logger($settings{'LOG'},"Bill for $company_cust successfully created.\n"); + my $file="'/var/ipfire/accounting/bill/$rggrp/$month-$actyear-$no.pdf'"; + $settings{'MAILTXT'} =~ tr/\|/\r\n/ ; + my $cmd = "/usr/local/bin/sendEmail "; + $cmd .= " -f $settings{'MAILSENDER'}"; #Sender + $cmd .= " -t $email"; #Recipient + if ($ccmail){ + $cmd .= " -cc $ccmail"; + } + #Send Mail via TLS? + if ($settings{'TLS'} eq 'on'){ + $cmd .= " -o tls=yes"; #TLS + } + $cmd .= " -u '$settings{'MAILSUB'}'"; #Subject + $cmd .= " -m '$settings{'MAILTXT'}'"; #Mailtext + $cmd .= " -s $settings{'MAILSRV'}:$settings{'MAILPORT'}"; #Mailserver:port + $cmd .= " -a $file"; + my $res=system ($cmd); + if ($res == 0){ + &ACCT::logger($settings{'LOG'},"Bill for $company_cust successfully sent.\n"); + }elsif ($res > 0){ + &ACCT::logger($settings{'LOG'},"ERROR: Bill for $company_cust NOT sent.\n"); + } + return 0; + + }else{ + &ACCT::logger($settings{'LOG'},"ERROR Bill for $company_cust could not be created.\n"); + my $cmd = "/usr/local/bin/sendEmail "; + $cmd .= " -f $settings{'MAILSENDER'}"; + $cmd .= " -t $settings{'MAILSENDER'}"; + $cmd .= " -u Fehler Squid Accounting"; + $cmd .= " -m 'Die Rechnung konnte nicht erzeugt und per Mail versendet werden' $company_cust"; + $cmd .= " -s $settings{'MAILSRV'}:$settings{'MAILPORT'}"; + my $res=system ($cmd); + return 0; + } +} diff --git a/src/squid-accounting/config/backup/includes/squid-accounting b/src/squid-accounting/config/backup/includes/squid-accounting new file mode 100644 index 0000000..53116a5 --- /dev/null +++ b/src/squid-accounting/config/backup/includes/squid-accounting @@ -0,0 +1,5 @@ +/var/ipfire/accounting/settings.conf +/var/ipfire/accounting/bill +/srv/web/ipfire/html/accounting +/var/ipfire/accounting/acct.db +/var/log/accounting.log diff --git a/src/squid-accounting/dbinstall.pl b/src/squid-accounting/dbinstall.pl new file mode 100755 index 0000000..0443732 --- /dev/null +++ b/src/squid-accounting/dbinstall.pl @@ -0,0 +1,49 @@ +#!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2014 IPFire Team <alexander.marx(a)ipfire.org> # +# # +# 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/>. # +# # +############################################################################### + + +use DBI; + +############################################################################### +my $dbh; +my $dsn="dbi:SQLite:dbname=/var/ipfire/accounting/acct.db"; +############################################################################### + + +$dbh = DBI->connect($dsn, "", "",{RaiseError => 1, AutoCommit => 1})or die "ERROR $!"; + +$dbh->do('CREATE TABLE ACCT (TIME_RUN "NUM",NAME "TXT",BYTES "NUM");'); + +$dbh->do('CREATE TABLE ACCT_HIST (TIME_RUN "NUM",NAME "TXT",BYTES "NUM");'); + +$dbh->do('CREATE TABLE ACCT_ADDR (COMPANY "TXT",TYPE "TXT",NAME1 "TXT", STR "TXT", NR "TXT", POSTCODE "NUM", CITY "TXT",BANK "TXT",IBAN "TXT",BIC "TXT",BLZ "NUM",ACCOUNT "NUM", EMAIL "TXT",INTERNET "TXT", HRB "TXT", USTID "TXT", TEL "TXT", FAX "TXT", CCMAIL "TXT");'); + +$dbh->do('CREATE TABLE BILLINGGRP (NAME "TXT",BILLTEXT "TXT",HOST "TXT",CUST "TXT",CENT "NUM");'); + +$dbh->do('CREATE TABLE BILLINGHOST (GRP "TXT",HOST "TXT");'); + +$dbh->do('CREATE TABLE BILLPOS (GRP "TXT",AMOUNT "INT", POS "TXT", PRICE "NUM");'); + +$dbh->do('CREATE TABLE BILLS (NO "NUM", PATH "TXT", NAME "TXT", DATE "NUM", GRP "TXT");'); + +$dbh->disconnect(); + +exit 0; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core81, updated. 4d3e174578dade4cb110ec7f370beb449fcaa48d
by git＠ipfire.org 07 Aug '14

07 Aug '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, core81 has been updated via 4d3e174578dade4cb110ec7f370beb449fcaa48d (commit) from a0e747dafc027d57976c799e23c17f5825a9739a (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 4d3e174578dade4cb110ec7f370beb449fcaa48d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Aug 7 04:31:58 2014 +0200 core81: change updatescript for core81. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/81/update.sh | 49 ++------------------------------------ 1 file changed, 2 insertions(+), 47 deletions(-) Difference in files: diff --git a/config/rootfiles/core/81/update.sh b/config/rootfiles/core/81/update.sh index 67244c6..743a1d3 100644 --- a/config/rootfiles/core/81/update.sh +++ b/config/rootfiles/core/81/update.sh @@ -25,68 +25,23 @@ /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # Remove old core updates from pakfire cache to save space... -core=80 +core=81 for (( i=1; i<=$core; i++ )) do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done # Stop services -/etc/init.d/ipsec stop # Remove old strongswan files -rm -f \ - /etc/strongswan.d/charon/unity.conf \ - /usr/lib/ipsec/plugins/libstrongswan-unity.so \ - /usr/share/strongswan/templates/config/plugins/unity.conf - -rm -f /usr/local/bin/setddns.pl # Extract files extract_files # Start services -/etc/init.d/dnsmasq restart -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - # Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# Uninstall the libgpg-error package. -rm -f \ - /opt/pakfire/db/installed/meta-libgpg-error \ - /opt/pakfire/db/rootfiles/libgpg-error - -# Fix broken proxy configuration permissions -chown -R nobody.nobody \ - /var/ipfire/proxy/advanced \ - /var/ipfire/proxy/acl-1.4 \ - /var/ipfire/proxy/enable \ - /var/ipfire/proxy/settings \ - /var/ipfire/proxy/squid.conf \ - /var/ipfire/proxy/transparent - -# Regenerate squid configuration file -sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi - -# Generate ddns configuration file -sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi - -# Update crontab -sed -i /var/spool/cron/root.orig -e "/setddns.pl/d" - -grep -q /usr/bin/ddns /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig - -# Update dynamic DNS records every five minutes. -# Force an update once a month -*/5 * * * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all -3 2 1 * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all --force -EOF - -fcrontab -z &>/dev/null +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" sync hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM August 2014