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 edit_other_products capability check for products to allow list, read, approve, edit, or delete, reported by @Mitchell45
givanz6db5257ce9fe
diff --git a/admin/controller/product/products.php b/admin/controller/product/products.phpindex dd69373..52f090d 100755--- a/admin/controller/product/products.php+++ b/admin/controller/product/products.php@@ -119,6 +119,14 @@ class Products extends Listing {$products = new ProductSQL();$options = ['product_id' => $product_id] + $this->global;++ $editCapability = 'edit_other_products';++ if (Admin::hasCapability($editCapability)) {+ unset($options['admin_id']);+ } else {+ }+$result = $products->delete($options);if ($result && isset($result['product'])) {diff --git a/admin/sql/mysqli/product.sql b/admin/sql/mysqli/product.sqlold mode 100755new mode 100644index 6174218..1ee10a0--- a/admin/sql/mysqli/product.sql+++ b/admin/sql/mysqli/product.sql@@ -4,6 +4,7 @@PROCEDURE get(IN product_id INT,+ IN admin_id INT,IN slug CHAR,IN type CHAR,IN language_id INT,@@ -176,6 +177,11 @@THENAND _.type = :typeEND @IF++ @IF isset(:admin_id) && !empty(:admin_id)+ THEN+ AND _.admin_id = :admin_id+ END @IFLIMIT 1;@@ -397,15 +403,59 @@PROCEDURE delete(IN product_id ARRAY,+ IN admin_id INT,OUT affected_rows)BEGIN- DELETE FROM product_to_site WHERE product_id IN (:product_id);- DELETE FROM product_image WHERE product_id IN (:product_id);- DELETE FROM product_content WHERE product_id IN (:product_id);- DELETE FROM product WHERE product_id IN (:product_id);+ DELETE product_to_taxonomy_item FROM product_to_taxonomy_item+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_to_taxonomy_item.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_to_taxonomy_item.product_id IN (:product_id);++ DELETE product_to_site FROM product_to_site+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_to_site.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_to_site.product_id IN (:product_id);++ DELETE product_option_value FROM product_option_value+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_option_value.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_option_value.product_id IN (:product_id);++ DELETE product_option FROM product_option+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_option.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_option.product_id IN (:product_id);++ DELETE product_content FROM product_content+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_content.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_content.product_id IN (:product_id);++ DELETE product_image FROM product_image+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_image.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_image.product_id IN (:product_id);+ DELETE product FROM product WHERE product_id IN (:product_id)+ @IF isset(:admin_id)+ THEN+ AND admin_id = :admin_id+ END @IF;+END-- Edit product@@ -416,6 +466,7 @@IN taxonomy_item_id ARRAY,IN product_id INT,IN site_id ARRAY,+ IN admin_id INT,OUT insert_id,OUT affected_rows,OUT insert_id,@@ -477,6 +528,12 @@SET @LIST(:product_update)WHERE product_id = :product_id++ @IF !empty(:admin_id)+ THEN+ AND admin_id = :admin_id+ END @IF+END @IF;END@@ -1184,7 +1241,8 @@@ELSE@IF isset(:order_by)THEN- ORDER BY product.$order_by $direction+ -- ORDER BY $order_by $direction+ ORDER BY product.@ESC(:order_by) @ESC(:direction)@ELSEORDER BY product.product_id DESCEND @IFdiff --git a/admin/sql/pgsql/product.sql b/admin/sql/pgsql/product.sqlold mode 100755new mode 100644index c3bc982..d559112--- a/admin/sql/pgsql/product.sql+++ b/admin/sql/pgsql/product.sql@@ -4,6 +4,7 @@PROCEDURE get(IN product_id INT,+ IN admin_id INT,IN slug CHAR,IN type CHAR,IN language_id INT,@@ -176,6 +177,11 @@THENAND _.type = :typeEND @IF++ @IF isset(:admin_id) && !empty(:admin_id)+ THEN+ AND _.admin_id = :admin_id+ END @IFLIMIT 1;@@ -397,15 +403,59 @@PROCEDURE delete(IN product_id ARRAY,+ IN admin_id INT,OUT affected_rows)BEGIN- DELETE FROM product_to_site WHERE product_id IN (:product_id);- DELETE FROM product_image WHERE product_id IN (:product_id);- DELETE FROM product_content WHERE product_id IN (:product_id);- DELETE FROM product WHERE product_id IN (:product_id);+ DELETE product_to_taxonomy_item FROM product_to_taxonomy_item+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_to_taxonomy_item.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_to_taxonomy_item.product_id IN (:product_id);++ DELETE product_to_site FROM product_to_site+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_to_site.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_to_site.product_id IN (:product_id);++ DELETE product_option_value FROM product_option_value+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_option_value.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_option_value.product_id IN (:product_id);++ DELETE product_option FROM product_option+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_option.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_option.product_id IN (:product_id);+ DELETE product_content FROM product_content+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_content.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_content.product_id IN (:product_id);++ DELETE product_image FROM product_image+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_image.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_image.product_id IN (:product_id);++ DELETE product FROM product WHERE product_id IN (:product_id)+ @IF isset(:admin_id)+ THEN+ AND admin_id = :admin_id+ END @IF;+END-- Edit product@@ -416,6 +466,7 @@IN taxonomy_item_id ARRAY,IN product_id INT,IN site_id ARRAY,+ IN admin_id INT,OUT fetch_one,OUT affected_rows,OUT fetch_one,@@ -474,6 +525,12 @@SET @LIST(:product_update)WHERE product_id = :product_id++ @IF !empty(:admin_id)+ THEN+ AND admin_id = :admin_id+ END @IF+END @IF;END@@ -961,7 +1018,7 @@--,MATCH(pd.name, pd.content) AGAINST(:search) as score,ts_rank(to_tsvector(name) || to_tsvector(content),- plainto_tsquery(:search)+ websearch_to_tsquery(:search)) AS scoreEND @IF@@ -1033,7 +1090,7 @@THEN-- AND pd.name ILIKE '%' || :search || '%'-- AND MATCH(pd.name, pd.content) AGAINST(:search)- AND to_tsvector(name) || to_tsvector(content) @@ plainto_tsquery(:search)+ AND to_tsvector(name) || to_tsvector(content) @@ websearch_to_tsquery(:search)END @IF-- like@@ -1165,11 +1222,17 @@-- ORDER BY parameters can't be binded, because they are added to the query directly they must be properly sanitized by only allowing a predefined set of values- @IF isset(:order_by)+ @IF isset(:search)THEN- ORDER BY product.$order_by $direction+ ORDER BY score DESC@ELSE- ORDER BY product.product_id DESC+ @IF isset(:order_by)+ THEN+ -- ORDER BY $order_by $direction+ ORDER BY product.@ESC(:order_by) @ESC(:direction)+ @ELSE+ ORDER BY product.product_id DESC+ END @IFEND @IFdiff --git a/admin/sql/sqlite/product.sql b/admin/sql/sqlite/product.sqlold mode 100755new mode 100644index f73a98d..15c61de--- a/admin/sql/sqlite/product.sql+++ b/admin/sql/sqlite/product.sql@@ -4,6 +4,7 @@PROCEDURE get(IN product_id INT,+ IN admin_id INT,IN slug CHAR,IN type CHAR,IN language_id INT,@@ -176,6 +177,11 @@THENAND _.type = :typeEND @IF++ @IF isset(:admin_id) && !empty(:admin_id)+ THEN+ AND _.admin_id = :admin_id+ END @IFLIMIT 1;@@ -397,15 +403,59 @@PROCEDURE delete(IN product_id ARRAY,+ IN admin_id INT,OUT affected_rows)BEGIN- DELETE FROM product_to_site WHERE product_id IN (:product_id);- DELETE FROM product_image WHERE product_id IN (:product_id);- DELETE FROM product_content WHERE product_id IN (:product_id);- DELETE FROM product WHERE product_id IN (:product_id);+ DELETE product_to_taxonomy_item FROM product_to_taxonomy_item+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_to_taxonomy_item.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_to_taxonomy_item.product_id IN (:product_id);++ DELETE product_to_site FROM product_to_site+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_to_site.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_to_site.product_id IN (:product_id);++ DELETE product_option_value FROM product_option_value+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_option_value.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_option_value.product_id IN (:product_id);++ DELETE product_option FROM product_option+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_option.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_option.product_id IN (:product_id);+ DELETE product_content FROM product_content+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_content.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_content.product_id IN (:product_id);++ DELETE product_image FROM product_image+ @IF isset(:admin_id)+ THEN+ INNER JOIN product ON (product.product_id = product_image.product_id AND product.admin_id = :admin_id)+ END @IF+ WHERE product_image.product_id IN (:product_id);++ DELETE product FROM product WHERE product_id IN (:product_id)+ @IF isset(:admin_id)+ THEN+ AND admin_id = :admin_id+ END @IF;+END-- Edit product@@ -416,6 +466,7 @@IN taxonomy_item_id ARRAY,IN product_id INT,IN site_id ARRAY,+ IN admin_id INT,OUT insert_id,OUT affected_rows,OUT insert_id,@@ -477,6 +528,12 @@SET @LIST(:product_update)WHERE product_id = :product_id++ @IF !empty(:admin_id)+ THEN+ AND admin_id = :admin_id+ END @IF+END @IF;END@@ -1166,12 +1223,18 @@-- ORDER BY parameters can't be binded, because they are added to the query directly they must be properly sanitized by only allowing a predefined set of values- @IF isset(:order_by)+ @IF isset(:search)THEN- ORDER BY product.$order_by $direction+ ORDER BY rank@ELSE- ORDER BY product.product_id DESC- END @IF+ @IF isset(:order_by)+ THEN+ -- ORDER BY $order_by $direction+ ORDER BY product.@ESC(:order_by) @ESC(:direction)+ @ELSE+ ORDER BY product.product_id DESC+ END @IF+ END @IF@IF isset(:limit)diff --git a/admin/sql/sqlite/vendor.sql b/admin/sql/sqlite/vendor.sqlindex 5979ad3..7cf4b07 100644--- a/admin/sql/sqlite/vendor.sql+++ b/admin/sql/sqlite/vendor.sql@@ -114,7 +114,7 @@@IF isset(:search)THEN- AND name LIKE CONCAT('%',:search,'%')+ AND name LIKE '%' || :search || '%'END @IF