diff --git a/admin/award_awards.php b/admin/award_awards.php index 7b5fca89..19cca880 100644 --- a/admin/award_awards.php +++ b/admin/award_awards.php @@ -208,6 +208,7 @@ } $q = $pdo->prepare("INSERT INTO award_prizes(award_awards_id,year) VALUES ('$aaid','$year');"); + $q->execute(); $ret = array('id' => $pdo->lastInsertId() ); echo json_encode($ret); exit; @@ -1050,7 +1051,7 @@ if(!$orderby) $orderby="order"; $q->execute(); -show_do_errros_if_any($pdo); +show_do_erros_if_any($pdo); print_r($q->rowCount()); if($q->rowCount()) { diff --git a/admin/reports.inc.php b/admin/reports.inc.php index d9279cfb..d7b9bbda 100644 --- a/admin/reports.inc.php +++ b/admin/reports.inc.php @@ -384,7 +384,7 @@ foreach($report_stock as $n=>$v) { VALUES $q"); $stmt->execute(); - echo $pdo->erroInfo(); + show_pdo_errors_if_any($pdo); } diff --git a/admin/reports.php b/admin/reports.php index 730cda96..ec4b3f93 100644 --- a/admin/reports.php +++ b/admin/reports.php @@ -240,6 +240,7 @@ $(document).ready(function() { +global $edit_mode; /* Load all the users reports */ $q = $pdo->prepare("SELECT reports_committee.*,reports.name FROM reports_committee diff --git a/admin/reports_judges.php b/admin/reports_judges.php index 673ba592..173965b5 100644 --- a/admin/reports_judges.php +++ b/admin/reports_judges.php @@ -150,7 +150,7 @@ $q=$pdo->prepare("SELECT lastname, firstname"); $q->execute(); -echo $pdo->errorInfo(); +show_pdo_errors_if_any($pdo); while($r=$q->fetch(PDO::FETCH_OBJ)) { $u=user_load($r->id); @@ -198,13 +198,13 @@ while($r=$q->fetch(PDO::FETCH_OBJ)) { } foreach($times as $x=>$t) { - if($sel[$x]==true) { + if(get_value_from_array($sel, $x)==true) { $timedata[]="yes"; } else { $timedata[]="no"; } } - + $tmp=array( $r->id, $r->uid, @@ -213,7 +213,7 @@ while($r=$q->fetch(PDO::FETCH_OBJ)) { $r->email, $r->phonehome, $r->phonework, - $r->phoneworkext, + get_value_property_or_default($r, 'phoneworkext'), $r->phonecell, $languages, $r->organization, @@ -223,7 +223,7 @@ while($r=$q->fetch(PDO::FETCH_OBJ)) { $r->province, $r->postalcode, $r->highest_psd, - $r->professional_quals, + get_value_property_or_default($r, 'professional_quals'), $expertise_other ); $tmp = array_merge($tmp, $qarray); diff --git a/admin/reports_judges_allyears.php b/admin/reports_judges_allyears.php index 19e13fdc..087b7297 100644 --- a/admin/reports_judges_allyears.php +++ b/admin/reports_judges_allyears.php @@ -121,7 +121,7 @@ $q=$pdo->prepare("SELECT firstname, year"); $q->execute(); -echo $pdo->errorInfo(); +show_pdo_errors_if_any($pdo); while($r=$q->fetch(PDO::FETCH_OBJ)) { $u=user_load($r->id); @@ -163,7 +163,7 @@ while($r=$q->fetch(PDO::FETCH_OBJ)) { $r->email, $r->phonehome, $r->phonework, - $r->phoneworkext, + get_value_property_or_default($r, 'phoneworkext'), $r->phonecell, $languages, $r->organization, @@ -173,7 +173,7 @@ while($r=$q->fetch(PDO::FETCH_OBJ)) { $r->province, $r->postalcode, $r->highest_psd, - $r->professional_quals, + get_value_property_or_default($r, 'professional_quals'), $expertise_other ); $tmp = array_merge($tmp, $qarray); diff --git a/admin/reports_judges_teams_projects.php b/admin/reports_judges_teams_projects.php index 82167222..235c85b4 100644 --- a/admin/reports_judges_teams_projects.php +++ b/admin/reports_judges_teams_projects.php @@ -70,7 +70,7 @@ $rep->heading($team['name']." (".$team['num'].")"); $memberlist=""; - if(count($team['members'])) + if(count(get_value_from_array($team,'members', []))) { foreach($team['members'] AS $member) { @@ -94,7 +94,7 @@ //get category eligibility $q=$pdo->prepare("SELECT projectcategories.category FROM projectcategories, award_awards_projectcategories WHERE award_awards_projectcategories.projectcategories_id=projectcategories.id AND award_awards_projectcategories.award_awards_id='{$award['id']}' AND award_awards_projectcategories.year='{$config['FAIRYEAR']}' AND projectcategories.year='{$config['FAIRYEAR']}' ORDER BY category"); $q->execute(); - echo $pdo->erroInfo(); + show_pdo_errors_if_any($pdo); $cats=""; while($r=$q->fetch(PDO::FETCH_OBJ)) { @@ -107,7 +107,7 @@ //get division eligibility $q=$pdo->prepare("SELECT projectdivisions.division_shortform FROM projectdivisions, award_awards_projectdivisions WHERE award_awards_projectdivisions.projectdivisions_id=projectdivisions.id AND award_awards_projectdivisions.award_awards_id='{$award['id']}' AND award_awards_projectdivisions.year='{$config['FAIRYEAR']}' AND projectdivisions.year='{$config['FAIRYEAR']}' ORDER BY division_shortform"); $q->execute(); - echo $pdo->erroInfo(); + show_pdo_errors_if_any($pdo); $divs=""; while($r=$q->fetch(PDO::FETCH_OBJ)) { diff --git a/admin/winners.php b/admin/winners.php index af84fdc6..803351f6 100644 --- a/admin/winners.php +++ b/admin/winners.php @@ -52,22 +52,22 @@ case 'addwinner': } //first check how many we are allowed to have - $q=pdo->prepare("SELECT number FROM award_prizes WHERE id='$prize_id'"); + $q=$pdo->prepare("SELECT number FROM award_prizes WHERE id='$prize_id'"); $q->execute(); - echo $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); $r=$q->fetch(PDO::FETCH_ASSOC); $number=$r['number']; /* Get the award info */ $q = $pdo->prepare("SELECT * FROM award_awards WHERE id='$award_awards_id'"); $q->execute(); - echo $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); $a=$q->fetch(PDO::FETCH_ASSOC); /* Get the project */ $q = $pdo->prepare("SELECT fairs_id FROM projects WHERE id='$projects_id'"); $q->execute(); - echo $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); $p=$q->fetch(PDO::FETCH_ASSOC); $fairs_id = $p['fairs_id']; @@ -86,14 +86,14 @@ case 'addwinner': projects.fairs_id='$fairs_id' awards_prizes_id='$prize_id'"); $q->execute(); - echo $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); $r=$q->fetch(PDO::FETCH_ASSOC); $count=$r['count']; } else { /* Count is the total number assigned */ $q=$pdo->prepare("SELECT COUNT(*) AS count FROM winners WHERE awards_prizes_id='$prize_id'"); $q->execute(); - echo $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); $r=$q->fetch(PDO::FETCH_ASSOC); $count=$r['count']; } @@ -141,7 +141,7 @@ case 'award_load': "); $q->execute(); - echo $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); if($q->rowCount() != 1) { echo i18n("Invalid award to load $award_awards_id"); @@ -178,7 +178,7 @@ case 'edit_load': "); $q->execute(); - echo $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); if($q->rowCount() != 1) { echo i18n("Invalid award to edit $award_awards_id"); @@ -418,9 +418,10 @@ $q = $pdo->prepare("SELECT AND award_awards.sponsors_id=sponsors.id $fair_where ORDER BY awards_order"); +$q->execute(); -// FIXME -//echo $pdo->errorInfo(); + +show_pdo_errors_if_any($pdo); if($q->rowCount() == 0) { echo i18n('No awards to display.'); @@ -498,7 +499,7 @@ function print_award(&$r, $fairs_id, $editor=false, $editor_data=array()) ORDER BY `order`"); $q->execute(); - echo $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); echo "
"; $has_winners = false; @@ -532,7 +533,7 @@ function print_award(&$r, $fairs_id, $editor=false, $editor_data=array()) winners.awards_prizes_id='{$pr->id}' $fairs_where "); $cq->execute(); - echo $pdo->errorInfo(); + show_pdo_errors_if_any($pdo); $count = $cq->rowCount(); // echo "winners=$count"; diff --git a/common.inc.php b/common.inc.php index a9221286..99e896e9 100644 --- a/common.inc.php +++ b/common.inc.php @@ -845,18 +845,22 @@ function emit_time_selector($name,$selected="") function emit_province_selector($name,$selected="",$extra="") { global $config; + global $pdo; $q=$pdo->prepare("SELECT * FROM provinces WHERE countries_code='".$config['country']."' ORDER BY province"); $q->execute(); + if($q->rowCount()==1) { $r = $q->fetch(); - echo ""; + + echo "code\">"; echo i18n($r->province); } else { echo " |