Fixed issue #6559: Batch emails to selected boxes not batching but tr…

…ying to send to everyone
LimeSurvey · Oct 1, 2012 · 74ec1be · 74ec1be
1 parent 625a3de
commit 74ec1be
Showing 1 changed file with 15 additions and 25 deletions.
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -1226,13 +1226,26 @@ function updatetokenattributedescriptions($iSurveyId)
     /**
     * Handle email action
     */
-    function email($iSurveyId, $aTokenIds = null)
+    function email($iSurveyId, $tids = null)
     {
         /* Check permissions */
         if (!hasSurveyPermission($iSurveyId, 'tokens', 'read'))
         {
             die("You do not have permission to view this page"); // TODO Replace
         }
+        $aTokenIds=$tids;
+        if (empty($tids))
+        {
+            $aTokenIds = Yii::app()->request->getPost('tokenids', false);
+        }
+        if (!empty($aTokenIds))
+        {
+            $aTokenIds = explode('|', $aTokenIds);
+            $aTokenIds = array_filter($aTokenIds);
+            $aTokenIds = array_map('sanitize_int', $aTokenIds);
+        }
+        $aTokenIds=array_unique(array_filter((array) $aTokenIds));        
+
         // CHECK TO SEE IF A TOKEN TABLE EXISTS FOR THIS SURVEY
         $bTokenExists = tableExists('{{tokens_' . $iSurveyId . '}}');
         if (!$bTokenExists) //If no tokens table exists
@@ -1260,7 +1273,6 @@ function email($iSurveyId, $aTokenIds = null)
         $aSurveyLangs = Survey::model()->findByPk($iSurveyId)->additionalLanguages;
         $sBaseLanguage = Survey::model()->findByPk($iSurveyId)->language;
         array_unshift($aSurveyLangs, $sBaseLanguage);
-        $aTokenIds = $this->_getTokenIds($aTokenIds, $iSurveyId);
         $aTokenFields = getTokenFieldsAndNames($iSurveyId, true);
         $iAttributes = 0;
         $bHtml = (getEmailFormat($iSurveyId) == 'html');
@@ -1440,7 +1452,7 @@ function email($iSurveyId, $aTokenIds = null)
                                 $slquery->date_invited = dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i", Yii::app()->getConfig("timeadjust"));
                                 $slquery->save();
                             }
-                            $tokenoutput .= " {$emrow['firstname']} {$emrow['lastname']} ({$emrow['email']})<br />\n";
+                            $tokenoutput .= "{$emrow['tid']}: {$emrow['firstname']} {$emrow['lastname']} ({$emrow['email']})<br />\n";
                             if (Yii::app()->getConfig("emailsmtpdebug") == 2)
                             {
                                 $tokenoutput .= $maildebug;
@@ -2302,28 +2314,6 @@ function _handletokenform($iSurveyId, $subaction, $iTokenId="")
         $this->_renderWrappedTemplate('token', array('tokenbar', 'tokenform'), $aData);
     }
 
-    private function _getTokenIds($aTokenIds, $iSurveyId)
-    {
-        // CHECK TO SEE IF A TOKEN TABLE EXISTS FOR THIS SURVEY
-        $bTokenExists = tableExists('{{tokens_' . $iSurveyId . '}}');
-        if (!$bTokenExists) //If no tokens table exists
-        {
-            self::_newtokentable($iSurveyId);
-        }
-        if (empty($aTokenIds))
-        {
-            $aTokenIds = Yii::app()->request->getPost('tokenids', false);
-        }
-        if (!empty($aTokenIds))
-        {
-            $aTokenIds = explode('|', $aTokenIds);
-            $aTokenIds = array_filter($aTokenIds);
-            $aTokenIds = array_map('sanitize_int', $aTokenIds);
-        }
-
-        return array_unique(array_filter((array) $aTokenIds));
-    }
-
     /**
     * Show dialogs and create a new tokens table
     */