fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-24 13:49:56 +09:00
Code Issues Projects Releases Packages Wiki Activity

git-svn-id: http://xe-core.googlecode.com/svn/trunk@2940 201d5d3c-b55e-5fd7-737f-ddc643e51545

Browse source
This commit is contained in:
zero 2007-11-06 05:12:56 +00:00
commit 581ba1115d
20 changed files with 62 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

10
classes/db/DB.class.php
View file

@ -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)."'";
}

2
classes/db/DBCubrid.class.php
View file

@ -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.'"';

2
classes/db/DBMysql.class.php
View file

@ -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.' ';

2
classes/db/DBMysql_innodb.class.php
View file

@ -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.' ';

2
classes/db/DBSqlite2.class.php
View file

@ -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.' ';

2
classes/db/DBSqlite3_pdo.class.php
View file

@ -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);

2
config/config.inc.php
View file

@ -14,7 +14,7 @@
* 이 내용은 제로보드XE의 버전을 관리자 페이지에 표시하기 위한 용도이며
* config.inc.php의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함
**/
define('__ZBXE_VERSION__', '0.2.4');
define('__ZBXE_VERSION__', '0.2.5');
/**
* @brief 디버깅 메세지 출력

4
modules/blog/skins/xe_blog/write_form.html
View file

@ -95,7 +95,7 @@
<div class="fl gap1">
<!--@if($is_logged)-->
<span class="button"><input type="button" value="{$lang->cmd_save}" onclick="doDocumentSave(this); return false;" /></span>
<span class="button"><input type="button" value="{$lang->cmd_temp_save}" onclick="doDocumentSave(this); return false;" /></span>
<span class="button"><input type="button" value="{$lang->cmd_load}" onclick="doDocumentLoad(this); return false;" /></span>
<!--@end-->
</div>
@ -103,7 +103,7 @@
<div class="fr gap1">
<span class="button"><input type="button" value="{$lang->cmd_back}" onclick="location.href='{getUrl('act','')}'" /></span>
<span class="button"><input type="button" value="{$lang->cmd_preview}" onclick="doDocumentPreview(this); return false;" /></span>
<span class="button"><input type="submit" value="{$lang->cmd_publish}" accesskey="s" /></span>
<span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
</div>
<div class="clear"></div>

4
modules/board/skins/xe_board/write_form.html
View file

@ -104,7 +104,7 @@
<div class="fl gap1">
<!--@if($is_logged)-->
<span class="button"><input type="button" value="{$lang->cmd_save}" onclick="doDocumentSave(this); return false;" /></span>
<span class="button"><input type="button" value="{$lang->cmd_temp_save}" onclick="doDocumentSave(this); return false;" /></span>
<span class="button"><input type="button" value="{$lang->cmd_load}" onclick="doDocumentLoad(this); return false;" /></span>
<!--@end-->
</div>
@ -112,7 +112,7 @@
<div class="fr gap1">
<span class="button"><input type="button" value="{$lang->cmd_back}" onclick="location.href='{getUrl('act','')}'" /></span>
<span class="button"><input type="button" value="{$lang->cmd_preview}" onclick="doDocumentPreview(this); return false;" /></span>
<span class="button"><input type="submit" value="{$lang->cmd_publish}" accesskey="s" /></span>
<span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
</div>
<div class="clear"></div>

23
modules/document/document.model.php
View file

@ -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;
}

2
modules/document/lang/en.lang.php
View file

@ -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 = '이 게시물을..';

2
modules/document/lang/es.lang.php
View file

@ -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 = '이 게시물을..';

2
modules/document/lang/jp.lang.php
View file

@ -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 = '이 게시물을..';

2
modules/document/lang/ko.lang.php
View file

@ -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 = '이 게시물을..';

2
modules/document/lang/zh-CN.lang.php
View file

@ -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 = '把文章..';

2
modules/document/queries/getDocumentListWithinTag.xml
View file

@ -9,7 +9,7 @@
<conditions>
<condition operation="in" column="documents.module_srl" var="module_srl" filter="number" />
<condition operation="equal" column="documents.document_srl" default="tags.document_srl" notnull="notnull" pipe="and" />
<condition operation="in" column="tags.tag" var="s_tags" notnull="notnull" pipe="and" />
<condition operation="like" column="tags.tag" var="s_tags" notnull="notnull" pipe="and" />
</conditions>
<navigation>
<index var="sort_index" default="documents.list_order" order="asc" />

19
modules/member/member.controller.php
View file

@ -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);

2
modules/point/point.controller.php
View file

@ -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('<span class="nowrap member_%s" style="cursor:pointer"><img src="%s" width="%s" height="%s" alt="%s" title="%s" align="absmiddle" style="margin-right:3px"/>%s</span>', $member_srl, Context::getRequestUri().$src, $this->icon_width+2, $this->icon_height, $title, $title, $text);
$text = sprintf('<span class="nowrap member_%s" style="cursor:pointer"><img src="%s" width="%s" height="%s" alt="%s" title="%s" align="absmiddle" style="margin-right:3px"/>%s</span>', $member_srl, Context::getRequestUri().$src, $this->icon_width, $this->icon_height, $title, $title, $text);
$this->member_code[$member_srl] = $text;

8
modules/trackback/conf/info.xml
View file

@ -3,8 +3,8 @@
<title xml:lang="ko">엮인글</title>
<title xml:lang="zh-CN">引用</title>
<title xml:lang="jp">トラックバック</title>
<title xml:lang="en">Trackback</title>
<title xml:lang="es">Trackback</title>
<title xml:lang="en">Trackback</title>
<title xml:lang="es">Trackback</title>
<author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
<name xml:lang="ko">제로</name>
<name xml:lang="zh-CN">zero</name>
@ -14,7 +14,7 @@
<description xml:lang="ko">엮인글 관리 모듈</description>
<description xml:lang="zh-CN">管理引用模块。</description>
<description xml:lang="jp">トラックバック管理モジュール</description>
<description xnl:lang="en">Module for managing trackbacks</description>
<description xnl:lang="en">Módulo para el manejo de trackbacks</description>
<description xnl:lang="en">Module for managing trackbacks</description>
<description xnl:lang="es">Módulo para el manejo de trackbacks</description>
</author>
</module>

2
widgets/newest_document/skins/blog_newest_document/css/normal.css
View file

@ -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; }