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

1.4.0 rc#2 trunk

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7217 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
haneul 2010-01-21 09:38:30 +00:00
commit 20496892cc
20 changed files with 267 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

28
classes/xml/XmlQueryParser.class.php
View file

@ -202,20 +202,6 @@
$buff .= sprintf('$output->groups = array("%s");%s', implode('","',$output->groups),"\n"); $buff .= sprintf('$output->groups = array("%s");%s', implode('","',$output->groups),"\n");
} }
// default check
if(count($this->default_list)) {
foreach($this->default_list as $key => $val) {
$pre_buff .= 'if(!isset($args->'.$key.')) $args->'.$key.' = '.$val.';'."\n";
}
}
// not null check
if(count($this->notnull_list)) {
foreach($this->notnull_list as $key => $val) {
$pre_buff .= 'if(!isset($args->'.$val.')) return new Object(-1, sprintf($lang->filter->isnull, $lang->'.$val.'?$lang->'.$val.':\''.$val.'\'));'."\n";
}
}
// minlength check // minlength check
if(count($minlength_list)) { if(count($minlength_list)) {
foreach($minlength_list as $key => $val) { foreach($minlength_list as $key => $val) {
@ -237,6 +223,20 @@
} }
} }
// default check
if(count($this->default_list)) {
foreach($this->default_list as $key => $val) {
$pre_buff .= 'if(!isset($args->'.$key.')) $args->'.$key.' = '.$val.';'."\n";
}
}
// not null check
if(count($this->notnull_list)) {
foreach($this->notnull_list as $key => $val) {
$pre_buff .= 'if(!isset($args->'.$val.')) return new Object(-1, sprintf($lang->filter->isnull, $lang->'.$val.'?$lang->'.$val.':\''.$val.'\'));'."\n";
}
}
$buff = "<?php if(!defined('__ZBXE__')) exit();\n" $buff = "<?php if(!defined('__ZBXE__')) exit();\n"
. sprintf('$output->query_id = "%s";%s', $query_id, "\n") . sprintf('$output->query_id = "%s";%s', $query_id, "\n")
. sprintf('$output->action = "%s";%s', $action, "\n") . sprintf('$output->action = "%s";%s', $action, "\n")

2
config/config.inc.php
View file

