From f92219f32860ff02e921daa72bd6bd6b6fa01929 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 6 Jan 2016 11:25:23 +0900
Subject: [PATCH] After install, allow login by both user_id and email_address
 by default

---
 modules/install/lang/lang.xml       | 6 +++---
 modules/install/tpl/admin_form.html | 4 ++--
 modules/install/tpl/js/install.js   | 9 +++++++++
 modules/member/member.class.php     | 5 +----
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/modules/install/lang/lang.xml b/modules/install/lang/lang.xml
index c5269a3be..a0a969a10 100644
--- a/modules/install/lang/lang.xml
+++ b/modules/install/lang/lang.xml
@@ -371,9 +371,9 @@
 		<value xml:lang="vi"><![CDATA[Sự cho phép của thư mục cài đặt không phải là 777]]></value>
 	</item>
 	<item name="install_notandum">
-		<value xml:lang="ko"><![CDATA[모든 항목을 반드시 작성해야 합니다. 모든 항목을 관리자 환경에서 수정할 수 있습니다. <strong>최초 로그인시 로그인 계정은 이메일 주소 입니다.</strong>]]></value>
-		<value xml:lang="en"><![CDATA[All form must be filled, but you can modify all of settings after finish the installation.]]></value>
-		<value xml:lang="jp"><![CDATA[すべての項目を必ず作成してください。すべての項目を管理者環境にて修正できます。]]></value>
+		<value xml:lang="ko"><![CDATA[작성하신 모든 항목은 설치 후 관리 모듈에서 수정할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can edit this information in the admin module after installation.]]></value>
+		<value xml:lang="jp"><![CDATA[すべての項目を管理者環境にて修正できます。]]></value>
 	</item>
 	<item name="cmd_install_refresh_page">
 		<value xml:lang="ko"><![CDATA[새로고침]]></value>
diff --git a/modules/install/tpl/admin_form.html b/modules/install/tpl/admin_form.html
index 87356024f..33f01a43e 100644
--- a/modules/install/tpl/admin_form.html
+++ b/modules/install/tpl/admin_form.html
@@ -29,13 +29,13 @@
 		<div class="x_control-group">
 			<label for="aNick" class="x_control-label">{$lang->nick_name}</label>
 			<div class="x_controls">
-				<input name="nick_name" type="text" id="aNick" required value="admin" />
+				<input name="nick_name" type="text" id="aNick" required value="" />
 			</div>
 		</div>
 		<div class="x_control-group">
 			<label for="aId" class="x_control-label">{$lang->user_id}</label>
 			<div class="x_controls">
-				<input name="user_id" type="text" id="aId" required value="admin" />
+				<input name="user_id" type="text" id="aId" required value="" />
 			</div>
 		</div>
 		<p class="install_help">{$lang->install_notandum}</p>
diff --git a/modules/install/tpl/js/install.js b/modules/install/tpl/js/install.js
index beebe2cf2..33f37f18e 100644
--- a/modules/install/tpl/js/install.js
+++ b/modules/install/tpl/js/install.js
@@ -6,4 +6,13 @@ jQuery(function($){
 			$("p.db_type_" + $(this).val()).show();
 		}).triggerHandler("click");
 	}
+	if($("input[name='user_id']").size() && $("input[name='email_address']").size()) {
+		var user_id_input = $("input[name='user_id']");
+		var email_input = $("input[name='email_address']");
+		email_input.on("blur", function() {
+			if (user_id_input.val() == "") {
+				user_id_input.val(email_input.val().replace(/@.+$/g, "").replace(/[^a-zA-Z0-9_]/g, ""));
+			}
+		});
+	}
 });
diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index c16bd026f..84328637d 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -93,19 +93,16 @@ class member extends ModuleObject {
 
 		if(!$config->signupForm || !is_array($config->signupForm))
 		{
-			$identifier = $isNotInstall ? 'email_address' : 'user_id';
-
+			$identifier = 'user_id';
 			$config->signupForm = $oMemberAdminController->createSignupForm($identifier);
 			$config->identifier = $identifier;
 
-
 			// Create Ruleset File
 			FileHandler::makeDir('./files/ruleset');
 			$oMemberAdminController->_createSignupRuleset($config->signupForm);
 			$oMemberAdminController->_createLoginRuleset($config->identifier);
 			$oMemberAdminController->_createFindAccountByQuestion($config->identifier);
 		}
-		
 		$oModuleController->insertModuleConfig('member',$config);
 
 		$groups = $oMemberModel->getGroups();