X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fphotos.php;h=324ce898d26003fdf188ebd919114cc43e6590a6;hb=cde17704ddbbe2b4926824aa2aa7aec7a9ac2dd6;hp=c1c6a4133f99436104552c441545a333748bb64c;hpb=d2c47924eb186a0839fe107b271ccbf27d15fe10;p=friendica.git diff --git a/mod/photos.php b/mod/photos.php index c1c6a4133f..324ce898d2 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -6,6 +6,10 @@ require_once('include/bbcode.php'); function photos_init(&$a) { + + if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + return; + } $o = ''; if($a->argc > 1) { @@ -246,6 +250,11 @@ foreach($_FILES AS $key => $val) { $rawtags = ((x($_POST,'newtag')) ? notags(trim($_POST['newtag'])) : ''); $item_id = ((x($_POST,'item_id')) ? intval($_POST['item_id']) : 0); $albname = ((x($_POST,'albname')) ? notags(trim($_POST['albname'])) : ''); + $str_group_allow = perms2str($_POST['group_allow']); + $str_contact_allow = perms2str($_POST['contact_allow']); + $str_group_deny = perms2str($_POST['group_deny']); + $str_contact_deny = perms2str($_POST['contact_deny']); + $resource_id = $a->argv[2]; if(! strlen($albname)) @@ -256,10 +265,14 @@ foreach($_FILES AS $key => $val) { dbesc($resource_id), intval($page_owner_uid) ); - if((count($p)) && (($p[0]['desc'] !== $desc) || ($p[0]['album'] !== $albname))) { - $r = q("UPDATE `photo` SET `desc` = '%s', `album` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d", + if(count($p)) { + $r = q("UPDATE `photo` SET `desc` = '%s', `album` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d", dbesc($desc), dbesc($albname), + dbesc($str_contact_allow), + dbesc($str_group_allow), + dbesc($str_contact_deny), + dbesc($str_group_deny), dbesc($resource_id), intval($page_owner_uid) ); @@ -301,6 +314,7 @@ foreach($_FILES AS $key => $val) { $arr['deny_gid'] = $p[0]['deny_gid']; $arr['last-child'] = 1; $arr['visible'] = $visibility; + $arr['body'] = '[url=' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . $a->get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.jpg' . '[/img]' . '[/url]'; @@ -647,6 +661,16 @@ function photos_content(&$a) { // photos/name/image/xxxxx/edit + if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + notice( t('Public access denied.') . EOL); + return; + } + + + require_once('include/bbcode.php'); + require_once('include/security.php'); + require_once('include/conversation.php'); + if(! x($a->data,'user')) { notice( t('No photos selected') . EOL ); return; @@ -883,8 +907,7 @@ function photos_content(&$a) { if($datatype === 'image') { - require_once('security.php'); - require_once('bbcode.php'); + $o = '
' . "\r\n"; // fetch image, item containing image, then comments @@ -900,6 +923,32 @@ function photos_content(&$a) { return; } + $prevlink = ''; + $nextlink = ''; + + $prvnxt = q("SELECT `resource-id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `scale` = 0 + $sql_extra ORDER BY `created` DESC ", + dbesc($ph[0]['album']), + intval($owner_uid) + ); + + if(count($prvnxt)) { + for($z = 0; $z < count($prvnxt); $z++) { + if($prvnxt[$z]['resource-id'] == $ph[0]['resource-id']) { + $prv = $z - 1; + $nxt = $z + 1; + if($prv < 0) + $prv = count($prvnxt) - 1; + if($nxt >= count($prvnxt)) + $nxt = 0; + break; + } + } + $prevlink = $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] ; + $nextlink = $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] ; + } + + if(count($ph) == 1) $hires = $lores = $ph[0]; if(count($ph) > 1) { @@ -929,11 +978,18 @@ function photos_content(&$a) { $o .= ''; } + if($prevlink) + $o .= '' ; - $o .= '