Ignore:
Timestamp:
2007/06/14 22:01:13 (15 years ago)
Author:
adati
Message:

1.4.0a-betaのマージ

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/beta/html/admin/mail/index.php

    r13628 r14676  
    2929        global $arrMailType; 
    3030        $this->arrMailType = $arrMailType; 
     31        global $arrDomain; 
     32        $this->arrDomain = $arrDomain; 
    3133        global $arrPageRows; 
    3234        $this->arrPageRows = $arrPageRows; 
     
    4042        global $arrCustomerType; 
    4143        $this->arrCustomerType = $arrCustomerType; 
     44        global $arrDOMAIN; 
     45        $this->arrDomain = $arrDOMAIN; 
     46        $this->arrDomain[''] = "»ØÄꤷ¤Ê¤¤"; 
     47        $this->arrDomain[1] = $arrDOMAIN[1]; 
     48        $this->arrDomain[2] = $arrDOMAIN[2];  
    4249    } 
    4350} 
     
    7582    $list_data['pref_disp'] = $objPage->arrPref[$list_data['pref']]; 
    7683     
     84    //¥É¥á¥¤¥ó»ØÄê¤òÊÑ´¹ 
     85    $list_data['domain_disp'] = $objPage->arrDomain[$list_data['domain']]; 
     86     
    7787    // ÇÛ¿®·Á¼° 
    7888    $list_data['htmlmail_disp'] = $objPage->arrHtmlmail[$list_data['htmlmail']]; 
     
    134144        // À¸À®¤µ¤ì¤¿WHEREʸ¤ò¼èÆÀ¤¹¤ë       
    135145        list($where, $arrval) = $objSelect->getWhere(); 
    136      
    137146        // ¡ÖWHERE¡×Éôʬ¤òºï½ü¤¹¤ë¡£ 
    138147        $where = ereg_replace("^WHERE", "", $where); 
     
    145154        $linemax = $objQuery->count($from, $where, $arrval); 
    146155        $objPage->tpl_linemax = $linemax;               // ²¿·ï¤¬³ºÅö¤·¤Þ¤·¤¿¡£É½¼¨ÍÑ 
    147          
     156 
    148157        // ¥Ú¡¼¥¸Á÷¤ê¤Î¼èÆÀ 
    149158        $objNavi = new SC_PageNavi($_POST['search_pageno'], $linemax, SEARCH_PMAX, "fnResultPageNavi", NAVI_PMAX); 
     
    253262        } else if( $_POST['mode'] == 'regist_complete' ){ 
    254263            lfRegistData($objPage->list_data); 
     264            //¥á¥ë¥Þ¥¬µ¡Ç½¤¬¥ª¥ó¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤É¤¦¤«¤ÎȽÄê 
    255265            if(MELMAGA_SEND == true) { 
     266                //ͽÌóÇÛ¿®¥â¡¼¥É¤Îʬ´ô 
    256267                if(MELMAGA_BATCH_MODE) { 
    257268                    header("Location: " . URL_DIR . "admin/mail/history.php"); 
     
    275286    $arrYear[$year] = $year; 
    276287} 
     288 
     289$objPage->arrBlaynEngine = lfGetBlayn(); 
     290 
    277291$objPage->arrYear = $arrYear; 
    278292 
     
    380394    $search_data = $conn->getAll($objSelect->getListMailMagazine(lfGetIsMobile($_POST['mail_type'])), $objSelect->arrVal); 
    381395    $dataCnt = count($search_data); 
    382      
    383396    $dtb_send_history = array(); 
    384397     
    385     if(DB_TYPE == "pgsql"){ 
    386         $dtb_send_history["send_id"] = $objQuery->nextval('dtb_send_history', 'send_id'); 
     398    if(DB_TYPE == "pgsql"){ 
     399       $dtb_send_history["send_id"] = $objQuery->nextval('dtb_send_history', 'send_id'); 
    387400    } 
     401     
    388402    $dtb_send_history["mail_method"] = $arrData['mail_method']; 
    389403    $dtb_send_history["subject"] = $arrData['subject']; 
    390404    $dtb_send_history["body"] = $arrData['body']; 
    391405    if(MELMAGA_BATCH_MODE) { 
    392         $dtb_send_history["start_date"] = $arrData['send_year'] ."/".$arrData['send_month']."/".$arrData['send_day']." ".$arrData['send_hour'].":".$arrData['send_minutes']; 
     406        //¥¤¥ó¥¹¥È¡¼¥ëÀè¤Î¥µ¡¼¥Ð¡¼¤ÇCRON¤¬Í­¸ú¤Ç¤¢¤ë¤Ê¤é»ØÄꤵ¤ì¤¿»þ´Ö¤Ë¥á¡¼¥ë¤òÁ÷¤ë 
     407        $dtb_send_history["start_date"] = $arrData['send_year'] ."/".$arrData['send_month']."/".$arrData['send_day']." ".$arrData['send_hour'].":".$arrData['send_minutes']; 
    393408    } else { 
    394         $dtb_send_history["start_date"] = "now()"; 
     409        //CRON¤¬Ìµ¸ú¤Ç¤¢¤ì¤Ð¥ê¥¢¥ë¥¿¥¤¥à¤ËÁ÷¿®¤¹¤ë 
     410        $dtb_send_history["start_date"] = "now()"; 
    395411    } 
    396412    $dtb_send_history["creator_id"] = $_SESSION['member_id']; 
     
    400416    $dtb_send_history["update_date"] = "now()"; 
    401417    $dtb_send_history["create_date"] = "now()"; 
    402     $objQuery->insert("dtb_send_history", $dtb_send_history );   
    403     if(DB_TYPE == "mysql"){ 
     418    
     419    //¥Ï¥Ã¥·¥ådtb_send_history¤ò¥Ç¡¼¥¿¥Ù¡¼¥¹dtb_send_history¤ËÁÞÆþ 
     420    $objQuery->insert("dtb_send_history", $dtb_send_history ); 
     421    if(DB_TYPE == "mysql"){ 
    404422        $dtb_send_history["send_id"] = $objQuery->nextval('dtb_send_history','send_id'); 
    405423    } 
    406424     
    407425    if ( is_array( $search_data ) ){ 
    408         foreach( $search_data as $line ){ 
    409             $dtb_send_customer = array(); 
     426        foreach( $search_data as $line ){ 
     427             
     428            $dtb_send_customer = array(); 
    410429            $dtb_send_customer["customer_id"] = $line["customer_id"]; 
    411430            $dtb_send_customer["send_id"] = $dtb_send_history["send_id"]; 
    412431            $dtb_send_customer["email"] = $line["email"]; 
    413              
    414             $dtb_send_customer["name"] = $line["name01"] . " " . $line["name02"]; 
    415                  
    416             $conn->autoExecute("dtb_send_customer", $dtb_send_customer );                    
    417         }    
    418     }    
     432            $dtb_send_customer["name"] = $line["name01"] . " " . $line["name02"];             
     433            $conn->autoExecute("dtb_send_customer", $dtb_send_customer );                    
     434             
     435        }    
     436    } 
    419437} 
    420438 
     
    430448        $arrCampaign[$arrVal['campaign_id']] = $arrVal['campaign_name']; 
    431449    } 
    432  
    433450    return $arrCampaign; 
    434451} 
     
    451468    return $is_mobile; 
    452469} 
     470 
     471// ¥Ö¥ì¥¤¥ó¥¨¥ó¥¸¥ó¤¬ÀßÄêºÑ¤ß¤«³Îǧ 
     472function lfGetBlayn() { 
     473     
     474    global $objQuery; 
     475     
     476    $arrRet[now_version] = $objQuery->count("dtb_module", "now_version = (SELECT now_version FROM dtb_module WHERE main_php='blayn/blayn.php')"); 
     477    $arrRet[blayn_ip] = $objQuery->count("dtb_blayn"); 
     478    return $arrRet; 
     479} 
    453480?> 
Note: See TracChangeset for help on using the changeset viewer.