diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
index 908f7f4..12d4a65 100644
--- a/module/Application/config/module.config.php
+++ b/module/Application/config/module.config.php
@@ -39,7 +39,7 @@
'options' => [
'route' => '/filepond',
'defaults' => [
- 'controller' => Controller\IndexController::class,
+ 'controller' => Controller\UploadController::class,
'action' => 'filepond',
],
],
@@ -49,11 +49,44 @@
'options' => [
'route' => '/uppy',
'defaults' => [
- 'controller' => Controller\IndexController::class,
+ 'controller' => Controller\UploadController::class,
'action' => 'uppy',
],
],
],
+ 'uppy-togglepub' => [
+ 'type' => Literal::class,
+ 'options' => [
+ 'route' => '/uppy/togglemediapub[/:id]',
+ 'constraints' => [
+ 'id' => '[0-9]+',
+ ],
+ 'defaults' => [
+ 'controller' => Controller\UploadController::class,
+ 'action' => 'togglemediapub',
+ ],
+ ],
+ ],
+ 'uppy-updatesort' => [
+ 'type' => Literal::class,
+ 'options' => [
+ 'route' => '/uppy/updatesort',
+ 'defaults' => [
+ 'controller' => Controller\UploadController::class,
+ 'action' => 'updateuppysort',
+ ],
+ ],
+ ],
+ 'add-theme' => [
+ 'type' => Literal::class,
+ 'options' => [
+ 'route' => '/themes/add',
+ 'defaults' => [
+ 'controller' => Controller\UploadController::class,
+ 'action' => 'addtheme',
+ ],
+ ],
+ ],
'setup' => [
'type' => Literal::class,
'options' => [
diff --git a/module/Application/data/data.sql b/module/Application/data/data.sql
index 3160970..4d3b1a5 100644
--- a/module/Application/data/data.sql
+++ b/module/Application/data/data.sql
@@ -14,12 +14,12 @@ INSERT INTO `settings` (`settings_key`, `settings_value`) VALUES
INSERT INTO `permission` (`permission_key`, `module`, `label`, `nav_label`, `nav_href`, `show_in_menu`) VALUES
('index', 'Application\\Controller\\IndexController', 'Home', 'Home', '/', 0),
('update', 'Application\\Controller\\IndexController', 'Updates', '', '', 0),
-('addtheme', 'Application\\Controller\\IndexController', 'Upload Theme', '', '/application/addtheme', 0),
+('addtheme', 'Application\\Controller\\UploadController', 'Upload Theme', '', '/application/addtheme', 0),
('themes', 'Application\\Controller\\IndexController', 'Theme Selection', '', '/application/themes', 0),
-('filepond', 'Application\\Controller\\IndexController', 'Upload Featured Image', '', '', 0),
-('uppy', 'Application\\Controller\\IndexController', 'Gallery Upload', '', '', 0),
-('togglemediapub', 'Application\\Controller\\IndexController', 'Gallery Upload', '', '', 0),
-('updateuppysort', 'Application\\Controller\\IndexController', 'Gallery Upload', '', '', 0),
+('filepond', 'Application\\Controller\\UploadController', 'Upload Featured Image', '', '', 0),
+('uppy', 'Application\\Controller\\UploadController', 'Gallery Upload', '', '', 0),
+('togglemediapub', 'Application\\Controller\\UploadController', 'Gallery Upload', '', '', 0),
+('updateuppysort', 'Application\\Controller\\UploadController', 'Gallery Upload', '', '', 0),
('quicksearch', 'Application\\Controller\\IndexController', 'Quick Search', '', '', 0),
('updatefieldsort', 'Application\\Controller\\IndexController', 'Update Form Field Sorting', '', '', 0),
('selectbool', 'Application\\Controller\\IndexController', 'Select Yes/No', '', '', 0);
diff --git a/module/Application/src/Controller/IndexController.php b/module/Application/src/Controller/IndexController.php
index a5883b1..9829506 100644
--- a/module/Application/src/Controller/IndexController.php
+++ b/module/Application/src/Controller/IndexController.php
@@ -338,113 +338,6 @@ public function filepondAction() {
}
}
- /**
- * Server Side for UPPY Fileupload
- *
- * @return bool
- * @since 1.0.7
- */
- public function uppyAction() {
- $this->layout('layout/json');
-
- $iEntityID = (int)$_REQUEST['entity_id'];
- $sEntityType = $_REQUEST['entity_type'];
- $sPath = '';
- $oEntityTbl = false;
-
- switch($sEntityType) {
- default:
- $oForm = CoreController::$aCoreTables['core-form']->select(['form_key'=>$sEntityType.'-single']);
- if(count($oForm) > 0) {
- $oForm = $oForm->current();
- $oEntityTbl = CoreController::$oServiceManager->get($oForm->entity_tbl_class);
- $oEntity = $oEntityTbl->getSingle($iEntityID);
- if($oEntity) {
- $sPath = $_SERVER['DOCUMENT_ROOT'].'/data/'.$sEntityType.'/'.$oEntity->getID().'/';
- }
- if(!is_dir($sPath)) {
- mkdir($sPath);
- }
- }
- $aFile = $_FILES['files'];
- if(move_uploaded_file($aFile['tmp_name'][0],$sPath.'/'.trim($aFile['name'][0]))) {
- if(isset($oForm)) {
- CoreController::$aCoreTables['core-gallery-media']->insert([
- 'filename'=>trim($aFile['name'][0]),
- 'entity_idfs'=>$iEntityID,
- 'entity_type'=>$sEntityType,
- 'is_public'=>0,
- 'created_by'=>CoreController::$oSession->oUser->getID(),
- 'created_date'=>date('Y-m-d H:i:s',time()),
- 'modified_by'=>CoreController::$oSession->oUser->getID(),
- 'modified_date'=>date('Y-m-d H:i:s',time()),
- 'sort_id'=>0,
- ]);
- }
- }
- break;
- }
-
- return false;
- }
-
- /**
- * Sorting for uppy galleries
- *
- * @return bool no viewfile. echo json
- * @since 1.0.12
- */
- public function updateuppysortAction() {
- $this->layout('layout/json');
-
-
- $oRequest = $this->getRequest();
- $aImagesToSort = $oRequest->getPost('images');
-
- $oGalleryTbl = CoreController::$aCoreTables['core-gallery-media'];
-
- $iSortID = 0;
- # Loop over all columns provided
- foreach($aImagesToSort as $sImgInfo) {
- $iMediaID = substr($sImgInfo,strlen('gallery-media-'));
- $oGalleryTbl->update(['sort_id'=>$iSortID],'Media_ID = '.$iMediaID);
- $iSortID++;
- }
-
- $aReturn = ['state'=>'success','message'=>'gallery successfully updated'];
-
- echo json_encode($aReturn);
-
- return false;
- }
-
- /**
- * Toggle Media Public Status
- *
- * @return \Laminas\Http\Response
- * @since 1.0.12
- */
- public function togglemediapubAction() {
- $this->layout('layout/json');
-
- $iMediaID = $this->params()->fromRoute('id',0);
-
- if($iMediaID != 0) {
- $oGalleryTbl = CoreController::$aCoreTables['core-gallery-media'];
- $oMedia = $oGalleryTbl->select(['Media_ID'=>$iMediaID]);
- if(count($oMedia) > 0) {
- $oMedia = $oMedia->current();
- $bPublic = ($oMedia->is_public == 1) ? 0 : 1;
- $oGalleryTbl->update(['is_public'=>$bPublic],'Media_ID = '.$iMediaID);
-
- return $this->redirect()->toRoute($oMedia->entity_type,['action'=>'view','id'=>$oMedia->entity_idfs]);
-
- }
- }
-
- return $this->redirect()->toRoute('home');
- }
-
/**
* Quicksearch across all registered entities
*
diff --git a/module/Application/src/Controller/UploadController.php b/module/Application/src/Controller/UploadController.php
new file mode 100644
index 0000000..7037289
--- /dev/null
+++ b/module/Application/src/Controller/UploadController.php
@@ -0,0 +1,293 @@
+
+ * @license https://opensource.org/licenses/BSD-3-Clause
+ * @version 1.0.0
+ * @since 1.0.0
+ */
+
+declare(strict_types=1);
+
+namespace Application\Controller;
+use Laminas\View\Model\ViewModel;
+use Laminas\Db\Adapter\AdapterInterface;
+use Laminas\Db\TableGateway\TableGateway;
+use Laminas\Db\Adapter\Adapter;
+use Laminas\View\View;
+
+class UploadController extends CoreController {
+ /**
+ * Add new theme to oneplace
+ *
+ * @return \Laminas\Http\Response|ViewModel
+ */
+ public function addthemeAction() {
+ $this->setThemeBasedLayout('application');
+
+ # Check if zip extension is loaded
+ if(!extension_loaded('zip')) {
+ $this->flashMessenger()->addErrorMessage('You need php-zip extension enabled on your webserver to add new themes');
+ $this->redirect()->toRoute('application',['action'=>'themes']);
+ }
+
+ $oRequest = $this->getRequest();
+
+ if(!$oRequest->isPost()) {
+ return new ViewModel([]);
+ } else {
+ $this->layout('layout/json');
+
+ /**
+ * Upload ZIP File
+ */
+ $filename = $_FILES["zip_file"]["name"];
+ $source = $_FILES["zip_file"]["tmp_name"];
+ $type = $_FILES["zip_file"]["type"];
+
+ # Check file extension
+ $name = explode(".", $filename);
+ $accepted_types = array('application/zip', 'application/x-zip-compressed', 'multipart/x-zip', 'application/x-compressed');
+ foreach($accepted_types as $mime_type) {
+ if($mime_type == $type) {
+ $okay = true;
+ break;
+ }
+ }
+
+ # allow only zip
+ $continue = strtolower($name[1]) == 'zip' ? true : false;
+ if(!$continue) {
+ $message = "The file you are trying to upload is not a .zip file. Please try again.";
+ }
+
+ # create theme dir if its the first theme
+ if(!is_dir($_SERVER['DOCUMENT_ROOT'].'/../data/themes')) {
+ mkdir($_SERVER['DOCUMENT_ROOT'].'/../data/themes');
+ }
+
+ # upload theme
+ $target_path = $_SERVER['DOCUMENT_ROOT'].'/themes/'.$filename; // change this to the correct site path
+ if(move_uploaded_file($source, $target_path)) {
+ # unzip theme
+ $zip = new \ZipArchive();
+ $x = $zip->open($target_path);
+ if ($x === true) {
+ $zip->extractTo($_SERVER['DOCUMENT_ROOT'].'/themes/'); // change this to the correct site path
+ $zip->close();
+
+ unlink($target_path);
+ }
+ $message = "Your .zip file was uploaded and unpacked.";
+ } else {
+ $message = "There was a problem with the upload. Please try again.";
+ }
+
+ echo $message;
+
+ # todo: theme name MUST be dynamic - define how to determine correct name, maybe add a json to theme
+ # because currently we only have zip name as indicator which is like nothing
+ $sThemeName = 'vuze';
+
+ # Install Layouts
+ foreach(glob($_SERVER['DOCUMENT_ROOT'].'/themes/'.$sThemeName.'/view/layout/*',GLOB_NOSORT) as $sThemeFile) {
+ rename($sThemeFile,$_SERVER['DOCUMENT_ROOT'].'/../module/Application/view/layout/'.basename($sThemeFile));
+ }
+ # Install Partials
+ foreach(glob($_SERVER['DOCUMENT_ROOT'].'/themes/'.$sThemeName.'/view/partial/*',GLOB_NOSORT) as $sThemeFile) {
+ rename($sThemeFile,$_SERVER['DOCUMENT_ROOT'].'/../module/Application/view/partial/'.basename($sThemeFile));
+ }
+
+ echo 'theme files installed';
+
+ return $this->redirect()->toRoute('application',['action'=>'themes']);
+ }
+ }
+
+ /**
+ * Server-Side for Filepond Upload
+ *
+ * @return bool
+ * @since 1.0.7
+ */
+ public function filepondAction() {
+ $this->layout('layout/json');
+
+ $oRequest = $this->getRequest();
+
+ if($oRequest->isPost()) {
+ $iEntityID = (int)$_REQUEST['entity_id'];
+ $sEntityType = $_REQUEST['type'];
+
+ $sPath = '';
+ $oEntityTbl = false;
+ switch($sEntityType) {
+ case 'skeleton':
+ $oEntityTbl = CoreController::$oServiceManager->get(\OnePlace\Skeleton\Model\SkeletonTable::class);
+ $oEntity = $oEntityTbl->getSingle($iEntityID);
+ if($oEntity) {
+ $sPath = $_SERVER['DOCUMENT_ROOT'].'/data/'.$sEntityType.'/'.$oEntity->getID().'/';
+ }
+ break;
+ case 'user':
+ $oEntityTbl = CoreController::$oServiceManager->get(\OnePlace\User\Model\UserTable::class);
+ $oEntity = $oEntityTbl->getSingle($iEntityID);
+ if($oEntity) {
+ $sPath = $_SERVER['DOCUMENT_ROOT'].'/data/'.$sEntityType.'/'.$oEntity->getID().'/';
+ }
+ break;
+ default:
+ $oForm = CoreController::$aCoreTables['core-form']->select(['form_key'=>$sEntityType.'-single']);
+ if(count($oForm) > 0) {
+ $oForm = $oForm->current();
+ $oEntityTbl = CoreController::$oServiceManager->get($oForm->entity_tbl_class);
+ $oEntity = $oEntityTbl->getSingle($iEntityID);
+ if($oEntity) {
+ $sPath = $_SERVER['DOCUMENT_ROOT'].'/data/'.$sEntityType.'/'.$oEntity->getID().'/';
+ }
+ }
+ break;
+ }
+
+ if($sPath != '') {
+ if(!is_dir($sPath)) {
+ mkdir($sPath);
+ }
+
+ if(array_key_exists('filepond',$_FILES)) {
+ $aFile = $_FILES['filepond'];
+ if(move_uploaded_file($aFile['tmp_name'],$sPath.'/'.$aFile['name'])) {
+ switch($sEntityType) {
+ case 'user':
+ $oEntityTbl->updateAttribute('featured_image', $aFile['name'], 'User_ID', $iEntityID);
+ break;
+ default:
+ if(is_object($oEntityTbl)) {
+ $oEntityTbl->updateAttribute('featured_image', $aFile['name'], ucfirst($sEntityType).'_ID', $iEntityID);
+ }
+ break;
+ }
+ }
+ }
+ }
+ return false;
+ } else {
+ var_dump($_REQUEST);
+
+ return false;
+ }
+ }
+
+ /**
+ * Server Side for UPPY Fileupload
+ *
+ * @return bool
+ * @since 1.0.7
+ */
+ public function uppyAction() {
+ $this->layout('layout/json');
+
+ $iEntityID = (int)$_REQUEST['entity_id'];
+ $sEntityType = $_REQUEST['entity_type'];
+ $sPath = '';
+ $oEntityTbl = false;
+
+ switch($sEntityType) {
+ default:
+ $oForm = CoreController::$aCoreTables['core-form']->select(['form_key'=>$sEntityType.'-single']);
+ if(count($oForm) > 0) {
+ $oForm = $oForm->current();
+ $oEntityTbl = CoreController::$oServiceManager->get($oForm->entity_tbl_class);
+ $oEntity = $oEntityTbl->getSingle($iEntityID);
+ if($oEntity) {
+ $sPath = $_SERVER['DOCUMENT_ROOT'].'/data/'.$sEntityType.'/'.$oEntity->getID().'/';
+ }
+ if(!is_dir($sPath)) {
+ mkdir($sPath);
+ }
+ }
+ $aFile = $_FILES['files'];
+ if(move_uploaded_file($aFile['tmp_name'][0],$sPath.'/'.trim($aFile['name'][0]))) {
+ if(isset($oForm)) {
+ CoreController::$aCoreTables['core-gallery-media']->insert([
+ 'filename'=>trim($aFile['name'][0]),
+ 'entity_idfs'=>$iEntityID,
+ 'entity_type'=>$sEntityType,
+ 'is_public'=>0,
+ 'created_by'=>CoreController::$oSession->oUser->getID(),
+ 'created_date'=>date('Y-m-d H:i:s',time()),
+ 'modified_by'=>CoreController::$oSession->oUser->getID(),
+ 'modified_date'=>date('Y-m-d H:i:s',time()),
+ 'sort_id'=>0,
+ ]);
+ }
+ }
+ break;
+ }
+
+ return false;
+ }
+
+ /**
+ * Sorting for uppy galleries
+ *
+ * @return bool no viewfile. echo json
+ * @since 1.0.12
+ */
+ public function updateuppysortAction() {
+ $this->layout('layout/json');
+
+
+ $oRequest = $this->getRequest();
+ $aImagesToSort = $oRequest->getPost('images');
+
+ $oGalleryTbl = CoreController::$aCoreTables['core-gallery-media'];
+
+ $iSortID = 0;
+ # Loop over all columns provided
+ foreach($aImagesToSort as $sImgInfo) {
+ $iMediaID = substr($sImgInfo,strlen('gallery-media-'));
+ $oGalleryTbl->update(['sort_id'=>$iSortID],'Media_ID = '.$iMediaID);
+ $iSortID++;
+ }
+
+ $aReturn = ['state'=>'success','message'=>'gallery successfully updated'];
+
+ echo json_encode($aReturn);
+
+ return false;
+ }
+
+ /**
+ * Toggle Media Public Status
+ *
+ * @return \Laminas\Http\Response
+ * @since 1.0.12
+ */
+ public function togglemediapubAction() {
+ $this->layout('layout/json');
+
+ $iMediaID = $this->params()->fromRoute('id',0);
+
+ if($iMediaID != 0) {
+ $oGalleryTbl = CoreController::$aCoreTables['core-gallery-media'];
+ $oMedia = $oGalleryTbl->select(['Media_ID'=>$iMediaID]);
+ if(count($oMedia) > 0) {
+ $oMedia = $oMedia->current();
+ $bPublic = ($oMedia->is_public == 1) ? 0 : 1;
+ $oGalleryTbl->update(['is_public'=>$bPublic],'Media_ID = '.$iMediaID);
+
+ return $this->redirect()->toRoute($oMedia->entity_type,['action'=>'view','id'=>$oMedia->entity_idfs]);
+
+ }
+ }
+
+ return $this->redirect()->toRoute('home');
+ }
+}
diff --git a/module/Application/view/application/index/themes.phtml b/module/Application/view/application/index/themes.phtml
index 38a4cbb..eff50fe 100644
--- a/module/Application/view/application/index/themes.phtml
+++ b/module/Application/view/application/index/themes.phtml
@@ -20,7 +20,7 @@ use Application\Controller\CoreController; ?>
- Upload new Theme
+ Upload new Theme
\ No newline at end of file
diff --git a/module/Application/view/partial/webgallery-view.phtml b/module/Application/view/partial/webgallery-view.phtml
index 7753e41..9dc13be 100644
--- a/module/Application/view/partial/webgallery-view.phtml
+++ b/module/Application/view/partial/webgallery-view.phtml
@@ -31,7 +31,7 @@ if(count($aImages) > 0) {
@@ -47,7 +47,7 @@ if(count($aImages) > 0) {
axis: "y",
update: function( event, ui ) {
var sortedIDs = $( "ul.plc-webgallery-list" ).sortable( "toArray" );
- $.post('/application/updateuppysort',{entity_idfs:'getID()?>',entity_type:'',images:sortedIDs},function(retVal) {
+ $.post('/uppy/updatesort',{entity_idfs:'getID()?>',entity_type:'',images:sortedIDs},function(retVal) {
console.log(retVal);
var oJson = $.parseJSON(retVal);
if(oJson.state == 'success') {