From 7ceae1c81e259c0d83c4a3a49a4e606a45c2e153 Mon Sep 17 00:00:00 2001 From: zlax Date: Thu, 16 Jul 2026 10:29:49 +0300 Subject: [PATCH] hubzilla 11 update --- link/Mod_Link.php | 427 ++-------------------------------------------- link/README.md | 4 +- link/link.php | 16 +- 3 files changed, 27 insertions(+), 420 deletions(-) diff --git a/link/Mod_Link.php b/link/Mod_Link.php index 55cfb47..74586d4 100644 --- a/link/Mod_Link.php +++ b/link/Mod_Link.php @@ -2,429 +2,38 @@ namespace Zotlabs\Module; -require_once('include/bbcode.php'); -require_once('include/security.php'); -require_once('include/conversation.php'); -require_once('include/acl_selectors.php'); -require_once('include/items.php'); +use Zotlabs\Web\Controller; -class Link extends \Zotlabs\Web\Controller { +class Link extends Controller { - function get($update = 0, $load = false) { + function init() { - $noscript_content = (get_config('system', 'noscript_content', '1') && (! $update)); - - $module_format = 'html'; - - $item_id = ((argc() > 1) ? intval(argv(1)) : 0); - - if(! $item_id) { - \App::$error = 404; - notice( t('Item not found.') . EOL); - return; } - if($load) - $_SESSION['loadtime'] = datetime_convert(); + function get() { - if(observer_prohibited()) { - notice( t('Public access denied.') . EOL); - return; - } + $item_id = ((argc() > 1) ? intval(argv(1)) : 0); - $observer_is_owner = false; + if(! $item_id) { + \App::$error = 404; + notice( t('Item not found.') . EOL); + return; + } - if(local_channel() && (! $update)) { - - $channel = \App::get_channel(); - - $channel_acl = array( - 'allow_cid' => $channel['channel_allow_cid'], - 'allow_gid' => $channel['channel_allow_gid'], - 'deny_cid' => $channel['channel_deny_cid'], - 'deny_gid' => $channel['channel_deny_gid'] - ); - - $x = array( - 'is_owner' => true, - 'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''), - 'default_location' => $channel['channel_location'], - 'nickname' => $channel['channel_address'], - 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'acl' => populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), - 'permissions' => $channel_acl, - 'bang' => '', - 'visitor' => true, - 'profile_uid' => local_channel(), - 'return_path' => 'channel/' . $channel['channel_address'], - 'expanded' => true, - 'editor_autocomplete' => true, - 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true, - 'jotnets' => true, - 'reset' => t('Reset form') + $r = q("select uuid from item where id = %d limit 1", + intval($item_id) ); - $o = '
'; - $o .= status_editor($x,false,'Display'); - $o .= '
'; - } - - // This page can be viewed by anybody so the query could be complicated - // First we'll see if there is a copy of the item which is owned by us - if we're logged in locally. - // If that fails (or we aren't logged in locally), - // query an item in which the observer (if logged in remotely) has cid or gid rights - // and if that fails, look for a copy of the post that has no privacy restrictions. - // If we find the post, but we don't find a copy that we're allowed to look at, this fact needs to be reported. - - // find a copy of the item somewhere - - $target_item = null; - - $r = q("select id, uid, mid, parent, parent_mid, thr_parent, verb, item_type, item_deleted, author_xchan, item_blocked from item where id = '%s' limit 1", - - dbesc($item_id . '%') - ); - - if($r) { - $target_item = $r[0]; - } - - $x = q("select * from xchan where xchan_hash = '%s' limit 1", - dbesc($target_item['author_xchan']) - ); - - if($x) { - // not yet ready for prime time - // \App::$poi = $x[0]; - } - - //if the item is to be moderated redirect to /moderate - if($target_item['item_blocked'] == ITEM_MODERATED) { - goaway(z_root() . '/moderate/' . $target_item['id']); - } - - $r = null; - - if($target_item['item_type'] == ITEM_TYPE_WEBPAGE) { - $x = q("select * from channel where channel_id = %d limit 1", - intval($target_item['uid']) - ); - $y = q("select * from iconfig left join item on iconfig.iid = item.id - where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item.id = %d limit 1", - intval($target_item['uid']), - intval($target_item['parent']) - ); - if($x && $y) { - goaway(z_root() . '/page/' . $x[0]['channel_address'] . '/' . $y[0]['v']); - } - else { - notice( t('Page not found.') . EOL); - return ''; - } - } - if($target_item['item_type'] == ITEM_TYPE_ARTICLE) { - $x = q("select * from channel where channel_id = %d limit 1", - intval($target_item['uid']) - ); - $y = q("select * from iconfig left join item on iconfig.iid = item.id - where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and item.id = %d limit 1", - intval($target_item['uid']), - intval($target_item['parent']) - ); - if($x && $y) { - goaway(z_root() . '/articles/' . $x[0]['channel_address'] . '/' . $y[0]['v']); - } - else { - notice( t('Page not found.') . EOL); - return ''; - } - } - if($target_item['item_type'] == ITEM_TYPE_CARD) { - $x = q("select * from channel where channel_id = %d limit 1", - intval($target_item['uid']) - ); - $y = q("select * from iconfig left join item on iconfig.iid = item.id - where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'CARD' and item.id = %d limit 1", - intval($target_item['uid']), - intval($target_item['parent']) - ); - if($x && $y) { - goaway(z_root() . '/cards/' . $x[0]['channel_address'] . '/' . $y[0]['v']); - } - else { - notice( t('Page not found.') . EOL); - return ''; - } - } - if ($target_item['item_type'] == ITEM_TYPE_CUSTOM) { - call_hooks('item_custom_display',$target_item); - notice( t('Page not found.') . EOL); - return ''; - } - - $static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0); - - $simple_update = (($update) ? " AND item_unseen = 1 " : ''); - - if($update && $_SESSION['loadtime']) - $simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) "; - if($load) - $simple_update = ''; - - if($static && $simple_update) - $simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) "; - - if((! $update) && (! $load)) { - - // $static = ((local_channel()) ? channel_manual_conv_update(local_channel()) : 1); - - // if the target item is not a post (eg a like) we want to address its thread parent - // $mid = ((($target_item['verb'] == ACTIVITY_LIKE) || ($target_item['verb'] == ACTIVITY_DISLIKE)) ? $target_item['thr_parent'] : $target_item['mid']); - $mid = $target_item['mid']; - - - // we must encode it again before handing to javascript - $mid = 'b64.' . base64url_encode($mid); - - $o .= '
' . "\r\n"; - $o .= "\r\n"; - - \App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( - '$baseurl' => z_root(), - '$pgtype' => 'display', - '$uid' => '0', - '$gid' => '0', - '$cid' => '0', - '$cmin' => '(-1)', - '$cmax' => '(-1)', - '$star' => '0', - '$liked' => '0', - '$conv' => '0', - '$spam' => '0', - '$fh' => '0', - '$dm' => '0', - '$nouveau' => '0', - '$wall' => '0', - '$static' => $static, - '$page' => ((\App::$pager['page'] != 1) ? \App::$pager['page'] : 1), - '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), - '$search' => '', - '$xchan' => '', - '$order' => '', - '$file' => '', - '$cats' => '', - '$tags' => '', - '$dend' => '', - '$dbegin' => '', - '$verb' => '', - '$net' => '', - '$mid' => (($mid) ? urlencode($mid) : '') - )); - - head_add_link([ - 'rel' => 'alternate', - 'type' => 'application/json+oembed', - 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string), - 'title' => 'oembed' - ]); - - } - - $observer_hash = get_observer_hash(); - $item_normal = item_normal(); - $item_normal_update = item_normal_update(); - - $sql_extra = public_permissions_sql($observer_hash); - - if($noscript_content || $load) { - - $r = null; - - require_once('include/channel.php'); - $sys = get_sys_channel(); - $sysid = $sys['channel_id']; - - if(local_channel()) { - $r = q("SELECT item.id as item_id from item WHERE uid = %d and mid = '%s' $item_normal limit 1", - intval(local_channel()), - dbesc($target_item['parent_mid']) - ); + if (!$r) { + notice( t('Item not found.') . EOL); + return; } - if(! $r) { - - // in case somebody turned off public access to sys channel content using permissions - // make that content unsearchable by ensuring the owner uid can't match - - if(! perm_is_allowed($sysid,$observer_hash,'view_stream')) - $sysid = 0; - - $r = q("SELECT item.id as item_id from item - WHERE mid = '%s' - AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid = '' - AND item.deny_gid = '' AND item_private = 0 ) - and uid in ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " )) - OR uid = %d ) - $sql_extra ) - $item_normal - limit 1", - dbesc($target_item['parent_mid']), - intval($sysid) - ); - } - } - - elseif($update && !$load) { - $r = null; - - require_once('include/channel.php'); - $sys = get_sys_channel(); - $sysid = $sys['channel_id']; - if(local_channel()) { - $r = q("SELECT item.parent AS item_id from item - WHERE uid = %d - and parent_mid = '%s' - $item_normal_update - $simple_update - limit 1", - intval(local_channel()), - dbesc($target_item['parent_mid']) - ); + if (get_config('link','hideasides')) { + goaway(z_root() . '/display/' . $r[0]['uuid'] . '?link_hideasides=1'); } - if($r === null) { - // in case somebody turned off public access to sys channel content using permissions - // make that content unsearchable by ensuring the owner_xchan can't match - if(! perm_is_allowed($sysid,$observer_hash,'view_stream')) - $sysid = 0; - $r = q("SELECT item.parent AS item_id from item - WHERE parent_mid = '%s' - AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid = '' - AND item.deny_gid = '' AND item_private = 0 ) - and uid in ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " )) - OR uid = %d ) - $sql_extra ) - $item_normal_update - $simple_update - limit 1", - dbesc($target_item['parent_mid']), - intval($sysid) - ); - } - $_SESSION['loadtime'] = datetime_convert(); - } - - else { - $r = array(); - } - - if($r) { - $parents_str = ids_to_querystr($r,'item_id'); - if($parents_str) { - $items = q("SELECT item.*, item.id AS item_id - FROM item - WHERE parent in ( %s ) $item_normal ", - dbesc($parents_str) - ); - xchan_query($items); - $items = fetch_post_tags($items,true); - $items = conv_sort($items,'created'); - } - } - else { - $items = array(); - } - - switch($module_format) { - - case 'html': - - if ($update) { - $o .= conversation($items, 'display', $update, 'client'); - } - else { - $o .= ''; - - \App::$page['title'] = (($items[0]['title']) ? $items[0]['title'] . " - " . \App::$page['title'] : \App::$page['title']); - - $o .= conversation($items, 'display', $update, 'client'); - } - - break; - - case 'atom': - - $atom = replace_macros(get_markup_template('atom_feed.tpl'), array( - '$version' => xmlify(\Zotlabs\Lib\System::get_project_version()), - '$generator' => xmlify(\Zotlabs\Lib\System::get_platform_name()), - '$generator_uri' => 'https://hubzilla.org', - '$feed_id' => xmlify(\App::$cmd), - '$feed_title' => xmlify(t('Article')), - '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now', ATOM_TIME)), - '$author' => '', - '$owner' => '', - '$profile_page' => xmlify(z_root() . '/display/' . $target_item['mid']), - )); - - $x = [ 'xml' => $atom, 'channel' => $channel, 'observer_hash' => $observer_hash, 'params' => $params ]; - call_hooks('atom_feed_top',$x); - - $atom = $x['xml']; - - // a much simpler interface - call_hooks('atom_feed', $atom); - - if($items) { - $type = 'html'; - foreach($items as $item) { - if($item['item_private']) - continue; - $atom .= atom_entry($item, $type, null, '', true, '', false); - } - } - - call_hooks('atom_feed_end', $atom); - - $atom .= '' . "\r\n"; - - header('Content-type: application/atom+xml'); - echo $atom; - killme(); - - } - - $o .= '
'; - - if((($update && $load) || $noscript_content) && (! $items)) { - - $r = q("SELECT id, item_deleted FROM item WHERE id = '%s' LIMIT 1", - dbesc($item_id) - ); - - if($r) { - if(intval($r[0]['item_deleted'])) { - notice( t('Item has been removed.') . EOL ); - } - else { - notice( t('Permission denied.') . EOL ); - } - } - else { - notice( t('Item not found.') . EOL ); - } - - } - - return $o; + goaway(z_root() . '/display/' . $r[0]['uuid']); } diff --git a/link/README.md b/link/README.md index ffa50bf..539dd53 100644 --- a/link/README.md +++ b/link/README.md @@ -11,6 +11,4 @@ where an item is the numeric value of an object from the database. It is possible to use /admin/addons/link settings page for enabling or disabling of showing "Link on Hub" in the dropdown menu. -Based on Zotlabs/Module/Display.php - -Adapted for Hubzilla 8.8 \ No newline at end of file +Adapted for Hubzilla 11 \ No newline at end of file diff --git a/link/link.php b/link/link.php index 2c6212d..10426ee 100644 --- a/link/link.php +++ b/link/link.php @@ -2,13 +2,11 @@ /** * Name: Link * Description: Using short links on whole hub - * Version: 0.87 + * Version: 0.92 * Author: ivan zlax <@zlax@ussr.win> * Maintainer: ivan zlax <@zlax@ussr.win> */ -use Zotlabs\Lib\Apps; -use Zotlabs\Extend\Hook; use Zotlabs\Extend\Route; function link_load() { @@ -52,15 +50,17 @@ function link_plugin_admin_post() { function dropdown_link(&$extras) { $arr = $extras; - $item_id = $extras['item']['item_id']; - $arr['dropdown_extras'] .= ''.t('Link on Hub').''; + $item = $arr['item']; + $item_id = $item['id'] ?? ($item['item_id'] ?? 0); + if ($item_id) { + $arr['dropdown_extras'] .= ''.t('Link on Hub').''; + } $extras = $arr; } function hideasides_header(&$b) { - $querystr = stristr(App::$query_string, '/', true); - if ($querystr == "link") { + if (isset($_GET['link_hideasides'])) { $addScriptTag = "\r\n"; - App::$page['htmlhead'] .= $addScriptTag; + \App::$page['htmlhead'] .= $addScriptTag; } }