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

bug fix

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5103 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2008-12-17 05:28:25 +00:00
parent 7cbc482c25
commit cf91699c4f
17 changed files with 101 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/document/document.class.php
View file

@ -224,7 +224,7 @@
if($logged_info->is_admin=='Y') return true;
$actions = array('procDocumentAdminAddCart','dispDocumentAdminManageDocument','procDocumentAdminManageCheckedDocument');
if(!in_array($this->act, $actions)) return false;
if(in_array($this->act, $actions)) return true;
$oModuleModel = &getModel('module');
if($oModuleModel->isSiteAdmin()) return true;

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

@ -330,7 +330,7 @@
$target_args->document_srls = implode(',',$target_srls);
$target_args->list_order = $args->sort_index;
$target_args->order = $args->order_type;
$target_args->order_type = $args->order_type;
$target_args->list_count = $args->list_count;
$target_args->page = 1;
$output = executeQueryArray('document.getDocuments', $target_args);

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

@ -14,7 +14,7 @@
<condition operation="like" column="tags.tag" var="s_tags" notnull="notnull" pipe="and" />
</conditions>
<navigation>
<index var="sort_index" default="documents.list_order" order="asc" />
<index var="sort_index" default="documents.list_order" order="order_type" />
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />

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

@ -9,7 +9,7 @@
<condition operation="in" column="document_srl" var="document_srls" notnull="notnull" />
</conditions>
<navigation>
<index var="list_order" default="list_order" order="asc" />
<index var="list_order" default="list_order" order="order_type" />
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />

4
modules/document/tpl/checked_list.html
View file

@ -63,8 +63,12 @@
<div id="popFooter">
<div class="tRight gap1">
<!--@if(count($document_list))-->
<!--@if($logged_info->is_admin=='Y')-->
<a href="#" onclick="doManageDocument('move');return false;" class="button"><span>{$lang->cmd_move}</span></a>
<a href="#" onclick="doManageDocument('copy');return false;" class="button"><span>{$lang->cmd_copy}</span></a>
<!--@end-->
<a href="#" onclick="doManageDocument('delete');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
<!--@end-->
<a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>

47
modules/editor/tpl/editor_module_config.html
View file

