_ >   14 14         $install_type = $_GET['install_type'];
  15 15 }
  16 16
< >     17 $force_finish = isset($_REQUEST['ff']) ? true : false;
    18
17 19 $pathtoroot = "";
  18 20 if(!strlen($pathtoroot))
  19 21 {
 
530 532                         }
  531 533                 }
  532 534         }
< >   533       }
534 535         
< >   535           $state = "finish";
  536           $include_file = "install/install_finish.php";
    536         $state = 'languagepack_upgrade';
    537     }
    538 }       
    539
    540 // upgrade language pack
    541 if($state=='languagepack_upgrade')
    542 {
    543         $state = 'lang_install_init';
    544         $_POST['lang'][] = 'english.lang';
    545         $force_finish = true;
537 546 }
  538 547
  539 548 if($state=="db_reconfig_save")
 
1289 1298  
  1290 1299   if($Status==0)
  1291 1300   {
< >   1292           $Offset = $objLanguages->ReadImportTable($PhraseTable, 1,"0,1,2",TRUE,200,$Offset);
    1301         $Offset = $objLanguages->ReadImportTable($PhraseTable, 1,"0,1,2", $force_finish ? false : true, 200,$Offset);
1293 1302                 if($Offset>=$Total)
  1294 1303                 {       
  1295 1304                 $Offset=0;
 
1303 1312                 $next_step = $_GET['next_step'];
  1304 1313         }
  1305 1314         
< >     1315                 if($force_finish == true) $next_step = 3;
1306 1316                 $NextUrl = $_SERVER['PHP_SELF']."?Offset=$Offset&Status=$Status&state=lang_install&next_step=$next_step&install_type=$install_type";
< >     1317                 if($force_finish == true) $NextUrl .= '&ff=1';
1307 1318                 $include_file = "install/lang_run.php";
  1308 1319   }
  1309 1320   else
 
1312 1323             $objMessageList = new clsEmailMessageList();
  1313 1324            
  1314 1325            
< >   1315             $Offset = $objMessageList->ReadImportTable($EventTable,TRUE,100,$Offset);
    1326           $Offset = $objMessageList->ReadImportTable($EventTable, $force_finish ? false : true,100,$Offset);
1316 1327          
  1317 1328           if($Offset>$Total)
  1318 1329           {
 
1322 1333         else if ($_GET['next_step']) {
  1323 1334                 $next_step = $_GET['next_step'];
  1324 1335         }               
< >     1336         if($force_finish == true) $next_step = 3;
1325 1337                 $NextUrl = $_SERVER['PHP_SELF']."?Offset=$Offset&Status=$Status&State=lang_install&next_step=$next_step&install_type=$install_type";
< >     1338                 if($force_finish == true) $NextUrl .= '&ff=1';
1326 1339                 $include_file = "install/lang_run.php";
  1327 1340           }
  1328 1341           else
< >   1329               $state="lang_default";
    1342           {
    1343             if( !$force_finish )
    1344             {
    1345                 $state = 'lang_default';
    1346             }
    1347             else
    1348                 {
    1349                 $_POST['next_step'] = 4;
    1350                 $state = 'finish';
    1351                         $include_file = "install/install_finish.php";
    1352                 }
    1353           }
1330 1354   }
  1331 1355 }
  1332 1356
< >     1357
    1358
    1359
1333 1360 if($state=="lang_default_set")
  1334 1361 {
  1335 1362 //      phpinfo(INFO_VARIABLES);
 
1823 1850                                                         <ol class="install">
  1824 1851                                                         <li <?php if ($tmp_step == 1 || $login_error != '' || $inst_error != '') { ?>class="current"<?php } ?>>License Verification
  1825 1852                                                         <li <?php if ($tmp_step == 2 && $login_error == '' && $inst_error == '') { ?>class="current"<?php } ?>>Select Modules to Upgrade
< >   1826                                                           <li <?php if ($tmp_step == 3) { ?>class="current"<?php } ?>>Finish
    1853                                                         <li <?php if ($tmp_step == 3) { ?>class="current"<?php } ?>>Language Pack Upgrade
    1854                                                         <li <?php if ($tmp_step == 4) { ?>class="current"<?php } ?>>Finish
< _   1827 1855                                                 </ol>                                                              
  1828 1856                                             <?php } ?>                                                                     
  1829 1857                                                 <?php include($include_file); ?>