Changeset 11627

Timestamp:

2007/03/08 23:50:35 (19 years ago)

Author:

uehara

Message:

 

Location:

branches/dev

Files:

• data/Smarty/templates/admin/mail/index.tpl (modified) (3 diffs)
• data/class/SC_CustomerList.php (modified) (3 diffs)
• data/conf/conf.php (modified) (1 diff)
• html/admin/mail/inc_mailmagazine.php (modified) (2 diffs)
• html/admin/mail/index.php (modified) (2 diffs)

branches/dev/data/Smarty/templates/admin/mail/index.tpl

@@ -264 +264 @@
                             <tr class="fs12n">
                                 <td bgcolor="#f2f1ec" width="110">¥­¥ã¥ó¥Ú¡¼¥ó</td>
-                                <td bgcolor="#ffffff" width="499" colspan="3">
+                                <td bgcolor="#ffffff" width="194" colspan="3">
                                     <select name="campaign_id" style="<!--{if $arrErr.campaign_id != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->">
                                         <option value="">ÁªÂò¤·¤Æ¤¯¤À¤µ¤¤</option>
@@ -270 +270 @@
                                     </select>
                                 </td>
+                                <td bgcolor="#f2f1ec" width="110">¥á¡¼¥ë¥¢¥É¥ì¥¹¼ïÊÌ</td>
+                                <td bgcolor="#ffffff" width="195">
+                                    <!--{html_checkboxes name="mail_type" options=$arrMailType separator="&nbsp;" selected=$list_data.mail_type}-->
+                                </td>                               
                             </tr>
                         </table>
@@ -380 +384 @@
                         <tr bgcolor="#636469" align="center" class="fs12n">
                             <td width="20"><span class="white">#</span></td>
-                            <td width="50"><span class="white">²ñ°÷ÈÖ¹æ</span></td>
-                            <td width="100"><span class="white">̾Á°</span></td>
-                            <td width="170"><span class="white">¥á¡¼¥ë¥¢¥É¥ì¥¹</span></td>                                                  
-                            <td width="170"><span class="white">¥á¡¼¥ë¥¢¥É¥ì¥¹(·ÈÂÓÍÑ)</span></td>  
+                            <td width="80"><span class="white">²ñ°÷ÈÖ¹æ</span></td>
+                            <td width="80"><span class="white">¼õÃíÈÖ¹æ</span></td>
+                            <td width="140"><span class="white">̾Á°</span></td>    
+                            <td width="190"><span class="white">¥á¡¼¥ë¥¢¥É¥ì¥¹</span></td>  
                             <td width="101"><span class="white">´õ˾ÇÛ¿®</span></td>
                             <td width="100"><span class="white">ÅÐÏ¿Æü</span></td>

branches/dev/data/class/SC_CustomerList.php

