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 23 additions and 27 deletions
+15 -19
View File
@@ -18,14 +18,10 @@ $(document).ready(function () {
// Get the content of the div // Get the content of the div
var content = currentDiv.html(); var content = currentDiv.html();
// Set the content in TinyMCE // Set the content in TinyMCE, Show the modal and initialise TinyMCE
$('#editor').val(content); $('#editor').val(content)
.modal('show')
// Open the modal .on('shown.bs.modal', function () {
$('#editModal').modal('show');
// Initialize TinyMCE when the modal is shown
$('#editModal').on('shown.bs.modal', function () {
tinymce.init({ tinymce.init({
promotion: false, promotion: false,
branding: false, branding: false,
@@ -33,18 +29,13 @@ $(document).ready(function () {
height: 300, 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', 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', 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, automatic_uploads: true,
images_reuse_filename: false, images_reuse_filename: false,
images_upload_credentials: true, images_upload_credentials: true,
force_br_newlines: false, force_br_newlines: false,
force_p_newlines: false, force_p_newlines: false,
newline_behavior: 'linebreak', newline_behavior: 'linebreak'
setup: function (editor) {
editor.on('init', function (e) {
editor.setContent(content);
});
}
}); });
}); });
@@ -61,6 +52,11 @@ $(document).ready(function () {
// Close the modal // Close the modal
$('#editModal').modal('hide'); $('#editModal').modal('hide');
if (tinymce.get('editor')) {
tinymce.get('editor').remove();
}
}); });
// Clean up TinyMCE when modal is closed // Clean up TinyMCE when modal is closed
@@ -72,10 +68,11 @@ $(document).ready(function () {
// Handle Saving changes to the page // Handle Saving changes to the page
$('#savePage').click(() => { $('#savePage').click(() => {
frameContainer=$('#frameContainer').contents().get(0)
$.post("/cms/controller/", { $.post("/cms/controller/", {
action: "save", action: "save",
uri: $('#frameContainer').contents().get(0).location.pathname, uri: frameContainer.location.pathname,
content: new XMLSerializer().serializeToString($('#frameContainer').contents().get(0)) content: new XMLSerializer().serializeToString(frameContainer)
}, function (data) { }, function (data) {
if (typeof data.error == "undefined") { if (typeof data.error == "undefined") {
showMessage(data.message, "success"); showMessage(data.message, "success");
@@ -169,8 +166,7 @@ $(document).ready(function () {
// Add click event to list items to redirect // Add click event to list items to redirect
$("#fileList li").click(function () { $("#fileList li").click(function () {
const fileUrl = $(this).data("url"); $('#frameContainer').contents().get(0).location.href = $(this).data("url"); // Redirect to the clicked file's URL
$('#frameContainer').contents().get(0).location.href = fileUrl; // Redirect to the clicked file's URL
$("#fileListDialog").dialog("close"); // Close the modal $("#fileListDialog").dialog("close"); // Close the modal
}); });
}, },
+1 -1
View File
@@ -30,7 +30,7 @@ class neoCMSCore
public function writeAudit($value) public function writeAudit($value)
{ {
if ($this->auditEnabled) 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() public function isLoggedIn()