diff options
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 129 | ||||
| -rw-r--r-- | Zotlabs/Lib/ActivityStreams.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Lib/Enotify.php | 25 | ||||
| -rw-r--r-- | Zotlabs/Lib/Libzot.php | 10 | ||||
| -rw-r--r-- | Zotlabs/Lib/MessageFilter.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Lib/NativeWiki.php | 322 | ||||
| -rw-r--r-- | Zotlabs/Lib/NativeWikiPage.php | 725 | ||||
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 17 | ||||
| -rw-r--r-- | Zotlabs/Lib/ThreadStream.php | 4 |
9 files changed, 132 insertions, 1108 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 9b3cab9d0..8e24dde41 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -670,24 +670,36 @@ class Activity { return $ret; } - static function decode_attachment($item) { + public static function decode_attachment($item) { $ret = []; if (array_key_exists('attachment', $item) && is_array($item['attachment'])) { - foreach ($item['attachment'] as $att) { + $ptr = $item['attachment']; + if (!array_key_exists(0, $ptr)) { + $ptr = [$ptr]; + } + foreach ($ptr as $att) { $entry = []; - if (array_key_exists('href', $att)) + if (array_key_exists('href', $att) && $att['href']) { $entry['href'] = $att['href']; - elseif (array_key_exists('url', $att)) + } elseif (array_key_exists('url', $att) && $att['url']) { $entry['href'] = $att['url']; - if (array_key_exists('mediaType', $att)) + } + if (array_key_exists('mediaType', $att) && $att['mediaType']) { $entry['type'] = $att['mediaType']; - elseif (array_key_exists('type', $att) && $att['type'] === 'Image') + } elseif (array_key_exists('type', $att) && $att['type'] === 'Image') { $entry['type'] = 'image/jpeg'; - if ($entry) + } + if (array_key_exists('name', $att) && $att['name']) { + $entry['name'] = html2plain(purify_html($att['name']), 256); + } + if ($entry) { $ret[] = $entry; + } } + } elseif (isset($item['attachment']) && is_string($item['attachment'])) { + btlogger('not an array: ' . $item['attachment']); } return $ret; @@ -1013,7 +1025,7 @@ class Activity { 'type' => 'Image', 'mediaType' => (($p['xchan_photo_mimetype']) ? $p['xchan_photo_mimetype'] : 'image/png'), 'updated' => datetime_convert('UTC', 'UTC', $p['xchan_photo_date'], ATOM_TIME), - 'url' => $p['xchan_photo_l'], + 'url' => $p['xchan_photo_l'] . '?rev=' . strtotime($p['xchan_photo_date']), 'height' => 300, 'width' => 300, ]; @@ -2195,20 +2207,20 @@ class Activity { $s['created'] = datetime_convert('UTC', 'UTC', $act->data['published']); $s['commented'] = $s['created']; } - elseif (array_key_exists('published', $act->obj)) { + elseif (is_array($act->obj) && array_key_exists('published', $act->obj)) { $s['created'] = datetime_convert('UTC', 'UTC', $act->obj['published']); $s['commented'] = $s['created']; } if (array_key_exists('updated', $act->data)) { $s['edited'] = datetime_convert('UTC', 'UTC', $act->data['updated']); } - elseif (array_key_exists('updated', $act->obj)) { + elseif (is_array($act->obj) && array_key_exists('updated', $act->obj)) { $s['edited'] = datetime_convert('UTC', 'UTC', $act->obj['updated']); } if (array_key_exists('expires', $act->data)) { $s['expires'] = datetime_convert('UTC', 'UTC', $act->data['expires']); } - elseif (array_key_exists('expires', $act->obj)) { + elseif (is_array($act->obj) && array_key_exists('expires', $act->obj)) { $s['expires'] = datetime_convert('UTC', 'UTC', $act->obj['expires']); } @@ -2270,9 +2282,18 @@ class Activity { $s['mid'] = $act->obj['id']; $s['parent_mid'] = $act->obj['id']; } + if ($act->type === 'emojiReaction') { $content['content'] = (($act->tgt && $act->tgt['type'] === 'Image') ? '[img=32x32]' . $act->tgt['url'] . '[/img]' : '&#x' . $act->tgt['name'] . ';'); } + + if (in_array($act->type, ['EmojiReaction', 'EmojiReact'])) { + // Pleroma reactions + $t = trim(self::get_textfield($act->data, 'content')); + if (mb_strlen($t) === 1) { + $content['content'] = $t; + } + } } $s['item_thread_top'] = 0; @@ -2408,7 +2429,6 @@ class Activity { } } } - } $a = self::decode_attachment($act->obj); @@ -2423,8 +2443,11 @@ class Activity { if (array_key_exists('type', $act->obj)) { - if ($act->obj['type'] === 'Note' && $s['attach']) { - $s['body'] = self::bb_attach($s['attach'], $s['body']) . $s['body']; + // Objects that might have media attachments which aren't already provided in the content element. + // We'll check specific media objects separately. + + if (in_array($act->obj['type'], ['Article', 'Document', 'Event', 'Note', 'Page', 'Place', 'Question']) && isset($s['attach']) && $s['attach']) { + $s = self::bb_attach($s); } if ($act->obj['type'] === 'Question' && in_array($act->type, ['Create', 'Update'])) { @@ -2513,13 +2536,13 @@ class Activity { usort($mps,[ '\Zotlabs\Lib\Activity', 'vid_sort' ]); foreach ($mps as $m) { if (intval($m['height']) < 500 && Activity::media_not_in_body($m['href'],$s['body'])) { - $s['body'] = $tag . $m['href'] . '[/video]' . "\n\n" . $s['body']; + $s['body'] = $tag . $m['href'] . '[/video]' . "\r\n" . $s['body']; break; } } } elseif (is_string($act->obj['url']) && Activity::media_not_in_body($act->obj['url'],$s['body'])) { - $s['body'] = $tag . $act->obj['url'] . '[/video]' . "\n\n" . $s['body']; + $s['body'] = $tag . $act->obj['url'] . '[/video]' . "\r\n" . $s['body']; } } @@ -2545,13 +2568,13 @@ class Activity { } foreach ($ptr as $vurl) { if (in_array($vurl['mediaType'], $atypes) && self::media_not_in_body($vurl['href'], $s['body'])) { - $s['body'] = '[audio]' . $vurl['href'] . '[/audio]' . "\n\n" . $s['body']; + $s['body'] = '[audio]' . $vurl['href'] . '[/audio]' . "\r\n" . $s['body']; break; } } } elseif (is_string($act->obj['url']) && self::media_not_in_body($act->obj['url'], $s['body'])) { - $s['body'] = '[audio]' . $act->obj['url'] . '[/audio]' . "\n\n" . $s['body']; + $s['body'] = '[audio]' . $act->obj['url'] . '[/audio]' . "\r\n" . $s['body']; } } @@ -2571,7 +2594,7 @@ class Activity { } foreach ($ptr as $vurl) { if (strpos($s['body'], $vurl['href']) === false) { - $bb_imgs = '[zmg]' . $vurl['href'] . '[/zmg]' . "\n\n"; + $bb_imgs = '[zmg]' . $vurl['href'] . '[/zmg]' . "\r\n"; break; } } @@ -2579,7 +2602,7 @@ class Activity { } elseif (is_string($act->obj['url'])) { if (strpos($s['body'], $act->obj['url']) === false) { - $s['body'] .= '[zmg]' . $act->obj['url'] . '[/zmg]' . "\n\n" . $s['body']; + $s['body'] .= '[zmg]' . $act->obj['url'] . '[/zmg]' . "\r\n" . $s['body']; } } } @@ -2616,10 +2639,10 @@ class Activity { if ($purl) { $li = z_fetch_url(z_root() . '/linkinfo?binurl=' . bin2hex($purl)); if ($li['success'] && $li['body']) { - $s['body'] .= "\n" . $li['body']; + $s['body'] .= "\r\n" . $li['body']; } else { - $s['body'] .= "\n\n" . $purl; + $s['body'] .= "\r\n" . $purl; } } } @@ -3574,38 +3597,76 @@ class Activity { return; } - static function bb_attach($attach, $body) { + public static function bb_attach($item) { $ret = false; - foreach ($attach as $a) { + if (!(is_array($item['attach']) && $item['attach'])) { + return $item; + } + + foreach ($item['attach'] as $a) { + if (array_key_exists('type', $a) && stripos($a['type'], 'image') !== false) { - if (self::media_not_in_body($a['href'], $body)) { - $ret .= "\n\n" . '[img]' . $a['href'] . '[/img]'; + // don't add inline image if it's an svg and we already have an inline svg + if ($a['type'] === 'image/svg+xml' && strpos($item['body'], '[/svg]')) { + continue; + } + if (self::media_not_in_body($a['href'], $item['body'])) { + if (isset($a['name']) && $a['name']) { + $alt = htmlspecialchars($a['name'], ENT_QUOTES); + $item['body'] = '[img=' . $a['href'] . ']' . $alt . '[/img]' . "\r\n" . $item['body']; + } else { + $item['body'] = '[img]' . $a['href'] . '[/img]' . "\r\n" . $item['body']; + } } } + if (array_key_exists('type', $a) && stripos($a['type'], 'video') !== false) { - if (self::media_not_in_body($a['href'], $body)) { - $ret .= "\n\n" . '[video]' . $a['href'] . '[/video]'; + if (self::media_not_in_body($a['href'], $item['body'])) { + $item['body'] = '[video]' . $a['href'] . '[/video]' . "\r\n" . $item['body']; } } if (array_key_exists('type', $a) && stripos($a['type'], 'audio') !== false) { - if (self::media_not_in_body($a['href'], $body)) { - $ret .= "\n\n" . '[audio]' . $a['href'] . '[/audio]'; + if (self::media_not_in_body($a['href'], $item['body'])) { + $item['body'] = '[audio]' . $a['href'] . '[/audio]' . "\r\n" . $item['body']; } } + //if (array_key_exists('type', $a) && stripos($a['type'], 'activity') !== false) { + //if (self::media_not_in_body($a['href'], $item['body'])) { + //$item = self::get_quote($a['href'], $item); + //} + //} } - return $ret; + return $item; } + // check for the existence of existing media link in body - static function media_not_in_body($s, $body) { - if ((strpos($body, ']' . $s . '[/img]') === false) && + public static function media_not_in_body($s, $body) { + + $s_alt = htmlspecialchars($s, ENT_QUOTES, 'UTF-8'); + + if ( + (strpos($body, ']' . $s . '[/img]') === false) && + (strpos($body, '[img=' . $s . ']') === false) && (strpos($body, ']' . $s . '[/zmg]') === false) && + (strpos($body, '[zmg=' . $s . ']') === false) && (strpos($body, ']' . $s . '[/video]') === false) && - (strpos($body, ']' . $s . '[/audio]') === false)) { + (strpos($body, ']' . $s . '[/zvideo]') === false) && + (strpos($body, ']' . $s . '[/audio]') === false) && + (strpos($body, ']' . $s . '[/zaudio]') === false) && + (strpos($body, ']' . $s_alt . '[/img]') === false) && + (strpos($body, '[img=' . $s_alt . ']') === false) && + (strpos($body, ']' . $s_alt . '[/zmg]') === false) && + (strpos($body, '[zmg=' . $s_alt . ']') === false) && + (strpos($body, ']' . $s_alt . '[/video]') === false) && + (strpos($body, ']' . $s_alt . '[/zvideo]') === false) && + (strpos($body, ']' . $s_alt . '[/audio]') === false) && + (strpos($body, ']' . $s_alt . '[/zaudio]') === false) + ) { return true; } return false; diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php index 1c278f2ee..e77b501b3 100644 --- a/Zotlabs/Lib/ActivityStreams.php +++ b/Zotlabs/Lib/ActivityStreams.php @@ -70,9 +70,12 @@ class ActivityStreams { } } + // This indicates only that we have sucessfully decoded JSON. $this->valid = true; - if (array_key_exists('type', $this->data) && array_key_exists('actor', $this->data) && array_key_exists('object', $this->data)) { + // Special handling for Mastodon "delete actor" activities which will often fail to verify + // because the key cannot be fetched. We will catch this condition elsewhere. + if (is_array($this->data) && array_key_exists('type', $this->data) && array_key_exists('actor', $this->data) && array_key_exists('object', $this->data)) { if ($this->data['type'] === 'Delete' && $this->data['actor'] === $this->data['object']) { $this->deleted = $this->data['actor']; $this->valid = false; @@ -81,6 +84,7 @@ class ActivityStreams { } + // Attempt to assemble an Activity from what we were given. if ($this->is_valid()) { $this->id = $this->get_property_obj('id'); $this->type = $this->get_primary_type(); diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index 1421c72ae..59e4d9a4e 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -256,8 +256,8 @@ class Enotify { $itemlink = $params['link']; - if (array_key_exists('item',$params) && activity_match($params['item']['verb'],ACTIVITY_LIKE)) { - if(! $always_show_in_notices || !($vnotify & VNOTIFY_LIKE)) { + if (array_key_exists('item',$params) && (activity_match($params['item']['verb'], ACTIVITY_LIKE) || activity_match($params['item']['verb'], ACTIVITY_DISLIKE))) { + if(! $always_show_in_notices || !($vnotify & VNOTIFY_LIKE) || !feature_enabled($recip['channel_id'], 'dislike')) { logger('notification: not a visible activity. Ignoring.'); pop_lang(); return; @@ -291,22 +291,29 @@ class Enotify { ); } + if (!$p) { + pop_lang(); + return; + } + xchan_query($p); -//@@FIXME $p can be null (line 285) $item_post_type = item_post_type($p[0]); // $private = $p[0]['item_private']; $parent_id = $p[0]['id']; $parent_item = $p[0]; + $verb = ((activity_match($params['item']['verb'], ACTIVITY_DISLIKE)) ? t('disliked') : t('liked')); // "your post" if($p[0]['owner']['xchan_name'] === $p[0]['author']['xchan_name'] && intval($p[0]['item_wall'])) - $dest_str = sprintf(t('%1$s liked [zrl=%2$s]your %3$s[/zrl]'), + $dest_str = sprintf(t('%1$s %2$s [zrl=%3$s]your %4$s[/zrl]'), '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', + $verb, $itemlink, - $item_post_type); + $item_post_type + ); else { pop_lang(); return; @@ -824,6 +831,14 @@ class Enotify { $itemem_text = sprintf( t('repeated %s\'s post'), '[bdi]' . $item['author']['xchan_name'] . '[/bdi]'); } + if($item['verb'] === ACTIVITY_LIKE) { + $itemem_text = sprintf( t('liked %s\'s post'), '[bdi]' . $item['author']['xchan_name'] . '[/bdi]'); + } + + if($item['verb'] === ACTIVITY_DISLIKE) { + $itemem_text = sprintf( t('disliked %s\'s post'), '[bdi]' . $item['author']['xchan_name'] . '[/bdi]'); + } + if(in_array($item['obj_type'], ['Document', 'Video', 'Audio', 'Image'])) { $itemem_text = t('shared a file with you'); } diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index 379b329c7..8eb5ce647 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -1627,7 +1627,7 @@ class Libzot { // doesn't exist. if ($perm === 'send_stream') { - if ($force || get_pconfig($channel['channel_id'], 'system', 'hyperdrive', false) || $arr['verb'] === ACTIVITY_SHARE) { + if ($force || get_pconfig($channel['channel_id'], 'system', 'hyperdrive', false)) { $allowed = true; } } @@ -1673,6 +1673,10 @@ class Libzot { $DR->update('comment parent not found'); $result[] = $DR->get(); + if ($relay || $request || $local_public) { + continue; + } + // We don't seem to have a copy of this conversation or at least the parent // - so request a copy of the entire conversation to date. // Don't do this if it's a relay post as we're the ones who are supposed to @@ -1684,10 +1688,10 @@ class Libzot { // the top level post is unlikely to be imported and // this is just an exercise in futility. - if ((!$relay) && (!$request) && (!$local_public) - && perm_is_allowed($channel['channel_id'], $sender, 'send_stream')) { + if (perm_is_allowed($channel['channel_id'], $sender, 'send_stream')) { self::fetch_conversation($channel, $arr['parent_mid']); } + continue; } diff --git a/Zotlabs/Lib/MessageFilter.php b/Zotlabs/Lib/MessageFilter.php index 95721e7c7..70b0188c4 100644 --- a/Zotlabs/Lib/MessageFilter.php +++ b/Zotlabs/Lib/MessageFilter.php @@ -8,7 +8,7 @@ class MessageFilter { public static function evaluate($item, $incl, $excl) { - $text = prepare_text($item['body'],((isset($item['mimetype'])) ? $item['mimetype'] : 'text/x-multicode')); + $text = prepare_text($item['body'],((isset($item['mimetype'])) ? $item['mimetype'] : 'text/bbcode')); $text = html2plain(($item['title']) ? $item['title'] . ' ' . $text : $text); $lang = null; diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php deleted file mode 100644 index bf4ac8e87..000000000 --- a/Zotlabs/Lib/NativeWiki.php +++ /dev/null @@ -1,322 +0,0 @@ -<?php - -namespace Zotlabs\Lib; - -use Zotlabs\Lib\Libsync; - -define ( 'NWIKI_ITEM_RESOURCE_TYPE', 'nwiki' ); - -class NativeWiki { - - - public static function listwikis($channel, $observer_hash) { - - $sql_extra = item_permissions_sql($channel['channel_id'], $observer_hash); - $wikis = q("SELECT * FROM item - WHERE resource_type = '%s' AND mid = parent_mid AND uid = %d AND item_deleted = 0 $sql_extra", - dbesc(NWIKI_ITEM_RESOURCE_TYPE), - intval($channel['channel_id']) - ); - - if($wikis) { - foreach($wikis as &$w) { - - $w['json_allow_cid'] = acl2json($w['allow_cid']); - $w['json_allow_gid'] = acl2json($w['allow_gid']); - $w['json_deny_cid'] = acl2json($w['deny_cid']); - $w['json_deny_gid'] = acl2json($w['deny_gid']); - - $w['rawName'] = get_iconfig($w, 'wiki', 'rawName'); - $w['htmlName'] = escape_tags($w['rawName']); - //$w['urlName'] = urlencode(urlencode($w['rawName'])); - $w['urlName'] = self::name_encode($w['rawName']); - $w['mimeType'] = get_iconfig($w, 'wiki', 'mimeType'); - $w['typelock'] = get_iconfig($w, 'wiki', 'typelock'); - $w['lockstate'] = (($w['allow_cid'] || $w['allow_gid'] || $w['deny_cid'] || $w['deny_gid']) ? 'lock' : 'unlock'); - } - } - // TODO: query db for wikis the observer can access. Return with two lists, for read and write access - return array('wikis' => $wikis); - } - - - public static function create_wiki($channel, $observer_hash, $wiki, $acl) { - - $resource_id = new_uuid(); - $uuid = new_uuid(); - - $ac = $acl->get(); - $mid = z_root() . '/item/' . $uuid; - - $arr = array(); // Initialize the array of parameters for the post - $item_hidden = ((intval($wiki['postVisible']) === 0) ? 1 : 0); - $wiki_url = z_root() . '/wiki/' . $channel['channel_address'] . '/' . $wiki['urlName']; - $arr['aid'] = $channel['channel_account_id']; - $arr['uuid'] = $uuid; - $arr['uid'] = $channel['channel_id']; - $arr['mid'] = $mid; - $arr['parent_mid'] = $mid; - $arr['item_hidden'] = $item_hidden; - $arr['resource_type'] = NWIKI_ITEM_RESOURCE_TYPE; - $arr['resource_id'] = $resource_id; - $arr['owner_xchan'] = $channel['channel_hash']; - $arr['author_xchan'] = $observer_hash; - $arr['plink'] = $mid; - $arr['llink'] = z_root() . '/display/' . gen_link_id($mid); - $arr['title'] = $wiki['htmlName']; // name of new wiki; - $arr['allow_cid'] = $ac['allow_cid']; - $arr['allow_gid'] = $ac['allow_gid']; - $arr['deny_cid'] = $ac['deny_cid']; - $arr['deny_gid'] = $ac['deny_gid']; - $arr['item_wall'] = 1; - $arr['item_origin'] = 1; - $arr['item_thread_top'] = 1; - $arr['item_private'] = intval($acl->is_private()); - $arr['verb'] = ACTIVITY_CREATE; - $arr['obj_type'] = 'Document'; - $arr['body'] = '[table][tr][td][h1]New Wiki[/h1][/td][/tr][tr][td][zrl=' . $wiki_url . ']' . $wiki['htmlName'] . '[/zrl][/td][/tr][/table]'; - - $arr['public_policy'] = map_scope(\Zotlabs\Access\PermissionLimits::Get($channel['channel_id'],'view_wiki'),true); - - // Save the wiki name information using iconfig. This is shareable. - if(! set_iconfig($arr, 'wiki', 'rawName', $wiki['rawName'], true)) { - return array('item' => null, 'success' => false); - } - if(! set_iconfig($arr, 'wiki', 'mimeType', $wiki['mimeType'], true)) { - return array('item' => null, 'success' => false); - } - - set_iconfig($arr,'wiki','typelock',$wiki['typelock'],true); - - $post = item_store($arr); - - $item_id = $post['item_id']; - - if($item_id) { - \Zotlabs\Daemon\Master::Summon(array('Notifier', 'activity', $item_id)); - return array('item' => $post['item'], 'item_id' => $item_id, 'success' => true); - } - else { - return array('item' => null, 'success' => false); - } - } - - - public static function update_wiki($channel_id, $observer_hash, $arr, $acl) { - - $w = self::get_wiki($channel_id, $observer_hash, $arr['resource_id']); - $item = $w['wiki']; - - if(! $item) { - return array('item' => null, 'success' => false); - } - - $x = $acl->get(); - - $item['allow_cid'] = $x['allow_cid']; - $item['allow_gid'] = $x['allow_gid']; - $item['deny_cid'] = $x['deny_cid']; - $item['deny_gid'] = $x['deny_gid']; - $item['item_private'] = intval($acl->is_private()); - - $update_title = false; - - if($item['title'] !== $arr['updateRawName']) { - $update_title = true; - $item['title'] = $arr['updateRawName']; - } - - $update = item_store_update($item); - - $item_id = $update['item_id']; - - // update acl for any existing wiki pages - - q("update item set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', item_private = %d where resource_type = 'nwikipage' and resource_id = '%s'", - dbesc($item['allow_cid']), - dbesc($item['allow_gid']), - dbesc($item['deny_cid']), - dbesc($item['deny_gid']), - dbesc($item['item_private']), - dbesc($arr['resource_id']) - ); - - - if($update['item_id']) { - info( t('Wiki updated successfully')); - if($update_title) { - // Update the wiki name information using iconfig. - if(! set_iconfig($update['item_id'], 'wiki', 'rawName', $arr['updateRawName'], true)) { - return array('item' => null, 'success' => false); - } - } - return array('item' => $update['item'], 'item_id' => $update['item_id'], 'success' => $update['success']); - } - else { - return array('item' => null, 'success' => false); - } - } - - - public static function sync_a_wiki_item($uid,$id,$resource_id) { - - $r = q("SELECT * from item WHERE uid = %d AND ( id = %d OR ( resource_type = '%s' and resource_id = '%s' )) ", - intval($uid), - intval($id), - dbesc(NWIKI_ITEM_RESOURCE_TYPE), - dbesc($resource_id) - ); - if($r) { - - $q = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s'", - dbesc($r[0]['resource_id']) - ); - if($q) { - $r = array_merge($r,$q); - } - xchan_query($r); - $sync_item = fetch_post_tags($r); - if($sync_item) { - $pkt = []; - foreach($sync_item as $w) { - $pkt[] = encode_item($w,true); - } - Libsync::build_sync_packet($uid,array('wiki' => $pkt)); - } - } - } - - - public static function delete_wiki($channel_id,$observer_hash,$resource_id) { - - $w = self::get_wiki($channel_id,$observer_hash,$resource_id); - if(! $w['wiki']) { - return [ 'success' => false ]; - } - else { - - $r = q("SELECT id FROM item WHERE uid = %s AND resource_id = '%s'", - intval($channel_id), - dbesc($resource_id) - ); - - $ids = array_column($r, 'id'); - drop_items($ids, true, DROPITEM_PHASE1); - - info(t('Wiki files deleted successfully')); - - return [ 'success' => true ]; - } - } - - - public static function get_wiki($channel_id, $observer_hash, $resource_id) { - - $sql_extra = item_permissions_sql($channel_id,$observer_hash); - - $item = q("SELECT * FROM item WHERE uid = %d AND resource_type = '%s' AND resource_id = '%s' AND item_deleted = 0 - $sql_extra ORDER BY id LIMIT 1", - intval($channel_id), - dbesc(NWIKI_ITEM_RESOURCE_TYPE), - dbesc($resource_id) - ); - if(! $item) { - return [ 'wiki' => null ]; - } - else { - - $w = $item[0]; // wiki item table record - // Get wiki metadata - $rawName = get_iconfig($w, 'wiki', 'rawName'); - $mimeType = get_iconfig($w, 'wiki', 'mimeType'); - $typelock = get_iconfig($w, 'wiki', 'typelock'); - - return array( - 'wiki' => $w, - 'rawName' => $rawName, - 'htmlName' => escape_tags($rawName), - //'urlName' => urlencode(urlencode($rawName)), - 'urlName' => self::name_encode($rawName), - 'mimeType' => $mimeType, - 'typelock' => $typelock - ); - } - } - - - public static function exists_by_name($uid, $urlName) { - - $sql_extra = item_permissions_sql($uid); - - $item = q("SELECT item.id, resource_id FROM item left join iconfig on iconfig.iid = item.id - WHERE resource_type = '%s' AND iconfig.v = '%s' AND uid = %d - AND item_deleted = 0 $sql_extra limit 1", - dbesc(NWIKI_ITEM_RESOURCE_TYPE), - //dbesc(urldecode($urlName)), - dbesc(self::name_decode($urlName)), - intval($uid) - ); - - if($item) { - return array('id' => $item[0]['id'], 'resource_id' => $item[0]['resource_id']); - } - else { - return array('id' => null, 'resource_id' => null); - } - } - - - public static function get_permissions($resource_id, $owner_id, $observer_hash) { - - // TODO: For now, only the owner can edit - $sql_extra = item_permissions_sql($owner_id, $observer_hash); - - if(local_channel() && local_channel() == $owner_id) { - return [ 'read' => true, 'write' => true, 'success' => true ]; - } - - $r = q("SELECT * FROM item WHERE uid = %d and resource_type = '%s' AND resource_id = '%s' $sql_extra LIMIT 1", - intval($owner_id), - dbesc(NWIKI_ITEM_RESOURCE_TYPE), - dbesc($resource_id) - ); - - if(! $r) { - return array('read' => false, 'write' => false, 'success' => true); - } - else { - $write = perm_is_allowed($owner_id, $observer_hash,'write_wiki'); - return array('read' => true, 'write' => $write, 'success' => true); - } - } - - - public static function name_encode ($string) { - - $string = html_entity_decode($string); - $encoding = mb_internal_encoding(); - mb_internal_encoding("UTF-8"); - $ret = mb_ereg_replace_callback ('[^A-Za-z0-9\-\_\.\~]',function ($char) { - $charhex = unpack('H*',$char[0]); - $ret = '('.$charhex[1].')'; - return $ret; - } - ,$string); - mb_internal_encoding($encoding); - return $ret; - } - - - public static function name_decode ($string) { - - $encoding = mb_internal_encoding(); - mb_internal_encoding("UTF-8"); - $ret = mb_ereg_replace_callback ('(\(([0-9a-f]+)\))',function ($chars) { - return pack('H*',$chars[2]); - } - ,$string); - mb_internal_encoding($encoding); - return $ret; - } - -} diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php deleted file mode 100644 index 1e944f7ac..000000000 --- a/Zotlabs/Lib/NativeWikiPage.php +++ /dev/null @@ -1,725 +0,0 @@ -<?php - -namespace Zotlabs\Lib; - -use App; -use Zotlabs\Access\PermissionLimits; - -class NativeWikiPage { - - static public function page_list($channel_id, $observer_hash, $resource_id) { - - // TODO: Create item table records for pages so that metadata like title can be applied - $w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id); - - $pages[] = [ - 'resource_id' => '', - 'title' => 'Home', - 'url' => 'Home', - 'link_id' => 'id_wiki_home_0' - ]; - - $sql_extra = item_permissions_sql($channel_id, $observer_hash); - - $r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and item_deleted = 0 - $sql_extra order by title asc", - dbesc($resource_id), - intval($channel_id) - ); - if ($r) { - $x = []; - $y = []; - - foreach ($r as $rv) { - if (!in_array($rv['mid'], $x)) { - $y[] = $rv; - $x[] = $rv['mid']; - } - } - - $items = fetch_post_tags($y, true); - - foreach ($items as $page_item) { - $title = get_iconfig($page_item['id'], 'nwikipage', 'pagetitle', t('(No Title)')); - if (urldecode($title) !== 'Home') { - $pages[] = [ - 'resource_id' => $resource_id, - 'title' => escape_tags($title), - //'url' => str_replace('%2F','/',urlencode(str_replace('%2F','/',urlencode($title)))), - 'url' => NativeWiki::name_encode($title), - 'link_id' => 'id_' . substr($resource_id, 0, 10) . '_' . $page_item['id'] - ]; - } - } - } - - return ['pages' => $pages, 'wiki' => $w]; - } - - - static public function create_page($channel, $observer_hash, $name, $resource_id, $mimetype = 'text/bbcode') { - - logger('mimetype: ' . $mimetype); - - if (!in_array($mimetype, ['text/markdown', 'text/bbcode', 'text/plain', 'text/html'])) - $mimetype = 'text/markdown'; - - $w = NativeWiki::get_wiki($channel['channel_id'], $observer_hash, $resource_id); - - if (!$w['wiki']) { - return ['content' => null, 'message' => 'Error reading wiki', 'success' => false]; - } - - // backslashes won't work well in the javascript functions - $name = str_replace('\\', '', $name); - - $uuid = new_uuid(); - $mid = z_root() . '/item/' . $uuid; - - // create an empty activity - $arr = []; - $arr['aid'] = $channel['channel_account_id']; - $arr['uid'] = $channel['channel_id']; - $arr['mid'] = $mid; - $arr['parent_mid'] = $w['wiki']['mid']; - $arr['parent'] = $w['wiki']['parent']; - $arr['uuid'] = $uuid; - $arr['item_hidden'] = $w['wiki']['item_hidden']; - $arr['plink'] = $mid; - $arr['llink'] = z_root() . '/display/' . gen_link_id($mid); - $arr['author_xchan'] = $observer_hash; - $arr['mimetype'] = $mimetype; - $arr['title'] = $name; - $arr['resource_type'] = 'nwikipage'; - $arr['resource_id'] = $resource_id; - $arr['allow_cid'] = $w['wiki']['allow_cid']; - $arr['allow_gid'] = $w['wiki']['allow_gid']; - $arr['deny_cid'] = $w['wiki']['deny_cid']; - $arr['deny_gid'] = $w['wiki']['deny_gid']; - $arr['item_private'] = $w['wiki']['item_private']; - $arr['item_wall'] = 1; - $arr['item_origin'] = 1; - $arr['item_thread_top'] = 1; - $arr['verb'] = ACTIVITY_CREATE; - $arr['obj_type'] = 'Document'; - // TODO: add an object? - $arr['public_policy'] = map_scope(PermissionLimits::Get($channel['channel_id'], 'view_wiki'), true); - - // We may wish to change this some day. - $arr['item_unpublished'] = 1; - - set_iconfig($arr, 'nwikipage', 'pagetitle', (($name) ? $name : t('(No Title)')), true); - $p = item_store($arr, false, false); - - if ($p['item_id']) { - $page = [ - 'rawName' => $name, - 'htmlName' => escape_tags($name), - //'urlName' => urlencode($name), - 'urlName' => NativeWiki::name_encode($name) - - ]; - - return ['page' => $page, 'item_id' => $p['item_id'], 'item' => $p['activity'], 'wiki' => $w, 'message' => '', 'success' => true]; - } - return ['success' => false, 'message' => t('Wiki page create failed.')]; - } - - - static public function rename_page($arr) { - - $pageUrlName = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : ''); - $pageNewName = ((array_key_exists('pageNewName', $arr)) ? $arr['pageNewName'] : ''); - $resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : ''); - $observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : ''); - $channel_id = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0); - - $w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id); - if (!$w['wiki']) { - return ['message' => t('Wiki not found.'), 'success' => false]; - } - - - $ic = q("select * from iconfig left join item on iconfig.iid = item.id - where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'", - intval($channel_id), - dbesc($pageNewName) - ); - - if ($ic) { - return ['success' => false, 'message' => t('Destination name already exists')]; - } - - - $ids = []; - - $ic = q("select *, item.id as item_id from iconfig left join item on iconfig.iid = item.id - where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'", - intval($channel_id), - dbesc($pageUrlName) - ); - - if ($ic) { - foreach ($ic as $c) { - set_iconfig($c['item_id'], 'nwikipage', 'pagetitle', $pageNewName); - $ids[] = $c['item_id']; - } - - $str_ids = implode(',', $ids); - q("update item set title = '%s' where id in ($str_ids)", - dbesc($pageNewName) - ); - - $page = [ - 'rawName' => $pageNewName, - 'htmlName' => escape_tags($pageNewName), - //'urlName' => urlencode(escape_tags($pageNewName)) - 'urlName' => NativeWiki::name_encode($pageNewName) - ]; - - return ['success' => true, 'page' => $page]; - } - - return ['success' => false, 'message' => t('Page not found')]; - - } - - - static public function get_page_content($arr) { - - $resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : ''); - $observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : ''); - $channel_id = ((array_key_exists('channel_id', $arr)) ? intval($arr['channel_id']) : 0); - - $w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id); - if (!$w['wiki']) { - return ['content' => null, 'message' => 'Error reading wiki', 'success' => false]; - } - - $item = self::load_page($arr); - - if ($item) { - $content = $item['body']; - - return [ - 'content' => $content, - 'mimeType' => $w['mimeType'], - 'pageMimeType' => $item['mimetype'], - 'message' => '', - 'success' => true - ]; - } - - return ['content' => null, 'message' => t('Error reading page content'), 'success' => false]; - - } - - - static public function page_history($arr) { - - $resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : ''); - $observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : ''); - $channel_id = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0); - - $w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id); - if (!$w['wiki']) { - return ['history' => null, 'message' => 'Error reading wiki', 'success' => false]; - } - - $items = self::load_page_history($arr); - - $history = []; - - if ($items) { - $processed = 0; - foreach ($items as $item) { - if ($processed > 1000) - break; - $processed++; - $history[] = [ - 'revision' => $item['revision'], - 'date' => datetime_convert('UTC', date_default_timezone_get(), $item['edited']), - 'name' => $item['author']['xchan_name'], - 'title' => get_iconfig($item, 'nwikipage', 'commit_msg') - ]; - - } - - return ['success' => true, 'history' => $history]; - } - - return ['success' => false]; - - } - - - static public function load_page($arr) { - - $pageUrlName = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : ''); - $resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : ''); - $observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : ''); - $channel_id = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0); - $revision = ((array_key_exists('revision', $arr)) ? $arr['revision'] : (-1)); - - $w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id); - - if (!$w['wiki']) { - return ['content' => null, 'message' => 'Error reading wiki', 'success' => false]; - } - - $ids = ''; - - $ic = q("select * from iconfig left join item on iconfig.iid = item.id where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'", - intval($channel_id), - dbesc($pageUrlName) - ); - - if ($ic) { - foreach ($ic as $c) { - if ($ids) - $ids .= ','; - $ids .= intval($c['iid']); - } - } - - $sql_extra = item_permissions_sql($channel_id, $observer_hash); - - if ($revision == (-1)) - $sql_extra .= " order by revision desc "; - elseif ($revision) - $sql_extra .= " and revision = " . intval($revision) . " "; - - $r = null; - - - if ($ids) { - $r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and id in ( $ids ) $sql_extra limit 1", - dbesc($resource_id), - intval($channel_id) - ); - - if ($r) { - $items = fetch_post_tags($r, true); - return $items[0]; - } - } - - return null; - } - - - static public function load_page_history($arr) { - - $pageUrlName = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : ''); - $resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : ''); - $observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : ''); - $channel_id = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0); - - $w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id); - if (!$w['wiki']) { - return ['content' => null, 'message' => 'Error reading wiki', 'success' => false]; - } - - $ids = ''; - - $ic = q("select * from iconfig left join item on iconfig.iid = item.id where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'", - intval($channel_id), - dbesc($pageUrlName) - ); - - if ($ic) { - foreach ($ic as $c) { - if ($ids) - $ids .= ','; - $ids .= intval($c['iid']); - } - } - - $sql_extra = item_permissions_sql($channel_id, $observer_hash); - - $sql_extra .= " order by revision desc "; - - $r = null; - if ($ids) { - $r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and id in ( $ids ) and item_deleted = 0 $sql_extra", - dbesc($resource_id), - intval($channel_id) - ); - if ($r) { - xchan_query($r); - $items = fetch_post_tags($r, true); - return $items; - } - } - - return null; - } - - - static public function save_page($arr) { - $pageUrlName = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : ''); - $content = ((array_key_exists('content', $arr)) ? $arr['content'] : ''); - $resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : ''); - $observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : ''); - $channel_id = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0); - - $w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id); - - if (!$w['wiki']) { - return ['message' => t('Error reading wiki'), 'success' => false]; - } - - - // fetch the most recently saved revision. - - $item = self::load_page($arr); - - if (!$item) { - return ['message' => t('Page not found'), 'success' => false]; - } - - $mimetype = $item['mimetype']; - - // change just the fields we need to change to create a revision; - - unset($item['id']); - unset($item['author']); - $item['parent'] = 0; - $item['body'] = $content; - $item['author_xchan'] = $observer_hash; - $item['revision'] = (($arr['revision']) ? intval($arr['revision']) + 1 : intval($item['revision']) + 1); - $item['edited'] = datetime_convert(); - $item['mimetype'] = $mimetype; - - if ($item['iconfig'] && is_array($item['iconfig']) && count($item['iconfig'])) { - for ($x = 0; $x < count($item['iconfig']); $x++) { - unset($item['iconfig'][$x]['id']); - unset($item['iconfig'][$x]['iid']); - } - } - - $ret = item_store($item, false, false); - - if ($ret['item_id']) - return ['message' => '', 'item_id' => $ret['item_id'], 'filename' => $pageUrlName, 'success' => true]; - else - return ['message' => t('Page update failed.'), 'success' => false]; - } - - - static public function delete_page($arr) { - - $pageUrlName = (array_key_exists('pageUrlName', $arr) ? $arr['pageUrlName'] : ''); - $resource_id = (array_key_exists('resource_id', $arr) ? $arr['resource_id'] : ''); - $observer_hash = (array_key_exists('observer_hash', $arr) ? $arr['observer_hash'] : ''); - $channel_id = (array_key_exists('channel_id', $arr) ? $arr['channel_id'] : 0); - - $w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id); - if (!$w['wiki']) { - return ['success' => false, 'message' => t('Error reading wiki')]; - } - - $ids = []; - - $ic = q("select * from iconfig left join item on iconfig.iid = item.id - where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'", - intval($channel_id), - dbesc($pageUrlName) - ); - - if ($ic) { - foreach ($ic as $c) { - $ids[] = intval($c['iid']); - } - } - - if ($ids) { - drop_items($ids, true, DROPITEM_PHASE1); - return ['success' => true]; - } - - return ['success' => false, 'message' => t('Nothing deleted')]; - } - - - static public function revert_page($arr) { - - $resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : ''); - $commitHash = ((array_key_exists('commitHash', $arr)) ? $arr['commitHash'] : null); - $observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : ''); - $channel_id = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0); - - if (!$commitHash) { - return ['message' => 'No commit was provided', 'success' => false]; - } - - $w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id); - if (!$w['wiki']) { - return ['message' => 'Error reading wiki', 'success' => false]; - } - - $x = $arr; - - if (intval($commitHash) > 0) { - unset($x['commitHash']); - $x['revision'] = intval($commitHash) - 1; - $loaded = self::load_page($x); - - if ($loaded) { - $content = $loaded['body']; - return ['content' => $content, 'success' => true]; - } - return ['success' => false]; - } - } - - - static public function compare_page($arr) { - - $resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : ''); - $compareCommit = ((array_key_exists('compareCommit', $arr)) ? $arr['compareCommit'] : 0); - $observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : ''); - $channel_id = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0); - - $w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id); - - if (!$w['wiki']) { - return ['message' => t('Error reading wiki'), 'success' => false]; - } - - $x = $arr; - $x['revision'] = (-1); - - $currpage = self::load_page($x); - if ($currpage) - $currentContent = $currpage['body']; - - $x['revision'] = $compareCommit; - $comppage = self::load_page($x); - if ($comppage) - $compareContent = $comppage['body']; - - if ($currpage && $comppage) { - require_once('library/class.Diff.php'); - $diff = \Diff::toTable(\Diff::compare($currentContent, $compareContent)); - - return ['success' => true, 'diff' => $diff]; - } - return ['success' => false, 'message' => t('Compare: object not found.')]; - - } - - - static public function commit($arr) { - - $commit_msg = ((array_key_exists('commit_msg', $arr)) ? $arr['commit_msg'] : t('Page updated')); - $observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : ''); - $channel_id = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0); - - if (array_key_exists('resource_id', $arr)) { - $resource_id = $arr['resource_id']; - } - else { - return ['message' => t('Wiki resource_id required for git commit'), 'success' => false]; - } - - $w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id); - if (!$w['wiki']) { - return ['message' => t('Error reading wiki'), 'success' => false]; - } - - - $page = self::load_page($arr); - - if ($page) { - set_iconfig($page['id'], 'nwikipage', 'commit_msg', escape_tags($commit_msg), true); - return ['success' => true, 'item_id' => $page['id'], 'page' => $page]; - } - - return ['success' => false, 'message' => t('Page not found.')]; - - } - - static public function convert_links($s, $wikiURL) { - - if (strpos($s, '[[') !== false) { - preg_match_all("/\[\[(.*?)\]\]/", $s, $match); - $pages = $pageURLs = []; - foreach ($match[1] as $m) { - // TODO: Why do we need to double urlencode for this to work? - //$pageURLs[] = urlencode(urlencode(escape_tags($m))); - $titleUri = explode('|', $m); - $page = $titleUri[0] ?? ''; - $title = $titleUri[1] ?? $page; - $pageURLs[] = NativeWiki::name_encode(escape_tags($page)); - $pages[] = $title; - } - $idx = 0; - while (strpos($s, '[[') !== false) { - $replace = '<a href="' . $wikiURL . '/' . $pageURLs[$idx] . '">' . $pages[$idx] . '</a>'; - $s = preg_replace("/\[\[(.*?)\]\]/", $replace, $s, 1); - $idx++; - } - } - return $s; - } - - static public function render_page_history($arr) { - - $pageUrlName = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : ''); - $resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : ''); - - $pageHistory = self::page_history([ - 'channel_id' => App::$profile_uid, - 'observer_hash' => get_observer_hash(), - 'resource_id' => $resource_id, - 'pageUrlName' => $pageUrlName - ]); - - return replace_macros(get_markup_template('nwiki_page_history.tpl'), [ - '$pageHistory' => $pageHistory['history'], - '$permsWrite' => $arr['permsWrite'], - '$name_lbl' => t('Name'), - '$msg_label' => t('Message', 'wiki_history'), - '$date_lbl' => t('Date'), - '$revert_btn' => t('Revert'), - '$compare_btn' => t('Compare') - ]); - - } - - - /** - * Replace the instances of the string [toc] with a list element that will be populated by - * a table of contents by the JavaScript library - * @param string $s - * @return string - */ - static public function generate_toc($s) { - if (strpos($s, '[toc]') !== false) { - //$toc_md = wiki_toc($s); // Generate Markdown-formatted list prior to HTML render - $toc_md = '<ul id="wiki-toc"></ul>'; // use the available jQuery plugin http://ndabas.github.io/toc/ - $s = preg_replace("/\[toc\]/", $toc_md, $s, -1); - } - return $s; - } - - - /** - * Converts a select set of bbcode tags. Much of the code is copied from include/bbcode.php - * @param string $s - * @return string - */ - static public function bbcode($s) { - - $s = str_replace(['[baseurl]', '[sitename]'], [z_root(), get_config('system', 'sitename')], $s); - - $s = preg_replace_callback("/\[observer\.language\=(.*?)\](.*?)\[\/observer\]/ism", 'oblanguage_callback', $s); - - $s = preg_replace_callback("/\[observer\.language\!\=(.*?)\](.*?)\[\/observer\]/ism", 'oblanguage_necallback', $s); - - - $observer = App::get_observer(); - if ($observer) { - $s1 = '<span class="bb_observer" title="' . t('Different viewers will see this text differently') . '">'; - $s2 = '</span>'; - $obsBaseURL = $observer['xchan_connurl']; - $obsBaseURL = preg_replace("/\/poco\/.*$/", '', $obsBaseURL); - $s = str_replace('[observer.baseurl]', $obsBaseURL, $s); - $s = str_replace('[observer.url]', $observer['xchan_url'], $s); - $s = str_replace('[observer.name]', $s1 . $observer['xchan_name'] . $s2, $s); - $s = str_replace('[observer.address]', $s1 . $observer['xchan_addr'] . $s2, $s); - $s = str_replace('[observer.webname]', substr($observer['xchan_addr'], 0, strpos($observer['xchan_addr'], '@')), $s); - $s = str_replace('[observer.photo]', '', $s); - } - else { - $s = str_replace('[observer.baseurl]', '', $s); - $s = str_replace('[observer.url]', '', $s); - $s = str_replace('[observer.name]', '', $s); - $s = str_replace('[observer.address]', '', $s); - $s = str_replace('[observer.webname]', '', $s); - $s = str_replace('[observer.photo]', '', $s); - } - - return $s; - } - - - static public function get_file_ext($arr) { - - if ($arr['mimetype'] === 'text/bbcode') - return '.bb'; - elseif ($arr['mimetype'] === 'text/markdown') - return '.md'; - elseif ($arr['mimetype'] === 'text/plain') - return '.txt'; - - } - - // This function is derived from - // http://stackoverflow.com/questions/32068537/generate-table-of-contents-from-markdown-in-php - static public function toc($content) { - // ensure using only "\n" as line-break - $source = str_replace(["\r\n", "\r"], "\n", $content); - - // look for markdown TOC items - preg_match_all( - '/^(?:=|-|#).*$/m', - $source, - $matches, - PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE - ); - - // preprocess: iterate matched lines to create an array of items - // where each item is an array(level, text) - $file_size = strlen($source); - foreach ($matches[0] as $item) { - $found_mark = substr($item[0], 0, 1); - if ($found_mark == '#') { - // text is the found item - $item_text = $item[0]; - $item_level = strrpos($item_text, '#') + 1; - $item_text = substr($item_text, $item_level); - } - else { - // text is the previous line (empty if <hr>) - $item_offset = $item[1]; - $prev_line_offset = strrpos($source, "\n", -($file_size - $item_offset + 2)); - $item_text = - substr($source, $prev_line_offset, $item_offset - $prev_line_offset - 1); - $item_text = trim($item_text); - $item_level = $found_mark == '=' ? 1 : 2; - } - if (!trim($item_text) or strpos($item_text, '|') !== FALSE) { - // item is an horizontal separator or a table header, don't mind - continue; - } - $raw_toc[] = ['level' => $item_level, 'text' => trim($item_text)]; - } - $o = ''; - foreach ($raw_toc as $t) { - $level = intval($t['level']); - $text = $t['text']; - switch ($level) { - case 1: - $li = '* '; - break; - case 2: - $li = ' * '; - break; - case 3: - $li = ' * '; - break; - case 4: - $li = ' * '; - break; - default: - $li = '* '; - break; - } - $o .= $li . $text . "\n"; - } - return $o; - } - -} diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 8d20935a1..a02c1415e 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -162,24 +162,11 @@ class ThreadItem { $mode = $conv->get_mode(); - switch($item['item_type']) { - case ITEM_TYPE_CARD: - $edlink = 'card_edit'; - break; - case ITEM_TYPE_ARTICLE: - $edlink = 'article_edit'; - break; - default: - $edlink = 'editpost'; - break; - } - if(local_channel() && $observer['xchan_hash'] === $item['author_xchan']) - $edpost = array(z_root() . '/' . $edlink . '/' . $item['id'], t('Edit')); + $edpost = array(z_root() . '/editpost/' . $item['id'], t('Edit')); else $edpost = false; - if($observer && $observer['xchan_hash'] && ($observer['xchan_hash'] == $this->get_data_value('author_xchan') || $observer['xchan_hash'] == $this->get_data_value('owner_xchan') @@ -297,7 +284,7 @@ class ThreadItem { if($this->is_toplevel()) { // FIXME check this permission - if(($conv->get_profile_owner() == local_channel()) && (! array_key_exists('real_uid',$item))) { + if($conv->get_profile_owner() === local_channel() || intval($item['item_private']) === 0) { $star = array( 'toggle' => t("Toggle Star Status"), diff --git a/Zotlabs/Lib/ThreadStream.php b/Zotlabs/Lib/ThreadStream.php index 7fe8fcc2e..2ad24a690 100644 --- a/Zotlabs/Lib/ThreadStream.php +++ b/Zotlabs/Lib/ThreadStream.php @@ -69,12 +69,12 @@ class ThreadStream { case 'cards': $this->profile_owner = \App::$profile['profile_uid']; $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments'); - $this->reload = $_SESSION['return_url']; + //$this->reload = $_SESSION['return_url']; break; case 'articles': $this->profile_owner = \App::$profile['profile_uid']; $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments'); - $this->reload = $_SESSION['return_url']; + //$this->reload = $_SESSION['return_url']; break; case 'display': // in this mode we set profile_owner after initialisation (from conversation()) and then |