Index: /branches/dev/html/admin/mail/index.php
===================================================================
--- /branches/dev/html/admin/mail/index.php	(revision 14321)
+++ /branches/dev/html/admin/mail/index.php	(revision 14322)
@@ -9,47 +9,47 @@
 
 class LC_Page {
-    var $arrSession;
-    var $arrHtmlmail;
-    var $arrNowDate;
-    function LC_Page() {
-        $this->tpl_mainpage = 'mail/index.tpl';
-        $this->tpl_mainno = 'mail';
-        $this->tpl_subnavi = 'mail/subnavi.tpl';
-        $this->tpl_subno = "index";
-        $this->tpl_pager = DATA_PATH . 'Smarty/templates/admin/pager.tpl';
-        $this->tpl_subtitle = 'ÇÛ¿®ÆâÍÆÀßÄê';
-        
-        global $arrPref;
-        $this->arrPref = $arrPref;
-        global $arrJob;
-        $arrJob["ÉÔÌÀ"] = "ÉÔÌÀ";
-        $this->arrJob = $arrJob;
-        global $arrSex;     
-        $this->arrSex = $arrSex;
-        global $arrMailType;
-        $this->arrMailType = $arrMailType;
-        global $arrDomain;
-        $this->arrDomain = $arrDomain;
-        global $arrPageRows;
-        $this->arrPageRows = $arrPageRows;
-        // ¥Ú¡¼¥¸¥Ê¥ÓÍÑ
-        $this->tpl_pageno = $_POST['search_pageno'];
-        global $arrMAILMAGATYPE;
-        $this->arrMAILMAGATYPE = $arrMAILMAGATYPE;
-        $this->arrHtmlmail[''] = "¤¹¤Ù¤Æ";
-        $this->arrHtmlmail[1] = $arrMAILMAGATYPE[1];
-        $this->arrHtmlmail[2] = $arrMAILMAGATYPE[2];
-        global $arrCustomerType;
-        $this->arrCustomerType = $arrCustomerType;
-        global $arrDOMAIN;
-        $this->arrDomain = $arrDOMAIN;
-        $this->arrDomain[''] = "»ØÄꤷ¤Ê¤¤";
-        $this->arrDomain[1] = $arrDOMAIN[1];
-        $this->arrDomain[2] = $arrDOMAIN[2]; 
-    }
+	var $arrSession;
+	var $arrHtmlmail;
+	var $arrNowDate;
+	function LC_Page() {
+		$this->tpl_mainpage = 'mail/index.tpl';
+		$this->tpl_mainno = 'mail';
+		$this->tpl_subnavi = 'mail/subnavi.tpl';
+		$this->tpl_subno = "index";
+		$this->tpl_pager = DATA_PATH . 'Smarty/templates/admin/pager.tpl';
+		$this->tpl_subtitle = 'ÇÛ¿®ÆâÍÆÀßÄê';
+		
+		global $arrPref;
+		$this->arrPref = $arrPref;
+		global $arrJob;
+		$arrJob["ÉÔÌÀ"] = "ÉÔÌÀ";
+		$this->arrJob = $arrJob;
+		global $arrSex;		
+		$this->arrSex = $arrSex;
+		global $arrMailType;
+		$this->arrMailType = $arrMailType;
+		global $arrDomain;
+		$this->arrDomain = $arrDomain;
+		global $arrPageRows;
+		$this->arrPageRows = $arrPageRows;
+		// ¥Ú¡¼¥¸¥Ê¥ÓÍÑ
+		$this->tpl_pageno = $_POST['search_pageno'];
+		global $arrMAILMAGATYPE;
+		$this->arrMAILMAGATYPE = $arrMAILMAGATYPE;
+		$this->arrHtmlmail[''] = "¤¹¤Ù¤Æ";
+		$this->arrHtmlmail[1] = $arrMAILMAGATYPE[1];
+		$this->arrHtmlmail[2] = $arrMAILMAGATYPE[2];
+		global $arrCustomerType;
+		$this->arrCustomerType = $arrCustomerType;
+		global $arrDOMAIN;
+		$this->arrDomain = $arrDOMAIN;
+		$this->arrDomain[''] = "»ØÄꤷ¤Ê¤¤";
+		$this->arrDomain[1] = $arrDOMAIN[1];
+		$this->arrDomain[2] = $arrDOMAIN[2]; 
+	}
 }
 
 class LC_HTMLtemplate {
-    var $list_data;
+	var $list_data;
 }
 
