From 12a9f20acfc4246865b4897d4b8b2e20337bcc3e Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Wed, 5 Aug 2015 19:07:24 +0200
Subject: [PATCH] Registration form fixes

---
 sms/register.php             | 4 ++--
 snapporder/lib/functions.php | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sms/register.php b/sms/register.php
index c0382fa..0c323a1 100644
--- a/sms/register.php
+++ b/sms/register.php
@@ -85,7 +85,7 @@ if( isset($_POST['submit']) ) {
     <em class="subtitle">på Det Norske Studentersamfund</em>
     <header class="about">
         <p>Hei, for at medlemskapet du har kjøpt på SMS eller på Chateau Neuf skal være gyldig, så <strong>må</strong> du registerere deg.</p>
-        <p class="imperative">Gå videre med registreringen ved å angi <em>telefonnummer, aktiveringskode, fornavn</em> og <em>epost</em>.</p>
+        <p class="imperative">Gå videre med registreringen ved å angi <em>telefonnummer, kortnummber/kode, fornavn</em> og <em>epost</em>.</p>
     </header>
     <section class="register-sms">
         <?php if(strlen($validation_errors) > 0 ) {
@@ -100,7 +100,7 @@ if( isset($_POST['submit']) ) {
                 <label for="id_phone">Telefonnummer:</label><input id="id_phone" type="tel" name="phone" placeholder="Telefonnummer" value="<?php echo $phone; ?>"/>
             </div>
             <div class="form-row">
-                <label for="id_activation_code">Kortnummer/kode:</label><input id="id_activation_code" type="text" name="activation_code" placeholder="Aktiveringskode" value="<?php echo $activation_code; ?>"/>
+                <label for="id_activation_code">Kortnummer/kode:</label><input id="id_activation_code" type="text" name="activation_code" placeholder="Kortnummer/Kode" value="<?php echo $activation_code; ?>"/>
             </div>
             <div class="form-row">
                 <label for="id_firstname">Fornavn:</label><input id="id_firstname" type="text" name="firstname" placeholder="Fornavn" value="<?php echo $firstname; ?>"/>
diff --git a/snapporder/lib/functions.php b/snapporder/lib/functions.php
index 6208c85..32b5262 100644
--- a/snapporder/lib/functions.php
+++ b/snapporder/lib/functions.php
@@ -546,7 +546,8 @@ function validate_activation_form($data) {
     if( strlen($data['street']) == 0) {
         $data['street'] = '-';
     }
-    if( !is_numeric($data['zipcode']) ) {
+    // zip code (optional)
+    if( strlen($data['zipcode']) > 0 && !is_numeric($data['zipcode']) ) {
         throw new ValidationException("Ugyldig postnummer, må være et tall");
     }