@ -14,7 +14,7 @@
</tr>
</thead>
<tbody>
<tr class="row2">
<tr>
<th rowspan="2"><div>{$lang->editor_skin}</div></th>
<td>
<select name="editor_skin" onchange="getEditorSkinColorList(this.value)">
@ -44,71 +44,102 @@
<tr>
<td colspan="2"><p>{$lang->about_editor_skin}</p></td>
</tr>
<tr class="row2">
<tr>
<th rowspan="2"><div>{$lang->enable_html_grant}</div></th>
<td>
<!--@foreach($group_list as $k => $v)-->
<input type="checkbox" name="enable_html_grant" value="{$k}" id="enable_html_{$k}" <!--@if(in_array($k, $editor_config->enable_html_grant))-->checked="checked"<!--@end-->/> <label for="enable_html_{$k}">{$v->title}</label> <br />
<!--@end-->
<span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_html_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
<span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_html_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
</td>
<td>
<!--@foreach($group_list as $k => $v)-->
<input type="checkbox" name="enable_comment_html_grant" value="{$k}" id="enable_comment_html_{$k}" <!--@if(in_array($k, $editor_config->enable_comment_html_grant))-->checked="checked"<!--@end-->/> <label for="enable_comment_html_{$k}">{$v->title}</label> <br />
<!--@end-->
<span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_html_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
<span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_html_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
</td>
</tr>
<tr>
<td colspan="2"><p>{$lang->about_enable_html_grant}</p></td>
</tr>
<tr class="row2">
<tr>
<th rowspan="2"><div>{$lang->upload_file_grant}</div></th>
<td>
<!--@foreach($group_list as $k => $v)-->
<input type="checkbox" name="upload_file_grant" value="{$k}" id="fileupload_{$k}" <!--@if(in_array($k, $editor_config->upload_file_grant))-->checked="checked"<!--@end-->/> <label for="fileupload_{$k}">{$v->title}</label> <br />
<!--@end-->
<span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('upload_file_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
<span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('upload_file_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
</td>
<td>
<!--@foreach($group_list as $k => $v)-->
<input type="checkbox" name="comment_upload_file_grant" value="{$k}" id="comment_fileupload_{$k}" <!--@if(in_array($k, $editor_config->comment_upload_file_grant))-->checked="checked"<!--@end-->/> <label for="comment_fileupload_{$k}">{$v->title}</label> <br />
<!--@end-->
<span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('comment_upload_file_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
<span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('comment_upload_file_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
</td>
</tr>
<tr>
<td colspan="2"><p>{$lang->about_upload_file_grant}</p></td>
</tr>
<tr class="row2">
<tr>
<th rowspan="2"><div>{$lang->enable_default_component_grant}</div></th>
<td>
<!--@foreach($group_list as $k => $v)-->
<input type="checkbox" name="enable_default_component_grant" value="{$k}" id="default_componen_{$k}" <!--@if(in_array($k, $editor_config->enable_default_component_grant))-->checked="checked"<!--@end-->/> <label for="default_componen_{$k}">{$v->title}</label> <br />
<!--@end-->
<span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_default_component_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
<span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_default_component_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
</td>
<td>
<!--@foreach($group_list as $k => $v)-->
<input type="checkbox" name="enable_comment_default_component_grant" value="{$k}" id="comment_default_component_{$k}" <!--@if(in_array($k, $editor_config->enable_comment_default_component_grant))-->checked="checked"<!--@end-->/> <label for="comment_default_component_{$k}">{$v->title}</label> <br />
<!--@end-->
<span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_default_component_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
<span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_default_component_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
</td>
</tr>
<tr>
<td colspan="2"><p>{$lang->about_default_component_grant}</p></td>
</tr>
<tr class="row2">
<tr>
<th rowspan="2"><div>{$lang->enable_component_grant}</div></th>
<td>
<!--@foreach($group_list as $k => $v)-->
<input type="checkbox" name="enable_component_grant" value="{$k}" id="componen_{$k}" <!--@if(in_array($k, $editor_config->enable_component_grant))-->checked="checked"<!--@end-->/> <label for="componen_{$k}">{$v->title}</label> <br />
<!--@end-->
<span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_component_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
<span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_component_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
</td>
<td>
<!--@foreach($group_list as $k => $v)-->
<input type="checkbox" name="enable_comment_component_grant" value="{$k}" id="comment_component_{$k}" <!--@if(in_array($k, $editor_config->enable_comment_component_grant))-->checked="checked"<!--@end-->/> <label for="comment_component_{$k}">{$v->title}</label> <br />
<!--@end-->
<span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_component_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
<span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_component_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
</td>
</tr>
<tr>
<td colspan="2"><p>{$lang->about_component_grant}</p></td>
</tr>
<tr class="row2">
<tr>
<th rowspan="2"><div>{$lang->editor_height}</div></th>
<td>
<input type="text" name="editor_height" value="{$editor_config->editor_height}" class="inputTypeText w80" />px
@ -120,14 +151,14 @@
<tr>
<td colspan="2"><p>{$lang->about_editor_height}</p></td>
</tr>
<tr class="row2">
<tr>
<th rowspan="2"><div>{$lang->enable_autosave}</div></th>
<td colspan="2"><input type="checkbox" value="Y" name="enable_autosave" <!--@if($editor_config->enable_autosave=='Y')-->checked="checked"<!--@end-->/></td>
</tr>
<tr>
<td colspan="2"><p>{$lang->about_enable_autosave}</p></td>
</tr>
<tr class="row2">
<tr>
<td class="right" colspan="3">
<span class="button"><input type="submit" value="{$lang->cmd_save}"/></span>
</td>

4
modules/member/lang/en.lang.php
View file

@ -73,7 +73,11 @@
'nick_name' => 'Nickname',
'email_address' => 'Email Address',
'regdate' => 'Join Date',
'regdate_more' => '가입일시(이상)',
'regdate_less' => '가입일시(이하)',
'last_login' => 'Last Login Date',
'last_login_more' => '최근로그인일시(이상)',
'last_login_less' => '최근로그인일시(이하)',
'extra_vars' => 'Extra Vars',
);

4
modules/member/lang/es.lang.php
View file

@ -72,7 +72,11 @@
'nick_name' => 'Apodo',
'email_address' => 'Dirección de Email',
'regdate' => 'Fecha del registro',
'regdate_more' => '가입일시(이상)',
'regdate_less' => '가입일시(이하)',
'last_login' => 'Fecha de su última conección',
'last_login_more' => '최근로그인일시(이상)',
'last_login_less' => '최근로그인일시(이하)',
'extra_vars' => 'Variables Extra',
);

4
modules/member/lang/fr.lang.php
View file

@ -73,7 +73,11 @@
'nick_name' => 'Surnom',
'email_address' => 'Mél',
'regdate' => 'Jour d\'Inscription',
'regdate_more' => '가입일시(이상)',
'regdate_less' => '가입일시(이하)',
'last_login' => 'Jour de la connexion dernière',
'last_login_more' => '최근로그인일시(이상)',
'last_login_less' => '최근로그인일시(이하)',
'extra_vars' => 'Variables additionnels ',
);

4
modules/member/lang/jp.lang.php
View file

@ -73,7 +73,11 @@
'nick_name' => 'ニックネーム',
'email_address' => 'メールアドレス',
'regdate' => '加入日',
'regdate_more' => '가입일시(이상)',
'regdate_less' => '가입일시(이하)',
'last_login' => '最近のログイン',
'last_login_more' => '최근로그인일시(이상)',
'last_login_less' => '최근로그인일시(이하)',
'extra_vars' => '拡張変数',
);

