Index: branches/RC/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r10448 -r10721
--- branches/RC/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 10448)
+++ branches/RC/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 10721)
@@ -916,5 +916,59 @@
 			if( getArrayValue($params, 'as_preg') ) $ret = preg_quote($ret, '/');
 			return $ret;
 		}
+		
+		/**
+		 * Returns list of all backup file dates formatted
+		 * in passed block
+		 *
+		 * @param Array $params
+		 * @return string
+		 * @access public
+		 */
+		function PrintBackupDates($params) 
+		{
+	 		$datearray=$this->getDirList($this->Application->ConfigValue('Backup_Path'));
+	 		$ret = '';
+	        foreach($datearray as $key => $value)
+	        {
+	        	$params['backuptimestamp'] = $value;
+	        	$params['backuptime'] = date('F j, Y, g:i a', $value);
+	        	$ret .= $this->Application->ParseBlock($params);
+	        }			
+	        return $ret;
+		}
+		
+		function getDirList ($dirName)
+		{
+		    $filedates = array();
+		    $d = dir($dirName);
+		
+		    while($entry = $d->read())
+		    {
+		        if ($entry != "." && $entry != "..")
+		        {
+		            if (!is_dir($dirName."/".$entry) && eregi("dump",$entry))
+		            {
+		                $filedate[]=$this->chopchop($entry);
+		            }
+		        }
+		    }
+		    $d->close();
+		    rsort($filedate);
+		
+		    return $filedate;
+		
+		}
+		
+		function chopchop ($filename)
+		{
+			 $p = pathinfo($filename);
+			 $ext = '.'.$p["extension"];
+		     $filename;
+		     $filename= ereg_replace("dump","",$filename);
+		     $filename= ereg_replace($ext,"",$filename);
+		     return $filename;
+		}		
+		
 	}
 ?>
\ No newline at end of file
Index: branches/RC/core/units/sections/sections_config.php
===================================================================
diff -u -N -r10718 -r10721
--- branches/RC/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 10718)
+++ branches/RC/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 10721)
@@ -289,16 +289,6 @@
 				'SectionPrefix' => 'adm',
 			),
 
-			'in-portal:restore' => Array (
-				'parent'		=>	'in-portal:tools',
-				'icon'			=>	'in-portal:tool_restore',
-				'label'			=>	'la_tab_Restore',
-				'url'			=>	Array ('index_file' => 'backup/restore1.php', 'pass' => 'm'),
-				'permissions'	=>	Array ('view'),
-				'priority'		=>	3,
-				'type'			=>	stTREE,
-			),
-
 			'in-portal:main_import' => Array (
 				'parent'		=>	'in-portal:tools',
 				'icon'			=>	'in-portal:tool_import',
Index: branches/RC/core/units/admin/admin_config.php
===================================================================
diff -u -N -r10718 -r10721
--- branches/RC/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 10718)
+++ branches/RC/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 10721)
@@ -22,6 +22,7 @@
 													'system_tools'	=>	Array('format' => '!la_title_SystemTools!'),
 													
 													'backup'		=>	Array('format' => '!la_performing_backup!'),
+													'restore'		=>	Array('format' => '!la_performing_restore!'),
 
 													'no_permissions'	=>	Array('format' => '!la_title_NoPermissions!'),
 
@@ -55,16 +56,26 @@
 																						'type'			=>	stTREE,
 																				),
 																				
