Fixed multiple question mandatory checking, but not completed yet.. s…

…ome progress made.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/trunk/unstable@798 b72ed6b6-b9f8-46b5-92b4-906544132732

group.php

@@ -60,9 +60,9 @@
 	$mi=0;
 	foreach ($chkmands as $cm)
 		{
-		if (!isset($multiname) || $multiname != "MULTI$mfns[$mi]") 
+		if (!isset($multiname) || $multiname != "MULTI$mfns[$mi]") //no multiple type mandatory set, or does not match this question
 			{
-			if ((isset($multiname) && $multiname) && (isset($_POST[$multiname]) && $_POST[$multiname]))
+			if ((isset($multiname) && $multiname) && (isset($_POST[$multiname]) && $_POST[$multiname])) //multiple type mandatory is set
 				{
 				if ($$multiname == $$multiname2) //so far all multiple choice options are unanswered
 					{
@@ -76,12 +76,13 @@
 					}
 				}
 			$multiname="MULTI$mfns[$mi]";
-			$multiname2=$multiname; //POSSIBLE CORRUPTION OF PROCESS - CHECK LATER
+			$multiname2=$multiname."2"; //POSSIBLE CORRUPTION OF PROCESS - CHECK LATER
 			$$multiname=0; 
 			$$multiname2=0;
 			}
 		else {$multiname="MULTI$mfns[$mi]";}
-		if ($_SESSION[$cm] == "0" || $_SESSION[$cm])
+		//if ($_SESSION[$cm] == "0" || $_SESSION[$cm])
+		if (isset($_SESSION[$cm]))
 			{
 			}
 		elseif (!isset($_POST[$multiname]) || !$_POST[$multiname])
@@ -143,7 +144,8 @@
 			}
 		else{$multiname="MULTI$cmfns[$mi]";}
 		$dccm="display$cmfns[$mi]";
-		if (($_SESSION[$ccm] == "0" || $_SESSION[$ccm]) && $_POST[$dccm] == "on")//There is an answer
+		//if (($_SESSION[$ccm] == "0" || $_SESSION[$ccm]) && $_POST[$dccm] == "on")//There is an answer
+		if (isset($_SESSION[$ccm]) && isset($_POST[$dccm]) && $_POST[$dccm] == "on")
 			{
 			}
 		elseif ($_POST[$dccm] == "on" && (!isset($_POST[$multiname]) || !$_POST[$multiname])) //Question is on, there is no answer, but it's a multiple
@@ -156,7 +158,7 @@
 		elseif ($_POST[$dccm] == "on")
 			{
 			//One of the conditional mandatory questions was on, but hasn't been answered
-			$$multiname++; 
+			$$multiname++;
 			}
 		$$multiname2++;
 		$mi++;

qanda.php

@@ -484,15 +484,19 @@
 		$anscount = mysql_num_rows($ansresult);
 		$answer .= "\t\t\t\t\t<input type='hidden' name='MULTI$ia[1]' value='$anscount'>\n";
 		$fn = 1;
+		if (!isset($multifields)) {$multifields="";}
 		while ($ansrow = mysql_fetch_array($ansresult))
 			{
 			$myfname = $ia[1].$ansrow['code'];
+			//LOOK HERE: TAKE OUT/MODIFY
 			$multifields .= "$fname{$ansrow['code']}|";
 			$answer .= "\t\t\t\t\t\t<input class='checkbox' type='checkbox' name='$ia[1]{$ansrow['code']}' id='$ia[1]{$ansrow['code']}' value='Y'";
-			if ($_SESSION[$myfname] == "Y") {$answer .= " checked";}
+			if (isset($_SESSION[$myfname]) && $_SESSION[$myfname] == "Y") {$answer .= " checked";}
 			$answer .= " onClick='checkconditions(this.value, this.name, this.type)' /><label for='$ia[1]{$ansrow['code']}' class='answertext'>{$ansrow['answer']}</label><br />\n";
 			$fn++;
-			$answer .= "\t\t\t\t<input type='hidden' name='java$myfname' id='java$myfname' value='{$_SESSION[$myfname]}'>\n";
+			$answer .= "\t\t\t\t<input type='hidden' name='java$myfname' id='java$myfname' value='";
+			if (isset($_SESSION[$myfname])) {$answer .= $_SESSION[$myfname];}
+			$answer .= "'>\n";
 			$inputnames[]=$myfname;
 			if ($ia[6] == "Y" && $ia[7] != "Y") //Question is mandatory. Add to mandatory array
 				{
@@ -509,9 +513,11 @@
 			{
 			$myfname = $ia[1]."other";
 			$answer .= "\t\t\t\t\t\t"._OTHER.": <input class='text' type='text' name='$myfname'";
-			if ($_SESSION[$myfname]) {$answer .= " value='".$_SESSION[$myfname]."'";}
+			if (isset($_SESSION[$myfname])) {$answer .= " value='".$_SESSION[$myfname]."'";}
 			$answer .= " />\n"
-					 . "\t\t\t\t<input type='hidden' name='java$myfname' id='java$myfname' value='{$_SESSION[$myfname]}'>\n";
+					 . "\t\t\t\t<input type='hidden' name='java$myfname' id='java$myfname' value='";
+			if (isset($_SESSION[$myfname])) {$answer .= $_SESSION[$myfname];}
+			$answer .= "'>\n";
 			$inputnames[]=$myfname;
 			$anscount++;
 			if ($ia[6] == "Y" && $ia[7] != "Y") //Question is mandatory. Add to mandatory array

question.php

@@ -77,12 +77,12 @@
 					}
 				}
 			$multiname="MULTI$mfns[$mi]";
-			$multiname2=$multiname; //POSSIBLE CORRUPTION OF PROCESS - CHECK LATER
+			$multiname2=$multiname."2"; //POSSIBLE CORRUPTION OF PROCESS - CHECK LATER
 			$$multiname=0; 
 			$$multiname2=0;
 			}
 		else {$multiname="MULTI$mfns[$mi]";}
-		if ($_SESSION[$cm] == "0" || $_SESSION[$cm])
+		if (isset($_SESSION[$cm]) && ($_SESSION[$cm] == "0" || $_SESSION[$cm]))
 			{
 			}
 		elseif (!isset($_POST[$multiname]) || !$_POST[$multiname])
@@ -139,7 +139,7 @@
 			if (isset($_POST['move']) && $_POST['move'] == " "._LAST." ") {$_SESSION['step'] = $_POST['thisstep']; $_POST['move'] == " "._NEXT." >> ";}
 			$notanswered[]=$cmfns[$mi];
 			}
-		elseif ($_POST[$dccm] == "on" && !$_SESSION[$ccm] && $_POST[$multiname])
+		elseif ($_POST[$dccm] == "on" && !$_SESSION[$ccm] && isset($_POST[$multiname]))
 			{
 			$notanswered[]=$cmfns[$mi];
 			}

survey.php

@@ -73,7 +73,7 @@
 					}
 				}
 			$multiname="MULTI$mfns[$mi]";
-			$multiname2=$multiname; //POSSIBLE CORRUPTION OF PROCESS - CHECK LATER
+			$multiname2=$multiname."2"; //POSSIBLE CORRUPTION OF PROCESS - CHECK LATER
 			$$multiname=0;
 			$$multiname2=0;
 			}