X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=0cc15aa360bca636dc2aaa828c003df1fb53e701;hb=cfb00d811df2a5b41c096e16aab45d2d4ee1dabd;hp=2bd2b9a5d18b4592948413b9397376a48a3a7a29;hpb=35d334dd26cdddfe019d41750ee689e4bfe94cbe;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index 2bd2b9a5d1..0cc15aa360 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -2,8 +2,12 @@
 /**
  * @file mod/display.php
  */
+
 use Friendica\App;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
@@ -18,7 +22,7 @@ function display_init(App $a)
 	}
 
 	$nick = (($a->argc > 1) ? $a->argv[1] : '');
-	$profiledata = array();
+	$profiledata = [];
 
 	if ($a->argc == 3) {
 		if (substr($a->argv[2], -5) == '.atom') {
@@ -63,7 +67,7 @@ function display_init(App $a)
 
 		if (!DBM::is_result($r)) {
 			$a->error = 404;
-			notice(t('Item not found.') . EOL);
+			notice(L10n::t('Item not found.') . EOL);
 			return;
 		}
 	} elseif (($a->argc == 3) && ($nick == 'feed-item')) {
@@ -102,7 +106,7 @@ function display_init(App $a)
 				}
 				$profiledata["network"] = NETWORK_DFRN;
 			} else {
-				$profiledata = array();
+				$profiledata = [];
 			}
 		}
 	}
@@ -111,7 +115,7 @@ function display_init(App $a)
 }
 
 function display_fetchauthor($a, $item) {
-	$profiledata = array();
+	$profiledata = [];
 	$profiledata["uid"] = -1;
 	$profiledata["nickname"] = $item["author-name"];
 	$profiledata["name"] = $item["author-name"];
@@ -170,7 +174,7 @@ function display_fetchauthor($a, $item) {
 			$profiledata["photo"] = $matches[1];
 		}
 		$profiledata["nickname"] = $profiledata["name"];
-		$profiledata["network"] = GetProfileUsername($profiledata["url"], "", false, true);
+		$profiledata["network"] = Protocol::matchByProfileUrl($profiledata["url"]);
 
 		$profiledata["address"] = "";
 		$profiledata["about"] = "";
@@ -181,7 +185,7 @@ function display_fetchauthor($a, $item) {
 	$profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]);
 
 	if (local_user()) {
-		if (in_array($profiledata["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
+		if (in_array($profiledata["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
 			$profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
 		}
 	} elseif ($profiledata["network"] == NETWORK_DFRN) {
@@ -194,7 +198,7 @@ function display_fetchauthor($a, $item) {
 
 function display_content(App $a, $update = false, $update_uid = 0) {
 	if (Config::get('system','block_public') && !local_user() && !remote_user()) {
-		notice(t('Public access denied.') . EOL);
+		notice(L10n::t('Public access denied.') . EOL);
 		return;
 	}
 
@@ -207,7 +211,11 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 	if ($update) {
 		$item_id = $_REQUEST['item_id'];
 		$item = dba::selectFirst('item', ['uid', 'parent'], ['id' => $item_id]);
-		$a->profile = array('uid' => intval($item['uid']), 'profile_uid' => intval($item['uid']));
+		if ($item['uid'] != 0) {
+			$a->profile = ['uid' => intval($item['uid']), 'profile_uid' => intval($item['uid'])];
+		} else {
+			$a->profile = ['uid' => intval($update_uid), 'profile_uid' => intval($update_uid)];
+		}
 		$item_parent = $item['parent'];
 	} else {
 		$item_id = (($a->argc > 2) ? $a->argv[2] : 0);
@@ -240,12 +248,12 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 
 	if (!$item_id) {
 		$a->error = 404;
-		notice(t('Item not found.').EOL);
+		notice(L10n::t('Item not found.').EOL);
 		return;
 	}
 
 	// We are displaying an "alternate" link if that post was public. See issue 2864
-	$is_public = dba::exists('item', array('id' => $item_id, 'private' => false));
+	$is_public = dba::exists('item', ['id' => $item_id, 'private' => false]);
 	if ($is_public) {
 		// For the atom feed the nickname doesn't matter at all, we only need the item id.
 		$alternate = System::baseUrl().'/display/feed-item/'.$item_id.'.atom';
@@ -256,10 +264,10 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 	}
 
 	$a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'),
-				array('$alternate' => $alternate,
-					'$conversation' => $conversation));
+				['$alternate' => $alternate,
+					'$conversation' => $conversation]);
 
-	$groups = array();
+	$groups = [];
 
 	$contact = null;
 	$remote_contact = false;
@@ -301,13 +309,13 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 	$is_owner = (local_user() && (in_array($a->profile['profile_uid'], [local_user(), 0])) ? true : false);
 
 	if (x($a->profile, 'hidewall') && !$is_owner && !$remote_contact) {
-		notice(t('Access to this profile has been restricted.') . EOL);
+		notice(L10n::t('Access to this profile has been restricted.') . EOL);
 		return;
 	}
 
 	// We need the editor here to be able to reshare an item.
 	if ($is_owner) {
-		$x = array(
+		$x = [
 			'is_owner' => true,
 			'allow_location' => $a->user['allow_location'],
 			'default_location' => $a->user['default-location'],
@@ -317,7 +325,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 			'bang' => '',
 			'visitor' => 'block',
 			'profile_uid' => local_user(),
-		);
+		];
 		$o .= status_editor($a, $x, 0, true);
 	}
 
@@ -342,7 +350,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 	);
 
 	if (!DBM::is_result($r)) {
-		notice(t('Item not found.') . EOL);
+		notice(L10n::t('Item not found.') . EOL);
 		return $o;
 	}
 
@@ -351,7 +359,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 	if (local_user() && (local_user() == $a->profile['uid'])) {
 		$unseen = dba::selectFirst('item', ['id'], ['parent' => $s[0]['parent'], 'unseen' => true]);
 		if (DBM::is_result($unseen)) {
-			dba::update('item', array('unseen' => false), array('parent' => $s[0]['parent'], 'unseen' => true));
+			dba::update('item', ['unseen' => false], ['parent' => $s[0]['parent'], 'unseen' => true]);
 		}
 	}
 
@@ -363,10 +371,10 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 	$o .= conversation($a, $items, 'display', $update_uid);
 
 	// Preparing the meta header
-	require_once 'include/bbcode.php';
 	require_once 'include/html2plain.php';
-	$description = trim(html2plain(bbcode($s[0]["body"], false, false), 0, true));
-	$title = trim(html2plain(bbcode($s[0]["title"], false, false), 0, true));
+
+	$description = trim(html2plain(BBCode::convert($s[0]["body"], false), 0, true));
+	$title = trim(html2plain(BBCode::convert($s[0]["title"], false), 0, true));
 	$author_name = $s[0]["author-name"];
 
 	$image = $a->remove_baseurl($s[0]["author-thumb"]);
@@ -422,7 +430,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 function displayShowFeed($item_id, $conversation) {
 	$xml = DFRN::itemFeed($item_id, $conversation);
 	if ($xml == '') {
-		http_status_exit(500);
+		System::httpExit(500);
 	}
 	header("Content-type: application/atom+xml");
 	echo $xml;