Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

Author: Till Brehm

install/lib/installer_base.lib.php

@@ -59,7 +59,7 @@ public function warning($msg) {
 	}
 
 	public function simple_query($query, $answers, $default, $name = '') {
-		global $autoinstall;
+		global $autoinstall, $autoupdate;
 		$finished = false;
 		do {
 			if($name != '' && $autoinstall[$name] != '') {
@@ -104,7 +104,7 @@ public function simple_query($query, $answers, $default, $name = '') {
 	}
 
 	public function free_query($query, $default, $name = '') {
-		global $autoinstall;
+		global $autoinstall, $autoupdate;
 		if($name != '' && $autoinstall[$name] != '') {
 			if($autoinstall[$name] == 'default') {
 				$input = $default;

interface/lib/classes/aps_crawler.inc.php

@@ -261,10 +261,13 @@ public function startCrawler()
 			// Get all known apps from the database and the highest known version
 			// Note: A dirty hack is used for numerical sorting of the VARCHAR field Version: +0 -> cast
 			// A longer but typesafe way would be: ORDER BY CAST(REPLACE(Version, '.', '') AS UNSIGNED) DESC
-			$existing_apps = $app->db->queryAllRecords("SELECT * FROM (
-                SELECT name AS Name, CONCAT(version, '-', CAST(`release` AS CHAR)) AS CurrentVersion
-                FROM aps_packages ORDER BY REPLACE(version, '.', '')+0 DESC, `release` DESC
-                ) as Versions GROUP BY name");
+			$existing_apps = array();
+			$tmpres = $app->db->query("SELECT name as `Name`, CONCAT(version, '-', CAST(`release` AS CHAR)) AS CurrentVersion FROM aps_packages ORDER BY INET_ATON(SUBSTRING_INDEX(CONCAT(version,'.0.0.0'),'.',4)) DESC, `release` DESC");
+			while($tmp = $tmpres->get()) {
+				if(!array_key_exists($tmp['Name'], $existing_apps)) $existing_apps[$tmp['Name']] = $tmp;
+			}
+			$tmpres->free();
+			unset($tmp);
 			//var_dump($existing_apps);
 
 			// Used for statistics later
@@ -492,6 +495,23 @@ public function startCrawler()
 			$app->log($this->log_prefix.'Processed '.$apps_in_repo.
 				' apps from the repo. Downloaded '.$apps_updated.
 				' updates, '.$apps_downloaded.' new apps');
+			
+			$prevapp = '';
+			$res = $app->db->query("SELECT `id`, `name`, `version`, `release`, `package_status` FROM `aps_packages` WHERE 1 ORDER BY `name` ASC, INET_ATON(SUBSTRING_INDEX(CONCAT(version,'.0.0.0'),'.',4)) DESC, `release` DESC");
+			while($curapp = $res->get()) {
+				if($curapp['name'] != $prevapp) {
+					$prevapp = $curapp['name'];
+					continue;
+				}
+				if($curapp['package_status'] != PACKAGE_OUTDATED) {
+					$app->log($this->log_prefix.'Tagging ' . $curapp['name'] . ' ' . $curapp['version'] . '-' . $curapp['release'] . ' as outdated.');
+					$app->db->query("UPDATE `aps_packages` SET `package_status` = ? WHERE `id` = ?", PACKAGE_OUTDATED, $curapp['id']);
+					$app->db->datalogUpdate('aps_packages', array("package_status" => PACKAGE_OUTDATED), 'id', $curapp['id']);
+				}
+			}
+			$res->free();
+			unset($curapp);
+			unset($prevapp);
 		}
 
 		catch(Exception $e)

interface/lib/classes/aps_guicontroller.inc.php

@@ -166,7 +166,7 @@ public function getNewestPackageID($id)
             FROM aps_packages
             WHERE name = (SELECT name FROM aps_packages WHERE id = ?)
             AND package_status = 2
-            ORDER BY REPLACE(version, '.', '')+0 DESC, `release` DESC", $id);
+            ORDER BY INET_ATON(SUBSTRING_INDEX(CONCAT(version,'.0.0.0'),'.',4)) DESC, `release` DESC", $id);
 
 		if(!empty($result) && ($id != $result['id'])) return $result['id'];
 

server/lib/classes/aps_installer.inc.php

@@ -306,7 +306,7 @@ private function prepareDatabase($task, $sxe)
 		$db_id = parent::getXPathValue($sxe, '//db:id');
 		if(empty($db_id)) return; // No database needed
 
-		$mysqlver_res = $app->db->queryOneRecord('SELECT VERSION() as ver;');
+		$mysqlver_res = $app->db->queryOneRecord('SELECT VERSION() as ver');
 		$mysqlver = $mysqlver_res['ver'];
 
 		$tmp = $app->db->queryOneRecord("SELECT value FROM aps_instances_settings WHERE name = 'main_database_password' AND instance_id = ?", $task['instance_id']);