From e86a4e2ed230290327005250fd20ef37965f2a1b Mon Sep 17 00:00:00 2001
From: devjin <namnyams@gmail.com>
Date: Thu, 8 Sep 2011 07:50:14 +0000
Subject: [PATCH] fixed install login error

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9120 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/member.class.php                      | 2 +-
 modules/member/member.controller.php                 | 9 +++++----
 modules/member/skins/default/login_form.html         | 1 +
 widgets/login_info/skins/xe_official/login_form.html | 3 +--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index fb1f01b3d..48dcb9bb0 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -136,7 +136,7 @@
                     // Insert admin information
                     $oMemberAdminController->insertAdmin($admin_info);
                     // Log-in Processing
-                    $output = $oMemberController->doLogin($admin_info->user_id);
+                    $output = $oMemberController->doLogin($admin_info->email_address);
                 }
             }
             // Register denied ID(default + module name)
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 259e4058f..6ea54e114 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -48,10 +48,11 @@
                 }
             }
 
-            $redirect_url = Context::get('redirect_url'); 
-            if ($output->toBool () && Context::getRequestMethod () == "POST" && $redirect_url) {
-                header ("location:" . $redirect_url);
-            }
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
 
             return $output;
         }
diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html
index b1bd2535d..9cb324224 100644
--- a/modules/member/skins/default/login_form.html
+++ b/modules/member/skins/default/login_form.html
@@ -16,6 +16,7 @@
 
     <form ruleset="@login" action="./" method="post" id="fo_member_login">
 	<input type="hidden" name="act" value="procMemberLogin" />
+	<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
         <fieldset class="login">
             <dl>
                 <dt><label for="uid">{$lang->user_id}</label></dt>
diff --git a/widgets/login_info/skins/xe_official/login_form.html b/widgets/login_info/skins/xe_official/login_form.html
index dbb1d5618..1d167a75d 100644
--- a/widgets/login_info/skins/xe_official/login_form.html
+++ b/widgets/login_info/skins/xe_official/login_form.html
@@ -18,8 +18,7 @@
 <legend>{$lang->cmd_login}</legend>
 <form id="fo_login_widget" action="./" method="post" ruleset="@login">
 	<input type="hidden" name="act" value="procMemberLogin" />
-	<input type="hidden" name="success_return_url" value="{getUrl('act', '')}" />
-
+	<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
 
     <div class="idpwWrap">
         <div class="idpw">