3.1.9

PhocaCz · Apr 25, 2019 · f124a19 · f124a19
1 parent bf7a01f
commit f124a19
Show file tree

Hide file tree

Showing 15 changed files with 299 additions and 273 deletions.
diff --git a/README.MD b/README.MD
@@ -56,7 +56,7 @@ Phoca Download is download manager for Joomla! CMS. It includes component, modul
 
 ## Version
 
-3.1.8
+3.1.9
 
 
 

diff --git a/admin/controllers/phocadownloaddownloads.php b/admin/controllers/phocadownloaddownloads.php
@@ -13,20 +13,20 @@
 class PhocaDownloadCpControllerPhocaDownloadDownloads extends JControllerForm
 {
 	protected	$option 		= 'com_phocadownload';
-	
-	public function &getModel($name = 'PhocaDownloadDownloads', $prefix = 'PhocaDownloadCpModel')
+
+	public function &getModel($name = 'PhocaDownloadDownloads', $prefix = 'PhocaDownloadCpModel', $config = array('ignore_request' => true))
 	{
 		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
 		return $model;
 	}
-	
+
 	function cancel($key = NULL) {
 		$model = $this->getModel( 'phocadownload' );
 		$this->setRedirect( 'index.php?option=com_phocadownload&view=phocadownloaddownloads' );
 	}
 
 	function reset() {
-		
+
 		$post					= JFactory::getApplication()->input->get('post');
 		$cid					= JFactory::getApplication()->input->get( 'cid', array(0), 'post', 'array' );
 		$idFile					= JFactory::getApplication()->input->get( 'idfile', 0, 'post', 'int' );
@@ -38,7 +38,7 @@ function reset() {
 		} else {
 			$msg = JText::_( 'COM_PHOCADOWNLOAD_ERROR_RESET_USER_STAT' );
 		}
-		
+
 		$link = 'index.php?option=com_phocadownload&view=phocadownloaddownloads&id='.(int)$idFile;
 		$this->setRedirect($link, $msg);
 	}

diff --git a/admin/controllers/phocadownloadupload.php b/admin/controllers/phocadownloadupload.php
@@ -27,26 +27,27 @@ function createfolder() {
 		// Set FTP credentials, if given
 		jimport('joomla.client.helper');
 		JClientHelper::setCredentialsFromRequest('ftp');
-		
+
 		$paramsC = JComponentHelper::getParams('com_phocadownload');
 		$folder_permissions = $paramsC->get( 'folder_permissions', 0755 );
 		//$folder_permissions = octdec((int)$folder_permissions);
 
-		
+
 		$folderNew		= JFactory::getApplication()->input->getCmd( 'foldername', '');
-		$folderCheck	= JFactory::getApplication()->input->get( 'foldername', null, '', 'string');
-		$parent			= JFactory::getApplication()->input->get( 'folderbase', '', '', 'path' );
-		$tab			= JFactory::getApplication()->input->get( 'tab', 0, '', 'string' );
+		$folderCheck	= JFactory::getApplication()->input->get( 'foldername', null, 'string');
+		$parent			= JFactory::getApplication()->input->get( 'folderbase', '', 'path' );
+		$tab			= JFactory::getApplication()->input->get( 'tab', 0, 'string' );
 		$field			= JFactory::getApplication()->input->get( 'field');
-		$viewBack		= JFactory::getApplication()->input->get( 'viewback', '', '', 'phocadownloadmanager' );
-		$manager		= JFactory::getApplication()->input->get( 'manager', 'file', '', 'string' );
-		
-		
+		$viewBack		= JFactory::getApplication()->input->get( 'viewback', '', 'phocadownloadmanager' );
+		$manager		= JFactory::getApplication()->input->get( 'manager', 'file', 'string' );
+
+
 		$link = '';
 		if ($manager != '') {
 			$group 	= PhocaDownloadSettings::getManagerGroup($manager);
 			$link	= 'index.php?option=com_phocadownload&view='.(string)$viewBack.'&manager='.(string)$manager
 						 .str_replace('&amp;', '&', $group['c']).'&folder='.$parent.'&tab='.(string)$tab.'&field='.$field;
+
 			$path	= PhocaDownloadPath::getPathSet($manager);// we use viewback to get right path
 		} else {
 
@@ -62,12 +63,13 @@ function createfolder() {
 			$app->redirect($link);
 		}
 
+
 		if (strlen($folderNew) > 0) {
 			$folder = JPath::clean($path['orig_abs_ds'].$parent.'/'.$folderNew);
-		
+
 			if (!JFolder::exists($folder) && !JFile::exists($folder)) {
 				//JFolder::create($path, $folder_permissions );
-				
+
 				switch((int)$folder_permissions) {
 					case 777:
 						JFolder::create($folder, 0777 );
@@ -80,7 +82,7 @@ function createfolder() {
 					break;
 					case 644:
 						JFolder::create($folder, 0644 );
-					break;				
+					break;
 					case 755:
 					Default:
 						JFolder::create($folder, 0755 );
@@ -92,7 +94,7 @@ function createfolder() {
 				} else {
 					$app->redirect($link, JText::_('COM_PHOCADOWNLOAD_ERROR_FOLDER_CREATING'));
 				}
-				
+
 				$app->redirect($link, JText::_('COM_PHOCADOWNLOAD_SUCCESS_FOLDER_CREATING'));
 			} else {
 				$app->redirect($link, JText::_('COM_PHOCADOWNLOAD_ERROR_FOLDER_CREATING_EXISTS'));
@@ -101,16 +103,16 @@ function createfolder() {
 		}
 		$app->redirect($link);
 	}
-	
+
 	function multipleupload() {
 		$result = PhocaDownloadFileUpload::realMultipleUpload();
-		return true;	
+		return true;
 	}
-	
+
 	function upload() {
 		$result = PhocaDownloadFileUpload::realSingleUpload();
 		return true;
 	}
-	
-	
-}
+
+
+}