diff --git a/admin/fundraising.php b/admin/fundraising.php index fea53f4c..785aa9dd 100644 --- a/admin/fundraising.php +++ b/admin/fundraising.php @@ -48,17 +48,21 @@ require_once("../dialog.inc.php"); } //this table is eventually going to be massive, and probably not in a tableview format, it'll show goals as well as all ongoing fund pledges, probabilities, etc as well as over/under, etc, all prettily colour coded.. basically a good overview of the total fundraising status of the fair. - $q=mysql_query("SELECT * FROM fundraising WHERE year='{$config['FAIRYEAR']}' ORDER BY system,type"); + $q=mysql_query("SELECT * FROM fundraising WHERE year='{$config['FAIRYEAR']}' ORDER BY system DESC,type"); echo ""; while($r=mysql_fetch_object($q)) { echo ""; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; - if($r->type=="general") $orsql.="OR fundraising_type IS NULL"; @@ -70,7 +74,25 @@ require_once("../dialog.inc.php"); AND sponsorships.year='{$config['FAIRYEAR']}'"); while($sr=mysql_fetch_object($sq)) { echo "id\" class=\"fundraising{$sr->status}\">"; - echo "\n"; + echo ""; + echo "\n"; + /* + echo "id\">"; + + //only user emails can be deleted, system ones are required and cannot be removed + if($r->type=="user") + { + echo " "; + echo "id\">"; + echo " "; + echo "id\">Send"; + } + + + */ echo ""; echo ""; echo "\n"; echo "
id',300,200)\" href=\"#\">editid',300,200)\" href=\"#\">"; + if($r->system=="no") { + echo "id\">"; + } + + echo "".i18n($r->name)."".format_money($r->goal)."
id&fundraising_type=$r->type',400,200)\" href=\"#\">edit$sr->organizationid&fundraising_type=$r->type',400,200)\" href=\"#\">"; + echo "id\">"; + + echo "$sr->organization$sr->status"; if($sr->status=="pending") @@ -104,6 +126,9 @@ require_once("../dialog.inc.php"); echo "add fund type".i18n("Total Net Position")."".format_money($totaldiff)."
\n"; + echo "
\n"; + echo "
\n"; + echo "Manage Sponsors\n"; send_footer(); ?> diff --git a/admin/fundraising_sponsorship.php b/admin/fundraising_sponsorship.php index a674e860..7aa082dc 100644 --- a/admin/fundraising_sponsorship.php +++ b/admin/fundraising_sponsorship.php @@ -27,7 +27,7 @@ user_auth_required('committee', 'admin'); if($_GET['id']) { - $id=intval($_GET['id']); + $idintval($_GET['id']); $q=mysql_query("SELECT * FROM sponsorships WHERE id='$id'"); echo "

Edit Sponsorship

"; $sponsorship=mysql_fetch_object($q); @@ -54,7 +54,7 @@ if($r->id==$sponsorship->sponsors_id) $sel="selected=\"selected\""; else $sel=""; echo "\n"; } - echo "\n"; + echo " ".i18n("Add")."\n"; echo "\n"; echo "".i18n("Type").""; diff --git a/admin/fundraising_sponsorship_handler.inc.php b/admin/fundraising_sponsorship_handler.inc.php index 5725b249..f445130c 100644 --- a/admin/fundraising_sponsorship_handler.inc.php +++ b/admin/fundraising_sponsorship_handler.inc.php @@ -1,4 +1,10 @@ system=="no") { + mysql_query("DELETE FROM sponsorships WHERE fundraising_type='".mysql_real_escape_string($f->type)."' AND year='".$config['FAIRYEAR']."'"); + mysql_query("DELETE FROM fundraising WHERE id='$id'"); + if(mysql_affected_rows()) + message_push(happy(i18n("Successfully removed fund %1",array($f->name)))); + } + else { + message_push(error(i18n("Cannot remove system fund"))); + } + } +} if($_POST['action']=="fundedit" || $_POST['action']=="fundadd") { $fundraising_id=intval($_POST['fundraising_id']); if($fundraising_id) { diff --git a/admin/sponsors.php b/admin/sponsors.php index 499d8cb4..5142a40b 100644 --- a/admin/sponsors.php +++ b/admin/sponsors.php @@ -104,18 +104,18 @@ if($_GET['action']=="edit") echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
".i18n("Organization Name")."organization)."\" size=\"60\" maxlength=\"128\" />
".i18n("Address")."address)."\" size=\"60\" maxlength=\"64\" />
".i18n("City")."city)."\" size=\"32\" maxlength=\"32\" />
".i18n($config['provincestate']).""; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo "
".i18n("Organization Name")."organization)."\" size=\"60\" maxlength=\"128\" />
".i18n("Address")."address)."\" size=\"60\" maxlength=\"64\" />
".i18n("City")."city)."\" size=\"32\" maxlength=\"32\" />
".i18n($config['provincestate']).""; emit_province_selector("province_code",$r->province_code); echo "
".i18n($config['postalzip'])."postalcode\" size=\"8\" maxlength=\"7\" />
".i18n("Phone")."phone)."\" size=\"16\" maxlength=\"32\" />
".i18n("Fax")."fax)."\" size=\"16\" maxlength=\"32\" />
".i18n("Email")."email)."\" size=\"60\" maxlength=\"128\" />
".i18n("Notes")."
".i18n($config['postalzip'])."postalcode\" size=\"8\" maxlength=\"7\" />
".i18n("Phone")."phone)."\" size=\"16\" maxlength=\"32\" />
".i18n("Fax")."fax)."\" size=\"16\" maxlength=\"32\" />
".i18n("Email")."email)."\" size=\"60\" maxlength=\"128\" />
".i18n("Notes")."
\n"; @@ -126,14 +126,10 @@ } else { - - - echo "
"; echo "Add New Sponsor\n"; echo "
"; - echo ""; + echo "
"; echo ""; - echo " "; echo " "; echo " "; echo " "; @@ -146,6 +142,7 @@ while($r=mysql_fetch_object($q)) { echo "\n"; + /* echo "\n"; + */ echo " \n"; $numq=mysql_query("SELECT COUNT(id) AS num FROM award_awards WHERE year='".$config['FAIRYEAR']."' AND sponsors_id='$r->id'");
Confirmed?Organization# of Awards# of Contacts
\n"; if($r->confirmed=='yes') { @@ -156,6 +153,7 @@ echo "id\">confirm"; } echo "$r->organization