diff -urN -x germany32 -x '*.rej' -x '*.orig' /scrloc/lipp/geo/geograph_web.7d/local/public_html/admin/moderation.php /scrloc/lipp/geo/geograph_web.7d.new/local/public_html/admin/moderation.php --- /scrloc/lipp/geo/geograph_web.7d/local/public_html/admin/moderation.php 2008-08-10 22:03:55.000000000 +0200 +++ /scrloc/lipp/geo/geograph_web.7d.new/local/public_html/admin/moderation.php 2008-10-15 13:08:39.000000000 +0200 @@ -229,17 +229,17 @@ ############################# # define the images to moderate -if (!isset($_GET['moderator']) && !isset($_GET['remoderate'])) { - - $count = $db->getRow("select count(*) as total,sum(created > date_sub(now(),interval 60 day)) as recent from moderation_log WHERE user_id = {$USER->user_id} AND type='dummy'"); - if ($count['total'] == 0) { - $_GET['remoderate'] = 1; - $limit = 25; - } elseif ($count['recent'] < 5) { - $_GET['remoderate'] = 1; - $limit = 10; - } -} +#if (!isset($_GET['moderator']) && !isset($_GET['remoderate'])) { +# +# $count = $db->getRow("select count(*) as total,sum(created > date_sub(now(),interval 60 day)) as recent from moderation_log WHERE user_id = {$USER->user_id} AND type='dummy'"); +# if ($count['total'] == 0) { +# $_GET['remoderate'] = 1; +# $limit = 25; +# } elseif ($count['recent'] < 5) { +# $_GET['remoderate'] = 1; +# $limit = 10; +# } +#} $sql_where2 = " and (l.gridsquare_id is null OR (l.user_id = {$USER->user_id} AND lock_type = 'modding') OR