# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1415295322 -7200
# Node ID 4fdb61f40946a0b08116bfab0889e23343d81c7f
# Parent  61a1575306d3af7fe987bbf2575f5c0ba310b0a1
Fixes to voting page. Some SQL fields had been left unrenamed, etc.

diff -r 61a1575306d3 -r 4fdb61f40946 pages/vote.inc.php
--- a/pages/vote.inc.php	Thu Nov 06 19:23:43 2014 +0200
+++ b/pages/vote.inc.php	Thu Nov 06 19:35:22 2014 +0200
@@ -119,22 +119,17 @@
 
   foreach (stExecSQL("SELECT * FROM compos WHERE visible<>0 AND voting<>0") as $compo)
   {
-    $cid = $compo["id"];
-    $esql = 
-      "FROM entries "
-      "WHERE (flags & ".EFLAG_DISQUALIFIED.")=0 ".
-      "AND compo_id=".$cid;
-
+    $esql = stPrepareSQL("FROM entries WHERE (flags & %d)=0 AND compo_id=%d", EFLAG_DISQUALIFIED, $compo["id"]);
     $nentries = stFetchSQLColumn("SELECT COUNT(*) ".$esql);
     if ($nentries > 0)
     {
       echo
       " <table class=\"vote\">\n".
-      "  <tr><th colspan=\"".($compo["showAuthors"] ? "3" : "2")."\">".chentities($compo["name"])."</th></tr>\n".
+      "  <tr><th colspan=\"".($compo["show_authors"] ? "3" : "2")."\">".chentities($compo["name"])."</th></tr>\n".
       "  <tr>\n".
       "   <th class=\"vshown\">#</th>\n".
       "   <th class=\"vtitle\">Title</th>\n".
-      ($compo["showAuthors"] ? "   <th class=\"vauthor\">Author</th>\n" : "").
+      ($compo["show_authors"] ? "   <th class=\"vauthor\">Author</th>\n" : "").
       "   ";
 
       for ($i = stGetSetting("voteMax"); $i >= stGetSetting("voteMin"); $i--)
@@ -152,7 +147,7 @@
           "  <tr class=\"".($row % 2 == 1 ? "rodd" : "reven")."\">\n".
           "   <td class=\"vshown\">".($entry["show_id"] > 0 ? $entry["show_id"] : "-")."</td>\n".
           "   <td class=\"vtitle\">".$entry["name"]."</td>\n".
-          ($compo["showAuthors"] ? "   <td class=\"vauthor\">".$entry["author"]."</td>\n" : "").
+          ($compo["show_authors"] ? "   <td class=\"vauthor\">".$entry["author"]."</td>\n" : "").
           "   ";
 
         $val = isset($votes[$eid]) ? $votes[$eid] : 0;