@@ -69,50 +69,50 @@
 
 /*
-    query:ÇÛ¿®ÍúÎò¡Ö³Îǧ¡×
+	query:ÇÛ¿®ÍúÎò¡Ö³Îǧ¡×
 */
 if ($_GET["mode"] == "query" && sfCheckNumLength($_GET["send_id"])) {
-    // Á÷¿®ÍúÎò¤è¤ê¡¢Á÷¿®¾ò·ï³Îǧ²èÌÌ
-    $sql = "SELECT search_data FROM dtb_send_history WHERE send_id = ?";
-    $result = $conn->getOne($sql, array($_GET["send_id"]));
-    $tpl_path = "mail/query.tpl";
-        
-    $list_data = unserialize($result);
-    
-    // ÅÔÆ»Éܸ©¤òÊÑ´¹
-    $list_data['pref_disp'] = $objPage->arrPref[$list_data['pref']];
-    
-    //¥É¥á¥¤¥ó»ØÄê¤òÊÑ´¹
-    $list_data['domain_disp'] = $objPage->arrDomain[$list_data['domain']];
-    
-    // ÇÛ¿®·Á¼°
-    $list_data['htmlmail_disp'] = $objPage->arrHtmlmail[$list_data['htmlmail']];
-    
-    // À­Ê̤ÎÊÑ´¹
-    if (count($list_data['sex']) > 0) {
-        foreach($list_data['sex'] as $key => $val){
-            $list_data['sex'][$key] = $objPage->arrSex[$val];
-            $sex_disp .= $list_data['sex'][$key] . " ";
-        }
-        $list_data['sex_disp'] = $sex_disp;
-    }
-    
-    // ¿¦¶È¤ÎÊÑ´¹
-    if (count($list_data['job']) > 0) {
-        foreach($list_data['job'] as $key => $val){
-            $list_data['job'][$key] = $objPage->arrJob[$val];
-            $job_disp .= $list_data['job'][$key] . " ";
-        }
-        $list_data['job_disp'] = $job_disp;
-    }
-        
-    // ¥«¥Æ¥´¥êÊÑ´¹
-    $arrCatList = sfGetCategoryList();
-    $list_data['category_name'] = $arrCatList[$list_data['category_id']];
-    
-    $objPage->list_data = $list_data;
-
-    $objView->assignobj($objPage);
-    $objView->display($tpl_path);
-    exit;
+	// Á÷¿®ÍúÎò¤è¤ê¡¢Á÷¿®¾ò·ï³Îǧ²èÌÌ
+	$sql = "SELECT search_data FROM dtb_send_history WHERE send_id = ?";
+	$result = $conn->getOne($sql, array($_GET["send_id"]));
+	$tpl_path = "mail/query.tpl";
+		
+	$list_data = unserialize($result);
+	
+	// ÅÔÆ»Éܸ©¤òÊÑ´¹
+	$list_data['pref_disp'] = $objPage->arrPref[$list_data['pref']];
+	
+	//¥É¥á¥¤¥ó»ØÄê¤òÊÑ´¹
+	$list_data['domain_disp'] = $objPage->arrDomain[$list_data['domain']];
+	
+	// ÇÛ¿®·Á¼°
+	$list_data['htmlmail_disp'] = $objPage->arrHtmlmail[$list_data['htmlmail']];
+	
+	// À­Ê̤ÎÊÑ´¹
+	if (count($list_data['sex']) > 0) {
+		foreach($list_data['sex'] as $key => $val){
+			$list_data['sex'][$key] = $objPage->arrSex[$val];
+			$sex_disp .= $list_data['sex'][$key] . " ";
+		}
+		$list_data['sex_disp'] = $sex_disp;
+	}
+	
+	// ¿¦¶È¤ÎÊÑ´¹
+	if (count($list_data['job']) > 0) {
+		foreach($list_data['job'] as $key => $val){
+			$list_data['job'][$key] = $objPage->arrJob[$val];
+			$job_disp .= $list_data['job'][$key] . " ";
+		}
+		$list_data['job_disp'] = $job_disp;
+	}
+		
+	// ¥«¥Æ¥´¥êÊÑ´¹
+	$arrCatList = sfGetCategoryList();
+	$list_data['category_name'] = $arrCatList[$list_data['category_id']];
+	
+	$objPage->list_data = $list_data;
+
+	$objView->assignobj($objPage);
+	$objView->display($tpl_path);
+	exit;
 }
 
