Index: branches/RC/admin/backup/restore3.php
===================================================================
diff -u -r8929 -r9398
--- branches/RC/admin/backup/restore3.php	(.../restore3.php)	(revision 8929)
+++ branches/RC/admin/backup/restore3.php	(.../restore3.php)	(revision 9398)
@@ -9,10 +9,10 @@
 checkViewPermission('in-portal:restore');
 
 $pathtolocal = $pathtoroot."kernel/";
-require_once ($pathtoroot."admin/include/elements.php");
+require_once ($pathtoroot.$admin."/include/elements.php");
 require_once ($pathtoroot."kernel/admin/include/navmenu.php");
 require_once ($pathtolocal."admin/include/navmenu.php");
-require_once($pathtoroot."admin/toolbar.php");
+require_once($pathtoroot.$admin."/toolbar.php");
 require_once($pathtoroot.$admin."/install/install_lib.php");
 
 $conn = &GetADODBConnection();
@@ -24,7 +24,7 @@
 	$filename = "dump".$_POST["backupdate"]."txt";
 	$filename = $objConfig->Get("Backup_Path")."/".$filename;
 }
-else 
+else
 	$filename = $_GET["Filename"];
 
 $FileOffset = (int)$_GET["Offset"];
@@ -45,7 +45,7 @@
 $MaxLines = 200;
 
 $PageTitle = admin_language("la_text_Restore_in_progress");
-$CancelURL =   $rootURL ."admin/backup/restore1.php?env=".BuildEnv();
+$CancelURL =   $rootURL .$admin."/backup/restore1.php?env=".BuildEnv();
 
 stats($PageTitle,$FileOffset,$TotalSize);
 //echo "FileOffset: $FileOffset <br>\n";
@@ -58,8 +58,8 @@
   	  $FileOffset = $TotalSize;
     $url = $_SERVER['PHP_SELF']."?env=".BuildEnv()."&Offset=$FileOffset&Filename=$filename";
   }
-  else 
-  {  	
+  else
+  {
   	switch($FileOffset)
   	{
   		case -1:
@@ -74,7 +74,7 @@
   	}
   	$application =& kApplication::Instance();
   	$application->ApplicationDie($error);
-  }  
+  }
 }
 else
   $url = $adminURL."/backup/restore4.php?env=".BuildEnv();
@@ -86,20 +86,20 @@
 function stats($caption,$myprogress,$totalnum)
 {
     global $rootURL, $CancelURL;
-    
+
     if($totalnum>0)
     {
       $pct=round(($myprogress/ $totalnum)*100);
     }
     else
     $pct = 100;
     $o .="<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"4\" class=\"tableborder\">";
-    
-    echo "\n";   
+
+    echo "\n";
     $o .= int_subsection_title_ret($caption."-".$pct."%");
-    $o .= "<TR><TD  align=\"middle\"><br />"; 
+    $o .= "<TR><TD  align=\"middle\"><br />";
     $o .= "  <TABLE CLASS=\"tableborder_full\" width=\"75%\">";
-    $o .="  <TR border=1><TD width=\"".$pct."%\" STYLE=\"background:url('".$rootURL."admin/images/progress_bar_segment.gif');\">&nbsp;</TD>";
+    $o .="  <TR border=1><TD width=\"".$pct."%\" STYLE=\"background:url('".$rootURL.$admin."/images/progress_bar_segment.gif');\">&nbsp;</TD>";
     $comp_pct = 100-$pct;
     $o .= "  <TD bgcolor=#FFFFFF width=\"".$comp_pct."%\"></TD></TR>";
     $o .= "  </TABLE>";