friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fix possibly undefined variables

This commit is contained in:
Hypolite Petovan 2019-01-21 16:53:03 -05:00
parent f8c782380f
commit 49c9b6f9ff
5 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Content/ForumManager.php
View File

@ -105,6 +105,8 @@ class ForumManager
if (DBA::isResult($contacts)) { if (DBA::isResult($contacts)) {
$id = 0; $id = 0;
$entries = [];
foreach ($contacts as $contact) { foreach ($contacts as $contact) {
$selected = (($cid == $contact['id']) ? ' forum-selected' : ''); $selected = (($cid == $contact['id']) ? ' forum-selected' : '');

1
src/Content/Widget/TagCloud.php
View File

@ -40,6 +40,7 @@ class TagCloud
$contact = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]); $contact = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
$url = System::removedBaseUrl($contact['url']); $url = System::removedBaseUrl($contact['url']);
$tags = [];
foreach ($r as $rr) { foreach ($r as $rr) {
$tag['level'] = $rr[2]; $tag['level'] = $rr[2];
$tag['url'] = $url . '?tag=' . urlencode($rr[0]); $tag['url'] = $url . '?tag=' . urlencode($rr[0]);

6
src/Model/Event.php
View File

@ -644,15 +644,17 @@ class Event extends BaseObject
*/ */
private static function formatListForExport(array $events, $format) private static function formatListForExport(array $events, $format)
{ {
$o = '';
if (!count($events)) { if (!count($events)) {
return ''; return $o;
} }
switch ($format) { switch ($format) {
// Format the exported data as a CSV file. // Format the exported data as a CSV file.
case "csv": case "csv":
header("Content-type: text/csv"); header("Content-type: text/csv");
$o = '"Subject", "Start Date", "Start Time", "Description", "End Date", "End Time", "Location"' . PHP_EOL; $o .= '"Subject", "Start Date", "Start Time", "Description", "End Date", "End Time", "Location"' . PHP_EOL;
foreach ($events as $event) { foreach ($events as $event) {
/// @todo The time / date entries don't include any information about the /// @todo The time / date entries don't include any information about the

1
src/Model/Term.php
View File

@ -274,6 +274,7 @@ class Term
'network' => $item['author-network'], 'url' => $item['author-link']]; 'network' => $item['author-network'], 'url' => $item['author-link']];
$tag['url'] = Contact::magicLinkByContact($author, $tag['url']); $tag['url'] = Contact::magicLinkByContact($author, $tag['url']);
$prefix = '';
if ($tag['type'] == TERM_HASHTAG) { if ($tag['type'] == TERM_HASHTAG) {
if ($orig_tag != $tag['url']) { if ($orig_tag != $tag['url']) {
$item['body'] = str_replace($orig_tag, $tag['url'], $item['body']); $item['body'] = str_replace($orig_tag, $tag['url'], $item['body']);

43
src/Module/Photo.php
View File

@ -46,28 +46,29 @@ class Photo extends BaseModule
} }
$customsize = 0; $customsize = 0;
$photo = false;
switch($a->argc) { switch($a->argc) {
case 4: case 4:
$customsize = intval($a->argv[2]); $customsize = intval($a->argv[2]);
$uid = self::stripExtension($a->argv[3]); $uid = self::stripExtension($a->argv[3]);
$photo = self::getAvatar($uid, $a->argv[1]); $photo = self::getAvatar($uid, $a->argv[1]);
break; break;
case 3: case 3:
$uid = self::stripExtension($a->argv[2]); $uid = self::stripExtension($a->argv[2]);
$photo = self::getAvatar($uid, $a->argv[1]); $photo = self::getAvatar($uid, $a->argv[1]);
break; break;
case 2: case 2:
$photoid = self::stripExtension($a->argv[1]); $photoid = self::stripExtension($a->argv[1]);
$scale = 0; $scale = 0;
if (substr($photoid, -2, 1) == "-") { if (substr($photoid, -2, 1) == "-") {
$scale = intval(substr($photoid, -1, 1)); $scale = intval(substr($photoid, -1, 1));
$photoid = substr($photoid, 0, -2); $photoid = substr($photoid, 0, -2);
} }
$photo = MPhoto::getPhoto($photoid, $scale); $photo = MPhoto::getPhoto($photoid, $scale);
if ($photo === false) { if ($photo === false) {
$photo = MPhoto::createPhotoForSystemResource("images/nosign.jpg"); $photo = MPhoto::createPhotoForSystemResource("images/nosign.jpg");
} }
break; break;
} }
if ($photo === false) { if ($photo === false) {