diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php
index a96fbb334..ca186a6e1 100644
--- a/classes/db/DB.class.php
+++ b/classes/db/DB.class.php
@@ -316,12 +316,17 @@
* like, like_prefix의 경우 value자체가 변경됨
* type == number가 아니면 addQuotes()를 하고 ' ' 로 묶음
**/
- function getConditionValue($name, $value, $operation, $type) {
+ function getConditionValue($name, $value, $operation, $type, $column_type) {
if($type == 'number') {
if(strpos($value,',')===false && strpos($value,'(')===false) return (int)$value;
return $value;
}
+ if(strpos($name,'.')!==false&&strpos($value,'.')!==false) {
+ list($column_name) = explode('.',$value);
+ if($column_type[$column_name]) return $value;
+ }
+
$value = preg_replace('/(^\'|\'$){1}/','',$value);
switch($operation) {
@@ -339,9 +344,6 @@
break;
}
-
- if(strpos($name,'.')!==false && strpos($value,'.')!==false) return $value;
-
return "'".$this->addQuotes($value)."'";
}
diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php
index 13eec45ae..e44bb8ee7 100644
--- a/classes/db/DBCubrid.class.php
+++ b/classes/db/DBCubrid.class.php
@@ -389,7 +389,7 @@
$type = $this->getColumnType($output->column_type,$name);
$pipe = $v['pipe'];
- $value = $this->getConditionValue($name, $value, $operation, $type);
+ $value = $this->getConditionValue($name, $value, $operation, $type, $output->column_type);
if(!$value) $value = $v['value'];
if(strpos($name,'.')===false) $name = '"'.$name.'"';
diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php
index ed1b4624a..51dcc8c3c 100644
--- a/classes/db/DBMysql.class.php
+++ b/classes/db/DBMysql.class.php
@@ -374,7 +374,7 @@
$type = $this->getColumnType($output->column_type,$name);
$pipe = $v['pipe'];
- $value = $this->getConditionValue($name, $value, $operation, $type);
+ $value = $this->getConditionValue($name, $value, $operation, $type, $output->column_type);
if(!$value) $value = $v['value'];
$str = $this->getConditionPart($name, $value, $operation);
if($sub_condition) $sub_condition .= ' '.$pipe.' ';
diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php
index 5521bca4c..4fc9c5a83 100644
--- a/classes/db/DBMysql_innodb.class.php
+++ b/classes/db/DBMysql_innodb.class.php
@@ -383,7 +383,7 @@
$type = $this->getColumnType($output->column_type,$name);
$pipe = $v['pipe'];
- $value = $this->getConditionValue($name, $value, $operation, $type);
+ $value = $this->getConditionValue($name, $value, $operation, $type, $output->column_type);
if(!$value) $value = $v['value'];
$str = $this->getConditionPart($name, $value, $operation);
if($sub_condition) $sub_condition .= ' '.$pipe.' ';
diff --git a/classes/db/DBSqlite2.class.php b/classes/db/DBSqlite2.class.php
index 2449b708f..fb31f28f9 100644
--- a/classes/db/DBSqlite2.class.php
+++ b/classes/db/DBSqlite2.class.php
@@ -360,7 +360,7 @@
$type = $this->getColumnType($output->column_type,$name);
$pipe = $v['pipe'];
- $value = $this->getConditionValue($name, $value, $operation, $type);
+ $value = $this->getConditionValue($name, $value, $operation, $type, $output->column_type);
if(!$value) $value = $v['value'];
$str = $this->getConditionPart($name, $value, $operation);
if($sub_condition) $sub_condition .= ' '.$pipe.' ';
diff --git a/classes/db/DBSqlite3_pdo.class.php b/classes/db/DBSqlite3_pdo.class.php
index b7aa27051..fcdefab69 100644
--- a/classes/db/DBSqlite3_pdo.class.php
+++ b/classes/db/DBSqlite3_pdo.class.php
@@ -389,7 +389,7 @@
$type = $this->getColumnType($output->column_type,$name);
$pipe = $v['pipe'];
- $value = $this->getConditionValue($name, $value, $operation, $type);
+ $value = $this->getConditionValue($name, $value, $operation, $type, $output->column_type);
if(!$value) $value = $v['value'];
$str = $this->getConditionPart($name, $value, $operation);
diff --git a/config/config.inc.php b/config/config.inc.php
index 0d9d520c8..75eb27b76 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -14,7 +14,7 @@
* 이 내용은 제로보드XE의 버전을 관리자 페이지에 표시하기 위한 용도이며
* config.inc.php의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함
**/
- define('__ZBXE_VERSION__', '0.2.4');
+ define('__ZBXE_VERSION__', '0.2.5');
/**
* @brief 디버깅 메세지 출력
diff --git a/modules/blog/skins/xe_blog/write_form.html b/modules/blog/skins/xe_blog/write_form.html
index ab6b57680..424e7fabd 100644
--- a/modules/blog/skins/xe_blog/write_form.html
+++ b/modules/blog/skins/xe_blog/write_form.html
@@ -95,7 +95,7 @@
-
+
@@ -103,7 +103,7 @@
-
+
diff --git a/modules/board/skins/xe_board/write_form.html b/modules/board/skins/xe_board/write_form.html
index 15a292786..adc3859f4 100644
--- a/modules/board/skins/xe_board/write_form.html
+++ b/modules/board/skins/xe_board/write_form.html
@@ -104,7 +104,7 @@
-
+
@@ -112,7 +112,7 @@
-
+
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index 67b5845b2..726381860 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -194,16 +194,7 @@
else $args->s_is_secret = '';
break;
case 'tag' :
- $oDB = &DB::getInstance();
- $tmp_str_arr = explode(' ',$search_keyword);
- $tmp_count = count($tmp_str_arr);
- $tag_arr = array();
- for($i=0;$i<$tmp_count;$i++) {
- $tmp_str = trim($tmp_str_arr[$i]);
- if(!$tmp_str) continue;
- $tag_arr[] = $oDB->addQuotes($tmp_str);
- }
- $args->s_tags = "'".implode("','",$tag_arr);
+ $args->s_tags = str_replace(' ','%',$search_keyword);
$query_id = 'document.getDocumentListWithinTag';
break;
case 'readed_count' :
@@ -334,8 +325,16 @@
$output = executeQuery('document.getCategory', $args);
$node = $output->data;
- if($node->group_srls) $node->group_srls = explode(',',$node->group_srls);
- else $node->group_srls = array();
+ if(!$node) return;
+
+ if($node->group_srls) {
+ $group_srls = explode(',',$node->group_srls);
+ unset($node->group_srls);
+ $node->group_srls = explode(',',$node->group_srls);
+ } else {
+ unset($node->group_srls);
+ $node->group_srls = array();
+ }
return $node;
}
diff --git a/modules/document/lang/en.lang.php b/modules/document/lang/en.lang.php
index 759686451..e7ee71c28 100644
--- a/modules/document/lang/en.lang.php
+++ b/modules/document/lang/en.lang.php
@@ -14,6 +14,8 @@
$lang->title_bold = '제목 굵게';
$lang->title_color = '제목 색깔';
+ $lang->cmd_temp_save = '임시 저장';
+
$lang->cmd_toggle_checked_document = 'Reverse selected items';
$lang->cmd_delete_checked_document = 'Delete selected';
$lang->cmd_document_do = '이 게시물을..';
diff --git a/modules/document/lang/es.lang.php b/modules/document/lang/es.lang.php
index 7052fe626..0f4a8a929 100644
--- a/modules/document/lang/es.lang.php
+++ b/modules/document/lang/es.lang.php
@@ -14,6 +14,8 @@
$lang->title_bold = '제목 굵게';
$lang->title_color = '제목 색깔';
+ $lang->cmd_temp_save = '임시 저장';
+
$lang->cmd_toggle_checked_document = '선택항목 반전';
$lang->cmd_delete_checked_document = 'Eliminar lo seleccionado';
$lang->cmd_document_do = '이 게시물을..';
diff --git a/modules/document/lang/jp.lang.php b/modules/document/lang/jp.lang.php
index c05aa3381..91102e69c 100644
--- a/modules/document/lang/jp.lang.php
+++ b/modules/document/lang/jp.lang.php
@@ -14,6 +14,8 @@
$lang->title_bold = '제목 굵게';
$lang->title_color = '제목 색깔';
+ $lang->cmd_temp_save = '임시 저장';
+
$lang->cmd_toggle_checked_document = '선택항목 반전';
$lang->cmd_delete_checked_document = '選択項目削除';
$lang->cmd_document_do = '이 게시물을..';
diff --git a/modules/document/lang/ko.lang.php b/modules/document/lang/ko.lang.php
index 5ca7ae280..03c250960 100644
--- a/modules/document/lang/ko.lang.php
+++ b/modules/document/lang/ko.lang.php
@@ -13,6 +13,8 @@
$lang->title_bold = '제목 굵게';
$lang->title_color = '제목 색깔';
+ $lang->cmd_temp_save = '임시 저장';
+
$lang->cmd_toggle_checked_document = '선택항목 반전';
$lang->cmd_delete_checked_document = '선택항목 삭제';
$lang->cmd_document_do = '이 게시물을..';
diff --git a/modules/document/lang/zh-CN.lang.php b/modules/document/lang/zh-CN.lang.php
index b394aca85..a86220cda 100644
--- a/modules/document/lang/zh-CN.lang.php
+++ b/modules/document/lang/zh-CN.lang.php
@@ -14,6 +14,8 @@
$lang->title_bold = '标题粗体';
$lang->title_color = '标题颜色';
+ $lang->cmd_temp_save = '임시 저장';
+
$lang->cmd_toggle_checked_document = '反选';
$lang->cmd_delete_checked_document = '删除所选';
$lang->cmd_document_do = '把文章..';
diff --git a/modules/document/queries/getDocumentListWithinTag.xml b/modules/document/queries/getDocumentListWithinTag.xml
index 42b7d6247..3564a9122 100644
--- a/modules/document/queries/getDocumentListWithinTag.xml
+++ b/modules/document/queries/getDocumentListWithinTag.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 583f9dbbb..04a383130 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -749,7 +749,17 @@
$signature = Context::get('signature');
$this->putSignature($args->member_srl, $signature);
- $this->setSessionInfo($args);
+ // user_id 에 따른 정보 가져옴
+ $member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
+
+ // 사용자의 전용 메뉴 구성
+ $member_info->menu_list = $this->getMemberMenuList();
+
+ // 로그인 성공후 trigger 호출 (after)
+ $trigger_output = ModuleHandler::triggerCall('member.doLogin', 'after', $member_info);
+ if(!$trigger_output->toBool()) return $trigger_output;
+
+ $this->setSessionInfo($member_info);
// 결과 리턴
$this->add('member_srl', $args->member_srl);
@@ -1124,6 +1134,13 @@
// 회원의 정보를 가져옴
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
+ // 사용자의 전용 메뉴 구성
+ $member_info->menu_list = $this->getMemberMenuList();
+
+ // 로그인 성공후 trigger 호출 (after)
+ $trigger_output = ModuleHandler::triggerCall('member.doLogin', 'after', $member_info);
+ if(!$trigger_output->toBool()) return $trigger_output;
+
// 사용자 정보의 최근 로그인 시간을 기록
$output = executeQuery('member.updateLastLogin', $args);
$this->setSessionInfo($member_info);
diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php
index 7e4bc710e..27833b1f1 100644
--- a/modules/point/point.controller.php
+++ b/modules/point/point.controller.php
@@ -359,7 +359,7 @@
$title = sprintf("%s:%s%s %s, %s:%s/%s", Context::getLang('point'), $point, $this->config->point_name, $per?"(".$per."%)":"", Context::getLang('level'), $level, $this->config->max_level);
- $text = sprintf('
%s', $member_srl, Context::getRequestUri().$src, $this->icon_width+2, $this->icon_height, $title, $title, $text);
+ $text = sprintf('
%s', $member_srl, Context::getRequestUri().$src, $this->icon_width, $this->icon_height, $title, $title, $text);
$this->member_code[$member_srl] = $text;
diff --git a/modules/trackback/conf/info.xml b/modules/trackback/conf/info.xml
index 3771def2c..04ee1fc96 100644
--- a/modules/trackback/conf/info.xml
+++ b/modules/trackback/conf/info.xml
@@ -3,8 +3,8 @@
엮인글
引用
トラックバック
- Trackback
- Trackback
+ Trackback
+ Trackback
제로
zero
@@ -14,7 +14,7 @@
엮인글 관리 모듈
管理引用模块。
トラックバック管理モジュール
- Module for managing trackbacks
- Módulo para el manejo de trackbacks
+ Module for managing trackbacks
+ Módulo para el manejo de trackbacks
diff --git a/widgets/newest_document/skins/blog_newest_document/css/normal.css b/widgets/newest_document/skins/blog_newest_document/css/normal.css
index 1285e3998..e83add6ec 100644
--- a/widgets/newest_document/skins/blog_newest_document/css/normal.css
+++ b/widgets/newest_document/skins/blog_newest_document/css/normal.css
@@ -3,4 +3,4 @@
/*:first-child+html .boxTypeB h2 { height:20px;} */
.newestDocument .documentList { padding:1.2em; overflow:hidden;}
.newestDocument .documentList li { display:block; color:#a4a4a4; margin-right:.1em; overflow:hidden; }
-.newestDocument .documentList li a { color:#a4a4a4; line-height:1.5em; }
+.newestDocument .documentList li a { color:#a4a4a4; line-height:1.5em; text-decoration:none; }