From dc307cb7d69d71f84cafb3784100d84344eef946 Mon Sep 17 00:00:00 2001 From: largeden Date: Tue, 28 Jan 2014 20:08:20 +0900 Subject: [PATCH 01/20] =?UTF-8?q?#375=20=EA=B2=8C=EC=8B=9C=ED=8C=90=20?= =?UTF-8?q?=EC=A0=95=EB=A0=AC=20=EA=B8=B0=EC=A4=80=20=EC=BB=AC=EB=9F=BC=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20regdate=20->=20list=5Forder=20-=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EB=AA=A8=EB=93=88=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=EC=97=90=EC=84=9C=20=EB=AC=B8=EC=84=9C=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EC=A0=95=EB=A0=AC(list=5Forder)=EC=9D=84=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=EC=9D=BC=20=EC=A0=95=EB=A0=AC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD(=EB=AC=B8=EC=84=9C=EB=B2=88=ED=98=B8=20?= =?UTF-8?q?=ED=91=9C=EA=B8=B0=EB=8A=94=20=EC=82=AD=EC=A0=9C)=20-=20default?= =?UTF-8?q?=20=EC=8A=A4=ED=82=A8=EC=97=90=EC=84=9C=20sort=5Findex=EC=9D=98?= =?UTF-8?q?=20regdate,=20last=5Fupdate=20=EA=B0=92=EC=9D=84=20list=5Forder?= =?UTF-8?q?,=20update=5Forder=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/board/board.admin.view.php | 2 +- modules/board/board.class.php | 2 +- modules/board/skins/default/list.html | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/board/board.admin.view.php b/modules/board/board.admin.view.php index 3f53e5e7d..90cfbee54 100644 --- a/modules/board/board.admin.view.php +++ b/modules/board/board.admin.view.php @@ -55,7 +55,7 @@ class boardAdminView extends board { // install order (sorting) options foreach($this->order_target as $key) $order_target[$key] = Context::getLang($key); - $order_target['list_order'] = Context::getLang('document_srl'); + $order_target['list_order'] = Context::getLang('regdate'); $order_target['update_order'] = Context::getLang('last_update'); Context::set('order_target', $order_target); } diff --git a/modules/board/board.class.php b/modules/board/board.class.php index d3adbd471..cb81e10f7 100644 --- a/modules/board/board.class.php +++ b/modules/board/board.class.php @@ -11,7 +11,7 @@ class board extends ModuleObject { var $search_option = array('title','content','title_content','comment','user_name','nick_name','user_id','tag'); ///< 검색 옵션 - var $order_target = array('list_order', 'update_order', 'regdate', 'voted_count', 'blamed_count', 'readed_count', 'comment_count', 'title'); // 정렬 옵션 + var $order_target = array('list_order', 'update_order', 'voted_count', 'blamed_count', 'readed_count', 'comment_count', 'title'); // 정렬 옵션 var $skin = "default"; ///< skin name var $list_count = 20; ///< the number of documents displayed in a page diff --git a/modules/board/skins/default/list.html b/modules/board/skins/default/list.html index bd58261a4..b5b06ed55 100644 --- a/modules/board/skins/default/list.html +++ b/modules/board/skins/default/list.html @@ -11,9 +11,9 @@ {$lang->writer} {$lang->user_id} {$lang->user_name} - {$lang->date} - {$lang->last_update} - {$lang->last_post} + {$lang->date} + {$lang->last_update} + {$lang->last_post} {$lang->readed_count} {$lang->voted_count} {$lang->blamed_count} From c6eae3ba10394c8248029fcb7afd8f058728f35e Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 8 Feb 2014 16:09:57 +0900 Subject: [PATCH 02/20] Update trash.admin.view.php --- modules/trash/trash.admin.view.php | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/modules/trash/trash.admin.view.php b/modules/trash/trash.admin.view.php index c68635aad..a2b9fc0b6 100644 --- a/modules/trash/trash.admin.view.php +++ b/modules/trash/trash.admin.view.php @@ -51,6 +51,33 @@ class trashAdminView extends trash // 템플릿 파일 지정 $this->setTemplateFile('trash_list'); } + + + + // Trash View - sejin7940 + function dispTrashAdminView() + { + $trash_srl = Context::get('trash_srl'); + + $oTrashModel = getModel('trash'); + $output = $oTrashModel->getTrash($trash_srl); + if(!$output->data->trash_srl) return new Object(-1, 'msg_invalid_request'); + + $originObject = unserialize($output->data->getSerializedObject()); + if(is_array($originObject)) $originObject = (object)$originObject; + + Context::set('oTrashVO',$output->data); + Context::set('oOrigin',$originObject); + + if($originObject) { + $args_extra->module_srl = $originObject->module_srl; + $args_extra->document_srl = $originObject->document_srl; + $output_extra = executeQueryArray('trash.getDocumentExtraVars', $args_extra); + Context::set('oOriginExtraVars',$output_extra->data); + } + $this->setTemplateFile('trash_view'); + } + } /* End of file trash.admin.view.php */ /* Location: ./modules/trash/trash.admin.view.php */ From 9177c5ee960a6f5dcdf7c0eb2bf0dd3491eb9030 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 8 Feb 2014 16:11:00 +0900 Subject: [PATCH 03/20] Update module.xml --- modules/trash/conf/module.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/trash/conf/module.xml b/modules/trash/conf/module.xml index e6225c9f2..5ffec0ed9 100644 --- a/modules/trash/conf/module.xml +++ b/modules/trash/conf/module.xml @@ -11,6 +11,8 @@ + + From 1153f7256e8c8bd91ea4ec382bd4e404c6d0026e Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 8 Feb 2014 16:11:57 +0900 Subject: [PATCH 04/20] Create getDocumentExtraVars.xml --- .../trash/queries/getDocumentExtraVars.xml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 modules/trash/queries/getDocumentExtraVars.xml diff --git a/modules/trash/queries/getDocumentExtraVars.xml b/modules/trash/queries/getDocumentExtraVars.xml new file mode 100644 index 000000000..c02dd3fad --- /dev/null +++ b/modules/trash/queries/getDocumentExtraVars.xml @@ -0,0 +1,32 @@ + + + +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + From b7de4d34a0b5b03cdfe09d7ef3d4819b6617bd2e Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 8 Feb 2014 16:14:40 +0900 Subject: [PATCH 05/20] Update trash.admin.view.php --- modules/trash/trash.admin.view.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/trash/trash.admin.view.php b/modules/trash/trash.admin.view.php index a2b9fc0b6..a6415305e 100644 --- a/modules/trash/trash.admin.view.php +++ b/modules/trash/trash.admin.view.php @@ -61,7 +61,7 @@ class trashAdminView extends trash $oTrashModel = getModel('trash'); $output = $oTrashModel->getTrash($trash_srl); - if(!$output->data->trash_srl) return new Object(-1, 'msg_invalid_request'); + if(!$output->data->getTrashSrl()) return new Object(-1, 'msg_invalid_request'); $originObject = unserialize($output->data->getSerializedObject()); if(is_array($originObject)) $originObject = (object)$originObject; From f43bd0141089681c851785f9e97ebdda01da0e13 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 8 Feb 2014 16:25:10 +0900 Subject: [PATCH 06/20] Create trash_view.html --- modules/trash/tpl/trash_view.html | 71 +++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 modules/trash/tpl/trash_view.html diff --git a/modules/trash/tpl/trash_view.html b/modules/trash/tpl/trash_view.html new file mode 100644 index 000000000..b9a92489f --- /dev/null +++ b/modules/trash/tpl/trash_view.html @@ -0,0 +1,71 @@ +
+