@ -13,7 +13,7 @@
* @brief XE의 전체 버전 표기 * @brief XE의 전체 버전 표기
* 이 파일의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함 * 이 파일의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함
**/ **/
define('__ZBXE_VERSION__', '1.4.0'); define('__ZBXE_VERSION__', '1.4.0.1');
/** /**
* @brief zbXE가 설치된 장소의 base path를 구함 * @brief zbXE가 설치된 장소의 base path를 구함

6
layouts/xe_official/css/default.css
View file

@ -55,7 +55,8 @@ body { background:#FFFFFF url(../images/default/bgBody.gif) repeat-x left top;}
*:first-child+html body#default #isSearch .submit { position:relative; top:-1px;} *:first-child+html body#default #isSearch .submit { position:relative; top:-1px;}
/* Site Layout - Content Body */ /* Site Layout - Content Body */
#contentBody { position:relative; width:980px; padding-bottom:30px; overflow:hidden; background:url(../images/default/bgContentBody.gif) repeat-y left top; border-bottom:1px solid #dddddd;} #contentBody { position:relative; width:980px; padding-bottom:30px; background:url(../images/default/bgContentBody.gif) repeat-y left top; border-bottom:1px solid #dddddd; *zoom:1;}
#contentBody:after{ content:""; display:block; clear:both;}
/* Site Layout - Column Left */ /* Site Layout - Column Left */
#columnLeft { position:relative; width:201px; float:left;} #columnLeft { position:relative; width:201px; float:left;}
@ -78,7 +79,8 @@ body { background:#FFFFFF url(../images/default/bgBody.gif) repeat-x left top;}
#lnb li.on ul li.on a { color:#ff1a00 !important; font-weight:bold !important; background:url(../images/default/bulletLnb.gif) no-repeat 175px center !important;} #lnb li.on ul li.on a { color:#ff1a00 !important; font-weight:bold !important; background:url(../images/default/bulletLnb.gif) no-repeat 175px center !important;}
/* Site Layout - Column Right */ /* Site Layout - Column Right */
#columnRight { width:770px; float:right; overflow:hidden;} #columnRight { width:770px; float:right;}
#columnRight:after{ content:""; display:block; clear:both;}
#visualArea { width:770px; height:200px; background:#f5f5f5; margin-bottom:2.5em; position:relative; left:-15px; margin-right:-15px;} #visualArea { width:770px; height:200px; background:#f5f5f5; margin-bottom:2.5em; position:relative; left:-15px; margin-right:-15px;}
#content { width:100%; overflow:hidden;} #content { width:100%; overflow:hidden;}

1
modules/autoinstall/autoinstall.admin.controller.php
View file

@ -118,7 +118,6 @@
if(!$_SESSION['ftp_password']) if(!$_SESSION['ftp_password'])
{ {
$ftp_password = Context::get('ftp_password'); $ftp_password = Context::get('ftp_password');
if($ftp_password) $_SESSION['ftp_password'] = $ftp_password;
} }
else else
{ {

12
modules/autoinstall/autoinstall.class.php
View file

@ -46,11 +46,13 @@
**/ **/
function checkUpdate() { function checkUpdate() {
$oDB =& DB::getInstance(); $oDB =& DB::getInstance();
if($oDB->isTableExists("autoinstall_installed_packages")) if(!file_exists(FileHandler::getRealPath("./modules/autoinstall/schemas/autoinstall_installed_packages.xml"))
&& $oDB->isTableExists("autoinstall_installed_packages"))
{ {
return true; return true;
} }
if($oDB->isTableExists("autoinstall_remote_categories")) if(!file_exists(FileHandler::getRealPath("./modules/autoinstall/schemas/autoinstall_remote_categories.xml"))
&& $oDB->isTableExists("autoinstall_remote_categories"))
{ {
return true; return true;
} }
@ -63,11 +65,13 @@
**/ **/
function moduleUpdate() { function moduleUpdate() {
$oDB =& DB::getInstance(); $oDB =& DB::getInstance();
if($oDB->isTableExists("autoinstall_installed_packages")) if(!file_exists(FileHandler::getRealPath("./modules/autoinstall/schemas/autoinstall_installed_packages.xml"))
&& $oDB->isTableExists("autoinstall_installed_packages"))
{ {
$oDB->dropTable("autoinstall_installed_packages"); $oDB->dropTable("autoinstall_installed_packages");
} }
if($oDB->isTableExists("autoinstall_remote_categories")) if(!file_exists(FileHandler::getRealPath("./modules/autoinstall/schemas/autoinstall_remote_categories.xml"))
&& $oDB->isTableExists("autoinstall_remote_categories"))
{ {
$oDB->dropTable("autoinstall_remote_categories"); $oDB->dropTable("autoinstall_remote_categories");
} }

2
modules/autoinstall/autoinstall.lib.php
View file

@ -124,6 +124,7 @@
{ {
return new Object(-1,'msg_ftp_invalid_auth_info'); return new Object(-1,'msg_ftp_invalid_auth_info');
} }
$_SESSION['ftp_password'] = $this->ftp_password;
$sftp = ssh2_sftp($connection); $sftp = ssh2_sftp($connection);
@ -176,6 +177,7 @@
$oFtp->ftp_quit(); $oFtp->ftp_quit();
return new Object(-1,'msg_ftp_invalid_auth_info'); return new Object(-1,'msg_ftp_invalid_auth_info');
} }
$_SESSION['ftp_password'] = $this->ftp_password;
$_list = $oFtp->ftp_rawlist($ftp_info->ftp_root_path); $_list = $oFtp->ftp_rawlist($ftp_info->ftp_root_path);

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

@ -9,7 +9,7 @@
<conditions> <conditions>
<condition operation="equal" column="alias_title" var="alias_title" notnull="notnull" /> <condition operation="equal" column="alias_title" var="alias_title" notnull="notnull" />
<condition operation="equal" column="modules.site_srl" var="site_srl" filter="number" notnull="notnull" pipe="and" /> <condition operation="equal" column="modules.site_srl" var="site_srl" filter="number" notnull="notnull" pipe="and" />
<condition operation="equal" column="modules.mid" var="mid" filter="number" notnull="notnull" pipe="and" /> <condition operation="equal" column="modules.mid" var="mid" notnull="notnull" pipe="and" />
<condition operation="equal" column="modules.module_srl" var="document_aliases.module_srl" filter="number" notnull="notnull" pipe="and" /> <condition operation="equal" column="modules.module_srl" var="document_aliases.module_srl" filter="number" notnull="notnull" pipe="and" />
</conditions> </conditions>
</query> </query>

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

@ -3,7 +3,7 @@
<table name="documents" /> <table name="documents" />
</tables> </tables>
<columns> <columns>
<column name="module_srl" var="module_srl" filter="number" default="0" /> <column name="module_srl" var="module_srl" filter="number" />
<column name="regdate" var="regdate" default="curdate()" /> <column name="regdate" var="regdate" default="curdate()" />
<column name="last_update" var="last_update" default="curdate()" /> <column name="last_update" var="last_update" default="curdate()" />
<column name="list_order" var="list_order" /> <column name="list_order" var="list_order" />

30
modules/editor/editor.model.php
View file

@ -92,17 +92,17 @@
$oParser = new XmlParser(); $oParser = new XmlParser();
$xml_doc = $oParser->loadXmlFile($xml_file); $xml_doc = $oParser->loadXmlFile($xml_file);
$component_info->drcomponent_name = $drComponentName; $component_info->component_name = $drComponentName;
$component_info->title = $xml_doc->drcomponent->title->body; $component_info->title = $xml_doc->component->title->body;
$component_info->description = str_replace('\n', "\n", $xml_doc->drcomponent->description->body); $component_info->description = str_replace('\n', "\n", $xml_doc->component->description->body);
$component_info->version = $xml_doc->drcomponent->version->body; $component_info->version = $xml_doc->component->version->body;
$component_info->date = $xml_doc->drcomponent->date->body; $component_info->date = $xml_doc->component->date->body;
$component_info->homepage = $xml_doc->drcomponent->link->body; $component_info->homepage = $xml_doc->component->link->body;
$component_info->license = $xml_doc->drcomponent->license->body; $component_info->license = $xml_doc->component->license->body;
$component_info->license_link = $xml_doc->drcomponent->license->attrs->link; $component_info->license_link = $xml_doc->component->license->attrs->link;
$buff = '<?php if(!defined("__ZBXE__")) exit(); '; $buff = '<?php if(!defined("__ZBXE__")) exit(); ';
$buff .= sprintf('$xml_info->drcomponent_name = "%s";', $component_info->drcomponent_name); $buff .= sprintf('$xml_info->component_name = "%s";', $component_info->component_name);
$buff .= sprintf('$xml_info->title = "%s";', $component_info->title); $buff .= sprintf('$xml_info->title = "%s";', $component_info->title);
$buff .= sprintf('$xml_info->description = "%s";', $component_info->description); $buff .= sprintf('$xml_info->description = "%s";', $component_info->description);
$buff .= sprintf('$xml_info->version = "%s";', $component_info->version); $buff .= sprintf('$xml_info->version = "%s";', $component_info->version);
@ -112,8 +112,8 @@
$buff .= sprintf('$xml_info->license_link = "%s";', $component_info->license_link); $buff .= sprintf('$xml_info->license_link = "%s";', $component_info->license_link);
// 작성자 정보 // 작성자 정보
if(!is_array($xml_doc->drcomponent->author)) $author_list[] = $xml_doc->drcomponent->author; if(!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
else $author_list = $xml_doc->drcomponent->author; else $author_list = $xml_doc->component->author;
for($i=0; $i < count($author_list); $i++) { for($i=0; $i < count($author_list); $i++) {
$buff .= sprintf('$xml_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body); $buff .= sprintf('$xml_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
@ -122,9 +122,9 @@
} }
// history // history
if($xml_doc->drcomponent->history) { if($xml_doc->component->history) {
if(!is_array($xml_doc->drcomponent->history)) $history_list[] = $xml_doc->drcomponent->history; if(!is_array($xml_doc->component->history)) $history_list[] = $xml_doc->component->history;
else $history_list = $xml_doc->drcomponent->history; else $history_list = $xml_doc->component->history;
for($i=0; $i < count($history_list); $i++) { for($i=0; $i < count($history_list); $i++) {
unset($obj); unset($obj);
@ -156,7 +156,7 @@
} }
// 추가 변수 정리 (에디터 컴포넌트에서는 text형만 가능) // 추가 변수 정리 (에디터 컴포넌트에서는 text형만 가능)
$extra_vars = $xml_doc->drcomponent->extra_vars->var; $extra_vars = $xml_doc->component->extra_vars->var;
if($extra_vars) { if($extra_vars) {
if(!is_array($extra_vars)) $extra_vars = array($extra_vars); if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
foreach($extra_vars as $key => $val) { foreach($extra_vars as $key => $val) {

1
modules/editor/lang/en.lang.php
View file

@ -227,5 +227,4 @@
$lang->edit->image_align = '이미지 정렬'; $lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일'; $lang->edit->attached_files = '첨부 파일';
$lang->edit->drag_here = 'You can start writting with a selected paragraph from paragraph toolbar below.';
?> ?>

1
modules/editor/lang/es.lang.php
View file

@ -223,5 +223,4 @@
$lang->edit->image_align = '이미지 정렬'; $lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일'; $lang->edit->attached_files = '첨부 파일';
$lang->edit->drag_here = '아래의 단락추가 툴바에서 원하는 유형의 단락을 추가해 글 쓰기를 시작하세요.';
?> ?>

1
modules/editor/lang/fr.lang.php
View file

@ -227,5 +227,4 @@
$lang->edit->image_align = '이미지 정렬'; $lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일'; $lang->edit->attached_files = '첨부 파일';
$lang->edit->drag_here = '아래의 단락추가 툴바에서 원하는 유형의 단락을 추가해 글 쓰기를 시작하세요.';
?> ?>

1
modules/editor/lang/jp.lang.php
View file

@ -229,5 +229,4 @@
$lang->edit->image_align = '이미지 정렬'; $lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일'; $lang->edit->attached_files = '첨부 파일';
$lang->edit->drag_here = '下のツールリストから段落のタイプを選んで追加できます。';
?> ?>

1
modules/editor/lang/ko.lang.php
View file

@ -229,5 +229,4 @@
$lang->edit->image_align = '이미지 정렬'; $lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일'; $lang->edit->attached_files = '첨부 파일';
$lang->edit->drag_here = '아래의 단락추가 툴바에서 원하는 유형의 단락을 추가해 글 쓰기를 시작하세요.';
?> ?>

1
modules/editor/lang/ru.lang.php
View file

@ -223,5 +223,4 @@
$lang->edit->image_align = '이미지 정렬'; $lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일'; $lang->edit->attached_files = '첨부 파일';
$lang->edit->drag_here = '아래의 단락추가 툴바에서 원하는 유형의 단락을 추가해 글 쓰기를 시작하세요.';
?> ?>

1
modules/editor/lang/vi.lang.php
View file

@ -229,5 +229,4 @@
$lang->edit->image_align = '이미지 정렬'; $lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일'; $lang->edit->attached_files = '첨부 파일';
$lang->edit->drag_here = '아래의 단락추가 툴바에서 원하는 유형의 단락을 추가해 글 쓰기를 시작하세요.';
?> ?>

1
modules/editor/lang/zh-CN.lang.php
View file

@ -229,5 +229,4 @@
$lang->edit->image_align = '이미지 정렬'; $lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일'; $lang->edit->attached_files = '첨부 파일';
$lang->edit->drag_here = '请点击编辑器工具栏中的相应按钮开始撰写日志。';
?> ?>

1
modules/editor/lang/zh-TW.lang.php
View file

@ -230,5 +230,4 @@
$lang->edit->image_align = '이미지 정렬'; $lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일'; $lang->edit->attached_files = '첨부 파일';
$lang->edit->drag_here = '아래의 단락추가 툴바에서 원하는 유형의 단락을 추가해 글 쓰기를 시작하세요.';
?> ?>

1
modules/install/install.admin.controller.php
View file

@ -140,6 +140,7 @@
$buff .= "?>"; $buff .= "?>";
$config_file = Context::getFTPConfigFile(); $config_file = Context::getFTPConfigFile();
FileHandler::WriteFile($config_file, $buff); FileHandler::WriteFile($config_file, $buff);
if($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
$this->setMessage('success_updated'); $this->setMessage('success_updated');
} }

6
modules/widget/tpl/js/widget.js
View file

@ -711,6 +711,12 @@ function doShowWidgetSizeSetup(px, py, obj) {
jQuery.each(opts, function(key, val){ jQuery.each(opts, function(key, val){
var el = form[0].elements[key]; var el = form[0].elements[key];
if (el) el.value = val; if (el) el.value = val;
if (el.tagName.toLowerCase() == "select")
{
if(el.selectedIndex == -1) {
el.selectedIndex = 0;
}
}
}); });
try { form[0].elements[0].focus() } catch(e) {}; try { form[0].elements[0].focus() } catch(e) {};