Fixed issue #6331: Opt-in and opt-out links not working

LimeSurvey · Nov 5, 2012 · 4b2d4e0 · 4b2d4e0
1 parent b33300a
commit 4b2d4e0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/application/controllers/OptinController.php b/application/controllers/OptinController.php
@@ -65,7 +65,7 @@ function actiontokens($surveyid, $token, $langcode = '')
         }
         else
         {
-            $row = Tokens_dynamic::model($iSurveyID)->getEmailStatus($iSurveyID, $sToken);
+            $row = Tokens_dynamic::model($iSurveyID)->getEmailStatus($sToken);
 
             if ($row == false)
             {
@@ -76,7 +76,7 @@ function actiontokens($surveyid, $token, $langcode = '')
                 $usresult = $row['emailstatus'];
                 if ($usresult=='OptOut')
                 {
-                    $usresult = Tokens_dynamic::model($iSurveyID)->updateEmailStatus($iSurveyID, $sToken, 'OK');
+                    $usresult = Tokens_dynamic::model($iSurveyID)->updateEmailStatus($sToken, 'OK');
                     $html = $clang->gT('You have been successfully added back to this survey.');
                 }
                 else if ($usresult=='OK')

diff --git a/application/controllers/OptoutController.php b/application/controllers/OptoutController.php
@@ -72,7 +72,7 @@ function actiontokens()
         }
         else
         {
-            $row = Tokens_dynamic::model()->getEmailStatus($iSurveyID, $sToken);
+            $row = Tokens_dynamic::model($iSurveyID)->getEmailStatus($sToken);
 
             if ($row == false)
             {
@@ -83,7 +83,7 @@ function actiontokens()
                 $usresult = $row['emailstatus'];
                 if ($usresult == 'OK')
                 {
-                    $usresult = Tokens_dynamic::model()->updateEmailStatus($iSurveyID, $sToken, 'OptOut');
+                    $usresult = Tokens_dynamic::model($iSurveyID)->updateEmailStatus($sToken, 'OptOut');
                     $html = $clang->gT('You have been successfully removed from this survey.');
                 }
                 else
@@ -155,8 +155,8 @@ function actionparticipants()
         }
         else
         {
-            $row = Tokens_dynamic::model()->getEmailStatus($iSurveyID, $sToken);
-            $datas = Tokens_dynamic::model()->model($iSurveyID)->find('token = :token', array(":token"=>$sToken));
+            $row = Tokens_dynamic::model($iSurveyID)->getEmailStatus($sToken);
+            $datas = Tokens_dynamic::model($iSurveyID)->find('token = :token', array(":token"=>$sToken));
 
             if ($row == false)
             {
@@ -167,7 +167,7 @@ function actionparticipants()
                 $usresult = $row['emailstatus'];
                 if ($usresult == 'OK')
                 {
-                    $usresult = Tokens_dynamic::model()->updateEmailStatus($iSurveyID, $sToken, 'OptOut');
+                    $usresult = Tokens_dynamic::model($iSurveyID)->updateEmailStatus($sToken, 'OptOut');
                     $html = $clang->gT('You have been successfully removed from this survey.');
                 }
                 else

diff --git a/application/models/Tokens_dynamic.php b/application/models/Tokens_dynamic.php
@@ -450,20 +450,20 @@ function deleteRecords($iTokenIds)
         return Yii::app()->db->createCommand($dlquery)->query();
     }
 
-    function getEmailStatus($sid,$token)
+    function getEmailStatus($token)
     {
         $command = Yii::app()->db->createCommand()
             ->select('emailstatus')
-            ->from('{{tokens_'.intval($sid).'}}')
+            ->from('{{tokens_'.intval(self::$sid).'}}')
             ->where('token=:token')
             ->bindParam(':token', $token, PDO::PARAM_STR);
 
         return $command->queryRow();
     }
 
-    function updateEmailStatus($sid,$token,$status)
+    function updateEmailStatus($token,$status)
     {
-        return Yii::app()->db->createCommand()->update('{{tokens_'.intval($sid).'}}',array('emailstatus' => $status),'token = :token',array(':token' => $token ));
+        return Yii::app()->db->createCommand()->update('{{tokens_'.intval(self::$sid).'}}',array('emailstatus' => $status),'token = :token',array(':token' => $token ));
     }
 }
 ?>