diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a56f79f..7c4f8cbc 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ -Monstra 3.0.4, 2016-04-05 +Monstra 3.0.4, 2018-07-21 ------------------------ +- Added Privacy policy page - Fixed User Security by adding a check that compares POST id with SESSION id for none admin edits - Fixed ability to read robots.txt diff --git a/engine/Site.php b/engine/Site.php index 1c2d01a2..0e0d8d8e 100644 --- a/engine/Site.php +++ b/engine/Site.php @@ -219,4 +219,18 @@ public static function powered() { return __('Powered by', 'system').' Monstra ' . Monstra::VERSION; } + + /** + * Get site privacy policy + * + * + * echo Site::privacyPolicy(); + * + * + * @return string + */ + public static function privacyPolicy() + { + return Option::get('privacy_policy'); + } } diff --git a/plugins/box/system/languages/de.lang.php b/plugins/box/system/languages/de.lang.php index df31167d..27e227da 100644 --- a/plugins/box/system/languages/de.lang.php +++ b/plugins/box/system/languages/de.lang.php @@ -50,7 +50,7 @@ 'Send New Password' => 'Neues Passwort zusenden', 'This user does not exist' => 'Dieser Benutzer existiert nicht', 'Version' => 'Version', - + 'Privacy policy' => 'Datenschutzerklärung', 'Install script writable' => 'Installationsskript beschreibbar', 'Install script not writable' => 'Installationsskript nicht beschreibbar', 'Directory: :dir writable' => 'Ordner: :dir beschreibbar', diff --git a/plugins/box/system/languages/en.lang.php b/plugins/box/system/languages/en.lang.php index 04d1e8bc..1640757a 100644 --- a/plugins/box/system/languages/en.lang.php +++ b/plugins/box/system/languages/en.lang.php @@ -50,7 +50,7 @@ 'Version' => 'Version', 'Plugin does not exist' => 'Plugin does not exist', 'Help' => 'Help', - + 'Privacy policy' => 'Privacy policy', 'Install script writable' => 'Install script writable', 'Install script not writable' => 'Install script not writable', 'Directory: :dir writable' => 'Directory: :dir writable', diff --git a/plugins/box/system/languages/fr.lang.php b/plugins/box/system/languages/fr.lang.php index 55509ee1..7531d219 100644 --- a/plugins/box/system/languages/fr.lang.php +++ b/plugins/box/system/languages/fr.lang.php @@ -52,7 +52,7 @@ 'This user does not exist' => 'Cet utilisateur n\'existe pas', 'Version' => 'Version', 'Plugin does not exist' => 'Ce plugin n\'existe pas', - + 'Privacy policy' => 'Politique de confidentialité', 'Install script writable' => 'Le script d\'installation est accessible en écriture', // pour ' = ’ (a voir) 'Install script not writable' => 'Le script d\'installation n\' est pas accessible en écriture', 'Directory: :dir writable' => 'Répertoire: :dir writable', diff --git a/plugins/box/system/languages/ja.lang.php b/plugins/box/system/languages/ja.lang.php index 7c7c1a15..c5103a12 100644 --- a/plugins/box/system/languages/ja.lang.php +++ b/plugins/box/system/languages/ja.lang.php @@ -49,6 +49,7 @@ 'This user does not exist' => 'このユーザーは存在しません', 'Version' => 'バージョン', 'Plugin does not exist' => 'プラグインが存在しません', + 'Privacy policy' => 'プライバシーポリシー', 'Install script writable' => 'インストールスクリプトは書き込み可能です', 'Install script not writable' => 'インストールスクリプトは書き込み不可能です', 'Directory: :dir writable' => 'ディレクトリ: :dir は書き込み可能です', diff --git a/plugins/box/system/languages/pl.lang.php b/plugins/box/system/languages/pl.lang.php index 7301cab4..40de2374 100644 --- a/plugins/box/system/languages/pl.lang.php +++ b/plugins/box/system/languages/pl.lang.php @@ -50,7 +50,7 @@ 'Version' => 'Wersja', 'Plugin does not exist' => 'Wtyczka nie istnieje', 'Help' => 'Pomoc', - + 'Privacy policy' => 'Polityka prywatności', 'Install script writable' => 'Skrypt instalacyjny ma możliwość zapisu', 'Install script not writable' => 'Skrypt instalacyjny nie ma możliwości zapisu', 'Directory: :dir writable' => 'Katalog: :dir z możliwością zapisu', diff --git a/plugins/box/system/languages/ru.lang.php b/plugins/box/system/languages/ru.lang.php index a936b9a5..5ac73f39 100644 --- a/plugins/box/system/languages/ru.lang.php +++ b/plugins/box/system/languages/ru.lang.php @@ -50,7 +50,7 @@ 'Plugin does not exist' => 'Такого плагина не существует', 'Help' => 'Помощь', 'Continue' => 'Продолжить', - + 'Privacy policy' => 'Политика приватности', 'Install script writable' => 'Установочный скрипт доступен для записи', 'Install script not writable' => 'Установочный скрипт не доступен для записи', 'Directory: :dir writable' => 'Директория :dir доступна для записи', diff --git a/plugins/box/system/system.admin.php b/plugins/box/system/system.admin.php index b1372aa9..db6609dc 100755 --- a/plugins/box/system/system.admin.php +++ b/plugins/box/system/system.admin.php @@ -131,7 +131,8 @@ public static function main() 'timezone' => Request::post('system_timezone'), 'system_email' => Request::post('system_email'), 'language' => Request::post('system_language'), - 'maintenance_message' => Request::post('site_maintenance_message'))); + 'maintenance_message' => Request::post('site_maintenance_message'), + 'privacy_policy' => Request::post('site_privacy_policy'))); Notification::set('success', __('Your changes have been saved.', 'system')); Request::redirect('index.php?id=system'); diff --git a/plugins/box/system/views/backend/index.view.php b/plugins/box/system/views/backend/index.view.php index ee1fb720..c69fbc6f 100755 --- a/plugins/box/system/views/backend/index.view.php +++ b/plugins/box/system/views/backend/index.view.php @@ -58,6 +58,14 @@ ); ?> +
+ 'form-control')) + ); + ?> +

