From d224708fe1d0f9bdb609bf848fd281af0c9035c2 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Tue, 29 Sep 2015 14:47:37 +0200
Subject: [PATCH] Fixes card reg form for users, removes link to webshop

---
 inside/Navigation.php        | 2 +-
 snapporder/lib/functions.php | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/inside/Navigation.php b/inside/Navigation.php
index 166c05a..b079637 100644
--- a/inside/Navigation.php
+++ b/inside/Navigation.php
@@ -153,7 +153,7 @@ class Navigation {
 <?php
   }*/
 
-  if(checkAuth("view-menu-webshop")){
+  if( checkAuth("view-menu-webshop") && checkAuth('view-display-sales') ){
           ?>
           <li class="menulist dropdown">
             <a href="#" id="webshopSwitch" class="switch dropdown-toggle">Nettbutikk <b class="caret"></b></a>
diff --git a/snapporder/lib/functions.php b/snapporder/lib/functions.php
index cbcd07d..62e235f 100644
--- a/snapporder/lib/functions.php
+++ b/snapporder/lib/functions.php
@@ -598,9 +598,12 @@ function validate_sms_form($data) {
         $login_msg = "Hvis nummeret tilhører deg, <a href=\"https://inside.studentersamfundet.no\">logg inn her</a> først, før du returnerer hit og fullfører skjemaet.";
         throw new ValidationException("Telefonnummeret ".$data['phone']." er allerede registrert i bruk. $login_msg");
     }
-    if( $logged_in_user_id && !membership_expired($logged_in_user_id) ) {
-        $see_more_msg = "Du kan <a href=\"https://inside.studentersamfundet.no\">se medlemskapet her</a>.";
-        throw new ValidationException("Du har allerede aktivert medlemskapet ditt :-) $see_more_msg");
+    if( $logged_in_user_id ) {
+        $_user = get_user($logged_in_user_id);
+        if($_user['is_member'] !== "0") {
+            $see_more_msg = "Du kan <a href=\"https://inside.studentersamfundet.no\">se medlemskapet her</a>.";
+            throw new ValidationException("Du har allerede aktivert medlemskapet ditt :-) $see_more_msg");
+        }
     }
 
     $data['phone'] = $phone;