-													'in-portal:backup_new' => Array (
+													'in-portal:backup' => Array (
 														'parent'		=>	'in-portal:tools',
 														'icon'			=>	'in-portal:tool_backup',
 														'label'			=>	'la_tab_Backup',
 														'url'			=>	Array ('t' => 'tools/backup1', 'pass' => 'm'),
 														'permissions'	=>	Array ('view'),
-														'priority'		=>	2.5,
+														'priority'		=>	2,
 														'type'			=>	stTREE,
 													),
 																				
+													'in-portal:restore' => Array (
+														'parent'		=>	'in-portal:tools',
+														'icon'			=>	'in-portal:tool_restore',
+														'label'			=>	'la_tab_Restore',
+														'url'			=>	Array ('t' => 'tools/restore1', 'pass' => 'm'),
+														'permissions'	=>	Array ('view'),
+														'priority'		=>	3,
+														'type'			=>	stTREE,
+													),
+																				
 													'in-portal:service'	=>	Array(
 																						'parent'		=>	'in-portal:tools',
 																						'icon'			=>	'conf_general',
Index: branches/RC/core/admin_templates/img/icons/icon46_tool_restore.gif
===================================================================
diff -u -N
Binary files differ
Index: branches/RC/kernel/units/sections/sections_config.php
===================================================================
diff -u -N -r10718 -r10721
--- branches/RC/kernel/units/sections/sections_config.php	(.../sections_config.php)	(revision 10718)
+++ branches/RC/kernel/units/sections/sections_config.php	(.../sections_config.php)	(revision 10721)
@@ -289,16 +289,6 @@
 				'SectionPrefix' => 'adm',
 			),
 
-			'in-portal:restore' => Array (
-				'parent'		=>	'in-portal:tools',
-				'icon'			=>	'in-portal:tool_restore',
-				'label'			=>	'la_tab_Restore',
-				'url'			=>	Array ('index_file' => 'backup/restore1.php', 'pass' => 'm'),
-				'permissions'	=>	Array ('view'),
-				'priority'		=>	3,
-				'type'			=>	stTREE,
-			),
-
 			'in-portal:main_import' => Array (
 				'parent'		=>	'in-portal:tools',
 				'icon'			=>	'in-portal:tool_import',
Index: branches/RC/core/units/admin/admin_events_handler.php
===================================================================
diff -u -N -r10718 -r10721
--- branches/RC/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 10718)
+++ branches/RC/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 10721)
@@ -599,7 +599,7 @@
 	}
 
 	/**
-	 * Stops users import & redirect to import template
+	 * Stops Backup & redirect to Backup template
 	 *
 	 * @param kEvent $event
 	 */
@@ -608,6 +608,16 @@
 		$event->redirect = 'tools/backup1';
 	}
 	
+	/**
+	 * Stops Restore & redirect to Restore template
+	 *
+	 * @param kEvent $event
+	 */
+	function OnRestoreCancel(&$event)
+	{
+		$event->redirect = 'tools/restore1';
+	}
+	
 	function performBackup()
 	{
 		$backupProgress = unserialize($this->Application->RecallVar('adm.backup_status'));
@@ -622,6 +632,10 @@
 		
 		if ($a_records['num'] < 50) {
 			$backupProgress['table_num']++;
+			if ($backupProgress['table_names'][$backupProgress['table_num']] == TABLE_PREFIX.'Cache') {
+				$backupProgress['table_num']++;
+			}
+			$backupProgress['record_count'] = 0;
 		} else {
 			$backupProgress['record_count']+=50;
 		}
@@ -684,14 +698,15 @@
 				$values_sql .= $this->Conn->qstr($field_value).',';
 			}
 			$values_sql = preg_replace('/(.*),$/', '\\1', $values_sql);
-			$temp .= 'INSERT INTO '.$table.' ('.$fields_sql.') VALUES ('.$values_sql.')';
+			$sql = 'INSERT INTO '.$table.' ('.$fields_sql.') VALUES ('.$values_sql.');';
+			$sql=ereg_replace("\n","\\n", $sql);
+			$sql=ereg_replace("\r","\\r", $sql);
+			$temp .= $sql."\n";
 	    }
 	    
-		$temp=ereg_replace("\n","\\n", $temp);
-		$temp=ereg_replace("\r","\\r", $temp);
 		if(strlen(TABLE_PREFIX))
 		{
-			$temp = str_replace("INSERT INTO $prefix","INSERT INTO ",$temp);
+			$temp = str_replace("INSERT INTO ".TABLE_PREFIX, "INSERT INTO ", $temp);
 		}
 	
     	return Array(
@@ -758,6 +773,284 @@
 	    return $schema_create;
 	}
 	
+	/**
+	 * Deletes one backup file
+	 *
+	 * @param kEvent $event
+	 */
+	function OnDeleteBackup(&$event)
+	{
+		@unlink($this->get_backup_file());
+	}
 	
+	function get_backup_file()
+	{
+		return $this->Application->ConfigValue('Backup_Path').'/dump'.$this->Application->GetVar('backupdate').'.txt';
+	}
 	