4
modules/member/lang/ko.lang.php
View file

@ -73,7 +73,11 @@
'nick_name' => '닉네임',
'email_address' => '메일주소',
'regdate' => '가입일시',
'regdate_more' => '가입일시(이상)',
'regdate_less' => '가입일시(이하)',
'last_login' => '최근로그인일시',
'last_login_more' => '최근로그인일시(이상)',
'last_login_less' => '최근로그인일시(이하)',
'extra_vars' => '확장변수',
);

4
modules/member/lang/ru.lang.php
View file

@ -71,7 +71,11 @@
'nick_name' => 'Ник',
'email_address' => 'Email',
'regdate' => 'Дата регистрации',
'regdate_more' => '가입일시(이상)',
'regdate_less' => '가입일시(이하)',
'last_login' => 'Дата последнего входа',
'last_login_more' => '최근로그인일시(이상)',
'last_login_less' => '최근로그인일시(이하)',
'extra_vars' => 'Экстра перем.',
);

4
modules/member/lang/zh-CN.lang.php
View file

@ -73,7 +73,11 @@
'nick_name' => '昵称',
'email_address' => '邮箱地址',
'regdate' => '注册日期',
'regdate_more' => '가입일시(이상)',
'regdate_less' => '가입일시(이하)',
'last_login' => '最近登录',
'last_login_more' => '최근로그인일시(이상)',
'last_login_less' => '최근로그인일시(이하)',
'extra_vars' => '扩展变数',
);

4
modules/member/lang/zh-TW.lang.php
View file

@ -73,7 +73,11 @@
'nick_name' => '暱稱',
'email_address' => '郵件地址',
'regdate' => '註冊日期',
'regdate_more' => '가입일시(이상)',
'regdate_less' => '가입일시(이하)',
'last_login' => '最近登入',
'last_login_more' => '최근로그인일시(이상)',
'last_login_less' => '최근로그인일시(이하)',
'extra_vars' => '延伸變數',
);

16
modules/member/member.admin.model.php
View file

@ -51,13 +51,25 @@
$args->s_email_address = $search_keyword;
break;
case 'regdate' :
$args->s_regdate = $search_keyword;
$args->s_regdate = ereg_replace("[^0-9]","",$search_keyword);
break;
case 'regdate_more' :
$args->s_regdate_more = substr(ereg_replace("[^0-9]","",$search_keyword) . '00000000000000',0,14);
break;
case 'regdate_less' :
$args->s_regdate_less = substr(ereg_replace("[^0-9]","",$search_keyword) . '00000000000000',0,14);
break;
case 'last_login' :
$args->s_last_login = $search_keyword;
break;
case 'last_login_more' :
$args->s_last_login_more = substr(ereg_replace("[^0-9]","",$search_keyword) . '00000000000000',0,14);
break;
case 'last_login_less' :
$args->s_last_login_less = substr(ereg_replace("[^0-9]","",$search_keyword) . '00000000000000',0,14);
break;
case 'extra_vars' :
$args->s_extra_vars = $search_keyword;
$args->s_extra_vars = ereg_replace("[^0-9]","",$search_keyword);
break;
}
}

4
modules/member/queries/getMemberList.xml
View file

@ -16,6 +16,10 @@
<condition operation="like" column="extra_vars" var="s_extra_vars" pipe="or" />
<condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
<condition operation="like_prefix" column="last_login" var="s_last_login" pipe="or" />
<condition operation="more" column="member.regdate" var="s_regdate_more" pipe="or" />
<condition operation="less" column="member.regdate" var="s_regdate_less" pipe="or" />
<condition operation="more" column="member.last_login" var="s_last_login_more" pipe="or" />
<condition operation="less" column="member.last_login" var="s_last_login_less" pipe="or" />
</group>
</conditions>
<navigation>

4
modules/member/queries/getMemberListWithinGroup.xml
View file

@ -19,6 +19,10 @@
<condition operation="like" column="extra_vars" var="s_extra_vars" pipe="or" />
<condition operation="like_prefix" column="member.regdate" var="s_regdate" pipe="or" />
<condition operation="like_prefix" column="member.last_login" var="s_last_login" pipe="or" />
<condition operation="more" column="member.regdate" var="s_regdate_more" pipe="or" />
<condition operation="less" column="member.regdate" var="s_regdate_less" pipe="or" />
<condition operation="more" column="member.last_login" var="s_last_login_more" pipe="or" />
<condition operation="less" column="member.last_login" var="s_last_login_less" pipe="or" />
</group>
</conditions>
<navigation>