From 6b2394d4e008aa546d10b1f7bebee50a95000567 Mon Sep 17 00:00:00 2001 From: Armanveer Gill Date: Tue, 21 Jan 2025 02:07:33 -0500 Subject: [PATCH] Removed the warnings from judging scheduler log files. --- admin/judges_sa.php | 11 +++---- admin/judges_sa_launcher.php | 2 +- admin/judges_schedulerconfig_check.inc.php | 12 ++++---- admin/project_editor.php | 4 +-- admin/registration_list.php | 32 +++++++++++++-------- admin/student_editor.php | 8 +++--- common.inc.php | 12 ++++---- data/logo-100.gif | Bin 6490 -> 2240 bytes data/logo-100.jpg | Bin 9324 -> 4166 bytes data/logo-100.png | Bin 17224 -> 8251 bytes data/logo-200.gif | Bin 19090 -> 4888 bytes data/logo-200.jpg | Bin 26637 -> 10466 bytes data/logo-200.png | Bin 50642 -> 20578 bytes data/logo-500.gif | Bin 87793 -> 16152 bytes data/logo-500.jpg | Bin 107309 -> 32335 bytes data/logo-500.png | Bin 196587 -> 74231 bytes data/logo.gif | Bin 49801 -> 10364 bytes data/logo.jpg | Bin 86522 -> 36948 bytes data/logo.png | Bin 82632 -> 45872 bytes judge_main.php | 4 +-- register_participants.php | 9 ++++-- register_participants_students.php | 2 +- theme/new_default/sfiab.css | 16 ++++++++++- user.inc.php | 19 ++++++------ user_login.php | 4 ++- user_new.php | 7 +++-- user_personal.php | 2 +- 27 files changed, 88 insertions(+), 56 deletions(-) diff --git a/admin/judges_sa.php b/admin/judges_sa.php index 9e4876ad..001065af 100644 --- a/admin/judges_sa.php +++ b/admin/judges_sa.php @@ -482,32 +482,32 @@ while($r = $q->fetch(PDO::FETCH_OBJ)) { $stmt = $pdo->prepare("DELETE FROM judges_teams_link WHERE judges_teams_id='$id' AND year={$config['FAIRYEAR']}"); $stmt->execute(); - print $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); /* Awards */ $stmt = $pdo->prepare("DELETE FROM judges_teams_awards_link WHERE judges_teams_id='$id' AND year={$config['FAIRYEAR']}"); $stmt->execute(); - print $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); /* Timeslots */ $stmt = $pdo->prepare("DELETE FROM judges_teams_timeslots_link WHERE judges_teams_id='$id' AND year={$config['FAIRYEAR']}"); $stmt->execute(); - print $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); /* Timeslots projects */ $stmt = $pdo->prepare("DELETE FROM judges_teams_timeslots_projects_link WHERE judges_teams_id='$id' AND year={$config['FAIRYEAR']}"); $stmt->execute(); - print $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); } echo "\n"; /* Finally, delete all the autocreated judges teams */ $stmt = $pdo->prepare("DELETE FROM judges_teams WHERE autocreate_type_id=1 AND year={$config['FAIRYEAR']}"); $stmt->execute(); -print $pdo->errorInfo(); +show_pdo_errors_if_any($pdo); /* Also delete any judges_teams_link that link to teams that dont exist, just * in case */ @@ -884,6 +884,7 @@ for($x=1;$xbucket[0]; + for($y=0; $y../data/logs/judge_scheduler_".date("YmdHis").".log 2>&1 &"); } -usleep(1500000); // 1.5 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 +//usleep(1500000); // 1.5 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: judges_scheduler_status.php"); exit; ?> diff --git a/admin/judges_schedulerconfig_check.inc.php b/admin/judges_schedulerconfig_check.inc.php index 1bd1577b..e3b0010f 100644 --- a/admin/judges_schedulerconfig_check.inc.php +++ b/admin/judges_schedulerconfig_check.inc.php @@ -144,16 +144,14 @@ 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; - } + //if (get_value_from_3d_array($jdiv, $r->jdiv_id, 'num_projects', 'total') !== null){ + $jdiv[$r->jdiv_id]['num_projects']['total'] += $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; + $jdiv[$r->jdiv_id]['num_projects'][$l] += $qr->cnt; - if(get_value_from_array($projectlanguagetotal, $l) !== null) - $projectlanguagetotal[$l]+=$qr->cnt; + $projectlanguagetotal[$l]+=$qr->cnt; $projecttotal+=$qr->cnt; } diff --git a/admin/project_editor.php b/admin/project_editor.php index b69f579f..9c6e85f7 100644 --- a/admin/project_editor.php +++ b/admin/project_editor.php @@ -101,7 +101,7 @@ exit; function project_save() { - global $registrations_id, $config; + global $registrations_id, $config, $pdo; //first, lets make sure this project really does belong to them $q=$pdo->prepare("SELECT * FROM projects WHERE registrations_id='{$registrations_id}' AND year='{$config['FAIRYEAR']}'"); @@ -178,7 +178,7 @@ function project_save() function project_load() { - global $registrations_id, $config; + global $registrations_id, $config, $pdo; //now lets find out their MAX grade, so we can pre-set the Age Category $q=$pdo->prepare("SELECT MAX(grade) AS maxgrade FROM students WHERE registrations_id='".$registrations_id."'"); $q->execute(); diff --git a/admin/registration_list.php b/admin/registration_list.php index e4b25650..d72d618f 100644 --- a/admin/registration_list.php +++ b/admin/registration_list.php @@ -29,6 +29,8 @@ require_once('../common.inc.php'); require_once('../user.inc.php'); + + $auth_type = user_auth_required(array('fair','committee'), 'admin'); //require_once('../register_participants.inc.php'); @@ -104,6 +106,8 @@ if($auth_type == 'committee') { ?> + +