Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / include / security.php

diff --git a/include/security.php b/include/security.php
index ae161b4a4330eae458cd8f8e2f1aeee0cd0387d8..c74a9b4a3cbe26d8ba919b6c44155e78612591db 100644 (file)
--- a/include/security.php
+++ b/include/security.php
@@ -1,23 +1,46 @@
 <?php
 
 function can_write_wall(&$a,$owner) {
-        if((! (local_user())) && (! (remote_user())))
-                return false;
-               $uid = get_uid();
-        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(count($r))
-                return true;
-        return false;
 
+       static $verified = 0;
+
+       if((! (local_user())) && (! (remote_user())))
+               return false;
+
+       $uid = local_user();
+
+       if(($uid) && ($uid == $owner)) {
+               return true;
+       }
+
+       if(remote_user()) {
+
+               // 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 `user`.`blockwall` = 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;
 }