Fixes for some E_NOTICE and type-hints added (#5358)

* Fixed http://github to https://github

Signed-off-by: Roland Häder <roland@mxchange.org>
* Fixes for #4965:
- updated messages.po file

Signed-off-by: Roland Häder <roland@mxchange.org>
* Fixed E_NOTICE where isset()/empty() was absent.

Signed-off-by: Roland Häder <roland@mxchange.org>
* Fixed missing variable $sql_order causing E_NOTICE.

Signed-off-by: Roland Häder <roland@mxchange.org>
* Continued:
- added array type-hint where known (some)

Signed-off-by: Roland Häder <roland@mxchange.org>
* Fixes:
- in Profile::load() $user is now only one-dimensional
- $a->get_hostname is no property, it is a method

Signed-off-by: Roland Häder <roland@mxchange.org>
* reverted changes that are unintended

Signed-off-by: Roland Häder <roland@mxchange.org>
* Continued:
- removed leading \ (uncommon, okay)
- removed entire if() block (CR by Hypolite)

Signed-off-by: Roland Häder <roland@mxchange.org>
* Removed if() block

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/boot.php b/boot.php
index 03a3761658d7d16c94e4ebee36c75cb8d6647156..218580a34d7e4c78ed405b0d55f2198f59f303f1 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -677,7 +677,7 @@ function check_url(App $a)
        // and www.example.com vs example.com.
        // We will only change the url to an ip address if there is no existing setting
 
-       if (empty($url) || (!link_compare($url, System::baseUrl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->get_hostname))) {
+       if (empty($url) || (!link_compare($url, System::baseUrl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->get_hostname()))) {
                Config::set('system', 'url', System::baseUrl());
        }
 

diff --git a/include/conversation.php b/include/conversation.php
index de7a136262f87a5cab68ea7e870113a515755e72..21b700f2fe0e42de4f0c9477ecd12b462454b8a1 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -405,7 +405,7 @@ function visible_activity($item) {
  * that are based on unique features of the calling module.
  *
  */
-function conversation(App $a, $items, $mode, $update, $preview = false, $order = 'commented', $uid = 0) {
+function conversation(App $a, array $items, $mode, $update, $preview = false, $order = 'commented', $uid = 0) {
        require_once 'mod/proxy.php';
 
        $ssl_state = ((local_user()) ? true : false);
@@ -768,7 +768,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
  *
  * @return array items with parents and comments
  */
-function conversation_add_children($parents, $block_authors, $order, $uid) {
+function conversation_add_children(array $parents, $block_authors, $order, $uid) {
        $max_comments = Config::get('system', 'max_comments', 100);
 
        $params = ['order' => ['uid', 'commented' => true]];

diff --git a/include/items.php b/include/items.php
index ab50e159a1898626ca202bddd1cef64b3f4caa63..e06df925e34ee9530c0c2f51d8c614175b00433b 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -429,9 +429,11 @@ function list_post_dates($uid, $wall) {
                $start_month = DateTimeFormat::utc($dstart, 'Y-m-d');
                $end_month = DateTimeFormat::utc($dend, 'Y-m-d');
                $str = day_translate(DateTimeFormat::utc($dnow, 'F'));
+
                if (empty($ret[$dyear])) {
                        $ret[$dyear] = [];
                }
+
                $ret[$dyear][] = [$str, $end_month, $start_month];
                $dnow = DateTimeFormat::utc($dnow . ' -1 month', 'Y-m-d');
        }

diff --git a/mod/network.php b/mod/network.php
index 154332f7dd91af37c9a2d53b823bb0d93a93912b..b2f6b7ba88c4e57565af039c3822dd9a02326c4d 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -596,6 +596,7 @@ function networkThreadedView(App $a, $update, $parent)
        $sql_extra3 = '';
        $sql_table = '`thread`';
        $sql_parent = '`iid`';
+       $sql_order = '';
 
        if ($update) {
                $sql_table = '`item`';

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 866065ec72612125f5c0db8362af82c392df48e0..1f09b7cc8d2508c1023f65432a7324d067f61d6d 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -24,6 +24,8 @@ use Friendica\Util\Network;
 use Friendica\Util\Temporal;
 use dba;
 
+use InvalidArgumentException;
+
 require_once 'include/dba.php';
 require_once 'mod/proxy.php';
 
@@ -89,7 +91,7 @@ class Profile
         * @param array   $profiledata  array
         * @param boolean $show_connect Show connect link
         */
-       public static function load(App $a, $nickname, $profile = 0, $profiledata = [], $show_connect = true)
+       public static function load(App $a, $nickname, $profile = 0, array $profiledata = [], $show_connect = true)
        {
                $user = dba::selectFirst('user', ['uid'], ['nickname' => $nickname, 'account_removed' => false]);
 
@@ -100,11 +102,8 @@ class Profile
                        return;
                }
 
-               if (empty($a->page['aside'])) {
-                       $a->page['aside'] = '';
-               }
-
-               if ($profiledata) {
+               if (count($profiledata) > 0) {
+                       // Add profile data to sidebar
                        $a->page['aside'] .= self::sidebar($profiledata, true, $show_connect);
 
                        if (!DBM::is_result($user)) {