From 4a6df8201f7c3eb8bb324aacf22026e97e3113e1 Mon Sep 17 00:00:00 2001
From: naoki hirata <naoki@magic3.org>
Date: Tue, 13 May 2014 08:01:34 +0900
Subject: [PATCH] =?utf8?q?=E3=80=8C=E3=83=89=E3=83=A1=E3=82=A4=E3=83=B3?=
 =?utf8?q?=E4=B8=80=E8=A6=A7=E3=80=8D=E3=82=92=E3=80=8C=E3=83=9B=E3=82=B9?=
 =?utf8?q?=E3=83=88=E4=B8=80=E8=A6=A7=E3=80=8D=E3=81=AB=E5=A4=89=E6=9B=B4?=
 =?utf8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 ...r.php => admin_mainHostlistWidgetContainer.php} | 26 +++++++++++-----------
 .../container/admin_mainWidgetContainer.php        |  2 +-
 .../{domain.tmpl.html => hostlist.tmpl.html}       | 10 ++++-----
 .../admin_main/include/template/menucore.tmpl.html |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)
 rename widgets/admin_main/include/container/{admin_mainDomainWidgetContainer.php => admin_mainHostlistWidgetContainer.php} (85%)
 rename widgets/admin_main/include/template/{domain.tmpl.html => hostlist.tmpl.html} (78%)

diff --git a/widgets/admin_main/include/container/admin_mainDomainWidgetContainer.php b/widgets/admin_main/include/container/admin_mainHostlistWidgetContainer.php
similarity index 85%
rename from widgets/admin_main/include/container/admin_mainDomainWidgetContainer.php
rename to widgets/admin_main/include/container/admin_mainHostlistWidgetContainer.php
index d3172c5f..e15166a9 100644
--- a/widgets/admin_main/include/container/admin_mainDomainWidgetContainer.php
+++ b/widgets/admin_main/include/container/admin_mainHostlistWidgetContainer.php
@@ -15,7 +15,7 @@
  */
 require_once($gEnvManager->getCurrentWidgetContainerPath() . '/admin_mainBaseWidgetContainer.php');
 
