+
{{ flash.error | first }}
diff --git a/system/typemill/routes/setup.php b/system/typemill/routes/setup.php
new file mode 100644
index 0000000..edf4c86
--- /dev/null
+++ b/system/typemill/routes/setup.php
@@ -0,0 +1,10 @@
+redirect('/tm', $routeParser->urlFor('auth.show'), 302);
+
+$app->get('/tm/setup', ControllerWebSetup::class . ':show')->setName('setup.show');
+$app->post('/tm/setup', ControllerWebSetup::class . ':create')->setName('setup.create');
+$app->redirect('/[{params:.*}]', $routeParser->urlFor('setup.show'), 302);
\ No newline at end of file
diff --git a/system/typemill/routes/web.php b/system/typemill/routes/web.php
index 34228f2..88f48fd 100644
--- a/system/typemill/routes/web.php
+++ b/system/typemill/routes/web.php
@@ -4,21 +4,31 @@ use Slim\Routing\RouteCollectorProxy;
use Typemill\Middleware\WebRedirectIfAuthenticated;
use Typemill\Middleware\WebRedirectIfUnauthenticated;
use Typemill\Middleware\WebAuthorization;
+use Typemill\Controllers\ControllerWebSetup;
use Typemill\Controllers\ControllerWebAuth;
+use Typemill\Controllers\ControllerWebRecover;
use Typemill\Controllers\ControllerWebSystem;
use Typemill\Controllers\ControllerWebAuthor;
use Typemill\Controllers\ControllerWebFrontend;
use Typemill\Controllers\ControllerWebDownload;
-# login/register
-$app->group('/tm', function (RouteCollectorProxy $group) {
+# LOGIN / REGISTER / RECOVER
+$app->group('/tm', function (RouteCollectorProxy $group) use ($settings) {
$group->get('/login', ControllerWebAuth::class . ':show')->setName('auth.show');
$group->post('/login', ControllerWebAuth::class . ':login')->setName('auth.login');
+ if(isset($settings['recoverpw']) && $settings['recoverpw'])
+ {
+ $group->get('/recover', ControllerWebRecover::class . ':showRecoverForm')->setName('auth.recoverform');
+ $group->post('/recover', ControllerWebRecover::class . ':recoverPassword')->setName('auth.recover');
+ $group->get('/reset', ControllerWebRecover::class . ':showPasswordResetForm')->setName('auth.resetform');
+ $group->post('/reset', ControllerWebRecover::class . ':resetPassword')->setName('auth.reset');
+ }
+
})->add(new WebRedirectIfAuthenticated($routeParser, $settings));
-# author and editor area, requires authentication
+# AUTHOR AREA (requires authentication)
$app->group('/tm', function (RouteCollectorProxy $group) use ($routeParser,$acl) {
# Admin Area
@@ -41,9 +51,6 @@ $app->group('/tm', function (RouteCollectorProxy $group) use ($routeParser,$acl)
$app->redirect('/tm', $routeParser->urlFor('auth.show'), 302);
$app->redirect('/tm/', $routeParser->urlFor('auth.show'), 302);
-# same with setup redirect
-
-
# downloads
$app->get('/media/files[/{params:.*}]', ControllerWebDownload::class . ':download')->setName('download.file');
diff --git a/system/typemill/settings/defaults.yaml b/system/typemill/settings/defaults.yaml
index be17ecc..53abdbc 100644
--- a/system/typemill/settings/defaults.yaml
+++ b/system/typemill/settings/defaults.yaml
@@ -1,17 +1,9 @@
version: '2.0.0'
-setup: true
-welcome: true
title: 'Typemill'
author: 'Unknown'
-copyright: 'Copyright'
+copyright: false
language: 'en'
langattr: 'en'
-themeFolder: 'themes'
-pluginFolder: 'plugins'
-settingsFolder: 'settings'
-contentFolder: 'content'
-authorFolder: '/system/typemill/author'
-adminSegment: 'tm'
editor: 'visual'
storage: '\Typemill\Models\Storage'
formats:
diff --git a/system/typemill/system.php b/system/typemill/system.php
index 51ae6bf..777a4a5 100644
--- a/system/typemill/system.php
+++ b/system/typemill/system.php
@@ -1,22 +1,19 @@
loadSettings();
+# $settings = Settings::loadSettings();
/****************************
* HANDLE DISPLAY ERRORS *
@@ -81,10 +81,10 @@ $timer['settings'] = microtime(true);
$container = new Container();
AppFactory::setContainer($container);
-$app = AppFactory::create();
+$app = AppFactory::create();
$container = $app->getContainer();
-$responseFactory = $app->getResponseFactory();
+$responseFactory = $app->getResponseFactory();
$routeParser = $app->getRouteCollector()->getRouteParser();
# add route parser to container to use named routes in controller
@@ -164,7 +164,9 @@ foreach($plugins as $plugin)
if(isset($updateSettings))
{
# update stored settings file
- Settings::updateSettings($settings);
+ $newPluginSettings = ['plugins' => $settings['plugins']];
+ $settingsModel->updateSettings($newPluginSettings);
+ # Settings::updateSettings($settings);
}
# add final settings to the container
@@ -184,11 +186,11 @@ $timer['plugins'] = microtime(true);
****************************/
# load roles and permissions and dispatch to plugins
-$rolesAndPermissions = Permissions::loadRolesAndPermissions($settings['defaultSettingsPath']);
+$rolesAndPermissions = Permissions::loadRolesAndPermissions($settings['systemSettingsPath']);
$rolesAndPermissions = $dispatcher->dispatch(new OnRolesPermissionsLoaded($rolesAndPermissions), 'onRolesPermissionsLoaded')->getData();
# load resources and dispatch to plugins
-$resources = Permissions::loadResources($settings['defaultSettingsPath']);
+$resources = Permissions::loadResources($settings['systemSettingsPath']);
$resources = $dispatcher->dispatch(new OnResourcesLoaded($resources), 'onResourcesLoaded')->getData();
# create acl-object
@@ -212,7 +214,7 @@ if( ( isset($settings['access']) && $settings['access'] ) || ( isset($settings['
}
else
{
- $session_segments = ['setup', 'tm/'];
+ $session_segments = ['setup', 'tm/', 'api/'];
# let plugins add own segments for session, eg. to enable csrf for forms
$client_segments = $dispatcher->dispatch(new OnSessionSegmentsLoaded([]), 'onSessionSegmentsLoaded')->getData();
@@ -277,12 +279,13 @@ $container->set('view', function() use ($settings, $csrf, $urlinfo, $translation
[
# path to templates with namespaces
$settings['rootPath'] . DIRECTORY_SEPARATOR . 'themes' . DIRECTORY_SEPARATOR . $settings['theme'],
- $settings['rootPath'] . $settings['authorFolder'],
+ $settings['rootPath'] . DIRECTORY_SEPARATOR . 'system' . DIRECTORY_SEPARATOR . 'typemill' . DIRECTORY_SEPARATOR . 'author',
],
[
# settings
'cache' => ( isset($settings['twigcache']) && $settings['twigcache'] ) ? $settings['rootPath'] . '/cache/twig' : false,
'debug' => isset($settings['displayErrorDetails']),
+ 'debug' => true,
'autoescape' => false
]
);
@@ -318,6 +321,10 @@ $container->set('view', function() use ($settings, $csrf, $urlinfo, $translation
$app->add(new AssetMiddleware($assets, $container->get('view')));
+$app->add(new ValidationErrorsMiddleware($container->get('view')));
+
+$app->add(new OldInputMiddleware($container->get('view')));
+
$app->add(new FlashMessages($container));
# Add Twig-View Middleware
@@ -356,9 +363,15 @@ $timer['middleware'] = microtime(true);
/************************
* ADD ROUTES *
************************/
-
-require __DIR__ . '/routes/api.php';
-require __DIR__ . '/routes/web.php';
+if(isset($settings['setup']) && $settings['setup'] == true)
+{
+ require __DIR__ . '/routes/setup.php';
+}
+else
+{
+ require __DIR__ . '/routes/api.php';
+ require __DIR__ . '/routes/web.php';
+}
$timer['routes'] = microtime(true);