X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=admin%2Fintroduce.php;h=b13a05e65dd4c55b9aeb37d837911ee134797795;hb=964f55fd550fc711c0320ce6a24ad713040695d0;hp=f2103a8fb47ba4865698aca900704d172c2ae2cf;hpb=1b0c3b7f86935a772aad271bad4f3d1f37243c2d;p=fms.git

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