diff -urN -x germany32 -x '*.rej' -x '*.orig' /scrloc/lipp/geo/geograph_web.7d/local/public_html/view.php /scrloc/lipp/geo/geograph_web.7d.new/local/public_html/view.php --- /scrloc/lipp/geo/geograph_web.7d/local/public_html/view.php 2008-08-23 17:20:44.000000000 +0200 +++ /scrloc/lipp/geo/geograph_web.7d.new/local/public_html/view.php 2008-10-15 13:08:58.000000000 +0200 @@ -100,19 +100,18 @@ $cacheid="img$ab|{$_GET['id']}|{$isowner}_{$ismoderator}"; - //is the image rejected? - only the owner and administrator should see it - if ($image->moderation_status=='rejected') - { - if ($isowner||$ismoderator) - { - //ok, we'll let it lie... - } - else - { + //is the image accepted? - otherwise, only the owner and administrator should see it + if (!$isowner&&!$ismoderator) { + if ($image->moderation_status=='rejected') { //clear the image $image=new GridImage; $cacheid=0; $rejected = true; + } elseif ($image->moderation_status=='pending') { + //clear the image + $image=new GridImage; + $cacheid=0; + $pending = true; } } } @@ -217,6 +216,9 @@ } elseif (!empty($rejected)) { header("HTTP/1.0 410 Gone"); header("Status: 410 Gone"); +} elseif (!empty($pending)) { + header("HTTP/1.0 403 Forbidden"); + header("Status: 403 Forbidden"); } else { header("HTTP/1.0 404 Not Found"); header("Status: 404 Not Found");