Logs view: remove unneeded tpl var

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index fda97299d3b39a073c418b1c1b4a65062f2790ff..7c7496c3baf138a0b47d66b9241d2653d39354eb 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -25,6 +25,7 @@ use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
 use Friendica\App\Module;
+use Friendica\Factory\ConfigFactory;
 use Friendica\Module\Maintenance;
 use Friendica\Security\Authentication;
 use Friendica\Core\Config\Cache;
@@ -56,24 +57,20 @@ use Psr\Log\LoggerInterface;
  */
 class App
 {
-       public $user;
-       public $data = [];
-       /** @deprecated 2019.09 - use App\Arguments->getArgv() or Arguments->get() */
-       public $argv;
-       /** @deprecated 2019.09 - use App\Arguments->getArgc() */
-       public $argc;
-       public $timezone;
-       public $theme_info = [];
        // Allow themes to control internal parameters
        // by changing App values in theme.php
-
-       public $videowidth              = 425;
-       public $videoheight             = 350;
-       public $theme_events_in_profile = true;
-       public $queue;
-
-       private $profile_owner;
-       private $contact_id;
+       private $theme_info = [
+               'videowidth'        => 425,
+               'videoheight'       => 350,
+               'events_in_profile' => true
+       ];
+
+       private $user_id       = 0;
+       private $nickname      = '';
+       private $timezone      = '';
+       private $profile_owner = 0;
+       private $contact_id    = 0;
+       private $queue         = [];
 
        /**
         * @var App\Mode The Mode of the Application
@@ -130,11 +127,56 @@ class App
         */
        private $pConfig;
 
+       /**
+        * Set the user ID
+        *
+        * @param int $user_id
+        * @return void
+        */
+       public function setLoggedInUserId(int $user_id)
+       {
+               $this->user_id = $user_id;
+       }
+
+       /**
+        * Set the nickname
+        *
+        * @param int $user_id
+        * @return void
+        */
+       public function setLoggedInUserNickname(string $nickname)
+       {
+               $this->nickname = $nickname;
+       }
+
+       public function isLoggedIn()
+       {
+               return local_user() && $this->user_id && ($this->user_id == local_user());
+       }
+
+       /**
+        * Fetch the user id
+        * @return int 
+        */
+       public function getLoggedInUserId()
+       {
+               return $this->user_id;
+       }
+
+       /**
+        * Fetch the user nick name
+        * @return string
+        */
+       public function getLoggedInUserNickname()
+       {
+               return $this->nickname;
+       }
+
        /**
         * Set the profile owner ID
         *
-        * @param int $owner_id 
-        * @return void 
+        * @param int $owner_id
+        * @return void
         */
        public function setProfileOwner(int $owner_id)
        {
@@ -144,7 +186,7 @@ class App
        /**
         * Get the profile owner ID
         *
-        * @return int 
+        * @return int
         */
        public function getProfileOwner():int
        {
@@ -153,9 +195,9 @@ class App
 
        /**
         * Set the contact ID
-        * 
-        * @param int $contact_id 
-        * @return void 
+        *
+        * @param int $contact_id
+        * @return void
         */
        public function setContactId(int $contact_id)
        {
@@ -165,13 +207,81 @@ class App
        /**
         * Get the contact ID
         *
-        * @return int 
+        * @return int
         */
        public function getContactId():int
        {
                return $this->contact_id;
        }
 
+       /**
+        * Set the timezone
+        *
+        * @param int $timezone
+        * @return void
+        */
+       public function setTimeZone(string $timezone)
+       {
+               $this->timezone = $timezone;
+       }
+
+       /**
+        * Get the timezone
+        *
+        * @return int
+        */
+       public function getTimeZone():string
+       {
+               return $this->timezone;
+       }
+
+       /**
+        * Set workerqueue information
+        *
+        * @param array $queue 
+        * @return void 
+        */
+       public function setQueue(array $queue)
+       {
+               $this->queue = $queue;
+       }
+
+       /**
+        * Fetch workerqueue information
+        *
+        * @return array 
+        */
+       public function getQueue()
+       {
+               return $this->queue ?? [];
+       }
+
+       /**
+        * Fetch a specific workerqueue field
+        *
+        * @param string $index 
+        * @return mixed 
+        */
+       public function getQueueValue(string $index)
+       {
+               return $this->queue[$index] ?? null;
+       }
+
+       public function setThemeInfoValue(string $index, $value)
+       {
+               $this->theme_info[$index] = $value;
+       }
+
+       public function getThemeInfo()
+       {
+               return $this->theme_info;
+       }
+
+       public function getThemeInfoValue(string $index, $default = null)
+       {
+               return $this->theme_info[$index] ?? $default;
+       }
+
        /**
         * Returns the current config cache of this node
         *
@@ -218,9 +328,6 @@ class App
                $this->process  = $process;
                $this->pConfig  = $pConfig;
 
-               $this->argv         = $args->getArgv();
-               $this->argc         = $args->getArgc();
-
                $this->load();
        }
 
@@ -246,7 +353,7 @@ class App
                        $this->profiler->update($this->config);
 
                        Core\Hook::loadHooks();
-                       $loader = new ConfigFileLoader($this->getBasePath());
+                       $loader = (new ConfigFactory())->createConfigFileLoader($this->getBasePath(), $_SERVER);
                        Core\Hook::callAll('load_config', $loader);
                }
 
@@ -581,7 +688,7 @@ class App
                                $this->baseURL->redirect('search');
                        }
 
-                       // Initialize module that can set the current theme in the init() method, either directly or via App->profile_owner
+                       // Initialize module that can set the current theme in the init() method, either directly or via App->setProfileOwner
                        $page['page_title'] = $moduleName;
 
                        if (!$this->mode->isInstall() && !$this->mode->has(App\Mode::MAINTENANCEDISABLED)) {