DEV: remove deprecated sanitize_token($codetosanitize) and replace al…

…l instances (#750)
LimeSurvey · Jul 7, 2017 · 8823890 · 8823890
1 parent 936bf62
commit 8823890
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -450,7 +450,7 @@ public function editToken($iSurveyId)
             'lastname' => flattenText(Yii::app()->request->getPost('lastname')),
             'email' => flattenText(Yii::app()->request->getPost('email')),
             'emailstatus' => flattenText(Yii::app()->request->getPost('emailstatus')),
-            'token' => sanitize_token(Yii::app()->request->getPost('token')),
+            'token' => Token::sanitizeToken(Yii::app()->request->getPost('token')),
             'language' => flattenText(Yii::app()->request->getPost('language')),
             'sent' => flattenText(Yii::app()->request->getPost('sent')),
             'remindersent' => flattenText(Yii::app()->request->getPost('remindersent')),
@@ -485,7 +485,7 @@ public function editToken($iSurveyId)
                 'lastname' => flattenText(Yii::app()->request->getPost('lastname')),
                 'email' => flattenText(Yii::app()->request->getPost('email')),
                 'emailstatus' => flattenText(Yii::app()->request->getPost('emailstatus')),
-                'token' => sanitize_token(Yii::app()->request->getPost('token')),
+                'token' => Token::sanitizeToken(Yii::app()->request->getPost('token')),
                 'language' => flattenText(Yii::app()->request->getPost('language')),
                 'sent' => flattenText(Yii::app()->request->getPost('sent')),
                 'remindersent' => flattenText(Yii::app()->request->getPost('remindersent')),
@@ -581,7 +581,7 @@ public function addnew($iSurveyId)
                 $validuntil = $datetimeobj->convert('Y-m-d H:i:s');
             }
 
-            $sanitizedtoken = sanitize_token($request->getPost('token'));
+            $sanitizedtoken = Token::sanitizeToken($request->getPost('token'));
 
             $aData = array(
                 'firstname' => flattenText($request->getPost('firstname')),
@@ -703,7 +703,7 @@ public function edit($iSurveyId, $iTokenId, $ajax = false)
             $aTokenData['lastname'] = flattenText($request->getPost('lastname'));
             $aTokenData['email'] = flattenText($request->getPost('email'));
             $aTokenData['emailstatus'] = flattenText($request->getPost('emailstatus'));
-            $sSanitizedToken = sanitize_token($request->getPost('token'));
+            $sSanitizedToken = Token::sanitizeToken($request->getPost('token'));
             $aTokenData['token'] = $sSanitizedToken;
             $aTokenData['language'] = sanitize_languagecode($request->getPost('language'));
             $aTokenData['sent'] = flattenText($request->getPost('sent'));
@@ -2193,7 +2193,7 @@ public function import($iSurveyId)
 
                         if (!$bDuplicateFound && !$bInvalidEmail && isset($aWriteArray['token']) && trim($aWriteArray['token'])!='')
                         {
-                            if (trim($aWriteArray['token']) != sanitize_token($aWriteArray['token']))
+                            if (trim($aWriteArray['token']) != Token::sanitizeToken($aWriteArray['token']))
                             {
                                 $aInvalidTokenList[] = sprintf(gT("Line %s : %s %s (%s) - token : %s"),$iRecordCount,CHtml::encode($aWriteArray['firstname']),CHtml::encode($aWriteArray['lastname']),CHtml::encode($aWriteArray['email']),CHtml::encode($aWriteArray['token']));
                                 $bInvalidToken=true;

diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -1431,7 +1431,7 @@ private function manageClearAll()
 
             global $token;
             if($token){
-                $restartparam['token'] = sanitize_token($token);
+                $restartparam['token'] = Token::sanitizeToken($token);
             }
 
             if (Yii::app()->request->getQuery('lang')){

diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php
@@ -318,7 +318,7 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
     {
         $restartparam=array();
         if($_token)
-            $restartparam['token']=sanitize_token($_token);// urlencode with needed with sanitize_token
+            $restartparam['token']=Token::sanitizeToken($_token);// urlencode with needed with sanitize_token
         if (Yii::app()->request->getQuery('lang'))
             $restartparam['lang']=sanitize_languagecode(Yii::app()->request->getQuery('lang'));
         elseif($s_lang)

diff --git a/application/helpers/sanitize_helper.php b/application/helpers/sanitize_helper.php
@@ -428,12 +428,6 @@ function sanitize_languagecodeS($codestringtosanitize) {
     return implode(" ",$codearray);
 }
 
-/**
- * @deprecated use Token::sanitizeToken($codetosanitize);
- */
-function sanitize_token($codetosanitize) {
-    return Token::sanitizeToken($codetosanitize);
-}
 
 function sanitize_signedint($integer, $min='', $max='')
 {