arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Update winners entry and award_downloader for award_sponsors->sponsors conversion

Browse Source
This commit is contained in:
james 2008-11-03 05:15:03 +00:00
parent 27a3a273d7
commit e5e863e3f7
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
admin/award_download.php
View File

@ -119,18 +119,18 @@
//check if the sponsor exists, if not, add them //check if the sponsor exists, if not, add them
$sponsorq=mysql_query("SELECT * FROM award_sponsors WHERE organization='".mysql_escape_string($award['sponsor'][0])."'"); $sponsorq=mysql_query("SELECT * FROM sponsors WHERE organization='".mysql_escape_string($award['sponsor'][0])."'");
if($sponsorr=mysql_fetch_object($sponsorq)) { if($sponsorr=mysql_fetch_object($sponsorq)) {
$sponsor_id=$sponsorr->id; $sponsor_id=$sponsorr->id;
} }
else 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')"); mysql_query("INSERT INTO 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(); $sponsor_id=mysql_insert_id();
} }
mysql_query("UPDATE award_awards SET mysql_query("UPDATE award_awards SET
award_sponsors_id='$sponsor_id', sponsors_id='$sponsor_id',
name='".mysql_escape_string($award['name_en'][0])."', name='".mysql_escape_string($award['name_en'][0])."',
criteria='".mysql_escape_string($award['criteria_en'][0])."', criteria='".mysql_escape_string($award['criteria_en'][0])."',
external_postback='".mysql_escape_string($postback)."' external_postback='".mysql_escape_string($postback)."'
@ -210,20 +210,20 @@ echo mysql_error();
} }
else { else {
//check if the sponsor exists, if not, add them //check if the sponsor exists, if not, add them
$sponsorq=mysql_query("SELECT * FROM award_sponsors WHERE organization='".mysql_escape_string($award['sponsor'][0])."'"); $sponsorq=mysql_query("SELECT * FROM sponsors WHERE organization='".mysql_escape_string($award['sponsor'][0])."'");
if($sponsorr=mysql_fetch_object($sponsorq)) { if($sponsorr=mysql_fetch_object($sponsorq)) {
$sponsor_id=$sponsorr->id; $sponsor_id=$sponsorr->id;
} }
else 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')"); mysql_query("INSERT INTO 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(); $sponsor_id=mysql_insert_id();
} }
echo i18n("Award does not exists, adding...")."<br />"; echo i18n("Award does not exists, adding...")."<br />";
mysql_query("INSERT INTO award_awards ( mysql_query("INSERT INTO award_awards (
award_types_id, award_types_id,
award_sponsors_id, sponsors_id,
name, name,
criteria, criteria,
year, year,

10
admin/winners.php
View File

@ -28,8 +28,8 @@
user_auth_required('committee', 'admin'); user_auth_required('committee', 'admin');
if($_GET['award_sponsors_id']) $award_sponsors_id=$_GET['award_sponsors_id']; if($_GET['sponsors_id']) $sponsors_id=$_GET['sponsors_id'];
else if($_POST['award_sponsors_id']) $award_sponsors_id=$_POST['award_sponsors_id']; else if($_POST['sponsors_id']) $sponsors_id=$_POST['sponsors_id'];
if($_GET['award_types_id']) $award_types_id=$_GET['award_types_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']; else if($_POST['award_types_id']) $award_types_id=$_POST['award_types_id'];
@ -274,16 +274,16 @@ else
award_awards.name, award_awards.name,
award_awards.order AS awards_order, award_awards.order AS awards_order,
award_types.type, award_types.type,
award_sponsors.organization sponsors.organization
FROM FROM
award_awards, award_awards,
award_types, award_types,
award_sponsors sponsors
WHERE WHERE
award_awards.year='".$config['FAIRYEAR']."' award_awards.year='".$config['FAIRYEAR']."'
AND award_awards.award_types_id=award_types.id AND award_awards.award_types_id=award_types.id
AND award_types.year='".$config['FAIRYEAR']."' AND award_types.year='".$config['FAIRYEAR']."'
AND award_awards.award_sponsors_id=award_sponsors.id AND award_awards.sponsors_id=sponsors.id
ORDER BY awards_order"); ORDER BY awards_order");
echo mysql_error(); echo mysql_error();