diff --git a/common.inc.php b/common.inc.php index b647df43..fa1d6cd2 100644 --- a/common.inc.php +++ b/common.inc.php @@ -22,14 +22,13 @@ */ ?> *'); @@ -87,7 +86,7 @@ else $dsn = "mysql:host=db;dbname=sfiab;charset=utf8mb4"; -$pdo = new PDO($dsn,$DBUSER,$DBPASS); +$pdo = new PDO($dsn,$DBUSER,$DBPASS,$dsn_options); if(!$pdo) { @@ -196,6 +195,8 @@ require_once("theme/{$config['theme_icons']}/icons.php"); require_once("committee.inc.php"); +session_start(); + if($config['SFIABDIRECTORY'] == '') { session_name("SFIABSESSID"); session_set_cookie_params(0,'/'); @@ -204,8 +205,6 @@ if($config['SFIABDIRECTORY'] == '') { session_set_cookie_params(0,$config['SFIABDIRECTORY']); } -session_start(); - //detect the browser first, so we know what icons to use - we store this in the config array as well //even though its not configurable by the fair if(stristr($_SERVER['HTTP_USER_AGENT'],"MSIE")) @@ -231,7 +230,6 @@ else } } //now if no language has been set yet, lets set it to the default language - if(!$_SESSION['lang']) { //first try the default language, if that doesnt work, use "en" @@ -243,15 +241,16 @@ if(!$_SESSION['lang']) //only allow debug to get set if we're using a development version (odd numbered ending) if(substr($config['version'], -1) % 2 != 0) - if(get_value_from_array($_GET, 'debug')) $_SESSION['debug']=$_GET['debug']; + if($_GET['debug']) $_SESSION['debug']=$_GET['debug']; //if the user has switched languages, go ahead and switch the session variable -if(array_key_exists('switchlanguage', $_GET)) +if($_GET['switchlanguage']) { //first, make sure its a valid language: if($config['languages'][$_GET['switchlanguage']]) { $_SESSION['lang']=$_GET['switchlanguage']; + } else { @@ -391,15 +390,28 @@ function send_header($title="", $nav=null, $icon=null, $titletranslated=false) //do this so we can use send_header() a little more loosly and not worry about it being sent more than once. if($HEADER_SENT) return; else $HEADER_SENT=true; + + //FIXME UTF-8? + echo "\n"; ?> - - -<? //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']); ?> +/css/output.css' /> - + + + + @@ -424,7 +436,7 @@ if(substr(getcwd(),-6)=="/admin" || substr(getcwd(),-7)=="/config" || substr(get if(file_exists($prependdir."data/logo-100.gif")) echo ""; -echo "

".i18n($config['fairname'])."

"; +echo "

".i18n($config['fairname'])."

