Merge pull request #4 from nolach/master

Solve issue #2 ('save' button issue, etc.)
winteram · May 10, 2013 · 17f49e0 · 17f49e0
2 parents 3ddc03b + 970ec6d
commit 17f49e0
Show file tree

Hide file tree

Showing 5 changed files with 1,025 additions and 1,023 deletions.
diff --git a/core/fileManager.php b/core/fileManager.php
@@ -171,14 +171,14 @@ function writeoutput($output)
 				    }
 					else {
 						$errors = "";
-						// template name is set, has only alphanumeric characters, and is < 30 characters
+						// template name is set and is < 30 characters
 						if(!isset($form["template-name"]) ||
-							strlen($form["template-name"]) > 30 || 
-							$form["template-name"] != preg_replace('/[^A-Za-z0-9]+/','',$form["template-name"]))
+							strlen($form["template-name"]) > 30 /*|| 
+							$form["template-name"] != preg_replace('/[^A-Za-z0-9]+/','',$form["template-name"])*/)
 						{
 							$errors .= "<li class='error-item'>";
-							$errors .= "Please input a valid template name (less than 30 alphanumeric characters only) ";
-							$errors .= " </li>";
+							$errors .= "Please input a valid template name (less than 30 characters)";
+							$errors .= "</li>";
 						}
 						else
 						{
@@ -358,10 +358,10 @@ function writeoutput($output)
 							// else if template name has changed
 							else if ($_REQUEST['oldname'] != $form["template-name"])
 							{	
-								// check for template-name conflict happened earlier, so this is safe
+								// checked for template-name conflict happened earlier, so this is safe
 								rename("../templates/".$_REQUEST['oldname'],"../templates/".$form["template-name"]);
 
-								// check if old name is currently active, if so, change?
+								// check if old name is currently active, if so, change
 								// also need to rename in active.txt
 								$optArr = array('oldName'	=> $_REQUEST['oldname'],
 												'newName'	=> $form['template-name'],

diff --git a/core/instruct0.html b/core/instruct0.html
@@ -3,4 +3,4 @@
 <br><br>
 <div> Please enter a unique subject identifier; No more than 30 characters, alphanumeric only. </div>
 <br>
-<input type="submit" value="Submit Subject ID" onclick='console.log("test");loadInstructions("one");'>
+<input type="submit" value="Submit Subject ID" onclick='loadInstructions("one");'>
diff --git a/core/js/IAT.js b/core/js/IAT.js
@@ -4,7 +4,7 @@ sub = '';
 function randomString(length) {
 	var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
     var result = '';
-    for (var i = length; i > 0; --i) result += chars[Math.round(Math.random() * (chars.length - 1))];
+    for (var i = length; i > 0; --i) result += chars.charAt(Math.floor(Math.random() * (chars.length - 1)));
     return result;
 }