Index: branches/RC/admin/backup/restore2.php
===================================================================
diff -u -r8929 -r9398
--- branches/RC/admin/backup/restore2.php	(.../restore2.php)	(revision 8929)
+++ branches/RC/admin/backup/restore2.php	(.../restore2.php)	(revision 9398)
@@ -1,4 +1,4 @@
-<?php   
+<?php
 
 // new startup: begin
 define('REL_PATH', 'admin/backup');
@@ -9,28 +9,28 @@
 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");
 //Set Section
 
 $section = "in-portal:restore";
 //Set Environment Variable
-$envar = "env=" . BuildEnv();   
+$envar = "env=" . BuildEnv();
 $sec = $objSections->GetSection($section);
 $objCatToolBar = new clsToolBar();
-$formaction = $rootURL."admin/backup/restore3.php?".$envar;
+$formaction = $rootURL.$admin."/backup/restore3.php?".$envar;
 $formaction = "restore3.php?".$envar;
-$restoreexit = $rootURL."admin/backup/restore4.php?".$envar;
+$restoreexit = $rootURL.$admin."/backup/restore4.php?".$envar;
 $conn = &GetADODBConnection();
 
 
 $totalfiles =   $objSession->GetVariable("restore_files_num");
 $filepath = $objConfig->Get("Backup_Path");
 
 if (true)
-{	
+{
    if($en_prev>-1)
   {
     $MouseOver="swap('moveleft','toolbar/tool_prev_f2.gif');";
@@ -45,29 +45,29 @@
     $MouseOver="swap('moveleft','toolbar/tool_prev_f2.gif');";
     $MouseOut="swap('moveleft', 'toolbar/tool_prev.gif');";
     $var="?env=".BuildEnv();
-    $link=$rootURL."admin/backup/restore1.php".$var;
-    
+    $link=$rootURL.$admin."/backup/restore1.php".$var;
+
     $objCatToolBar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Step"),$link,$MouseOver,$MouseOut,"","tool_prev.gif");
-  }  
-  
+  }
+
   	$MouseOver="if (document.restore2.backupdate.value) swap('moveright','toolbar/tool_next_f2.gif');";
-    $MouseOut="if (document.restore2.backupdate.value) swap('moveright', 'toolbar/tool_next.gif');";  
+    $MouseOut="if (document.restore2.backupdate.value) swap('moveright', 'toolbar/tool_next.gif');";
     $var="?env=".BuildEnv();
 
     $onClick="restore_submit('restore2','$formaction');";
     $link="#";
     $objCatToolBar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Step"),$link,$MouseOver,$MouseOut,$onClick,"tool_next_f3.gif");
 
 }
-//$link2=$rootURL."admin/backup/restore3.php".$var;
+//$link2=$rootURL.$admin."/backup/restore3.php".$var;
 //$onClick="document.location= '$link2';";
 //$onClick="restore_submit('restore2','$formaction');";
 //$MouseOver="swap('img_edit','toolbar/tool_edit_f2.gif');";
 //$MouseOut="swap('img_edit', 'toolbar/tool_edit.gif');";
 //$objCatToolBar->Add("img_edit","la_ToolTip_Restore","#", $MouseOver,$MouseOut,$onClick,
 //                    "tool_edit.gif");
 
-$link3=$rootURL."admin/backup/restore2.php".$var;
+$link3=$rootURL.$admin."/backup/restore2.php".$var;
 
 
 $objCatToolBar->Add("img_del","la_ToolTip_Delete","#", "swap('img_del','toolbar/tool_delete_f2.gif');",
@@ -79,30 +79,30 @@
 
 //phpinfo(INFO_VARIABLES);
 
-function getDirList ($dirName) 
-{  
+function getDirList ($dirName)
+{
     global $objSession;
     $filedates = array();
-    $d = dir($dirName); 
+    $d = dir($dirName);
 
-    while($entry = $d->read()) 
-    { 
-        if ($entry != "." && $entry != "..") 
-        { 
-            if (!is_dir($dirName."/".$entry) && eregi("dump",$entry)) 
-            { 
-                $shortversion=chopchop($entry);     
+    while($entry = $d->read())
+    {
+        if ($entry != "." && $entry != "..")
+        {
+            if (!is_dir($dirName."/".$entry) && eregi("dump",$entry))
+            {
+                $shortversion=chopchop($entry);
                 $filedate[]=$shortversion;
 
-            } 
-        }  
-    } 
-    $d->close(); 
+            }
+        }
+    }
+    $d->close();
     rsort($filedate);
 
     return $filedate;
 
-} 
+}
 function chopchop ($filename)
 {
 	 $p = pathinfo($filename);
@@ -137,8 +137,8 @@
 
           echo "<TD valign=\"top\"><span class=\"text\"><input type=radio NAME=\"backupdate\" onclick=\"$onClick\" VALUE=\"".$value."\" >";
           echo adodb_date("F j, Y, g:i a",$value)."</TD>";
-        }   
-        
+        }
+
 ?>
     <input TYPE="hidden" NAME="Action" VALUE="">
 </FORM>