From 06c6bfc88dc5897a578631a7745aa2fbac8edb92 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 31 Jul 2018 18:10:34 +0000 Subject: [PATCH] And some more notices ... --- fromgplus/fromgplus.php | 8 ++++---- leistungsschutzrecht/leistungsschutzrecht.php | 12 +++++++++--- pumpio/pumpio.php | 14 +++++++++----- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php index 9c8c7ff2..959ad1f7 100644 --- a/fromgplus/fromgplus.php +++ b/fromgplus/fromgplus.php @@ -81,14 +81,14 @@ class="settings-submit" value="' . L10n::t('Save Settings') . '" />'; function fromgplus_addon_settings_post(&$a,&$b) { - if(! local_user()) + if (!local_user()) return; - if($_POST['fromgplus-submit']) { + if (!empty($_POST['fromgplus-submit'])) { PConfig::set(local_user(),'fromgplus','account',trim($_POST['fromgplus-account'])); - $enable = ((x($_POST,'fromgplus-enable')) ? intval($_POST['fromgplus-enable']) : 0); + $enable = (x($_POST,'fromgplus-enable') ? intval($_POST['fromgplus-enable']) : 0); PConfig::set(local_user(),'fromgplus','enable', $enable); - $keywords = ((x($_POST, 'fromgplus-keywords')) ? intval($_POST['fromgplus-keywords']) : 0); + $keywords = (x($_POST, 'fromgplus-keywords') ? intval($_POST['fromgplus-keywords']) : 0); PConfig::set(local_user(),'fromgplus', 'keywords', $keywords); if (!$enable) diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php index e608409b..c0625ccb 100644 --- a/leistungsschutzrecht/leistungsschutzrecht.php +++ b/leistungsschutzrecht/leistungsschutzrecht.php @@ -23,14 +23,20 @@ function leistungsschutzrecht_uninstall() { } function leistungsschutzrecht_getsiteinfo($a, &$siteinfo) { - if (!isset($siteinfo["url"])) + if (!isset($siteinfo["url"])) { return; + } - if (!leistungsschutzrecht_is_member_site($siteinfo["url"])) + if (!leistungsschutzrecht_is_member_site($siteinfo["url"])) { return; + } //$siteinfo["title"] = $siteinfo["url"]; - $siteinfo["text"] = leistungsschutzrecht_cuttext($siteinfo["text"]); + + if (!empty($siteinfo["text"])) { + $siteinfo["text"] = leistungsschutzrecht_cuttext($siteinfo["text"]); + } + unset($siteinfo["image"]); unset($siteinfo["images"]); unset($siteinfo["keywords"]); diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index ce82ca31..4431cf4c 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -970,7 +970,9 @@ function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion = $likedata['app'] = $post->generator->displayName; $likedata['author-name'] = $post->actor->displayName; $likedata['author-link'] = $post->actor->url; - $likedata['author-avatar'] = $post->actor->image->url; + if (!empty($post->actor->image)) { + $likedata['author-avatar'] = $post->actor->image->url; + } $author = '[url=' . $likedata['author-link'] . ']' . $likedata['author-name'] . '[/url]'; $objauthor = '[url=' . $orig_post['author-link'] . ']' . $orig_post['author-name'] . '[/url]'; @@ -1223,10 +1225,12 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp $postarray['verb'] = ACTIVITY_POST; $postarray['owner-name'] = $post->actor->displayName; $postarray['owner-link'] = $post->actor->url; - $postarray['owner-avatar'] = $post->actor->image->url; - $postarray['author-name'] = $post->actor->displayName; - $postarray['author-link'] = $post->actor->url; - $postarray['author-avatar'] = $post->actor->image->url; + $postarray['author-name'] = $postarray['owner-name']; + $postarray['author-link'] = $postarray['owner-link']; + if (!empty($post->actor->image)) { + $postarray['owner-avatar'] = $post->actor->image->url; + $postarray['author-avatar'] = $postarray['owner-avatar']; + } $postarray['plink'] = $post->object->url; $postarray['app'] = $post->generator->displayName; $postarray['title'] = '';