mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-02 20:27:25 +02:00
Code Issues Releases Wiki Activity

Version 1.2.19: Modularized Visual Editor

Browse Source
This commit is contained in:
trendschau
2019-11-24 07:25:04 +01:00
parent e1c16529e5
commit 126106bccb
54 changed files with 801 additions and 1465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
system/Controllers/AuthController.php
View File

@@ -11,7 +11,7 @@ use Typemill\Models\WriteYaml;
class AuthController extends Controller
{
# redirect if visit /setup route
public function redirect(Request $request, Response $response)
{
if(isset($_SESSION['login']))
@@ -23,6 +23,7 @@ class AuthController extends Controller
return $response->withRedirect($this->c->router->pathFor('auth.show'));
}
}
/**
* show login form
@@ -125,7 +126,10 @@ class AuthController extends Controller
$yaml->updateYaml('settings/users', '.logins', $logins);
}
return $response->withRedirect($this->c->router->pathFor('content.raw'));
$settings = $this->c->get('settings');
$editor = (isset($settings['editor']) && $settings['editor'] == 'visual') ? 'visual' : 'raw';
return $response->withRedirect($this->c->router->pathFor('content.' . $editor));
}
}

7
system/Controllers/ContentApiController.php
View File

@@ -180,7 +180,12 @@ class ContentApiController extends ContentController
$delete = $this->deleteContentFiles(['txt']);
# set redirect url to edit page
$url = $this->uri->getBaseUrl() . '/tm/content/' . $this->settings['editor'] . $this->item->urlRelWoF;
$url = $this->uri->getBaseUrl() . '/tm/content/' . $this->settings['editor'];
if(isset($this->item->urlRelWoF))
{
$url = $url . $this->item->urlRelWoF;
}
# remove the unpublished changes
$delete = $this->deleteContentFiles(['txt']);

17
system/Controllers/PageController.php
View File

@@ -174,9 +174,22 @@ class PageController extends Controller
}
}
$route = empty($args) && $settings['startpage'] ? '/cover.twig' : '/index.twig';
return $this->render($response, $route, array('navigation' => $structure, 'content' => $contentHTML, 'item' => $item, 'breadcrumb' => $breadcrumb, 'settings' => $settings, 'title' => $title, 'description' => $description, 'base_url' => $base_url, 'image' => $firstImage ));
$home = empty($args) ? true : false;
$theme = $settings['theme'];
$route = empty($args) && isset($settings['themes'][$theme]['cover']) ? '/cover.twig' : '/index.twig';
return $this->render($response, $route, [
'home' => $home,
'navigation' => $structure,
'content' => $contentHTML,
'item' => $item,
'breadcrumb' => $breadcrumb,
'settings' => $settings,
'title' => $title,
'description' => $description,
'base_url' => $base_url,
'image' => $firstImage ]);
}
protected function getCachedStructure($cache)

30
system/Controllers/SettingsController.php
View File

@@ -15,15 +15,16 @@ class SettingsController extends Controller
public function showSettings($request, $response, $args)
{
$user = new User();
$settings = $this->c->get('settings');
$copyright = $this->getCopyright();
$languages = $this->getLanguages();
$locale = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2) : 'en';
$users = $user->getUsers();
$route = $request->getAttribute('route');
$user = new User();
$settings = $this->c->get('settings');
$defaultSettings = \Typemill\Settings::getDefaultSettings();
$copyright = $this->getCopyright();
$languages = $this->getLanguages();
$locale = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2) : 'en';
$users = $user->getUsers();
$route = $request->getAttribute('route');
return $this->render($response, 'settings/system.twig', array('settings' => $settings, 'copyright' => $copyright, 'languages' => $languages, 'locale' => $locale, 'users' => $users, 'route' => $route->getName() ));
return $this->render($response, 'settings/system.twig', array('settings' => $settings, 'copyright' => $copyright, 'languages' => $languages, 'locale' => $locale, 'formats' => $defaultSettings['formats'] ,'users' => $users, 'route' => $route->getName() ));
}
public function saveSettings($request, $response, $args)
@@ -41,10 +42,11 @@ class SettingsController extends Controller
return $response->withRedirect($this->c->router->pathFor('settings.show'));
}
$settings = \Typemill\Settings::getUserSettings();
$params = $request->getParams();
$newSettings = isset($params['settings']) ? $params['settings'] : false;
$validate = new Validation();
$settings = \Typemill\Settings::getUserSettings();
$defaultSettings = \Typemill\Settings::getDefaultSettings();
$params = $request->getParams();
$newSettings = isset($params['settings']) ? $params['settings'] : false;
$validate = new Validation();
if($newSettings)
{
@@ -55,13 +57,13 @@ class SettingsController extends Controller
'copyright' => $newSettings['copyright'],
'year' => $newSettings['year'],
'language' => $newSettings['language'],
'startpage' => isset($newSettings['startpage']) ? true : false,
'editor' => $newSettings['editor'],
'formats' => $newSettings['formats'],
);
$copyright = $this->getCopyright();
$validate->settings($newSettings, $copyright, 'settings');
$validate->settings($newSettings, $copyright, $defaultSettings['formats'], 'settings');
}
else
{