@@ -140 +140 @@
         //¡¡E-MAIL
         if (strlen($this->arrSql['email']) > 0) {
+
+            $search_all = 'all';
+            $search_pc = 'email';
+            $search_mobile = 'email_mobile';
+            
             //¥«¥ó¥Þ¶èÀÚ¤ê¤ÇÊ£¿ô¤Î¾ò·ï»ØÄê²Äǽ¤Ë
             $this->arrSql['email'] = explode(",", $this->arrSql['email']);
+            
+            //¡¡¥á¡¼¥ë¼ïÊÌ
+            if ( is_array( $this->arrSql['mail_type'] ) ){
+
+                if(in_array(MAIL_TYPE_PC, $this->arrSql['mail_type']) && !in_array(MAIL_TYPE_MOBILE, $this->arrSql['mail_type'])) {
+                    // PC¤Î¤ß¸¡º÷
+                    $search_patern = $search_pc;            
+                } else if(!in_array(MAIL_TYPE_PC, $this->arrSql['mail_type']) && in_array(MAIL_TYPE_MOBILE, $this->arrSql['mail_type'])) {
+                    // ¥â¥Ð¥¤¥ë¤Î¤ß¸¡º÷
+                    $search_patern = $search_mobile;
+                } else {
+                    // Á´¸¡º÷
+                    $search_patern = $search_all;
+                }
+                
+            } else {
+                // Á´¸¡º÷
+                $search_patern = $search_all;               
+            }
+
+
             $sql_where = "";
             foreach($this->arrSql['email'] as $val) {
@@ -147 +173 @@
                 //¸¡º÷¾ò·ï¤ò´Þ¤Þ¤Ê¤¤
                 if($this->arrSql['not_emailinc'] == '1') {
+                    
                     if($sql_where == "") {
-                        $sql_where .= "dtb_customer.email NOT ILIKE ? ";
+                        $sql_where .= "(dtb_customer.email NOT ILIKE ? OR dtb_customer.email_maile NOT ILIKE ?) ";
                     } else {
-                        $sql_where .= "AND dtb_customer.email NOT ILIKE ? ";
+                        $sql_where .= "AND (dtb_customer.email NOT ILIKE ? OR dtb_customer.email_maile NOT ILIKE ?) ";
                     }
+                    
                 } else {                
                     if($sql_where == "") {
-                        $sql_where .= "dtb_customer.email ILIKE ? ";
+                        $sql_where .= "(dtb_customer.email ILIKE ? OR dtb_customer.email_maile ILIKE ?) ";
                     } else {
-                        $sql_where .= "OR dtb_customer.email ILIKE ? ";
+                        $sql_where .= "OR (dtb_customer.email ILIKE ? OR dtb_customer.email_maile ILIKE ?)  ";
                     }
                 }
@@ -164 +192 @@
             $this->setWhere($sql_where);
         }
-    
-        //¡¡·ÈÂÓÍѥ᡼¥ë¥¢¥É¥ì¥¹
-        if (strlen($this->arrSql['email_mobile']) > 0) {
-            //¥«¥ó¥Þ¶èÀÚ¤ê¤ÇÊ£¿ô¤Î¾ò·ï»ØÄê²Äǽ¤Ë
-            $this->arrSql['email_mobile'] = explode(",", $this->arrSql['email_mobile']);
-            $sql_where = "";
-            foreach($this->arrSql['email_mobile'] as $val) {
-                $val = trim($val);
-                if($sql_where == "") {
-                    $sql_where .= "dtb_customer.email_mobile ILIKE ? ";
-                } else {
-                    $sql_where .= "OR dtb_customer.email_mobile ILIKE ? ";
-                }
-                $this->arrVal[] = $this->addSearchStr($val);
-            }
-            $this->setWhere($sql_where);
-        }
-        
-                
+                    
         //¡¡HTML-mail
         if ( $mode == 'magazine' ){

branches/dev/data/conf/conf.php

@@ -680 +680 @@
                 );
 
+/*¡¡¥á¡¼¥ë¥¢¥É¥ì¥¹¼ïÊÌ¡¡*/
+define ("MAIL_TYPE_PC",1);
+define ("MAIL_TYPE_MOBILE",1);
+$arrMailType = array(
+                    MAIL_TYPE_PC => "¥Ñ¥½¥³¥óÍÑ¥¢¥É¥ì¥¹",
+                    MAIL_TYPE_MOBILE => "·ÈÂÓÍÑ¥¢¥É¥ì¥¹",
+                );      
+                
+                
 /*¡¡1¹Ô¿ô¡¡*/       
 $arrPageRows = array(

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

@@ -44 +44 @@
                             array(  "column" => "job",              "convert" => "" ),
                             array(  "column" => "email",            "convert" => "a" ),
-                            array(  "column" => "email_mobile",         "convert" => "a" ),
                             array(  "column" => "htmlmail",         "convert" => "n" ),
                             array(  "column" => "customer",         "convert" => "" ),
@@ -75 +74 @@
                             ,array(  "column" => "buy_total_from",  "convert" => "n" )      
                             ,array(  "column" => "buy_total_to",    "convert" => "n" )
-                            ,array(  "column" => "campaign_id", "convert" => "" )                                           
-                         );
+                            ,array(  "column" => "campaign_id", "convert" => "" )
+                            ,array(  "column" => "mail_type",           "convert" => "a" )
+
+                    );
 
 //--------------------------------------------------------------------------------------------------------------------------------------

branches/dev/html/admin/mail/index.php

@@ -27 +27 @@
         global $arrSex;     
         $this->arrSex = $arrSex;
+        global $arrMailType;
+        $this->arrMailType = $arrMailType;
         global $arrPageRows;
         $this->arrPageRows = $arrPageRows;
@@ -92 +94 @@
         }
         $list_data['job_disp'] = $job_disp;
+    }
+    
+    // ¥á¡¼¥ë¼ïÊ̤ÎÊÑ´¹
+    if (count($list_data['mail_type']) > 0) {
+        foreach($list_data['mail_type'] as $key => $val){
+            $list_data['mail_type'][$key] = $objPage->arrMailType[$val];
+            $mail_type_disp .= $list_data['mail_type'][$key] . " ";
+        }
+        $list_data['mail_type_disp'] = $mail_type_disp;
     }