From 3f3475d4073f230c42a42689bd728cbd454d5e0e Mon Sep 17 00:00:00 2001 From: dave Date: Wed, 23 Jan 2008 18:40:59 +0000 Subject: [PATCH] - fix the limit on the special awards self nomination query - add a rollover for regfee items --- admin/reports_students.inc.php | 2 +- config/rollover.php | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/admin/reports_students.inc.php b/admin/reports_students.inc.php index 22a30a8..05a4ff6 100644 --- a/admin/reports_students.inc.php +++ b/admin/reports_students.inc.php @@ -45,7 +45,7 @@ function reports_students_award_selfnom_num(&$report, $text, $n) WHERE projects.id='$text' AND projects.year='$year' AND project_specialawards_link.year='$year' - LIMIT $n,$n"); + LIMIT $n,1"); echo mysql_error(); $i = mysql_fetch_assoc($q); return $i['name']; diff --git a/config/rollover.php b/config/rollover.php index 8ca24cb..a28e7a4 100644 --- a/config/rollover.php +++ b/config/rollover.php @@ -295,6 +295,18 @@ '".mysql_escape_string($r->required)."', '".mysql_escape_string($r->ord)."')"); + echo i18n("Rolling registration fee items")."
"; + //award types + $q=mysql_query("SELECT * FROM regfee_items WHERE year='$currentfairyear'"); + echo mysql_error(); + while($r=mysql_fetch_object($q)) + mysql_query("INSERT INTO regfee_items (`year`,`name`,`description`,`cost`,`per`) VALUES ( + '$newfairyear', + '".mysql_escape_string($r->name)."', + '".mysql_escape_string($r->description)."', + '".mysql_escape_string($r->cost)."', + '".mysql_escape_string($r->per)."')"); + echo "
"; echo "
"; mysql_query("UPDATE config SET val='$newfairyear' WHERE var='FAIRYEAR' AND year=0");