Merge pull request #4328 from tobiasd/20180125-msg

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 25dd9b3afab8f5ef5374784531be9e47ec47de17..d62b398a754d98567c0be804a9abdbde34f42da7 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,20 +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') {
@@ -59,7 +64,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')) {
@@ -98,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"];
@@ -177,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) {
@@ -190,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;
        }
 
@@ -203,7 +208,7 @@ 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']));
+               $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);
@@ -236,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';
@@ -252,10 +257,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;
@@ -297,13 +302,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'],
@@ -313,7 +318,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);
        }
 
@@ -338,7 +343,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;
        }
 
@@ -347,7 +352,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]);
                }
        }