Date: Thu, 28 Feb 2013 17:22:25 +0900
Subject: [PATCH 20/39] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88?=
=?UTF-8?q?=E3=83=BC=E3=83=AB=E5=BE=8C=E3=81=AE=20welcome=20=E3=83=A1?=
=?UTF-8?q?=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E4=B8=AD=E3=81=AE=E6=A9=9F?=
=?UTF-8?q?=E6=A7=8B=E5=90=8D=E3=81=AE=E8=AA=A4=E3=82=8A=E3=82=92=E8=A8=82?=
=?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
「情報・システム研究機構」の「研究」が抜けていた。
ついでに “ ” の向きの間違いも訂正。
---
html/webapp/modules/install/language/japanese/welcome.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/html/webapp/modules/install/language/japanese/welcome.php b/html/webapp/modules/install/language/japanese/welcome.php
index 190ac84..184068d 100644
--- a/html/webapp/modules/install/language/japanese/welcome.php
+++ b/html/webapp/modules/install/language/japanese/welcome.php
@@ -12,17 +12,17 @@
$content .=
"はじめに
- NetCommonsは、大学共同利用機関法人情報・システム機構 国立情報学研究所が開発したPHPによるオープンソースの情報共有基盤システムです。
-本ソフトウェアの著作権は情報・システム機構およびプログラムを作成した各個人に帰属し、FreeBSDライセンス（参考：日本語訳）によって公開されています。本ソフトウェアを利用する方は、FreeBSDライセンスの精神をご理解の上、ご利用ください。
+ NetCommonsは、大学共同利用機関法人情報・システム研究機構 国立情報学研究所が開発したPHPによるオープンソースの情報共有基盤システムです。
+本ソフトウェアの著作権は情報・システム研究機構およびプログラムを作成した各個人に帰属し、FreeBSDライセンス（参考：日本語訳）によって公開されています。本ソフトウェアを利用する方は、FreeBSDライセンスの精神をご理解の上、ご利用ください。
本ソフトウェアはソースコード形式であれバイナリ形式であれ、変更の有無に関わらず、以下の条件を満たす限りにおいて、再配布および使用を許可します:
- ソースコード形式で再配布する場合、上記著作権表示、本条件書および下記責任限定規定を必ず含めてください。
- バイナリ形式で再配布する場合、上記著作権表示、本条件書および下記責任限定規定を、配布物とともに提供される文書 および/または他の資料に必ず含めてください。
- 本ソフトウェアは国立情報学研究所NetCommons PROJECT によって、”現状のまま” 提供されるものとします。本ソフトウェアについては、明示黙示を問わず、商用品として通常そなえるべき品質をそなえているとの保証も、特定の目的に適合するとの保証を含め、何の保証もなされません。 事由のいかんを問わず、損害発生の原因いかんを問わず、且つ、 責任の根拠が契約であるか厳格責任であるか (過失その他) 不法行為であるかを問わず、 情報・システム研究機構、国立情報学研究所、NetCommons PROJECTおよび寄与者も、仮にそのような損害が発生する可能性を知らされていたとしても、本ソフトウェアの使用から発生した直接損害、間接損害、偶発的な損害、特別損害、懲罰的損害または結果損害のいずれに対しても (代替品または サービスの提供; 使用機会、データまたは利益の損失の補償; または、業務の中断に対する補償を含め) 責任をいっさい負いません。
+ 本ソフトウェアは国立情報学研究所NetCommons PROJECT によって、“現状のまま” 提供されるものとします。本ソフトウェアについては、明示黙示を問わず、商用品として通常そなえるべき品質をそなえているとの保証も、特定の目的に適合するとの保証を含め、何の保証もなされません。 事由のいかんを問わず、損害発生の原因いかんを問わず、且つ、 責任の根拠が契約であるか厳格責任であるか (過失その他) 不法行為であるかを問わず、 情報・システム研究機構、国立情報学研究所、NetCommons PROJECTおよび寄与者も、仮にそのような損害が発生する可能性を知らされていたとしても、本ソフトウェアの使用から発生した直接損害、間接損害、偶発的な損害、特別損害、懲罰的損害または結果損害のいずれに対しても (代替品または サービスの提供; 使用機会、データまたは利益の損失の補償; または、業務の中断に対する補償を含め) 責任をいっさい負いません。
- 本ソフトウェアの名称である「NetCommons」およびロゴは大学共同利用機関法人情報・システム機構の知的財産として商標登録されています。商標「NetCommons」の利用を希望される場合には、大学共同利用機関法人情報・システム機構 国立情報学研究所（郵便番号101-8430 東京都千代田区一ツ橋２－１－２）までお問い合わせください。
+ 本ソフトウェアの名称である「NetCommons」およびロゴは大学共同利用機関法人情報・システム研究機構の知的財産として商標登録されています。商標「NetCommons」の利用を希望される場合には、大学共同利用機関法人情報・システム研究機構 国立情報学研究所（郵便番号101-8430 東京都千代田区一ツ橋２－１－２）までお問い合わせください。
必要なソフトウエア
From 7904e3c31e7933115d6dc708874997040ceac30e Mon Sep 17 00:00:00 2001
From: komuna
Date: Thu, 28 Feb 2013 17:53:28 +0900
Subject: [PATCH 21/39] =?UTF-8?q?CSS,=20JavaScript,=20gzip=20=E3=81=AE?=
=?UTF-8?q?=E8=A1=A8=E8=A8=98=E3=81=AE=E8=AA=A4=E3=82=8A=E3=82=92=E8=A8=82?=
=?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Css とか Javascript とかになってた。
PHP のコメント中などユーザーの目に触れないところは修正していない。
---
html/webapp/modules/system/language/chinese/main.ini | 4 ++--
html/webapp/modules/system/language/english/main.ini | 4 ++--
html/webapp/modules/system/language/japanese/main.ini | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/html/webapp/modules/system/language/chinese/main.ini b/html/webapp/modules/system/language/chinese/main.ini
index deba918..35a6c08 100644
--- a/html/webapp/modules/system/language/chinese/main.ini
+++ b/html/webapp/modules/system/language/chinese/main.ini
@@ -64,9 +64,9 @@ system_closesite_text_note = "上述说明在网站关闭时将出现。"
[System_View_Main_Server::System_Action_Server]
system_server_config = "系统配置"
system_php_memory_limit = "最大内存"
-system_js_compress_gzip = "以Gzip格式压缩Javascript文件？"
+system_js_compress_gzip = "以gzip格式压缩JavaScript文件？"
system_none_zlib = "没有被安装zlib扩展包。
要安装zlib扩展包，需要在编译PHP时加上选项--with-zlib[=DIR]。"
-system_js_compress_gzip_desc = "通过压缩javascript文件，您可以节约传输时间。但并不是所有的浏览器或代理服务器都能够正确解压缩Gzip格式文件。"
+system_js_compress_gzip_desc = "通过压缩JavaScript文件，您可以节约传输时间。但并不是所有的浏览器或代理服务器都能够正确解压缩gzip格式文件。"
system_session_title = "会话"
system_session_name = "保存会话ID的Coockie"
system_proxy_title = "代理服务器"
diff --git a/html/webapp/modules/system/language/english/main.ini b/html/webapp/modules/system/language/english/main.ini
index 93b24c1..debac24 100644
--- a/html/webapp/modules/system/language/english/main.ini
+++ b/html/webapp/modules/system/language/english/main.ini
@@ -64,9 +64,9 @@ system_closesite_text_note = "The text that is presented when the site is closed
[System_View_Main_Server::System_Action_Server]
system_server_config = "System Configuration"
system_php_memory_limit = "Maximum number of memories"
-system_js_compress_gzip = "Compress Javascript files in Gzip format?"
+system_js_compress_gzip = "Compress JavaScript files in gzip format?"
system_none_zlib = "Not install the zlib extension yet.
To install the zlib extension, you need to add the option --with-zlib[=DIR] when compiling PHP."
-system_js_compress_gzip_desc = "By compressing the javascript files, you can save the transfer time. However, not every browser or proxy server is able to expand the Gzip format correctly."
+system_js_compress_gzip_desc = "By compressing the JavaScript files, you can save the transfer time. However, not every browser or proxy server is able to expand the gzip format correctly."
system_session_title = "Session"
system_session_name = "Coockie for session ID"
system_proxy_title = "proxy server"
diff --git a/html/webapp/modules/system/language/japanese/main.ini b/html/webapp/modules/system/language/japanese/main.ini
index e71a99c..e4549d8 100644
--- a/html/webapp/modules/system/language/japanese/main.ini
+++ b/html/webapp/modules/system/language/japanese/main.ini
@@ -64,9 +64,9 @@ system_closesite_text_note = "サイト閉鎖時に表示します。"
[System_View_Main_Server::System_Action_Server]
system_server_config = "システムコンフィグ"
system_php_memory_limit = "PHP最大メモリ数"
-system_js_compress_gzip = "Css,JavascriptのGzip圧縮転送を有効にする"
+system_js_compress_gzip = "CSS,JavaScriptのgzip圧縮転送を有効にする"
system_none_zlib = "zlib拡張モジュールがインストールされていません。
有効にする場合、PHPのコンパイル時の オプションに--with-zlib[=DIR]を 指定してコンパイルする必要があります。"
-system_js_compress_gzip_desc = "HTTP転送されるCss,JavascriptをGzip圧縮することで、読み込みが早くなります。但し、gzip圧縮に対応していないブラウザ等でjavascriptの転送に失敗する場合があります。"
+system_js_compress_gzip_desc = "HTTP転送されるCSS,JavaScriptをgzip圧縮することで、読み込みが早くなります。但し、gzip圧縮に対応していないブラウザ等でJavaScriptの転送に失敗する場合があります。"
system_session_title = "セッション"
system_session_name = "セッションID保存用のクッキーの名称"
system_proxy_title = "プロキシサーバ"
From d408c29949dbcb91737385503b688dae0cc73683 Mon Sep 17 00:00:00 2001
From: komuna
Date: Thu, 28 Feb 2013 18:09:17 +0900
Subject: [PATCH 22/39] =?UTF-8?q?=E6=96=87=E6=9B=B8=E5=9E=8B=E5=AE=A3?=
=?UTF-8?q?=E8=A8=80=E3=81=AE=E5=89=8D=E3=81=AE=E7=A9=BA=E8=A1=8C=E3=82=92?=
=?UTF-8?q?=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
ソース見たときに気持ち悪いので。
あっても文法違反ではないし，表示に支障はないが。
---
html/webapp/templates/main/header.html | 1 -
1 file changed, 1 deletion(-)
diff --git a/html/webapp/templates/main/header.html b/html/webapp/templates/main/header.html
index 9d61453..0586369 100644
--- a/html/webapp/templates/main/header.html
+++ b/html/webapp/templates/main/header.html
@@ -1,4 +1,3 @@
-
<{strip}>
From 2034982389e776b7c4b3a24ede86dcfd9e79406f Mon Sep 17 00:00:00 2001
From: kteraguchi
Date: Thu, 11 Apr 2013 18:34:20 +0900
Subject: [PATCH 23/39] =?UTF-8?q?Ver.2.4.0.0=E3=83=AA=E3=83=AA=E3=83=BC?=
=?UTF-8?q?=E3=82=B9=E3=81=8B=E3=82=892013/1/21=E3=81=BE=E3=81=A7=E3=81=AE?=
=?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=88=86=E3=81=A7=E6=BC=8F=E3=82=8C=E3=81=A6?=
=?UTF-8?q?=E3=81=9F=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E8=BF=BD?=
=?UTF-8?q?=E5=8A=A0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/user/update/Update.class.php | 131 ++++++++++++++++++
html/webapp/modules/user/update/maple.ini | 8 ++
2 files changed, 139 insertions(+)
create mode 100644 html/webapp/modules/user/update/Update.class.php
create mode 100644 html/webapp/modules/user/update/maple.ini
diff --git a/html/webapp/modules/user/update/Update.class.php b/html/webapp/modules/user/update/Update.class.php
new file mode 100644
index 0000000..9b0ec26
--- /dev/null
+++ b/html/webapp/modules/user/update/Update.class.php
@@ -0,0 +1,131 @@
+db->execute($sql);
+ if ($indexes === false) {
+ return false;
+ }
+ foreach($indexes as $index) {
+ if ($index['Key_name'] == 'item_id') {
+ $isIndexedItemId = true;
+ }
+ if ($index['Key_name'] == 'content') {
+ $isIndexedContent = true;
+
+ if ($index['Index_type'] == 'FULLTEXT') {
+ $isFullTextIndexedContent = true;
+ }
+ }
+ }
+ if (!$isIndexedItemId) {
+ $sql = "ALTER TABLE {users_items_link} "
+ . "ADD INDEX ("
+ . "`item_id`, "
+ . "`email_reception_flag`);";
+ $result = $this->db->execute($sql);
+ if ($result === false) {
+ return false;
+ }
+ }
+ if ($isFullTextIndexedContent) {
+ $sql = "ALTER TABLE {users_items_link} "
+ . "DROP INDEX `content`;";
+ $result = $this->db->execute($sql);
+ if ($result === false) {
+ return false;
+ }
+ $isIndexedContent = false;
+ }
+ if (!$isIndexedContent) {
+ $sql = "ALTER TABLE {users_items_link} "
+ . "ADD INDEX (`content`(255));";
+ $result = $this->db->execute($sql);
+ if ($result === false) {
+ return false;
+ }
+ }
+
+ $sql = "SHOW INDEX "
+ . "FROM {users};";
+ $indexes = $this->db->execute($sql);
+ if ($indexes === false) {
+ return false;
+ }
+ $isIndexedLoginId = false;
+ $isIndexedHandle = false;
+ $isIndexedActiveFlag = false;
+ $isIndexedActivateKey = false;
+ foreach($indexes as $index) {
+ if ($index['Key_name'] == 'active_flag') {
+ $isIndexedActiveFlag = true;
+ }
+ if ($index['Key_name'] == 'login_id') {
+ $isIndexedLoginId = true;
+ }
+ if ($index['Key_name'] == 'handle') {
+ $isIndexedHandle = true;
+ }
+ if ($index['Key_name'] == 'activate_key') {
+ $isIndexedActivateKey = true;
+ }
+ }
+ if (!$isIndexedLoginId) {
+ $sql = "ALTER TABLE {users} "
+ . "ADD INDEX (`login_id`);";
+ $result = $this->db->execute($sql);
+ if ($result === false) {
+ return false;
+ }
+ }
+ if (!$isIndexedHandle) {
+ $sql = "ALTER TABLE {users} "
+ . "ADD INDEX (`handle`);";
+ $result = $this->db->execute($sql);
+ if ($result === false) {
+ return false;
+ }
+ }
+ if (!$isIndexedActiveFlag) {
+ $sql = "ALTER TABLE {users} "
+ . "ADD INDEX ("
+ . "`active_flag`, "
+ . "`system_flag`, "
+ . "`role_authority_id`);";
+ $result = $this->db->execute($sql);
+ if ($result === false) {
+ return false;
+ }
+ }
+ if (!$isIndexedActivateKey) {
+ $sql = "ALTER TABLE {users} "
+ . "ADD INDEX (`activate_key`);";
+ $result = $this->db->execute($sql);
+ if ($result === false) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+}
+?>
diff --git a/html/webapp/modules/user/update/maple.ini b/html/webapp/modules/user/update/maple.ini
new file mode 100644
index 0000000..1a2a42e
--- /dev/null
+++ b/html/webapp/modules/user/update/maple.ini
@@ -0,0 +1,8 @@
+[RecursiveNocall]
+ValidateDef =
+
+[ValidateDef]
+requiredfalse ="1:lang._invalid_input"
+
+[Action]
+db = "ref:DbObject"
\ No newline at end of file
From 1be6c12b63d9b42ccc3372f73e009fb20eeee9d8 Mon Sep 17 00:00:00 2001
From: kteraguchi
Date: Thu, 11 Apr 2013 18:51:25 +0900
Subject: [PATCH 24/39] =?UTF-8?q?#52=20#53=E3=80=80=E3=83=9A=E3=83=BC?=
=?UTF-8?q?=E3=82=B8=E3=83=87=E3=83=BC=E3=82=BF=E5=89=8A=E9=99=A4=E5=87=A6?=
=?UTF-8?q?=E7=90=86=E3=81=AE=E5=85=B1=E9=80=9A=E5=8C=96=E3=80=81=E5=8F=8A?=
=?UTF-8?q?=E3=81=B3=E3=80=81=E4=BC=9A=E5=93=A1=E6=A4=9C=E7=B4=A2=E3=81=AE?=
=?UTF-8?q?=E4=B8=8D=E5=85=B7=E5=90=88=E4=BF=AE=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/abbreviateurl/Action.class.php | 18 +
.../webapp/components/blocks/Action.class.php | 39 +-
.../components/database/Sqlutility.class.php | 287 ++++++------
html/webapp/components/pages/Action.class.php | 413 +++++++++++++++---
html/webapp/components/pages/View.class.php | 47 ++
.../components/uploads/Action.class.php | 67 +--
html/webapp/components/users/Action.class.php | 173 +++++++-
html/webapp/components/users/View.class.php | 20 +-
.../components/whatsnew/Action.class.php | 32 +-
.../backup/action/main/init/Init.class.php | 1 -
.../edit/deletepage/Deletepage.class.php | 155 +++----
.../menu/action/edit/deletepage/maple.ini | 4 +-
.../admin/uninstall/Uninstall.class.php | 11 +-
.../room/action/admin/delete/Delete.class.php | 208 +--------
.../room/action/admin/delete/dicon.ini | 6 +-
.../room/action/admin/delete/maple.ini | 19 +-
.../admin/selmodules/Selmodules.class.php | 216 ++++-----
.../room/action/admin/selmodules/dicon.ini | 7 +-
html/webapp/modules/room/install.ini | 1 +
.../modules/room/update/Update.class.php | 55 +++
html/webapp/modules/room/update/dicon.ini | 13 +
html/webapp/modules/room/update/maple.ini | 12 +
.../user/action/admin/delete/Delete.class.php | 158 +------
.../user/action/admin/delete/dicon.ini | 4 +-
.../user/action/admin/delete/maple.ini | 8 -
.../admin/seldelete/Seldelete.class.php | 250 ++---------
.../user/action/admin/seldelete/dicon.ini | 4 +-
.../user/action/admin/seldelete/maple.ini | 7 -
.../whatsnew/components/Action.class.php | 5 +-
.../modules/whatsnew/update/Update.class.php | 41 ++
30 files changed, 1129 insertions(+), 1152 deletions(-)
create mode 100644 html/webapp/modules/room/update/Update.class.php
create mode 100644 html/webapp/modules/room/update/dicon.ini
create mode 100644 html/webapp/modules/room/update/maple.ini
diff --git a/html/webapp/components/abbreviateurl/Action.class.php b/html/webapp/components/abbreviateurl/Action.class.php
index ccd7eea..7b1b314 100644
--- a/html/webapp/components/abbreviateurl/Action.class.php
+++ b/html/webapp/components/abbreviateurl/Action.class.php
@@ -263,6 +263,24 @@ function moveRoom($contents_id, $org_room_id, $move_room_id)
return true;
}
+ /**
+ * 条件に該当する短縮URLデータを削除する。
+ *
+ * @param string $whereClause where句文字列
+ * @param array $bindValues バインド値配列
+ * @return boolean true or false
+ * @access public
+ */
+ function deleteByWhereClause($whereClause, $bindValues)
+ {
+ $sql = "DELETE FROM {abbreviate_url} "
+ . "WHERE " . $whereClause;
+ if (!$this->_db->execute($sql, $bindValues)) {
+ $this->_db->addError();
+ return false;
+ }
+ return true;
+ }
}
?>
diff --git a/html/webapp/components/blocks/Action.class.php b/html/webapp/components/blocks/Action.class.php
index 6e29ddc..749a0e4 100644
--- a/html/webapp/components/blocks/Action.class.php
+++ b/html/webapp/components/blocks/Action.class.php
@@ -631,13 +631,13 @@ function delFuncExec($block_id, $block_obj = null, $delete_action = null)
// 配列でなければエラーとする
return false;
}
-
+
//自動的に削除
$where_params = array(
"block_id" => $block_id
);
$error = false;
-
+
foreach ($table_list as $table_name) {
//ブロックIDより削除処理。ブロックIDがなければ、処理しない
$result = $this->_db->execute("DESCRIBE ".$table_name." block_id");
@@ -658,28 +658,35 @@ function delFuncExec($block_id, $block_obj = null, $delete_action = null)
//削除関数呼び出し
//
$pathList = explode("_", $delete_action);
- $ucPathList = array_map('ucfirst', $pathList);
-
- $basename = ucfirst($pathList[count($pathList) - 1]);
-
- $actionPath = join("/", $pathList);
- $className = join("_", $ucPathList);
- $filename = MODULE_DIR . "/${actionPath}/${basename}.class.php";
- if (@file_exists($filename)) {
+ $ucPathList = array_map('ucfirst', $pathList);
+
+ $basename = ucfirst($pathList[count($pathList) - 1]);
+
+ $actionPath = join("/", $pathList);
+ $className = join("_", $ucPathList);
+ $filename = MODULE_DIR . "/${actionPath}/${basename}.class.php";
+ if (@file_exists($filename)) {
//$params = array("action" =>$delete_action, "block_id" =>$block_id, "page_id" =>$block_obj['page_id'], "table_name" =>$table_list);
$pagesView =& $this->_container->getComponent("pagesView");
$page = $pagesView->getPageById($block_obj['page_id']);
- if($page === false) {
- return false;
- }
-
- $params = array("action" =>$delete_action, "mode"=>"block_delete", "block_id" =>$block_id, "page_id" =>$block_obj['page_id'], "room_id" =>$page['room_id']);
+ if($page === false) {
+ return false;
+ }
+
+ $params = array(
+ 'action' => $delete_action,
+ 'mode' => 'block_delete',
+ 'block_id' => $block_id,
+ 'page_id' => $block_obj['page_id'],
+ 'room_id' => $page['room_id'],
+ 'module_id' => $block_obj['module_id']
+ );
$result = $this->preexecuteMain->preExecute($delete_action, $params);
if($result === false || $result === "false") {
//エラーが発生した場合、エラーリストに追加
$this->_db->addError("delFuncExec", sprintf(_INVALID_ACTION, $delete_action));
}
- }
+ }
}
}
}
diff --git a/html/webapp/components/database/Sqlutility.class.php b/html/webapp/components/database/Sqlutility.class.php
index 86fe653..6225b81 100644
--- a/html/webapp/components/database/Sqlutility.class.php
+++ b/html/webapp/components/database/Sqlutility.class.php
@@ -20,194 +20,193 @@ class Database_Sqlutility
* @access private
*/
var $_container = null;
-
+
/**
* コンストラクター
*
- * @access public
+ * @access public
*/
function Database_Sqlutility() {
$this->_container =& DIContainerFactory::getContainer();
$this->_db =& $this->_container->getComponent("DbObject");
}
-
+
/**
- * モジュールDirからテーブルリスト取得
+ * モジュール使用テーブル名データを取得する。
*
- * @param string $dirname モジュールのディレクリ名称
- * @return array テーブル名称の配列
- * @access public
+ * @param string $dirname モジュールのディレクリ名称
+ * @param boolean $needPrefix テーブル名のプレフィックス有無
+ * @return array テーブル名の配列
+ * @access public
*/
- function &getTableList($dirname, $prefix_flag = true)
+ function &getTableList($directory, $needPrefix = true)
{
- $table_list = false;
- $configView =& $this->_container->getComponent("configView");
- $config_obj = $configView->getConfigByConfname(_SYS_CONF_MODID, "db_kind"); //conf_name=db_kind(mysql等がvalueに入る)
- if($config_obj) {
- $db_kind = $config_obj["conf_value"];
- } else {
- $db_kind = _DEFAULT_SQL_KIND;
+ $tableNames = array();
+ $databaseDriver = _DEFAULT_SQL_KIND;
+
+ $configView =& $this->_container->getComponent('configView');
+ $config = $configView->getConfigByConfname(_SYS_CONF_MODID, 'db_kind');
+ if (!empty($config)) {
+ $databaseDriver = $config['conf_value'];
}
- $file_path = "/".$dirname."/sql/".$db_kind."/"._SYS_TABLE_INI;
- if (@file_exists(MODULE_DIR.$file_path) && filesize(MODULE_DIR.$file_path) != 0) {
- //モジュールに使用するテーブルあり
- // SQLファイルの読み込み
- $handle = fopen(MODULE_DIR.$file_path, 'r');
- $sql_query = fread($handle, filesize(MODULE_DIR.$file_path));
- fclose($handle);
- $sql_query = trim($sql_query);
- // SQLユーティリティクラスにて各クエリを配列に格納する
- $this->splitMySqlFile($pieces, $sql_query);
-
- //$created_tables = array();
- $table_list = array();
- foreach ($pieces as $piece) {
- // SQLユーティリティクラスにてテーブル名にプレフィックスをつける
- // 配列としてリターンされ、
- // [0] プレフィックスをつけたクエリ
- // [4] プレフィックスをつけないテーブル名
- // が格納されている
- $prefixed_query = $this->prefixQuery($piece, $this->_db->getPrefix());
- if ( !$prefixed_query ) {
- //エラー
- $table_list = false;
- break;
- }
-
- //既にTABLEが存在しなければ、次へ
- //if(in_array($this->_db->getPrefix().$prefixed_query[4],$created_tables)) {
- // continue;
- //}
- if($prefix_flag) {
- $table_list[] = $this->_db->getPrefix().$prefixed_query[4];
- } else {
- $table_list[] = $prefixed_query[4];
- }
+
+ $sqlFilePathName = MODULE_DIR . '/' . $directory . '/sql/' . $databaseDriver . '/' . _SYS_TABLE_INI;
+ if (!file_exists($sqlFilePathName)) {
+ return $tableNames;
+ }
+
+ $sqlFileSize = filesize($sqlFilePathName);
+ if (empty($sqlFileSize)) {
+ return $tableNames;
+ }
+
+ $handle = fopen($sqlFilePathName, 'r');
+ $sqlContent = fread($handle, $sqlFileSize);
+ fclose($handle);
+
+ $this->splitMySqlFile($sqls, $sqlContent);
+ $tablePrefix = $this->_db->getPrefix();
+ foreach ($sqls as $sql) {
+ $dividedSqls = $this->prefixQuery($sql, $tablePrefix);
+ if (!$dividedSqls) {
+ return $dividedSqls;
+ }
+
+ $tableName = $dividedSqls[4];
+ if ($needPrefix) {
+ $tableName = $tablePrefix . $tableName;
+ }
+
+ if (in_array($tableName, $tableNames)) {
+ continue;
}
+
+ $tableNames[] = $tableName;
}
- return $table_list;
+
+ return $tableNames;
}
-
+
/**
- * 各クエリを配列に格納
- * TODO:今後、自作、メソッドに入れ替え予定
- *
- * @param array the splitted sql commands
- * @param string the sql commands
- * @return boolean always true
- * @access public
- */
+ * 各クエリを配列に格納
+ * TODO:今後、自作、メソッドに入れ替え予定
+ *
+ * @param array the splitted sql commands
+ * @param string the sql commands
+ * @return boolean always true
+ * @access public
+ */
function splitMySqlFile(&$ret, $sql)
{
- $sql = trim($sql);
- $sql_len = strlen($sql);
- $char = '';
- $string_start = '';
- $in_string = false;
-
- for ($i = 0; $i < $sql_len; ++$i) {
- $char = $sql[$i];
-
- // We are in a string, check for not escaped end of
- // strings except for backquotes that can't be escaped
- if ($in_string) {
- for (;;) {
- $i = strpos($sql, $string_start, $i);
+ $sql = trim($sql);
+ $sql_len = strlen($sql);
+ $char = '';
+ $string_start = '';
+ $in_string = false;
+
+ for ($i = 0; $i < $sql_len; ++$i) {
+ $char = $sql[$i];
+
+ // We are in a string, check for not escaped end of
+ // strings except for backquotes that can't be escaped
+ if ($in_string) {
+ for (;;) {
+ $i = strpos($sql, $string_start, $i);
// No end of string found -> add the current
// substring to the returned array
- if (!$i) {
+ if (!$i) {
$ret[] = $sql;
- return true;
- }
- // Backquotes or no backslashes before
- // quotes: it's indeed the end of the
+ return true;
+ }
+ // Backquotes or no backslashes before
+ // quotes: it's indeed the end of the
// string -> exit the loop
- else if ($string_start == '`' || $sql[$i-1] != '\\') {
- $string_start = '';
- $in_string = false;
- break;
- }
- // one or more Backslashes before the presumed
+ else if ($string_start == '`' || $sql[$i-1] != '\\') {
+ $string_start = '';
+ $in_string = false;
+ break;
+ }
+ // one or more Backslashes before the presumed
// end of string...
- else {
+ else {
// first checks for escaped backslashes
- $j = 2;
- $escaped_backslash = false;
+ $j = 2;
+ $escaped_backslash = false;
while ($i-$j > 0 && $sql[$i-$j] == '\\') {
$escaped_backslash = !$escaped_backslash;
- $j++;
- }
- // ... if escaped backslashes: it's really the
+ $j++;
+ }
+ // ... if escaped backslashes: it's really the
// end of the string -> exit the loop
- if ($escaped_backslash) {
- $string_start = '';
- $in_string = false;
+ if ($escaped_backslash) {
+ $string_start = '';
+ $in_string = false;
break;
- }
- // ... else loop
- else {
+ }
+ // ... else loop
+ else {
$i++;
- }
- } // end if...elseif...else
- } // end for
- } // end if (in string)
- // We are not in a string, first check for delimiter...
- else if ($char == ';') {
+ }
+ } // end if...elseif...else
+ } // end for
+ } // end if (in string)
+ // We are not in a string, first check for delimiter...
+ else if ($char == ';') {
// if delimiter found, add the parsed part to the returned array
- $ret[] = substr($sql, 0, $i);
- $sql = ltrim(substr($sql, min($i + 1, $sql_len)));
- $sql_len = strlen($sql);
- if ($sql_len) {
- $i = -1;
- } else {
- // The submited statement(s) end(s) here
- return true;
+ $ret[] = substr($sql, 0, $i);
+ $sql = ltrim(substr($sql, min($i + 1, $sql_len)));
+ $sql_len = strlen($sql);
+ if ($sql_len) {
+ $i = -1;
+ } else {
+ // The submited statement(s) end(s) here
+ return true;
}
- } // end else if (is delimiter)
- // ... then check for start of a string,...
- else if (($char == '"') || ($char == '\'') || ($char == '`')) {
- $in_string = true;
+ } // end else if (is delimiter)
+ // ... then check for start of a string,...
+ else if (($char == '"') || ($char == '\'') || ($char == '`')) {
+ $in_string = true;
$string_start = $char;
- } // end else if (is start of string)
-
- // for start of a comment (and remove this comment if found)...
- else if ($char == '#' || ($char == ' ' && $i > 1 && $sql[$i-2] . $sql[$i-1] == '--')) {
- // starting position of the comment depends on the comment type
- $start_of_comment = (($sql[$i] == '#') ? $i : $i-2);
- // if no "\n" exits in the remaining string, checks for "\r"
- // (Mac eol style)
- $end_of_comment = (strpos(' ' . $sql, "\012", $i+2))
- ? strpos(' ' . $sql, "\012", $i+2)
- : strpos(' ' . $sql, "\015", $i+2);
- if (!$end_of_comment) {
- // no eol found after '#', add the parsed part to the returned
- // array and exit
+ } // end else if (is start of string)
+
+ // for start of a comment (and remove this comment if found)...
+ else if ($char == '#' || ($char == ' ' && $i > 1 && $sql[$i-2] . $sql[$i-1] == '--')) {
+ // starting position of the comment depends on the comment type
+ $start_of_comment = (($sql[$i] == '#') ? $i : $i-2);
+ // if no "\n" exits in the remaining string, checks for "\r"
+ // (Mac eol style)
+ $end_of_comment = (strpos(' ' . $sql, "\012", $i+2))
+ ? strpos(' ' . $sql, "\012", $i+2)
+ : strpos(' ' . $sql, "\015", $i+2);
+ if (!$end_of_comment) {
+ // no eol found after '#', add the parsed part to the returned
+ // array and exit
// RMV fix for comments at end of file
- $last = trim(substr($sql, 0, $i-1));
+ $last = trim(substr($sql, 0, $i-1));
if (!empty($last)) {
$ret[] = $last;
}
- return true;
+ return true;
} else {
- $sql = substr($sql, 0, $start_of_comment) . ltrim(substr($sql, $end_of_comment));
- $sql_len = strlen($sql);
- $i--;
- } // end if...else
- } // end else if (is comment)
- } // end for
-
- // add any rest to the returned array
- if (!empty($sql) && trim($sql) != '') {
+ $sql = substr($sql, 0, $start_of_comment) . ltrim(substr($sql, $end_of_comment));
+ $sql_len = strlen($sql);
+ $i--;
+ } // end if...else
+ } // end else if (is comment)
+ } // end for
+
+ // add any rest to the returned array
+ if (!empty($sql) && trim($sql) != '') {
$ret[] = $sql;
- }
- return true;
+ }
+ return true;
}
/**
* add a prefix.'_' to all tablenames in a query
* TODO:今後、自作、メソッドに入れ替え予定
- * @param string $query valid SQL query string
- * @param string $prefix prefix to add to all table names
+ * @param string $query valid SQL query string
+ * @param string $prefix prefix to add to all table names
* @return mixed FALSE on failure
*/
function prefixQuery($query, $prefix)
diff --git a/html/webapp/components/pages/Action.class.php b/html/webapp/components/pages/Action.class.php
index b4d3535..b55bb0e 100644
--- a/html/webapp/components/pages/Action.class.php
+++ b/html/webapp/components/pages/Action.class.php
@@ -440,77 +440,99 @@ function updThreadNum($parent_id, $thread_num)
/**
* 削除関数呼び出し
- * @param int $room_id 削除対象room_id
- * @param array $modules 削除対象モジュール配列
- * @param string delete_action
+ * @param mix $roomId 削除対象ルームID
+ * @param array $module 削除対象モジュール配列
+ * @param string $deleteAction 削除アクション名称
* @return boolean true or false
- * @access public
+ * @access public
*/
- function delFuncExec($room_id, &$module, $delete_action = null)
+ function delFuncExec($roomId, $module, $deleteAction = null)
{
- if($delete_action == "auto") {
- $action_name = $module['action_name'];
- $pathList = explode("_", $action_name);
+ if (empty($roomId)) {
+ return true;
+ }
+
+ if (!strlen($deleteAction)) {
+ return true;
+ }
+
+ $roomIds = $roomId;
+ if (!is_array($roomId)) {
+ $roomIds = array($roomId);
+ }
+
+ if ($deleteAction == 'auto') {
+ $inValue = '';
+ foreach ($roomIds as $roomId) {
+ $inValue .= intval($roomId) . ',';
+ }
+ $inValue = substr($inValue, 0, -1);
+
+ $actionName = $module['action_name'];
+ $pathList = explode('_', $actionName);
$dirname = $pathList[0];
- //テーブルリスト取得
- $table_list = $this->databaseSqlutility->getTableList($dirname);
- if(!is_array($table_list)) {
- // 配列でなければエラーとする
+ // 使用しているテーブル名配列を取得
+ $tables = $this->databaseSqlutility->getTableList($dirname);
+ if (!is_array($tables)) {
return false;
}
- //自動的に削除
- $where_params = array(
- "room_id" => $room_id
- );
- $error = false;
-
- foreach ($table_list as $table_name) {
- //ルームIDより削除処理。ルームIDがなければ、処理しない
- $result = $this->_db->execute("DESCRIBE ".$table_name." room_id");
- if(is_array($result) && isset($result[0])) {
- $result = $this->_db->execute("DELETE FROM ".$table_name." WHERE room_id=?" .
- " ",$where_params);
- if(!$result) {
- $error = true;
- }
+ $isError = false;
+ foreach ($tables as $table) {
+ $sql = "DESCRIBE " . $table . " room_id";
+ $result = $this->_db->execute($sql);
+ if ($result === false) {
+ $isError = true;
+ }
+
+ if (count($result) == 0) {
+ continue;
+ }
+
+ $sql = "DELETE FROM " . $table . " "
+ . "WHERE room_id IN (" . $inValue . ")";
+ if (!$this->_db->execute($sql)) {
+ $this->_db->addError();
+ $isError = true;
}
}
- if($error) return false;
- } elseif($delete_action == "" || $delete_action === null) {
- //なにもしない
} else {
- //
- //削除関数呼び出し
- //
- $pathList = explode("_", $delete_action);
- $ucPathList = array_map('ucfirst', $pathList);
-
- $basename = ucfirst($pathList[count($pathList) - 1]);
-
- $actionPath = join("/", $pathList);
- $className = join("_", $ucPathList);
- $filename = MODULE_DIR . "/${actionPath}/${basename}.class.php";
- if (@file_exists($filename)) {
- $pagesView =& $this->_container->getComponent("pagesView");
- $page =& $pagesView->getPageById($room_id);
- if($page === false || !isset($page['page_id'])) {
- return false;
+ $pathList = explode('_', $deleteAction);
+ $ucPathList = array_map('ucfirst', $pathList);
+ $basename = ucfirst($pathList[count($pathList) - 1]);
+
+ $actionPath = join('/', $pathList);
+ $className = join('_', $ucPathList);
+ $filename = MODULE_DIR . "/${actionPath}/${basename}.class.php";
+ if (!file_exists($filename)) {
+ return false;
+ }
+
+ $isError = false;
+ $pagesView =& $this->_container->getComponent('pagesView');
+ foreach ($roomIds as $roomId) {
+ $page =& $pagesView->getPageById($roomId);
+ if (empty($page)) {
+ $isError = true;
}
- //ブロック削除アクション
$params = array(
- 'action' => $delete_action,
- 'mode' => "delete",
- 'page_id'=> $page['page_id'],
- 'room_id'=> $room_id
- );
- $result = $this->preexecuteMain->preExecute($delete_action, $params);
- if($result === false || $result === "false") {
- return false;
+ 'action' => $deleteAction,
+ 'mode' => 'delete',
+ 'page_id'=> $page['page_id'],
+ 'room_id'=> $roomId
+ );
+ $result = $this->preexecuteMain->preExecute($deleteAction, $params);
+ if ($result === false
+ || $result === "false") {
+ $isError = true;
}
- }
+ }
+ }
+
+ if ($isError) {
+ return false;
}
return true;
}
@@ -687,5 +709,284 @@ function &_fetchcallbackGetChildPages($result, $page) {
}
return $ret;
}
+
+ /**
+ * サブグループも含めたルームデータを削除する
+ *
+ * @param string $roomId ページID
+ * @return boolean true or false
+ * @access public
+ */
+ function deleteRoom($roomId)
+ {
+ $roomId = intval($roomId);
+
+ $sql = "SELECT page_id "
+ . "FROM {pages} "
+ . "WHERE parent_id = ? "
+ . "AND page_id = room_id";
+ $subRooms =& $this->_db->execute($sql, $roomId);
+ if ($subRooms === false) {
+ $this->_db->addError();
+ return false;
+ }
+
+ foreach ($subRooms as $subRoom) {
+ $pageId = $subRoom['page_id'];
+ if (!$this->deleteRoom($pageId)) {
+ return false;
+ }
+ }
+
+ if (!$this->deleteLowestRoom($roomId)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * サブグループがないルームデータを削除する
+ *
+ * @param string $roomId ルームID
+ * @return boolean true or false
+ * @access public
+ */
+ function deleteLowestRoom($roomId)
+ {
+ $pagesView =& $this->_container->getComponent('pagesView');
+ $modules =& $pagesView->getUsableModulesByRoom($roomId);
+ if ($modules === false) {
+ return false;
+ }
+
+ if (!$this->deleteEachModule($roomId, $modules)) {
+ return false;
+ }
+
+ if (!$this->deleteRoomModule($roomId, null)) {
+ return false;
+ }
+
+ $columnValues = array(
+ 'room_id' => $roomId
+ );
+ if (!$this->_db->deleteExecute('pages_users_link', $columnValues)) {
+ return false;
+ }
+
+ $inValue = '';
+ $sql = "SELECT page_id, "
+ . "room_id, "
+ . "parent_id, "
+ . "display_sequence, "
+ . "lang_dirname, "
+ . "private_flag "
+ . "FROM {pages} "
+ . "WHERE room_id = ?";
+ $pages =& $this->_db->execute($sql, $roomId);
+ if ($pages === false) {
+ $this->_db->addError();
+ return false;
+ }
+ foreach ($pages as $page) {
+ $inValue .= $page['page_id'] . ',';
+
+ if ($page['page_id'] == $page['room_id']) {
+ $parentId = $page['parent_id'];
+ $sequence = $page['display_sequence'];
+ $language = $page['lang_dirname'];
+ $isPrivate = $page['private_flag'];
+ }
+ }
+
+ if (empty($inValue)) {
+ return false;
+ }
+ $inValue = substr($inValue, 0, -1);
+ if (!$this->deletePagesByInOperator($inValue)) {
+ return false;
+ }
+
+ if (!empty($parentId)
+ && !$this->decrementDisplaySeq($parentId, $sequence, $language)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * 各モジュール削除処理を呼出す。
+ *
+ * @param mix $roomId ルームID
+ * @param array $modules モジュールデータ配列
+ * @return boolean true or false
+ * @access public
+ */
+ function deleteEachModule($roomId, $modules)
+ {
+ foreach ($modules as $module) {
+ $actionName = $module['delete_action'];
+ if (!strlen($actionName)) {
+ continue;
+ }
+
+ if (!$this->delFuncExec($roomId, $module, $actionName)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * ルームモジュールデータを削除する。
+ *
+ * @param string $roomId ルームID
+ * @param array $moduleIds モジュールID配列
+ * @return boolean true or false
+ * @access public
+ */
+ function deleteRoomModule($roomId, $moduleIds)
+ {
+ if (isset($roomId)
+ && is_array($moduleIds)
+ && empty($moduleIds)) {
+ return true;
+ }
+
+ $whereClause = '';
+ $bindValues = array();
+ if (!empty($roomId)) {
+ $whereClause .= "room_id = ? ";
+ $bindValues = array(
+ $roomId
+ );
+ }
+ if (!empty($roomId)
+ && !empty($moduleIds)) {
+ $whereClause .= "AND ";
+ }
+ if (!empty($moduleIds)) {
+ $whereClause .= "module_id IN ('" . implode("','", $moduleIds) . "')";
+ }
+
+ $sql = "DELETE FROM {pages_modules_link} "
+ . "WHERE " . $whereClause;
+ if (!$this->_db->execute($sql, $bindValues)) {
+ $this->_db->addError();
+ return false;
+ }
+
+ $uploadsAction =& $this->_container->getComponent('uploadsAction');
+ if (!$uploadsAction->deleteByWhereClause($whereClause, $bindValues)) {
+ return false;
+ }
+
+ $whatsnewAction =& $this->_container->getComponent('whatsnewAction');
+ if (!$whatsnewAction->deleteByWhereClause($whereClause, $bindValues)) {
+ return false;
+ }
+
+ $abbreviateurlAction =& $this->_container->getComponent('abbreviateurlAction');
+ if (!$abbreviateurlAction->deleteByWhereClause($whereClause, $bindValues)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * IN演算子でページデータ、および、ページIDに関係するデータを削除する
+ *
+ * @param string $inValue IN演算子の値（カンマ区切り）
+ * @return boolean true or false
+ * @access public
+ */
+ function deletePagesByInOperator($inValue)
+ {
+ if (empty($inValue)) {
+ return true;
+ }
+
+ $sql = "SELECT B.block_id, "
+ . "B.page_id, "
+ . "B.module_id, "
+ . "B.action_name, "
+ . "M.block_delete_action "
+ . "FROM {blocks} B "
+ . "LEFT JOIN {modules} M "
+ . "ON B.module_id = M.module_id "
+ . "WHERE B.page_id IN (" . $inValue . ")";
+ $blocks =& $this->_db->execute($sql);
+ if ($blocks === false) {
+ $this->_db->addError();
+ return false;
+ }
+
+ $blocksAction =& $this->_container->getComponent('blocksAction');
+ foreach ($blocks as $block) {
+ $blockId = $block['block_id'];
+ $actionName = $block['block_delete_action'];
+ if (!strlen($actionName)) {
+ continue;
+ }
+
+ if (!$blocksAction->delFuncExec($blockId, $block, $actionName)) {
+ return false;
+ }
+ }
+
+ if (!$this->deleteByInOperator('blocks', $inValue)) {
+ return false;
+ }
+
+ if (!$this->deleteByInOperator('menu_detail', $inValue)) {
+ return false;
+ }
+
+ if (!$this->deleteByInOperator('mobile_menu_detail', $inValue)) {
+ return false;
+ }
+
+ if (!$this->deleteByInOperator('pages_meta_inf', $inValue)) {
+ return false;
+ }
+
+ if (!$this->deleteByInOperator('pages_style', $inValue, 'set_page_id')) {
+ return false;
+ }
+
+ if (!$this->deleteByInOperator('pages', $inValue)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * IN演算子でデータを削除する。
+ *
+ * @param string $tableName 対象テーブル名称
+ * @param string $inValue IN演算子の値（カンマ区切り文字列）
+ * @return boolean true or false
+ * @access public
+ */
+ function deleteByInOperator($tableName, $inValue, $columnName = 'page_id')
+ {
+ if (empty($inValue)) {
+ return true;
+ }
+
+ $sql = "DELETE FROM {" . $tableName . "} "
+ . "WHERE " . $columnName . " IN (" . $inValue . ")";
+ if (!$this->_db->execute($sql)) {
+ $this->_db->addError();
+ return false;
+ }
+
+ return true;
+ }
}
?>
diff --git a/html/webapp/components/pages/View.class.php b/html/webapp/components/pages/View.class.php
index 62f3b82..bab3b6c 100644
--- a/html/webapp/components/pages/View.class.php
+++ b/html/webapp/components/pages/View.class.php
@@ -598,5 +598,52 @@ function getGroupWhereStatement()
return $whereStatement;
}
+
+ /**
+ * ルームで使用可能なモジュールデータ配列を取得する
+ *
+ * @param string $roomId ルームID
+ * @return array ルームで使用可能なモジュールデータ配列
+ * @access public
+ */
+ function &getUsableModulesByRoom($roomId, $useIdAsKey = false)
+ {
+ $fetchFunction = null;
+ if ($useIdAsKey) {
+ $fetchFunction = array($this, '_fetchModule');
+ }
+
+ $sql = "SELECT M.module_id, "
+ . "M.action_name, "
+ . "M.delete_action "
+ . "FROM {modules} M "
+ . "INNER JOIN {pages_modules_link} PM "
+ . "ON M.module_id = PM.module_id "
+ . "WHERE PM.room_id = ?";
+ $modules =& $this->_db->execute($sql, $roomId, null, null, true, $fetchFunction);
+ if ($modules === false) {
+ $this->_db->addError();
+ }
+
+ return $modules;
+ }
+
+ /**
+ * モジュールIDをキーとしたモジュールデータ配列を作成する。
+ *
+ * @param object $recordSet モジュールデータADORecordSetオブジェクト
+ * @return string 指定文字区切りの文字列
+ * @access private
+ */
+ function &_fetchModule(&$recordSet)
+ {
+ $modules = array();
+ while ($module = $recordSet->fetchRow()) {
+ $moduleId = $module['module_id'];
+ $modules[$moduleId] = $module;
+ }
+
+ return $modules;
+ }
}
?>
diff --git a/html/webapp/components/uploads/Action.class.php b/html/webapp/components/uploads/Action.class.php
index 1c341c8..fce1a68 100644
--- a/html/webapp/components/uploads/Action.class.php
+++ b/html/webapp/components/uploads/Action.class.php
@@ -355,61 +355,40 @@ function _delUploadFile($upload_id, $upload = null)
}
/**
- * module_idによるUploads削除処理
- * @param int module_id
+ * 条件に該当するアップロードデータを削除する。
+ *
+ * @param string $whereClause where句文字列
+ * @param array $bindValues バインド値配列
* @return boolean true or false
* @access public
*/
- function delUploadsByModuleid($module_id)
+ function deleteByWhereClause($whereClause, $bindValues)
{
- $where_params = array(
- "module_id" => $module_id
- );
- $uploads =& $this->_db->selectExecute("uploads", $where_params);
- if($uploads === false) {
- return false;
- }
- foreach($uploads as $upload) {
- $this->_delUploadFile($upload["upload_id"], $upload);
- }
-
- $result = $this->_db->execute("DELETE FROM {uploads} WHERE module_id=?" .
- " ",$where_params);
-
- if($result === false) {
- //エラーが発生した場合、エラーリストに追加
+ $sql = "SELECT upload_id, "
+ . "physical_file_name, "
+ . "file_path, "
+ . "extension "
+ . "FROM {uploads} "
+ . "WHERE " . $whereClause;
+ $uploads = $this->_db->execute($sql, $bindValues);
+ if ($uploads === false) {
$this->_db->addError();
return false;
}
- return true;
- }
-
-
- /**
- * room_idによるUploads削除処理
- * @param int room_id
- * @return boolean true or false
- * @access public
- */
- function delUploadsByRoomid($room_id)
- {
- $where_params = array(
- "room_id" => $room_id
- );
- $uploads =& $this->_db->selectExecute("uploads", $where_params);
- if($uploads === false) {
- return false;
- }
+ $inValue = '';
foreach($uploads as $upload) {
- $this->_delUploadFile($upload["upload_id"], $upload);
+ $this->_delUploadFile($upload['upload_id'], $upload);
+ $inValue .= $upload['upload_id'] . ',';
+ }
+ if (empty($inValue)) {
+ return true;
}
- $result = $this->_db->execute("DELETE FROM {uploads} WHERE room_id=?" .
- " ",$where_params);
-
- if($result === false) {
- //エラーが発生した場合、エラーリストに追加
+ $inValue = substr($inValue, 0, -1);
+ $sql = "DELETE FROM {uploads} "
+ . "WHERE upload_id IN (" . $inValue . ")";
+ if (!$this->_db->execute($sql)) {
$this->_db->addError();
return false;
}
diff --git a/html/webapp/components/users/Action.class.php b/html/webapp/components/users/Action.class.php
index c79d16c..f4c863a 100644
--- a/html/webapp/components/users/Action.class.php
+++ b/html/webapp/components/users/Action.class.php
@@ -65,7 +65,7 @@ function insUser($params=array()) {
// Hash値で同じものがないか念のためチェック
$result = $this->_db->selectExecute("users", array("user_id" => $user_id));
if ($result === false) {
- return false;
+ return false;
}
if(!isset($result[0]['user_id'])) {
break;
@@ -105,7 +105,7 @@ function insItem($params=array()) {
function insItemDesc($item_id, $params=array()) {
$db_params = array("item_id"=>0);
$db_params = array_merge($db_params, $params);
- $db_params["item_id"] = $item_id;
+ $db_params["item_id"] = $item_id;
return $this->_db->insertExecute("items_desc", $db_params);
}
@@ -120,7 +120,7 @@ function insItemDesc($item_id, $params=array()) {
function insItemOptions($item_id, $params=array()) {
$db_params = array("item_id"=>0);
$db_params = array_merge($db_params, $params);
- $db_params["item_id"] = $item_id;
+ $db_params["item_id"] = $item_id;
return $this->_db->insertExecute("items_options", $db_params);
}
@@ -308,8 +308,8 @@ function delUsersItemsLinkById($item_id, $user_id = null)
}
$result = $this->_db->deleteExecute("users_items_link", $params);
if ($result === false) {
- $this->_db->addError();
- return $result;
+ $this->_db->addError();
+ return $result;
}
return true;
}
@@ -328,8 +328,8 @@ function delItemDescById($item_id)
);
$result = $this->_db->deleteExecute("items_desc", $params);
if ($result === false) {
- $this->_db->addError();
- return $result;
+ $this->_db->addError();
+ return $result;
}
return true;
}
@@ -348,9 +348,164 @@ function delItemOptionsById($item_id)
);
$result = $this->_db->deleteExecute("items_options", $params);
if ($result === false) {
- $this->_db->addError();
- return $result;
+ $this->_db->addError();
+ return $result;
+ }
+ return true;
+ }
+
+ /**
+ * 会員データを削除する
+ *
+ * @param mix $roomId 削除対象ルームID
+ * @return boolean true or false
+ * @access public
+ */
+ function deleteUser($userId)
+ {
+ if (empty($userId)) {
+ return true;
+ }
+
+ $userIds = $userId;
+ if (!is_array($userId)) {
+ $userIds = array($userId);
+ }
+ $inValue = "'" . implode("','", $userIds) . "'";
+
+ $sql = "SELECT P.room_id, "
+ . "U.role_authority_id "
+ . "FROM {pages} P "
+ . "INNER JOIN {users} U "
+ . "ON P.insert_user_id = U.user_id "
+ . "WHERE P.thread_num = ? "
+ . "AND P.private_flag = ? "
+ . "AND P.space_type = ? "
+ . "AND P.insert_user_id IN (" . $inValue . ")";
+ $bindValues = array(
+ 0,
+ _ON,
+ _SPACE_TYPE_GROUP
+ );
+ $privateRoomsPerRole = $this->_db->execute($sql, $bindValues, null, null, true, array($this, '_fetchPrivateRoomPerRole'));
+
+ $roles = array_keys($privateRoomsPerRole);
+ $sql = "SELECT M.action_name, "
+ . "M.delete_action, "
+ . "AM.role_authority_id "
+ . "FROM {modules} M "
+ . "INNER JOIN {authorities_modules_link} AM "
+ . "ON M.module_id = AM.module_id "
+ . "WHERE M.system_flag = ? "
+ . "AND AM.role_authority_id IN ('" . implode("','", $roles) . "')";
+ $bindValues = array(
+ _OFF
+ );
+ $modulesPerRole =& $this->_db->execute($sql, $bindValues, null, null, true, array($this, '_fetchModulePerRole'));
+ if ($modulesPerRole === false) {
+ return false;
}
+
+ $pagesAction =& $this->_container->getComponent('pagesAction');
+ foreach ($privateRoomsPerRole as $roleId => $privateRooms) {
+ if (!$pagesAction->deleteEachModule($privateRooms, $modulesPerRole[$roleId])) {
+ return false;
+ }
+
+ foreach ($privateRooms as $roomId) {
+ if (!$pagesAction->deleteRoom($roomId)) {
+ return false;
+ }
+ }
+ }
+
+ if (!$this->deleteByInOperator('users', $inValue)) {
+ return false;
+ }
+
+ if (!$this->deleteByInOperator('users_items_link', $inValue)) {
+ return false;
+ }
+
+ if (!$this->deleteByInOperator('pages_users_link', $inValue)) {
+ return false;
+ }
+
+ $sql = "UPDATE {uploads} "
+ . "SET "
+ . "garbage_flag = ? "
+ . "WHERE action_name = ? "
+ . "AND unique_id IN (" . $inValue . ") "
+ . "AND garbage_flag = ?";
+ $bindValues = array(
+ _ON,
+ 'common_download_user',
+ _OFF
+ );
+ if (!$this->_db->execute($sql, $bindValues)) {
+ $this->_db->addError();
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * ロール毎のプライベートスペースデータ配列を作成する。
+ *
+ * @param object $recordSet プライベートスペースデータADORecordSet
+ * @return array モジュールデータ配列
+ * @access public
+ */
+ function _fetchPrivateRoomPerRole($recordSet)
+ {
+ $privateRoomsPerRole = array();
+ while ($privateRoom = $recordSet->fetchRow()) {
+ $roleId = $privateRoom['role_authority_id'];
+ $privateRoomsPerRole[$roleId][] = $privateRoom['room_id'];
+ }
+
+ return $privateRoomsPerRole;
+ }
+
+ /**
+ * ロール毎にモジュールデータ配列を作成する
+ *
+ * @param array $recordSet タスクADORecordSet
+ * @return array モジュールデータ配列
+ * @access private
+ */
+ function _fetchModulePerRole($recordSet) {
+ $modulesPerRole = array();
+ while ($module = $recordSet->fetchRow()) {
+ $roleId = $module['role_authority_id'];
+ $modulesPerRole[$roleId][] = $module;
+ }
+
+ return $modulesPerRole;
+ }
+
+ /**
+ * IN演算子でデータを削除する。
+ *
+ * @param string $tableName 対象テーブル名称
+ * @param string $inValue IN演算子の値（カンマ区切り文字列）
+ * @return boolean true or false
+ * @access public
+ */
+ function deleteByInOperator($tableName, $inValue)
+ {
+ if (empty($inValue)) {
+ return true;
+ }
+
+ $sql = "DELETE FROM {" . $tableName . "} "
+ . "WHERE user_id IN (" . $inValue . ")";
+ if (!$this->_db->execute($sql)) {
+ $this->_db->addError();
+ return false;
+ }
+
return true;
}
}
diff --git a/html/webapp/components/users/View.class.php b/html/webapp/components/users/View.class.php
index a1a68a1..76e19af 100644
--- a/html/webapp/components/users/View.class.php
+++ b/html/webapp/components/users/View.class.php
@@ -927,7 +927,7 @@ function &createSearchWhereString() {
$othersSearchAuthority = false;
$actionName = $actionChain->getCurActionName();
- if ($session->getParameter('_auth_id') == _AUTH_ADMIN
+ if ($session->getParameter('_user_auth_id') == _AUTH_ADMIN
|| $actionName == 'room_action_admin_search') {
$othersSearchAuthority = true;
}
@@ -1049,10 +1049,10 @@ function &_fetchRoomUser($result, $func_params)
$absence_users = array(); //不参加会員
$absence_rooms = array(); //不参加会員がいるルームID配列
while ($row = $result->fetchRow()) {
- if($row['role_authority_id'] == _ROLE_AUTH_OTHER) {
+ if ($row['role_authority_id'] == _ROLE_AUTH_OTHER) {
//不参加会員
$absence_users[$row['user_id']] = $row['user_id'];
- $absence_rooms[$row['room_id']] = $row['room_id'];
+ $absence_rooms[$row['room_id']][] = $row['user_id'];
} else {
$presence_users[$row['user_id']] = $row['user_id'];
}
@@ -1061,16 +1061,22 @@ function &_fetchRoomUser($result, $func_params)
return $presence_users;
}
- // 不参加会員が誰もいないデフォルト参加ルームがある場合は全ての会員から検索する
- foreach($default_entry_room_arr as $room_id) {
- if(!isset($absence_rooms[$room_id])) {
+ $noParticipationRoomUsers = array();
+ foreach ($default_entry_room_arr as $room_id) {
+ // 不参加会員が誰もいないデフォルト参加ルームがある場合は全ての会員から検索する
+ if (!isset($absence_rooms[$room_id])) {
$absence_users = array();
return $absence_users;
}
+
+ if (empty($noParticipationRoomUsers)) {
+ $noParticipationRoomUsers = $absence_rooms[$room_id];
+ }
+ $noParticipationRoomUsers = array_intersect($noParticipationRoomUsers, $absence_rooms[$room_id]);
}
// 参加会員配列にいない不参加会員を取得
- $absence_users = array_diff($absence_users, $presence_users);
+ $absence_users = array_diff($noParticipationRoomUsers, $presence_users);
// 不参加者を返す
return $absence_users;
diff --git a/html/webapp/components/whatsnew/Action.class.php b/html/webapp/components/whatsnew/Action.class.php
index c1aad0f..2e80964 100644
--- a/html/webapp/components/whatsnew/Action.class.php
+++ b/html/webapp/components/whatsnew/Action.class.php
@@ -416,7 +416,7 @@ function _deleteUser(&$recordSet)
*/
function _deletePeriod($moduleId, $roomIds)
{
- //if (rand(0, 10) != 0) { return true; }
+ if (rand(0, 10) != 0) { return true; }
$modulesView =& $this->_container->getComponent('modulesView');
$module = $modulesView->getModuleByDirname('whatsnew');
@@ -499,13 +499,14 @@ function _deletePeriod($moduleId, $roomIds)
}
/**
- * ルームIDで新着データを削除する
- *
- * @param string $roomId ルームID
+ * 条件に該当する新着データを削除する。
+ *
+ * @param string $whereClause where句文字列
+ * @param array $bindValues バインド値配列
* @return boolean true or false
- * @access public
+ * @access public
*/
- function deleteByRoomId($roomId)
+ function deleteByWhereClause($whereClause, $bindValues)
{
$module =& $this->_modulesView->getModuleByDirname('whatsnew');
if (!$module) {
@@ -514,9 +515,9 @@ function deleteByRoomId($roomId)
$sql = "SELECT whatsnew_id "
. "FROM {whatsnew} "
- . "WHERE room_id = ? ";
- $inValue = $this->_db->execute($sql, $roomId, null, null, false, array($this, '_createDelimitedString'));
- if ($inValue == false) {
+ . "WHERE " . $whereClause;
+ $inValue = $this->_db->execute($sql, $bindValues, null, null, false, array($this, '_createDelimitedString'));
+ if ($inValue === false) {
$this->_db->addError();
return false;
}
@@ -524,13 +525,11 @@ function deleteByRoomId($roomId)
if (!$this->_deleteByInOperator('whatsnew_user', $inValue)) {
return false;
}
-
- $sql = "DELETE FROM {whatsnew} "
- . "WHERE room_id = ? ";
- if (!$this->_db->execute($sql, $roomId)) {
- $this->_db->addError();
+ if (!$this->_deleteByInOperator('whatsnew', $inValue)) {
return false;
}
+
+ return true;
}
/**
@@ -541,13 +540,14 @@ function deleteByRoomId($roomId)
* @return string 指定文字区切りの文字列
* @access private
*/
- function &_createDelimitedIdString(&$recordSet, $glue = ',')
+ function &_createDelimitedString(&$recordSet, $glue = ',')
{
$string = '';
while ($whatsnew = $recordSet->fetchRow()) {
$string .= $whatsnew[0]. $glue;
}
- if (!strlen($glue)) {
+ if (strlen($string)
+ && strlen($glue)) {
$string = substr($string, 0, strlen($glue) * -1);
}
diff --git a/html/webapp/modules/backup/action/main/init/Init.class.php b/html/webapp/modules/backup/action/main/init/Init.class.php
index e058ba5..73008ff 100644
--- a/html/webapp/modules/backup/action/main/init/Init.class.php
+++ b/html/webapp/modules/backup/action/main/init/Init.class.php
@@ -879,7 +879,6 @@ function _createDumpXML($page_id, $child_flag = false)
$pathList = explode("_",$module['action_name']);
$dirname =$pathList[0];
$tableList = $this->databaseSqlutility->getTableList($dirname, false);
- if($tableList === false) continue;
foreach($tableList as $table) {
$metaColumns = $adodb->MetaColumns($this->db->getPrefix().$table);
if(isset($metaColumns["ROOM_ID"])) {
diff --git a/html/webapp/modules/menu/action/edit/deletepage/Deletepage.class.php b/html/webapp/modules/menu/action/edit/deletepage/Deletepage.class.php
index 0f09773..0ae6b7a 100644
--- a/html/webapp/modules/menu/action/edit/deletepage/Deletepage.class.php
+++ b/html/webapp/modules/menu/action/edit/deletepage/Deletepage.class.php
@@ -14,31 +14,27 @@
*/
class Menu_Action_Edit_Deletepage extends Action
{
- // リクエストパラメータを受け取るため
- var $main_page_id = null;
- var $block_id = null;
-
- // 使用コンポーネントを受け取るため
- var $session = null;
- var $pagesView = null;
- var $pagesAction = null;
- var $blocksAction = null;
- var $menuAction = null;
- var $blocksView = null;
-
- // 値をセットするため
- var $url = null;
-
- var $del_page_arr = array();
-
- /**
- * ページ追加アクション
- *
- * @access public
- */
- function execute()
- {
- $page_id = intval($this->main_page_id);
+ // リクエストパラメータを受け取るため
+ var $main_page_id = null;
+ var $block_id = null;
+
+ // 使用コンポーネントを受け取るため
+ var $session = null;
+ var $pagesView = null;
+ var $pagesAction = null;
+ var $db = null;
+
+ // 値をセットするため
+ var $url = null;
+
+ /**
+ * ページ追加アクション
+ *
+ * @access public
+ */
+ function execute()
+ {
+ $page_id = intval($this->main_page_id);
$page =& $this->pagesView->getPageById($page_id);
if($page === false || !isset($page['page_id'])) {
return 'error';
@@ -47,53 +43,39 @@ function execute()
//深さが0 または、ルーム
return 'error';
}
- //ページ削除
- if(!$this->pagesAction->delPageById($page_id)) {
- return 'error';
- }
- //ページスタイル削除
- if(!$this->pagesAction->delPageStyleById($page_id)) {
- return 'error';
- }
-
- //pages_meta_infテーブル削除
- if(!$this->pagesAction->delPageMetaInfById($page_id)) {
- return 'error';
- }
-
- //表示順decrement
- if(!$this->pagesAction->decrementDisplaySeq($page['parent_id'], $page['display_sequence'], $page['lang_dirname'])) {
- return 'error';
+
+ $pageIds = array($page_id);
+ $hasChildPageIds = array();
+ if ($page['node_flag']) {
+ $hasChildPageIds = $pageIds;
}
- //削除関数を呼び出し
- $blocks =& $this->blocksView->getBlockByPageId($page_id);
- if(isset($blocks[0])) {
- foreach($blocks as $block) {
- $this->blocksAction->delFuncExec($block['block_id']);
+
+ while (!empty($hasChildPageIds)) {
+ $sql = "SELECT page_id, "
+ . "node_flag "
+ . "FROM {pages} "
+ . "WHERE parent_id IN (" . implode(',', $hasChildPageIds) . ")";
+ $childPages = $this->db->execute($sql);
+ if ($childPages === false) {
+ $this->db->addError();
+ return 'error';
+ }
+
+ $hasChildPageIds = array();
+ foreach ($childPages as $childPage) {
+ if ($childPage['node_flag']) {
+ $hasChildPageIds[] = $childPage['page_id'];
+ }
+ $pageIds[] = $childPage['page_id'];
}
}
-
- //ブロックテーブル削除
- if(!$this->blocksAction->delBlockByPageId($page_id)) {
- return 'error';
- }
- //メニュー詳細テーブル削除
- if(!$this->menuAction->delMenuDetailByPageId($page_id)) {
- return 'error';
- }
- //携帯メニュー詳細テーブル削除
- if(!$this->menuAction->delMobileMenuDetailByPageId($page_id)) {
+
+ $inValue = implode(',', $pageIds);
+ if (!$this->pagesAction->deletePagesByInOperator($inValue)) {
return 'error';
}
- $this->del_page_arr[] = $page_id;
- if($page['node_flag']) {
- //子供を再帰的に削除
- if(!$this->_delPageChildren($page['page_id'])) {
- return 'error';
- }
- }
- if(in_array($this->session->getParameter("_main_page_id"), $this->del_page_arr)) {
+ if(in_array($this->session->getParameter("_main_page_id"), $pageIds)) {
$this->session->setParameter("_editing_block_id", intval($this->block_id));
//再表示URL
@@ -102,45 +84,6 @@ function execute()
$this->url = "true";
}
return 'success';
- }
-
- function _delPageChildren($parent_id) {
- $ret = true;
- $pages = $this->pagesView->getPages(array("parent_id"=>$parent_id));
- if(isset($pages[0])) {
- foreach($pages as $page) {
- if($page['node_flag']) {
- //子供を再帰的に削除
- $this->_delPageChildren($page['page_id']);
- }
- $this->del_page_arr[] = $page['page_id'];
- if(!$this->pagesAction->delPageById($page['page_id'])) {
- $ret = false;
- }
- //ページスタイル削除
- if(!$this->pagesAction->delPageStyleById($page['page_id'])) {
- $ret = false;
- }
- //pages_meta_infテーブル削除
- if(!$this->pagesAction->delPageMetaInfById($page['page_id'])) {
- $ret = false;
- }
- //削除関数を呼び出し
- $blocks =& $this->blocksView->getBlockByPageId($page['page_id']);
- if(isset($blocks[0])) {
- foreach($blocks as $block) {
- $this->blocksAction->delFuncExec($block['block_id']);
- }
- }
- if(!$this->blocksAction->delBlockByPageId($page['page_id'])) {
- $ret = false;
- }
- if(!$this->menuAction->delMenuDetailByPageId($page['page_id'])) {
- $ret = false;
- }
- }
- }
- return $ret;
- }
+ }
}
?>
diff --git a/html/webapp/modules/menu/action/edit/deletepage/maple.ini b/html/webapp/modules/menu/action/edit/deletepage/maple.ini
index 0996510..401fa5e 100644
--- a/html/webapp/modules/menu/action/edit/deletepage/maple.ini
+++ b/html/webapp/modules/menu/action/edit/deletepage/maple.ini
@@ -7,9 +7,7 @@ main_page_id.menu.delete = "1:lang.menu_error_last_page"
session = "ref:Session"
pagesView = "ref:pagesView"
pagesAction = "ref:pagesAction"
-blocksAction = "ref:blocksAction"
-menuAction = "ref:menuAction"
-blocksView = "ref:blocksView"
+db = "ref:DbObject"
[View]
success = "common:menu_action_edit_deletepage.html"
diff --git a/html/webapp/modules/module/action/admin/uninstall/Uninstall.class.php b/html/webapp/modules/module/action/admin/uninstall/Uninstall.class.php
index 75d7155..df2bdb0 100644
--- a/html/webapp/modules/module/action/admin/uninstall/Uninstall.class.php
+++ b/html/webapp/modules/module/action/admin/uninstall/Uninstall.class.php
@@ -231,10 +231,10 @@ function execute()
}
}
}
- if($this->uploadsAction->delUploadsByModuleid($this->upd_module_id) && $del_flag) {
- $this->_setMes(MODULE_MES_RESULT_UPLOADS_EN,1);
- }
-
+ if ($del_flag) {
+ $this->_setMes(MODULE_MES_RESULT_UPLOADS_EN,1);
+ }
+
// ----------------------------------------------
// --- モジュールテーブルのデータ削除 ---
// ----------------------------------------------
@@ -266,8 +266,7 @@ function execute()
// --- ページモジュールリンクデータ削除 ---
// ----------------------------------------------------------------------
$this->_setMes(sprintf(MODULE_MES_RESULT_DELETE_ST,MODULE_PAGES_MODULES_LINK_TABLE_NAME),1);
- if($this->pagesAction->delPagesModulesLink(array("module_id" => $this->upd_module_id))) {
- //削除成功
+ if ($this->pagesAction->deleteRoomModule(null, array($this->upd_module_id))) {
$this->_setMes(sprintf(MODULE_MES_RESULT_DELETE_EN,MODULE_PAGES_MODULES_LINK_TABLE_NAME),1);
} else {
$this->_setMes(sprintf(MODULE_MES_RESULT_DELETE_ER,MODULE_PAGES_MODULES_LINK_TABLE_NAME),1);
diff --git a/html/webapp/modules/room/action/admin/delete/Delete.class.php b/html/webapp/modules/room/action/admin/delete/Delete.class.php
index eb6783e..98539a2 100644
--- a/html/webapp/modules/room/action/admin/delete/Delete.class.php
+++ b/html/webapp/modules/room/action/admin/delete/Delete.class.php
@@ -15,207 +15,23 @@
class Room_Action_Admin_Delete extends Action
{
// パラメータを受け取るため
- var $parent_page_id = null;
var $edit_current_page_id = null;
-
- // バリデートによりセット
- var $parent_page = null;
- var $page = null;
-
- // 使用コンポーネントを受け取るため
- var $pagesView = null;
- var $pagesAction = null;
- var $blocksView = null;
- var $modulesView = null;
- var $preexecuteMain = null;
- var $blocksAction = null;
- var $db = null;
- var $uploadsAction = null;
-
- /**
- * ルーム削除処理
- *
- * @access public
- */
- function execute()
- {
- $result = $this->_delRoom(intval($this->edit_current_page_id));
- if($result === false) return 'error';
- return 'success';
- }
-
- /**
- * 削除処理
- * @param int current_page_id
- * @return boolean
- * @access private
- */
- function _delRoom($current_page_id) {
- $log =& LogFactory::getLog();
-
- // ----------------------------------------------------------------------
- // --- サブグループ ---
- // ----------------------------------------------------------------------
- $sub_pages =& $this->db->selectExecute("pages", array("parent_id" => $current_page_id, "room_id = page_id" => null));
- if($sub_pages === false) {
- return false;
- }
- if(count($sub_pages) > 0) {
- //サブグループあり
- //それぞれ、ルーム削除を再帰的に行う
- foreach($sub_pages as $sub_page) {
- $result = $this->_delRoom(intval($sub_page['page_id']));
- if(!$result) return false;
- }
- }
-
- // ルームに所属しているページ一覧取得
- $result = $this->db->selectExecute("pages", array("room_id" => $current_page_id) ,null, null, null, array($this, "_fetchcallback"));
- if($result === false) {
- return false;
- }
- list($page_list, $pages) = $result;
-
- // ----------------------------------------------------------------------
- // --- ブロック削除アクション-削除アクション実行 ---
- // ----------------------------------------------------------------------
- $blocks =& $this->blocksView->getBlockByPageId($page_list);
- $modules =& $this->modulesView->getModulesByUsed($current_page_id,0,0,true);
- if(is_array($blocks) && count($blocks) > 0) {
- foreach($blocks as $block) {
- $block_delete_action = $modules[$block['module_id']]['block_delete_action'];
- if($block_delete_action != "" && $block_delete_action != null) {
- //ブロック削除アクション
- $result = $this->blocksAction->delFuncExec($block['block_id'], $block, $block_delete_action);
- //if($result === false) {
- // 削除アクションの返り値をエラーとしない
- // モジュールの作り方によってルームの削除ができなくなると問題なので。
- //$log->warn(sprintf("%sのブロック削除アクション(%s)が失敗しました。",$modules[$block['module_id_id']]['module_name'], $block_delete_action), "Room_Action_Admin_Delete_Init#execute");
- //return false;
- //}
- }
- }
- }
- if(is_array($modules) && count($modules) > 0) {
- foreach($modules as $module) {
- $delete_action = $module['delete_action'];
- // delete_action処理
- if($delete_action != "" && $delete_action != null) {
- $result = $this->pagesAction->delFuncExec($current_page_id, $module, $delete_action);
- }
- }
- }
- // ----------------------------------------------------------------------
- // --- 添付ファイル更新処理 ---
- // ----------------------------------------------------------------------
- $result = $this->uploadsAction->delUploadsByRoomid($current_page_id);
- if($result === false) return false;
-
- // ----------------------------------------------------------------------
- // --- ページモジュールリンクテーブル削除 ---
- // ----------------------------------------------------------------------
- $result = $this->pagesAction->delPagesModulesLink(array("room_id" => $current_page_id));
- if($result === false) return false;
-
- // ----------------------------------------------------------------------
- // --- ページユーザリンクテーブル削除 ---
- // ----------------------------------------------------------------------
- $result = $this->pagesAction->delPageUsersLink(array("room_id" => $current_page_id));
- if($result === false) return false;
-
- foreach($page_list as $page_id) {
- // ----------------------------------------------------------------------
- // --- ブロックテーブル削除 ---
- // ----------------------------------------------------------------------
- $result = $this->pagesAction->delPageById($page_id, "blocks");
- if(!$result) {
- return false;
- }
- // ----------------------------------------------------------------------
- // --- 非表示メニューテーブル削除 ---
- // ----------------------------------------------------------------------
- if(!$this->pagesAction->delPageById($page_id, 'menu_detail')) {
- return false;
- }
- if(!$this->pagesAction->delPageById($page_id, 'mobile_menu_detail')) {
- return false;
- }
+ // 使用コンポーネントを受け取るため
+ var $pagesAction = null;
- // ----------------------------------------------------------------------
- // --- ページテーブル削除 ---
- // ----------------------------------------------------------------------
- $result = $this->pagesAction->delPageById($page_id);
- if(!$result) {
- return false;
- }
- // ----------------------------------------------------------------------
- // --- ページスタイル削除 ---
- // ----------------------------------------------------------------------
- if(!$this->pagesAction->delPageStyleById($page_id)) {
- return false;
- }
-
- // ----------------------------------------------------------------------
- // --- pages_meta_infテーブル削除 ---
- // ----------------------------------------------------------------------
- if(!$this->pagesAction->delPageMetaInfById($page_id)) {
- return false;
- }
-
- // ----------------------------------------------------------------------
- // --- 表示順decrement ---
- // ----------------------------------------------------------------------
- if($current_page_id == $page_id) {
- if(!$this->pagesAction->decrementDisplaySeq($pages[$page_id]['parent_id'], $pages[$page_id]['display_sequence'], $pages[$page_id]['lang_dirname'])) {
- return false;
- }
- }
- }
- // ----------------------------------------------------------------------
- // --- ショートカット先削除 ---
- // ----------------------------------------------------------------------
- $shortcuts =& $this->db->selectExecute("shortcut", array("room_id" => $current_page_id));
- if(isset($shortcuts[0])) {
- $preexecute_params = array(
- "mode" => "delete",
- "shortcut_flag" => _ON
- );
- foreach($shortcuts as $shortcut) {
- //TODO shortcut_site_idにより、他サイトを考慮した場合は、他サイトの削除処理を行うこと 現状、未実装
- $preexecute_params["block_id"] = $shortcut["shortcut_block_id"];
- $preexecute_params["page_id"] = $shortcut["shortcut_page_id"];
- $preexecute_params["room_id"] = $shortcut["shortcut_room_id"];
- //delete_blockアクションを呼ぶ
- $result = $this->preexecuteMain->preExecute("pages_actionblock_deleteblock", $preexecute_params);
- if($result === false || $result === "false") {
- //$errorList->add($this->_classname, sprintf(_INVALID_ACTION,"pages_actionblock_deleteblock"));
- return false;
- }
- }
- $result = $this->db->deleteExecute("shortcut", array("room_id" => $current_page_id));
- if($result === false){
- //$errorList->add($this->_classname, sprintf(_INVALID_ACTION,"pages_actionblock_deleteblock"));
- return false;
- }
- }
- return true;
- }
-
- /**
- * fetch時コールバックメソッド
- * @param result adodb object
- * @return array
- * @access private
+ /**
+ * ルーム削除処理
+ *
+ * @access public
*/
- function _fetchcallback($result) {
- $ret = array();
- $parent_ret = array();
- while ($row = $result->fetchRow()) {
- $ret[] = $row['page_id'];
- $page_ret[$row['page_id']] = $row;
+ function execute()
+ {
+ if (!$this->pagesAction->deleteRoom($this->edit_current_page_id)) {
+ return 'error';
}
- return array($ret, $page_ret);
+
+ return 'success';
}
}
?>
\ No newline at end of file
diff --git a/html/webapp/modules/room/action/admin/delete/dicon.ini b/html/webapp/modules/room/action/admin/delete/dicon.ini
index 6cf756c..d38ced3 100644
--- a/html/webapp/modules/room/action/admin/delete/dicon.ini
+++ b/html/webapp/modules/room/action/admin/delete/dicon.ini
@@ -1,15 +1,13 @@
[DIContainer]
databaseSqlutility = "database.sqlutility"
-blocksAction = "blocks.action"
pagesAction = "pages.action"
uploadsAction = "uploads.action"
+blocksAction = "blocks.action"
[blocksAction]
databaseSqlutility = "dicon://databaseSqlutility"
preexecuteMain = "dicon://preexecuteMain"
-modulesView = "dicon://modulesView"
[pagesAction]
databaseSqlutility = "dicon://databaseSqlutility"
-preexecuteMain = "dicon://preexecuteMain"
-modulesView = "dicon://modulesView"
\ No newline at end of file
+preexecuteMain = "dicon://preexecuteMain"
\ No newline at end of file
diff --git a/html/webapp/modules/room/action/admin/delete/maple.ini b/html/webapp/modules/room/action/admin/delete/maple.ini
index 076e1d4..36cf219 100644
--- a/html/webapp/modules/room/action/admin/delete/maple.ini
+++ b/html/webapp/modules/room/action/admin/delete/maple.ini
@@ -8,18 +8,11 @@ edit_current_page_id.required ="1:lang._invalid_input"
parent_page_id,edit_current_page_id.room.RoomRegist = "1,delete:lang._invalid_input"
[DIContainer]
-filename_delete = dicon.ini
-
-[Action]
-pagesAction = "ref:pagesAction"
-blocksView = "ref:blocksView"
-modulesView = "ref:modulesView"
-preexecuteMain = "ref:preexecuteMain"
-blocksAction = "ref:blocksAction"
-pagesView = "ref:pagesView"
-db = "ref:DbObject"
-uploadsAction = "ref:uploadsAction"
+filename = dicon.ini
[View]
-success = "main:error.html"
-error = "main:error.html"
\ No newline at end of file
+success = "main:true.html"
+error = "main:error.html"
+
+[Action]
+pagesAction = "ref:pagesAction"
\ No newline at end of file
diff --git a/html/webapp/modules/room/action/admin/selmodules/Selmodules.class.php b/html/webapp/modules/room/action/admin/selmodules/Selmodules.class.php
index 385bc49..95f6152 100644
--- a/html/webapp/modules/room/action/admin/selmodules/Selmodules.class.php
+++ b/html/webapp/modules/room/action/admin/selmodules/Selmodules.class.php
@@ -15,109 +15,97 @@
class Room_Action_Admin_Selmodules extends Action
{
// リクエストパラメータを受け取るため
- var $edit_current_page_id = null;
- var $parent_page_id = null;
-
- var $enroll_modules = null;
-
+ var $edit_current_page_id = null;
+ var $parent_page_id = null;
+
+ var $enroll_modules = null;
+
// バリデートによりセット
var $parent_page = null;
var $page = null;
-
- // 使用コンポーネントを受け取るため
- var $pagesView = null;
- var $pagesAction = null;
- var $modulesView = null;
- var $blocksView = null;
- var $blocksAction = null;
- var $preexecuteMain = null;
- var $db = null;
- var $request = null;
-
+
+ // 使用コンポーネントを受け取るため
+ var $pagesView = null;
+ var $pagesAction = null;
+ var $modulesView = null;
+ var $blocksView = null;
+ var $blocksAction = null;
+ var $preexecuteMain = null;
+ var $db = null;
+ var $request = null;
+
//値をセットするため
- /**
- * 使用可能モジュール配置修正
- *
- * @access public
- */
- function execute()
- {
- if($this->edit_current_page_id != 0) {
- $log =& LogFactory::getLog();
- // ----------------------------------------------------------------------
- // --- ページモジュールリンクテーブル変更 ---
- // ----------------------------------------------------------------------
- //if(isset($this->enroll_modules)) {
- $where_params = array(
- "room_id" => $this->edit_current_page_id
- );
- $page_modules =& $this->pagesView->getPageModulesLink($where_params, null, array($this, "_fetchcallbackModulesLink"));
- $error_flag = false;
- if(isset($this->enroll_modules)) {
- foreach($this->enroll_modules as $module_id) {
- if(!isset($page_modules[$module_id])) {
- $params = array(
- "room_id" => $this->edit_current_page_id,
- "module_id" => $module_id
- );
- //insert
- $result = $this->pagesAction->insPagesModulesLink($params);
- if($result === false) {
- $error_flag = true;
- }
- }
- unset($page_modules[$module_id]);
- }
- }
- $page_list =& $this->db->selectExecute("pages", array("room_id" => $this->edit_current_page_id) ,null, null, null, array($this, "_fetchcallback"));
- if($page_list === false) {
- return 'error';
- }
- $blocks =& $this->blocksView->getBlockByPageId($page_list);
-
- //ページモジュールリンクテーブル削除
- foreach($page_modules as $page_module) {
- $where_params = array(
- "room_id" => $page_module['room_id'],
- "module_id" => $page_module['module_id']
- );
- $result = $this->pagesAction->delPagesModulesLink($where_params);
- if($result === false) {
- $error_flag = true;
- }
- //
- // モジュール削除関数を呼び出す
- //
- $module =& $this->modulesView->getModulesById($page_module['module_id']);
- $delete_action = $module['delete_action'];
- if($delete_action != "" && $delete_action != null) {
- $result = $this->pagesAction->delFuncExec($page_module['room_id'], $module, $delete_action);
- }
- }
- if(is_array($blocks) && count($blocks) > 0) {
- foreach($blocks as $block) {
- $module_id = $block['module_id'];
- if(isset($page_modules[$module_id])) {
- //block削除処理
- $preexecute_params = array(
- "block_id" => $block['block_id'],
- "page_id"=> $block['page_id']
- );
- $result = $this->preexecuteMain->preExecute("pages_actionblock_deleteblock", $preexecute_params);
- //if($result === false || $result === "false") {
- // $log->warn(sprintf("%sの削除アクション(%s)が失敗しました。","pages", "pages_actionblock_deleteblock"), "Room_Action_Admin_Create_Selectmodules#execute");
- //}
- }
- }
- }
- if($error_flag) {
- return 'error';
- }
- //}
- }
- // ----------------------------------------------------------------------
- // --- 終了処理 ---
+ /**
+ * 使用可能モジュール配置修正
+ *
+ * @access public
+ */
+ function execute()
+ {
+ $roomId = $this->edit_current_page_id;
+ $usableModuleIds = $this->enroll_modules;
+ if (!isset($usableModuleIds)) {
+ $usableModuleIds = array();
+ }
+ $previousUsableModules = $this->pagesView->getUsableModulesByRoom($roomId, true);
+
+ $isError = false;
+ foreach ($usableModuleIds as $moduleId) {
+ if (isset($previousUsableModules[$moduleId])) {
+ unset($previousUsableModules[$moduleId]);
+ continue;
+ }
+
+ $insertDatas = array(
+ 'room_id' => $roomId,
+ 'module_id' => $moduleId
+ );
+
+ if (!$this->pagesAction->insPagesModulesLink($insertDatas)) {
+ $isError = true;
+ }
+ }
+
+ if (!$this->pagesAction->deleteEachModule($roomId, $previousUsableModules)) {
+ $isError = true;
+ }
+
+ $unusableModuleIds = array_keys($previousUsableModules);
+ if (!$this->pagesAction->deleteRoomModule($roomId, $unusableModuleIds)) {
+ $isError = true;
+ }
+
+ $sql = "SELECT B.block_id, "
+ . "B.page_id "
+ . "FROM {blocks} B "
+ . "INNER JOIN {pages} P "
+ . "ON B.page_id = P.page_id "
+ . "WHERE P.room_id = ? "
+ . "AND B.module_id IN ('" . implode("','", $unusableModuleIds) . "')";
+ $blocks =& $this->db->execute($sql, $roomId);
+ if ($blocks === false) {
+ $this->db->addError();
+ }
+
+ foreach($blocks as $block) {
+ $request = array(
+ 'block_id' => $block['block_id'],
+ 'page_id' => $block['page_id']
+ );
+ $result = $this->preexecuteMain->preExecute('pages_actionblock_deleteblock', $request);
+ if ($result === false
+ || $result === 'false') {
+ $isError = true;
+ }
+ }
+
+ if($isError) {
+ return 'error';
+ }
+
+ // ----------------------------------------------------------------------
+ // --- 終了処理 ---
// ----------------------------------------------------------------------
// リスト表示のリクエストパラメータセット
if(!isset($this->parent_page)) {
@@ -130,37 +118,7 @@ function execute()
$this->request->setParameter("show_default_entry_flag", $this->parent_page['default_entry_flag']);
}
- return 'success';
- }
-
-
- /**
- * fetch時コールバックメソッド
- * @param result adodb object
- * @return array
- * @access private
- */
- function &_fetchcallbackModulesLink($result) {
- $ret = array();
- while ($row = $result->fetchRow()) {
- $ret[$row['module_id']] = $row;
- }
- return $ret;
- }
-
-
- /**
- * fetch時コールバックメソッド
- * @param result adodb object
- * @return array
- * @access private
- */
- function &_fetchcallback($result) {
- $ret = array();
- while ($row = $result->fetchRow()) {
- array_push ( $ret, $row['page_id']);
- }
- return $ret;
+ return 'success';
}
}
?>
diff --git a/html/webapp/modules/room/action/admin/selmodules/dicon.ini b/html/webapp/modules/room/action/admin/selmodules/dicon.ini
index 8431155..d38ced3 100644
--- a/html/webapp/modules/room/action/admin/selmodules/dicon.ini
+++ b/html/webapp/modules/room/action/admin/selmodules/dicon.ini
@@ -1,14 +1,13 @@
[DIContainer]
databaseSqlutility = "database.sqlutility"
-blocksAction = "blocks.action"
pagesAction = "pages.action"
+uploadsAction = "uploads.action"
+blocksAction = "blocks.action"
[blocksAction]
databaseSqlutility = "dicon://databaseSqlutility"
preexecuteMain = "dicon://preexecuteMain"
-modulesView = "dicon://modulesView"
[pagesAction]
databaseSqlutility = "dicon://databaseSqlutility"
-preexecuteMain = "dicon://preexecuteMain"
-modulesView = "dicon://modulesView"
\ No newline at end of file
+preexecuteMain = "dicon://preexecuteMain"
\ No newline at end of file
diff --git a/html/webapp/modules/room/install.ini b/html/webapp/modules/room/install.ini
index 72cd700..c073806 100644
--- a/html/webapp/modules/room/install.ini
+++ b/html/webapp/modules/room/install.ini
@@ -2,3 +2,4 @@ version = "2.4.0.0"
action_name="room_view_admin_init"
module_icon="room.gif"
system_flag=1
+module_update_action = "room_update"
diff --git a/html/webapp/modules/room/update/Update.class.php b/html/webapp/modules/room/update/Update.class.php
new file mode 100644
index 0000000..6c94cbc
--- /dev/null
+++ b/html/webapp/modules/room/update/Update.class.php
@@ -0,0 +1,55 @@
+db->execute($sql, $bindValues);
+ if ($garbages === false) {
+ $this->db->addError();
+ return false;
+ }
+
+ foreach ($garbages as $garbage) {
+ if (!$this->pagesAction->deleteRoom($garbage['room_id'])) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+}
+?>
diff --git a/html/webapp/modules/room/update/dicon.ini b/html/webapp/modules/room/update/dicon.ini
new file mode 100644
index 0000000..647492b
--- /dev/null
+++ b/html/webapp/modules/room/update/dicon.ini
@@ -0,0 +1,13 @@
+[DIContainer]
+databaseSqlutility = "database.sqlutility"
+blocksAction = "blocks.action"
+pagesAction = "pages.action"
+uploadsAction = "uploads.action"
+
+[blocksAction]
+databaseSqlutility = "dicon://databaseSqlutility"
+preexecuteMain = "dicon://preexecuteMain"
+
+[pagesAction]
+databaseSqlutility = "dicon://databaseSqlutility"
+preexecuteMain = "dicon://preexecuteMain"
\ No newline at end of file
diff --git a/html/webapp/modules/room/update/maple.ini b/html/webapp/modules/room/update/maple.ini
new file mode 100644
index 0000000..1fd1080
--- /dev/null
+++ b/html/webapp/modules/room/update/maple.ini
@@ -0,0 +1,12 @@
+[RecursiveNocall]
+ValidateDef =
+
+[ValidateDef]
+requiredfalse ="1:lang._invalid_input"
+
+[DIContainer]
+filename = dicon.ini
+
+[Action]
+db = "ref:DbObject"
+pagesAction = "ref:pagesAction"
\ No newline at end of file
diff --git a/html/webapp/modules/user/action/admin/delete/Delete.class.php b/html/webapp/modules/user/action/admin/delete/Delete.class.php
index 10f9cdf..dc025b1 100644
--- a/html/webapp/modules/user/action/admin/delete/Delete.class.php
+++ b/html/webapp/modules/user/action/admin/delete/Delete.class.php
@@ -19,15 +19,7 @@ class User_Action_Admin_Delete extends Action
var $user_id = null;
// 使用コンポーネントを受け取るため
- var $pagesView = null;
var $usersAction = null;
- var $pagesAction = null;
- var $uploadsAction = null;
- var $db = null;
- var $blocksView = null;
- var $blocksAction = null;
- var $modulesView = null;
- var $usersView = null;
var $actionChain = null;
/**
@@ -37,160 +29,16 @@ class User_Action_Admin_Delete extends Action
*/
function execute()
{
- $user_id = $this->user_id;
-
- // ルームに所属しているページ一覧取得
- $params = array(
- "insert_user_id" => $user_id
- );
-
- $privatespace_pages = $this->db->execute("SELECT {pages}.* " .
- " FROM {pages} " .
- " WHERE {pages}.thread_num = 0 AND {pages}.private_flag = "._ON.
- " AND {pages}.space_type = "._SPACE_TYPE_GROUP.
- " AND {pages}.insert_user_id = ? ".
- " ORDER BY default_entry_flag DESC",$params);
-
- if ($privatespace_pages === false || !isset($privatespace_pages[0])) {
- $this->db->addError();
- return 'error';
- }
- if(count($privatespace_pages) > 1) {
- $where_page_list = array("(room_id = ".$privatespace_pages[0]['room_id']." OR room_id=".$privatespace_pages[1]['room_id'].")" => null);
- } else {
- $where_page_list = array("room_id" => $privatespace_pages[0]['room_id']);
- }
- $page_list =& $this->db->selectExecute("pages", $where_page_list ,null, null, null, array($this, "_fetchcallback"));
- if($page_list === false) {
- return 'error';
- }
- $users = $this->usersView->getUsers(array("user_id"=>$user_id));
- if($users === false || !isset($users[0])) return 'error';
-
- // ----------------------------------------------------------------------
- // --- usersテーブルから削除 ---
- // ----------------------------------------------------------------------
- // ----------------------------------------------------------------------
- // --- users_items_linkテーブルから削除 ---
- // ----------------------------------------------------------------------
- $result = $this->usersAction->delUserById($user_id);
- if($result === false) return 'error';
-
- // ----------------------------------------------------------------------
- // --- pages_users_linkテーブルから削除 ---
- // ----------------------------------------------------------------------
- $where_params = array("user_id" => $user_id);
- $result = $this->pagesAction->delPageUsersLink($where_params);
- if($result === false) return 'error';
-
- // ----------------------------------------------------------------------
- // --- ブロック削除アクション-削除アクション実行 ---
- // ----------------------------------------------------------------------
- $blocks =& $this->blocksView->getBlockByPageId($page_list);
- $modules =& $this->modulesView->getAuthoritiesModulesByUsed($users[0]['role_authority_id'],0,0,true);
-
- if(is_array($blocks) && count($blocks) > 0) {
- foreach($blocks as $block) {
- if(!isset($modules[$block['module_id']])) {
- $get_modules= $this->modulesView->getModules(array("module_id" => $block['module_id']));
- $modules[$block['module_id']] = $get_modules[0];
- }
- $block_delete_action = $modules[$block['module_id']]['block_delete_action'];
- if($block_delete_action != "" && $block_delete_action != null) {
- //ブロック削除アクション
- $result = $this->blocksAction->delFuncExec($block['block_id'], $block, $block_delete_action);
- }
- }
- }
- foreach($privatespace_pages as $privatespace_page) {
- $current_page_id = $privatespace_page['room_id'];
-
- // ----------------------------------------------------------------------
- // --- 添付ファイル削除処理 ---
- // ----------------------------------------------------------------------
- $result = $this->uploadsAction->delUploadsByRoomid($current_page_id);
- if($result === false) return 'error';
-
- if(is_array($modules) && count($modules) > 0) {
- foreach($modules as $module) {
- $delete_action = $module['delete_action'];
- // delete_action処理
- if($delete_action != "" && $delete_action != null) {
- $result = $this->pagesAction->delFuncExec($current_page_id, $module, $delete_action);
- }
- }
- }
- }
-
- // ----------------------------------------------------------------------
- // --- プライベートスペースの削除 ---
- // ----------------------------------------------------------------------
- foreach($page_list as $page_id) {
- //削除関数を呼び出し
- $blocks =& $this->blocksView->getBlockByPageId($page_id);
- if(isset($blocks[0])) {
- foreach($blocks as $block) {
- $this->blocksAction->delFuncExec($block['block_id']);
- }
- }
- // ----------------------------------------------------------------------
- // --- ブロックテーブル削除 ---
- // ----------------------------------------------------------------------
- $result = $this->pagesAction->delPageById($page_id, "blocks");
- if(!$result) {
- return 'error';
- }
-
- // ----------------------------------------------------------------------
- // --- ページテーブル削除 ---
- // ----------------------------------------------------------------------
- $result = $this->pagesAction->delPageById($page_id);
- if(!$result) {
- return 'error';
- }
-
- // ----------------------------------------------------------------------
- // --- pages_meta_inf テーブルから削除 ---
- // ----------------------------------------------------------------------
- if(!$this->pagesAction->delPageMetaInfById($page_id)) {
- return 'error';
- }
+ if (!$this->usersAction->deleteUser($this->user_id)) {
+ return 'error';
}
- // ----------------------------------------------------------------------
- // --- uploads テーブルから削除(アバター等) ---
- // ----------------------------------------------------------------------
- // 複数存在する場合もあるため、ガーベージフラグにより対応
- $params = array("garbage_flag" => _ON);
- $where_params = array(
- "action_name" => "common_download_user",
- "unique_id " => $user_id,
- "garbage_flag" => _OFF
- );
- $result = $this->uploadsAction->updUploads($params, $where_params);
- if($result === false) return 'error';
-
$recursive_action_name = $this->actionChain->getRecursive();
- if($recursive_action_name != "") {
+ if (!empty($recursive_action_name)) {
return 'recursive_success';
}
return 'success';
}
-
-
- /**
- * fetch時コールバックメソッド
- * @param result adodb object
- * @return array
- * @access private
- */
- function &_fetchcallback($result) {
- $ret = array();
- while ($row = $result->fetchRow()) {
- $ret[] = $row['page_id'];
- }
- return $ret;
- }
}
?>
diff --git a/html/webapp/modules/user/action/admin/delete/dicon.ini b/html/webapp/modules/user/action/admin/delete/dicon.ini
index e3d3b5c..d38ced3 100644
--- a/html/webapp/modules/user/action/admin/delete/dicon.ini
+++ b/html/webapp/modules/user/action/admin/delete/dicon.ini
@@ -7,9 +7,7 @@ blocksAction = "blocks.action"
[blocksAction]
databaseSqlutility = "dicon://databaseSqlutility"
preexecuteMain = "dicon://preexecuteMain"
-modulesView = "dicon://modulesView"
[pagesAction]
databaseSqlutility = "dicon://databaseSqlutility"
-preexecuteMain = "dicon://preexecuteMain"
-modulesView = "dicon://modulesView"
\ No newline at end of file
+preexecuteMain = "dicon://preexecuteMain"
\ No newline at end of file
diff --git a/html/webapp/modules/user/action/admin/delete/maple.ini b/html/webapp/modules/user/action/admin/delete/maple.ini
index 25ada51..d60734c 100644
--- a/html/webapp/modules/user/action/admin/delete/maple.ini
+++ b/html/webapp/modules/user/action/admin/delete/maple.ini
@@ -20,15 +20,7 @@ action="user_view_main_search"
filename_regist = "dicon.ini"
[Action]
-pagesView = "ref:pagesView"
-pagesAction = "ref:pagesAction"
usersAction = "ref:usersAction"
-uploadsAction = "ref:uploadsAction"
-db = "ref:DbObject"
-blocksView = "ref:blocksView"
-blocksAction = "ref:blocksAction"
-usersView = "ref:usersView"
-modulesView = "ref:modulesView"
actionChain = "ref:ActionChain"
[View]
diff --git a/html/webapp/modules/user/action/admin/seldelete/Seldelete.class.php b/html/webapp/modules/user/action/admin/seldelete/Seldelete.class.php
index 63dfe89..730d879 100644
--- a/html/webapp/modules/user/action/admin/seldelete/Seldelete.class.php
+++ b/html/webapp/modules/user/action/admin/seldelete/Seldelete.class.php
@@ -20,13 +20,8 @@ class User_Action_Admin_Seldelete extends Action
// 使用コンポーネントを受け取るため
var $session = null;
- var $pagesView = null;
var $usersAction = null;
- var $pagesAction = null;
- var $uploadsAction = null;
var $db = null;
- var $blocksView = null;
- var $blocksAction = null;
var $authoritiesView = null;
/**
@@ -57,205 +52,48 @@ function execute()
$this->db->addError();
return 'error';
}
- $del_users = array();
+
$login_user_id = $this->session->getParameter("_user_id");
$_system_user_id = $this->session->getParameter("_system_user_id");
$_user_auth_id = $this->session->getParameter("_user_auth_id");
- $arr_count = 0;
- $count = 0;
+
+ $canUseSysytemModule = false;
+ $roleId = $this->session->getParameter('_role_auth_id');
+ $fetchMethod = array($this, '_canUseSysytemModule');
+ $whereArray = array('system_flag' => _ON);
if($_user_auth_id == _AUTH_ADMIN) {
- //
- // 管理者ならば、システムコントロールモジュール、サイト運営モジュールの選択の有無で上下を判断
- //
- $_role_auth_id = $this->session->getParameter("_role_auth_id");
- $func = array($this, "_getSysModulesFetchcallback");
- $system_user_flag = $this->authoritiesView->getAuthoritiesModulesLinkByAuthorityId($_role_auth_id, array("system_flag"=>_ON), null, $func);
- } else {
- $func = null;
- $system_user_flag = null;
+ // 管理者ならば、システムコントロールモジュール、サイト運営モジュールの選択の有無で上下を判断
+ $canUseSysytemModule = $this->authoritiesView->getAuthoritiesModulesLinkByAuthorityId($roleId, $whereArray, null, $fetchMethod);
}
+
+ $targetUsers = array();
foreach($users as $user_id => $user) {
- if(!isset($del_users[$arr_count])) {
- $del_users[$arr_count] = array();
- }
if($user_id == $login_user_id || $user_id == $_system_user_id) {
- // 自分自身 or システム管理者
- continue;
- }
- if($_user_auth_id != _AUTH_ADMIN && $user['user_authority_id'] >= $_user_auth_id) {
- // ログイン会員よりベース権限が未満のものしか削除できない
- continue;
- }
+ // 自分自身 or システム管理者
+ continue;
+ }
+ if($_user_auth_id != _AUTH_ADMIN && $user['user_authority_id'] >= $_user_auth_id) {
+ // ログイン会員よりベース権限が未満のものしか削除できない
+ continue;
+ }
- if($system_user_flag === null) {
- $buf_system_user_flag = $this->authoritiesView->getAuthoritiesModulesLinkByAuthorityId($user['role_authority_id'], array("system_flag"=>_ON), null, $func);
- if($buf_system_user_flag === true) {
+ if (empty($canUseSysytemModule)) {
+ $canUseSysytemModuleTarget = $this->authoritiesView->getAuthoritiesModulesLinkByAuthorityId($user['role_authority_id'], $whereArray, null, $fetchMethod);
+ if ($canUseSysytemModuleTarget === true) {
continue;
}
}
- if(isset($this->delete_users[$user_id])) {
- if($this->delete_users[$user_id] == _ON) {
- // 選択されている
- // 削除対象
- $del_users[$arr_count][] = $user_id;
- } else {
- continue;
- }
- } else if($this->select_user == _ON){
- // 全選択中
- // 削除対象
- $del_users[$arr_count][] = $user_id;
+ if (!empty($this->delete_users[$user_id])
+ || !empty($this->select_user)) {
+ $targetUsers[] = $user_id;
} else {
continue;
}
- // 50件単位でdeleteするため
- $count++;
- if($count == 50) {
- $count = 0;
- $arr_count++;
- }
- }
-
- $modules = $this->db->execute("SELECT {modules}.*,{authorities_modules_link}.role_authority_id FROM {modules},{authorities_modules_link} " .
- " WHERE {modules}.system_flag = 0 AND {modules}.module_id={authorities_modules_link}.module_id " .
- " ORDER BY {modules}.display_sequence",array(),null,null, true, array($this, "_fetchcallbackModulesByUsed"));
- if ($modules === false) {
- $this->db->addError();
- return 'error';
}
- // ---------------------------------------------------------
- // 削除処理
- // ---------------------------------------------------------
- // 50件単位
- foreach($del_users as $del_users_arr) {
- if(count($del_users_arr) == 0) {
- continue;
- }
- $where_user_str = implode("','", $del_users_arr);
- $where_params = array(
- "user_id IN ('".$where_user_str. "') " => null
- );
-
- $params = array();
- $privatespace_pages = $this->db->execute("SELECT {pages}.page_id " .
- " FROM {pages_users_link}, {pages} " .
- " WHERE {pages}.thread_num = 0 AND {pages}.private_flag = "._ON.
- " AND {pages}.space_type = "._SPACE_TYPE_GROUP.
- " AND {pages}.insert_user_id IN ('".$where_user_str. "') " .
- " ",$params, null, null, true, array($this, "_pageFetchcallback"));
- if ($privatespace_pages === false) {
- $this->db->addError();
- return 'error';
- }
-
- $page_list =& $this->db->selectExecute("pages", array("room_id IN (".implode(",", $privatespace_pages). ") " => null) ,null, null, null, array($this, "_pageFetchcallback"));
- if($page_list === false) {
- return 'error';
- }
- // ----------------------------------------------------------------------
- // --- usersテーブルから削除 ---
- // ----------------------------------------------------------------------
- // ----------------------------------------------------------------------
- // --- users_items_linkテーブルから削除 ---
- // ----------------------------------------------------------------------
- $result = $this->db->deleteExecute("users", $where_params);
- if ($result === false) {
- return 'error';
- }
-
- $result = $this->db->deleteExecute("users_items_link", $where_params);
- if ($result === false) {
- return 'error';
- }
-
- // ----------------------------------------------------------------------
- // --- pages_users_linkテーブルから削除 ---
- // ----------------------------------------------------------------------
- $result = $this->pagesAction->delPageUsersLink($where_params);
- if($result === false) {
- return 'error';
- }
-
- // ----------------------------------------------------------------------
- // --- プライベートスペースの削除 ---
- // ----------------------------------------------------------------------
- if(is_array($page_list)) {
- // ----------------------------------------------------------------------
- // --- ブロック削除アクション-削除アクション実行 ---
- // ----------------------------------------------------------------------
-
- $blocks =& $this->blocksView->getBlockByPageId($page_list);
- if(is_array($blocks) && count($blocks) > 0) {
- foreach($blocks as $block) {
- //ブロック削除アクション
- $result = $this->blocksAction->delFuncExec($block['block_id'], $block);
- }
- }
- foreach($page_list as $current_page_id) {
-
- // ----------------------------------------------------------------------
- // --- pages_meta_inf テーブルから削除 ---
- // ----------------------------------------------------------------------
- if(!$this->pagesAction->delPageMetaInfById($current_page_id)) {
- return 'error';
- }
-
- // ----------------------------------------------------------------------
- // --- 添付ファイル削除処理 ---
- // ----------------------------------------------------------------------
- $result = $this->uploadsAction->delUploadsByRoomid($current_page_id);
- if(is_array($modules) && count($modules) > 0 &&
- isset($modules[$users[$user_id]['role_authority_id']])) {
- foreach($modules[$users[$user_id]['role_authority_id']] as $module) {
- $delete_action = $module['delete_action'];
- // delete_action処理
- if($delete_action != "" && $delete_action != null) {
- $result = $this->pagesAction->delFuncExec($current_page_id, $module, $delete_action);
- }
- }
- }
- }
-
- /*
- foreach($page_list as $page_id) {
- //削除関数を呼び出し
- $blocks =& $this->blocksView->getBlockByPageId($page_id);
- if(isset($blocks[0])) {
- foreach($blocks as $block) {
- $this->blocksAction->delFuncExec($block['block_id']);
- }
- }
- }
- */
- $delpage_params = array(
- "page_id IN (".implode(",", $page_list). ") " => null
- );
- $result = $this->db->deleteExecute("pages", $delpage_params);
- if ($result === false) {
- return 'error';
- }
- $result = $this->db->deleteExecute("blocks", $delpage_params);
- if ($result === false) {
- return 'error';
- }
- }
-
- // ----------------------------------------------------------------------
- // --- uploads テーブルから削除(アバター等) ---
- // ----------------------------------------------------------------------
- // 複数存在する場合もあるため、ガーベージフラグにより対応
- $params = array("garbage_flag" => _ON);
- $where_params = array(
- "action_name" => "common_download_user",
- "unique_id IN ('".$where_user_str. "') " => null,
- "garbage_flag" => _OFF
- );
- $result = $this->uploadsAction->updUploads($params, $where_params);
- if($result === false) {
- return 'error';
- }
+ if (!$this->usersAction->deleteUser($targetUsers)) {
+ return 'error';
}
return 'success';
@@ -276,26 +114,13 @@ function &_fetchcallback($result) {
}
/**
- * fetch時コールバックメソッド
- * @param result adodb object
- * @return array users
- * @access private
- */
- function &_pageFetchcallback($result) {
- $ret = array();
- while ($row = $result->fetchRow()) {
- $ret[$row['page_id']] = $row['page_id'];
- }
- return $ret;
- }
-
- /**
- * fetch時コールバックメソッド
- * @param result adodb object
+ * システム管理用モジュールが利用できるかどうか判断する。
+ *
+ * @param array $recordSet 利用可能モジュール
* @return true or null
- * @access private
+ * @access private
*/
- function _getSysModulesFetchcallback($result) {
+ function _canUseSysytemModule($result) {
$site_modules_dir_arr = explode("|", AUTHORITY_SYS_DEFAULT_MODULES_ADMIN);
while ($obj = $result->fetchRow()) {
if($obj["authority_id"] === null) continue;
@@ -308,20 +133,5 @@ function _getSysModulesFetchcallback($result) {
}
return null;
}
-
- /**
- * fetch時コールバックメソッド
- * @param result adodb object
- * @return true or null
- * @access private
- */
- function _fetchcallbackModulesByUsed($result) {
- $ret = array();
- while ($row = $result->fetchRow()) {
- $ret[$row['role_authority_id']][$row['module_id']] = $row;
- }
- return $ret;
- }
-
}
?>
diff --git a/html/webapp/modules/user/action/admin/seldelete/dicon.ini b/html/webapp/modules/user/action/admin/seldelete/dicon.ini
index e3d3b5c..d38ced3 100644
--- a/html/webapp/modules/user/action/admin/seldelete/dicon.ini
+++ b/html/webapp/modules/user/action/admin/seldelete/dicon.ini
@@ -7,9 +7,7 @@ blocksAction = "blocks.action"
[blocksAction]
databaseSqlutility = "dicon://databaseSqlutility"
preexecuteMain = "dicon://preexecuteMain"
-modulesView = "dicon://modulesView"
[pagesAction]
databaseSqlutility = "dicon://databaseSqlutility"
-preexecuteMain = "dicon://preexecuteMain"
-modulesView = "dicon://modulesView"
\ No newline at end of file
+preexecuteMain = "dicon://preexecuteMain"
\ No newline at end of file
diff --git a/html/webapp/modules/user/action/admin/seldelete/maple.ini b/html/webapp/modules/user/action/admin/seldelete/maple.ini
index a219411..0da7b62 100644
--- a/html/webapp/modules/user/action/admin/seldelete/maple.ini
+++ b/html/webapp/modules/user/action/admin/seldelete/maple.ini
@@ -4,7 +4,6 @@ filename_auth = "/modules/authority/config/define.inc.php"
[ValidateDef]
authcheck = "1,_auth_id>=_AUTH_ADMIN:lang._invalid_auth"
-;user_id.user.DelUser="1:lang._invalid_input"
[TokenExtra]
mode="check"
@@ -15,15 +14,9 @@ filename_regist = "dicon.ini"
[Action]
session = "ref:Session"
-pagesView = "ref:pagesView"
-pagesAction = "ref:pagesAction"
usersAction = "ref:usersAction"
-uploadsAction = "ref:uploadsAction"
db = "ref:DbObject"
-blocksView = "ref:blocksView"
-blocksAction = "ref:blocksAction"
authoritiesView = "ref:authoritiesView"
-modulesView = "ref:modulesView"
[View]
success = "action:user_action_main_search"
diff --git a/html/webapp/modules/whatsnew/components/Action.class.php b/html/webapp/modules/whatsnew/components/Action.class.php
index c69b27e..77a2997 100644
--- a/html/webapp/modules/whatsnew/components/Action.class.php
+++ b/html/webapp/modules/whatsnew/components/Action.class.php
@@ -58,10 +58,11 @@ function setRead()
if (empty($whatsnew)) {
return false;
}
-
+
$params = array(
"whatsnew_id"=>$whatsnew["whatsnew_id"],
- "user_id" => $_user_id
+ "user_id" => $_user_id,
+ 'room_id' => $whatsnew['room_id']
);
$count = $this->_db->countExecute("whatsnew_user", $params);
if ($count > 0) {
diff --git a/html/webapp/modules/whatsnew/update/Update.class.php b/html/webapp/modules/whatsnew/update/Update.class.php
index 5ac4f17..00334d6 100644
--- a/html/webapp/modules/whatsnew/update/Update.class.php
+++ b/html/webapp/modules/whatsnew/update/Update.class.php
@@ -277,6 +277,47 @@ function execute()
if($result === false) return false;
}
+ $sql = "SELECT WU.whatsnew_id, "
+ . "W.room_id "
+ . "FROM {whatsnew_user} WU "
+ . "LEFT JOIN {whatsnew} W "
+ . "ON WU.whatsnew_id = W.whatsnew_id "
+ . "WHERE WU.room_id IS NULL "
+ . "GROUP BY WU.whatsnew_id "
+ . "ORDER BY W.room_id";
+ $whatsnews = $this->db->execute($sql);
+ $roomId = null;
+ $targetIds = array();
+ foreach ($whatsnews as $whatsnew) {
+ if (!isset($whatsnew['room_id'])) {
+ $whatsnew['room_id'] = 'NULL';
+ }
+
+ $roomId = $whatsnew['room_id'];
+ $targetIds[$roomId][] = $whatsnew['whatsnew_id'];
+ }
+
+ foreach ($targetIds as $roomId => $whatsnewIds) {
+ $whereClause = 'WHERE whatsnew_id IN (' . implode(',', $whatsnewIds) . ')';
+ $bindValues = array();
+ if ($roomId === 'NULL') {
+ $sql = "DELETE FROM {whatsnew_user} "
+ . $whereClause;
+ } else {
+ $sql = "UPDATE {whatsnew_user} SET "
+ . "room_id = ? "
+ . $whereClause;
+ $bindValues = array(
+ $roomId
+ );
+ }
+
+ $result = $this->db->execute($sql, $bindValues);
+ if ($result === false) {
+ return false;
+ }
+ }
+
return true;
}
}
From 8d93d2e764c65738260795bdcda0df8f7a23d2ef Mon Sep 17 00:00:00 2001
From: kteraguchi
Date: Tue, 16 Apr 2013 15:16:25 +0900
Subject: [PATCH 25/39] =?UTF-8?q?#54=20=E6=96=B0=E7=9D=80=E3=83=AA?=
=?UTF-8?q?=E3=83=B3=E3=82=AF=E5=85=88=E3=81=AE=E3=83=96=E3=83=AD=E3=83=83?=
=?UTF-8?q?=E3=82=AF=E3=81=8C=E5=89=8A=E9=99=A4=E3=81=95=E3=82=8C=E3=81=A6?=
=?UTF-8?q?=E3=82=82Notice=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C=E7=99=BA?=
=?UTF-8?q?=E7=94=9F=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
=?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../calendar/components/View.class.php | 45 +++++++++----------
1 file changed, 22 insertions(+), 23 deletions(-)
diff --git a/html/webapp/modules/calendar/components/View.class.php b/html/webapp/modules/calendar/components/View.class.php
index 4da2643..0b8aacb 100644
--- a/html/webapp/modules/calendar/components/View.class.php
+++ b/html/webapp/modules/calendar/components/View.class.php
@@ -1214,37 +1214,37 @@ function hasEditAuthority(&$plan)
*/
function &getSelectRoomList()
{
- $calendarView =& $this->_container->getComponent("calendarView");
+ $calendarView =& $this->_container->getComponent("calendarView");
- $calendar_block = $calendarView->getBlock();
- if ($calendar_block === false) {
- return $calendar_block;
- }
+ $calendar_block = $calendarView->getBlock();
+ if ($calendar_block === false) {
+ return $calendar_block;
+ }
- $sess_myroom_flag = $this->_session->getParameter(array("calendar", "myroom_flag", $calendar_block["block_id"]));
+ $sess_myroom_flag = $this->_session->getParameter(array("calendar", "myroom_flag", $calendar_block["block_id"]));
if (isset($sess_myroom_flag)) {
$calendar_block["myroom_flag"] = intval($sess_myroom_flag);
}
- $user_id = $this->_session->getParameter("_user_id");
-
- $room_arr = $this->_request->getParameter("room_arr");
- if (!empty($user_id)) {
- $room_arr[0][0][0] = array(
- "page_id" => CALENDAR_ALL_MEMBERS_ID,
- "parent_id" => 0,
- "page_name" => CALENDAR_ALL_MEMBERS_LANG,
- "thread_num" => 0,
- "space_type" => _SPACE_TYPE_UNDEFINED,
- "private_flag" => _OFF,
- "authority_id" => $this->_session->getParameter("_user_auth_id")
- );
- }
+ $user_id = $this->_session->getParameter("_user_id");
+
+ $room_arr = $this->_request->getParameter("room_arr");
+ if (!empty($user_id)) {
+ $room_arr[0][0][0] = array(
+ "page_id" => CALENDAR_ALL_MEMBERS_ID,
+ "parent_id" => 0,
+ "page_name" => CALENDAR_ALL_MEMBERS_LANG,
+ "thread_num" => 0,
+ "space_type" => _SPACE_TYPE_UNDEFINED,
+ "private_flag" => _OFF,
+ "authority_id" => $this->_session->getParameter("_user_auth_id")
+ );
+ }
$thread_num = 0;
$parent_id = 0;
- $getdata =& $this->_container->getComponent("GetData");
+ $getdata =& $this->_container->getComponent("GetData");
$pages = $getdata->getParameter("pages");
$actionChain =& $this->_container->getComponent("ActionChain");
@@ -1254,12 +1254,11 @@ function &getSelectRoomList()
"not_enroll_room_arr" => array(),
"room_arr" => $room_arr,
"calendar_block" => $calendar_block,
- "_page" => $pages[$this->_session->getParameter("_main_page_id")],
"private_room_id_arr" => array(),
"action_name" => $actionChain->getCurActionName()
);
- $sess_enroll_room = $this->_session->getParameter(array("calendar", "enroll_room", $calendar_block["block_id"]));
+ $sess_enroll_room = $this->_session->getParameter(array("calendar", "enroll_room", $calendar_block["block_id"]));
foreach ($result_params["room_arr"][$thread_num][$parent_id] as $disp => $room) {
if ($room["space_type"] == _SPACE_TYPE_GROUP && $room["private_flag"] == _ON) {
if ($result_params["calendar_block"]["myroom_flag"] == _ON) {
From d21ab2215b40ad0c036487744f6a19137ca36125 Mon Sep 17 00:00:00 2001
From: kteraguchi
Date: Tue, 16 Apr 2013 15:49:18 +0900
Subject: [PATCH 26/39] =?UTF-8?q?#55=20=E3=83=AA=E3=82=B9=E3=83=88?=
=?UTF-8?q?=E3=82=A2=E6=99=82=E3=80=81id=E3=81=8C=E9=81=A9=E5=88=87?=
=?UTF-8?q?=E3=81=AB=E8=A8=AD=E5=AE=9A=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88?=
=?UTF-8?q?=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
html/webapp/modules/chat/install.ini | 1 -
html/webapp/modules/circular/install.ini | 1 +
html/webapp/modules/multidatabase/install.ini | 1 +
html/webapp/modules/registration/install.ini | 3 ++-
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/html/webapp/modules/chat/install.ini b/html/webapp/modules/chat/install.ini
index 5873bcf..171ba0b 100644
--- a/html/webapp/modules/chat/install.ini
+++ b/html/webapp/modules/chat/install.ini
@@ -15,7 +15,6 @@ display_type = "_OFF"
line_num = "30"
[Restore]
-chat_id =
block_id = core.block_id
room_id = core.page_id
diff --git a/html/webapp/modules/circular/install.ini b/html/webapp/modules/circular/install.ini
index 3ad17d4..fa99f01 100644
--- a/html/webapp/modules/circular/install.ini
+++ b/html/webapp/modules/circular/install.ini
@@ -26,3 +26,4 @@ circular_id =
circular.circular_body = wysiwyg.upload_id
circular_choice.choice_id =
circular_postscript.postscript_id =
+circular_postscript.postscript_value = wysiwyg.upload_id
diff --git a/html/webapp/modules/multidatabase/install.ini b/html/webapp/modules/multidatabase/install.ini
index 2c6db68..5b0a366 100644
--- a/html/webapp/modules/multidatabase/install.ini
+++ b/html/webapp/modules/multidatabase/install.ini
@@ -33,6 +33,7 @@ room_id = core.page_id
content_id =
comment_id =
metadata_id =
+title_metadata_id = metadata_id
metadata_content_id =
multidatabase_metadata_content.content=wysiwyg.upload_id
multidatabase_metadata_content.content = text.upload_id
diff --git a/html/webapp/modules/registration/install.ini b/html/webapp/modules/registration/install.ini
index 5d75619..5e2053a 100644
--- a/html/webapp/modules/registration/install.ini
+++ b/html/webapp/modules/registration/install.ini
@@ -37,7 +37,8 @@ room_id = core.page_id
item_id =
data_id =
item_data_id =
-registration_item_data.item_data_value=wysiwyg.upload_id
+upload_id = core.upload_id
+registration_item_data.item_data_value = text.upload_id
[Operation]
select_sql = "SELECT {registration}.registration_id,{registration}.registration_name FROM {registration_block},{registration} WHERE {registration_block}.registration_id = {registration}.registration_id AND {registration_block}.block_id = ?"
From e2643f7e5dd186cf4148e73172922d894e2acefc Mon Sep 17 00:00:00 2001
From: kteraguchi
Date: Tue, 16 Apr 2013 16:06:22 +0900
Subject: [PATCH 27/39] =?UTF-8?q?#56=20room=5Fid=E3=82=92=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?=
=?UTF-8?q?=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../reservation/components/Action.class.php | 3 ++-
.../reservation/update/Update.class.php | 27 +++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/html/webapp/modules/reservation/components/Action.class.php b/html/webapp/modules/reservation/components/Action.class.php
index 9513279..c083842 100644
--- a/html/webapp/modules/reservation/components/Action.class.php
+++ b/html/webapp/modules/reservation/components/Action.class.php
@@ -1021,7 +1021,8 @@ function updateReserve()
$details_params = array(
"contact" => $this->_request->getParameter("contact"),
"description" => $description,
- "rrule" => $rrule_str
+ "rrule" => $rrule_str,
+ 'room_id' => $reserve_room_id
);
if ($edit_rrule == RESERVATION_RESERVE_EDIT_ALL) {
diff --git a/html/webapp/modules/reservation/update/Update.class.php b/html/webapp/modules/reservation/update/Update.class.php
index c553678..2f47175 100644
--- a/html/webapp/modules/reservation/update/Update.class.php
+++ b/html/webapp/modules/reservation/update/Update.class.php
@@ -190,6 +190,33 @@ function execute()
$result = $this->db->execute($sql);
if($result === false) return false;
}
+
+ $sql = "SELECT RD.reserve_details_id, "
+ . "R.room_id "
+ . "FROM {reservation_reserve_details} RD "
+ . "LEFT JOIN {reservation_reserve} R "
+ . "ON RD.reserve_details_id = R.reserve_details_id "
+ . "WHERE R.room_id != RD.room_id "
+ . "OR R.room_id IS NULL "
+ . "GROUP BY RD.reserve_details_id";
+ $reserves = $this->db->execute($sql);
+ foreach ($reserves as $reserve) {
+ $whereArray = array(
+ 'reserve_details_id' => $reserve['reserve_details_id']
+ );
+ if (isset($reserve['room_id'])) {
+ $updateColumns = array(
+ 'room_id' => $reserve['room_id']
+ );
+ $result = $this->db->updateExecute('reservation_reserve_details', $updateColumns, $whereArray, false);
+ } else {
+ $result = $this->db->deleteExecute('reservation_reserve_details', $whereArray);
+ }
+ if ($result === false) {
+ return false;
+ }
+ }
+
return true;
}
}
From 92a0532737da2ffa411157b680d4e6b5e086334b Mon Sep 17 00:00:00 2001
From: kteraguchi
Date: Fri, 19 Apr 2013 17:57:25 +0900
Subject: [PATCH 28/39] =?UTF-8?q?#16=20#23=20=E3=83=8F=E3=83=B3=E3=83=89?=
=?UTF-8?q?=E3=83=AB=E5=90=8D=E3=82=82=E6=94=B9=E8=A1=8C=E3=81=95=E3=82=8C?=
=?UTF-8?q?=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?=
=?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
html/webapp/modules/journal/files/css/default/style.css | 1 -
html/webapp/modules/whatsnew/files/css/default/style.css | 2 --
2 files changed, 3 deletions(-)
diff --git a/html/webapp/modules/journal/files/css/default/style.css b/html/webapp/modules/journal/files/css/default/style.css
index 6ca6cd2..ede713e 100644
--- a/html/webapp/modules/journal/files/css/default/style.css
+++ b/html/webapp/modules/journal/files/css/default/style.css
@@ -55,7 +55,6 @@
border-left:medium none;
padding-left:30px;
text-align:right;
- white-space:nowrap;
}
.journal_list_bottom {
diff --git a/html/webapp/modules/whatsnew/files/css/default/style.css b/html/webapp/modules/whatsnew/files/css/default/style.css
index 2d8f1ac..bd99cb7 100644
--- a/html/webapp/modules/whatsnew/files/css/default/style.css
+++ b/html/webapp/modules/whatsnew/files/css/default/style.css
@@ -17,9 +17,7 @@ tr.whatsnew_read td a{
.whatsnew_user_name {
font-size:85%;
text-align:right;
- white-space:nowrap;
padding:2px 5px 3px 5px;
- white-space:nowrap;
}
.whatsnew_module {
font-size:85%;
From 924e5ff6ec010f65755982efc7bf62101222af97 Mon Sep 17 00:00:00 2001
From: kteraguchi
Date: Mon, 22 Apr 2013 18:29:56 +0900
Subject: [PATCH 29/39] =?UTF-8?q?#36=20#41=20=E3=81=A4=E3=81=84=E3=81=A7?=
=?UTF-8?q?=E3=81=AB=E6=9C=AB=E5=B0=BE=E3=81=AE=E3=82=B9=E3=83=9A=E3=83=BC?=
=?UTF-8?q?=E3=82=B9=E3=82=92=E9=99=A4=E5=8E=BB=E3=80=82=EF=BC=88Reseachma?=
=?UTF-8?q?p=E3=82=BD=E3=83=BC=E3=82=B9=E3=81=A8=E5=90=88=E3=82=8F?=
=?UTF-8?q?=E3=81=9B=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
html/webapp/modules/system/language/english/main.ini | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/html/webapp/modules/system/language/english/main.ini b/html/webapp/modules/system/language/english/main.ini
index debac24..8296797 100644
--- a/html/webapp/modules/system/language/english/main.ini
+++ b/html/webapp/modules/system/language/english/main.ini
@@ -81,13 +81,13 @@ system_proxy_pass = "Proxy password"
system_proxy_pass_note = "If your proxy server needs BASIC authentication, set the password. Else, leave blank"
system_use_permalink_title="Permalink Setting"
system_use_permalink="Use the permalink"
-system_use_permalink_note = "During initial setting, URLs with many parameters are used, but permanent links can also be created.
To enable setting, it is necessary to enable .htaccess in Apache. Under htdocs `.htaccess` will be automatically created."
+system_use_permalink_note = "During initial setting, URLs with many parameters are used, but permanent links can also be created.
To enable setting, it is necessary to enable .htaccess in Apache. Under htdocs `.htaccess` will be automatically created."
system_ldap_title = "LDAP Certification"
system_ldap_uses = "Use the LDAP"
system_ldap_server = "LDAP Host"
system_ldap_server_note = "Please input the LDAP host's name or IP address."
system_ldap_domain = "Domain"
-system_ldap_domain_note = "Please input the Domain's name or RDN(Relative Distinguished Name)."
+system_ldap_domain_note = "Please input the Domain's name or RDN(Relative Distinguished Name)."
[System_View_Main_Mail]
system_mail_from = "FROM address"
From 45e7ea60b8fa013dd8e8ae4d5334f7ed2ca1893f Mon Sep 17 00:00:00 2001
From: kteraguchi
Date: Tue, 23 Apr 2013 15:54:44 +0900
Subject: [PATCH 30/39] =?UTF-8?q?#24=20#25=20=E3=81=A4=E3=81=84=E3=81=A7?=
=?UTF-8?q?=E3=81=AB=E4=B8=8D=E8=A6=81=E5=AE=9A=E7=BE=A9=E3=82=92=E5=89=8A?=
=?UTF-8?q?=E9=99=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
html/webapp/style/css/page_style.css | 4 ----
1 file changed, 4 deletions(-)
diff --git a/html/webapp/style/css/page_style.css b/html/webapp/style/css/page_style.css
index c991f20..0f57952 100644
--- a/html/webapp/style/css/page_style.css
+++ b/html/webapp/style/css/page_style.css
@@ -163,8 +163,4 @@ div#centercolumn_inf_mes {
div#centercolumn_inf_mes div {
padding:3px;
-}
-
-div.centercolumn_active_center {
- padding:8px 15px;
}
\ No newline at end of file
From 5a0e61ed662c038aee13c6fe998fdd2d7aea7389 Mon Sep 17 00:00:00 2001
From: kteraguchi
Date: Wed, 24 Apr 2013 12:03:35 +0900
Subject: [PATCH 31/39] =?UTF-8?q?Ver.2.4.0.0=E3=83=AA=E3=83=AA=E3=83=BC?=
=?UTF-8?q?=E3=82=B9=E3=81=8B=E3=82=892013/1/21=E3=81=BE=E3=81=A7=E3=81=AE?=
=?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=88=86=E3=81=A7=E6=BC=8F=E3=82=8C=E3=81=A6?=
=?UTF-8?q?=E3=81=9F=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E8=BF=BD?=
=?UTF-8?q?=E5=8A=A0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
html/webapp/language/chinese/lang_common.js | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/html/webapp/language/chinese/lang_common.js b/html/webapp/language/chinese/lang_common.js
index 17c9f75..57bfcdf 100644
--- a/html/webapp/language/chinese/lang_common.js
+++ b/html/webapp/language/chinese/lang_common.js
@@ -33,7 +33,19 @@ compCalendarLang = {
btn_prev_year : "«",
btn_next_year : "»",
btn_prev_month : "‹",
- btn_next_month : "›"
+ btn_next_month : "›",
+ month_jan : " 1月",
+ month_feb : " 2月",
+ month_mar : " 3月",
+ month_apr : " 4月",
+ month_may : " 5月",
+ month_jun : " 6月",
+ month_jul : " 7月",
+ month_aug : " 8月",
+ month_sep : " 9月",
+ month_oct : "10月",
+ month_nov : "11月",
+ month_dec : "12月"
};
/*WYSIWYG用定義ファイル*/
compTextareaLang = {
From 87994f105e7aff91f38ed569183e18f9c28d69a5 Mon Sep 17 00:00:00 2001
From: kteraguchi
Date: Thu, 25 Apr 2013 15:59:10 +0900
Subject: [PATCH 32/39] =?UTF-8?q?#57=20NC2.4.0.0=E3=81=AE=E4=BF=AE?=
=?UTF-8?q?=E6=AD=A3=E3=81=A7=E3=80=81=E6=B6=88=E3=81=88=E3=81=A6=E3=81=97?=
=?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=9F=E6=8A=95=E7=A5=A8=E9=A0=86=E3=82=BD?=
=?UTF-8?q?=E3=83=BC=E3=83=88=E5=87=A6=E7=90=86=E3=82=92=E6=88=BB=E3=81=97?=
=?UTF-8?q?=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../multidatabase/view/main/search/result/Result.class.php | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/html/webapp/modules/multidatabase/view/main/search/result/Result.class.php b/html/webapp/modules/multidatabase/view/main/search/result/Result.class.php
index 7842357..60d4a3e 100644
--- a/html/webapp/modules/multidatabase/view/main/search/result/Result.class.php
+++ b/html/webapp/modules/multidatabase/view/main/search/result/Result.class.php
@@ -199,6 +199,11 @@ function execute()
$order_params = array(
"{multidatabase_content}.insert_time" => "ASC"
);
+ }else if($this->sort_metadata == MULTIDATABASE_DEFAULT_VOTE_SORT) {
+ $order_params = array(
+ "{multidatabase_content}.vote_count" => "DESC",
+ "{multidatabase_content}.insert_time" => "DESC"
+ );
}else if(isset($this->sort_metadatas[$this->sort_metadata]) && ($this->sort_metadatas[$this->sort_metadata]["type"] == MULTIDATABASE_META_TYPE_FILE || $this->sort_metadatas[$this->sort_metadata]["type"] == MULTIDATABASE_META_TYPE_IMAGE)) {
$order_params = array(
"F".$this->sort_metadata.".file_name" => "ASC",
From 56e99a1a517c6d1ed20727ce94bc14cf224240ec Mon Sep 17 00:00:00 2001
From: kteraguchi
Date: Fri, 26 Apr 2013 11:57:57 +0900
Subject: [PATCH 33/39] =?UTF-8?q?Ver.2.4.0.0=E3=83=AA=E3=83=AA=E3=83=BC?=
=?UTF-8?q?=E3=82=B9=E3=81=8B=E3=82=892013/1/21=E3=81=BE=E3=81=A7=E3=81=AE?=
=?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=88=86=E3=81=A7=E3=80=81=E3=83=A1=E3=83=BC?=
=?UTF-8?q?=E3=83=AB=E3=82=A2=E3=83=89=E3=83=AC=E3=82=B9=E3=83=81=E3=82=A7?=
=?UTF-8?q?=E3=83=83=E3=82=AF=E5=87=A6=E7=90=86=E3=81=AE=E5=85=B1=E9=80=9A?=
=?UTF-8?q?=E5=8C=96=E3=82=92=E3=81=97=E3=81=9F=E9=9A=9B=E3=81=AB=E3=80=81?=
=?UTF-8?q?Notice=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C=E7=99=BA=E7=94=9F?=
=?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=AA=E3=81=A3?=
=?UTF-8?q?=E3=81=9F=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/login/validator/Validator_ItemsInputs.class.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/html/webapp/modules/login/validator/Validator_ItemsInputs.class.php b/html/webapp/modules/login/validator/Validator_ItemsInputs.class.php
index 1db03d2..335733c 100644
--- a/html/webapp/modules/login/validator/Validator_ItemsInputs.class.php
+++ b/html/webapp/modules/login/validator/Validator_ItemsInputs.class.php
@@ -55,15 +55,14 @@ function validate($attributes, $errStr, $params)
if($show_items === false) {
return $errStr;
}
- $autoregist_use_items = explode("|", $config['autoregist_use_items']['conf_value']);
- foreach($autoregist_use_items as $autoregist_use_item) {
+ $configs = explode("|", $config['autoregist_use_items']['conf_value']);
+ foreach($configs as $autoregist_use_item) {
$buf_arr = explode(":", $autoregist_use_item);
if(isset($buf_arr[0]) && $buf_arr[0] != "") {
$autoregist_use_items[$buf_arr[0]] = $buf_arr[0];
$autoregist_use_items_req[$buf_arr[0]] = $buf_arr[1];
}
}
-
$files = $fileUpload->getOriginalName();
$files_key = array_keys($files);
From 9a28aae626f55ad96be34148ec34131957c96139 Mon Sep 17 00:00:00 2001
From: kteraguchi
Date: Fri, 26 Apr 2013 15:54:52 +0900
Subject: [PATCH 34/39] =?UTF-8?q?Revert=20"=E6=96=87=E6=9B=B8=E5=9E=8B?=
=?UTF-8?q?=E5=AE=A3=E8=A8=80=E3=81=AE=E5=89=8D=E3=81=AE=E7=A9=BA=E8=A1=8C?=
=?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 2209bca239276af8eba71406b4cdb096455be759.
---
html/webapp/templates/main/header.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/html/webapp/templates/main/header.html b/html/webapp/templates/main/header.html
index 0586369..9d61453 100644
--- a/html/webapp/templates/main/header.html
+++ b/html/webapp/templates/main/header.html
@@ -1,3 +1,4 @@
+
<{strip}>
From 69cd0a230a80a79d666d908e01cd2983247adb41 Mon Sep 17 00:00:00 2001
From: kteraguchi
Date: Fri, 26 Apr 2013 16:53:52 +0900
Subject: [PATCH 35/39] =?UTF-8?q?#9=20Eclipse=E9=96=8B=E7=99=BA=E7=94=A8?=
=?UTF-8?q?=E7=84=A1=E8=A6=96=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E5=AE=9A?=
=?UTF-8?q?=E7=BE=A9=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitignore b/.gitignore
index fecf3e6..37ebe2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,6 @@
# C:\Github\NetCommons2 > git init .
# C:\Github\NetCommons2 > git checkout -b develop
# C:\Github\NetCommons2 [develop +0 ~1 -0]> git update-index --assume-unchanged html\webapp\config\install.inc.php
+
+# Eclipse開発用無視ファイル設定
+/.settings
From 5449470fbc4fd8fa3c2dc3c6cbe9316772e58e36 Mon Sep 17 00:00:00 2001
From: kteraguchi
Date: Fri, 10 May 2013 10:29:59 +0900
Subject: [PATCH 36/39] =?UTF-8?q?#9=20Eclipse=E9=96=8B=E7=99=BA=E7=94=A8?=
=?UTF-8?q?=E7=84=A1=E8=A6=96=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E5=AE=9A?=
=?UTF-8?q?=E7=BE=A9=E3=82=92=E5=86=8D=E8=BF=BD=E5=8A=A0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 37ebe2d..71a9b13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,9 @@
/html/images
/html/js
/html/themes
+/html/htdocs/images
+/html/htdocs/js
+/html/htdocs/themes
/html/webapp/templates_c/*
/html/webapp/uploads/*
@@ -20,4 +23,6 @@
# C:\Github\NetCommons2 [develop +0 ~1 -0]> git update-index --assume-unchanged html\webapp\config\install.inc.php
# Eclipse開発用無視ファイル設定
-/.settings
+/.settings
+/.buildpath
+/.project
From 8e9a658b75c34008a275b2f185275389102aae03 Mon Sep 17 00:00:00 2001
From: kteraguchi
Date: Fri, 10 May 2013 10:48:48 +0900
Subject: [PATCH 37/39] =?UTF-8?q?#60=20htdocs/index.php=E3=81=8C=E5=AD=98?=
=?UTF-8?q?=E5=9C=A8=E3=81=99=E3=82=8B=E5=A0=B4=E5=90=88=E3=80=81=E3=83=90?=
=?UTF-8?q?=E3=83=83=E3=82=AF=E3=82=A2=E3=83=83=E3=83=97=E5=AF=BE=E8=B1=A1?=
=?UTF-8?q?=E3=81=A8=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?=
=?UTF-8?q?=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
html/webapp/modules/backup/action/main/init/Init.class.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/html/webapp/modules/backup/action/main/init/Init.class.php b/html/webapp/modules/backup/action/main/init/Init.class.php
index 73008ff..5eb7e92 100644
--- a/html/webapp/modules/backup/action/main/init/Init.class.php
+++ b/html/webapp/modules/backup/action/main/init/Init.class.php
@@ -249,7 +249,7 @@ function _fullBackUp()
$archiveDir = (isset($startIndexDirs[0])) ? $archiveBaseDir . implode('/', $startIndexDirs) : substr($archiveBaseDir, 0, strlen($archiveBaseDir) - 1);
$this->_readStartFile($source, START_INDEX_DIR, $archiveDir);
- if(file_exists(dirname(START_INDEX_DIR) . INDEX_FILE_NAME)) {
+ if (file_exists(dirname(START_INDEX_DIR) . INDEX_FILE_NAME)) {
$handle = fopen(dirname(START_INDEX_DIR) . INDEX_FILE_NAME, "r");
if ($handle) {
$contents = fread($handle, 94);
@@ -258,7 +258,7 @@ function _fullBackUp()
$source[] = File_Archive::read(dirname(START_INDEX_DIR) . INDEX_FILE_NAME, dirname($archiveDir) . INDEX_FILE_NAME);
}
}
- } else {
+ } elseif (file_exists(START_INDEX_DIR . '/htdocs' . INDEX_FILE_NAME)) {
$source[] = File_Archive::read(START_INDEX_DIR . '/htdocs' . INDEX_FILE_NAME, $archiveDir . '/htdocs' . INDEX_FILE_NAME);
}
From c7171437da4d220a71358016f3100d42b02cede8 Mon Sep 17 00:00:00 2001
From: kteraguchi
Date: Fri, 17 May 2013 16:47:26 +0900
Subject: [PATCH 38/39] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?=
=?UTF-8?q?=E3=81=AE=E8=BF=BD=E8=A8=98=E3=80=81=E3=81=8A=E3=82=88=E3=81=B3?=
=?UTF-8?q?=E3=80=81=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E5=AE=9A?=
=?UTF-8?q?=E7=BE=A9=E3=81=AE=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
docs/CHANGES.txt | 68 +++++++++++++++++++
html/webapp/config/version.php | 2 +-
html/webapp/modules/authority/install.ini | 2 +-
html/webapp/modules/backup/install.ini | 2 +-
html/webapp/modules/bbs/install.ini | 2 +-
html/webapp/modules/calendar/install.ini | 2 +-
html/webapp/modules/chat/install.ini | 2 +-
html/webapp/modules/circular/install.ini | 2 +-
html/webapp/modules/journal/install.ini | 2 +-
html/webapp/modules/linklist/install.ini | 2 +-
html/webapp/modules/login/install.ini | 2 +-
html/webapp/modules/menu/install.ini | 2 +-
html/webapp/modules/module/install.ini | 2 +-
html/webapp/modules/multidatabase/install.ini | 2 +-
html/webapp/modules/photoalbum/install.ini | 2 +-
html/webapp/modules/pm/install.ini | 2 +-
html/webapp/modules/registration/install.ini | 2 +-
html/webapp/modules/reservation/install.ini | 2 +-
html/webapp/modules/room/install.ini | 2 +-
html/webapp/modules/rss/install.ini | 2 +-
html/webapp/modules/system/install.ini | 2 +-
html/webapp/modules/user/install.ini | 2 +-
html/webapp/modules/whatsnew/install.ini | 2 +-
23 files changed, 90 insertions(+), 22 deletions(-)
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 01e9dcc..f8888ac 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -1,6 +1,74 @@
NetComomns2 Changelog
===============================
+2013/05/20: Version 2.4.1.0
+===============================
+- 会員の新規申込みで複数選択項目があった場合、その項目を条件とした会員検索にヒットしないバグを修正
+- 会員項目で英語表記の一部を先頭大文字に修正
+- 会員検索でルームに参加していない会員が正しくヒットしないバグを修正
+- 権限管理で不要な定義を削除
+- ページデータの削除処理を共通化
+- パブリックスペースで主坦権限であるユーザーがページ追加できないバグを修正
+- バックアップでhtdocs/index.phpが存在しない場合、フルバックアップができないバグを修正
+- バックアップのルームリストアでアップロードファイルの削除処理を修正
+- システム管理でJavaScript,CSS,gzipの表記を修正
+- モバイル管理の表示メニュー設定に対象外のページが表示されてしまうバグを修正
+- モバイル管理でルーム別メニュー表示をしないに設定した場合、ルームが表示されないことがあるバグを修正
+- スマートフォンでPC用画面に切り替える際に確認メッセージを表示するように修正
+- スマートフォンで機種によって横スクロールしていたが、しないように修正
+- スマートフォンで表示する場合、ページ内リンクのフラグメント（#）以降を削除する処理を追加
+- メールアドレス検索処理の修正、および、共通化
+- カレンダーコンポーネントで月表示の英語表記を修正
+‐ WYSIWYGエディタの画像挿入時に画像サイズ「大・中・小」を選択できるように修正
+‐ WYSIWYGエディタでliタグのvalueが認識されないバグを修正
+‐ WYSIWYGエディタでリンク挿入の英語文言を一部修正
+- 共通定義の文言を一部修正
+- ファイルのダウンロード処理で1Mbyteごとにflushするように修正
+- 固定リンクの使用禁止文字を追加
+- 読み上げソフト用画面をキャンセルする処理を修正
+- インストール後のWelcome文章を修正
+- フッターにある著作権表示の内側余白を修正
+- generatorでDEPRECATEDエラーを抑制する処理を追加
+- システムカラーの定義を6桁のカラーコードに修正
+- ログインで定数を使うように修正
+- お知らせで携帯表示にあるtext/html切替リンクの表示処理を修正
+- 掲示板でフィーチャーフォンのスレッド表示が正しく表示されないバグを修正
+- カレンダーで新着からのリンク先が削除されていた場合、Noticeエラーが発生するバグを修正
+- チャットのデータがNC1からの移行データだった場合、IDが重複してしまうことがあるバグを修正
+- チャットでルームのリストア時にIDが重複してしまうバグを修正
+- 回覧板の追記をWYSIWYGエディタに変更
+- 回覧板で追記のメール件名を入力できるように修正
+- 日誌で同一日付の記事が合った場合、次の記事、前の記事のリンク先が正しくないバグを修正
+- 日誌で携帯版の新着にあるリンク先がコメント画面になってしまうバグを修正
+- 日誌で長いタイトルは改行するように修正
+- リンクリストで表示方法選択がドロップダウンの場合は説明付きチェックボックスを使用不可になるように修正
+- リンクリストでhttpsでも画像が表示するように修正
+- 汎用データベースで項目属性の変更による既存コンテンツ更新処理のバグを修正
+- 汎用データベースで表示直後に改ページが動作しないバグを修正
+- 汎用データベースで検索結果を投票順でソートするとエラーが発生するバグを修正
+- 汎用データベースでルームのリストア時にタイトルメタデータIDが変更されないバグを修正
+- 汎用データベースの表示方法変更画面で登録した表示件数、表示順が表示されるように修正
+- フォトアルバムで選択中のアルバムが削除された場合に表示されるメッセージを修正
+- フォトアルバムで写真画面の幅を大きくするように修正
+- フォトアルバムでスマートフォンの写真一覧画面にある改ページ処理を修正
+- プライベートメッセージの宛先検索でMySQLのバージョンによってエラーが発生するバグを修正
+- プライベートメッセージでグループルームがない場合、宛先の検索がヒットしないバグを修正
+- プライベートメッセージの英語文言を一部修正
+- 登録フォームで入力必須の項目に「0」が登録できないバグを修正
+- 施設予約で利用するグループを変更しても、施設詳細のルームIDが更新されないバグを修正
+- 施設予約のルーム選択リストからパブリックスペース、および、パブリックルームを選択できるように修正
+- 施設予約で登録者を正しく表示するように修正
+- 施設予約の個人的な予約で会員の権限、ルームでの権限を選択できるように修正
+- 施設予約で15分未満の予約をした際に、表示されるメッセージを修正
+- 施設予約の日表示で予約登録画面を開いた場合、選択していたカテゴリを表示するように修正
+- 施設予約で最初に表示する施設を削除すると、Noticeエラーが発生するバグを修正
+- RSSの対象がAtom形式で1件の場合表示されないバグを修正
+- RSSで概要、内容が表示されないことがあるバグを修正
+- 新着情報で古いデータの削除処理を修正
+- 新着情報で長いタイトルは改行するように修正
+
+
+
2012/03/27: Version 2.4.0.0
===============================
- スマートフォン対応、および、フィーチャーフォンのデザイン改修
diff --git a/html/webapp/config/version.php b/html/webapp/config/version.php
index 90797dc..c35760a 100644
--- a/html/webapp/config/version.php
+++ b/html/webapp/config/version.php
@@ -1,4 +1,4 @@
\ No newline at end of file
diff --git a/html/webapp/modules/authority/install.ini b/html/webapp/modules/authority/install.ini
index f713dcb..c122020 100644
--- a/html/webapp/modules/authority/install.ini
+++ b/html/webapp/modules/authority/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name="authority_view_admin_init"
module_icon="authority.gif"
system_flag=1
diff --git a/html/webapp/modules/backup/install.ini b/html/webapp/modules/backup/install.ini
index 32a314e..90f8a1b 100644
--- a/html/webapp/modules/backup/install.ini
+++ b/html/webapp/modules/backup/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name="backup_view_main_init"
module_icon="backup.gif"
system_flag=1
diff --git a/html/webapp/modules/bbs/install.ini b/html/webapp/modules/bbs/install.ini
index 3a06a45..4f27b34 100644
--- a/html/webapp/modules/bbs/install.ini
+++ b/html/webapp/modules/bbs/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name = "bbs_view_main_init"
edit_action_name = "bbs_view_edit_list"
search_action = "bbs_view_admin_search"
diff --git a/html/webapp/modules/calendar/install.ini b/html/webapp/modules/calendar/install.ini
index 6584a90..c43cbfe 100644
--- a/html/webapp/modules/calendar/install.ini
+++ b/html/webapp/modules/calendar/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name="calendar_view_main_init"
edit_action_name="calendar_view_edit_init"
search_action = "calendar_view_admin_search"
diff --git a/html/webapp/modules/chat/install.ini b/html/webapp/modules/chat/install.ini
index 171ba0b..5ed9258 100644
--- a/html/webapp/modules/chat/install.ini
+++ b/html/webapp/modules/chat/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name="chat_view_main_init"
edit_action_name = "chat_view_edit_init"
block_add_action = "chat_action_edit_create"
diff --git a/html/webapp/modules/circular/install.ini b/html/webapp/modules/circular/install.ini
index fa99f01..8f51fda 100644
--- a/html/webapp/modules/circular/install.ini
+++ b/html/webapp/modules/circular/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name = "circular_view_main_init"
edit_action_name = "circular_view_edit_option"
search_action = "circular_view_admin_search"
diff --git a/html/webapp/modules/journal/install.ini b/html/webapp/modules/journal/install.ini
index 33f46a0..5453878 100644
--- a/html/webapp/modules/journal/install.ini
+++ b/html/webapp/modules/journal/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name="journal_view_main_init"
edit_action_name="journal_view_edit_list"
block_add_action="journal_view_edit_create"
diff --git a/html/webapp/modules/linklist/install.ini b/html/webapp/modules/linklist/install.ini
index 637ad0e..11aa85e 100644
--- a/html/webapp/modules/linklist/install.ini
+++ b/html/webapp/modules/linklist/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name = "linklist_view_main_init"
edit_action_name = "linklist_view_edit_list"
block_add_action = "linklist_view_edit_entry"
diff --git a/html/webapp/modules/login/install.ini b/html/webapp/modules/login/install.ini
index 496ea5b..763f7ac 100644
--- a/html/webapp/modules/login/install.ini
+++ b/html/webapp/modules/login/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name="login_view_main_init"
[Mobile]
diff --git a/html/webapp/modules/menu/install.ini b/html/webapp/modules/menu/install.ini
index 3254baa..8b854d0 100644
--- a/html/webapp/modules/menu/install.ini
+++ b/html/webapp/modules/menu/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name="menu_view_main_init"
edit_action_name="menu_view_edit_init"
block_delete_action="auto"
diff --git a/html/webapp/modules/module/install.ini b/html/webapp/modules/module/install.ini
index 41052df..645a691 100644
--- a/html/webapp/modules/module/install.ini
+++ b/html/webapp/modules/module/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name = "module_view_admin_init"
system_flag=1
;disposition_flag=1
diff --git a/html/webapp/modules/multidatabase/install.ini b/html/webapp/modules/multidatabase/install.ini
index 5b0a366..5ce72ac 100644
--- a/html/webapp/modules/multidatabase/install.ini
+++ b/html/webapp/modules/multidatabase/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name="multidatabase_view_main_init"
edit_action_name="multidatabase_view_edit_list"
block_add_action="multidatabase_view_edit_create"
diff --git a/html/webapp/modules/photoalbum/install.ini b/html/webapp/modules/photoalbum/install.ini
index dc46f80..490c407 100644
--- a/html/webapp/modules/photoalbum/install.ini
+++ b/html/webapp/modules/photoalbum/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name = "photoalbum_view_main_init"
edit_action_name = "photoalbum_view_edit_list"
block_add_action = "photoalbum_view_edit_entry"
diff --git a/html/webapp/modules/pm/install.ini b/html/webapp/modules/pm/install.ini
index 2b6e8bb..77b0246 100644
--- a/html/webapp/modules/pm/install.ini
+++ b/html/webapp/modules/pm/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name="pm_view_main_init"
delete_action = "pm_action_admin_operation"
module_update_action="pm_update"
diff --git a/html/webapp/modules/registration/install.ini b/html/webapp/modules/registration/install.ini
index 5e2053a..8717f19 100644
--- a/html/webapp/modules/registration/install.ini
+++ b/html/webapp/modules/registration/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name="registration_view_main_init"
edit_action_name="registration_view_edit_registration_list"
block_add_action="registration_view_edit_registration_entry"
diff --git a/html/webapp/modules/reservation/install.ini b/html/webapp/modules/reservation/install.ini
index 4774daf..f5fec1c 100644
--- a/html/webapp/modules/reservation/install.ini
+++ b/html/webapp/modules/reservation/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.1.0"
action_name = "reservation_view_main_init"
edit_action_name = "reservation_view_edit_style_init"
block_add_action = "reservation_action_edit_addblock"
diff --git a/html/webapp/modules/room/install.ini b/html/webapp/modules/room/install.ini
index c073806..7cc88f5 100644
--- a/html/webapp/modules/room/install.ini
+++ b/html/webapp/modules/room/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name="room_view_admin_init"
module_icon="room.gif"
system_flag=1
diff --git a/html/webapp/modules/rss/install.ini b/html/webapp/modules/rss/install.ini
index 45c6af7..421cdba 100644
--- a/html/webapp/modules/rss/install.ini
+++ b/html/webapp/modules/rss/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name = "rss_view_main_init"
edit_action_name = "rss_view_edit_init"
block_delete_action = "auto"
diff --git a/html/webapp/modules/system/install.ini b/html/webapp/modules/system/install.ini
index beade5f..17eb963 100644
--- a/html/webapp/modules/system/install.ini
+++ b/html/webapp/modules/system/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name="system_view_main_general"
system_flag=1
module_icon=system.gif
diff --git a/html/webapp/modules/user/install.ini b/html/webapp/modules/user/install.ini
index 0963e07..a1b5f2c 100644
--- a/html/webapp/modules/user/install.ini
+++ b/html/webapp/modules/user/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name="user_view_main_search"
system_flag=1
module_icon="user.gif"
diff --git a/html/webapp/modules/whatsnew/install.ini b/html/webapp/modules/whatsnew/install.ini
index 6052a04..9228ecf 100644
--- a/html/webapp/modules/whatsnew/install.ini
+++ b/html/webapp/modules/whatsnew/install.ini
@@ -1,4 +1,4 @@
-version = "2.4.0.0"
+version = "2.4.0.1"
action_name = "whatsnew_view_main_init"
edit_action_name = "whatsnew_view_edit_init"
block_add_action = "whatsnew_action_edit_addblock"
From ef06c473523038c97320e9b9ea2945999fb989ad Mon Sep 17 00:00:00 2001
From: "suehiro.hisayoshi"
Date: Tue, 21 May 2013 19:55:18 +0900
Subject: [PATCH 39/39] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=87=E3=83=B3?=
=?UTF-8?q?=E3=83=88=E3=81=8C=E5=B4=A9=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F?=
=?UTF-8?q?=E3=81=AE=E3=81=A7=E3=83=87=E3=82=A3=E3=83=AC=E3=82=AF=E3=83=88?=
=?UTF-8?q?=E3=83=AA=E3=81=AE=E9=9B=B0=E5=9B=B2=E6=B0=97=E3=81=AB=E5=90=88?=
=?UTF-8?q?=E3=82=8F=E3=81=9B=E3=81=A6=E7=9B=B4=E3=81=97=E3=81=9F=E3=80=82?=
=?UTF-8?q?=20=E6=A9=9F=E8=83=BD=E3=82=84=E9=96=A2=E6=95=B0=E3=81=AE?=
=?UTF-8?q?=E5=AE=9F=E8=A3=85=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B=E4=BF=AE?=
=?UTF-8?q?=E6=AD=A3=E7=82=B9=E3=81=AF=E3=81=82=E3=82=8A=E3=81=BE=E3=81=9B?=
=?UTF-8?q?=E3=82=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../filter/Filter_RequestCheck.class.php | 174 +++++++++---------
1 file changed, 87 insertions(+), 87 deletions(-)
diff --git a/html/maple/filter/Filter_RequestCheck.class.php b/html/maple/filter/Filter_RequestCheck.class.php
index e1491ed..905a454 100644
--- a/html/maple/filter/Filter_RequestCheck.class.php
+++ b/html/maple/filter/Filter_RequestCheck.class.php
@@ -18,7 +18,7 @@
* @access public
*/
class Filter_RequestCheck extends Filter {
-
+
var $_container;
var $_log;
@@ -30,118 +30,118 @@ class Filter_RequestCheck extends Filter {
var $_request;
var $_className;
-
- /**
- * コンストラクター
- *
- * @access public
- */
- function Filter_RequestCheck() {
- parent::Filter();
- }
- /**
- * Viewの処理を実行
- *
- * @access public
- **/
- function execute() {
- $this->_container =& DIContainerFactory::getContainer();
+ /**
+ * コンストラクター
+ *
+ * @access public
+ */
+ function Filter_RequestCheck() {
+ parent::Filter();
+ }
+
+ /**
+ * Viewの処理を実行
+ *
+ * @access public
+ **/
+ function execute() {
+ $this->_container =& DIContainerFactory::getContainer();
$this->_log =& LogFactory::getLog();
$this->_filterChain =& $this->_container->getComponent("FilterChain");
$this->_actionChain =& $this->_container->getComponent("ActionChain");
$this->_request =& $this->_container->getComponent("Request");
-
+
$this->_className = get_class($this);
-
- $this->_prefilter();
-
+
+ $this->_prefilter();
+
$this->_log->trace("{$this->_className}の前処理が実行されました", "{$this->_className}#execute");
-
+
$this->_filterChain->execute();
$this->_postfilter();
$this->_log->trace("{$this->_className}の後処理が実行されました", "{$this->_className}#execute");
- }
-
- /**
+ }
+
+ /**
* プレフィルタ
* 初期処理を行う
* @access private
*/
function _prefilter()
{
- $errorList =& $this->_actionChain->getCurErrorList();
- if ($errorList->isExists()) {
- //既にエラーがあればそのまま返却
- return;
- }
- //アクション名取得
- $action_name = $this->_actionChain->getCurActionName();
- $pathList = explode("_", $action_name);
- $attributes = $this->getAttributes();
- if (isset($attributes["request"])) {
- if ($attributes["request"] == "BOTH" || $this->_request->getMethod() == $attributes["request"]) {
- //登録処理の場合、リファラチェック
- if ($this->_request->getMethod() == "POST" && $this->_refcheck()) {
- return;
- } else if($this->_request->getMethod() == "GET"){
- return;
- }
- }
- } else if ($this->_request->getMethod() == "POST" && isset($_FILES) && (0 < count($_FILES))) {
- //ファイルアップロード処理の場合、リファラチェック
- if ($this->_refcheck()) {
- return;
- }
- } else {
- //Default
- //system_view(action)_XXXX
- $i = 1;
- //if($pathList[1] == "system" && isset($pathList[2])) {
- // $i = 2;
- //}
- if($pathList[$i] != "action" && $pathList[$i] != "view") {
- //module名_action or module名_viewのどちらでもない場合、チェックしない
- return;
- }else if ($this->_request->getMethod() == "POST" && $pathList[$i] == "action") {
- //登録処理の場合、リファラチェック
- if (isset($attributes["refcheck"]) && $attributes["refcheck"] == "none") {
- return;
- }
- if ($this->_refcheck()) {
- return;
- }
- } else if($this->_request->getMethod() == "GET" && $pathList[$i] == "view"){
- return;
- }
- }
- //エラー
- $errorList->add("RquestCheck_Error", sprintf(_REQUESTCHECK_FAILURE,CURRENT_URL));
- $errorList->setType(VALIDATE_ERROR_TYPE); //VALIDATE_ERRORとする
- return;
-
+ $errorList =& $this->_actionChain->getCurErrorList();
+ if ($errorList->isExists()) {
+ //既にエラーがあればそのまま返却
+ return;
+ }
+ //アクション名取得
+ $action_name = $this->_actionChain->getCurActionName();
+ $pathList = explode("_", $action_name);
+ $attributes = $this->getAttributes();
+ if (isset($attributes["request"])) {
+ if ($attributes["request"] == "BOTH" || $this->_request->getMethod() == $attributes["request"]) {
+ //登録処理の場合、リファラチェック
+ if ($this->_request->getMethod() == "POST" && $this->_refcheck()) {
+ return;
+ } else if($this->_request->getMethod() == "GET"){
+ return;
+ }
+ }
+ } else if ($this->_request->getMethod() == "POST" && isset($_FILES) && (0 < count($_FILES))) {
+ //ファイルアップロード処理の場合、リファラチェック
+ if ($this->_refcheck()) {
+ return;
+ }
+ } else {
+ //Default
+ //system_view(action)_XXXX
+ $i = 1;
+ //if($pathList[1] == "system" && isset($pathList[2])) {
+ // $i = 2;
+ //}
+ if($pathList[$i] != "action" && $pathList[$i] != "view") {
+ //module名_action or module名_viewのどちらでもない場合、チェックしない
+ return;
+ }else if ($this->_request->getMethod() == "POST" && $pathList[$i] == "action") {
+ //登録処理の場合、リファラチェック
+ if (isset($attributes["refcheck"]) && $attributes["refcheck"] == "none") {
+ return;
+ }
+ if ($this->_refcheck()) {
+ return;
+ }
+ } else if($this->_request->getMethod() == "GET" && $pathList[$i] == "view"){
+ return;
+ }
+ }
+ //エラー
+ $errorList->add("RquestCheck_Error", sprintf(_REQUESTCHECK_FAILURE,CURRENT_URL));
+ $errorList->setType(VALIDATE_ERROR_TYPE); //VALIDATE_ERRORとする
+ return;
+
}
-
+
/**
* リファラチェック
* @access private
*/
function _refcheck()
{
- $ref = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
- if ($ref != '' && strpos($ref, BASE_URL) === 0) {
- return true;
- }
- // httpsの場合
- $ssl_base_url = preg_replace("/^http:\/\//i","https://", BASE_URL);
- if ($ref != '' && strpos($ref, $ssl_base_url) === 0) {
- return true;
- }
- return false;
+ $ref = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
+ if ($ref != '' && strpos($ref, BASE_URL) === 0) {
+ return true;
+ }
+ // httpsの場合
+ $ssl_base_url = preg_replace("/^http:\/\//i","https://", BASE_URL);
+ if ($ref != '' && strpos($ref, $ssl_base_url) === 0) {
+ return true;
+ }
+ return false;
}
-
+
/**
* ポストフィルタ
* @access private