{$lang->cmd_trash} {$lang->trash_description}

+
+

삭제 정보

+ + + + + + + + + + + + + + +
{$lang->trasher} + {@ + $oMemberModel = &getModel('member'); + $remover_info = $oMemberModel->getMemberInfoByMemberSrl($oTrashVO->getRemoverSrl()); + } + {htmlspecialchars($remover_info->nick_name)} [{$remover_info->user_id}] +
{$lang->trash_date}{zdate($oTrashVO->getRegdate(), "Y-m-d H:i:s")}
{$lang->trash_description}{$oTrashVO->getDescription()}
+
+

원문 정보

+ + + + + + + + + + + + + + + + + + + + + + + + +
{$lang->title}{$oOrigin->title}
{$lang->writer}{htmlspecialchars($oOrigin->nick_name)} [{$oOrigin->user_id}]
{$lang->regdate}{zdate($oOrigin->regdate,'Y.m.d H:i:s')}
{$val->name}{$val->value}
{$lang->content}{$oOrigin->content}
+ + +
+ + + + + + + + +
+ +
+ + +
+
+ From e7d7132b67d328b4650c1a8de844d261213d17b9 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 8 Feb 2014 16:43:24 +0900 Subject: [PATCH 07/20] Update lang.xml --- modules/trash/lang/lang.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/modules/trash/lang/lang.xml b/modules/trash/lang/lang.xml index 9c72e44ee..124126edc 100644 --- a/modules/trash/lang/lang.xml +++ b/modules/trash/lang/lang.xml @@ -83,4 +83,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + From 8ebfd26545de484533ac2fab7f398b909620396d Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 8 Feb 2014 16:44:06 +0900 Subject: [PATCH 08/20] Update trash_view.html --- modules/trash/tpl/trash_view.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/trash/tpl/trash_view.html b/modules/trash/tpl/trash_view.html index b9a92489f..298d1e428 100644 --- a/modules/trash/tpl/trash_view.html +++ b/modules/trash/tpl/trash_view.html @@ -1,7 +1,7 @@

