Index: temp/trunk/html/admin/system/bkup.php
===================================================================
--- temp/trunk/html/admin/system/bkup.php	(revision 5657)
+++ temp/trunk/html/admin/system/bkup.php	(revision 5658)
@@ -199,8 +199,4 @@
 		//°µ½Ì¤ò¤ª¤³¤Ê¤¦
 		$zip = $tar->create("./" . $bkup_name . "/");
-//		$zip = $tar->create($bkup_dir);
-
-		sfprintr($zip);
-		sfprintr($tar);
 
 		// ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Ç¡¼¥¿¤Îºï½ü
@@ -274,24 +270,21 @@
 // ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ò¥ê¥¹¥È¥¢¤¹¤ë
 function lfRestore($bkup_name){
+	global $objPage;
+	$objQuery = new SC_Query();
+	$csv_data = "";
+	$err = true;
+	
+	$bkup_dir = $objPage->bkup_dir;
 	
 	//file¥Õ¥©¥ë¥À¤Ë°ÜÆ°¤¹¤ë
-	chdir("file");
-	
-	//ÊÑ¿ô$key¤ËÁ°²èÌ̤ǻØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤ò³ÊǼ¤¹¤ë
-	$key = $HTTP_POST_VARS["compck"];
-	
-	//²òÅàÀè¤Î¥Õ¥©¥ë¥À̾¤ò$fname¤Ë³ÊǼ¤¹¤ë
-	//¥Õ¥©¥ë¥À̾¤Ï¡Ö¥Õ¥¡¥¤¥ë̾.tar.tz¡×¤è¤ê¡Ö.tar.tz¡×¤ò¼è¤ê½ü¤¯
-	//substr(ʸ»úÎó,³«»Ï°ÌÃÖ,ʸ»ú¿ô¡Ë¤Ïʸ»úÎó¤Î³«»Ï°ÌÃÖ¤«¤éʸ»ú¿ôʬ¤ò¼è¤ê½Ð¤¹´Ø¿ô
-	//strlen(ʸ»úÎó¡Ë¤Ïʸ»úÎó¤ÎŤµ¤òÊÖ¤¹´Ø¿ô
-	$fname = substr($key,0,strlen($key) - 7);
+	chdir($bkup_dir);
 	
 	//¥ª¥Ö¥¸¥§¥¯¥È¤òºîÀ®¤¹¤ë
 	//new Archive_Tar(¥Õ¥¡¥¤¥ë̾,°µ½Ì¥Õ¥é¥°);
 	//°µ½Ì¥Õ¥é¥°TRUE¤Ïgzip²òÅà¤ò¤ª¤³¤Ê¤¦
-	$tar = new Archive_Tar($key, TRUE);
+	$tar = new Archive_Tar($bkup_name, TRUE);
 	
 	//»ØÄꤵ¤ì¤¿¥Õ¥©¥ë¥ÀÆâ¤Ë²òÅह¤ë
-	$tar->extract("./" . $fname);
+	$tar->extract("./");
 }