forked from science-ation/science-ation
- Client side support for downloading additional materials (in generated PDF
form) from an upstream server.
This commit is contained in:
parent
bc3a0e8d67
commit
74629b8b5b
@ -260,11 +260,28 @@ case 'catdiv_save':
|
|||||||
|
|
||||||
happy_("Category/Division mapping information saved");
|
happy_("Category/Division mapping information saved");
|
||||||
exit;
|
exit;
|
||||||
|
|
||||||
case 'confirm_load':
|
case 'confirm_load':
|
||||||
$award_awards_id = intval($_GET['id']);
|
$award_awards_id = intval($_GET['id']);
|
||||||
$winners = get_winners($award_awards_id);
|
$winners = get_winners($award_awards_id);
|
||||||
print_r($winners);
|
print_r($winners);
|
||||||
exit;
|
exit;
|
||||||
|
|
||||||
|
case 'additional_materials':
|
||||||
|
$award_awards_id = intval($_GET['award_awards_id']);
|
||||||
|
$q = mysql_query("SELECT award_source_fairs_id,external_identifier FROM award_awards WHERE id='$award_awards_id'");
|
||||||
|
$a = mysql_fetch_assoc($q);
|
||||||
|
$q = mysql_query("SELECT * FROM fairs WHERE id='{$a['award_source_fairs_id']}'");
|
||||||
|
$fair = mysql_fetch_assoc($q);
|
||||||
|
$req = array('award_additional_materials' => array(
|
||||||
|
'year'=>$config['FAIRYEAR'],
|
||||||
|
'identifier'=>$a['external_identifier'])
|
||||||
|
);
|
||||||
|
$data = curl_query($fair, $req, $url);
|
||||||
|
foreach($data['award_additional_materials']['pdf']['header'] as $h)
|
||||||
|
header($h);
|
||||||
|
echo base64_decode($data['award_additional_materials']['pdf']['data64']);
|
||||||
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -475,7 +492,7 @@ if(!function_exists('curl_init')) {
|
|||||||
|
|
||||||
$q = mysql_query("SELECT award_awards.id, award_awards.name AS awardname,
|
$q = mysql_query("SELECT award_awards.id, award_awards.name AS awardname,
|
||||||
fairs.name as fairname, award_source_fairs_id,
|
fairs.name as fairname, award_source_fairs_id,
|
||||||
fairs.type as fairtype
|
fairs.type as fairtype, award_awards.external_additional_materials
|
||||||
FROM award_awards
|
FROM award_awards
|
||||||
LEFT JOIN fairs ON fairs.id=award_awards.award_source_fairs_id
|
LEFT JOIN fairs ON fairs.id=award_awards.award_source_fairs_id
|
||||||
WHERE award_awards.award_source_fairs_id IS NOT NULL
|
WHERE award_awards.award_source_fairs_id IS NOT NULL
|
||||||
@ -489,6 +506,7 @@ echo mysql_error();
|
|||||||
<tr><th><?=i18n("Award Name")?></th>
|
<tr><th><?=i18n("Award Name")?></th>
|
||||||
<th><?=i18n("Source Name")?></th>
|
<th><?=i18n("Source Name")?></th>
|
||||||
<th><?=i18n("Send")?></th>
|
<th><?=i18n("Send")?></th>
|
||||||
|
<th><?=i18n("Additional<br />Info")?></th>
|
||||||
</tr>
|
</tr>
|
||||||
<?
|
<?
|
||||||
while($r=mysql_fetch_object($q)) {
|
while($r=mysql_fetch_object($q)) {
|
||||||
@ -499,13 +517,18 @@ while($r=mysql_fetch_object($q)) {
|
|||||||
echo "<a href=\"#\" onClick=\"popup_upload({$r->award_source_fairs_id},{$r->id})\" >".i18n("send")."</a>";
|
echo "<a href=\"#\" onClick=\"popup_upload({$r->award_source_fairs_id},{$r->id})\" >".i18n("send")."</a>";
|
||||||
else
|
else
|
||||||
echo "<a href=\"#\" onClick=\"award_upload({$r->id})\" >".i18n("send")."</a>";
|
echo "<a href=\"#\" onClick=\"award_upload({$r->id})\" >".i18n("send")."</a>";
|
||||||
|
echo "</td><td>";
|
||||||
|
|
||||||
|
if($r->external_additional_materials) {
|
||||||
|
echo "<a href=\"{$_SERVER['PHP_SELF']}?action=additional_materials&award_awards_id={$r->id}\" target=\"_blank\">".i18n("download")."</a>";
|
||||||
|
}
|
||||||
|
|
||||||
echo "</td></tr>";
|
echo "</td></tr>";
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
</table>
|
</table>
|
||||||
<br />
|
<br />
|
||||||
|
|
||||||
|
|
||||||
<div id="award_upload_status"></div>
|
<div id="award_upload_status"></div>
|
||||||
<?
|
<?
|
||||||
/*<a href="award_upload.php?action=send<?=$sendurl?>"><?=i18n("Send all awards")?></a> */
|
/*<a href="award_upload.php?action=send<?=$sendurl?>"><?=i18n("Send all awards")?></a> */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user