Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-29 23:04:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into phpstan-level-1

Browse source
This commit is contained in:
Art4 2024-11-18 21:45:42 +00:00
commit c79f3cde22
150 changed files with 2429 additions and 1781 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Module/Settings/Account.php
View file

@ -40,8 +40,6 @@ class Account extends BaseSettings
self::checkFormSecurityTokenRedirectOnError($redirectUrl, 'settings');
$a = DI::app();
$user = User::getById($this->session->getLocalUserId());
if (!empty($request['password-submit'])) {
@ -111,7 +109,7 @@ class Account extends BaseSettings
}
if (strlen($timezone) && $timezone != $user['timezone']) {
$a->setTimeZone($timezone);
DI::appHelper()->setTimeZone($timezone);
}
$fields = [
@ -383,8 +381,6 @@ class Account extends BaseSettings
return '';
}
$a = DI::app();
$user = User::getById($this->session->getLocalUserId());
$username = $user['username'];
@ -404,7 +400,7 @@ class Account extends BaseSettings
$expire_network_only = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'expire', 'network_only', false);
if (!strlen($user['timezone'])) {
$timezone = $a->getTimeZone();
$timezone = DI::appHelper()->getTimeZone();
}
// Set the account type to "Community" when the page is a community page but the account type doesn't fit

17
src/Module/Settings/Display.php
View file

@ -7,7 +7,10 @@
namespace Friendica\Module\Settings;
use Friendica\App;
use Friendica\App\Arguments;
use Friendica\App\BaseURL;
use Friendica\App\Page;
use Friendica\AppHelper;
use Friendica\Content\ContactSelector;
use Friendica\Content\Conversation\Collection\Timelines;
use Friendica\Content\Text\BBCode;
@ -40,8 +43,8 @@ class Display extends BaseSettings
private $config;
/** @var IManagePersonalConfigValues */
private $pConfig;
/** @var App */
private $app;
/** @var AppHelper */
private $appHelper;
/** @var SystemMessages */
private $systemMessages;
/** @var ChannelFactory */
@ -55,13 +58,13 @@ class Display extends BaseSettings
/** @var TimelineFactory */
protected $timeline;
public function __construct(Repository\UserDefinedChannel $userDefinedChannel, NetworkFactory $network, CommunityFactory $community, ChannelFactory $channel, TimelineFactory $timeline, SystemMessages $systemMessages, App $app, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
public function __construct(Repository\UserDefinedChannel $userDefinedChannel, NetworkFactory $network, CommunityFactory $community, ChannelFactory $channel, TimelineFactory $timeline, SystemMessages $systemMessages, AppHelper $appHelper, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, IHandleUserSessions $session, Page $page, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
{
parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
$this->config = $config;
$this->pConfig = $pConfig;
$this->app = $app;
$this->appHelper = $appHelper;
$this->systemMessages = $systemMessages;
$this->timeline = $timeline;
$this->channel = $channel;
@ -168,7 +171,7 @@ class Display extends BaseSettings
// call theme_post only if theme has not been changed
if ($themeconfigfile = Theme::getConfigFile($theme)) {
require_once $themeconfigfile;
theme_post($this->app);
theme_post($this->appHelper);
}
} else {
User::update(['theme' => $theme], $uid);
@ -305,7 +308,7 @@ class Display extends BaseSettings
$theme_config = '';
if ($themeconfigfile = Theme::getConfigFile($theme_selected)) {
require_once $themeconfigfile;
$theme_config = theme_content($this->app);
$theme_config = theme_content($this->appHelper);
}
$tpl = Renderer::getMarkupTemplate('settings/display.tpl');