[git] gnupg-doc - branch, master, updated. 39eb838f46ba3cded3770e83c1c81f0bdfd21ccc

[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, master has been updated
       via  39eb838f46ba3cded3770e83c1c81f0bdfd21ccc (commit)
      from  a99298a88016b76934f8d857d6310135cf08ffcf (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 39eb838f46ba3cded3770e83c1c81f0bdfd21ccc
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Feb 7 08:20:08 2014 +0100

    accounts: Also collect data for stickers.

diff --git a/misc/accounts.gnupg.net/htbin/goteo-collect.cgi b/misc/accounts.gnupg.net/htbin/goteo-collect.cgi
index 146d606..5a37b00 100755
--- a/misc/accounts.gnupg.net/htbin/goteo-collect.cgi
+++ b/misc/accounts.gnupg.net/htbin/goteo-collect.cgi
@@ -167,11 +167,15 @@ sub write_template {
             $indel = 0 if (/<!--END_/);
             next;
         }
-        elsif (($reward eq 'm') && /^<!--BEGIN_T_SHIRT/) {
+        elsif (($reward eq 'm') && /^<!--BEGIN_(T_SHIRT|STICKER)/) {
             $indel = 1;
             next;
         }
-        elsif (($reward eq 't') && /^<!--BEGIN_MAIL/) {
+        elsif (($reward eq 't') && /^<!--BEGIN_(MAIL|STICKER)/) {
+            $indel = 1;
+            next;
+        }
+        elsif (($reward eq 's') && /^<!--BEGIN_(T_SHIRT|MAIL)/) {
             $indel = 1;
             next;
         }
diff --git a/misc/accounts.gnupg.net/htdocs/goteo-collect-thx.html.in b/misc/accounts.gnupg.net/htdocs/goteo-collect-thx.html.in
index f85aaaa..2911c69 100644
--- a/misc/accounts.gnupg.net/htdocs/goteo-collect-thx.html.in
+++ b/misc/accounts.gnupg.net/htdocs/goteo-collect-thx.html.in
@@ -107,6 +107,19 @@ any later time.
 
 <!--END_MAIL-->
 
+<!--BEGIN_STICKER-->
+<p>Please have some patience until information from everyone
+   has been collected and the stickers been delivered.</p>
+
+<p>We now have this data on file:</p>
+<pre>
+Mail: @MAIL@
+Address:
+ at ADDRESS@
+</pre>
+
+<!--END_STICKER-->
+
 <p>If we ever run into problems, we may ask you for a transaction id.
   Please note it down:</p>
 <pre>@TXID@</pre>
diff --git a/misc/accounts.gnupg.net/htdocs/goteo-collect.html.in b/misc/accounts.gnupg.net/htdocs/goteo-collect.html.in
index b13079d..fbfa4c4 100644
--- a/misc/accounts.gnupg.net/htdocs/goteo-collect.html.in
+++ b/misc/accounts.gnupg.net/htdocs/goteo-collect.html.in
@@ -145,6 +145,21 @@ done.  You may not send mail via that server.</p>
 
 <!--END_MAIL-->
 
+<!--BEGIN_STICKER-->
+<p>We noticed that the postal address for sending out the stickers is
+  sometimes missing or maybe wrong.  Thus please check the shipping
+  address (e.g. name and country given) and change if necessary: :<p>
+<textarea cols="80" rows="6" style="width:500px" name="address"
+                >@ADDRESS@
+</textarea>
+
+
+<p>Please also check the email address we can use in case of
+problems:</p>
+<p><input type="text" size="80" style="width:500px" name="mail"
+          value="@MAIL@" /></p>
+<!--END_STICKER-->
+
 
 
 <p><input type="submit" value="Send" /></p>

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

Summary of changes:
 misc/accounts.gnupg.net/htbin/goteo-collect.cgi         |    8 ++++++--
 .../accounts.gnupg.net/htdocs/goteo-collect-thx.html.in |   13 +++++++++++++
 misc/accounts.gnupg.net/htdocs/goteo-collect.html.in    |   15 +++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)


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