From 66c4e5fd1d9b73d15b7ad7e83c660f8a6ec1dcdf Mon Sep 17 00:00:00 2001 From: dam-man Date: Sun, 1 Jan 2017 21:35:32 +0100 Subject: [PATCH 1/3] Removed some deprecated Joomla Framework code. Removed Jrequest::getVar and replaced it with Jinput. Removed deprecated form token check and replaced it with new version of this check. --- .../com_jedchecker/controllers/uploads.php | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/source/administrator/components/com_jedchecker/controllers/uploads.php b/source/administrator/components/com_jedchecker/controllers/uploads.php index de61943..1bd3790 100644 --- a/source/administrator/components/com_jedchecker/controllers/uploads.php +++ b/source/administrator/components/com_jedchecker/controllers/uploads.php @@ -18,7 +18,7 @@ jimport('joomla.filesystem.archive'); * * @since 1.0 */ -class JedcheckerControllerUploads extends JControllerLegacy +class JedcheckerControllerUploads extends JControllerlegacy { /** * Constructor. @@ -39,9 +39,18 @@ class JedcheckerControllerUploads extends JControllerLegacy */ public function upload() { - JRequest::checkToken() or die('Invalid Token'); - $appl = JFactory::getApplication(); - $file = JRequest::getVar('extension', '', 'files', 'array'); + $appl = JFactory::getApplication(); + $input = JFactory::getApplication()->input; + $token = JSession::getFormToken(); + + // Checking the form token + if (!$token || !$appl->input->get($token, null, 'alnum')) + { + jexit('Invalid Token'); + } + + // Gets the uploaded file from the sent form + $file = $input->files->get('extension', null, 'raw'); if ($file['tmp_name']) { @@ -76,8 +85,9 @@ class JedcheckerControllerUploads extends JControllerLegacy // Let us try to upload if (!JFile::upload($file['tmp_name'], $file['filepath'], false, true)) { - // Error in upload + // Error in upload - redirect back with an error notice JFactory::getApplication()->enqueueMessage(JText::_('COM_JEDCHECKER_ERROR_UNABLE_TO_UPLOAD_FILE'), 'error'); + $this->setRedirect('index.php?option=com_jedchecker&view=uploads'); return false; } @@ -97,8 +107,14 @@ class JedcheckerControllerUploads extends JControllerLegacy */ public function unzip() { - JRequest::checkToken() or die('Invalid Token'); - $appl = JFactory::getApplication(); + $appl = JFactory::getApplication(); + $token = JSession::getFormToken(); + + // Checking the form token + if (!$token || !$appl->input->get($token, null, 'alnum')) + { + jexit('Invalid Token'); + } // If folder doesn't exist - create it! if (!JFolder::exists($this->pathUnzipped)) @@ -138,7 +154,7 @@ class JedcheckerControllerUploads extends JControllerLegacy /** * Recursively go through each folder and extract the archives * - * @param string $start - the directory where we start the unzipping from + * @param string $start - the directory where we start the unzipping from * * @return void */ From cb0958c171a3f594d79e15680a00bc96b134cd70 Mon Sep 17 00:00:00 2001 From: dam-man Date: Fri, 13 Jan 2017 11:27:07 +0100 Subject: [PATCH 2/3] Update uploads.php Updated code to com_installer standard --- .../components/com_jedchecker/controllers/uploads.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/source/administrator/components/com_jedchecker/controllers/uploads.php b/source/administrator/components/com_jedchecker/controllers/uploads.php index 1bd3790..36a8dea 100644 --- a/source/administrator/components/com_jedchecker/controllers/uploads.php +++ b/source/administrator/components/com_jedchecker/controllers/uploads.php @@ -41,13 +41,9 @@ class JedcheckerControllerUploads extends JControllerlegacy { $appl = JFactory::getApplication(); $input = JFactory::getApplication()->input; - $token = JSession::getFormToken(); - - // Checking the form token - if (!$token || !$appl->input->get($token, null, 'alnum')) - { - jexit('Invalid Token'); - } + + // Check the sent token by the form + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); // Gets the uploaded file from the sent form $file = $input->files->get('extension', null, 'raw'); From 10450d74dd4b77a07f62db1cea796d6c9700d846 Mon Sep 17 00:00:00 2001 From: dam-man Date: Fri, 13 Jan 2017 11:43:36 +0100 Subject: [PATCH 3/3] Update uploads.php Form token check changed --- .../components/com_jedchecker/controllers/uploads.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/source/administrator/components/com_jedchecker/controllers/uploads.php b/source/administrator/components/com_jedchecker/controllers/uploads.php index 36a8dea..cb8ce92 100644 --- a/source/administrator/components/com_jedchecker/controllers/uploads.php +++ b/source/administrator/components/com_jedchecker/controllers/uploads.php @@ -104,13 +104,9 @@ class JedcheckerControllerUploads extends JControllerlegacy public function unzip() { $appl = JFactory::getApplication(); - $token = JSession::getFormToken(); - - // Checking the form token - if (!$token || !$appl->input->get($token, null, 'alnum')) - { - jexit('Invalid Token'); - } + + // Form check token + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); // If folder doesn't exist - create it! if (!JFolder::exists($this->pathUnzipped))