[git] gnupg-doc - branch, preview, updated. 5112655e812f3ee1f18cebc9c181f3d62c9332ec

[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  5112655e812f3ee1f18cebc9c181f3d62c9332ec (commit)
      from  b75b9c73c2b84dad6a855b76b7d2b857ab100c2a (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 5112655e812f3ee1f18cebc9c181f3d62c9332ec
Author: Werner Koch <wk at gnupg.org>
Date:   Mon May 15 12:26:21 2017 +0200

    cgi: Add simple Bitcoin page.

diff --git a/cgi/procdonate.cgi b/cgi/procdonate.cgi
index c6dc026..a16afdf 100755
--- a/cgi/procdonate.cgi
+++ b/cgi/procdonate.cgi
@@ -247,6 +247,8 @@ sub write_template ($) {
         $check_paytype = "PP";
     } elsif ( $paytype eq "se" ) {
         $check_paytype = "SE";
+    } elsif ( $paytype eq "bc" ) {
+        $check_paytype = "BC";
     }
 
     # Set var for the paypal button
@@ -470,6 +472,10 @@ sub write_checkout_page ()
     elsif ( $paytype eq "pp" ) {
         write_template("donate/checkout-pp.html");
     }
+    elsif ( $paytype eq "bc" ) {
+        # For Bitcoins this is the final page
+        write_template("donate/checkout-bc.html");
+    }
     else {
         # For SEPA this is the final page
         write_template("donate/checkout-se.html");
@@ -547,7 +553,10 @@ sub check_donation ()
 
     # Check the payment type
     $paytype = $q->param("paytype");
-    if ( $paytype ne "cc" and $paytype ne "pp" and $paytype ne "se" ) {
+    if ( $paytype eq "bc" ) {
+        # No further checks - this is kind of a hack.
+    }
+    elsif ( $paytype ne "cc" and $paytype ne "pp" and $paytype ne "se" ) {
 
         if ($lang eq 'de') {
             $msg= 'Keine Zahlungsart angegeben.'
diff --git a/web/donate/checkout-bc.org b/web/donate/checkout-bc.org
new file mode 100644
index 0000000..9ba7f76
--- /dev/null
+++ b/web/donate/checkout-bc.org
@@ -0,0 +1,24 @@
+#+TITLE: GnuPG - Donate - Donate Bitcoins
+#+STARTUP: showall
+#+SETUPFILE: "../share/setup.inc"
+
+* Donate Bitcoins to the GnuPG Project
+
+  Donated Bitcoins are collected by the [[https://www.gnupg.org/verein][GnuPG e.V.]]
+
+#+BEGIN_HTML
+  <p>
+  Send your Bitcoins to
+  <a href="bitcoin:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+  ><tt>xxxxxxxxxxxxxxxxx­xxxxxxxxxxxxxxxxx</tt></a>.
+  </p>
+#+END_HTML
+
+
+  *Thank you in advance for your donation.*
+
+#+BEGIN_HTML
+  <ul>
+    <li><a href="/index.html">Continue</a></li>
+  </ul>
+#+END_HTML
diff --git a/web/donate/donate.de.org b/web/donate/donate.de.org
index 9ba501b..65adadd 100644
--- a/web/donate/donate.de.org
+++ b/web/donate/donate.de.org
@@ -48,7 +48,6 @@
       <div class="col-md-8 col-md-offset-2">
         <h1>Support GnuPG</h1>
         <p>To process your donation we need to collect some information. This information is only used for the purpose of the donation and no data will ever be send to any entity not directly involved in the donation process. Not giving a name makes the donation “anonymous” in that the name won’t be listed on the public thank you page.</p>
-        <p>You can also send us <b>Bitcoin</b>. Our address is <a href="bitcoin:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"><small><tt>xxxxxxxxxxxxxxxxx­xxxxxxxxxxxxxxxxx</tt></small></a>.</p>
       </div>
     </div>
 
@@ -180,6 +179,13 @@
               Überweisung
             </label>
           </div>
+          <div class="radio">
+            <label>
+              <input type="radio" name="paytype" id="bc"
+                     value="bc" /><!--CHECK_BC-->
+              Bitcoin
+            </label>
+          </div>
         </div>
       </div>
 
diff --git a/web/donate/donate.org b/web/donate/donate.org
index 2a5f9b0..6ad3507 100644
--- a/web/donate/donate.org
+++ b/web/donate/donate.org
@@ -47,8 +47,13 @@
     <div class="row">
       <div class="col-md-8 col-md-offset-2">
         <h1>Support GnuPG</h1>
-        <p>To process your donation we need to collect some information. This information is only used for the purpose of the donation and no data will ever be send to any entity not directly involved in the donation process. Not giving a name makes the donation “anonymous” in that the name won’t be listed on the public thank you page.</p>
-        <p>You can also send us <b>Bitcoin</b>. Our address is <a href="bitcoin:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"><small><tt>xxxxxxxxxxxxxxxxx­xxxxxxxxxxxxxxxxx</tt></small></a>.</p>
+        <p>To process your donation we need to collect some information.
+           This information is only used for the purpose of the donation
+           and no data will ever be send to any entity not directly
+           involved in the donation process.  Not giving a name makes
+           the donation “anonymous” in that the name won’t be listed
+           on the public thank you page.
+        </p>
       </div>
     </div>
 
@@ -179,6 +184,13 @@
               SEPA (European bank transfer)
             </label>
           </div>
+          <div class="radio">
+            <label>
+              <input type="radio" name="paytype" id="bc"
+                     value="bc" /><!--CHECK_BC-->
+              Bitcoin
+            </label>
+          </div>
         </div>
       </div>
 

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

Summary of changes:
 cgi/procdonate.cgi         | 11 ++++++++++-
 web/donate/checkout-bc.org | 24 ++++++++++++++++++++++++
 web/donate/donate.de.org   |  8 +++++++-
 web/donate/donate.org      | 16 ++++++++++++++--
 4 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 web/donate/checkout-bc.org


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