Merge branch 'release' of ssh://dirk@git-cacert.it-sls.de/var/cache/git/cacert-devel into bug-1023bug-1023

1 files changed, 4 insertions, 45 deletions

diff --git a/scripts/cron/updatesort.php b/scripts/cron/updatesort.php
index 498eda2..051b179 100755
--- a/scripts/cron/updatesort.php
+++ b/scripts/cron/updatesort.php
@@ -17,55 +17,14 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 	require_once(dirname(__FILE__).'/../../includes/mysql.php');
+	require_once(dirname(__FILE__).'/../../includes/lib/account.php');
 
 
-
-	/* Set assurer flag for accounts who miss it
-
-	   See also includes/lib/account.php, function fix_assurer_flag($userID)
-
-	   We may have some performance problems here, there are 150k assurances and 220k users
-	   in the production database. The exists-clause on cats_passed should be a good filter... */
-	   
-  /* Synchronisation of assurer flag currently deactivated, see https://bugs.cacert.org/view.php?id=1003
-     and https://bugs.cacert.org/view.php?id=1024 */
-/*
-	$query = "select `n`.`to` as `uid` from `notary` as `n`, `users` as `u` ".
-	         "  where `n`.`to`=`u`.`id` and `u`.`assurer`<>'1' ".
-	         "    and (`n`.`expire` > now() OR `n`.`expire` IS NULL) ".
-	         "    and exists(select 1 from `cats_passed` as `cp`, `cats_variant` as `cv` ".
-	         "                 where `cp`.`variant_id`=`cv`.`id` and `cv`.`type_id` = 1 and `cp`.`user_id`=`n`.`to`)".
-	         "  group by `n`.`to` having sum(`n`.`points`)>=100";
-
-	$res = mysql_query($query);
-	while($row = mysql_fetch_assoc($res))
-	{
-		$query = "update users set `assurer`='1' where `id`='${row['uid']}'";
-		//echo $query."\n";
-		mysql_query($query);
+	// Recalculate assurer flag for all accounts
+	if (!fix_assurer_flag()) {
+		fwrite(STDERR, "ERROR on fixing the assurer flag. Continuing anyway");
 	}
-*/
-	/* Remove assurer flag from accounts not eligible.
-
-	   Also a bit performance critical, but assurer flag is only set at 5k accounts
 
-	*/
-  /* Synchronisation of assurer flag currently deactivated, see https://bugs.cacert.org/view.php?id=1003
-     and https://bugs.cacert.org/view.php?id=1024 */
-/*
-    $query = "select `u`.id as `uid` from `users` as `u` " .
-	         "  where `u`.`assurer` = '1' ".
-	         "    and (not exists(select 1 from `cats_passed` as `cp`, `cats_variant` as `cv` ".
-	         "                     where `cp`.`variant_id`=`cv`.`id` and `cv`.`type_id` = 1 and `cp`.`user_id`=`u`.`id`) ".
-	         "         or (select sum(`n`.`points`) from `notary` as `n` where `n`.`to`=`u`.`id` and (`n`.`expire` > now() OR `n`.`expire` IS NULL)) < 100) ";
-	$res = mysql_query($query);
-	while($row = mysql_fetch_assoc($res))
-	{
-		$query = "update users set `assurer`='0' where `id`='${row['uid']}'";
-		//echo $query."\n";
-		mysql_query($query);
-	}
-*/
 
 	mysql_query("update `locations` set `acount`=0");
 	$query = "SELECT `users`.`locid` AS `locid`, count(*) AS `total` FROM `users`