merge

main/inc/lib/usermanager.lib.php

@@ -266,11 +266,14 @@ class UserManager
 				$url_id = api_get_current_access_url_id();
 			}
 			UrlManager::delete_url_rel_user($user_id, $url_id);
+		} else {
+			//we delete the user from the default url 
+			UrlManager::delete_url_rel_user($user_id, 1);
 		}
 
 		if (api_get_setting('allow_social_tool')=='true' ) {
 			require_once api_get_path(LIBRARY_PATH).'social.lib.php';
-			//Delete user from groups
+			//@todo Delete user from groups
 
 			//Delete from user friend lists
 			SocialManager::remove_user_rel_user($user_id,true);

main/install/install.lib.php

@@ -40,18 +40,23 @@ function is_already_installed_system() {
 	global $new_version;
 
 	if (empty($new_version)) {
-		return true;
+		return true; // Must be initialized.
+	}
+
+	if (is_array($_POST) && count($_POST) > 0) {
+		return false; // Running installation.
 	}
 
 	$current_config_file = str_replace('\\', '/', realpath('../inc/conf/configuration.php'));
 	if (!file_exists($current_config_file)) {
-		return false;
+		return false; // Configuration file does not exist, install the system.
 	}
 	require $current_config_file;
 
-	 // Careful, if/when the name 'dokeos_version' is changed. Check this then.
+	// Careful, if/when the name 'dokeos_version' is changed. Check this then.
 	$current_version = $_configuration['dokeos_version'];
 
+	// If the current version is old, upgrading is assumed as intended.
 	return empty($current_version) ? false : ($new_version == $current_version);
 }