+	/**
+	 * Starts restore process
+	 *
+	 * @param kEvent $event
+	 */
+	function OnRestore(&$event)
+	{
+		$file = $this->get_backup_file();
+		
+		$restoreProgress = Array (
+			'file_pos' => 0,
+			'file_name' => $file,
+			'file_size' => filesize($file),
+		);
+		$this->Application->RemoveVar('adm.restore_success');
+		$this->Application->StoreVar('adm.restore_status', serialize($restoreProgress));
+		$event->redirect = 'tools/restore3';
+	}
+	
+	function OnRestoreProgress(&$event)
+	{
+		$done_percent = $this->performRestore();
+
+		if ($done_percent == -3) {
+			$event->redirect = 'tools/restore4';
+			return ;
+		}
+		
+		if ($done_percent < 0) {
+			$this->Application->StoreVar('adm.restore_error', 'File read error');			$event->redirect = 'tools/restore4';
+			return ;
+		}
+
+		if ($done_percent == 100) {
+			$this->replaceRestoredFiles();
+			$this->Application->StoreVar('adm.restore_success', 1);
+			$event->redirect = 'tools/restore4';
+			return ;
+		}
+
+		echo $done_percent;
+		$event->status = erSTOP;
+		
+	}
+	
+	function replaceRestoredFiles()
+	{
+		// gather restored table names
+		$tables = $this->Conn->GetCol('SHOW TABLES');
+		$mask_restore_table = '/^restore'.TABLE_PREFIX.'(.*)$/';
+		foreach($tables as $table)
+		{
+			if( preg_match($mask_restore_table,$table,$rets) )
+			{
+				$old_table = substr($table, 7);
+				$this->Conn->Query('DROP TABLE IF EXISTS '.$old_table);
+				$this->Conn->Query('CREATE TABLE '.$old_table.' LIKE '.$table);
+				$this->Conn->Query('INSERT INTO '.$old_table.' SELECT * FROM '.$table);
+				$this->Conn->Query('DROP TABLE '.$table);
+			}
+		}
+		
+	}
+	
+	function performRestore()
+	{
+		$restoreProgress = unserialize($this->Application->RecallVar('adm.restore_status'));
+		$filename = $restoreProgress['file_name'];
+		$FileOffset = $restoreProgress['file_pos'];
+		$MaxLines = 200;
+		$size = filesize($filename);
+		
+		if($FileOffset > $size) {
+			return -2;
+		}	
+		
+		$fp = fopen($filename,"r");
+		if(!$fp) {
+			return -1;
+		}
+		
+		
+		if($FileOffset>0)
+		{
+			fseek($fp,$FileOffset);
+		}
+		else
+		{
+			$EndOfSQL = FALSE;
+			$sql = "";
+			while(!feof($fp) && !$EndOfSQL)
+			{
+				$l = fgets($fp,16384);
+				if(substr($l,0,11)=="INSERT INTO")
+				{
+				  $EndOfSQL = TRUE;
+				}
+				else
+				{
+				  $sql .= $l;
+				  $FileOffset = ftell($fp) - strlen($l);
+				}
+			}
+			if(strlen($sql))
+			{
+				$error = $this->runSchemaText($sql);
+				if ($error != '') {
+					
+					$this->Application->StoreVar('adm.restore_error', $error);				
+					return -3;
+				}
+			}
+			fseek($fp,$FileOffset);
+		}
+		
+		$LinesRead = 0;
+		$sql = "";
+		$AllSql = array();
+		while($LinesRead < $MaxLines && !feof($fp))
+		{
+			$sql = fgets($fp, 16384);
+			if(strlen($sql))
+			{
+				$AllSql[] = $sql;
+				$LinesRead++;
+			}
+		}
+		if(!feof($fp))
+		{
+			$FileOffset = ftell($fp);
+		}
+		else
+		{
+			$FileOffset = $size;
+		}
+		fclose($fp);
+		
+		if(count($AllSql)>0) {
+			$error = $this->runSQLText($AllSql);
+			if ($error != '') {
+				
+				$this->Application->StoreVar('adm.restore_error', $error);				
+				return -3;
+			}
+			
+		}
+		$restoreProgress['file_pos'] = $FileOffset;
+		$this->Application->StoreVar('adm.restore_status', serialize($restoreProgress));
+					
+		return round($FileOffset/$size * 100);
+//		$this->Application->StoreVar('adm.restore_error', 'lalalal');
+//		$event->redirect = 'tools/restore4';
+	}
+	
+	
+	function runSchemaText($sql)
+	{
+		$table_prefix = 'restore'.TABLE_PREFIX;
+//		$table_prefix = TABLE_PREFIX;
+	    if(strlen($table_prefix))
+	    {
+	    	$what = "CREATE TABLE ";
+	    	$replace = "CREATE TABLE ".$table_prefix;
+	    	$sql = ereg_replace($what, $replace, $sql);
+	
+	    	$what = "DROP TABLE ";
+	    	$replace = "DROP TABLE IF EXISTS ".$table_prefix;
+	    	$sql = ereg_replace($what, $replace, $sql);
+	
+	    	$what = "INSERT INTO ";
+	    	$replace = "INSERT INTO ".$table_prefix;
+	    	$sql = ereg_replace($what, $replace, $sql);
+	
+	    	$what = "UPDATE ";
+	    	$replace = "UPDATE ".$table_prefix;
+	    	$sql = ereg_replace($what, $replace, $sql);
+	
+	    	$what = "ALTER TABLE ";
+	    	$replace = "ALTER TABLE ".$table_prefix;
+	    	$sql = ereg_replace($what, $replace, $sql);
+	    }
+	
+	    $commands = explode("# --------------------------------------------------------",$sql);
+	    if(count($commands)>0)
+	    {
+//	    	$query_func = getConnectionInterface('query',$dbo_type);
+//	    	$errorno_func = getConnectionInterface('errorno',$dbo_type);
+//	    	$errormsg_func = getConnectionInterface('errormsg',$dbo_type);
+	
+	    	for($i = 0; $i < count($commands); $i++)
+	    	{
+	    		$cmd = $commands[$i];
+	    		$cmd = trim($cmd);
+	    		if(strlen($cmd)>0)
+	    		{
+	    			$this->Conn->Query($cmd);
+	    			if($this->Conn->errorCode != 0)
+	    			{
+	    				return $this->Conn->errorMessage." COMMAND:<PRE>$cmd</PRE>";
+	    			}
+	    		}
+	    	}
+	    }
+	}
+	
+	function runSQLText($allsql)
+	{
+		$line = 0;
+//		$query_func = getConnectionInterface('query',$dbo_type);
+//		$errorno_func = getConnectionInterface('errorno',$dbo_type);
+//		$errormsg_func = getConnectionInterface('errormsg',$dbo_type);
+	
+		while($line<count($allsql))
+		{
+			$sql = $allsql[$line];
+			if(strlen(trim($sql))>0 && substr($sql,0,1)!="#")
+			{
+				$table_prefix = 'restore'.TABLE_PREFIX;
+				if(strlen($table_prefix))
+				{
+					$what = "CREATE TABLE ";
+					$replace = "CREATE TABLE ".$table_prefix;
+					$sql = ereg_replace($what, $replace, $sql);
+	
+					$what = "DELETE FROM ";
+					$replace = "DELETE FROM ".$table_prefix;
+					$sql = ereg_replace($what, $replace, $sql);
+	
+					$what = "DROP TABLE ";
+					$replace = "DROP TABLE IF EXISTS ".$table_prefix;
+					$sql = ereg_replace($what, $replace, $sql);
+	
+					$what = "INSERT INTO ";
+					$replace = "INSERT INTO ".$table_prefix;
+					$sql = ereg_replace($what, $replace, $sql);
+	
+					$what = "REPLACE INTO ";
+					$replace = "REPLACE INTO ".$table_prefix;
+					$sql = ereg_replace($what, $replace, $sql);
+	
+					$what = "UPDATE ";
+					$replace = "UPDATE ".$table_prefix;
+					$sql = ereg_replace($what, $replace, $sql);
+	
+					$what = "ALTER TABLE ";
+					$replace = "ALTER TABLE ".$table_prefix;
+					$sql = ereg_replace($what, $replace, $sql);
+				}
+				$sql = trim($sql);
+				if(strlen($sql)>0)
+				{
+					$this->Conn->Query($sql);
+					
+	    			if($this->Conn->errorCode != 0)
+	    			{
+	    				return $this->Conn->errorMessage." COMMAND:<PRE>$sql</PRE>";
+	    			}
+				}
+			}
+			$line++;
+		}
+	}
+	
+	
+	
 }
