Index: branches/RC/admin/backup/backup1.php
===================================================================
diff -u -r8929 -r9398
--- branches/RC/admin/backup/backup1.php	(.../backup1.php)	(revision 8929)
+++ branches/RC/admin/backup/backup1.php	(.../backup1.php)	(revision 9398)
@@ -9,10 +9,10 @@
 checkViewPermission('in-portal:backup');
 
 $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:backup";
 //Set Environment Variable
@@ -30,15 +30,15 @@
     $objConfig->Set("Backup_Path",$newpath);
     $objConfig->Save();
 }
-   
+
 //initializes default
 $objSession->SetVariable("backup_start",0);
 $objSession->SetVariable("backup_tnumber","start");
 
 $date = adodb_mktime();
 
 $filepath=$objConfig->Get("Backup_Path");
-$filename="dump".$date.".txt";         
+$filename="dump".$date.".txt";
 //$filename= $filepath."".$filename;
 $limit = 100;
 $success =0;
@@ -67,7 +67,7 @@
 
 if (true)
 {
-	
+
    if($en_prev>-1)
   {
     $MouseOver="swap('moveleft','toolbar/tool_prev_f2.gif');";
@@ -85,16 +85,16 @@
     $link = "#";
     $objCatToolBar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Step"),"#","","","","tool_prev_f3.gif");
 
-  }  
+  }
   if(true)
   {
     $MouseOver="swap('moveright','toolbar/tool_next_f2.gif');";
     $MouseOut="swap('moveright', 'toolbar/tool_next.gif');";
     $var="?env=".BuildEnv()."&en=$en_next";
     $script_name = $ro_perm ? 'backup1' : 'backup2';
-    $link2 = $rootURL."admin/backup/".$script_name.".php".$var;
+    $link2 = $rootURL.$admin."/backup/".$script_name.".php".$var;
     $onClick="document.location= '$link2';";
-   
+
     $link="#";
     if ($writable) {
     	$objCatToolBar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Step"),$link,$MouseOver,$MouseOut,$onClick,"tool_next.gif");
@@ -103,30 +103,30 @@
     	$objCatToolBar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Step"),"#","","","","tool_next_f3.gif");
     }
   }
-  
+
   $title = admin_language("la_performing_backup")." - ".admin_language("la_Step")." 1";
 
   int_header($objCatToolBar,NULL,$title);
 }
 ?>
-         
+
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-<form name="backup1" METHOD="POST" action="<?php echo $_SERVER["PHP_SELF"]."?".$envar; ?>">	
+<form name="backup1" METHOD="POST" action="<?php echo $_SERVER["PHP_SELF"]."?".$envar; ?>">
 <?php int_subsection_title(admin_language("la_Prompt_Step_One"));  ?>
- <TR <?php echo int_table_color(); ?>> 
+ <TR <?php echo int_table_color(); ?>>
        <TD COLSPAN="2">
-       <span class=\"text\"><?php echo prompt_language("la_Text_Backup_Info");?></span> 
+       <span class=\"text\"><?php echo prompt_language("la_Text_Backup_Info");?></span>
 
        </TD>
    </TR>
-   <TR <?php echo int_table_color(); ?>> 
+   <TR <?php echo int_table_color(); ?>>
       <td width=\"60%\" valign=\"top\"><span class=\"text\"><?php echo prompt_language("la_prompt_Backup_Path"); ?></span>
-       <?php  
+       <?php
           if(!$writable)
             echo "<br /><span class=\"error\">".prompt_language("la_Text_backup_access")."</SPAN>";
-       ?>            
+       ?>
       </td>
-       <TD> 
+       <TD>
  	  		<INPUT type="text" name="backup_path" class="text" size="50" value='<?php echo $objConfig->Get("Backup_Path"); ?>'><input TYPE="hidden" NAME="Action" VALUE="update">  <input type="submit" name="submit" value="Update" class="button">
  	  </TD>
    </TR>