Index: branches/RC/admin/backup/backup2.php
===================================================================
diff -u -r8929 -r9398
--- branches/RC/admin/backup/backup2.php	(.../backup2.php)	(revision 8929)
+++ branches/RC/admin/backup/backup2.php	(.../backup2.php)	(revision 9398)
@@ -9,19 +9,19 @@
 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");
 
 
 global $tables;
 unset($tables);
 
 //$m = GetModuleArray();
 //foreach($m as $key => $value)
-//{	
-//    $mod = $pathtoroot . $value . "admin/include/backup.php";		
+//{
+//    $mod = $pathtoroot . $value . "admin/include/backup.php";
 //    require_once($mod);
 //}
 
@@ -44,7 +44,7 @@
 //if(strlen($prefix))
 //{
   for($x=0;$x<count($tables);$x++)
-  {  
+  {
   	if(substr($tables[$x],0,strlen($prefix))==$prefix)
   	{
   	  	if (!strstr($tables[$x], 'ses_')) {
@@ -63,9 +63,9 @@
 
 $filename = $filepath."/".$filename;
 $PageTitle = admin_language("la_text_Backup_in_progress");
-$CancelURL =   $rootURL ."admin/backup/backup1.php?".$envar ;
+$CancelURL =   $rootURL .$admin."/backup/backup1.php?".$envar ;
 
-if ($success==1) 
+if ($success==1)
 {
     finish();
 }
@@ -85,15 +85,15 @@
 {
 	for($x=0;$x<count($TableNames);$x++) {
 		if (!strstr($TableNames[$x], 'ses_')) {
-			$out[] = GetTableCreate($conn,$TableNames[$x]);	
+			$out[] = GetTableCreate($conn,$TableNames[$x]);
 		}
 	}
 }
 
 if (!strstr($CurrentTable, 'ses_')) {
 	$RowCount = insert_data($CurrentTable,$SqlStart,50,"");
 }
-	
+
 $fp = fopen($filename,"a");
 
 if (filesize($filename) == 0) {
@@ -114,7 +114,7 @@
 	fwrite($fp,"\n");
 	fclose($fp);
 }
-else 
+else
 {
   echo "Error opening $filename <br>\n";
   exit();
@@ -140,27 +140,27 @@
 
 echo "</BODY></HTML>\n";
 
-//extracts the rows of data from tables using limits 
+//extracts the rows of data from tables using limits
 function insert_data($table, $start, $limit, $mywhere)
 {
 	global $out;
-	
+
     $conn = &GetADODBConnection();
 
     if ($mywhere !="")
     {
         $whereclause= " WHERE ".$mywhere." ";
     }
-    else 
+    else
     {
         $whereclause = "";
     }
-    
+
     $rs = $conn->Execute("SELECT * from $table $whereclause LIMIT $start, $limit");
 	$prefix = GetTablePrefix();
     $rowcount = 0;
 	while($rs && !$rs->EOF)
-	{  
+	{
         $temp=$conn->GetInsertSQL($rs,$rs->fields);
 		$temp=ereg_replace("\n","\\n", $temp);
 		$temp=ereg_replace("\r","\\r", $temp);
@@ -172,7 +172,7 @@
 		$rs->MoveNext();
 		$rowcount++;
     }
-     
+
     return $rowcount;
 }
 
@@ -182,7 +182,7 @@
 	$schema_create .="# --------------------------------------------------------".$crlf;
     $conn->Execute("SET SQL_QUOTE_SHOW_CREATE = 0");
     $result = $conn->Execute("SHOW CREATE TABLE $table");
-    if($result && !$result->EOF) 
+    if($result && !$result->EOF)
     {
         $tmpres        = $result->fields; // mysql_fetch_array($result);
         $pos           = strpos($tmpres["Create Table"], ' (');
@@ -221,11 +221,11 @@
 	if(strlen($schema_create))
 	{
 		$schema_create = str_replace("DROP TABLE IF EXISTS ".GetTablePrefix(),"DROP TABLE ",$schema_create);
-		$schema_create = str_replace("CREATE TABLE ".GetTablePrefix(),"CREATE TABLE ",$schema_create);	
+		$schema_create = str_replace("CREATE TABLE ".GetTablePrefix(),"CREATE TABLE ",$schema_create);
 		while(strlen($schema_create && substr($schema_create,-1)!=")"))
 		{
 			$schema_create = substr($schema_create,0,-1);
-		}	
+		}
 	}
 	$schema_create .= "\n# --------------------------------------------------------\n";
     return $schema_create;
@@ -234,20 +234,20 @@
 function stats($caption,$myprogress,$totalnum)
 {
     global $rootURL, $CancelURL,$PageTitle;
-    
+
     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>";