From 00e72cd97d271e458519f131c4f9879bc2d585f0 Mon Sep 17 00:00:00 2001
From: Luke Faraone <lfaraone@zulip.com>
Date: Tue, 5 Nov 2013 16:13:59 -0500
Subject: [PATCH] Switch url parameter to full_name from service-specific
 gafyd_name

(imported from commit 21541da29d2846cfd912d19b73e239e96606f9e5)
---
 confirmation/views.py                                   | 2 +-
 templates/confirmation/confirm_preregistrationuser.html | 2 +-
 templates/zerver/register.html                          | 5 ++---
 zerver/views/__init__.py                                | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/confirmation/views.py b/confirmation/views.py
index 9cf20d24b4..d0ee9fefef 100644
--- a/confirmation/views.py
+++ b/confirmation/views.py
@@ -29,7 +29,7 @@ def confirm(request, confirmation_key):
         'confirmed': confirmed,
         'days': getattr(settings, 'EMAIL_CONFIRMATION_DAYS', 10),
         'key': confirmation_key,
-        'gafyd_name': request.GET.get("gafyd_name", None),
+        'full_name': request.GET.get("full_name", None),
     }
     templates = [
         'confirmation/confirm.html',
diff --git a/templates/confirmation/confirm_preregistrationuser.html b/templates/confirmation/confirm_preregistrationuser.html
index c40a0225bb..db33b600cb 100644
--- a/templates/confirmation/confirm_preregistrationuser.html
+++ b/templates/confirmation/confirm_preregistrationuser.html
@@ -12,7 +12,7 @@ post to another view which executes in our code to produce the desired form.
     {% csrf_token %}
     <input type="hidden" value="{{ key }}" name="key"/>
     <input type="hidden" value="1" name="from_confirmation"/>
-    <input type="hidden" value="{% if gafyd_name %}{{ gafyd_name }}{% endif %}" name="gafyd_name"/>
+    <input type="hidden" value="{% if full_name %}{{ full_name }}{% endif %}" name="full_name"/>
 </form>
 
 <script type="text/javascript">
diff --git a/templates/zerver/register.html b/templates/zerver/register.html
index 9c2d7789df..fa45a25937 100644
--- a/templates/zerver/register.html
+++ b/templates/zerver/register.html
@@ -40,7 +40,7 @@ Form is validated both client-side using jquery-validate (see signup.js) and ser
         <label for="id_full_name" class="control-label">Full name</label>
         <div class="controls">
             <input id="id_full_name" class="required" type="text" name="full_name"
-                   value="{% if form.full_name.value %}{{ form.full_name.value }}{% elif gafyd_name %}{{ gafyd_name }}{% endif %}"
+                   value="{% if form.full_name.value %}{{ form.full_name.value }}{% elif full_name %}{{ full_name }}{% endif %}"
                    maxlength="100" />
             {% if form.full_name.errors %}
                 {% for error in form.full_name.errors %}
@@ -55,9 +55,8 @@ Form is validated both client-side using jquery-validate (see signup.js) and ser
             <input id="id_password" class="required" type="password" name="password"
                    value="{% if form.password.value %}{{ form.password.value }}{% endif %}"
                    maxlength="100" />
-            {% if gafyd_name %}
+            {% if full_name %}
             <span class="help-inline">This is used for mobile applications and other tools that don't support Google Apps authentication.</span>
-            <input type="hidden" value="{{ gafyd_name }}" name="gafyd_name"/>
             {% endif %}
             {% if form.password.errors %}
                 {% for error in form.password.errors %}
diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py
index 810c7735ad..f13e172bc3 100644
--- a/zerver/views/__init__.py
+++ b/zerver/views/__init__.py
@@ -334,7 +334,7 @@ def accounts_register(request):
              'company_name': domain,
              'email': email,
              'key': key,
-             'gafyd_name': request.POST.get('gafyd_name', False),
+             'full_name': request.POST.get('full_name', False),
             },
         context_instance=RequestContext(request))
 
@@ -465,7 +465,7 @@ def maybe_send_to_registration(request, email, full_name=''):
             "/",
             # Split this so we only get the part after the /
             Confirmation.objects.get_link_for_object(prereg_user).split("/", 3)[3],
-            '?gafyd_name=',
+            '?full_name=',
             # urllib does not handle Unicode, so coerece to encoded byte string
             # Explanation: http://stackoverflow.com/a/5605354/90777
             urllib.quote_plus(full_name.encode('utf8')))))