[#31727] Migrate application classes from legacy JApplication to JApp…

…licationWeb (Fix #1716)
joomla · Sep 20, 2013 · d962a5a · d962a5a
1 parent e766a79
commit d962a5a
Show file tree

Hide file tree

Showing 67 changed files with 3,599 additions and 1,315 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -927,6 +927,9 @@ public function deleteUnexistingFiles()
 			'administrator/components/com_newsfeeds/models/fields/ordering.php',
 			'administrator/components/com_plugins/models/fields/ordering.php',
 			'administrator/components/com_weblinks/models/fields/ordering.php',
+			'/administrator/includes/application.php',
+			'/includes/application.php',
+			'/libraries/legacy/application/helper.php',
 		);
 
 		// TODO There is an issue while deleting folders using the ftp mode

diff --git a/administrator/components/com_banners/views/tracks/view.raw.php b/administrator/components/com_banners/views/tracks/view.raw.php
@@ -37,7 +37,7 @@ public function display($tpl = null)
 
 		$document = JFactory::getDocument();
 		$document->setMimeEncoding($mimetype);
-		JResponse::setHeader('Content-disposition', 'attachment; filename="'.$basename.'.'.$filetype.'"; creation-date="'.JFactory::getDate()->toRFC822().'"', true);
+		JFactory::getApplication()->setHeader('Content-disposition', 'attachment; filename="'.$basename.'.'.$filetype.'"; creation-date="'.JFactory::getDate()->toRFC822().'"', true);
 		echo $content;
 	}
 }
diff --git a/administrator/components/com_config/config.php b/administrator/components/com_config/config.php
@@ -13,7 +13,7 @@
 // Access checks are done internally because of different requirements for the two controllers.
 
 // Tell the browser not to cache this page.
-JResponse::setHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT', true);
+JFactory::getApplication()->setHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT', true);
 
 $controller = JControllerLegacy::getInstance('Config');
 $controller->execute(JFactory::getApplication()->input->get('task'));

diff --git a/administrator/components/com_config/controllers/application.php b/administrator/components/com_config/controllers/application.php
@@ -50,8 +50,8 @@ public function save()
 		// Check if the user is authorized to do this.
 		if (!JFactory::getUser()->authorise('core.admin'))
 		{
-			JFactory::getApplication()->redirect('index.php', JText::_('JERROR_ALERTNOAUTHOR'));
-			return;
+			$this->setRedirect('index.php', JText::_('JERROR_ALERTNOAUTHOR'));
+			$this->redirect();
 		}
 
 		// Set FTP credentials, if given.
@@ -135,8 +135,8 @@ public function cancel()
 		// Check if the user is authorized to do this.
 		if (!JFactory::getUser()->authorise('core.admin', 'com_config'))
 		{
-			JFactory::getApplication()->redirect('index.php', JText::_('JERROR_ALERTNOAUTHOR'));
-			return;
+			$this->setRedirect('index.php', JText::_('JERROR_ALERTNOAUTHOR'));
+			$this->redirect();
 		}
 
 		// Set FTP credentials, if given
@@ -164,8 +164,8 @@ public function removeroot()
 		// Check if the user is authorized to do this.
 		if (!JFactory::getUser()->authorise('core.admin'))
 		{
-			JFactory::getApplication()->redirect('index.php', JText::_('JERROR_ALERTNOAUTHOR'));
-			return;
+			$this->setRedirect('index.php', JText::_('JERROR_ALERTNOAUTHOR'));
+			$this->redirect();
 		}
 
 		// Initialise model.

diff --git a/administrator/components/com_config/controllers/component.php b/administrator/components/com_config/controllers/component.php
@@ -79,8 +79,8 @@ public function save()
 		// Check if the user is authorized to do this.
 		if (!JFactory::getUser()->authorise('core.admin', $option))
 		{
-			JFactory::getApplication()->redirect('index.php', JText::_('JERROR_ALERTNOAUTHOR'));
-			return;
+			$this->setRedirect('index.php', JText::_('JERROR_ALERTNOAUTHOR'));
+			$this->redirect();
 		}
 
 		$returnUri = $this->input->post->get('return', null, 'base64');

diff --git a/administrator/components/com_finder/controllers/indexer.json.php b/administrator/components/com_finder/controllers/indexer.json.php
@@ -282,9 +282,10 @@ public static function sendResponse($data = null)
 		// Send the assigned error code if we are catching an exception.
 		if ($data instanceof Exception)
 		{
+			$app = JFactory::getApplication();
 			JLog::add($data->getMessage(), JLog::ERROR);
-			JResponse::setHeader('status', $data->getCode());
-			JResponse::sendHeaders();
+			$app->setHeader('status', $data->getCode());
+			$app->sendHeaders();
 		}
 
 		// Create the response object.

diff --git a/administrator/components/com_media/views/imageslist/view.html.php b/administrator/components/com_media/views/imageslist/view.html.php
@@ -21,7 +21,7 @@ class MediaViewImagesList extends JViewLegacy
 	public function display($tpl = null)
 	{
 		// Do not allow cache
-		JResponse::allowCache(false);
+		JFactory::getApplication()->allowCache(false);
 
 		$lang	= JFactory::getLanguage();
 

diff --git a/administrator/components/com_media/views/medialist/view.html.php b/administrator/components/com_media/views/medialist/view.html.php
@@ -20,8 +20,10 @@ class MediaViewMediaList extends JViewLegacy
 {
 	public function display($tpl = null)
 	{
+		$app = JFactory::getApplication();
+
 		// Do not allow cache
-		JResponse::allowCache(false);
+		$app->allowCache(false);
 
 		JHtml::_('behavior.framework', true);