From 78914cc5dcb8b0219d69e1f5f9c4c81bfe968230 Mon Sep 17 00:00:00 2001 From: akasima Date: Tue, 28 Jan 2014 12:52:13 +0900 Subject: [PATCH 01/16] NOISSUE procInsertMember() upload images --- modules/member/member.controller.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 5f136bbe2..ce068301c 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -321,6 +321,24 @@ class memberController extends member if(!$output->toBool()) return $output; // insert ProfileImage, ImageName, ImageMark + $profile_image = $_FILES['profile_image']; + if(is_uploaded_file($profile_image['tmp_name'])) + { + $this->insertProfileImage($args->member_srl, $profile_image['tmp_name']); + } + + $image_mark = $_FILES['image_mark']; + if(is_uploaded_file($image_mark['tmp_name'])) + { + $this->insertImageMark($args->member_srl, $image_mark['tmp_name']); + } + + $image_name = $_FILES['image_name']; + if(is_uploaded_file($image_name['tmp_name'])) + { + $this->insertImageName($args->member_srl, $image_name['tmp_name']); + } + // If a virtual site, join the site $site_module_info = Context::get('site_module_info'); if($site_module_info->site_srl > 0) From 15175a73048216b5ba1cf1922ae8ba253e285440 Mon Sep 17 00:00:00 2001 From: SMaker Date: Tue, 11 Feb 2014 18:04:33 +0900 Subject: [PATCH 02/16] =?UTF-8?q?=ED=99=95=EC=9E=A5=EB=B3=80=EC=88=98=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=20=EC=8B=9C=20=EC=83=81=EB=8B=B4=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=EC=9D=B4=20=EC=9E=91=EB=8F=99=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/document/queries/getDocumentListWithExtraVars.xml | 2 ++ modules/document/queries/getDocumentListWithExtraVarsPage.xml | 1 + 2 files changed, 3 insertions(+) diff --git a/modules/document/queries/getDocumentListWithExtraVars.xml b/modules/document/queries/getDocumentListWithExtraVars.xml index 7e0f5fdfc..51f0c60e0 100644 --- a/modules/document/queries/getDocumentListWithExtraVars.xml +++ b/modules/document/queries/getDocumentListWithExtraVars.xml @@ -9,11 +9,13 @@ + + diff --git a/modules/document/queries/getDocumentListWithExtraVarsPage.xml b/modules/document/queries/getDocumentListWithExtraVarsPage.xml index 0b1239d36..2d8d6d17f 100644 --- a/modules/document/queries/getDocumentListWithExtraVarsPage.xml +++ b/modules/document/queries/getDocumentListWithExtraVarsPage.xml @@ -9,6 +9,7 @@ + From 6fb4b7a61022b88038fcf93a32eebfd74b92e49a Mon Sep 17 00:00:00 2001 From: Jonghwan Hyeon Date: Fri, 14 Feb 2014 18:34:08 +0900 Subject: [PATCH 03/16] =?UTF-8?q?$file=5Fobj=EA=B0=80=20=EC=A0=95=EC=83=81?= =?UTF-8?q?=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EC=B4=88=EA=B8=B0=ED=99=94=20?= =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/importer/importer.admin.controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php index 1bd38bf23..03232bbcb 100644 --- a/modules/importer/importer.admin.controller.php +++ b/modules/importer/importer.admin.controller.php @@ -1010,13 +1010,13 @@ class importerAdminController extends importer while(!feof($fp)) { - $file_obj = new stdClass; $str = trim(fgets($fp, 1024)); // If it ends with , break if(trim($str) == '') break; // If it starts with , collect attachments if(trim($str) == '') { + $file_obj = new stdClass; $file_obj->file_srl = getNextSequence(); $file_obj->upload_target_srl = $upload_target_srl; $file_obj->module_srl = $module_srl; From c0fa3218682250107c367f95f81df32110e86ea0 Mon Sep 17 00:00:00 2001 From: Jonghwan Hyeon Date: Fri, 14 Feb 2014 18:37:04 +0900 Subject: [PATCH 04/16] =?UTF-8?q?status=EB=A5=BC=20=EC=9D=BD=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EC=95=84=20=EB=8C=93=EA=B8=80=EC=9D=84=20=EA=B0=80?= =?UTF-8?q?=EC=A0=B8=EC=98=A4=EC=A7=80=20=EC=95=8A=EB=8D=98=20=EB=AC=B8?= =?UTF-8?q?=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/importer/importer.admin.controller.php | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php index 03232bbcb..f0af11460 100644 --- a/modules/importer/importer.admin.controller.php +++ b/modules/importer/importer.admin.controller.php @@ -937,6 +937,7 @@ class importerAdminController extends importer $obj->last_update = base64_decode($xmlDoc->comment->update->body); if(!$obj->last_update) $obj->last_update = $obj->regdate; $obj->ipaddress = base64_decode($xmlDoc->comment->ipaddress->body); + $obj->status = base64_decode($xmlDoc->comment->status->body); $obj->list_order = $obj->comment_srl*-1; // Change content information (attachment) if(count($files)) From 87fa55a0c6427052242b8afbee6d053255277e40 Mon Sep 17 00:00:00 2001 From: akasima Date: Mon, 17 Feb 2014 16:25:38 +0900 Subject: [PATCH 05/16] #220 return data type errro --- classes/file/FileHandler.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php index eeda383df..29d94eb7f 100644 --- a/classes/file/FileHandler.class.php +++ b/classes/file/FileHandler.class.php @@ -640,7 +640,7 @@ class FileHandler break; } - return (int) $val; + return $val; } /** From ba8629925fbc0424edb4b4db19f38500e34c2463 Mon Sep 17 00:00:00 2001 From: bnu Date: Mon, 17 Feb 2014 17:15:59 +0900 Subject: [PATCH 06/16] =?UTF-8?q?#490=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=EC=9D=BC=20=EB=96=84=20xe=5Flogged=20cookie?= =?UTF-8?q?=EB=A5=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/member/member.controller.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 860aef260..370294bc6 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1812,6 +1812,7 @@ class memberController extends member $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR']; $_SESSION['member_srl'] = $this->memberInfo->member_srl; $_SESSION['is_admin'] = ''; + setcookie('xe_logged', 'true', 0, '/'); // Do not save your password in the session jiwojum;; //unset($this->memberInfo->password); // User Group Settings @@ -2318,10 +2319,12 @@ class memberController extends member { $_SESSION[$key] = ''; } + session_destroy(); setcookie(session_name(), '', $_SERVER['REQUEST_TIME']-42000, '/'); setcookie('sso','',$_SERVER['REQUEST_TIME']-42000, '/'); setcookie('xeak','',$_SERVER['REQUEST_TIME']-42000, '/'); + setcookie('xe_logged', 'false', $_SERVER['REQUEST_TIME'] - 42000, '/'); if($memberSrl || $_COOKIE['xeak']) { From 2e91e7367eee59b43236875e17d9097dc7cabe5a Mon Sep 17 00:00:00 2001 From: akasima Date: Mon, 17 Feb 2014 19:15:38 +0900 Subject: [PATCH 07/16] =?UTF-8?q?#493=20XEHttpRequest=20=EB=B2=84=EA=B7=B8?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/httprequest/XEHttpRequest.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/httprequest/XEHttpRequest.class.php b/classes/httprequest/XEHttpRequest.class.php index 0fe8514fc..02ed6b8a3 100644 --- a/classes/httprequest/XEHttpRequest.class.php +++ b/classes/httprequest/XEHttpRequest.class.php @@ -148,7 +148,7 @@ class XEHttpRequest $is_chunked = FALSE; while(strlen(trim($line = fgets($sock)))) { - list($equiv, $content) = preg_split('/ *: */', rtrim($line), 1); + list($equiv, $content) = preg_split('/ *: */', rtrim($line), 2); if(!strcasecmp($equiv, 'Transfer-Encoding') && $content == 'chunked') { $is_chunked = TRUE; From 514c3c39086d44b4d4e7ed512337045af2deb4cc Mon Sep 17 00:00:00 2001 From: akasima Date: Tue, 18 Feb 2014 18:18:23 +0900 Subject: [PATCH 08/16] =?UTF-8?q?#494=20=EB=B9=84=EB=B0=80=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EC=B0=BE=EA=B8=B0=20=EC=A7=88=EB=AC=B8=ED=95=AD?= =?UTF-8?q?=EB=AA=A9=20=EB=AC=B8=EC=A0=9C=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/member/skins/default/find_member_account.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/member/skins/default/find_member_account.html b/modules/member/skins/default/find_member_account.html index 70c166b9b..b80312c3b 100644 --- a/modules/member/skins/default/find_member_account.html +++ b/modules/member/skins/default/find_member_account.html @@ -41,7 +41,7 @@
From 17edfdf2cc5ba4304e163eb0aa390a14701e8884 Mon Sep 17 00:00:00 2001 From: akasima Date: Wed, 19 Feb 2014 13:55:01 +0900 Subject: [PATCH 09/16] #498 document table's cache delete --- modules/document/document.controller.php | 56 ++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 87220649c..03b6ecf64 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -832,6 +832,14 @@ class documentController extends document $args->document_srl = $document_srl; $output = executeQuery('document.updateReadedCount', $args); + $oCacheHandler = CacheHandler::getInstance('object'); + if($oCacheHandler->isSupport()) + { + //remove document item from cache + $cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl; + $oCacheHandler->delete($cache_key); + } + // Register session $_SESSION['readed_document'][$document_srl] = true; @@ -1097,6 +1105,14 @@ class documentController extends document $oDB->commit(); + $oCacheHandler = CacheHandler::getInstance('object'); + if($oCacheHandler->isSupport()) + { + //remove document item from cache + $cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl; + $oCacheHandler->delete($cache_key); + } + // Leave in the session information $_SESSION['voted_document'][$document_srl] = true; @@ -1238,6 +1254,14 @@ class documentController extends document { $args->update_order = -1*getNextSequence(); $args->last_updater = $last_updater; + + $oCacheHandler = CacheHandler::getInstance('object'); + if($oCacheHandler->isSupport()) + { + //remove document item from cache + $cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl; + $oCacheHandler->delete($cache_key); + } } return executeQuery('document.updateCommentCount', $args); @@ -1255,6 +1279,14 @@ class documentController extends document $args->document_srl = $document_srl; $args->trackback_count = $trackback_count; + $oCacheHandler = CacheHandler::getInstance('object'); + if($oCacheHandler->isSupport()) + { + //remove document item from cache + $cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl; + $oCacheHandler->delete($cache_key); + } + return executeQuery('document.updateTrackbackCount', $args); } @@ -1358,6 +1390,30 @@ class documentController extends document if(!$output->toBool()) return $output; $this->makeCategoryFile($category_info->module_srl); + // remvove cache + $oCacheHandler = CacheHandler::getInstance('object'); + if($oCacheHandler->isSupport()) + { + $page = 0; + while(true) { + $args = new stdClass(); + $args->category_srl = $category_srl; + $args->page = ++$page; + $output = executeQuery('document.getDocumentList', $args, array('document_srl')); + + if($output->data == array()) + break; + + foreach($output->data as $val) + { + $document_srl = $val->document_srl; + //remove document item from cache + $cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl; + $oCacheHandler->delete($cache_key); + } + } + } + // Update category_srl of the documents in the same category to 0 $args = new stdClass(); $args->target_category_srl = 0; From 703e1fde5782f88eb67017b3633db6c9a511540f Mon Sep 17 00:00:00 2001 From: akasima Date: Wed, 19 Feb 2014 14:13:00 +0900 Subject: [PATCH 10/16] #498 document table's cache delete.. mod some code --- modules/document/document.controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 03b6ecf64..709099db8 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -1398,6 +1398,7 @@ class documentController extends document while(true) { $args = new stdClass(); $args->category_srl = $category_srl; + $args->list_count = 100; $args->page = ++$page; $output = executeQuery('document.getDocumentList', $args, array('document_srl')); @@ -1406,9 +1407,8 @@ class documentController extends document foreach($output->data as $val) { - $document_srl = $val->document_srl; //remove document item from cache - $cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl; + $cache_key = 'document_item:'. getNumberingPath($val->document_srl) . $val->document_srl; $oCacheHandler->delete($cache_key); } } From 8d46449502577a55dbf0afa05ae82e14b98d998b Mon Sep 17 00:00:00 2001 From: akasima Date: Wed, 19 Feb 2014 14:36:55 +0900 Subject: [PATCH 11/16] =?UTF-8?q?#467=20=EA=B4=80=EB=A6=AC=EC=9E=90=20>=20?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20=EB=94=94=EC=9E=90?= =?UTF-8?q?=EC=9D=B8=20=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/layout/tpl/layout_info_view.html | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/layout/tpl/layout_info_view.html b/modules/layout/tpl/layout_info_view.html index b45be0e67..43cef668c 100644 --- a/modules/layout/tpl/layout_info_view.html +++ b/modules/layout/tpl/layout_info_view.html @@ -61,6 +61,7 @@ +
{@$group = ''} {@$cnt = 1} From 8e48231fea0c8c8532969a697f2f70c121f0d07f Mon Sep 17 00:00:00 2001 From: akasima Date: Wed, 19 Feb 2014 17:43:36 +0900 Subject: [PATCH 12/16] =?UTF-8?q?#495=20=EA=B2=8C=EC=8B=9C=EB=AC=BC=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20'=ED=9C=B4=EC=A7=80=ED=86=B5'=20=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/document/conf/module.xml | 2 + .../document/document.admin.controller.php | 75 +++++++++++++++++++ modules/document/document.model.php | 4 + 3 files changed, 81 insertions(+) diff --git a/modules/document/conf/module.xml b/modules/document/conf/module.xml index 28d0b74f2..b06c6e8a1 100644 --- a/modules/document/conf/module.xml +++ b/modules/document/conf/module.xml @@ -14,6 +14,7 @@ + @@ -58,6 +59,7 @@ + diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php index c3e84ffa4..5f422ef76 100644 --- a/modules/document/document.admin.controller.php +++ b/modules/document/document.admin.controller.php @@ -712,6 +712,81 @@ class documentAdminController extends document return $this->setRedirectUrl($returnUrl, $output); } + /** + * @fn procDocumentAdminMoveToTrash + * @brief move a document to trash. + * @see documentModel::getDocumentMenu + */ + function procDocumentAdminMoveToTrash() + { + $document_srl = Context::get('document_srl'); + + $oDocumentModel = getModel('document'); + $oDocumentController = getController('document'); + $oDocument = $oDocumentModel->getDocument($document_srl, false, false); + if(!$oDocument->isGranted()) return $this->stop('msg_not_permitted'); + + $oModuleModel = getModel('module'); + $module_info = $oModuleModel->getModuleInfoByDocumentSrl($document_srl); + + $args = new stdClass(); + $args->description = $message_content; + $args->document_srl = $document_srl; + + $oDocumentController->moveDocumentToTrash($args); + + $returnUrl = Context::get('success_return_url'); + if(!$returnUrl) + { + $arrUrl = parse_url(Context::get('cur_url')); + $query = ""; + + if($arrUrl['query']) + { + parse_str($arrUrl['query'], $arrQuery); + + // set query + if(isset($arrQuery['document_srl'])) + unset($arrQuery['document_srl']); + + $searchArgs = new stdClass; + foreach($arrQuery as $key=>$val) + { + $searchArgs->{$key} = $val; + } + + if(!isset($searchArgs->sort_index)) + $searchArgs->sort_index = $module_info->order_target; + + foreach($module_info as $key=>$val) + { + if(!isset($searchArgs->{$key})) + $searchArgs->{$key} = $val; + } + + $oDocumentModel = getModel('document'); + $output = $oDocumentModel->getDocumentList($searchArgs, $module_info->except_notice, TRUE, array('document_srl')); + + $cur_page = 1; + if(isset($arrQuery['page'])) { + $cur_page = (int)$arrQuery['page']; + } + + + if($cur_page>1 && count($output->data) == 0) + $arrQuery['page'] = $cur_page - 1; + + $query = "?"; + foreach($arrQuery as $key=>$val) + $query .= sprintf("%s=%s&", $key, $val); + $query = substr($query, 0, -1); + } + $returnUrl = $arrUrl['path'] . $query; + } + + $this->add('redirect_url', $returnUrl); + } + /** * Restor document from trash * @return void|object diff --git a/modules/document/document.model.php b/modules/document/document.model.php index c51c18de9..b379c1202 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -528,6 +528,10 @@ class documentModel extends document if($oDocument->isExists()) { + $str_confirm = Context::getLang('cmd_document_do') . Context::getLang('confirm_delete'); + $url = sprintf("if(!confirm('%s')) return; var params = new Array(); params['document_srl']='%s'; params['mid']=current_mid;params['cur_url']=current_url; exec_xml('document', 'procDocumentAdminMoveToTrash', params)", $str_confirm, $document_srl); + $oDocumentController->addDocumentPopupMenu($url,'cmd_trash','','javascript'); + // Find a post equivalent to ip address $url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','ipaddress','search_keyword',$oDocument->getIpAddress()); $oDocumentController->addDocumentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress'); From a2f109d86a6ecd8cc4343714ec9222987a52e50b Mon Sep 17 00:00:00 2001 From: akasima Date: Thu, 20 Feb 2014 10:54:23 +0900 Subject: [PATCH 13/16] =?UTF-8?q?#486=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=EC=A6=88=20=ED=91=9C=EC=8B=9C=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/file/file.model.php | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/modules/file/file.model.php b/modules/file/file.model.php index afdcdc3ac..c9d4587ec 100644 --- a/modules/file/file.model.php +++ b/modules/file/file.model.php @@ -226,24 +226,21 @@ class fileModel extends file function getUploadConfig() { $logged_info = Context::get('logged_info'); - $file_config = new stdClass(); + + $module_srl = Context::get('module_srl'); + // Get the current module if module_srl doesn't exist + if(!$module_srl) + { + $current_module_info = Context::get('current_module_info'); + $module_srl = $current_module_info->module_srl; + } + $file_config = $this->getFileConfig($module_srl); + if($logged_info->is_admin == 'Y') { $file_config->allowed_filesize = preg_replace("/[a-z]/is","",ini_get('upload_max_filesize')); - $file_config->allowed_attach_size = preg_replace("/[a-z]/is","",ini_get('upload_max_filesize')); $file_config->allowed_filetypes = '*.*'; } - else - { - $module_srl = Context::get('module_srl'); - // Get the current module if module_srl doesn't exist - if(!$module_srl) - { - $current_module_info = Context::get('current_module_info'); - $module_srl = $current_module_info->module_srl; - } - $file_config = $this->getFileConfig($module_srl); - } return $file_config; } From b63468b620754839473ce1f0ad669743014eeee6 Mon Sep 17 00:00:00 2001 From: akasima Date: Fri, 21 Feb 2014 14:01:22 +0900 Subject: [PATCH 14/16] =?UTF-8?q?#516=20=ED=95=84=EC=88=98=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=20=ED=8F=BC=20=EC=83=81=ED=83=9C=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=A5=B8=20=EB=A9=94=EC=9D=BC=ED=8F=BC=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/member/skins/default/confirm_member_account_mail.html | 2 +- modules/member/skins/default/confirm_member_new_email.html | 2 +- modules/member/skins/default/find_member_account_mail.html | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/member/skins/default/confirm_member_account_mail.html b/modules/member/skins/default/confirm_member_account_mail.html index 1e0950baf..33e1ecd74 100644 --- a/modules/member/skins/default/confirm_member_account_mail.html +++ b/modules/member/skins/default/confirm_member_account_mail.html @@ -2,7 +2,7 @@
  • Site : {getUrl()}
    • -
  • {$name} : {$value}
    • +
  • {$name} : {$value}
{$lang->msg_confirm_account_comment}
diff --git a/modules/member/skins/default/confirm_member_new_email.html b/modules/member/skins/default/confirm_member_new_email.html index 91309d539..9a2f37fff 100644 --- a/modules/member/skins/default/confirm_member_new_email.html +++ b/modules/member/skins/default/confirm_member_new_email.html @@ -2,7 +2,7 @@
  • Site : {getUrl()}
    • -
  • {$name} : {$value}
    • +
  • {$name} : {$value}
{sprintf($lang->msg_confirm_email_address_change, $newEmail)}
diff --git a/modules/member/skins/default/find_member_account_mail.html b/modules/member/skins/default/find_member_account_mail.html index 5873df314..36ace04da 100644 --- a/modules/member/skins/default/find_member_account_mail.html +++ b/modules/member/skins/default/find_member_account_mail.html @@ -2,9 +2,9 @@
  • {$lang->site} : {getUrl()}
    • -
  • {$name} : {$value}
    • +
  • {$name} : {$value}
  • {$lang->password} : {$auth_args->new_password}
{$lang->msg_find_account_comment}
-{$find_url} \ No newline at end of file +{$find_url} From 62a785fcad387810513ab8703b5cf706d3375b10 Mon Sep 17 00:00:00 2001 From: akasima Date: Fri, 21 Feb 2014 14:38:26 +0900 Subject: [PATCH 15/16] =?UTF-8?q?#517=20=EA=B0=80=EC=9E=85=EC=9D=B8?= =?UTF-8?q?=EC=A6=9D=EB=A9=94=EC=9D=BC=EC=97=90=20=ED=8F=AC=ED=95=A8?= =?UTF-8?q?=EB=90=98=EB=8A=94=20=ED=9A=8C=EC=9B=90=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/member/member.controller.php | 54 ++++++++++++++++++---------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 370294bc6..eaefc60fd 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1194,27 +1194,48 @@ class memberController extends member if(!$memberSrl) return new Object(-1, 'msg_not_exists_member'); $columnList = array('member_srl', 'user_id', 'user_name', 'nick_name', 'email_address'); - $memberInfo = $oMemberModel->getMemberInfoByMemberSrl($memberSrl, 0, $columnList); + $member_info = $oMemberModel->getMemberInfoByMemberSrl($memberSrl, 0, $columnList); - // Check if a authentication mail has been sent previously - $chk_args = new stdClass; - $chk_args->member_srl = $memberInfo->member_srl; - $output = executeQuery('member.chkAuthMail', $chk_args); - if($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request'); - - $auth_args = new stdClass; - $auth_args->member_srl = $memberInfo->member_srl; - $output = executeQueryArray('member.getAuthMailInfo', $auth_args); - if(!$output->data || !$output->data[0]->auth_key) return new Object(-1, 'msg_invalid_request'); - $auth_info = $output->data[0]; - - // Get content of the email to send a member - Context::set('memberInfo', $memberInfo); $oModuleModel = getModel('module'); $member_config = $oModuleModel->getModuleConfig('member'); if(!$member_config->skin) $member_config->skin = "default"; if(!$member_config->colorset) $member_config->colorset = "white"; + // Check if a authentication mail has been sent previously + $chk_args = new stdClass; + $chk_args->member_srl = $member_info->member_srl; + $output = executeQuery('member.chkAuthMail', $chk_args); + if($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request'); + + $auth_args = new stdClass; + $auth_args->member_srl = $member_info->member_srl; + $output = executeQueryArray('member.getAuthMailInfo', $auth_args); + if(!$output->data || !$output->data[0]->auth_key) return new Object(-1, 'msg_invalid_request'); + $auth_info = $output->data[0]; + + $memberInfo = array(); + global $lang; + if(is_array($member_config->signupForm)) + { + $exceptForm=array('password', 'find_account_question'); + foreach($member_config->signupForm as $form) + { + if(!in_array($form->name, $exceptForm) && $form->isDefaultForm && ($form->required || $form->mustRequired)) + { + $memberInfo[$lang->{$form->name}] = $member_info->{$form->name}; + } + } + } + else + { + $memberInfo[$lang->user_id] = $member_info->user_id; + $memberInfo[$lang->user_name] = $member_info->user_name; + $memberInfo[$lang->nick_name] = $member_info->nick_name; + $memberInfo[$lang->email_address] = $member_info->email_address; + } + + // Get content of the email to send a member + Context::set('memberInfo', $memberInfo); Context::set('member_config', $member_config); $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin); @@ -1225,9 +1246,6 @@ class memberController extends member $oTemplate = &TemplateHandler::getInstance(); $content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail'); - // Get information of the Webmaster - $oModuleModel = getModel('module'); - $member_config = $oModuleModel->getModuleConfig('member'); // Send a mail $oMail = new Mail(); $oMail->setTitle( Context::getLang('msg_confirm_account_title') ); From a76f6ddbb51e112c669eea10276bf9cdf4134f8c Mon Sep 17 00:00:00 2001 From: SMaker Date: Fri, 21 Feb 2014 23:09:53 +0900 Subject: [PATCH 16/16] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B8=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/document/queries/getDocumentListWithExtraVars.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/document/queries/getDocumentListWithExtraVars.xml b/modules/document/queries/getDocumentListWithExtraVars.xml index 51f0c60e0..6214db64c 100644 --- a/modules/document/queries/getDocumentListWithExtraVars.xml +++ b/modules/document/queries/getDocumentListWithExtraVars.xml @@ -15,7 +15,6 @@ -