diff --git a/winners.php b/winners.php index 24ba2cb3..bc844853 100644 --- a/winners.php +++ b/winners.php @@ -162,19 +162,19 @@ if($_GET['conferences_id'] && $_GET['type']) { echo "    "; echo "($pr->projectnumber) $pr->title"; - $sq=mysql_query("SELECT students.firstname, - students.lastname, - students.schools_id, - students.webfirst, - students.weblast, - students.webphoto, + $sq=mysql_query("SELECT users.firstname, + users.lastname, + users.schools_id, + users.webfirst, + users.weblast, + users.webphoto, schools.school FROM - students, + users, schools WHERE - students.registrations_id='$pr->reg_id' - AND students.schools_id=schools.id + users.registrations_id='$pr->reg_id' + AND users.schools_id=schools.id "); $studnum=0; @@ -236,12 +236,15 @@ else { $q=mysql_query("SELECT DISTINCT(winners.conferences_id) AS conferences_id, - dates.date + dates.date, + conferences.name AS conferencename FROM winners, - dates + dates, + conferences WHERE winners.conferences_id=dates.conferences_id + AND winners.conferences_id=conferences.id AND dates.name='postwinners' AND dates.date<=NOW() ORDER BY @@ -258,7 +261,7 @@ else $first=false; } //get the "winnersposted" date for the conference, and make - echo "

".i18n("%1 Winners",array($r->conferences_id))."

"; + echo "

".i18n("%1 Winners",array($r->conferencename))."

"; //do this each time, because for each conference the names of the award types could change, along with what is actually given out. $tq=mysql_query("SELECT @@ -278,7 +281,7 @@ else "); echo mysql_error(); while($tr=mysql_fetch_object($tq)) { - echo "  conferences_id&type=$tr->type\">".i18n("%1 %2 award winners",array($r->conferences_id,$tr->type))."
"; + echo "  conferences_id&type=$tr->type\">".i18n("%1 %2 award winners",array($r->conferencename,$tr->type))."
"; } echo "
"; $first=false;