From b35318faf72235cb448ed984a56d38ba1d34eb67 Mon Sep 17 00:00:00 2001
From: oyvinbak <oyvinbak@nintendo.neuf.no>
Date: Sun, 7 Aug 2011 23:45:25 +0200
Subject: [PATCH] =?UTF-8?q?Oppdatert=20for=20at=20medlemskap=20skal=20f?=
 =?UTF-8?q?=C3=B8lge=20skolesemester?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inside/Page.php      | 14 ++++++-------
 inside/User.php      | 50 +++++++++++++++++++++++++++++++-------------
 inside/functions.php |  8 +++++++
 3 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/inside/Page.php b/inside/Page.php
index 1f4e9ef..420a85e 100644
--- a/inside/Page.php
+++ b/inside/Page.php
@@ -3315,9 +3315,9 @@ Om dere lager en facebook side til arrangementet, ikke glem &aring; putte inn le
               print "<input type=\"hidden\" name=\"subaction\" value=\"sticker-sale\" />";
               print "<select name=\"new-sticker-date\">\n";
               print "<option value=\"" . date("Y") . "\">" . "i år (" . date("Y") . ")" . "</option>\n";
-              print "<option value=\"" . date("Y", strtotime("+1 year")) . "\">" . "neste år (" . date("Y", strtotime("+1 year")) . ")" . "</option>\n";
-              print "<option value=\"" . date("Y", strtotime("+3 year")) . "\">" . "tre år (" . date("Y", strtotime("+3 year")) . ")" . "</option>\n";
-              print "<option value=\"" . date("Y", strtotime("+5 year")) . "\">" . "fem år (" . date("Y", strtotime("+5 year")) . ")" . "</option>\n";
+              print "<option value=\"" . date("Y", strtotime("+1 year")) . "\">" . "neste år (" . getStickerPeriod("+1 year") . ")" . "</option>\n";
+              print "<option value=\"" . date("Y", strtotime("+3 year")) . "\">" . "tre år (" . getStickerPeriod("+3 year") . ")" . "</option>\n";
+              print "<option value=\"" . date("Y", strtotime("+5 year")) . "\">" . "fem år (" . getStickerPeriod("+5 year") . ")" . "</option>\n";
               print "</select>\n";
               print "<input type=\"submit\" value=\"Selg oblat\" />";
             }
@@ -3326,12 +3326,12 @@ Om dere lager en facebook side til arrangementet, ikke glem &aring; putte inn le
               print "produser kort";
             } elseif (!$user->getCardDelivered()) {
               print "<input type=\"hidden\" name=\"subaction\" value=\"give-card\" />";
-              print "<input type=\"hidden\" name=\"new-sticker-date\" value=\"" . date("Y", strtotime($user->getExpiryDate())) . "\" />";
-              print "<input type=\"submit\" name=\"give-card\" value=\"Lever ut kort (" . date("Y", strtotime($user->getExpiryDate())) . ")\" />";
+              print "<input type=\"hidden\" name=\"new-sticker-date\" value=\"" . $user->getNewStickerDate() . "\" />";
+              print "<input type=\"submit\" name=\"give-card\" value=\"Lever ut kort (" . $user->getNewStickerDate() . ")\" />";
             } elseif (!$user->hasCardSticker()) {
               print "<input type=\"hidden\" name=\"subaction\" value=\"give-sticker\" />";
-              print "<input type=\"hidden\" name=\"new-sticker-date\" value=\"" . date("Y", strtotime($user->getExpiryDate())) . "\" />";
-              print "<input type=\"submit\" name=\"give-sticker\" value=\"Gi oblat (" . date("Y", strtotime($user->getExpiryDate())) . ")\" />";
+              print "<input type=\"hidden\" name=\"new-sticker-date\" value=\"" . $user->getNewStickerDate() . "\" />";
+              print "<input type=\"submit\" name=\"give-sticker\" value=\"Gi oblat (" . $user->getNewStickerDate() . ")\" />";
             } else {
               print "-";
             }
diff --git a/inside/User.php b/inside/User.php
index a1a895b..b9b6b49 100644
--- a/inside/User.php
+++ b/inside/User.php
@@ -719,10 +719,16 @@ class User {
   }
 
   public function updateExpiry($newDate) {
+  	if(preg_match('#^\d{4}/\d{2}$#', $newDate))
+  	{
+  		$newDate = substr($newDate,0,2) . substr($newDate,5,2);
+  	}
+  
     if ($newDate == 'lifetime') {
       $sql = "UPDATE din_user SET expires = NULL WHERE id = $this->id LIMIT 1";
     } else {
-      $sql = "UPDATE din_user SET expires = '$newDate-12-31' WHERE id = $this->id LIMIT 1";
+    	$expires = $this->getExpiryDate($newDate);
+      $sql = "UPDATE din_user SET expires = '$expires' WHERE id = $this->id LIMIT 1";
     }
     $conn = db_connect();
     $result = $this->conn->query($sql);
@@ -923,12 +929,26 @@ class User {
         return true;
       }
     }
