clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

placeholder for a funny commit description for removing some more notices (#5631)

This commit is contained in:
Michael Vogel 2018-08-19 03:52:21 +02:00 committed by Hypolite Petovan
parent 060e887a31
commit ab5cedfa50
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mod/match.php
View File

@ -94,11 +94,11 @@ function match_content(App $a)
$entry = [ $entry = [
'url' => Contact::magicLink($jj->url), 'url' => Contact::magicLink($jj->url),
'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $jj->url), 'itemurl' => defaults($contact_details, 'addr', $jj->url),
'name' => $jj->name, 'name' => $jj->name,
'details' => $contact_details['location'], 'details' => defaults($contact_details, 'location', ''),
'tags' => $contact_details['keywords'], 'tags' => defaults($contact_details, 'keywords', ''),
'about' => $contact_details['about'], 'about' => defaults($contact_details, 'about', ''),
'account_type' => Contact::getAccountType($contact_details), 'account_type' => Contact::getAccountType($contact_details),
'thumb' => ProxyUtils::proxifyUrl($jj->photo, false, ProxyUtils::SIZE_THUMB), 'thumb' => ProxyUtils::proxifyUrl($jj->photo, false, ProxyUtils::SIZE_THUMB),
'inttxt' => ' ' . L10n::t('is interested in:'), 'inttxt' => ' ' . L10n::t('is interested in:'),

20
mod/profperm.php
View File

@ -12,7 +12,7 @@ use Friendica\Model\Profile;
function profperm_init(App $a) function profperm_init(App $a)
{ {
if (! local_user()) { if (!local_user()) {
return; return;
} }
@ -25,7 +25,7 @@ function profperm_init(App $a)
function profperm_content(App $a) { function profperm_content(App $a) {
if (! local_user()) { if (!local_user()) {
notice(L10n::t('Permission denied') . EOL); notice(L10n::t('Permission denied') . EOL);
return; return;
} }
@ -45,7 +45,7 @@ function profperm_content(App $a) {
$switchtotext = Config::get('system','groupedit_image_limit', 400); $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 $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", AND `network` = '%s' AND `id` = %d AND `uid` = %d LIMIT 1",
DBA::escape(Protocol::DFRN), DBA::escape(Protocol::DFRN),
@ -64,7 +64,7 @@ function profperm_content(App $a) {
intval($a->argv[1]), intval($a->argv[1]),
intval(local_user()) intval(local_user())
); );
if (! DBA::isResult($r)) { if (!DBA::isResult($r)) {
notice(L10n::t('Invalid profile identifier.') . EOL ); notice(L10n::t('Invalid profile identifier.') . EOL );
return; return;
} }
@ -82,8 +82,8 @@ function profperm_content(App $a) {
$members = $r; $members = $r;
if($change) { if (!empty($change)) {
if(in_array($change,$ingroup)) { if (in_array($change,$ingroup)) {
q("UPDATE `contact` SET `profile-id` = 0 WHERE `id` = %d AND `uid` = %d", q("UPDATE `contact` SET `profile-id` = 0 WHERE `id` = %d AND `uid` = %d",
intval($change), intval($change),
intval(local_user()) intval(local_user())
@ -120,7 +120,7 @@ function profperm_content(App $a) {
} }
$o .= '<div id="prof-update-wrapper">'; $o .= '<div id="prof-update-wrapper">';
if($change) if (!empty($change))
$o = ''; $o = '';
$o .= '<div id="prof-members-title">'; $o .= '<div id="prof-members-title">';
@ -131,7 +131,7 @@ function profperm_content(App $a) {
$textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false); $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false);
foreach($members as $member) { foreach($members as $member) {
if($member['url']) { if ($member['url']) {
$member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['id'] . '); return true;'; $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['id'] . '); return true;';
$o .= micropro($member,true,'mpprof', $textmode); $o .= micropro($member,true,'mpprof', $textmode);
} }
@ -153,7 +153,7 @@ function profperm_content(App $a) {
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
$textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false); $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
foreach($r as $member) { 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;'; $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['id'] . '); return true;';
$o .= micropro($member,true,'mpprof',$textmode); $o .= micropro($member,true,'mpprof',$textmode);
} }
@ -162,7 +162,7 @@ function profperm_content(App $a) {
$o .= '</div><div id="prof-all-contacts-end"></div>'; $o .= '</div><div id="prof-all-contacts-end"></div>';
if($change) { if (!empty($change)) {
echo $o; echo $o;
killme(); killme();
} }

1
mod/videos.php
View File

@ -365,6 +365,7 @@ function videos_content(App $a)
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
$alt_e = $rr['filename']; $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']; $name_e = $rr['album'];
$videos[] = [ $videos[] = [

2
src/Model/Event.php
View File

@ -62,7 +62,7 @@ class Event extends BaseObject
$o .= "<h4>" . L10n::t('Finishes:') . "</h4><p>" . $event_end . "</p>"; $o .= "<h4>" . L10n::t('Finishes:') . "</h4><p>" . $event_end . "</p>";
} }
if (strlen($event['location'])) { if (!empty($event['location'])) {
$o .= "<h4>" . L10n::t('Location:') . "</h4><p>" . BBCode::convert($event['location'], false, $simple) . "</p>"; $o .= "<h4>" . L10n::t('Location:') . "</h4><p>" . BBCode::convert($event['location'], false, $simple) . "</p>";
} }