Fixed issue #8537: Survey admin allows token length to be set at a va…

…lue that exceeds schema column width (36)
LimeSurvey · Jan 17, 2014 · 521095a · 521095a
1 parent 528a218
commit 521095a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php
@@ -1016,6 +1016,10 @@ function index($sa = null)
             {
                 $tokenlength = 15;
             }
+            if($tokenlength > 36)
+            {
+                $tokenlength = 36;
+            }
 
             cleanLanguagesFromSurvey($iSurveyID,Yii::app()->request->getPost('languageids'));
 

diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -1492,7 +1492,18 @@ function insert($iSurveyID=null)
                 $converter = new Date_Time_Converter($sExpiryDate, $aDateFormatData['phpdate'] . ' H:i:s');
                 $sExpiryDate = $converter->convert("Y-m-d H:i:s");
             }
-
+
+            $iTokenLength=$_POST['tokenlength'];
+            //token length has to be at least 5, otherwise set it to default (15)
+            if($iTokenLength < 5)
+            {
+                $iTokenLength = 15;
+            }
+            if($iTokenLength > 36)
+            {
+                $iTokenLength = 36;
+            }
+
             // Insert base settings into surveys table
             $aInsertData = array(
             'expires' => $sExpiryDate,
@@ -1535,7 +1546,7 @@ function insert($iSurveyID=null)
             'publicgraphs' => $_POST['publicgraphs'],
             'assessments' => $_POST['assessments'],
             'emailresponseto' => $_POST['emailresponseto'],
-            'tokenlength' => $_POST['tokenlength']
+            'tokenlength' => $iTokenLength
             );
 
             $warning = '';

diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -182,7 +182,7 @@ public function rules()
         array('format', 'in','range'=>array('G','S','A'), 'allowEmpty'=>true),
         array('googleanalyticsstyle', 'numerical', 'integerOnly'=>true, 'min'=>'0', 'max'=>'2', 'allowEmpty'=>true), 
         array('autonumber_start','numerical', 'integerOnly'=>true,'allowEmpty'=>true),
-        array('tokenlength','numerical', 'integerOnly'=>true,'allowEmpty'=>true),
+        array('tokenlength','numerical', 'integerOnly'=>true,'allowEmpty'=>true, 'min'=>'5', 'max'=>'36'),
         array('bouncetime','numerical', 'integerOnly'=>true,'allowEmpty'=>true),
         array('navigationdelay','numerical', 'integerOnly'=>true,'allowEmpty'=>true),
       //  array('expires','date', 'format'=>array('yyyy-MM-dd', 'yyyy-MM-dd HH:mm', 'yyyy-MM-dd HH:mm:ss',), 'allowEmpty'=>true),

diff --git a/application/views/admin/survey/subview/tabTokens_view.php b/application/views/admin/survey/subview/tabTokens_view.php
@@ -1,5 +1,4 @@
 <div id='tokens'><ul>
-
         <li><label for='anonymized'><?php $clang->eT("Anonymized responses?"); ?>
 
                 <script type="text/javascript"><!--
@@ -16,7 +15,6 @@ function alertPrivacy()
                         }
                     }
                     //--></script></label>
-
             <?php if ($esrow['active'] == "Y") {
                     if ($esrow['anonymized'] == "N") { ?>
                     <?php $clang->eT("Responses to this survey are NOT anonymized."); ?>
@@ -114,11 +112,8 @@ function alertPrivacy()
                     ><?php $clang->eT("No"); ?></option>
             </select>
         </li>
-
-
         <li><label for='tokenlength'><?php $clang->eT("Set token length to:"); ?></label>
-            <input type='text' value="<?php echo $esrow['tokenlength']; ?>" name='tokenlength' id='tokenlength' size='12' maxlength='2' onkeypress="return goodchars(event,'0123456789')" />
+            <input type='text' value="<?php echo $esrow['tokenlength']; ?>" name='tokenlength' id='tokenlength' size='4' maxlength='2' onkeypress="return goodchars(event,'0123456789')" />
         </li>
-
-
     </ul></div>
+