{$lang->cmd_trash} {$lang->trash_description}

-

삭제 정보

+

{$lang->delete_info}

@@ -24,7 +24,7 @@

-

원문 정보

+

{$lang->origin_info}

From 36c4b5b279340fb9b755542447ccaf6c3e6b00c8 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 8 Feb 2014 16:56:19 +0900 Subject: [PATCH 09/20] Update trash_list.html --- modules/trash/tpl/trash_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/trash/tpl/trash_list.html b/modules/trash/tpl/trash_list.html index 8f08c3e82..add8cec8a 100644 --- a/modules/trash/tpl/trash_list.html +++ b/modules/trash/tpl/trash_list.html @@ -41,7 +41,7 @@ var no_text_comment = '{$lang->no_text_comment}'; From b8f9a7d24e68105f832704af3b1bab1588b74c40 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 8 Feb 2014 17:39:13 +0900 Subject: [PATCH 10/20] Update lang.xml --- modules/trash/lang/lang.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/trash/lang/lang.xml b/modules/trash/lang/lang.xml index 124126edc..f53058eab 100644 --- a/modules/trash/lang/lang.xml +++ b/modules/trash/lang/lang.xml @@ -109,4 +109,10 @@ + + + + + + From b04a737b7353f89ec1be12cd98656e242e0b8f83 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 8 Feb 2014 17:45:16 +0900 Subject: [PATCH 11/20] Update trash_view.html --- modules/trash/tpl/trash_view.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/trash/tpl/trash_view.html b/modules/trash/tpl/trash_view.html index 298d1e428..d40f6096d 100644 --- a/modules/trash/tpl/trash_view.html +++ b/modules/trash/tpl/trash_view.html @@ -27,6 +27,16 @@

{$lang->origin_info}

