Dont check CURL support inside the loop and dont allow checking to be called without CURL support

Remove awards that were previously added but now dissappeared from the XML import
This commit is contained in:
james 2007-11-28 18:46:32 +00:00
parent 4917bc3a75
commit 325c909432
3 changed files with 240 additions and 201 deletions

View File

@ -30,13 +30,19 @@
'Administration' => 'admin/index.php', 'Administration' => 'admin/index.php',
'Awards Main' => 'admin/awards.php' )); 'Awards Main' => 'admin/awards.php' ));
function array_remove($needle,&$haystack) {
if(in_array($needle,$haystack))
unset($haystack[array_search($needle,$haystack)]);
}
if($_GET['action']=="check") if($_GET['action']=="check")
{ {
if(count($_GET['check'])) { if(count($_GET['check'])) {
require_once("xml.inc.php"); require_once("xml.inc.php");
foreach($_GET['check'] AS $ch) { foreach($_GET['check'] AS $checksource) {
$q=mysql_query("SELECT * FROM award_sources WHERE id='".intval($ch)."'"); $checksource=intval($checksource);
$q=mysql_query("SELECT * FROM award_sources WHERE id='$checksource'");
$r=mysql_fetch_object($q); $r=mysql_fetch_object($q);
echo i18n("Checking %1 for awards...",array($r->name)); echo i18n("Checking %1 for awards...",array($r->name));
echo "<br />"; echo "<br />";
@ -52,219 +58,235 @@
xmlCreateRecurse($req); xmlCreateRecurse($req);
$xmldata=$output; $xmldata=$output;
if(function_exists('curl_init')) $ch = curl_init(); /// initialize a cURL session
{ curl_setopt ($ch, CURLOPT_URL,"$r->url");
$ch = curl_init(); /// initialize a cURL session curl_setopt ($ch, CURLOPT_HEADER, 0); /// Header control
curl_setopt ($ch, CURLOPT_URL,"$r->url"); curl_setopt ($ch, CURLOPT_POST, 1); /// tell it to make a POST, not a GET
curl_setopt ($ch, CURLOPT_HEADER, 0); /// Header control curl_setopt ($ch, CURLOPT_POSTFIELDS, "xml=".$xmldata); /// put the query string here starting with "?"
curl_setopt ($ch, CURLOPT_POST, 1); /// tell it to make a POST, not a GET curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1); /// This allows the output to be set into a variable $datastream
curl_setopt ($ch, CURLOPT_POSTFIELDS, "xml=".$xmldata); /// put the query string here starting with "?" curl_setopt ($ch, CURLOPT_POSTFIELDSIZE, 0);
curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1); /// This allows the output to be set into a variable $datastream curl_setopt ($ch, CURLOPT_TIMEOUT, 360);
curl_setopt ($ch, CURLOPT_POSTFIELDSIZE, 0); curl_setopt ($ch, CURLOPT_SSLVERSION, 3);
curl_setopt ($ch, CURLOPT_TIMEOUT, 360); $datastream = curl_exec ($ch); /// execute the curl session and return the output to a variable $datastream
curl_setopt ($ch, CURLOPT_SSLVERSION, 3); $datastream = str_replace(" standalone=\"yes\"","",$datastream);
$datastream = curl_exec ($ch); /// execute the curl session and return the output to a variable $datastream // echo "curl close <br />";
$datastream = str_replace(" standalone=\"yes\"","",$datastream); curl_close ($ch); /// close the curl session
// echo "curl close <br />";
curl_close ($ch); /// close the curl session
echo i18n("The Remote Server said:")."<br />"; echo i18n("The Remote Server said:")."<br />";
//echo notice($datastream); //echo notice($datastream);
$response=xml_parsexml($datastream); $response=xml_parsexml($datastream);
$keys=array_keys($response); $keys=array_keys($response);
if($keys[0]=="awardresponse") { if($keys[0]=="awardresponse") {
echo "<i>";
$ar=$response['awardresponse'][0];
$postback=$ar['postback'][0];
echo i18n("Postback URL: %1",array($postback))." <br />";
$numawards=count($ar['awards'][0]['award']);
echo i18n("Number of Awards: %1",array($numawards))." <br />";
foreach($ar['awards'][0]['award'] AS $award) {
$identifier=$award['identifier'][0];
$year=$award['year'][0];
echo i18n("Award Identifier: %1",array($identifier))." &nbsp; ";
echo i18n("Award Year: %1",array($year))."<br />";
if($year==$config['FAIRYEAR']) {
$tq=mysql_query("SELECT * FROM award_awards WHERE external_identifier='$identifier' AND year='$year'");
if($awardrecord=mysql_fetch_object($tq)) {
echo i18n("Award already exists, updating info")."<br />";
//check if the sponsor exists, if not, add them //get a list of all the existing awards for this external source
$sponsorq=mysql_query("SELECT * FROM award_sponsors WHERE organization='".mysql_escape_string($award['sponsor'][0])."'"); $aq=mysql_query("SELECT * FROM award_awards WHERE award_sources_id='$checksource' AND year='".$config['FAIRYEAR']."'");
if($sponsorr=mysql_fetch_object($sponsorq)) { $existingawards=array();
$sponsor_id=$sponsorr->id; while($ar=mysql_fetch_object($aq)) {
} $existingawards[]=$ar->id;
else }
{
mysql_query("INSERT INTO award_sponsors (organization,year,notes,confirmed) VALUES ('".mysql_escape_string($award['sponsor'][0])."','$year','".mysql_escape_string("Imported from external source: $r->name")."','yes')"); echo "<i>";
$sponsor_id=mysql_insert_id(); $ar=$response['awardresponse'][0];
} $postback=$ar['postback'][0];
echo i18n("Postback URL: %1",array($postback))." <br />";
$numawards=count($ar['awards'][0]['award']);
echo i18n("Number of Awards: %1",array($numawards))." <br />";
foreach($ar['awards'][0]['award'] AS $award) {
$identifier=$award['identifier'][0];
$year=$award['year'][0];
echo i18n("Award Identifier: %1",array($identifier))." &nbsp; ";
echo i18n("Award Year: %1",array($year))."<br />";
echo i18n("Award Name: %1",array($award['name_en'][0]))."<br />";
mysql_query("UPDATE award_awards SET if($year==$config['FAIRYEAR']) {
award_sponsors_id='$sponsor_id', $tq=mysql_query("SELECT * FROM award_awards WHERE external_identifier='$identifier' AND year='$year'");
name='".mysql_escape_string($award['name_en'][0])."', if($awardrecord=mysql_fetch_object($tq)) {
criteria='".mysql_escape_string($award['criteria_en'][0])."', echo i18n("Award already exists, updating info")."<br />";
external_postback='".mysql_escape_string($postback)."'
WHERE //remove it from the existingawards list
id='$awardrecord->id' array_remove($awardrecord->id,$existingawards);
AND external_identifier='".mysql_escape_string($identifier)."'
AND year='$year'
"); //check if the sponsor exists, if not, add them
$sponsorq=mysql_query("SELECT * FROM award_sponsors WHERE organization='".mysql_escape_string($award['sponsor'][0])."'");
if($sponsorr=mysql_fetch_object($sponsorq)) {
$sponsor_id=$sponsorr->id;
}
else
{
mysql_query("INSERT INTO award_sponsors (organization,year,notes,confirmed) VALUES ('".mysql_escape_string($award['sponsor'][0])."','$year','".mysql_escape_string("Imported from external source: $r->name")."','yes')");
$sponsor_id=mysql_insert_id();
}
mysql_query("UPDATE award_awards SET
award_sponsors_id='$sponsor_id',
name='".mysql_escape_string($award['name_en'][0])."',
criteria='".mysql_escape_string($award['criteria_en'][0])."',
external_postback='".mysql_escape_string($postback)."'
WHERE
id='$awardrecord->id'
AND external_identifier='".mysql_escape_string($identifier)."'
AND year='$year'
");
echo mysql_error(); echo mysql_error();
//update the prizes //update the prizes
if(is_array($award['prizes'][0]) && count($award['prizes'][0]['prize']>0)) if(is_array($award['prizes'][0]) && count($award['prizes'][0]['prize']>0))
{ {
$prizes=$award['prizes'][0]['prize']; $prizes=$award['prizes'][0]['prize'];
$numprizes=count($prizes); $numprizes=count($prizes);
echo i18n("Number of prizes: %1",array($numprizes))."<br />"; echo i18n("Number of prizes: %1",array($numprizes))."<br />";
$pq=mysql_query("SELECT * FROM award_prizes WHERE award_awards_id='$awardrecord->id'"); $pq=mysql_query("SELECT * FROM award_prizes WHERE award_awards_id='$awardrecord->id'");
//get a list of all the existing prizes //get a list of all the existing prizes
$existingprizes=array(); $existingprizes=array();
while($pr=mysql_fetch_object($pq)) { while($pr=mysql_fetch_object($pq)) {
$existingprizes[$pr->external_identifier]=$pr; $existingprizes[$pr->external_identifier]=$pr;
}
foreach($prizes AS $prize) {
//if it exists -> update it
if(array_key_exists($prize['identifier'][0],$existingprizes)) {
$ep=$existingprizes[$prize['identifier'][0]];
echo "&nbsp;".i18n("Updating prize %1",array($ep->external_identifier))."<br />";
mysql_query("UPDATE award_prizes SET
cash='".intval($prize['cash'][0])."',
scholarship='".intval($prize['scholarship'][0])."',
value='".intval($prize['value'][0])."',
prize='".mysql_escape_string($prize['prize_en'][0])."',
number='".intval($prize['number'][0])."',
`order`='".intval($prize['ord'][0])."'
WHERE
id='$ep->id'");
//remove it from the list
unset($existingprizes[$ep->external_identifier]);
}
else { //if it doesnt exist -> add it
echo "&nbsp;".i18n("Adding prize %1",array($prize['identifier'][0]))."<br />";
mysql_query("INSERT INTO award_prizes (
award_awards_id,
cash,
scholarship,
value,
prize,
number,
`order`,
`year`,
external_identifier
) VALUES (
'$awardrecord->id',
'".intval($prize['cash'][0])."',
'".intval($prize['scholarship'][0])."',
'".intval($prize['value'][0])."',
'".mysql_escape_string($prize['prize_en'][0])."',
'".intval($prize['number'][0])."',
'".intval($prize['ord'][0])."',
'$year',
'".mysql_escape_string($prize['identifier'][0])."'
)");
}
}
//if an entry exists thats not in the xml -> delete it
foreach($existingprizes AS $ep) {
echo "&nbsp;".i18n("Removing prize %1",array($ep->external_identifier))."<br />";
mysql_query("DELETE FROM award_prizes WHERE id='$ep->id'");
}
}
//FIXME: update the translations
}
else {
//check if the sponsor exists, if not, add them
$sponsorq=mysql_query("SELECT * FROM award_sponsors WHERE organization='".mysql_escape_string($award['sponsor'][0])."'");
if($sponsorr=mysql_fetch_object($sponsorq)) {
$sponsor_id=$sponsorr->id;
}
else
{
mysql_query("INSERT INTO award_sponsors (organization,year,notes,confirmed) VALUES ('".mysql_escape_string($award['sponsor'][0])."','$year','".mysql_escape_string("Imported from external source: $r->name")."','yes')");
$sponsor_id=mysql_insert_id();
} }
echo i18n("Award does not exists, adding...")."<br />"; foreach($prizes AS $prize) {
mysql_query("INSERT INTO award_awards ( //if it exists -> update it
award_types_id, if(array_key_exists($prize['identifier'][0],$existingprizes)) {
award_sponsors_id, $ep=$existingprizes[$prize['identifier'][0]];
name,
criteria, echo "&nbsp;".i18n("Updating prize %1",array($ep->external_identifier))."<br />";
year, mysql_query("UPDATE award_prizes SET
external_identifier, cash='".intval($prize['cash'][0])."',
external_postback scholarship='".intval($prize['scholarship'][0])."',
) value='".intval($prize['value'][0])."',
VALUES ( prize='".mysql_escape_string($prize['prize_en'][0])."',
2, number='".intval($prize['number'][0])."',
$sponsor_id, `order`='".intval($prize['ord'][0])."'
'".mysql_escape_string($award['name_en'][0])."', WHERE
'".mysql_escape_string($award['criteria_en'][0])."', id='$ep->id'");
'".$year."',
'".mysql_escape_string($identifier)."', //remove it from the list
'".mysql_escape_string($postback)."' unset($existingprizes[$ep->external_identifier]);
)"); }
$award_id=mysql_insert_id(); else { //if it doesnt exist -> add it
echo "&nbsp;".i18n("Adding prize %1",array($prize['identifier'][0]))."<br />";
//import the prizes
if(is_array($award['prizes'][0]) && count($award['prizes'][0]['prize']>0))
{
$prizes=$award['prizes'][0]['prize'];
$numprizes=count($prizes);
echo i18n("Number of prizes: %1",array($numprizes))."<br />";
foreach($prizes AS $prize) {
mysql_query("INSERT INTO award_prizes ( mysql_query("INSERT INTO award_prizes (
award_awards_id, award_awards_id,
cash, cash,
scholarship, scholarship,
value, value,
prize, prize,
number, number,
`order`, `order`,
`year`, `year`,
external_identifier external_identifier
) VALUES ( ) VALUES (
'$award_id', '$awardrecord->id',
'".intval($prize['cash'][0])."', '".intval($prize['cash'][0])."',
'".intval($prize['scholarship'][0])."', '".intval($prize['scholarship'][0])."',
'".intval($prize['value'][0])."', '".intval($prize['value'][0])."',
'".mysql_escape_string($prize['prize_en'][0])."', '".mysql_escape_string($prize['prize_en'][0])."',
'".intval($prize['number'][0])."', '".intval($prize['number'][0])."',
'".intval($prize['ord'][0])."', '".intval($prize['ord'][0])."',
'$year', '$year',
'".mysql_escape_string($prize['identifier'][0])."' '".mysql_escape_string($prize['identifier'][0])."'
)"); )");
} }
} }
else //if an entry exists thats not in the xml -> delete it
echo error(i18n("No prizes associated with this award")); foreach($existingprizes AS $ep) {
echo "&nbsp;".i18n("Removing prize %1",array($ep->external_identifier))."<br />";
//FIXME: import the translations & prize translations mysql_query("DELETE FROM award_prizes WHERE id='$ep->id'");
}
} }
//FIXME: update the translations
} }
else else {
{ //check if the sponsor exists, if not, add them
echo error(i18n("Award is not for the current fair year... skipping")); $sponsorq=mysql_query("SELECT * FROM award_sponsors WHERE organization='".mysql_escape_string($award['sponsor'][0])."'");
} if($sponsorr=mysql_fetch_object($sponsorq)) {
$sponsor_id=$sponsorr->id;
}
else
{
mysql_query("INSERT INTO award_sponsors (organization,year,notes,confirmed) VALUES ('".mysql_escape_string($award['sponsor'][0])."','$year','".mysql_escape_string("Imported from external source: $r->name")."','yes')");
$sponsor_id=mysql_insert_id();
}
echo i18n("Award does not exists, adding...")."<br />";
mysql_query("INSERT INTO award_awards (
award_types_id,
award_sponsors_id,
name,
criteria,
year,
external_identifier,
external_postback,
award_sources_id
)
VALUES (
2,
$sponsor_id,
'".mysql_escape_string($award['name_en'][0])."',
'".mysql_escape_string($award['criteria_en'][0])."',
'".$year."',
'".mysql_escape_string($identifier)."',
'".mysql_escape_string($postback)."',
'$checksource'
)");
$award_id=mysql_insert_id();
//import the prizes
if(is_array($award['prizes'][0]) && count($award['prizes'][0]['prize']>0))
{
$prizes=$award['prizes'][0]['prize'];
$numprizes=count($prizes);
echo i18n("Number of prizes: %1",array($numprizes))."<br />";
foreach($prizes AS $prize) {
mysql_query("INSERT INTO award_prizes (
award_awards_id,
cash,
scholarship,
value,
prize,
number,
`order`,
`year`,
external_identifier
) VALUES (
'$award_id',
'".intval($prize['cash'][0])."',
'".intval($prize['scholarship'][0])."',
'".intval($prize['value'][0])."',
'".mysql_escape_string($prize['prize_en'][0])."',
'".intval($prize['number'][0])."',
'".intval($prize['ord'][0])."',
'$year',
'".mysql_escape_string($prize['identifier'][0])."'
)");
}
}
else
echo error(i18n("No prizes associated with this award"));
//FIXME: import the translations & prize translations
}
} }
echo "</i>"; else
{
echo error(i18n("Award is not for the current fair year... skipping"));
}
echo "<br />";
}
echo "</i>";
//remove any awards that are left in the $existingawards array, they must have been removed from the source
foreach($existingawards AS $aid) {
echo i18n("Removing award id %1 that was removed from external source",array($aid));
mysql_query("DELETE FROM award_prizes WHERE award_awards_id='$aid'");
mysql_query("DELETE FROM award_awards WHERE id='$aid'");
} }
else
echo error(i18n("Invalid XML response. Expecting '%1', received '%2'",array("awardresponse",$keys[0])));
} }
else else
{ echo error(i18n("Invalid XML response. Expecting '%1', received '%2'",array("awardresponse",$keys[0])));
echo error("CURL Support Missing");
echo i18n("Your PHP installation does not support CURL. You will need to login to the YSF system as the regional coodinator and upload the XML data manually");
}
echo "<br />"; echo "<br />";
} }
} }
@ -273,6 +295,16 @@ echo mysql_error();
} }
else else
{ {
if(!function_exists('curl_init'))
{
echo error(i18n("CURL Support Missing"));
echo notice(i18n("Your PHP installation does not support CURL. You will need to have CURL support added by your system administrator before being able to access external award sources"));
$links=false;
}
else
$links=true;
$q=mysql_query("SELECT * FROM award_sources ORDER BY name"); $q=mysql_query("SELECT * FROM award_sources ORDER BY name");
echo "<table class=\"tableview\">"; echo "<table class=\"tableview\">";
echo "<tr><th>".i18n("Source Name")."</th>"; echo "<tr><th>".i18n("Source Name")."</th>";
@ -283,14 +315,20 @@ echo mysql_error();
echo "<tr>"; echo "<tr>";
echo "<td>$r->name</td>\n"; echo "<td>$r->name</td>\n";
echo "<td>$r->url</td>"; echo "<td>$r->url</td>";
echo "<td align=\"center\"><a href=\"award_download.php?action=check&check[]=$r->id\">".i18n("check")."</a></td>"; echo "<td align=\"center\">";
if($links)
echo "<a href=\"award_download.php?action=check&check[]=$r->id\">".i18n("check")."</a>";
else
echo "n/a";
echo "</td>";
echo "</tr>"; echo "</tr>";
$checkurl.="&check[]=$r->id"; $checkurl.="&check[]=$r->id";
} }
echo "</table>\n"; echo "</table>\n";
echo "<br />"; echo "<br />";
echo "<a href=\"award_download.php?action=check$checkurl\">".i18n("Check all sources")."</a>"; if($links)
echo "<a href=\"award_download.php?action=check$checkurl\">".i18n("Check all sources")."</a>";
} }
send_footer(); send_footer();

View File

@ -1 +1 @@
69 70

1
db/db.update.70.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `award_awards` ADD `award_sources_id` INT UNSIGNED DEFAULT NULL ;