Skip to content

armgit / Vvveb

Public Imported from GitHub
0

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

Moved media code to media trait

givanz4412e5189043
diff --git a/admin/controller/media/media.php b/admin/controller/media/media.php
index e59e15d..cae502e 100755
--- a/admin/controller/media/media.php
+++ b/admin/controller/media/media.php
@@ -24,186 +24,41 @@ namespace Vvveb\Controller\Media;
use function Vvveb\__;
use Vvveb\Controller\Base;
-use function Vvveb\fileUploadErrMessage;
use function Vvveb\sanitizeFileName;
use Vvveb\Sql\media_ContentSQL;
+use Vvveb\System\Traits\Media as MediaTrait;
class Media extends Base {
- protected $uploadDenyExtensions = ['php', 'svg', 'js'];
-
- //protected $uploadAllowExtensions = ['ico','jpg','jpeg','png','gif','webp', 'mp4', 'mkv', 'mov'];
-
- function dirForType($type) {
- switch ($type) {
- case 'public':
- $scandir = DIR_MEDIA;
-
- break;
-
- case 'plugins':
- $scandir = DIR_PLUGINS;
+ use MediaTrait;
- break;
+ protected $dirMedia = DIR_MEDIA;
- case 'themes':
- $scandir = DIR_THEMES;
-
- break;
-
- default:
- return false;
- }
+ protected $uploadDenyExtensions = ['php', 'svg', 'js'];
- return $scandir;
- }
+ //protected $uploadAllowExtensions = ['ico','jpg','jpeg','png','gif','webp', 'mp4', 'mkv', 'mov'];
function index() {
- $admin_path = \Vvveb\adminPath();
- $controllerPath = $admin_path . 'index.php?module=media/media';
+ $adminPath = \Vvveb\adminPath();
+ $controllerPath = $adminPath . 'index.php?module=media/media';
+ $this->setMediaEndpoints($controllerPath);
- $this->view->mediaUrl = $controllerPath;
- $this->view->scanUrl = "$controllerPath&action=scan";
- $this->view->uploadUrl = "$controllerPath&action=upload";
- $this->view->deleteUrl = "$controllerPath&action=delete";
- $this->view->renameUrl = "$controllerPath&action=rename";
$this->view->mediaContentUrl = "$controllerPath&action=mediaContent";
}
- function upload() {
- $file = $this->request->files['file'] ?? [];
- $success = false;
- $return = '';
- $message = '';
-
- if ($file) {
- $path = sanitizeFileName($this->request->post['mediaPath'] ?? '');
- $fileName = sanitizeFileName($file['name']);
- $path = preg_replace('@^[\\\/]public[\\\/]media|^[\\\/]media|^[\\\/]public@', '', $path);
- $extension = strtolower(substr($fileName, strrpos($fileName, '.') + 1));
-
- if ($file['error'] == UPLOAD_ERR_OK) {
- $success = true;
- } else {
- $message = fileUploadErrMessage($file['error']);
- }
-
- if (in_array($extension, $this->uploadDenyExtensions)) {
- $message = __('File type not allowed!');
- $success = false;
- }
-
- $origFilename = $fileName;
- $i = 1;
-
- if ($success) {
- while (file_exists($destination = DIR_MEDIA . $path . DS . $fileName) && ($i++ < 5)) {
- $fileName = rand(0, 10000) . '-' . $origFilename;
- }
-
- if (move_uploaded_file($file['tmp_name'], $destination)) {
- if (isset($this->request->post['onlyFilename'])) {
- $return = $fileName;
- } else {
- $return = $destination;
- }
- $message = __('File uploaded successfully!');
- } else {
- $destination = DIR_MEDIA . $path . DS;
- $success = false;
-
- if (! is_writable($destination)) {
- $message = sprintf(__('%s not writable!'), $destination);
- } else {
- $message = __('Error moving uploaded file!');
- }
- }
- }
- } else {
- $message = __('Invalid upload!');
- }
-
- $message = ['success' => $success, 'message' => $message, 'file' => $return];
-
- $this->response->setType('json');
- $this->response->output($message);
- }
-
- function delete() {
- $file = sanitizeFileName($this->request->post['file']);
- $themeFolder = DIR_MEDIA;
-
- if ($file && @unlink($themeFolder . DS . $file)) {
- $message = ['success' => true, 'message' => __('File deleted!')];
- } else {
- $message = ['success' => false, 'message' => __('Error deleting file!')];
- }
-
- $this->response->setType('json');
- $this->response->output($message);
- }
-
- function rename() {
- $file = sanitizeFileName($this->request->post['file']);
- $newfile = sanitizeFileName($this->request->post['newfile']);
- $duplicate = $this->request->post['duplicate'] ?? false;
- $dirMedia = DIR_MEDIA;
-
- $currentFile = $dirMedia . DS . $file;
- $targetFile = $dirMedia . DS . $newfile;
-
- if ($duplicate) {
- if (copy($currentFile, $targetFile)) {
- $message = ['success' => true, 'message' => __('File copied!')];
- } else {
- $message = ['success' => false, 'message' => __('Error copying file!')];
- }
- } else {
- if (rename($currentFile, $targetFile)) {
- $message = ['success' => true, 'message' => __('File renamed!')];
- } else {
- $message = ['success' => false, 'message' => __('Error renaming file!')];
- }
- }
-
- $this->response->setType('json');
- $this->response->output($message);
- }
-
- function newFolder() {
- $folder = sanitizeFileName($this->request->post['folder']);
- $path = sanitizeFileName($this->request->post['path']);
- $success = false;
-
- $dirMedia = DIR_MEDIA;
-
- if (is_dir($dirMedia . $path)) {
- if (@mkdir($dirMedia . $path . DS . $folder)) {
- $message = __('Folder created!');
- $success = true;
- } else {
- $message = __('Error creating folder!');
- }
- } else {
- $message = __('Path does not exist!');
- }
-
- $message = ['success' => $success, 'message' => $message];
-
- $this->response->setType('json');
- $this->response->output($message);
- }
-
function mediaContentSave() {
$file = sanitizeFileName($this->request->post['file']);
- $content = ($this->request->post['media_content']);
+ $content = ($this->request->post['media_content'] ?? []);
+ $result = false;
- $mediaContent = new media_ContentSQL();
- $media = $mediaContent->get(['file' => $file] + $this->global);
+ if ($file && $content) {
+ $mediaContent = new media_ContentSQL();
+ $media = $mediaContent->get(['file' => $file] + $this->global);
- if ($media) {
- $result = $mediaContent->edit(['media_id' => $media['media_id'], 'media_content' => $content, 'media' => []]);
- } else {
- $result = $mediaContent->add(['media' => ['file' => $file], 'media_content' => $content]);
+ if ($media) {
+ $result = $mediaContent->edit(['media_id' => $media['media_id'], 'media_content' => $content, 'media' => []]);
+ } else {
+ $result = $mediaContent->add(['media' => ['file' => $file], 'media_content' => $content]);
+ }
}
if ($result) {
@@ -226,65 +81,4 @@ class Media extends Base {
$this->response->setType('json');
$this->response->output($result ?? []);
}
-
- function scan() {
- $type = $this->request->get['type'] ?? 'public';
- $scandir = $this->dirForType($type);
-
- if (! $scandir) {
- return [];
- }
-
- // This function scans the files folder recursively, and builds a large array
- $scan = function ($dir) use ($scandir, &$scan) {
- $files = [];
-
- // Is there actually such a folder/file?
-
- if (file_exists($dir)) {
- $listdir = @scandir($dir);
-
- if ($listdir) {
- foreach ($listdir as $f) {
- if (! $f || $f[0] == '.' || $f == 'node_modules' || $f == 'vendor') {
- continue; // Ignore hidden files
- }
-
- if (is_dir($dir . DS . $f)) {
- // The path is a folder
-
- $files[] = [
- 'name' => $f,
- 'type' => 'folder',
- 'path' => str_replace([$scandir, '\\'], ['', '/'], $dir) . '/' . $f,
- 'items' => $scan("$dir/$f"), // Recursively get the contents of the folder
- ];
- } else {
- // It is a file
-
- $files[] = [
- 'name' => $f,
- 'type' => 'file',
- 'path' => str_replace([$scandir, '\\'], ['', '/'], $dir) . '/' . $f,
- 'size' => filesize("$dir/$f"), // Gets the size of this file
- ];
- }
- }
- }
- }
-
- return $files;
- };
-
- $response = $scan($scandir);
-
- // Output the directory listing as JSON
- $this->response->setType('json');
- $this->response->output([
- 'name' => '',
- 'type' => 'folder',
- 'path' => '',
- 'items' => $response,
- ]);
- }
}
diff --git a/admin/controller/product/digital-asset.php b/admin/controller/product/digital-asset.php
index fb691a4..ddbeedb 100644
--- a/admin/controller/product/digital-asset.php
+++ b/admin/controller/product/digital-asset.php
@@ -22,165 +22,28 @@
namespace Vvveb\Controller\Product;
-use function Vvveb\__;
use Vvveb\Controller\Crud;
-use function Vvveb\sanitizeFileName;
use Vvveb\System\Images;
+use Vvveb\System\Traits\Media as MediaTrait;
class DigitalAsset extends Crud {
+ use MediaTrait;
+
+ protected $dirMedia = DIR_STORAGE . 'digital_assets';
+
protected $type = 'digital_asset';
protected $controller = 'digital-asset';
protected $module = 'product';
- function delete() {
- $file = sanitizeFileName($this->request->post['file']);
- $dir = DIR_STORAGE . 'digital_assets';
-
- header('Content-type: application/json; charset=utf-8');
-
- if ($file && @unlink($dir . DS . $file)) {
- $message = ['success' => true, 'message' => __('File deleted!')];
- } else {
- $message = ['success' => false, 'message' => __('Error deleting file!')];
- }
-
- $this->response->setType('json');
- $this->response->output($message);
- }
-
- function upload() {
- $path = sanitizeFileName($this->request->post['mediaPath']);
- $file = $this->request->files['file'] ?? [];
- $fileName = sanitizeFileName($file['name']);
- $path = preg_replace('@^[\\\/]public[\\\/]media|^[\\\/]media|^[\\\/]public@', '', $path);
- $extension = strtolower(substr($fileName, strrpos($fileName, '.') + 1));
- $success = false;
- $return = '';
- $message = '';
- $dirMedia = DIR_STORAGE . 'digital_assets';
-
- if ($file) {
- if ($file['error'] == UPLOAD_ERR_OK) {
- $success = true;
- } else {
- $message = fileUploadErrMessage($file['error']);
- }
-
- /*
- if (in_array($extension, $this->uploadDenyExtensions)) {
- $message = __('File type not allowed!');
- $success = false;
- }
- */
-
- $origFilename = $fileName;
- $i = 1;
-
- if ($success) {
- while (file_exists($destination = $dirMedia . $path . DS . $fileName) && ($i++ < 5)) {
- $fileName = rand(0, 10000) . '-' . $origFilename;
- }
-
- if (move_uploaded_file($file['tmp_name'], $destination)) {
- if (isset($this->request->post['onlyFilename'])) {
- $return = $fileName;
- } else {
- $return = $destination;
- }
- $message = __('File uploaded successfully!');
- } else {
- $destination = $dirMedia . $path . DS;
- $success = false;
-
- if (! is_writable($destination)) {
- $message = sprintf(__('%s not writable!'), $destination);
- } else {
- $message = __('Error moving uploaded file!');
- }
- }
- }
- } else {
- $message = __('Invalid upload!');
- }
-
- $message = ['success' => $success, 'message' => $message, 'file' => $return];
-
- $this->response->setType('json');
- $this->response->output($message);
- }
-
- function scan() {
- $type = $this->request->get['type'] ?? 'public';
- $scandir = DIR_STORAGE . 'digital_assets';
-
- if (! $scandir) {
- return [];
- }
-
- // This function scans the files folder recursively, and builds a large array
- $scan = function ($dir) use ($scandir, &$scan) {
- $files = [];
-
- // Is there actually such a folder/file?
-
- if (file_exists($dir)) {
- $listdir = @scandir($dir);
-
- if ($listdir) {
- foreach ($listdir as $f) {
- if (! $f || $f[0] == '.' || $f == 'node_modules' || $f == 'vendor') {
- continue; // Ignore hidden files
- }
-
- if (is_dir($dir . DS . $f)) {
- // The path is a folder
-
- $files[] = [
- 'name' => $f,
- 'type' => 'folder',
- 'path' => str_replace([$scandir, '\\'], ['', '/'], $dir) . '/' . $f,
- 'items' => $scan($dir . DS . $f), // Recursively get the contents of the folder
- ];
- } else {
- // It is a file
-
- $files[] = [
- 'name' => $f,
- 'type' => 'file',
- 'path' => str_replace([$scandir, '\\'], ['', '/'], $dir) . '/' . $f,
- 'size' => filesize($dir . DS . $f), // Gets the size of this file
- ];
- }
- }
- }
- }
-
- return $files;
- };
-
- $response = $scan($scandir);
-
- // Output the directory listing as JSON
- $this->response->setType('json');
- $this->response->output([
- 'name' => '',
- 'type' => 'folder',
- 'path' => '',
- 'items' => $response,
- ]);
- }
-
function index() {
parent::index();
- $admin_path = \Vvveb\adminPath();
+ $adminPath = \Vvveb\adminPath();
- $controllerPath = $admin_path . 'index.php?module=product/digital-asset';
- $this->view->scanUrl = "$controllerPath&action=scan";
- $this->view->uploadUrl = "$controllerPath&action=upload";
- $this->view->deleteUrl = "$controllerPath&action=delete";
+ $controllerPath = $adminPath . 'index.php?module=product/digital-asset';
+ $this->setMediaEndpoints($controllerPath);
if ($this->view->digital_asset) {
$this->view->digital_asset['image'] = $this->view->digital_asset['file'];
diff --git a/system/traits/media.php b/system/traits/media.php
new file mode 100644
index 0000000..58b7719
--- /dev/null
+++ b/system/traits/media.php
@@ -0,0 +1,268 @@
+<?php
+
+/**
+ * Vvveb
+ *
+ * Copyright (C) 2022 Ziadin Givan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Vvveb\System\Traits;
+
+use function Vvveb\__;
+use function Vvveb\fileUploadErrMessage;
+use function Vvveb\parseQuantity;
+use function Vvveb\sanitizeFileName;
+
+trait Media {
+ function dirForType($type) {
+ switch ($type) {
+ case 'public':
+ $scandir = DIR_MEDIA;
+
+ break;
+
+ case 'plugins':
+ $scandir = DIR_PLUGINS;
+
+ break;
+
+ case 'themes':
+ $scandir = DIR_THEMES;
+
+ break;
+
+ default:
+ return false;
+ }
+
+ return $scandir;
+ }
+
+ function setMediaEndpoints($controllerPath) {
+ $this->view->mediaUrl = $controllerPath;
+ $this->view->scanUrl = "$controllerPath&action=scan";
+ $this->view->uploadUrl = "$controllerPath&action=upload";
+ $this->view->deleteUrl = "$controllerPath&action=delete";
+ $this->view->renameUrl = "$controllerPath&action=rename";
+ $this->view->uploadMaxFilesize = parseQuantity(ini_get('upload_max_filesize'));
+ $this->view->postMaxSize = parseQuantity(ini_get('post_max_size'));
+ }
+
+ function upload() {
+ $files = $this->request->files['files'] ?? [];
+ $overwrite = $this->request->post['overwrite'] ?? false;
+ $success = false;
+ $return = '';
+ $message = '';
+ $response = [];
+
+ if ($files) {
+ $length = count($files['name'] ?? []);
+
+ for ($count = 0; $count < $length; $count++) {
+ $path = sanitizeFileName($this->request->post['mediaPath'] ?? '');
+ $fileName = sanitizeFileName($files['name'][$count]);
+ $path = preg_replace('@^[\\\/]public[\\\/]media|^[\\\/]media|^[\\\/]public@', '', $path);
+ $extension = strtolower(substr($fileName, strrpos($fileName, '.') + 1));
+
+ if ($files['error'][$count] == UPLOAD_ERR_OK) {
+ $success = true;
+ } else {
+ $message = fileUploadErrMessage($files['error'][$count]);
+ }
+
+ if (isset($this->uploadDenyExtensions) && in_array($extension, $this->uploadDenyExtensions)) {
+ $message .= __('File type not allowed!');
+ $success = false;
+ }
+
+ $origFilename = $fileName;
+ $i = 1;
+
+ if ($success) {
+ if ($overwrite) {
+ $destination = $this->dirMedia . $path . DS . $fileName;
+ } else {
+ while (file_exists($destination = $this->dirMedia . $path . DS . $fileName) && ($i++ < 5)) {
+ $fileName = rand(0, 10000) . '-' . $origFilename;
+ }
+ }
+
+ if (@move_uploaded_file($files['tmp_name'][$count], $destination)) {
+ if (isset($this->request->post['onlyFilename'])) {
+ $return = $fileName;
+ } else {
+ $return = $destination;
+ }
+ $message = __('File uploaded successfully!');
+ } else {
+ $destination = $this->dirMedia . $path . DS;
+ $success = false;
+
+ if (! is_writable($destination)) {
+ $message = sprintf(__('%s not writable!'), $destination);
+ } else {
+ $message = __('Error moving uploaded file!');
+ }
+ }
+ }
+
+ $response[] = ['success' => $success, 'message' => $message, 'file' => $return, 'size' => $files['size'][$count]];
+ }
+ } else {
+ $message = __('Invalid upload!');
+ $response[] = ['success' => $success, 'message' => $message, 'file' => $return];
+ }
+
+ $this->response->setType('json');
+ $this->response->output($response);
+ }
+
+ function delete() {
+ $file = sanitizeFileName($this->request->post['file']);
+ $themeFolder = $this->dirMedia;
+
+ if ($file && @unlink($themeFolder . DS . $file)) {
+ $message = ['success' => true, 'message' => __('File deleted!')];
+ } else {
+ $message = ['success' => false, 'message' => __('Error deleting file!')];
+ }
+
+ $this->response->setType('json');
+ $this->response->output($message);
+ }
+
+ function rename() {
+ $file = sanitizeFileName($this->request->post['file']);
+ $newfile = sanitizeFileName($this->request->post['newfile']);
+ $duplicate = $this->request->post['duplicate'] ?? false;
+ $dirMedia = $this->dirMedia;
+
+ $currentFile = $dirMedia . DS . $file;
+ $targetFile = $dirMedia . DS . $newfile;
+
+ if ($duplicate) {
+ if (copy($currentFile, $targetFile)) {
+ $message = ['success' => true, 'message' => __('File copied!')];
+ } else {
+ $message = ['success' => false, 'message' => __('Error copying file!')];
+ }
+ } else {
+ if (rename($currentFile, $targetFile)) {
+ $message = ['success' => true, 'message' => __('File renamed!')];
+ } else {
+ $message = ['success' => false, 'message' => __('Error renaming file!')];
+ }
+ }
+
+ $this->response->setType('json');
+ $this->response->output($message);
+ }
+
+ function newFolder() {
+ $folder = sanitizeFileName($this->request->post['folder']);
+ $path = sanitizeFileName($this->request->post['path']);
+ $success = false;
+
+ $dirMedia = $this->dirMedia;
+
+ if (is_dir($dirMedia . $path)) {
+ if (is_dir($dirMedia . $path . DS . $folder)) {
+ $message = __('Folder already exists!');
+ } else {
+ if (@mkdir($dirMedia . $path . DS . $folder)) {
+ $message = __('Folder created!');
+ $success = true;
+ } else {
+ $message = __('Error creating folder!');
+ }
+ }
+ } else {
+ $message = __('Path does not exist!');
+ }
+
+ $message = ['success' => $success, 'message' => $message];
+
+ $this->response->setType('json');
+ $this->response->output($message);
+ }
+
+ function scan() {
+ $scandir = $this->dirMedia; //$this->dirForType($type);
+
+ if (isset($this->dirMediaType) && $this->dirMediaType) {
+ $type = $this->request->get['type'] ?? 'public';
+ $scandir = $this->dirForType($type);
+ }
+
+ if (! $scandir) {
+ return [];
+ }
+
+ // This function scans the files folder recursively, and builds a large array
+ $scan = function ($dir) use ($scandir, &$scan) {
+ $files = [];
+
+ // Is there actually such a folder/file?
+
+ if (file_exists($dir)) {
+ $listdir = @\scandir($dir);
+
+ if ($listdir) {
+ foreach ($listdir as $f) {
+ if (! $f || $f[0] == '.' || $f == 'node_modules' || $f == 'vendor') {
+ continue; // Ignore hidden files
+ }
+
+ if (is_dir($dir . DS . $f)) {
+ // The path is a folder
+
+ $files[] = [
+ 'name' => $f,
+ 'type' => 'folder',
+ 'path' => str_replace([$scandir, '\\'], ['', '/'], $dir) . '/' . $f,
+ 'items' => $scan("$dir/$f"), // Recursively get the contents of the folder
+ ];
+ } else {
+ // It is a file
+
+ $files[] = [
+ 'name' => $f,
+ 'type' => 'file',
+ 'path' => str_replace([$scandir, '\\'], ['', '/'], $dir) . '/' . $f,
+ 'size' => filesize("$dir/$f"), // Gets the size of this file
+ ];
+ }
+ }
+ }
+ }
+
+ return $files;
+ };
+
+ $response = $scan($scandir);
+
+ // Output the directory listing as JSON
+ $this->response->setType('json');
+ $this->response->output([
+ 'name' => '',
+ 'type' => 'folder',
+ 'path' => '',
+ 'items' => $response,
+ ]);
+ }
+}