diff --git a/admin/award_awards.php b/admin/award_awards.php index 0f00c1e3..0417c88b 100644 --- a/admin/award_awards.php +++ b/admin/award_awards.php @@ -45,13 +45,19 @@ if($_GET['award_types_id'] && $_GET['award_types_id']!="all") $_SESSION['award_types_id']=$_GET['award_types_id']; + if($_GET['award_sponsors_confirmed'] && $_GET['award_sponsors_confirmed']!="all") + $_SESSION['award_sponsors_confirmed']=$_GET['award_sponsors_confirmed']; + if($_GET['award_sponsors_id']=="all") unset($_SESSION['award_sponsors_id']); if($_GET['award_types_id']=="all") unset($_SESSION['award_types_id']); + if($_GET['award_sponsors_confirmed']=="all") + unset($_SESSION['award_sponsors_confirmed']); $award_types_id=$_SESSION['award_types_id']; $award_sponsors_id=$_SESSION['award_sponsors_id']; + $award_sponsors_confirmed=$_SESSION['award_sponsors_confirmed']; if($_POST['save']=="edit" || $_POST['save']=="add") { @@ -349,7 +355,7 @@ echo mysql_error(); echo "
"; echo i18n("Filter By:"); echo "
"; - echo "
"; + echo ""; + echo ""; echo "
"; $q=mysql_query("SELECT id,organization FROM award_sponsors ORDER BY organization"); echo ""; - echo ""; + echo "
"; $q=mysql_query("SELECT id,type FROM award_types WHERE year='{$config['FAIRYEAR']}' ORDER BY type"); echo ""; + echo ""; + + echo ""; echo ""; echo "
"; @@ -395,6 +412,7 @@ echo mysql_error(); if($award_sponsors_id) $where_asi="AND award_sponsors_id='$award_sponsors_id'"; if($award_types_id) $where_ati="AND award_types_id='$award_types_id'"; + if($award_sponsors_confirmed) $where_asc="AND award_sponsors.confirmed='$award_sponsors_confirmed'"; if(!$orderby) $orderby="order"; @@ -404,7 +422,8 @@ echo mysql_error(); award_awards.order, award_awards.award_sources_id, award_types.type, - award_sponsors.organization + award_sponsors.organization, + award_sponsors.confirmed FROM award_awards, @@ -414,6 +433,7 @@ echo mysql_error(); award_awards.year='".$config['FAIRYEAR']."' $where_asi $where_ati + $where_asc AND award_awards.award_sponsors_id=award_sponsors.id AND award_awards.award_types_id=award_types.id AND award_types.year='".$config['FAIRYEAR']."'