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

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

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>