arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Removed errors and warnings in the judging scheduler (still does not work as intended)

Browse Source
This commit is contained in:
Armanveer Gill 2025-01-19 21:13:25 -05:00
parent 655972636b
commit 8569fb79f8
16 changed files with 144 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/judges_jdiv.php
View File

@ -180,7 +180,7 @@ function get_all_divs()
return $cdl; return $cdl;
} }
if(get_value_from_array($_POST, 'action') == "add" && get_value_from_array($_POST, 'jdiv_id') && count(get_value_from_array($_POST, 'cdllist')) > 0) if(get_value_from_array($_POST, 'action') == "add" && get_value_from_array($_POST, 'jdiv_id') && count(get_value_from_array($_POST, 'cdllist', [])) > 0)
{ {
foreach($_POST['cdllist'] AS $selectedcdl) { foreach($_POST['cdllist'] AS $selectedcdl) {
$q=$pdo->prepare("UPDATE judges_jdiv SET jdiv_id='{$_POST['jdiv_id']}' WHERE ". $q=$pdo->prepare("UPDATE judges_jdiv SET jdiv_id='{$_POST['jdiv_id']}' WHERE ".

45
admin/judges_sa.php
View File

@ -289,7 +289,8 @@ function judge_mark_for_round($j, $r)
* modify it, not a copy of it */ * modify it, not a copy of it */
$ju =& $judges[$j['id']]; $ju =& $judges[$j['id']];
foreach($ju['availability'] as $key=>&$a) { $availability = &$ju['availability'];
foreach($availability as $key=>&$a) {
if($r['starttime'] >= $a['start'] && $r['starttime'] <= $a['end']) { if($r['starttime'] >= $a['start'] && $r['starttime'] <= $a['end']) {
/* Round starts in the middle of this availablity slot /* Round starts in the middle of this availablity slot
* modify this availabilty so it doesn't overlap */ * modify this availabilty so it doesn't overlap */
@ -383,7 +384,8 @@ while($r=$q->fetch(PDO::FETCH_OBJ)) {
TRACE("Loading Languages...\n"); TRACE("Loading Languages...\n");
$langr = array(); $langr = array();
$pdo->prepare("SELECT * FROM languages WHERE active='Y'"); $q = $pdo->prepare("SELECT * FROM languages WHERE active='Y'");
$q->execute();
while($r=$q->fetch(PDO::FETCH_OBJ)) { while($r=$q->fetch(PDO::FETCH_OBJ)) {
$langr[$r->lang] = $r->langname; $langr[$r->lang] = $r->langname;
TRACE(" {$r->lang} - {$r->langname}\n"); TRACE(" {$r->lang} - {$r->langname}\n");
@ -556,13 +558,14 @@ foreach($judges as &$j) {
if($config['judges_availability_enable']=="yes") { if($config['judges_availability_enable']=="yes") {
/* Load the judge time availability */ /* Load the judge time availability */
$q = $pdo->prepare("SELECT * FROM judges_availability WHERE users_id='{$j['id']}' ORDER BY `start`"); $q = $pdo->prepare("SELECT * FROM judges_availability WHERE users_id='{$j['id']}' ORDER BY `start`");
$q->execute();
if($q->rowCount()== 0) { if($q->rowCount()== 0) {
TRACE(" {$j['name']} hasn't selected any time availability, POTENTIAL BUG (they shouldn't be marked as complete).\n"); TRACE(" {$j['name']} hasn't selected any time availability, POTENTIAL BUG (they shouldn't be marked as complete).\n");
TRACE(" Ignoring this judge.\n"); TRACE(" Ignoring this judge.\n");
unset($judges[$j['id']]); unset($judges[$j['id']]);
continue; continue;
} }
$q->execute();
while($r = $q->fetch(PDO::FETCH_ASSOC)) { while($r = $q->fetch(PDO::FETCH_ASSOC)) {
$j['availability'][] = $r; $j['availability'][] = $r;
} }
@ -646,12 +649,19 @@ function next_judges_teams_number()
function judge_team_create($num, $name) function judge_team_create($num, $name)
{ {
global $config; global $config, $pdo;
$name = $name; $name = $pdo->quote($name);
$stmt = $pdo->prepare("INSERT INTO judges_teams (num,name,autocreate_type_id,year) $stmt = $pdo->prepare("
VALUES ('$num','$name','1','{$config['FAIRYEAR']}')"); INSERT INTO judges_teams (num, name, autocreate_type_id, year)
VALUES (:num, :name, :autocreate_type_id, :year)
");
$stmt->bindValue(':num', $num, PDO::PARAM_INT);
$stmt->bindValue(':name', $name, PDO::PARAM_STR);
$stmt->bindValue(':autocreate_type_id', 1, PDO::PARAM_INT);
$stmt->bindValue(':year', $config['FAIRYEAR'], PDO::PARAM_INT);
$stmt->execute(); $stmt->execute();
$id = lastInsertId(); $id = $pdo->lastInsertId();
return $id; return $id;
} }
@ -713,7 +723,7 @@ for($k=0; $k<count($keys); $k++) {
$e = 100 + 10 * ($config['effort'] / 1000); $e = 100 + 10 * ($config['effort'] / 1000);
$a = new annealer($jdiv[$jdiv_id]['num_jteams'], 125, $e, 0.9, $a = new annealer($jdiv[$jdiv_id]['num_jteams'], 125, $e, 0.9,
jdiv_compute_cost, $project_ids); 'jdiv_compute_cost', $project_ids);
$a->anneal(); $a->anneal();
$jdiv[$jdiv_id]['jteams'] = array(); $jdiv[$jdiv_id]['jteams'] = array();
@ -772,8 +782,8 @@ function judges_to_teams_update($progress, $total)
set_status("Assigning Judges to Teams"); set_status("Assigning Judges to Teams");
$e = $config['effort']; $e = $config['effort'];
$a = new annealer(count($jteam), 25, $e, 0.98, judges_cost_function, $div1_judge_ids); $a = new annealer(count($jteam), 25, $e, 0.98, 'judges_cost_function', $div1_judge_ids);
$a->set_update_callback(judges_to_teams_update); $a->set_update_callback('judges_to_teams_update');
$a->anneal(); $a->anneal();
@ -861,10 +871,11 @@ for($x=1;$x<count($jteam); $x++) {
} else { } else {
$r=$q->fetch(PDO::FETCH_OBJ); $r=$q->fetch(PDO::FETCH_OBJ);
$stmt = $pdo->prepare("INSERT INTO judges_teams_awards_link (award_awards_id,judges_teams_id,year) VALUES ('$r->id','$team_id','{$config['FAIRYEAR']}')"); $stmt = $pdo->prepare("INSERT INTO judges_teams_awards_link (award_awards_id,judges_teams_id,year) VALUES ('$r->id','$team_id','{$config['FAIRYEAR']}')");
$stmt->execute();
/* Add the award ID to the jdiv, if it's not already there */ /* Add the award ID to the jdiv, if it's not already there */
if(!in_array($r->id, $jdiv[$t['jdiv_id']]['award_ids'])) { if(!in_array($r->id, $jdiv[$t['jdiv_id']]['award_ids'])) {
$jdiv[$t['jdiv_id']]['award_ids'][] = $r->id; $jdiv[$t['jdiv_id']]['award_ids'][] = $r->id;
$stmt->execute();
} }
} }
} }
@ -873,7 +884,7 @@ for($x=1;$x<count($jteam); $x++) {
print("Unused Judges:\n"); print("Unused Judges:\n");
$ids = $a->bucket[0]; $ids = $a->bucket[0];
for($y=0; $y<count($ids); $y++) { for($y=0; $y<count(get_value_or_default($ids, [])); $y++) {
pr_judge($jteam[0], $ids[$y]); pr_judge($jteam[0], $ids[$y]);
} }
@ -1062,7 +1073,7 @@ if($config['scheduler_enable_sa_scheduling'] == 'yes') {
AND award_types.year='{$config['FAIRYEAR']}' AND award_types.year='{$config['FAIRYEAR']}'
AND award_types.type='Special' AND award_types.type='Special'
"; ";
$r = $stmt->prepare($q); $r = $pdo->prepare($q);
$r->execute(); $r->execute();
print($pdo->errorInfo()); print($pdo->errorInfo());
/* sa_jteam for leftover judges, if any */ /* sa_jteam for leftover judges, if any */
@ -1260,7 +1271,7 @@ if($config['scheduler_enable_sa_scheduling'] == 'yes') {
$e = $config['effort']; $e = $config['effort'];
$a = new annealer(count($r['jteam_ids']), 25, $e, 0.98, $a = new annealer(count($r['jteam_ids']), 25, $e, 0.98,
judges_sa_cost_function, $judge_ids); 'judges_sa_cost_function', $judge_ids);
//$a->set_update_callback(judges_to_teams_update); //$a->set_update_callback(judges_to_teams_update);
//$a->set_pick_move(judges_sa_pick_move); //$a->set_pick_move(judges_sa_pick_move);
$a->anneal(); $a->anneal();
@ -1482,8 +1493,8 @@ for($k=0; $k<$keys_count; $k++) {
set_percent(50 + ($k / $keys_count) * 50); set_percent(50 + ($k / $keys_count) * 50);
$e = 500 + 50 * ($config['effort'] / 1000); $e = 500 + 50 * ($config['effort'] / 1000);
$a = new annealer($n_timeslots, 100, $e, 0.98, timeslot_cost_function, $jteams_ids); $a = new annealer($n_timeslots, 100, $e, 0.98, 'timeslot_cost_function', $jteams_ids);
$a->set_pick_move(timeslot_pick_move); $a->set_pick_move('timeslot_pick_move');
$a->anneal(); $a->anneal();
printf(" "); printf(" ");

27
admin/judges_teams.php
View File

@ -26,13 +26,13 @@
require_once("../user.inc.php"); require_once("../user.inc.php");
user_auth_required('committee', 'admin'); user_auth_required('committee', 'admin');
include "judges.inc.php"; include "judges.inc.php";
$action = null;
if(get_value_from_array($_GET,'edit')) $edit=get_value_from_array($_GET,'edit'); if(get_value_from_array($_GET,'edit')) $edit=get_value_from_array($_GET,'edit');
if(get_value_from_array($_POST,'edit')) $edit=get_value_from_array($_POST,'edit'); if(get_value_from_array($_POST,'edit')) $edit=get_value_from_array($_POST,'edit');
if(get_value_from_array($_GET,'action')) $action=get_value_from_array($_GET,'action'); 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(get_value_from_array($_POST,'action')) $action=get_value_from_array($_POST,'action');
if(get_value_or_default($action) == "delete" && get_value_from_array($_GET, 'delete')) if($action == "delete" && get_value_from_array($_GET, 'delete'))
{ {
//ALSO DELETE: team members, timeslots, projects, awards //ALSO DELETE: team members, timeslots, projects, awards
@ -90,7 +90,7 @@
"); ");
$q2->execute(); $q2->execute();
$numdeleted=0; $numdeleted=0;
while($r2=$Q2->FETCH(PDO::FETCH_OBJ)) while($r2=$q2->FETCH(PDO::FETCH_OBJ))
{ {
//okay now we can start deleting things! whew! //okay now we can start deleting things! whew!
//first delete any linkings to the team //first delete any linkings to the team
@ -203,7 +203,7 @@
//first make sure we dont have any non-divisional award teams (dont want people hitting refresh and adding all the teams twice //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']."'"); $q=$pdo->prepare("SELECT COUNT(*) AS c FROM judges_teams WHERE autocreate_type_id!='1' AND year='".$config['FAIRYEAR']."'");
$q->execute(); $q->execute();
$r=$q->fetch(PDO::FETCHH_OBJ); $r=$q->fetch(PDO::FETCH_OBJ);
if($r->c) if($r->c)
{ {
message_push(error(i18n("Cannot 'Create All' teams when any divisional teams currently exist. Try deleting all existing non-divisional teams first."))); message_push(error(i18n("Cannot 'Create All' teams when any divisional teams currently exist. Try deleting all existing non-divisional teams first.")));
@ -238,10 +238,15 @@
else else
$num=1; $num=1;
while($r=$q->fetch(PDO::FETCHH_OBJ)) { while($r=$q->fetch(PDO::FETCH_OBJ)) {
// print_r($r); // print_r($r);
$name="($r->award_type) $r->name"; $name="($r->award_type) $r->name";
$stmt = $pdo->prepare("INSERT INTO judges_teams(num,name,autocreate_type_id,year) VALUES ('$num','$name','$r->award_types_id','".$config['FAIRYEAR']."')"); $stmt = $pdo->prepare("INSERT INTO judges_teams (num, name, autocreate_type_id, year)
VALUES (:num, :name, :autocreate_type_id, :year)");
$stmt->bindParam(':num', $num);
$stmt->bindParam(':name', $name);
$stmt->bindParam(':autocreate_type_id', $r->award_types_id);
$stmt->bindParam(':year', $config['FAIRYEAR']);
$stmt->execute(); $stmt->execute();
show_pdo_errors_if_any($pdo); show_pdo_errors_if_any($pdo);
$team_id=$pdo->lastInsertId(); $team_id=$pdo->lastInsertId();
@ -287,7 +292,7 @@ function addclicked()
</script> </script>
<? <?
echo "<br />"; echo "<br />";
$team=getJudgingTeam($edit); $team=getJudgingTeam($edit);
@ -307,7 +312,7 @@ function addclicked()
echo "<tr><td>".i18n("Awards").":</td><td>"; echo "<tr><td>".i18n("Awards").":</td><td>";
if(count(get_value_from_array($team, 'awards'))) if(count(get_value_from_array($team, 'awards', [])))
{ {
foreach($team['awards'] AS $award) foreach($team['awards'] AS $award)
{ {
@ -406,6 +411,7 @@ function addclicked()
echo "<br />"; echo "<br />";
$teams=getJudgingTeams(); $teams=getJudgingTeams();
$newteamnum=null;
if(count($teams)) { if(count($teams)) {
//grab an array of all the current team numbers //grab an array of all the current team numbers
foreach($teams AS $team) foreach($teams AS $team)
@ -413,7 +419,7 @@ function addclicked()
//start at 1, and find the next available team number //start at 1, and find the next available team number
$newteamnum=1; $newteamnum=1;
while($teamnumbers[$newteamnum]==1) while(get_value_from_array($teamnumbers, $newteamnum)==1)
{ {
$newteamnum++; $newteamnum++;
} }
@ -427,6 +433,7 @@ function addclicked()
if(!$r->c) { if(!$r->c) {
echo "<a href=\"judges_teams.php?action=createall\">".i18n("Automatically create one new team for every non-divisional award")."</a><br />"; echo "<a href=\"judges_teams.php?action=createall\">".i18n("Automatically create one new team for every non-divisional award")."</a><br />";
} }
echo "<a href=\"judges_teams.php?action=add&num=$newteamnum\">".i18n("Manually add individual team")."</a><br />"; echo "<a href=\"judges_teams.php?action=add&num=$newteamnum\">".i18n("Manually add individual team")."</a><br />";
echo "</td><td>"; echo "</td><td>";
@ -451,7 +458,7 @@ function addclicked()
echo "</td>"; echo "</td>";
echo "<td>"; echo "<td>";
if(count($team['awards'])) if(count(get_value_from_array($team, 'awards', [])))
{ {
foreach($team['awards'] AS $award) foreach($team['awards'] AS $award)
{ {

4
admin/judges_teams_members.php
View File

@ -106,7 +106,7 @@ jQuery(document).ready(function(){
</script> </script>
<? <?
if(get_value_from_array($_POST, 'action') == "add" && get_value_from_array($_POST, 'team_num') && count(get_value_from_array($_POST, 'judgelist'))>0) { if(get_value_from_array($_POST, 'action') == "add" && get_value_from_array($_POST, 'team_num') && count(get_value_from_array($_POST, 'judgelist', []))>0) {
//first check if this team exists. //first check if this team exists.
$q=$pdo->prepare("SELECT id,name FROM judges_teams WHERE num='".$_POST['team_num']."' AND year='".$config['FAIRYEAR']."'"); $q=$pdo->prepare("SELECT id,name FROM judges_teams WHERE num='".$_POST['team_num']."' AND year='".$config['FAIRYEAR']."'");
$q->execute(); $q->execute();
@ -118,7 +118,7 @@ jQuery(document).ready(function(){
//if the team is empty, we'll add the first person as the captain //if the team is empty, we'll add the first person as the captain
$team=getJudgingTeam($team_id); $team=getJudgingTeam($team_id);
if(count($team['members'])) if(count(get_value_from_array($team, 'members', [])))
$captain='no'; $captain='no';
else else
$captain='yes'; $captain='yes';

30
admin/judges_teams_projects.php
View File

@ -57,27 +57,27 @@ function eligibleclick()
<? <?
echo "<br />"; echo "<br />";
$action=null;
if(get_value_from_array($_GET, 'actio')) $action=$_GET['action'];
else if(get_value_from_array($_POST, 'action')) $action=$_POST['action'];
if($_GET['action']) $action=$_GET['action']; if(get_value_from_array($_GET, 'edit')) $edit=$_GET['edit'];
else if($_POST['action']) $action=$_POST['action']; else if(get_value_from_array($_POST, 'edit')) $edit=$_POST['edit'];
if($_GET['edit']) $edit=$_GET['edit']; if(!get_value_from_2d_array($_SESSION, 'viewstate','judges_projects_list_show'))
else if($_POST['edit']) $edit=$_POST['edit'];
if(!$_SESSION['viewstate']['judges_projects_list_show'])
$_SESSION['viewstate']['judges_projects_list_show']='unassigned'; $_SESSION['viewstate']['judges_projects_list_show']='unassigned';
//now update the judges_teams_list_show viewstate //now update the judges_teams_list_show viewstate
if($_GET['judges_projects_list_show']) if(get_value_from_array($_GET, 'judges_projects_list_show'))
$_SESSION['viewstate']['judges_projects_list_show']=$_GET['judges_projects_list_show']; $_SESSION['viewstate']['judges_projects_list_show']=$_GET['judges_projects_list_show'];
if(!$_SESSION['viewstate']['judges_projects_list_eligible']) if(!get_value_from_2d_array($_SESSION, 'viewstate', 'judges_projects_list_eligible'))
$_SESSION['viewstate']['judges_projects_list_eligible']='true'; $_SESSION['viewstate']['judges_projects_list_eligible']='true';
//now update the judges_teams_list_show viewstate //now update the judges_teams_list_show viewstate
if($_GET['judges_projects_list_eligible']) if(get_value_from_array($_GET, 'judges_projects_list_eligible'))
$_SESSION['viewstate']['judges_projects_list_eligible']=$_GET['judges_projects_list_eligible']; $_SESSION['viewstate']['judges_projects_list_eligible']=$_GET['judges_projects_list_eligible'];
if($_GET['action']=="delete" && $_GET['delete'] && $_GET['edit']) if(get_value_from_array($_GET, 'action')=="delete" && $_GET['delete'] && $_GET['edit'])
{ {
$stmt = $pdo->prepare("DELETE FROM judges_teams_timeslots_projects_link WHERE id='".$_GET['delete']."'"); $stmt = $pdo->prepare("DELETE FROM judges_teams_timeslots_projects_link WHERE id='".$_GET['delete']."'");
$stmt->execute(); $stmt->execute();
@ -86,7 +86,7 @@ if($_GET['action']=="delete" && $_GET['delete'] && $_GET['edit'])
} }
if($_POST['action']=="assign" && $_POST['edit'] && $_POST['timeslot'] && $_POST['project_id']) if(get_value_from_array($_POST, 'action')=="assign" && $_POST['edit'] && $_POST['timeslot'] && $_POST['project_id'])
{ {
$stmt = $pdo->prepare("INSERT INTO judges_teams_timeslots_projects_link (judges_teams_id,judges_timeslots_id,projects_id,year) VALUES ('".$_POST['edit']."','".$_POST['timeslot']."','".$_POST['project_id']."','".$config['FAIRYEAR']."')"); $stmt = $pdo->prepare("INSERT INTO judges_teams_timeslots_projects_link (judges_teams_id,judges_timeslots_id,projects_id,year) VALUES ('".$_POST['edit']."','".$_POST['timeslot']."','".$_POST['project_id']."','".$config['FAIRYEAR']."')");
$stmt->execute(); $stmt->execute();
@ -95,7 +95,7 @@ if($_POST['action']=="assign" && $_POST['edit'] && $_POST['timeslot'] && $_POST[
$q=$pdo->prepare("SELECT DISTINCT(date) AS d FROM judges_timeslots WHERE year='".$config['FAIRYEAR']."'"); $q=$pdo->prepare("SELECT DISTINCT(date) AS d FROM judges_timeslots WHERE year='".$config['FAIRYEAR']."'");
$q->execute(); $q->execute();
if($q-rowCount()>1) if($q->rowCount()>1)
$show_date=true; $show_date=true;
else else
$show_date=false; $show_date=false;
@ -241,7 +241,7 @@ if( ($action=="edit" || $action=="assign" ) && $edit)
projectnumber"; projectnumber";
} }
$pq=$pdo->($querystr); $pq=$pdo->prepare($querystr);
$pq->execute(); $pq->execute();
show_pdo_errors_if_any($pdo); show_pdo_errors_if_any($pdo);
@ -346,7 +346,7 @@ if( ($action=="edit" || $action=="assign" ) && $edit)
echo "<td width=\"200\">"; echo "<td width=\"200\">";
echo "<b>".$team['name']." (#".$team['num'].")</b><br />"; echo "<b>".$team['name']." (#".$team['num'].")</b><br />";
$memberlist=""; $memberlist="";
if(count($team['members'])) { if(count(get_value_from_array($team, 'members', []))) {
foreach($team['members'] AS $member) { foreach($team['members'] AS $member) {
echo "&nbsp;&nbsp;"; echo "&nbsp;&nbsp;";
$err=false; $err=false;
@ -385,7 +385,7 @@ if( ($action=="edit" || $action=="assign" ) && $edit)
date,starttime date,starttime
"); ");
$q->execute(); $q->execute();
$numslots=$q-rowCount(); $numslots=$q->rowCount();
echo "<a href=\"judges_teams_projects.php?action=edit&edit=".$team['id']."\">".i18n("Edit team project assignments")."</a>"; echo "<a href=\"judges_teams_projects.php?action=edit&edit=".$team['id']."\">".i18n("Edit team project assignments")."</a>";

12
admin/project_editor.php
View File

@ -46,7 +46,7 @@ if($auth_type == 'fair') {
} else { } else {
/* Make sure they have permission to laod this student, check /* Make sure they have permission to laod this student, check
the master copy of the fairs_id in the project */ 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='$registrations_id' registrations_id='$registrations_id'
AND year='{$config['FAIRYEAR']}' AND year='{$config['FAIRYEAR']}'
AND fairs_id=$fairs_id"); AND fairs_id=$fairs_id");
@ -73,20 +73,20 @@ case 'project_regenerate_number':
/* Now generate */ /* Now generate */
$q=$pdo->prepare("SELECT id FROM projects WHERE registrations_id='{$registrations_id}' AND year='{$config['FAIRYEAR']}'"); $q=$pdo->prepare("SELECT id FROM projects WHERE registrations_id='{$registrations_id}' AND year='{$config['FAIRYEAR']}'");
$q->execute(); $q->execute();
$i=$q->fetch(PDO::FETCH_ASSOC);; $i=$q->fetch(PDO::FETCH_ASSOC);
$id = $i['id']; $id = $i['id'];
$pdo->prepare("UPDATE projects SET projectnumber=NULL,projectsort=NULL, $stmt = $pdo->prepare("UPDATE projects SET projectnumber=NULL,projectsort=NULL,
projectnumber_seq='0',projectsort_seq='0' projectnumber_seq='0',projectsort_seq='0'
WHERE id='$id'"); WHERE id='$id'");
$pdo->execute(); $stmt->execute();
show_pdo_errors_if_any($pdo); show_pdo_errors_if_any($pdo);
list($pn,$ps,$pns,$pss) = generateProjectNumber($registrations_id); list($pn,$ps,$pns,$pss) = generateProjectNumber($registrations_id);
// print("Generated Project Number [$pn]"); // print("Generated Project Number [$pn]");
$pdo->prepare("UPDATE projects SET projectnumber='$pn',projectsort='$ps', $stmt = $pdo->prepare("UPDATE projects SET projectnumber='$pn',projectsort='$ps',
projectnumber_seq='$pns',projectsort_seq='$pss' projectnumber_seq='$pns',projectsort_seq='$pss'
WHERE id='$id'"); WHERE id='$id'");
$pdo->execute(); $stmt->execute();
happy_("Generated and Saved Project Number: $pn"); happy_("Generated and Saved Project Number: $pn");
break; break;

36
admin/registration_list.php
View File

@ -129,6 +129,7 @@ function popup_editor(id, open_tab)
var h = (document.documentElement.clientHeight * 0.9); var h = (document.documentElement.clientHeight * 0.9);
registrations_id = id; registrations_id = id;
registrations_new = 0; registrations_new = 0;
if(id == -1) { if(id == -1) {
@ -146,16 +147,16 @@ function popup_editor(id, open_tab)
case 'reg': case 'reg':
/* If we open on the reg tab, disable the others until a save */ /* If we open on the reg tab, disable the others until a save */
$('#editor_tabs').tabs('option', 'disabled', [1,2]); $('#editor_tabs').tabs('option', 'disabled', [1,2]);
$('#editor_tabs').tabs('select', 0); $('#editor_tabs').tabs('option', 'active', 0);
break; break;
case 'project': case 'project':
$('#editor_tabs').tabs('option', 'disabled', []); $('#editor_tabs').tabs('option', 'disabled', []);
$('#editor_tabs').tabs('select', 2); $('#editor_tabs').tabs('option', 'active', 2);
break; break;
default: default:
$('#editor_tabs').tabs('option', 'disabled', []); $('#editor_tabs').tabs('option', 'disabled', []);
$('#editor_tabs').tabs('select', 1); $('#editor_tabs').tabs('option', 'active', 1);
break; break;
} }
/* Don't let anything collapse */ /* Don't let anything collapse */
@ -299,8 +300,8 @@ $(document).ready(function() {
/* Create a row before loading it */ /* Create a row before loading it */
$("#registration_list").append("<tr id=\"row_"+id+"\"></tr>"); $("#registration_list").append("<tr id=\"row_"+id+"\"></tr>");
} }
$("#row_"+id).load("<?$_SERVER['PHP_SELF']?>?action=load_row&id="+id); $("#" + $.escapeSelector("row_" + id)).load("<?$_SERVER['PHP_SELF']?>?action=load_row&id="+id);
$("#row_"+id).effect('highlight',{},500); $("#" + $.escapeSelector("row_" + id)).effect('highlight',{},500);
} }
}); });
@ -437,10 +438,10 @@ function list_query($year, $wherestatus, $reg_id)
registrations.status DESC, projects.title registrations.status DESC, projects.title
"); ");
$q->execute();
// FIXME // FIXME
//show_pdo_errors_if_any($pdo); show_pdo_errors_if_any($pdo);
return $q; return $q;
} }
@ -448,8 +449,9 @@ function list_query($year, $wherestatus, $reg_id)
function print_row($r) function print_row($r)
{ {
global $cats, $divs, $config, $year; global $cats, $divs, $config, $year, $pdo;
switch($r->status) { $status_text=null;
switch(get_value_property_or_default($r, 'status')) {
case "new": $status_text="New"; break; case "new": $status_text="New"; break;
case "open": $status_text="Open"; break; case "open": $status_text="Open"; break;
case "paymentpending": $status_text="Payment Pending"; break; case "paymentpending": $status_text="Payment Pending"; break;
@ -458,18 +460,18 @@ function print_row($r)
$status_text=i18n($status_text); $status_text=i18n($status_text);
$scl = "style=\"cursor:pointer;\" onclick=\"popup_editor('{$r->reg_id}','');\""; $scl = "style=\"cursor:pointer;\" onclick=\"popup_editor('{" . get_value_property_or_default($r, 'reg_id') ."}','');\"";
$pcl = "style=\"cursor:pointer;\" onclick=\"popup_editor('{$r->reg_id}','project');\""; $pcl = "style=\"cursor:pointer;\" onclick=\"popup_editor('{". get_value_property_or_default($r, 'reg_id') ."}','project');\"";
echo "<td $scl>{$status_text}</td>"; echo "<td $scl>{$status_text}</td>";
echo "<td $scl>{$r->email}</td>"; echo "<td $scl>{".get_value_property_or_default($r, 'email') ."}</td>";
echo "<td $scl>{$r->reg_num}</td>"; echo "<td $scl>{".get_value_property_or_default($r, 'reg_num') ."}</td>";
$pn = str_replace(' ', '&nbsp;', $r->projectnumber); $pn = str_replace(' ', '&nbsp;', get_value_property_or_default($r, 'projectnumber', ''));
echo "<td $scl>$pn</td>"; echo "<td $scl>$pn</td>";
echo "<td $pcl>{$r->title}</td>"; echo "<td $pcl>{" .get_value_property_or_default($r, 'title')."}</td>";
echo "<td $scl>".i18n($cats[$r->projectcategories_id])."</td>"; echo "<td $scl>".i18n(get_value_from_array($cats, get_value_property_or_default($r, 'projectcategories_id'), ''))."</td>";
echo "<td $scl>".i18n($divs[$r->projectdivisions_id])."</td>"; echo "<td $scl>".i18n($divs[get_value_property_or_default($r, 'projectdivisions_id', '')])."</td>";
$sq=$pdo->prepare("SELECT students.firstname, $sq=$pdo->prepare("SELECT students.firstname,
students.lastname, students.lastname,

18
admin/reports.inc.php
View File

@ -359,24 +359,24 @@ foreach($report_stock as $n=>$v) {
foreach($report[$type] as $k=>$v) { foreach($report[$type] as $k=>$v) {
if($type == 'option') { if($type == 'option') {
/* field, value, x, y, w, h, lines, face, align, valign, fn, fs, fsize, overflow */ /* field, value, x, y, w, h, lines, face, align, valign, fn, fs, fsize, overflow */
$vals = "'".$pdo->quote($k)."','".$pdo->quote($v)."','0','0','0','0','0','','','','','','0','truncate'"; $vals = "".$pdo->quote($k).",".$pdo->quote($v).",'0','0','0','0','0','','','','','','0','truncate'";
} else { } else {
if(get_value_from_array($v, 'lines') == 0) $v['lines'] =1; if(get_value_from_array($v, 'lines') == 0) $v['lines'] =1;
$fs = is_array(get_value_from_array($v,'fontstyle')) ? implode(',',$v['fontstyle']) : ''; $fs = is_array(get_value_from_array($v,'fontstyle')) ? implode(',',$v['fontstyle']) : '';
$opts = get_value_from_array($v, 'align') . " " .$pdo->quote(get_value_from_array($v, 'valign')); $opts = get_value_from_array($v, 'align') . " " .$pdo->quote(get_value_from_array($v, 'valign', ''));
$vals = "'{$v['field']}','{$v['value']}', $vals = "'".get_value_from_array($v, 'field')."','".get_value_from_array($v, 'value')."',
'{$v['x']}','{$v['y']}','{$v['w']}', '".get_value_from_array($v,'x')."','".get_value_from_array($v, 'y')."','".get_value_from_array($v, 'w')."',
'{$v['h']}','{$v['lines']}','{$v['face']}', '".get_value_from_array($v, 'h')."','".get_value_from_array($v,'lines')."','".get_value_from_array($v, 'face')."',
'$opts','{$v['valign']}', '$opts','".get_value_from_array($v, 'valign')."',
'{$v['fontname']}','$fs','{$v['fontsize']}', '".get_value_from_array($v, 'fontname')."','$fs','".get_value_from_array($v, 'fontsize')."',
'{$v['on_overflow']}'"; '".get_value_from_array($v, 'on_overflow')."'";
} }
if($q != '') $q .= ','; if($q != '') $q .= ',';
$q .= "({$report['id']}, '$type','$x',$vals)"; $q .= "({$report['id']}, '$type','$x',$vals)";
$x++; $x++;
} }
echo $q;
$stmt = $pdo->prepare("INSERT INTO reports_items(`reports_id`,`type`,`ord`, $stmt = $pdo->prepare("INSERT INTO reports_items(`reports_id`,`type`,`ord`,
`field`,`value`,`x`, `y`, `w`, `h`, `field`,`value`,`x`, `y`, `w`, `h`,
`lines`, `face`, `align`,`valign`, `lines`, `face`, `align`,`valign`,

8
common.inc.php
View File

@ -408,6 +408,7 @@ function send_header($title="", $nav=null, $icon=null, $titletranslated=false)
<body> <body>
<!-- <? if($title && !$titletranslated) echo i18n($title); else if($title) echo $title; else echo i18n($config['fairname']); ?> --> <!-- <? if($title && !$titletranslated) echo i18n($title); else if($title) echo $title; else echo i18n($config['fairname']); ?> -->
<script src="https://code.jquery.com/jquery-3.7.1.js"></script> <script src="https://code.jquery.com/jquery-3.7.1.js"></script>
<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/jquery.tablesorter/2.32.0/js/jquery.tablesorter.min.js" integrity="sha512-O/JP2r8BG27p5NOtVhwqsSokAwEP5RwYgvEzU9G6AfNjLYqyt2QT8jqU1XrXCiezS50Qp1i3ZtCQWkHZIRulGA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
@ -448,7 +449,7 @@ if(isset($_SESSION['users_type'])) {
if($_SESSION['users_type'] != false) { if($_SESSION['users_type'] != false) {
echo i18n($types[$_SESSION['users_type']]); echo i18n($types[$_SESSION['users_type']]);
} }
echo " {$_SESSION['email']}: "; echo " {".get_value_from_array($_SESSION, 'email')."}: ";
if($_SESSION['multirole'] == true) { if($_SESSION['multirole'] == true) {
echo "<a href=\"{$config['SFIABDIRECTORY']}/user_multirole.php\">[".i18n('Switch Roles')."]</a> "; echo "<a href=\"{$config['SFIABDIRECTORY']}/user_multirole.php\">[".i18n('Switch Roles')."]</a> ";
} }
@ -703,6 +704,7 @@ function send_popup_header($title="")
</head> </head>
<body onLoad="window.focus()"> <body onLoad="window.focus()">
<script src="https://code.jquery.com/jquery-3.7.1.js"></script> <script src="https://code.jquery.com/jquery-3.7.1.js"></script>
<script src="https://code.jquery.com/jquery-migrate-3.5.2.js"></script>
<script src="https://code.jquery.com/ui/1.14.1/jquery-ui.min.js"></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> <script type="text/javascript" src="<?=$config['SFIABDIRECTORY']?>/js/sfiab.js"></script>
@ -1114,10 +1116,10 @@ function output_page_text($textname)
} }
//if it looks like we have HTML content, dont do a nl2br, if there's no html, then do the nl2br //if it looks like we have HTML content, dont do a nl2br, if there's no html, then do the nl2br
if($r->text !== null and strlen($r->text)==strlen(strip_tags($r->text))) if(get_value_property_or_default($r, 'text') !== null and strlen($r->text)==strlen(strip_tags($r->text)))
echo nl2br($r->text); echo nl2br($r->text);
else else
echo $r->text; echo get_value_property_or_default($r, 'text');
} }
function output_page_cms($filename) function output_page_cms($filename)

6
projects.inc.php
View File

@ -173,7 +173,7 @@ function getSpecialAwardsEligibleForProject($projectid)
function getSpecialAwardsNominatedForProject($projectid) function getSpecialAwardsNominatedForProject($projectid)
{ {
global $config; global $config, $pdo;
$awardsq=$pdo->prepare("SELECT $awardsq=$pdo->prepare("SELECT
award_awards.id, award_awards.id,
@ -210,7 +210,7 @@ function getSpecialAwardsNominatedForProject($projectid)
function getNominatedForNoSpecialAwardsForProject($projectid) function getNominatedForNoSpecialAwardsForProject($projectid)
{ {
global $config; global $config, $pdo;
$awardsq=$pdo->prepare("SELECT $awardsq=$pdo->prepare("SELECT
projects.id AS projects_id projects.id AS projects_id
FROM FROM
@ -275,7 +275,7 @@ function getProjectsNominatedForSpecialAward($award_id)
function getLanguagesOfProjectsNominatedForSpecialAward($award_id) function getLanguagesOfProjectsNominatedForSpecialAward($award_id)
{ {
global $config; global $config, $pdo;
//if they dont use special award nominations, then we will instead get all of the projects that //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. //are eligible for the award, instead of nominated for it.

21
register_participants.inc.php
View File

@ -23,7 +23,7 @@
?> ?>
<? <?
function registrationFormsReceived($reg_id="") function registrationFormsReceived($reg_id="")
{ { global $pdo;
if($reg_id) $rid=$reg_id; if($reg_id) $rid=$reg_id;
else $rid=$_SESSION['registration_id']; else $rid=$_SESSION['registration_id'];
$q=$pdo->prepare("SELECT status FROM registrations WHERE id='$rid'"); $q=$pdo->prepare("SELECT status FROM registrations WHERE id='$rid'");
@ -50,7 +50,7 @@ function registrationDeadlinePassed()
function studentStatus($reg_id="") function studentStatus($reg_id="")
{ {
global $config; global $config, $pdo;
if($config['participant_student_personal']=="yes") 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","sex");
else else
@ -91,7 +91,7 @@ function studentStatus($reg_id="")
function emergencycontactStatus($reg_id="") function emergencycontactStatus($reg_id="")
{ {
global $config; global $config, $pdo;
$required_fields=array("firstname","lastname","relation","phone1"); $required_fields=array("firstname","lastname","relation","phone1");
if($reg_id) $rid=$reg_id; if($reg_id) $rid=$reg_id;
@ -122,7 +122,7 @@ function emergencycontactStatus($reg_id="")
function projectStatus($reg_id="") function projectStatus($reg_id="")
{ {
global $config; global $config, $pdo;
$required_fields=array("title","projectcategories_id","projectdivisions_id","language","req_table","req_electricity","summarycountok"); $required_fields=array("title","projectcategories_id","projectdivisions_id","language","req_table","req_electricity","summarycountok");
if($config['participant_short_title_enable'] == 'yes') if($config['participant_short_title_enable'] == 'yes')
@ -162,7 +162,7 @@ function projectStatus($reg_id="")
function mentorStatus($reg_id="") function mentorStatus($reg_id="")
{ {
global $config; global $config, $pdo;
$required_fields=array("firstname","lastname","phone","email","organization","description"); $required_fields=array("firstname","lastname","phone","email","organization","description");
if($reg_id) $rid=$reg_id; if($reg_id) $rid=$reg_id;
@ -179,7 +179,7 @@ function mentorStatus($reg_id="")
$q->execute(); $q->execute();
//if we dont have the minimum, return incomplete //if we dont have the minimum, return incomplete
if($q->rowCount()<$config['minmentorserproject']) if($q->rowCount()<get_value_from_array($config, 'minmentorserproject'))
return "incomplete"; return "incomplete";
while($r=$q->fetch(PDO::FETCH_OBJ)) while($r=$q->fetch(PDO::FETCH_OBJ))
@ -200,7 +200,7 @@ $q->execute();
function safetyStatus($reg_id="") function safetyStatus($reg_id="")
{ {
global $config; global $config, $pdo;
if($reg_id) $rid=$reg_id; if($reg_id) $rid=$reg_id;
else $rid=$_SESSION['registration_id']; else $rid=$_SESSION['registration_id'];
@ -296,13 +296,14 @@ function tourStatus($reg_id="")
} }
function namecheckStatus($reg_id="") function namecheckStatus($reg_id="")
{ {
global $config; global $config, $pdo;
if($reg_id) { if($reg_id) {
$q=$pdo->prepare("SELECT * FROM students WHERE $q=$pdo->prepare("SELECT * FROM students WHERE
registrations_id='$reg_id' registrations_id='$reg_id'
$q->execute();
AND year='".$config['FAIRYEAR']."'"); AND year='".$config['FAIRYEAR']."'");
$q->execute();
} else { } else {
$q=$pdo->prepare("SELECT * FROM students WHERE $q=$pdo->prepare("SELECT * FROM students WHERE
id='{$_SESSION['students_id']}'"); id='{$_SESSION['students_id']}'");

4
register_participants_mentor.php
View File

@ -62,7 +62,7 @@ show_pdo_errors_if_any($pdo);
//now do any data saves //now do any data saves
if($_POST['action']=="save") if(get_value_from_array($_POST, 'action')=="save")
{ {
if(registrationFormsReceived()) if(registrationFormsReceived())
{ {
@ -122,7 +122,7 @@ if($_POST['action']=="save")
} }
if($_GET['action']=="removementor") if(get_value_from_array($_GET, 'action')=="removementor")
{ {
if(registrationFormsReceived()) if(registrationFormsReceived())
{ {

6
register_participants_project.php
View File

@ -74,7 +74,7 @@ show_pdo_errors_if_any($pdo);
} }
if($_POST['action']=="save") if(get_value_from_array($_POST, 'action')=="save")
{ {
if(registrationFormsReceived()) if(registrationFormsReceived())
{ {
@ -119,7 +119,7 @@ show_pdo_errors_if_any($pdo);
$stmt = $pdo->prepare("UPDATE projects SET ". $stmt = $pdo->prepare("UPDATE projects SET ".
"title='".$title."', ". "title='".$title."', ".
"shorttitle='".$shorttitle."', ". "shorttitle='".$shorttitle."', ".
"projectdivisions_id='".intval($_POST['projectdivisions_id']."', ". "projectdivisions_id='".intval($_POST['projectdivisions_id'])."', ".
"projecttype='".stripslashes($_POST['projecttype'])."', ". "projecttype='".stripslashes($_POST['projecttype'])."', ".
"language='".stripslashes($_POST['language'])."', ". "language='".stripslashes($_POST['language'])."', ".
"req_table='".stripslashes($_POST['req_table'])."', ". "req_table='".stripslashes($_POST['req_table'])."', ".
@ -165,7 +165,7 @@ show_pdo_errors_if_any($pdo);
//now select their project info //now select their project info
$q=$pdo->prepare("SELECT * FROM projects WHERE registrations_id='".$_SESSION['registration_id']."' AND year='".$config['FAIRYEAR']."'"); $q=$pdo->prepare("SELECT * FROM projects WHERE registrations_id='".$_SESSION['registration_id']."' AND year='".$config['FAIRYEAR']."'");
$q->execute(); $q->execute();
/check if it exists, if we didnt find any record, lets insert one //check if it exists, if we didnt find any record, lets insert one
if($q->rowCount()==0) if($q->rowCount()==0)
{ {
$stmt = $pdo->prepare("INSERT INTO projects (registrations_id,projectcategories_id,year) VALUES ('".$_SESSION['registration_id']."','$projectcategories_id','".$config['FAIRYEAR']."')"); $stmt = $pdo->prepare("INSERT INTO projects (registrations_id,projectcategories_id,year) VALUES ('".$_SESSION['registration_id']."','$projectcategories_id','".$config['FAIRYEAR']."')");

4
register_participants_safety.php
View File

@ -57,7 +57,7 @@ show_pdo_errors_if_any($pdo);
echo "<a href=\"register_participants_main.php\">&lt;&lt; ".i18n("Back to Participant Registration Summary")."</a><br />"; echo "<a href=\"register_participants_main.php\">&lt;&lt; ".i18n("Back to Participant Registration Summary")."</a><br />";
echo "<br />"; echo "<br />";
if($_POST['action']=="save") { if(get_value_from_array($_POST, 'action')=="save") {
if(registrationFormsReceived()) { if(registrationFormsReceived()) {
echo error(i18n("Cannot make changes to forms once they have been received by the fair")); echo error(i18n("Cannot make changes to forms once they have been received by the fair"));
} }
@ -115,7 +115,7 @@ else if($newstatus=="complete") {
echo i18n($r->question)."</td>"; echo i18n($r->question)."</td>";
echo "<td>"; echo "<td>";
if($r->type=="check") { if($r->type=="check") {
if($safetyanswers[$r->id]=="checked") $ch="checked=\"checked\""; else $ch=""; if(get_value_from_array($safetyanswers, $r->id)=="checked") $ch="checked=\"checked\""; else $ch="";
echo "<input $ch type=\"checkbox\" name=\"safety[$r->id]\" value=\"checked\" />"; echo "<input $ch type=\"checkbox\" name=\"safety[$r->id]\" value=\"checked\" />";
} }
else if($r->type=="yesno") { else if($r->type=="yesno") {

2
register_participants_signature_tcpdf.php
View File

@ -27,7 +27,7 @@
require_once('tcpdf.inc.php'); require_once('tcpdf.inc.php');
//anyone can access a sample, we dont need to be authenticated or anything for that //anyone can access a sample, we dont need to be authenticated or anything for that
if($_GET['sample']) { if(get_value_from_array($_GET, 'sample')) {
$registration_number=12345; $registration_number=12345;
$registration_id=0; $registration_id=0;
} else { } else {

38
register_participants_students.php
View File

@ -37,13 +37,14 @@
exit; exit;
} }
$fairyear = intval($config['FAIRYEAR']); $fairyear = intval($config['FAIRYEAR']);
$q=yahoo_image.png.pnguery("SELECT registrations.id AS regid, students.id AS studentid, students.firstname FROM registrations,students ". $q=$pdo->prepare("SELECT registrations.id AS regid, students.id AS studentid, students.firstname FROM registrations,students ".
"WHERE students.email='" . $_SESSION['email'] . "' ". "WHERE students.email='" . $_SESSION['email'] . "' ".
"AND registrations.num='" . $_SESSION['registration_number'] . "' ". "AND registrations.num='" . $_SESSION['registration_number'] . "' ".
"AND registrations.id='" . $_SESSION['registration_id'] . "' ". "AND registrations.id='" . $_SESSION['registration_id'] . "' ".
"AND students.registrations_id=registrations.id ". "AND students.registrations_id=registrations.id ".
"AND registrations.year=" . $fairyear . " ". "AND registrations.year=" . $fairyear . " ".
"AND students.year=" . $fairyear); "AND students.year=" . $fairyear);
$q->execute();
show_pdo_errors_if_any($pdo); show_pdo_errors_if_any($pdo);
@ -70,7 +71,7 @@ $items_q->execute();
//now do any data saves //now do any data saves
if($_POST['action']=="save") if(get_value_from_array($_POST, 'action')=="save")
{ {
if(registrationFormsReceived()) if(registrationFormsReceived())
{ {
@ -189,7 +190,7 @@ if($_POST['action']=="save")
} }
} }
if($_GET['action']=="removestudent") if(get_value_from_array($_GET, 'action')=="removestudent")
{ {
if(registrationFormsReceived()) if(registrationFormsReceived())
{ {
@ -257,7 +258,7 @@ $q->execute();
$numfound=$q->rowCount(); $numfound=$q->rowCount();
} }
if($_GET['numstudents']) if(get_value_from_array($_GET, 'numstudents'))
$numtoshow=$_GET['numstudents']; $numtoshow=$_GET['numstudents'];
else else
$numtoshow=$numfound; $numtoshow=$numfound;
@ -288,7 +289,7 @@ $q->execute();
echo "<h3>".i18n("Student %1 Details",array($x))."</h3>"; echo "<h3>".i18n("Student %1 Details",array($x))."</h3>";
//if we have a valid student, set their ID, so we can UPDATE when we submit //if we have a valid student, set their ID, so we can UPDATE when we submit
//if there is no record for this student, then set the ID to 0, so we will INSERT when we submit //if there is no record for this student, then set the ID to 0, so we will INSERT when we submit
if($studentinfo->id) $id=$studentinfo->id; else $id=0; if(get_value_property_or_default($studentinfo,'id')) $id=$studentinfo->id; else $id=0;
//true should work here, it just has to be set to _something_ for it to work. //true should work here, it just has to be set to _something_ for it to work.
echo "<input type=\"hidden\" name=\"num[$x]\" value=\"true\" />"; echo "<input type=\"hidden\" name=\"num[$x]\" value=\"true\" />";
@ -297,8 +298,8 @@ $q->execute();
echo "<input type=\"hidden\" name=\"id[$x]\" value=\"$id\" />"; echo "<input type=\"hidden\" name=\"id[$x]\" value=\"$id\" />";
echo "<table>"; echo "<table>";
echo "<tr>\n"; echo "<tr>\n";
echo " <td>".i18n("First Name")."</td><td><input type=\"text\" name=\"firstname[$x]\" value=\"$studentinfo->firstname\" />".REQUIREDFIELD."</td>\n"; 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=\"$studentinfo->lastname\" />".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"; echo "</tr>\n";
if($config['participant_student_pronunciation']=='yes') { if($config['participant_student_pronunciation']=='yes') {
echo "<tr>\n"; echo "<tr>\n";
@ -325,11 +326,11 @@ if($config['participant_student_personal']=="yes")
echo "</tr>\n"; echo "</tr>\n";
echo "<tr>\n"; echo "<tr>\n";
echo " <td>".i18n("Email Address")."</td><td><input type=\"text\" name=\"email[$x]\" value=\"$studentinfo->email\" />".REQUIREDFIELD."</td>\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";
if($config['participant_student_personal']=="yes") if($config['participant_student_personal']=="yes")
{ {
echo " <td>".i18n("City")."</td><td><input type=\"text\" name=\"city[$x]\" value=\"$studentinfo->city\" />".REQUIREDFIELD."</td>\n"; echo " <td>".i18n("City")."</td><td><input type=\"text\" name=\"city[$x]\" value=\"".get_value_property_or_default($studentinfo, 'city')."\" />".REQUIREDFIELD."</td>\n";
} }
else else
{ {
@ -342,11 +343,11 @@ if($config['participant_student_personal']=="yes")
{ {
echo "<tr>\n"; echo "<tr>\n";
echo " <td>".i18n("Address")."</td>"; echo " <td>".i18n("Address")."</td>";
echo " <td><input type=\"text\" name=\"address[$x]\" value=\"$studentinfo->address\" />".REQUIREDFIELD."</td>\n"; echo " <td><input type=\"text\" name=\"address[$x]\" value=\"".get_value_property_or_default($studentinfo, 'address')."\" />".REQUIREDFIELD."</td>\n";
echo " <td>".i18n($config['provincestate'])."</td>"; echo " <td>".i18n($config['provincestate'])."</td>";
echo "<td>"; echo "<td>";
emit_province_selector("province[$x]",$studentinfo->province); emit_province_selector("province[$x]",get_value_property_or_default($studentinfo, 'province'));
echo REQUIREDFIELD; echo REQUIREDFIELD;
echo "</td>\n"; echo "</td>\n";
@ -355,14 +356,15 @@ if($config['participant_student_personal']=="yes")
echo "<tr>\n"; echo "<tr>\n";
echo " <td>".i18n($config['postalzip'])."</td>"; echo " <td>".i18n($config['postalzip'])."</td>";
echo "<td><input type=\"text\" name=\"postalcode[$x]\" value=\"$studentinfo->postalcode\" />".REQUIREDFIELD."</td>\n"; 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>".i18n("Phone")."</td>";
echo " <td><input type=\"text\" name=\"phone[$x]\" value=\"$studentinfo->phone\" />".REQUIREDFIELD."</td>\n"; echo " <td><input type=\"text\" name=\"phone[$x]\" value=\"".get_value_property_or_default($studentinfo, 'phone')."\" />".REQUIREDFIELD."</td>\n";
echo "</tr>\n"; echo "</tr>\n";
echo "<tr>\n"; echo "<tr>\n";
echo " <td>".i18n("Date of Birth")."</td><td>\n"; echo " <td>".i18n("Date of Birth")."</td><td>\n";
list($year,$month,$day)=split("-",$studentinfo->dateofbirth); $year = null;
list($year,$month,$day)=explode("-",get_value_property_or_default($studentinfo,'dateofbirth', ''));
echo "<table><tr><td>"; echo "<table><tr><td>";
emit_day_selector("day[$x]",$day); emit_day_selector("day[$x]",$day);
echo "</td><td>\n"; echo "</td><td>\n";
@ -436,7 +438,7 @@ if($config['participant_student_personal']=="yes")
{ {
echo "<tr>\n"; echo "<tr>\n";
echo "<td>".i18n("Medical Alert Info")."</td><td colspan=\"3\">"; echo "<td>".i18n("Medical Alert Info")."</td><td colspan=\"3\">";
echo "<input name=\"medicalalert[$x]\" type=\"text\" size=\"50\" value=\"$studentinfo->medicalalert\" />"; echo "<input name=\"medicalalert[$x]\" type=\"text\" size=\"50\" value=\"".get_value_property_or_default($studentinfo, 'medicalalert')."\" />";
echo "</td>"; echo "</td>";
echo "</tr>\n"; echo "</tr>\n";
} }
@ -445,7 +447,7 @@ if($config['participant_student_personal']=="yes")
{ {
echo "<tr>\n"; echo "<tr>\n";
echo "<td>".i18n("Special Food Requirements")."</td><td colspan=\"3\">"; echo "<td>".i18n("Special Food Requirements")."</td><td colspan=\"3\">";
echo "<input name=\"foodreq[$x]\" type=\"text\" size=\"50\" value=\"$studentinfo->foodreq\" />"; echo "<input name=\"foodreq[$x]\" type=\"text\" size=\"50\" value=\"".get_value_property_or_default($studentinfo, 'foodreq')."\" />";
echo "</td>"; echo "</td>";
echo "</tr>\n"; echo "</tr>\n";
} }
@ -478,8 +480,8 @@ if($config['participant_student_personal']=="yes")
echo "</tr>\n"; echo "</tr>\n";
echo "<tr>\n"; echo "<tr>\n";
echo " <td>".i18n("Teacher Name")."</td><td><input type=\"text\" name=\"teachername[$x]\" value=\"$studentinfo->teachername\" /></td>\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("Teacher Email")."</td><td><input type=\"text\" name=\"teacheremail[$x]\" value=\"$studentinfo->teacheremail\" /></td>\n"; echo " <td>".i18n("Teacher Email")."</td><td><input type=\"text\" name=\"teacheremail[$x]\" value=\"".get_value_property_or_default($studentinfo, 'teacheremail')."\" /></td>\n";
echo "</tr>\n"; echo "</tr>\n";
if($config['participant_regfee_items_enable'] == 'yes' ) { if($config['participant_regfee_items_enable'] == 'yes' ) {