Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

Support for page rename and page duplicate

givanz516ebc1c6ed4
diff --git a/admin/controller/editor/editor.php b/admin/controller/editor/editor.php
index 2de9121..fe2432b 100755
--- a/admin/controller/editor/editor.php
+++ b/admin/controller/editor/editor.php
@@ -150,10 +150,10 @@ class Editor extends Base {
}
function index() {
- $theme = sanitizeFileName($this->request->get['theme'] ?? false);
+ $theme = $this->getTheme();
$themeParam = ($theme ? '&theme=' . $theme : '');
$view = View::getInstance();
- $view->themeBaseUrl = PUBLIC_PATH . 'themes/' . ($this->getTheme() ?? 'default') . '/';
+ $view->themeBaseUrl = PUBLIC_PATH . 'themes/' . $theme . '/';
$view->pages = $this->loadTemplateList($theme);
$this->loadThemeAssets();
@@ -169,7 +169,7 @@ class Editor extends Base {
foreach ($results['posts'] as $post) {
$slug = $post['slug'];
- $url = url('content/page/index',['slug' => $slug]);
+ $url = url('content/page/index',['slug' => $slug, 'post_id' => $post['post_id']]);
$posts[$slug] = [
'name' => $slug,
@@ -378,7 +378,7 @@ class Editor extends Base {
}
$currentFile = $themeFolder . DS . $file;
- $targetFile = dirname($currentFile) . DS . basename($newfile); //save in same folder
+ $targetFile = dirname($currentFile) . DS . slugify(basename($newfile)); //save in same folder
$message = ['success' => false, 'message' => __('Error!')];
@@ -421,37 +421,42 @@ class Editor extends Base {
$site_id[] = $item['site_id'];
}
}
-
+
$startTemplateUrl = $data['template'] ?? "content/$type.html";
- $template = "content/$slug.html";
-
- if (!@copy($themeFolder . DS . $startTemplateUrl, $themeFolder . DS . $template)) {
+ $template = "content/$slug.html";
+
+ if (! @copy($themeFolder . DS . $startTemplateUrl, $themeFolder . DS . $template)) {
$template = $data['template'] ?? '';
}
-
+
$result = $this->posts->add([
'post' => [
'post_content' => $data['post_content'],
'taxonomy_item' => $taxonomy_item ?? [],
- 'template' => $template,
+ 'template' => $template,
] + $data,
'site_id' => $site_id,
]);
if ($result && isset($result['post'])) {
- $message = ['success' => true, 'url' => url('content/page/index', ['slug' => $slug]), 'message' => ucfirst($type) . __(' duplicated!')];
+ $message = ['success' => true, 'url' => url('content/page/index', ['slug' => $slug, 'post_id' => $post_id]), 'message' => ucfirst($type) . ' ' . __('duplicated') . '!'];
} else {
$message = ['success' => false, 'message' => sprintf(__('Error duplicating %s!'), $type)];
}
}
} 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 renaming %s!'), $type)];
+ $data = [
+ 'post_content' => ['name' => $name, 'slug' => $slug],
+ 'post_id' => $post_id,
+ 'language_id' => $this->global['language_id'],
+ ];
+ $result = $this->posts->editContent($data);
+
+ if ($result && isset($result['post_content'])) {
+ $message = ['success' => true, 'url' => url('content/page/index', ['slug' => $slug, 'post_id' => $post_id]), 'message' => ucfirst($type) . ' ' . __('renamed') . '!'];
+ } else {
+ $message = ['success' => false, 'message' => sprintf(__('Error renaming %s!'), $type)];
+ }
}
}
} else {
@@ -598,14 +603,15 @@ class Editor extends Base {
//if plugins template use public path
$isPlugin = false;
+
if (substr_compare($file,'/plugins/', 0, 9) === 0) {
$fileName = DIR_PUBLIC . DS . ($folder ? $folder . DS : '') . $file;
$isPlugin = true;
} else {
$fileName = $themeFolder . DS . ($folder ? $folder . DS : '') . $file;
}
-
- if (! $startTemplateUrl && !$isPlugin) {
+
+ if (! $startTemplateUrl && ! $isPlugin) {
$backupFolder = $themeFolder . DS . 'backup' . DS;
if (is_writable($backupFolder)) {
diff --git a/install/sql/insert/admin/role.sql b/install/sql/insert/admin/role.sql
index 3be6bcb..5f32cb1 100755
--- a/install/sql/insert/admin/role.sql
+++ b/install/sql/insert/admin/role.sql
@@ -8,4 +8,4 @@ INSERT INTO `role` (`role_id`, `name`, `display_name`, `permissions`) VALUES
(7, 'shop', 'Shop', '{"allow":["index/index","product/*","order/*","media/media/scan"], "deny":[], "capabilities":["view_other_products","edit_other_products"]}'),
(8, 'vendor', 'Vendor', '{"allow":["index/index","product/*","order/*","media/media/scan"], "deny":["product/vendors/*","product/vendor/*","product/manufacturers/*", "product/manufacturer/*"]}'),
(9, 'rest', 'Rest', '{"allow":["content/*"],"deny":["*/save","*/delete"], "capabilities":["view_other_products","edit_other_products"]}}'),
-(10, 'demo', 'Demo', '{"allow":["*"],"deny":["*/save","*/delete","*/rename","*/upload", "*/activate","*/deactivate","*/update","*/deletemenu"], "capabilities":["view_other_posts","view_other_products","view_other_sites"]}');
+(10, 'demo', 'Demo', '{"allow":["*"],"deny":["*/save","*/delete","*/rename","*/duplicate","*/upload", "*/activate","*/deactivate","*/update","*/deletemenu"], "capabilities":["view_other_posts","view_other_products","view_other_sites"]}');