Initial fixes for Judging Scheduler

admin/award_awards.php

@@ -27,14 +27,14 @@
  user_auth_required('committee', 'admin');
  require_once('awards.inc.php');
 
- switch(get_value_from_array($_GET, 'action', 'awardinfo_load')) {
-	
+ switch(get_value_from_array($_GET, 'action')) {
+	 
  case 'awardinfo_load':
  	$id = intval(get_value_from_array($_GET, 'id'));
-	
 	$q = $pdo->prepare("SELECT * FROM award_awards WHERE id='$id'");
 	$q->execute();	
 	$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) {print('sdfs');
 		$ret[$k]=iconv("ISO-8859-1","UTF-8",$v);
@@ -54,7 +54,7 @@
 
 	if($id == -1) {
 		
-		$q = $prepare("INSERT INTO award_awards (year,self_nominate,schedule_judges) 
+		$q = $pdo->prepare("INSERT INTO award_awards (year,self_nominate,schedule_judges) 
 				VALUES ('{$config['FAIRYEAR']}','yes','yes')");
 		$q->execute();
 		$id = $pdo->lastInsertId();
@@ -177,7 +177,7 @@
 		$q->execute();
 	} else {
 		
-		$q = $prepare("SELECT * FROM award_prizes WHERE award_awards_id='$id' ORDER BY `order`");
+		$q = $pdo->prepare("SELECT * FROM award_prizes WHERE award_awards_id='$id' ORDER BY `order`");
 		$q->execute();
 	}
 	while($r=$q->fetch(PDO::FETCH_ASSOC)) {
@@ -254,8 +254,8 @@
 	}
 	
 	$q = $pdo->prepare("SELECT * FROM award_awards WHERE id='$id'");
-	$q -> execute();
-	$a = fetch(PDO::FETCH_ASSOC)
+	$q->execute();
+	$a = $q->fetch(PDO::FETCH_ASSOC)
 ?>
 	<h4><?=i18n("Feeder Fairs")?></h4>
 	<form id="feeder_form">

admin/committees.php

@@ -174,7 +174,7 @@ if(get_value_from_array($_POST,'committees_id') && get_value_from_array($_POST,'
 
 if(get_value_from_array($_POST, 'action')=="assign")
 {
-	if(get_value_from_array($_POST, 'committees_id') && get_vaue_from_array($_POST,'users_uid')) {
+	if(get_value_from_array($_POST, 'committees_id') && get_value_from_array($_POST,'users_uid')) {
 		$cid = intval($_POST['committees_id']);
 		$q = $pdo->prepare("SELECT * FROM committees_link WHERE committees_id='$cid' AND users_uid='$uid'");
 		$q->execute();

admin/communication.php

@@ -65,7 +65,7 @@ case 'dialog_choose':
 	<select id="comm_dialog_choose_emails_id">
 		<option value="-1">-- <?=i18n('Choose a Communication')?> --</option>
 	<?
-	$type = $_GET['type'];
+	$type = $pdo->quote( $_GET['type']);
 	$q = $pdo->prepare("SELECT * FROM emails WHERE type='$type'");
 	$q->execute();
 	while($e = $q->fetch(PDO::FETCH_ASSOC)) {
@@ -157,15 +157,15 @@ case 'email_save':
 	$subject=iconv("UTF-8","ISO-8859-1//TRANSLIT",$subject);
 
 	//Now its safe to escape it for the db query
-	$name = stripslashes($name);
-	$description = stripslashes($description);
-	$from = stripslashes($from);
-	$subject = stripslashes($subject);
-	$bodyhtml = stripslashes($bodyhtml);
+	$name = $pdo->quote(stripslashes($name));
+	$description = $pdo->quote(stripslashes($description));
+	$from = $pdo->quote(stripslashes($from));
+	$subject = $pdo->quote(stripslashes($subject));
+	$bodyhtml = $pdo->quote(stripslashes($bodyhtml));
 
-	$type = $_POST['type'];
-	$key = $_POST['key'];
-	$fcid = $_POST['fcid'];
+	$type = $pdo->quote($_POST['type']);
+	$key = $pdo->quote($_POST['key']);
+	$fcid = $pdo->quote($_POST['fcid']);
 
 	if($id == 0) {
 		if($key && $name) {
@@ -690,7 +690,7 @@ case "email_get_list":
 	
 	$emailq = $pdo->prepare("SELECT * FROM emails WHERE id='$emailid'");
 	$emailq->execute();
-	$email=$emailq.fetch(PDO::FETCH_OBJ);
+	$email=$emailq->fetch(PDO::FETCH_OBJ);
 
 	$recipq = $pdo->prepare("SELECT * FROM fundraising_campaigns_users_link
 						WHERE fundraising_campaigns_id='$fcid'");
@@ -747,12 +747,12 @@ case "email_get_list":
 			
 			$q = $pdo->prepare("INSERT INTO emailqueue_recipients (emailqueue_id,toemail,toname,replacements,sent) VALUES (
 				'$emailqueueid',
-				'".$u['email']."',
-				'".$u['name']."',
-				'".json_encode($replacements."',
+				'".$pdo->quote($u['email'])."',
+				'".$pdo->quote($u['name'])."',
+				'".$pdo->quote(json_encode($replacements)."',
 				NULL)"));
 			$q->execute();
-			echo $pdo->erroInfo();
+			show_pdo_errors_if_any($pdo);
 		}
 		$q = $pdo->prepare("UPDATE emails SET lastsent=NOW() WHERE id='$emailid'");
 		$q->execute();
@@ -875,14 +875,14 @@ case "email_get_list":
 
 		$numtotal=$recipq->rowCount();
 		$q = $pdo->prepare("INSERT INTO emailqueue (val,name,users_uid,`from`,subject,body,bodyhtml,`type`,fundraising_campaigns_id,started,finished,numtotal,numsent) VALUES (
-				'".$email->val."',
-				'".$email->name."',
-				'".$_SESSION['users_uid']."',
-				'".$email->from."',
-				'".$email->subject."',
-				'".$email->body."',
-				'".$email->bodyhtml."',
-				'".$email->type."',
+				'".$pdo->quote($email->val)."',
+				'".$pdo->quote($email->name)."',
+				'".$pdo->quote($_SESSION['users_uid'])."',
+				'".$pdo->quote($email->from)."',
+				'".$pdo->quote($email->subject)."',
+				'".$pdo->quote($email->body)."',
+				'".$pdo->quote($email->bodyhtml)."',
+				'".$pdo->quote($email->type)."',
 				NULL,
 				NOW(),
 				NULL,
@@ -923,7 +923,7 @@ case "email_get_list":
 				$acq=$pdo->prepare("SELECT accesscode FROM schools WHERE (sciencehead_uid='{$u['uid']}' OR principal_uid='{$u['uid']}') AND `year`='{$config['FAIRYEAR']}'");
 				$acq->execute();
 				show_pdo_errors_if_any($pdo);
-				$acr=$acq->fetch(PDO::FETCH-OBJ);
+				$acr=$acq->fetch(PDO::FETCH_OBJ);
 				$accesscode=$acr->accesscode;
 
 				$replacements=array(

admin/donors.php

@@ -1078,7 +1078,8 @@ function update_contactsinfo()
 }
 
 function contactsinfo_save(uid) {
-	var id=sponsor_id;		
+	var id=sponsor_id;	
+	print(id);
 	$("#debug").load("<?$_SERVER['PHP_SELF']?>?action=contactsinfo_save&id="+id, $("#contact_" + uid).serializeArray(),
 	function() {
 		$("#contactaccordion").accordion();

admin/fundraising_campaigns.php

@@ -545,6 +545,7 @@ function save_campaign_info(){
        target='".$_POST['target']."',
        fundraising_goal='".$_POST['fundraising_goal']."'
        WHERE id='$id'");
+    $stmt->execute();
 }
 
 send_header("Appeal Management",
@@ -558,8 +559,8 @@ send_header("Appeal Management",
 <script type="text/javascript">
 $(document).ready(function() {
     <?
-    if($_GET['manage_campaign']) {
-        echo "managecampaign(".intval($_GET['manage_campaign']).");\n";
+    if(get_value_from_array($_GET, 'manage_campaign')) {
+        echo "managecampaign(".intval(get_value_from_array($_GET, 'manage_campaign')).");\n";
     }
     else {
         echo "managecampaigns();\n";
@@ -755,10 +756,12 @@ function opensendemaildialog(fcid,emails_id) {
 function display_campaign_form($r=null) {
     global $config;
     global $campaign_types;
+    global $pdo;
+    
 ?>    
 		<tr>
 			<td><?=i18n("Name")?></td>
-			<td colspan="3"><input size="40" type="text" name="name" value="<?=$r->name?>"></td>
+			<td colspan="3"><input size="40" type="text" name="name" value="<?=get_value_property_or_default($r, 'name')?>"></td>
             <td><?=i18n("Type")?></td><td>
             <select name="type">
             <option value=""><?=i18n("Choose")?></option>
@@ -772,16 +775,16 @@ function display_campaign_form($r=null) {
             </td>
         </tr>
         <?
-        if($r->startdate) $sd=$r->startdate;
+        if(get_value_property_or_default($r, 'startdate')) $sd=$r->startdate;
         else $sd=date("Y-m-d");
         ?>
         <tr>
 			<td><?=i18n("Start Date")?></td><td><input type="text" name="startdate" class="date" value="<?=$sd?>" /></td>
-			<td><?=i18n("Follow-Up Date")?></td><td><input type="text" name="followupdate" class="date" value="<?=$r->followupdate?>" /></td>
-			<td><?=i18n("End Date")?></td><td><input type="text" name="enddate" class="date" value="<?=$r->enddate?>" /></td>
+			<td><?=i18n("Follow-Up Date")?></td><td><input type="text" name="followupdate" class="date" value="<?=get_value_property_or_default($r, 'followupdate')?>" /></td>
+			<td><?=i18n("End Date")?></td><td><input type="text" name="enddate" class="date" value="<?=get_value_property_or_default($r, 'enddate')?>" /></td>
         </tr>
         <tr>
-			<td><?=i18n("Target")?></td><td>$<input type="text" id="target" name="target" size="10" value="<?=$r->target?>" /></td>
+			<td><?=i18n("Target")?></td><td>$<input type="text" id="target" name="target" size="10" value="<?=get_value_property_or_default($r,'target')?>" /></td>
 			<td><?=i18n("Default Purpose")?></td><td colspan="3">
             <?
             $fgq=$pdo->prepare("SELECT * FROM fundraising_goals WHERE fiscalyear='{$config['FISCALYEAR']}' ORDER BY name");

admin/index.php

@@ -65,14 +65,16 @@
  	echo theme_icon("registration_fee_items_management")."<br />".i18n("Registration Fee Items Management")."<br /><i>(".i18n("disabled").")</i>";
  echo "</td>";
  echo " </tr>\n";
+
  echo " <tr>";
  echo "  <td><a href=\"reports.php\">".theme_icon("print/export_reports")."<br />".i18n("Print / Export Reports")."</a></td>";
  echo "  <td><a href=\"reports_ceremony.php\">".theme_icon("print_awards_ceremony_scripts")."<br />".i18n("Print Award Ceremony Scripts")."</a></td>";
  echo "  <td><a href=\"reports_editor.php\">".theme_icon("report_management")."<br />".i18n("Report Management")."</a></td>";
  echo "  <td><a href=\"translations.php\">".theme_icon("translations_management")."<br />".i18n("Translations Management")."</a></td>";
- echo "  <td>";
+ 
  echo "</td>";
  echo " </tr>\n";
+
  echo " <tr>";
  echo "<td></td><td></td>\n";
  echo " </tr>\n";

admin/judges_sa.php

@@ -36,7 +36,7 @@
 // However when I Launch using $WshShell->run($bat_filename,0,false ); for Windows IIS it seems:
 // All the $_SERVER variables are set as if were a website page so any variable I have tried will cause a bailout
 // THUS..   There is no test I have found to verify this was run from the command line (or in background) for Windows
-if($_SERVER['SERVER_ADDR']) {
+if(get_value_from_array($_SERVER, 'SERVER_ADDR')) {
 	echo "This script must be run from the command line";
 	exit;
 }
@@ -55,7 +55,7 @@ $round_divisional2 = NULL;
 
 
 function set_status($txt)
-{
+{   global $pdo;
 	TRACE("Status: $txt\n");
 	$stmt = $pdo->prepare("UPDATE config SET val='$txt' WHERE 
 			var='judge_scheduler_activity' AND year=0");
@@ -64,7 +64,7 @@ function set_status($txt)
 
 $set_percent_last_percent = -1;
 function set_percent($n)
-{
+{   global $pdo;
 	global $set_percent_last_percent;
 	$p = floor($n);
 	if($p == $set_percent_last_percent) return;
@@ -383,7 +383,7 @@ while($r=$q->fetch(PDO::FETCH_OBJ)) {
 
 TRACE("Loading Languages...\n");
 $langr = array();
-dddddddddddddddo->prepare("SELECT * FROM languages WHERE active='Y'");
+$pdo->prepare("SELECT * FROM languages WHERE active='Y'");
 while($r=$q->fetch(PDO::FETCH_OBJ)) {
 	$langr[$r->lang] = $r->langname;
 	TRACE("   {$r->lang} - {$r->langname}\n");
@@ -395,7 +395,7 @@ $round = array();
 $q = $pdo->prepare("SELECT * FROM judges_timeslots WHERE round_id='0' AND `year`='{$config['FAIRYEAR']}'");
 $q->execute();
 /* Loads judges_timeslots.id, .starttime, .endtime, .date, .name */
-while($r = $q=>fetch(PDO::FETCH_ASSOC)) {
+while($r = $q->fetch(PDO::FETCH_ASSOC)) {
 	TRACE("   id:{$r['id']} type:{$r['type']} name:{$r['name']}\n");
 
 	$qq = $pdo->prepare("SELECT * FROM judges_timeslots WHERE round_id='{$r['id']}'");
@@ -470,7 +470,7 @@ foreach($keys as $jdiv_id) {
 
 /* Clean out the judging teams that were autocreated in a previous run */
 TRACE("Deleting autocreated divisional and special award judging teams:");
-$q = pdo->prepare("SELECT * FROM judges_teams WHERE autocreate_type_id=1 AND year={$config['FAIRYEAR']}");
+$q = $pdo->prepare("SELECT * FROM judges_teams WHERE autocreate_type_id=1 AND year={$config['FAIRYEAR']}");
 $q->execute();
 while($r = $q->fetch(PDO::FETCH_OBJ)) {
 	$id = $r->id;
@@ -563,7 +563,7 @@ foreach($judges as &$j) {
 			continue;
 		}
 		$q->execute();
-		while($r = $q=>fetch(PDO::FETCH_ASSOC)) {
+		while($r = $q->fetch(PDO::FETCH_ASSOC)) {
 			$j['availability'][] = $r;
 		}
 	}
@@ -621,7 +621,7 @@ if(count($judges)==0) {
 $q = $pdo->prepare("SELECT * FROM judges_teams WHERE year={$config['FAIRYEAR']}");
 $q->execute();
 $used_judges_teams_numbers = array();
-while($i = $q=>fetch(PDO::FETCH_ASSOC)) {
+while($i = $q->fetch(PDO::FETCH_ASSOC)) {
 	$used_judges_teams_numbers[] = $i['num'];
 }
 echo "The following judge team numbers are already used: \n";
@@ -1292,7 +1292,7 @@ if($config['scheduler_enable_sa_scheduling'] == 'yes') {
 			/* Do timeslot and project timeslot assignment */
 			$stmt = $pdo->prepare("INSERT INTO judges_teams_timeslots_link 
 							(judges_teams_id,judges_timeslots_id,year)
-							VALUES ('{$t['id']}', '{$r['timeslots'][0]['id']}', '{$config['FAIRYEAR']}')")
+							VALUES ('{$t['id']}', '{$r['timeslots'][0]['id']}', '{$config['FAIRYEAR']}')");
 			$stmt->execute();
 			show_pdo_errors_if_any($pdo);
 

admin/judges_schedulerconfig_check.inc.php

@@ -144,12 +144,16 @@ function judges_scheduler_check_judges()
 		$qp->execute();
 		$qr = $qp->fetch(PDO::FETCH_OBJ);
 		
+		if (get_value_from_3d_array($jdiv, $r->jdiv_id, 'num_projects', 'total') !== null){
+			$jdiv[$r->jdiv_id][num_projects][total] += $qr->cnt;
+		}
 		
-		$jdiv[$r->jdiv_id]['num_projects']['total'] += $qr->cnt;
-		$jdiv[$r->jdiv_id]['num_projects'][$l] += $qr->cnt;
+		if(get_value_from_3d_array($jdiv,$r->jdiv_id, 'num_projects', $l) !== null)
+			$jdiv[$r->jdiv_id]['num_projects'][$l] += $qr->cnt;
 		
 
-        $projectlanguagetotal[$l]+=$qr->cnt;
+		if(get_value_from_array($projectlanguagetotal, $l) !== null)
+      	  $projectlanguagetotal[$l]+=$qr->cnt;
         $projecttotal+=$qr->cnt;
 		
 	}

admin/judges_teams.php

@@ -32,7 +32,7 @@
 	if(get_value_from_array($_GET,'action')) $action=get_value_from_array($_GET,'action');
 	if(get_value_from_array($_POST,'action')) $action=get_value_from_array($_POST,'action');
 
-	if($action == "delete" && get_value_from_array($_GET, 'delete'))
+	if(get_value_or_default($action) == "delete" && get_value_from_array($_GET, 'delete'))
 	{
 		//ALSO DELETE: team members, timeslots, projects, awards
 		
@@ -48,7 +48,7 @@
 		$stmt->execute();message_push(happy(i18n("Judge team successfully removed, and all of its corresponding members, timeslots, projects and awards unlinked from team")));
 	}
 
-	if($action=="deletealldivisional")
+	if(get_value_or_default($action)=="deletealldivisional")
 	{
 		$q2=$pdo->prepare("SELECT *
 				FROM 	
@@ -81,7 +81,7 @@
 			message_push(error(i18n("There were no auto-created divisional teams to delete")));
 	}
 	
-	if($action=="deleteall")
+	if(get_value_or_default($action)=="deleteall")
 	{
 		$q2=$pdo->prepare("SELECT *
 				FROM 	judges_teams
@@ -112,7 +112,7 @@
 			message_push(error(i18n("There were no teams to delete")));
 	}
 
-	if(($action=="save" || $action=="assign") && $edit)
+	if((get_value_or_default($action)=="save" || $action=="assign") && $edit)
 	{
 		//if we're updating or assigning, it doesnt matter, lets do the same thing (save record, add award
 		//but when we're done, if we're "assign" then go back to edit that team
@@ -189,7 +189,7 @@
 		}
 	}
 
-	if($action=="unassign")
+	if(get_value_or_default($action)=="unassign")
 	{
 		$stmt = $pdo->prepare("DELETE FROM judges_teams_awards_link WHERE judges_teams_id='$edit' AND award_awards_id='".$_GET['unassign']."' AND year='".$config['FAIRYEAR']."'");
 		$stmt->execute();
@@ -198,7 +198,7 @@
 		$action="edit";
 	}
 
-	if($action=="createall")
+	if(get_value_or_default($action)=="createall")
 	{
 		//first make sure we dont have any non-divisional award teams (dont want people hitting refresh and adding all the teams twice
 		$q=$pdo->prepare("SELECT COUNT(*) AS c FROM judges_teams WHERE autocreate_type_id!='1' AND year='".$config['FAIRYEAR']."'");
@@ -259,7 +259,7 @@
 		}
 	}
 
-	if($action=="add" && $_GET['num'])
+	if(get_value_or_default($action)=="add" && $_GET['num'])
 	{
 		$stmt = $pdo->prepare("INSERT INTO judges_teams(num,year) VALUES ('".$_GET['num']."','".$config['FAIRYEAR']."')");
 		$stmt->execute();
@@ -268,7 +268,7 @@
 		$action="edit";
 	}
 
-	if($action=="edit" && $edit)
+	if(get_value_or_default($action)=="edit" && $edit)
 	{
 		send_header("Edit Judging Team",
  			array('Committee Main' => 'committee_main.php',

admin/reports.inc.php

@@ -359,17 +359,17 @@ foreach($report_stock as $n=>$v) {
 	foreach($report[$type] as $k=>$v) {
 		if($type == 'option') {
 			/* field, value, x, y, w, h, lines, face, align, valign, fn, fs, fsize, overflow */
-			$vals = "'".$k."','".$v."','0','0','0','0','0','','','','','','0','truncate'";
+			$vals = "'".$pdo->quote($k)."','".$pdo->quote($v)."','0','0','0','0','0','','','','','','0','truncate'";
 		} else {
 			if(get_value_from_array($v, 'lines') == 0) $v['lines'] =1;
 			$fs = is_array(get_value_from_array($v,'fontstyle')) ? implode(',',$v['fontstyle']) : '';
-			$opts = "{".get_value_from_array($v,'align')."} {". get_value_from_array($v, 'valign') ."}";
-			$vals = "'{'".get_value_from_array($v, 'field')."'}','".get_value_from_array($v, 'value')."',
-				'{".get_value_from_array($v, 'x')."}','{".get_value_from_array($v,'y')."}','{".get_value_from_array($v, 'w')."}',
-				'{".get_value_from_array($v, 'h')."}','{".get_value_from_array($v, 'lines')."}','{".get_value_from_array($v,'face')."}',
-				'$opts','{".get_value_from_array($v,'valign')."}',
-				'{".get_value_from_array($v, 'fontname')."}','$fs','{".get_value_from_array($v, 'fontsize')."}',
-				'{".get_value_from_array($v, 'on_overflow')."}'";
+			$opts = get_value_from_array($v, 'align') . " " .$pdo->quote(get_value_from_array($v, 'valign'));
+			$vals = "'{$v['field']}','{$v['value']}',
+				'{$v['x']}','{$v['y']}','{$v['w']}',
+				'{$v['h']}','{$v['lines']}','{$v['face']}',
+				'$opts','{$v['valign']}',
+				'{$v['fontname']}','$fs','{$v['fontsize']}',
+				'{$v['on_overflow']}'";
 		}
 		if($q != '') $q .= ',';
 		$q .= "({$report['id']}, '$type','$x',$vals)";
@@ -396,17 +396,19 @@ foreach($report_stock as $n=>$v) {
 	global $report_tours_fields, $report_fairs_fields;
 	global $report_fundraisings_fields;
 
+	global $pdo;
+
 	$report = array();
 
 	$q = $pdo->prepare("SELECT * FROM reports WHERE id='$report_id'");
 	$q->execute();
 	$r = $q->fetch(PDO::FETCH_ASSOC);
-	$report['name'] = $r['name'];
-	$report['id'] = $r['id'];
-	$report['system_report_id'] = $r['system_report_id']; 
-	$report['desc'] = $r['desc'];
-	$report['creator'] = $r['creator'];
-	$report['type'] = $r['type'];
+	$report['name'] = get_value_from_array($r, 'name');
+	$report['id'] = get_value_from_array($r, 'id');
+	$report['system_report_id'] = get_value_from_array($r, 'system_report_id'); 
+	$report['desc'] = get_value_from_array($r,'desc');
+	$report['creator'] = get_value_from_array($r,'creator');
+	$report['type'] = get_value_from_array($r, 'type');
 
 	$report['col'] = array();
 	$report['sort'] = array();

admin/tours_assignments.php

@@ -38,7 +38,7 @@
 	$tours[$i->id]['num'] = $i->num;
  }
 
- if($_GET['action']=='info') {
+ if(get_value_from_array($_GET, 'action')=='info') {
 	$sid = intval($_GET['id']);
 
 	$query="SELECT * FROM students WHERE id='$sid'
@@ -139,10 +139,10 @@ function switchinfo()
 
 
 
-	$tours_id = intval($_POST['tours_id']);
-	$student_list = is_array($_POST['studentlist']) ? $_POST['studentlist'] : array();
+	$tours_id = intval(get_value_from_array($_POST, 'tours_id'));
+	$student_list = is_array(get_value_from_array($_POST, 'studentlist')) ? $_POST['studentlist'] : array();
 
-	if($_POST['action']=='add' && $tours_id != 0 && count($student_list)>0) {
+	if(get_value_from_array($_POST, 'action')=='add' && $tours_id != 0 && count($student_list)>0) {
 		// make sure the tour is valid
 		if(!array_key_exists($tours_id, $tours)) {
 			/* Someone is hacking the POST */
@@ -184,10 +184,10 @@ function switchinfo()
 				$added,$j,$tours[$tours_id]['num'],$tours[$tours_id]['name'])));
 	}
 
-	$tours_id = intval($_GET['tours_id']);
-	$students_id = intval($_GET['students_id']);
+	$tours_id = intval(get_value_from_array($_GET, 'tours_id'));
+	$students_id = intval(get_value_from_array($_GET, 'students_id'));
 
-	if($_GET['action']=='del' && $tours_id>0 && $students_id>0) {
+	if(get_value_from_array($_GET, 'action')=='del' && $tours_id>0 && $students_id>0) {
 		$stmt = $pdo->prepare("DELETE FROM tours_choice 
 				WHERE students_id='$students_id' 
 				AND year='{$config['FAIRYEAR']}'
@@ -198,7 +198,7 @@ function switchinfo()
 
 	}
 
-	if($_GET['action']=="empty" && $tours_id>0)
+	if(get_value_from_array($_GET, 'action')=="empty" && $tours_id>0)
 	{
 		$stmt=$po->prepare("DELETE FROM tours_choice WHERE 
 				tour_id='$tours_id'
@@ -212,7 +212,7 @@ function switchinfo()
 	if(!$_SESSION['viewstate']['students_teams_list_show'])
 		$_SESSION['viewstate']['students_teams_list_show']='unassigned';
 	//now update the students_teams_list_show viewstate
-	if($_GET['students_teams_list_show'])
+	if(get_value_from_array($_GET, 'students_teams_list_show'))
 		$_SESSION['viewstate']['students_teams_list_show']=$_GET['students_teams_list_show'];
 
 	echo "<form name=\"tours\" method=\"post\" action=\"tours_assignments.php\">";

admin/tours_sa_config.php

@@ -28,7 +28,7 @@ ogram; see the file COPYING.  If not, write to
  require_once("../config_editor.inc.php");
  user_auth_required('committee', 'admin');
 
- if($_GET['action']=="launch") {
+ if(get_value_from_array($_GET, 'action')=="launch") {
 	exec("nice php tours_sa.php >/dev/null 2>&1 &");
 	usleep(1000000); // 1 second to allow the judges_sa to update the % status to 0% otherwise the status page will think its not running if it gets there too soon
 	header("Location: tours_sa_status.php");
@@ -54,6 +54,7 @@ ogram; see the file COPYING.  If not, write to
  function tours_check_tours()
  {
  	global $config;
+	global $pdo;
 	$q = $pdo->prepare("SELECT * FROM tours WHERE year='{$config['FAIRYEAR']}'");
 	$q->execute();
 	return $q->rowCount();
@@ -62,6 +63,7 @@ ogram; see the file COPYING.  If not, write to
  function tours_check_students()
  {
  	global $config;
+	global $pdo;
 	$q=$pdo->prepare("SELECT students.id
 		FROM students
 			LEFT JOIN tours_choice ON (tours_choice.students_id=students.id)
@@ -77,7 +79,7 @@ ogram; see the file COPYING.  If not, write to
 	return $q->rowCount();
  }
 
- if($_GET['action']=="reset") {
+ if(get_value_from_array($_GET, 'action')=="reset") {
  	$stmt = $pdo->prepare("UPDATE config SET `val`='-1' WHERE `var`='tours_assigner_percent' AND `year`=0");
 	$stmt->execute();
 	$config['tours_assigner_percent']=="-1";

admin/winners.php

@@ -465,6 +465,7 @@ while($r=$q->fetch(PDO::FETCH_ASSOC)) {
 function print_award(&$r, $fairs_id, $editor=false, $editor_data=array())
 {
 	global $config, $auth_type;
+	global $pdo;
 
 //	echo "fair=$fairs_id";
 

committee_main.php

@@ -47,6 +47,7 @@
 	 echo " <td><a href=\"admin/reports.php\">".theme_icon("print/export_reports")."<br />".i18n("My Reports (View/Print/Edit)")."</a></td>";
  }
  echo " </tr>\n";
+
  echo " <tr>\n";
  echo "  <td><a href=\"user_personal.php\">".theme_icon("edit_profile")."<br />".i18n("Edit My Profile")."</a></td>";
  echo "  <td><a href=\"user_password.php\">".theme_icon("change_password")."<br />".i18n("Change My Password")."</a></td>";

common.inc.php

@@ -208,7 +208,7 @@ session_start();
 
 //detect the browser first, so we know what icons to use - we store this in the config array as well
 //even though its not configurable by the fair
-if(stristr($_SERVER['HTTP_USER_AGENT'],"MSIE"))
+if(stristr(get_value_from_array($_SERVER, 'HTTP_USER_AGENT', ""),"MSIE"))
 	$config['icon_extension']="gif";
 else
 	$config['icon_extension']="png";
@@ -375,7 +375,7 @@ function happy($str,$type="normal")
 function display_messages()
 {
 	/* Dump any messages in the queue */
-	if(is_array($_SESSION['messages'])) {
+	if(is_array(get_value_from_array($_SESSION, 'messages'))) {
 		foreach($_SESSION['messages'] as $m) echo $m;
 	}
 	$_SESSION['messages'] = array();
@@ -396,16 +396,21 @@ function send_header($title="", $nav=null, $icon=null, $titletranslated=false)
 <html>
 <head>
 <meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <title><? //if($title && !$titletranslated) echo i18n($title); else if($title) echo $title; else echo i18n($config['fairname']); ?></title>
 <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']?>/tableeditor.css" type="text/css" media="all" />
+<link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined" rel="stylesheet" />
+
 </head>
 <body>
 <!-- <? if($title && !$titletranslated) echo i18n($title); else if($title) echo $title; else echo i18n($config['fairname']); ?> -->
-<script type="text/javascript" src="<?=$config['SFIABDIRECTORY']?>/js/jquery/1.3.2/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
+
 <script type="text/javascript" src="<?=$config['SFIABDIRECTORY']?>/js/jqueryui/1.7.2/jquery-ui.min.js"></script>
 <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 type="text/javascript" src="<?=$config['SFIABDIRECTORY']?>/js/tablesorter/jquery.tablesorter.min.js"></script>
 <script type="text/javascript">
 $(document).ready(function(){
@@ -425,6 +430,14 @@ if(file_exists($prependdir."data/logo-100.gif"))
 	echo "<img align=\"left\" height=\"50\" src=\"".$config['SFIABDIRECTORY']."/data/logo-100.gif\">";
 
 echo "<h1>".i18n($config['fairname'])."</h1>";
+echo "<span id='menu-toggle-button' onClick='toggle_sidebar()' class='material-symbols-outlined'>
+menu
+</span>"
+?>
+
+</div>
+<hr />
+<? 
 echo "<div align=\"right\" style=\"font-size: 0.75em;\">";
 if(isset($_SESSION['users_type'])) {
 	$types = array('volunteer' => 'Volunteer', 'judge' => 'Judge', 
@@ -454,10 +467,9 @@ if(isset($_SESSION['users_type'])) {
 }
 echo "</div>";
 ?>
-<hr />
-</div>
-<table cellpadding="5" width="100%">
-<tr><td width="175">
+
+<table id='content' cellpadding="5" width="100%">
+<tr><td id='sidebar' width="175">
 <?
 	global $pdo;
 	//if the date is greater than the date/time that the confirmed participants gets posted,
@@ -570,7 +582,7 @@ echo "</ul>";
 ?>
 
 </div>
-</td><td>
+</td><td id='main-content'>
 <?
 
 if(is_array($nav)) {
@@ -618,7 +630,7 @@ if(substr(getcwd(),-6)=="/admin" || substr(getcwd(),-7)=="/config" || substr(get
 		$fname=substr($_SERVER['REDIRECT_SCRIPT_URL'],strlen($config['SFIABDIRECTORY'])+1);
 	else
 		$fname=substr($_SERVER['PHP_SELF'],strlen($config['SFIABDIRECTORY'])+1);	
-	echo "</td><td align=\"right\"><a target=\"_sfiabhelp\" href=\"http://www.sfiab.ca/wiki/index.php/Help_$fname\"><img border=\"0\" src=\"".$config['SFIABDIRECTORY']."/images/32/help.".$config['icon_extension']."\"></a>";
+	echo "</td><td align=\"right\"><a target=\"_sfiabhelp\" href=\"http://www.sfiab.ca/wiki/index.php/Help_$fname\"><img border=\"0\" src=\"".$config['SFIABDIRECTORY']."/images/32/help_science_ation.".$config['icon_extension']."\"></a>";
 }
 "</td></tr>";
 echo "</table>";
@@ -678,10 +690,14 @@ function send_popup_header($title="")
 <html>
 <head>
 <meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 <title><?=i18n($title)?></title>
 <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 media=all href="<?=$config['SFIABDIRECTORY']?>/tableeditor.css" type=text/css rel=stylesheet>
+<link href="https://fonts.googleapis.com/icon?family=Material+Icons"
+      rel="stylesheet">
 </head>
 <body onLoad="window.focus()">
 <script type="text/javascript" src="<?=$config['SFIABDIRECTORY']?>/js/jquery/1.3.2/jquery.min.js"></script>
@@ -852,7 +868,7 @@ function emit_province_selector($name,$selected="",$extra="")
 	
 	if($q->rowCount()==1)
 	{
-		$r = $q->fetch();
+		$r = $q->fetch(PDO::FETCH_OBJ);
 		
 		echo "<input type=\"hidden\" name=\"$name\" value=\"$r->code\">";
 		echo i18n($r->province);
@@ -862,7 +878,7 @@ function emit_province_selector($name,$selected="",$extra="")
 		echo "<select name=\"$name\" $extra>\n";
 		
 		echo "<option value=\"\">".i18n("Select a {$config['provincestate']}")."</option>\n";
-		while($r = $q->fetch())
+		while($r = $q->fetch(PDO::FETCH_OBJ))
 		{
 			if($r->code == $selected) $sel="selected=\"selected\""; else $sel="";
 

config/index.php

@@ -42,12 +42,14 @@
  echo "  <td><a href=\"categories.php\">".theme_icon("project_age_categories")."<br />".i18n("Project Age Categories")."</a></td>";
  echo "  <td><a href=\"divisions.php\">".theme_icon("project_divisions")."<br />".i18n("Project Divisions")."</a></td>";
  echo " </tr>";
+ echo "<hr class='thematic-break'/>";
  echo " <tr>";
  echo "  <td><a href=\"divisions_cwsf.php\">".theme_icon("cwsf_project_divisions")."<br />".i18n("CWSF Project Divisions")."</a></td>";
  echo "  <td><a href=\"subdivisions.php\">".theme_icon("project_sub_divisions")."<br />".i18n("Project Sub-Divisions")."</a></td>";
  echo "  <td><a href=\"pagetexts.php\">".theme_icon("page_texts")."<br />".i18n("Page Texts")."</a></td>";
  echo "  <td><a href=\"signaturepage.php\">".theme_icon("exhibitor_signature_page")."<br />".i18n("Exhibitor $participationform")."</a></td>";
  echo " </tr>\n";
+ echo "<hr class='thematic-break'/>";
  echo " <tr>";
  echo "  <td><a href=\"judges_questions.php\">".theme_icon("judge_registration_questions")."<br />".i18n("Judge Registration Questions")."</a></td>";
  echo "  <td><a href=\"safetyquestions.php\">".theme_icon("project_safety_questions")."<br />".i18n("Project Safety Questions")."</a></td>";
@@ -71,7 +73,7 @@
  echo "  <td><a href=\"rolloverfiscal.php\">".theme_icon("rollover_fiscal_year")."<br />".i18n("Rollover Fiscal Year")."</a></td>";
  echo "  <td><a href=\"backuprestore.php\">".theme_icon("backup_restore")."<br />".i18n("Database Backup/Restore")."</a></td>";
  echo "  <td></td>\n";
- echo "  <td></td>\n";
+ 
  echo " </tr>";
  echo "</table>\n";
 

config/subdivisions.php

@@ -73,7 +73,7 @@
 		{
 			$idq=$pdo->prepare("SELECT MAX(id) AS id FROM projectsubdivisions");
 			$idq->execute();
-			$idr=$idq->fetch(PDO::fETCH_OBJ);
+			$idr=$idq->fetch(PDO::FETCH_OBJ);
 			$newid=$idr->id+1;
 
 		}

projects.inc.php

@@ -25,6 +25,7 @@
 function getProjectsEligibleForAward($award_id)
 {
 	global $config;
+	global $pdo;
 
 	$prjq=$pdo->prepare("SELECT
 				award_awards.id,
@@ -229,6 +230,7 @@ function getNominatedForNoSpecialAwardsForProject($projectid)
 function getProjectsNominatedForSpecialAward($award_id)
 {
 	global $config;
+	global $pdo;
 
 	//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.

theme/icons_science_ation/icons.php

@@ -0,0 +1,77 @@
+<?
+/* 
+   This file is part of the 'Science Fair In A Box' project
+   SFIAB Website: http://www.sfiab.ca
+
+   Copyright (C) 2008 James Grant <james@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.
+*/
+
+	$theme_icons['name']="Science-ation Icons";
+	$theme_icons['description']="KDE4 icons";
+	$theme_icons['author']="James Grant <james@lightbox.org>";
+
+	//COMMITTEE MAIN ICONS (that are not used in admin/config already)
+	$theme_icons['icons']['change_password']="encrypted.png";
+	$theme_icons['icons']['edit_profile']="edit_user.png";
+	$theme_icons['icons']['manage_roles']="agt_forum.png";
+
+	//ADMIN ICONS
+	$theme_icons['icons']['administration']="gear.png";
+	$theme_icons['icons']['participant_registration']="accessories-text-editor.png";
+	$theme_icons['icons']['print/export_reports']="application-pdf.png";
+	$theme_icons['icons']['print_awards_ceremony_scripts']="application-pdf.png";
+	$theme_icons['icons']['committee_management']="system-users.png";
+	$theme_icons['icons']['awards_management']="plasmagik.png";
+	$theme_icons['icons']['schools_management']="applications-education.png";
+	$theme_icons['icons']['judging_management']="klipper.png";
+	$theme_icons['icons']['sciencefair_management']="folder.png";
+	$theme_icons['icons']['translations_management']="kwordquiz.png";
+	$theme_icons['icons']['report_management']="document-multiple.png";
+	$theme_icons['icons']['volunteer_management']="user-group-new.png";
+	$theme_icons['icons']['tour_management']="preferences-system-performance.png";
+	$theme_icons['icons']['internal_document_management']="application-vnd.oasis.opendocument.text.png";
+	$theme_icons['icons']['registration_fee_items_management']="transfers_list.png";
+	$theme_icons['icons']['judging_score_entry']="transfers_list.png";
+	$theme_icons['icons']['enter_winning_projects']="legalmoves.png";
+	$theme_icons['icons']['one-click_cwsf_registration']="flag-blue.png";
+	$theme_icons['icons']['one-click_ysf_affiliation_stats']="flag-green.png";
+	$theme_icons['icons']['fair_stats']="view_sort_descending.png";
+	$theme_icons['icons']['communication']="mail-mark-unread.png";
+	$theme_icons['icons']['website_content_management']="toggle_log.png";
+	$theme_icons['icons']['fundraising']="Coins-32x32.png";
+
+	//CONFIG ICONS
+	$theme_icons['icons']['configuration']="package_utilities.png";
+	$theme_icons['icons']['configuration_variables']="configure.png";
+	$theme_icons['icons']['important_dates']="date.png";
+	$theme_icons['icons']['project_age_categories']="kdmconfig.png";
+	$theme_icons['icons']['project_divisions']="edu_science.png";
+	$theme_icons['icons']['cwsf_project_divisions']="edu_science_canada.png";
+	$theme_icons['icons']['project_sub_divisions']="chemical.png";
+	$theme_icons['icons']['page_texts']="kwrite.png";
+	$theme_icons['icons']['exhibitor_signature_page']="signature.png";
+	$theme_icons['icons']['judge_registration_questions']="vcs_status.png";
+	$theme_icons['icons']['project_safety_questions']="help-contents.png";
+	$theme_icons['icons']['images']="elempic.png";
+	$theme_icons['icons']['external_award_sources']="ark.png";
+	$theme_icons['icons']['language_pack_installer']="kanagram.png";
+	$theme_icons['icons']['new_version_checker']="numbers.png";
+	$theme_icons['icons']['rollover_fair_year']="svn_switch.png";
+	$theme_icons['icons']['rollover_fiscal_year']="rollover_fiscal.png";
+	$theme_icons['icons']['backup_restore']="rebuild.png";
+
+?>

theme/new_default/jquery-ui-1.7.2.custom.css

@@ -0,0 +1,406 @@
+/*
+* jQuery UI CSS Framework
+* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+*/
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+
+/*
+* jQuery UI CSS Framework
+* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=5px&bgColorHeader=2191c0&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=75&borderColorHeader=4297d7&fcHeader=eaf5f7&iconColorHeader=d8e7f3&bgColorContent=fcfdfd&bgTextureContent=06_inset_hard.png&bgImgOpacityContent=100&borderColorContent=a6c9e2&fcContent=222222&iconColorContent=0078ae&bgColorDefault=0078ae&bgTextureDefault=02_glass.png&bgImgOpacityDefault=45&borderColorDefault=77d5f7&fcDefault=ffffff&iconColorDefault=e0fdff&bgColorHover=79c9ec&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=448dae&fcHover=026890&iconColorHover=056b93&bgColorActive=6eac2c&bgTextureActive=12_gloss_wave.png&bgImgOpacityActive=50&borderColorActive=acdd4a&fcActive=ffffff&iconColorActive=f5e175&bgColorHighlight=f8da4e&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcd113&fcHighlight=915608&iconColorHighlight=f7a50d&bgColorError=e14f1c&bgTextureError=12_gloss_wave.png&bgImgOpacityError=45&borderColorError=cd0a0a&fcError=ffffff&iconColorError=fcd113&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=75&opacityOverlay=30&bgColorShadow=999999&bgTextureShadow=01_flat.png&bgImgOpacityShadow=55&opacityShadow=45&thicknessShadow=0px&offsetTopShadow=5px&offsetLeftShadow=5px&cornerRadiusShadow=5px
+*/
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #a6c9e2; background: #fcfdfd url(images/ui-bg_inset-hard_100_fcfdfd_1x100.png) 50% bottom repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #4297d7; background: #2191c0 url(images/ui-bg_gloss-wave_75_2191c0_500x100.png) 50% 50% repeat-x; color: #eaf5f7; font-weight: bold; }
+.ui-widget-header a { color: #eaf5f7; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #77d5f7; background: #0078ae url(images/ui-bg_glass_45_0078ae_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; outline: none; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #ffffff; text-decoration: none; outline: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #448dae; background: #79c9ec url(images/ui-bg_glass_75_79c9ec_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #026890; outline: none; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #026890; text-decoration: none; outline: none; }
+.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #acdd4a; background: #6eac2c url(images/ui-bg_gloss-wave_50_6eac2c_500x100.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; outline: none; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #ffffff; outline: none; text-decoration: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #fcd113; background: #f8da4e url(images/ui-bg_glass_55_f8da4e_1x400.png) 50% 50% repeat-x; color: #915608; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #915608; }
+.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a; background: #e14f1c url(images/ui-bg_gloss-wave_45_e14f1c_500x100.png) 50% top repeat-x; color: #ffffff; }
+.ui-state-error a, .ui-widget-content .ui-state-error a { color: #ffffff; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #ffffff; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_0078ae_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_0078ae_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_d8e7f3_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_e0fdff_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_056b93_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_f5e175_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_f7a50d_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_fcd113_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-tl { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; }
+.ui-corner-tr { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; }
+.ui-corner-bl { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; }
+.ui-corner-br { -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
+.ui-corner-top { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; }
+.ui-corner-bottom { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
+.ui-corner-right {  -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
+.ui-corner-left { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; }
+.ui-corner-all { -moz-border-radius: 5px; -webkit-border-radius: 5px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_75_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: 5px 0 0 5px; padding: 0px; background: #999999 url(images/ui-bg_flat_55_999999_40x100.png) 50% 50% repeat-x; opacity: .45;filter:Alpha(Opacity=45); -moz-border-radius: 5px; -webkit-border-radius: 5px; }/* Accordion
+----------------------------------*/
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; }
+.ui-accordion .ui-accordion-content-active { display: block; }/* Datepicker
+----------------------------------*/
+.ui-datepicker { width: 17em; padding: .2em .2em 0; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { float:left; font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker .ui-datepicker-title select.ui-datepicker-year { float: right; }
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/* Dialog
+----------------------------------*/
+.ui-dialog { position: relative; padding: .2em; width: 300px; }
+.ui-dialog .ui-dialog-titlebar { padding: .5em .3em .3em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em; } 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/* Progressbar
+----------------------------------*/
+.ui-progressbar { height:2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }/* Resizable
+----------------------------------*/
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0px; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0px; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0px; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0px; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Slider
+----------------------------------*/
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs
+----------------------------------*/
+.ui-tabs { padding: .2em; zoom: 1; }
+.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { position: relative; float: left; border-bottom-width: 0 !important; margin: 0 .2em -1px 0; padding: 0; }
+.ui-tabs .ui-tabs-nav li a { float: left; text-decoration: none; padding: .5em 1em; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 1px; border-bottom-width: 0; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border-width: 0; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }

theme/new_default/sfiab.css

@@ -0,0 +1,534 @@
+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;
+	
+	height:100%;
+}
+
+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;
+}
+
+
+
+td {
+	vertical-align: top;
+}
+
+
+table tr.even {
+	background: #EEEEFF;
+}
+
+table tr.odd {
+	background: #E0E0F8;
+}
+
+
+#header {
+
+	height: 50px;
+	text-align: center;
+	
+	background: #ffffff;
+	padding: 10px;
+}
+
+
+#footer {
+	width: 100%;
+	text-align: center;
+	background-color : #5C6F90;
+	font-size: 0.8em;
+}
+
+#footer a {
+	text-decoration: none;
+	font-size: 1em;
+	color: #FFFFFF;
+}
+
+#left {
+	width: 165px;
+	background: #EEEEFF;
+	border: 2px solid Silver;
+	padding: 5px;
+	font-size: 1.0em;
+	box-shadow: 2px 2px 2px black;
+}
+
+
+#main {
+	
+	
+	background:#f1eeff;
+	padding: 3px;
+	border: 2px solid Silver;
+	min-height: 600px;
+	width: 99%;
+	
+}
+
+#mainwhere {
+    margin-right: 10px;
+    background: #EEEEFF;
+    padding: 3px;
+    border-top: 2px solid Silver;
+    border-left: 2px solid Silver;
+    border-right: 2px solid Silver;
+    font-size: 0.85em;
+	width: 99%;
+}
+
+
+#emptypopup {
+	padding: 30px;
+	text-align: center;
+}
+
+h1 {
+	font-size: 2.0em;
+	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;
+	margin-top: 0;
+	margin-bottom: .1em;
+}
+
+ul.mainnav {
+	list-style : none;
+	margin : 0;
+	padding : 0;
+	background-color : #d6d6d6;
+	width: 165px;
+}
+
+ul.mainnav li {
+	display : block;
+	border-top : 1px solid #a5b5c6;
+}
+
+ul.mainnav li a {
+	display : block;
+	margin : 0;
+	padding : 6px;
+	
+	background-color: #e0e0ff;
+	font : bold 0.9em/1.5em Arial, sans-serif;
+	
+	color: black;
+	text-decoration : none;
+}
+
+ul.mainnav li a:hover {
+	
+	background-color: white;
+	
+	color:black;
+	text-decoration: none;
+}
+
+.aligncenter {
+	width: 100%;
+	text-align: center;
+}
+
+a {
+	text-decoration: none;
+	font-size: 1em;
+	color: #5C6F90;
+}
+
+
+
+
+a:hover {
+	text-decoration: underline;
+}
+
+.summarytable {
+	border-collapse: collapse;
+	border-spacing: 0px;
+	border: 2px solid black;
+	margin: 0px;
+	padding: 0px;
+	margin-left: 30px;
+	margin-right: 30px;
+	
+}
+
+.summarytable th {
+	border: 2px solid black;
+	background-color: #5C6F90;
+	padding: 5px;
+	margin: 0px;
+	font-size: 1.0em;
+	color: white;
+	font-weight: bold;
+}
+
+.summarytable th a{
+	font-size: 1.0em;
+	color: white;
+	font-weight: bold;
+}
+
+.summarytable td {
+	border: 2px solid black;
+	margin: 0px;
+	padding: 2px;
+
+}
+
+.complete {
+	color: green;
+	font-weight: bold;
+}
+
+.incomplete {
+	color: red;
+	font-weight: bold;
+
+}
+
+.error {
+	color: red;
+	font-weight: bold;
+	border: 1px solid red;
+	background: #F0DCDC;
+}
+
+
+.notice {
+	font-weight: bold;
+	border: 1px solid Silver;
+/*background: #E0E0FF; */
+	background: #FFFFE0;
+	font-size: 1em;
+}
+
+.happy {
+	color: green;
+	font-weight: bold;
+	border: 1px solid Silver;
+	background: #D0EED0;
+	font-size: 1em;
+}
+
+.caution {
+	text-decoration: none;
+	font-weight: bold;
+	font-size: 1em;
+	color: red;
+}
+
+a.caution:hover {
+	text-decoration: underline;
+}
+
+.requiredfield {
+	font-weight: bold;
+	font-size: 0.8em;
+	color: #FF0000;
+}
+
+.headertable td {
+	vertical-align: baseline;
+}
+
+hr {
+	margin-top: 2px;
+}
+
+tr.externalaward {
+	font-style: italic;
+	color: #0000AA;
+}
+
+
+.adminconfigtable td {
+	text-align: center;
+	/* padding: 5px; */
+	width: 128px;
+	color: #999999;
+}
+
+.fundraisingpending {
+	color: black;
+	border: 1px solid #FFAAAA;
+	background: #FFAAAA;
+}
+
+.fundraisingconfirmed {
+	color: black;
+	border: 1px solid #FFFFAA;
+	background: #FFFFAA;
+}
+
+
+.fundraisingreceived {
+	color: black;
+	border: 1px solid #AAFFAA;
+	background: #AAFFAA;
+}
+
+.fundraisingtable {
+	border-collapse: collapse;
+	border-spacing: 0px;
+	border: 0px;
+	margin: 0px;
+	padding: 0px;
+	margin-left: 30px;
+	margin-right: 30px;
+	font-size: 0.8em;
+	
+}
+
+.fundraisingtable th {
+	border: 1px solid black;
+	background-color: #5C6F90;
+	padding: 2px;
+	margin: 0px;
+	font-size: 1.0em;
+	color: white;
+	font-weight: bold;
+	text-align: left;
+}
+
+.fundraisingtable th a{
+	color: white;
+	font-weight: normal;
+}
+
+.fundraisingtable td {
+	border: 1px solid black;
+	margin: 0px;
+	padding: 1px;
+
+}
+
+/* Notice area floating along the top of the page */
+div.notice_area {
+	left: 0;
+	top: 0;
+	width: 100%;
+	position: fixed;
+	z-index: 9999;
+}
+
+div.notice_area div {
+	padding: 0.1em 0;
+	border: 0;
+	text-align: center;
+	position: relative;
+	font-size: 1.5em;
+	background-color: #FFFFE0;
+}
+
+div.notice_area div.notice {
+	border: 3px solid yellow;
+	color: black;
+	background-color: #FFFFE0;
+}
+
+div.notice_area div.error {
+	border: 3px solid red;
+	color: red;
+	background-color: #FF9999;
+}
+
+div.notice_area div.happy {
+/*	border: 2px solid white;
+	color: green;
+	background-color: #99FF99;*/
+	color: white;
+	background-color: green;
+}
+
+.date {
+    width: 80px;
+
+}
+
+/* The popup windows created with jquery-ui use the following classes:
+ * div.ui-dialog 
+ * div.ui-dialog-titlebar - includes the next 2 items in the div
+ * span.ui-dialog-title-dialog - Title text
+ * a.ui-dialog-titlebar-close
+ * ui-dialog-content */
+
+/* Override the background colour */
+.ui-dialog {
+	background: #e0e0ff;
+}
+
+.ui-widget {
+	font-size: 1em;
+}
+
+/* Override the titlebar padding, it's too big, make the font
+ * a happy size */
+.ui-dialog .ui-dialog-titlebar { 
+	padding: 0.2em 0.5em 0.2em .5em ;
+	font-size: 1.2em;
+	font-weight: bold;
+	text-align: center;
+
+}
+
+/* Required for tabs to work */
+.ui-tabs .ui-tabs-hide {
+	display: none;
+}
+
+/* Rework the tabs, the default layout with a separate div
+ behind only the tabs is silly, and it looks stupid. */
+div.ui-tabs {
+	background: none;
+	border: none;
+	padding: 0;
+}
+
+div.ui-tabs div.ui-tabs-panel {
+	border: 1px solid #A5B5C6;
+	background: #eeeeff;
+}
+
+div.ui-tabs ul.ui-tabs-nav {
+	border: 0;
+	background: none;
+}
+
+/* Dump the HUGE tab border and change the font.  We need to
+ * rework the fonts for ALL of sfiab.   "1em" in here is about 20pt*/
+.ui-tabs .ui-tabs-nav li a {
+	padding: 0.1em 0.3em 0.1em 0.3em;
+	font-size: 1em;
+	font-weight: bold;
+}
+
+.ui-datepicker {
+    z-index: 1003;
+}
+
+.text-link {
+	cursor: pointer;
+	color: #5C6F90;
+	text-decoration: underline;
+}
+
+.text-link-selected {
+	font-weight: bold;
+	cursor: default;
+	text-decoration: none;
+	color: #000000;
+}
+
+.text-link-disabled {
+	font-weight: none;
+	cursor: default;
+	text-decoration: none;
+	color: #c0c0c0;
+}
+
+
+
+#menu-toggle-button{
+	display: none;
+}
+
+
+
+#sidebar.active{
+	display: block;
+	position: fixed;
+	top: 20%;
+	left: 0;
+	z-index: 100;
+}
+
+#sidebar.active ~ #main-content{
+	opacity: 0.7;
+}
+
+#menu-toggle-button:hover{
+	cursor: pointer;
+}
+
+
+@media screen and (max-width: 600px) {
+
+	#header {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	#sidebar {
+		display: none;
+	}
+
+	#menu-toggle-button {
+		display: block;
+		height: 25px;
+		width: 25px;
+		
+	}
+
+	.user-info-table td{
+		display: block;
+	}
+
+	.adminconfigtable tr{
+		display: grid;
+		grid-template-columns: 1fr 1fr 1fr;
+	}
+	
+
+}
+
+.thematic-break{
+	display: none;
+}
+
+
+@media screen and (max-width: 410px){
+
+	.adminconfigtable{
+		margin: auto;
+	}
+	
+
+	.adminconfigtable tr{
+		display: grid;
+		grid-template-columns: 1fr 1fr;
+	}
+	adminconfigtable
+	.thematic-break{
+		display: block;
+	}
+} 

theme/new_default/theme-script.js

@@ -0,0 +1,5 @@
+function toggle_sidebar(){
+    var sidebar = document.querySelector('#sidebar');
+    
+    sidebar.classList.toggle('active');
+}

theme/new_default/theme.php

@@ -0,0 +1,27 @@
+<?
+/* 
+   This file is part of the 'Science Fair In A Box' project
+   SFIAB Website: http://www.sfiab.ca
+
+   Copyright (C) 2008 James Grant <james@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.
+*/
+
+	$theme['name']="Science-ation";
+	$theme['description']="The default theme";
+	$theme['author']="James Grant <james@lightbox.org>";
+
+?>

user.inc.php

@@ -202,7 +202,8 @@ function user_load($user, $uid = false)
 		$id = intval($user);
 		$query .= "	`users`.`id`='$id'";
 	}
-	$q=$pdo->query($query);
+	$q=$pdo->prepare($query);
+	$q->execute();
 
 	if($q->rowCount()!=1) {
 		echo "Query [$query] returned ".$q->rowCount()." rows\n";

user_personal.php

@@ -258,7 +258,7 @@ function item($user, $fname, $subtext='')
 
  echo "<form name=\"personalform\" id=\"personal_form\">\n";
  echo "<input type=\"hidden\" name=\"users_id\" value=\"{$u['id']}\" />";
- echo "<table>\n";
+ echo "<table class='user-info-table'>\n";
 
 echo "<tr>\n";
 item($u, 'firstname');
@@ -350,9 +350,9 @@ echo "</table>";
 
 /* Committee specific fields */
 if(in_array('committee', $u['types'])) {
-	echo "<table>";
+	echo "<table class='user-info-table'>";
 
-	echo "<tr><td>".i18n("Email (Private)").":</td><td><input size=\"25\" type=\"text\" name=\"emailprivate\" value=\"{$u['emailprivate']}\" /></td></tr>\n";
+	echo "<tr><td>".i18n("Email (Private)").":</td><td><input type=\"text\" name=\"emailprivate\" value=\"{$u['emailprivate']}\" /></td></tr>\n";
 	echo "<tr><td>".i18n("Display Emails").":</td><td>";
 	if($u['displayemail']=="no") $checked="checked=\"checked\""; else $checked="";
 	echo "<input type=\"radio\" name=\"displayemail\" value=\"no\" $checked />".i18n("No");