X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=d62b398a754d98567c0be804a9abdbde34f42da7;hb=208a149a7b7e25dc84c39e5631cba11d41869bae;hp=642df656e0ba5c3c98129b0d9a697104f2320d8e;hpb=cfa42552bc70c913c6bdee660592cdba6e6f4689;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index 642df656e0..d62b398a75 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,19 +1,25 @@
 <?php
-
+/**
+ * @file mod/display.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Group;
+use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
 
-function display_init(App $a) {
-	if (Config::get('system','block_public') && !local_user() && !remote_user()) {
+function display_init(App $a)
+{
+	if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
 		return;
 	}
 
 	$nick = (($a->argc > 1) ? $a->argv[1] : '');
-	$profiledata = array();
+	$profiledata = [];
 
 	if ($a->argc == 3) {
 		if (substr($a->argv[2], -5) == '.atom') {
@@ -52,23 +58,19 @@ function display_init(App $a) {
 			$r = dba::fetch_first("SELECT `id`, `parent`, `author-name`, `author-link`,
 						`author-avatar`, `network`, `body`, `uid`, `owner-link`
 				FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
-					AND `allow_cid` = ''  AND `allow_gid` = ''
-					AND `deny_cid`  = '' AND `deny_gid`  = ''
 					AND NOT `private` AND `uid` = 0
 					AND `guid` = ? LIMIT 1", $a->argv[1]);
 		}
 
 		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')) {
 		$r = dba::fetch_first("SELECT `id`, `parent`, `author-name`, `author-link`,
 					`author-avatar`, `network`, `body`, `uid`, `owner-link`
 			FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
-				AND `allow_cid` = ''  AND `allow_gid` = ''
-				AND `deny_cid`  = '' AND `deny_gid`  = ''
 				AND NOT `private` AND `uid` = 0
 				AND `id` = ? LIMIT 1", $a->argv[2]);
 	}
@@ -101,16 +103,16 @@ function display_init(App $a) {
 				}
 				$profiledata["network"] = NETWORK_DFRN;
 			} else {
-				$profiledata = array();
+				$profiledata = [];
 			}
 		}
 	}
 
-	profile_load($a, $nick, 0, $profiledata);
+	Profile::load($a, $nick, 0, $profiledata);
 }
 
 function display_fetchauthor($a, $item) {
-	$profiledata = array();
+	$profiledata = [];
 	$profiledata["uid"] = -1;
 	$profiledata["nickname"] = $item["author-name"];
 	$profiledata["name"] = $item["author-name"];
@@ -180,7 +182,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) {
@@ -193,7 +195,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;
 	}
 
@@ -205,8 +207,9 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 
 	if ($update) {
 		$item_id = $_REQUEST['item_id'];
-		$item = dba::select('item', ['uid'], ['id' => $item_id], ['limit' => 1]);
-		$a->profile = array('uid' => intval($item['uid']), 'profile_uid' => intval($item['uid']));
+		$item = dba::selectFirst('item', ['uid', 'parent'], ['id' => $item_id]);
+		$a->profile = ['uid' => intval($item['uid']), 'profile_uid' => intval($item['uid'])];
+		$item_parent = $item['parent'];
 	} else {
 		$item_id = (($a->argc > 2) ? $a->argv[2] : 0);
 
@@ -226,8 +229,6 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 			if ($item_parent == 0) {
 				$r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent` FROM `item`
 					WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
-						AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
-						AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
 						AND NOT `item`.`private` AND `item`.`uid` = 0
 						AND `item`.`guid` = ?", $a->argv[1]);
 				if (DBM::is_result($r)) {
@@ -240,12 +241,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,17 +257,17 @@ 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;
 
 	$contact_id = 0;
 
-	if (is_array($_SESSION['remote'])) {
+	if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
 		foreach ($_SESSION['remote'] as $v) {
 			if ($v['uid'] == $a->profile['uid']) {
 				$contact_id = $v['cid'];
@@ -276,7 +277,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 	}
 
 	if ($contact_id) {
-		$groups = init_groups_visitor($contact_id);
+		$groups = Group::getIdsByContactId($contact_id);
 		$r = dba::fetch_first("SELECT * FROM `contact` WHERE `id` = ? AND `uid` = ? LIMIT 1",
 			$contact_id,
 			$a->profile['uid']
@@ -300,14 +301,14 @@ 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 ($a->profile['hidewall'] && !$is_owner && !$remote_contact) {
-		notice(t('Access to this profile has been restricted.') . EOL);
+	if (x($a->profile, 'hidewall') && !$is_owner && !$remote_contact) {
+		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,9 +318,8 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 			'bang' => '',
 			'visitor' => 'block',
 			'profile_uid' => local_user(),
-			'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
-		);
-		$o .= status_editor($a,$x,0,true);
+		];
+		$o .= status_editor($a, $x, 0, true);
 	}
 
 	$sql_extra = item_permissions_sql($a->profile['uid'], $remote_contact, $groups);
@@ -343,16 +343,16 @@ 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;
 	}
 
 	$s = dba::inArray($r);
 
 	if (local_user() && (local_user() == $a->profile['uid'])) {
-		$unseen = dba::select('item', array('id'), array('parent' => $s[0]['parent'], 'unseen' => true), array('limit' => 1));
+		$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]);
 		}
 	}