mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-07-28 09:50:37 +02:00
Code Issues Releases Wiki Activity

Merge branch 'v2.x' into v2.2.0

Browse Source
This commit is contained in:
trendschau
2024-01-30 22:17:35 +01:00
parent f76517b228 7ae2408fdc
commit f7edfe664d
5 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
composer.lock generated
View File

@@ -1143,16 +1143,16 @@
},
{
"name": "slim/csrf",
"version": "1.3.0",
"version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/slimphp/Slim-Csrf.git",
"reference": "ebaaf295fd6d7224078d8ae3bba45329b31798c7"
"reference": "f66be9740283ed4f432535aff3623540e178013a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/slimphp/Slim-Csrf/zipball/ebaaf295fd6d7224078d8ae3bba45329b31798c7",
"reference": "ebaaf295fd6d7224078d8ae3bba45329b31798c7",
"url": "https://api.github.com/repos/slimphp/Slim-Csrf/zipball/f66be9740283ed4f432535aff3623540e178013a",
"reference": "f66be9740283ed4f432535aff3623540e178013a",
"shasum": ""
},
"require": {
@@ -1163,10 +1163,10 @@
"psr/http-server-middleware": "^1.0"
},
"require-dev": {
"phpspec/prophecy": "^1.15",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3.7"
"phpspec/prophecy": "^1.18",
"phpspec/prophecy-phpunit": "^2.1",
"phpunit/phpunit": "^9.6",
"squizlabs/php_codesniffer": "^3.8"
},
"type": "library",
"autoload": {
@@ -1195,9 +1195,9 @@
],
"support": {
"issues": "https://github.com/slimphp/Slim-Csrf/issues",
"source": "https://github.com/slimphp/Slim-Csrf/tree/1.3.0"
"source": "https://github.com/slimphp/Slim-Csrf/tree/1.4.0"
},
"time": "2022-11-05T19:27:53+00:00"
"time": "2024-01-22T09:08:27+00:00"
},
{
"name": "slim/flash",

4
readme.md
View File

@@ -37,6 +37,8 @@ To run Typemill, you need the following:
## Installation
Check installations with different setups on [typemill.net](https://typemill.net/getting-started/installation)
### Using ZIP File and FTP
1. Download and unpack the latest version of Typemill as a zip file from [Typemill Website](https://typemill.net).
@@ -60,7 +62,7 @@ composer update
### Using Docker
(Details to be provided soon)
See description on [typemill.net](https://typemill.net/getting-started/installation/docker)
## Folder Permissions

4
system/typemill/Controllers/ControllerApiSystemExtensions.php
View File

@@ -73,13 +73,13 @@ class ControllerApiSystemExtensions extends Controller
if($params['type'] == 'plugins')
{
$pluginsettings = $this->settings['plugins'][$params['name']] ?? $params['name'];
$pluginsettings = $this->settings['plugins'][$params['name']] ?? [];
$pluginsettings['active'] = $params['checked'];
$updatedSettings = $settings->updateSettings($pluginsettings, 'plugins', $params['name']);
}
elseif($params['type'] == 'themes')
{
$themesettings = $this->settings['themes'][$params['name']] ?? $params['name'];
$themesettings = $this->settings['themes'][$params['name']] ?? [];
$updatedSettings = $settings->updateSettings($themesettings, 'themes', $params['name']);
if($updatedSettings)
{

12
system/typemill/Controllers/ControllerWebSetup.php
View File

@@ -87,12 +87,6 @@ class ControllerWebSetup extends Controller
if($username)
{
usleep(30000);
$user->setUser($username);
$user->login();
# create initial settings file
$settingsModel = new Settings();
$settingsModel->createSettings([
@@ -101,9 +95,13 @@ class ControllerWebSetup extends Controller
'mailfromname' => $params['username']
]);
$user->setUser($username);
$user->login();
$urlinfo = $this->c->get('urlinfo');
$route = $urlinfo['baseurl'] . '/tm/system';
usleep(30000);
$this->c->get('flash')->addMessage('error', Translations::translate('Account created. Please login with your username and password now.'));

4
system/typemill/Models/Settings.php
View File

@@ -235,9 +235,7 @@ class Settings
$defaults = array_merge($defaults, $defaultSettings);
}
$initialSettings = $this->storage->updateYaml('settingsFolder', '', 'settings.yaml', [
$defaults
]);
$initialSettings = $this->storage->updateYaml('settingsFolder', '', 'settings.yaml', $defaults);
if($initialSettings)
{