Skip to content

armgit / Vvveb

Public Imported from GitHub
0

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

Added edit_other_posts capability check for post revisions to allow list, read, approve, edit, or delete, reported by @Mitchell45

givanzcbedd3754bcc
diff --git a/admin/controller/content/revisions.php b/admin/controller/content/revisions.php
index 09c9cd6..d41e848 100644
--- a/admin/controller/content/revisions.php
+++ b/admin/controller/content/revisions.php
@@ -27,6 +27,7 @@ use Vvveb\Controller\Base;
use function Vvveb\humanReadable;
use function Vvveb\model;
use Vvveb\System\Images;
+use Vvveb\System\User\Admin;
class Revisions extends Base {
protected $type = 'post';
@@ -63,7 +64,19 @@ class Revisions extends Base {
}
function delete() {
- $results = $this->revisions->delete($this->options + $this->global);
+ $options = $this->options + $this->global;
+ $editCapability = 'edit_other_posts';
+
+ if ($this->object == 'product') {
+ $editCapability = 'edit_other_products';
+ }
+
+ if (Admin::hasCapability($editCapability)) {
+ unset($options['admin_id']);
+ } else {
+ }
+
+ $results = $this->revisions->delete($options);
if ($results) {
$message[] = __('Revision deleted!');
@@ -77,10 +90,22 @@ class Revisions extends Base {
$content = $this->request->post['content'] ?? false;
if ($content) {
+ $options = $this->options + $this->global;
+ $editCapability = 'edit_other_posts';
+
+ if ($this->object == 'product') {
+ $editCapability = 'edit_other_products';
+ }
+
+ if (Admin::hasCapability($editCapability)) {
+ unset($options['admin_id']);
+ } else {
+ }
+
+
$result = $this->post->editContent(
[$this->type . '_content' => ['content' => $content]] +
- $this->options +
- $this->global
+ $options
);
if ($result) {
@@ -94,6 +119,17 @@ class Revisions extends Base {
}
function revision() {
+ $editCapability = 'view_other_posts';
+
+ if ($this->object == 'product') {
+ $editCapability = 'view_other_products';
+ }
+
+ if (Admin::hasCapability($editCapability)) {
+ unset($this->options['admin_id']);
+ } else {
+ }
+
$view = $this->view;
$results = $this->revisions->get($this->options);
$revision = [];
@@ -113,21 +149,39 @@ class Revisions extends Base {
$this->notFound();
}
+
$view = $this->view;
$modelName = $this->object . '_content_revision';
$revisions = model($modelName);
$this->options += $this->global;
+
+ $editCapability = 'view_other_posts';
+
+ if ($this->object == 'product') {
+ $editCapability = 'view_other_products';
+ }
+
+ if (Admin::hasCapability($editCapability)) {
+ unset($this->options['admin_id']);
+ } else {
+ }
+
$allOptions = $this->options;
unset($allOptions['created_at']);
- $revisions = $this->revisions->getAll($allOptions); // all post/product revisions
- $revision = $this->revisions->get($this->options); // latest or selected revision
$post = $this->post->get($this->options); // post/product content
+ if (! isset($post[$this->object . '_id'])) {
+ return $this->notFound();
+ }
+
if (isset($post['image'])) {
$post['image'] = $post['image'] = Images::image($post['image'], $this->object, 'thumb');
}
+ $revisions = $this->revisions->getAll($allOptions); // all post/product revisions
+ $revision = $this->revisions->get($this->options); // latest or selected revision
+
$results = [
'revisions' => $revisions[$modelName] ?? [],
'revision' => $revision ?? [],
diff --git a/admin/sql/mysqli/post_content_revision.sql b/admin/sql/mysqli/post_content_revision.sql
index 7e66382..1bfb7e7 100644
--- a/admin/sql/mysqli/post_content_revision.sql
+++ b/admin/sql/mysqli/post_content_revision.sql
@@ -7,6 +7,7 @@
IN language_id INT,
IN created_at INT,
IN content INT,
+ IN admin INT,
IN start INT,
IN limit INT,
OUT fetch_all,
@@ -29,12 +30,17 @@
THEN
AND post_content_revision.post_id = :post_id
END @IF
-
+
@IF !empty(:language_id)
THEN
AND post_content_revision.language_id = :language_id
- END @IF
-
+ END @IF
+
+ @IF !empty(:admin_id)
+ THEN
+ AND post_content_revision.admin_id = :admin_id
+ END @IF
+
@IF !empty(:created_at)
THEN
AND post_content_revision.created_at = :created_at
@@ -51,17 +57,18 @@
SELECT count(*) FROM (
- @SQL_COUNT(post_content_revision.post_id, post_content_revision) -- this takes previous query removes limit and replaces select columns with parameter product_id
+ @SQL_COUNT(post_content_revision.post_id, post_content_revision) -- this takes previous query removes limit and replaces select columns with parameter post_id
) as count;
END
- -- get post_content_revision
+ -- get post content revision
PROCEDURE get(
IN post_id INT,
IN language_id INT,
+ IN admin_id INT,
IN created_at CHAR,
OUT fetch_row,
)
@@ -82,7 +89,12 @@
THEN
AND _.language_id = :language_id
END @IF
-
+
+ @IF !empty(:admin_id)
+ THEN
+ AND _.admin_id = :admin_id
+ END @IF
+
@IF !empty(:created_at)
THEN
AND _.created_at = :created_at
@@ -111,11 +123,13 @@
END
- -- edit post_content_revision
+ -- edit post content revision
+
CREATE PROCEDURE edit(
IN revision ARRAY,
IN post_id INT,
IN language_id INT,
+ IN admin_id INT,
IN created_at INT,
OUT affected_rows
)
@@ -131,16 +145,21 @@
WHERE
post_id = :post_id AND
language_id = :language_id AND
- created_at = :created_at;
+ created_at = :created_at
+ @IF !empty(:admin_id)
+ THEN
+ AND admin_id = :admin_id
+ END @IF;
END
- -- delete post_content_revision
+ -- delete post content revision
PROCEDURE delete(
IN post_id INT,
IN language_id INT,
+ IN admin_id INT,
IN created_at CHAR,
OUT affected_rows
)
@@ -150,4 +169,9 @@
post_id = :post_id AND
language_id = :language_id AND
created_at = :created_at
+
+ @IF !empty(:admin_id)
+ THEN
+ AND admin_id = :admin_id
+ END @IF;
END
diff --git a/admin/sql/pgsql/post_content_revision.sql b/admin/sql/pgsql/post_content_revision.sql
index 7e66382..1bfb7e7 100644
--- a/admin/sql/pgsql/post_content_revision.sql
+++ b/admin/sql/pgsql/post_content_revision.sql
@@ -7,6 +7,7 @@
IN language_id INT,
IN created_at INT,
IN content INT,
+ IN admin INT,
IN start INT,
IN limit INT,
OUT fetch_all,
@@ -29,12 +30,17 @@
THEN
AND post_content_revision.post_id = :post_id
END @IF
-
+
@IF !empty(:language_id)
THEN
AND post_content_revision.language_id = :language_id
- END @IF
-
+ END @IF
+
+ @IF !empty(:admin_id)
+ THEN
+ AND post_content_revision.admin_id = :admin_id
+ END @IF
+
@IF !empty(:created_at)
THEN
AND post_content_revision.created_at = :created_at
@@ -51,17 +57,18 @@
SELECT count(*) FROM (
- @SQL_COUNT(post_content_revision.post_id, post_content_revision) -- this takes previous query removes limit and replaces select columns with parameter product_id
+ @SQL_COUNT(post_content_revision.post_id, post_content_revision) -- this takes previous query removes limit and replaces select columns with parameter post_id
) as count;
END
- -- get post_content_revision
+ -- get post content revision
PROCEDURE get(
IN post_id INT,
IN language_id INT,
+ IN admin_id INT,
IN created_at CHAR,
OUT fetch_row,
)
@@ -82,7 +89,12 @@
THEN
AND _.language_id = :language_id
END @IF
-
+
+ @IF !empty(:admin_id)
+ THEN
+ AND _.admin_id = :admin_id
+ END @IF
+
@IF !empty(:created_at)
THEN
AND _.created_at = :created_at
@@ -111,11 +123,13 @@
END
- -- edit post_content_revision
+ -- edit post content revision
+
CREATE PROCEDURE edit(
IN revision ARRAY,
IN post_id INT,
IN language_id INT,
+ IN admin_id INT,
IN created_at INT,
OUT affected_rows
)
@@ -131,16 +145,21 @@
WHERE
post_id = :post_id AND
language_id = :language_id AND
- created_at = :created_at;
+ created_at = :created_at
+ @IF !empty(:admin_id)
+ THEN
+ AND admin_id = :admin_id
+ END @IF;
END
- -- delete post_content_revision
+ -- delete post content revision
PROCEDURE delete(
IN post_id INT,
IN language_id INT,
+ IN admin_id INT,
IN created_at CHAR,
OUT affected_rows
)
@@ -150,4 +169,9 @@
post_id = :post_id AND
language_id = :language_id AND
created_at = :created_at
+
+ @IF !empty(:admin_id)
+ THEN
+ AND admin_id = :admin_id
+ END @IF;
END
diff --git a/admin/sql/sqlite/post_content_revision.sql b/admin/sql/sqlite/post_content_revision.sql
index 7e66382..1bfb7e7 100644
--- a/admin/sql/sqlite/post_content_revision.sql
+++ b/admin/sql/sqlite/post_content_revision.sql
@@ -7,6 +7,7 @@
IN language_id INT,
IN created_at INT,
IN content INT,
+ IN admin INT,
IN start INT,
IN limit INT,
OUT fetch_all,
@@ -29,12 +30,17 @@
THEN
AND post_content_revision.post_id = :post_id
END @IF
-
+
@IF !empty(:language_id)
THEN
AND post_content_revision.language_id = :language_id
- END @IF
-
+ END @IF
+
+ @IF !empty(:admin_id)
+ THEN
+ AND post_content_revision.admin_id = :admin_id
+ END @IF
+
@IF !empty(:created_at)
THEN
AND post_content_revision.created_at = :created_at
@@ -51,17 +57,18 @@
SELECT count(*) FROM (
- @SQL_COUNT(post_content_revision.post_id, post_content_revision) -- this takes previous query removes limit and replaces select columns with parameter product_id
+ @SQL_COUNT(post_content_revision.post_id, post_content_revision) -- this takes previous query removes limit and replaces select columns with parameter post_id
) as count;
END
- -- get post_content_revision
+ -- get post content revision
PROCEDURE get(
IN post_id INT,
IN language_id INT,
+ IN admin_id INT,
IN created_at CHAR,
OUT fetch_row,
)
@@ -82,7 +89,12 @@
THEN
AND _.language_id = :language_id
END @IF
-
+
+ @IF !empty(:admin_id)
+ THEN
+ AND _.admin_id = :admin_id
+ END @IF
+
@IF !empty(:created_at)
THEN
AND _.created_at = :created_at
@@ -111,11 +123,13 @@
END
- -- edit post_content_revision
+ -- edit post content revision
+
CREATE PROCEDURE edit(
IN revision ARRAY,
IN post_id INT,
IN language_id INT,
+ IN admin_id INT,
IN created_at INT,
OUT affected_rows
)
@@ -131,16 +145,21 @@
WHERE
post_id = :post_id AND
language_id = :language_id AND
- created_at = :created_at;
+ created_at = :created_at
+ @IF !empty(:admin_id)
+ THEN
+ AND admin_id = :admin_id
+ END @IF;
END
- -- delete post_content_revision
+ -- delete post content revision
PROCEDURE delete(
IN post_id INT,
IN language_id INT,
+ IN admin_id INT,
IN created_at CHAR,
OUT affected_rows
)
@@ -150,4 +169,9 @@
post_id = :post_id AND
language_id = :language_id AND
created_at = :created_at
+
+ @IF !empty(:admin_id)
+ THEN
+ AND admin_id = :admin_id
+ END @IF;
END