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

merge from branch 1.5.0 (~r10870)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3@10871 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-12 00:24:11 +00:00
commit ec06013652
9 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/db/DBMysql.class.php
View file

@ -582,7 +582,7 @@ class DBMysql extends DB {
$uses_groupby = $queryObject->getGroupByString() != '';
if($uses_distinct || $uses_groupby) {
$count_query = sprintf('select %s %s %s %s'
, $temp_select
, $temp_select == '*' ? '1' : $temp_select
, 'FROM ' . $queryObject->getFromString($with_values)
, ($temp_where === '' ? '' : ' WHERE '. $temp_where)
, ($uses_groupby ? ' GROUP BY ' . $queryObject->getGroupByString() : '')

2
classes/template/TemplateHandler.class.php
View file

@ -272,7 +272,7 @@ class TemplateHandler {
if(!preg_match('/no-error-return-url="true"/i', $matches[1]))
{
preg_match('/<input[^>]*name="error_return_url"[^>]*>/is', $matches[2], $m3);
if(!$m3[0]) $matches[2] = '<input type="hidden" name="error_return_url" value="<?php echo getRequestUriByServerEnviroment() ?>" />'.$matches[2];
if(!$m3[0]) $matches[2] = '<input type="hidden" name="error_return_url" value="<?php echo htmlspecialchars(getRequestUriByServerEnviroment()) ?>" />'.$matches[2];
}
else
{

4
modules/member/skins/default/signup_form.html
View file

@ -45,8 +45,8 @@
<li>
<p class="q">{$lang->allow_mailing}</p>
<p class="a">
<input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'"> <label for="mailingYes">{$lang->cmd_yes}</label>
<input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" > <label for="mailingNo">{$lang->cmd_no}</label>
<input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'" /> <label for="mailingYes">{$lang->cmd_yes}</label>
<input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" /> <label for="mailingNo">{$lang->cmd_no}</label>
</p>
</li>
<li>

19
modules/member/tpl/signup_form.html
View file

@ -35,23 +35,24 @@
<input type="password" name="password" id="password" value=""/>
</li>
<li>
<label for="password2">{$lang->password2} <em style="color:red">*</em></label>
<label for="password2">{$lang->password3} <em style="color:red">*</em></label>
<input type="password" name="password2" id="password2" value=""/>
</li>
<li loop="$formTags=>$formTag">
<label>{$formTag->title}</label>
<block cond="$formTag->name != 'signature'">{$formTag->inputTag}</block>
<block cond="$formTag->name =='signature'">{$editor}</block>
</li>
<block loop="$formTags=>$formTag" cond="$formTag->name != 'signature'">
<li>
<label>{$formTag->title}</label>
{$formTag->inputTag}
</li>
</block>
<li>
<label>{$lang->allow_mailing}</label>
<input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'"> <label for="mailingYes">{$lang->cmd_yes}</label>
<input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" > <label for="mailingNo">{$lang->cmd_no}</label>
<input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'" /> <label for="mailingYes">{$lang->cmd_yes}</label>
<input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" /> <label for="mailingNo">{$lang->cmd_no}</label>
</li>
<li>
<label>{$lang->allow_message}</label>
<block loop="$lang->allow_message_type=>$key,$val">
<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key || (!$member_info && $key == 'Y')" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
</block>
</li>
</ul>

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

@ -101,7 +101,7 @@
}
if($output->toBool() && $output->data && $vid) {
Context::set('vid', $output->data->domain, true);
if($mid==$output->data->domain) Context::set('mid',$output->data->mid,true);
if(strtolower($mid)==strtolower($output->data->domain)) Context::set('mid',$output->data->mid,true);
}
if(!$output || !$output->data) { $domain = ''; unset($output); }
}

2
widgets/login_info/skins/xe_global/login_form.html
View file

@ -21,7 +21,7 @@
<legend>{$lang->cmd_login}</legend>
<h2>Login</h2>
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<input type="hidden" name="success_return_url" value="{htmlspecialchars(getRequestUriByServerEnviroment())}" />
<div class="idpwWrap">
<div class="idpw">
<input name="user_id" type="text" title="<!--@if($member_config->identifier != 'email_address')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->" />

2
widgets/login_info/skins/xe_globalTwo/login_form.html
View file

@ -21,7 +21,7 @@
<fieldset id="login" class="login_{$colorset}">
<legend>{$lang->cmd_login}</legend>
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<input type="hidden" name="success_return_url" value="{htmlspecialchars(getRequestUriByServerEnviroment())}" />
<h2>Login</h2>
<div class="idpwWrap">
<div class="idpw">

2
widgets/login_info/skins/xe_official/login_form.html
View file

@ -17,7 +17,7 @@
<form id="fo_login_widget" action="./" method="post" ruleset="@login" class="login_{$colorset}">
<fieldset>
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<input type="hidden" name="success_return_url" value="{htmlspecialchars(getRequestUriByServerEnviroment())}" />
<div class="idpwWrap">
<div class="idpw">
<input name="user_id" type="text" title="<!--@if($member_config->identifier != 'email_address')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->" />

2
widgets/login_info/skins/xe_solid_enterprise_login/login_form.html
View file

@ -14,7 +14,7 @@ var keep_signed_msg = "{$lang->about_keep_signed}";
<fieldset id="login">
<legend>{$lang->cmd_login}</legend>
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<input type="hidden" name="success_return_url" value="{htmlspecialchars(getRequestUriByServerEnviroment())}" />
<div id="sign_box">
<div class="txt sign_state1"><span class="label">Sign in</span></div>
<div class="signin_window" style="display:none;">