Dev: added a step to confirm token removal from optout

application/controllers/OptoutController.php

@@ -24,11 +24,55 @@ class OptoutController extends LSYii_Controller {
      public $layout = 'bare';
      public $defaultAction = 'tokens';
 
+
+     function actiontokens()
+     {
+
+
+         $iSurveyID     = Yii::app()->request->getQuery('surveyid');
+         $sLanguageCode = Yii::app()->request->getQuery('langcode');
+         $sToken        = Token::sanitizeToken(Yii::app()->request->getQuery('token'));
+
+         Yii::app()->loadHelper('database');
+         Yii::app()->loadHelper('sanitize');
+
+         //IF there is no survey id, redirect back to the default public page
+         if (!$iSurveyID){
+             $this->redirect(array('/'));
+         }
+
+         $iSurveyID = (int)$iSurveyID; //Make sure it's an integer (protect from SQL injects)
+         //Check that there is a SID
+         // Get passed language from form, so that we dont lose this!
+         if (!isset($sLanguageCode) || $sLanguageCode == "" || !$sLanguageCode)
+         {
+             $sBaseLanguage = Survey::model()->findByPk($iSurveyID)->language;
+         }
+         else
+         {
+             $sBaseLanguage = sanitize_languagecode($sLanguageCode);
+         }
+
+         Yii::app()->setLanguage($sBaseLanguage);
+
+         $aSurveyInfo=getSurveyInfo($iSurveyID,$sBaseLanguage);
+
+         if ($aSurveyInfo==false || !tableExists("{{tokens_{$iSurveyID}}}")){
+             throw new CHttpException(404, "The survey in which you are trying to participate does not seem to exist. It may have been deleted or the link you were given is outdated or incorrect.");
+         }else{
+             $sMessage = "<p>".gT('This will remove you from this survey.')."</p>";
+             $sMessage .= '<p><a href="'.Yii::app()->createUrl('optout/removetokens', array('surveyid'=>$iSurveyID, 'langcode'=> $sBaseLanguage, 'token' => $sToken )).'" class="btn btn-default btn-lg">'.gT("Continue").'</a><p>';
+             $this->_renderHtml($sMessage, $aSurveyInfo, $iSurveyID);
+         }
+
+
+     }
+
     /**
      * This function is run when opting out of an individual token table. The other function /optout/participants
      * opts the user out of ALL survey invitations from the system
      */
-    function actiontokens()
+    function actionremovetokens()
     {
         $iSurveyID=Yii::app()->request->getQuery('surveyid');
         $sLanguageCode=Yii::app()->request->getQuery('langcode');