[git] gnupg-doc - branch, preview, updated. a2746cb3f968d545ee84c9113203e9e5150c7cb1
by Werner Koch
cvs at cvs.gnupg.org
Thu May 11 19:43:04 CEST 2017
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 "The GnuPG website and other docs".
The branch, preview has been updated
via a2746cb3f968d545ee84c9113203e9e5150c7cb1 (commit)
from ab675d51e5e33ca60602d78b4e4d35d977dc8a2d (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 a2746cb3f968d545ee84c9113203e9e5150c7cb1
Author: Werner Koch <wk at gnupg.org>
Date: Thu May 11 19:38:35 2017 +0200
cgi: Check the right radio button on redisplay.
diff --git a/cgi/procdonate.cgi b/cgi/procdonate.cgi
index fda31c1..e9f21ac 100755
--- a/cgi/procdonate.cgi
+++ b/cgi/procdonate.cgi
@@ -74,10 +74,18 @@ sub write_template ($) {
my $err_mail = '';
my $err_paytype = '';
my $check_checked = ' checked="checked"';
+ my $sel_other = '';
my $sel_eur = '';
my $sel_usd = '';
my $sel_gbp = '';
my $sel_jpy = '';
+ my $sel_amt500 = '';
+ my $sel_amt200 = '';
+ my $sel_amt100 = '';
+ my $sel_amt50 = '';
+ my $sel_amt20 = '';
+ my $sel_amt10 = '';
+ my $sel_amt5 = '';
my $recur_none = '';
my $recur_month = '';
my $recur_quarter = '';
@@ -88,6 +96,7 @@ sub write_template ($) {
my $check_paytype = 'none';
my $stripe_data_email = '';
my $stripe_data_label_value = 'Donate now';
+ my $xamount;
# Avoid broken HTML attributes.
$amount =~ s/\x22/\x27/g;
@@ -112,18 +121,45 @@ sub write_template ($) {
# No need to clean $euroamount.
+
# Create a formatted message.
$message_fmt = $message;
$message_fmt =~ s/\n/<br\x2f>/g;
+ # Check the currency and predefined amount.
if ( $currency =~ /EUR/i ) {
$sel_eur = ' selected="selected"';
+ $xamount = int $amount;
+ if ( $xamount = 5 ) {
+ $sel_amt5 = ' selected="selected"';
+ } elsif ( $xamount = 10 ) {
+ $sel_amt10 = ' selected="selected"';
+ } elsif ( $xamount = 20 ) {
+ $sel_amt20 = ' selected="selected"';
+ } elsif ( $xamount = 50 ) {
+ $sel_amt50 = ' selected="selected"';
+ } elsif ( $xamount = 100 ) {
+ $sel_amt100 = ' selected="selected"';
+ } elsif ( $xamount = 200 ) {
+ $sel_amt200 = ' selected="selected"';
+ } elsif ( $xamount = 500 ) {
+ $sel_amt500 = ' selected="selected"';
+ } elsif ( $xamount = 10 ) {
+ $sel_amt10 = ' selected="selected"';
+ } else {
+ $sel_other = $check_checked;
+ }
} elsif ( $currency =~ /USD/i ) {
$sel_usd = ' selected="selected"';
+ $sel_other = $check_checked;
} elsif ( $currency =~ /GBP/i ) {
$sel_gbp = ' selected="selected"';
+ $sel_other = $check_checked;
} elsif ( $currency =~ /JPY/i ) {
$sel_jpy = ' selected="selected"';
+ $sel_other = $check_checked;
+ } else {
+ $sel_other = $check_checked;
}
# For non-recurring Stripe donations we do not want to send a
@@ -150,7 +186,6 @@ sub write_template ($) {
$stripe_data_label_value = 'Donate yearly';
}
-
if ( $paytype eq "cc" ) {
$check_paytype = "CC";
} elsif ( $paytype eq "pp" ) {
@@ -198,7 +233,7 @@ sub write_template ($) {
|| s/(\x22\x2f>)?<!--CURRENCY-->/$currency\1/
|| s/(\x22\x2f>)?<!--NAME-->/$name\1/
|| s/(\x22\x2f>)?<!--MAIL-->/$mail\1/
- || s/\x2f><!--CHECKOTHER-->/$check_checked\x2f>/
+ || s/\x2f><!--CHECKOTHER-->/$sel_other\x2f>/
|| s/\x2f><!--CHECK_$check_paytype-->/$check_checked\x2f>/
|| s/(<\x2ftextarea>)?<!--MESSAGE-->/$message\1/
|| s/<!--MESSAGE_FMT-->/$message_fmt/
@@ -210,6 +245,13 @@ sub write_template ($) {
|| s/(<selected=\x22selected\x22)?><!--RECUR_MONTH-->/$recur_month>/
|| s/(<selected=\x22selected\x22)?><!--RECUR_QUARTER-->/$recur_quarter>/
|| s/(<selected=\x22selected\x22)?><!--RECUR_YEAR-->/$recur_year>/
+ || s/(<selected=\x22selected\x22)?><!--SEL_AMT500-->/$sel_amt500>/
+ || s/(<selected=\x22selected\x22)?><!--SEL_AMT200-->/$sel_amt200>/
+ || s/(<selected=\x22selected\x22)?><!--SEL_AMT100-->/$sel_amt100>/
+ || s/(<selected=\x22selected\x22)?><!--SEL_AMT50-->/$sel_amt50>/
+ || s/(<selected=\x22selected\x22)?><!--SEL_AMT20-->/$sel_amt20>/
+ || s/(<selected=\x22selected\x22)?><!--SEL_AMT10-->/$sel_amt10>/
+ || s/(<selected=\x22selected\x22)?><!--SEL_AMT5-->/$sel_amt5>/
|| s/<!--RECUR_TEXT-->/$recur_text/
|| s/<!--STRIPE_DATA_EMAIL-->/$stripe_data_email/
|| s/<!--STRIPE_DATA_LABEL_VALUE-->/$stripe_data_label_value/
diff --git a/web/donate/donate.org b/web/donate/donate.org
index d41f1d0..9ef45f7 100644
--- a/web/donate/donate.org
+++ b/web/donate/donate.org
@@ -70,31 +70,38 @@
</label>
<div class="col-md-6">
<label class="radio-inline">
- <input type="radio" name="amount" id="amount500" value="500"> 500€
+ <input type="radio" name="amount" id="amount500"
+ value="500" ><!--SEL_AMT500--> 500 €
</label>
<label class="radio-inline">
- <input type="radio" name="amount" id="amount200" value="200"> 200€
+ <input type="radio" name="amount" id="amount200"
+ value="200" ><!--SEL_AMT200--> 200 €
</label>
<label class="radio-inline">
- <input type="radio" name="amount" id="amount100" value="100"> 100€
+ <input type="radio" name="amount" id="amount100"
+ value="100" ><!--SEL_AMT100--> 100 €
</label>
<label class="radio-inline">
- <input type="radio" name="amount" id="amount50" value="50"> 50€
+ <input type="radio" name="amount" id="amount50"
+ value="50" ><!--SEL_AMT50--> 50 €
</label>
<label class="radio-inline">
- <input type="radio" name="amount" id="amount20" value="20"> 20€
+ <input type="radio" name="amount" id="amount20"
+ value="20" ><!--SEL_AMT20--> 20 €
</label>
<label class="radio-inline">
- <input type="radio" name="amount" id="amount10" value="10"> 10€
+ <input type="radio" name="amount" id="amount10"
+ value="10" ><!--SEL_AMT10--> 10 €
</label>
<label class="radio-inline">
- <input type="radio" name="amount" id="amount5" value="5"> 5€
+ <input type="radio" name="amount" id="amount5"
+ value="5" ><!--SEL_AMT5--> 5 €
</label>
</div>
</div>
-----------------------------------------------------------------------
Summary of changes:
cgi/procdonate.cgi | 46 ++++++++++++++++++++++++++++++++++++++++++++--
web/donate/donate.org | 21 ++++++++++++++-------
2 files changed, 58 insertions(+), 9 deletions(-)
hooks/post-receive
--
The GnuPG website and other docs
http://git.gnupg.org
More information about the Gnupg-commits
mailing list