From ac8c80ddbe5414c59a72881684e1079289270f12 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 9 Nov 2024 08:45:45 +0100 Subject: Fix incorrect module imports. When importing modules with use statements, they always require the fully qualified module name. Iow, there's no need to prefix them with an extra backslash. Ref: https://www.php.net/manual/en/language.namespaces.importing.php --- Zotlabs/Module/Admin/Addons.php | 4 ++-- Zotlabs/Module/Admin/Themes.php | 2 +- Zotlabs/Module/Apporder.php | 4 ++-- Zotlabs/Module/Apps.php | 4 ++-- Zotlabs/Module/Chatsvc.php | 2 +- Zotlabs/Module/Cloud.php | 8 ++++---- Zotlabs/Module/Notify.php | 4 ++-- Zotlabs/Module/Permcat.php | 4 ++-- Zotlabs/Module/Snap.php | 20 ++++++++++---------- include/help.php | 2 +- include/nav.php | 6 +++--- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Zotlabs/Module/Admin/Addons.php b/Zotlabs/Module/Admin/Addons.php index 681eed750..0cb173e7c 100644 --- a/Zotlabs/Module/Admin/Addons.php +++ b/Zotlabs/Module/Admin/Addons.php @@ -3,8 +3,8 @@ namespace Zotlabs\Module\Admin; use App; -use \Zotlabs\Lib\Config; -use \Michelf\MarkdownExtra; +use Zotlabs\Lib\Config; +use Michelf\MarkdownExtra; class Addons { diff --git a/Zotlabs/Module/Admin/Themes.php b/Zotlabs/Module/Admin/Themes.php index 6793f56b1..09fec9725 100644 --- a/Zotlabs/Module/Admin/Themes.php +++ b/Zotlabs/Module/Admin/Themes.php @@ -2,7 +2,7 @@ namespace Zotlabs\Module\Admin; -use \Michelf\MarkdownExtra; +use Michelf\MarkdownExtra; use Zotlabs\Lib\Config; /** diff --git a/Zotlabs/Module/Apporder.php b/Zotlabs/Module/Apporder.php index 313c2df50..579ca738c 100644 --- a/Zotlabs/Module/Apporder.php +++ b/Zotlabs/Module/Apporder.php @@ -2,7 +2,7 @@ namespace Zotlabs\Module; -use \Zotlabs\Lib as Zlib; +use Zotlabs\Lib as Zlib; class Apporder extends \Zotlabs\Web\Controller { @@ -25,7 +25,7 @@ class Apporder extends \Zotlabs\Web\Controller { $syslist[] = Zlib\Apps::app_encode($li); } } - + Zlib\Apps::translate_system_apps($syslist); usort($syslist,'Zotlabs\\Lib\\Apps::app_name_compare'); diff --git a/Zotlabs/Module/Apps.php b/Zotlabs/Module/Apps.php index a8817111e..97e1b237f 100644 --- a/Zotlabs/Module/Apps.php +++ b/Zotlabs/Module/Apps.php @@ -1,8 +1,8 @@ 1) $which = argv(1); - + $profile = 0; - + if($which) profile_load( $which, $profile); else - killme(); + killme(); if($_SERVER['PHP_AUTH_USER'] && $_SERVER['PHP_AUTH_USER'] !== $which) killme(); @@ -68,7 +68,7 @@ class Snap extends \Zotlabs\Web\Controller { } if(! in_array(strtolower($_SERVER['REQUEST_METHOD']),['propfind','get','head'])) - killme(); + killme(); $auth = new \Zotlabs\Storage\BasicAuth(); $auth->setRealm(ucfirst(\Zotlabs\Lib\System::get_platform_name()) . 'WebDAV'); @@ -101,5 +101,5 @@ class Snap extends \Zotlabs\Web\Controller { killme(); } - + } diff --git a/include/help.php b/include/help.php index 12721a30b..0efe90a9f 100644 --- a/include/help.php +++ b/include/help.php @@ -1,6 +1,6 @@