diff --git a/admin/award_download.php b/admin/award_download.php index 7e3c2b49..e0421171 100644 --- a/admin/award_download.php +++ b/admin/award_download.php @@ -21,65 +21,62 @@ */ ?> 'committee_main.php', 'Administration' => 'admin/index.php', 'Awards Main' => 'admin/awards.php' )); - function array_remove($needle,&$haystack) { + function array_remove($needle,&$haystack) + { if(in_array($needle,$haystack)) unset($haystack[array_search($needle,$haystack)]); } - - if($_GET['action']=="check") + function check_source($source) { + + } + + if($_GET['action']=="check") { if(count($_GET['check'])) { - require_once("xml.inc.php"); foreach($_GET['check'] AS $checksource) { + $checksource=intval($checksource); - $q=mysql_query("SELECT * FROM award_sources WHERE id='$checksource' AND enabled='yes'"); - $r=mysql_fetch_object($q); - if(!($r->username && $r->password)) { + $q=mysql_query("SELECT * FROM fairs WHERE id='$checksource'"); + $fair=mysql_fetch_assoc($q); + if(!($fair['username'] && $fair['password'])) { echo error(i18n("Username and Password are not set for source '%1'. Please set them in the SFIAB Configuration/External Award Sources editor first",array($r->name))); continue; } - echo i18n("Checking %1 for awards...",array($r->name)); + echo i18n("Checking %1 for awards...",array($fair['name'])); echo "
"; - $req=array("awardrequest"=>array( - "username"=>$r->username, - "password"=>$r->password, - "year"=>$config['FAIRYEAR'], - ) - ); + if($fair['type'] == 'ysf') { + $req=array("awardrequest"=>array( + "username"=>$r->username, + "password"=>$r->password, + "year"=>$config['FAIRYEAR'], + ) + ); + } else { + $req['getawards'] = array('year'=>$config['FAIRYEAR']); + } - $output=""; - xmlCreateRecurse($req); - $xmldata=$output; + $data = curl_query($fair, $req); - $ch = curl_init(); /// initialize a cURL session - curl_setopt ($ch, CURLOPT_URL,"$r->url"); - curl_setopt ($ch, CURLOPT_HEADER, 0); /// Header control - curl_setopt ($ch, CURLOPT_POST, 1); /// tell it to make a POST, not a GET - curl_setopt ($ch, CURLOPT_POSTFIELDS, "xml=".$xmldata); /// put the query string here starting with "?" - curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1); /// This allows the output to be set into a variable $datastream - curl_setopt ($ch, CURLOPT_POSTFIELDSIZE, 0); - curl_setopt ($ch, CURLOPT_TIMEOUT, 360); - curl_setopt ($ch, CURLOPT_SSLVERSION, 3); - $datastream = curl_exec ($ch); /// execute the curl session and return the output to a variable $datastream - $datastream = str_replace(" standalone=\"yes\"","",$datastream); - // echo "curl close
"; - curl_close ($ch); /// close the curl session + if($data['error'] != 0) { + echo error("Server said: {$data['message']}
"); + send_footer(); + exit; + } + echo notice(i18n('Server said: Success')); - echo i18n("The Remote Server said:")."
"; - //echo notice($datastream); - $response=xml_parsexml($datastream); $keys=array_keys($response); if($keys[0]=="awardresponse") { @@ -318,7 +315,7 @@ echo mysql_error(); else $links=true; - $q=mysql_query("SELECT * FROM award_sources WHERE enabled='yes' ORDER BY name"); + $q=mysql_query("SELECT * FROM fairs WHERE enable_awards='yes' ORDER BY name"); echo ""; echo ""; echo ""; @@ -326,16 +323,16 @@ echo mysql_error(); echo ""; while($r=mysql_fetch_object($q)) { echo ""; - echo "\n"; - echo ""; + echo "\n"; + echo ""; echo ""; echo ""; - $checkurl.="&check[]=$r->id"; + $checkurl.="&check[]={$r->id}"; } echo "
".i18n("Source Name")."".i18n("Source Location URL")."
$r->name$r->url{$r->name}{$r->url}"; if($links) - echo "id\">".i18n("check").""; + echo "id}\">".i18n("check").""; else echo "n/a"; echo "
\n"; echo "
"; diff --git a/admin/curl.inc.php b/admin/curl.inc.php new file mode 100644 index 00000000..ffebc9f8 --- /dev/null +++ b/admin/curl.inc.php @@ -0,0 +1,84 @@ + + Copyright (C) 2009 David Grant + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation, version 2. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. +*/ +?> + $fair['username'], + 'password' => $fair['password']); + $str = json_encode(array_merge($d, $data)); + break; + case 'ysf': + if($ysf_url == '') + $url = $fair['url']; + else + $url = $ysf_url; + $var = 'xml'; + $output=""; + xmlCreateRecurse($data); + $str = $output; + break; + } + + $ch = curl_init(); /// initialize a cURL session + curl_setopt ($ch, CURLOPT_URL, $url); + curl_setopt ($ch, CURLOPT_HEADER, 0); /// Header control + curl_setopt ($ch, CURLOPT_POST, 1); /// tell it to make a POST, not a GET + curl_setopt ($ch, CURLOPT_POSTFIELDS, "$var=".urlencode($str)); /// put the query string here starting with "?" + curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1); /// This allows the output to be set into a variable $datastream + curl_setopt ($ch, CURLOPT_POSTFIELDSIZE, 0); + curl_setopt ($ch, CURLOPT_TIMEOUT, 360); + curl_setopt ($ch, CURLOPT_SSLVERSION, 3); + curl_setopt ($ch, CURLOPT_SSL_VERIFYPEER, false); + $datastream = curl_exec ($ch); /// execute the curl session and return the output to a variable $datastream + curl_close ($ch); /// close the curl session + +// echo "
$datastream
"; + + switch($fair['type']) { + case 'sfiab': + $ret=json_decode(urldecode($datastream), true); + break; + case 'ysf': + $datastream = str_replace(" standalone=\"yes\"","",$datastream); + /* Return is plaintext, make a return array */ + $ret['error'] = 0; + $ret['message'] = $datastream; + break; + } +// echo "ret: ";print_r($ret);echo "
"; + return $ret; + } +?> diff --git a/admin/fair_stats.php b/admin/fair_stats.php index 0e40f638..6fa55e50 100644 --- a/admin/fair_stats.php +++ b/admin/fair_stats.php @@ -27,6 +27,7 @@ user_auth_required('committee', 'admin'); require_once('xml.inc.php'); require_once('stats.inc.php'); + require_once('curl.inc.php'); function stats_to_ysf($fair, $stats) { @@ -75,63 +76,6 @@ $server_config['fair_stats_scholarships'] = 'no'; $server_config['fair_stats_delegates'] = 'no'; - function curl_query($fair, $data) - { - global $output; - switch($fair['type']) { - case 'sfiab': - $url = $fair['url'].'/xmltransport.php'; - $var = 'json'; - $d = array(); - $d['auth'] = array('username' => $fair['username'], - 'password' => $fair['password']); - $str = json_encode(array_merge($d, $data)); - break; - case 'ysf': - $url = "https://secure.ysf-fsj.ca/registration/xmlaffiliation.php"; - $var = 'xml'; - $d = array(); - $d['affiliation'] = array( - "ysf_region_id"=>$fair['username'], - "ysf_region_password"=>$fair['password'], - "year"=>$year); - foreach($data as $k=>$v) $d['affiliation'][$k] = $v; - $output=""; - xmlCreateRecurse($d); - $str = $output; - break; - } - - $ch = curl_init(); /// initialize a cURL session - curl_setopt ($ch, CURLOPT_URL, $url); - curl_setopt ($ch, CURLOPT_HEADER, 0); /// Header control - curl_setopt ($ch, CURLOPT_POST, 1); /// tell it to make a POST, not a GET - curl_setopt ($ch, CURLOPT_POSTFIELDS, "$var=".urlencode($str)); /// put the query string here starting with "?" - curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1); /// This allows the output to be set into a variable $datastream - curl_setopt ($ch, CURLOPT_POSTFIELDSIZE, 0); - curl_setopt ($ch, CURLOPT_TIMEOUT, 360); - curl_setopt ($ch, CURLOPT_SSLVERSION, 3); - curl_setopt ($ch, CURLOPT_SSL_VERIFYPEER, false); - $datastream = curl_exec ($ch); /// execute the curl session and return the output to a variable $datastream - curl_close ($ch); /// close the curl session - -// echo "
$datastream
"; - - switch($fair['type']) { - case 'sfiab': - $ret=json_decode(urldecode($datastream), true); - break; - case 'ysf': - $datastream = str_replace(" standalone=\"yes\"","",$datastream); - /* Return is plaintext, make a return array */ - $ret['error'] = 0; - $ret['message'] = $datastream; - break; - } -// echo "ret: ";print_r($ret);echo "
"; - return $ret; - } - if($_GET['year']) $year=intval($_GET['year']); else $year=$config['FAIRYEAR']; @@ -153,12 +97,19 @@ $stats['year'] = $year; if($fair['type'] == 'ysf') { $st = stats_to_ysf($fair, $stats); + $req = array('affiliation' => array( + "ysf_region_id"=>$fair['username'], + "ysf_region_password"=>$fair['password'], + "year"=>$year, + 'stats'=>$st) + ); } else { - $st = $stats; + $req = array('stats'=>$stats); } if(function_exists('curl_init')) { - $r = curl_query($fair, array('stats'=>$st)); + $r = curl_query($fair, $req, + 'https://secure.ysf-fsj.ca/registration/xmlaffiliation.php'); if($r['error'] == 0) echo happy(i18n("The %1 Server said:", array($fair['name'])).' '.$r['message']); else @@ -203,20 +154,22 @@ exit; } + if($fair['type'] == 'ysf') { + $data['statconfig'] = array('fair_stats_participation'); + } else { + echo notice(i18n('Getting stats request and downloading existing stats from server %1', array($fair['url']))); + /* Query the server to see what stats we need */ + $q=array('getstats' => array('year' => $year)); - echo notice(i18n('Getting stats request and downloading existing stats from server %1', array($fair['url']))); - /* Query the server to see what stats we need */ - $q=array('getstats' => array('year' => $year)); + $data = curl_query($fair, $q); - $data = curl_query($fair, $q); - - if($data['error'] != 0) { - echo error("Server said: {$data['message']}
"); - send_footer(); - exit; + if($data['error'] != 0) { + echo error("Server said: {$data['message']}
"); + send_footer(); + exit; + } + echo notice(i18n('Server said: Success')); } - - echo notice(i18n('Server said: Success')); echo '
'; echo i18n('This server has requested the following stats for your %1 fair:', array($year)); echo '