@@ -122,169 +122,174 @@
 switch($_POST['mode']) {
 /*
-    search:¡Ö¸¡º÷¡×¥Ü¥¿¥ó
-    back:¸¡º÷·ë²Ì²èÌÌ¡ÖÌá¤ë¡×¥Ü¥¿¥ó
+	search:¡Ö¸¡º÷¡×¥Ü¥¿¥ó
+	back:¸¡º÷·ë²Ì²èÌÌ¡ÖÌá¤ë¡×¥Ü¥¿¥ó
 */
 case 'delete':
 case 'search':
 case 'back':
-    //-- ÆþÎÏÃÍ¥³¥ó¥Ð¡¼¥È
-    $objPage->list_data = lfConvertParam($_POST, $arrSearchColumn);
-        
-    //-- ÆþÎÏ¥¨¥é¡¼¤Î¥Á¥§¥Ã¥¯
-    $objPage->arrErr = lfErrorCheck($objPage->list_data);
-
-    //-- ¸¡º÷³«»Ï
-    if (!is_array($objPage->arrErr)) {
-        $objPage->list_data['name'] = sfManualEscape($objPage->list_data['name']);
-        // hiddenÍ×ÁǺîÀ®
-        $objPage->arrHidden = lfGetHidden($objPage->list_data);
-
-        //-- ¸¡º÷¥Ç¡¼¥¿¼èÆÀ    
-        $objSelect = new SC_CustomerList($objPage->list_data, "magazine");
-        // À¸À®¤µ¤ì¤¿WHEREʸ¤ò¼èÆÀ¤¹¤ë     
-        list($where, $arrval) = $objSelect->getWhere();
-        // ¡ÖWHERE¡×Éôʬ¤òºï½ü¤¹¤ë¡£
-        $where = ereg_replace("^WHERE", "", $where);
-
-        // ¸¡º÷·ë²Ì¤Î¼èÆÀ
-        $objQuery = new SC_Query();
-        $from = "dtb_customer";
-
-        // ¹Ô¿ô¤Î¼èÆÀ
-        $linemax = $objQuery->count($from, $where, $arrval);
-        $objPage->tpl_linemax = $linemax;               // ²¿·ï¤¬³ºÅö¤·¤Þ¤·¤¿¡£É½¼¨ÍÑ
-        
-        // ¥Ú¡¼¥¸Á÷¤ê¤Î¼èÆÀ
-        $objNavi = new SC_PageNavi($_POST['search_pageno'], $linemax, SEARCH_PMAX, "fnResultPageNavi", NAVI_PMAX);
-        $objPage->arrPagenavi = $objNavi->arrPagenavi;  
-        $startno = $objNavi->start_row;
-
-        // ¼èÆÀÈϰϤλØÄê(³«»Ï¹ÔÈֹ桢¹Ô¿ô¤Î¥»¥Ã¥È)
-        $objQuery->setlimitoffset(SEARCH_PMAX, $startno);
-        // ɽ¼¨½ç½ø
-        $objQuery->setorder("customer_id DESC");
-        
-        // ¸¡º÷·ë²Ì¤Î¼èÆÀ  
-        $col = $objSelect->getMailMagazineColumn(lfGetIsMobile($_POST['mail_type']));
-        $objPage->arrResults = $objQuery->select($col, $from, $where, $arrval);
-        //¸½ºß»þ¹ï¤Î¼èÆÀ
-        $objPage->arrNowDate = lfGetNowDate();
-    }
-    break;
-/*
-    input:¸¡º÷·ë²Ì²èÌÌ¡ÖhtmlmailÆâÍÆÀßÄê¡×¥Ü¥¿¥ó
+	//-- ÆþÎÏÃÍ¥³¥ó¥Ð¡¼¥È
+	$objPage->list_data = lfConvertParam($_POST, $arrSearchColumn);
+		
+	//-- ÆþÎÏ¥¨¥é¡¼¤Î¥Á¥§¥Ã¥¯
+	$objPage->arrErr = lfErrorCheck($objPage->list_data);
+
+	//-- ¸¡º÷³«»Ï
+	if (!is_array($objPage->arrErr)) {
+		$objPage->list_data['name'] = sfManualEscape($objPage->list_data['name']);
+		// hiddenÍ×ÁǺîÀ®
+		$objPage->arrHidden = lfGetHidden($objPage->list_data);
+
+		//-- ¸¡º÷¥Ç¡¼¥¿¼èÆÀ	
+		$objSelect = new SC_CustomerList($objPage->list_data, "magazine");
+		// À¸À®¤µ¤ì¤¿WHEREʸ¤ò¼èÆÀ¤¹¤ë		
+		list($where, $arrval) = $objSelect->getWhere();
+		// ¡ÖWHERE¡×Éôʬ¤òºï½ü¤¹¤ë¡£
+		$where = ereg_replace("^WHERE", "", $where);
+
+		// ¸¡º÷·ë²Ì¤Î¼èÆÀ
+		$objQuery = new SC_Query();
+		$from = "dtb_customer";
+
+		// ¹Ô¿ô¤Î¼èÆÀ
+		$linemax = $objQuery->count($from, $where, $arrval);
+		$objPage->tpl_linemax = $linemax;				// ²¿·ï¤¬³ºÅö¤·¤Þ¤·¤¿¡£É½¼¨ÍÑ
+		
+		// ¥Ú¡¼¥¸Á÷¤ê¤Î¼èÆÀ
+		$objNavi = new SC_PageNavi($_POST['search_pageno'], $linemax, SEARCH_PMAX, "fnResultPageNavi", NAVI_PMAX);
+		$objPage->arrPagenavi = $objNavi->arrPagenavi;	
+		$startno = $objNavi->start_row;
+
+		// ¼èÆÀÈϰϤλØÄê(³«»Ï¹ÔÈֹ桢¹Ô¿ô¤Î¥»¥Ã¥È)
+		$objQuery->setlimitoffset(SEARCH_PMAX, $startno);
+		// ɽ¼¨½ç½ø
+		$objQuery->setorder("customer_id DESC");
+		
+		// ¸¡º÷·ë²Ì¤Î¼èÆÀ	
+		$col = $objSelect->getMailMagazineColumn(lfGetIsMobile($_POST['mail_type']));
+		$objPage->arrResults = $objQuery->select($col, $from, $where, $arrval);
+		//¸½ºß»þ¹ï¤Î¼èÆÀ
+		$objPage->arrNowDate = lfGetNowDate();
+	}
+	break;
+/*
+	input:¸¡º÷·ë²Ì²èÌÌ¡ÖhtmlmailÆâÍÆÀßÄê¡×¥Ü¥¿¥ó
 */
 case 'input':
-    //-- ÆþÎÏÃÍ¥³¥ó¥Ð¡¼¥È
-    $objPage->list_data = lfConvertParam($_POST, $arrSearchColumn);
-    //-- ÆþÎÏ¥¨¥é¡¼¤Î¥Á¥§¥Ã¥¯
-    $objPage->arrErr = lfErrorCheck($objPage->list_data);
-    //-- ¥¨¥é¡¼¤Ê¤·
-    if (!is_array($objPage->arrErr)) {
-        //-- ¸½ºß»þ¹ï¤Î¼èÆÀ
-        $objPage->arrNowDate = lfGetNowDate();
-        $objPage->arrHidden = lfGetHidden($objPage->list_data); // hiddenÍ×ÁǺîÀ®
-        $objPage->tpl_mainpage = 'mail/input.tpl';
-    }
-    break;
-/*
-    template:¥Æ¥ó¥×¥ì¡¼¥ÈÁªÂò
+	//-- ÆþÎÏÃÍ¥³¥ó¥Ð¡¼¥È
+	$objPage->list_data = lfConvertParam($_POST, $arrSearchColumn);
+	//-- ÆþÎÏ¥¨¥é¡¼¤Î¥Á¥§¥Ã¥¯
+	$objPage->arrErr = lfErrorCheck($objPage->list_data);
+	//-- ¥¨¥é¡¼¤Ê¤·
+	if (!is_array($objPage->arrErr)) {
+		//-- ¸½ºß»þ¹ï¤Î¼èÆÀ
+		$objPage->arrNowDate = lfGetNowDate();
+		$objPage->arrHidden = lfGetHidden($objPage->list_data); // hiddenÍ×ÁǺîÀ®
+		$objPage->tpl_mainpage = 'mail/input.tpl';
+	}
+	break;
+/*
+	template:¥Æ¥ó¥×¥ì¡¼¥ÈÁªÂò
 */
 case 'template':
-    //-- ÆþÎÏÃÍ¥³¥ó¥Ð¡¼¥È
-    $objPage->list_data = lfConvertParam($_POST, $arrSearchColumn);
-    
-    //-- »þ¹ïÀßÄê¤Î¼èÆÀ
-    $objPage->arrNowDate['year'] = $_POST['send_year'];
-    $objPage->arrNowDate['month'] = $_POST['send_month'];
-    $objPage->arrNowDate['day'] = $_POST['send_day'];
-    $objPage->arrNowDate['hour'] = $_POST['send_hour'];
-    $objPage->arrNowDate['minutes'] = $_POST['send_minutes'];
-    
-    //-- ÆþÎÏ¥¨¥é¡¼¤Î¥Á¥§¥Ã¥¯
-    $objPage->arrErr = lfErrorCheck($objPage->list_data);
-
-    //-- ¸¡º÷³«»Ï
-    if ( ! is_array($objPage->arrErr)) {
-        $objPage->list_data['name'] = sfManualEscape($objPage->list_data['name']);
-        $objPage->arrHidden = lfGetHidden($objPage->list_data); // hiddenÍ×ÁǺîÀ®
-    
-        $objPage->tpl_mainpage = 'mail/input.tpl';
-        $template_data = getTemplateData($conn, $_POST['template_id']);
-        if ( $template_data ){
-            foreach( $template_data as $key=>$val ){
-                $objPage->list_data[$key] = $val;
-            }
-        }
-
-        //-- HTML¥Æ¥ó¥×¥ì¡¼¥È¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢HTML¥½¡¼¥¹¤òÀ¸À®¤·¤ÆBODY¤ØÁÞÆþ
-        if ( $objPage->list_data["mail_method"] == 3) {
-            $objTemplate = new LC_HTMLtemplate;
-            $objTemplate->list_data = lfGetHtmlTemplateData($_POST['template_id']);
-            $objSiteInfo = new SC_SiteInfo();
-            $objTemplate->arrInfo = $objSiteInfo->data;
-            //¥á¡¼¥ëôÅö¼Ì¿¿¤Îɽ¼¨
-            $objUpFile = new SC_UploadFile(IMAGE_TEMP_URL, IMAGE_SAVE_URL);
-            $objUpFile->addFile("¥á¡¼¥ëôÅö¼Ì¿¿", 'charge_image', array('jpg'), IMAGE_SIZE, true, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT);
-            $objUpFile->setDBFileList($objTemplate->list_data);
-            $objTemplate->arrFile = $objUpFile->getFormFileList(IMAGE_TEMP_URL, IMAGE_SAVE_URL);
-            $objMakeTemplate = new SC_AdminView();
-            $objMakeTemplate->assignobj($objTemplate);      
-            $objPage->list_data["body"] = $objMakeTemplate->fetch("mail/html_template.tpl");
-        }
-    }
-    break;
-/*
-    regist_confirm:¡ÖÆþÎÏÆâÍƤò³Îǧ¡×
-    regist_back:¡Ö¥Æ¥ó¥×¥ì¡¼¥ÈÀßÄê²èÌ̤ØÌá¤ë¡×
-    regist_complete:¡ÖÅÐÏ¿¡×
-*/  
+	//-- ÆþÎÏÃÍ¥³¥ó¥Ð¡¼¥È
+	$objPage->list_data = lfConvertParam($_POST, $arrSearchColumn);
+	
+	//-- »þ¹ïÀßÄê¤Î¼èÆÀ
+	$objPage->arrNowDate['year'] = $_POST['send_year'];
+	$objPage->arrNowDate['month'] = $_POST['send_month'];
+	$objPage->arrNowDate['day'] = $_POST['send_day'];
+	$objPage->arrNowDate['hour'] = $_POST['send_hour'];
+	$objPage->arrNowDate['minutes'] = $_POST['send_minutes'];
+	
+	//-- ÆþÎÏ¥¨¥é¡¼¤Î¥Á¥§¥Ã¥¯
+	$objPage->arrErr = lfErrorCheck($objPage->list_data);
+
+	//-- ¸¡º÷³«»Ï
+	if ( ! is_array($objPage->arrErr)) {
+		$objPage->list_data['name'] = sfManualEscape($objPage->list_data['name']);
+		$objPage->arrHidden = lfGetHidden($objPage->list_data); // hiddenÍ×ÁǺîÀ®
+	
+		$objPage->tpl_mainpage = 'mail/input.tpl';
+		$template_data = getTemplateData($conn, $_POST['template_id']);
+		if ( $template_data ){
+			foreach( $template_data as $key=>$val ){
+				$objPage->list_data[$key] = $val;
+			}
+		}
+
+		//-- HTML¥Æ¥ó¥×¥ì¡¼¥È¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢HTML¥½¡¼¥¹¤òÀ¸À®¤·¤ÆBODY¤ØÁÞÆþ
+		if ( $objPage->list_data["mail_method"] == 3) {
+			$objTemplate = new LC_HTMLtemplate;
+			$objTemplate->list_data = lfGetHtmlTemplateData($_POST['template_id']);
+			$objSiteInfo = new SC_SiteInfo();
+			$objTemplate->arrInfo = $objSiteInfo->data;
+			//¥á¡¼¥ëôÅö¼Ì¿¿¤Îɽ¼¨
+			$objUpFile = new SC_UploadFile(IMAGE_TEMP_URL, IMAGE_SAVE_URL);
+			$objUpFile->addFile("¥á¡¼¥ëôÅö¼Ì¿¿", 'charge_image', array('jpg'), IMAGE_SIZE, true, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT);
+			$objUpFile->setDBFileList($objTemplate->list_data);
+			$objTemplate->arrFile = $objUpFile->getFormFileList(IMAGE_TEMP_URL, IMAGE_SAVE_URL);
+			$objMakeTemplate = new SC_AdminView();
+			$objMakeTemplate->assignobj($objTemplate);		
+			$objPage->list_data["body"] = $objMakeTemplate->fetch("mail/html_template.tpl");
+		}
+	}
+	break;
+/*
+	regist_confirm:¡ÖÆþÎÏÆâÍƤò³Îǧ¡×
+	regist_back:¡Ö¥Æ¥ó¥×¥ì¡¼¥ÈÀßÄê²èÌ̤ØÌá¤ë¡×
+	regist_complete:¡ÖÅÐÏ¿¡×
+*/	
 case 'regist_confirm':
 case 'regist_back':
 case 'regist_complete':
-    //-- ÆþÎÏÃÍ¥³¥ó¥Ð¡¼¥È
-    $arrCheckColumn = array_merge( $arrSearchColumn, $arrRegistColumn );
-    $objPage->list_data = lfConvertParam($_POST, $arrCheckColumn);
-    
-    //¸½ºß»þ¹ï¤Î¼èÆÀ
-    $objPage->arrNowDate = lfGetNowDate();
-
-    //-- ÆþÎÏ¥¨¥é¡¼¤Î¥Á¥§¥Ã¥¯
-    $objPage->arrErr = lfErrorCheck($objPage->list_data, 1);
-    $objPage->tpl_mainpage = 'mail/input.tpl';
-    $objPage->arrHidden = lfGetHidden($objPage->list_data); // hiddenÍ×ÁǺîÀ®
-    
-    //-- ¸¡º÷³«»Ï
-    if ( ! is_array($objPage->arrErr)) {
-            $objPage->list_data['name'] = sfManualEscape($objPage->list_data['name']);
-        if ( $_POST['mode'] == 'regist_confirm'){
-            $objPage->tpl_mainpage = 'mail/input_confirm.tpl';
-        } else if( $_POST['mode'] == 'regist_complete' ){
-            lfRegistData($objPage->list_data);
+	//-- ÆþÎÏÃÍ¥³¥ó¥Ð¡¼¥È
+	$arrCheckColumn = array_merge( $arrSearchColumn, $arrRegistColumn );
+	$objPage->list_data = lfConvertParam($_POST, $arrCheckColumn);
+	
+	//¸½ºß»þ¹ï¤Î¼èÆÀ
+	$objPage->arrNowDate = lfGetNowDate();
+
+	//-- ÆþÎÏ¥¨¥é¡¼¤Î¥Á¥§¥Ã¥¯
+	$objPage->arrErr = lfErrorCheck($objPage->list_data, 1);
+	$objPage->tpl_mainpage = 'mail/input.tpl';
+	$objPage->arrHidden = lfGetHidden($objPage->list_data); // hiddenÍ×ÁǺîÀ®
+	
+	//-- ¸¡º÷³«»Ï
+	if ( ! is_array($objPage->arrErr)) {
+			$objPage->list_data['name'] = sfManualEscape($objPage->list_data['name']);
+		if ( $_POST['mode'] == 'regist_confirm'){
+			$objPage->tpl_mainpage = 'mail/input_confirm.tpl';
+		} else if( $_POST['mode'] == 'regist_complete' ){
+			lfRegistData($objPage->list_data);
             //¥á¥ë¥Þ¥¬µ¡Ç½¤¬¥ª¥ó¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤É¤¦¤«¤ÎȽÄê
-            if(MELMAGA_SEND == true) {
+			if(MELMAGA_SEND == true) {
                 //ͽÌóÇÛ¿®¥â¡¼¥É¤Îʬ´ô
-                if(MELMAGA_BATCH_MODE) {
-                    header("Location: " . URL_DIR . "admin/mail/history.php");
-                } else {    
-                    header("Location: " . URL_DIR . "admin/mail/sendmail.php?mode=now");
-                }
-                exit;
-            } else {
-                sfErrorHeader(">> ËÜ¥µ¥¤¥È¤Ç¤Ï¥á¥ë¥Þ¥¬ÇÛ¿®¤Ï¹Ô¤¨¤Þ¤»¤ó¡£");
-            }
-        }
-    }
-    break;
+				if(MELMAGA_BATCH_MODE) {
+					header("Location: " . URL_DIR . "admin/mail/history.php");
+				} else {	
+					header("Location: " . URL_DIR . "admin/mail/sendmail.php?mode=now");
+				}
+				exit;
+			} else {
+				sfErrorHeader(">> ËÜ¥µ¥¤¥È¤Ç¤Ï¥á¥ë¥Þ¥¬ÇÛ¿®¤Ï¹Ô¤¨¤Þ¤»¤ó¡£");
+			}
+		}
+	}
+	break;
 default:
-    $objPage->list_data['mail_type'] = 1;
-    break;
+	$objPage->list_data['mail_type'] = 1;
+	break;
 }
 
 // ÇÛ¿®»þ´Ö¤Îǯ¤ò¡¢¡Ö¸½ºßǯ¢·¸½ºßǯ¡Ü£±¡×¤ÎÈϰϤËÀßÄê
 for ($year=date("Y"); $year<=date("Y") + 1;$year++){
-    $arrYear[$year] = $year;
-}
+	$arrYear[$year] = $year;
+}
+
+$objPage->arrIP = lfGetBlayn();
+
 $objPage->arrYear = $arrYear;