{$lang->no_text_comment} - {$oTrashVO->getTitle()} + {$oTrashVO->getTitle()} {$lang->document}{$lang->comment} {$oTrashVO->getNickName()}
+ + + + From f79080daae4403e62b8802e48560b2866be3e0db Mon Sep 17 00:00:00 2001 From: SMaker Date: Wed, 26 Feb 2014 14:30:59 +0900 Subject: [PATCH 12/20] =?UTF-8?q?XE=EC=99=80=20=EB=A7=88=EB=A6=AC=EC=95=84?= =?UTF-8?q?DB=EA=B3=BC=20=ED=98=B8=ED=99=98=EB=90=98=EA=B2=8C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/db/DBMysql.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php index 2bbcd3ebe..35a0d1ec1 100644 --- a/classes/db/DBMysql.class.php +++ b/classes/db/DBMysql.class.php @@ -85,9 +85,9 @@ class DBMysql extends DB return; } // Error appears if the version is lower than 4.1 - if(mysql_get_server_info($result) < "4.1") + if(version_compare(mysql_get_server_info($result), '4.1', '<')) { - $this->setError(-1, "XE cannot be installed under the version of mysql 4.1. Current mysql version is " . mysql_get_server_info()); + $this->setError(-1, 'XE cannot be installed under the version of mysql 4.1. Current mysql version is ' . mysql_get_server_info()); return; } // select db From 4c1e85fb0cdb8ecedd132a13476df36b5e4e7e39 Mon Sep 17 00:00:00 2001 From: BJRambo Date: Fri, 28 Feb 2014 12:45:45 +0900 Subject: [PATCH 13/20] =?UTF-8?q?#542=20=EB=A0=88=EC=9D=B4=EC=95=84?= =?UTF-8?q?=EC=9B=83=EC=97=90=EC=84=9C=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EC=A0=95=EC=9D=98=20=ED=99=95=EC=9E=A5=EB=B3=80=EC=88=98?= =?UTF-8?q?=EB=A5=BC=20=EC=84=A0=ED=83=9D=ED=95=B4=EB=8F=84=20=EB=B0=98?= =?UTF-8?q?=EC=9D=91=EC=9D=B4=20=EC=97=86=EB=8D=98=20=EB=AC=B8=EC=A0=9C?= =?UTF-8?q?=EC=A0=90=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/layout/tpl/layout_info_view.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/layout/tpl/layout_info_view.html b/modules/layout/tpl/layout_info_view.html index 43cef668c..e270feccc 100644 --- a/modules/layout/tpl/layout_info_view.html +++ b/modules/layout/tpl/layout_info_view.html @@ -61,7 +61,6 @@ - {@$group = ''} {@$cnt = 1} @@ -137,7 +136,7 @@ - +

{$lang->menu}

