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
Digital assets download and link generation
givanz3a563b82cd90
diff --git a/admin/sql/mysqli/digital_asset.sql b/admin/sql/mysqli/digital_asset.sqlindex ea84ad8..174409c 100755--- a/admin/sql/mysqli/digital_asset.sql+++ b/admin/sql/mysqli/digital_asset.sql@@ -5,6 +5,7 @@PROCEDURE getAll(IN language_id INT,IN user_id INT,+ IN product_id INT,IN order_status_id INT,IN start INT,IN limit INT,@@ -13,7 +14,13 @@)BEGIN-- digital_asset- SELECT digital_asset.*, digital_asset_content.name+ SELECT UNIQUE digital_asset.digital_asset_id, digital_asset.*, digital_asset_content.name+ -- user_id+ @IF isset(:user_id)+ THEN+ , o.customer_order_id, o.order_id, op.name as product_name+ END @IF+FROM digital_asset AS digital_assetINNER JOIN digital_asset_content ON digital_asset_content.digital_asset_id = digital_asset.digital_asset_idAND digital_asset_content.language_id = :language_id@@ -26,6 +33,12 @@INNER JOIN `order` o ON o.order_id = op.order_id AND o.user_id = :user_id AND o.order_status_id = :order_status_idEND @IF+ -- product_id+ @IF isset(:product_id)+ THEN+ INNER JOIN product_to_digital_asset ptda ON ptda.digital_asset_id = digital_asset.digital_asset_id AND ptda.product_id = :product_id+ END @IF+WHERE 1 = 1-- limit@@ -56,9 +69,18 @@FROM digital_asset as _INNER JOIN digital_asset_content ON digital_asset_content.digital_asset_id = _.digital_asset_idAND digital_asset_content.language_id = :language_id-++ -- user_id+ @IF isset(:user_id)+ THEN+ INNER JOIN product_to_digital_asset ptda ON ptda.digital_asset_id = _.digital_asset_id+ INNER JOIN order_product op ON op.product_id = ptda.product_id+ INNER JOIN `order` o ON o.order_id = op.order_id AND o.user_id = :user_id AND o.order_status_id = :order_status_id+ END @IF+WHERE _.digital_asset_id = :digital_asset_id;- END++ END-- add digital_assetdiff --git a/admin/sql/mysqli/digital_asset_log.sql b/admin/sql/mysqli/digital_asset_log.sqlnew file mode 100644index 0000000..91d7eb3--- /dev/null+++ b/admin/sql/mysqli/digital_asset_log.sql@@ -0,0 +1,107 @@+-- Digital assets log++ -- get all digital_assets_log++ PROCEDURE getAll(+ IN user_id INT,+ IN start INT,+ IN limit INT,+ OUT fetch_all,+ OUT fetch_one,+ )+ BEGIN++ SELECT digital_asset_log.*++ FROM digital_asset_log AS digital_asset_log++ WHERE 1 = 1++ -- user_id+ @IF isset(:user_id)+ THEN+ user_id = :user_id+ END @IF++ -- limit+ @IF isset(:limit)+ THEN+ @SQL_LIMIT(:start, :limit)+ END @IF;++ SELECT count(*) FROM (++ @SQL_COUNT(digital_asset.digital_asset_id, digital_asset) -- this takes previous query removes limit and replaces select columns with parameter product_id++ ) as count;++ END++ -- get digital_asset++ PROCEDURE get(+ IN digital_asset_log_id INT,+ IN user_id INT,+ IN site_id INT,+ OUT fetch_row,+ )+ BEGIN+ -- digital_asset+ SELECT *+ FROM digital_asset_log as _++ WHERE _.digital_asset_log_id = :digital_asset_log_id;++ END++ -- add digital_asset_log++ PROCEDURE add(+ IN digital_asset_log ARRAY,+ OUT insert_id,+ )+ BEGIN++ -- allow only table fields and set defaults for missing values+ :digital_asset_log_data = @FILTER(:digital_asset_log, digital_asset_log)++ INSERT INTO digital_asset_log++ ( @KEYS(:digital_asset_log_data) )++ VALUES ( :digital_asset_log_data );++ END++ -- edit digital_asset_log++ CREATE PROCEDURE edit(+ IN digital_asset_log ARRAY,+ IN digital_asset_log_id INT,+ OUT affected_rows+ )+ BEGIN++ -- allow only table fields and set defaults for missing values+ :digital_asset_log_data = @FILTER(:digital_asset_log, digital_asset_log)++ UPDATE digital_asset_log++ SET @LIST(:digital_asset_log_data)++ WHERE digital_asset_log_id = :digital_asset_log_id;++ END+++ -- delete digital_asset_log++ PROCEDURE delete(+ IN digital_asset_log_id ARRAY,+ OUT affected_rows,+ OUT affected_rows,+ )+ BEGIN+ -- digital_asset_log+ DELETE FROM digital_asset_log WHERE digital_asset_log_id IN (:digital_asset_log_id);+ ENDdiff --git a/admin/sql/pgsql/digital_asset.sql b/admin/sql/pgsql/digital_asset.sqlindex 4bb4db5..23a2701 100755--- a/admin/sql/pgsql/digital_asset.sql+++ b/admin/sql/pgsql/digital_asset.sql@@ -5,6 +5,7 @@PROCEDURE getAll(IN language_id INT,IN user_id INT,+ IN product_id INT,IN order_status_id INT,IN start INT,IN limit INT,@@ -13,7 +14,13 @@)BEGIN-- digital_asset- SELECT digital_asset.*, digital_asset_content.name+ SELECT UNIQUE digital_asset.digital_asset_id, digital_asset.*, digital_asset_content.name+ -- user_id+ @IF isset(:user_id)+ THEN+ , o.customer_order_id, o.order_id, op.name as product_name+ END @IF+FROM digital_asset AS digital_assetINNER JOIN digital_asset_content ON digital_asset_content.digital_asset_id = digital_asset.digital_asset_idAND digital_asset_content.language_id = :language_id@@ -26,6 +33,12 @@INNER JOIN "order" o ON o.order_id = op.order_id AND o.user_id = :user_id AND o.order_status_id = :order_status_idEND @IF+ -- product_id+ @IF isset(:product_id)+ THEN+ INNER JOIN product_to_digital_asset ptda ON ptda.digital_asset_id = digital_asset.digital_asset_id AND ptda.product_id = :product_id+ END @IF+WHERE 1 = 1-- limit@@ -57,7 +70,16 @@INNER JOIN digital_asset_content ON digital_asset_content.digital_asset_id = _.digital_asset_idAND digital_asset_content.language_id = :language_id+ -- user_id+ @IF isset(:user_id)+ THEN+ INNER JOIN product_to_digital_asset ptda ON ptda.digital_asset_id = _.digital_asset_id+ INNER JOIN order_product op ON op.product_id = ptda.product_id+ INNER JOIN `order` o ON o.order_id = op.order_id AND o.user_id = :user_id AND o.order_status_id = :order_status_id+ END @IF+WHERE _.digital_asset_id = :digital_asset_id;+END-- add digital_assetdiff --git a/admin/sql/pgsql/digital_asset_log.sql b/admin/sql/pgsql/digital_asset_log.sqlnew file mode 100644index 0000000..6df0642--- /dev/null+++ b/admin/sql/pgsql/digital_asset_log.sql@@ -0,0 +1,107 @@+-- Digital assets log++ -- get all digital_assets_log++ PROCEDURE getAll(+ IN user_id INT,+ IN start INT,+ IN limit INT,+ OUT fetch_all,+ OUT fetch_one,+ )+ BEGIN++ SELECT digital_asset_log.*++ FROM digital_asset_log AS digital_asset_log++ WHERE 1 = 1++ -- user_id+ @IF isset(:user_id)+ THEN+ user_id = :user_id+ END @IF++ -- limit+ @IF isset(:limit)+ THEN+ @SQL_LIMIT(:start, :limit)+ END @IF;++ SELECT count(*) FROM (++ @SQL_COUNT(digital_asset.digital_asset_id, digital_asset) -- this takes previous query removes limit and replaces select columns with parameter product_id++ ) as count;++ END++ -- get digital_asset++ PROCEDURE get(+ IN digital_asset_log_id INT,+ IN user_id INT,+ IN site_id INT,+ OUT fetch_row,+ )+ BEGIN+ -- digital_asset+ SELECT *+ FROM digital_asset_log as _++ WHERE _.digital_asset_log_id = :digital_asset_log_id;++ END++ -- add digital_asset_log++ PROCEDURE add(+ IN digital_asset_log ARRAY,+ OUT fetch_one,+ )+ BEGIN++ -- allow only table fields and set defaults for missing values+ :digital_asset_log_data = @FILTER(:digital_asset_log, digital_asset_log)++ INSERT INTO digital_asset_log++ ( @KEYS(:digital_asset_log_data) )++ VALUES ( :digital_asset_log_data ) RETURNING digital_asset_log_id;++ END++ -- edit digital_asset_log++ CREATE PROCEDURE edit(+ IN digital_asset_log ARRAY,+ IN digital_asset_log_id INT,+ OUT affected_rows+ )+ BEGIN++ -- allow only table fields and set defaults for missing values+ :digital_asset_log_data = @FILTER(:digital_asset_log, digital_asset_log)++ UPDATE digital_asset_log++ SET @LIST(:digital_asset_log_data)++ WHERE digital_asset_log_id = :digital_asset_log_id;++ END+++ -- delete digital_asset_log++ PROCEDURE delete(+ IN digital_asset_log_id ARRAY,+ OUT affected_rows,+ OUT affected_rows,+ )+ BEGIN+ -- digital_asset_log+ DELETE FROM digital_asset_log WHERE digital_asset_log_id IN (:digital_asset_log_id);+ ENDdiff --git a/admin/sql/sqlite/digital_asset.sql b/admin/sql/sqlite/digital_asset.sqlindex ce790aa..b53679e 100755--- a/admin/sql/sqlite/digital_asset.sql+++ b/admin/sql/sqlite/digital_asset.sql@@ -5,6 +5,7 @@PROCEDURE getAll(IN language_id INT,IN user_id INT,+ IN product_id INT,IN order_status_id INT,IN start INT,IN limit INT,@@ -13,7 +14,13 @@)BEGIN-- digital_asset- SELECT digital_asset.*, digital_asset_content.name+ SELECT UNIQUE digital_asset.digital_asset_id, digital_asset.*, digital_asset_content.name+ -- user_id+ @IF isset(:user_id)+ THEN+ , o.customer_order_id, o.order_id, op.name as product_name+ END @IF+FROM digital_asset AS digital_assetINNER JOIN digital_asset_content ON digital_asset_content.digital_asset_id = digital_asset.digital_asset_idAND digital_asset_content.language_id = :language_id@@ -26,6 +33,12 @@INNER JOIN `order` o ON o.order_id = op.order_id AND o.user_id = :user_id AND o.order_status_id = :order_status_idEND @IF+ -- product_id+ @IF isset(:product_id)+ THEN+ INNER JOIN product_to_digital_asset ptda ON ptda.digital_asset_id = digital_asset.digital_asset_id AND ptda.product_id = :product_id+ END @IF+WHERE 1 = 1-- limit@@ -57,7 +70,16 @@INNER JOIN digital_asset_content ON digital_asset_content.digital_asset_id = _.digital_asset_idAND digital_asset_content.language_id = :language_id+ -- user_id+ @IF isset(:user_id)+ THEN+ INNER JOIN product_to_digital_asset ptda ON ptda.digital_asset_id = _.digital_asset_id+ INNER JOIN order_product op ON op.product_id = ptda.product_id+ INNER JOIN `order` o ON o.order_id = op.order_id AND o.user_id = :user_id AND o.order_status_id = :order_status_id+ END @IF+WHERE _.digital_asset_id = :digital_asset_id;+END-- add digital_assetdiff --git a/admin/sql/sqlite/digital_asset_log.sql b/admin/sql/sqlite/digital_asset_log.sqlnew file mode 100644index 0000000..91d7eb3--- /dev/null+++ b/admin/sql/sqlite/digital_asset_log.sql@@ -0,0 +1,107 @@+-- Digital assets log++ -- get all digital_assets_log++ PROCEDURE getAll(+ IN user_id INT,+ IN start INT,+ IN limit INT,+ OUT fetch_all,+ OUT fetch_one,+ )+ BEGIN++ SELECT digital_asset_log.*++ FROM digital_asset_log AS digital_asset_log++ WHERE 1 = 1++ -- user_id+ @IF isset(:user_id)+ THEN+ user_id = :user_id+ END @IF++ -- limit+ @IF isset(:limit)+ THEN+ @SQL_LIMIT(:start, :limit)+ END @IF;++ SELECT count(*) FROM (++ @SQL_COUNT(digital_asset.digital_asset_id, digital_asset) -- this takes previous query removes limit and replaces select columns with parameter product_id++ ) as count;++ END++ -- get digital_asset++ PROCEDURE get(+ IN digital_asset_log_id INT,+ IN user_id INT,+ IN site_id INT,+ OUT fetch_row,+ )+ BEGIN+ -- digital_asset+ SELECT *+ FROM digital_asset_log as _++ WHERE _.digital_asset_log_id = :digital_asset_log_id;++ END++ -- add digital_asset_log++ PROCEDURE add(+ IN digital_asset_log ARRAY,+ OUT insert_id,+ )+ BEGIN++ -- allow only table fields and set defaults for missing values+ :digital_asset_log_data = @FILTER(:digital_asset_log, digital_asset_log)++ INSERT INTO digital_asset_log++ ( @KEYS(:digital_asset_log_data) )++ VALUES ( :digital_asset_log_data );++ END++ -- edit digital_asset_log++ CREATE PROCEDURE edit(+ IN digital_asset_log ARRAY,+ IN digital_asset_log_id INT,+ OUT affected_rows+ )+ BEGIN++ -- allow only table fields and set defaults for missing values+ :digital_asset_log_data = @FILTER(:digital_asset_log, digital_asset_log)++ UPDATE digital_asset_log++ SET @LIST(:digital_asset_log_data)++ WHERE digital_asset_log_id = :digital_asset_log_id;++ END+++ -- delete digital_asset_log++ PROCEDURE delete(+ IN digital_asset_log_id ARRAY,+ OUT affected_rows,+ OUT affected_rows,+ )+ BEGIN+ -- digital_asset_log+ DELETE FROM digital_asset_log WHERE digital_asset_log_id IN (:digital_asset_log_id);+ ENDdiff --git a/app/component/digital_assets.php b/app/component/digital_assets.phpindex ac8566e..2d96376 100644--- a/app/component/digital_assets.php+++ b/app/component/digital_assets.php@@ -22,15 +22,17 @@namespace Vvveb\Component;+use function Vvveb\getConfig;+use Vvveb\Sql\Digital_assetSQL;use Vvveb\System\Component\ComponentBase;use Vvveb\System\Event;-use Vvveb\System\Images;use function Vvveb\url;class Digital_assets extends ComponentBase {public static $defaultOptions = ['start' => 0,'user_id' => null,+ 'product_id' => null,'order_status_id' => null,'limit' => ['url', 4],'digital_asset' => ['url', 'price asc'],@@ -39,25 +41,19 @@ class Digital_assets extends ComponentBase {public $options = [];function results() {- $digital_asset = new \Vvveb\Sql\Digital_assetSQL();+ $digital_asset = new Digital_assetSQL();$results = $digital_asset->getAll($this->options);+ $key = getConfig('app.key');if (isset($results['digital_asset'])) {foreach ($results['digital_asset'] as $id => &$digital_asset) {- if (isset($digital_asset['images'])) {- $digital_asset['images'] = json_decode($digital_asset['images'], 1);-- foreach ($digital_asset['images'] as &$image) {- $image = Images::image('digital_asset', $image);- }- }-- if (isset($digital_asset['image'])) {- $digital_asset['images'][] = Images::image('digital_asset', $digital_asset['image']);- }-- $digital_asset['url'] = url('user/digital_assets/digital_asset', ['digital_asset_id' => $digital_asset['digital_asset_id']]);+ $digital_asset['url'] = url('user/downloads/download',[+ 'digital_asset_id' => $digital_asset['digital_asset_id'],+ 'public' => str_replace(['/', '-'], '_', $digital_asset['public']),+ 'customer_order_id' => $digital_asset['customer_order_id'],+ 'key' => $key,+ ]);}}diff --git a/app/controller/user/downloads.php b/app/controller/user/downloads.phpindex 742e37a..874bf23 100755--- a/app/controller/user/downloads.php+++ b/app/controller/user/downloads.php@@ -22,7 +22,64 @@namespace Vvveb\Controller\User;+use function Vvveb\__;+use function Vvveb\getConfig;+use Vvveb\Sql\Digital_asset_logSQL;+use Vvveb\Sql\Digital_assetSQL;+class Downloads extends Base {function index() {}++ function download() {+ $public = $this->request->get['public'] ?? false;+ $digital_asset_id = $this->request->get['digital_asset_id'] ?? false;+ $userKey = $this->request->get['key'] ?? false;+ $customerOrderId = $this->request->get['customer_order_id'] ?? false;+ $key = getConfig('app.key');++ if ($digital_asset_id && $public && ($key == $userKey)) {+ $digital_asset = new Digital_assetSQL();++ $results = $digital_asset->get(+ [+ 'digital_asset_id' => $digital_asset_id,+ 'language_id' => $this->global['language_id'],+ 'user_id' => $this->global['user_id'],+ 'order_status_id' => 4,+ ]);++ if ($results && isset($results['file']) && ($customerOrderId == $results['customer_order_id'])) {+ $digital_asset_log = new Digital_asset_logSQL();+ $digital_asset_log->add([+ 'digital_asset_log' => [+ 'digital_asset_id' => $digital_asset_id,+ 'user_id' => $this->global['user_id'],+ 'ip' => $_SERVER['REMOTE_ADDR'] ?? '',+ 'site_id' => $this->global['site_id'],+ ],+ ]);++ $filename = trim($results['file'], '/');+ $public = $results['public'];+ $file = DIR_STORAGE . 'digital_assets' . DS . $filename;++ header('Content-Description: File Transfer');+ header('Content-Type: application/octet-stream');+ header('Content-Disposition: attachment; filename="' . $public . '"');+ header('Expires: 0');+ header('Cache-Control: must-revalidate');+ header('Pragma: public');+ header('Content-Length: ' . filesize($file));++ readfile($file);+ } else {+ die(__('Invalid download!'));+ }+ } else {+ die(__('Invalid download!'));+ }++ die();+ }}diff --git a/app/sql/mysqli/digital_asset_log.sql b/app/sql/mysqli/digital_asset_log.sqlnew file mode 100644index 0000000..021987b--- /dev/null+++ b/app/sql/mysqli/digital_asset_log.sql@@ -0,0 +1,5 @@+-- Digital asset log++ -- get common code from admin+ import(/admin/digital_asset_log.sql);+diff --git a/app/sql/pgsql/digital_asset_log.sql b/app/sql/pgsql/digital_asset_log.sqlnew file mode 100644index 0000000..021987b--- /dev/null+++ b/app/sql/pgsql/digital_asset_log.sql@@ -0,0 +1,5 @@+-- Digital asset log++ -- get common code from admin+ import(/admin/digital_asset_log.sql);+diff --git a/app/sql/sqlite/digital_asset_log.sql b/app/sql/sqlite/digital_asset_log.sqlnew file mode 100644index 0000000..021987b--- /dev/null+++ b/app/sql/sqlite/digital_asset_log.sql@@ -0,0 +1,5 @@+-- Digital asset log++ -- get common code from admin+ import(/admin/digital_asset_log.sql);+diff --git a/install/sql/mysqli/schema/user/digital_asset_log.sql b/install/sql/mysqli/schema/user/digital_asset_log.sqlindex 82bebaf..23898d0 100755--- a/install/sql/mysqli/schema/user/digital_asset_log.sql+++ b/install/sql/mysqli/schema/user/digital_asset_log.sql@@ -3,9 +3,12 @@ DROP TABLE IF EXISTS `digital_asset_log`;CREATE TABLE `digital_asset_log` (`digital_asset_log_id` INT UNSIGNED NOT NULL AUTO_INCREMENT,`digital_asset_id` INT UNSIGNED NOT NULL,+ `user_id` INT UNSIGNED NOT NULL,`site_id` tinyint(6) NOT NULL,`ip` varchar(40) NOT NULL,- `country` varchar(2) NOT NULL,+ `country` varchar(2),`created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,- PRIMARY KEY (`digital_asset_log_id`)+ PRIMARY KEY (`digital_asset_log_id`),+ KEY (`user_id`),+ KEY (`digital_asset_id`)) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;diff --git a/install/sql/pgsql/schema/user/digital_asset_log.sql b/install/sql/pgsql/schema/user/digital_asset_log.sqlindex 8c5dd0e..5e6f5cf 100755--- a/install/sql/pgsql/schema/user/digital_asset_log.sql+++ b/install/sql/pgsql/schema/user/digital_asset_log.sql@@ -1,15 +1,19 @@-DROP TABLE IF EXISTS digital_asset_stats;+DROP TABLE IF EXISTS digital_asset_log;-DROP SEQUENCE IF EXISTS digital_asset_stats_seq;-CREATE SEQUENCE digital_asset_stats_seq;--- SELECT setval('digital_asset_stats_seq', 0, true); -- last inserted id by sample data+DROP SEQUENCE IF EXISTS digital_asset_log_seq;+CREATE SEQUENCE digital_asset_log_seq;+-- SELECT setval('digital_asset_log_seq', 0, true); -- last inserted id by sample data-CREATE TABLE digital_asset_stats (- "digital_asset_stats_id" int check ("digital_asset_stats_id" > 0) NOT NULL DEFAULT NEXTVAL ('digital_asset_stats_seq'),+CREATE TABLE digital_asset_log (+ "digital_asset_log_id" int check ("digital_asset_log_id" > 0) NOT NULL DEFAULT NEXTVAL ('digital_asset_log_seq'),"digital_asset_id" int check ("digital_asset_id" > 0) NOT NULL,+ "user_id" int check ("user_id" > 0) NOT NULL,"site_id" smallint NOT NULL,"ip" varchar(40) NOT NULL,- "country" varchar(2) NOT NULL,+ "country" varchar(2),"created_at" timestamp(0) NOT NULL DEFAULT now(),- PRIMARY KEY ("digital_asset_stats_id")+ PRIMARY KEY ("digital_asset_log_id"));++CREATE INDEX "digital_asset_log_user_id" ON digital_asset_log ("user_id");+CREATE INDEX "digital_asset_log_digital_asset_id" ON digital_asset_log ("digital_asset_id");diff --git a/install/sql/sqlite/schema/user/digital_asset_log.sql b/install/sql/sqlite/schema/user/digital_asset_log.sqlindex 563091e..f9e38e1 100755--- a/install/sql/sqlite/schema/user/digital_asset_log.sql+++ b/install/sql/sqlite/schema/user/digital_asset_log.sql@@ -3,9 +3,13 @@ DROP TABLE IF EXISTS `digital_asset_log`;CREATE TABLE `digital_asset_log` (`digital_asset_stats_id` INTEGER PRIMARY KEY AUTOINCREMENT,`digital_asset_id` INT NOT NULL,+`user_id` INT NOT NULL,`site_id` TINYINT NOT NULL,`ip` TEXT NOT NULL,-`country` TEXT NOT NULL,-`created_at` datetime NOT NULL+`country` TEXT,+`created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP-- PRIMARY KEY (`digital_asset_stats_id`));++CREATE INDEX `digital_asset_log_user_id` ON `digital_asset_log` (`user_id`);+CREATE INDEX `digital_asset_log_digital_asset_id` ON `digital_asset_log` (`digital_asset_id`);\ No newline at end of file