From 325af25d3f0ad65160ef301768c441034e9c5aab Mon Sep 17 00:00:00 2001 From: zero Date: Mon, 5 Nov 2007 13:43:19 +0000 Subject: [PATCH 1/9] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2930 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- .../newest_document/skins/blog_newest_document/css/normal.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } From 6645c16413485a2dfc043fbdc088d0aee7d025d1 Mon Sep 17 00:00:00 2001 From: haneul Date: Mon, 5 Nov 2007 15:01:21 +0000 Subject: [PATCH 2/9] correct module info (en->es) git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2931 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/trackback/conf/info.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 From b5755133d3b94cd54664f5a8575cdff723cca96a Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 6 Nov 2007 01:51:19 +0000 Subject: [PATCH 3/9] =?UTF-8?q?=ED=9A=8C=EC=9B=90=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=EC=8B=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EC=84=B8=EC=85=98=20=EC=A0=95=EB=B3=B4=EA=B0=80=20=EB=88=84?= =?UTF-8?q?=EB=9D=BD=EB=90=98=EB=8D=98=20=EB=B2=84=EA=B7=B8=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 git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2932 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/member.controller.php | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) 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); From cc74a3f5ecb1516d335f1867489c48bbd59b8532 Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 6 Nov 2007 02:03:54 +0000 Subject: [PATCH 4/9] =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EA=B5=AC=ED=95=A0=EB=95=8C=20$node=20obje?= =?UTF-8?q?ct=EC=97=90=20group=5Fsrls=EB=A5=BC=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=EC=8B=9C=20=EC=83=9D=EA=B8=B0=EB=8A=94=20non=20object=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2933 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/document/document.model.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/document/document.model.php b/modules/document/document.model.php index 67b5845b2..11062db41 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -334,8 +334,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; } From 637e953a34e22002a46e56262371e06977eb45ab Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 6 Nov 2007 03:54:16 +0000 Subject: [PATCH 5/9] =?UTF-8?q?join=20query=EC=82=AC=EC=9A=A9=EC=8B=9C?= =?UTF-8?q?=EC=97=90=20value=EC=97=90=20.=20=EC=9D=B4=20=EC=9E=88=EC=9D=84?= =?UTF-8?q?=20=EA=B2=BD=EC=9A=B0=20query=20fail=EC=9D=B4=20=EB=82=98?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2934 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/db/DB.class.php | 10 ++++++---- classes/db/DBCubrid.class.php | 2 +- classes/db/DBMysql.class.php | 2 +- classes/db/DBMysql_innodb.class.php | 2 +- classes/db/DBSqlite2.class.php | 2 +- classes/db/DBSqlite3_pdo.class.php | 2 +- modules/document/document.model.php | 11 +---------- modules/document/queries/getDocumentListWithinTag.xml | 2 +- 8 files changed, 13 insertions(+), 20 deletions(-) diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php index a96fbb334..8c7c15e83 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($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/modules/document/document.model.php b/modules/document/document.model.php index 11062db41..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' : 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 @@ - + From c12e81e71935284a18231179d7ef59fbb8a8ddb4 Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 6 Nov 2007 03:56:48 +0000 Subject: [PATCH 6/9] =?UTF-8?q?=EC=9E=84=EC=8B=9C=EC=A0=80=EC=9E=A5/=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=EC=9C=BC=EB=A1=9C=20=EA=B8=80=EC=93=B8?= =?UTF-8?q?=EB=95=8C=20=EB=B2=84=ED=8A=BC=20=EA=B0=92=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2935 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/blog/skins/xe_blog/write_form.html | 4 ++-- modules/board/skins/xe_board/write_form.html | 4 ++-- modules/document/lang/en.lang.php | 2 ++ modules/document/lang/es.lang.php | 2 ++ modules/document/lang/jp.lang.php | 2 ++ modules/document/lang/ko.lang.php | 2 ++ modules/document/lang/zh-CN.lang.php | 2 ++ 7 files changed, 14 insertions(+), 4 deletions(-) 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/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 = '把文章..'; From a481ec66b95cdd8776703805d552c439f65cdbbb Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 6 Nov 2007 04:35:14 +0000 Subject: [PATCH 7/9] =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EC=BD=98=EC=9D=98=20=EA=B0=80=EB=A1=9C=20=EA=B8=B8?= =?UTF-8?q?=EC=9D=B4=20+2=20=ED=95=98=EB=8D=98=20=EB=B6=80=EB=B6=84=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 git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2936 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/point/point.controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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%s', $member_srl, Context::getRequestUri().$src, $this->icon_width+2, $this->icon_height, $title, $title, $text); + $text = sprintf('%s%s', $member_srl, Context::getRequestUri().$src, $this->icon_width, $this->icon_height, $title, $title, $text); $this->member_code[$member_srl] = $text; From 3dcce0c2e5278d379f71f01bec1e34a46e0108c4 Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 6 Nov 2007 04:58:42 +0000 Subject: [PATCH 8/9] =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EC=97=85=EA=B7=B8?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2937 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- config/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 디버깅 메세지 출력 From dc8d1170f604bb64dc4790a78f49ea1fba1e4f8c Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 6 Nov 2007 05:09:13 +0000 Subject: [PATCH 9/9] git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2938 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/db/DB.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php index 8c7c15e83..ca186a6e1 100644 --- a/classes/db/DB.class.php +++ b/classes/db/DB.class.php @@ -322,7 +322,7 @@ return $value; } - if(strpos($value,'.')!==false) { + if(strpos($name,'.')!==false&&strpos($value,'.')!==false) { list($column_name) = explode('.',$value); if($column_type[$column_name]) return $value; }