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

merge from 1.5.2.1

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10466 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-03-23 05:49:16 +00:00
parent c727926d9e
commit 9bf08cf3df
26 changed files with 110 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

27
modules/admin/tpl/index.html
View file

@ -1,7 +1,4 @@
<!--#include("./_spHeader.html")-->
<include target="./_spHeader.html" />
<div class="content dashboard" id="content">
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
@ -28,7 +25,7 @@
<!--@if($value->need_install)-->
<li style="margin:0 0 4px 0;">{$value->module} - <span class="btn"><button type="button" onclick="doInstallModule('{$value->module}')">{$lang->cmd_create_db_table}</button></span></li>
<!--@else if($value->need_update)-->
<li style="margin:0 0 4px 0;">{$value->module} - <span class="btn"><button type="button" onclick="doUpdateModule('{$value->module}')">{$lang->cmd_module_update}</button></li>
<li style="margin:0 0 4px 0;">{$value->module} - <span class="btn"><button type="button" onclick="doUpdateModule('{$value->module}')">{$lang->cmd_module_update}</button></span></li>
<!--@end-->
<!--@end-->
</ul>
@ -52,16 +49,14 @@
{@$document = $value->variables}
<li>
<a href="{getUrl('', 'document_srl', $document['document_srl'])}" target="_blank"><!--@if(trim($value->getTitle()))-->{$value->getTitle()}<!--@else--><strong>{$lang->no_title_document}</strong><!--@end--></a> <span class="side">{$document['nick_name']}</span>
<span class="action">
<form>
<form class="action">
<input type="hidden" name="module" value="admin" />
<input type="hidden" name="act" value="procDocumentManageCheckedDocument" />
<input type="hidden" name="cart[]" value="{$document['document_srl']}" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin')}" />
<button type="submit" name="type" value="trash" class="text">{$lang->cmd_trash}</button>
<button type="submit" name="type" value="delete" class="text">{$lang->cmd_delete}</button>
</form>
</span>
</form>
</li>
<!--@end-->
<li cond="!is_array($latestDocumentList) || count($latestDocumentList) < 1">{$lang->no_data}</li>
@ -73,16 +68,14 @@
<!--@foreach($latestCommentList AS $key=>$value)-->
<li>
<a href="{getUrl('', 'document_srl', $value->document_srl)}#comment_{$value->comment_srl}" target="_blank"><!--@if(trim($value->content))-->{$value->getSummary()}<!--@else--><strong>{$lang->no_text_comment}</strong><!--@end--></a> <span class="side">{$value->nick_name}</span>
<span class="action">
<form>
<form class="action">
<input type="hidden" name="module" value="admin" />
<input type="hidden" name="act" value="procCommentAdminDeleteChecked" />
<input type="hidden" name="cart[]" value="{$value->comment_srl}" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin')}" />
<button type="submit" name="is_trash" value="true" class="text">{$lang->cmd_trash}</button>
<button type="submit" name="is_trash" value="false" class="text">{$lang->cmd_delete}</button>
</form>
</span>
</form>
</li>
<!--@end-->
<li cond="!is_array($latestCommentList) || count($latestCommentList) < 1">{$lang->no_data}</li>
@ -94,15 +87,13 @@
<!--@foreach($latestTrackbackList AS $key=>$value)-->
<li>
<a href="{$value->url}" target="_blank">{$value->title}</a> <span class="side">{$value->blog_name}</span>
<span class="action">
<form>
<form class="action">
<input type="hidden" name="module" value="admin" />
<input type="hidden" name="act" value="procTrackbackAdminDeleteChecked" />
<input type="hidden" name="cart[]" value="{$value->trackback_srl}" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin')}" />
<button type="submit" class="text">{$lang->cmd_delete}</button>
</form>
</span>
</form>
</li>
<!--@end-->
<li cond="!is_array($latestTrackbackList) || count($latestTrackbackList) < 1">{$lang->no_data}</li>
@ -110,4 +101,4 @@
</div>
</div>
</div>
<!--#include("./_spFooter.html")-->
<include target="./_spFooter.html" />

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

@ -166,7 +166,7 @@ class documentController extends document {
// Set to 0 if the category_srl doesn't exist
if($obj->category_srl) {
$category_list = $oDocumentModel->getCategoryList($obj->module_srl);
if(!$category_list[$obj->category_srl]->grant)
if(count($category_list) > 0 && !$category_list[$obj->category_srl]->grant)
{
return new Object(-1, 'msg_not_permitted');
}

2
modules/editor/skins/xpresseditor/css/default.css
View file

@ -32,7 +32,7 @@
.xpress-editor a.skip:hover,
.xpress-editor a.skip:active,
.xpress-editor a.skip:focus{position:relative;display:block;padding:5px;right:0;z-index:60;width:auto;height:auto;text-align:right;white-space:nowrap;color:#000;text-decoration:none;letter-spacing:-1px;_zoom:1}
.xpress-editor .input_area{position:relative;margin:10px;z-index:30;*zoom:1;height:400px}
.xpress-editor .input_area{position:relative;margin:10px;z-index:30;*zoom:1;height:400px;overflow:hidden}
.xpress-editor .input_area iframe,
.xpress-editor .input_area textarea{display:block;width:100% !important;position:relative;height:100%;border:0 !important;padding:0 !important;overflow:auto}
.xpress-editor .input_area textarea{*margin:0 -10px;_margin-bottom:-2px}

21
modules/editor/skins/xpresseditor/js/xpresseditor.js
View file

@ -5813,18 +5813,21 @@ xe.XE_Table = $.Class({
}
}).extend(xe.XE_Table);
})(jQuery);
// Auto Resize Checkbox Toggle Class
$('.input_auto>input').change(function(){
setTimeout(function(){
if($('.input_control').is(':hidden')){
$('.input_auto').addClass('line');
} else {
$('.input_auto').removeClass('line');
}
},1);
jQuery(function($){
$('.input_auto>input').change(function(){
setTimeout(function(){
if($('.input_control').is(':hidden')){
$('.input_auto').addClass('line');
} else {
$('.input_auto').removeClass('line');
}
},1);
});
});
})(jQuery);
if (!window.xe) xe = {};
xe.Editors = [];

