[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3c6423cd40c793338836de904a37d42f89d50b5b
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 3c6423cd40c793338836de904a37d42f89d50b5b (commit) via 045ea1d0138e208c6aa5d6e78875f1b5b3f260b8 (commit) via c96146d01ea11cde01ca1e2c1368b57730fb7f1b (commit) from f809b8d5c75ebfba1fce53882596356456328826 (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 3c6423cd40c793338836de904a37d42f89d50b5b Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 18 09:25:54 2019 +0100
Update contributors
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 045ea1d0138e208c6aa5d6e78875f1b5b3f260b8 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 17 23:36:53 2019 +0100
Update translations
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c96146d01ea11cde01ca1e2c1368b57730fb7f1b Author: Alexander Marx alexander.marx@ipfire.org Date: Thu May 24 12:38:39 2018 +0200
BUG11505: Captive Portal: no way to remove an uploaded logo
added a delete button
Signed-off-by: Alexander Marx alexander.marx@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: doc/language_issues.en | 1 + doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.it | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 1 + doc/language_missings | 7 +++++++ html/cgi-bin/captive.cgi | 9 ++++++++- html/cgi-bin/credits.cgi | 3 ++- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 13 files changed, 27 insertions(+), 2 deletions(-)
Difference in files: diff --git a/doc/language_issues.en b/doc/language_issues.en index 8cc104347..4069705af 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -18,6 +18,7 @@ WARNING: untranslated string: Captive client session expiry time = Session Expir WARNING: untranslated string: Captive clients = unknown string WARNING: untranslated string: Captive config = Settings WARNING: untranslated string: Captive coupon = Coupon +WARNING: untranslated string: Captive delete logo = Delete Logo WARNING: untranslated string: Captive expiry time = Expiry Time WARNING: untranslated string: Captive export coupons = Export Coupons WARNING: untranslated string: Captive generate coupons = Generate Coupons diff --git a/doc/language_issues.es b/doc/language_issues.es index 5e3467eef..2256a97c2 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -677,6 +677,7 @@ WARNING: untranslated string: Captive client session expiry time = Session Expir WARNING: untranslated string: Captive clients = unknown string WARNING: untranslated string: Captive config = Settings WARNING: untranslated string: Captive coupon = Coupon +WARNING: untranslated string: Captive delete logo = Delete Logo WARNING: untranslated string: Captive expiry time = Expiry Time WARNING: untranslated string: Captive export coupons = Export Coupons WARNING: untranslated string: Captive generate coupons = Generate Coupons diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 4af8190bb..e86215a8d 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -778,6 +778,7 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Captive clients = unknown string +WARNING: untranslated string: Captive delete logo = Delete Logo WARNING: untranslated string: Daily = Daily WARNING: untranslated string: Disabled = Disabled WARNING: untranslated string: Scan for Songs = unknown string diff --git a/doc/language_issues.it b/doc/language_issues.it index dce48892c..6b1a5591f 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -766,6 +766,7 @@ WARNING: untranslated string: Captive client session expiry time = Session Expir WARNING: untranslated string: Captive clients = unknown string WARNING: untranslated string: Captive config = Settings WARNING: untranslated string: Captive coupon = Coupon +WARNING: untranslated string: Captive delete logo = Delete Logo WARNING: untranslated string: Captive expiry time = Expiry Time WARNING: untranslated string: Captive export coupons = Export Coupons WARNING: untranslated string: Captive generate coupons = Generate Coupons diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 9dfe2f9ff..bd0188b4c 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -761,6 +761,7 @@ WARNING: untranslated string: Captive client session expiry time = Session Expir WARNING: untranslated string: Captive clients = unknown string WARNING: untranslated string: Captive config = Settings WARNING: untranslated string: Captive coupon = Coupon +WARNING: untranslated string: Captive delete logo = Delete Logo WARNING: untranslated string: Captive expiry time = Expiry Time WARNING: untranslated string: Captive export coupons = Export Coupons WARNING: untranslated string: Captive generate coupons = Generate Coupons diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 5e3467eef..2256a97c2 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -677,6 +677,7 @@ WARNING: untranslated string: Captive client session expiry time = Session Expir WARNING: untranslated string: Captive clients = unknown string WARNING: untranslated string: Captive config = Settings WARNING: untranslated string: Captive coupon = Coupon +WARNING: untranslated string: Captive delete logo = Delete Logo WARNING: untranslated string: Captive expiry time = Expiry Time WARNING: untranslated string: Captive export coupons = Export Coupons WARNING: untranslated string: Captive generate coupons = Generate Coupons diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 274872394..f5aee0df9 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -679,6 +679,7 @@ WARNING: untranslated string: Captive client session expiry time = Session Expir WARNING: untranslated string: Captive clients = unknown string WARNING: untranslated string: Captive config = Settings WARNING: untranslated string: Captive coupon = Coupon +WARNING: untranslated string: Captive delete logo = Delete Logo WARNING: untranslated string: Captive expiry time = Expiry Time WARNING: untranslated string: Captive export coupons = Export Coupons WARNING: untranslated string: Captive generate coupons = Generate Coupons diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 7891e53e2..c498de30d 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -779,6 +779,7 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Captive clients = unknown string +WARNING: untranslated string: Captive delete logo = Delete Logo WARNING: untranslated string: Daily = Daily WARNING: untranslated string: Disabled = Disabled WARNING: untranslated string: Scan for Songs = unknown string diff --git a/doc/language_missings b/doc/language_missings index 54b2f5120..f46c3e4ce 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -112,6 +112,7 @@ < Captive client session expiry time < Captive config < Captive coupon +< Captive delete logo < Captive err doublevoucher < Captive expire < Captive expiry time @@ -871,6 +872,7 @@ < advproxy wpad notice < advproxy wpad title < advproxy wpad view pac +< Captive delete logo < cryptographic settings < Daily < default IP address @@ -978,6 +980,7 @@ < Captive client session expiry time < Captive config < Captive coupon +< Captive delete logo < Captive err doublevoucher < Captive expire < Captive expiry time @@ -1272,6 +1275,7 @@ < Captive client session expiry time < Captive config < Captive coupon +< Captive delete logo < Captive err doublevoucher < Captive expire < Captive expiry time @@ -1634,6 +1638,7 @@ < Captive client session expiry time < Captive config < Captive coupon +< Captive delete logo < Captive err doublevoucher < Captive expire < Captive expiry time @@ -2424,6 +2429,7 @@ < Captive client session expiry time < Captive config < Captive coupon +< Captive delete logo < Captive err doublevoucher < Captive expire < Captive expiry time @@ -3176,6 +3182,7 @@ < advproxy wpad notice < advproxy wpad title < advproxy wpad view pac +< Captive delete logo < crypto error < cryptographic settings < crypto warning diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index b7c42e797..b33287dd4 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -142,6 +142,10 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { } }
+if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive delete logo'}") { + unlink $logo; +} + if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive generate coupons'}") { #check valid remark if ($cgiparams{'REMARK'} ne '' && !&validremark($cgiparams{'REMARK'})){ @@ -381,7 +385,10 @@ if (-e $logo) { print <<END; <tr> <td>$Lang::tr{'Captive logo uploaded'}</td> - <td>$Lang::tr{'yes'}</td> + <td> + $Lang::tr{'yes'} + <input type='submit' name='ACTION' value="$Lang::tr{'Captive delete logo'}"/> + </td> </tr> END } diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index b2727733c..6c89352bb 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -83,19 +83,20 @@ Jan Lentfer, Marcus Scholz, Ersan Yildirim, Joern-Ingo Weigert, +Alexander Koch, Wolfgang Apolinarski, Alfred Haas, Lars Schuhmacher, Rene Zingel, Sascha Kilian, Ronald Wiesinger, -Alexander Koch, Stephan Feddersen, Stéphane Pautrel, Justin Luth, Michael Eitelwein, Bernhard Bitsch, Dominik Hassler, +Florian Bührle, Larsen, Gabriel Rolland, Anton D. Seliverstov, diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index ba7771ab6..0603e7135 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -28,6 +28,7 @@ 'Captive clients' => 'Clients', 'Captive config' => 'Konfiguration', 'Captive coupon' => 'Gutschein', +'Captive delete logo' => 'Logo löschen', 'Captive err doublevoucher' => 'Ein Gutschein mit diesem Code ist bereits im Umlauf', 'Captive expire' => 'Ablauf', 'Captive expiry time' => 'Ablaufzeit', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 8dbd13433..6e4f855cb 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -27,6 +27,7 @@ 'Captive client session expiry time' => 'Session Expiry Time', 'Captive config' => 'Settings', 'Captive coupon' => 'Coupon', +'Captive delete logo' => 'Delete Logo', 'Captive err doublevoucher' => 'A coupon with this code already exists', 'Captive expire' => 'Expire', 'Captive expiry time' => 'Expiry Time',
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer