From ea84468e7d18d117204890624966bf1d538f9779 Mon Sep 17 00:00:00 2001 From: ovclas Date: Mon, 14 May 2012 08:04:10 +0000 Subject: [PATCH] merge from 1.5.2.5 ( ~ r10673) git-svn-id: http://xe-core.googlecode.com/svn/trunk@10674 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- addons/adminlogging/conf/info.xml | 4 + addons/captcha/lang/lang.xml | 6 +- addons/mobile/lang/lang.xml | 3 + common/lang/lang.xml | 36 +++++- config/config.inc.php | 2 +- .../colorCode/js/jquery.ba-resize.min.js | 9 -- m.layouts/colorCode/js/layout.js | 15 +-- m.layouts/colorCode/layout.html | 1 - modules/addon/conf/module.xml | 2 +- modules/addon/lang/lang.xml | 5 + modules/admin/conf/module.xml | 8 +- modules/admin/lang/lang.xml | 108 ++++++++++++++++-- modules/document/document.model.php | 2 +- modules/document/queries/deleteDocument.xml | 3 +- .../queries/getDocumentDivisionUseIndex.xml | 4 +- .../queries/getDocumentListUseIndex.xml | 4 +- modules/document/queries/insertDocument.xml | 3 +- modules/document/queries/updateDocument.xml | 3 +- modules/install/install.admin.controller.php | 4 + 19 files changed, 173 insertions(+), 49 deletions(-) delete mode 100644 m.layouts/colorCode/js/jquery.ba-resize.min.js diff --git a/addons/adminlogging/conf/info.xml b/addons/adminlogging/conf/info.xml index fa5bf4613..b27e706ab 100644 --- a/addons/adminlogging/conf/info.xml +++ b/addons/adminlogging/conf/info.xml @@ -2,10 +2,14 @@ 어드민 메뉴 접근 로깅 admin menu access logging + 后台访问日志 管理選單訪問日誌 admin menu에 접근한 기록을 로깅하는 애드온입니다. + + 后台访问以及登陆日志。 + 管理選單訪問紀錄及登入日誌。 diff --git a/addons/captcha/lang/lang.xml b/addons/captcha/lang/lang.xml index d78bdd578..df7cdae22 100644 --- a/addons/captcha/lang/lang.xml +++ b/addons/captcha/lang/lang.xml @@ -4,24 +4,28 @@ + + - + + + \ No newline at end of file diff --git a/addons/mobile/lang/lang.xml b/addons/mobile/lang/lang.xml index fab31405b..202e0d626 100644 --- a/addons/mobile/lang/lang.xml +++ b/addons/mobile/lang/lang.xml @@ -4,6 +4,7 @@ + @@ -12,6 +13,7 @@ + @@ -20,6 +22,7 @@ + diff --git a/common/lang/lang.xml b/common/lang/lang.xml index 34c7ccaae..59598bf1e 100644 --- a/common/lang/lang.xml +++ b/common/lang/lang.xml @@ -88,6 +88,7 @@ + @@ -868,18 +869,21 @@ + + + @@ -914,6 +918,7 @@ + @@ -921,6 +926,7 @@ + @@ -928,6 +934,7 @@ + @@ -1137,6 +1144,7 @@ + @@ -1278,6 +1286,7 @@ + @@ -1771,6 +1780,7 @@ + @@ -1917,6 +1927,7 @@ + @@ -2188,6 +2199,7 @@ + @@ -2195,6 +2207,7 @@ + @@ -2243,6 +2256,7 @@ + @@ -2772,6 +2786,7 @@ Xin vui lòng kiểm tra lại thông tin Database.]]> + @@ -2803,16 +2818,19 @@ Xin vui lòng kiểm tra lại thông tin Database.]]> + - + + + @@ -2980,6 +2998,7 @@ Xin vui lòng kiểm tra lại thông tin Database.]]> + @@ -3459,6 +3478,7 @@ Xin vui lòng kiểm tra lại thông tin Database.]]> + @@ -3536,6 +3556,7 @@ Xin vui lòng kiểm tra lại thông tin Database.]]> + @@ -3593,6 +3614,7 @@ Xin vui lòng kiểm tra lại thông tin Database.]]> + @@ -3637,53 +3659,61 @@ Xin vui lòng kiểm tra lại thông tin Database.]]> + - + + + + + + + + @@ -3714,10 +3744,12 @@ Xin vui lòng kiểm tra lại thông tin Database.]]> + + diff --git a/config/config.inc.php b/config/config.inc.php index ae4b54485..7d40acd2c 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -13,7 +13,7 @@ * @brief display XE's full version * Even The file should be revised when releasing altough no change is made **/ - define('__XE_VERSION__', '1.5.2.4'); + define('__XE_VERSION__', '1.5.2.5'); define('__ZBXE_VERSION__', __XE_VERSION__); // deprecated : __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead. /** diff --git a/m.layouts/colorCode/js/jquery.ba-resize.min.js b/m.layouts/colorCode/js/jquery.ba-resize.min.js deleted file mode 100644 index c67888314..000000000 --- a/m.layouts/colorCode/js/jquery.ba-resize.min.js +++ /dev/null @@ -1,9 +0,0 @@ -/* - * jQuery resize event - v1.1 - 3/14/2010 - * http://benalman.com/projects/jquery-resize-plugin/ - * - * Copyright (c) 2010 "Cowboy" Ben Alman - * Dual licensed under the MIT and GPL licenses. - * http://benalman.com/about/license/ - */ -(function($,h,c){var a=$([]),e=$.resize=$.extend($.resize,{}),i,k="setTimeout",j="resize",d=j+"-special-event",b="delay",f="throttleWindow";e[b]=250;e[f]=true;$.event.special[j]={setup:function(){if(!e[f]&&this[k]){return false}var l=$(this);a=a.add(l);$.data(this,d,{w:l.width(),h:l.height()});if(a.length===1){g()}},teardown:function(){if(!e[f]&&this[k]){return false}var l=$(this);a=a.not(l);l.removeData(d);if(!a.length){clearTimeout(i)}},add:function(l){if(!e[f]&&this[k]){return false}var n;function m(s,o,p){var q=$(this),r=$.data(this,d);r.w=o!==c?o:q.width();r.h=p!==c?p:q.height();n.apply(this,arguments)}if($.isFunction(l)){n=l;return m}else{n=l.handler;l.handler=m}}};function g(){i=h[k](function(){a.each(function(){var n=$(this),m=n.width(),l=n.height(),o=$.data(this,d);if(m!==o.w||l!==o.h){n.trigger(j,[o.w=m,o.h=l])}});g()},e[b])}})(jQuery,this); \ No newline at end of file diff --git a/m.layouts/colorCode/js/layout.js b/m.layouts/colorCode/js/layout.js index 21a248f15..0217af739 100644 --- a/m.layouts/colorCode/js/layout.js +++ b/m.layouts/colorCode/js/layout.js @@ -9,18 +9,5 @@ jQuery(function($){ lang.removeClass('off').addClass('on'); lang_lst.show(); } - }) - var lo_foot = $('.lo_foot'); - var lo_head = $('.lo_head'); - var ct = $('.ct'); - function footPosition(){ - if((lo_head.outerHeight() + ct.outerHeight() + 71) > $(window).height()){ - lo_foot.removeClass('fixed').addClass('static'); - }else if((lo_head.outerHeight() + ct.outerHeight() + 71) < $(window).height()){ - lo_foot.removeClass('static').addClass('fixed'); - } - } - footPosition(); - ct.resize(footPosition); - + }) }); // end of ready \ No newline at end of file diff --git a/m.layouts/colorCode/layout.html b/m.layouts/colorCode/layout.html index 4e8450e8d..8453dd6c8 100644 --- a/m.layouts/colorCode/layout.html +++ b/m.layouts/colorCode/layout.html @@ -5,7 +5,6 @@ -
diff --git a/modules/addon/conf/module.xml b/modules/addon/conf/module.xml index 4bfa9b81b..410c8f3e6 100644 --- a/modules/addon/conf/module.xml +++ b/modules/addon/conf/module.xml @@ -16,7 +16,7 @@ Add-ons 설치된 애드온 - Add-ons + 插件 Add-ons Add-ons Add-ons diff --git a/modules/addon/lang/lang.xml b/modules/addon/lang/lang.xml index 570cef5f3..9482b75d8 100644 --- a/modules/addon/lang/lang.xml +++ b/modules/addon/lang/lang.xml @@ -84,30 +84,35 @@ + + + + + diff --git a/modules/admin/conf/module.xml b/modules/admin/conf/module.xml index 3d0e14120..5dcb8be1d 100644 --- a/modules/admin/conf/module.xml +++ b/modules/admin/conf/module.xml @@ -26,7 +26,7 @@ General 일반 - General + 总览 General General General @@ -39,7 +39,7 @@ Admin Setup 관리자 설정 - Admin Setup + 后台设置 Admin Setup Admin Setup Admin Setup @@ -52,7 +52,7 @@ FTP Configuration FTP 설정 - FTP Configuration + FTP 配置 FTP Configuration FTP Configuration FTP Configuration @@ -65,7 +65,7 @@ Theme 테마 - Theme + 主题 Theme Theme Theme diff --git a/modules/admin/lang/lang.xml b/modules/admin/lang/lang.xml index 90ff6bc64..cbf4de897 100644 --- a/modules/admin/lang/lang.xml +++ b/modules/admin/lang/lang.xml @@ -4,46 +4,55 @@ + + + + + + + + + @@ -216,36 +225,43 @@ + + + + + + + @@ -564,6 +580,7 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]> + @@ -573,6 +590,7 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]> + @@ -582,24 +600,29 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]> + + + + + @@ -698,6 +721,7 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]> + @@ -740,14 +764,17 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]> + + + @@ -771,6 +798,7 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]> + @@ -778,6 +806,7 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]> + @@ -797,91 +826,110 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]> + + + + + + + + + + + + + 관리자 페이지에서는 수행되지 않습니다.]]> Manager page does not work.]]> + 页面管理将无效.]]> + + + + IP대역 정보는 /files/config/db.config.php 파일에 저장됩니다.
여러개의 항목은 줄을 바꾸어 입력하세요.]]> The information on IP address band is stored in /files/config/db.config.php.
Change the line to multiple IP.]]> 　　IP帯域情報は、/files/config/db.config.php ファイルに保存されます。
Change the line to multiple IP.]]> + IP信息将保存在 /files/config/db.config.php.
每行一个IP。]]> The information on FTP is stored in files/config/ftp.config.php.
If you are unable to easy install, PHP's 'safe_mode' must be changed 'On' ]]> + FTP的信息保存在 /files/config/ftp.config.php.
如果不启用快捷安装，请务必将开启PHP安全模式]]> + *.ico 파일만 업로드 가능.]]> *.ico file only.]]> *.ico ファイルのみ登録できます。]]> + *.ico文件.]]> + *.png 파일만 업로드 가능.]]> *.png file only.]]> *.png ファイルのみ登録できます。]]> + *.png文件.]]> + + + + + + + + + + + + + + -　　　　 - +　　 + + + + + + + + + + + + + + + + + + + + + - + + - + + - + + - + + @@ -1182,11 +1273,13 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]> + files/config/ftp.config.php 파일에 저장 됩니다. 설치 후 환경설정 페이지에서도 등록, 변경, 제거 할 수 있습니다.]]> files/config/ftp.config.php. You can add, change or delete this on the Settings page after the installation.]]> + files/config/ftp.config.php里面。你可以安装后在设置页面里面增加、修改或者删除该信息。]]> files/config/ftp.config.php 檔案中。 安裝後可在設定頁面中新增、更改或刪除此資訊。]]> files/config/ftp.config.php gespeichert. Nach der Installation ist es auch möglich, dass die Angabe von Administrator modifiziert oder gelöscht werden kann.]]> @@ -1194,7 +1287,7 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]> - + @@ -1279,5 +1372,6 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]> + diff --git a/modules/document/document.model.php b/modules/document/document.model.php index 0e2f19e09..cd98e0612 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -252,7 +252,7 @@ $division = (int)Context::get('division'); // order by list_order and (module_srl===0 or module_srl many count), therefore case table full scan - if($args->sort_index == 'list_order' && ((int)$args->exclude_module_srl === 0 || count($args->module_srl) > 10)) + if($args->sort_index == 'list_order' && ($args->exclude_module_srl === '0' || count(explode(',', $args->module_srl)) > 5)) { $listSqlID = 'document.getDocumentListUseIndex'; $divisionSqlID = 'document.getDocumentDivisionUseIndex'; diff --git a/modules/document/queries/deleteDocument.xml b/modules/document/queries/deleteDocument.xml index cc32e7a90..a4f567820 100644 --- a/modules/document/queries/deleteDocument.xml +++ b/modules/document/queries/deleteDocument.xml @@ -1,8 +1,7 @@ - + - diff --git a/modules/document/queries/getDocumentDivisionUseIndex.xml b/modules/document/queries/getDocumentDivisionUseIndex.xml index 7f341f11e..b43361feb 100644 --- a/modules/document/queries/getDocumentDivisionUseIndex.xml +++ b/modules/document/queries/getDocumentDivisionUseIndex.xml @@ -5,7 +5,9 @@ - + + + diff --git a/modules/document/queries/getDocumentListUseIndex.xml b/modules/document/queries/getDocumentListUseIndex.xml index d80b3b280..be456edaf 100644 --- a/modules/document/queries/getDocumentListUseIndex.xml +++ b/modules/document/queries/getDocumentListUseIndex.xml @@ -5,7 +5,9 @@ - + + + diff --git a/modules/document/queries/insertDocument.xml b/modules/document/queries/insertDocument.xml index c7d537ebe..5f585de6d 100644 --- a/modules/document/queries/insertDocument.xml +++ b/modules/document/queries/insertDocument.xml @@ -1,8 +1,7 @@ - +
- diff --git a/modules/document/queries/updateDocument.xml b/modules/document/queries/updateDocument.xml index 47411ad8b..46f7e0409 100644 --- a/modules/document/queries/updateDocument.xml +++ b/modules/document/queries/updateDocument.xml @@ -1,8 +1,7 @@ - +
- diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index b96c1d93a..6eb8dbfff 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -146,6 +146,10 @@ $buff = ' $val) { if(!$val) continue; + if(preg_match('/(<\?|<\?php|\?>)/xsm', preg_replace('/\s/', '', $val))) + { + continue; + } $buff .= sprintf("\$ftp_info->%s = '%s';\n", $key, str_replace("'","\\'",$val)); } $buff .= "?>";