version 0.1.2

[fms.git] / admin / introduce.php

diff --git a/admin/introduce.php b/admin/introduce.php
index f2103a8..b13a05e 100644 (file)
--- a/admin/introduce.php
+++ b/admin/introduce.php
@@ -9,13 +9,13 @@ function localiddropdown($name)
        \r
        $db=new PDO('sqlite:'.$dblocation);\r
        \r
-       $st=$db->prepare("SELECT LocalIdentityID, Name FROM tblLocalIdentity ORDER BY Name;");  \r
+       $st=$db->prepare("SELECT LocalIdentityID, Name, PublicKey FROM tblLocalIdentity ORDER BY Name;");       \r
        $st->execute();\r
        \r
        print "<select name=\"".$name."\">";\r
        while($record=$st->fetch())\r
        {\r
-               print "<option value=\"".$record[0]."\">".$record[1]."</option>";\r
+               print "<option value=\"".$record[0]."\" title=\"".$record[2]."\">".$record[1]."</option>";\r
        }\r
        print "</select>";\r
 }\r
@@ -53,19 +53,37 @@ function content()
        print "<br>Type answers for a few puzzles and submit<br>";\r
        \r
        \r
-       $st=$db->prepare("SELECT UUID,Day FROM tblIntroductionPuzzleRequests WHERE UUID NOT IN (SELECT UUID FROM tblIdentityIntroductionInserts) AND Day>='".gmdate('Y-m-d',strtotime('-1 day'))."' AND Found='true';");\r
+       $st=$db->prepare("SELECT UUID,Day,IdentityID FROM tblIntroductionPuzzleRequests WHERE UUID NOT IN (SELECT UUID FROM tblIdentityIntroductionInserts) AND Day>='".gmdate('Y-m-d',strtotime('-1 day'))."' AND Found='true' ORDER BY IdentityID, Day DESC, RequestIndex DESC;");\r
        $st->execute();\r
        \r
-       while($record=$st->fetch())\r
+       // only show latest captcha for each known identity\r
+       $lastid='';\r
+       $shown=0;\r
+       while(($record=$st->fetch()) && $shown<30)\r
+       {\r
+               if($lastid!=$record[2])\r
+               {\r
+                       $lastid=$record[2];\r
+                       print "<img src=\"showcaptcha.php?UUID=".$record[0]."\">";\r
+                       print "<input type=\"hidden\" name=\"uuid[]\" value=\"".$record[0]."\">";\r
+                       print "<input type=\"hidden\" name=\"day[]\" value=\"".$record[1]."\">";\r
+                       print "<input type=\"text\" name=\"solution[]\">";\r
+                       print "<br>";\r
+                       $shown++;\r
+               }\r
+       }\r
+       \r
+       if($shown>0)\r
+       {\r
+       ?>\r
+       <input type="submit" value="Announce">\r
+       <?php\r
+       }\r
+       else\r
        {\r
-               print "<img src=\"showcaptcha.php?UUID=".$record[0]."\">";\r
-               print "<input type=\"hidden\" name=\"uuid[]\" value=\"".$record[0]."\">";\r
-               print "<input type=\"hidden\" name=\"day[]\" value=\"".$record[1]."\">";\r
-               print "<input type=\"text\" name=\"solution[]\">";\r
-               print "<br>";\r
+               print "You must wait for some puzzles to be downloaded.  Check back later.";\r
        }\r
        ?>\r
-       <input type="submit">\r
        </form> \r
        <?php   \r
 }\r