Changeset 14676 for branches/beta/html/admin/mail/inc_mailmagazine.php

Timestamp:

2007/06/14 22:01:13 (17 years ago)

Author:

adati

Message:

1.4.0a-betaのマージ

File:

• branches/beta/html/admin/mail/inc_mailmagazine.php (modified) (3 diffs)

branches/beta/html/admin/mail/inc_mailmagazine.php

@@ -70 +70 @@
                             array(  "column" => "buy_end_month",    "convert" => "n" ),
                             array(  "column" => "buy_end_day",      "convert" => "n" ),
-                            array(  "column" => "buy_product_code", "convert" => "aKV" )
-                            ,array(  "column" => "buy_product_name",    "convert" => "aKV" )
-                            ,array(  "column" => "category_id", "convert" => "" )           
-                            ,array(  "column" => "buy_total_from",  "convert" => "n" )      
-                            ,array(  "column" => "buy_total_to",    "convert" => "n" )
-                            ,array(  "column" => "campaign_id", "convert" => "" )
-                            ,array(  "column" => "mail_type",           "convert" => "" )
-
+                            array(  "column" => "buy_product_code", "convert" => "aKV" ),
+                            array(  "column" => "buy_product_name", "convert" => "aKV" ),
+                            array(  "column" => "category_id",      "convert" => ""  ),     
+                            array(  "column" => "buy_total_from",   "convert" => "n" ), 
+                            array(  "column" => "buy_total_to",     "convert" => "n" ),
+                            array(  "column" => "campaign_id",      "convert" => ""  ),
+                            array(  "column" => "mail_type",        "convert" => ""  ),
+                            array(  "column" => "domain",           "convert" => "" )
                     );
 
@@ -216 +216 @@
     if ( $flag ){
         $objErr->doFunc(array("¥Æ¥ó¥×¥ì¡¼¥È", "template_id"), array("EXIST_CHECK", "NUM_CHECK"));
-        $objErr->doFunc(array("¥á¡¼¥ëÁ÷¿®Ë¡Ë¡", "mail_method"), array("EXIST_CHECK", "NUM_CHECK"));
+        $objErr->doFunc(array("¥á¡¼¥ëÁ÷¿®ÊýË¡", "mail_method"), array("EXIST_CHECK", "NUM_CHECK"));
         
         if(MELMAGA_BATCH_MODE) {
@@ -230 +230 @@
         $objErr->doFunc(array("ËÜʸ", 'body', LLTEXT_LEN), array("EXIST_CHECK","MAX_LENGTH_CHECK"));    // HTML¥Æ¥ó¥×¥ì¡¼¥È¤ò»ÈÍѤ·¤Ê¤¤¾ì¹ç
     }
-    
+
     return $objErr->arrErr;
 }