Fixed issue #5678: usesleft field is not created by RemoteControl in …

…tokens table git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@12125 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jan 20, 2012 · 46eef71 · 46eef71
1 parent 364228b
commit 46eef71
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/admin/remotecontrol/lsrc.helper.php b/admin/remotecontrol/lsrc.helper.php
@@ -2221,6 +2221,7 @@ function createTokenTable($iVid, $att=0)
 			. "remindersent C(17) DEFAULT 'N',\n "
 			. "remindercount int I DEFAULT 0,\n "
 			. "completed C(17) DEFAULT 'N',\n "
+			. "usesleft I DEFAULT 1,\n"
 			. "validfrom date ,\n "
 			. "validuntil date ,\n "
 			. "mpid I ";

diff --git a/common_functions.php b/common_functions.php
@@ -7364,25 +7364,25 @@ function sGetTemplatePath($sTemplateName)
     global $standardtemplaterootdir, $usertemplaterootdir, $defaulttemplate;
     if (isStandardTemplate($sTemplateName))
     {
-        return $standardtemplaterootdir.'/'.$sTemplateName;
+        return $standardtemplaterootdir.DIRECTORY_SEPARATOR.$sTemplateName;
     }
     else
     {
-        if (file_exists($usertemplaterootdir.'/'.$sTemplateName))
+        if (file_exists($usertemplaterootdir.DIRECTORY_SEPARATOR.$sTemplateName))
         {
-            return $usertemplaterootdir.'/'.$sTemplateName;
+            return $usertemplaterootdir.DIRECTORY_SEPARATOR.$sTemplateName;
         }
-        elseif (file_exists($usertemplaterootdir.'/'.$defaulttemplate))
+        elseif (file_exists($usertemplaterootdir.DIRECTORY_SEPARATOR.$defaulttemplate))
         {
-            return $usertemplaterootdir.'/'.$defaulttemplate;
+            return $usertemplaterootdir.DIRECTORY_SEPARATOR.$defaulttemplate;
         }
-        elseif (file_exists($standardtemplaterootdir.'/'.$defaulttemplate))
+        elseif (file_exists($standardtemplaterootdir.DIRECTORY_SEPARATOR.$defaulttemplate))
         {
-            return $standardtemplaterootdir.'/'.$defaulttemplate;
+            return $standardtemplaterootdir.DIRECTORY_SEPARATOR.$defaulttemplate;
         }
         else
         {
-            return $standardtemplaterootdir.'/default';
+            return $standardtemplaterootdir.DIRECTORY_SEPARATOR.'default';
         }
     }
 }