Don't copy course availability on whole course copy

Include instructor's group name in profile info
Bug fix syntax error on 3x+x(1+x) caused by overlap of regex
Bug fix f() variable not working if listed before regular variables

assessment/displayq2.php

@@ -1558,7 +1558,7 @@ function makeanswerbox($anstype, $qn, $la, $options,$multi,$colorbox='') {
 		if (count($ovar)==0) {
 			$ovar[] = "x";
 		}
-		$vlist = implode("|",$ovar);
+		$vlist = implode("|",$variables);
 		$flist = implode('|',$ofunc);
 		$out .= "<script type=\"text/javascript\">functoproc[$qn] = 1; vlist[$qn]=\"$vlist\"; flist[$qn]=\"$flist\";</script>\n";
 		if (isset($domain)) {$fromto = explode(",",$domain);} else {$fromto[0]=-10; $fromto[1]=10;}

assessment/header.php

@@ -96,7 +96,7 @@ function getlastanswer(qn, part) {
 }
 
 if ($sessiondata['graphdisp']==1) {
-	echo "<script src=\"$imasroot/javascript/ASCIIsvg_min.js?v=101314\" type=\"text/javascript\"></script>\n";
+	echo "<script src=\"$imasroot/javascript/ASCIIsvg_min.js?v=121514\" type=\"text/javascript\"></script>\n";
 	echo "<script type=\"text/javascript\">var usingASCIISvg = true;</script>";
 } else {
 	echo "<script src=\"$imasroot/javascript/mathjs.js?v=101314\" type=\"text/javascript\"></script>\n";
@@ -115,7 +115,7 @@ function getlastanswer(qn, part) {
 }
 </style> 
 <![endif]--> 
-<script src="<?php echo $imasroot . "/javascript/AMhelpers_min.js?v=101314";?>" type="text/javascript"></script>
+<script src="<?php echo $imasroot . "/javascript/AMhelpers_min.js?v=121514";?>" type="text/javascript"></script>
 <script src="<?php echo $imasroot . "/javascript/confirmsubmit.js";?>" type="text/javascript"></script>
 <!--[if lt IE 9]>
 <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js"></script>

course/copyitems.php

@@ -100,7 +100,7 @@
 			}
 			mysql_query("START TRANSACTION") or die("Query failed :$query " . mysql_error());
 			if (isset($_POST['copycourseopt'])) {
-				$tocopy = 'ancestors,hideicons,allowunenroll,copyrights,msgset,topbar,cploc,picicons,chatset,showlatepass,available,theme';
+				$tocopy = 'ancestors,hideicons,allowunenroll,copyrights,msgset,topbar,cploc,picicons,chatset,showlatepass,theme';
 
 				$query = "SELECT $tocopy FROM imas_courses WHERE id='{$_POST['ctc']}'";
 				$result = mysql_query($query) or die("Query failed :$query " . mysql_error());

forms.php

@@ -103,6 +103,12 @@
 		echo '<fieldset id="userinfoprofile"><legend>Profile Settings</legend>';
 		echo "<span class=form><label for=\"firstname\">Enter First Name:</label></span> <input class=form type=text size=20 id=firstname name=firstname value=\"{$line['FirstName']}\" /><br class=\"form\" />\n";
 		echo "<span class=form><label for=\"lastname\">Enter Last Name:</label></span> <input class=form type=text size=20 id=lastname name=lastname value=\"{$line['LastName']}\"><BR class=form>\n";
+		if ($myrights>10 && $groupid>0) {
+			$query = "SELECT name FROM imas_groups WHERE id=".intval($groupid);
+			$result = mysql_query($query) or die("Query failed : " . mysql_error());
+			$r = mysql_fetch_row($result);
+			echo '<span class="form">'._('Group').':</span><span class="formright">'.$r[0].'</span><br class="form"/>';
+		}
 		echo '<span class="form"><label for="dochgpw">Change Password?</label></span> <span class="formright"><input type="checkbox" name="dochgpw" onclick="togglechgpw(this.checked)" /></span><br class="form" />';
 		echo '<div style="display:none" id="pwinfo">';
 		echo "<span class=form><label for=\"oldpw\">Enter old password:</label></span> <input class=form type=password id=oldpw name=oldpw size=40 /> <BR class=form>\n";

javascript/AMhelpers.js

@@ -648,10 +648,9 @@ function AMpreview(inputId,outputId) {
   if (fl!='') {
 	  reg = new RegExp("("+fl+")\\(","g");
 	  str = str.replace(reg,"$1*sin($1+");
-	  vl = vl+'|'+fl;
   }
   vars = vl.split('|');
-  var totesteqn = mathjs(str,vl); 
+  var totesteqn = mathjs(str,vl);
 
   while (tstpt<ptlist.length && (isNaN(res) || res=="Infinity")) {
 	  var totest = '';
@@ -963,12 +962,11 @@ function doonsubmit(form,type2,skipconfirm) {
 		if (fl!='') {
 			reg = new RegExp("("+fl+")\\(","g");
 			str = str.replace(reg,"$1*sin($1+");
-			varlist = varlist+'|'+fl;
 		}
 		vars = varlist.split("|");
 		var nh = document.getElementById("qn" + qn);
 		nh.value = mathjs(str,varlist);
-
+		
 		ptlist = pts[qn].split(",");
 		vals= new Array();
 		for (var fj=0; fj<ptlist.length;fj++) { //for each set of inputs

javascript/ASCIIsvg.js

@@ -1052,6 +1052,8 @@ function mathjs(st,varlist) {
 	 // var reg = new RegExp("("+varlist+")("+varlist+")(\w*[^\(#])","g");
 	  //st = st.replace(reg,"($1)($2)$3"); //get xysin
 	  var reg = new RegExp("([^a-df-zA-Z#])("+varlist+")([^a-df-zA-Z#])","g");
+	  st = st.replace(reg,"$1($2)$3");
+	  var reg = new RegExp("([^a-df-zA-Z#\(])("+varlist+")([^a-df-zA-Z#\)])","g"); //do second time for overlap, like 5x+f(3)
 	  st = st.replace(reg,"$1($2)$3");	  
 	  var reg = new RegExp("^("+varlist+")([^a-df-zA-Z])","g");
 	  st = st.replace(reg,"($1)$2");

javascript/mathjs.js

@@ -109,6 +109,8 @@ function mathjs(st,varlist) {
 	  st = st.replace(reg,"($1)$2");
 	  var reg = new RegExp("("+varlist+")("+varlist+")([^a-df-zA-Z#])","g"); // 10/25/10 re-removed \( for x(1+x); moved f() handling to AMhelpers;  6/1/09 readded \( for f(350/x)
 	  st = st.replace(reg,"($1)($2)$3"); //get xy3
+	  var reg = new RegExp("([^a-df-zA-Z#\(])("+varlist+")([^a-df-zA-Z#\)])","g"); //do second time for overlap, like 5x+f(3)
+	  st = st.replace(reg,"$1($2)$3");	  
 	 // var reg = new RegExp("("+varlist+")("+varlist+")(\w*[^\(#])","g");
 	  //st = st.replace(reg,"($1)($2)$3"); //get xysin
 	  var reg = new RegExp("([^a-df-zA-Z#])("+varlist+")([^a-df-zA-Z#])","g");