Dev Fixed issue where vendorspecific SQL was used.

LimeSurvey · Oct 14, 2013 · b598e38 · b598e38 · c-schmitz · Oct 14, 2013
1 parent cf1a19d
commit b598e38
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/application/models/Token.php b/application/models/Token.php
@@ -137,17 +137,19 @@ public function rules()
 
 		public function scopes()
 		{
-			return array(
-				'incomplete' => array(
-					'condition' => 'completed = "N"'
-				),
-				'usable' => array(
-					'condition' => 'usesleft > 0 AND COALESCE(validuntil, NOW()) >= NOW() AND COALESCE(validfrom, NOW()) <= NOW()'
-				),
-                'editable' => array(
-                    'condition' => 'COALESCE(validuntil, NOW()) >= NOW() AND COALESCE(validfrom, NOW()) <= NOW()'
+            $now = date('Y-m-d H:i:s');
+
+            return array(
+                'incomplete' => array(
+                    'condition' => 'completed = "N"'
+                ),
+                array(
+                    'condition' => "COALESCE(validuntil, '$now') >= '$now' AND COALESCE(validfrom, '$now') <= '$now'"
+                ),
+                array(
+                    'condition' => "usesleft > 0 AND COALESCE(validuntil, '$now') >= '$now' AND COALESCE(validfrom, '$now') <= '$now'"
                 )
-			);
+            );
 		}
 		public function summary()
 		{
@@ -167,7 +169,6 @@ public function tableName()
 		{
 			return '{{tokens_' . $this->id . '}}';
 		}
-
 	}
 
 ?>