Always coalesce, if it is not a multi-frame image it won't hurt anyway

[friendica.git] / mod / lockview.php

diff --git a/mod/lockview.php b/mod/lockview.php
index a886effeb767832947effcc25f7d68a30a215dfc..a832629f198ef680e0afce32e96a60f1e9de2e06 100644 (file)
--- a/mod/lockview.php
+++ b/mod/lockview.php
@@ -2,12 +2,23 @@
 
 
 function lockview_content(&$a) {
-
-       $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
+  
+       $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(! $item_id)
                killme();
 
-       $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
+       if (!in_array($type, array('item','photo','event')))
+               killme();
+     
+       $r = q("SELECT * FROM `%s` WHERE `id` = %d LIMIT 1",
+               dbesc($type),
                intval($item_id)
        );
        if(! count($r))
@@ -22,7 +33,7 @@ function lockview_content(&$a) {
        $deny_users = expand_acl($item['deny_cid']);
        $deny_groups = expand_acl($item['deny_gid']);
 
-       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 />';