[4.0] Improve updater layout

administrator/components/com_admin/script.php

@@ -1395,6 +1395,14 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/administrator/components/com_joomlaupdate/helpers/select.php',
 			'/administrator/components/com_joomlaupdate/joomlaupdate.php',
 			'/administrator/components/com_joomlaupdate/models/default.php',
+			'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default.php',
+			'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_nodownload.php',
+			'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_noupdate.php',
+			'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php',
+			'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php',
+			'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php',
+			'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_updatemefirst.php',
+			'/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php',
 			'/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php',
 			'/administrator/components/com_joomlaupdate/views/default/tmpl/default.php',
 			'/administrator/components/com_joomlaupdate/views/default/tmpl/default.xml',

administrator/components/com_installer/src/Model/WarningsModel.php

@@ -95,7 +95,11 @@ public function getItems()
 			return $messages;
 		}
 
-		$messages = array();
+		$messages = [];
+
+		 // 16MB
+		$minMemory = 16 * 1024 * 1024;
+
 		$file_uploads = ini_get('file_uploads');
 
 		if (!$file_uploads)
@@ -111,13 +115,10 @@ public function getItems()
 			$messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSET'),
 					'description' => Text::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSETDESC'));
 		}
-		else
+		elseif (!is_writable($upload_dir))
 		{
-			if (!is_writable($upload_dir))
-			{
-				$messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLE'),
-						'description' => Text::sprintf('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLEDESC', $upload_dir));
-			}
+			$messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLE'),
+					'description' => Text::sprintf('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLEDESC', $upload_dir));
 		}
 
 		$tmp_path = Factory::getApplication()->get('tmp_path');
@@ -127,26 +128,23 @@ public function getItems()
 			$messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSET'),
 					'description' => Text::_('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSETDESC'));
 		}
-		else
+		elseif (!is_writable($tmp_path))
 		{
-			if (!is_writable($tmp_path))
-			{
-				$messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLE'),
-						'description' => Text::sprintf('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLEDESC', $tmp_path));
-			}
+			$messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLE'),
+					'description' => Text::sprintf('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLEDESC', $tmp_path));
 		}
 
 		$memory_limit = $this->return_bytes(ini_get('memory_limit'));
 
-		if ($memory_limit < (8 * 1024 * 1024) && $memory_limit != -1)
+		if ($memory_limit < $minMemory && $memory_limit != -1)
 		{
-			// 8MB
+			// 16MB
 			$messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_LOWMEMORYWARN'),
 					'description' => Text::_('COM_INSTALLER_MSG_WARNINGS_LOWMEMORYDESC'));
 		}
-		elseif ($memory_limit < (16 * 1024 * 1024) && $memory_limit != -1)
+		elseif ($memory_limit < ($minMemory * 1.5) && $memory_limit != -1)
 		{
-			// 16MB
+			// 24MB
 			$messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_MEDMEMORYWARN'),
 					'description' => Text::_('COM_INSTALLER_MSG_WARNINGS_MEDMEMORYDESC'));
 		}
@@ -160,13 +158,13 @@ public function getItems()
 					'description' => Text::_('COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOSTDESC'));
 		}
 
-		if ($post_max_size < (8 * 1024 * 1024)) // 8MB
+		if ($post_max_size < $minMemory)
 		{
 			$messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZE'),
 					'description' => Text::_('COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZEDESC'));
 		}
 
-		if ($upload_max_filesize < (8 * 1024 * 1024)) // 8MB
+		if ($upload_max_filesize < $minMemory)
 		{
 			$messages[] = array('message' => Text::_('COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE'),
 					'description' => Text::_('COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZEDESC'));

administrator/components/com_joomlaupdate/src/Controller/DisplayController.php

@@ -45,6 +45,12 @@ public function display($cachable = false, $urlparams = false)
 		// Get and render the view.
 		if ($view = $this->getView($vName, $vFormat))
 		{
+			// Only super user can access file upload
+			if ($view == 'upload' && !$this->app->getIdentity()->authorise('core.admin', 'com_joomlaupdate'))
+			{
+				$this->app->redirect(Route::_('index.php?option=com_joomlaupdate', true));
+			}
+
 			// Get the model for the view.
 			/** @var \Joomla\Component\Joomlaupdate\Administrator\Model\UpdateModel $model */
 			$model = $this->getModel('Update');

administrator/components/com_joomlaupdate/src/Model/UpdateModel.php

@@ -172,6 +172,69 @@ public function refreshUpdates($force = false)
 		}
 	}
 
+	/**
+	 * Makes sure that the Joomla! Update Component Update is in the database and check if there is a new version.
+	 *
+	 * @return  boolean  True if there is an update else false
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getCheckForSelfUpdate()
+	{
+		$db = $this->getDbo();
+
+		$query = $db->getQuery(true)
+			->select($db->quoteName('extension_id'))
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('element') . ' = ' . $db->quote('com_joomlaupdate'));
+		$db->setQuery($query);
+
+		try
+		{
+			// Get the component extension ID
+			$joomlaUpdateComponentId = $db->loadResult();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Something is wrong here!
+			$joomlaUpdateComponentId = 0;
+			Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+		}
+
+		// Try the update only if we have an extension id
+		if ($joomlaUpdateComponentId != 0)
+		{
+			// Always force to check for an update!
+			$cache_timeout = 0;
+
+			$updater = Updater::getInstance();
+			$updater->findUpdates($joomlaUpdateComponentId, $cache_timeout, Updater::STABILITY_STABLE);
+
+			// Fetch the update information from the database.
+			$query = $db->getQuery(true)
+				->select('*')
+				->from($db->quoteName('#__updates'))
+				->where($db->quoteName('extension_id') . ' = :id')
+				->bind(':id', $joomlaUpdateComponentId, ParameterType::INTEGER);
+			$db->setQuery($query);
+
+			try
+			{
+				$joomlaUpdateComponentObject = $db->loadObject();
+			}
+			catch (\RuntimeException $e)
+			{
+				// Something is wrong here!
+				$joomlaUpdateComponentObject = null;
+				Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+			}
+
+			return !empty($joomlaUpdateComponentObject);
+		}
+
+		return false;
+	}
+
 	/**
 	 * Returns an array with the Joomla! update information.
 	 *
@@ -1354,7 +1417,7 @@ public function getNonCoreExtensions()
 	 *
 	 * @since   3.10.0
 	 */
-	public function getNonCorePlugins($folderFilter = array())
+	public function getNonCorePlugins($folderFilter = ['system','user','authentication','actionlog','twofactorauth'])
 	{
 		$db    = $this->getDbo();
 		$query = $db->getQuery(true);