joomla/Component-Builder
39
25
Fork 11
Code Issues 77 Pull Requests Projects 4 Wiki Activity

Continued formatting of JCB code

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-12-15 03:10:10 +02:00
parent 8ac350e62b
commit e44b6bc272
91 changed files with 1516 additions and 1518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
admin/models/import_joomla_components.php
View File

@ -56,8 +56,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
/**
* Import Settings
*/
protected $getType = NULL;
protected $dataType = NULL;
protected $getType = NULL;
protected $dataType = NULL;
/**
* Method to auto-populate the model state.
@ -280,8 +280,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
protected function _getPackageFromUpload()
{
// Get the uploaded file information
$app = JFactory::getApplication();
$input = $app->input;
$app = JFactory::getApplication();
$input = $app->input;
// Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See JInputFiles::get.
$userfile = $input->files->get('import_package', null, 'raw');
@ -308,9 +308,9 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
}
// Build the appropriate paths
$config = JFactory::getConfig();
$tmp_dest = $config->get('tmp_path') . '/' . $userfile['name'];
$tmp_src = $userfile['tmp_name'];
$config = JFactory::getConfig();
$tmp_dest = $config->get('tmp_path') . '/' . $userfile['name'];
$tmp_src = $userfile['tmp_name'];
// Move uploaded file
jimport('joomla.filesystem.file');
@ -341,8 +341,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
*/
protected function _getPackageFromFolder()
{
$app = JFactory::getApplication();
$input = $app->input;
$app = JFactory::getApplication();
$input = $app->input;
// Get the path to the package to import
$p_dir = $input->getString('import_directory');
@ -372,8 +372,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
}
$package['packagename'] = null;
$package['dir'] = $p_dir;
$package['type'] = $type;
$package['dir'] = $p_dir;
$package['type'] = $type;
return $package;
}
@ -386,8 +386,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
*/
protected function _getPackageFromUrl()
{
$app = JFactory::getApplication();
$input = $app->input;
$app = JFactory::getApplication();
$input = $app->input;
// Get the URL of the package to import
$url = $input->getString('import_url');
@ -426,7 +426,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
*/
protected function check($archivename)
{
$app = JFactory::getApplication();
$app = JFactory::getApplication();
// Clean the name
$archivename = JPath::clean($archivename);
@ -439,15 +439,15 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
return false;
}
$config = JFactory::getConfig();
$config = JFactory::getConfig();
// set Package Name
$check['packagename'] = $archivename;
$check['packagename'] = $archivename;
// set directory
$check['dir'] = $config->get('tmp_path'). '/' .$archivename;
$check['dir'] = $config->get('tmp_path'). '/' .$archivename;
// set type
$check['type'] = $this->getType;
$check['type'] = $this->getType;
return $check;
}
@ -492,8 +492,8 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
{
jimport('joomla.filesystem.file');
$config = JFactory::getConfig();
$package = $config->get('tmp_path'). '/' .$package;
$config = JFactory::getConfig();
$package = $config->get('tmp_path'). '/' .$package;
// Is the package file a valid file?
if (is_file($package))