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

issue 90 apply patch.

Browse source 
show security login message by config status


git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9827 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-11-17 01:46:59 +00:00
parent 5af206c9a7
commit 339b2de797
6 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
classes/context/Context.class.php
View file

@ -282,6 +282,16 @@ class Context {
return $self->db_info;
}
/**
* @brief return ssl status
* @return none|always|optional
**/
function getSslStatus()
{
$dbInfo = Context::getDBInfo();
return $dbInfo->use_ssl;
}
/**
* @brief return default URL
* @return default URL string

8
widgets/login_info/login_info.class.php
View file

@ -26,12 +26,16 @@
$oModuleModel = &getModel('module');
$this->member_config = $oModuleModel->getModuleConfig('member');
Context::set('member_config', $this->member_config);
// Set a flag to check if the https connection is made when using SSL and create https url
$ssl_mode = false;
if($this->member_config->enable_ssl == 'Y') {
if(preg_match('/^https:\/\//i',Context::getRequestUri())) $ssl_mode = true;
$useSsl = Context::getSslStatus();
if($useSsl != 'none')
{
if(preg_match('/^https:\/\//i', Context::getRequestUri())) $ssl_mode = true;
}
Context::set('ssl_mode',$ssl_mode);
// Compile a template
$oTemplate = &TemplateHandler::getInstance();
return $oTemplate->compile($tpl_path, $tpl_file);

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

@ -39,11 +39,9 @@
</p>
<p class="login_mod"><input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" /></p>
</div>
<!--@if($member_config->enable_ssl=='Y')-->
<p class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
<p cond="$ssl_mode" class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
<a href="#" onclick="toggleSecuritySignIn(); return false;">{$lang->security_sign_in}</a>
</p>
<!--@end-->
<ul class="help">
<li class="first-child"><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
<li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>

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

@ -40,11 +40,9 @@
</p>
<p class="login_mod"><input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" /></p>
</div>
<!--@if($member_config->enable_ssl=='Y')-->
<p class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
<p cond="$ssl_mode" class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
<a href="#" onclick="toggleSecuritySignIn(); return false;">{$lang->security_sign_in}</a>
</p>
<!--@end-->
<ul class="help">
<li class="first-child"><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
<li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>

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

@ -29,7 +29,7 @@
</div>
<input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" />
</div>
<p cond="$member_config->enable_ssl=='Y'" class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
<p cond="$ssl_mode" class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
<button type="button" class="text" onclick="toggleSecuritySignIn(); return false;">{$lang->security_sign_in}</button>
</p>
<p class="keep_msg">{$lang->about_keep_warning}</p>

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

@ -26,11 +26,9 @@ var keep_signed_msg = "{$lang->about_keep_signed}";
<div class="input_text mb_pw"><img src="images/bullet_input_pw.gif" alt="" title="" /><input name="password"type="password" title="password" /></div>
<label><input type="checkbox" name="keep_signed" id="keepid" class="sign_check" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" />{$lang->keep_signed}</label>
<!--@if($member_config->enable_ssl=='Y')-->
<p class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
<p cond="$ssl_mode" class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
<a href="#" onclick="toggleSecuritySignIn(); return false;">{$lang->security_sign_in}</a>
</p>
<!--@end-->
</div>
<div class="m_right">
<input class="sign_submit" type="image" src="images/btn_signin.gif" width="51" height="46" />
@ -46,4 +44,4 @@ var keep_signed_msg = "{$lang->about_keep_signed}";
</div><!-- //signin_window -->
</div>
</fieldset>
</form>
</form>