Index: trunk/admin/install.php
===================================================================
diff -u -r26 -r31
--- trunk/admin/install.php	(.../install.php)	(revision 26)
+++ trunk/admin/install.php	(.../install.php)	(revision 31)
@@ -3,8 +3,6 @@
 
 //$new_version = '1.0.2';
 
-//echo '<pre>'.print_r($_REQUEST, true).'</pre>';
-
 define("GET_LICENSE_URL", "http://www.in-portal.net/licensing/license.php");
 define('BACKUP_NAME', 'dump(.*).txt'); // how backup dump files are named
 $general_error = '';
@@ -16,8 +14,6 @@
 	$install_type = $_GET['install_type'];
 }
 
-$force_finish = isset($_REQUEST['ff']) ? true : false;
-
 $pathtoroot = "";
 if(!strlen($pathtoroot))
 {
@@ -425,9 +421,9 @@
 	        		$sql = "SELECT count(*) AS count FROM ".$g_TablePrefix."Modules WHERE Name = '".$rs->fields['Name']."' AND Version = '$file'";
 	        		$rs1 = $ado->Execute($sql);
 	        		
-	        		if ($rs1->fields['count'] == 0) {
-//	        			$sql = "SELECT Version FROM ".$g_TablePrefix."Modules WHERE Name = '".$p."'";
-//	        			$rs2 = $ado->Execute($sql);
+	        		if ($rs1->fields['count'] == 0 && str_replace('.', '', $file) > str_replace('.', '', $rs->fields['Version'])) {
+	        			//$sql = "SELECT Version FROM ".$g_TablePrefix."Modules WHERE Name = '".$p."'";
+	        			//$rs2 = $ado->Execute($sql);
 						$Texts[] = $rs->fields['Name']." (".$rs->fields['Version']." ".prompt_language("la_to")." ".$file.")";
 	        			$Modules[] = $rs->fields['Name'];
 	        		}
@@ -441,13 +437,18 @@
 }
 
 if ($state == "upgrade_process") {
-	
+    $ado = inst_GetADODBConnection();	
 	$mod_arr = $_POST['modules'];
 		
     foreach($mod_arr as $p)
     {
         $mod_name = strtolower($p);
         
+		$sql = "SELECT Version FROM ".$g_TablePrefix."Modules WHERE Name = '$p'";
+		$rs = $ado->Execute($sql);	
+
+		$current_version = $rs->fields['Version'];
+        
     	if ($mod_name == 'in-portal') {
     		$mod_name = '';
     	}
@@ -481,32 +482,26 @@
     		for ($j = 0; $j < $version_nrs[1] + 1; $j++) {
     			for ($k = 0; $k < $version_nrs[2] + 1; $k++) {
     				$try_version = "$i.$j.$k";
-    				
-			    	$filename = $pathtoroot.$mod_name."/admin/install/upgrades/inportal_upgrade_v$try_version.sql";
-			        
-			        if(file_exists($filename))
-			       	{
-			    		RunSQLFile($ado, $filename);
-				      	set_ini_value("Module Versions", $p, $try_version);
-				      	save_values();
+			    	
+			    	if (str_replace('.', '', $try_version) > str_replace('.', '', $current_version)) {
+    					$filename = $pathtoroot.$mod_name."/admin/install/upgrades/inportal_upgrade_v$try_version.sql";
+			        	echo "Trying Version: $try_version<br>";
+			        	if(file_exists($filename))
+			       		{
+			    			RunSQLFile($ado, $filename);
+				      		set_ini_value("Module Versions", $p, $try_version);
+				      		save_values();
+			    		}
 			    	}
     			}
     		}
     	}
     }
 	
-	$state = 'languagepack_upgrade';
+	$state = "finish";
+	$include_file = "install/install_finish.php";
 }
 
-
-// upgrade language pack
-if($state=='languagepack_upgrade')
-{
-	$state = 'lang_install_init';
-	$_POST['lang'][] = 'english.lang';
-	$force_finish = true;
-}
-
 if($state=="db_reconfig_save")
 {
     $ini_vars = parse_ini_file($ini_file,TRUE);
@@ -1260,7 +1255,7 @@
   
   if($Status==0)
   { 
-    	$Offset = $objLanguages->ReadImportTable($PhraseTable, 1,"0,1,2", $force_finish ? false : true, 200,$Offset);
+    	$Offset = $objLanguages->ReadImportTable($PhraseTable, 1,"0,1,2",TRUE,200,$Offset);
   		if($Offset>=$Total)
   		{    	
     		$Offset=0;
@@ -1274,9 +1269,7 @@
     		$next_step = $_GET['next_step'];
     	}
     	
-		if($force_finish == true) $next_step = 3;
 		$NextUrl = $_SERVER['PHP_SELF']."?Offset=$Offset&Status=$Status&state=lang_install&next_step=$next_step&install_type=$install_type";
-		if($force_finish == true) $NextUrl .= '&ff=1';
 		$include_file = "install/lang_run.php";
   }
   else 
@@ -1285,7 +1278,7 @@
   	    $objMessageList = new clsEmailMessageList();
   	    
   	    
-  	  $Offset = $objMessageList->ReadImportTable($EventTable, $force_finish ? false : true,100,$Offset);
+  	  $Offset = $objMessageList->ReadImportTable($EventTable,TRUE,100,$Offset);
   	  
   	  if($Offset>$Total)
   	  {
@@ -1294,31 +1287,15 @@
     	}
     	else if ($_GET['next_step']) {
     		$next_step = $_GET['next_step'];
-    	}
-    	if($force_finish == true) $next_step = 3;
+    	}  	  	
   	  	$NextUrl = $_SERVER['PHP_SELF']."?Offset=$Offset&Status=$Status&State=lang_install&next_step=$next_step&install_type=$install_type";
-  	  	if($force_finish == true) $NextUrl .= '&ff=1';
   	  	$include_file = "install/lang_run.php";
   	  }
   	  else
-  	  {
-  	    if( !$force_finish )
-  	    {
-  	    	$state = 'lang_default';
-  	    }
-  	    else
-  		{
-  	    	$_POST['next_step'] = 4;
-  	    	$state = 'finish';
-			$include_file = "install/install_finish.php";
-  		}
-  	  }
+  	    $state="lang_default";
   }
 }
 
-
-
-
 if($state=="lang_default_set")
 {
 //	phpinfo(INFO_VARIABLES);
@@ -1812,8 +1789,7 @@
 							<ol class="install">
 					    		<li <?php if ($tmp_step == 1 || $login_error != '' || $inst_error != '') { ?>class="current"<?php } ?>>License Verification
 					    		<li <?php if ($tmp_step == 2 && $login_error == '' && $inst_error == '') { ?>class="current"<?php } ?>>Select Modules to Upgrade
-					    		<li <?php if ($tmp_step == 3) { ?>class="current"<?php } ?>>Language Pack Upgrade
-					    		<li <?php if ($tmp_step == 4) { ?>class="current"<?php } ?>>Finish
+					    		<li <?php if ($tmp_step == 3) { ?>class="current"<?php } ?>>Finish
 					    	</ol>				    				    
 					    <?php } ?>						    			    
 						<?php include($include_file); ?>