From 0821e47ba8bcf9de659bef979822c9d6830b9d8d Mon Sep 17 00:00:00 2001 From: bnu Date: Fri, 28 Feb 2014 23:42:42 +0900 Subject: [PATCH 14/20] =?UTF-8?q?fix=20#540=20=ED=9C=B4=EC=A7=80=ED=86=B5?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99=ED=95=9C=20=EA=B8=80?= =?UTF-8?q?=EC=9D=98=20cache=EB=A5=BC=20=EC=82=AD=EC=A0=9C=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B0=94=EB=A1=9C=20=EC=9E=A1=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/document/document.controller.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 709099db8..7e3f9e74a 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -793,6 +793,8 @@ class documentController extends document $oCacheHandler = CacheHandler::getInstance('object'); if($oCacheHandler->isSupport()) { + $cache_key = 'document_item:'. getNumberingPath($oDocument->document_srl) . $oDocument->document_srl; + $oCacheHandler->delete($cache_key); } return $output; From 08f80e42ab29f7aa29ea25b1fcbdc884af4079cb Mon Sep 17 00:00:00 2001 From: akasima Date: Mon, 3 Mar 2014 09:33:09 +0900 Subject: [PATCH 15/20] =?UTF-8?q?#38=20=EC=AA=BD=EC=A7=80=20=EB=B0=9C?= =?UTF-8?q?=EC=86=A1=20=EA=B6=8C=ED=95=9C=20=EC=84=A4=EC=A0=95=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communication.admin.controller.php | 7 +- .../communication.admin.view.php | 4 + .../communication.controller.php | 6 ++ modules/communication/communication.model.php | 92 +++++++++++++++++++ modules/communication/lang/lang.xml | 8 ++ modules/communication/tpl/index.html | 21 +++++ 6 files changed, 137 insertions(+), 1 deletion(-) diff --git a/modules/communication/communication.admin.controller.php b/modules/communication/communication.admin.controller.php index be289821f..1f9e8b028 100644 --- a/modules/communication/communication.admin.controller.php +++ b/modules/communication/communication.admin.controller.php @@ -24,7 +24,7 @@ class communicationAdminController extends communication function procCommunicationAdminInsertConfig() { // get the default information - $args = Context::gets('skin', 'colorset', 'editor_skin', 'sel_editor_colorset', 'mskin', 'mcolorset', 'layout_srl', 'mlayout_srl'); + $args = Context::gets('skin', 'colorset', 'editor_skin', 'sel_editor_colorset', 'mskin', 'mcolorset', 'layout_srl', 'mlayout_srl', 'grant_write_default','grant_write_group'); $args->editor_colorset = $args->sel_editor_colorset; unset($args->sel_editor_colorset); @@ -53,6 +53,11 @@ class communicationAdminController extends communication $args->layout_srl = NULL; } + $oCommunicationModel = getModel('communication'); + $args->grant_write = $oCommunicationModel->getGrantArray($args->grant_write_default, $args->grant_write_group); + unset($args->grant_write_default); + unset($args->grant_write_group); + // create the module module Controller object $oModuleController = getController('module'); $output = $oModuleController->insertModuleConfig('communication', $args); diff --git a/modules/communication/communication.admin.view.php b/modules/communication/communication.admin.view.php index 039a33c99..264161bfe 100644 --- a/modules/communication/communication.admin.view.php +++ b/modules/communication/communication.admin.view.php @@ -58,6 +58,10 @@ class communicationAdminView extends communication $security->encodeHTML('communication_skin_list..title'); $security->encodeHTML('communication_mobile_skin_list..title'); + $oMemberModel = getModel('member'); + $group_list = $oMemberModel->getGroups($this->site_srl); + Context::set('group_list', $group_list); + // specify a template $this->setTemplatePath($this->module_path . 'tpl'); $this->setTemplateFile('index'); diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php index c16f4457f..cbda510a2 100644 --- a/modules/communication/communication.controller.php +++ b/modules/communication/communication.controller.php @@ -88,6 +88,12 @@ class communicationController extends communication // Check if there is a member to receive a message $oMemberModel = getModel('member'); $oCommunicationModel = getModel('communication'); + $config = $oCommunicationModel->getConfig(); + + if(!$oCommunicationModel->checkGrant($config->grant_write)) + { + return new Object(-1, 'msg_not_permitted'); + } $receiver_member_info = $oMemberModel->getMemberInfoByMemberSrl($receiver_srl); if($receiver_member_info->member_srl != $receiver_srl) diff --git a/modules/communication/communication.model.php b/modules/communication/communication.model.php index d5a0f88e3..46e262fd3 100644 --- a/modules/communication/communication.model.php +++ b/modules/communication/communication.model.php @@ -51,10 +51,102 @@ class communicationModel extends communication { $communication_config->mskin = 'default'; } + + if(!$communication_config->grant_write) + { + $communication_config->grant_write = array('default_grant'=>'member'); + } return $communication_config; } + /** + * @brief get grant array for insert to database. table module_config's config field + * @param string $default + * @param array $group + * @return array + */ + function getGrantArray($default, $group) + { + $grant = array(); + if($default!="") + { + switch($default) + { + case "-2": + $grant = array("default_grant"=>"site"); + break; + case "-3": + $grant = array("default_grant"=>"manager"); + break; + default : + $grant = array("default_grant"=>"member"); + break; + } + } + else if(is_array($group)) + { + $oMemberModel = getModel('member'); + $group_list = $oMemberModel->getGroups($this->site_srl); + + $group_grant = array(); + foreach($group as $group_srl) + { + $group_grant[$group_srl] = $group_list[$group_srl]->title; + } + $grant = array('group_grant'=>$group_grant); + } + return $grant; + } + + /** + * @brief check member's grant + * @param object $member_info + * @param array $arrGrant + * @return boolean + */ + function checkGrant($arrGrant) + { + if(!$arrGrant) + return false; + + $logged_info = Context::get('logged_info'); + if(!$logged_info) + return false; + + if($logged_info->is_admin == "Y") + return true; + + if($arrGrant['default_grant']) + { + if($arrGrant['default_grant'] == "member" && $logged_info) + return true; + + if($arrGrant['default_grant'] == "site" && $this->site_srl == $logged_info->site_srl) + return true; + + if($arrGrant['default_grant'] == "manager" && $logged_info->is_admin == "Y") + return true; + } + + if($arrGrant['group_grant']) + { + $group_grant = $arrGrant['group_grant']; + if(!is_array($group_grant)) + return false; + + foreach($logged_info->group_list as $group_srl=>$title) + { + if(isset($group_grant[$group_srl])&&$group_grant[$group_srl]==$title) + return true; + } + + } + + return false; + + } + /** * get the message contents * @param int $message_srl diff --git a/modules/communication/lang/lang.xml b/modules/communication/lang/lang.xml index 6f31a0b9c..d4bac684f 100644 --- a/modules/communication/lang/lang.xml +++ b/modules/communication/lang/lang.xml @@ -376,4 +376,12 @@ + + + + + + + + diff --git a/modules/communication/tpl/index.html b/modules/communication/tpl/index.html index e099a2f38..7f21fa105 100644 --- a/modules/communication/tpl/index.html +++ b/modules/communication/tpl/index.html @@ -1,4 +1,5 @@ +
@@ -81,6 +82,24 @@
+
+ +
+ + +
+
+
@@ -89,5 +108,7 @@ jQuery(function() { doGetSkinColorset("{$communication_config->skin}", 'P'); doGetSkinColorset("{$communication_config->mskin}", 'M'); + jQuery('.grant_default').change( function(event) { doShowGrantZone(); } ); + doShowGrantZone() }); From 4deb4f7fa060eced266e0b74855ed3015f71bac0 Mon Sep 17 00:00:00 2001 From: akasima Date: Mon, 3 Mar 2014 09:48:12 +0900 Subject: [PATCH 16/20] =?UTF-8?q?#547=20=ED=81=90=EB=B8=8C=EB=A6=AC?= =?UTF-8?q?=EB=93=9C=20=EB=A9=94=EB=89=B4=EC=96=BC=20=EB=A7=81=ED=81=AC=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/install/lang/lang.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/install/lang/lang.xml b/modules/install/lang/lang.xml index 12fdf353e..75d4b81be 100644 --- a/modules/install/lang/lang.xml +++ b/modules/install/lang/lang.xml @@ -405,7 +405,7 @@ innodb để sử dụng MySql Database.
Giao dịch được kích hoạt cho innodb]]> - Manual]]> + Manual]]> Manual for more info]]> Manual]]> Manual]]> From 04832f9ec3fdc5597a3cd961da39e9b21d234449 Mon Sep 17 00:00:00 2001 From: akasima Date: Mon, 3 Mar 2014 14:19:30 +0900 Subject: [PATCH 17/20] =?UTF-8?q?#477=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20>=20=EC=BD=94=EB=93=9C=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=EC=97=90=EC=84=9C=20input=20type=3Dnumber=EC=97=90=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/widget/tpl/js/generate_code.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/widget/tpl/js/generate_code.js b/modules/widget/tpl/js/generate_code.js index 87eb393f6..7d905fc23 100644 --- a/modules/widget/tpl/js/generate_code.js +++ b/modules/widget/tpl/js/generate_code.js @@ -133,6 +133,7 @@ function doFillWidgetVars() { switch(type) { case "hidden" : + case "number" : case "text" : case "textarea" : var val = selected_node.getAttribute(name); From 61eccc05920e2a30cd164d3aa3a8d6b617cc34ef Mon Sep 17 00:00:00 2001 From: akasima Date: Mon, 3 Mar 2014 15:01:49 +0900 Subject: [PATCH 18/20] =?UTF-8?q?#449=20code=20review=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=A5=B8=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/trash/tpl/trash_view.html | 8 -------- modules/trash/trash.admin.view.php | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/trash/tpl/trash_view.html b/modules/trash/tpl/trash_view.html index d40f6096d..8cb422f08 100644 --- a/modules/trash/tpl/trash_view.html +++ b/modules/trash/tpl/trash_view.html @@ -7,10 +7,6 @@
@@ -30,10 +26,6 @@ diff --git a/modules/trash/trash.admin.view.php b/modules/trash/trash.admin.view.php index a6415305e..cb5d2b766 100644 --- a/modules/trash/trash.admin.view.php +++ b/modules/trash/trash.admin.view.php @@ -69,6 +69,14 @@ class trashAdminView extends trash Context::set('oTrashVO',$output->data); Context::set('oOrigin',$originObject); + $oMemberModel = &getModel('member'); + $remover_info = $oMemberModel->getMemberInfoByMemberSrl($output->data->getRemoverSrl()); + Context::set('remover_info', $remover_info); + + $oModuleModel = &getModel('module'); + $module_info = $oModuleModel->getModuleInfoByModuleSrl($originObject->module_srl); + Context::set('module_info', $module_info); + if($originObject) { $args_extra->module_srl = $originObject->module_srl; $args_extra->document_srl = $originObject->document_srl; From 9e0e61fbce0c8cd109f387bc94d622a068347e60 Mon Sep 17 00:00:00 2001 From: akasima Date: Mon, 3 Mar 2014 15:29:20 +0900 Subject: [PATCH 19/20] =?UTF-8?q?#430=20=EC=82=AC=EC=9D=B4=ED=8A=B8=20?= =?UTF-8?q?=EC=9E=A0=EA=B8=88=20=EA=B4=80=EB=A6=AC=20=EB=AC=B8=EA=B5=AC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/admin/lang/lang.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/admin/lang/lang.xml b/modules/admin/lang/lang.xml index 3fc63c16b..e93335114 100644 --- a/modules/admin/lang/lang.xml +++ b/modules/admin/lang/lang.xml @@ -1590,8 +1590,8 @@ - 만약 접근이 차단된 경우 './files/config/db.config.php' 파일에서 `'use_sitelock' => 'Y'`를 `'use_sitelock' => 'N'`으로 변경하여 차단을 해제할 수 있습니다.]]> - もし接近が遮断された場合、'./files/config/db.config.php' ファイルから `'use_sitelock' => 'Y'`を `'use_sitelock' => 'N'`へ変更すれば遮断が解除できます。]]> + 만약 접근이 차단된 경우 './files/config/db.config.php' 파일에서 `'use_sitelock' => 'Y'`를 `'use_sitelock' => 'N'`으로 변경하여 차단을 해제할 수 있습니다.
사이트 잠금 디자인 파일의 위치는 './common/tpl/sitelock.html' 입니다.]]> + もし接近が遮断された場合、'./files/config/db.config.php' ファイルから `'use_sitelock' => 'Y'`を `'use_sitelock' => 'N'`へ変更すれば遮断が解除できます。
サイトロックの設計ファイルの場所は、'./commo/tpl/sitelock.html' です。]]> From b7aa347bf90df9398a0797a195a79c4e3a53ff77 Mon Sep 17 00:00:00 2001 From: mog422 Date: Tue, 4 Mar 2014 21:29:48 +0900 Subject: [PATCH 20/20] =?UTF-8?q?fix=20#528=20mssql=20=ED=99=98=EA=B2=BD?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=9C=A0=EB=8B=88=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=ED=83=80=EC=9E=85=20=EC=82=AC=EC=9A=A9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/db/DBMssql.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/classes/db/DBMssql.class.php b/classes/db/DBMssql.class.php index ec6e4d541..f53b32ac4 100644 --- a/classes/db/DBMssql.class.php +++ b/classes/db/DBMssql.class.php @@ -30,11 +30,11 @@ class DBMssql extends DB var $column_type = array( 'bignumber' => 'bigint', 'number' => 'int', - 'varchar' => 'varchar', - 'char' => 'char', - 'text' => 'text', - 'bigtext' => 'text', - 'date' => 'varchar(14)', + 'varchar' => 'nvarchar', + 'char' => 'nchar', + 'text' => 'ntext', + 'bigtext' => 'ntext', + 'date' => 'nvarchar(14)', 'float' => 'float', );
{$lang->module} + {@ + $oModuleModel = &getModel('module'); + $module_info = $oModuleModel->getModuleInfoByModuleSrl($oOrigin->module_srl); + } + {$module_info->browser_title} ({$module_info->mid}) +
{$lang->title} {$oOrigin->title}
{$lang->trasher} - {@ - $oMemberModel = &getModel('member'); - $remover_info = $oMemberModel->getMemberInfoByMemberSrl($oTrashVO->getRemoverSrl()); - } {htmlspecialchars($remover_info->nick_name)} [{$remover_info->user_id}]
{$lang->module} - {@ - $oModuleModel = &getModel('module'); - $module_info = $oModuleModel->getModuleInfoByModuleSrl($oOrigin->module_srl); - } {$module_info->browser_title} ({$module_info->mid})