\ No newline at end of file
Index: branches/RC/core/admin_templates/tools/restore1.tpl
===================================================================
diff -u -N
--- branches/RC/core/admin_templates/tools/restore1.tpl	(revision 0)
+++ branches/RC/core/admin_templates/tools/restore1.tpl	(revision 10721)
@@ -0,0 +1,83 @@
+<inp2:m_RequireLogin permissions="in-portal:service.view" system="1"/>
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_DefineElement name="blue_bar_step" module="" icon="" pagination="0">
+	<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" height="30">
+		<tr>
+			<td class="header_left_bg" nowrap width="80%" valign="middle">
+				<span class="tablenav_link" id="blue_bar"><inp2:{$prefix}_SectionTitle title_preset="$title_preset" title="Invalid OR Missing title preset [#preset_name#]" cut_first="100" pass_params="true"/> - <inp2:m_Phrase label="la_Step"/> <inp2:m_Param name="step"/></span>
+			</td>
+			<td align="right" class="tablenav" width="20%" valign="middle">
+				<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
+					<script>
+						var $help_url='<inp2:m_t t="help" h_prefix="$prefix" h_icon="$icon" h_module="$module" h_title_preset="$title_preset" pass="all,m,h" m_opener="p" escape="escape"/>';
+						$help_url = $help_url.replace(/#/g, '%23');
+						set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') );
+					</script>
+					<a href="javascript: OpenHelp($help_url);">
+						<img src="img/blue_bar_help.gif" border="0">
+					</a>
+				</inp2:m_if>
+				<inp2:m_if check="m_Param" name="pagination">
+					<inp2:m_RenderElement name="grid_pagination_elem" grid="st" PrefixSpecial="$prefix" pass_params="1"/>
+				</inp2:m_if>
+			</td>
+		</tr>
+	</table>
+</inp2:m_DefineElement>
+
+
+<inp2:m_RenderElement name="section_header" icon="icon46_tool_restore" title="!la_title_Restore!"/>
+
+<inp2:m_RenderElement name="blue_bar_step" prefix="adm" title_preset="restore" module="in-portal" icon="icon46_tool_restore" step="1"/>
+
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						location.href = '<inp2:m_Link t="tools/restore2"/>';
+						}
+				 ) );
+				a_toolbar.Render();
+				a_toolbar.DisableButton('prev');
+				a_toolbar.DisableButton('next');
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered" id="config_table">
+	<inp2:m_RenderElement name="subsection" title="la_Prompt_Warning"/>
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td colspan="3" class="text">
+				<inp2:m_Phrase label="la_Text_Restore_Heading"/>
+			</td>
+		</tr>
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td class="text" colspan="3">
+				<span class="hint"><img src="../../admin/images/smicon7.gif" align="absmiddle" height="14" width="14">
+					<inp2:m_Phrase label="la_text_disclaimer_part1"/> 
+					<inp2:m_Phrase label="la_text_disclaimer_part2"/> 
+				</span>	
+			</td>
+		</tr>
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td class="text" colspan="3">
+				<input id="agree" value="0" name="agree" onclick="if (this.checked == true) a_toolbar.EnableButton('next'); else a_toolbar.DisableButton('next');" type="checkbox"><label for="agree"><inp2:m_Phrase label="la_Text_IAgree"/></label>					</td>
+		</tr>
+			
+</table>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/tools/restore2.tpl
===================================================================
diff -u -N
--- branches/RC/core/admin_templates/tools/restore2.tpl	(revision 0)
+++ branches/RC/core/admin_templates/tools/restore2.tpl	(revision 10721)
@@ -0,0 +1,83 @@
+<inp2:m_RequireLogin permissions="in-portal:service.view" system="1"/>
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_DefineElement name="blue_bar_step" module="" icon="" pagination="0">
+	<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" height="30">
+		<tr>
+			<td class="header_left_bg" nowrap width="80%" valign="middle">
+				<span class="tablenav_link" id="blue_bar"><inp2:{$prefix}_SectionTitle title_preset="$title_preset" title="Invalid OR Missing title preset [#preset_name#]" cut_first="100" pass_params="true"/> - <inp2:m_Phrase label="la_Step"/> <inp2:m_Param name="step"/></span>
+			</td>
+			<td align="right" class="tablenav" width="20%" valign="middle">
+				<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
+					<script>
+						var $help_url='<inp2:m_t t="help" h_prefix="$prefix" h_icon="$icon" h_module="$module" h_title_preset="$title_preset" pass="all,m,h" m_opener="p" escape="escape"/>';
+						$help_url = $help_url.replace(/#/g, '%23');
+						set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') );
+					</script>
+					<a href="javascript: OpenHelp($help_url);">
+						<img src="img/blue_bar_help.gif" border="0">
+					</a>
+				</inp2:m_if>
+				<inp2:m_if check="m_Param" name="pagination">
+					<inp2:m_RenderElement name="grid_pagination_elem" grid="st" PrefixSpecial="$prefix" pass_params="1"/>
+				</inp2:m_if>
+			</td>
+		</tr>
+	</table>
+</inp2:m_DefineElement>
+
+
+<inp2:m_RenderElement name="section_header" icon="icon46_tool_restore" title="!la_title_Restore!"/>
+
+<inp2:m_RenderElement name="blue_bar_step" prefix="adm" title_preset="restore" module="in-portal" icon="icon46_tool_restore" step="2"/>
+
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							location.href = '<inp2:m_Link t="tools/restore1"/>';
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						submit_event('adm.restore','OnRestore');
+						}
+				 ) );
+				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>', function() {
+						submit_event('adm.restore','OnDeleteBackup');
+						}
+				 ) );
+				a_toolbar.Render();
+				a_toolbar.DisableButton('next');
+				a_toolbar.DisableButton('delete');
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered" id="config_table">
+	<inp2:m_RenderElement name="subsection" title="la_Prompt_Restore_Filechoose"/>
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td class="text">
+				<img src="../../admin/images/arrow.gif" align="middle" border="0" height="15" width="15">
+     			<span class="NAV_CURRENT_ITEM"><inp2:m_Phrase label="la_Prompt_Backup_Date"/></span>
+			</td>
+		</tr>
+		<inp2:m_DefineElement name="backup_date">
+        <tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td class="text">
+				<input type=radio name="backupdate" onclick="a_toolbar.EnableButton('next');a_toolbar.EnableButton('delete')" value="<inp2:m_Param name='backuptimestamp'/>" /><inp2:m_Param name='backuptime'/>
+			</td>
+		</tr>
+		</inp2:m_DefineElement>
+		<inp2:adm_PrintBackupDates name="backup_date"/>		
+</table>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/tools/restore3.tpl
===================================================================
diff -u -N
--- branches/RC/core/admin_templates/tools/restore3.tpl	(revision 0)
+++ branches/RC/core/admin_templates/tools/restore3.tpl	(revision 10721)
@@ -0,0 +1,46 @@
+<inp2:m_RequireLogin permissions="in-portal:service.view" system="1"/>
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_DefineElement name="blue_bar_step" module="" icon="" pagination="0">
+	<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" height="30">
+		<tr>
+			<td class="header_left_bg" nowrap width="80%" valign="middle">
+				<span class="tablenav_link" id="blue_bar"><inp2:{$prefix}_SectionTitle title_preset="$title_preset" title="Invalid OR Missing title preset [#preset_name#]" cut_first="100" pass_params="true"/> - <inp2:m_Phrase label="la_Step"/> <inp2:m_Param name="step"/></span>
+			</td>
+			<td align="right" class="tablenav" width="20%" valign="middle">
+				<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
+					<script>
+						var $help_url='<inp2:m_t t="help" h_prefix="$prefix" h_icon="$icon" h_module="$module" h_title_preset="$title_preset" pass="all,m,h" m_opener="p" escape="escape"/>';
+						$help_url = $help_url.replace(/#/g, '%23');
+						set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') );
+					</script>
+					<a href="javascript: OpenHelp($help_url);">
+						<img src="img/blue_bar_help.gif" border="0">
+					</a>
+				</inp2:m_if>
+				<inp2:m_if check="m_Param" name="pagination">
+					<inp2:m_RenderElement name="grid_pagination_elem" grid="st" PrefixSpecial="$prefix" pass_params="1"/>
+				</inp2:m_if>
+			</td>
+		</tr>
+	</table>
+</inp2:m_DefineElement>
+
+
+<inp2:m_RenderElement name="section_header" icon="icon46_tool_restore" title="!la_title_Restore!"/>
+
+<inp2:m_RenderElement name="blue_bar_step" prefix="adm" title_preset="restore" module="in-portal" icon="icon46_tool_backup" step="3"/>
+
+
+<inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
+
+<script type="text/javascript">
+	function cancel_action() {
+		submit_event('adm.backup', 'OnRestoreCancel');
+	}
+
+	$Restore = new AjaxProgressBar('<inp2:m_t t="dummy" adm.restore_event="OnRestoreProgress" pass="m,adm.restore" js_escape="1"/>');
+</script>
+<!--<a href="<inp2:m_t t="dummy" adm.restore_event="OnRestoreProgress" pass="m,adm.restore"/>"><inp2:m_t t="dummy" adm.restore_event="OnRestoreProgress" pass="m,adm.restore"/></a>
+--><inp2:m_include t="incs/footer"/>
+
Index: branches/RC/core/admin_templates/tools/restore4.tpl
===================================================================
diff -u -N
--- branches/RC/core/admin_templates/tools/restore4.tpl	(revision 0)
+++ branches/RC/core/admin_templates/tools/restore4.tpl	(revision 10721)
@@ -0,0 +1,73 @@
+<inp2:m_RequireLogin permissions="in-portal:service.view" system="1"/>
+<inp2:m_include t="incs/header"/>
+
+<inp2:m_DefineElement name="blue_bar_step" module="" icon="" pagination="0">
+	<table border="0" cellpadding="2" cellspacing="0" class="bordered-no-bottom" width="100%" height="30">
+		<tr>
+			<td class="header_left_bg" nowrap width="80%" valign="middle">
+				<span class="tablenav_link" id="blue_bar"><inp2:{$prefix}_SectionTitle title_preset="$title_preset" title="Invalid OR Missing title preset [#preset_name#]" cut_first="100" pass_params="true"/> - <inp2:m_Phrase label="la_Step"/> <inp2:m_Param name="step"/></span>
+			</td>
+			<td align="right" class="tablenav" width="20%" valign="middle">
+				<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
+					<script>
+						var $help_url='<inp2:m_t t="help" h_prefix="$prefix" h_icon="$icon" h_module="$module" h_title_preset="$title_preset" pass="all,m,h" m_opener="p" escape="escape"/>';
+						$help_url = $help_url.replace(/#/g, '%23');
+						set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') );
+					</script>
+					<a href="javascript: OpenHelp($help_url);">
+						<img src="img/blue_bar_help.gif" border="0">
+					</a>
+				</inp2:m_if>
+				<inp2:m_if check="m_Param" name="pagination">
+					<inp2:m_RenderElement name="grid_pagination_elem" grid="st" PrefixSpecial="$prefix" pass_params="1"/>
+				</inp2:m_if>
+			</td>
+		</tr>
+	</table>
+</inp2:m_DefineElement>
+
+
+<inp2:m_RenderElement name="section_header" icon="icon46_tool_restore" title="!la_title_Restore!"/>
+
+<inp2:m_RenderElement name="blue_bar_step" prefix="adm" title_preset="restore" module="in-portal" icon="icon46_tool_restore" step="4"/>
+
+
+<!-- ToolBar --->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tbody>
+	<tr>
+  	<td>
+  		<script type="text/javascript">
+				a_toolbar = new ToolBar();
+				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
+							location.href = '<inp2:m_Link t="tools/restore1"/>';;
+						}
+					) );
+				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
+						}
+				 ) );
+				a_toolbar.Render();
+				a_toolbar.DisableButton('next');
+
+
+			</script>
+		</td>
+	</tr>
+</tbody>
+</table>
+
+<table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered" id="config_table">
+	<inp2:m_RenderElement name="subsection" title="la_Prompt_Restore_Status"/>
+		<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<td colspan="3" class="text">
+				<inp2:m_if check="m_Recall" var="adm.restore_success"/>
+					<inp2:m_Phrase label="la_Prompt_Restore_Success"/>
+				<inp2:m_else/>	
+					<inp2:m_Phrase label="la_Prompt_Restore_Failed"/> <inp2:m_Recall var="adm.restore_error"/>
+				</inp2:m_if>
+			</td>
+		</tr>
+</table>
+
+<inp2:m_include t="incs/footer"/>
\ No newline at end of file