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

diff --git a/mod/lockview.php b/mod/lockview.php
index a886effeb767832947effcc25f7d68a30a215dfc..9e64e2608b1e341f0e6de41373e643892f8fd85e 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))

diff --git a/mod/photos.php b/mod/photos.php
index f892e2ce284dfce7cf8ba09bc578feb1ad2815d0..52cc66eae1c31fdbf80281ef7a50db26d6b60a7b 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -913,7 +913,15 @@ function photos_content(&$a) {
                $o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']) . '">' . $ph[0]['album'] . '</a></h3>';
  
                if($can_post && ($ph[0]['uid'] == $owner_uid)) {
-                       $o .= '<div id="photo-edit-link-wrap" ><a id="photo-edit-link" href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/edit' . '">' . t('Edit photo') . '</a></div>';
+                       $o .= '<div id="photo-edit-link-wrap" ><a id="photo-edit-link" href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/edit' . '">' . t('Edit photo') . '</a>';
+                       
+                       // lock
+                       $o .= ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) 
+                                       || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) ) 
+                                       ? ' - <img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,\'photo/' . $ph[0]['id'] . '\');" />'
+                                       : '');
+                       
+                       $o .= '</div>';
                }