# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1382024656 -10800
# Node ID b75f99a8973ce9be3da2b4f2266fb9f7719b84fa
# Parent  d50b64fbbc705adb9abca20db29a5fa68de1bbb2
More work.

diff -r d50b64fbbc70 -r b75f99a8973c createdb.php
--- a/createdb.php	Thu Oct 17 18:14:15 2013 +0300
+++ b/createdb.php	Thu Oct 17 18:44:16 2013 +0300
@@ -164,8 +164,7 @@
   "compos" => "id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(128), description VARCHAR(4096), visible INT DEFAULT 0, voting INT DEFAULT 0, showAuthors INT DEFAULT 0",
   "entries" => "id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(64), author VARCHAR(64), compo_id INT DEFAULT NULL, filename VARCHAR(256) DEFAULT NULL",
 
-  "attendees" => "id INTEGER PRIMARY KEY AUTOINCREMENT, regtime INT, name VARCHAR(64), groups VARCHAR(64), oneliner VARCHAR(64), email VARCHAR(80)",
-  "votekeys" => "id INTEGER PRIMARY KEY AUTOINCREMENT, attendee_id INT, key VARCHAR(64), active INT DEFAULT 0",
+  "attendees" => "id INTEGER PRIMARY KEY AUTOINCREMENT, regtime INT, name VARCHAR(64), groups VARCHAR(64), oneliner VARCHAR(64), email VARCHAR(80), votekey VARCHAR(64), active INT DEFAULT 0",
 
   "votes" => "id INTEGER PRIMARY KEY AUTOINCREMENT, entry_id INT DEFAULT NULL, voter_id INT DEFAULT NULL, value INT DEFAULT 0",
 );
diff -r d50b64fbbc70 -r b75f99a8973c results.inc.php
--- a/results.inc.php	Thu Oct 17 18:14:15 2013 +0300
+++ b/results.inc.php	Thu Oct 17 18:44:16 2013 +0300
@@ -40,8 +40,10 @@
     {
       $sql =
         "SELECT entries.*,SUM(votes.value) AS votesum ".
-        "FROM entries LEFT JOIN votes ON entries.id=votes.entry_id ".
-        "WHERE entries.compo_id=".$compo["id"]." ".
+        "FROM entries ".
+        "LEFT JOIN votes ON entries.id=votes.entry_id ".
+        "LEFT JOIN attendees ON attendees.id=votes.voter_id ".
+        "WHERE entries.compo_id=".$compo["id"]." AND attendees.active<>0 ".
         "GROUP BY votes.entry_id ".
         "ORDER BY votesum DESC";
 
diff -r d50b64fbbc70 -r b75f99a8973c vote.inc.php
--- a/vote.inc.php	Thu Oct 17 18:14:15 2013 +0300
+++ b/vote.inc.php	Thu Oct 17 18:44:16 2013 +0300
@@ -41,7 +41,7 @@
   // Try fetching previously stored votes
   $sql = stPrepareSQL(
     "SELECT * FROM votes WHERE voter_id=%d",
-    stGetSessionItem("user_id"));
+    stGetSessionItem("voter_id"));
 
   if (($res = stExecSQL($sql)) !== false)
   {