Updated install process to use separate file with version information in order to re-use that information in automated packaging systems. Also fixed condition on is_already_installed_portal() which was checking the contrary - refs #4796

main/install/index.php

@@ -119,15 +119,11 @@ if (!empty($_POST['old_version'])) {
 	$my_old_version = $dokeos_version;
 }
 
-$new_version 		= '1.9.0';
-$new_version_stable = false;
-$new_version_major 	= true;
-$software_name 		= 'Chamilo';
-$software_url 		= 'http://www.chamilo.org/';
+require_once __DIR__.'/version.php';
 
 // A protection measure for already installed systems.
 
-if (!is_already_installed_system()) {
+if (is_already_installed_system()) {
 	// The system has already been installed, so block re-installation.
 	$global_error_code = 6;
 	require '../inc/global_error_message.inc.php';
@@ -848,4 +844,4 @@ if (@$_POST['step2']) {
 </div><!-- wrapper end-->
 <footer></footer>
 </body>
-</html>
+</html>

main/install/install.lib.php

@@ -2024,4 +2024,4 @@ function locking_settings() {
         $sql = "UPDATE $table SET access_url_locked = 1 WHERE variable  = '$setting'";
         Database::query($sql);
     }
-}
+}

main/install/version.php

@@ -0,0 +1,20 @@
+<?php
+/* For licensing terms, see /license.txt */
+/**
+ * This script lists the necessary variables that allow the installation
+ * system to know in which version is the current Chamilo install. This 
+ * script should be overwritten with each upgrade of Chamilo. It is not
+ * required from any other process of Chamilo than the installation or upgrade.
+ * It also helps for automatic packaging of unstable versions
+ * @package chamilo.install
+ */
+/**
+ * Variables used from the main/install/index.php
+ */
+$new_version 		= '1.9.0';
+$new_version_status	= 'alpha';
+$new_version_last_id	= 7;
+$new_version_stable 	= false;
+$new_version_major 	= true;
+$software_name 		= 'Chamilo';
+$software_url 		= 'http://www.chamilo.org/';