Index: /temp/trunk/html/admin/system/index.php
===================================================================
--- /temp/trunk/html/admin/system/index.php	(revision 1328)
+++ /temp/trunk/html/admin/system/index.php	(revision 2737)
@@ -46,4 +46,5 @@
 	$objPage->tpl_nomove = "-";
 }
+$objPage->linemax= $linemax;
 
 // ¥Ú¡¼¥¸Á÷¤ê¤Î½èÍý
Index: mp/trunk/html/admin/system/Copy of update.php
===================================================================
--- /temp/trunk/html/admin/system/Copy of update.php	(revision 1328)
+++ 	(revision )
@@ -1,266 +1,0 @@
-<?php
-$now_dir = realpath(dirname(__FILE__));
-require_once($now_dir . "/../../../data/lib/slib.php");	
-require_once($now_dir . "/../../../data/class/SC_View.php");
-require_once($now_dir . "/../../../data/class/SC_Query.php");
-require_once($now_dir . "/../../../data/class/SC_CheckError.php");
-require_once($now_dir . "/../../../data/class/SC_FormParam.php");
-require_once($now_dir . "/../../../data/class/SC_Customer.php");
-require_once($now_dir . "/../../../data/class/SC_Cookie.php");
-//require_once($now_dir . "/../../../data/module/Archive/Tar.php");
-
-//¥Ú¡¼¥¸´ÉÍý¥¯¥é¥¹
-class LC_Page {
-	//¥³¥ó¥¹¥È¥é¥¯¥¿
-	function LC_Page() {
-		//¥á¥¤¥ó¥Æ¥ó¥×¥ì¡¼¥È¤Î»ØÄê
-		$this->tpl_mainpage = 'system/update.tpl';
-		$this->tpl_subnavi = 'system/subnavi.tpl';
-		$this->tpl_mainno = 'system';		
-		$this->tpl_subno = 'update';
-		$this->tpl_subtitle = '¥¢¥Ã¥×¥Ç¡¼¥È´ÉÍý';
-	}
-}
-
-$objPage = new LC_Page();
-$objView = new SC_AdminView();
-$objQuery = new SC_Query();
-
-/*
-//¥¢¥Ã¥×¥Ç¡¼¥È¾ðÊó¤ò¼èÆÀ
-$fp = fopen("csv.php", "r");
-$i = 0;
-$j = 0;
-$k = 0;
-//¥Õ¥¡¥¤¥ë¼èÆÀÀ®¸ù
-if($fp) {
-	//CSV¾ðÊó¤òÇÛÎó¤Ë³ÊÇ¼
-	while(!feof($fp)) {
-		$line = fgetcsv($fp, 40000);
-		$arrRet[$i]['update_id'] = $line[0];		//¥¢¥Ã¥×¥Ç¡¼¥Èµ¡Ç½ID
-		$arrRet[$i]['file_name'] = $line[1];		//¥Õ¥¡¥¤¥ëÌ¾
-		$arrRet[$i]['func_name'] = $line[2];		//µ¡Ç½Ì¾
-		$arrRet[$i]['func_explain'] = $line[3];		//µ¡Ç½ÀâÌÀ
-		$arrRet[$i]['version'] = $line[4];			//¥Ð¡¼¥¸¥ç¥ó
-		$arrRet[$i]['update_date'] = $line[5];		//ºÇ½ª¹¹¿·Æü»þ
-		if($i >= 1) {
-			$arrval = array($arrRet[$i]['update_id'], $arrRet[$i]['version']);
-			//´û¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ëµ¡Ç½¤«¤É¤¦¤«¥Á¥§¥Ã¥¯
-			$arrGet = $objQuery->select("*", "dtb_update_list", "update_id = ? AND version = ? ", $arrval);
-			//¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß
-			if(count($arrGet) > 0) {
-				$arrInstalled[$k] = $arrGet[0];
-				$k++;
-			} else {
-				$arrUpList[$j] = $arrRet[$i];
-				$j++;
-			}
-		}
-		$i++;
-	}
-	//¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß
-	$objPage->arrInstalled = $arrInstalled;
-	//¥¢¥Ã¥×¥Ç¡¼¥È²ÄÇ½µ¡Ç½°ìÍ÷
-	$objPage->arrUpList = $arrUpList;
-}
-
-//³ÎÇ§²èÌÌ
-if($_POST['mode'] == 'confirm' && sfIsInt($_POST['update_id'])) {
-	//¥Æ¥ó¥×¥ì¡¼¥È»ØÄê
-	$objPage->tpl_mainpage = "system/update_confirm.tpl";
-	//¥¢¥Ã¥×¥Ç¡¼¥Èµ¡Ç½ID
-	$update_id = $_POST['update_id'];
-	//¥Õ¥¡¥¤¥ëÌ¾
-	$comp_file = trim($arrRet[$update_id]['file_name']);
-	//FTPÀÜÂ³
-	$con = ftp_connect("localhost");
-	if($con != false) {
-		//FTP¥í¥°¥¤¥óÀ®¸ù
-		if(ftp_login($con, "osuser", "password")) {
-			//¥í¡¼¥«¥ë¤ËÊÝÂ¸¤¹¤ë¥Ñ¥¹
-			$objPage->local_save_dir = ROOT_DIR . "data/install/";
-			//¥í¡¼¥«¥ë¤ËÊÝÂ¸¤¹¤ë¥Õ¥¡¥¤¥ëÌ¾¤ò¥Ñ¥¹»ØÄê
-			$local_file = $objPage->local_save_dir . $comp_file;
-			//FTP¥À¥¦¥ó¥í¡¼¥ÉÀ®¸ù
-			if(ftp_get($con, $local_file, $comp_file, FTP_BINARY)) {
-				//FTPÀÜÂ³ÀÚÃÇ
-				ftp_quit($con);
-				//¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¡¢¥¤¥ó¥¹¥È¡¼¥ë¥Õ¥©¥ë¥À¤Ë°Ü¹Ô
-				$current_dir = getcwd();
-				//¥Ç¥£¥ì¥¯¥È¥ê¤Î°Ü¹Ô
-				chdir(ROOT_DIR . "data/install/");
-				//¥¢¡¼¥«¥¤¥Ö´ÉÍý¥¯¥é¥¹
-				$objTar = new Archive_Tar($comp_file);
-				//²òÅà¸å¤Î¥Õ¥¡¥¤¥ëÌ¾¤Î¼èÆÀ(³ÈÄ¥»Ò¤òºï½ü¤·¤¿¥Õ¥¡¥¤¥ë)
-				$extract_file = ereg_replace("\.tar\.gz|\.tar|\.gz|\.tgz", "", $comp_file);
-				//¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤òÉ½¼¨
-				$arrRet = $objTar->listcontent();
-				foreach($arrRet as $data) {
-					//PHP¥Õ¥¡¥¤¥ë¤â¤·¤¯¤Ïtpl¥Õ¥¡¥¤¥ë¤Ç¤¢¤ë
-					if(ereg("\.php$|\.tpl$", $data['filename'])) {
-						$main_file = ereg_replace($extract_file . "/", "", $data['filename']);
-						$arrFile[]['main_file'] = ROOT_DIR . $main_file; 
-					}
-					//sql¥Õ¥¡¥¤¥ë¤Ç¤¢¤ë
-					if(ereg("\.sql$", $data['filename'])) {
-						//¥Õ¥¡¥¤¥ëÌ¾¤«¤éDBÌ¾¤ò¼èÆÀ¤¹¤ë
-						$sql_file = ereg_replace($extract_file . "/", "", $data['filename']);
-						$db_name = ereg_replace("\.sql$", "", $sql_file);
-						$arrFile[]['sql_file'] = $db_name;
-					}
-				}
-				$objPage->arrFile = $arrFile;
-				//°µ½Ì¥Õ¥¡¥¤¥ë¤Îºï½ü
-				unlink($comp_file);
-				//¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¸µ¤ËÌá¤¹
-				chdir($current_dir);
-			} else {
-				//FTP¥À¥¦¥ó¥í¡¼¥É¥¨¥é¡¼
-				sfDispSiteError(FTP_DOWNLOAD_ERROR);
-			}
-		} else {
-			//FTP¥í¥°¥¤¥ó¥¨¥é¡¼
-			sfDispSiteError(FTP_LOGIN_ERROR);
-		}
-	} else {
-		//FTPÀÜÂ³¥¨¥é¡¼
-		sfDispSiteError(FTP_CONNECT_ERROR);
-	}
-}
-
-
-
-//¥¢¥Ã¥×¥Ç¡¼¥Èµ¡Ç½¤Î¥¤¥ó¥¹¥È¡¼¥ë
-if($_POST['mode'] == 'install' && sfIsInt($_POST['update_id'])) {
-	//¥¢¥Ã¥×¥Ç¡¼¥Èµ¡Ç½ID
-	$update_id = $_POST['update_id'];
-	//¥Õ¥¡¥¤¥ëÌ¾
-	$comp_file = trim($arrRet[$update_id]['file_name']);
-	//FTPÀÜÂ³
-	$con = ftp_connect("localhost");
-	if($con != false) {
-		//FTP¥í¥°¥¤¥óÀ®¸ù
-		if(ftp_login($con, "osuser", "password")) {
-			//¥í¡¼¥«¥ë¤ËÊÝÂ¸¤¹¤ë¥Ñ¥¹¤ò»ØÄê
-			$objPage->local_save_dir = ROOT_DIR . "data/install/";
-			//¥í¡¼¥«¥ë¤ËÊÝÂ¸¤¹¤ë¥Õ¥¡¥¤¥ëÌ¾¤ò¥Ñ¥¹»ØÄê
-			$local_file = ROOT_DIR . "data/install/" . $comp_file;
-			//FTP¥À¥¦¥ó¥í¡¼¥ÉÀ®¸ù
-			if(ftp_get($con, $local_file, $comp_file, FTP_BINARY)) {
-				//FTPÀÜÂ³ÀÚÃÇ
-				ftp_quit($con);
-				//¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¡¢¥¤¥ó¥¹¥È¡¼¥ë¥Õ¥©¥ë¥À¤Ë°Ü¹Ô
-				$current_dir = getcwd();
-				//¥Ç¥£¥ì¥¯¥È¥ê¤Î°Ü¹Ô
-				chdir(ROOT_DIR . "data/install/");
-				//¥¢¡¼¥«¥¤¥Ö´ÉÍý¥¯¥é¥¹
-				$objTar = new Archive_Tar($comp_file, true);
-				//¥¨¥é¡¼¤Î¾ÜºÙ¤òÊÖ¤¹
-				//$objTar->setErrorHandling(PEAR_ERROR_PRINT);
-				//²òÅàÀ®¸ù
-				if($objTar->extract("./")) {
-					//°µ½Ì¥Õ¥¡¥¤¥ë¤òºï½ü
-					unlink($comp_file);
-					//²òÅà¸å¤Î¥Õ¥¡¥¤¥ëÌ¾¤Î¼èÆÀ(³ÈÄ¥»Ò¤òºï½ü¤·¤¿¥Õ¥¡¥¤¥ë)
-					$extract_file = ereg_replace("\.tar\.gz|\.tar|\.gz|\.tgz", "", $comp_file);
-					//²òÅà¸å¤Î¿Æ¥Õ¥¡¥¤¥ë¤òÊÑ¿ô¤ËÅÏ¤¹
-					$extract_top_file = $extract_file;
-					//¥¤¥ó¥¹¥È¡¼¥ëÀ®¸ù¤Î¥Õ¥é¥°
-					$install_flag = true;
-					//²òÅà¥Õ¥¡¥¤¥ë¤Ë¤è¤ê¡¢¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤¹¤ë
-					$flag = lfSetExtractFile($extract_file, $extract_top_file, $install_flag);
-					//¥Õ¥¡¥¤¥ë¤Î¾å½ñ¤­¤¬À®¸ù
-					if($flag) {
-						//³ÊÇ¼¤¹¤ë¥­¡¼¤ÈÃÍ¤ò»ØÄê
-						$sqlval['update_id'] = $update_id;
-						$sqlval['func_name'] = $arrRet[$update_id]['func_name'];
-						$sqlval['func_explain'] = $arrRet[$update_id]['func_explain'];
-						$sqlval['version'] = $arrRet[$update_id]['version'];
-						$sqlval['update_date'] = 'now()';
-						
-						//¥¢¥Ã¥×¥Ç¡¼¥È´ÉÍý¥Æ¡¼¥Ö¥ë¤Ë¾ðÊó¤ò³ÊÇ¼
-						$objQuery->insert("dtb_update_list", $sqlval);
-						//¥Õ¥¡¥¤¥ë¤Îºï½ü
-						system("rm -rf ". $extract_file);
-						//¾ðÊó¤ò¹¹¿·
-						sfReload();
-					} else {
-						sfDispSiteError(WRITE_FILE_ERROR);
-					}
-
-				} else {
-					//¥Õ¥¡¥¤¥ë²òÅà¥¨¥é¡¼
-					sfDispSiteError(EXTRACT_ERROR);
-				}
-				//¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¸µ¤ËÌá¤¹
-				chdir($current_dir);
-				
-			} else {
-				//FTP¥À¥¦¥ó¥í¡¼¥É¥¨¥é¡¼
-				sfDispSiteError(FTP_DOWNLOAD_ERROR);
-			}
-		} else {
-			//FTP¥í¥°¥¤¥ó¥¨¥é¡¼
-			sfDispSiteError(FTP_LOGIN_ERROR);
-		}
-	} else {
-		//FTPÀÜÂ³¥¨¥é¡¼
-		sfDispSiteError(FTP_CONNECT_ERROR);
-	}
-}
-*/
-$objView->assignobj($objPage);		//ÊÑ¿ô¤ò¥Æ¥ó¥×¥ì¡¼¥È¤Ë¥¢¥µ¥¤¥ó¤¹¤ë
-$objView->display(MAIN_FRAME);		//¥Æ¥ó¥×¥ì¡¼¥È¤Î½ÐÎÏ
-
-//-------------------------------------------------------------------------------------------------------
-
-//²òÅà¥Õ¥¡¥¤¥ë¤Ë¤è¤ê¡¢¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤¹¤ë
-function lfSetExtractFile($extract_file, $extract_top_file, $install_success) {
-	//¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ê¤±¤ì¤Ð
-	if(!is_dir($extract_file)) {
-		return false;
-	}
-
-	//¥Ç¥£¥ì¥¯¥È¥ê¤ò³«¤¯
-	if($handle = opendir($extract_file)) {
-		//¥Ç¥£¥ì¥¯¥È¥ê¤ÎÃæ¿È¤òÆÉ¤ß¹þ¤à
-		while($file = readdir($handle)) {
-			//'.'¤È'..'¥Õ¥¡¥¤¥ë¤Ï½ü³°
-			if($file != "." && $file != "..") {
-				//¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¢¤ë
-				if(is_dir($extract_file . "/" . $file)) {
-					//ºÆµ¢¸Æ¤Ó½Ð¤·
-					lfSetExtractFile($extract_file . "/" . $file, $extract_top_file, $install_success);
-				} else {
-					//¥Õ¥¡¥¤¥ë¤Ç¤¢¤ë
-					if(is_file($extract_file . "/" . $file)) {
-						//sql¥Õ¥¡¥¤¥ë¤Ç¤¢¤ë
-						if(ereg("\.sql$", $file)) {
-							//¥Õ¥¡¥¤¥ë¤ò¼è¤êÆþ¤ì¤ë
-							require_once($extract_file . "/" . $file);
-							//¥¯¥¨¥ê¡¼¼Â¹Ô¥¯¥é¥¹
-							$objQuery = new SC_Query;
-							//¥¯¥¨¥ê¡¼¤Î¼Â¹Ô
-							$objQuery->query($sql);
-						} else {
-							//²òÅà¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¤ò»ØÄê
-							$replace_file = ereg_replace("^" . $extract_top_file . "/", "", $extract_file);
-							//¥Õ¥¡¥¤¥ë¤ò¥³¥Ô¡¼(¾å½ñ¤­)¤¹¤ë
-							if(!copy($extract_file . "/" . $file, ROOT_DIR . $replace_file . "/" . $file)) {
-								$install_success = false;
-							}
-						} 
-					}
-				}
-			}
-		}
-		//¥Ç¥£¥ì¥¯¥È¥ê¤òÊÄ¤¸¤ë
-		closedir($handle);
-	} else {
-		$install_success = false;
-	}
-	return $install_success;
-	
-}	
-
-?>
