Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / lockview.php

diff --git a/mod/lockview.php b/mod/lockview.php
index a99628b6e277820e84ff704731348cf9f799e4da..746df28cd9478bbbef134dbbe8a797c3c8a0750c 100644 (file)
--- a/mod/lockview.php
+++ b/mod/lockview.php
@@ -1,45 +1,51 @@
 <?php
 
 
-function lockview_content(&$a) {
+function lockview_content(App &$a) {
   
        $type = (($a->argc > 1) ? $a->argv[1] : 0);
-  if (is_numeric($type)) {
-      $item_id = intval($type);
-      $type='item';
-  } else {
-    $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
-  }
+       if (is_numeric($type)) {
+               $item_id = intval($type);
+               $type='item';
+       } else {
+               $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
+       }
   
        if(! $item_id)
                killme();
 
-  if (!in_array($type, array('item','photo','event')))
-    killme();
+       if (!in_array($type, array('item','photo','event')))
+               killme();
      
        $r = q("SELECT * FROM `%s` WHERE `id` = %d LIMIT 1",
-    dbesc($type),
+               dbesc($type),
                intval($item_id)
        );
-       if(! count($r))
+       if (! dbm::is_result($r)) {
                killme();
+       }
        $item = $r[0];
-       if($item['uid'] != local_user())
-               killme();
 
+       call_hooks('lockview_content', $item);
 
-       $allowed_users = expand_acl($item['allow_cid']);
-       $allowed_groups = expand_acl($item['allow_gid']);
-       $deny_users = expand_acl($item['deny_cid']);
-       $deny_groups = expand_acl($item['deny_gid']);
+       if($item['uid'] != local_user()) {
+               echo t('Remote privacy information not available.') . '<br />';
+               killme();
+       }
 
-       if(($item['private']) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid'])) 
+
+       if(($item['private'] == 1) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid'])) 
                && (! strlen($item['deny_cid'])) && (! strlen($item['deny_gid']))) {
 
                echo t('Remote privacy information not available.') . '<br />';
                killme();
        }
 
+       $allowed_users = expand_acl($item['allow_cid']);
+       $allowed_groups = expand_acl($item['allow_gid']);
+       $deny_users = expand_acl($item['deny_cid']);
+       $deny_groups = expand_acl($item['deny_gid']);
+
        $o = t('Visible to:') . '<br />';
        $l = array();
 
@@ -47,8 +53,7 @@ function lockview_content(&$a) {
                $r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
                        dbesc(implode(', ', $allowed_groups))
                );
-               if(count($r))
-  if($item['uid'] != local_user())
+               if (dbm::is_result($r))
                        foreach($r as $rr) 
                                $l[] = '<b>' . $rr['name'] . '</b>';
        }
@@ -56,7 +61,7 @@ function lockview_content(&$a) {
                $r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
                        dbesc(implode(', ',$allowed_users))
                );
-               if(count($r))
+               if (dbm::is_result($r))
                        foreach($r as $rr) 
                                $l[] = $rr['name'];
 
@@ -66,7 +71,7 @@ function lockview_content(&$a) {
                $r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
                        dbesc(implode(', ', $deny_groups))
                );
-               if(count($r))
+               if (dbm::is_result($r))
                        foreach($r as $rr) 
                                $l[] = '<b><strike>' . $rr['name'] . '</strike></b>';
        }
@@ -74,17 +79,13 @@ function lockview_content(&$a) {
                $r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
                        dbesc(implode(', ',$deny_users))
                );
-               if(count($r))
+               if (dbm::is_result($r))
                        foreach($r as $rr) 
                                $l[] = '<strike>' . $rr['name'] . '</strike>';
 
        }
 
-  if (count($l)>0) {
-    echo $o . implode(', ', $l);
-  } else {
-    echo $o . t('nobody');
-  }
+       echo $o . implode(', ', $l);
        killme();
 
 }