diff options
author | Mario <mario@mariovavti.com> | 2024-11-09 10:26:23 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2024-11-09 10:26:23 +0000 |
commit | 14207c68ca451c365b3fe1f8d267409da39f9498 (patch) | |
tree | 9806a0d423f3f31aa5e5cb95f323d61267d34e84 | |
parent | 0ed08274f16d65b427bd4a5bbd8bd5bd6b2a65c2 (diff) | |
parent | ac8c80ddbe5414c59a72881684e1079289270f12 (diff) | |
download | volse-hubzilla-14207c68ca451c365b3fe1f8d267409da39f9498.tar.gz volse-hubzilla-14207c68ca451c365b3fe1f8d267409da39f9498.tar.bz2 volse-hubzilla-14207c68ca451c365b3fe1f8d267409da39f9498.zip |
Merge branch 'fix-incorrect-module-imports' into 'dev'
Fix incorrect module imports.
See merge request hubzilla/core!2163
-rw-r--r-- | Zotlabs/Module/Admin/Addons.php | 4 | ||||
-rw-r--r-- | Zotlabs/Module/Admin/Themes.php | 2 | ||||
-rw-r--r-- | Zotlabs/Module/Apporder.php | 4 | ||||
-rw-r--r-- | Zotlabs/Module/Apps.php | 4 | ||||
-rw-r--r-- | Zotlabs/Module/Chatsvc.php | 2 | ||||
-rw-r--r-- | Zotlabs/Module/Cloud.php | 8 | ||||
-rw-r--r-- | Zotlabs/Module/Notify.php | 4 | ||||
-rw-r--r-- | Zotlabs/Module/Permcat.php | 4 | ||||
-rw-r--r-- | Zotlabs/Module/Snap.php | 20 | ||||
-rw-r--r-- | include/help.php | 2 | ||||
-rw-r--r-- | 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 @@ <?php namespace Zotlabs\Module; -use \Zotlabs\Lib\Config; -use \Zotlabs\Lib as Zlib; +use Zotlabs\Lib\Config; +use Zotlabs\Lib as Zlib; class Apps extends \Zotlabs\Web\Controller { diff --git a/Zotlabs/Module/Chatsvc.php b/Zotlabs/Module/Chatsvc.php index 2f2784fc4..e9dfb2a4b 100644 --- a/Zotlabs/Module/Chatsvc.php +++ b/Zotlabs/Module/Chatsvc.php @@ -4,7 +4,7 @@ namespace Zotlabs\Module; require_once('include/security.php'); -use \Zotlabs\Lib as Zlib; +use Zotlabs\Lib as Zlib; class Chatsvc extends \Zotlabs\Web\Controller { diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php index 527b06b3a..510f91c1e 100644 --- a/Zotlabs/Module/Cloud.php +++ b/Zotlabs/Module/Cloud.php @@ -8,10 +8,10 @@ namespace Zotlabs\Module; */ use Sabre\DAV as SDAV; -use \Zotlabs\Web\Controller; -use \Zotlabs\Storage\BasicAuth; -use \Zotlabs\Storage\Directory; -use \Zotlabs\Storage\Browser; +use Zotlabs\Web\Controller; +use Zotlabs\Storage\BasicAuth; +use Zotlabs\Storage\Directory; +use Zotlabs\Storage\Browser; // composer autoloader for SabreDAV diff --git a/Zotlabs/Module/Notify.php b/Zotlabs/Module/Notify.php index 0af2ec93a..7a7becbc8 100644 --- a/Zotlabs/Module/Notify.php +++ b/Zotlabs/Module/Notify.php @@ -1,8 +1,8 @@ <?php namespace Zotlabs\Module; -use \Zotlabs\Lib\PConfig; -use \Zotlabs\Web\Controller; +use Zotlabs\Lib\PConfig; +use Zotlabs\Web\Controller; class Notify extends Controller { diff --git a/Zotlabs/Module/Permcat.php b/Zotlabs/Module/Permcat.php index 064c9cefb..0335c7bc6 100644 --- a/Zotlabs/Module/Permcat.php +++ b/Zotlabs/Module/Permcat.php @@ -2,7 +2,7 @@ namespace Zotlabs\Module; -use \Zotlabs\Lib as Zlib; +use Zotlabs\Lib as Zlib; class Permcat extends \Zotlabs\Web\Controller { @@ -22,4 +22,4 @@ class Permcat extends \Zotlabs\Web\Controller { } -}
\ No newline at end of file +} diff --git a/Zotlabs/Module/Snap.php b/Zotlabs/Module/Snap.php index 89aebc097..770ba07c2 100644 --- a/Zotlabs/Module/Snap.php +++ b/Zotlabs/Module/Snap.php @@ -8,8 +8,8 @@ namespace Zotlabs\Module; * Module for accessing the DAV storage area from a DAV client. */ -use \Sabre\DAV as SDAV; -use \Zotlabs\Storage; +use Sabre\DAV as SDAV; +use Zotlabs\Storage; // composer autoloader for SabreDAV require_once('vendor/autoload.php'); @@ -24,7 +24,7 @@ require_once('vendor/autoload.php'); class Snap extends \Zotlabs\Web\Controller { function init() { - + // workaround for HTTP-auth in CGI mode if (x($_SERVER, 'REDIRECT_REMOTE_USER')) { $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ; @@ -43,20 +43,20 @@ class Snap extends \Zotlabs\Web\Controller { $_SERVER['PHP_AUTH_PW'] = $password; } } - + if (! is_dir('store')) os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, false); - + $which = null; if (argc() > 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 @@ <?php -use \Michelf\MarkdownExtra; +use Michelf\MarkdownExtra; use CommerceGuys\Intl\Language\LanguageRepository; require_once('include/items.php'); diff --git a/include/nav.php b/include/nav.php index f8cd6101f..1bee5a2db 100644 --- a/include/nav.php +++ b/include/nav.php @@ -1,8 +1,8 @@ <?php /** @file */ -use \Zotlabs\Lib\Apps; -use \Zotlabs\Lib\Chatroom; -use \Zotlabs\Lib\Config; +use Zotlabs\Lib\Apps; +use Zotlabs\Lib\Chatroom; +use Zotlabs\Lib\Config; require_once('include/security.php'); require_once('include/menu.php'); |