Move mod/cal.php and mod/events.php to Module

[friendica.git] / src / Module / BaseAdmin.php

diff --git a/src/Module/BaseAdmin.php b/src/Module/BaseAdmin.php
index 713c44cc200ccfb5c413159d86f3bfb0943a593f..1c9fc0f2446ab41759eaa85cfe58ab567a7c3206 100644 (file)
--- a/src/Module/BaseAdmin.php
+++ b/src/Module/BaseAdmin.php
@@ -24,12 +24,9 @@ namespace Friendica\Module;
 use Friendica\BaseModule;
 use Friendica\Core\Addon;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\DI;
 use Friendica\Network\HTTPException;
 
-require_once 'boot.php';
-
 /**
  * This abstract module is meant to be extended by all modules that are reserved to administrator users.
  *
@@ -52,10 +49,10 @@ abstract class BaseAdmin extends BaseModule
         */
        public static function checkAdminAccess(bool $interactive = false)
        {
-               if (!local_user()) {
+               if (!DI::userSession()->getLocalUserId()) {
                        if ($interactive) {
-                               notice(DI::l10n()->t('Please login to continue.'));
-                               Session::set('return_path', DI::args()->getQueryString());
+                               DI::sysmsg()->addNotice(DI::l10n()->t('Please login to continue.'));
+                               DI::session()->set('return_path', DI::args()->getQueryString());
                                DI::baseUrl()->redirect('login');
                        } else {
                                throw new HTTPException\UnauthorizedException(DI::l10n()->t('Please login to continue.'));
@@ -66,7 +63,7 @@ abstract class BaseAdmin extends BaseModule
                        throw new HTTPException\ForbiddenException(DI::l10n()->t('You don\'t have access to administration pages.'));
                }
 
-               if (!empty($_SESSION['submanage'])) {
+               if (DI::userSession()->getSubManagedUserId()) {
                        throw new HTTPException\ForbiddenException(DI::l10n()->t('Submanaged account can\'t access the administration pages. Please log back in as the main account.'));
                }
        }