[git] gnupg-doc - branch, preview, updated. 2632b4a05a06c6a5257f1a287d6443ec633acceb

[by Werner Koch]

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  2632b4a05a06c6a5257f1a287d6443ec633acceb (commit)
      from  eb2bfb667371dd072097e8bcc2a550f850069c2c (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 2632b4a05a06c6a5257f1a287d6443ec633acceb
Author: Werner Koch <wk at gnupg.org>
Date:   Tue May 30 19:23:20 2017 +0200

    cgi: Insert a QR code for the SEPA transaction

diff --git a/cgi/procdonate.cgi b/cgi/procdonate.cgi
index 9fe237c..13b9bf4 100755
--- a/cgi/procdonate.cgi
+++ b/cgi/procdonate.cgi
@@ -21,6 +21,9 @@ use IO::Socket::UNIX;
 realpath($0) =~ /^(.*)\/.*$/;
 my %config = do $1 . '/config.rc';
 
+$ENV{PATH} = "/bin:/usr/bin";
+delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
+
 my $baseurl = $config{baseurl};
 my $htdocs =  $config{htdocs};
 my $stripepubkey =  $config{stripepubkey};
@@ -46,6 +49,7 @@ my $name = "";
 my $mail = "";
 my $message = "";
 my $separef = "";
+my $sepaqr = "";
 my $errorstr = "";
 my $notepanel = "";
 
@@ -332,6 +336,7 @@ sub write_template ($) {
         || s/<!--PUBLISH_NAME-->/$publishname/
         || s/<!--LANG-->/$lang/
         || s/<!--SEPA_REF-->/$separef/
+        || s/<!--SEPA_QR-->/$sepaqr/
         || s/<!--ERRORSTR-->/$errorstr/
         || s/<!--ERR_AMOUNT-->/$err_amount/
         || s/<!--ERR_NAME-->/$err_name/
@@ -1041,6 +1046,20 @@ sub complete_sepa ()
     $mail = $data{"Mail"};
     $message = $data{"Message"};
 
+    my @cmd = (qw (/usr/local/bin/ppsepaqr),
+               'DE76301502000002108603',
+               'g10 Code GmbH',
+               $amount,
+               'GnuPG donation '.$separef );
+
+    if (open PPSEPAQR, '-|', @cmd) {
+        while (defined (my $line = <PPSEPAQR>))
+        {
+            $sepaqr = $sepaqr . $line;
+        }
+        close PPSEPAQR;
+    }
+
     write_checkout_page ();
 }
 
diff --git a/web/donate/checkout-se.de.org b/web/donate/checkout-se.de.org
index 43169f3..3eddd25 100644
--- a/web/donate/checkout-se.de.org
+++ b/web/donate/checkout-se.de.org
@@ -117,7 +117,7 @@
               </div>
             </div>
           </form>
-
+          <!--SEPA-QR-->
           <p>
 	    Bitte achten Sie darauf, dass die unter Verwendungszweck
 	    angegebene Referenznummer stimmt. Diese wird benötigt um
diff --git a/web/donate/checkout-se.fr.org b/web/donate/checkout-se.fr.org
index 1f05e36..ac1c19a 100644
--- a/web/donate/checkout-se.fr.org
+++ b/web/donate/checkout-se.fr.org
@@ -116,7 +116,7 @@
               </div>
             </div>
           </form>
-
+          <!--SEPA-QR-->
           <p>
             Veuillez vous assurer de la présence du numéro de référence, afin que
             nous puissions associer le montant reçu à votre donation et ainsi vous
diff --git a/web/donate/checkout-se.org b/web/donate/checkout-se.org
index 56f079a..0f80c31 100644
--- a/web/donate/checkout-se.org
+++ b/web/donate/checkout-se.org
@@ -117,7 +117,7 @@
               </div>
             </div>
           </form>
-
+          <!--SEPA-QR-->
           <p>
             Take care to give the reference number so that we can match your
             data with your actual donation and list you as donor if desired.

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

Summary of changes:
 cgi/procdonate.cgi            | 19 +++++++++++++++++++
 web/donate/checkout-se.de.org |  2 +-
 web/donate/checkout-se.fr.org |  2 +-
 web/donate/checkout-se.org    |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org