From 58608a4ea5920f09b3cf5327bca0ee67e1761a7a Mon Sep 17 00:00:00 2001
From: h-alstad <>
Date: Wed, 11 May 2011 21:46:49 +0200
Subject: [PATCH] =?UTF-8?q?Oppdaget=20feil=20ved=20salg=20av=20nytt=20medl?=
 =?UTF-8?q?emskort=20til=20livsvarige=20medlemmer.=20Bruk=20hasExpired()?=
 =?UTF-8?q?=20i=20stedet=20for=20=C3=A5=20sjekke=20p=C3=A5=20dato=20for=20?=
 =?UTF-8?q?=C3=A5=20sjekke=20medlemsstatus=20ved=20medlemskapssalg.=20hasE?=
 =?UTF-8?q?xpired()=20har=20st=C3=B8tte=20for=20livsvarig=20medlemskap.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inside/User.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/inside/User.php b/inside/User.php
index 92bdf79..d33a7ec 100644
--- a/inside/User.php
+++ b/inside/User.php
@@ -575,11 +575,11 @@ class User {
   }
 
   public function renewMembership($cardno) {
-    $expires = $this->getExpiryDate();
-    if ($expires <= $this->expires) {
+    if (!$this->hasExpired()) {
       notify("Du har allerede gyldig medlemskap for dette året.");
       return false;
     }
+    $expires = $this->getExpiryDate();
     $this->conn->autoCommit(false);
     if ($this->_registerUsedCardno($cardno) == true) {
       $sql = "UPDATE din_user SET " . "  expires = '$expires' " . "WHERE " . "  id = $this->id";
@@ -602,11 +602,11 @@ class User {
   }
 
   public function renewMembershipPayex() {
-    $expires = $this->getExpiryDate();
-    if ($expires <= $this->expires) {
+    if (!$this->hasExpired()) {
       notify("Du har allerede gyldig medlemskap for dette året.");
       return false;
     }
+    $expires = $this->getExpiryDate();
     $this->conn->autoCommit(false);
     $sql = "UPDATE din_user SET " . "  expires = '$expires' " . "WHERE " . "  id = $this->id";
     $result = $this->conn->query($sql);
@@ -626,11 +626,11 @@ class User {
   }
 
   public function renewMembershipEurobate() {
-    $expires = $this->getExpiryDate();
-    if ($expires <= $this->expires) {
+    if (!$this->hasExpired()) {
       // har allerede gyldig medlemskap
       return false;
     }
+    $expires = $this->getExpiryDate();
     $this->conn->autoCommit(false);
     $sql = "UPDATE din_user SET " . "  expires = '$expires' " . "WHERE " . "  id = $this->id";
     $result = $this->conn->query($sql);
@@ -685,8 +685,7 @@ class User {
 
   /* Order new membercard if old one is lost */
   public function renewMembercardPayex() {
-        $expires = $this->getExpiryDate();
-        if ($expires > $this->expires) {
+        if ($this->hasExpired()) {
             notify("Du har ikke gyldig medlemskap for dette året.");
             return false;
         }