From bc588358ee166eeec1e2ef8cd90d3d4906bcd49e Mon Sep 17 00:00:00 2001 From: Armanveer Gill Date: Thu, 19 Dec 2024 22:29:06 -0500 Subject: [PATCH] Fix PDO and Warnings continued --- admin/award_awardcreatedivisional.php | 8 +-- admin/award_awards.php | 4 -- admin/awards.inc.php | 5 +- admin/committees.php | 54 +++++++++---------- admin/communication.php | 12 ++--- admin/cwsfregister.php | 4 +- admin/donors.php | 3 +- admin/donors_search.php | 6 +-- admin/fair_stats.php | 6 +-- admin/fundraising_campaigns.php | 2 +- admin/fundraising_setup.php | 4 +- admin/judges.inc.php | 45 ++++++++-------- admin/judges_jdiv.php | 14 ++--- admin/judges_schedulerconfig.php | 2 +- admin/judges_schedulerconfig_check.inc.php | 20 ++++--- admin/judges_teams.php | 4 +- admin/judges_teams_members.php | 32 +++++------ admin/judges_teams_projects.php | 5 +- admin/judges_teams_timeslots.php | 6 +-- admin/judges_timeslots.php | 2 +- admin/registration_list.php | 6 +-- admin/registration_receivedforms.php | 4 +- admin/registration_stats.php | 40 ++++++++------ admin/registration_webconsent.php | 5 +- admin/reports.inc.php | 4 +- admin/reports.php | 4 +- admin/reports_acscript.php | 10 ++-- admin/reports_editor.php | 28 +++++----- admin/reports_volunteers.inc.php | 2 +- admin/schools.php | 9 ++-- admin/schoolsimport.php | 2 +- admin/translations.php | 12 +++-- admin/user_editor_window.php | 4 +- admin/user_list.php | 13 ++--- common.inc.php | 9 ++-- config/categories.php | 2 +- config/divisions.php | 6 +-- config/divisions_cwsf.php | 2 +- config/languagepacks.php | 5 +- config/pagetexts.php | 4 +- config/safetyquestions.php | 5 +- config/subdivisions.php | 11 ++-- config/versionchecker.php | 3 +- config_editor.inc.php | 4 +- confirmed_participants.php | 2 +- data/logo-100.gif | Bin 0 -> 6490 bytes data/logo-100.jpg | Bin 0 -> 9324 bytes data/logo-100.png | Bin 0 -> 17224 bytes data/logo-200.gif | Bin 0 -> 19090 bytes data/logo-200.jpg | Bin 0 -> 26637 bytes data/logo-200.png | Bin 0 -> 50642 bytes data/logo-500.gif | Bin 0 -> 87793 bytes data/logo-500.jpg | Bin 0 -> 107309 bytes data/logo-500.png | Bin 0 -> 196587 bytes data/logo.gif | Bin 0 -> 49801 bytes data/logo.jpg | Bin 0 -> 86522 bytes data/logo.png | Bin 0 -> 82632 bytes data/logs/.htaccess | 2 + data/logs/judge_scheduler_20241219024052.log | 2 + data/logs/judge_scheduler_20241219024109.log | 2 + data/logs/judge_scheduler_20241219030628.log | 2 + helper.inc.php | 21 +++++++- judge.inc.php | 4 +- judge_expertise.php | 5 +- judge_other.php | 8 +-- judge_special_awards.php | 8 +-- lcsv.php | 4 +- questions.inc.php | 18 +++---- tableeditor.class.php | 13 +++-- tcpdf/tcpdf.php | 2 +- user.inc.php | 12 +++-- user_login.php | 21 ++++---- version.txt | 2 +- 73 files changed, 308 insertions(+), 252 deletions(-) create mode 100644 data/logo-100.gif create mode 100644 data/logo-100.jpg create mode 100644 data/logo-100.png create mode 100644 data/logo-200.gif create mode 100644 data/logo-200.jpg create mode 100644 data/logo-200.png create mode 100644 data/logo-500.gif create mode 100644 data/logo-500.jpg create mode 100644 data/logo-500.png create mode 100644 data/logo.gif create mode 100644 data/logo.jpg create mode 100644 data/logo.png create mode 100644 data/logs/.htaccess create mode 100644 data/logs/judge_scheduler_20241219024052.log create mode 100644 data/logs/judge_scheduler_20241219024109.log create mode 100644 data/logs/judge_scheduler_20241219030628.log diff --git a/admin/award_awardcreatedivisional.php b/admin/award_awardcreatedivisional.php index 9c970259..09c59acc 100644 --- a/admin/award_awardcreatedivisional.php +++ b/admin/award_awardcreatedivisional.php @@ -32,11 +32,11 @@ 'Awards Main' => 'admin/awards.php') ); - if($_GET['sponsors_id']) $sponsors_id=$_GET['sponsors_id']; - else if($_POST['sponsors_id']) $sponsors_id=$_POST['sponsors_id']; + if(get_value_from_array($_GET, 'sponsors_id')) $sponsors_id=$_GET['sponsors_id']; + else if(get_value_from_array($_POST,'sponsors_id')) $sponsors_id=$_POST['sponsors_id']; - if($_GET['award_types_id']) $award_types_id=$_GET['award_types_id']; - else if($_POST['award_types_id']) $award_types_id=$_POST['award_types_id']; + if(get_value_from_array($_GET, 'award_types_id')) $award_types_id=$_GET['award_types_id']; + else if(get_value_from_array($_POST, 'award_types_id')) $award_types_id=$_POST['award_types_id']; //first, we can only do this if we dont have any type=divisional awards created yet diff --git a/admin/award_awards.php b/admin/award_awards.php index 18337884..8489dcc7 100644 --- a/admin/award_awards.php +++ b/admin/award_awards.php @@ -229,8 +229,6 @@ WHERE id='$id'"); $q->execute(); -// echo $q; -// echo mysql_error(); happy_("Prize saved"); exit; @@ -307,8 +305,6 @@ exit; case 'feeder_save': -// print_r($_POST); - $id = intval($_POST['award_awards_id']); $dl = is_array($_POST['feeder_dl']) ? $_POST['feeder_dl'] : array(); $ul = is_array($_POST['feeder_ul']) ? $_POST['feeder_ul'] : array(); diff --git a/admin/awards.inc.php b/admin/awards.inc.php index 9515c2ba..bebbd1c1 100644 --- a/admin/awards.inc.php +++ b/admin/awards.inc.php @@ -28,7 +28,8 @@ function award_delete($award_awards_id) $q = $pdo->prepare("SELECT id FROM award_prizes WHERE award_awards_id='$award_awards_id'"); $q->execute(); - while(($p = $q->fetch(PDO::FETCH_ASSOC))) { + + while(($p = $q->fetch(PDO::FETCH_ASSOC))) { $q = $pdo->prepare(); $q->execute("DELETE FROM winners WHERE award_prizes_id='{$p['id']}'"); @@ -54,13 +55,11 @@ function award_delete($award_awards_id) function award_prize_delete($award_prizes_id) { - $q = $pdo->prepare("DELETE FROM winners WHERE award_prizes_id='$award_prizes_id'"); $q->execute(); $q = $pdo->prepare("DELETE FROM award_prizes WHERE id='$award_prizes_id'"); $q->execute(); - } ?> diff --git a/admin/committees.php b/admin/committees.php index ef3ab541..e5a22b46 100644 --- a/admin/committees.php +++ b/admin/committees.php @@ -142,7 +142,7 @@ if(get_value_from_array($_POST,'committees_id') && get_value_from_array($_POST,' $titles=$_POST['title']; $pords = $_POST['order']; - while($ids[$x]) { + while(get_value_from_array($ids, $x)) { $cid = intval($ids[$x]); $q = $pdo->prepare("UPDATE committees SET ord='".intval($ords[$x])."' WHERE id='$cid'"); @@ -342,36 +342,36 @@ if(get_value_from_array($_GET, 'unlinkmember') && get_value_from_array($_GET,'un } echo "\n"; - echo $pdo->errorInfo(); + while($r2=$q2->fetch(PDO::FETCH_OBJ)) { - $u = user_load_by_uid($r2->uid); - echo "    "; - echo "\"Edit\""; - echo " "; - echo "id}\">\"Unlink\""; - echo ""; - echo ""; - echo "{$u['name']}"; - echo ""; - echo "title}\" name=\"title[{$r->id}][{$u['uid']}]\" size=\"15\">"; - echo ""; - echo "ord}\" name=\"order[{$r->id}][{$u['uid']}]\" size=\"2\">"; + if ($u = user_load_by_uid($r2->uid)) { + echo "    "; + echo "\"Edit\""; + echo " "; + echo "id}\">\"Unlink\""; + echo ""; + echo ""; + echo "{$u['name']}"; + echo ""; + echo "title}\" name=\"title[{$r->id}][{$u['uid']}]\" size=\"15\">"; + echo ""; + echo "ord}\" name=\"order[{$r->id}][{$u['uid']}]\" size=\"2\">"; - echo ""; + echo ""; - if(get_value_from_array($u, 'email')) { - print_r($u["email"]); - list($b,$a)=explode("@",$u['email']); - echo ""; + if(get_value_from_array($u, 'email')) { + list($b,$a)=explode("@",$u['email']); + echo ""; + } + + if(get_value_from_array($u, 'emailprivate')) { + if($u['email']) echo " / "; + list($b,$a)=explode("@",$u['emailprivate']); + echo ""; + } + + echo "\n"; } - - if(get_value_from_array($u, 'emailprivate')) { - if($u['email']) echo " / "; - list($b,$a)=explode("@",$u['emailprivate']); - echo ""; - } - - echo "\n"; } echo " \n"; } diff --git a/admin/communication.php b/admin/communication.php index 4e48a8e0..6da761b9 100644 --- a/admin/communication.php +++ b/admin/communication.php @@ -39,7 +39,7 @@ * select: comm_dialog_choose_select(emails_id) * cancel: comm_dialog_choose_cancel() */ -switch($_GET['action']) { +switch(get_value_from_array($_GET, 'action')) { case 'dialog_choose_load': $emails_id = intval($_GET['emails_id']); $q = $pdo->prepare("SELECT * FROM emails WHERE id='$emails_id'"); @@ -677,7 +677,7 @@ case "email_get_list": } - if($_GET['action']=="sendqueue") { + if(get_value_from_array($_GET, 'action') == "sendqueue") { $fcid=intval($_POST['fundraising_campaigns_id']); $emailid=intval($_POST['emails_id']); @@ -785,13 +785,13 @@ case "email_get_list": prepare("DELETE FROM emails WHERE id='".$_GET['delete']."' AND `type`='user'"); $q->execute(); echo happy("Email successfully deleted"); } - if($_GET['action']=="send" && $_GET['send']) { + if(get_value_from_array($_GET, 'action') == "send" && get_value_from_array($_GET, 'send')) { echo $pdo->errorInfo(); $q = $pdo->prepare("SELECT * FROM emails WHERE id='".$_GET['send']."'"); @@ -860,7 +860,7 @@ case "email_get_list": } //echo $str; } - else if($_POST['action']=="reallysend" && $_POST['reallysend'] && $_POST['to']) { + else if(get_value_from_array($_POST, 'action') == "reallysend" && get_value_from_array($_POST, 'reallysend') && get_value_from_array($_POST, 'to')) { $emailid=intval($_POST['reallysend']); $emailq=$pdo->prepare("SELECT * FROM emails WHERE id='$emailid'"); $email=$emailq->fetch(PDO::FETCH_OBJ); @@ -962,7 +962,7 @@ case "email_get_list": echo "Click here to see the sending progress"; } - else if($_GET['action']=="restartqueue") + else if(get_value_from_array($_GET, 'action') == "restartqueue") { launchQueue(); echo "
"; diff --git a/admin/cwsfregister.php b/admin/cwsfregister.php index 8746141a..cd20df95 100644 --- a/admin/cwsfregister.php +++ b/admin/cwsfregister.php @@ -129,7 +129,7 @@ include "xml.inc.php"; ); echo "
"; - if(count(get_value_from_array($_POST,'cwsfdivision', ''))) + if(count(get_value_from_array($_POST,'cwsfdivision', []))) { foreach($_POST['cwsfdivision'] AS $p=>$d) { @@ -139,7 +139,7 @@ include "xml.inc.php"; echo happy(i18n("CWSF Project Divisions saved")); } - if($_POST['action']=="register" && $_POST['xml']) + if(get_value_from_array($_POST,'action')=="register" && $_POST['xml']) { if(function_exists('curl_init')) { diff --git a/admin/donors.php b/admin/donors.php index 888fbda9..ed3b57bc 100644 --- a/admin/donors.php +++ b/admin/donors.php @@ -27,8 +27,9 @@ require_once("../user.inc.php"); user_auth_required('committee', 'admin'); require_once("fundraising_common.inc.php"); - +global $pdo; switch(get_value_from_array($_GET, 'action')) { + case 'organizationinfo_load': $id=intval($_GET['id']); $q=$pdo->prepare("SELECT * FROM sponsors WHERE id='$id'"); diff --git a/admin/donors_search.php b/admin/donors_search.php index 825422f5..71a6dc71 100644 --- a/admin/donors_search.php +++ b/admin/donors_search.php @@ -44,7 +44,7 @@ // echo "query=$query"; $q=$pdo->prepare($query); $q->execute(); - $_POST['donortype']; + get_value_from_array($_POST,'donortype'); $thisyear=$config['FISCALYEAR']; $lastyear=$config['FISCALYEAR']-1; $rows=array(); @@ -66,7 +66,7 @@ $rows[]=array("id"=>$r->id, "name"=>$r->organization, "thisyeartotal"=>$thisyeartotal, "lastyeartotal"=>$lastyeartotal, "change"=>$change); } $thisyearsort=array(); - if(!$_POST['order']) { + if(!get_value_from_array($_POST, 'order')) { //if order is not given, lets order by donation amount this year foreach($rows AS $key=>$val) { $thisyearsort[$key]=$val['thisyeartotal']; @@ -74,7 +74,7 @@ array_multisort($thisyearsort,SORT_DESC,$rows); } - if($_POST['limit']) { + if(get_value_from_array($_POST, 'limit')) { $limit=$_POST['limit']; } else { diff --git a/admin/fair_stats.php b/admin/fair_stats.php index 26cebbd4..2828cd05 100644 --- a/admin/fair_stats.php +++ b/admin/fair_stats.php @@ -88,8 +88,8 @@ if(get_value_from_array($_GET,'year')) $year=intval(get_value_from_array($_GET, 'year')); else $year=$config['FAIRYEAR']; - if($_GET['id']) $fairs_id=intval($_GET['id']); - else if($_POST['id']) $fairs_id=intval($_POST['id']); + if(get_value_from_array($_GET, 'id')) $fairs_id=intval($_GET['id']); + else if(get_value_from_array($_POST, 'id')) $fairs_id=intval($_POST['id']); else $fairs_id = -1; if($fairs_id != -1) { @@ -504,7 +504,7 @@ $q->execute(); } $keys = array_keys($stats_data); foreach($keys as $k) { - if($stats_data[$k]['manual'] == true) continue; + if(isset($stats_data[$k]['manual']) && $stats_data[$k]['manual'] == true) continue; echo ""; } diff --git a/admin/fundraising_campaigns.php b/admin/fundraising_campaigns.php index 53719d73..007de180 100644 --- a/admin/fundraising_campaigns.php +++ b/admin/fundraising_campaigns.php @@ -26,7 +26,7 @@ user_auth_required('committee', 'admin'); require("fundraising_common.inc.php"); -switch($_GET['action']){ +switch(get_value_from_array($_GET, 'action')){ case "campaigninfo_save": save_campaign_info(); exit; diff --git a/admin/fundraising_setup.php b/admin/fundraising_setup.php index 41bbacbb..a805e93f 100644 --- a/admin/fundraising_setup.php +++ b/admin/fundraising_setup.php @@ -62,7 +62,7 @@ } - switch($_GET['gettab']) { + switch(get_value_from_array($_GET, 'gettab')) { case "levels": $q=$pdo->prepare("SELECT * FROM fundraising_donor_levels WHERE fiscalyear='{$config['FISCALYEAR']}' ORDER BY max"); $q->execute(); @@ -205,7 +205,7 @@ break; } - switch($_GET['action']) { + switch(get_value_from_array($_GET, 'action')) { case "level_save": $id=$_POST['id']; if(! ($_POST['level'] && $_POST['min'] && $_POST['max'])) { diff --git a/admin/judges.inc.php b/admin/judges.inc.php index 7d809d0a..54f051bc 100644 --- a/admin/judges.inc.php +++ b/admin/judges.inc.php @@ -1,9 +1,8 @@ prepare("SELECT judges_teams.id, + global $config, $pdo; + $q=$pdo->prepare("SELECT judges_teams.id, judges_teams.num, judges_teams.name FROM @@ -11,8 +10,7 @@ function getJudgingTeams() WHERE judges_teams.year='".$config['FAIRYEAR']."' ORDER BY - num,name - "); + num,name"); $q->execute(); $lastteamid=-1; @@ -35,33 +33,34 @@ function getJudgingTeams() $tq->execute(); $teams[$r->id]['timeslots'] = array(); $teams[$r->id]['rounds'] = array(); + while($ts = $tq->fetch(PDO::FETCH_ASSOC)) { $teams[$r->id]['timeslots'][] = $ts; $rounds[$ts['round_id']] = $ts['round_id']; } + foreach($rounds as $round_id) { $tq = $pdo->prepare("SELECT * FROM judges_timeslots WHERE id='{$round_id}'"); $tq->execute(); $teams[$r->id]['rounds'][] = $tq->fetch(PDO::FETCH_ASSOC); } - + //get the members for this team - $mq=$pdo->prepare("SELECT - users.id AS judges_id, - users.firstname, - users.lastname, - judges_teams_link.captain - - FROM - users, - judges_teams_link - WHERE - judges_teams_link.users_id=users.id AND - judges_teams_link.judges_teams_id='$r->id' - ORDER BY - captain DESC, - lastname, - firstname"); + $mq = $pdo->prepare("SELECT + users.id AS judges_id, + users.firstname, + users.lastname, + judges_teams_link.captain + FROM + users, + judges_teams_link + WHERE + judges_teams_link.users_id=users.id AND + judges_teams_link.judges_teams_id='$r->id' + ORDER BY + captain DESC, + lastname, + firstname"); $mq->execute(); show_pdo_errors_if_any($pdo); @@ -255,7 +254,7 @@ function teamMemberToName($member) function judges_load_all() { - global $config; + global $config, $pdo; $ret = array(); diff --git a/admin/judges_jdiv.php b/admin/judges_jdiv.php index 2e6149bd..9266fb9a 100644 --- a/admin/judges_jdiv.php +++ b/admin/judges_jdiv.php @@ -101,7 +101,7 @@ function newbuttonclicked(jdivs) function get_all_divs() { - global $config; + global $config, $pdo; global $divshort, $div,$cat, $langr; global $divcat; @@ -170,7 +170,7 @@ function get_all_divs() $q->execute(); $r = $q->fetch(PDO::FETCH_OBJ); - echo $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); $c = $r->cnt; $cdl[$id]['name'] = "$x $y ({$cdl[$id]['lang']}) ($c project".($c==1?'':'s').")"; @@ -180,7 +180,7 @@ function get_all_divs() return $cdl; } - if($_POST['action']=="add" && $_POST['jdiv_id'] && count($_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) { $q=$pdo->prepare("UPDATE judges_jdiv SET jdiv_id='{$_POST['jdiv_id']}' WHERE ". @@ -190,18 +190,18 @@ function get_all_divs() echo happy(i18n("Judging Division(s) successfully added")); } - if($_GET['action']=="del" && $_GET['cdl_id']) { + if(get_value_from_array($_GET, 'action') == "del" && get_value_from_array($_GET, 'cdl_id')) { $stmt = $pdo->prepare("UPDATE judges_jdiv SET jdiv_id=0 WHERE id='{$_GET['cdl_id']}'"); $stmt->execute(); } - if($_GET['action']=="empty" && $_GET['jdiv_id']) { + if(get_value_from_array($_GET, 'action') == "empty" && get_value_from_array($_GET, 'jdiv_id')) { $stmt = $pdo->prepare("UPDATE judges_jdiv SET jdiv_id=0 WHERE jdiv_id='{$_GET['jdiv_id']}' "); $stmt->execute(); echo happy(i18n("Emptied all divisions from Judging Division Group %1",array($_GET['jdiv_id']))); } - if($_GET['action']=="recreate") { + if(get_value_from_array($_GET, 'action') == "recreate") { //just delete them all, they'll be recreated automagically $stmt = $pdo->prepare("TRUNCATE TABLE judges_jdiv"); $stmt->execute(); @@ -216,7 +216,7 @@ function get_all_divs() /* Count the divisions, or, use the posted variable so we can create new * and empty judging divisions */ - if($_POST['jdivs'] > 0) { + if(get_value_from_array($_POST, 'jdivs') > 0) { $jdivs = $_POST['jdivs']; } else { $jdivs = 0; diff --git a/admin/judges_schedulerconfig.php b/admin/judges_schedulerconfig.php index 80b748ef..1e57a73f 100644 --- a/admin/judges_schedulerconfig.php +++ b/admin/judges_schedulerconfig.php @@ -46,7 +46,7 @@ ogram; see the file COPYING. If not, write to config_editor("Judge Scheduler", $config['FAIRYEAR'], "var", $_SERVER['PHP_SELF']); echo "
"; - if($_GET['action']=="reset") + if(get_value_from_array($_GET, 'action') == "reset") { $stmt = $pdo->prepare("UPDATE config SET `val`='-1' WHERE `var`='judge_scheduler_percent' AND `year`=0"); $stmt->execute(); diff --git a/admin/judges_schedulerconfig_check.inc.php b/admin/judges_schedulerconfig_check.inc.php index 9a12c4f9..952c5bc3 100644 --- a/admin/judges_schedulerconfig_check.inc.php +++ b/admin/judges_schedulerconfig_check.inc.php @@ -1,8 +1,9 @@ prepare("SELECT * FROM judges_timeslots WHERE ". " year='".$config['FAIRYEAR']."'". @@ -10,7 +11,7 @@ function judges_scheduler_check_timeslots() $q->execute(); if($q->rowCount()) { $round=$q->fetch(PDO::FETCH_OBJ); - $q=$stmt->prepare("SELECT * FROM judges_timeslots WHERE round_id='$round->id' AND type='timeslot'"); + $q=$pdo->prepare("SELECT * FROM judges_timeslots WHERE round_id='$round->id' AND type='timeslot'"); $q->execute(); return $q->rowCount(); } @@ -20,7 +21,7 @@ function judges_scheduler_check_timeslots() function judges_scheduler_check_timeslots_sa() { - global $config; + global $config, $pdo; $rows = 0; $q=$pdo->prepare("SELECT * FROM judges_timeslots WHERE ". @@ -39,7 +40,7 @@ function judges_scheduler_check_timeslots_sa() function judges_scheduler_check_awards() { - global $config; + global $config, $pdo; $q=$pdo->prepare("SELECT * FROM projectdivisions WHERE year='".$config['FAIRYEAR']."' ORDER BY id"); $q->execute(); @@ -92,7 +93,7 @@ function judges_scheduler_check_awards() AND award_awards.award_types_id='1' "); $q->execute(); - echo $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); if($q->rowCount()!=1) { $missing_awards[] = "{$cat[$c]} - {$div[$d]} (".i18n("%1 found",array($q->rowCount())).")"; } @@ -103,7 +104,7 @@ function judges_scheduler_check_awards() function judges_scheduler_check_jdivs() { - global $config; + global $config, $pdo; $q=$pdo->prepare("SELECT DISTINCT jdiv_id FROM judges_jdiv "); $q->execute(); @@ -115,10 +116,13 @@ function judges_scheduler_check_jdivs() function judges_scheduler_check_judges() { - global $config; + global $config, $pdo; $ok = 1; $jdiv = array(); + $projectlanguagetotal = array(); + $projecttotal = 0; + $q=$pdo->prepare("SELECT * FROM judges_jdiv ORDER BY jdiv_id"); $q->execute(); while($r=$q->fetch(PDO::FETCH_OBJ)) { @@ -140,8 +144,10 @@ function judges_scheduler_check_judges() $qp->execute(); $qr = $qp->fetch(PDO::FETCH_OBJ); + $jdiv[$r->jdiv_id]['num_projects']['total'] += $qr->cnt; $jdiv[$r->jdiv_id]['num_projects'][$l] += $qr->cnt; + $projectlanguagetotal[$l]+=$qr->cnt; $projecttotal+=$qr->cnt; diff --git a/admin/judges_teams.php b/admin/judges_teams.php index 548cd5c6..11ff0201 100644 --- a/admin/judges_teams.php +++ b/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['delete']) + if($action == "delete" && get_value_from_array($_GET, 'delete')) { //ALSO DELETE: team members, timeslots, projects, awards @@ -419,8 +419,6 @@ function addclicked() } } - //print_r($teams); - echo ""; echo ""; - if(count($team['members'])) { + if(count(get_value_from_array($team, 'members', []))) { foreach($team['members'] AS $member) { $j = &$judgelist[$member['id']]; echo ""; + echo ""; echo ""; @@ -336,7 +336,7 @@ echo $pdo->errorInfo(); } -if ($_POST['action'] == 'recieve_all') +if (get_value_from_array($_POST, 'action') == 'receive_all') { // Grab all projects that don't have project numbers. Status should therefor be open or new but not complete $query_noprojectnumber = $pdo->prepare("SELECT * FROM projects WHERE projectnumber IS NULL AND year =".$config['FAIRYEAR'].""); diff --git a/admin/registration_stats.php b/admin/registration_stats.php index c6479cf2..b638f2c1 100644 --- a/admin/registration_stats.php +++ b/admin/registration_stats.php @@ -129,11 +129,13 @@ else $wherestatus=""; while($r=$q->fetch(PDO::FETCH_OBJ)) { $stats_totalprojects++; - $stats_divisions[$r->projectdivisions_id]++; - $stats_categories[$r->projectcategories_id]++; - $stats_projects_catdiv[$r->projectcategories_id][$r->projectdivisions_id]++; - $stats_projects_lang[$r->projectcategories_id][$r->projectdivisions_id][$r->language]++; - $languages[$r->language]++; + + $stats_divisions[$r->projectdivisions_id] = add_or_initialize($stats_divisions, $r->projectdivisions_id); + $stats_categories[$r->projectcategories_id] = add_or_initialize($stats_categories, $r->projectcategories_id); + $stats_projects_catdiv[$r->projectcategories_id][$r->projectdivisions_id] = add_or_initialize_multi_2($stats_projects_catdiv, $r->projectcategories_id, $r->projectdivisions_id); + $stats_projects_lang[$r->projectcategories_id][$r->projectdivisions_id][$r->language] = add_or_initialize_multi_3($stats_projects_lang, $r->projectcategories_id, $r->projectdivisions_id, $r->language); + + $languages[$r->language] = add_or_initialize($languages, $r->language); switch($r->status) { @@ -163,6 +165,7 @@ else $wherestatus=""; $studnum=1; $schools=""; $students=""; + $lastschoolid = -1; while($studentinfo=$sq->fetch(PDO::FETCH_OBJ)) { $stats_totalstudents++; @@ -173,7 +176,7 @@ else $wherestatus=""; } //this really isnt right, its only taking the school from the last student in the project to count towards the school's project totals //but there's really no other way - $stats_projects_schools[$r->projectcategories_id][$lastschoolid]++; + $stats_projects_schools[$r->projectcategories_id][$lastschoolid] = add_or_initialize_multi_2($stats_projects_schools, $r->projectcategories_id, $lastschoolid); } echo "
"; $q=$pdo->prepare("SELECT COUNT(*) AS c FROM judges_teams WHERE autocreate_type_id!='1' AND year='".$config['FAIRYEAR']."'"); diff --git a/admin/judges_teams_members.php b/admin/judges_teams_members.php index 66921c12..8b4d079d 100644 --- a/admin/judges_teams_members.php +++ b/admin/judges_teams_members.php @@ -106,11 +106,11 @@ jQuery(document).ready(function(){ 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. $q=$pdo->prepare("SELECT id,name FROM judges_teams WHERE num='".$_POST['team_num']."' AND year='".$config['FAIRYEAR']."'"); $q->execute(); - if($q->rowCount();) + if($q->rowCount()) { $r=$q->fetch(PDO::FETCH_OBJ); $team_id=$r->id; @@ -130,7 +130,7 @@ jQuery(document).ready(function(){ $q=$pdo->prepare("SELECT * FROM judges_teams_link WHERE users_id='$selectedjudge' AND judges_teams_id='$team_id'"); $q->execute(); - if($q->rowCount();) { + if($q->rowCount()) { echo notice(i18n("Judge (%1) already belongs to judging team: %2",array($selectedjudge,$team_name))); } @@ -152,7 +152,7 @@ jQuery(document).ready(function(){ echo happy(i18n("%1 %2 added to team #%3 (%4)",array($added,$j,$_POST['team_num'],$team_name))); } - if($_GET['action']=="del" && $_GET['team_num'] && $_GET['team_id'] && $_GET['users_id']) + if(get_value_from_array($_GET, 'action') == "del" && get_value_from_array($_GET, 'team_num') && get_value_from_array($_GET, 'team_id') && get_value_from_array($_GET, 'users_id')) { $stmt = $pdo->prepare("DELETE FROM judges_teams_link WHERE users_id='".$_GET['users_id']."' AND judges_teams_id='".$_GET['team_id']."' AND year='".$config['FAIRYEAR']."'"); $stmt->execute(); @@ -161,7 +161,7 @@ jQuery(document).ready(function(){ //if there is still members left in the team, make sure we have a captain still $q = $pdo->prepare("SELECT * FROM judges_teams_link WHERE judges_teams_id='".$_GET['team_id']."' AND year='".$config['FAIRYEAR']."'"); $q->execute(); - if($q->rowCount();) + if($q->rowCount()) { //make sure the team still has a captain! //FIXME: this might best come from the "i am willing to be a team captain" question under the judges profile @@ -191,14 +191,14 @@ jQuery(document).ready(function(){ } } - if($_GET['action']=="empty" && $_GET['team_num'] && $_GET['team_id']) + if(get_value_from_array($_GET, 'action') == "empty" && get_value_from_array($_GET, 'team_num') && get_value_from_array($_GET, 'team_id')) { $stmt = $pdo->prepare("DELETE FROM judges_teams_link WHERE judges_teams_id='".$_GET['team_id']."' AND year='".$config['FAIRYEAR']."'"); $stmt->execute(); echo happy(i18n("Emptied all judges from team #%1 (%2)",array($_GET['team_num'],$_GET['team_name']))); } - if($_POST['action']=="saveteamnames") + if(get_value_from_array($_POST, 'action') == "saveteamnames") { if(count($_POST['team_names'])) { @@ -212,7 +212,7 @@ jQuery(document).ready(function(){ } - if($_GET['action']=="addcaptain") + if(get_value_from_array($_GET, 'action') == "addcaptain") { //teams can have as many captains as they want, so just add it. @@ -221,12 +221,12 @@ jQuery(document).ready(function(){ echo happy(i18n("Team captain assigned")); } - if($_GET['action']=="removecaptain") + if(get_value_from_array($_GET, 'action') == "removecaptain") { //teams must always have at least one captain, so if we only have one, and we are trying to remove it, dont let them! $q=$pdo->prepare("SELECT * FROM judges_teams_link WHERE captain='yes' AND judges_teams_id='".$_GET['team_id']."'"); $q->execute(); - if($q->rowCount();<2) + if($q->rowCount() < 2) { echo error(i18n("A judge team must always have at least one captain")); } @@ -238,7 +238,7 @@ jQuery(document).ready(function(){ } } - if($_GET['action']=="autoassignspecial") { + if(get_value_from_array($_GET, 'action') == "autoassignspecial") { /* Load all the judges (judge_complete=yes, deleted=no, year=fairyear) */ $judgelist = judges_load_all(); @@ -276,7 +276,7 @@ jQuery(document).ready(function(){ //find the award id linked to a team $q=$pdo->prepare("SELECT * FROM judges_teams_awards_link WHERE award_awards_id='{$awardid}' AND year='{$config['FAIRYEAR']}'"); $q->execute(); - if($q->rowCount();) { + if($q->rowCount()) { while($r=$q->fetch(PDO::FETCH_OBJ)) { $stmt = $pdo->prepare("INSERT INTO judges_teams_link (users_id,judges_teams_id,captain,year) VALUES ('$jid','$r->judges_teams_id','yes','{$config['FAIRYEAR']}')"); $stmt->execute(); @@ -298,7 +298,7 @@ jQuery(document).ready(function(){ if(!$_SESSION['viewstate']['judges_teams_list_show']) $_SESSION['viewstate']['judges_teams_list_show']='unassigned'; //now update the judges_teams_list_show viewstate - if($_GET['judges_teams_list_show']) + if(get_value_from_array($_GET, 'judges_teams_list_show')) $_SESSION['viewstate']['judges_teams_list_show']=$_GET['judges_teams_list_show']; echo "
"; @@ -354,7 +354,7 @@ jQuery(document).ready(function(){ if($_SESSION['viewstate']['judges_teams_list_show']=='unassigned') { /* Remove all judges that have a link */ foreach($judgelist as $j) { - if(count($j['teams_links']) == 0) $jlist[] = $j['id']; + if(count(get_value_from_array($j, 'teams_links', [])) == 0) $jlist[] = $j['id']; } } else { $jlist = array_keys($judgelist); @@ -364,7 +364,7 @@ jQuery(document).ready(function(){ echo i18n("Listing %1 judges",array(count($jlist))); echo "
"; echo ""; - echo $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); echo "
"; diff --git a/admin/judges_teams_projects.php b/admin/judges_teams_projects.php index acee51bc..7094e534 100644 --- a/admin/judges_teams_projects.php +++ b/admin/judges_teams_projects.php @@ -233,16 +233,17 @@ if( ($action=="edit" || $action=="assign" ) && $edit) registrations WHERE projectnumber is not null - " . getJudgingEligibilityCode(). " AND + ' . getJudgingEligibilityCode(). ' AND projects.registrations_id=registrations.id AND judges_teams_timeslots_projects_link.projects_id IS NULL AND projects.year='".$config['FAIRYEAR']."' ORDER BY projectnumber"; } + $pq=$pdo->($querystr); $pq->execute(); - echo $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); $eligibleprojects=getProjectsEligibleOrNominatedForAwards($award_ids); // echo nl2br(print_r($eligibleprojects,true)); diff --git a/admin/judges_teams_timeslots.php b/admin/judges_teams_timeslots.php index e54fbc4b..a62a7452 100644 --- a/admin/judges_teams_timeslots.php +++ b/admin/judges_teams_timeslots.php @@ -38,14 +38,14 @@ $action = $_POST['action']; - if($action == 'delete' && array_key_exists('delete', $_GET)) { + if(get_value_from_array($_GET, 'action') && $action == 'delete') { $id = intval($_GET['delete']); $stmt = $pdo->prepare("DELETE FROM judges_teams_timeslots_link WHERE id='$id'"); $stmt->execute(); message_push(happy(i18n("Judging team timeslot successfully removed"))); } - if($action == 'empty' && array_key_exists('empty',$_GET)) { + if(array_key_exists('empty', $_GET) && $action == 'empty') { $id = intval($_GET['empty']); $stmt = $pdo->prepare("DELETE FROM judges_teams_timeslots_link WHERE judges_teams_id='$id'"); $stmt->execute(); @@ -191,7 +191,7 @@ function checkinvert(what) echo ""; echo "".$team['name']." (#".$team['num'].")
"; $memberlist=""; - if(count($team['members'])) + if(count(get_value_from_array($team, 'members', []))) { foreach($team['members'] AS $member) { diff --git a/admin/judges_timeslots.php b/admin/judges_timeslots.php index 828496e3..c177d60d 100644 --- a/admin/judges_timeslots.php +++ b/admin/judges_timeslots.php @@ -258,7 +258,7 @@ echo ""; echo "
".i18n("Name").":"; - echo "
".i18n("Date").":"; emit_date_selector("date",$r['date']); diff --git a/admin/registration_list.php b/admin/registration_list.php index a869f27e..3282c5dc 100644 --- a/admin/registration_list.php +++ b/admin/registration_list.php @@ -33,7 +33,7 @@ $auth_type = user_auth_required(array('fair','committee'), 'admin'); //require_once('../register_participants.inc.php'); - if($_GET['year']) $year=$_GET['year']; + if(get_value_from_array($_GET, 'year')) $year=$_GET['year']; else $year=$config['FAIRYEAR']; $q = $pdo->prepare("SELECT * FROM projectcategories WHERE year='$year' ORDER BY id"); @@ -45,10 +45,10 @@ while($r=$q->fetch(PDO::FETCH_OBJ)) $q = $pdo->prepare("SELECT * FROM projectdivisions WHERE year='$year' ORDER BY id"); $q->execute(); -while($q->fetch(PDO::FETCH_OBJ)) +while($r=$q->fetch(PDO::FETCH_OBJ)) $divs[$r->id]=$r->division; -$action=$_GET['action']; +$action=get_value_from_array($_GET, 'action'); switch($action) { case 'load_row': $id = intval($_GET['id']); diff --git a/admin/registration_receivedforms.php b/admin/registration_receivedforms.php index 9e01f608..d8eb17d9 100644 --- a/admin/registration_receivedforms.php +++ b/admin/registration_receivedforms.php @@ -323,7 +323,7 @@ echo $pdo->errorInfo(); echo "This button does not keep track of payments"; echo "
"; echo ""; - echo ""; + echo ""; echo ""; echo ""; echo "
"; @@ -189,19 +192,23 @@ else $wherestatus=""; foreach($divs AS $d=>$dn) { echo ""; $tstud=0; + $tstudcat = array(); $tproj=0; + $tprojcat = array(); foreach($cats AS $c=>$cn) { echo ""; - $tstud+=$stats_students_catdiv[$c][$d]; - $tproj+=$stats_projects_catdiv[$c][$d]; - $tstudcat[$c]+=$stats_students_catdiv[$c][$d]; - $tprojcat[$c]+=$stats_projects_catdiv[$c][$d]; + $tstud+=$stats_students_catdiv[$c][$d] ?? 0; + $tproj+=$stats_projects_catdiv[$c][$d] ?? 0; + + $tstudcat[$c] = add_or_initialize($tstudcat, $c, $stats_students_catdiv[$c][$d] ?? 0); + $tprojcat[$c] = add_or_initialize($tprojcat, $c, $stats_projects_catdiv[$c][$d] ?? 0); } echo ""; - $tproj[$l]+=$stats_projects_lang[$c][$d][$l]; - - $tprojcat[$c][$l]+=$stats_projects_lang[$c][$d][$l]; + $tproj[$l] = add_or_initialize($tproj, $l, $stats_projects_lang[$c][$d][$l] ?? 0); + $tprojcat[$c][$l] = add_or_initialize_multi_2($tprojcat, $c, $l, $stats_projects_lang[$c][$d][$l] ?? 0); } } foreach($tproj AS $l=>$ln) { @@ -314,7 +320,7 @@ else $wherestatus=""; echo ""; - $tproj[$l]+=$tprojcat[$c][$l]; + $tproj[$l] = add_or_initialize($tproj, $l, $tprojcat[$c][$l] ?? 0); } } foreach($tproj AS $l=>$ln) { diff --git a/admin/registration_webconsent.php b/admin/registration_webconsent.php index 2de79a9c..ac743347 100644 --- a/admin/registration_webconsent.php +++ b/admin/registration_webconsent.php @@ -34,7 +34,7 @@ echo "
"; - if(is_array($_POST['changed'])) + if(get_value_from_array($_POST, 'changed')) { $numchanged=0; foreach($_POST['changed'] AS $id=>$val) @@ -92,7 +92,7 @@ ORDER BY projectnumber "); $sq->execute(); - echo $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); echo ""; echo "
$dn"; - echo ($stats_students_catdiv[$c][$d]?$stats_students_catdiv[$c][$d]:0); + + echo ($stats_students_catdiv[$c][$d] ?? 0); echo "    "; - echo ($stats_projects_catdiv[$c][$d]?$stats_projects_catdiv[$c][$d]:0); + echo ($stats_projects_catdiv[$c][$d] ?? 0); echo ""; echo ($tstud?$tstud:0); @@ -293,11 +300,10 @@ else $wherestatus=""; { foreach($languages AS $l=>$ln) { echo ""; - echo ($stats_projects_lang[$c][$d][$l]?$stats_projects_lang[$c][$d][$l]:0); + echo ($stats_projects_lang[$c][$d][$l] ?? 0); echo ""; echo ($tprojcat[$c][$l]?$tprojcat[$c][$l]:0); echo "
"; @@ -103,6 +103,7 @@ echo " "; echo " "; echo ""; + while($r=$sq->fetch(PDO::FETCH_OBJ)) { echo ""; diff --git a/admin/reports.inc.php b/admin/reports.inc.php index dabdbfa9..3db5632b 100644 --- a/admin/reports.inc.php +++ b/admin/reports.inc.php @@ -437,13 +437,13 @@ foreach($report_stock as $n=>$v) { * ['option'][name] = value; */ if(!in_array($f, $allow_options)) { // print("Type[$type] Field[$f] not allowed.\n"); - continue; + break; } $report['option'][$f] = $a['value']; default: if(!in_array($f, $allow_fields)) { // print("Type[$type] Field[$f] not allowed.\n"); - continue; + break; } /* Pull out all the data */ $val = array(); diff --git a/admin/reports.php b/admin/reports.php index 2d5ba866..30410d7d 100644 --- a/admin/reports.php +++ b/admin/reports.php @@ -32,7 +32,7 @@ $option_keys = array('type','stock'); -switch($_GET['action']) { +switch(get_value_from_array($_GET, 'action')) { case 'remove_report': $id = intval($_GET['id']); $stmt = $pdo->prepare("DELETE FROM reports_committee WHERE @@ -260,7 +260,7 @@ $q->execute(); if($last_category != $i->category) { /* New category */ echo '"; $last_category = $i->category; } diff --git a/admin/reports_acscript.php b/admin/reports_acscript.php index 656bc915..6f334f21 100644 --- a/admin/reports_acscript.php +++ b/admin/reports_acscript.php @@ -12,14 +12,14 @@ else if($_GET['awardtype']) $awardtype=" AND award_types.type='".$_GET['awardtype']."'"; else $awardtype=""; - if($_GET['show_unawarded_awards']=="on") $show_unawarded_awards="yes"; + if(get_value_from_array($_GET, 'show_unawarded_awards')=="on") $show_unawarded_awards="yes"; else $show_unawarded_awards="no"; - if($_GET['show_unawarded_prizes']=="on") $show_unawarded_prizes="yes"; + if(get_value_from_array($_GET, 'show_unawarded_prizes')=="on") $show_unawarded_prizes="yes"; else $show_unawarded_prizes="no"; - $show_pronunciation= ($_GET['show_pronunciation'] == 'on') ? TRUE : FALSE; - $group_by_prize= ($_GET['group_by_prize'] == 'on') ? true : false; + $show_pronunciation= get_value_from_array($_GET, 'show_pronunciation' == 'on') ? TRUE : FALSE; + $group_by_prize= (get_value_from_array($_GET, 'group_by_prize') == 'on') ? true : false; if(is_array($_GET['show_category'])) { $show_category = array(); @@ -35,7 +35,7 @@ $and_categories = '1'; } - $show_criteria = ($_GET['show_criteria']=='on') ? true : false; + $show_criteria = (get_value_from_array($_GET, 'show_criteria')=='on') ? true : false; $type=$_GET['type']; if(!$type) $type="pdf"; diff --git a/admin/reports_editor.php b/admin/reports_editor.php index b4830c8c..95883b09 100644 --- a/admin/reports_editor.php +++ b/admin/reports_editor.php @@ -80,7 +80,7 @@ { global $locs; $ret = array(); - if(!is_array($_POST[$f])) return array(); + if(!is_array(get_value_from_array($_POST, $f))) return array(); $x = 0; foreach($_POST[$f] as $o=>$d) { if(is_array($d)) { @@ -123,7 +123,7 @@ function parse_options($f) { $ret = array(); - if(!is_array($_POST[$f])) return array(); + if(!is_array(get_value_from_array($_POST, $f))) return array(); foreach($_POST[$f] as $c=>$v) { if(trim($c) == '') continue; $ret[$c] = stripslashes($v); @@ -133,11 +133,11 @@ /* Decode the report */ $report = array(); - $report['id'] = intval($_POST['id']); - $report['name'] = stripslashes($_POST['name']); - $report['creator'] = stripslashes($_POST['creator']); - $report['desc'] = stripslashes($_POST['desc']); - $report['type'] = stripslashes($_POST['type']); + $report['id'] = intval(get_value_from_array($_POST, 'id', '')); + $report['name'] = stripslashes(get_value_from_array($_POST, 'name', '')); + $report['creator'] = stripslashes(get_value_from_array($_POST, 'creator', '')); + $report['desc'] = stripslashes(get_value_from_array($_POST, 'desc', '')); + $report['type'] = stripslashes(get_value_from_array($_POST, 'type', '')); $report['col'] = parse_fields('col'); $report['group'] = parse_fields('group'); $report['sort'] = parse_fields('sort'); @@ -148,10 +148,10 @@ // print("
");print_r($_POST);print("
"); // print("
");print_r($report);print("
"); - $reloadaction = $_POST['reloadaction']; - $loadaction = $_POST['loadaction']; - $colaction = $_POST['colaction']; - $repaction = $_POST['repaction']; + $reloadaction = get_value_from_array($_POST, 'reloadaction', ''); + $loadaction = get_value_from_array($_POST, 'loadaction', ''); + $colaction = get_value_from_array($_POST, 'colaction', ''); + $repaction = get_value_from_array($_POST, 'repaction', ''); $repaction_save = $repaction; @@ -371,7 +371,7 @@ function createDataTCPDF(x,y,w,h,align,valign,fontname,fontstyle,fontsize,value) /* ---- Setup ------ */ - $n_columns = intval($_POST['ncolumns']); + $n_columns = intval(get_value_from_array($_POST, 'ncolumns')); $n = count($report['col']) + 1; if($n > $n_columns) $n_columns = $n; if($colaction == 'add') $n_columns+=3; @@ -461,9 +461,11 @@ $doCanvasSample = false; $doCanvasSampletcpdf = false; $l_w=$report_stock[$report['option']['stock']]['label_width']; $l_h=$report_stock[$report['option']['stock']]['label_height']; + + if($l_w && $l_h && $report['option']['type']=="label") { echo "

Label Data Locations

"; - + pdf_begin_page $doCanvasSample=true; $ratio=$l_h/$l_w; $canvaswidth=600; diff --git a/admin/reports_volunteers.inc.php b/admin/reports_volunteers.inc.php index 142db256..1cbf5855 100644 --- a/admin/reports_volunteers.inc.php +++ b/admin/reports_volunteers.inc.php @@ -112,7 +112,7 @@ $report_volunteers_fields = array( 'name' => 'Fair -- Name', 'header' => 'Fair Name', 'width' => 3, - 'table' => "'".$config['fairname'])."'", + 'table' => "'".$config['fairname']."'"), 'static_text' => array ( 'name' => 'Static Text (useful for labels)', diff --git a/admin/schools.php b/admin/schools.php index 39e1673c..0e05dfb1 100644 --- a/admin/schools.php +++ b/admin/schools.php @@ -197,6 +197,7 @@ $q=$pdo->prepare("SELECT * FROM schools WHERE id='".get_value_from_array($_GET, 'edit', '')."'"); $q->execute(); $r=$q->fetch(PDO::FETCH_OBJ); + print_r($r); } else if(get_value_from_array($_GET, 'action') == "add") { @@ -211,14 +212,14 @@ echo "\n"; echo "
".i18n("Last")."".i18n("Photo")."

'; - if($edit_mode == true) echo i18n('Category').': '; + if(get_value_or_default($edit_mode) == true) echo i18n('Category').': '; echo "{$i->category}

\n"; - echo "\n"; + + echo "\n"; echo "\n"; echo "\n"; @@ -316,6 +318,7 @@ "schools_management" ); + global $notice; switch($notice) { case 'added': echo happy("School successfully added"); diff --git a/admin/schoolsimport.php b/admin/schoolsimport.php index 2a5dd75d..16b5fa30 100644 --- a/admin/schoolsimport.php +++ b/admin/schoolsimport.php @@ -36,7 +36,7 @@ $showform=true; - if($_POST['action']=="import") + if(get_value_from_array($_POST, 'action')=="import") { if(!$_FILES['schools']['error'] && $_FILES['schools']['size']>0) { diff --git a/admin/translations.php b/admin/translations.php index 2df97d58..bb47d57f 100644 --- a/admin/translations.php +++ b/admin/translations.php @@ -33,18 +33,20 @@ ); //by default, we will edit the french translations -if($_GET['translang']) $_SESSION['translang']=$_GET['translang']; +if(get_value_from_array($_GET, 'translang')) $_SESSION['translang']=$_GET['translang']; -if(!$_SESSION['translang']) +if(get_value_from_array(!$_SESSION, 'translang')) $_SESSION['translang']="fr"; +$show = false; + +if(get_value_from_array($_GET, 'show')) $show=$_GET['show']; +else if(get_value_from_array($_POST, 'show')) $show=$_POST['show']; -if($_GET['show']) $show=$_GET['show']; -else if($_POST['show']) $show=$_POST['show']; if(!$show) $show="missing"; -if($_POST['action']=="save") { +if(get_value_from_array($_POST, 'action') == "save") { //first, delete anything thats supposed to eb deleted if(count($_POST['delete'])) { foreach($_POST['delete'] AS $del) { diff --git a/admin/user_editor_window.php b/admin/user_editor_window.php index a7007aaf..bde7bbb7 100644 --- a/admin/user_editor_window.php +++ b/admin/user_editor_window.php @@ -122,7 +122,7 @@ echo $pdo->errorInfo(); $u = user_load($id); -$selected = $_GET['tab']; +$selected = get_value_from_array($_GET, 'tab'); if(!array_key_exists($selected, $tabs)) { if(in_array('fair', $u['types']) ) $selected = 'fairinfo'; @@ -131,7 +131,7 @@ if(!array_key_exists($selected, $tabs)) { } -if($_GET['sub'] == 1) { +if(get_value_from_array($_GET, 'sub') == 1) { $_SESSION['embed'] = true; $_SESSION['embed_submit_url'] = "{$_SERVER['PHP_SELF']}?id=$id&tab=$selected"; $_SESSION['embed_edit_id'] = $id; diff --git a/admin/user_list.php b/admin/user_list.php index f3d2b75b..e8703055 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -149,7 +149,7 @@ function update (id) "; echo "- ".i18n('Hide Display Options').""; - echo ""; + echo ""; echo "
"; echo "
".i18n("School Name")."school)."\" size=\"60\" maxlength=\"64\" />
".i18n("School Name")."school))."\" size=\"60\" maxlength=\"64\" />
".i18n("School Language").""; echo ""; @@ -250,6 +251,7 @@ else $pl = array(); /* Don't show autogenerated emails */ + $e = $pl['email'][0] == '*' ? '' : $pl['email']; echo "
".i18n("Principal")."
".i18n("Principal Email")."
"; @@ -275,6 +275,8 @@ function update (id) } } + $having_year = ''; + if($show_year == 'current') $having_year = "AND u1.year={$config['FAIRYEAR']}"; @@ -304,10 +306,9 @@ function update (id) $q = $pdo->prepare($querystr); $q->execute(); - echo $pdo->errorInfo(); -// echo $querystr; + show_pdo_errors_if_any($pdo); $num=$q->rowCount(); - echo $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); echo i18n("Listing %1 people total. See the table at the bottom for the totals by status