'; diff --git a/admin/user_editor_window.php b/admin/user_editor_window.php index 477ec3af..8d352bf2 100644 --- a/admin/user_editor_window.php +++ b/admin/user_editor_window.php @@ -27,7 +27,12 @@ user_auth_required('committee', 'admin'); -$tabs = array('personal' => array( +$tabs = array( 'fairinfo' => array( + 'name' => 'Fair Information', + 'types' => array('fair'), + 'file' => '../fair_info.php', + 'enabled' => true,), + 'personal' => array( 'name' => 'Personal', 'types' => array('student','judge','committee','volunteer','sponsor','fair'), 'file' => '../user_personal.php', @@ -63,16 +68,9 @@ $tabs = array('personal' => array( 'file' => '../volunteer_position.php', 'enabled' => true,), - 'fairinfo' => array( - 'name' => 'Fair Information', - 'types' => array('fair'), - 'file' => '../fair_info.php', - 'enabled' => true,), ); -$selected = $_GET['tab']; -if(!array_key_exists($selected, $tabs)) $selected = 'personal'; if(array_key_exists('username',$_GET)) { $username = $_GET['username']; @@ -97,6 +95,16 @@ echo mysql_error(); } $u = user_load($id); + +$selected = $_GET['tab']; +if(!array_key_exists($selected, $tabs)) { + if(in_array('fair', $u['types']) ) + $selected = 'fairinfo'; + else + $selected = 'personal'; +} + + send_popup_header(i18n("User Editor").": {$u['name']}"); ?> diff --git a/db/db.code.version.txt b/db/db.code.version.txt index a949a93d..b0d73241 100644 --- a/db/db.code.version.txt +++ b/db/db.code.version.txt @@ -1 +1 @@ -128 +129 diff --git a/fair_info.php b/fair_info.php index 3500eebb..6e67352f 100644 --- a/fair_info.php +++ b/fair_info.php @@ -27,6 +27,8 @@ require_once("user.inc.php"); require_once("fair.inc.php"); + $fair_type = array('feeder' => 'Feeder Fair', 'sfiab' => 'SFIAB Upstream', 'ysf' => 'YSF/CWSF Upstream'); + function yesno($name, $val) { echo "\n"; echo "\n"; - echo "\n"; - echo '
'.i18n('Fair Name').''; - echo ""; - echo '
'.i18n('Fair Abbreviation').''; - echo ""; - echo '
'.i18n('Fair Type').''; - echo "\n"; + echo '"; - echo ''; + echo '
'.i18n('Fair Type').':'; + echo "
'.i18n('URL').''; + echo '
'.i18n('Fair Name').':'; + echo ""; + echo '
'.i18n('Fair Abbreviation').':'; + echo ""; + echo '
'.i18n('Fair Website').':'; + if($f['website'] == '') $f['website'] = 'http://'; + echo ""; + echo '
'; + + /* All upstream stuff */ + echo '
'; + echo "\n"; + echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - + /* End upstream stuff */ + echo "
'.i18n('Upstream URL').':'; if($f['url'] == '') $f['url'] = 'http://'; echo ""; echo '
'.i18n('Website').''; - if($f['website'] == '') $f['website'] = 'http://'; - echo ""; - echo '
'.i18n('Username').''; + echo '
'.i18n('Upstream Username').':'; echo ""; echo '
'.i18n('Password').''; + echo '
'.i18n('Upstream Password').':'; echo ""; echo '
'.i18n('Enable stats').''; + echo '
'.i18n('Enable stats upload').':'; yesno('enable_stats', $f['enable_stats']); echo '
'.i18n('Enable awards download').''; + echo '
'.i18n('Enable awards download').':'; yesno('enable_awards', $f['enable_awards']); echo '
'.i18n('Enable winners upload').''; + echo '
'.i18n('Enable winners upload').':'; yesno('enable_winners', $f['enable_winners']); echo '
"; + + echo i18n('* Use the \'Personal\' tab to specify contact information for someone at this fair.'); + echo '
'; + echo '
'; + echo i18n('* The feeder fair must login to this SFIAB to download award lists + and upload statistics and winners. Use the \'Personal\' tab to specify an + email and password for the feeder fair, use the email address of a contact at + the feeder fair. Then give the email/password to that person so they can configure + their own SFIAB to upload data to this SFIAB.'); echo '
'; -echo "
"; echo "
"; echo "\n"; echo ""; echo "
"; + + if($_SESSION['embed'] != true) send_footer(); + +?> + + diff --git a/theme/default/sfiab.css b/theme/default/sfiab.css index 407bb023..9912d853 100644 --- a/theme/default/sfiab.css +++ b/theme/default/sfiab.css @@ -458,3 +458,24 @@ ul#htabs a:hover { background: #EEEEFF; /* Should match selected tab background */ border-color: #A5B5C6;/* Should match UL border */ } + + + + +table.usereditor { + width: 100%; +} + +table.usereditor td.left { + width: 30%; + vertical-align: middle; + text-align: right; + padding-right: 5px; +} + +table.usereditor td.right { + width: 70%; + vertical-align: middle; + text-align: left; +} +