';
@@ -224,6 +249,20 @@ public function alerts(): string
return $output;
}
+ /**
+ * Allow admin to dismiss alerts
+ * @return string
+ */
+ public function hideAlerts(): string
+ {
+ if (!$this->loggedIn) {
+ return '';
+ }
+ $output = '';
+ $output .= ' Hide all alerts until next login
';
+ return $output;
+ }
+
/**
* Get an asset (returns URL of the asset)
*
@@ -257,28 +296,46 @@ public function backupAction(): void
}
/**
- * Replace the .htaccess with one adding security settings
+ * Save if WCMS should force https
* @return void
+ * @throws Exception
*/
- public function betterSecurityAction(): void
+ public function forceHttpsAction(): void
{
- if (isset($_POST['betterSecurity']) && $this->verifyFormActions()) {
- if ($_POST['betterSecurity'] === 'on') {
- if ($contents = $this->getFileFromRepo('htaccess-ultimate', self::WCMS_CDN_REPO)) {
- file_put_contents('.htaccess', trim($contents));
- }
- $this->alert('success', 'Improved security turned ON.');
- $this->redirect();
- } elseif ($_POST['betterSecurity'] === 'off') {
- if ($contents = $this->getFileFromRepo('htaccess', self::WCMS_CDN_REPO)) {
- file_put_contents('.htaccess', trim($contents));
- }
- $this->alert('success', 'Improved security turned OFF.');
- $this->redirect();
- }
+ if (isset($_POST['forceHttps']) && $this->verifyFormActions()) {
+ $this->set('config', 'forceHttps', $_POST['forceHttps'] === 'true');
+ $this->updateSecurityCache();
+
+ $this->alert('success', 'Force HTTPs was successfully changed.');
+ $this->redirect();
+ }
+ }
+
+ /**
+ * Save if WCMS should show the popup before saving the page content changes
+ * @return void
+ * @throws Exception
+ */
+ public function saveChangesPopupAction(): void
+ {
+ if (isset($_POST['saveChangesPopup']) && $this->verifyFormActions()) {
+ $this->set('config', 'saveChangesPopup', $_POST['saveChangesPopup'] === 'true');
+ $this->alert('success', 'Saving the confirmation popup settings changed.');
+ $this->redirect();
}
}
+ /**
+ * Update cache for security settings.
+ * @return void
+ */
+ public function updateSecurityCache(): void
+ {
+ $content = ['forceHttps' => $this->isHttpsForced()];
+ $json = json_encode($content, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT);
+ file_put_contents($this->securityCachePath, $json, LOCK_EX);
+ }
+
/**
* Get a static block
*
@@ -304,7 +361,7 @@ public function block(string $key): string
*/
public function changePasswordAction(): void
{
- if (isset($_POST['old_password'], $_POST['new_password'])
+ if (isset($_POST['old_password'], $_POST['new_password'], $_POST['repeat_password'])
&& $_SESSION['token'] === $_POST['token']
&& $this->loggedIn
&& $this->hashVerify($_POST['token'])) {
@@ -321,14 +378,21 @@ public function changePasswordAction(): void
$this->redirect();
return;
}
+ if ($_POST['new_password'] !== $_POST['repeat_password']) {
+ $this->alert('danger',
+ 'New passwords do not match. Re-open security settings');
+ $this->redirect();
+ return;
+ }
$this->set('config', 'password', password_hash($_POST['new_password'], PASSWORD_DEFAULT));
$this->set('config', 'forceLogout', true);
$this->logoutAction(true);
+ $this->alert('success', '
Password changed. Log in again.
', 1);
}
}
/**
- * Check if we can run WonderCMS properly
+ * Check if folders are writable
* Executed once before creating the database file
*
* @param string $folder the relative path of the folder to check/create
@@ -346,7 +410,7 @@ public function checkFolder(string $folder): void
}
/**
- * Initialize the JSON database if doesn't exist
+ * Initialize the JSON database if it doesn't exist
* @return void
*/
public function createDb(): void
@@ -355,12 +419,14 @@ public function createDb(): void
$this->checkMinimumRequirements();
$password = $this->generatePassword();
$this->db = (object)[
- 'config' => [
+ self::DB_CONFIG => [
'siteTitle' => 'Website title',
- 'theme' => 'essence',
+ 'theme' => 'sky',
'defaultPage' => 'home',
'login' => 'loginURL',
'forceLogout' => false,
+ 'forceHttps' => false,
+ 'saveChangesPopup' => false,
'password' => password_hash($password, PASSWORD_DEFAULT),
'lastLogins' => [],
'defaultRepos' => [
@@ -376,12 +442,14 @@ public function createDb(): void
'0' => [
'name' => 'Home',
'slug' => 'home',
- 'visibility' => 'show'
+ 'visibility' => 'show',
+ self::DB_MENU_ITEMS_SUBPAGE => new stdClass()
],
'1' => [
- 'name' => 'Example',
- 'slug' => 'example',
- 'visibility' => 'show'
+ 'name' => 'How to',
+ 'slug' => 'how-to',
+ 'visibility' => 'show',
+ self::DB_MENU_ITEMS_SUBPAGE => new stdClass()
]
]
],
@@ -390,34 +458,39 @@ public function createDb(): void
'title' => '404',
'keywords' => '404',
'description' => '404',
- 'content' => '
Sorry, page not found. :(
'
+ 'content' => '
404 - Page not found
',
+ self::DB_PAGES_SUBPAGE_KEY => new stdClass()
],
'home' => [
'title' => 'Home',
- 'keywords' => 'Keywords, are, good, for, search, engines',
- 'description' => 'A short description is also good.',
- 'content' => '
It\'s alive!
+ 'keywords' => 'Enter, page, keywords, for, search, engines',
+ 'description' => 'A page description is also good for search engines.',
+ 'content' => '
Welcome to your website
+
+
Your password for editing everything is: ' . $password . '
To install an awesome editor, open Settings -> Plugins -> Install Summernote.
'
+
To install an awesome editor, open Settings/Plugins and click Install Summernote.
',
+ self::DB_PAGES_SUBPAGE_KEY => new stdClass()
],
- 'example' => [
- 'title' => 'Example',
- 'keywords' => 'Keywords, are, good, for, search, engines',
- 'description' => 'A short description is also good.',
- 'content' => '
Easy editing
-
Click anywhere to edit, click outside the area to save. Changes are live and shown immediately.
+ 'how-to' => [
+ 'title' => 'How to',
+ 'keywords' => 'Enter, keywords, for, this page',
+ 'description' => 'A page description is also good for search engines.',
+ 'content' => '
Easy editing
+
After logging in, click anywhere to edit and click outside to save. Changes are live and shown immediately.
-
Create new page
-
Pages can be created in the Menu above.
+
Create new page
+
Pages can be created in the Settings.
-
Install themes and plugins
+
Start a blog or change your theme
To install, update or remove themes/plugins, visit the Settings.