Development sync into master #25

Merged
andydixon merged 2 commits from development into master 2024-10-09 21:31:08 +02:00
2 changed files with 19 additions and 23 deletions
Showing only changes of commit 7a544dad21 - Show all commits
+18 -22
View File
@@ -18,14 +18,10 @@ $(document).ready(function () {
// Get the content of the div
var content = currentDiv.html();
// Set the content in TinyMCE
$('#editor').val(content);
// Open the modal
$('#editModal').modal('show');
// Initialize TinyMCE when the modal is shown
$('#editModal').on('shown.bs.modal', function () {
// Set the content in TinyMCE, Show the modal and initialise TinyMCE
$('#editor').val(content)
.modal('show')
.on('shown.bs.modal', function () {
tinymce.init({
promotion: false,
branding: false,
@@ -33,18 +29,13 @@ $(document).ready(function () {
height: 300,
plugins: 'print preview paste importcss searchreplace autolink autosave save directionality code visualblocks visualchars fullscreen image link media template codesample table charmap hr pagebreak nonbreaking anchor toc insertdatetime advlist lists wordcount textpattern noneditable help charmap quickbars emoticons',
toolbar: 'undo redo | bold italic underline strikethrough | fontselect fontsizeselect formatselect | alignleft aligncenter alignright alignjustify | outdent indent | numlist bullist | forecolor backcolor removeformat | pagebreak | charmap emoticons | fullscreen preview save print | insertfile image media template link anchor codesample | ltr rtl',
images_upload_url: '/cms/image_upload.php', // URL of your server-side script
images_upload_url: '/cms/image_upload.php',
automatic_uploads: true,
images_reuse_filename: false,
images_upload_credentials: true,
force_br_newlines: false,
force_p_newlines: false,
newline_behavior: 'linebreak',
setup: function (editor) {
editor.on('init', function (e) {
editor.setContent(content);
});
}
newline_behavior: 'linebreak'
});
});
@@ -61,6 +52,11 @@ $(document).ready(function () {
// Close the modal
$('#editModal').modal('hide');
if (tinymce.get('editor')) {
tinymce.get('editor').remove();
}
});
// Clean up TinyMCE when modal is closed
@@ -77,10 +73,10 @@ $(document).ready(function () {
uri: $('#frameContainer').contents().get(0).location.pathname,
content: new XMLSerializer().serializeToString($('#frameContainer').contents().get(0))
}, function (data) {
if( typeof data.error == "undefined") {
showMessage(data.message,"success");
if (typeof data.error == "undefined") {
showMessage(data.message, "success");
} else {
showMessage(data.message,"error");
showMessage(data.message, "error");
}
// alert(data)
});
@@ -116,15 +112,15 @@ $(document).ready(function () {
},
success: function (response) {
if (typeof response.error != "undefined") {
showMessage(response.error,"error");
showMessage(response.error, "error");
} else {
showMessage("New page Created","success");
showMessage("New page Created", "success");
$('#frameContainer').contents().get(0).location.href = response.url;
$("#newPageForm").dialog("close"); // Close the modal on success
}
},
error: function () {
showMessage("Failed to create the new page (API error)","error");
showMessage("Failed to create the new page (API error)", "error");
}
});
});
@@ -230,7 +226,7 @@ function showMessage(message, type) {
messageBar.slideDown();
// Hide the bar after 5 seconds
setTimeout(function() {
setTimeout(function () {
messageBar.slideUp();
}, 5000);
}
+1 -1
View File
@@ -30,7 +30,7 @@ class neoCMSCore
public function writeAudit($value)
{
if ($this->auditEnabled)
file_put_contents(__DIR__ . "/" . date('y-m-d-') . "audit.txt", date('Y-m-d H:i:s') . "\t" . $this->loggedInUser . "\t" . trim($value) . "\n", FILE_APPEND);
file_put_contents(__DIR__ . "/logs/" . date('y-m-d-') . "audit.txt", date('Y-m-d H:i:s') . "\t" . $this->loggedInUser . "\t" . trim($value) . "\n", FILE_APPEND);
}
public function isLoggedIn()