TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

improve things display a little

Browse Source
This commit is contained in:
Mario
2024-03-05 09:45:49 +00:00
parent 1e2a4a57b6
commit d23ed6b11f
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Zotlabs/Lib/Activity.php
View File

@@ -207,23 +207,19 @@ class Activity {
$channel = channelx_by_n($r[0]['obj_channel']);
$content = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl] ';
$content .= $r[0]['obj_verb'] . ' ';
$content .= '[zrl=' . $r[0]['obj_url'] . ']' . $r[0]['obj_term'] . '[/zrl]';
$x = [
'type' => 'Page',
'id' => z_root() . '/thing/' . $r[0]['obj_obj'],
'name' => $r[0]['obj_term'],
'content' => bbcode($content),
'name' => $channel['channel_name'] . ' ' . $r[0]['obj_verb'] . ' ' . $r[0]['obj_term'],
'content' => $r[0]['obj_url'],
'url' => $r[0]['obj_url']
];
if ($r[0]['obj_image']) {
if ($r[0]['obj_imgurl']) {
$x['content'] = '<a href="' . $r[0]['obj_url'] . '"><img src="' . $r[0]['obj_imgurl'] . '" alt="' . $r[0]['obj_term'] . '"></a>';
$x['icon'] = [
'type' => 'Image',
'url' => $r[0]['obj_image']
'url' => $r[0]['obj_imgurl']
];
}

10
Zotlabs/Module/Thing.php
View File

@@ -5,6 +5,7 @@
namespace Zotlabs\Module;
use App;
use Zotlabs\Lib\Libsync;
use Zotlabs\Lib\Activity;
use Zotlabs\Lib\ActivityStreams;
@@ -218,10 +219,11 @@ class Thing extends \Zotlabs\Web\Controller {
$ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]';
$plink = '[zrl=' . $url . ']' . $name . '[/zrl]';
$arr['body'] = sprintf($bodyverb, $ulink, $translated_verb, $plink);
$arr['title'] = $channel['channel_name'] . ' ' . $translated_verb . ' ' . $name;
$arr['body'] = $url;
if($local_photo)
$arr['body'] .= "\n\n" . '[zmg]' . $local_photo . '[/zmg]';
$arr['body'] = '[zrl=' . $url . '][zmg=' . $local_photo . ']' . $name . '[/zmg][/zrl]';
$arr['verb'] = 'Create';
$arr['obj_type'] = 'Page';
@@ -275,12 +277,12 @@ class Thing extends \Zotlabs\Web\Controller {
dbesc(argv(1))
);
if($r) {
if ($r) {
$channel = channelx_by_n($r[0]['obj_channel']);
profile_load($channel['channel_address']);
return replace_macros(get_markup_template('show_thing.tpl'), array(
'$header' => $channel['xchan_name'] . ' ' . $r[0]['obj_verb'],
'$header' => $channel['xchan_name'] . ' ' . $r[0]['obj_verb'] . ' ' . $r[0]['obj_term'],
'$edit' => t('Edit'),
'$delete' => t('Delete'),
'$canedit' => ((local_channel() && local_channel() == $r[0]['obj_channel']) ? true : false),