Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Default theme fixes #2491

Merged
merged 4 commits into from
Apr 29, 2024
Merged

Default theme fixes #2491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
edfc9fc
[fix] #2473 custom themes and colors were not cleared/stored correctly
marcelfolaron Apr 28, 2024
739b5ec
Update Language.php
marcelfolaron Apr 28, 2024
11f02af
Add servername as fallback for http_host
marcelfolaron Apr 28, 2024
097a2e7
Merge branch 'master' into defaultThemeFixes
marcelfolaron Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 0 additions & 62 deletions .idea/php.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/Core/Language.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public function __construct(

//Start checking if the user has a language set
if (!$this->setLanguage($language)) {
$this->setLanguage($this->config->language);
$this->setLanguage("en-US");
}
}

Expand Down
4 changes: 2 additions & 2 deletions app/Core/Session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function __construct(

//test remote host info
$session_string = ! $this->request instanceof CliRequest
? self::get_client_ip() . $_SERVER['HTTP_HOST']
? self::get_client_ip() . $_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME']
: 'cli';

$testSessionHost = hash('sha1', $session_string . $this->sessionpassword);
Expand Down Expand Up @@ -136,7 +136,7 @@ public static function getSID(): string
private function makeSID(): void
{
$session_string = ! $this->request instanceof CliRequest
? self::get_client_ip() . $_SERVER['HTTP_HOST']
? self::get_client_ip() . $_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME']
: 'cli';

$tmp = hash('sha1', mt_rand(32, 32) . $session_string . time());
Expand Down
Loading
Loading