Avoid warnings in addons (#639)

* Avoid warnings in addons

* And some warnings removed

* And more ...

* And some more ...

* Added comment

* And again ...

* And again ...

* Partly reworked "newmemberwidget"

* And more warnings ...

* The next round

diff --git a/blockem/blockem.php b/blockem/blockem.php
index aaa6939..3de7be4 100644 (file)
--- a/blockem/blockem.php
+++ b/blockem/blockem.php
@@ -138,6 +138,10 @@ function blockem_prepare_body_content_filter(\Friendica\App $a, &$hook_data)
 }
 
 function blockem_display_item(&$a,&$b) {
+       if (empty($b['output']['body'])) {
+               return;
+       }
+
        if(strstr($b['output']['body'],'id="blockem-wrap-'))
                $b['output']['thumb'] = $a->get_baseurl() . "/images/person-80.jpg";
 }
@@ -177,7 +181,7 @@ function blockem_item_photo_menu(&$a,&$b) {
 
        $blocked = false;
        $author = $b['item']['author-link'];
-       if(is_array($a->data['blockem'])) {
+       if(!empty($a->data['blockem'])) {
                foreach($a->data['blockem'] as $bloke) {
                        if(link_compare($bloke,$author)) {
                                $blocked = true;

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 5dfac50..fcee326 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -455,7 +455,7 @@ function fromgplus_fetch($a, $uid) {
 
        $lastdate = 0;
 
-       if (!is_array($activities->items))
+       if (empty($activities->items))
                return;
 
        $reversed = array_reverse($activities->items);

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 37d2ce5..372193f 100644 (file)
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -477,7 +477,7 @@ function jappixmini_script(App $a)
                return;
        }
 
-       if ($_GET["mode"] == "minimal") {
+       if (defaults($_GET, "mode", '') == "minimal") {
                return;
        }
 

diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php
index 04d3e55..6cfe95f 100644 (file)
--- a/leistungsschutzrecht/leistungsschutzrecht.php
+++ b/leistungsschutzrecht/leistungsschutzrecht.php
@@ -138,6 +138,10 @@ function leistungsschutzrecht_is_member_site($url) {
        $cleanedurlpart = explode("%", $urldata["host"]);
 
        $hostname = explode(".", $cleanedurlpart[0]);
+       if (empty($hostname)) {
+               return false;
+       }
+
        $site = $hostname[sizeof($hostname) - 2].".".$hostname[sizeof($hostname) - 1];
 
        return (isset($sites[$site]));

diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index 57b4923..5aff1c9 100644 (file)
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -11,29 +11,42 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 
-function newmemberwidget_install () {
-    Addon::registerHook( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init');
-    logger('newmemberwidget installed');
+function newmemberwidget_install()
+{
+       Addon::registerHook( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init');
+       logger('newmemberwidget installed');
 }
-function newmemberwidget_uninstall () {
-    Addon::unregisterHook( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init');
+
+function newmemberwidget_uninstall()
+{
+       Addon::unregisterHook( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init');
 }
 
-function newmemberwidget_network_mod_init ( $a, $b) {
-    if (x($_SESSION['new_member'])) {
+function newmemberwidget_network_mod_init ($a, $b)
+{
+       if (empty($_SESSION['new_member'])) {
+               return;
+       }
+
        $t = '<div id="newmember_widget" class="widget">'.EOL;
        $t .= '<h3>'.L10n::t('New Member').'</h3>'.EOL;
        $t .= '<a href="newmember" id="newmemberwidget-tips">' . L10n::t('Tips for New Members') . '</a><br />'.EOL;
-       if (Config::get('newmemberwidget','linkglobalsupport')==1)
-           $t .= '<a href="https://forum.friendi.ca/profile/helpers" target="_new">'.L10n::t('Global Support Forum').'</a><br />'.EOL;
-       if (Config::get('newmemberwidget','linklocalsupport')==1)
-           $t .= '<a href="'.$a->get_baseurl().'/profile/'.Config::get('newmemberwidget','localsupport').'" target="_new">'.L10n::t('Local Support Forum').'</a><br />'.EOL;
-       $ft = Config::get('newmemberwidget','freetext');
-       if (!trim($ft)=="")
-           $t .= '<p>'.BBCode::convert(trim($ft)).'</p>';
+
+       if (Config::get('newmemberwidget','linkglobalsupport', false)) {
+               $t .= '<a href="https://forum.friendi.ca/profile/helpers" target="_new">'.L10n::t('Global Support Forum').'</a><br />'.EOL;
+       }
+
+       if (Config::get('newmemberwidget','linklocalsupport', false)) {
+               $t .= '<a href="'.$a->get_baseurl().'/profile/'.Config::get('newmemberwidget','localsupport').'" target="_new">'.L10n::t('Local Support Forum').'</a><br />'.EOL;
+       }
+
+       $ft = Config::get('newmemberwidget','freetext', '');
+       if (!empty($ft)) {
+               $t .= '<p>'.BBCode::convert(trim($ft)).'</p>';
+       }
+
        $t .= '</div><div class="clear"></div>';
-       $a->page['aside'] = $t . $a->page['aside'];
-    }
+       $a->page['aside'] = $t . $a->page['aside'];
 }
 
 function newmemberwidget_addon_admin_post(&$a)

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 974be0a..0fe2a2f 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -94,7 +94,7 @@ function openstreetmap_location($a, &$item)
                }
        }
 
-       if ($target == "") {
+       if (empty($target)) {
                $target = $nomserver.'?q='.urlencode($item['location']);
        }
 

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 1b6469e..9e02a74 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -494,23 +494,23 @@ function pumpio_send(&$a, &$b)
                                'objectType' => "note",
                                'content' => $content];
 
-                       if ($title != "") {
+                       if (!empty($title)) {
                                $params["object"]["displayName"] = $title;
                        }
 
-                       if (count($receiver["to"])) {
+                       if (!empty($receiver["to"])) {
                                $params["to"] = $receiver["to"];
                        }
 
-                       if (count($receiver["bto"])) {
+                       if (!empty($receiver["bto"])) {
                                $params["bto"] = $receiver["bto"];
                        }
 
-                       if (count($receiver["cc"])) {
+                       if (!empty($receiver["cc"])) {
                                $params["cc"] = $receiver["cc"];
                        }
 
-                       if (count($receiver["bcc"])) {
+                       if (!empty($receiver["bcc"])) {
                                $params["bcc"] = $receiver["bcc"];
                        }
                 } else {
@@ -654,8 +654,7 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "")
 
 function pumpio_sync(&$a)
 {
-       $r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = 'pumpio'",
-               $plugin);
+       $r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = 'pumpio'");
 
        if (!DBM::is_result($r)) {
                return;
@@ -765,7 +764,7 @@ function pumpio_fetchtimeline(&$a, $uid)
 
        logger('pumpio: fetching for user '.$uid.' '.$url.' C:'.$client->client_id.' CS:'.$client->client_secret.' T:'.$client->access_token.' TS:'.$client->access_token_secret);
 
-       $username = $user.'@'.$host;
+       $useraddr = $username.'@'.$hostname;
 
        if (pumpio_reachable($url)) {
                $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $user);
@@ -774,7 +773,7 @@ function pumpio_fetchtimeline(&$a, $uid)
        }
 
        if (!$success) {
-               logger('pumpio: error fetching posts for user '.$uid." ".$username." ".print_r($user, true));
+               logger('pumpio: error fetching posts for user '.$uid." ".$useraddr." ".print_r($user, true));
                return;
        }
 
@@ -903,7 +902,7 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
 {
        require_once('include/items.php');
 
-       if ($post->object->id == "") {
+       if (empty($post->object->id)) {
                logger('Got empty like: '.print_r($post, true), LOGGER_DEBUG);
                return;
        }
@@ -957,6 +956,7 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
        $likedata['gravity'] = GRAVITY_ACTIVITY;
        $likedata['uid'] = $uid;
        $likedata['wall'] = 0;
+       $likedata['network'] = NETWORK_PUMPIO;
        $likedata['uri'] = Item::newURI($uid);
        $likedata['parent-uri'] = $orig_post["uri"];
        $likedata['contact-id'] = $contactid;
@@ -1168,7 +1168,11 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 
                $reply = new stdClass;
                $reply->verb = "note";
-               $reply->cc = $post->cc;
+
+               if (isset($post->cc)) {
+                       $reply->cc = $post->cc;
+               }
+
                $reply->to = $post->to;
                $reply->object = new stdClass;
                $reply->object->objectType = $post->object->inReplyTo->objectType;
@@ -1186,7 +1190,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
                $postarray['parent-uri'] = $post->object->inReplyTo->id;
        }
 
-       if ($post->object->pump_io->proxyURL) {
+       if (!empty($post->object->pump_io->proxyURL)) {
                $postarray['extid'] = $post->object->pump_io->proxyURL;
        }
 
@@ -1203,11 +1207,11 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
        $postarray['body'] = HTML::toBBCode($post->object->content);
        $postarray['object'] = json_encode($post);
 
-       if ($post->object->fullImage->url != "") {
+       if (!empty($post->object->fullImage->url)) {
                $postarray["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$postarray["body"];
        }
 
-       if ($post->object->displayName != "") {
+       if (!empty($post->object->displayName)) {
                $postarray['title'] = $post->object->displayName;
        }
 
@@ -1303,6 +1307,10 @@ function pumpio_fetchinbox(&$a, $uid)
                $success = false;
        }
 
+       if (!$success) {
+               return;
+       }
+
        if ($user->items) {
                $posts = array_reverse($user->items);
 
@@ -1587,9 +1595,9 @@ function pumpio_fetchallcomments(&$a, $uid, $id)
                        $like->object->id = $item->id;
                        $like->actor = new stdClass;
                        $like->actor->displayName = $item->displayName;
-                       $like->actor->preferredUsername = $item->preferredUsername;
+                       //$like->actor->preferredUsername = $item->preferredUsername;
+                       //$like->actor->image = $item->image;
                        $like->actor->url = $item->url;
-                       $like->actor->image = $item->image;
                        $like->generator = new stdClass;
                        $like->generator->displayName = "pumpio";
                        pumpio_dolike($a, $uid, $self, $post, $own_id, false);

diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index ae7f6d6..3bb8892 100644 (file)
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -30,7 +30,7 @@ function rendertime_page_end(&$a, &$o) {
        $ignored_modules = ["fbrowser"];
        $ignored = in_array($a->module, $ignored_modules);
 
-       if (is_site_admin() && ($_GET["mode"] != "minimal") && !$a->is_mobile && !$a->is_tablet && !$ignored) {
+       if (is_site_admin() && (defaults($_GET, "mode", '') != "minimal") && !$a->is_mobile && !$a->is_tablet && !$ignored) {
                $o = $o.'<div class="renderinfo">'. L10n::t("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s",
                        round($a->performance["database"] - $a->performance["database_write"], 3),
                        round($a->performance["database_write"], 3),

diff --git a/showmore/showmore.php b/showmore/showmore.php
index e39acde..3673c95 100644 (file)
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -126,6 +126,8 @@ function showmore_prepare_body(\Friendica\App $a, &$hook_data)
        if (get_body_length($hook_data['html']) > $chars) {
                $found = true;
                $shortened = trim(showmore_cutitem($hook_data['html'], $chars)) . "...";
+       } else {
+               $found = false;
        }
 
        if ($found) {

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index b97a6ca..6fc5b8a 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -1065,7 +1065,7 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
        $postarray['uid'] = $uid;
        $postarray['wall'] = 0;
 
-       if (is_object($post->retweeted_status)) {
+       if (!empty($post->retweeted_status)) {
                $content = $post->retweeted_status;
                statusnet_fetch_contact($uid, $content->user, false);
        } else {
@@ -1080,7 +1080,7 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
 
        $contactid = 0;
 
-       if ($content->in_reply_to_status_id != "") {
+       if (!empty($content->in_reply_to_status_id)) {
 
                $parent = $hostname . "::" . $content->in_reply_to_status_id;
 
@@ -1166,19 +1166,19 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
        $postarray['created'] = DateTimeFormat::utc($content->created_at);
        $postarray['edited'] = DateTimeFormat::utc($content->created_at);
 
-       if (is_string($content->place->name)) {
+       if (!empty($content->place->name)) {
                $postarray["location"] = $content->place->name;
        }
 
-       if (is_string($content->place->full_name)) {
+       if (!empty($content->place->full_name)) {
                $postarray["location"] = $content->place->full_name;
        }
 
-       if (is_array($content->geo->coordinates)) {
+       if (!empty($content->geo->coordinates)) {
                $postarray["coord"] = $content->geo->coordinates[0] . " " . $content->geo->coordinates[1];
        }
 
-       if (is_array($content->coordinates->coordinates)) {
+       if (!empty($content->coordinates->coordinates)) {
                $postarray["coord"] = $content->coordinates->coordinates[1] . " " . $content->coordinates->coordinates[0];
        }
 

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 99c7d49..d9baf1b 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -422,6 +422,7 @@ function twitter_action(App $a, $uid, $pid, $action)
        switch ($action) {
                case "delete":
                        // To-Do: $result = $connection->post('statuses/destroy', $post);
+                       $result = [];
                        break;
                case "like":
                        $result = $connection->post('favorites/create', $post);
@@ -429,6 +430,9 @@ function twitter_action(App $a, $uid, $pid, $action)
                case "unlike":
                        $result = $connection->post('favorites/destroy', $post);
                        break;
+               default:
+                       logger('Unhandled action ' . $action, LOGGER_DEBUG);
+                       $result = [];
        }
        logger("twitter_action '" . $action . "' send, result: " . print_r($result, true), LOGGER_DEBUG);
 }
@@ -799,7 +803,7 @@ function twitter_do_mirrorpost(App $a, $uid, $post)
        // $datarray['object'] = json_encode($post); // Activate for debugging
        $datarray["title"] = "";
 
-       if (is_object($post->retweeted_status)) {
+       if (!empty($post->retweeted_status)) {
                // We don't support nested shares, so we mustn't show quotes as shares on retweets
                $item = twitter_createpost($a, $uid, $post->retweeted_status, ['id' => 0], false, false, true);
 
@@ -1131,6 +1135,10 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
 
                                $oembed_data = OEmbed::fetchURL($expanded_url);
 
+                               if (empty($oembed_data) || empty($oembed_data->type)) {
+                                       continue;
+                               }
+
                                // Quickfix: Workaround for URL with "[" and "]" in it
                                if (strpos($expanded_url, "[") || strpos($expanded_url, "]")) {
                                        $expanded_url = $url->url;
@@ -1254,7 +1262,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
 function twitter_media_entities($post, &$postarray)
 {
        // There are no media entities? So we quit.
-       if (!is_array($post->extended_entities->media)) {
+       if (empty($post->extended_entities->media)) {
                return "";
        }
 
@@ -1274,6 +1282,9 @@ function twitter_media_entities($post, &$postarray)
        // This is a pure media post, first search for all media urls
        $media = [];
        foreach ($post->extended_entities->media AS $medium) {
+               if (!isset($media[$medium->url])) {
+                       $media[$medium->url] = '';
+               }
                switch ($medium->type) {
                        case 'photo':
                                $media[$medium->url] .= "\n[img]" . $medium->media_url_https . "[/img]";
@@ -1396,6 +1407,9 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
        if ($post->user->protected) {
                $postarray['private'] = 1;
                $postarray['allow_cid'] = '<' . $self['id'] . '>';
+       } else {
+               $postarray['private'] = 0;
+               $postarray['allow_cid'] = '';
        }
 
        if (is_string($post->full_text)) {
@@ -1420,22 +1434,22 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
 
        $statustext = $converted["plain"];
 
-       if (is_string($post->place->name)) {
+       if (!empty($post->place->name)) {
                $postarray["location"] = $post->place->name;
        }
-       if (is_string($post->place->full_name)) {
+       if (!empty($post->place->full_name)) {
                $postarray["location"] = $post->place->full_name;
        }
-       if (is_array($post->geo->coordinates)) {
+       if (!empty($post->geo->coordinates)) {
                $postarray["coord"] = $post->geo->coordinates[0] . " " . $post->geo->coordinates[1];
        }
-       if (is_array($post->coordinates->coordinates)) {
+       if (!empty($post->coordinates->coordinates)) {
                $postarray["coord"] = $post->coordinates->coordinates[1] . " " . $post->coordinates->coordinates[0];
        }
-       if (is_object($post->retweeted_status)) {
+       if (!empty($post->retweeted_status)) {
                $retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false, $noquote);
 
-               $retweet['object'] = $postarray['object'];
+               //$retweet['object'] = $postarray['object']; // Activate for debugging
                $retweet['private'] = $postarray['private'];
                $retweet['allow_cid'] = $postarray['allow_cid'];
                $retweet['contact-id'] = $postarray['contact-id'];
@@ -1446,7 +1460,7 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
                $postarray = $retweet;
        }
 
-       if (is_object($post->quoted_status) && !$noquote) {
+       if (!empty($post->quoted_status) && !$noquote) {
                $quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false, true);
 
                $postarray['body'] = $statustext;
@@ -1498,20 +1512,16 @@ function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection,
 
        $posts = array_reverse($posts);
 
-       if (count($posts)) {
+       if (!empty($posts)) {
                foreach ($posts as $post) {
                        $postarray = twitter_createpost($a, $uid, $post, $self, false, false, false);
 
-                       if (trim($postarray['body']) == "") {
+                       if (empty($postarray['body'])) {
                                continue;
                        }
 
                        $item = Item::insert($postarray);
 
-                       if ($notify) {
-                               $item = $notify;
-                       }
-
                        $postarray["id"] = $item;
 
                        logger('twitter_fetchparentpost: User ' . $self["nick"] . ' posted parent timeline item ' . $item);
@@ -1629,7 +1639,7 @@ function twitter_fetchhometimeline(App $a, $uid)
 
                        $postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true, false);
 
-                       if (trim($postarray['body']) == "") {
+                       if (empty($postarray['body']) || trim($postarray['body']) == "") {
                                continue;
                        }
 

diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index bd5adb5..bef31fe 100644 (file)
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -131,7 +131,7 @@ function xmpp_converse(App $a)
                return;
        }
 
-       if ($_GET["mode"] == "minimal") {
+       if (defaults($_GET, "mode", '') == "minimal") {
                return;
        }