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

copy sandbox to trunk

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7234 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
haneul 2010-01-22 06:56:46 +00:00
commit 510e7a4fb9
24 changed files with 53 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
common/lang/en.lang.php
View file

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

1
common/lang/es.lang.php
View file

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

1
common/lang/fr.lang.php
View file

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

1
common/lang/ge.lang.php
View file

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

1
common/lang/jp.lang.php
View file

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

1
common/lang/ko.lang.php
View file

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

1
common/lang/mn.lang.php
View file

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

1
common/lang/ru.lang.php
View file

@ -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'] = 'одна строка текста';

1
common/lang/vi.lang.php
View file

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

1
common/lang/zh-CN.lang.php
View file

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

1
common/lang/zh-TW.lang.php
View file

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

2
config/config.inc.php
View file

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

4
modules/admin/tpl/js/admin.js
View file

@ -88,6 +88,8 @@ jQuery(function($){
var btn = $('#search_nav button:first');
var result = $('<ul class="_result" />');
if(inp.length == 0) return;
nav.after( result.hide() );
inp.keydown(function(event){
@ -141,4 +143,4 @@ jQuery(function($){
return false;
});
});
});

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

@ -111,6 +111,7 @@
function procAutoinstallAdminPackageinstall()
{
set_time_limit(0);
$package_srls = Context::get('package_srl');
$oModel =& getModel('autoinstall');
$packages = explode(',', $package_srls);

2
modules/autoinstall/conf/info.xml
View file

@ -12,7 +12,7 @@
<description xml:lang="zh-TW">With this module, you can install and upgrade your programs including modules, skins, layouts, etc., from www.xpressengine.com by one-click.</description>
<description xml:lang="zh-CN">很方便的在管理页面一键安装XE相关模块(模块/皮肤/布局/控件/控件样式等)。</description>
<description xml:lang="jp">管理者モードにてクリックだけで、モジュール/スキン/レイアウト/ウィジェット/ウィジェットスタイルのインストールを可能にするモジュールです。</description>
<version>0.1</version>
<version>0.2</version>
<date>2009-11-11</date>
<category>system</category>
<author email_address="haneul0318@gmail.com" link="http://www.seungyeop.kr">

2
modules/autoinstall/queries/getPackageCount.xml
View file

@ -6,6 +6,6 @@
<column name="count(*)" alias="count" />
</columns>
<conditions>
<condition operation="equal" column="category_srl" var="category_srl" filter="number" notnull="notnull" />
<condition operation="equal" column="category_srl" var="category_srl" filter="number" />
</conditions>
</query>

4
modules/comment/comment.item.php
View file

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

1
modules/document/document.controller.php
View file

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

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

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

24
modules/file/file.controller.php
View file

@ -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;$i<count($file_module_config->download_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;$i<count($file_module_config->download_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');
}
}

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

@ -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')) {

1
modules/integration_search/integration_search.model.php
View file

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

16
modules/module/module.model.php
View file

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

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

@ -60,6 +60,7 @@
// 페이지의 원 정보를 구해옴
$oModuleModel = &getModel('module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
if(!isset($content)) $content ='';
$module_info->content = $content;
// module 모듈의 controller 객체 생성