-class admin_mainDomainWidgetContainer extends admin_mainBaseWidgetContainer
+class admin_mainHostlistWidgetContainer extends admin_mainBaseWidgetContainer
 {
 	const HOME_DIR = '/home';
 	const SITE_DEF_FILE = '/public_html/include/siteDef.php';
@@ -40,7 +40,7 @@ class admin_mainDomainWidgetContainer extends admin_mainBaseWidgetContainer
 	 */
 	function _setTemplate($request, &$param)
 	{
-		return 'domain.tmpl.html';
+		return 'hostlist.tmpl.html';
 	}
 	/**
 	 * テンプレートにデータ埋め込む
@@ -54,7 +54,7 @@ class admin_mainDomainWidgetContainer extends admin_mainBaseWidgetContainer
 	function _assign($request, &$param)
 	{
 		// ディレクトリ一覧を取得
-		$domainArray = array();
+		$hostArray = array();
 		$searchPath = self::HOME_DIR;
 		if (is_dir($searchPath)){
 			$dir = dir($searchPath);
@@ -70,19 +70,19 @@ class admin_mainDomainWidgetContainer extends admin_mainBaseWidgetContainer
 						$line['dir'] = $file;
 						$line['date'] = date("Y/m/d H:i:s", filemtime($siteInfoFile));
 						
-						// ドメイン名取得
-						$domain = '';
+						// ホスト名取得
+						$host = '';
 						$contents = file_get_contents($siteInfoFile);
 						$key = 'M3_SYSTEM_ROOT_URL';
 						if (preg_match("/^[ \t]*define\([ \t]*[\"']" . $key . "[\"'][ \t]*,[ \t]*[\"'](.*)[\"'][ \t]*\)/m", $contents, $matches)){
 							$params = parse_url($matches[1]);
-							$domain = $params['host'];
+							$host = $params['host'];
 						}
-						$line['domain'] = $domain;
+						$line['host'] = $host;
 						
 						// 使用ディスク量
 						$line['disksize'] = calcDirSize($filePath);
-						$domainArray[] = $line;
+						$hostArray[] = $line;
 					}
 				}
 			}
@@ -90,16 +90,16 @@ class admin_mainDomainWidgetContainer extends admin_mainBaseWidgetContainer
 		}
 		
 		// 値を埋め込む
-		for ($i = 0; $i < count($domainArray); $i++){
-			$line = $domainArray[$i];
+		for ($i = 0; $i < count($hostArray); $i++){
+			$line = $hostArray[$i];
 			$row = array(
-				'domain'	=> $this->convertToDispString($line['domain']),	// ドメイン名
+				'host'	=> $this->convertToDispString($line['host']),	// ホスト名
 				'dir'		=> $this->convertToDispString($line['dir']),			// ディレクトリ名
 				'date'		=> $this->convertToDispDate($line['date']),			// インストール日時
 				'disksize'	=> $this->convertToDispString(convFromBytes($line['disksize'])),			// ディスク使用量
 			);
-			$this->tmpl->addVars('domainlist', $row);
-			$this->tmpl->parseTemplate('domainlist', 'a');
+			$this->tmpl->addVars('hostlist', $row);
+			$this->tmpl->parseTemplate('hostlist', 'a');
 		}
 	}
 }
diff --git a/widgets/admin_main/include/container/admin_mainWidgetContainer.php b/widgets/admin_main/include/container/admin_mainWidgetContainer.php
index aace1e8b..ec00b3f4 100644
--- a/widgets/admin_main/include/container/admin_mainWidgetContainer.php
+++ b/widgets/admin_main/include/container/admin_mainWidgetContainer.php
@@ -278,7 +278,7 @@ class admin_mainWidgetContainer extends admin_mainBaseWidgetContainer
 						case 'corefile':		// コアファイル編集
 						case 'serverinfo':		// サーバ情報
 						case 'install':			// インストール
-						case 'domain':			// ドメイン一覧
+						case 'hostlist':		// ホスト一覧
 						case 'test':			// テスト用画面
 							$this->gLaunch->goSubWidget($task);
 							return false;
diff --git a/widgets/admin_main/include/template/domain.tmpl.html b/widgets/admin_main/include/template/hostlist.tmpl.html
similarity index 78%
rename from widgets/admin_main/include/template/domain.tmpl.html
rename to widgets/admin_main/include/template/hostlist.tmpl.html
index 98b828e0..2cab3033 100644
--- a/widgets/admin_main/include/template/domain.tmpl.html
+++ b/widgets/admin_main/include/template/hostlist.tmpl.html
@@ -19,19 +19,19 @@ $(function(){
 </script>
 <div class="col-sm-8 col-sm-offset-2">
 <!-- m3:ErrorMessage -->
-<h3>ドメイン一覧</h3>
+<h3>ホスト一覧</h3>
 <table class="table table-striped">
     <thead>
     <tr>
-		<th width="40%">ドメイン名</th>
+		<th width="40%">ホスト名</th>
 	    <th width="20%">ディレクトリ名</th>
-	    <th width="20%">インストール日時</th>
+	    <th width="20%">インストール日</th>
 		<th width="20%">ディスク使用量</th>
 	</tr>
     </thead>
     <tbody>
-	<patTemplate:tmpl name="domainlist">
-    <tr><td>{DOMAIN}</td><td>{DIR}</td><td>{DATE}</td><td>{DISKSIZE}</td></tr>
+	<patTemplate:tmpl name="hostlist">
+    <tr><td>{HOST}</td><td>{DIR}</td><td>{DATE}</td><td class="text-right">{DISKSIZE}</td></tr>
 	</patTemplate:tmpl>
     </tbody>
 </table>
diff --git a/widgets/admin_main/include/template/menucore.tmpl.html b/widgets/admin_main/include/template/menucore.tmpl.html
index 63728eb1..c6bffc57 100644
--- a/widgets/admin_main/include/template/menucore.tmpl.html
+++ b/widgets/admin_main/include/template/menucore.tmpl.html
@@ -25,7 +25,7 @@ $(function(){
     <ul class="list-group">
         <li class="list-group-item"><a href="?task=corefile" ><span >コアファイル管理</span></a></li>
 		<li class="list-group-item"><a href="?task=serverinfo" ><span >サーバ情報</span></a></li>
-		<li class="list-group-item"><a href="?task=domain" ><span >ドメイン一覧</span></a></li>
+		<li class="list-group-item"><a href="?task=hostlist" ><span >ホスト一覧</span></a></li>
     </ul>
 </div>
 </patTemplate:tmpl>
-- 
2.11.0