Fix Awards System

.devcontainer/science-ation-blank-generic.sql

@@ -1771,9 +1771,10 @@ CREATE TABLE `projectcategories` (
 LOCK TABLES `projectcategories` WRITE;
 /*!40000 ALTER TABLE `projectcategories` DISABLE KEYS */;
 INSERT INTO `projectcategories` VALUES
-(1,'junor','',7,8,2025),
+(1,'Junior','',7,8,2025),
-(2,'senior','',11,12,2025),
+(2,'Intermediate','',9,10,2025),
-(3,'int','',9,10,2025);
+(3,'Senior','',11,12,2025);
+
 /*!40000 ALTER TABLE `projectcategories` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3131,7 +3132,7 @@ CREATE TABLE `schools` (
 LOCK TABLES `schools` WRITE;
 /*!40000 ALTER TABLE `schools` DISABLE KEYS */;
 INSERT INTO `schools` VALUES
-(1,'sd','','','','','','','','','','','','',NULL,NULL,'','','','','',2025,NULL,0,0,0,'',0,'total','no');
+(1,'Sample School','','','','','','','','','','','','',NULL,NULL,'','','','','',2025,NULL,0,0,0,'',0,'total','no');
 /*!40000 ALTER TABLE `schools` ENABLE KEYS */;
 UNLOCK TABLES;
 

admin/award_awards.php

@@ -31,16 +31,15 @@ require_once ('awards.inc.php');
 $_GET['action'] = $_GET['action'] ?? '';
 
 switch ($_GET['action']) {
-	case 'awardinfo_load':
+	case 'awardinfo_load':;
-		                    ;
 		$id = intval(get_value_from_array($_GET, 'id'));
-		$q = $pdo->prepare("SELECT * FROM award_awards WHERE id=?");
+		$q = $pdo->prepare('SELECT * FROM award_awards WHERE id=?');
 		$q->execute([$id]);
 		$ret = $q->fetch(PDO::FETCH_ASSOC);
 
 		// json_encode NEEDS UTF8 DATA, but we store it in the database as ISO :(
 		foreach ($ret AS $k => $v) {
-			$ret[$k] = iconv('ISO-8859-1', 'UTF-8', $v);
+			$ret[$k] = iconv('ISO-8859-1', 'UTF-8', get_value_or_default($v, ''));
 		}
 		// echo iconv("ISO-8859-1","UTF-8",json_encode($ret));
 		echo json_encode($ret);
@@ -55,17 +54,17 @@ switch ($_GET['action']) {
 		/* Scrub the data while we save it */
 		$id = intval($_POST['id']);
 
-		if ($id == -1) {
+		try {
-			$q = $pdo->prepare("INSERT INTO award_awards (year,self_nominate,schedule_judges) 
+			if ($id == -1) {
+				$q = $pdo->prepare("INSERT INTO award_awards (year,self_nominate,schedule_judges) 
 					VALUES (?,'yes','yes')");
-			$q->execute([$config['FAIRYEAR']]);
+				$q->execute([$config['FAIRYEAR']]);
-			$id = $pdo->lastInsertId();
+				$id = $pdo->lastInsertId();
-			happy_('Award Created');
+				/* Set the award_id in the client */
-			/* Set the award_id in the client */
+				echo "<script type=\"text/javascript\">award_id=$id;</script>";
-			echo "<script type=\"text/javascript\">award_id=$id;</script>";
+			}
-		}
 
-		$q = "UPDATE award_awards SET 
+			$q = "UPDATE award_awards SET 
 			award_types_id='" . intval($_POST['award_types_id']) . "',
 			presenter='" . iconv('UTF-8', 'ISO-8859-1', stripslashes($_POST['presenter'])) . "', 
 			excludefromac='" . (($_POST['excludefromac'] == 1) ? 1 : 0) . "',
@@ -74,21 +73,32 @@ switch ($_GET['action']) {
 			schedule_judges='" . (($_POST['schedule_judges'] == 'yes') ? 'yes' : 'no') . "', 
 			description='" . iconv('UTF-8', 'ISO-8859-1', stripslashes($_POST['description'])) . "' ";
 
-		if (array_key_exists('name', $_POST)) {
+			
-			/*
+			if (array_key_exists('name', $_POST)) {
-			 * These values may be disabled, if they name key exists, assume
+				/*
-			 * they aren't disabled and save them too
+				 * These values may be disabled, if they name key exists, assume
-			 */
+				 * they aren't disabled and save them too
-			$q .= ",name='" . iconv('UTF-8', 'ISO-8859-1', stripslashes($_POST['name'])) . "',
+				 */
-				criteria='" . iconv('UTF-8', 'ISO-8859-1', stripslashes($_POST['criteria'])) . "', 
+				$q .= ",name=" . $pdo->quote($_POST['name']) . ",
-				sponsors_id='" . intval($_POST['sponsors_id']) . "' ";
+				criteria='" . iconv('UTF-8', 'ISO-8859-1', stripslashes($_POST['criteria'])) . "'";
+				if (intval($_POST['sponsors_id']) != -1) { 
+					$q .= "sponsors_id='" . $sponsors_id . "' ";
+				}
+			}
+
+			$q .= " WHERE id=$id";
+			error_log('query: ' . $q);
+			$q = $pdo->prepare($q);
+			$q->execute();
+
+			happy_('Award Created');
+			happy_('Award information saved');
+		} catch (PDOException $exception) {
+			error_('Award not created');
+			error_('Award information failed to save');
+			error_log("Here");
+			error_log($exception);
 		}
-		$q .= "WHERE id=?";
-		$q = $pdo->prepare($q);
-		$q->execute([$id]);
-	
-		show_pdo_errors_if_any($pdo);
-		happy_('Award information saved');
 		exit;
 
 	case 'eligibility_load':
@@ -96,19 +106,27 @@ switch ($_GET['action']) {
 		// select the current categories that this award is linked to
 		$ret = array('categories' => array(), 'divisions' => array());
 
-		$q = $pdo->prepare("SELECT * FROM award_awards_projectcategories WHERE award_awards_id=?");
+		try {
-		$q->execute([$id]);
+			$q = $pdo->prepare('SELECT * FROM award_awards_projectcategories WHERE award_awards_id=?');
-		while ($r = $q->fetch(PDO::FETCH_ASSOC)) {
+			$q->execute([$id]);
-			$ret['categories'][] = $r['projectcategories_id'];
+
+			while ($r = $q->fetch(PDO::FETCH_ASSOC)) {
+				$ret['categories'][] = $r['projectcategories_id'];
+			}
+
+			// select the current categories that this award is linked to
+			$q = $pdo->prepare('SELECT * FROM award_awards_projectdivisions WHERE award_awards_id=?');
+			$q->execute([$id]);
+
+			while ($r = $q->fetch(PDO::FETCH_ASSOC)) {
+				$ret['divisions'][] = $r['projectdivisions_id'];
+			}
+
+			echo json_encode($ret);
+		} catch (PDOException $exception) {
+			error_log($exception);
 		}
 
-		// select the current categories that this award is linked to
-		$q = $pdo->$prepare("SELECT * FROM award_awards_projectdivisions WHERE award_awards_id=?");
-		$q->execute([$id]);
-		while ($r = $q->fetch(PDO::FETCH_ASSOC)) {
-			$ret['divisions'][] = $r['projectdivisions_id'];
-		}
-		echo json_encode($ret);
 		exit;
 
 	case 'eligibility_save':
@@ -119,78 +137,94 @@ switch ($_GET['action']) {
 			error_('Invalid data');
 			exit;
 		}
-
+		try {
-		// wipe out any old award-category links
+			// wipe out any old award-category links
-		$q = $pdo->prepare("DELETE FROM award_awards_projectcategories WHERE award_awards_id=?");
+			$q = $pdo->prepare('DELETE FROM award_awards_projectcategories WHERE award_awards_id=?');
-		$q->execute([$id]);
+			$q->execute([$id]);
-		foreach ($_POST['categories'] AS $key => $cat) {
+			foreach ($_POST['categories'] AS $key => $cat) {
-			$c = intval($cat);
+				$c = intval($cat);
-			$q = $pdo->prepare('INSERT INTO award_awards_projectcategories (award_awards_id, projectcategories_id, year) 
+				$q = $pdo->prepare('INSERT INTO award_awards_projectcategories (award_awards_id, projectcategories_id, year) 
 						VALUES (:id, :c, :year)');
 
-			$q->bindParam(':id', $id, PDO::PARAM_INT);
+				$q->bindParam(':id', $id, PDO::PARAM_INT);
-			$q->bindParam(':c', $c, PDO::PARAM_INT);
+				$q->bindParam(':c', $c, PDO::PARAM_INT);
-			$q->bindParam(':year', $config['FAIRYEAR'], PDO::PARAM_INT);
+				$q->bindParam(':year', $config['FAIRYEAR'], PDO::PARAM_INT);
 
-			$q->execute();
+				$q->execute();
-		}
+			}
 
-		// wipe out any old award-divisions links
+			// wipe out any old award-divisions links
 
-		$q = $pdo->prepare("DELETE FROM award_awards_projectdivisions WHERE award_awards_id=?");
+			$q = $pdo->prepare('DELETE FROM award_awards_projectdivisions WHERE award_awards_id=?');
-		$q->execute([$id]);
+			$q->execute([$id]);
 
-		// now add the new ones
+			// now add the new ones
-		foreach ($_POST['divisions'] AS $key => $div) {
+			foreach ($_POST['divisions'] AS $key => $div) {
-			$d = intval($div);
+				$d = intval($div);
 
-			$q = $pdo->prepare('INSERT INTO award_awards_projectdivisions (award_awards_id, projectdivisions_id, year) 
+				$q = $pdo->prepare('INSERT INTO award_awards_projectdivisions (award_awards_id, projectdivisions_id, year) 
 						VALUES (:id, :d, :year)');
 
-			$q->bindParam(':id', $id, PDO::PARAM_INT);
+				$q->bindParam(':id', $id, PDO::PARAM_INT);
-			$q->bindParam(':d', $d, PDO::PARAM_INT);
+				$q->bindParam(':d', $d, PDO::PARAM_INT);
-			$q->bindParam(':year', $config['FAIRYEAR'], PDO::PARAM_INT);
+				$q->bindParam(':year', $config['FAIRYEAR'], PDO::PARAM_INT);
 
-			$q->execute();
+				$q->execute();
-			show_pdo_errors_if_any($pdo);
+				show_pdo_errors_if_any($pdo);
+			}
+
+			happy_('Eligibility information saved');
+		} catch (PDOException $exception) {
+			error_('Eligibility information failed to save');
 		}
-		happy_('Eligibility information saved');
 		exit;
 
 	case 'prize_order':
 		$order = 0;
-		foreach ($_GET['prizelist'] as $position => $id) {
-			if ($id == '')
-				continue;
-			$order++;
 
-			$q = $pdo->prepare("UPDATE `award_prizes` SET `order`=? WHERE `id`=?");
+		try {
-			$q->execute([$order, $id]);
+			foreach ($_GET['prizelist'] as $position => $id) {
+				if ($id == '')
+					continue;
+				$order++;
+
+				$q = $pdo->prepare('UPDATE `award_prizes` SET `order`=? WHERE `id`=?');
+				$q->execute([$order, $id]);
+			}
+
+			happy_('Order Updated.');
+		} catch (PDOException $exception) {
+			error_('Order failed to update');
+			error_log($exception);
 		}
-		//	print_r($_GET);
-		happy_('Order Updated.');
 		exit;
 
 	case 'award_order':
 		$order = 0;
-		foreach ($_GET['awardlist'] as $position => $id) {
+		try {
-			if ($id == '')
+			foreach ($_GET['awardlist'] as $position => $id) {
-				continue;
+				if ($id == '')
-			$order++;
+					continue;
+				$order++;
 
-			$q = $pdo->prepare("UPDATE `award_awards` SET `order`=? WHERE `id`=?");
+				$q = $pdo->prepare('UPDATE `award_awards` SET `order`=? WHERE `id`=?');
-			$q->execute([$order, $id]);
+				$q->execute([$order, $id]);
+			}
+
+			happy_('Order updated');
+		} catch (PDOException $exception) {
+			error_('Order failed to update');
+			error_log($exception);
 		}
-		happy_('Order updated');
 		exit;
 
 	case 'prizeinfo_load':
 		$id = intval($_GET['id']);
 		if ($id == -1) {
-						$q = $pdo->prepare("SELECT * FROM award_prizes WHERE year='-1' AND award_awards_id='0' ORDER BY `order`");
+			$q = $pdo->prepare("SELECT * FROM award_prizes WHERE year='-1' AND award_awards_id='0' ORDER BY `order`");
 			$q->execute();
 		} else {
-			$q = $pdo->prepare("SELECT * FROM award_prizes WHERE award_awards_id=? ORDER BY `order`");
+			$q = $pdo->prepare('SELECT * FROM award_prizes WHERE award_awards_id=? ORDER BY `order`');
 			$q->execute([$id]);
 		}
 		while ($r = $q->fetch(PDO::FETCH_ASSOC)) {
@@ -204,7 +238,7 @@ switch ($_GET['action']) {
 	case 'prize_load':
 		$id = intval($_GET['id']);
 
-		$q = $pdo->prepare("SELECT * FROM award_prizes WHERE id=?");
+		$q = $pdo->prepare('SELECT * FROM award_prizes WHERE id=?');
 		$q->execute([$id]);
 		$ret = $q->fetch(PDO::FETCH_ASSOC);
 		foreach ($ret AS $k => $v) {
@@ -221,21 +255,26 @@ switch ($_GET['action']) {
 			$year = -1;
 		}
 
-		$q = $pdo->prepare('INSERT INTO award_prizes (award_awards_id, year) VALUES (:aaid, :year)');
+		try {
+			$q = $pdo->prepare('INSERT INTO award_prizes (award_awards_id, year) VALUES (:aaid, :year)');
 
-		$q->bindParam(':aaid', $aaid, PDO::PARAM_INT);
+			$q->bindParam(':aaid', $aaid, PDO::PARAM_INT);
-		$q->bindParam(':year', $year, PDO::PARAM_INT);
+			$q->bindParam(':year', $year, PDO::PARAM_INT);
 
-		$q->execute();
+			$q->execute();
 
-		$ret = array('id' => $pdo->lastInsertId());
+			$ret = array('id' => $pdo->lastInsertId());
-		echo json_encode($ret);
+			echo json_encode($ret);
+		} catch (PDOException $exception) {
+			error_log($exception);
+		}
 		exit;
 
 	case 'prize_save':
 		$id = intval($_POST['id']);
 
-		$q = $pdo->prepare('UPDATE award_prizes SET 
+		try {
+			$q = $pdo->prepare('UPDATE award_prizes SET 
 					prize = :prize, 
 					cash = :cash,
 					scholarship = :scholarship,
@@ -248,21 +287,25 @@ switch ($_GET['action']) {
 					trophyschoolreturn = :trophyschoolreturn
 					WHERE id = :id');
 
-		$q->bindParam(':prize', stripslashes(iconv('UTF-8', 'ISO-8859-1', $_POST['prize'])), PDO::PARAM_STR);
+			$q->bindParam(':prize', stripslashes(iconv('UTF-8', 'ISO-8859-1', $_POST['prize'])), PDO::PARAM_STR);
-		$q->bindValue(':cash', intval($_POST['cash']), PDO::PARAM_INT);
+			$q->bindValue(':cash', intval($_POST['cash']), PDO::PARAM_INT);
-		$q->bindValue(':scholarship', intval($_POST['scholarship']), PDO::PARAM_INT);
+			$q->bindValue(':scholarship', intval($_POST['scholarship']), PDO::PARAM_INT);
-		$q->bindValue(':value', intval($_POST['value']), PDO::PARAM_INT);
+			$q->bindValue(':value', intval($_POST['value']), PDO::PARAM_INT);
-		$q->bindValue(':number', intval($_POST['number']), PDO::PARAM_INT);
+			$q->bindValue(':number', intval($_POST['number']), PDO::PARAM_INT);
-		$q->bindValue(':excludefromac', ($_POST['excludefromac'] == 1) ? 1 : 0, PDO::PARAM_INT);
+			$q->bindValue(':excludefromac', ($_POST['excludefromac'] == 1) ? 1 : 0, PDO::PARAM_INT);
-		$q->bindValue(':trophystudentkeeper', ($_POST['trophystudentkeeper'] == 1) ? 1 : 0, PDO::PARAM_INT);
+			$q->bindValue(':trophystudentkeeper', ($_POST['trophystudentkeeper'] == 1) ? 1 : 0, PDO::PARAM_INT);
-		$q->bindValue(':trophystudentreturn', ($_POST['trophystudentreturn'] == 1) ? 1 : 0, PDO::PARAM_INT);
+			$q->bindValue(':trophystudentreturn', ($_POST['trophystudentreturn'] == 1) ? 1 : 0, PDO::PARAM_INT);
-		$q->bindValue(':trophyschoolkeeper', ($_POST['trophyschoolkeeper'] == 1) ? 1 : 0, PDO::PARAM_INT);
+			$q->bindValue(':trophyschoolkeeper', ($_POST['trophyschoolkeeper'] == 1) ? 1 : 0, PDO::PARAM_INT);
-		$q->bindValue(':trophyschoolreturn', ($_POST['trophyschoolreturn'] == 1) ? 1 : 0, PDO::PARAM_INT);
+			$q->bindValue(':trophyschoolreturn', ($_POST['trophyschoolreturn'] == 1) ? 1 : 0, PDO::PARAM_INT);
-		$q->bindValue(':id', $id, PDO::PARAM_INT);
+			$q->bindValue(':id', $id, PDO::PARAM_INT);
 
-		$q->execute();
+			$q->execute();
 
-		happy_('Prize saved');
+			happy_('Prize saved');
+		} catch (PDOException $exception) {
+			error_('Prize failed to save');
+			error_log($exception);
+		}
 		exit;
 
 	case 'prize_delete':
@@ -275,7 +318,7 @@ switch ($_GET['action']) {
 		$id = intval($_GET['id']);
 		/* Prepare two lists of fair IDs, for which fairs can upload and download this award */
 
-		$q = $pdo->prepare("SELECT * FROM fairs_awards_link WHERE award_awards_id=?");
+		$q = $pdo->prepare('SELECT * FROM fairs_awards_link WHERE award_awards_id=?');
 		$q->execute([$id]);
 		$ul = array();
 		$dl = array();
@@ -286,7 +329,7 @@ switch ($_GET['action']) {
 				$dl[$r['fairs_id']] = true;
 		}
 
-		$q = $pdo->prepare("SELECT * FROM award_awards WHERE id=?");
+		$q = $pdo->prepare('SELECT * FROM award_awards WHERE id=?');
 		$q->execute([$id]);
 		$a = $q->fetch(PDO::FETCH_ASSOC);
 		?>
@@ -346,38 +389,46 @@ switch ($_GET['action']) {
 
 		/* Prepare a fair-wise list */
 		$data = array();
-		foreach ($dl AS $fairs_id)
+		foreach ($dl AS $fairs_id) {
 			$data[$fairs_id]['dl'] = true;
-		foreach ($ul AS $fairs_id)
+		}
+
+		foreach ($ul AS $fairs_id) {
 			$data[$fairs_id]['ul'] = true;
+		}
 
 		/* Now save each one */
 
-		$q = $pdo->prepare("DELETE FROM fairs_awards_link WHERE award_awards_id=?");
+		try {
-		$q->execute([$id]);
+			$q = $pdo->prepare('DELETE FROM fairs_awards_link WHERE award_awards_id=?');
-		show_pdo_errors_if_any($pdo);
+			$q->execute([$id]);
-		foreach ($data as $fairs_id => $f) {
-			$dl = ($f['dl'] == true) ? 'yes' : 'no';
-			$ul = ($f['ul'] == true) ? 'yes' : 'no';
-
-			$q = $pdo->prepare("INSERT INTO fairs_awards_link (award_awards_id,fairs_id,download_award,upload_winners)
-					VALUES (?,?,?,?)");
-			$q->execute([$id,$fairs_id,$dl,$ul]);
 			show_pdo_errors_if_any($pdo);
-		}
+			foreach ($data as $fairs_id => $f) {
-		$ident = stripslashes($_POST['identifier']);
+				$dl = ($f['dl'] == true) ? 'yes' : 'no';
-		$per_fair = $_POST['per_fair'] == 'yes' ? 'yes' : 'no';
+				$ul = ($f['ul'] == true) ? 'yes' : 'no';
-		$mat = intval($_POST['additional_materials']);
-		$w = intval($_POST['register_winners']);
 
-		$q = $pdo->prepare("UPDATE award_awards SET external_identifier=?,
+				$q = $pdo->prepare('INSERT INTO fairs_awards_link (award_awards_id,fairs_id,download_award,upload_winners)
+					VALUES (?,?,?,?)');
+				$q->execute([$id, $fairs_id, $dl, $ul]);
+				show_pdo_errors_if_any($pdo);
+			}
+			$ident = stripslashes($_POST['identifier']);
+			$per_fair = $_POST['per_fair'] == 'yes' ? 'yes' : 'no';
+			$mat = intval($_POST['additional_materials']);
+			$w = intval($_POST['register_winners']);
+
+			$q = $pdo->prepare('UPDATE award_awards SET external_identifier=?,
 							external_additional_materials=?,
 							external_register_winners=?,
 							per_fair=?
-						WHERE id=?");
+						WHERE id=?');
-		$q->execute([[$ident, $mat,$w],$per_fair,$id]);
+			$q->execute([$ident, $mat, $w, $per_fair, $id]);
 
-		happy_('Feeder Fair information saved');
+			happy_('Feeder Fair information saved');
+		} catch (PDOException $exception) {
+			error_('Feeder Fair information failed to save');
+			error_log($exception);
+		}
 		exit;
 }
 
@@ -387,7 +438,6 @@ send_header('Awards Management',
 		'Awards Main' => 'admin/awards.php'));
 
 ?>
-<!--<script type="text/javascript" src="../js/jquery.tablednd_0_5.js"></script>-->
 <script type="text/javascript">
 
 var award_id = 0;
@@ -396,16 +446,17 @@ var award_tab_update = new Array();
 
 function update_awardinfo()
 {	
-
 	if(award_tab_update['awardinfo'] == award_id) return;
+
 	award_tab_update['awardinfo'] = award_id;
+
 //	alert(award_id);
 	if(award_id == -1) {
 //		$("#awardinfo input:text").val('');
 		/* New award, set defaults and clear everythign else */
 		$("#awardinfo_id").val(-1);
 		$("#awardinfo_name").val("");
-		$("#awardinfo_sponsors_id").val(0);
+		$("#awardinfo_sponsors_id").val(-1);
 		$("#awardinfo_presenter").val("");
 		$("#awardinfo_description").val("");
 		$("#awardinfo_criteria").val("");
@@ -419,9 +470,9 @@ function update_awardinfo()
 	}
 
 	/* Enable all fields */
-	$("#awardinfo *").removeAttr('disabled');
+	$("#awardinfo *").prop('disabled',false);
 
-	$.getJSON("<?= $_SERVER['PHP_SELF'] ?>?action=awardinfo_load&id="+award_id,
+	$.getJSON(`<?= $_SERVER['PHP_SELF'] ?>?action=awardinfo_load&id=${award_id}`,
 		function(json){
 			$("#awardinfo_id").val(json.id);
 			$("#awardinfo_name").val(json.name);
@@ -610,10 +661,10 @@ function update_feeder()
 	$("#editor_tab_feeder").load("<?= $_SERVER['PHP_SELF'] ?>?action=feeder_load&id="+award_id, '',
 		function(responseText, textStatus, XMLHttpRequest) {
 			/* Register buttons and handlers */
-			$("#feeder_enable").change(function() {
+			$("#feeder_enable").on("change", function() {
 					update_feeder_enable();
 				});
-			$("#feeder_save").click(function() {
+			$("#feeder_save").on("click", function() {
 				$("#debug").load("<? $_SERVER['PHP_SELF'] ?>?action=feeder_save", $("#feeder_form").serializeArray());
 				return false;
 			});
@@ -664,28 +715,6 @@ $(document).ready(function() {
 		},
 		active: -1
 	});
-
-	// $("#editor_tabs").tabs({
-	// 		show: function(event, ui) { 
-	// 			switch(ui.panel.id) {
-	// 			case 'editor_tab_awardinfo':
-	// 				update_awardinfo();
-	// 				break;			
-	// 			case 'editor_tab_eligibility':
-	// 				update_eligibility();
-	// 				break;			
-	// 			case 'editor_tab_prizes':
-	// 				update_prizeinfo();
-	// 				break;
-	// 			case 'editor_tab_feeder':
-	// 				update_feeder();
-	// 				break;
-	// 			}
-	// 			return true;
-	// 		},
-	// 		collapsible: true,
-	// 		selected: -1 /* None selected */
-	// 	});
 })
 
  </script>
@@ -725,7 +754,7 @@ $(document).ready(function() {
 $sq = $pdo->prepare('SELECT id,organization FROM sponsors ORDER BY organization');
 $sq->execute();
 echo '<select id="awardinfo_sponsors_id" name="sponsors_id">';
-echo '<option value="">' . i18n('Choose a sponsor') . "</option>\n";
+echo '<option hidden value="-1">' . i18n('Choose a sponsor') . "</option>\n";
 while ($sr = $sq->fetch(PDO::FETCH_OBJ)) {
 	echo "<option value=\"$sr->id\">" . i18n($sr->organization) . '</option>';
 }
@@ -736,7 +765,7 @@ while ($sr = $sq->fetch(PDO::FETCH_OBJ)) {
 			</td></tr>
 		<tr><td><?= i18n('Type') ?>:</td><td>
 <?
-$tq = $pdo->prepare("SELECT id,type FROM award_types WHERE year=? ORDER BY type");
+$tq = $pdo->prepare('SELECT id,type FROM award_types WHERE year=? ORDER BY type');
 $tq->execute([$config['FAIRYEAR']]);
 echo '<select id="awardinfo_award_types_id" name="award_types_id">';
 // only show the "choose a type" option if we are adding,if we are editing, then they must have already chosen one.
@@ -833,7 +862,6 @@ while ($dr = $dq->fetch(PDO::FETCH_OBJ)) {
 		<th><?= i18n('Actions') ?></th>
 	</tr></table>
 	<br >
-	* <?= i18n('Click on the Script Order and drag to re-order the prizes') ?>
 	<br >
 	<hr>
 
@@ -880,7 +908,7 @@ while ($dr = $dq->fetch(PDO::FETCH_OBJ)) {
 	<br />
 	<form>
 	<input type="submit" onClick="prize_create();return false;" value="<?= i18n('Create New Prize') ?>" />
-	<input type="submit" id="prizeinfo_save" onClick="prize_save();return false;" value="<?= i18n('Save Prize') ?>" disabled="disabled" />
+	<input type="submit" id="prizeinfo_save" onClick="prize_save();" value="<?= i18n('Save Prize') ?>" disabled="disabled" />
 	</form>
 </div>
 
@@ -1084,13 +1112,6 @@ echo '</table>';
 <br /><br />
 
 <?
-
-/*
- * For some reason, this submit button opens the dialog then it closes right away, but it doesn't
- * if the entry is done through the a href
- */
-// <input type="submit" onClick="award_create();" value="<?=i18n("Create New Award")>" />
-
 $where_asi = $where_asi ?? '';
 $where_ati = $where_ati ?? '';
 
@@ -1120,16 +1141,16 @@ WHERE
 				award_awards.year=?
 				$where_asi
 				$where_ati
-			AND \taward_types.year=?
+			AND award_types.year=?
 		$orderby
 ");
 
-$q->execute([$config['FAIRYEAR'],$config['FAIRYEAR']]);
+$q->execute([$config['FAIRYEAR'], $config['FAIRYEAR']]);
 
 show_pdo_errors_if_any($pdo);
 
 if ($q->rowCount()) {
-	echo '* ' . i18n('Click on the Script Order and drag to re-order the awards');
+	//echo '* ' . i18n('Click on the Script Order and drag to re-order the awards');
 	echo '<table id="awardlist" class="tableview" >';
 	echo '<tr class="nodrop nodrag">';
 	echo ' <th>' . i18n('Order') . '</th>';
@@ -1154,7 +1175,7 @@ if ($q->rowCount()) {
 		echo " <td $eh>{$r->type}</td>\n";
 		echo " <td $eh>{$r->name}</td>\n";
 
-		$numq = $pdo->prepare("SELECT SUM(number) AS num FROM award_prizes WHERE award_awards_id=?");
+		$numq = $pdo->prepare('SELECT SUM(number) AS num FROM award_prizes WHERE award_awards_id=?');
 		$numq->execute([$r->id]);
 		$numr = $numq->fetch(PDO::FETCH_ASSOC);
 		if (!$numr['num'])

admin/award_upload.php

@@ -53,7 +53,6 @@ function get_winners($awardid, $fairs_id)
 	$student_fields = array('firstname' => 'firstname',
 		'lastname' => 'lastname',
 		'email' => 'email',
-		'gender' => 'sex',
 		'grade' => 'grade',
 		'language' => 'lang',
 		'birthdate' => 'dateofbirth',

admin/awards.php

@@ -42,8 +42,8 @@ echo '<a href="award_awards.php?action=edit_prize_template">' . i18n('Edit prize
 echo '<br />';
 echo '<a href="award_awardcreatedivisional.php">' . i18n('Create divisional awards for all divisions & categories') . '</a><br />';
 echo '<br />';
-echo '<a href="award_download.php">' . i18n('Download awards from external sources') . '</a><br />';
+//echo '<a href="award_download.php">' . i18n('Download awards from external sources') . '</a><br />';
-echo '<a href="award_upload.php">' . i18n('Upload award winners to external sources') . '</a><br />';
+//echo '<a href="award_upload.php">' . i18n('Upload award winners to external sources') . '</a><br />';
 
 send_footer();
 

admin/cwsfregister.php

@@ -83,7 +83,6 @@ function get_cwsf_award_winners()
 						'firstname' => $s->firstname,
 						'lastname' => $s->lastname,
 						'email' => $s->email,
-						'gender' => $s->sex,
 						'grade' => $s->grade,
 						'language' => $s->lang,
 						'birthdate' => $s->dateofbirth,

admin/reports_students.inc.php

@@ -349,13 +349,6 @@ $report_students_fields = array(
 		'table_sort' => 'students.grade',
 		'table' => "CONCAT('Grade ', students.grade)"
 	),
-	'gender' => array(
-		'name' => 'Student -- Gender',
-		'header' => 'Gender',
-		'width' => 0.5,
-		'table' => 'students.sex',
-		'value_map' => array('male' => 'Male', 'female' => 'Female')
-	),
 	'birthdate' => array(
 		'name' => 'Student -- Birthdate',
 		'header' => 'Birthdate',

admin/schools.php

@@ -98,7 +98,7 @@ if (get_value_from_array($_POST, 'save') == 'edit' || get_value_from_array($_POS
 
 	/* Get info about science head */
 	// FIX ME
-	$split = explode(' ', get_value_from_array($_POST, 'principal') ?? '', 2);
+	$split = explode(' ', get_value_from_array($_POST, 'principal', ''), 2);
 
 	if (count($split) === 2) {
 		list($first, $last) = $split;
@@ -239,6 +239,7 @@ if (get_value_from_array($_GET, 'action') == 'edit' || get_value_from_array($_GE
 	echo '<option value="">' . i18n('Choose') . "</option>\n";
 
 	foreach ($config['languages'] AS $k => $l) {
+		$sel = ($r->schoollang == $k) ? 'selected="selected"' : '';
 		echo "<option $sel value=\"$k\">" . i18n($l) . "</option>\n";
 	}
 	echo '</select>';
@@ -263,8 +264,8 @@ if (get_value_from_array($_GET, 'action') == 'edit' || get_value_from_array($_GE
 	emit_province_selector('province_code', get_value_property_or_default($r, 'province_code', ''));
 	echo "</td></tr>\n";
 	echo '<tr><td>' . i18n($config['postalzip']) . '</td><td><input type="text" name="postalcode" value="' . get_value_property_or_default($r, 'postalcode') . "\" size=\"8\" maxlength=\"7\" /></td></tr>\n";
-	echo '<tr><td>' . i18n('Phone') . '</td><td><input type="text" name="phone" value="' . htmlspecialchars(get_value_property_or_default($r, 'phone', '')) . "\" size=\"16\" maxlength=\"16\" /></td></tr>\n";
+	echo '<tr><td>' . i18n('Phone') . '</td><td><input type="tel" name="phone" value="' . htmlspecialchars(get_value_property_or_default($r, 'phone', '')) . "\" size=\"16\" maxlength=\"16\" /></td></tr>\n";
-	echo '<tr><td>' . i18n('Fax') . '</td><td><input type="text" name="fax" value="' . htmlspecialchars(get_value_property_or_default($r, 'fax', '')) . "\" size=\"16\" maxlength=\"16\" /></td></tr>\n";
+	echo '<tr><td>' . i18n('Fax') . '</td><td><input type="tel" name="fax" value="' . htmlspecialchars(get_value_property_or_default($r, 'fax', '')) . "\" size=\"16\" maxlength=\"16\" /></td></tr>\n";
 
 	if (get_value_property_or_default($r, 'principal_uid') > 0)
 		$pl = user_load_by_uid(get_value_property_or_default($r, 'principal_uid'));
@@ -274,9 +275,9 @@ if (get_value_from_array($_GET, 'action') == 'edit' || get_value_from_array($_GE
 
 	$e = get_value_from_array($pl, 'email', 0) == '*' ? '' : get_value_from_array($pl, 'email');
 	echo '<tr><td>' . i18n('Principal') . '</td><td><input type="text" name="principal" value="' . htmlspecialchars(get_value_from_array($pl, 'name', '')) . "\" size=\"60\" maxlength=\"64\" /></td></tr>\n";
-	echo '<tr><td>' . i18n('Principal Email') . '</td><td><input type="text" name="principalemail" value="' . htmlspecialchars(get_value_or_default($e, '')) . "\" size=\"60\" maxlength=\"128\" /></td></tr>\n";
+	echo '<tr><td>' . i18n('Principal Email') . '</td><td><input type="email" name="principalemail" value="' . htmlspecialchars(get_value_or_default($e, '')) . "\" size=\"60\" maxlength=\"128\" /></td></tr>\n";
 
-	echo '<tr><td>' . i18n('School Email') . '</td><td><input type="text" name="schoolemail" value="' . htmlspecialchars(get_value_property_or_default($r, 'schoolemail', '')) . "\" size=\"60\" maxlength=\"128\" /></td></tr>\n";
+	echo '<tr><td>' . i18n('School Email') . '</td><td><input type="email" name="schoolemail" value="' . htmlspecialchars(get_value_property_or_default($r, 'schoolemail', '')) . "\" size=\"60\" maxlength=\"128\" /></td></tr>\n";
 	echo '<tr><td>' . i18n('Access Code') . '</td><td><input type="text" name="accesscode" value="' . htmlspecialchars(get_value_property_or_default($r, 'accesscode', '')) . "\" size=\"32\" maxlength=\"32\" /></td></tr>\n";
 	echo '<tr><td colspan=2><br /><b>' . i18n('Science head/teacher or science fair contact at school') . '</b></td></tr>';
 	if (get_value_property_or_default($r, 'sciencehead_uid', '') > 0)
@@ -284,10 +285,10 @@ if (get_value_from_array($_GET, 'action') == 'edit' || get_value_from_array($_GE
 	else
 		$sh = array();
 	/* Don't show autogenerated emails */
-	$e = get_value_from_2d_array($sh, 'email', 0, '') == '*' ? '' : get_value_from_2d_array($sh, 'email', '');
+	$e = get_value_from_array($sh, 'email', '') == '*' ? '' : get_value_from_array($sh, 'email', '');
-	echo '<tr><td>' . i18n('Email') . '</td><td><input type="text" name="scienceheademail" value="' . htmlspecialchars(get_value_or_default($e, '')) . "\" size=\"60\" maxlength=\"128\" /></td></tr>\n";
+	echo '<tr><td>' . i18n('Email') . '</td><td><input type="email" name="scienceheademail" value="' . htmlspecialchars(get_value_or_default($e, '')) . "\" size=\"60\" maxlength=\"128\" /></td></tr>\n";
 	echo '<tr><td>' . i18n('Name') . '</td><td><input type="text" name="sciencehead" value="' . htmlspecialchars(get_value_from_array($sh, 'name', '')) . "\" size=\"60\" maxlength=\"64\" /></td></tr>\n";
-	echo '<tr><td>' . i18n('Phone') . '</td><td><input type="text" name="scienceheadphone" value="' . htmlspecialchars(get_value_property_or_default($sh, 'phonework', '')) . "\" size=\"16\" maxlength=\"16\" /></td></tr>\n";
+	echo '<tr><td>' . i18n('Phone') . '</td><td><input type="tel" name="scienceheadphone" value="' . htmlspecialchars(get_value_property_or_default($sh, 'phonework', '')) . "\" size=\"16\" maxlength=\"16\" /></td></tr>\n";
 
 	if ($config['participant_registration_type'] == 'schoolpassword') {
 		echo '<tr><td colspan=2><br /><b>' . i18n('Participant Registration Password') . '</b></td></tr>';
@@ -377,13 +378,18 @@ if (get_value_from_array($_GET, 'action') == 'edit' || get_value_from_array($_GE
 	while ($r = $q->fetch(PDO::FETCH_OBJ)) {
 		echo "<tr>\n";
 		echo " <td>$r->school</td>\n";
-		echo " <td>$r->address, $r->city, $r->postalcode</td>\n";
+		if ($r->address != '' && $r->city != '' && $r->postalcode != '') {
-		echo " <td>$r->phone</td>\n";
+			echo " <td>$r->address, $r->city, $r->postalcode</td>\n";
+		} else {
+			echo " <td></td>\n";
+		}
+		
+		echo " <td><a href='tel:$r->phone'>$r->phone</a></td>\n";
 
 		$sciencehead = '';
-		if ($r->sciencehead_uid > 0) {
+		if ($r->sciencehead_uid != NULL && $r->sciencehead_uid > 0) {
 			$sh = user_load_by_uid($r->sciencehead_uid);
-			$sciencehead = $sh['name'];
+			$sciencehead = $sh['name'] ?? '';
 		}
 		echo " <td>$sciencehead</td>\n";
 		if ($config['participant_registration_type'] == 'schoolpassword')

admin/schoolsimport.php

@@ -48,78 +48,90 @@ if (get_value_from_array($_POST, 'action') == 'import') {
 		if (count($CSVP->data) > 0) {
 			// okay it looks like we have something.. lets dump the current stuff
 			if ($_POST['emptycurrent'] == 1) {
-				echo happy(i18n('Old school data erased'));
+				try {
-				$stmt = $pdo->prepare("DELETE FROM schools WHERE year=?");
+					$stmt = $pdo->prepare('DELETE FROM schools WHERE year=?');
-				$stmt->execute([$config['FAIRYEAR']]);
+					$stmt->execute([$config['FAIRYEAR']]);
+					echo happy(i18n('Old school data erased'));
+				} catch (PDOException $exception) {
+					echo error(i18n('Failed to erase old school data'));
+				}
 			}
 
 			$loaded = 0;
-			foreach ($CSVP->data AS $row) {
+			foreach ($CSVP->data AS $raw_row) {
-				for ($n = 0; $n < count($row); $n++) {
+				$row = str_getcsv($raw_row[0], ',', '"', '\\');
-					$row[$n] = trim($row[$n]);
-				}
 
-				$email = $row[16];
+				// $email = $row[16];
-				if ($email != '') {
+				// if ($email != '') {
-					$scienceHead = user_load_by_email($email);
+				// 	$scienceHead = user_load_by_email($email);
-					if (!$scienceHead) {
+				// 	if (!$scienceHead) {
-						$scienceHead = user_create('teacher', $email);
+				// 		$scienceHead = user_create('teacher', $email);
-						$scienceHead['email'] = $email;
+				// 		$scienceHead['email'] = $email;
-					}
+				// 	}
-					list($first, $last) = explode(' ', $row[15], 2);
+				// 	list($first, $last) = explode(' ', $row[15], 2);
-					$scienceHead['firstname'] = $first;
+				// 	$scienceHead['firstname'] = $first;
-					$scienceHead['lastname'] = $last;
+				// 	$scienceHead['lastname'] = $last;
-					$scienceHead['phonework'] = $row[17];
+				// 	$scienceHead['phonework'] = $row[17];
-					user_save($scienceHead);
+				// 	user_save($scienceHead);
-				}
+				// }
 
-				$email = $row[12];
+				// $email = $row[12];
-				if ($email != '') {
+				// if ($email != '') {
-					$principal = user_load_by_email($email);
+				// 	$principal = user_load_by_email($email);
-					if (!$principal) {
+				// 	if (!$principal) {
-						$principal = user_create('principal', $email);
+				// 		$principal = user_create('principal', $email);
-						$principal['email'] = $email;
+				// 		$principal['email'] = $email;
-					}
+				// 	}
-					list($first, $last) = explode(' ', $row[11], 2);
+				// 	list($first, $last) = explode(' ', $row[11], 2);
-					$principal['firstname'] = $first;
+				// 	$principal['firstname'] = $first;
-					$principal['lastname'] = $last;
+				// 	$principal['lastname'] = $last;
-					$principal['phonework'] = $row[13];
+				// 	$principal['phonework'] = $row[13];
-					user_save($principal);
+				// 	user_save($principal);
-				}
+				// }
 
-				$stmt = $pdo->prepare("INSERT INTO schools (school,schoollang,schoollevel,board,district,phone,fax,address,city,province_code,postalcode,schoolemail,accesscode,registration_password,projectlimit,projectlimitper,year,principal_uid,sciencehead_uid) VALUES (
+				$total = $row[22] != '' ? $row[22] : 'total';
-					'" . stripslashes($row[0]) . "',
+				$limit = $row[21] != '' ? $row[21] : 0;
-					'" . stripslashes($row[1]) . "',
+				try {
-					'" . stripslashes($row[2]) . "',
+					$stmt = $pdo->prepare('INSERT INTO schools 
-					'" . stripslashes($row[3]) . "',
+						(school, schoollang, schoollevel, designate, board, district, phone, fax, address, city, province_code, postalcode, schoolemail, accesscode, registration_password, projectlimit, projectlimitper, year, principal_uid, sciencehead_uid) 
-					'" . stripslashes($row[4]) . "',
+						VALUES 
-					'" . stripslashes($row[5]) . "',
+						(:school, :schoollang, :schoollevel, :designate, :board, :district, :phone, :fax, :address, :city, :province_code, :postalcode, :schoolemail, :accesscode, :registration_password, :projectlimit, :projectlimitper, :year, :principal_uid, :sciencehead_uid)');
-					'" . stripslashes($row[6]) . "',
+
-					'" . stripslashes($row[7]) . "',
+					$stmt->bindValue(':school', htmlspecialchars($row[0]));
-					'" . stripslashes($row[8]) . "',
+					$stmt->bindParam(':schoollang', $row[1]);
-					'" . stripslashes($row[9]) . "',
+					$stmt->bindParam(':schoollevel', $row[2]);
-					'" . stripslashes($row[10]) . "',
+					$stmt->bindParam(':designate', $row[3]);
-					'" . stripslashes($row[14]) . "',
+					$stmt->bindParam(':board', $row[4]);
-					'" . stripslashes($row[18]) . "',
+					$stmt->bindParam(':district', $row[5]);
-					'" . stripslashes($row[19]) . "',
+					$stmt->bindParam(':phone', $row[6]);
-					'" . stripslashes($row[20]) . "',
+					$stmt->bindParam(':fax', $row[7]);
-					'" . stripslashes($row[21]) . "',
+					$stmt->bindParam(':address', $row[8]);
-					'" . $config['FAIRYEAR'] . "',
+					$stmt->bindParam(':city', $row[9]);
-					'" . $principal['uid'] . "',
+					$stmt->bindParam(':province_code', $row[10]);
-					'" . $scienceHead['uid'] . "')");
+					$stmt->bindParam(':postalcode', $row[11]);
-				$stmt->execute();
+					$stmt->bindParam(':schoolemail', $row[15]);
+					$stmt->bindParam(':accesscode', $row[19]);
+					$stmt->bindParam(':registration_password', $row[20]);
+					$stmt->bindParam(':projectlimit', $limit);
+					$stmt->bindValue(':projectlimitper', $total);
+					$stmt->bindParam(':year', $config['FAIRYEAR']);
+					$stmt->bindParam(':principal_uid', $principal['uid']);
+					$stmt->bindParam(':sciencehead_uid', $scienceHead['uid']);
+
+					$stmt->execute();
 
-				if (!$pdo->errorInfo())
 					$loaded++;
-				else
+				} catch (PDOException $exception) {
-					show_pdo_errors_if_any($pdo);
+					error_log($exception);
+					echo error(i18n('Failed to load schools %2 at row %1', array($loaded++, $row[0])));
+					var_dump($row);
+				}
 			}
 			echo happy(i18n('Successfully loaded %1 schools', array($loaded)));
 			echo '<a href="schools.php">' . i18n('School Management') . '</a> <br />';
 		} else {
 			echo error(i18n('Found no CSV data in the uploaded file'));
 		}
-		print_r($data);
 	} else {
 		echo error(i18n('Please choose a valid CSV file to upload'));
 		$showform = true;

admin/student_editor.php

@@ -41,13 +41,13 @@ if ($auth_type == 'fair') {
 	if ($registrations_id == -1 && ($action == 'registration_load' || $action == 'registration_save')) {
 		/* we can't check the project it hasn't been created. */
 	} else {
-		/* Make sure they have permission to laod this student, check
+		/* Make sure they have permission to load this student, check
 		the master copy of the fairs_id in the project */
-		$q = $pdo->prepare("SELECT * FROM projects WHERE 
+		$q = $pdo->prepare('SELECT * FROM projects WHERE 
 				registrations_id=? 
 				AND year=?
-				AND fairs_id=?");
+				AND fairs_id=?');
-		$q->execute([$registrations_id,$config['FAIRYEAR'],$fairs_id]);
+		$q->execute([$registrations_id, $config['FAIRYEAR'], $fairs_id]);
 		if ($q->rowCount() != 1) {
 			echo 'permission denied.';
 			exit;
@@ -75,8 +75,9 @@ switch ($action) {
 
 	case 'student_remove':
 		$remove_id = intval($_GET['students_id']);
-		$q = $pdo->prepare("SELECT id FROM students WHERE id=? AND registrations_id=?");
+		try {
-		$q->execute([$remove_id,$registrations_id]);
+		$q = $pdo->prepare('SELECT id FROM students WHERE id=? AND registrations_id=?');
+		$q->execute([$remove_id, $registrations_id]);
 		if ($q->rowCount() != 1) {
 			error_('Invalid student to remove');
 			exit;
@@ -86,48 +87,52 @@ switch ($action) {
 			exit;
 		}
 
-		$stmt = $pdo->prepare("DELETE FROM students WHERE id=? AND registrations_id=?");
+		$stmt = $pdo->prepare('DELETE FROM students WHERE id=? AND registrations_id=?');
-		$stmt->execute([$remove_id,$registrations_id]);
+		$stmt->execute([$remove_id, $registrations_id]);
 
 		// now see if they have an emergency contact that also needs to be removed
-		$q = $pdo->prepare("SELECT id FROM emergencycontact WHERE students_id=? AND registrations_id=? AND year=?");
+		$q = $pdo->prepare('SELECT id FROM emergencycontact WHERE students_id=? AND registrations_id=? AND year=?');
-		$q->execute([$remove_id,$registrations_id,$config['FAIRYEAR']]);
+		$q->execute([$remove_id, $registrations_id, $config['FAIRYEAR']]);
 		// no need to error message if this doesnt exist
 		if ($q->rowCount() == 1) {
-			$stmt = $do->prepare("DELETE FROM emergencycontact WHERE students_id=? AND registrations_id=? AND year=?");
+			$stmt = $do->prepare('DELETE FROM emergencycontact WHERE students_id=? AND registrations_id=? AND year=?');
-			$stmt->execute([$remove_id,$registrations_id,$config['FAIRYEAR']]);
+			$stmt->execute([$remove_id, $registrations_id, $config['FAIRYEAR']]);
 		}
-		
+
 		if ($q->rowCount() != 1) {
 			error_('Invalid student to remove');
 			exit;
 		}
 
-		$stmt = $pdo->prepare("DELETE FROM students WHERE id=? AND registrations_id=?");
+		$stmt = $pdo->prepare('DELETE FROM students WHERE id=? AND registrations_id=?');
-		$stmt->execute([$remove_id,$registrations_id]);
+		$stmt->execute([$remove_id, $registrations_id]);
 
 		// now see if they have an emergency contact that also needs to be removed
-		$q = $pdo->prepare("SELECT id FROM emergencycontact WHERE students_id=? AND registrations_id=? AND year=?");
+		$q = $pdo->prepare('SELECT id FROM emergencycontact WHERE students_id=? AND registrations_id=? AND year=?');
-		$q->execute([$remove_id,$registrations_id,$config['FAIRYEAR']]);
+		$q->execute([$remove_id, $registrations_id, $config['FAIRYEAR']]);
-		
+
 		// no need to error message if this doesnt exist
 		if ($q->rowCount() == 1) {
-			$stmt = $do->prepare("DELETE FROM emergencycontact WHERE students_id=? AND registrations_id=? AND year=?");
+			$stmt = $do->prepare('DELETE FROM emergencycontact WHERE students_id=? AND registrations_id=? AND year=?');
-			$stmt->execute([$remove_id,$registrations_id,$config['FAIRYEAR']]);
+			$stmt->execute([$remove_id, $registrations_id, $config['FAIRYEAR']]);
 		}
 
-		$stmt = $pdo->prepare("DELETE FROM students WHERE id=? AND registrations_id=?");
+		$stmt = $pdo->prepare('DELETE FROM students WHERE id=? AND registrations_id=?');
-		$stmt->execute([$remove_id,$registrations_id]);
+		$stmt->execute([$remove_id, $registrations_id]);
 
 		// now see if they have an emergency contact that also needs to be removed
-		$q = $pdo->prepare("SELECT id FROM emergencycontact WHERE students_id=? AND registrations_id=? AND year=?");
+		$q = $pdo->prepare('SELECT id FROM emergencycontact WHERE students_id=? AND registrations_id=? AND year=?');
-		$q->execute([$remove_id,$registrations_id,$config['FAIRYEAR']]);
+		$q->execute([$remove_id, $registrations_id, $config['FAIRYEAR']]);
 		// no need to error message if this doesnt exist
 		if ($q->rowCount() == 1) {
-			$stmt = $do->prepare("DELETE FROM emergencycontact WHERE students_id=? AND registrations_id=? AND year=?");
+			$stmt = $do->prepare('DELETE FROM emergencycontact WHERE students_id=? AND registrations_id=? AND year=?');
-			$stmt->execute([$remove_id,$registrations_id,$config['FAIRYEAR']]);
+			$stmt->execute([$remove_id, $registrations_id, $config['FAIRYEAR']]);
 		}
 		happy_('Student successfully removed');
+		} catch (PDOException $exception) {
+			error_('Failed to remove student');
+		}
+		
 		exit;
 
 	default:
@@ -146,17 +151,18 @@ function students_save()
 		if ($_POST['id'][$x] == 0) {
 			// if they use schoolpassword or singlepassword, then we need to set the school based on the school stored in the registration record.  for anything else they can choose the school on their own.
 			if ($config['participant_registration_type'] == 'schoolpassword' || $config['participant_registration_type'] == 'invite') {
-				$q = $pdo->prepare("SELECT schools_id FROM registrations WHERE id=? AND YEAR=?");
+				$q = $pdo->prepare('SELECT schools_id FROM registrations WHERE id=? AND YEAR=?');
-				$q->execute([$registrations_id,$config['FAIRYEAR']]);
+				$q->execute([$registrations_id, $config['FAIRYEAR']]);
 				$r = $q->fetch(PDO::FETCH_OBJ);
 				$schools_id = $r->schools_id;
-				$schoolvalue = "'$schools_id', ";
+				$schoolvalue = stripslashes($schools_id);
 			} else {
-				$schoolvalue = "'" . stripslashes($_POST['schools_id'][$x]) . "', ";
+				$schoolvalue = stripslashes($_POST['schools_id'][$x]);
 			}
-			// INSERT new record
+			try {
-			$dob = $_POST['year'][$x] . '-' . $_POST['month'][$x] . '-' . $_POST['day'][$x];
+				// INSERT new record
-			$stmt = $pdo->prepare('INSERT INTO students (registrations_id,firstname,lastname,sex,email,address,city,province,postalcode,phone,dateofbirth,grade,schools_id,tshirt,medicalalert,foodreq,teachername,teacheremail,year) VALUES (
+				$dob = $_POST['year'][$x] . '-' . $_POST['month'][$x] . '-' . $_POST['day'][$x];
+				$stmt = $pdo->prepare('INSERT INTO students (registrations_id,firstname,lastname,email,address,city,province,postalcode,phone,dateofbirth,grade,schools_id,tshirt,medicalalert,foodreq,teachername,teacheremail,year) VALUES (
 				?, 
 				?, 
 				?, 
@@ -174,18 +180,40 @@ function students_save()
 				?,
 				?,
 				?,
-				?,
 				?)');
-			$stmt->execute([$registrations_id,iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['firstname'][$x])),
+				$stmt->execute([
-			iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['lastname'][$x])),stripslashes($_POST['sex'][$x]),
+					$registrations_id,
-			iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['email'][$x])),iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['address'][$x])),
+					iconv('UTF-8', 'ISO-8859-1//TRANSLIT',
-			iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['city'][$x])),iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['province'][$x])),
+						stripslashes($_POST['firstname'][$x])),
-			stripslashes($_POST['postalcode'][$x]),stripslashes($_POST['phone'][$x]),$dob,stripslashes($_POST['grade'][$x]),
+					iconv('UTF-8', 'ISO-8859-1//TRANSLIT',
-			$schoolvalue,stripslashes($_POST['tshirt'][$x]),stripslashes($_POST['medicalalert'][$x]),stripslashes($_POST['foodreq'][$x]),
+						stripslashes($_POST['lastname'][$x])),
-			iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['teachername'][$x])),iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['teacheremail'][$x])),
+					iconv('UTF-8', 'ISO-8859-1//TRANSLIT',
-			$config['FAIRYEAR']]);
+						stripslashes($_POST['email'][$x])),
+					iconv('UTF-8', 'ISO-8859-1//TRANSLIT',
+						stripslashes($_POST['address'][$x])),
+					iconv('UTF-8', 'ISO-8859-1//TRANSLIT',
+						stripslashes($_POST['city'][$x])),
+					iconv('UTF-8', 'ISO-8859-1//TRANSLIT',
+						stripslashes($_POST['province'][$x])),
+					stripslashes($_POST['postalcode'][$x]),
+					stripslashes($_POST['phone'][$x]), $dob,
+					stripslashes($_POST['grade'][$x]),
+					$schoolvalue,
+					stripslashes($_POST['tshirt'][$x]),
+					stripslashes($_POST['medicalalert'][$x]),
+					stripslashes($_POST['foodreq'][$x]),
+					iconv('UTF-8', 'ISO-8859-1//TRANSLIT',
+						stripslashes($_POST['teachername'][$x])),
+					iconv('UTF-8', 'ISO-8859-1//TRANSLIT',
+						stripslashes($_POST['teacheremail'][$x])),
+					$config['FAIRYEAR']
+				]);
 
-			happy_('%1 %2 successfully added', array($_POST['firstname'][$x], $_POST['lastname'][$x]));
+				happy_('%1 %2 successfully added', array($_POST['firstname'][$x], $_POST['lastname'][$x]));
+			} catch (PDOException $exception) {
+				error_('%1 %2 failed to update', array($_POST['firstname'][$x], $_POST['lastname'][$x]));
+				error_log($exception);
+			}
 		} else {
 			// if they use schoolpassword or singlepassword, then we dont need to save teh schools_id because its already set when they inserted the record, and we dont allow them to change their school.
 			if (($config['participant_registration_type'] == 'schoolpassword' || $config['participant_registration_type'] == 'invite') && !$_POST['schools_id'][$x]) {
@@ -195,12 +223,12 @@ function students_save()
 			} else
 				$schoolquery = '';
 
-			// UPDATE existing record
+			try {
-			$dob = $_POST['year'][$x] . '-' . $_POST['month'][$x] . '-' . $_POST['day'][$x];
+				// UPDATE existing record
-			$stmt = $pdo->prepare("UPDATE students SET 
+				$dob = $_POST['year'][$x] . '-' . $_POST['month'][$x] . '-' . $_POST['day'][$x];
+				$stmt = $pdo->prepare("UPDATE students SET 
 				firstname=?, 
 				lastname=?, 
-				sex=?, 
 				email=?, 
 				address=?, 
 				city=?, 
@@ -217,27 +245,29 @@ function students_save()
 				tshirt=? 
 				WHERE id=?");
 
-			$stmt->execute([
+				$stmt->execute([
-				iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['firstname'][$x])),
+					iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['firstname'][$x])),
-				iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['lastname'][$x])),
+					iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['lastname'][$x])),
-				stripslashes($_POST['sex'][$x]),
+					iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['email'][$x])),
-				iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['email'][$x])),
+					iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['address'][$x])),
-				iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['address'][$x])),
+					iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['city'][$x])),
-				iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['city'][$x])),
+					iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['province'][$x])),
-				iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['province'][$x])),
+					stripslashes($_POST['postalcode'][$x]),
-				stripslashes($_POST['postalcode'][$x]),
+					stripslashes($_POST['phone'][$x]),
-				stripslashes($_POST['phone'][$x]),
+					$dob,
-				$dob,
+					stripslashes($_POST['grade'][$x]),
-				stripslashes($_POST['grade'][$x]),
+					stripslashes($_POST['medicalalert'][$x]),
-				stripslashes($_POST['medicalalert'][$x]),
+					stripslashes($_POST['foodreq'][$x]),
-				stripslashes($_POST['foodreq'][$x]),
+					iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['teachername'][$x])),
-				iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['teachername'][$x])),
+					iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['teacheremail'][$x])),
-				iconv('UTF-8', 'ISO-8859-1//TRANSLIT', stripslashes($_POST['teacheremail'][$x])),
+					stripslashes($_POST['tshirt'][$x]),
-				stripslashes($_POST['tshirt'][$x]),
+					$_POST['id'][$x]
-				$_POST['id'][$x]
+				]);
-			]);
+				happy_('%1 %2 successfully updated', array(iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $_POST['firstname'][$x]), iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $_POST['lastname'][$x])));
-
+			} catch (PDOException $exception) {
-			happy_('%1 %2 successfully updated', array(iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $_POST['firstname'][$x]), iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $_POST['lastname'][$x])));
+				error_('%1 %2 failed to update', array(iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $_POST['firstname'][$x]), iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $_POST['lastname'][$x])));
+				error_log($exception);
+			}
 		}
 		$x++;
 	}
@@ -248,10 +278,10 @@ function students_load()
 	global $registrations_id, $config, $pdo;
 
 	// now query and display
-	$q = $pdo->prepare("SELECT * FROM students WHERE
+	$q = $pdo->prepare('SELECT * FROM students WHERE
 				registrations_id=? 
-				AND year=?");
+				AND year=?');
-	$q->execute([$registrations_id,$config['FAIRYEAR']]);
+	$q->execute([$registrations_id, $config['FAIRYEAR']]);
 	show_pdo_errors_if_any($pdo);
 
 	$numfound = $q->rowCount();
@@ -298,24 +328,6 @@ function students_load()
 		echo ' <td>' . i18n('First Name') . "</td><td><input type=\"text\" name=\"firstname[$x]\" value=\"" . get_value_property_or_default($studentinfo, 'firstname') . '" />' . REQUIREDFIELD . "</td>\n";
 		echo ' <td>' . i18n('Last Name') . "</td><td><input type=\"text\" name=\"lastname[$x]\" value=\"" . get_value_property_or_default($studentinfo, 'lastname') . '" />' . REQUIREDFIELD . "</td>\n";
 		echo "</tr>\n";
-
-		if ($config['participant_student_personal'] == 'yes') {
-			echo "<tr>\n";
-			echo ' <td>' . i18n('Gender') . '</td><td>';
-			echo "<select name=\"sex[$x]\">";
-			echo '<option value="">' . i18n('Select') . "</option>\n";
-			if ($studentinfo->sex == 'male')
-				$sel = 'selected="selected"';
-			else
-				$sel = '';
-			echo "<option $sel value=\"male\">" . i18n('Male') . "</option>\n";
-			if ($studentinfo->sex == 'female')
-				$sel = 'selected="selected"';
-			else
-				$sel = '';
-			echo "<option $sel value=\"female\">" . i18n('Female') . "</option>\n";
-			echo '</select>' . REQUIREDFIELD;
-		}
 		echo "</td>\n";
 		echo " <td></td><td></td>\n";
 		echo "</tr>\n";
@@ -438,7 +450,7 @@ function students_load()
 		echo "<tr>\n";
 		echo ' <td>' . i18n('School') . '</td><td colspan="3">';
 		if ($config['participant_registration_type'] == 'open' || $config['participant_registration_type'] == 'singlepassword' || $config['participant_registration_type'] == 'openorinvite' || ($studentinfo && !$studentinfo->schools_id)) {
-			$schoolq = $pdo->prepare("SELECT id,school,city FROM schools WHERE year=? ORDER by city,school");
+			$schoolq = $pdo->prepare('SELECT id,school,city FROM schools WHERE year=? ORDER by city,school');
 			$schoolq->execute([$config['FAIRYEAR']]);
 			echo "<select name=\"schools_id[$x]\">\n";
 			echo '<option value="">' . i18n('Choose School') . "</option>\n";
@@ -451,8 +463,8 @@ function students_load()
 			}
 			echo '</select>' . REQUIREDFIELD;
 		} else {
-			$schoolq = $pdo->prepare("SELECT id,school FROM schools WHERE year=? AND id=?");
+			$schoolq = $pdo->prepare('SELECT id,school FROM schools WHERE year=? AND id=?');
-			$schoolq->execute([$config['FAIRYEAR'],$studentinfo->schools_id]);
+			$schoolq->execute([$config['FAIRYEAR'], $studentinfo->schools_id]);
 			$r = $schoolq->fetch(PDO::FETCH_OBJ);
 			echo $r->school;
 		}
@@ -504,7 +516,7 @@ function registration_load()
 		/* Find a reg num */
 		do {
 			$regnum = rand(100000, 999999);
-			$q = $pdo->prepare("SELECT * FROM registrations WHERE num=? AND year=?");
+			$q = $pdo->prepare('SELECT * FROM registrations WHERE num=? AND year=?');
 			$q->execute([$regnum, $config['FAIRYEAR']]);
 		} while ($q->rowCount() > 0);
 
@@ -513,14 +525,14 @@ function registration_load()
 		echo notice(i18n('New registration number generated.'));
 		echo notice(i18n('This new registration will added when the "Save Registration Information" button is pressed below.  At that time the other tabs will become available.'));
 	} else {
-		$q = $pdo->prepare("SELECT * FROM registrations WHERE id=?");
+		$q = $pdo->prepare('SELECT * FROM registrations WHERE id=?');
 		$q->execute([$registrations_id]);
 		if ($q->rowCount() != 1)
 			$r = array();
 		else {
 			$r = $q->fetch(PDO::FETCH_ASSOC);
 			/* Get the fair from the project */
-			$q = $pdo->prepare("SELECT fairs_id FROM projects WHERE registrations_id=?");
+			$q = $pdo->prepare('SELECT fairs_id FROM projects WHERE registrations_id=?');
 			$q->execute([$registrations_id]);
 			if ($q->rowCount() == 1) {
 				$p = $q->fetch(PDO::FETCH_ASSOC);
@@ -602,31 +614,31 @@ function registration_save()
 	$fairs_id = intval($_POST['registration_fair']);
 
 	if ($registrations_id == -1) {
-		$stmt = $pdo->prepare("INSERT INTO registrations (start,schools_id,year) VALUES (
+		$stmt = $pdo->prepare('INSERT INTO registrations (start,schools_id,year) VALUES (
-					NOW(), NULL,?)");
+					NOW(), NULL,?)');
 		$stmt->execute([$config['FAIRYEAR']]);
 		$registrations_id = $pdo->lastInsertId();
 
 		/* Create one student and a project */
-		$stmt = $pdo->prepare("INSERT INTO students (registrations_id,email,year) VALUES (
+		$stmt = $pdo->prepare('INSERT INTO students (registrations_id,email,year) VALUES (
 		
-					?,?,?)");
+					?,?,?)');
-		$stmt->execute([$registrations_id,$registration_email,$config['FAIRYEAR']]);
+		$stmt->execute([$registrations_id, $registration_email, $config['FAIRYEAR']]);
-		$stmt = $pdo->prepare("INSERT INTO projects (registrations_id,year) VALUES (
+		$stmt = $pdo->prepare('INSERT INTO projects (registrations_id,year) VALUES (
 		
-					?,?)");
+					?,?)');
-		$stmt->execute([$registrations_id,$config['FAIRYEAR']]);
+		$stmt->execute([$registrations_id, $config['FAIRYEAR']]);
 		happy_('Created student and project record');
 	}
 
 	/* Update registration */
-	$stmt = $pdo->prepare("UPDATE registrations SET 
+	$stmt = $pdo->prepare('UPDATE registrations SET 
 					num=?,
 					status=?,
 					email=?
 				WHERE 
-					id=?");
+					id=?');
-	$stmt->execute([$registration_num,$registration_status,$registration_email,$registrations_id]);
+	$stmt->execute([$registration_num, $registration_status, $registration_email, $registrations_id]);
 	show_pdo_errors_if_any($pdo);
 
 	/*
@@ -635,11 +647,11 @@ function registration_save()
 	 */
 	if ($auth_type == 'fair')
 		$fairs_id = $_SESSION['fairs_id'];
-	$stmt = $pdo->prepare("UPDATE projects SET 
+	$stmt = $pdo->prepare('UPDATE projects SET 
 					fairs_id=?
 				WHERE 
-					registrations_id=?");
+					registrations_id=?');
-	$stmt->execute([$fairs_id,$registrations_id]);
+	$stmt->execute([$fairs_id, $registrations_id]);
 	show_pdo_errors_if_any($pdo);
 	happy_('Information Saved');
 	echo '<script language="javascript" type="text/javascript">';

common.inc.php

@@ -31,7 +31,6 @@ include_once ('helper.inc.php');
 // so we will set it in the code instead just to make sure
 error_reporting(E_ALL);
 ini_set('log_errors', 'On');
-//ini_set('display_errors', 'Off');
 // error_reporting( E_ALL ^ E_WARNING );
 //error_reporting(E_ALL ^ E_WARNING ^ E_NOTICE ^ E_DEPRECATED);
 
@@ -85,6 +84,11 @@ if (file_exists($prependdir . 'data/config.inc.php')) {
 	exit;
 }
 
+if (get_value_or_default(isset($DEBUG), false))
+	ini_set('display_errors', 'On');
+else
+	ini_set('display_errors', 'Off');
+
 $dsn = "mysql:host=db;dbname=$DBNAME;charset=utf8mb4";
 
 $pdo = new PDO($dsn, $DBUSER, $DBPASS);
@@ -368,10 +372,9 @@ function send_header($title = '', $nav = null, $icon = null, $titletranslated =
 		echo i18n($config['fairname']); ?></title>
 
 		<link rel="stylesheet" href="https://code.jquery.com/ui/1.14.1/themes/base/jquery-ui.css">
-		<link rel="stylesheet" href="<?= $config['SFIABDIRECTORY'] ?>/theme/<?= $config['theme'] ?>/sfiab.css" type="text/css" media="all" />
+		<link rel="stylesheet" href="<?= $config['SFIABDIRECTORY'] ?>/theme/<?= $config['theme'] ?>/style.css" type="text/css" media="all" />
-		<link rel="stylesheet" href="<?= $config['SFIABDIRECTORY'] ?>/tableeditor.css" type="text/css" media="all" />
+		<link rel="stylesheet" href="<?= $config['SFIABDIRECTORY'] ?>/theme/<?= $config['theme'] ?>/tableeditor.css" type="text/css" media="all" />
 		<link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined" rel="stylesheet" />
-
 	</head>
 
 	<body>
@@ -385,6 +388,7 @@ function send_header($title = '', $nav = null, $icon = null, $titletranslated =
 		<script src="https://code.jquery.com/jquery-migrate-3.5.2.js"></script>
 
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.32.0/js/jquery.tablesorter.min.js" integrity="sha512-O/JP2r8BG27p5NOtVhwqsSokAwEP5RwYgvEzU9G6AfNjLYqyt2QT8jqU1XrXCiezS50Qp1i3ZtCQWkHZIRulGA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/TableDnD/0.9.1/jquery.tablednd.js" integrity="sha256-d3rtug+Hg1GZPB7Y/yTcRixO/wlI78+2m08tosoRn7A=" crossorigin="anonymous"></script>
 
 		<script src="https://code.jquery.com/ui/1.14.1/jquery-ui.min.js"></script>
 		<script type="text/javascript" src="<?= $config['SFIABDIRECTORY'] ?>/js/sfiab.js"></script>
@@ -597,9 +601,9 @@ function send_header($title = '', $nav = null, $icon = null, $titletranslated =
 	if ($icon && theme_icon($icon)) {
 		echo '<td width="40">';
 		echo theme_icon($icon);
-		echo '</td><td>';
+		echo '</td><td id="page-title">';
 	} else
-		echo '<td>';
+		echo '<td id="page-title">';
 
 	if ($title && !$titletranslated)
 		echo '<h2>' . i18n($title) . '</h2>';
@@ -682,8 +686,8 @@ function send_popup_header($title = '')
 		<title><?= i18n($title) ?></title>
 		<link rel="stylesheet" href="https://code.jquery.com/ui/1.14.1/themes/base/jquery-ui.css">
 		<!--<link rel="stylesheet" href="<?= $config['SFIABDIRECTORY'] ?>/theme/<?= $config['theme'] ?>/jquery-ui-1.7.2.custom.css" type="text/css" media="all" />-->
-		<link rel="stylesheet" href="<?= $config['SFIABDIRECTORY'] ?>/theme/<?= $config['theme'] ?>/sfiab.css" type="text/css" media="all" />
+		<link rel="stylesheet" href="<?= $config['SFIABDIRECTORY'] ?>/theme/<?= $config['theme'] ?>/style.css" type="text/css" media="all" />
-		<link media=all href="<?= $config['SFIABDIRECTORY'] ?>/tableeditor.css" type=text/css rel=stylesheet>
+		<link media=all href="<?= $config['SFIABDIRECTORY'] ?>/theme/<?= $config['theme'] ?>/tableeditor.css" type=text/css rel=stylesheet>
 		<link href="https://fonts.googleapis.com/icon?family=Material+Icons"
 			rel="stylesheet">
 	</head>
@@ -695,6 +699,7 @@ function send_popup_header($title = '')
 		<script type="text/javascript" src="<?= $config['SFIABDIRECTORY'] ?>/js/sfiab.js"></script>
 
 		<script type="text/javascript" src="<?= $config['SFIABDIRECTORY'] ?>/theme/<?= $config['theme'] ?>/theme-script.js"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/TableDnD/0.9.1/jquery.tablednd.js" integrity="sha256-d3rtug+Hg1GZPB7Y/yTcRixO/wlI78+2m08tosoRn7A=" crossorigin="anonymous"></script>
 		<div id="notice_area" class="notice_area"></div>
 
 	<?

csvimport.inc.php

@@ -56,12 +56,12 @@ class CSVParser
 			// End of line
 			if ($ch == "\n" && !$quoted) {
 				// Remove enclosure delimiters
-				for ($k = 0; $k < count($row); $k++) {
+				/*for ($k = 0; $k < count($row); $k++) {
 					if ($row[$k] != '' && $row[$k][0] == $this->enclosure) {
 						$row[$k] = substr($row[$k], 1, strlen($row[$k]) - 2);
 					}
 					$row[$k] = str_replace(str_repeat($this->enclosure, 2), $this->enclosure, $row[$k]);
-				}
+				}*/
 
 				// Append row into table
 				$this->data[] = $row;

helper.inc.php

@@ -31,7 +31,7 @@ function get_value(mixed $var): mixed
 
 function get_value_or_default(mixed $var, mixed $default = null): mixed
 {
-	return $var && isset($var) ? $var : $default;
+	return isset($var) && $var ? $var : $default;
 }
 
 function get_value_property_or_default(mixed $var, mixed $property, mixed $default = null): mixed
@@ -48,6 +48,16 @@ function show_pdo_errors_if_any($pdo)
 	}
 }
 
+function pdo_succeeded($pdo)
+{
+	return check_for_pdo_errors($pdo) === true;
+}
+
+function pdo_failed($pdo)
+{
+	return check_for_pdo_errors($pdo) === false;
+}
+
 function check_for_pdo_errors($pdo)
 {
 	$errorInfo = $pdo->errorInfo();

projects.inc.php

@@ -69,7 +69,7 @@ function getLanguagesOfProjectsEligibleForAward($award_id)
 {
 	global $config, $pdo;
 
-	$prjq = $pdo->prepare("SELECT DISTINCT(projects.language) AS language
+	$prjq = $pdo->prepare('SELECT DISTINCT(projects.language) AS language
 			FROM
 				award_awards,
 				award_awards_projectcategories,
@@ -85,7 +85,7 @@ function getLanguagesOfProjectsEligibleForAward($award_id)
 				AND projects.year=?
 			ORDER BY
 				language
-				");
+				');
 	$prjq->execute([$award_id, $config['FAIRYEAR']]);
 	$languages = array();
 	while ($r = $prjq->fetch(PDO::FETCH_OBJ)) {
@@ -100,7 +100,7 @@ function getProjectsEligibleOrNominatedForAwards($awards_ids_array)
 	global $pdo;
 	$projects = array();
 	foreach ($awards_ids_array AS $award_id) {
-		$q = $pdo->prepare("SELECT award_types.type FROM award_awards, award_types WHERE award_awards.id=? AND award_awards.award_types_id=award_types.id");
+		$q = $pdo->prepare('SELECT award_types.type FROM award_awards, award_types WHERE award_awards.id=? AND award_awards.award_types_id=award_types.id');
 		$q->execute([$award_id]);
 		$r = $q->fetch(PDO::FETCH_OBJ);
 
@@ -174,7 +174,8 @@ function getSpecialAwardsNominatedForProject($projectid)
 {
 	global $config, $pdo;
 
-	$awardsq = $pdo->prepare("SELECT
+	try {
+		$awardsq = $pdo->prepare('SELECT
 				award_awards.id,
 				award_awards.name,
 				award_awards.criteria,
@@ -191,25 +192,29 @@ function getSpecialAwardsNominatedForProject($projectid)
 				AND projects.id=?
 			ORDER BY
 				award_awards.name
-				");
+				');
-	$awardsq->execute([$projectid, $config['FAIRYEAR'], $projectid]);
+		$awardsq->execute([$projectid, $config['FAIRYEAR'], $projectid]);
-	$awards = array();
+		$awards = array();
-	show_pdo_errors_if_any($pdo);
+
-	while ($r = $awardsq->fetch(PDO::FETCH_OBJ)) {
+		while ($r = $awardsq->fetch(PDO::FETCH_OBJ)) {
-		$awards[$r->id] = array(
+			$awards[$r->id] = array(
-			'id' => $r->id,
+				'id' => $r->id,
-			'criteria' => $r->criteria,
+				'criteria' => $r->criteria,
-			'name' => $r->name,
+				'name' => $r->name,
-			'fairs_id' => $r->fairs_id
+				'fairs_id' => $r->fairs_id
-		);
+			);
+		}
+		return $awards;
+	} catch (PDOException $exception) {
+		error_log($exception);
+		return false;
 	}
-	return $awards;
 }
 
 function getNominatedForNoSpecialAwardsForProject($projectid)
 {
 	global $config, $pdo;
-	$awardsq = $pdo->prepare("SELECT
+	$awardsq = $pdo->prepare('SELECT
 				projects.id AS projects_id
 			FROM
 				project_specialawards_link,
@@ -219,7 +224,7 @@ function getNominatedForNoSpecialAwardsForProject($projectid)
 				AND projects.year=?
 				AND projects.id=?
 				AND project_specialawards_link.award_awards_id IS NULL
-				");
+				');
 	$awardsq->execute([$projectid, $config['FAIRYEAR'], $projectid]);
 	if ($awardsq->rowCount() == 1)
 		return true;
@@ -233,7 +238,7 @@ function getProjectsNominatedForSpecialAward($award_id)
 	// if they dont use special award nominations, then we will instead get all of the projects that
 	// are eligible for the award, instead of nominated for it.
 	if ($config['specialawardnomination'] != 'none') {
-		$prjq = $pdo->prepare("SELECT
+		$prjq = $pdo->prepare('SELECT
 					projects.projectnumber,
 					projects.title,
 					projects.language,
@@ -248,7 +253,7 @@ function getProjectsNominatedForSpecialAward($award_id)
 					AND projects.year=?
 				ORDER BY
 					projectsort
-					");
+					');
 		$prjq->execute([$award_id, $config['FAIRYEAR']]);
 		$projects = array();
 		while ($prjr = $prjq->fetch(PDO::FETCH_OBJ)) {
@@ -274,7 +279,7 @@ function getLanguagesOfProjectsNominatedForSpecialAward($award_id)
 	// if they dont use special award nominations, then we will instead get all of the projects that
 	// are eligible for the award, instead of nominated for it.
 	if ($config['specialawardnomination'] != 'none') {
-		$prjq = $pdo->prepare("SELECT  DISTINCT(projects.language) AS language
+		$prjq = $pdo->prepare('SELECT  DISTINCT(projects.language) AS language
 				FROM
 					project_specialawards_link,
 					projects
@@ -284,7 +289,7 @@ function getLanguagesOfProjectsNominatedForSpecialAward($award_id)
 					AND projects.projectnumber is not null
 					AND projects.year=?
 					ORDER BY language
-					");
+					');
 		$prjq->execute([$award_id, $config['FAIRYEAR']]);
 		$languages = array();
 		while ($r = $prjq->fetch(PDO::FETCH_OBJ)) {
@@ -304,7 +309,7 @@ function getSpecialAwardsNominatedByRegistrationID($id)
 {
 	global $config, $pdo;
 
-	$awardq = $pdo->prepare("SELECT
+	$awardq = $pdo->prepare('SELECT
 				award_awards.id,
 				award_awards.name,
 				award_awards_projectcategories.projectcategories_id, 
@@ -325,7 +330,7 @@ function getSpecialAwardsNominatedByRegistrationID($id)
 				AND projects.year=?
 			ORDER BY
 				projectsort
-				");
+				');
 	$awardq->execute([$award_id, $config['FAIRYEAR']]);
 	$projects = array();
 	while ($prjr = $awardq->fetch(PDO::FETCH_OBJ)) {
@@ -342,14 +347,14 @@ function project_load($pid)
 {
 	global $pdo;
 	/* Load this project */
-	$q = $pdo->prepare("SELECT * FROM projects WHERE id=?");
+	$q = $pdo->prepare('SELECT * FROM projects WHERE id=?');
 	$q->execute([$pid]);
 	$proj = $q->fetch();
 
 	/* Load the students */
-	$q = $pdo->prepare("SELECT students.*,schools.school FROM students 
+	$q = $pdo->prepare('SELECT students.*,schools.school FROM students 
 		LEFT JOIN schools ON schools.id=students.schools_id
-		WHERE registrations_id=? AND students.year=? ORDER BY students.id");
+		WHERE registrations_id=? AND students.year=? ORDER BY students.id');
 	$q->execute([$proj['registrations_id'], $proj['year']]);
 	$proj['num_students'] = 0;
 	while ($s = $q->fetch(PDO::FETCH_OBJ)) {

register_participants.inc.php

@@ -23,6 +23,17 @@
  */
 ?>
 <?
+
+function setRegistrationFormsReceived($reg_id = ''){
+	global $pdo;
+	if ($reg_id)
+		$rid = $reg_id;
+	else
+		$rid = $_SESSION['registration_id'];
+	$q = $pdo->prepare('UPDATE registrations set status = "paymentpending" WHERE id=?');
+	$q->execute([$rid]);
+}
+
 function registrationFormsReceived($reg_id = '')
 {
 	global $pdo;
@@ -55,7 +66,7 @@ function studentStatus($reg_id = '')
 {
 	global $config, $pdo;
 	if ($config['participant_student_personal'] == 'yes')
-		$required_fields = array('firstname', 'lastname', 'address', 'city', 'postalcode', 'phone', 'email', 'grade', 'dateofbirth', 'schools_id', 'sex');
+		$required_fields = array('firstname', 'lastname', 'address', 'city', 'postalcode', 'phone', 'email', 'grade', 'dateofbirth', 'schools_id');
 	else
 		$required_fields = array('firstname', 'lastname', 'email', 'grade', 'schools_id');
 

register_participants_emergencycontact.php

@@ -181,7 +181,7 @@ while ($sr = $sq->fetch(PDO::FETCH_OBJ)) {
 	echo "</tr>\n";
 	echo '<tr>';
 	echo ' <td>' . i18n('Phone 3') . ": </td><td><input type=\"text\" name=\"phone3[$id]\" size=\"20\" value=\"$r->phone3\" /></td>";
-	echo ' <td>' . i18n('Phone 4') . ": </td><td><input type=\"text\" name=\"phone4[$id]\" size=\"20\" value=\"$r->phone4\" /></td>";
+	echo ' <td><b>' . i18n('Student Cell') . "</b>: </td><td><input type=\"text\" name=\"phone4[$id]\" size=\"20\" value=\"$r->phone4\" /></td>";
 	echo "</tr>\n";
 	echo '</table>';
 	echo '<br />';

register_participants_main.php

@@ -29,7 +29,7 @@ include 'register_participants.inc.php';
 include 'projects.inc.php';
 
 // authenticate based on email address and registration number from the SESSION
-if (!$_SESSION['email']) {
+if (!get_value_from_array($_SESSION, 'email')) {
 	header('Location: register_participants.php');
 	exit;
 }
@@ -196,7 +196,7 @@ else
 echo '<tr><td>';
 
 if ($all_complete == true){
-	echo "<a href=\"/content/register_participants_signature.php\">";
+	echo "<a href='register_participants_signature.php'>";
 	echo i18n("$participationform"); 
 	echo '</a>';
 }
@@ -207,25 +207,17 @@ else{
 
 
 // echo i18n("$participationform");
-// if ($all_complete == true)
+if ($all_complete == true)
-// 	echo '</a>';
+	echo '</a>';
-// else
+else
-// 	echo '<br /><font color="red">(' . i18n('Available when ALL above sections are "Complete"') . ')</font>';
+	echo '<br /><font color="red">(' . i18n('Available when ALL above sections are "Complete"') . ')</font>';
 
-echo '</td><td>';
+echo "<td>";
-echo i18n('Sign');
+if (registrationFormsReceived())
-// check to see if its complete
+	echo outputStatus('complete');
-echo '</td></tr>';
+else
-
+	echo outputStatus('incomplete');
-// received information
+echo "</td>";
-// echo '<tr><td>' . i18n("$participationform Received") . '</td><td>';
-// if (registrationFormsReceived())
-// 	echo outputStatus('complete');
-// else
-// 	echo outputStatus('incomplete');
-
-// // check to see if its complete
-// echo '</td></tr>';
 
 echo '</table>';
 

register_participants_namecheck.php

@@ -85,7 +85,7 @@ if ($newstatus != 'complete') {
 	echo happy(i18n('Name Check Complete'));
 }
 
-echo i18n('Every year there is one participant who realizes that his/her name
+echo i18n('Every year there is one participant who realizes that their name
  is spelled wrong after certificates are printed and plaques are engraved.  This
  page has been created in an effort to ensure you are not that student.  It is
  difficult to re-print certificates and even harder to re-engrave a plaque.');
@@ -105,6 +105,7 @@ echo '<br /><br />';
 echo '<table class="summarytable">';
 foreach ($student_display_name AS $sn)
 	echo "<tr><td><span style=\"font-size: 4.0em; font-weight: bold\">&nbsp;$sn&nbsp;</span></td></tr>";
+
 echo '</table>';
 echo '<br /><br />';
 echo i18n('Please confirm that:');
@@ -115,16 +116,29 @@ echo "<input type=\"hidden\" name=\"action\" value=\"save\">\n";
 
 $ch = ($newstatus == 'complete') ? 'checked="checked"' : '';
 
-echo "<input type=\"checkbox\" name=\"spelling\" value=\"yes\" $ch /> " . i18n('My name is correctly spelled');
+if (count($student_display_name) == 1) {
-echo '<br />';
+	echo "<input type=\"checkbox\" name=\"spelling\" value=\"yes\" $ch /> " . i18n('My name is correctly spelled');
-echo "<input type=\"checkbox\" name=\"caps\" value=\"yes\" $ch /> " . i18n('The correct letters are capitalized and in lower-case.');
+	echo '<br />';
-echo '<br />';
+	echo "<input type=\"checkbox\" name=\"caps\" value=\"yes\" $ch /> " . i18n('The correct letters are capitalized and in lower-case.');
-echo "<input type=\"checkbox\" name=\"punc\" value=\"yes\" $ch /> " . i18n('Any required punctuation and accents are present and correct.');
+	echo '<br />';
-echo '<br />';
+	echo "<input type=\"checkbox\" name=\"punc\" value=\"yes\" $ch /> " . i18n('Any required punctuation and accents are present and correct.');
-echo '<br />';
+	echo '<br />';
+	echo '<br />';
 
-echo '<input type="submit" value="' . i18n('My Name is Correct') . "\" />\n";
+	echo '<input type="submit" value="' . i18n('My Name is Correct') . "\" />\n";
-echo '</form>';
+	echo '</form>';
+} else {
+	echo "<input type=\"checkbox\" name=\"spelling\" value=\"yes\" $ch /> " . i18n('The names are correctly spelled');
+	echo '<br />';
+	echo "<input type=\"checkbox\" name=\"caps\" value=\"yes\" $ch /> " . i18n('The correct letters are capitalized and in lower-case.');
+	echo '<br />';
+	echo "<input type=\"checkbox\" name=\"punc\" value=\"yes\" $ch /> " . i18n('Any required punctuation and accents are present and correct.');
+	echo '<br />';
+	echo '<br />';
+
+	echo '<input type="submit" value="' . i18n('The names are Correct') . "\" />\n";
+	echo '</form>';
+}
 
 send_footer();
 ?>

register_participants_safety.php

@@ -103,7 +103,7 @@ if ($q->rowCount()) {
 	echo '<br />';
 	echo "<form method=\"post\" action=\"register_participants_safety.php\">\n";
 	echo "<input type=\"hidden\" name=\"action\" value=\"save\">\n";
-	echo "<table class=\"tableedit\">\n";
+	echo "<table class=\"tableedit safety_questions\">\n";
 	$num = 1;
 	while ($r = $q->fetch(PDO::FETCH_OBJ)) {
 		$trclass = ($num % 2 == 0 ? 'odd' : 'even');

register_participants_signature.php

@@ -1,19 +1,112 @@
-
 <?
-include 'data/config.inc.php';
+
+/*
+ * This file is part of the 'Science Fair In A Box' project
+ * SFIAB Website: http://www.sfiab.ca
+ *
+ * Copyright (C) 2005 Sci-Tech Ontario Inc <info@scitechontario.org>
+ * Copyright (C) 2005 James Grant <james@lightbox.org>
+ * Copyright (C) 2008 David Grant <dave@lightbox.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+?>
+<?
+require ('common.inc.php');
+include 'register_participants.inc.php';
+
+// authenticate based on email address and registration number from the SESSION
+if (!$_SESSION['email']) {
+  header('Location: register_participants.php');
+  exit;
+}
+if (!$_SESSION['registration_number']) {
+  header('Location: register_participants.php');
+  exit;
+}
+
+global $pdo;
+
+$q = $pdo->prepare('SELECT * FROM students WHERE registrations_id=?');
+$q->execute([$_SESSION['registration_id']]);
+show_pdo_errors_if_any($pdo);
+
+if ($q->rowCount() == 0) {
+  header('Location: register_participants.php');
+  exit;
+}
+
+while ($s = $q->fetch(PDO::FETCH_OBJ)) {
+  $student[] = array(
+    'first' => "{$s->firstname}",
+    'last' => "{$s->lastname}",
+    'email' => "{$s->email}",
+    'grade' => "{$s->grade}"
+  );
+}
+
+// send the header
+send_header('Participant Registration - Signature Page');
+
+echo '<a href="register_participants_main.php">&lt;&lt; ' . i18n('Back to Participant Registration Summary') . '</a><br />';
+echo '<br />';
+
+if ($_POST['signed']) {
+  setRegistrationFormsReceived();
+}
+
+// output the current status
+$newstatus = registrationFormsReceived($_SESSION['registration_id']);
+if ($newstatus != 'complete') {
+  echo error(i18n('Signature Page Incomplete.  Please complete all forms below'));
+} else if ($newstatus == 'complete') {
+  echo happy(i18n('Signature Page Complete'));
+}
 ?>
 
 <script src="https://cdn.docuseal.com/js/form.js"></script>
 
-
+<div class="signatures" style="background-color: #d3d3d3; min-height: 800px">
 <docuseal-form
   id="docusealForm"
   data-src=<? echo "$SIGNATURES_URL" ?>
-  data-email="">
+  data-email=<? echo $student[0]['email'] ?>
+  data-values='<? echo '{"Name": "' . $student[0]['first'] . ' ' . $student[0]['last'] . '", "Grade": "' . $student[0]['grade'] . '"}' ?>'
+  style="display: block; max-height: 800px; overflow: auto;"
 </docuseal-form>
+</div>
 
 <script>
-  window.docusealForm.addEventListener('completed', (e) => e.detail)
+  window.docusealForm.addEventListener('completed', function (e) {
+    console.log(e);
+    const xhttp = new XMLHttpRequest();
+    xhttp.open("POST", "register_participants_signature.php");
+    xhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+    xhttp.onload = function() {
+      location.reload();
+    }
+    xhttp.send("signed=" + e.detail.submission_url);
+  });
 </script>
 
+<?
+send_footer();
+?>
+
+
+
+
+
 

register_participants_spawards.php

@@ -40,13 +40,13 @@ if (!$_SESSION['registration_number']) {
 }
 
 $q = $pdo->prepare('SELECT registrations.id AS regid, students.id AS studentid, students.firstname FROM registrations,students '
-	. "WHERE students.email=?"
+	. 'WHERE students.email=?'
-	. "AND registrations.num=?"
+	. 'AND registrations.num=?'
-	. "AND registrations.id=?"
+	. 'AND registrations.id=?'
 	. 'AND students.registrations_id=registrations.id '
 	. 'AND registrations.year=?'
 	. 'AND students.year=?');
-$q->execute([$_SESSION['email'],$_SESSION['registration_number'],$_SESSION['registration_id'],$config['FAIRYEAR'],$config['FAIRYEAR']]);
+$q->execute([$_SESSION['email'], $_SESSION['registration_number'], $_SESSION['registration_id'], $config['FAIRYEAR'], $config['FAIRYEAR']]);
 show_pdo_errors_if_any($pdo);
 
 if ($q->rowCount() == 0) {
@@ -55,7 +55,7 @@ if ($q->rowCount() == 0) {
 }
 $authinfo = $q->fetch(PDO::FETCH_OBJ);
 
-$q = $pdo->prepare("SELECT * FROM projects WHERE registrations_id=?");
+$q = $pdo->prepare('SELECT * FROM projects WHERE registrations_id=?');
 $q->execute([$_SESSION['registration_id']]);
 $project = $q->fetch(PDO::FETCH_OBJ);
 
@@ -91,8 +91,8 @@ echo '<br />';
 
 if ($config['specialawardnomination'] == 'date') {
 	echo notice(i18n('Special award self-nomination is only available from %1 to %2.  Please make sure you complete your nominations between these dates.', array($config['dates']['specawardregopen'], $config['dates']['specawardregclose'])));
-	$q = $pdo->prepare("SELECT (NOW()>? AND NOW()<?) AS datecheck");
+	$q = $pdo->prepare('SELECT (NOW()>? AND NOW()<?) AS datecheck');
-	$q->execute([$config['dates']['specawardregopen'],$config['dates']['specawardregclose']]);
+	$q->execute([$config['dates']['specawardregopen'], $config['dates']['specawardregclose']]);
 	$r = $q->fetch(PDO::FETCH_OBJ);
 	// this will return 1 if its between the dates, 0 otherwise.
 	if ($r->datecheck == 1)
@@ -123,22 +123,26 @@ if ($_POST['action'] == 'save') {
 		if ($num > $config['maxspecialawardsperproject']) {
 			echo error(i18n('You can only apply to %1 special awards.  You have selected %2', array($config['maxspecialawardsperproject'], $num)));
 		} else {
-			$stmt = $pdo->prepare("DELETE FROM project_specialawards_link WHERE projects_id=? AND year=?");
+			try {
-			$stmt->execute([$project->id,  $config['FAIRYEAR']]);
+				$stmt = $pdo->prepare('DELETE FROM project_specialawards_link WHERE projects_id=? AND year=?');
-			foreach ($splist AS $spaward) {
+				$stmt->execute([$project->id, $config['FAIRYEAR']]);
-				$s = ($spaward == -1) ? 'NULL' : "'$spaward'";
+				foreach ($splist AS $spaward) {
-				$stmt = $pdo->prepare('INSERT INTO project_specialawards_link (award_awards_id,projects_id,year) VALUES (
+					$stmt = $pdo->prepare('INSERT INTO project_specialawards_link (award_awards_id,projects_id,year) VALUES (
 					?, 
 					?,
 					?)');
-				$stmt->execute([$s,$project->id,$config['FAIRYEAR']]);
+					$stmt->execute([$s, $project->id, $config['FAIRYEAR']]);
-				show_pdo_errors_if_any($pdo);
+					show_pdo_errors_if_any($pdo);
-			}
+				}
-			if ($num) {
+				if ($num) {
-				if ($noawards == true)
+					if ($noawards == true)
-					echo happy(i18n('Successfully registered for no special awards'));
+						echo happy(i18n('Successfully registered for no special awards'));
-				else
+					else
-					echo happy(i18n('Successfully registered for %1 special awards', array($num)));
+						echo happy(i18n('Successfully registered for %1 special awards', array($num)));
+				}
+			} catch (PDOException $exception) {
+				error(happy(i18n('Failed to register your settings for special awards')));
+				error_log($exception);
 			}
 		}
 	} else {

register_participants_students.php

@@ -104,12 +104,11 @@ if (get_value_from_array($_POST, 'action') == 'save') {
 				}
 				// INSERT new record
 				$dob = $_POST['year'][$x] . '-' . $_POST['month'][$x] . '-' . $_POST['day'][$x];
-				$stmt = $pdo->prepare('INSERT INTO students (registrations_id,firstname,lastname,pronunciation,sex,email,address,city,county,province,postalcode,phone,dateofbirth,grade,schools_id,tshirt,medicalalert,foodreq,teachername,teacheremail,year) VALUES ('
+				$stmt = $pdo->prepare('INSERT INTO students (registrations_id,firstname,lastname,pronunciation,email,address,city,county,province,postalcode,phone,dateofbirth,grade,schools_id,tshirt,medicalalert,foodreq,teachername,teacheremail,year) VALUES ('
 					. "'" . $_SESSION['registration_id'] . "', "
 					. "'" . stripslashes($_POST['firstname'][$x]) . "', "
 					. "'" . stripslashes($_POST['lastname'][$x]) . "', "
 					. "'" . stripslashes($_POST['pronunciation'][$x]) . "', "
-					. "'" . stripslashes($_POST['sex'][$x]) . "', "
 					. "'" . stripslashes($_POST['email'][$x]) . "', "
 					. "'" . stripslashes($_POST['address'][$x]) . "', "
 					. "'" . stripslashes($_POST['city'][$x]) . "', "
@@ -144,7 +143,6 @@ if (get_value_from_array($_POST, 'action') == 'save') {
 					. "firstname='" . stripslashes($_POST['firstname'][$x]) . "', "
 					. "lastname='" . stripslashes($_POST['lastname'][$x]) . "', "
 					. "pronunciation='" . stripslashes($_POST['pronunciation'][$x]) . "', "
-					. "sex='" . stripslashes($_POST['sex'][$x]) . "', "
 					. "email='" . stripslashes($_POST['email'][$x]) . "', "
 					. "address='" . stripslashes($_POST['address'][$x]) . "', "
 					. "city='" . stripslashes($_POST['city'][$x]) . "', "
@@ -289,29 +287,12 @@ for ($x = 1; $x <= $numtoshow; $x++) {
 		echo "</tr>\n";
 	}
 
-	if ($config['participant_student_personal'] == 'yes') {
-		echo "<tr>\n";
-		echo ' <td>' . i18n('Gender') . '</td><td>';
-		echo "<select name=\"sex[$x]\">";
-		echo '<option value="">' . i18n('Select') . "</option>\n";
-		if ($studentinfo->sex == 'male')
-			$sel = 'selected="selected"';
-		else
-			$sel = '';
-		echo "<option $sel value=\"male\">" . i18n('Male') . "</option>\n";
-		if ($studentinfo->sex == 'female')
-			$sel = 'selected="selected"';
-		else
-			$sel = '';
-		echo "<option $sel value=\"female\">" . i18n('Female') . "</option>\n";
-		echo '</select>' . REQUIREDFIELD;
-	}
 	echo "</td>\n";
 	echo " <td></td><td></td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
-	echo ' <td>' . i18n('Email Address') . "</td><td><input type=\"text\" name=\"email[$x]\" value=\"" . get_value_property_or_default($studentinfo, 'email') . '" />' . REQUIREDFIELD . "</td>\n";
+	echo ' <td>' . i18n('Email Address') . "</td><td><input type=\"email\" name=\"email[$x]\" value=\"" . get_value_property_or_default($studentinfo, 'email') . '" />' . REQUIREDFIELD . "</td>\n";
 
 	if ($config['participant_student_personal'] == 'yes') {
 		echo ' <td>' . i18n('City') . "</td><td><input type=\"text\" name=\"city[$x]\" value=\"" . get_value_property_or_default($studentinfo, 'city') . '" />' . REQUIREDFIELD . "</td>\n";
@@ -338,7 +319,7 @@ for ($x = 1; $x <= $numtoshow; $x++) {
 		echo ' <td>' . i18n($config['postalzip']) . '</td>';
 		echo "<td><input type=\"text\" name=\"postalcode[$x]\" value=\"" . get_value_property_or_default($studentinfo, 'postalcode') . '" />' . REQUIREDFIELD . "</td>\n";
 		echo ' <td>' . i18n('Phone') . '</td>';
-		echo " <td><input type=\"text\" name=\"phone[$x]\" value=\"" . get_value_property_or_default($studentinfo, 'phone') . '" />' . REQUIREDFIELD . "</td>\n";
+		echo " <td><input type=\"tel\" name=\"phone[$x]\" value=\"" . get_value_property_or_default($studentinfo, 'phone') . '" />' . REQUIREDFIELD . "</td>\n";
 		echo "</tr>\n";
 
 		echo "<tr>\n";
@@ -475,7 +456,7 @@ for ($x = 1; $x <= $numtoshow; $x++) {
 
 	echo "<tr>\n";
 	echo ' <td>' . i18n('Teacher Name') . "</td><td><input type=\"text\" name=\"teachername[$x]\" value=\"" . get_value_property_or_default($studentinfo, 'teachername') . "\" /></td>\n";
-	echo ' <td>' . i18n('TeacherEmail') . "</td><td><input type=\"text\" name=\"teacheremail[$x]\" value=\"" . get_value_property_or_default($studentinfo, 'teacheremail') . "\" /></td>\n";
+	echo ' <td>' . i18n('Teacher Email') . "</td><td><input type=\"email\" name=\"teacheremail[$x]\" value=\"" . get_value_property_or_default($studentinfo, 'teacheremail') . "\" /></td>\n";
 	echo "</tr>\n";
 
 	if ($config['participant_regfee_items_enable'] == 'yes') {

remote.php

@@ -237,7 +237,6 @@ function award_upload_assign(&$fair, &$award, &$prize, &$project, $year, &$respo
 	$student_fields = array('firstname' => 'firstname',
 		'lastname' => 'lastname',
 		'email' => 'email',
-		'gender' => 'sex',
 		'grade' => 'grade',
 		'language' => 'lang',
 		'birthdate' => 'dateofbirth',

theme/science_ation/style.css

@@ -1,32 +1,44 @@
-html{
+html {
-	overflow-x:hidden;
+	overflow-x: hidden;
 }
 
-body
+body {
-{
-	
 	font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 	font-size: small;
 	margin: 0;
 	padding: 0;
 	background: #E0E0FF;
 	background: #e0e0ff;
-	overflow-x:hidden;
+	overflow-x: hidden;
-	height:100%;
+	height: 100%;
-	
 }
 
-input, textarea, select
+input,
-{
+textarea,
+select {
 	font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 	font-size: small;
 }
 
-table{
+table {
-	overflow-x:scroll;
+	width: 100%;
+	overflow: scroll;
+	display:block;
 }
 
+#main-content {
+	width: 100%;
+}
 
+#page-title {
+	vertical-align: bottom;
+}
+
+.tableview {
+	border-collapse: collapse;
+  	border-spacing: 1px;
+  	color: black;
+}
 
 td {
 	vertical-align: top;
@@ -46,7 +58,7 @@ table tr.odd {
 
 	height: 50px;
 	text-align: center;
-	
+
 	background: #ffffff;
 	padding: 10px;
 }
@@ -55,7 +67,7 @@ table tr.odd {
 #footer {
 	width: 100%;
 	text-align: center;
-	background-color : #5C6F90;
+	background-color: #5C6F90;
 	font-size: 0.8em;
 }
 
@@ -72,29 +84,22 @@ table tr.odd {
 	padding: 5px;
 	font-size: 1.0em;
 	box-shadow: 2px 2px 2px black;
+	border-radius: 0.5rem;
 }
 
 
 #main {
-	
+	background: #f1eeff;
-	
+	padding: 10px;
-	background:#f1eeff;
-	padding: 3px;
-	border: 2px solid Silver;
 	min-height: 600px;
-	width: 99%;
+	border-radius: 0 0 0.5rem 0.5rem;
-	
 }
 
 #mainwhere {
-    margin-right: 10px;
+	background: #EEEEFF;
-    background: #EEEEFF;
+	padding: 0.5rem;
-    padding: 3px;
+	border-radius: 0.5rem 0.5rem 0 0;
-    border-top: 2px solid Silver;
+	font-size: 1em;
-    border-left: 2px solid Silver;
-    border-right: 2px solid Silver;
-    font-size: 0.85em;
-	width: 99%;
 }
 
 
@@ -108,19 +113,22 @@ h1 {
 	font-weight: bold;
 	margin-top: 0;
 	margin-bottom: 0;
-} 
+}
+
 h2 {
 	font-size: 1.6em;
 	font-weight: bold;
 	margin-top: 0;
 	margin-bottom: .3em;
 }
+
 h3 {
 	font-size: 1.4em;
 	font-weight: bold;
 	margin-top: 0;
 	margin-bottom: .2em;
 }
+
 h4 {
 	font-size: 1.2em;
 	font-weight: bold;
@@ -129,35 +137,35 @@ h4 {
 }
 
 ul.mainnav {
-	list-style : none;
+	list-style: none;
-	margin : 0;
+	margin: 0;
-	padding : 0;
+	padding: 0;
-	background-color : #d6d6d6;
+	background-color: #d6d6d6;
 	width: 165px;
 }
 
 ul.mainnav li {
-	display : block;
+	display: block;
-	border-top : 1px solid #a5b5c6;
+	border-top: 1px solid #a5b5c6;
 }
 
 ul.mainnav li a {
-	display : block;
+	display: block;
-	margin : 0;
+	margin: 0;
-	padding : 6px;
+	padding: 6px;
-	
+
 	background-color: #e0e0ff;
-	font : bold 0.9em/1.5em Arial, sans-serif;
+	font: bold 0.9em/1.5em Arial, sans-serif;
-	
+
 	color: black;
-	text-decoration : none;
+	text-decoration: none;
 }
 
 ul.mainnav li a:hover {
-	
+
 	background-color: white;
-	
+
-	color:black;
+	color: black;
 	text-decoration: none;
 }
 
@@ -187,7 +195,7 @@ a:hover {
 	padding: 0px;
 	margin-left: 30px;
 	margin-right: 30px;
-	
+
 }
 
 .summarytable th {
@@ -200,7 +208,7 @@ a:hover {
 	font-weight: bold;
 }
 
-.summarytable th a{
+.summarytable th a {
 	font-size: 1.0em;
 	color: white;
 	font-weight: bold;
@@ -235,7 +243,7 @@ a:hover {
 .notice {
 	font-weight: bold;
 	border: 1px solid Silver;
-/*background: #E0E0FF; */
+	/*background: #E0E0FF; */
 	background: #FFFFE0;
 	font-size: 1em;
 }
@@ -278,6 +286,15 @@ tr.externalaward {
 	color: #0000AA;
 }
 
+.safety_questions tr {
+	width: 20px;
+	overflow: scroll;
+}
+
+.safety_questions>* {
+	font-size: 1.5em;
+}
+
 
 .adminconfigtable td {
 	text-align: center;
@@ -314,7 +331,7 @@ tr.externalaward {
 	margin-left: 30px;
 	margin-right: 30px;
 	font-size: 0.8em;
-	
+
 }
 
 .fundraisingtable th {
@@ -328,7 +345,7 @@ tr.externalaward {
 	text-align: left;
 }
 
-.fundraisingtable th a{
+.fundraisingtable th a {
 	color: white;
 	font-weight: normal;
 }
@@ -371,7 +388,7 @@ div.notice_area div.error {
 }
 
 div.notice_area div.happy {
-/*	border: 2px solid white;
+	/*	border: 2px solid white;
 	color: green;
 	background-color: #99FF99;*/
 	color: white;
@@ -379,7 +396,7 @@ div.notice_area div.happy {
 }
 
 .date {
-    width: 80px;
+	width: 80px;
 
 }
 
@@ -401,8 +418,8 @@ div.notice_area div.happy {
 
 /* Override the titlebar padding, it's too big, make the font
  * a happy size */
-.ui-dialog .ui-dialog-titlebar { 
+.ui-dialog .ui-dialog-titlebar {
-	padding: 0.2em 0.5em 0.2em .5em ;
+	padding: 0.2em 0.5em 0.2em .5em;
 	font-size: 1.2em;
 	font-weight: bold;
 	text-align: center;
@@ -441,7 +458,7 @@ div.ui-tabs ul.ui-tabs-nav {
 }
 
 .ui-datepicker {
-    z-index: 1003;
+	z-index: 1003;
 }
 
 .text-link {
@@ -464,20 +481,21 @@ div.ui-tabs ul.ui-tabs-nav {
 	color: #c0c0c0;
 }
 
-.tablesorter-headerRow{
+.tablesorter-headerRow {
-	background:black;
+	background: black;
 }
 
-#registration_list{
+#registration_list {
-	background:black;
+	background: black;
 }
-#menu-toggle-button{
+
+#menu-toggle-button {
 	display: none;
 }
 
 
 
-#sidebar.active{
+#sidebar.active {
 	display: block;
 	position: fixed;
 	top: 20%;
@@ -485,11 +503,11 @@ div.ui-tabs ul.ui-tabs-nav {
 	z-index: 100;
 }
 
-#sidebar.active ~ #main-content{
+#sidebar.active~#main-content {
-	opacity: 0.7;
+	opacity: 0.5;
 }
 
-#menu-toggle-button:hover{
+#menu-toggle-button:hover {
 	cursor: pointer;
 }
 
@@ -510,39 +528,39 @@ div.ui-tabs ul.ui-tabs-nav {
 		display: block;
 		height: 25px;
 		width: 25px;
-		
+
 	}
 
-	.user-info-table td{
+	.user-info-table td {
 		display: block;
 	}
 
-	.adminconfigtable tr{
+	.adminconfigtable tr {
 		display: grid;
 		grid-template-columns: 1fr 1fr 1fr;
 	}
-	
+
 
 }
 
-.thematic-break{
+.thematic-break {
 	display: none;
 }
 
 
-@media screen and (max-width: 410px){
+@media screen and (max-width: 410px) {
 
-	.adminconfigtable{
+	.adminconfigtable {
 		margin: auto;
 	}
-	
 
-	.adminconfigtable tr{
+
+	.adminconfigtable tr {
 		display: grid;
 		grid-template-columns: 1fr 1fr;
 	}
-	adminconfigtable
+
-	.thematic-break{
+	adminconfigtable .thematic-break {
 		display: block;
 	}
-} 
+}

theme/science_ation/tableeditor.css

@@ -22,11 +22,6 @@ input {
 	border-collapse: collapse;
 	border-spacing: 1px;
 	color: black;
-	margin-left: 20px;
-	margin-right: 20px;
-	border: 0px;
-	font-size: 0.8em;
-	;
 }
 
 .tableview td {

user.inc.php

@@ -479,7 +479,7 @@ function user_save(&$u)
 	$fields = array('salutation', 'firstname', 'lastname', 'username',
 		'email',
 		'phonehome', 'phonework', 'phonecell', 'fax', 'organization',
-		'address', 'address2', 'city', 'province', 'postalcode', 'sex',
+		'address', 'address2', 'city', 'province', 'postalcode', 
 		'firstaid', 'cpr', 'types', 'lang');
 
 	$set = '';
@@ -691,7 +691,7 @@ function user_purge($u, $type = false)
 function user_dupe_row($table, $key, $val, $newval)
 {
 	global $config, $pdo;
-	$nullfields = array('id', 'sex', 'deleteddatetime');  /* Fields that can be null */
+	$nullfields = array('id', 'deleteddatetime');  /* Fields that can be null */
 	$q = $pdo->prepare("SELECT * FROM $table WHERE $key='$val'");
 	$q->execute();
 	if ($q->rowCount() != 1) {
@@ -965,7 +965,6 @@ $user_personal_fields_map = array(
 	'salutation' => array('salutation'),
 	'name' => array('firstname', 'lastname'),
 	'email' => array('email'),
-	'sex' => array('sex'),
 	'phonehome' => array('phonehome'),
 	'phonework' => array('phonework'),
 	'phonecell' => array('phonecell'),

user_personal.php

@@ -46,7 +46,6 @@ $user_personal_fields = array(
 	'lang' => array('name' => 'Preferred Language'),
 	'province' => array('name' => $config['provincestate']),
 	'organization' => array('name' => 'Organization'),
-	'sex' => array('name' => 'Gender'),
 	'firstaid' => array('name' => 'First Aid Training',
 		'type' => 'yesno'),
 	'cpr' => array('name' => 'CPR Training',
@@ -301,28 +300,6 @@ item($u, 'phonework');
 echo '</tr>';
 echo "<tr>\n";
 item($u, 'fax');
-if (in_array('sex', $fields)) {
-	echo '<td>' . i18n('Gender') . ': </td>';
-	echo '<td>';
-	echo '<select name="sex">';
-	echo '<option value="">' . i18n('Choose') . "</option>\n";
-	if ($u['sex'] == 'male')
-		$sel = 'selected="selected"';
-	else
-		$sel = '';
-	echo "<option value=\"male\" $sel>" . i18n('Male') . "</option>\n";
-	if ($u['sex'] == 'female')
-		$sel = 'selected="selected"';
-	else
-		$sel = '';
-	echo "<option value=\"female\" $sel>" . i18n('Female') . "</option>\n";
-	echo '</select>';
-	if (in_array('sex', $required))
-		echo REQUIREDFIELD;
-	echo '</td>';
-} else {
-	echo '<td></td><td></td>';
-}
 echo '</tr>';
 
 echo "<tr>\n";