5
modules/member/member.controller.php
View file

@ -1689,11 +1689,6 @@
if (!$args->user_id) $args->user_id = 't'.$args->member_srl;
if (!$args->user_name) $args->user_name = $args->member_srl;
if(trim($args->find_account_answer))
{
$args->find_account_answer = md5($args->find_account_answer);
}
$output = executeQuery('member.insertMember', $args);
if(!$output->toBool()) {
$oDB->rollback();

5
modules/member/member.model.php
View file

@ -250,6 +250,11 @@
}
}
if(strlen($info->find_account_answer) == 32 && preg_match('/[a-zA-Z0-9]+/', $info->find_account_answer))
{
$info->find_account_answer = null;
}
// XSS defence
$oSecurity = new Security($info);
$oSecurity->encodeHTML('user_name', 'nick_name', 'find_account_answer', 'description', 'address.', 'group_list..');

2
modules/member/skins/default/login_form.html
View file

@ -3,7 +3,7 @@
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<h1 class="h1">{$lang->cmd_login}...</h1>
<h1 class="h1">{$lang->cmd_login}</h1>
<form ruleset="@login" action="./" method="post" id="fo_member_login" class="form">
<input type="hidden" name="success_return_url" value="{getUrl('act', '')}" />
<input type="hidden" name="act" value="procMemberLogin" />

2
modules/member/tpl/insert_member.html
View file

@ -36,7 +36,7 @@
<p class="q">{$lang->password} <em style="color:red">*</em></p>
<p class="a">
<input type="hidden" name="password" value="{$member_info->password}" />
<input type="password" name="reset_password" value="" />
<input type="text" name="reset_password" value="" />
</p>
</li>
<li cond="!$member_srl">

4
modules/member/tpl/login_form.html
View file

@ -1,7 +1,7 @@
<load target="css/mlogin.css" usecdn="true" />
<div class="bd">
<div class="hx h2">
<h2>{$lang->cmd_login}...</h2>
<h2>{$lang->cmd_login}</h2>
</div>
<form action="./" method="POST" class="ff">
<input type="hidden" name="module" value="member" />
@ -13,7 +13,7 @@
</ul>
<div class="bna">
<div class="fl"><input name="keep_signed" type="checkbox" value="Y" id="autoLogin" /> <label for="autoLogin">{$lang->keep_signed}</label></div>
<div class="fr"><button type="submit" class="bn dark">{$lang->cmd_login}...</button></div>
<div class="fr"><button type="submit" class="bn dark">{$lang->cmd_login}</button></div>
</div>
</form>
</div>

4
modules/module/tpl/module_grants.html
View file

@ -9,7 +9,7 @@
<input type="hidden" name="module_srl" value="{$module_srl}" />
<input type="hidden" name="admin_member" value="<!--@foreach($admin_member as $key => $val)--><!--@if($member_config->identifier == 'email_address')-->{$val->email_address},<!--@else-->{$val->user_id},<!--@end--><!--@end-->" />
<h3 class="h3">{$lang->module_admin}</h3>
<h2 class="h2">{$lang->module_admin}</h2>
<p>{$lang->about_admin_id}</p>
<ul>
<li>
@ -33,7 +33,7 @@
</p>
</li>
</ul>
<h3 class="h3">{$lang->permission_setting}</h3>
<h2 class="h2">{$lang->permission_setting}</h2>
<p>{$lang->about_grant_deatil}</p>
<div class="table">
<table width="100%" border="1" cellspacing="0">

6
modules/module/tpl/skin_config.html
View file

@ -6,7 +6,7 @@
<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
<input type="hidden" name="page" value="{$page}" />
<h3 class="h3">{$lang->skin_default_info}</h3>
<h2 class="h2">{$lang->skin_default_info}</h2>
<div class="table">
<table width="100%" border="1" cellspacing="0">
<tr>
@ -46,7 +46,7 @@
</table>
</div>
<h3 class="h3">{$lang->extra_vars}</h3>
<h2 class="h2">{$lang->extra_vars}</h2>
<div class="table">
<table width="100%" border="1" cellspacing="0">
<tr valign="top" cond="$skin_info->colorset">
@ -75,7 +75,7 @@
{@$group = $val->group}
</table>
</div>
<h3 class="h3">{$group}</h3>
<h2 class="h2">{$group}</h2>
<div class="table">
<table width="100%" border="1" cellspacing="0">
<!--@end-->

2
modules/point/tpl/config.html
View file

@ -30,7 +30,7 @@
<label for="signup_point">{$lang->point_signup}</label>
<br />
<input type="text" value="{$config->login_point}" name="login_point" id="login_point" style="width:30px" /> :
<label for="login_point">{$lang->cmd_login}...</label>
<label for="login_point">{$lang->cmd_login}</label>
<br />
<input type="text" name="insert_document" value="{$config->insert_document}" id="insert_document" style="width:30px" /> :
<label for="insert_document">{$lang->point_insert_document}</label>