diff --git a/mod/match.php b/mod/match.php index c4bea6767b..caa4c944ca 100644 --- a/mod/match.php +++ b/mod/match.php @@ -94,11 +94,11 @@ function match_content(App $a) $entry = [ 'url' => Contact::magicLink($jj->url), - 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $jj->url), + 'itemurl' => defaults($contact_details, 'addr', $jj->url), 'name' => $jj->name, - 'details' => $contact_details['location'], - 'tags' => $contact_details['keywords'], - 'about' => $contact_details['about'], + 'details' => defaults($contact_details, 'location', ''), + 'tags' => defaults($contact_details, 'keywords', ''), + 'about' => defaults($contact_details, 'about', ''), 'account_type' => Contact::getAccountType($contact_details), 'thumb' => ProxyUtils::proxifyUrl($jj->photo, false, ProxyUtils::SIZE_THUMB), 'inttxt' => ' ' . L10n::t('is interested in:'), diff --git a/mod/profperm.php b/mod/profperm.php index 4ee933e6cb..ee5e2f23d7 100644 --- a/mod/profperm.php +++ b/mod/profperm.php @@ -12,7 +12,7 @@ use Friendica\Model\Profile; function profperm_init(App $a) { - if (! local_user()) { + if (!local_user()) { return; } @@ -25,7 +25,7 @@ function profperm_init(App $a) function profperm_content(App $a) { - if (! local_user()) { + if (!local_user()) { notice(L10n::t('Permission denied') . EOL); return; } @@ -45,7 +45,7 @@ function profperm_content(App $a) { $switchtotext = Config::get('system','groupedit_image_limit', 400); } - if(($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) { + if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) { $r = q("SELECT `id` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `self` = 0 AND `network` = '%s' AND `id` = %d AND `uid` = %d LIMIT 1", DBA::escape(Protocol::DFRN), @@ -64,7 +64,7 @@ function profperm_content(App $a) { intval($a->argv[1]), intval(local_user()) ); - if (! DBA::isResult($r)) { + if (!DBA::isResult($r)) { notice(L10n::t('Invalid profile identifier.') . EOL ); return; } @@ -82,8 +82,8 @@ function profperm_content(App $a) { $members = $r; - if($change) { - if(in_array($change,$ingroup)) { + if (!empty($change)) { + if (in_array($change,$ingroup)) { q("UPDATE `contact` SET `profile-id` = 0 WHERE `id` = %d AND `uid` = %d", intval($change), intval(local_user()) @@ -120,7 +120,7 @@ function profperm_content(App $a) { } $o .= '
'; - if($change) + if (!empty($change)) $o = ''; $o .= '
'; @@ -131,7 +131,7 @@ function profperm_content(App $a) { $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false); foreach($members as $member) { - if($member['url']) { + if ($member['url']) { $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['id'] . '); return true;'; $o .= micropro($member,true,'mpprof', $textmode); } @@ -153,7 +153,7 @@ function profperm_content(App $a) { if (DBA::isResult($r)) { $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false); foreach($r as $member) { - if(! in_array($member['id'],$ingroup)) { + if (!in_array($member['id'],$ingroup)) { $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['id'] . '); return true;'; $o .= micropro($member,true,'mpprof',$textmode); } @@ -162,7 +162,7 @@ function profperm_content(App $a) { $o .= '
'; - if($change) { + if (!empty($change)) { echo $o; killme(); } diff --git a/mod/videos.php b/mod/videos.php index 505c3c2a8f..fcdd96d09c 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -365,6 +365,7 @@ function videos_content(App $a) if (DBA::isResult($r)) { foreach ($r as $rr) { $alt_e = $rr['filename']; + /// @todo The album isn't part of the above query. This seems to be some unfinished code that needs to be reworked completely. $name_e = $rr['album']; $videos[] = [ diff --git a/src/Model/Event.php b/src/Model/Event.php index 1bc922b465..91579faa19 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -62,7 +62,7 @@ class Event extends BaseObject $o .= "

" . L10n::t('Finishes:') . "

" . $event_end . "

"; } - if (strlen($event['location'])) { + if (!empty($event['location'])) { $o .= "

" . L10n::t('Location:') . "

" . BBCode::convert($event['location'], false, $simple) . "

"; }