From 9017dcd0fd904ecdf54b75ad39588db4f2e91ea6 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 May 2016 14:23:17 +0200 Subject: typo --- Zotlabs/Module/Ping.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index f0caa4373..32427b06f 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -286,7 +286,7 @@ class Ping extends \Zotlabs\Web\Controller { foreach($r as $item) { if((argv(1) === 'home') && (! intval($item['item_wall']))) continue; - $result[] = \Zotlbas\Lib\Enotify::format($item); + $result[] = \Zotlabs\Lib\Enotify::format($item); } } // logger('ping (network||home): ' . print_r($result, true), LOGGER_DATA); -- cgit v1.2.3 From 24360fd19182cad5ed29d10bb47c208bc195c232 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 May 2016 14:33:10 +0200 Subject: check if $addonDir is a dir to silence warning if it does not exist --- Zotlabs/Module/Admin.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index 172b109c8..8f15035d1 100644 --- a/Zotlabs/Module/Admin.php +++ b/Zotlabs/Module/Admin.php @@ -1421,13 +1421,15 @@ class Admin extends \Zotlabs\Web\Controller { function listAddonRepos() { $addonrepos = []; $addonDir = __DIR__ . '/../../extend/addon/'; - if ($handle = opendir($addonDir)) { - while (false !== ($entry = readdir($handle))) { - if ($entry != "." && $entry != "..") { - $addonrepos[] = $entry; + if(is_dir($addonDir)) { + if ($handle = opendir($addonDir)) { + while (false !== ($entry = readdir($handle))) { + if ($entry != "." && $entry != "..") { + $addonrepos[] = $entry; + } } + closedir($handle); } - closedir($handle); } return $addonrepos; } -- cgit v1.2.3 From 9d7abd58ac004f8df733a8187b57f6a3bfc2520e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 May 2016 14:37:30 +0200 Subject: another typo --- Zotlabs/Lib/Enotify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index c6405dac2..ccb538ef5 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -648,7 +648,7 @@ class Enotify { logger("notification: enotify::send returns " . $res, LOGGER_DEBUG); } - static public function forma($item) { + static public function format($item) { $ret = ''; -- cgit v1.2.3