diff --git a/config/system.php b/config/system.php
index a396d4b..4205d46 100755
--- a/config/system.php
+++ b/config/system.php
@@ -9,6 +9,7 @@
"page_length" => 50,
"company_name" => "Spala",
"company_description" => "A modern lightweight CMS for Laravel and Vue developers",
+ "contact_info" => "",
"reset_password_token_lifetime" => 30,
"lock_screen" => 0,
"lock_screen_timeout" => 60,
@@ -40,6 +41,7 @@
"page_length",
"company_name",
"company_description",
+ "contact_info",
"maintenance_mode",
"reset_password",
"registration",
diff --git a/resources/assets/js/views/configuration/system/System.vue b/resources/assets/js/views/configuration/system/System.vue
index 8eb1e8e..b5bc787 100755
--- a/resources/assets/js/views/configuration/system/System.vue
+++ b/resources/assets/js/views/configuration/system/System.vue
@@ -143,6 +143,17 @@
+
+
+
+
+
+
+
+
@@ -240,6 +251,7 @@
footer_credit: '',
company_name: '',
company_description: '',
+ contact_info: '',
facebook_group: '',
https: 0,
multilingual: 0,
diff --git a/resources/assets/js/views/page/Form.vue b/resources/assets/js/views/page/Form.vue
index 9dd792c..35f0437 100755
--- a/resources/assets/js/views/page/Form.vue
+++ b/resources/assets/js/views/page/Form.vue
@@ -79,6 +79,7 @@
},
methods: {
submit() {
+ this.pageForm.body = this.cleanHTML(this.pageForm.body);
this.pageForm.body = this.addAttributes(this.pageForm.body);
this.pageForm.post('/api/page/new')
.then(response => {
@@ -89,6 +90,29 @@
helper.showErrorMsg(error);
})
},
+ cleanHTML(bodyHtml) {
+ let stringStripper = /(\n|\r| class=(")?Mso[a-zA-Z]+(")?)/g;
+ let output = bodyHtml.replace(stringStripper, ' ');
+ let commentStripper = new RegExp('', 'g');
+ output = output.replace(commentStripper, '');
+ let allowedTags = [
+ '
', '', '', '', '', '', '
', '
', '
', '',
+ '
{{ trans('general.contact_info') }}
+
{{ getConfig('contact_info') }}
diff --git a/resources/assets/js/views/post/View.vue b/resources/assets/js/views/post/View.vue
index 8c4df7e..9731032 100755
--- a/resources/assets/js/views/post/View.vue
+++ b/resources/assets/js/views/post/View.vue
@@ -27,6 +27,7 @@
{{ trans('general.contact_info') }}
+ {{ getConfig('contact_info') }}
diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss
index a8061ff..a1bb7ec 100755
--- a/resources/assets/sass/app.scss
+++ b/resources/assets/sass/app.scss
@@ -2671,4 +2671,8 @@ samp {
.topbar ul.dropdown-user li.divider {
margin: 0;
+}
+
+.modal {
+ top: 50px;
}
\ No newline at end of file
diff --git a/resources/lang/en/configuration.php b/resources/lang/en/configuration.php
index 463159e..d67cbf4 100755
--- a/resources/lang/en/configuration.php
+++ b/resources/lang/en/configuration.php
@@ -14,6 +14,7 @@
'https' => 'HTTPS',
'config_image_removed' => 'Image removed.',
'config_image_uploaded' => 'Image uploaded.',
+ 'contact_info' => 'Contact Info',
'maintenance_mode' => 'Maintenance Mode',
'maintenance_mode_message' => 'Maintenance Mode Message',
'multilingual' => 'Multilingual',
diff --git a/resources/lang/ru/configuration.php b/resources/lang/ru/configuration.php
index 756be89..d60c51f 100755
--- a/resources/lang/ru/configuration.php
+++ b/resources/lang/ru/configuration.php
@@ -14,6 +14,7 @@
'https' => 'HTTPS',
'config_image_removed' => 'Изображение удалено.',
'config_image_uploaded' => 'Изображение загружено.',
+ 'contact_info' => 'Контакты',
'maintenance_mode' => 'Сайт временно недоступен',
'maintenance_mode_message' => 'Сообщение о технических работах',
'multilingual' => 'Мультиязычный сайт',