Index: branches/dev/html/entry/index.php
===================================================================
--- branches/dev/html/entry/index.php	(revision 17)
+++ branches/dev/html/entry/index.php	(revision 283)
@@ -113,5 +113,5 @@
 		}
 
-		//--¡¡²¾ÅÐÏ¿¤È´°Î»²èÌÌ
+		//--¡¡²ñ°÷ÅÐÏ¿¤È´°Î»²èÌÌ
 		if ($_POST["mode"] == "complete") {
 			// ¥­¥ã¥ó¥Ú¡¼¥ó¤«¤é¤ÎÁ«°Ü¤Î»þÍÑ¤ÎÃÍ
@@ -120,5 +120,6 @@
 			}
 			
-			$objPage->uniqid = lfRegistData ($objPage->arrForm, $arrRegistColumn, $arrRejectRegistColumn);
+			// ²ñ°÷¾ðÊó¤ÎÅÐÏ¿
+			$objPage->uniqid = lfRegistData ($objPage->arrForm, $arrRegistColumn, $arrRejectRegistColumn, CUSTOMER_CONFIRM_MAIL);
 			
 			$objPage->tpl_css = '/css/layout/entry/complete.css';
@@ -126,5 +127,5 @@
 			$objPage->tpl_title = '²ñ°÷ÅÐÏ¿(´°Î»¥Ú¡¼¥¸)';
 
-			//¡¡²¾ÅÐÏ¿´°Î»¥á¡¼¥ëÁ÷¿®
+			//¡¡´°Î»¥á¡¼¥ëÁ÷¿®
 			$objPage->CONF = $CONF;
 			$objPage->to_name01 = $_POST['name01'];
@@ -132,6 +133,14 @@
 			$objMailText = new SC_SiteView();
 			$objMailText->assignobj($objPage);
-			$subject = sfMakesubject('²ñ°÷ÅÐÏ¿¤Î¤´³ÎÇ§');
-			$toCustomerMail = $objMailText->fetch("mail_templates/customer_mail.tpl");
+			
+			// ²¾²ñ°÷¤¬Í­¸ú¤Î¾ì¹ç
+			if(CUSTOMER_CONFIRM_MAIL == true) {
+				$subject = sfMakesubject('²ñ°÷ÅÐÏ¿¤Î¤´³ÎÇ§');
+				$toCustomerMail = $objMailText->fetch("mail_templates/customer_mail.tpl");
+			} else {
+				$subject = sfMakesubject('²ñ°÷ÅÐÏ¿¤Î¤´´°Î»');
+				$toCustomerMail = $objMailText->fetch("mail_templates/customer_regist_mail.tpl");
+			}
+			
 			$objMail = new GC_SendMail();
 			$objMail->setItem(
@@ -144,6 +153,5 @@
 								, $CONF["email04"]					//¡¡return_path
 								, $CONF["email04"]					//  Errors_to
-								, $CONF["email01"]					//  Bcc
-																);
+							);
 			// °¸Àè¤ÎÀßÄê
 			$name = $_POST["name01"] . $_POST["name02"] ." ÍÍ";
@@ -168,10 +176,9 @@
 
 //----------------------------------------------------------------------------------------------------------------------
-
-//---- function·²
-function lfRegistData ($array, $arrRegistColumn, $arrRejectRegistColumn) {
+// ²ñ°÷¾ðÊó¤ÎÅÐÏ¿
+function lfRegistData ($array, $arrRegistColumn, $arrRejectRegistColumn, $confirm_flg) {
 	global $objConn;
-
-	// ²¾ÅÐÏ¿
+	
+	// ÅÐÏ¿¥Ç¡¼¥¿¤ÎÀ¸À®
 	foreach ($arrRegistColumn as $data) {
 		if (strlen($array[ $data["column"] ]) > 0 && ! in_array($data["column"], $arrRejectRegistColumn)) {
@@ -188,11 +195,17 @@
 	$arrRegist["password"] = sha1($arrRegist["password"] . ":" . AUTH_MAGIC);
 	
-	$count = 1;
-	while ($count != 0) {
-		$uniqid = sfGetUniqRandomId("t");
-		$count = $objConn->getOne("SELECT COUNT(*) FROM dtb_customer WHERE secret_key = ?", array($uniqid));
-	}
-	
-	$arrRegist["secret_key"] = $uniqid;		// ²¾ÅÐÏ¿IDÈ¯¹Ô
+	// ²¾²ñ°÷ÅÐÏ¿¤Î¾ì¹ç
+	if($confirm_flg == true) {
+		// ½ÅÊ£¤·¤Ê¤¤²ñ°÷ÅÐÏ¿¥­¡¼¤òÈ¯¹Ô¤¹¤ë¡£
+		$count = 1;
+		while ($count != 0) {
+			$uniqid = sfGetUniqRandomId("t");
+			$count = $objConn->getOne("SELECT COUNT(*) FROM dtb_customer WHERE secret_key = ?", array($uniqid));
+		}
+		$arrRegist["secret_key"] = $uniqid;		// ²ñ°÷ÅÐÏ¿¥­¡¼
+	} else {
+		$arrRegist["status"] = "2";				// ËÜ²ñ°÷
+	}
+	
 	$arrRegist["create_date"] = "now()"; 	// ºîÀ®Æü
 	$arrRegist["update_date"] = "now()"; 	// ¹¹¿·Æü
Index: branches/dev/data/conf/conf.php
===================================================================
--- branches/dev/data/conf/conf.php	(revision 244)
+++ branches/dev/data/conf/conf.php	(revision 283)
@@ -163,4 +163,5 @@
 /* ¥·¥¹¥Æ¥à´ØÏ¢ */
 define ("ADMIN_ID", "1");								// ´ÉÍý¥æ¡¼¥¶ID(¥á¥ó¥Æ¥Ê¥ó¥¹ÍÑÉ½¼¨¤µ¤ì¤Ê¤¤¡£)
+define ("CUSTOMER_CONFIRM_MAIL", true);					// ²ñ°÷ÅÐÏ¿»þ¤Ë²¾²ñ°÷³ÎÇ§¥á¡¼¥ë¤òÁ÷¿®¤¹¤ë¤«¡Êtrue:²¾²ñ°÷¡¢false:ËÜ²ñ°÷¡Ë
 define ("MELMAGA_SEND", true);							// ¥á¥ë¥Þ¥¬ÇÛ¿®ÍÞÀ©(false:OFF¡¢true:ON)
 define ("MELMAGA_BATCH_MODE", false);					// ¥á¥¤¥ë¥Þ¥¬¥¸¥ó¥Ð¥Ã¥Á¥â¡¼¥É(true:¥Ð¥Ã¥Á¤ÇÁ÷¿®¤¹¤ë ¢¨Í×cronÀßÄê¡¢false:¥ê¥¢¥ë¥¿¥¤¥à¤ÇÁ÷¿®¤¹¤ë)
