Mercurial > hg > fapweb

changeset 478:8dde27202989

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
And fix the previous commit ..
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 07 Dec 2013 10:18:52 +0200
parents 82b94c1db52d
children 86ee2b42a995
files admajax.php
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/admajax.php	Sat Dec 07 10:14:58 2013 +0200
+++ b/admajax.php	Sat Dec 07 10:18:52 2013 +0200
@@ -1082,7 +1082,14 @@
       case "voters":
         // Generate vote keys, if needed
         $numVKeys = stFetchSQLColumn("SELECT COUNT(*) FROM votekeys");
-        while ($numVKeys < $maxAttendeesHard)
+        $numUsers = stFetchSQLColumn("SELECT COUNT(*) FROM attendees");
+        if (($tmp = stGetSetting("maxAttendeesHard")) > $numUsers)
+          $numUsers = $tmp;
+        else
+        if (($tmp = stGetSetting("maxAttendeesSoft")) > $numUsers)
+          $numUsers = $tmp;
+
+        while ($numVKeys < $numUsers)
         {
           if (($key = stGenerateUserKey()) !== false)
           {