bug #185

pages/wot/10.php

@@ -28,7 +28,7 @@
 	$rc = $row['list'];
 	$query = "SELECT `users`. *, count(*) AS `list` FROM `users`, `notary`
 			WHERE `users`.`id` = `notary`.`from` AND `notary`.`from` != `notary`.`to`
-			GROUP BY `notary`.`from` HAVING count(*) > '$rc' ORDER BY `list` DESC";
+			GROUP BY `notary`.`from` HAVING count(*) > '$rc' ORDER BY `notary`.`when` DESC";
 	$rank = mysql_num_rows(mysql_query($query)) + 1;
 ?>
     <td class="DataTD"><?=sprintf(_("You have made %s assurances which ranks you as the #%s top assurer."), intval($rc), intval($rank))?></td>

www/index.php

@@ -223,7 +223,15 @@
 			exit;
 		}
 
-		$_SESSION['_config']['errmsg'] = _("Incorrect email address and/or Pass Phrase.");
+		$query = "select * from `users` where `email`='$email' and (`password`=old_password('$pword') or `password`=sha1('$pword') or
+						`password`=password('$pword')) and `verified`=0 and `deleted`=0";
+		$res = mysql_query($query);
+		if(mysql_num_rows($res) <= 0)
+		{
+			$_SESSION['_config']['errmsg'] = _("Incorrect email address and/or Pass Phrase.");
+		} else {
+			$_SESSION['_config']['errmsg'] = _("Your account has not been verified yet, please check your email account for the signup messages.");
+		}
 	}
 
 	if($_REQUEST['process'] && $_REQUEST['oldid'] == 1)