+$objPage->errorCount = count($objPage->arrErr);
+
 
 $objPage->arrCustomerOrderId = lfGetCustomerOrderId($_POST['buy_product_code']);
@@ -293,5 +298,5 @@
 
 $objPage->arrCampaignList = lfGetCampaignList();
-
+sfprintr(count($objPage->arrErr));
 //----¡¡¥Ú¡¼¥¸É½¼¨
 $objView->assignobj($objPage);
@@ -302,115 +307,115 @@
 // ¾¦ÉÊ¥³¡¼¥É¤Ç¸¡º÷¤µ¤ì¤¿¾ì¹ç¤Ë¥Ò¥Ã¥È¤·¤¿¼õÃíÈÖ¹æ¤ò¼èÆÀ¤¹¤ë¡£
 function lfGetCustomerOrderId($keyword) {
-    if($keyword != "") {
-        $col = "dtb_order.customer_id, dtb_order.order_id";
-        $from = "dtb_order LEFT JOIN dtb_order_detail USING(order_id)";
-        $where = "product_code LIKE ? AND del_flg = 0";
-        $val = sfManualEscape($keyword);
-        $arrVal[] = "%$val%";
-        $objQuery = new SC_Query();
-        $objQuery->setgroupby("customer_id, order_id");
-        $arrRet = $objQuery->select($col, $from, $where, $arrVal);
-        $arrCustomerOrderId = sfArrKeyValues($arrRet, "customer_id", "order_id");
-    }
-    return $arrCustomerOrderId; 
+	if($keyword != "") {
+		$col = "dtb_order.customer_id, dtb_order.order_id";
+		$from = "dtb_order LEFT JOIN dtb_order_detail USING(order_id)";
+		$where = "product_code LIKE ? AND del_flg = 0";
+		$val = sfManualEscape($keyword);
+		$arrVal[] = "%$val%";
+		$objQuery = new SC_Query();
+		$objQuery->setgroupby("customer_id, order_id");
+		$arrRet = $objQuery->select($col, $from, $where, $arrVal);
+		$arrCustomerOrderId = sfArrKeyValues($arrRet, "customer_id", "order_id");
+	}
+	return $arrCustomerOrderId;	
 }
 
 function lfMakeCsvData( $send_id ){
-        
-    global $conn;
-
-    $arrTitle  = array(  'name01','email');
-                
-    $sql = "SELECT name01,email FROM dtb_send_customer WHERE send_id = ? ORDER BY email";
-    $result = $conn->getAll($sql, array($send_id) );
-    
-    if ( $result ){
-        $return = lfGetCSVData( $result, $arrTitle);
-    }
-    return $return; 
+		
+	global $conn;
+
+	$arrTitle  = array(	 'name01','email');
+				
+	$sql = "SELECT name01,email FROM dtb_send_customer WHERE send_id = ? ORDER BY email";
+	$result = $conn->getAll($sql, array($send_id) );
+	
+	if ( $result ){
+		$return = lfGetCSVData( $result, $arrTitle);
+	}
+	return $return;	
 }
 
 //---- CSV½ÐÎÏÍѥǡ¼¥¿¼èÆÀ
