diff --git a/admin/award_download.php b/admin/award_download.php
index afbd66ca..a7095202 100644
--- a/admin/award_download.php
+++ b/admin/award_download.php
@@ -42,8 +42,13 @@
require_once("xml.inc.php");
foreach($_GET['check'] AS $checksource) {
$checksource=intval($checksource);
- $q=mysql_query("SELECT * FROM award_sources WHERE id='$checksource'");
+ $q=mysql_query("SELECT * FROM award_sources WHERE id='$checksource' AND enabled='yes'");
$r=mysql_fetch_object($q);
+ if(!($r->username && $r->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 "
";
@@ -313,7 +318,7 @@ echo mysql_error();
else
$links=true;
- $q=mysql_query("SELECT * FROM award_sources ORDER BY name");
+ $q=mysql_query("SELECT * FROM award_sources WHERE enabled='yes' ORDER BY name");
echo "
".i18n("Source Name")." | "; echo "".i18n("Source Location URL")." | "; diff --git a/config/award_sources.php b/config/award_sources.php index 2fc98e43..c7602db7 100644 --- a/config/award_sources.php +++ b/config/award_sources.php @@ -32,8 +32,18 @@ $editor=new TableEditor("award_sources", - array("name"=>"Name", - "url"=>"URL", + array( + "enabled"=>"Enabled?", + "name"=>"Name", + "website"=>"Help URL", + "username"=>"Username", + ) + , + array( + "enabled"=>"Enabled?", + "name"=>"Name", + "url"=>"Source URL", + "website"=>"Help URL", "username"=>"Username", "password"=>"Password" ) @@ -44,5 +54,8 @@ $editor->setRecordType("Award Source"); $editor->execute(); + echo "
---|