+    
+	public function getNewStickerDate()
+	{
+		$year = substr($this->getExpiryDate(),0,4);
+		return $year . '/' . (substr($year,2,2) + 1);
+	}
 
-    public function getExpiryDate() {
-      if (date("Y-m-d") > date("Y-11-15")) {
-        return date("Y", strtotime("+1 year")) . "-12-31";
-      } else {
-        return date("Y") . "-12-31";
+    public function getExpiryDate($year) {
+      if($year)
+      {
+      	return $year . '07-01';
+      }
+      
+      if (date("m-d") > "07-01" )
+      {
+      	return date("Y", strtotime("+1 year")) . '-08-01';
+      }
+      else
+      {
+      	return date("Y") . '-08-01';
       }
     }
 
@@ -1230,10 +1250,10 @@ class User {
             print "<input type=\"hidden\" name=\"action\" value=\"update-user-expiry\" />\n";
             print "<select name=\"newExpiryDate_" . $this->id . "\" id=\"newExpiryDate_" . $this->id . "\">\n";
             print "<option value=\"0000-00-00\">" . "ugyldig utløpsår" . "</option>\n";
-            print "<option value=\"" . date("Y") . "\">" . "inneværende år (" . date("Y") . ")" . "</option>\n";
-            print "<option value=\"" . date("Y", strtotime("+1 year")) . "\">" . "neste år (" . date("Y", strtotime("+1 year")) . ")" . "</option>\n";
-            print "<option value=\"" . date("Y", strtotime("+3 year")) . "\">" . "tre år (" . date("Y", strtotime("+3 year")) . ")" . "</option>\n";
-            print "<option value=\"" . date("Y", strtotime("+5 year")) . "\">" . "fem år (" . date("Y", strtotime("+5 year")) . ")" . "</option>\n";
+            print "<option value=\"" . getStickerPeriod("now") . "\">" . "inneværende år (" . getStickerPeriod("now") . ")" . "</option>\n";
+            print "<option value=\"" . getStickerPeriod("+1 year") . "\">" . "neste år (" . getStickerPeriod("+1 year") . ")" . "</option>\n";
+            print "<option value=\"" . getStickerPeriod("+3 year") . "\">" . "tre år (" . getStickerPeriod("+3 year") . ")" . "</option>\n";
+            print "<option value=\"" . getStickerPeriod("+5 year") . "\">" . "fem år (" . getStickerPeriod("+5 year") . ")" . "</option>\n";
             print "<option value=\"lifetime\">" . "livsvarig" . "</option>\n";
             print "</select>\n";
             print "<input type=\"submit\" value=\"endre\" />\n";
@@ -1252,10 +1272,10 @@ class User {
             print "<div>";
             print "<input type=\"hidden\" name=\"action\" value=\"update-user-last-sticker\" />";
             print "<select name=\"newStickerDate_" . $this->id . "\" id=\"newStickerDate_" . $this->id . "\">";
-            print "<option value=\"" . date("Y") . "\">" . "inneværende år (" . date("Y") . ")" . "</option>\n";
-            print "<option value=\"" . date("Y", strtotime("+1 year")) . "\">" . "neste år (" . date("Y", strtotime("+1 year")) . ")" . "</option>\n";
-            print "<option value=\"" . date("Y", strtotime("+3 year")) . "\">" . "tre år (" . date("Y", strtotime("+3 year")) . ")" . "</option>\n";
-            print "<option value=\"" . date("Y", strtotime("+5 year")) . "\">" . "fem år (" . date("Y", strtotime("+5 year")) . ")" . "</option>\n";
+            print "<option value=\"" . getStickerPeriod("now") . "\">" . "inneværende år (" . getStickerPeriod("now") . ")" . "</option>\n";
+            print "<option value=\"" . getStickerPeriod("+1 year") . "\">" . "neste år (" . getStickerPeriod("+1 year") . ")" . "</option>\n";
+            print "<option value=\"" . getStickerPeriod("+3 year") . "\">" . "tre år (" . getStickerPeriod("+3 year") . ")" . "</option>\n";
+            print "<option value=\"" . getStickerPeriod("+5 year") . "\">" . "fem år (" . getStickerPeriod("+5 year") . ")" . "</option>\n";
             print "<option value=\"" . 0 . "\">ingen verdi</option>";
             print "</select>";
             print "<input type=\"submit\" value=\"endre\" />";
@@ -1552,4 +1572,4 @@ class User {
     return $this->membershipCard;
   }
 }
-?>
\ No newline at end of file
+?>
diff --git a/inside/functions.php b/inside/functions.php
index 1f31ac0..293a55f 100644
--- a/inside/functions.php
+++ b/inside/functions.php
@@ -1554,4 +1554,12 @@ function strip_nl($string) {
 	$string = str_replace("\r", "", $string);
 	return $string;
 }
+
+
+function getStickerPeriod($time)
+{
+	$start = date('Y', strtotime($time));
+	return $start . '/' . (substr($start,2,2) + 1);
+}
+
 ?>