diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-02-04 08:44:17 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-02-04 08:44:17 +0100 |
| commit | cc6a5f59b455a0e8d0b7a5250508e3b71f19ed3c (patch) | |
| tree | b3bf41b82deb81ab185e09ff07e2308b1ebc99d1 | |
| parent | 9cf04b61106d27f1f641dda39de737386f7b8c99 (diff) | |
| parent | 5c98032893d945644c6da6bdf99484c0c8cb7e45 (diff) | |
| download | volse-hubzilla-cc6a5f59b455a0e8d0b7a5250508e3b71f19ed3c.tar.gz volse-hubzilla-cc6a5f59b455a0e8d0b7a5250508e3b71f19ed3c.tar.bz2 volse-hubzilla-cc6a5f59b455a0e8d0b7a5250508e3b71f19ed3c.zip | |
Merge branch 'master' of https://github.com/friendika/friendika.git
| -rw-r--r-- | mod/lockview.php | 17 | ||||
| -rw-r--r-- | mod/photos.php | 10 |
2 files changed, 23 insertions, 4 deletions
diff --git a/mod/lockview.php b/mod/lockview.php index a886effeb..9e64e2608 100644 --- 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 f892e2ce2..52cc66eae 100644 --- 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>'; } |