X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphotos.php;h=854c6ee1418f2f81e62c12f6ab4f6d8ea04d5786;hb=8c245a5d2f4e6882211ac17561f86537a7089c73;hp=c1c6a4133f99436104552c441545a333748bb64c;hpb=56415329368d3c93b64ad6490d56a2f0ff82ab68;p=friendica.git diff --git a/mod/photos.php b/mod/photos.php index c1c6a4133f..854c6ee141 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -246,6 +246,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 +261,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) ); @@ -1016,6 +1025,8 @@ function photos_content(&$a) { '$caption' => $ph[0]['desc'], '$tag_label' => t('Add a Tag'), '$tags' => $link_item['tag'], + '$permissions' => t('Permissions'), + '$aclselect' => populate_acl($ph[0]), '$help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'), '$item_id' => ((count($linked_items)) ? $link_item['id'] : 0), '$submit' => t('Submit'), @@ -1033,8 +1044,14 @@ function photos_content(&$a) { $likebuttons = ''; - if($can_post || can_write_wall($a,$owner_uid)) - $likebuttons = replace_macros($like_tpl,array('$id' => $link_item['id'])); + if($can_post || can_write_wall($a,$owner_uid)) { + $likebuttons = replace_macros($like_tpl,array( + '$id' => $item['id'], + '$likethis' => t("I like this \x28toggle\x29"), + '$nolike' => t("I don't like this \x28toggle\x29"), + '$wait' => t('Please wait') + )); + } if(! count($r)) { $o .= '