From 02cdd0ac943d5b636a5624aa84b7ccd046a212e2 Mon Sep 17 00:00:00 2001
From: naoki hirata <naoki@magic3.org>
Date: Sat, 19 Apr 2014 22:12:48 +0900
Subject: [PATCH] =?utf8?q?=E3=82=A6=E3=82=A3=E3=82=B8=E3=82=A7=E3=83=83?=
 =?utf8?q?=E3=83=88=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=A2?=
 =?utf8?q?=E3=83=83=E3=83=97=E6=A9=9F=E8=83=BD=E6=9B=B4=E6=96=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 include/manager/pageManager.php                    |   4 +-
 .../admin_mainWidgetlistWidgetContainer.php        |  78 ++++++++++++-
 widgets/admin_main/include/db/admin_mainDb.php     |  42 +++++--
 widgets/admin_main/include/locale/ja_JP.mo         | Bin 58949 -> 59547 bytes
 widgets/admin_main/include/locale/ja_JP.po         | 129 ++++++++++++---------
 .../include/template/widgetlist.tmpl.html          |   7 ++
 6 files changed, 191 insertions(+), 69 deletions(-)

diff --git a/include/manager/pageManager.php b/include/manager/pageManager.php
index c59c75ea..47973b27 100644
--- a/include/manager/pageManager.php
+++ b/include/manager/pageManager.php
@@ -4229,7 +4229,7 @@ class PageManager extends Core
 		} else {
 			// ウィジェットが存在する場合は実行
 			if (!file_exists($widgetIndexFile)) {
-				echo 'widget not found error: ' . $widgetId;
+				if ($gEnvManager->isSystemManageUser()) echo '<span class="error">widget not found error: ' . $widgetId . '</span>';		// システム運用者の場合はエラーメッセージ表示
 			} else {
 				// パラメータ初期化
 				$this->lastHeadCss = '';			// 最後に設定したHTMLヘッダにCSS出力する文字列
@@ -4397,7 +4397,7 @@ class PageManager extends Core
 		if (file_exists($widgetIndexFile)){
 			require($widgetIndexFile);
 		} else {
-			echo 'widget not found error: ' . $widgetId;
+			if ($gEnvManager->isSystemManageUser()) echo '<span class="error">widget not found error: ' . $widgetId . '</span>';		// システム運用者の場合はエラーメッセージ表示
 		}
 		$msg = 'widget-end(' . $widgetId . ')';
 		$gErrorManager->writeDebug(__METHOD__, $msg);		// 時間計測用
diff --git a/widgets/admin_main/include/container/admin_mainWidgetlistWidgetContainer.php b/widgets/admin_main/include/container/admin_mainWidgetlistWidgetContainer.php
index 9f82ee60..0c64adbe 100644
--- a/widgets/admin_main/include/container/admin_mainWidgetlistWidgetContainer.php
+++ b/widgets/admin_main/include/container/admin_mainWidgetlistWidgetContainer.php
@@ -16,6 +16,7 @@
 require_once($gEnvManager->getCurrentWidgetContainerPath() .	'/admin_mainBaseWidgetContainer.php');
 require_once($gEnvManager->getCurrentWidgetDbPath() . '/admin_mainDb.php');
 require_once($gEnvManager->getLibPath()				. '/pcl/pclzip.lib.php' );
+require_once($gEnvManager->getLibPath() .	'/gitRepo.php');
 require_once($gEnvManager->getCurrentWidgetContainerPath()		. '/admin_mainDef.php');			// 定義クラス
 
 class admin_mainWidgetlistWidgetContainer extends admin_mainBaseWidgetContainer
@@ -183,7 +184,10 @@ class admin_mainWidgetlistWidgetContainer extends admin_mainBaseWidgetContainer
 			$updateAvailable = ($request->trimValueOf('item' . $selectedItemNo . '_available') == 'on') ? 1 : 0;		// 利用可能かどうか
 			$updateActive = ($request->trimValueOf('item' . $selectedItemNo . '_active') == 'on') ? 1 : 0;		// ウィジェット実行可能かどうか
 			
-			$ret = $this->db->updateWidget($serial, $updateAvailable, $updateActive);
+			$updateParams = array();
+			$updateParams['wd_available'] = $updateAvailable;
+			$updateParams['wd_active'] = $updateActive;
+			$ret = $this->db->updateWidget($serial, $updateParams);
 			if ($ret){		// データ更新成功のとき
 				$this->setMsg(self::MSG_GUIDANCE, $this->_('Line updated.'));		// データを更新しました
 			} else {
@@ -483,6 +487,75 @@ class admin_mainWidgetlistWidgetContainer extends admin_mainBaseWidgetContainer
 	        $dest = preg_replace_callback($exp, array($this, '_update_widget_info_callback'), $infoSrc);
 			
 			$this->setMsg(self::MSG_GUIDANCE, $this->_('Latest widget information gotten.'));		// 最新のウィジェット情報を取得しました
+		} else if ($act == 'updatewidget'){		// ウィジェットの更新
+			// ### 最新のバージョン番号をチェック ###
+			$canUpdate = false;			// 更新可能かどうか
+			
+			// 現在のバージョン取得
+			$ret = $this->_db->getWidgetInfo($widgetId, $row);
+			if ($ret) $version = $row['wd_version'];		// ウィジェットのバージョン
+											
+			// ウィジェットの最新情報ファイルを取得
+			$infoSrc = file_get_contents(self::NEW_INFO_URL);
+
+			// ウィジェットIDとバージョン番号を取得して登録
+			$exp = '/^\(\'' . preg_quote($widgetId) . '\'.*\'([0-9\.]+[a-z]*)\'/m';			// バージョン番号の最後の「b」(ベータ版)等は許可
+			if (preg_match($exp, $infoSrc, $matches)){
+				$latestVersion = $matches[1];
+				
+				if (!empty($version) && !empty($latestVersion) && version_compare($version, $latestVersion) == -1) $canUpdate = true;		// 最新バージョンが現在のバージョンよりも上の場合
+			}
+			if ($canUpdate){
+				// GitHubからソースコードを取得
+				$zipFilePath = $this->gEnv->getIncludePath() . '/widgets_update/' . $widgetId . '#' . date('Ymd') . '.zip';
+				$repo = new GitRepo('magic3org', 'magic3');
+				$ret = $repo->createZipArchive('/widgets/' . $widgetId, $zipFilePath);
+				if ($ret){		// Zipファイル作成完了のとき
+					// 既存ウィジェットのバックアップ
+					$status = false;
+					$widgetDir = $this->gEnv->getWidgetsPath() . '/' . $widgetId;		// ウィジェットのディレクトリ
+					$zipFilePath = $this->gEnv->getIncludePath() . '/widgets_update/' . $widgetId . '.zip';
+					$zipFile = new PclZip($zipFilePath);
+					$ret = $zipFile->create($widgetDir, PCLZIP_OPT_REMOVE_PATH, dirname($widgetDir));
+					if ($ret){
+						// 作業ディレクトリを作成
+						$tmpDir = $this->gEnv->getTempDirBySession();		// セッション単位の作業ディレクトリを取得
+						if (file_exists($tmpDir)) rmDirectory($tmpDir);		// 存在する場合は一旦削除
+							
+						// ダウンロードしたウィジェットと入れ替え
+						$zipFile = new PclZip($zipFilePath);
+						$ret = $zipFile->extract(PCLZIP_OPT_PATH, $tmpDir);
+						if ($ret){
+							$ret = rmDirectory($widgetDir);
+							if ($ret) $ret = mvDirectory($tmpDir . '/' . basename($widgetId), $widgetDir);
+							if ($ret){		// 完了の場合はバージョン情報を更新
+								$updateParams = array();
+								$updateParams['wd_version'] = $latestVersion;
+								$ret = $this->db->updateWidget($row['wd_serial'], $updateParams);
+								if ($ret) $status = true;		// ウィジェット更新完了
+							}
+						}
+					}
+					if ($status){
+						$msg = $this->_('Widget updated successfully.');		// ウィジェットの更新が完了しました。
+						$this->setGuidanceMsg($msg);
+					} else {
+						$msg = $this->_('Failed in updating widget.');		// ウィジェットの更新に失敗しました
+						$this->setAppErrorMsg($msg);
+					}
+				} else {		// Zipファイル作成失敗のとき
+					$resCode = $repo->getResponseCode();
+					if ($resCode == 403){
+						$msg = $this->_('Connection count is over the limit. Wait a minute, connect again.');		// ウィジェットの更新に失敗しました
+					} else {
+						$msg = $this->_('Failed in connecting to GitHub.');		// GitHubへの接続に失敗しました
+					}
+					$this->setAppErrorMsg($msg);
+				}
+			} else {
+				$msg = $this->_('The widget is already the latest version.');		// ウィジェットはすでに最新バージョンです
+				$this->setAppErrorMsg($msg);
+			}
 		}
 		// ウィジェットのタイプごとの処理
 		switch ($this->widgetType){
@@ -538,6 +611,7 @@ class admin_mainWidgetlistWidgetContainer extends admin_mainBaseWidgetContainer
 		$localeText['msg_delete_line'] = $this->_('Delete widget?');		// このウィジェットを削除しますか?
 		$localeText['msg_no_upload_file'] = $this->_('File not selected.');		// アップロードするファイルが選択されていません
 		$localeText['msg_upload_file'] = $this->_('Upload file.');		// ファイルをアップロードします
+		$localeText['msg_update_widget'] = $this->_('Update widget?');		// ウィジェットを更新しますか?
 		$localeText['label_widget_list'] = $this->_('Widget List');			// ウィジェット一覧
 //		$localeText['label_widget_type'] = $this->_('Widget Type:');			// ウィジェットタイプ：
 		$localeText['label_install_dir'] = $this->_('Install Directory:');			// インストールディレクトリ:
@@ -764,7 +838,7 @@ class admin_mainWidgetlistWidgetContainer extends admin_mainBaseWidgetContainer
 			if (version_compare($version, $latestVersion) == -1){		// 最新バージョンが現在のバージョンよりも上の場合のみ表示
 				$optionVerStr = strtolower($matches[2]);
 				if (empty($optionVerStr)){		// 付加記号なしの場合
-					$latestVer = '<span class="available">' . $this->convertToDispString($latestVersion) . '</span>';
+					$latestVer = '<span class="available"><a href="javascript:void(0);" onclick="updateWidget(\'' . $widgetId . '\');">' . $this->convertToDispString($latestVersion) . '</a></span>';
 				} else {
 					switch ($optionVerStr){
 						case 'x':		// 緊急バージョンアップ
diff --git a/widgets/admin_main/include/db/admin_mainDb.php b/widgets/admin_main/include/db/admin_mainDb.php
index 8e8a4281..d3fae977 100644
--- a/widgets/admin_main/include/db/admin_mainDb.php
+++ b/widgets/admin_main/include/db/admin_mainDb.php
@@ -304,11 +304,10 @@ class admin_mainDb extends BaseDb
 	 * ウィジェットの更新
 	 *
 	 * @param int $serial			シリアル番号
-	 * @param bool $available		利用可能かどうか
-	 * @param bool $active	ウィジェット実行可能かどうか
+	 * @param array $updateParams	更新パラメータ
 	 * @return bool					true=成功、false=失敗
 	 */
-	function updateWidget($serial, $available, $active)
+	function updateWidget($serial, $updateParams)
 	{
 		$userId = $this->gEnv->getCurrentUserId();	// 現在のユーザ
 		$now = date("Y/m/d H:i:s");	// 現在日時
@@ -350,6 +349,8 @@ class admin_mainDb extends BaseDb
 		$updateFields[] = 'wd_read_scripts'; $boolFields[] = 'wd_read_scripts';		// スクリプトディレクトリを自動読み込みするかどうか
 		$updateFields[] = 'wd_read_css'; $boolFields[] = 'wd_read_css';			// cssディレクトリを自動読み込みするかどうか
 		$updateFields[] = 'wd_use_ajax'; $boolFields[] = 'wd_use_ajax';			// Ajax共通ライブラリを読み込むかどうか
+    	$updateFields[] = 'wd_active'; $boolFields[] = 'wd_use_ajax';			// 一般ユーザが実行可能かどうか
+    	$updateFields[] = 'wd_available'; $boolFields[] = 'wd_use_ajax';		// メニューから選択可能かどうか
 		$updateFields[] = 'wd_editable'; $boolFields[] = 'wd_editable';			// データ編集可能かどうか
 		$updateFields[] = 'wd_edit_content'; $boolFields[] = 'wd_edit_content';	// 主要コンテンツ編集可能かどうか
 		$updateFields[] = 'wd_has_admin'; $boolFields[] = 'wd_has_admin';			// 管理画面があるかどうか
@@ -382,8 +383,8 @@ class admin_mainDb extends BaseDb
 		
 		// 指定のシリアルNoのレコードが削除状態でないかチェック
 		$historyIndex = 0;		// 履歴番号
-		$queryStr  = 'select * from _widgets ';
-		$queryStr .=   'where wd_serial = ? ';
+		$queryStr  = 'SELECT * FROM _widgets ';
+		$queryStr .=   'WHERE wd_serial = ? ';
 		$ret = $this->selectRecord($queryStr, array($serial), $row);
 		if ($ret){		// 既に登録レコードがあるとき
 			if ($row['wd_deleted']){		// レコードが削除されていれば終了
@@ -406,10 +407,10 @@ class admin_mainDb extends BaseDb
 		
 		// ##### データ更新処理 #####
 		// 呼び出しパラメータから取得値
-		$newParams = array();
-		$newParams['wd_available'] = intval($available);
-		$newParams['wd_active'] = intval($active);
-		$keys = array_keys($newParams);// キーを取得
+//		$newParams = array();
+//		$newParams['wd_available'] = intval($available);
+//		$newParams['wd_active'] = intval($active);
+		$keys = array_keys($updateParams);// キーを取得
 		
 		// クエリー作成
 		$queryStr  = 'INSERT INTO _widgets (';
@@ -419,12 +420,19 @@ class admin_mainDb extends BaseDb
 		$values = array($row['wd_id'], $historyIndex);
 		// 呼び出しパラメータから取得値を連結
 		for ($i = 0; $i < count($keys); $i++){
-			$queryStr .= $keys[$i] . ', ';
+			$fieldName = $keys[$i];
+			$queryStr .= $fieldName . ', ';
 			$valueStr .= '?, ';
-			$values[] = $newParams[$keys[$i]];
+//			$values[] = $newParams[$keys[$i]];
+			if (in_array($fieldName, $boolFields)){
+				$values[] = intval($updateParams[$fieldName]);
+			} else {
+				$values[] = $updateParams[$fieldName];
+			}
 		}
 		
 		// 更新値を設定
+		/*
 		if ($this->getDbType() == M3_DB_TYPE_PGSQL){// PostgreSQLの場合
 			for ($i = 0; $i < count($updateFields); $i++){
 				$fieldName = $updateFields[$i];
@@ -447,6 +455,18 @@ class admin_mainDb extends BaseDb
 					$values[] = $row[$fieldName];
 				}
 			}
+		}*/
+		for ($i = 0; $i < count($updateFields); $i++){
+			$fieldName = $updateFields[$i];
+			if (!in_array($fieldName, $keys)){		// フィールドがないとき
+				$queryStr .= $fieldName . ', ';
+				$valueStr .= '?, ';
+				if (in_array($fieldName, $boolFields)){
+					$values[] = intval($row[$fieldName]);
+				} else {
+					$values[] = $row[$fieldName];
+				}
+			}
 		}
 
 		// レコードを追加
diff --git a/widgets/admin_main/include/locale/ja_JP.mo b/widgets/admin_main/include/locale/ja_JP.mo
index 577316504954d75736d0f6cb2570c2633a2ba824..d4686acc08db170ee7dad4c45f52e415e63760a9 100644
GIT binary patch
delta 12478
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

delta 12042
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

diff --git a/widgets/admin_main/include/locale/ja_JP.po b/widgets/admin_main/include/locale/ja_JP.po
index 7fe913ac..e25f84e7 100644
--- a/widgets/admin_main/include/locale/ja_JP.po
+++ b/widgets/admin_main/include/locale/ja_JP.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-15 23:08+0900\n"
-"PO-Revision-Date: 2014-04-15 23:08+0900\n"
+"POT-Creation-Date: 2014-04-19 22:09+0900\n"
+"PO-Revision-Date: 2014-04-19 22:11+0900\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ja_JP\n"
@@ -248,7 +248,7 @@ msgstr "追加CSSクラス"
 #: ../container/admin_mainSmenudefWidgetContainer.php:151
 #: ../container/admin_mainTemplistWidgetContainer.php:559
 #: ../container/admin_mainUserlistWidgetContainer.php:138
-#: ../container/admin_mainWidgetlistWidgetContainer.php:777
+#: ../container/admin_mainWidgetlistWidgetContainer.php:875
 msgid "Update"
 msgstr "更新"
 
@@ -309,7 +309,7 @@ msgstr "メール送信に失敗しました。メールアドレス:"
 
 #: ../container/admin_mainConfigsiteWidgetContainer.php:170
 #: ../container/admin_mainTemplistWidgetContainer.php:220
-#: ../container/admin_mainWidgetlistWidgetContainer.php:267
+#: ../container/admin_mainWidgetlistWidgetContainer.php:271
 #, php-format
 msgid "You are not allowed to write temporary directory. (directory: %s)"
 msgstr "一時ディレクトリに書き込み権限がありません。(ディレクトリ： %s)"
@@ -324,15 +324,15 @@ msgstr "画像の作成に失敗しました"
 
 #: ../container/admin_mainConfigsiteWidgetContainer.php:244
 #: ../container/admin_mainTemplistWidgetContainer.php:308
-#: ../container/admin_mainWidgetlistWidgetContainer.php:397
-#: ../container/admin_mainWidgetlistWidgetContainer.php:416
+#: ../container/admin_mainWidgetlistWidgetContainer.php:401
+#: ../container/admin_mainWidgetlistWidgetContainer.php:420
 msgid "Failed in uploading file."
 msgstr "ファイルのアップロードに失敗しました"
 
 #: ../container/admin_mainConfigsiteWidgetContainer.php:251
 #: ../container/admin_mainEditmenuWidgetContainer.php:330
 #: ../container/admin_mainTemplistWidgetContainer.php:316
-#: ../container/admin_mainWidgetlistWidgetContainer.php:424
+#: ../container/admin_mainWidgetlistWidgetContainer.php:428
 #, php-format
 msgid ""
 "Uploded file not found. (detail: The file may be over maximum size to be "
@@ -771,7 +771,7 @@ msgstr "未設定"
 #: ../container/admin_mainUserlistWidgetContainer.php:149
 #: ../container/admin_mainUserlistWidgetContainer.php:303
 #: ../container/admin_mainUserlistWidgetContainer.php:371
-#: ../container/admin_mainWidgetlistWidgetContainer.php:546
+#: ../container/admin_mainWidgetlistWidgetContainer.php:621
 #: ../help/help_menudef.php:43 ../help/help_userlist.php:47
 msgid "Name"
 msgstr "名前"
@@ -805,13 +805,13 @@ msgstr "管理メニュー定義ファイル"
 
 #: ../container/admin_mainEditmenuWidgetContainer.php:204
 #: ../container/admin_mainTemplistWidgetContainer.php:453
-#: ../container/admin_mainWidgetlistWidgetContainer.php:556
+#: ../container/admin_mainWidgetlistWidgetContainer.php:631
 msgid "Upload"
 msgstr "アップロード"
 
 #: ../container/admin_mainEditmenuWidgetContainer.php:205
 #: ../container/admin_mainTemplistWidgetContainer.php:561
-#: ../container/admin_mainWidgetlistWidgetContainer.php:779
+#: ../container/admin_mainWidgetlistWidgetContainer.php:877
 msgid "Download"
 msgstr "ダウンロード"
 
@@ -892,7 +892,7 @@ msgstr "パス："
 #: ../container/admin_mainTemplistWidgetContainer.php:560
 #: ../container/admin_mainUserlistWidgetContainer.php:137
 #: ../container/admin_mainUserlistWidgetContainer.php:160
-#: ../container/admin_mainWidgetlistWidgetContainer.php:778
+#: ../container/admin_mainWidgetlistWidgetContainer.php:876
 msgid "Delete"
 msgstr "削除"
 
@@ -955,7 +955,7 @@ msgstr "ファイルを選択"
 
 #: ../container/admin_mainFilebrowseWidgetContainer.php:211
 #: ../container/admin_mainTemplistWidgetContainer.php:454
-#: ../container/admin_mainWidgetlistWidgetContainer.php:557
+#: ../container/admin_mainWidgetlistWidgetContainer.php:632
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -1197,7 +1197,7 @@ msgstr "編集"
 #: ../container/admin_mainPagedefWidgetContainer.php:138
 #: ../container/admin_mainSmenudefWidgetContainer.php:170
 #: ../container/admin_mainTemplistWidgetContainer.php:450
-#: ../container/admin_mainWidgetlistWidgetContainer.php:552
+#: ../container/admin_mainWidgetlistWidgetContainer.php:627
 #: ../help/help_menudef.php:67 ../help/help_templist.php:59
 #: ../help/help_widgetlist.php:59
 msgid "Operation"
@@ -1584,17 +1584,17 @@ msgid "Save"
 msgstr "保存"
 
 #: ../container/admin_mainTemplistWidgetContainer.php:57
-#: ../container/admin_mainWidgetlistWidgetContainer.php:52
+#: ../container/admin_mainWidgetlistWidgetContainer.php:53
 msgid "For PC"
 msgstr "PC用"
 
 #: ../container/admin_mainTemplistWidgetContainer.php:58
-#: ../container/admin_mainWidgetlistWidgetContainer.php:53
+#: ../container/admin_mainWidgetlistWidgetContainer.php:54
 msgid "For Mobile"
 msgstr "携帯用"
 
 #: ../container/admin_mainTemplistWidgetContainer.php:59
-#: ../container/admin_mainWidgetlistWidgetContainer.php:54
+#: ../container/admin_mainWidgetlistWidgetContainer.php:55
 msgid "For Smartphone"
 msgstr "スマートフォン用"
 
@@ -1628,7 +1628,7 @@ msgid "Failed in deleting template directory. (directory: %s)"
 msgstr "テンプレートのディレクトリが削除できませんでした。(ディレクトリ： %s)"
 
 #: ../container/admin_mainTemplistWidgetContainer.php:213
-#: ../container/admin_mainWidgetlistWidgetContainer.php:260
+#: ../container/admin_mainWidgetlistWidgetContainer.php:264
 msgid "Only zip format file is allowed to upload."
 msgstr "zip圧縮のファイルのみアップロード可能です"
 
@@ -1653,13 +1653,13 @@ msgid "Failed in moving directory. (directory: %s)"
 msgstr "ディレクトリの移動に失敗しました。(ディレクトリ： %s)"
 
 #: ../container/admin_mainTemplistWidgetContainer.php:356
-#: ../container/admin_mainWidgetlistWidgetContainer.php:464
+#: ../container/admin_mainWidgetlistWidgetContainer.php:468
 #, php-format
 msgid "Failed in downloading file. (detail: %s)"
 msgstr "ファイルのアップロードに失敗しました。(要因： %s)"
 
 #: ../container/admin_mainTemplistWidgetContainer.php:436
-#: ../container/admin_mainWidgetlistWidgetContainer.php:537
+#: ../container/admin_mainWidgetlistWidgetContainer.php:611
 msgid "Update line?"
 msgstr "行を更新しますか?"
 
@@ -1668,12 +1668,12 @@ msgid "Delete tmplate?"
 msgstr "テンプレートを削除しますか?"
 
 #: ../container/admin_mainTemplistWidgetContainer.php:438
-#: ../container/admin_mainWidgetlistWidgetContainer.php:539
+#: ../container/admin_mainWidgetlistWidgetContainer.php:613
 msgid "File not selected."
 msgstr "アップロードするファイルが選択されていません"
 
 #: ../container/admin_mainTemplistWidgetContainer.php:439
-#: ../container/admin_mainWidgetlistWidgetContainer.php:540
+#: ../container/admin_mainWidgetlistWidgetContainer.php:614
 msgid "Upload file."
 msgstr "ファイルをアップロードします"
 
@@ -1683,12 +1683,12 @@ msgid "Template List"
 msgstr "テンプレート一覧"
 
 #: ../container/admin_mainTemplistWidgetContainer.php:442
-#: ../container/admin_mainWidgetlistWidgetContainer.php:543
+#: ../container/admin_mainWidgetlistWidgetContainer.php:618
 msgid "Install Directory:"
 msgstr "インストールディレクトリ:"
 
 #: ../container/admin_mainTemplistWidgetContainer.php:443
-#: ../container/admin_mainWidgetlistWidgetContainer.php:544
+#: ../container/admin_mainWidgetlistWidgetContainer.php:619
 #: ../help/help_templist.php:71 ../help/help_widgetlist.php:71
 msgid "Reload directory"
 msgstr "ディレクトリ再読み込み"
@@ -1711,7 +1711,7 @@ msgid "Template Upload (zip compressed file)"
 msgstr "テンプレートアップロード(zip圧縮ファイル)"
 
 #: ../container/admin_mainTemplistWidgetContainer.php:452
-#: ../container/admin_mainWidgetlistWidgetContainer.php:554
+#: ../container/admin_mainWidgetlistWidgetContainer.php:629
 msgid "Select file to upload."
 msgstr "アップロードするファイルを選択してください"
 
@@ -1884,134 +1884,155 @@ msgstr "パスワード送信"
 msgid "Account"
 msgstr "アカウント"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:174
+#: ../container/admin_mainWidgetlistWidgetContainer.php:175
 #, php-format
 msgid "New widgets added. (widgets count=%d)"
 msgstr "新規ウィジェットを追加しました(追加数=%d)"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:177
+#: ../container/admin_mainWidgetlistWidgetContainer.php:178
 msgid "No new widgets added."
 msgstr "新規ウィジェットはありません"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:188
+#: ../container/admin_mainWidgetlistWidgetContainer.php:192
 msgid "Line updated."
 msgstr "データを更新しました"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:190
+#: ../container/admin_mainWidgetlistWidgetContainer.php:194
 msgid "Failed in updating line."
 msgstr "データ更新に失敗しました"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:218
+#: ../container/admin_mainWidgetlistWidgetContainer.php:222
 #, php-format
 msgid "Widget deleted. (widget ID: %s)"
 msgstr "ウィジェットを削除しました。(ウィジェットID： %s)"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:221
+#: ../container/admin_mainWidgetlistWidgetContainer.php:225
 #, php-format
 msgid "Failed in deleting widget directory. (directory: %s)"
 msgstr "ウィジェットのディレクトリが削除できませんでした。(ディレクトリ： %s)"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:225
+#: ../container/admin_mainWidgetlistWidgetContainer.php:229
 #, php-format
 msgid "You are not allowed to delete widget directory. (directory: %s)"
 msgstr "ウィジェットのディレクトリの削除権限がありません。(ディレクトリ： %s)"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:229
-#: ../container/admin_mainWidgetlistWidgetContainer.php:728
+#: ../container/admin_mainWidgetlistWidgetContainer.php:233
+#: ../container/admin_mainWidgetlistWidgetContainer.php:806
 msgid "Widget not found."
 msgstr "ウィジェットが見つかりません"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:276
+#: ../container/admin_mainWidgetlistWidgetContainer.php:280
 #, php-format
 msgid "The widget already exists. (widget ID: %s)"
 msgstr "ウィジェットがすでに存在します。(ウィジェットID： %s)"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:306
+#: ../container/admin_mainWidgetlistWidgetContainer.php:310
 #, php-format
 msgid "Failed in getting file list from zip file. (detail: %s)"
 msgstr "zipファイルの内容のリスト取得に失敗しました。(要因:： %s)"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:318
+#: ../container/admin_mainWidgetlistWidgetContainer.php:322
 msgid "Failed in deleting widget directory."
 msgstr "ウィジェットのディレクトリが削除できませんでした"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:381
+#: ../container/admin_mainWidgetlistWidgetContainer.php:385
 msgid "Widget installed successfully."
 msgstr "ウィジェットのインストールが完了しました。"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:385
+#: ../container/admin_mainWidgetlistWidgetContainer.php:389
+#: ../container/admin_mainWidgetlistWidgetContainer.php:540
 msgid "Widget updated successfully."
 msgstr "ウィジェットの更新が完了しました。"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:389
+#: ../container/admin_mainWidgetlistWidgetContainer.php:393
 #, php-format
 msgid "Current version is %s."
 msgstr "バージョンは%sです。"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:393
+#: ../container/admin_mainWidgetlistWidgetContainer.php:397
 #, php-format
 msgid "File uploaded. (widget ID: %s)"
 msgstr "ファイルのアップロードが完了しました。(ウィジェットID： %s)"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:404
+#: ../container/admin_mainWidgetlistWidgetContainer.php:408
 #, php-format
 msgid "Failed in uploading file. (detail: %s)"
 msgstr "ファイルのアップロードに失敗しました。(要因： %s)"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:410
+#: ../container/admin_mainWidgetlistWidgetContainer.php:414
 msgid "The zip filename is different from directory name."
 msgstr ""
 "zipファイルのファイル名とディレクトリ名が異なっているか、全角文字が含まれてい"
 "ます"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:485
+#: ../container/admin_mainWidgetlistWidgetContainer.php:489
 msgid "Latest widget information gotten."
 msgstr "最新のウィジェット情報を取得しました"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:536
+#: ../container/admin_mainWidgetlistWidgetContainer.php:543
+msgid "Failed in updating widget."
+msgstr "ウィジェットの更新に失敗しました"
+
+#: ../container/admin_mainWidgetlistWidgetContainer.php:550
+msgid "Connection count is over the limit. Wait a minute, connect again."
+msgstr "接続回数の上限を超えました。しばらく待ってから再度接続してください"
+
+#: ../container/admin_mainWidgetlistWidgetContainer.php:552
+msgid "Failed in connecting to GitHub."
+msgstr "GitHubへの接続に失敗しました"
+
+#: ../container/admin_mainWidgetlistWidgetContainer.php:557
+msgid "The widget is already the latest version."
+msgstr "ウィジェットはすでに最新バージョンです"
+
+#: ../container/admin_mainWidgetlistWidgetContainer.php:610
 msgid "Get new information of widgets?"
 msgstr "ウィジェットの最新情報を取得しますか?"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:538
+#: ../container/admin_mainWidgetlistWidgetContainer.php:612
 msgid "Delete widget?"
 msgstr "ウィジェットを削除しますか?"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:541
+#: ../container/admin_mainWidgetlistWidgetContainer.php:615
+msgid "Update widget?"
+msgstr "ウィジェットを更新しますか?"
+
+#: ../container/admin_mainWidgetlistWidgetContainer.php:616
 #: ../help/help_widgetlist.php:31
 msgid "Widget List"
 msgstr "ウィジェット一覧"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:547
+#: ../container/admin_mainWidgetlistWidgetContainer.php:622
 msgid "Version"
 msgstr "バージョン"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:548
+#: ../container/admin_mainWidgetlistWidgetContainer.php:623
 msgid "Latest"
 msgstr "最新"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:549
+#: ../container/admin_mainWidgetlistWidgetContainer.php:624
 #: ../help/help_widgetlist.php:51
 msgid "Available"
 msgstr "配置可"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:550
+#: ../container/admin_mainWidgetlistWidgetContainer.php:625
 #: ../help/help_widgetlist.php:55
 msgid "Active"
 msgstr "実行可"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:551
+#: ../container/admin_mainWidgetlistWidgetContainer.php:626
 msgid "Release Date"
 msgstr "リリース日"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:553
+#: ../container/admin_mainWidgetlistWidgetContainer.php:628
 msgid "Widget Upload (zip compressed file)"
 msgstr "ウィジェットアップロード(zip圧縮ファイル)"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:555
+#: ../container/admin_mainWidgetlistWidgetContainer.php:630
 msgid "Replace widget if exists."
 msgstr "ウィジェットが存在する場合は置き換え"
 
-#: ../container/admin_mainWidgetlistWidgetContainer.php:776
+#: ../container/admin_mainWidgetlistWidgetContainer.php:874
 msgid "Configure"
 msgstr "設定"
 
diff --git a/widgets/admin_main/include/template/widgetlist.tmpl.html b/widgets/admin_main/include/template/widgetlist.tmpl.html
index 60f95038..208be5b1 100644
--- a/widgets/admin_main/include/template/widgetlist.tmpl.html
+++ b/widgets/admin_main/include/template/widgetlist.tmpl.html
@@ -44,6 +44,13 @@ function detailline(widgetId){
 	m3ShowStandardWindow("?cmd=configwidget&openby=all&widget=" + widgetId);
 	return false;
 }
+function updateWidget(widgetId){
+	if (!window.confirm('{_LC_MSG_UPDATE_WIDGET}')) return false;
+	document.main.act.value = 'updatewidget';
+	document.main.widget.value = widgetId;
+	document.main.submit();
+	return false;
+}
 function uploadCheck(){
 	if (!document.upload.upfile.value){
 		alert('{_LC_MSG_NO_UPLOAD_FILE}');
-- 
2.11.0