diff --git a/common/lang/en.lang.php b/common/lang/en.lang.php
index 468448915..0e1afcd74 100644
--- a/common/lang/en.lang.php
+++ b/common/lang/en.lang.php
@@ -256,6 +256,7 @@
$lang->confirm_move = 'Are you sure to move?';
$lang->confirm_reset = 'Are you sure to reset?';
$lang->confirm_leave = 'Are you sure to leave?';
+ $lang->confirm_update = 'Are you sure to update?';
$lang->column_type = 'Column Type';
$lang->column_type_list['text'] = 'one-line text';
diff --git a/common/lang/es.lang.php b/common/lang/es.lang.php
index 6049591ec..83b7458fd 100644
--- a/common/lang/es.lang.php
+++ b/common/lang/es.lang.php
@@ -262,6 +262,7 @@
$lang->confirm_move = '¿Está seguro que desea mover?';
$lang->confirm_reset = '¿Está seguro que desea rehacer?';
$lang->confirm_leave = '¿Está seguro que desea abandonar?';
+ $lang->confirm_update = 'Are you sure to update?';
$lang->column_type = 'Tipos de Columnas';
$lang->column_type_list['text'] = 'Texto sin cambio de línea';
diff --git a/common/lang/fr.lang.php b/common/lang/fr.lang.php
index 7672dcf17..0d673680c 100644
--- a/common/lang/fr.lang.php
+++ b/common/lang/fr.lang.php
@@ -256,6 +256,7 @@
$lang->confirm_move = 'Vous voulez sûrement bouger?';
$lang->confirm_reset = 'Vous voulez sûrement restaurer?';
$lang->confirm_leave = 'Vous voulez sûrement supprimer votre compte?';
+ $lang->confirm_update = 'Are you sure to update?';
$lang->column_type = 'Types de la colonne';
$lang->column_type_list['text'] = 'Texte en une seul ligne';
diff --git a/common/lang/ge.lang.php b/common/lang/ge.lang.php
index 998fe0222..10e40f5e8 100644
--- a/common/lang/ge.lang.php
+++ b/common/lang/ge.lang.php
@@ -256,6 +256,7 @@
$lang->confirm_move = 'Sind Sie sicher, dass zu bewegen? ';
$lang->confirm_reset = 'Sind Sie sicher, dass zurücksetzen? ';
$lang->confirm_leave = 'Sind Sie sicher, dass zu verlassen? ';
+ $lang->confirm_update = 'Are you sure to update?';
$lang->column_type = 'Spaltenart';
$lang->column_type_list['text'] = 'ein Online-Text';
diff --git a/common/lang/jp.lang.php b/common/lang/jp.lang.php
index 95dc3f081..0ad0a5f63 100644
--- a/common/lang/jp.lang.php
+++ b/common/lang/jp.lang.php
@@ -258,6 +258,7 @@
$lang->confirm_move = '移動しますか？';
$lang->confirm_reset = '初期化しますか？';
$lang->confirm_leave = '退会しますか？';
+ $lang->confirm_update = 'Are you sure to update?';
$lang->column_type = 'タイプ';
$lang->column_type_list['text'] = '入力フィールド(text)';
diff --git a/common/lang/ko.lang.php b/common/lang/ko.lang.php
index 807261aa1..9c9b992d5 100644
--- a/common/lang/ko.lang.php
+++ b/common/lang/ko.lang.php
@@ -258,6 +258,7 @@
$lang->confirm_move = '이동하시겠습니까?';
$lang->confirm_reset = '초기화 하시겠습니까??';
$lang->confirm_leave = '탈퇴 하시겠습니까??';
+ $lang->confirm_update = '수정하시겠습니까?';
$lang->column_type = '형식';
$lang->column_type_list['text'] = '한줄 입력칸 (text)';
diff --git a/common/lang/mn.lang.php b/common/lang/mn.lang.php
index a6815a153..f9201826e 100644
--- a/common/lang/mn.lang.php
+++ b/common/lang/mn.lang.php
@@ -257,6 +257,7 @@
$lang->confirm_move = 'Шилжих үү?';
$lang->confirm_reset = 'Reset хийх үү?';
$lang->confirm_leave = 'Гишүүнээс гарах уу?';
+ $lang->confirm_update = 'Are you sure to update?';
$lang->column_type = 'Хэлбэр';
$lang->column_type_list['text'] = 'Нэг мөрөөр оруулах (text)';
diff --git a/common/lang/ru.lang.php b/common/lang/ru.lang.php
index 1bbd6678d..4d1308466 100644
--- a/common/lang/ru.lang.php
+++ b/common/lang/ru.lang.php
@@ -254,6 +254,7 @@
$lang->confirm_move = 'Вы подтверждаете перемещение?';
$lang->confirm_reset = 'Вы подтверждаете сброс?';
$lang->confirm_leave = 'Вы подтверждаете уход?';
+ $lang->confirm_update = 'Are you sure to update?';
$lang->column_type = 'Тип колонки';
$lang->column_type_list['text'] = 'одна строка текста';
diff --git a/common/lang/vi.lang.php b/common/lang/vi.lang.php
index 0e25acdc6..66efb2c28 100644
--- a/common/lang/vi.lang.php
+++ b/common/lang/vi.lang.php
@@ -249,6 +249,7 @@
$lang->confirm_move = 'Bạn chắc chắn muốn chuyển?';
$lang->confirm_reset = 'Bạn chắc chắn muốn thiết lập lại?';
$lang->confirm_leave = 'Bạn chắc chắn muốn từ bỏ?';
+ $lang->confirm_update = 'Are you sure to update?';
$lang->column_type = 'Định dạng cột';
$lang->column_type_list['text'] = 'Ô nhập liệu';
diff --git a/common/lang/zh-CN.lang.php b/common/lang/zh-CN.lang.php
index abb723e68..600a17c63 100644
--- a/common/lang/zh-CN.lang.php
+++ b/common/lang/zh-CN.lang.php
@@ -258,6 +258,7 @@
$lang->confirm_move = '确定要移动吗?';
$lang->confirm_reset = '确定要初始化吗?';
$lang->confirm_leave = '确定要注销吗?';
+ $lang->confirm_update = 'Are you sure to update?';
$lang->column_type = '格式';
$lang->column_type_list['text'] = '单行文本输入区(text)';
diff --git a/common/lang/zh-TW.lang.php b/common/lang/zh-TW.lang.php
index f1dc8cf8b..fc55a95fa 100644
--- a/common/lang/zh-TW.lang.php
+++ b/common/lang/zh-TW.lang.php
@@ -257,6 +257,7 @@
$lang->confirm_move = '確定要移動嗎?';
$lang->confirm_reset = '確定要重置嗎?';
$lang->confirm_leave = '確定要退出嗎?';
+ $lang->confirm_update = 'Are you sure to update?';
$lang->column_type = '格式';
$lang->column_type_list['text'] = '文字輸入(text)';
diff --git a/config/config.inc.php b/config/config.inc.php
index 393b85816..ff88c383f 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -13,7 +13,7 @@
* @brief XE의 전체 버전 표기
* 이 파일의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함
**/
- define('__ZBXE_VERSION__', '1.4.0.1');
+ define('__ZBXE_VERSION__', '1.4.0.2');
/**
* @brief zbXE가 설치된 장소의 base path를 구함
diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js
index 04b40d41e..d84c26cf8 100644
--- a/modules/admin/tpl/js/admin.js
+++ b/modules/admin/tpl/js/admin.js
@@ -88,6 +88,8 @@ jQuery(function($){
var btn = $('#search_nav button:first');
var result = $('');
+ if(inp.length == 0) return;
+
nav.after( result.hide() );
inp.keydown(function(event){
@@ -141,4 +143,4 @@ jQuery(function($){
return false;
});
-});
\ No newline at end of file
+});
diff --git a/modules/autoinstall/autoinstall.admin.controller.php b/modules/autoinstall/autoinstall.admin.controller.php
index 75226b91f..cf3ed8848 100644
--- a/modules/autoinstall/autoinstall.admin.controller.php
+++ b/modules/autoinstall/autoinstall.admin.controller.php
@@ -111,6 +111,7 @@
function procAutoinstallAdminPackageinstall()
{
+ set_time_limit(0);
$package_srls = Context::get('package_srl');
$oModel =& getModel('autoinstall');
$packages = explode(',', $package_srls);
diff --git a/modules/autoinstall/conf/info.xml b/modules/autoinstall/conf/info.xml
index ed3b709df..3a3ab04f2 100644
--- a/modules/autoinstall/conf/info.xml
+++ b/modules/autoinstall/conf/info.xml
@@ -12,7 +12,7 @@
With this module, you can install and upgrade your programs including modules, skins, layouts, etc., from www.xpressengine.com by one-click.
很方便的在管理页面一键安装XE相关模块(模块/皮肤/布局/控件/控件样式等)。
管理者モードにてクリックだけで、モジュール/スキン/レイアウト/ウィジェット/ウィジェットスタイルのインストールを可能にするモジュールです。
- 0.1
+ 0.2
2009-11-11
system
diff --git a/modules/autoinstall/queries/getPackageCount.xml b/modules/autoinstall/queries/getPackageCount.xml
index f1f3e05d0..7229e5cb1 100644
--- a/modules/autoinstall/queries/getPackageCount.xml
+++ b/modules/autoinstall/queries/getPackageCount.xml
@@ -6,6 +6,6 @@
-
+
diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php
index a8c36e029..eb505bc66 100644
--- a/modules/comment/comment.item.php
+++ b/modules/comment/comment.item.php
@@ -282,9 +282,7 @@
}
function getPermanentUrl() {
- $url = getUrl('','document_srl',$this->get('document_srl')).'#comment_'.$this->get('comment_srl');
- if(substr($url,0,1)=='/') return substr(Context::getRequestUri(),0,-1).$url;
- return $url;
+ return getFullUrl('','document_srl',$this->get('document_srl')).'#comment_'.$this->get('comment_srl');
}
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 43ea33b1d..890f53004 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -250,6 +250,7 @@
$oDB->begin();
$oModuleModel = &getModel('module');
+ if(!$obj->module_srl) $obj->module_srl = $source_obj->get('module_srl');
$module_srl = $obj->module_srl;
$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
if(!isset($document_config->use_history)) $document_config->use_history = 'N';
diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php
index ffb5a7834..b24c9f96e 100644
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@@ -64,9 +64,9 @@
foreach($drComponentList as $i => $drComponent){
unset($obj);
$obj = $this->getDrComponentXmlInfo($drComponent);
+ Context::loadLang(sprintf('%s%s/lang/',$drComponentPath,$drComponent));
$path = sprintf('%s%s/tpl/',$drComponentPath,$drComponent);
$obj->html = $oTemplate->compile($path,$drComponent);
- Context::loadLang($path.'lang/');
$drComponentInfo[$drComponent] = $obj;
}
}
diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
index 840ceae2d..fb4c39a0b 100644
--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@@ -182,15 +182,25 @@
if(!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
$logged_info = Context::get('logged_info');
if($logged_info->is_admin != 'Y') {
- $is_permitted = false;
- for($i=0;$idownload_grant);$i++) {
- $group_srl = $file_module_config->download_grant[$i];
- if($logged_info->group_list[$group_srl]) {
- $is_permitted = true;
- break;
+
+ $oModuleModel =& getModel('module');
+ $module_info = $oModuleModel->getModuleInfoByModuleSrl($file_obj->module_srl);
+
+ if(!$oModuleModel->isSiteAdmin($logged_info, $module_info->site_srl))
+ {
+ $oMemberModel =& getModel('member');
+ $member_groups = $oMemberModel->getMemberGroups($logged_info->member_srl, $module_info->site_srl);
+
+ $is_permitted = false;
+ for($i=0;$idownload_grant);$i++) {
+ $group_srl = $file_module_config->download_grant[$i];
+ if($member_groups[$group_srl]) {
+ $is_permitted = true;
+ break;
+ }
}
+ if(!$is_permitted) return $this->stop('msg_not_permitted_download');
}
- if(!$is_permitted) return $this->stop('msg_not_permitted_download');
}
}
diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php
index 01a1a4720..21ee4dbf6 100644
--- a/modules/install/install.admin.controller.php
+++ b/modules/install/install.admin.controller.php
@@ -126,6 +126,7 @@
$ftp_info = Context::getFTPInfo();
$ftp_info->ftp_user = Context::get('ftp_user');
$ftp_info->ftp_port = Context::get('ftp_port');
+ $ftp_info->ftp_host = Context::Get('ftp_host');
$ftp_info->sftp = Context::get('sftp');
$ftp_info->ftp_root_path = Context::get('ftp_root_path');
if(ini_get('safe_mode')) {
diff --git a/modules/integration_search/integration_search.model.php b/modules/integration_search/integration_search.model.php
index 025674490..931b414fc 100644
--- a/modules/integration_search/integration_search.model.php
+++ b/modules/integration_search/integration_search.model.php
@@ -28,6 +28,7 @@
$args->search_keyword = $search_keyword;
$args->sort_index = 'list_order';
$args->order_type = 'asc';
+ if(!$args->module_srl) unset($args->module_srl);
// 대상 문서들을 가져옴
$oDocumentModel = &getModel('document');
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index 7a3d094f0..df5602383 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -1033,13 +1033,21 @@
/**
* @brief site_module_info의 관리자 인지 체크
**/
- function isSiteAdmin($member_info) {
+ function isSiteAdmin($member_info, $site_srl = null) {
if(!$member_info->member_srl) return false;
if($member_info->is_admin == 'Y') return true;
- $site_module_info = Context::get('site_module_info');
- if(!$site_module_info) return;
- $args->site_srl = $site_module_info->site_srl;
+ if(!isset($site_srl))
+ {
+ $site_module_info = Context::get('site_module_info');
+ if(!$site_module_info) return;
+ $args->site_srl = $site_module_info->site_srl;
+ }
+ else
+ {
+ $args->site_srl = $site_srl;
+ }
+
$args->member_srl = $member_info->member_srl;
$output = executeQuery('module.isSiteAdmin', $args);
if($output->data->member_srl == $args->member_srl) return true;
diff --git a/modules/page/page.admin.controller.php b/modules/page/page.admin.controller.php
index e582d7c8c..da970124a 100644
--- a/modules/page/page.admin.controller.php
+++ b/modules/page/page.admin.controller.php
@@ -60,6 +60,7 @@
// 페이지의 원 정보를 구해옴
$oModuleModel = &getModel('module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+ if(!isset($content)) $content ='';
$module_info->content = $content;
// module 모듈의 controller 객체 생성