Powerful and easy to use cms to build websites, blogs or ecommerce stores.
HTML backendblogblog-engineblog-platformbloggingcmscontent-managementcontent-management-systemecommerceecommerce-platformno-codepage-builderphpphp-cmsphp7php8self-hostedshopping-cartweb-applicationwebsite-builder
Added editor file mananager rename and delete endpoints, rename support for pages.
givanzbe66cf180763
diff --git a/admin/controller/editor/editor.php b/admin/controller/editor/editor.phpindex 9f909b7..373d973 100755--- a/admin/controller/editor/editor.php+++ b/admin/controller/editor/editor.php@@ -154,7 +154,7 @@ class Editor extends Base {$this->loadThemeAssets();- $this->posts = new postSQL();+ $this->posts = new PostSQL();$options = ['type' => 'page','limit' => 100,@@ -172,6 +172,7 @@ class Editor extends Base {'file' => $post['template'] ? $post['template'] : 'content/page.html','url' => $url . ($theme ? '?theme=' . $theme : ''),'title' => $post['name'],+ 'post_id' => $post['post_id'],'folder' => '','className' => 'page',];@@ -212,11 +213,16 @@ class Editor extends Base {$revisionsPath = $admin_path . 'index.php?module=editor/revisions' . $themeParam;$reusablePath = $admin_path . 'index.php?module=editor/reusable' . $themeParam;+ //media endpoints$this->view->scanUrl = "$mediaControllerPath&action=scan";$this->view->uploadUrl = "$mediaControllerPath&action=upload";+ $this->view->deleteUrl = "$mediaControllerPath&action=delete";+ $this->view->renameUrl = "$mediaControllerPath&action=rename";++ //editor endpoints$this->view->saveUrl = "$controllerPath&action=save";- $this->view->deleteUrl = "$controllerPath&action=delete";- $this->view->renameUrl = "$controllerPath&action=rename";+ $this->view->deleteFileUrl = "$controllerPath&action=delete";+ $this->view->renameFileUrl = "$controllerPath&action=rename";$this->view->saveReusableUrl = "$reusablePath&action=save";$this->view->oEmbedProxyUrl = "$controllerPath&action=oEmbedProxy";@@ -319,14 +325,38 @@ class Editor extends Base {}function delete() {+ $post_id = $this->request->post['post_id'] ?? false;$file = sanitizeFileName($this->request->post['file']);$themeFolder = $this->getThemeFolder();//echo $themeFolder . DS . $file;- if (unlink($themeFolder . DS . $file)) {- $message = ['success' => true, 'message' => __('File deleted!')];+ if ($post_id) {+ $type = 'page';++ if ($post_id) {+ if (is_numeric($post_id)) {+ $post_id = [$post_id];+ }++ $this->posts = new PostSQL();+ $options = [+ 'post_id' => $post_id, 'type' => $type,+ ] + $this->global;++ $result = $this->posts->delete($options);++ if ($result && isset($result['post'])) {+ $message = ['success' => true, 'message' => ucfirst($type) . __(' deleted!')];+ } else {+ $message = ['success' => false, 'message' => sprintf(__('Error deleting %s!'), $type)];+ }+ }} else {- $message = ['success' => false, 'message' => __('Error deleting file!')];+ if (unlink($themeFolder . DS . $file)) {+ $message = ['success' => true, 'message' => __('File deleted!')];+ } else {+ $message = ['success' => false, 'message' => __('Error deleting file!')];+ }}$this->response->setType('json');@@ -334,25 +364,60 @@ class Editor extends Base {}function rename() {+ $post_id = $this->request->post['post_id'] ?? false;$file = sanitizeFileName($this->request->post['file']);$newfile = sanitizeFileName($this->request->post['newfile']);- $duplicate = $this->request->post['duplicate'] ?? false;+ $duplicate = $this->request->post['duplicate'] ?? 'false';$themeFolder = $this->getThemeFolder();+ if (strpos($newfile, '.html') === false) {+ $newfile .= '.html';+ }+$currentFile = $themeFolder . DS . $file;$targetFile = $themeFolder . DS . $newfile;- if ($duplicate) {- if (copy($currentFile, $targetFile)) {- $message = ['success' => true, 'message' => __('File copied!')];- } else {- $message = ['success' => false, 'message' => __('Error copying file!')];+ $message = ['success' => false, 'message' => __('Error!')];++ if ($post_id) {+ if ($newfile) {+ $type = 'page';+ $name = sanitizeFileName($this->request->post['name']);+ $slug = slugify($name);++ $this->posts = new PostSQL();+ $options = [+ 'post_id' => $post_id,+ 'post_content' => [+ 'name' => $name,+ 'slug' => $slug,+ ],+ ] + $this->global;++ if ($duplicate === 'true') {+ } else {+ $result = $this->posts->editContent($options);+ }++ if ($result && isset($result['post_content'])) {+ $message = ['success' => true, 'url' => url('content/page/index', ['slug' => $slug]), 'message' => ucfirst($type) . __(' renamed!')];+ } else {+ $message = ['success' => false, 'message' => sprintf(__('Error deleting %s!'), $type)];+ }}} else {- if (rename($currentFile, $targetFile)) {- $message = ['success' => true, 'message' => __('File renamed!')];+ if ($duplicate === 'true') {+ if (copy($currentFile, $targetFile)) {+ $message = ['success' => true, 'newfile' => $newfile, 'message' => __('File copied!')];+ } else {+ $message = ['success' => false, 'message' => __('Error copying file!')];+ }} else {- $message = ['success' => false, 'message' => __('Error renaming file!')];+ if (rename($currentFile, $targetFile)) {+ $message = ['success' => true, 'newfile' => $newfile, 'message' => __('File renamed!')];+ } else {+ $message = ['success' => false, 'message' => __('Error renaming file!')];+ }}}diff --git a/public/js/vvvebjs/builder.js b/public/js/vvvebjs/builder.jsindex 4a580e1..83ec837 100755--- a/public/js/vvvebjs/builder.js+++ b/public/js/vvvebjs/builder.js@@ -3461,6 +3461,8 @@ Vvveb.FileManager = {this.tree.addEventListener("click", function (e) {let element = event.target.closest("a");if (element) {+ e.stopImmediatePropagation();+ if (element.classList.contains('view')) return;e.preventDefault();return false;}@@ -3470,6 +3472,7 @@ Vvveb.FileManager = {let element = event.target.closest(".delete");if (element) {Vvveb.FileManager.deletePage(element.closest("li"), e);+ e.stopImmediatePropagation();e.preventDefault();return false;}@@ -3479,6 +3482,7 @@ Vvveb.FileManager = {let element = event.target.closest(".rename");if (element) {Vvveb.FileManager.renamePage(element.closest("li"), e, false);+ e.stopImmediatePropagation();e.preventDefault();return false;}@@ -3488,6 +3492,7 @@ Vvveb.FileManager = {let element = event.target.closest(".duplicate");if (element) {Vvveb.FileManager.renamePage(element.closest("li"), e, true);+ e.stopImmediatePropagation();e.preventDefault();return false;}@@ -3527,8 +3532,18 @@ Vvveb.FileManager = {},deletePage: function(element, e) {- let page = element.dataset;- if (confirm(`Are you sure you want to delete "${page.file}"template?`)) {+ let page = element.dataset;+ let post_id = element.dataset.post_id;+ let name;+ let _self = this;++ if (post_id) {+ name = element.querySelector('label span')?.textContent;+ } else {+ name = page.file;+ }++ if (confirm(`Are you sure you want to delete "${name}"?`)) {//allow event to change page or cancel by setting page to falsewindow.dispatchEvent(new CustomEvent("vvveb.FileManager.deletePage", {@@ -3537,10 +3552,10 @@ Vvveb.FileManager = {if (page) {- fetch(deleteUrl, {method: "POST", body: JSON.stringify({file:page.file})})+ fetch(deleteFileUrl, {method: "POST", body: new URLSearchParams({file:page.file,post_id})}).then((response) => {if (!response.ok) { throw new Error(response) }- return response.text()+ return response.json()}).then((data) => {let bg = "bg-success";@@ -3563,11 +3578,23 @@ Vvveb.FileManager = {},renamePage: function(element, e, duplicate = false) {- let page = element.dataset;- let newfile = prompt(`Enter new file name for "${page.file}"`, page.file);+ let page = element.dataset;+ let post_id = element.dataset.post_id ?? 0;+ let newfile;+ let name;let _self = this;- if (newfile) {+ if (post_id) {+ name = element.querySelector('label span')?.textContent;+ name = prompt(`Enter new name for "${name}"`, name);+ if (name) {+ newfile = page.file;+ }+ } else {+ newfile = prompt(`Enter new file name for "${page.file}"`, page.file);+ }++ if (newfile || name) {//allow event to change page or newfile or cancel by setting page to falsewindow.dispatchEvent(new CustomEvent("vvveb.FileManager.renamePage", {detail: {page, newfile}@@ -3575,10 +3602,10 @@ Vvveb.FileManager = {if (page) {- fetch(deleteUrl, {method: "POST", body: JSON.stringify({file:page.file, newfile:newfile, duplicate})})+ fetch(renameFileUrl, {method: "POST", body: new URLSearchParams({file:page.file, newfile:newfile, name, duplicate, post_id})}).then((response) => {if (!response.ok) { throw new Error(response) }- return response.text()+ return response.json()}).then((data) => {let bg = "bg-success";@@ -3587,10 +3614,11 @@ Vvveb.FileManager = {} else {bg = "bg-danger";}-++ newfile = data.newfile ?? newfile;displayToast(bg, "Rename", data.message ?? data);let baseName = newfile.replace('.html', '');- let newName = friendlyName(newfile.replace(/.*[\/\\]+/, '')).replace('.html', '');+ let newName = name || friendlyName(newfile.replace(/.*[\/\\]+/, '')).replace('.html', '');if (duplicate) {let data = _self.pages[page.page];@@ -3600,16 +3628,17 @@ Vvveb.FileManager = {} else {_self.pages[page.page]["file"] = newfile;_self.pages[page.page]["title"] = newName;- document.querySelector(":scope > label span", element).innerHTML = newName;- page.url = page.url.replace(page.file, newfile);+ page.url = data.url ?? page.url.replace(page.file, newfile);page.file = newfile;+ element.querySelector(":scope > label span").innerHTML = newName;+ element.querySelector(":scope > label a.view").setAttribute("href", page.url);_self.pages[page.page]["url"] = page.url;_self.pages[page.page]["file"] = page.file;}}).catch(error => {- console.log(error.statusText);- displayToast("bg-danger", "Error", "Error deleting page!");+ console.log(error);+ displayToast("bg-danger", "Error", "Error renaming page!");});}}