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 bff444621e224663b5906671602fef17ac1756d8 (commit) via 796a6e526cb3eca6a047a48ad1bdcf273f74b38a (commit) via adb4174fa459d8102c674e8b6b7c9aeac17c8da2 (commit) via ab50bf41fec93cf480e66140d2161580f4d72926 (commit) from 772d3dbd6091b75fa10317c88c25c53ce466f825 (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 bff444621e224663b5906671602fef17ac1756d8 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Feb 18 15:32:39 2022 +0100

acct.en.pl: Update to use proxy accounting - Bug#12772

-Replace the variable names used for the accounting page with proxy accounting in a consistent manner - Tested on a vm system and confirmed to have a consistent naming approach now

Fixes: Bug#12772 Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org

commit 796a6e526cb3eca6a047a48ad1bdcf273f74b38a Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Feb 18 15:32:38 2022 +0100

acct.pl: Change name of package in Error message - Bug#12772

- Change package name from squid accounting to proxy accounting in mail Subject line

Fixes: Bug#12772 Signed-off-by: Adolf Belka adolf.belka@ipfire.org

commit adb4174fa459d8102c674e8b6b7c9aeac17c8da2 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Feb 18 15:32:37 2022 +0100

squid-accounting: Rename to proxy-accounting - bug#12772

- Rename lfs, rootfile and paks directory - Change name in make.sh - Tested out in a vm system and worked

Fixes: Bug#12772 Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org

commit ab50bf41fec93cf480e66140d2161580f4d72926 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Feb 18 15:33:52 2022 +0100

accounting.cgi: Change some variables to alphanumeric - Bug#12777

- The Postcode in the address only allowed numeric postcodes. The Netherlands and Great Britain are at lease two countries that use alphanumeric postcodes with spaces. Changed the postcode check from numeric to alphanumeric. - The Bank Code in the Providers details only allowed numeric Bank Codes. In Great Britain the Bank Code, also known as the Sort Code is made up of three groups of digits separated by a - . - Adjusted the regex for the alphanumeric check to include a space and a - . The original comment indicated that a - was allowed but it was not included in the regex. - Tested on a vm system and confirmed that a postcode from The Netherlands and Great Britain and a Sort Code from Breat Britain are now accepted.

Fixes: Bug#12777 Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Bernhard Bitsch bbitsch@ipfire.org

-----------------------------------------------------------------------

Summary of changes: .../rootfiles/packages/{squid-accounting => proxy-accounting} | 2 +- lfs/{squid-accounting => proxy-accounting} | 8 ++++---- make.sh | 2 +- src/paks/{squid-accounting => proxy-accounting}/install.sh | 0 src/paks/{squid-accounting => proxy-accounting}/uninstall.sh | 0 src/paks/{squid-accounting => proxy-accounting}/update.sh | 0 src/squid-accounting/accounting.cgi | 10 +++++----- src/squid-accounting/acct.en.pl | 4 ++-- src/squid-accounting/acct.pl | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) rename config/rootfiles/packages/{squid-accounting => proxy-accounting} (90%) rename lfs/{squid-accounting => proxy-accounting} (94%) rename src/paks/{squid-accounting => proxy-accounting}/install.sh (100%) rename src/paks/{squid-accounting => proxy-accounting}/uninstall.sh (100%) rename src/paks/{squid-accounting => proxy-accounting}/update.sh (100%)

Difference in files: diff --git a/config/rootfiles/packages/squid-accounting b/config/rootfiles/packages/proxy-accounting similarity index 90% rename from config/rootfiles/packages/squid-accounting rename to config/rootfiles/packages/proxy-accounting index 82b171e33..0c142ea5c 100644 --- a/config/rootfiles/packages/squid-accounting +++ b/config/rootfiles/packages/proxy-accounting @@ -11,6 +11,6 @@ var/ipfire/addon-lang/acct.de.pl var/ipfire/addon-lang/acct.en.pl var/ipfire/addon-lang/acct.fr.pl var/ipfire/addon-lang/acct.tr.pl -var/ipfire/backup/addons/includes/squid-accounting +var/ipfire/backup/addons/includes/proxy-accounting var/ipfire/menu.d/EX-squid-accounting.menu var/log/accounting.log diff --git a/lfs/squid-accounting b/lfs/proxy-accounting similarity index 94% rename from lfs/squid-accounting rename to lfs/proxy-accounting index 9476382b3..024f249be 100644 --- a/lfs/squid-accounting +++ b/lfs/proxy-accounting @@ -13,11 +13,11 @@ SUMMARY = SQUID Accounting IPFire extension

VER = 1.0.4

-THISAPP = squid-accounting-$(VER) +THISAPP = proxy-accounting-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = squid-accounting -PAK_VER = 13 +PROG = proxy-accounting +PAK_VER = 14

