X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=5c85c9f26d46ad29a7260c44d117bee4676750fd;hb=3153e098b0e83910a550773f5661d4e8541b14b7;hp=5c74b1b539388750f7b2c8300351ac34a07795dd;hpb=a69e128fe4d202296582f3810239ebc4635d8b6a;p=friendica.git diff --git a/src/App.php b/src/App.php index 5c74b1b539..5c85c9f26d 100644 --- 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; @@ -39,6 +40,7 @@ use Friendica\Model\Profile; use Friendica\Module\Special\HTTPException as ModuleHTTPException; use Friendica\Network\HTTPException; use Friendica\Util\ConfigFileLoader; +use Friendica\Util\DateTimeFormat; use Friendica\Util\HTTPSignature; use Friendica\Util\Profiler; use Friendica\Util\Strings; @@ -56,32 +58,20 @@ use Psr\Log\LoggerInterface; */ class App { - public $profile; - public $profile_uid; - public $user; - public $cid; - public $contact; - public $contacts; - public $page_contact; - public $content; - 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 $interactive = true; - public $identities; - public $theme_info = []; - public $category; // Allow themes to control internal parameters // by changing App values in theme.php - - public $sourcename = ''; - public $videowidth = 425; - public $videoheight = 350; - public $theme_events_in_profile = true; - public $queue; + 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 @@ -138,6 +128,162 @@ 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 + */ + public function setProfileOwner(int $owner_id) + { + $this->profile_owner = $owner_id; + } + + /** + * Get the profile owner ID + * + * @return int + */ + public function getProfileOwner():int + { + return $this->profile_owner; + } + + /** + * Set the contact ID + * + * @param int $contact_id + * @return void + */ + public function setContactId(int $contact_id) + { + $this->contact_id = $contact_id; + } + + /** + * Get the contact ID + * + * @return int + */ + public function getContactId():int + { + return $this->contact_id; + } + + /** + * Set the timezone + * + * @param string $timezone A valid time zone identifier, see https://www.php.net/manual/en/timezones.php + * @return void + */ + public function setTimeZone(string $timezone) + { + $this->timezone = (new \DateTimeZone($timezone))->getName(); + DateTimeFormat::setLocalTimeZone($this->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 * @@ -184,9 +330,6 @@ class App $this->process = $process; $this->pConfig = $pConfig; - $this->argv = $args->getArgv(); - $this->argc = $args->getArgc(); - $this->load(); } @@ -197,6 +340,9 @@ class App { set_time_limit(0); + // Ensure that all "strtotime" operations do run timezone independent + date_default_timezone_set('UTC'); + // This has to be quite large to deal with embedded private photos ini_set('pcre.backtrack_limit', 500000); @@ -212,7 +358,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); } @@ -231,15 +377,13 @@ class App private function loadDefaultTimezone() { if ($this->config->get('system', 'default_timezone')) { - $this->timezone = $this->config->get('system', 'default_timezone'); + $timezone = $this->config->get('system', 'default_timezone', 'UTC'); } else { global $default_timezone; - $this->timezone = !empty($default_timezone) ? $default_timezone : 'UTC'; + $timezone = $default_timezone ?? '' ?: 'UTC'; } - if ($this->timezone) { - date_default_timezone_set($this->timezone); - } + $this->setTimeZone($timezone); } /** @@ -317,10 +461,10 @@ class App $page_theme = null; // Find the theme that belongs to the user whose stuff we are looking at - if ($this->profile_uid && ($this->profile_uid != local_user())) { + if (!empty($this->profile_owner) && ($this->profile_owner != local_user())) { // Allow folks to override user themes and always use their own on their own site. // This works only if the user is on the same server - $user = $this->database->selectFirst('user', ['theme'], ['uid' => $this->profile_uid]); + $user = $this->database->selectFirst('user', ['theme'], ['uid' => $this->profile_owner]); if ($this->database->isResult($user) && !$this->pConfig->get(local_user(), 'system', 'always_my_theme')) { $page_theme = $user['theme']; } @@ -350,11 +494,11 @@ class App $page_mobile_theme = null; // Find the theme that belongs to the user whose stuff we are looking at - if ($this->profile_uid && ($this->profile_uid != local_user())) { + if (!empty($this->profile_owner) && ($this->profile_owner != local_user())) { // Allow folks to override user themes and always use their own on their own site. // This works only if the user is on the same server if (!$this->pConfig->get(local_user(), 'system', 'always_my_theme')) { - $page_mobile_theme = $this->pConfig->get($this->profile_uid, 'system', 'mobile-theme'); + $page_mobile_theme = $this->pConfig->get($this->profile_owner, 'system', 'mobile-theme'); } } @@ -547,7 +691,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_uid + // 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)) {