"; echo "
"; if(isset($_SESSION['users_type'])) { $types = array('volunteer' => 'Volunteer', 'judge' => 'Judge', @@ -459,7 +471,6 @@ echo "
";
"; //only display it if a date is set to begin with. if($config['dates']['postparticipants'] && $config['dates']['postparticipants']!="0000-00-00 00:00:00") { - $q= $pdo->prepare("SELECT (NOW()>'".$config['dates']['regclose']."') AS test"); - $q->execute(); - $r=$q->fetch(PDO::FETCH_OBJ); + $q=("SELECT (NOW()>'".$config['dates']['regclose']."') AS test"); + $r=$q->fetch(); if($r->test==1) { $registrationconfirmationlink="
  • ".i18n("Confirmed Participants")."
    • "; @@ -477,26 +487,35 @@ echo ""; } ?> -
    +
    \n"; - echo "

  • ".i18n("Fundraising")."

    • \n"; - echo "
  • ".i18n("Fundraising Dashboard").'
    • '; - echo "
  • ".i18n("Fundraising Setup").'
    • '; - echo "
  • ".i18n("Manage Appeals").'
    • '; - echo "
  • ".i18n("Manage Donors/Sponsors").'
    • '; - echo "
  • ".i18n("Fundraising Reports").'
    • '; - echo "
    \n"; - } + switch($navkeys[2]) { + case "Fundraising": + echo "
    \n"; + break; + default: + //no special menu + break; + } } ?> -
    -
    Debug...
    +
    Debug...
    @@ -674,16 +699,17 @@ function send_popup_header($title="") echo "\n"; ?> - - - - -<?=i18n($title)?> + + +<?=i18n($title)?> + + + @@ -826,8 +852,7 @@ function emit_minute_selector($name,$selected="") function emit_time_selector($name,$selected="") { - global $hour; - global $minute; + if($selected) { list($hour,$minute,$second)=explode(":",$selected); @@ -845,10 +870,8 @@ 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) + $q=("SELECT * FROM provinces WHERE countries_code='".mysql_escape_string($config['country'])."' ORDER BY province"); + if(mysql_num_rows($q)==1) { $r = $q->fetch(); echo ""; @@ -1091,7 +1114,7 @@ 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($r->text !== null and strlen($r->text)==strlen(strip_tags($r->text))) + if(strlen($r->text)==strlen(strip_tags($r->text))) echo nl2br($r->text); else echo $r->text; @@ -1107,16 +1130,16 @@ function output_page_cms($filename) if($q->rowCount()) { $r = $q->fetch(); - send_header($r['title'],null,null,true); + 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 - if($r['text'] !== null and strlen($r['text'])==strlen(strip_tags($r['text']))) - echo nl2br($r['text']); + if(strlen($r->text)==strlen(strip_tags($r->text))) + echo nl2br($r->text); else - echo $r['text']; + echo $r->text; } else { send_header("Error: File not found"); @@ -1164,12 +1187,11 @@ function committee_warnings() //properly :) + $q = $pdo->prepare("SELECT DATE_ADD('".$config['dates']['fairdate']."', INTERVAL 4 MONTH) < NOW() AS rollovercheck"); $q->execute(); - $r = $q->fetch(PDO::FETCH_OBJ); - - // FIXME Clear out Important Dates as part of rollover + $r = $q->fetch(); if($r->rollovercheck) { echo error(i18n("It has been more than 4 months since your fair. In order to prepare the system for the next year's fair, you should go to the SFIAB Configuration page, and click on 'Rollover Fair Year'. Do not start updating the system with new information until the year has been properly rolled over.")); } @@ -1183,14 +1205,14 @@ function committee_warnings() /* The bug was that the external_identifier was set to the prize name.. so only display the warning * if we find that case for a non-sfiab external fair */ while(($p = $q->fetch(PDO::FETCH_ASSOC) )) { - $qq = ("SELECT * FROM award_awards $r->rollovercheck + $qq = ("SELECT * FROM award_awards LEFT JOIN fairs ON fairs.id=award_awards.award_source_fairs_id WHERE award_awards.id='{$p['award_awards_id']}' AND year='{$config['FAIRYEAR']}' AND award_awards.award_source_fairs_id IS NOT NULL AND fairs.type='ysc' "); echo pdo->errorInfo(); - if($qq->rowCount() > 0) { + if(mysql_num_rows($qq) > 0) { $warn; break; @@ -1254,13 +1276,13 @@ function format_datetime($dt) { } function format_money($n,$decimals=true) -{ global $neg; +{ if($n<0){ $neg=true; $n=$n*-1; } //get the part before the decimal - $before=floor(get_value_or_default($n, 0)); + $before=floor($n); $out=""; //space it out in blocks of three @@ -1319,7 +1341,7 @@ function error_($str, $i18n_array=array(), $timeout=-1) function debug_($str) { - if(get_value_from_array($_SESSION, 'debug') != true) return; + if($_SESSION['debug'] != true) return; $s = str_replace("\n", "", nl2br(htmlspecialchars($str))).'
    '; echo "