Merge commit 'mike/master'

[friendica.git] / include / security.php

diff --git a/include/security.php b/include/security.php
index 794cd2ce1f36d732d974b5478cfdc61cc81854f4..5e79e1edd5f0017424777df1206ce2d3eee96617 100644 (file)
--- a/include/security.php
+++ b/include/security.php
@@ -2,26 +2,45 @@
 
 function can_write_wall(&$a,$owner) {
 
-        if((! (local_user())) && (! (remote_user())))
-                return false;
-               $uid = local_user();
+       static $verified = 0;
 
-        if(($uid) && ($uid == $owner)) {
-                return true;
-               }
+       if((! (local_user())) && (! (remote_user())))
+               return false;
+
+       $uid = local_user();
+
+       if(($uid) && ($uid == $owner)) {
+               return true;
+       }
 
-        $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `user`.`uid` = `contact`.`uid` 
-                       WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
-                       AND `readonly` = 0  AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1",
-                       intval($owner),
-                       intval($_SESSION['visitor_id']),
-                       intval(REL_VIP),
-                       intval(REL_BUD),
-                       intval(PAGE_COMMUNITY)
-        );
+       if(remote_user()) {
 
-        if(count($r))
-                return true;
-        return false;
+               // user remembered decision and avoid a DB lookup for each and every display item
+               // DO NOT use this function if there are going to be multiple owners
+
+               if($verified === 2)
+                       return true;
+               elseif($verified === 1)
+                       return false;
+               else {
+                       $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `user`.`uid` = `contact`.`uid` 
+                               WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
+                               AND `readonly` = 0  AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1",
+                               intval($owner),
+                               intval(remote_user()),
+                               intval(REL_VIP),
+                               intval(REL_BUD),
+                               intval(PAGE_COMMUNITY)
+                       );
+                       if(count($r)) {
+                               $verified = 2;
+                               return true;
+                       }
+                       else {
+                               $verified = 1;
+                       }
+               }
+       }
 
+       return false;
 }