diff --git a/classes/xml/XmlQueryParser.class.php b/classes/xml/XmlQueryParser.class.php
index c46f80642..bdc58ef02 100644
--- a/classes/xml/XmlQueryParser.class.php
+++ b/classes/xml/XmlQueryParser.class.php
@@ -202,20 +202,6 @@
$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
if(count($minlength_list)) {
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 = "query_id = "%s";%s', $query_id, "\n")
. sprintf('$output->action = "%s";%s', $action, "\n")
diff --git a/config/config.inc.php b/config/config.inc.php
index 78dd7fca4..393b85816 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -13,7 +13,7 @@
* @brief XE의 전체 버전 표기
* 이 파일의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함
**/
- define('__ZBXE_VERSION__', '1.4.0');
+ define('__ZBXE_VERSION__', '1.4.0.1');
/**
* @brief zbXE가 설치된 장소의 base path를 구함
diff --git a/layouts/xe_official/css/default.css b/layouts/xe_official/css/default.css
index 78a86ffa7..11aca8a41 100644
--- a/layouts/xe_official/css/default.css
+++ b/layouts/xe_official/css/default.css
@@ -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;}
/* 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 */
#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;}
/* 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;}
#content { width:100%; overflow:hidden;}
diff --git a/modules/autoinstall/autoinstall.admin.controller.php b/modules/autoinstall/autoinstall.admin.controller.php
index 97525fe43..75226b91f 100644
--- a/modules/autoinstall/autoinstall.admin.controller.php
+++ b/modules/autoinstall/autoinstall.admin.controller.php
@@ -118,7 +118,6 @@
if(!$_SESSION['ftp_password'])
{
$ftp_password = Context::get('ftp_password');
- if($ftp_password) $_SESSION['ftp_password'] = $ftp_password;
}
else
{
diff --git a/modules/autoinstall/autoinstall.class.php b/modules/autoinstall/autoinstall.class.php
index 1df1ead74..9db02f6d2 100644
--- a/modules/autoinstall/autoinstall.class.php
+++ b/modules/autoinstall/autoinstall.class.php
@@ -46,11 +46,13 @@
**/
function checkUpdate() {
$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;
}
- 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;
}
@@ -63,11 +65,13 @@
**/
function moduleUpdate() {
$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");
}
- 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");
}
diff --git a/modules/autoinstall/autoinstall.lib.php b/modules/autoinstall/autoinstall.lib.php
index 4113f6163..06da5889c 100644
--- a/modules/autoinstall/autoinstall.lib.php
+++ b/modules/autoinstall/autoinstall.lib.php
@@ -124,6 +124,7 @@
{
return new Object(-1,'msg_ftp_invalid_auth_info');
}
+ $_SESSION['ftp_password'] = $this->ftp_password;
$sftp = ssh2_sftp($connection);
@@ -176,6 +177,7 @@
$oFtp->ftp_quit();
return new Object(-1,'msg_ftp_invalid_auth_info');
}
+ $_SESSION['ftp_password'] = $this->ftp_password;
$_list = $oFtp->ftp_rawlist($ftp_info->ftp_root_path);
diff --git a/modules/document/queries/getDocumentSrlByAlias.xml b/modules/document/queries/getDocumentSrlByAlias.xml
index 17eadc534..1bba47205 100644
--- a/modules/document/queries/getDocumentSrlByAlias.xml
+++ b/modules/document/queries/getDocumentSrlByAlias.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/modules/document/queries/updateDocumentOrder.xml b/modules/document/queries/updateDocumentOrder.xml
index 0dd50b2df..b7a67b1b7 100644
--- a/modules/document/queries/updateDocumentOrder.xml
+++ b/modules/document/queries/updateDocumentOrder.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php
index a6246d151..ffb5a7834 100644
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@@ -92,17 +92,17 @@
$oParser = new XmlParser();
$xml_doc = $oParser->loadXmlFile($xml_file);
- $component_info->drcomponent_name = $drComponentName;
- $component_info->title = $xml_doc->drcomponent->title->body;
- $component_info->description = str_replace('\n', "\n", $xml_doc->drcomponent->description->body);
- $component_info->version = $xml_doc->drcomponent->version->body;
- $component_info->date = $xml_doc->drcomponent->date->body;
- $component_info->homepage = $xml_doc->drcomponent->link->body;
- $component_info->license = $xml_doc->drcomponent->license->body;
- $component_info->license_link = $xml_doc->drcomponent->license->attrs->link;
+ $component_info->component_name = $drComponentName;
+ $component_info->title = $xml_doc->component->title->body;
+ $component_info->description = str_replace('\n', "\n", $xml_doc->component->description->body);
+ $component_info->version = $xml_doc->component->version->body;
+ $component_info->date = $xml_doc->component->date->body;
+ $component_info->homepage = $xml_doc->component->link->body;
+ $component_info->license = $xml_doc->component->license->body;
+ $component_info->license_link = $xml_doc->component->license->attrs->link;
$buff = '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->description = "%s";', $component_info->description);
$buff .= sprintf('$xml_info->version = "%s";', $component_info->version);
@@ -112,8 +112,8 @@
$buff .= sprintf('$xml_info->license_link = "%s";', $component_info->license_link);
// 작성자 정보
- if(!is_array($xml_doc->drcomponent->author)) $author_list[] = $xml_doc->drcomponent->author;
- else $author_list = $xml_doc->drcomponent->author;
+ if(!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
+ else $author_list = $xml_doc->component->author;
for($i=0; $i < count($author_list); $i++) {
$buff .= sprintf('$xml_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
@@ -122,9 +122,9 @@
}
// history
- if($xml_doc->drcomponent->history) {
- if(!is_array($xml_doc->drcomponent->history)) $history_list[] = $xml_doc->drcomponent->history;
- else $history_list = $xml_doc->drcomponent->history;
+ if($xml_doc->component->history) {
+ if(!is_array($xml_doc->component->history)) $history_list[] = $xml_doc->component->history;
+ else $history_list = $xml_doc->component->history;
for($i=0; $i < count($history_list); $i++) {
unset($obj);
@@ -156,7 +156,7 @@
}
// 추가 변수 정리 (에디터 컴포넌트에서는 text형만 가능)
- $extra_vars = $xml_doc->drcomponent->extra_vars->var;
+ $extra_vars = $xml_doc->component->extra_vars->var;
if($extra_vars) {
if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
foreach($extra_vars as $key => $val) {
diff --git a/modules/editor/lang/en.lang.php b/modules/editor/lang/en.lang.php
index a648591a3..a427b31d0 100644
--- a/modules/editor/lang/en.lang.php
+++ b/modules/editor/lang/en.lang.php
@@ -227,5 +227,4 @@
$lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일';
- $lang->edit->drag_here = 'You can start writting with a selected paragraph from paragraph toolbar below.';
?>
\ No newline at end of file
diff --git a/modules/editor/lang/es.lang.php b/modules/editor/lang/es.lang.php
index 48e75e1e4..60eee307a 100644
--- a/modules/editor/lang/es.lang.php
+++ b/modules/editor/lang/es.lang.php
@@ -223,5 +223,4 @@
$lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일';
- $lang->edit->drag_here = '아래의 단락추가 툴바에서 원하는 유형의 단락을 추가해 글 쓰기를 시작하세요.';
?>
\ No newline at end of file
diff --git a/modules/editor/lang/fr.lang.php b/modules/editor/lang/fr.lang.php
index 0c1951d33..3935840d2 100644
--- a/modules/editor/lang/fr.lang.php
+++ b/modules/editor/lang/fr.lang.php
@@ -227,5 +227,4 @@
$lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일';
- $lang->edit->drag_here = '아래의 단락추가 툴바에서 원하는 유형의 단락을 추가해 글 쓰기를 시작하세요.';
?>
\ No newline at end of file
diff --git a/modules/editor/lang/jp.lang.php b/modules/editor/lang/jp.lang.php
index d7f4be1ef..3b1cbbcfb 100644
--- a/modules/editor/lang/jp.lang.php
+++ b/modules/editor/lang/jp.lang.php
@@ -229,5 +229,4 @@
$lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일';
- $lang->edit->drag_here = '下のツールリストから段落のタイプを選んで追加できます。';
?>
\ No newline at end of file
diff --git a/modules/editor/lang/ko.lang.php b/modules/editor/lang/ko.lang.php
index df370cc9c..568700552 100644
--- a/modules/editor/lang/ko.lang.php
+++ b/modules/editor/lang/ko.lang.php
@@ -229,5 +229,4 @@
$lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일';
- $lang->edit->drag_here = '아래의 단락추가 툴바에서 원하는 유형의 단락을 추가해 글 쓰기를 시작하세요.';
?>
\ No newline at end of file
diff --git a/modules/editor/lang/ru.lang.php b/modules/editor/lang/ru.lang.php
index e7858da32..b18c660ed 100644
--- a/modules/editor/lang/ru.lang.php
+++ b/modules/editor/lang/ru.lang.php
@@ -223,5 +223,4 @@
$lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일';
- $lang->edit->drag_here = '아래의 단락추가 툴바에서 원하는 유형의 단락을 추가해 글 쓰기를 시작하세요.';
?>
\ No newline at end of file
diff --git a/modules/editor/lang/vi.lang.php b/modules/editor/lang/vi.lang.php
index 25afcc776..339e23955 100644
--- a/modules/editor/lang/vi.lang.php
+++ b/modules/editor/lang/vi.lang.php
@@ -229,5 +229,4 @@
$lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일';
- $lang->edit->drag_here = '아래의 단락추가 툴바에서 원하는 유형의 단락을 추가해 글 쓰기를 시작하세요.';
?>
\ No newline at end of file
diff --git a/modules/editor/lang/zh-CN.lang.php b/modules/editor/lang/zh-CN.lang.php
index 74385c6b6..3cabadf8a 100644
--- a/modules/editor/lang/zh-CN.lang.php
+++ b/modules/editor/lang/zh-CN.lang.php
@@ -1,213 +1,213 @@
-
- * @brief 网页编辑器(editor) 模块语言包
- **/
-
- $lang->editor = '网页编辑器';
- $lang->component_name = '组件';
- $lang->component_version = '版本';
- $lang->component_author = '作者';
- $lang->component_link = '链接';
- $lang->component_date = '编写日期';
- $lang->component_license = '版权';
- $lang->component_history = '更新日志';
- $lang->component_description = '说明';
- $lang->component_extra_vars = '变数设置';
- $lang->component_grant = '权限设置';
- $lang->content_style = '文档样式';
- $lang->content_font = '文档字体';
- $lang->content_font_size = '字体大小';
-
- $lang->about_component = '组件简介';
- $lang->about_component_grant = '可以设置除默认组件外的扩展组件使用权限
(全部解除时任何用户都可以使用)。';
- $lang->about_component_mid = '可以指定使用编辑器组件的对象。
(全部解除时任何用户都可以使用)。';
-
- $lang->msg_component_is_not_founded = '找不到%s 组件说明！';
- $lang->msg_component_is_inserted = '您选择的组件已插入！';
- $lang->msg_component_is_first_order = '您选择的组件已到最上端位置！';
- $lang->msg_component_is_last_order = '您选择的组件已到最下端位置！';
- $lang->msg_load_saved_doc = "有自动保存的内容， 确定要恢复吗？\n发布主题后，自动保存的文本将会被删除。";
- $lang->msg_auto_saved = '已自动保存！';
-
- $lang->cmd_disable = '非激活';
- $lang->cmd_enable = '激活';
-
- $lang->editor_skin = '编辑器皮肤';
- $lang->upload_file_grant = '文件上传权限';
- $lang->enable_default_component_grant = '默认组件使用权限';
- $lang->enable_component_grant = '组件使用权限';
- $lang->enable_html_grant = 'HTML编辑权限';
- $lang->enable_autosave = '内容自动保存';
- $lang->height_resizable = '高度调整';
- $lang->editor_height = '编辑器高度';
-
- $lang->about_editor_skin = '可以选择编辑器皮肤。';
- $lang->about_content_style = '可以指定编辑或打印文档时的文档样式。';
- $lang->about_content_font = '可以指定编辑或打印文档时的文档字体，不指定随用户设置。
多个字体可以用逗号(，)区分输入。';
- $lang->about_content_font_size = '可以指定编辑或打印文档时的文档字体大小。
指定时请包含字体单位(如12px, 1em)。';
- $lang->about_upload_file_grant = '可以设置上传文件的权限(全部解除为无限制)。';
- $lang->about_default_component_grant = '可以设置编辑器默认组件的使用权限(全部解除为无限制)。';
- $lang->about_editor_height = '可以指定编辑器的默认高度。';
- $lang->about_editor_height_resizable = '允许用户拖动编辑器高度。';
- $lang->about_enable_html_grant = 'HTML代码编辑权限设置。';
- $lang->about_enable_autosave = '发表主题时激活内容自动保存功能。';
-
- $lang->edit->fontname = '字体';
- $lang->edit->fontsize = '大小';
- $lang->edit->use_paragraph = '段落功能';
- $lang->edit->fontlist = array(
- '宋体'=>'宋体',
- '黑体'=>'黑体',
- '楷体_GB2312'=>'楷体',
- 'Arial'=>'Arial',
- 'Arial Black'=>'Arial Black',
- 'Tahoma'=>'Tahoma',
- 'Verdana'=>'Verdana',
- 'Sans-serif'=>'Sans-serif',
- 'Serif'=>'Serif',
- 'Monospace'=>'Monospace',
- 'Cursive'=>'Cursive',
- 'Fantasy'=>'Fantasy',
- );
-
- $lang->edit->header = '样式';
- $lang->edit->header_list = array(
- 'h1' => '标题 1',
- 'h2' => '标题 2',
- 'h3' => '标题 3',
- 'h4' => '标题 4',
- 'h5' => '标题 5',
- 'h6' => '标题 6',
- );
-
- $lang->edit->submit = '确认';
-
- $lang->edit->fontcolor = '文本颜色';
- $lang->edit->fontbgcolor = '背景颜色';
- $lang->edit->bold = '粗体';
- $lang->edit->italic = '斜体';
- $lang->edit->underline = '下划线';
- $lang->edit->strike = '取消线';
- $lang->edit->sup = '上标';
- $lang->edit->sub = '下标';
- $lang->edit->redo = '恢复';
- $lang->edit->undo = '撤销';
- $lang->edit->align_left = '左对齐';
- $lang->edit->align_center = '居中对齐';
- $lang->edit->align_right = '右对齐';
- $lang->edit->align_justify = '两端对齐';
- $lang->edit->add_indent = '增加缩进';
- $lang->edit->remove_indent = '减少缩进';
- $lang->edit->list_number = '有序列表';
- $lang->edit->list_bullet = '无序列表';
- $lang->edit->remove_format = '删除文字格式';
-
- $lang->edit->help_remove_format = '清除格式。';
- $lang->edit->help_strike_through = '取消线。';
- $lang->edit->help_align_full = '两端对齐。';
-
- $lang->edit->help_fontcolor = '文本颜色。';
- $lang->edit->help_fontbgcolor = '背景颜色。';
- $lang->edit->help_bold = '粗体';
- $lang->edit->help_italic = '斜体';
- $lang->edit->help_underline = '下划线';
- $lang->edit->help_strike = '取消线';
- $lang->edit->help_sup = '上标';
- $lang->edit->help_sub = '下标';
- $lang->edit->help_redo = '恢复';
- $lang->edit->help_undo = '撤销';
- $lang->edit->help_align_left = '左对齐';
- $lang->edit->help_align_center = '居中对齐';
- $lang->edit->help_align_right = '右对齐';
- $lang->edit->help_align_justify = '两端对齐';
- $lang->edit->help_add_indent = '增加缩进';
- $lang->edit->help_remove_indent = '减少缩进';
- $lang->edit->help_list_number = '有序列表';
- $lang->edit->help_list_bullet = '无序列表';
- $lang->edit->help_use_paragraph = '分段请按 Ctrl＋回车． (发表主题快捷键：Alt＋S)';
-
- $lang->edit->url = '链接';
- $lang->edit->blockquote = '注释框';
- $lang->edit->table = '表格';
- $lang->edit->image = '图片';
- $lang->edit->multimedia = '视频';
- $lang->edit->emoticon = '表情图标';
-
- $lang->edit->upload = '上传';
- $lang->edit->upload_file = '上传附件';
- $lang->edit->link_file = '插入附件';
- $lang->edit->delete_selected = '删除所选';
-
- $lang->edit->icon_align_article = '占一个段落';
- $lang->edit->icon_align_left = '文本左侧';
- $lang->edit->icon_align_middle = '居中对齐';
- $lang->edit->icon_align_right = '文本右侧';
-
- $lang->about_dblclick_in_editor = '双击背景, 文本, 图片, 引用即可对其相关组件进行详细设置。';
-
- $lang->edit->rich_editor = '常规';
- $lang->edit->html_editor = 'HTML';
- $lang->edit->extension ='扩展组件';
- $lang->edit->help = '帮助';
- $lang->edit->help_command = '快捷键说明';
-
- $lang->edit->lineheight = '行间距';
- $lang->edit->fontbgsampletext = '我爱中华！';
-
- $lang->edit->hyperlink = '链接';
- $lang->edit->target_blank = '新窗口';
-
- $lang->edit->quotestyle1 = '左侧实线';
- $lang->edit->quotestyle2 = '引用符号';
- $lang->edit->quotestyle3 = '实线';
- $lang->edit->quotestyle4 = '实线 + 背景';
- $lang->edit->quotestyle5 = '粗实线';
- $lang->edit->quotestyle6 = '虚线';
- $lang->edit->quotestyle7 = '虚线 + 背景';
- $lang->edit->quotestyle8 = '取消应用';
-
-
- $lang->edit->jumptoedit = '跳转';
- $lang->edit->set_sel = '表格大小';
- $lang->edit->row = '行';
- $lang->edit->col = '列';
- $lang->edit->add_one_row = '添加1行';
- $lang->edit->del_one_row = '删除1行';
- $lang->edit->add_one_col = '添加1列';
- $lang->edit->del_one_col = '删除1列';
-
- $lang->edit->table_config = '表格属性';
- $lang->edit->border_width = '表格边框';
- $lang->edit->border_color = '边框颜色';
- $lang->edit->add = '加';
- $lang->edit->del = '减';
- $lang->edit->search_color = '修改颜色';
- $lang->edit->table_backgroundcolor = '背景颜色';
- $lang->edit->special_character = '特殊字符';
- $lang->edit->insert_special_character = '插入特殊字符';
- $lang->edit->close_special_character = '关闭';
- $lang->edit->symbol = '基本符号';
- $lang->edit->number_unit = '数字/单位';
- $lang->edit->circle_bracket = '数字序号';
- $lang->edit->korean = '韩文';
- $lang->edit->greece = '希腊';
- $lang->edit->Latin = '拉丁';
- $lang->edit->japan = '日文';
- $lang->edit->selected_symbol = '被选字符';
-
- $lang->edit->search_replace = '查找/替换';
- $lang->edit->close_search_replace = '关闭';
- $lang->edit->replace_all = '全部替换';
- $lang->edit->search_words = '查找内容';
- $lang->edit->replace_words = '替换为';
- $lang->edit->next_search_words = '查找下一个';
- $lang->edit->edit_height_control = '调整输入框大小';
-
- $lang->edit->merge_cells = '合并单元格';
- $lang->edit->split_row = '跨行';
- $lang->edit->split_col = '跨列';
+
+ * @brief 网页编辑器(editor) 模块语言包
+ **/
+
+ $lang->editor = '网页编辑器';
+ $lang->component_name = '组件';
+ $lang->component_version = '版本';
+ $lang->component_author = '作者';
+ $lang->component_link = '链接';
+ $lang->component_date = '编写日期';
+ $lang->component_license = '版权';
+ $lang->component_history = '更新日志';
+ $lang->component_description = '说明';
+ $lang->component_extra_vars = '变数设置';
+ $lang->component_grant = '权限设置';
+ $lang->content_style = '文档样式';
+ $lang->content_font = '文档字体';
+ $lang->content_font_size = '字体大小';
+
+ $lang->about_component = '组件简介';
+ $lang->about_component_grant = '可以设置除默认组件外的扩展组件使用权限
(全部解除时任何用户都可以使用)。';
+ $lang->about_component_mid = '可以指定使用编辑器组件的对象。
(全部解除时任何用户都可以使用)。';
+
+ $lang->msg_component_is_not_founded = '找不到%s 组件说明！';
+ $lang->msg_component_is_inserted = '您选择的组件已插入！';
+ $lang->msg_component_is_first_order = '您选择的组件已到最上端位置！';
+ $lang->msg_component_is_last_order = '您选择的组件已到最下端位置！';
+ $lang->msg_load_saved_doc = "有自动保存的内容， 确定要恢复吗？\n发布主题后，自动保存的文本将会被删除。";
+ $lang->msg_auto_saved = '已自动保存！';
+
+ $lang->cmd_disable = '非激活';
+ $lang->cmd_enable = '激活';
+
+ $lang->editor_skin = '编辑器皮肤';
+ $lang->upload_file_grant = '文件上传权限';
+ $lang->enable_default_component_grant = '默认组件使用权限';
+ $lang->enable_component_grant = '组件使用权限';
+ $lang->enable_html_grant = 'HTML编辑权限';
+ $lang->enable_autosave = '内容自动保存';
+ $lang->height_resizable = '高度调整';
+ $lang->editor_height = '编辑器高度';
+
+ $lang->about_editor_skin = '可以选择编辑器皮肤。';
+ $lang->about_content_style = '可以指定编辑或打印文档时的文档样式。';
+ $lang->about_content_font = '可以指定编辑或打印文档时的文档字体，不指定随用户设置。
多个字体可以用逗号(，)区分输入。';
+ $lang->about_content_font_size = '可以指定编辑或打印文档时的文档字体大小。
指定时请包含字体单位(如12px, 1em)。';
+ $lang->about_upload_file_grant = '可以设置上传文件的权限(全部解除为无限制)。';
+ $lang->about_default_component_grant = '可以设置编辑器默认组件的使用权限(全部解除为无限制)。';
+ $lang->about_editor_height = '可以指定编辑器的默认高度。';
+ $lang->about_editor_height_resizable = '允许用户拖动编辑器高度。';
+ $lang->about_enable_html_grant = 'HTML代码编辑权限设置。';
+ $lang->about_enable_autosave = '发表主题时激活内容自动保存功能。';
+
+ $lang->edit->fontname = '字体';
+ $lang->edit->fontsize = '大小';
+ $lang->edit->use_paragraph = '段落功能';
+ $lang->edit->fontlist = array(
+ '宋体'=>'宋体',
+ '黑体'=>'黑体',
+ '楷体_GB2312'=>'楷体',
+ 'Arial'=>'Arial',
+ 'Arial Black'=>'Arial Black',
+ 'Tahoma'=>'Tahoma',
+ 'Verdana'=>'Verdana',
+ 'Sans-serif'=>'Sans-serif',
+ 'Serif'=>'Serif',
+ 'Monospace'=>'Monospace',
+ 'Cursive'=>'Cursive',
+ 'Fantasy'=>'Fantasy',
+ );
+
+ $lang->edit->header = '样式';
+ $lang->edit->header_list = array(
+ 'h1' => '标题 1',
+ 'h2' => '标题 2',
+ 'h3' => '标题 3',
+ 'h4' => '标题 4',
+ 'h5' => '标题 5',
+ 'h6' => '标题 6',
+ );
+
+ $lang->edit->submit = '确认';
+
+ $lang->edit->fontcolor = '文本颜色';
+ $lang->edit->fontbgcolor = '背景颜色';
+ $lang->edit->bold = '粗体';
+ $lang->edit->italic = '斜体';
+ $lang->edit->underline = '下划线';
+ $lang->edit->strike = '取消线';
+ $lang->edit->sup = '上标';
+ $lang->edit->sub = '下标';
+ $lang->edit->redo = '恢复';
+ $lang->edit->undo = '撤销';
+ $lang->edit->align_left = '左对齐';
+ $lang->edit->align_center = '居中对齐';
+ $lang->edit->align_right = '右对齐';
+ $lang->edit->align_justify = '两端对齐';
+ $lang->edit->add_indent = '增加缩进';
+ $lang->edit->remove_indent = '减少缩进';
+ $lang->edit->list_number = '有序列表';
+ $lang->edit->list_bullet = '无序列表';
+ $lang->edit->remove_format = '删除文字格式';
+
+ $lang->edit->help_remove_format = '清除格式。';
+ $lang->edit->help_strike_through = '取消线。';
+ $lang->edit->help_align_full = '两端对齐。';
+
+ $lang->edit->help_fontcolor = '文本颜色。';
+ $lang->edit->help_fontbgcolor = '背景颜色。';
+ $lang->edit->help_bold = '粗体';
+ $lang->edit->help_italic = '斜体';
+ $lang->edit->help_underline = '下划线';
+ $lang->edit->help_strike = '取消线';
+ $lang->edit->help_sup = '上标';
+ $lang->edit->help_sub = '下标';
+ $lang->edit->help_redo = '恢复';
+ $lang->edit->help_undo = '撤销';
+ $lang->edit->help_align_left = '左对齐';
+ $lang->edit->help_align_center = '居中对齐';
+ $lang->edit->help_align_right = '右对齐';
+ $lang->edit->help_align_justify = '两端对齐';
+ $lang->edit->help_add_indent = '增加缩进';
+ $lang->edit->help_remove_indent = '减少缩进';
+ $lang->edit->help_list_number = '有序列表';
+ $lang->edit->help_list_bullet = '无序列表';
+ $lang->edit->help_use_paragraph = '分段请按 Ctrl＋回车． (发表主题快捷键：Alt＋S)';
+
+ $lang->edit->url = '链接';
+ $lang->edit->blockquote = '注释框';
+ $lang->edit->table = '表格';
+ $lang->edit->image = '图片';
+ $lang->edit->multimedia = '视频';
+ $lang->edit->emoticon = '表情图标';
+
+ $lang->edit->upload = '上传';
+ $lang->edit->upload_file = '上传附件';
+ $lang->edit->link_file = '插入附件';
+ $lang->edit->delete_selected = '删除所选';
+
+ $lang->edit->icon_align_article = '占一个段落';
+ $lang->edit->icon_align_left = '文本左侧';
+ $lang->edit->icon_align_middle = '居中对齐';
+ $lang->edit->icon_align_right = '文本右侧';
+
+ $lang->about_dblclick_in_editor = '双击背景, 文本, 图片, 引用即可对其相关组件进行详细设置。';
+
+ $lang->edit->rich_editor = '常规';
+ $lang->edit->html_editor = 'HTML';
+ $lang->edit->extension ='扩展组件';
+ $lang->edit->help = '帮助';
+ $lang->edit->help_command = '快捷键说明';
+
+ $lang->edit->lineheight = '行间距';
+ $lang->edit->fontbgsampletext = '我爱中华！';
+
+ $lang->edit->hyperlink = '链接';
+ $lang->edit->target_blank = '新窗口';
+
+ $lang->edit->quotestyle1 = '左侧实线';
+ $lang->edit->quotestyle2 = '引用符号';
+ $lang->edit->quotestyle3 = '实线';
+ $lang->edit->quotestyle4 = '实线 + 背景';
+ $lang->edit->quotestyle5 = '粗实线';
+ $lang->edit->quotestyle6 = '虚线';
+ $lang->edit->quotestyle7 = '虚线 + 背景';
+ $lang->edit->quotestyle8 = '取消应用';
+
+
+ $lang->edit->jumptoedit = '跳转';
+ $lang->edit->set_sel = '表格大小';
+ $lang->edit->row = '行';
+ $lang->edit->col = '列';
+ $lang->edit->add_one_row = '添加1行';
+ $lang->edit->del_one_row = '删除1行';
+ $lang->edit->add_one_col = '添加1列';
+ $lang->edit->del_one_col = '删除1列';
+
+ $lang->edit->table_config = '表格属性';
+ $lang->edit->border_width = '表格边框';
+ $lang->edit->border_color = '边框颜色';
+ $lang->edit->add = '加';
+ $lang->edit->del = '减';
+ $lang->edit->search_color = '修改颜色';
+ $lang->edit->table_backgroundcolor = '背景颜色';
+ $lang->edit->special_character = '特殊字符';
+ $lang->edit->insert_special_character = '插入特殊字符';
+ $lang->edit->close_special_character = '关闭';
+ $lang->edit->symbol = '基本符号';
+ $lang->edit->number_unit = '数字/单位';
+ $lang->edit->circle_bracket = '数字序号';
+ $lang->edit->korean = '韩文';
+ $lang->edit->greece = '希腊';
+ $lang->edit->Latin = '拉丁';
+ $lang->edit->japan = '日文';
+ $lang->edit->selected_symbol = '被选字符';
+
+ $lang->edit->search_replace = '查找/替换';
+ $lang->edit->close_search_replace = '关闭';
+ $lang->edit->replace_all = '全部替换';
+ $lang->edit->search_words = '查找内容';
+ $lang->edit->replace_words = '替换为';
+ $lang->edit->next_search_words = '查找下一个';
+ $lang->edit->edit_height_control = '调整输入框大小';
+
+ $lang->edit->merge_cells = '合并单元格';
+ $lang->edit->split_row = '跨行';
+ $lang->edit->split_col = '跨列';
$lang->edit->toggle_list = '展开/折叠列表';
$lang->edit->minimize_list = '最小化';
@@ -226,8 +226,7 @@
$lang->edit->close_help = '关闭帮助';
$lang->edit->confirm_submit_without_saving = '尚有未保存的段落。\\n确定要提交吗？';
-
- $lang->edit->image_align = '이미지 정렬';
- $lang->edit->attached_files = '첨부 파일';
- $lang->edit->drag_here = '请点击编辑器工具栏中的相应按钮开始撰写日志。';
-?>
\ No newline at end of file
+
+ $lang->edit->image_align = '이미지 정렬';
+ $lang->edit->attached_files = '첨부 파일';
+?>
diff --git a/modules/editor/lang/zh-TW.lang.php b/modules/editor/lang/zh-TW.lang.php
index 792f5bc4d..e5cb8b7ee 100644
--- a/modules/editor/lang/zh-TW.lang.php
+++ b/modules/editor/lang/zh-TW.lang.php
@@ -230,5 +230,4 @@
$lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일';
- $lang->edit->drag_here = '아래의 단락추가 툴바에서 원하는 유형의 단락을 추가해 글 쓰기를 시작하세요.';
?>
\ No newline at end of file
diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php
index c6831c904..01a1a4720 100644
--- a/modules/install/install.admin.controller.php
+++ b/modules/install/install.admin.controller.php
@@ -140,6 +140,7 @@
$buff .= "?>";
$config_file = Context::getFTPConfigFile();
FileHandler::WriteFile($config_file, $buff);
+ if($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
$this->setMessage('success_updated');
}
diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js
index 34effae6c..f2dc0b58a 100644
--- a/modules/widget/tpl/js/widget.js
+++ b/modules/widget/tpl/js/widget.js
@@ -711,6 +711,12 @@ function doShowWidgetSizeSetup(px, py, obj) {
jQuery.each(opts, function(key, val){
var el = form[0].elements[key];
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) {};