-function lfGetCSVData( $array, $arrayIndex){    
-    
-    for ($i=0; $i<count($array); $i++){
-        
-        for ($j=0; $j<count($array[$i]); $j++ ){
-            if ( $j > 0 ) $return .= ",";
-            $return .= "\"";            
-            if ( $arrayIndex ){
-                $return .= mb_ereg_replace("<","¡ã",mb_ereg_replace( "\"","\"\"",$array[$i][$arrayIndex[$j]] )) ."\"";   
-            } else {
-                $return .= mb_ereg_replace("<","¡ã",mb_ereg_replace( "\"","\"\"",$array[$i][$j] )) ."\"";
-            }
-        }
-        $return .= "\n";            
-    }
-    return $return;
+function lfGetCSVData( $array, $arrayIndex){	
+	
+	for ($i=0; $i<count($array); $i++){
+		
+		for ($j=0; $j<count($array[$i]); $j++ ){
+			if ( $j > 0 ) $return .= ",";
+			$return .= "\"";			
+			if ( $arrayIndex ){
+				$return .= mb_ereg_replace("<","¡ã",mb_ereg_replace( "\"","\"\"",$array[$i][$arrayIndex[$j]] )) ."\"";	
+			} else {
+				$return .= mb_ereg_replace("<","¡ã",mb_ereg_replace( "\"","\"\"",$array[$i][$j] )) ."\"";
+			}
+		}
+		$return .= "\n";			
+	}
+	return $return;
 }
 
 //¸½ºß»þ¹ï¤Î¼èÆÀ¡ÊÇÛ¿®»þ´Ö¥Ç¥Õ¥©¥ë¥ÈÃÍ¡Ë
 function lfGetNowDate(){
-    $nowdate = date("Y/n/j/G/i");
-    list($year, $month, $day, $hour, $minute) = split("[/]", $nowdate);
-    $arrNowDate = array( 'year' => $year, 'month' => $month, 'day' => $day, 'hour' => $hour, 'minutes' => $minute);
-    foreach ($arrNowDate as $key => $val){
-        switch ($key){
-            case 'minutes':
-            $val = ereg_replace('^[0]','', $val);
-            if ($val < 30){
-            $list_date[$key] = '30';
-            }else{
-            $list_date[$key] = '00';
-            }
-            break;
-            case 'year':
-            case 'month':
-            case 'day':
-            $list_date[$key] = $val;
-            break;
-        }
-    }
-        if ($arrNowDate['minutes'] < 30){
-            $list_date['hour'] = $hour;
-        }else{
-            $list_date['hour'] = $hour + 1;
-        }
-    return $list_date;
+	$nowdate = date("Y/n/j/G/i");
+	list($year, $month, $day, $hour, $minute) = split("[/]", $nowdate);
+	$arrNowDate = array( 'year' => $year, 'month' => $month, 'day' => $day, 'hour' => $hour, 'minutes' => $minute);
+	foreach ($arrNowDate as $key => $val){
+		switch ($key){
+			case 'minutes':
+			$val = ereg_replace('^[0]','', $val);
+			if ($val < 30){
+			$list_date[$key] = '30';
+			}else{
+			$list_date[$key] = '00';
+			}
+			break;
+			case 'year':
+			case 'month':
+			case 'day':
+			$list_date[$key] = $val;
+			break;
+		}
+	}
+		if ($arrNowDate['minutes'] < 30){
+			$list_date['hour'] = $hour;
+		}else{
+			$list_date['hour'] = $hour + 1;
+		}
+	return $list_date;
 }
 
 // ÇÛ¿®ÆâÍƤÈÇÛ¿®¥ê¥¹¥È¤ò½ñ¤­¹þ¤à
 function lfRegistData($arrData){
-    
-    global $conn;
-    global $arrSearchColumn;
-    
-    $objQuery = new SC_Query();
-    $objSelect = new SC_CustomerList( lfConvertParam($arrData, $arrSearchColumn), "magazine" );
-    
-    $search_data = $conn->getAll($objSelect->getListMailMagazine(lfGetIsMobile($_POST['mail_type'])), $objSelect->arrVal);
-    $dataCnt = count($search_data);
-    $dtb_send_history = array();
-    
+	
+	global $conn;
+	global $arrSearchColumn;
+	
+	$objQuery = new SC_Query();
+	$objSelect = new SC_CustomerList( lfConvertParam($arrData, $arrSearchColumn), "magazine" );
+	
+	$search_data = $conn->getAll($objSelect->getListMailMagazine(lfGetIsMobile($_POST['mail_type'])), $objSelect->arrVal);
+	$dataCnt = count($search_data);
+	$dtb_send_history = array();
+	
     if(DB_TYPE == "pgsql"){
-       $dtb_send_history["send_id"] = $objQuery->nextval('dtb_send_history', 'send_id');
+	   $dtb_send_history["send_id"] = $objQuery->nextval('dtb_send_history', 'send_id');
     }
     
     $dtb_send_history["mail_method"] = $arrData['mail_method'];
-    $dtb_send_history["subject"] = $arrData['subject'];
-    $dtb_send_history["body"] = $arrData['body'];
-    if(MELMAGA_BATCH_MODE) {
-        //¥¤¥ó¥¹¥È¡¼¥ëÀè¤Î¥µ¡¼¥Ð¡¼¤ÇCRON¤¬Í­¸ú¤Ç¤¢¤ë¤Ê¤é»ØÄꤵ¤ì¤¿»þ´Ö¤Ë¥á¡¼¥ë¤òÁ÷¤ë
+	$dtb_send_history["subject"] = $arrData['subject'];
+	$dtb_send_history["body"] = $arrData['body'];
+	if(MELMAGA_BATCH_MODE) {
+		//¥¤¥ó¥¹¥È¡¼¥ëÀè¤Î¥µ¡¼¥Ð¡¼¤ÇCRON¤¬Í­¸ú¤Ç¤¢¤ë¤Ê¤é»ØÄꤵ¤ì¤¿»þ´Ö¤Ë¥á¡¼¥ë¤òÁ÷¤ë
         $dtb_send_history["start_date"] = $arrData['send_year'] ."/".$arrData['send_month']."/".$arrData['send_day']." ".$arrData['send_hour'].":".$arrData['send_minutes'];
-    } else {
-        //CRON¤¬Ìµ¸ú¤Ç¤¢¤ì¤Ð¥ê¥¢¥ë¥¿¥¤¥à¤ËÁ÷¿®¤¹¤ë
+	} else {
+		//CRON¤¬Ìµ¸ú¤Ç¤¢¤ì¤Ð¥ê¥¢¥ë¥¿¥¤¥à¤ËÁ÷¿®¤¹¤ë
         $dtb_send_history["start_date"] = "now()";
-    }
-    $dtb_send_history["creator_id"] = $_SESSION['member_id'];
-    $dtb_send_history["send_count"] = $dataCnt;
-    $arrData['body'] = "";
-    $dtb_send_history["search_data"] = serialize($arrData);
-    $dtb_send_history["update_date"] = "now()";
-    $dtb_send_history["create_date"] = "now()";
+	}
+	$dtb_send_history["creator_id"] = $_SESSION['member_id'];
+	$dtb_send_history["send_count"] = $dataCnt;
+	$arrData['body'] = "";
+	$dtb_send_history["search_data"] = serialize($arrData);
+	$dtb_send_history["update_date"] = "now()";
+	$dtb_send_history["create_date"] = "now()";
    
     //¥Ï¥Ã¥·¥ådtb_send_history¤ò¥Ç¡¼¥¿¥Ù¡¼¥¹dtb_send_history¤ËÁÞÆþ
@@ -420,48 +425,58 @@
     }
     
-    if ( is_array( $search_data ) ){
+	if ( is_array( $search_data ) ){
         foreach( $search_data as $line ){
             
             $dtb_send_customer = array();
-            $dtb_send_customer["customer_id"] = $line["customer_id"];
-            $dtb_send_customer["send_id"] = $dtb_send_history["send_id"];
-            $dtb_send_customer["email"] = $line["email"];
-            $dtb_send_customer["name"] = $line["name01"] . " " . $line["name02"];            
-            $conn->autoExecute("dtb_send_customer", $dtb_send_customer );                   
+			$dtb_send_customer["customer_id"] = $line["customer_id"];
+			$dtb_send_customer["send_id"] = $dtb_send_history["send_id"];
+			$dtb_send_customer["email"] = $line["email"];
+			$dtb_send_customer["name"] = $line["name01"] . " " . $line["name02"];            
+            $conn->autoExecute("dtb_send_customer", $dtb_send_customer );					
             
-        }   
-    }
+        }	
+	}
 }
 
 // ¥­¥ã¥ó¥Ú¡¼¥ó°ìÍ÷
 function lfGetCampaignList() {
+	
+	global $objQuery;
+	
+	$sql = "SELECT campaign_id, campaign_name FROM dtb_campaign ORDER BY update_date DESC";
+	$arrResult = $objQuery->getall($sql);
+
+	foreach($arrResult as $arrVal) {
+		$arrCampaign[$arrVal['campaign_id']] = $arrVal['campaign_name'];
+	}
+	return $arrCampaign;
+}
+
+function lfGetIsMobile($mail_type) {
+	// ¸¡º÷·ë²Ì¤Î¼èÆÀ			
+	$is_mobile = false;
+	switch($mail_type) {
+		case 1:
+			$is_mobile = false;
+			break;
+		case 2:
+			$is_mobile = true;		
+			break;
+		default:
+			$is_mobile = false;
+			break;
+	}
+	
+	return $is_mobile;
+}
+
+// ¥Ö¥ì¥¤¥ó¥¨¥ó¥¸¥ó¤¬ÀßÄêºÑ¤ß¤«³Îǧ
+function lfGetBlayn() {
     
     global $objQuery;
     
-    $sql = "SELECT campaign_id, campaign_name FROM dtb_campaign ORDER BY update_date DESC";
-    $arrResult = $objQuery->getall($sql);
-
-    foreach($arrResult as $arrVal) {
-        $arrCampaign[$arrVal['campaign_id']] = $arrVal['campaign_name'];
-    }
-    return $arrCampaign;
-}
-
-function lfGetIsMobile($mail_type) {
-    // ¸¡º÷·ë²Ì¤Î¼èÆÀ          
-    $is_mobile = false;
-    switch($mail_type) {
-        case 1:
-            $is_mobile = false;
-            break;
-        case 2:
-            $is_mobile = true;      
-            break;
-        default:
-            $is_mobile = false;
-            break;
-    }
+    $arrRet = $objQuery->count("dtb_blayn");
     
-    return $is_mobile;
+    return $arrRet;
 }
 ?>