From 20d1bd80ee2050d66bed26d377124403f68ec01a Mon Sep 17 00:00:00 2001
From: devjin <namnyams@gmail.com>
Date: Mon, 10 Oct 2011 07:35:56 +0000
Subject: [PATCH] issue 353 fixed mobile system message login

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9529 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/message/m.skins/default/system_message.html | 4 ++--
 modules/message/message.mobile.php                  | 3 +++
 modules/message/skins/default/system_message.html   | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/message/m.skins/default/system_message.html b/modules/message/m.skins/default/system_message.html
index f732b89b8..86a76f833 100644
--- a/modules/message/m.skins/default/system_message.html
+++ b/modules/message/m.skins/default/system_message.html
@@ -11,10 +11,10 @@
         {@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
         {@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
         {@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
-		<!--%import("./filter/login.xml")-->
 		<!--%import("./filter/openid_login.xml")-->
 		<div class="mLogin" id="gLogin">
-			<form action="./" method="post" onsubmit="return procFilter(this, message_login)" id="gForm" class="ff">
+			<form action="./" method="post" ruleset="@login" id="gForm" class="ff">
+			<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
 				<fieldset>
 					<ul>
 						<li><label for="uid">{$lang->user_id}</label><input type="text" name="user_id" id="uid" value="" /></li>
diff --git a/modules/message/message.mobile.php b/modules/message/message.mobile.php
index 08180b96d..31bb66869 100644
--- a/modules/message/message.mobile.php
+++ b/modules/message/message.mobile.php
@@ -32,6 +32,9 @@
 
             Context::set('system_message', nl2br($this->getMessage()));
 
+			Context::set('act', 'procMemberLogin');
+			Context::set('mid', '');
+
             $this->setTemplatePath($template_path);
             $this->setTemplateFile('system_message');
         }
diff --git a/modules/message/skins/default/system_message.html b/modules/message/skins/default/system_message.html
index 4b5738f09..15213c51a 100644
--- a/modules/message/skins/default/system_message.html
+++ b/modules/message/skins/default/system_message.html
@@ -36,4 +36,7 @@
 	<div class="logOut" cond="$is_logged && $module == 'admin'">
 		<span class="buttonAccount"><a href="{getUrl('act','dispMemberLogout','module','')}">{$lang->cmd_logout}</a></span>
 	</div>
+	<div class="logOut" cond="!$is_logged && $module != 'admin'">
+		<span class="buttonAccount"><a href="{getUrl('act','dispMemberLoginForm','module','', 'mid', '')}">{$lang->cmd_login}</a></span>
+	</div>
 </div>