From 01589a1518e778993c6fa03b071b3eef2761fd44 Mon Sep 17 00:00:00 2001
From: jacob <jacob>
Date: Tue, 20 Dec 2011 15:21:48 +0000
Subject: [PATCH] Bug fixes for conference managament "wizard".

---
 super/conferences.php | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/super/conferences.php b/super/conferences.php
index 6ea64f14..3d9a420c 100644
--- a/super/conferences.php
+++ b/super/conferences.php
@@ -908,33 +908,39 @@ function copy_conference($params){
 	if($errorMessage != ''){ wizard_draw_step('error', 'SQL error before line #' . __LINE__ . ': <br/>' . $errorMessage); rollback($newConfId, $completedTables); return false; }
 
 	// timeslots and rounds
-	$q = mysql_query("SELECT snoobaloo * FROM judges_timeslots WHERE conferences_id='$oldConfId' AND round_id='0'");
+	$q = mysql_query("SELECT * FROM judges_timeslots WHERE conferences_id='$oldConfId' AND round_id='0'");
 	$errorMessage = mysql_error();
 	while($errorMessage == '' && $r=mysql_fetch_assoc($q)) {
 		if($params['rollDates'] == 'yes'){
-			mysql_query("INSERT INTO judges_timeslots (`conferences_id`,`round_id`,`type`,`date`,`starttime`,`endtime`,`name`)
+			$queryText = "INSERT INTO judges_timeslots (`conferences_id`,`round_id`,`type`,`date`,`starttime`,`endtime`,`name`)
 				VALUES ('$newConfId','0','{$r['type']}',DATE_ADD('{$r['date']}', INTERVAL 1 YEAR),
-					'{$r['starttime']}','{$r['endtime']}','{$r['name']}')");
+					'{$r['starttime']}','{$r['endtime']}','{$r['name']}')";
 		}else{
-			mysql_query("INSERT INTO judges_timeslots (`conferences_id`,`round_id`,`type`,`date`,`starttime`,`endtime`,`name`)
+			$queryText = "INSERT INTO judges_timeslots (`conferences_id`,`round_id`,`type`,`date`,`starttime`,`endtime`,`name`)
 				VALUES ('$newConfId','0','{$r['type']}','{$r['date']}',
-					'{$r['starttime']}','{$r['endtime']}','{$r['name']}')");
+					'{$r['starttime']}','{$r['endtime']}','{$r['name']}')";
 		}
+		mysql_query($queryText);
 		$errorMessage .= mysql_error();
 		$round_id = mysql_insert_id();
 		$qq = mysql_query("SELECT * FROM judges_timeslots WHERE round_id='{$r['id']}'");
 		if($params['rollDates'] == 'yes'){
-			while($rr=mysql_fetch_assoc($qq) && mysql_error() == '')
-				mysql_query("INSERT INTO judges_timeslots (`conferences_id`,`round_id`,`type`,`date`,`starttime`,`endtime`)
+			while(($rr=mysql_fetch_assoc($qq)) && $errorMessage == ''){
+				$queryText = "INSERT INTO judges_timeslots (`conferences_id`,`round_id`,`type`,`date`,`starttime`,`endtime`)
 						VALUES ('$newConfId','$round_id','timeslot',DATE_ADD('{$rr['date']}', INTERVAL 1 YEAR),
-							'{$rr['starttime']}','{$rr['endtime']}')");
+							'{$rr['starttime']}','{$rr['endtime']}')";
+				mysql_query($queryText);
+				$errorMessage .= mysql_error();
+			}
 		}else{
-			while($rr=mysql_fetch_assoc($qq) && mysql_error() == '')
-				mysql_query("INSERT INTO judges_timeslots (`conferences_id`,`round_id`,`type`,`date`,`starttime`,`endtime`)
+			while(($rr=mysql_fetch_assoc($qq)) && $errorMessage == ''){
+				$queryText = "INSERT INTO judges_timeslots (`conferences_id`,`round_id`,`type`,`date`,`starttime`,`endtime`)
 						VALUES ('$newConfId','$round_id','timeslot','{$rr['date']}',
-							'{$rr['starttime']}','{$rr['endtime']}')");
+							'{$rr['starttime']}','{$rr['endtime']}')";
+				mysql_query($queryText);
+				$errorMessage .= mysql_error();
+			}
 		}
-		$errorMessage .=  mysql_error();
 	}
 	$completedTables[] = 'judges_timeslots';
 	if($errorMessage != ''){ wizard_draw_step('error', 'SQL error before line #' . __LINE__ . ': <br/>' . $errorMessage); rollback($newConfId, $completedTables); return false; }