Index: trunk/admin/install.php
===================================================================
diff -u -r24 -r26
--- trunk/admin/install.php	(.../install.php)	(revision 24)
+++ trunk/admin/install.php	(.../install.php)	(revision 26)
@@ -3,6 +3,8 @@
 
 //$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 = '';
@@ -14,6 +16,8 @@
 	$install_type = $_GET['install_type'];
 }
 
+$force_finish = isset($_REQUEST['ff']) ? true : false;
+
 $pathtoroot = "";
 if(!strlen($pathtoroot))
 {
@@ -491,16 +495,18 @@
     	}
     }
 	
-	// upgrade language pack if some module upgrade options selected
-	if( isset($mod_arr) && is_array($mod_arr) )
-	{
-		
-	}
-	
-	$state = "finish";
-	$include_file = "install/install_finish.php";
+	$state = 'languagepack_upgrade';
 }
 
+
+// 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);
@@ -1254,7 +1260,7 @@
   
   if($Status==0)
   { 
-    	$Offset = $objLanguages->ReadImportTable($PhraseTable, 1,"0,1,2",TRUE,200,$Offset);
+    	$Offset = $objLanguages->ReadImportTable($PhraseTable, 1,"0,1,2", $force_finish ? false : true, 200,$Offset);
   		if($Offset>=$Total)
   		{    	
     		$Offset=0;
@@ -1268,7 +1274,9 @@
     		$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 
@@ -1277,7 +1285,7 @@
   	    $objMessageList = new clsEmailMessageList();
   	    
   	    
-  	  $Offset = $objMessageList->ReadImportTable($EventTable,TRUE,100,$Offset);
+  	  $Offset = $objMessageList->ReadImportTable($EventTable, $force_finish ? false : true,100,$Offset);
   	  
   	  if($Offset>$Total)
   	  {
@@ -1286,15 +1294,31 @@
     	}
     	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
-  	    $state="lang_default";
+  	  {
+  	    if( !$force_finish )
+  	    {
+  	    	$state = 'lang_default';
+  	    }
+  	    else
+  		{
+  	    	$_POST['next_step'] = 4;
+  	    	$state = 'finish';
+			$include_file = "install/install_finish.php";
+  		}
+  	  }
   }
 }
 
+
+
+
 if($state=="lang_default_set")
 {
 //	phpinfo(INFO_VARIABLES);
@@ -1788,7 +1812,8 @@
 							<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 } ?>>Finish
+					    		<li <?php if ($tmp_step == 3) { ?>class="current"<?php } ?>>Language Pack Upgrade
+					    		<li <?php if ($tmp_step == 4) { ?>class="current"<?php } ?>>Finish
 					    	</ol>				    				    
 					    <?php } ?>						    			    
 						<?php include($include_file); ?>
Index: trunk/admin/install/lang_run.php
===================================================================
diff -u -r13 -r26
--- trunk/admin/install/lang_run.php	(.../lang_run.php)	(revision 13)
+++ trunk/admin/install/lang_run.php	(.../lang_run.php)	(revision 26)
@@ -2,8 +2,9 @@
 
 function stats($caption,$myprogress,$totalnum)
 {
-    global $rootURL, $CancelURL, $admin;
+    global $rootURL, $CancelURL, $admin, $force_finish;
     
+    $step_num = $force_finish ? 3 : 6;
     if($totalnum>0)
     {
       $pct=round(($myprogress/ $totalnum)*100);
@@ -17,7 +18,7 @@
 			      <!-- toolbar buttons //-->
 			      <table border="0" cellpadding="2" cellspacing="0" class="tableborder_full" width="100%" height="30">
 			      	<tr>
-			      		<td class="tablenav" width="580" nowrap background="images/tabnav_left.jpg"><span class="tablenav_link">&nbsp;Step 6 - '.$caption."-".$pct.'%</span></td>
+			      		<td class="tablenav" width="580" nowrap background="images/tabnav_left.jpg"><span class="tablenav_link">&nbsp;Step '.$step_num.' - '.$caption."-".$pct.'%</span></td>
 			      		<td align="right" class="tablenav" background="images/tabnav_back.jpg" width="100%"><img src="images/blue_bar_help.gif"  border="0" ><br></td>
 			      	</tr>
 			      </table>