Fixed 4533: Tokens with hyphen cause error when exit & clearall is used

dev: Made the hyphen forbidden in tokens by updating the sanitize token function to strip the hyphen and use the sanitized token in duplicate check git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@9100 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Sep 1, 2010 · 3136ed3 · 3136ed3
1 parent fecb055
commit 3136ed3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/admin/tokens.php b/admin/tokens.php
@@ -2586,14 +2586,15 @@
                     $invalidemaillist[]=$line[0]." ".$line[1]." (".$line[2].")";
                 }
 
+                if (!isset($writearray['token'])) {
+                    $writearray['token'] = '';
+                } else {
+                    $writearray['token']=sanitize_token($writearray['token']);
+                }
+
                 if (!$dupfound && !$invalidemail)
                 {
                     if (!isset($writearray['emailstatus']) || $writearray['emailstatus']=='') $writearray['emailstatus'] = "OK";
-                    if (!isset($writearray['token'])) {
-                        $writearray['token'] = '';
-                    }else{
-                        $writearray['token']=sanitize_token($writearray['token']);
-                    }
                     if (!isset($writearray['language']) || $writearray['language'] == "") $writearray['language'] = $baselanguage;
                     if (isset($writearray['validfrom']) && trim($writearray['validfrom']=='')){ unset($writearray['validfrom']);}
                     if (isset($writearray['validuntil']) && trim($writearray['validuntil']=='')){ unset($writearray['validuntil']);}

diff --git a/classes/core/sanitize.php b/classes/core/sanitize.php
@@ -371,7 +371,7 @@ function sanitize_languagecodeS($codestringtosanitize) {
 }
 
 function sanitize_token($codetosanitize) {
-    return preg_replace('/[^_a-z0-9-]/i', '', $codetosanitize);
+    return preg_replace('/[^_a-z0-9]/i', '', $codetosanitize);
 }
 
 function sanitize_signedint($integer, $min='', $max='')