",array($num)); echo i18n(" Notes:"; echo "
".i18n('Type').": {$user_what[$t]}"; - if($r["{$t}_active"] == 'yes') { + if(get_value_from_array($r, "{$t}_active") == 'yes') { echo "
".i18n("yes")."
"; $userstate = 'active'; } else { diff --git a/common.inc.php b/common.inc.php index e48cec64..b647df43 100644 --- a/common.inc.php +++ b/common.inc.php @@ -246,13 +246,12 @@ if(substr($config['version'], -1) % 2 != 0) if(get_value_from_array($_GET, 'debug')) $_SESSION['debug']=$_GET['debug']; //if the user has switched languages, go ahead and switch the session variable -if(get_value_from_array($_GET, 'switchlanguage')) +if(array_key_exists('switchlanguage', $_GET)) { //first, make sure its a valid language: if($config['languages'][$_GET['switchlanguage']]) { $_SESSION['lang']=$_GET['switchlanguage']; - } else { @@ -1110,7 +1109,7 @@ function output_page_cms($filename) $r = $q->fetch(); send_header($r['title'],null,null,true); - if(file_exists("data/logo-200.gif") && $r->showlogo==1) + if(file_exists("data/logo-200.gif") && $r['showlogo'] == 1) echo ""; //if it looks like we have HTML content, dont do a nl2br, if there's no html, then do the nl2br @@ -1261,7 +1260,7 @@ function format_money($n,$decimals=true) $n=$n*-1; } //get the part before the decimal - $before=floor($n); + $before=floor(get_value_or_default($n, 0)); $out=""; //space it out in blocks of three @@ -1320,7 +1319,7 @@ function error_($str, $i18n_array=array(), $timeout=-1) function debug_($str) { - if($_SESSION['debug'] != true) return; + if(get_value_from_array($_SESSION, 'debug') != true) return; $s = str_replace("\n", "", nl2br(htmlspecialchars($str))).'
'; echo "