diff --git a/public/themes/default/footer-links.chunk.php b/public/themes/default/footer-links.chunk.php index 17ec4c8b..e20151d2 100644 --- a/public/themes/default/footer-links.chunk.php +++ b/public/themes/default/footer-links.chunk.php @@ -1 +1,2 @@ + diff --git a/storage/database/options.table.xml b/storage/database/options.table.xml index 67b37a88..aba3a47a 100644 --- a/storage/database/options.table.xml +++ b/storage/database/options.table.xml @@ -1,2 +1,2 @@ -211527510b419sitenameSitename25fe7b20ebbkeywordsSite keywords32996da0de2descriptionSite description44056d724b8sloganSite slogan5620d3e963edefaultpagehome66c9cd389f6siteurlhttp://example.org/72db8769b1etimezoneKwajalein8a0b440adcelanguageen9d7bd60ad05maintenance_statusoff10c415980d92maintenance_message<h1>Monstra :: Maintenance mode</h1>114c4e8f0aa8theme_site_namedefault124c4e8f0aa8theme_admin_namedefault124c4e8f0aa8users_frontend_registrationtrue18f469fc791ccaptcha_installedtrue19f119fc791csystem_emailadmin@admin.com20f119fc121cstyles_version121f119fc133cjavascript_version1 \ No newline at end of file +181527510b419sitenameSitename25fe7b20ebbkeywordsSite keywords32996da0de2descriptionSite description44056d724b8sloganSite slogan5620d3e963edefaultpagehome66c9cd389f6siteurlhttp://example.org/72db8769b1etimezoneKwajalein8a0b440adcelanguageen9d7bd60ad05maintenance_statusoff10c415980d92maintenance_message<h1>Monstra :: Maintenance mode</h1>114c4e8f0aa8theme_site_namedefault124c4e8f0aa8theme_admin_namedefault134c4e8f0aa8users_frontend_registrationtrue14f469fc791ccaptcha_installedtrue15f119fc791csystem_emailadmin@admin.com16f119fc121cstyles_version117f119fc133cjavascript_version118y88afc13efprivacy_policyprivacy-policy \ No newline at end of file diff --git a/storage/database/pages.table.xml b/storage/database/pages.table.xml index 272a2c3c..bf1488b9 100644 --- a/storage/database/pages.table.xml +++ b/storage/database/pages.table.xml @@ -1,2 +1,2 @@ -4