mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 21:55:15 +00:00
improved photo editing and alt text support
This commit is contained in:
nobody
parent
f78ef46a51
commit
cabed0682c
6 changed files with 258 additions and 206 deletions
|
|
@ -23,11 +23,11 @@ class Photos extends Controller {
|
|||
|
||||
function init() {
|
||||
|
||||
if(observer_prohibited()) {
|
||||
if (observer_prohibited()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(argc() > 1) {
|
||||
if (argc() > 1) {
|
||||
|
||||
$nick = escape_tags(argv(1));
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ class Photos extends Controller {
|
|||
|
||||
$profile_uid = 0;
|
||||
|
||||
if($channelx) {
|
||||
if ($channelx) {
|
||||
App::$data['channel'] = $channelx;
|
||||
head_set_icon($channelx['xchan_photo_s']);
|
||||
$profile_uid = $channelx['channel_id'];
|
||||
|
|
@ -61,37 +61,21 @@ class Photos extends Controller {
|
|||
|
||||
$phototypes = $ph->supportedTypes();
|
||||
|
||||
$can_post = false;
|
||||
|
||||
$page_owner_uid = App::$data['channel']['channel_id'];
|
||||
|
||||
if(perm_is_allowed($page_owner_uid,get_observer_hash(),'write_storage'))
|
||||
$can_post = true;
|
||||
|
||||
if(! $can_post) {
|
||||
if (! perm_is_allowed($page_owner_uid,get_observer_hash(),'write_storage')) {
|
||||
notice( t('Permission denied.') . EOL );
|
||||
killme_if_ajax();
|
||||
return;
|
||||
}
|
||||
|
||||
$s = abook_self($page_owner_uid);
|
||||
|
||||
if(! $s) {
|
||||
notice( t('Page owner information could not be retrieved.') . EOL);
|
||||
logger('mod_photos: post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
|
||||
killme_if_ajax();
|
||||
return;
|
||||
}
|
||||
|
||||
$owner_record = $s[0];
|
||||
|
||||
$acl = new AccessControl(App::$data['channel']);
|
||||
|
||||
if((argc() > 3) && (argv(2) === 'album')) {
|
||||
if ((argc() > 3) && (argv(2) === 'album')) {
|
||||
|
||||
$album = argv(3);
|
||||
|
||||
if(! photos_album_exists($page_owner_uid, get_observer_hash(), $album)) {
|
||||
if (! photos_album_exists($page_owner_uid, get_observer_hash(), $album)) {
|
||||
notice( t('Album not found.') . EOL);
|
||||
goaway(z_root() . '/' . $_SESSION['photo_return']);
|
||||
}
|
||||
|
|
@ -101,16 +85,15 @@ class Photos extends Controller {
|
|||
* DELETE photo album and all its photos
|
||||
*/
|
||||
|
||||
if($_REQUEST['dropalbum'] == t('Delete Album')) {
|
||||
if ($_REQUEST['dropalbum'] === t('Delete Album')) {
|
||||
|
||||
|
||||
$folder_hash = '';
|
||||
|
||||
$r = q("select * from attach where is_dir = 1 and uid = %d and hash = '%s'",
|
||||
$r = q("select hash from attach where is_dir = 1 and uid = %d and hash = '%s'",
|
||||
intval($page_owner_uid),
|
||||
dbesc($album)
|
||||
);
|
||||
if(! $r) {
|
||||
if (! $r) {
|
||||
notice( t('Album not found.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
|
@ -122,20 +105,21 @@ class Photos extends Controller {
|
|||
|
||||
// get the list of photos we are about to delete
|
||||
|
||||
if(remote_channel() && (! local_channel())) {
|
||||
if (remote_channel() && (! local_channel())) {
|
||||
$str = photos_album_get_db_idstr($page_owner_uid,$album,remote_channel());
|
||||
}
|
||||
elseif(local_channel()) {
|
||||
elseif (local_channel()) {
|
||||
$str = photos_album_get_db_idstr(local_channel(),$album);
|
||||
}
|
||||
elseif(is_site_admin()) {
|
||||
elseif (is_site_admin()) {
|
||||
$str = photos_album_get_db_idstr_admin($page_owner_uid,$album);
|
||||
$admin_delete = true;
|
||||
}
|
||||
else {
|
||||
$str = null;
|
||||
}
|
||||
if(! $str) {
|
||||
|
||||
if (! $str) {
|
||||
goaway(z_root() . '/' . $_SESSION['photo_return']);
|
||||
}
|
||||
|
||||
|
|
@ -143,12 +127,12 @@ class Photos extends Controller {
|
|||
intval($page_owner_uid)
|
||||
);
|
||||
if($r) {
|
||||
foreach($r as $i) {
|
||||
attach_delete($page_owner_uid, $i['resource_id'], true );
|
||||
foreach($r as $rv) {
|
||||
attach_delete($page_owner_uid, $rv['resource_id'], true );
|
||||
}
|
||||
}
|
||||
|
||||
// remove the associated photos in case they weren't attached to an item
|
||||
// remove the associated photos in case they weren't attached to an item (rare)
|
||||
|
||||
q("delete from photo where resource_id in ( $str ) and uid = %d",
|
||||
intval($page_owner_uid)
|
||||
|
|
@ -158,12 +142,16 @@ class Photos extends Controller {
|
|||
intval($page_owner_uid)
|
||||
);
|
||||
|
||||
if($folder_hash) {
|
||||
if ($folder_hash) {
|
||||
attach_delete($page_owner_uid, $folder_hash, true );
|
||||
if(! $admin_delete) {
|
||||
|
||||
// Sync this action to channel clones, UNLESS it was an admin delete action.
|
||||
// The admin only has authority to moderate content on their own site.
|
||||
|
||||
if (! $admin_delete) {
|
||||
$sync = attach_export_data(App::$data['channel'],$folder_hash, true);
|
||||
if($sync) {
|
||||
Libsync::build_sync_packet($page_owner_uid,array('file' => array($sync)));
|
||||
if ($sync) {
|
||||
Libsync::build_sync_packet($page_owner_uid, [ 'file' => [ $sync ] ]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -171,48 +159,71 @@ class Photos extends Controller {
|
|||
goaway(z_root() . '/photos/' . App::$data['channel']['channel_address']);
|
||||
}
|
||||
|
||||
if((argc() > 2) && (x($_REQUEST,'delete')) && ($_REQUEST['delete'] === t('Delete Photo'))) {
|
||||
if ((argc() > 2) && (x($_REQUEST,'delete')) && ($_REQUEST['delete'] === t('Delete Photo'))) {
|
||||
// same as above but remove single photo
|
||||
|
||||
$ob_hash = get_observer_hash();
|
||||
if(! $ob_hash)
|
||||
goaway(z_root() . '/' . $_SESSION['photo_return']);
|
||||
|
||||
$ob_hash = get_observer_hash();
|
||||
|
||||
if (! $ob_hash) {
|
||||
goaway(z_root() . '/' . $_SESSION['photo_return']);
|
||||
}
|
||||
|
||||
// query to verify ownership of the photo by this viewer
|
||||
// We've already checked observer permissions to perfom this action
|
||||
|
||||
// This implements the policy that remote channels (visitors and guests)
|
||||
// which modify content can only modify their own content.
|
||||
// The page owner can modify anything within their authority, including
|
||||
// content published by others in their own channel pages.
|
||||
// The site admin can of course modify anything on their own site for
|
||||
// maintenance or legal compliance reasons.
|
||||
|
||||
$r = q("SELECT id, resource_id FROM photo WHERE ( xchan = '%s' or uid = %d ) AND resource_id = '%s' LIMIT 1",
|
||||
dbesc($ob_hash),
|
||||
intval(local_channel()),
|
||||
dbesc(argv(2))
|
||||
);
|
||||
|
||||
if($r) {
|
||||
if ($r) {
|
||||
attach_delete($page_owner_uid, $r[0]['resource_id'], true );
|
||||
$sync = attach_export_data(App::$data['channel'],$r[0]['resource_id'], true);
|
||||
if($sync) {
|
||||
Libsync::build_sync_packet($page_owner_uid,array('file' => array($sync)));
|
||||
if ($sync) {
|
||||
Libsync::build_sync_packet($page_owner_uid, [ 'file' => [ $sync ] ]);
|
||||
}
|
||||
}
|
||||
elseif(is_site_admin()) {
|
||||
// If the admin deletes a photo, don't sync
|
||||
elseif (is_site_admin()) {
|
||||
// If the admin deletes a photo, don't check ownership or invoke clone sync
|
||||
attach_delete($page_owner_uid, argv(2), true);
|
||||
}
|
||||
|
||||
goaway(z_root() . '/photos/' . App::$data['channel']['channel_address'] . '/album/' . $_SESSION['album_return']);
|
||||
}
|
||||
|
||||
if((argc() > 2) && array_key_exists('move_to_album',$_POST)) {
|
||||
// perform move_to_album
|
||||
|
||||
if ((argc() > 2) && array_key_exists('move_to_album',$_POST)) {
|
||||
|
||||
$m = q("select folder from attach where hash = '%s' and uid = %d limit 1",
|
||||
dbesc(argv(2)),
|
||||
intval($page_owner_uid)
|
||||
);
|
||||
if(($m) && ($m[0]['folder'] != $_POST['move_to_album'])) {
|
||||
|
||||
// we should sanitize the post variable, but probably pointless because the move
|
||||
// will fail if we can't find the target
|
||||
|
||||
if (($m) && ($m[0]['folder'] != $_POST['move_to_album'])) {
|
||||
attach_move($page_owner_uid,argv(2),$_POST['move_to_album']);
|
||||
|
||||
$sync = attach_export_data(App::$data['channel'],argv(2),false);
|
||||
if($sync)
|
||||
Libsync::build_sync_packet($page_owner_uid,array('file' => array($sync)));
|
||||
if ($sync) {
|
||||
Libsync::build_sync_packet($page_owner_uid, [ 'file' => [ $sync ] ]);
|
||||
}
|
||||
|
||||
if(! ($_POST['desc'] && $_POST['newtag']))
|
||||
// return if this is the only thing being edited
|
||||
|
||||
if (! ($_POST['desc'] && $_POST['newtag'])) {
|
||||
goaway(z_root() . '/' . $_SESSION['photo_return']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -228,10 +239,10 @@ class Photos extends Controller {
|
|||
dbesc($resource_id),
|
||||
intval($page_owner_uid)
|
||||
);
|
||||
if($r) {
|
||||
if ($r) {
|
||||
|
||||
$ph = photo_factory(@file_get_contents(dbunescbin($r[0]['content'])), $r[0]['mimetype']);
|
||||
if($ph->is_valid()) {
|
||||
if ($ph->is_valid()) {
|
||||
$rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
|
||||
$ph->rotate($rotate_deg);
|
||||
|
||||
|
|
@ -278,29 +289,35 @@ class Photos extends Controller {
|
|||
$ph->storeThumbnail($arr, PHOTO_RES_320);
|
||||
}
|
||||
}
|
||||
}}
|
||||
}} // end FIXED
|
||||
|
||||
|
||||
if((argc() > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false))) {
|
||||
|
||||
$desc = ((x($_POST,'desc')) ? notags(trim($_POST['desc'])) : '');
|
||||
$rawtags = ((x($_POST,'newtag')) ? notags(trim($_POST['newtag'])) : '');
|
||||
// edit existing photo properties
|
||||
|
||||
if (x($_POST,'item_id') !== false && intval($_POST['item_id'])) {
|
||||
|
||||
$title = ((x($_POST,'title')) ? escape_tags(trim($_POST['title'])) : EMPTY_STR );
|
||||
$desc = ((x($_POST,'desc')) ? escape_tags(trim($_POST['desc'])) : EMPTY_STR );
|
||||
$body = ((x($_POST,'body')) ? trim($_POST['body']) : EMPTY_STR);
|
||||
|
||||
$item_id = ((x($_POST,'item_id')) ? intval($_POST['item_id']) : 0);
|
||||
$is_nsfw = ((x($_POST,'adult')) ? intval($_POST['adult']) : 0);
|
||||
|
||||
|
||||
// convert any supplied posted permissions for storage
|
||||
|
||||
$acl->set_from_array($_POST);
|
||||
$perm = $acl->get();
|
||||
|
||||
$resource_id = argv(2);
|
||||
|
||||
$p = q("SELECT mimetype, is_nsfw, filename, description, resource_id, imgscale, allow_cid, allow_gid, deny_cid, deny_gid FROM photo WHERE resource_id = '%s' AND uid = %d ORDER BY imgscale DESC",
|
||||
$p = q("SELECT mimetype, is_nsfw, filename, title, description, resource_id, imgscale, allow_cid, allow_gid, deny_cid, deny_gid FROM photo WHERE resource_id = '%s' AND uid = %d ORDER BY imgscale DESC",
|
||||
dbesc($resource_id),
|
||||
intval($page_owner_uid)
|
||||
);
|
||||
if($p) {
|
||||
$ext = $phototypes[$p[0]['mimetype']];
|
||||
|
||||
$r = q("UPDATE photo SET description = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' WHERE resource_id = '%s' AND uid = %d",
|
||||
if ($p) {
|
||||
// update the photo structure with any of the changed elements which are common to all resolutions
|
||||
$r = q("UPDATE photo SET title = '%s', description = '%s', allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' WHERE resource_id = '%s' AND uid = %d",
|
||||
dbesc($title),
|
||||
dbesc($desc),
|
||||
dbesc($perm['allow_cid']),
|
||||
dbesc($perm['allow_gid']),
|
||||
|
|
@ -314,7 +331,7 @@ class Photos extends Controller {
|
|||
$item_private = (($str_contact_allow || $str_group_allow || $str_contact_deny || $str_group_deny) ? true : false);
|
||||
|
||||
$old_is_nsfw = $p[0]['is_nsfw'];
|
||||
if($old_is_nsfw != $is_nsfw) {
|
||||
if ($old_is_nsfw != $is_nsfw) {
|
||||
$r = q("update photo set is_nsfw = %d where resource_id = '%s' and uid = %d",
|
||||
intval($is_nsfw),
|
||||
dbesc($resource_id),
|
||||
|
|
@ -325,112 +342,123 @@ class Photos extends Controller {
|
|||
/* Don't make the item visible if the only change was the album name */
|
||||
|
||||
$visibility = 0;
|
||||
if($p[0]['description'] !== $desc || strlen($rawtags))
|
||||
if ($p[0]['description'] !== $desc || $p[0]['title'] !== $title || $body !== EMPTY_STR) {
|
||||
$visibility = 1;
|
||||
|
||||
if(! $item_id) {
|
||||
$item_id = photos_create_item(App::$data['channel'],get_observer_hash(),$p[0],$visibility);
|
||||
|
||||
}
|
||||
|
||||
$r = q("SELECT * FROM item WHERE id = %d AND uid = %d LIMIT 1",
|
||||
intval($item_id),
|
||||
intval($page_owner_uid)
|
||||
);
|
||||
if (! $r) {
|
||||
logger('linked photo item not found.');
|
||||
notice ( t('linked item not found.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
$linked_item = array_shift($r);
|
||||
|
||||
// extract the original footer text
|
||||
$footer_text = EMPTY_STR;
|
||||
$orig_text = $linked_item['body'];
|
||||
$matches = [];
|
||||
|
||||
if (preg_match('/\[footer\](.*?)\[\/footer\]/ism',$orig_text,$matches)) {
|
||||
logger('matches: ' . print_r($matches,true));
|
||||
$footer_text = $matches[0];
|
||||
}
|
||||
|
||||
$body = cleanup_bbcode($body);
|
||||
$tags = linkify_tags($body, $page_owner_uid);
|
||||
|
||||
$post_tags = [];
|
||||
if ($tags) {
|
||||
foreach ($tags as $tag) {
|
||||
$success = $tag['success'];
|
||||
if ($success['replaced']) {
|
||||
// suppress duplicate mentions/tags
|
||||
$already_tagged = false;
|
||||
foreach ($post_tags as $pt) {
|
||||
if ($pt['term'] === $success['term'] && $pt['url'] === $success['url'] && intval($pt['ttype']) === intval($success['termtype'])) {
|
||||
$already_tagged = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ($already_tagged) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$post_tags[] = [
|
||||
'uid' => $page_owner_uid,
|
||||
'ttype' => $success['termtype'],
|
||||
'otype' => TERM_OBJ_POST,
|
||||
'term' => $success['term'],
|
||||
'url' => $success['url']
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($post_tags) {
|
||||
q("delete from term where otype = 1 and oid = %d",
|
||||
intval($linked_item['id'])
|
||||
);
|
||||
foreach($post_tags as $t) {
|
||||
q("insert into term (uid,oid,otype,ttype,term,url)
|
||||
values(%d,%d,%d,%d,'%s','%s') ",
|
||||
intval($page_owner_uid),
|
||||
intval($linked_item['id']),
|
||||
intval(TERM_OBJ_POST),
|
||||
intval($t['ttype']),
|
||||
dbesc($t['term']),
|
||||
dbesc($t['url'])
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
$body = z_input_filter($body,'text/bbcode');
|
||||
|
||||
$obj = EMPTY_STR;
|
||||
|
||||
if($item_id) {
|
||||
$r = q("SELECT * FROM item WHERE id = %d AND uid = %d LIMIT 1",
|
||||
intval($item_id),
|
||||
intval($page_owner_uid)
|
||||
);
|
||||
|
||||
if($r) {
|
||||
$old_tag = $r[0]['tag'];
|
||||
$old_inform = $r[0]['inform'];
|
||||
}
|
||||
|
||||
if($r[0]['obj']) {
|
||||
$obj = json_decode($r[0]['obj'],true);
|
||||
$obj['name'] = (($desc) ? $desc : $p[0]['filename']);
|
||||
$obj['updated'] = datetime_convert('UTC','UTC','now',ATOM_TIME);
|
||||
$obj = json_encode($obj);
|
||||
if (isset($linked_item['obj']) && strlen($linked_item['obj'])) {
|
||||
$obj = json_decode($linked_item['obj'],true);
|
||||
|
||||
$obj['name'] = (($title) ? $title : $p[0]['filename']);
|
||||
$obj['summary'] = (($desc) ? $desc : $p[0]['filename']);
|
||||
$obj['updated'] = datetime_convert('UTC','UTC','now',ATOM_TIME);
|
||||
$obj['source'] = [ 'content' => $body, 'mediaType' => 'text/bbcode' ];
|
||||
$obj['content'] = bbcode($body . $footer_text, [ 'export' => true ]);
|
||||
if (isset($obj['url']) && is_array($obj['url'])) {
|
||||
for ($x = 0; $x < count($obj['url']); $x ++) {
|
||||
$obj['url'][$x]['summary'] = $obj['summary'];
|
||||
}
|
||||
}
|
||||
$obj = json_encode($obj);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// make sure the linked item has the same permissions as the photo regardless of any other changes
|
||||
$x = q("update item set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', title = '%s', obj = '%s', edited = '%s', item_private = %d
|
||||
where id = %d",
|
||||
dbesc($perm['allow_cid']),
|
||||
dbesc($perm['allow_gid']),
|
||||
dbesc($perm['deny_cid']),
|
||||
dbesc($perm['deny_gid']),
|
||||
dbesc(($desc) ? $desc : $p[0]['filename']),
|
||||
dbesc($obj),
|
||||
dbesc(datetime_convert()),
|
||||
intval($acl->is_private()),
|
||||
intval($item_id)
|
||||
$x = q("update item set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', title = '%s', obj = '%s', body = '%s', edited = '%s', item_private = %d where id = %d",
|
||||
dbesc($perm['allow_cid']),
|
||||
dbesc($perm['allow_gid']),
|
||||
dbesc($perm['deny_cid']),
|
||||
dbesc($perm['deny_gid']),
|
||||
dbesc(($desc) ? $desc : $p[0]['filename']),
|
||||
dbesc($obj),
|
||||
dbesc($body . $footer_text),
|
||||
dbesc(datetime_convert()),
|
||||
intval($acl->is_private()),
|
||||
intval($item_id)
|
||||
);
|
||||
|
||||
// make sure the attach has the same permissions as the photo regardless of any other changes
|
||||
$x = q("update attach set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where hash = '%s' and uid = %d and is_photo = 1",
|
||||
dbesc($perm['allow_cid']),
|
||||
dbesc($perm['allow_gid']),
|
||||
dbesc($perm['deny_cid']),
|
||||
dbesc($perm['deny_gid']),
|
||||
dbesc($resource_id),
|
||||
intval($page_owner_uid)
|
||||
dbesc($perm['allow_cid']),
|
||||
dbesc($perm['allow_gid']),
|
||||
dbesc($perm['deny_cid']),
|
||||
dbesc($perm['deny_gid']),
|
||||
dbesc($resource_id),
|
||||
intval($page_owner_uid)
|
||||
);
|
||||
|
||||
if(strlen($rawtags)) {
|
||||
|
||||
$str_tags = '';
|
||||
$inform = '';
|
||||
|
||||
// if the new tag doesn't have a namespace specifier (@foo or #foo) give it a mention
|
||||
|
||||
$x = substr($rawtags,0,1);
|
||||
if($x !== '@' && $x !== '#')
|
||||
$rawtags = '@' . $rawtags;
|
||||
|
||||
require_once('include/text.php');
|
||||
$profile_uid = App::$profile['profile_uid'];
|
||||
|
||||
$results = linkify_tags($rawtags, (local_channel()) ? local_channel() : $profile_uid);
|
||||
|
||||
$success = $results['success'];
|
||||
$post_tags = [];
|
||||
|
||||
foreach($results as $result) {
|
||||
$success = $result['success'];
|
||||
if($success['replaced']) {
|
||||
$post_tags[] = array(
|
||||
'uid' => $profile_uid,
|
||||
'ttype' => $success['termtype'],
|
||||
'otype' => TERM_OBJ_POST,
|
||||
'term' => $success['term'],
|
||||
'url' => $success['url']
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
$r = q("select * from item where id = %d and uid = %d limit 1",
|
||||
intval($item_id),
|
||||
intval($page_owner_uid)
|
||||
);
|
||||
|
||||
if($r) {
|
||||
$r = fetch_post_tags($r,true);
|
||||
$datarray = $r[0];
|
||||
if($post_tags) {
|
||||
if((! array_key_exists('term',$datarray)) || (! is_array($datarray['term'])))
|
||||
$datarray['term'] = $post_tags;
|
||||
else
|
||||
$datarray['term'] = array_merge($datarray['term'],$post_tags);
|
||||
}
|
||||
item_store_update($datarray,$execflag);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if($visibility) {
|
||||
Run::Summon( [ 'Notifier', 'edit_post', $item_id ] );
|
||||
|
|
@ -439,12 +467,12 @@ class Photos extends Controller {
|
|||
$sync = attach_export_data(App::$data['channel'],$resource_id);
|
||||
|
||||
if($sync)
|
||||
Libsync::build_sync_packet($page_owner_uid,array('file' => array($sync)));
|
||||
Libsync::build_sync_packet($page_owner_uid, [ 'file' => [ $sync ] ]);
|
||||
|
||||
goaway(z_root() . '/' . $_SESSION['photo_return']);
|
||||
return; // NOTREACHED
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -561,7 +589,8 @@ class Photos extends Controller {
|
|||
if(argc() > 3) {
|
||||
$datatype = argv(2);
|
||||
$datum = argv(3);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
if(argc() > 2) {
|
||||
$datatype = argv(2);
|
||||
$datum = '';
|
||||
|
|
@ -687,8 +716,9 @@ class Photos extends Controller {
|
|||
'$newalbum_label' => t('Enter an album name'),
|
||||
'$newalbum_placeholder' => t('or select an existing album (doubleclick)'),
|
||||
'$visible' => array('visible', t('Create a status post for this upload'), 0,'', array(t('No'), t('Yes')), 'onclick="showHideBodyTextarea();"'),
|
||||
'$caption' => array('description', t('Title (optional)')),
|
||||
'$body' => array('body', t('Description (optional)'),'', 'Description will only appear in the status post'),
|
||||
'$caption' => array('description', t('Please briefly describe this photo for vision-impaired viewers')),
|
||||
'title' => [ 'title', t('Title (optional)') ],
|
||||
'$body' => array('body', t('Your message (optional)'),'', 'This will only appear in the status post'),
|
||||
'$albums' => $albums['albums'],
|
||||
'$selname' => $selname,
|
||||
'$permissions' => t('Permissions'),
|
||||
|
|
@ -985,7 +1015,8 @@ class Photos extends Controller {
|
|||
);
|
||||
|
||||
$map = null;
|
||||
|
||||
$link_item = null;
|
||||
|
||||
if($linked_items) {
|
||||
|
||||
xchan_query($linked_items);
|
||||
|
|
@ -1049,10 +1080,13 @@ class Photos extends Controller {
|
|||
$_SESSION['album_return'] = bin2hex($ph[0]['album']);
|
||||
|
||||
$folder_list = attach_folder_select_list($ph[0]['uid']);
|
||||
|
||||
$edit_body = htmlspecialchars_decode(undo_post_tagging($link_item['body']),ENT_COMPAT);
|
||||
// We will regenerate the body footer
|
||||
$edit_body = preg_replace('/\[footer\](.*?)\[\/footer\]/ism','',$edit_body);
|
||||
|
||||
$edit = [
|
||||
'edit' => t('Edit photo'),
|
||||
'id' => $link_item['id'],
|
||||
'edit' => t('Edit photo'),
|
||||
'id' => $link_item['id'],
|
||||
'albums' => $albums['albums'],
|
||||
'album' => $album_e,
|
||||
'album_select' => [ 'move_to_album', t('Move photo to album'), $x[0]['folder'], '', $folder_list ],
|
||||
|
|
@ -1060,8 +1094,9 @@ class Photos extends Controller {
|
|||
'newalbum_placeholder' => t('or select an existing one (doubleclick)'),
|
||||
'nickname' => App::$data['channel']['channel_address'],
|
||||
'resource_id' => $ph[0]['resource_id'],
|
||||
'capt_label' => t('Title (optional)'),
|
||||
'caption' => $caption_e,
|
||||
'desc' => [ 'desc', t('Please briefly describe this photo for vision-impaired viewers'), $ph[0]['description'] ],
|
||||
'title' => [ 'title', t('Title (optional)'), $ph[0]['title'] ],
|
||||
'body' => [ 'body', t('Your message (optional)'),$edit_body, t('This will only appear in the optional status post attached to this photo') ],
|
||||
'tag_label' => t('Add a Tag'),
|
||||
'permissions' => t('Permissions'),
|
||||
'aclselect' => $aclselect_e,
|
||||
|
|
@ -1116,6 +1151,7 @@ class Photos extends Controller {
|
|||
'$comment' => t('Comment'),
|
||||
'$submit' => t('Submit'),
|
||||
'$preview' => t('Preview'),
|
||||
'$auto_save_draft' => 'true',
|
||||
'$ww' => '',
|
||||
'$feature_encrypt' => false
|
||||
));
|
||||
|
|
@ -1153,7 +1189,6 @@ class Photos extends Controller {
|
|||
}
|
||||
$like_button_label = tt('Like','Likes',$like_count,'noun');
|
||||
|
||||
//if (feature_enabled($conv->get_profile_owner(),'dislike')) {
|
||||
$dislike_count = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid']] : '');
|
||||
$dislike_list = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid'] . '-l'] : '');
|
||||
$dislike_button_label = tt('Dislike','Dislikes',$dislike_count,'noun');
|
||||
|
|
@ -1163,7 +1198,7 @@ class Photos extends Controller {
|
|||
} else {
|
||||
$dislike_list_part = '';
|
||||
}
|
||||
//}
|
||||
|
||||
|
||||
|
||||
$like = ((isset($alike[$link_item['mid']])) ? format_like($alike[$link_item['mid']],$alike[$link_item['mid'] . '-l'],'like',$link_item['mid']) : '');
|
||||
|
|
@ -1259,6 +1294,7 @@ class Photos extends Controller {
|
|||
'$photo' => $photo,
|
||||
'$prevlink' => $prevlink,
|
||||
'$nextlink' => $nextlink,
|
||||
'$title' => $ph[0]['title'],
|
||||
'$desc' => $ph[0]['description'],
|
||||
'$filename' => $ph[0]['filename'],
|
||||
'$unknown' => t('Unknown'),
|
||||
|
|
|
|||
|
|
@ -953,11 +953,15 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
|
|||
if($arr['item'])
|
||||
$args['item'] = $arr['item'];
|
||||
|
||||
if($arr['description'])
|
||||
$args['description'] = $arr['description'];
|
||||
|
||||
if($arr['title'])
|
||||
$args['title'] = $arr['title'];
|
||||
|
||||
if($arr['body'])
|
||||
$args['body'] = $arr['body'];
|
||||
|
||||
if($arr['description'])
|
||||
$args['description'] = $arr['description'];
|
||||
|
||||
$args['deliver'] = $dosync;
|
||||
|
||||
|
|
|
|||
|
|
@ -262,8 +262,12 @@ function photo_upload($channel, $observer, $args) {
|
|||
$p['edited'] = $args['edited'];
|
||||
if($args['title'])
|
||||
$p['title'] = $args['title'];
|
||||
if($args['description'])
|
||||
|
||||
if ($args['description']) {
|
||||
$p['description'] = $args['description'];
|
||||
}
|
||||
|
||||
$alt_desc = ((isset($p['description']) && $p['description']) ? $p['description'] : $p['filename']);
|
||||
|
||||
$url = [];
|
||||
|
||||
|
|
@ -271,6 +275,7 @@ function photo_upload($channel, $observer, $args) {
|
|||
$url[0] = [
|
||||
'type' => 'Link',
|
||||
'mediaType' => $type,
|
||||
'summary' => $alt_desc,
|
||||
'href' => z_root() . '/photo/' . $photo_hash . '-0.' . $ph->getExt(),
|
||||
'width' => $width,
|
||||
'height' => $height
|
||||
|
|
@ -291,6 +296,7 @@ function photo_upload($channel, $observer, $args) {
|
|||
$url[1] = [
|
||||
'type' => 'Link',
|
||||
'mediaType' => $type,
|
||||
'summary' => $alt_desc,
|
||||
'href' => z_root() . '/photo/' . $photo_hash . '-1.' . $ph->getExt(),
|
||||
'width' => $ph->getWidth(),
|
||||
'height' => $ph->getHeight()
|
||||
|
|
@ -306,6 +312,7 @@ function photo_upload($channel, $observer, $args) {
|
|||
$url[2] = [
|
||||
'type' => 'Link',
|
||||
'mediaType' => $type,
|
||||
'summary' => $alt_desc,
|
||||
'href' => z_root() . '/photo/' . $photo_hash . '-2.' . $ph->getExt(),
|
||||
'width' => $ph->getWidth(),
|
||||
'height' => $ph->getHeight()
|
||||
|
|
@ -321,6 +328,7 @@ function photo_upload($channel, $observer, $args) {
|
|||
$url[3] = [
|
||||
'type' => 'Link',
|
||||
'mediaType' => $type,
|
||||
'summary' => $alt_desc,
|
||||
'href' => z_root() . '/photo/' . $photo_hash . '-3.' . $ph->getExt(),
|
||||
'width' => $ph->getWidth(),
|
||||
'height' => $ph->getHeight()
|
||||
|
|
@ -367,26 +375,18 @@ function photo_upload($channel, $observer, $args) {
|
|||
}
|
||||
}
|
||||
|
||||
$title = (($args['description']) ? $args['description'] : $args['filename']);
|
||||
|
||||
$large_photos = 1;
|
||||
$title = ((isset($args['title']) && $args['title']) ? $args['title'] : $args['filename']);
|
||||
|
||||
$desc = htmlspecialchars($alt_desc);
|
||||
|
||||
$found_tags = linkify_tags($args['body'], $channel_id);
|
||||
|
||||
$alt = ' alt="' . $title . '"' ;
|
||||
$alt = ' alt="' . $desc . '"' ;
|
||||
|
||||
if($large_photos) {
|
||||
$scale = 1;
|
||||
$width = $url[1]['width'];
|
||||
$height = $url[1]['height'];
|
||||
$tag = (($r1) ? '[zmg width="' . $width . '" height="' . $height . '"' . $alt . ']' : '[zmg' . $alt . ']');
|
||||
}
|
||||
else {
|
||||
$scale = 2;
|
||||
$width = $url[2]['width'];
|
||||
$height = $url[2]['height'];
|
||||
$tag = (($r2) ? '[zmg width="' . $width . '" height="' . $height . '"' . $alt . ']' : '[zmg' . $alt . ']');
|
||||
}
|
||||
$scale = 1;
|
||||
$width = $url[1]['width'];
|
||||
$height = $url[1]['height'];
|
||||
$tag = (($r1) ? '[zmg width="' . $width . '" height="' . $height . '"' . $alt . ']' : '[zmg' . $alt . ']');
|
||||
|
||||
$author_link = '[zrl=' . z_root() . '/channel/' . $channel['channel_address'] . ']' . $channel['channel_name'] . '[/zrl]';
|
||||
|
||||
|
|
@ -396,7 +396,7 @@ function photo_upload($channel, $observer, $args) {
|
|||
|
||||
$activity_format = sprintf(t('%1$s posted %2$s to %3$s','photo_upload'), $author_link, $photo_link, $album_link);
|
||||
|
||||
$summary = (($args['body']) ? $args['body'] : '') . '[footer]' . $activity_format . '[/footer]';
|
||||
$body = (($args['body']) ? $args['body'] : '') . '[footer]' . $activity_format . '[/footer]';
|
||||
|
||||
// If uploaded into a post, this is the text that is returned to the webapp for inclusion in the post.
|
||||
|
||||
|
|
@ -414,8 +414,8 @@ function photo_upload($channel, $observer, $args) {
|
|||
// This is a placeholder and will get over-ridden by the item mid, which is critical for sharing as a conversational item over activitypub
|
||||
'id' => z_root() . '/photo/' . $photo_hash,
|
||||
'url' => $url,
|
||||
'source' => [ 'content' => $summary, 'mediaType' => 'text/bbcode' ],
|
||||
'content' => bbcode($summary)
|
||||
'source' => [ 'content' => $body, 'mediaType' => 'text/bbcode' ],
|
||||
'content' => bbcode($body)
|
||||
];
|
||||
|
||||
$public = (($ac['allow_cid'] || $ac['allow_gid'] || $ac['deny_cid'] || $ac['deny_gid']) ? false : true);
|
||||
|
|
@ -436,7 +436,7 @@ function photo_upload($channel, $observer, $args) {
|
|||
|
||||
$post_tags = [];
|
||||
|
||||
if($found_tags) {
|
||||
if ($found_tags) {
|
||||
foreach($found_tags as $result) {
|
||||
$success = $result['success'];
|
||||
if($success['replaced']) {
|
||||
|
|
@ -452,8 +452,8 @@ function photo_upload($channel, $observer, $args) {
|
|||
}
|
||||
|
||||
// Create item container
|
||||
if($args['item']) {
|
||||
foreach($args['item'] as $i) {
|
||||
if ($args['item']) {
|
||||
foreach ($args['item'] as $i) {
|
||||
|
||||
$item = get_item_elements($i);
|
||||
$force = false;
|
||||
|
|
@ -461,7 +461,8 @@ function photo_upload($channel, $observer, $args) {
|
|||
if($item['mid'] === $item['parent_mid']) {
|
||||
|
||||
$object['id'] = $item['mid'];
|
||||
$item['body'] = $summary;
|
||||
$item['summary'] = $summary;
|
||||
$item['body'] = $body;
|
||||
$item['mimetype'] = 'text/bbcode';
|
||||
$item['obj_type'] = ACTIVITY_OBJ_PHOTO;
|
||||
$item['obj'] = json_encode($object);
|
||||
|
|
@ -477,8 +478,8 @@ function photo_upload($channel, $observer, $args) {
|
|||
dbesc($item['mid']),
|
||||
intval($channel['channel_id'])
|
||||
);
|
||||
if($r) {
|
||||
if(($item['edited'] > $r[0]['edited']) || $force) {
|
||||
if ($r) {
|
||||
if (($item['edited'] > $r[0]['edited']) || $force) {
|
||||
$item['id'] = $r[0]['id'];
|
||||
$item['uid'] = $channel['channel_id'];
|
||||
item_store_update($item,false,$deliver);
|
||||
|
|
@ -526,7 +527,8 @@ function photo_upload($channel, $observer, $args) {
|
|||
'item_origin' => 1,
|
||||
'item_thread_top' => 1,
|
||||
'item_private' => intval($acl->is_private()),
|
||||
'body' => $summary
|
||||
'summary' => $summary,
|
||||
'body' => $body
|
||||
];
|
||||
|
||||
if ($post_tags) {
|
||||
|
|
@ -826,7 +828,9 @@ function photos_album_rename($channel_id, $oldname, $newname) {
|
|||
}
|
||||
|
||||
/**
|
||||
* @brief
|
||||
* @brief returns the DB escaped comma separated list of the contents (by hash name) of a given photo album
|
||||
* based on the creator. This is used to ensure guests can only edit content they created. The page owner and site
|
||||
* admin can edit any content owned by this channel.
|
||||
*
|
||||
* @param int $channel_id
|
||||
* @param string $album
|
||||
|
|
|
|||
|
|
@ -1725,11 +1725,14 @@ function prepare_body(&$item,$attach = false,$opts = false) {
|
|||
|
||||
// if original photo width is > 640px make it a cover photo
|
||||
if ($ptr) {
|
||||
$alt_text = ' alt="' . ((isset($ptr['summary']) && $ptr['summary']) ? htmlspecialchars($ptr['summary'], ENT_QUOTES, 'UTF-8') : t('Image/photo')) . '"';
|
||||
$title_text = ' title="' . ((isset($ptr['summary']) && $ptr['summary']) ? htmlspecialchars($ptr['summary'], ENT_QUOTES, 'UTF-8') : t('Image/photo')) . '"';
|
||||
|
||||
if (array_key_exists('width',$ptr) && $ptr['width'] > 640) {
|
||||
$photo = '<a href="' . zid(rawurldecode($object['id'])) . '" target="_blank" rel="nofollow noopener"><img style="max-width:' . $ptr['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($ptr['href'])) . '"></a>';
|
||||
$photo = '<a href="' . zid(rawurldecode($object['id'])) . '"' . $title_text . ' target="_blank" rel="nofollow noopener"><img style="max-width:' . $ptr['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($ptr['href'])) . '"' . $alt_text . '></a>';
|
||||
}
|
||||
else {
|
||||
$item['body'] = '[zmg]' . $ptr['href'] . '[/zmg]' . "\n\n" . $item['body'];
|
||||
$item['body'] = '[zmg' . $alt_text . ']' . $ptr['href'] . '[/zmg]' . "\n\n" . $item['body'];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
</div>
|
||||
{{/if}}
|
||||
</div>
|
||||
<h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2>
|
||||
<h2>{{if $title}}{{$title}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
<div id="photo-map">
|
||||
|
|
@ -63,8 +63,11 @@
|
|||
</div>
|
||||
*}}
|
||||
<div class="form-group">
|
||||
<label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label>
|
||||
<input id="photo-edit-caption" class="form-control" type="text" name="desc" value="{{$edit.caption}}" />
|
||||
|
||||
{{include file="field_input.tpl" field=$edit.desc}}
|
||||
{{include file="field_input.tpl" field=$edit.title}}
|
||||
{{include file="field_textarea.tpl" field=$edit.body}}
|
||||
|
||||
</div>
|
||||
{{* <div class="form-group">
|
||||
<label id="photo-edit-tags-label" for="photo-edit-newtag">{{$edit.tag_label}}</label>
|
||||
|
|
@ -95,7 +98,7 @@
|
|||
<div id="photo-edit-end" class="clear"></div>
|
||||
</div>
|
||||
<div id="photo-view-wrapper">
|
||||
<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div>
|
||||
<div id="photo-photo"><a href="{{$photo.href}}" title="{{$desc}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}" alt="{{$desc}}"></a></div>
|
||||
<div id="photo-photo-end" class="clear"></div>
|
||||
{{if $tags}}
|
||||
<div class="photo-item-tools-left" id="in-this-photo">
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
<input id="photos-upload-choose" type="file" name="userfile" />
|
||||
</div -->
|
||||
{{include file="field_input.tpl" field=$caption}}
|
||||
{{include file="field_input.tpl" field=$title}}
|
||||
{{include file="field_checkbox.tpl" field=$visible}}
|
||||
<div id="body-textarea">
|
||||
{{include file="field_textarea.tpl" field=$body}}
|
||||
|
|
@ -40,6 +41,7 @@
|
|||
|
||||
{{if $uploader}}
|
||||
{{include file="field_input.tpl" field=$caption}}
|
||||
{{include file="field_input.tpl" field=$title}}
|
||||
{{include file="field_checkbox.tpl" field=$visible}}
|
||||
<div id="body-textarea">
|
||||
{{include file="field_textarea.tpl" field=$body}}
|
||||
|
|
|
|||
Loading…
Reference in a new issue