DEPS = perl-File-ReadBackwards

@@ -65,7 +65,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -v -m 644 $(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 + /var/ipfire/backup/addons/includes/proxy-accounting

#activate hourly logging of proxy logfile ln -sf /usr/local/bin/acct.pl /etc/fcron.hourly/squid-accounting diff --git a/make.sh b/make.sh index a6f44030c..ea3e0f9a1 100755 --- a/make.sh +++ b/make.sh @@ -1655,7 +1655,7 @@ buildipfire() { lfsmake2 perl-Font-TTF lfsmake2 perl-IO-String lfsmake2 perl-PDF-API2 - lfsmake2 squid-accounting + lfsmake2 proxy-accounting lfsmake2 pigz lfsmake2 tmux lfsmake2 perl-Text-CSV_XS diff --git a/src/paks/squid-accounting/install.sh b/src/paks/proxy-accounting/install.sh similarity index 100% rename from src/paks/squid-accounting/install.sh rename to src/paks/proxy-accounting/install.sh diff --git a/src/paks/squid-accounting/uninstall.sh b/src/paks/proxy-accounting/uninstall.sh similarity index 100% rename from src/paks/squid-accounting/uninstall.sh rename to src/paks/proxy-accounting/uninstall.sh diff --git a/src/paks/squid-accounting/update.sh b/src/paks/proxy-accounting/update.sh similarity index 100% rename from src/paks/squid-accounting/update.sh rename to src/paks/proxy-accounting/update.sh diff --git a/src/squid-accounting/accounting.cgi b/src/squid-accounting/accounting.cgi index 751b6e8a5..e1e2346da 100755 --- a/src/squid-accounting/accounting.cgi +++ b/src/squid-accounting/accounting.cgi @@ -1488,7 +1488,7 @@ sub checkaddress{ if (! $cgiparams{'txt_plz'}){ $errormessage.="$Lang::tr{'acct empty field'} $Lang::tr{'acct plz'}<br>"; }else{ - if(! &validnumfield($cgiparams{'txt_plz'})){ + if(! &validalphanumfield($cgiparams{'txt_plz'})){ $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct plz'}<br>"; } } @@ -1523,7 +1523,7 @@ sub checkaddress{ } if(($cgiparams{'txt_iban'} && $cgiparams{'txt_blz'})||(!$cgiparams{'txt_iban'} && $cgiparams{'txt_blz'})){ #Check BLZ - if(! &validnumfield($cgiparams{'txt_blz'})){ + if(! &validalphanumfield($cgiparams{'txt_blz'})){ $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct blz'}<br>"; } #Check BANKACCOUNT @@ -1653,7 +1653,7 @@ sub validphonefield{ }

sub validalphanumfield{ - #GET: Input from a numeric field + #GET: Input from an alphanumeric field #GIVES: True if valid, false if not valid my $remark = $_[0];

@@ -1661,8 +1661,8 @@ sub validalphanumfield{ # 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]*$/) { + # Only valid characters are a-z, A-Z, 0-9 - and space + 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]*$/) { diff --git a/src/squid-accounting/acct.en.pl b/src/squid-accounting/acct.en.pl index 913f2a79f..21aeab69c 100644 --- a/src/squid-accounting/acct.en.pl +++ b/src/squid-accounting/acct.en.pl @@ -110,7 +110,7 @@ 'acct name' => 'Description', 'acct no data' => 'No Data available', 'acct rrdsize' => 'Size of Bill directory', -'acct settings' => 'Accounting settings', +'acct settings' => 'Proxy Accounting settings', 'acct skipurl' => 'Skip these URLs (Intranet)', 'acct status' => 'Status', 'acct str' => 'Street', @@ -122,7 +122,7 @@ 'acct tel' => 'Telephone', 'acct tls' => 'Use TLS', 'acct traffic monthly' => 'Monthly data volume', -'acct title' => 'Webproxy Accounting', +'acct title' => 'Proxy Accounting', 'acct usemail' => 'Send bills via Mail', 'acct usermulti' => 'is already in group', 'acct ustid' => 'USt-ID', diff --git a/src/squid-accounting/acct.pl b/src/squid-accounting/acct.pl index e90d06ed3..681c81764 100755 --- a/src/squid-accounting/acct.pl +++ b/src/squid-accounting/acct.pl @@ -289,7 +289,7 @@ sub sendbill { my $msg = MIME::Lite->new( From => $mail{'SENDER'}, To => $mail{'RECIPIENT'}, - Subject => "ERROR Squid Accounting", + Subject => "ERROR Proxy Accounting", Type => 'multipart/mixed' );

hooks/post-receive -- IPFire 2.x development tree