Changeset 14676 for branches/beta/data/lib

Timestamp:

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

Author:

adati

Message:

1.4.0a-betaのマージ

Location:

branches/beta/data/lib

Files:

• glib.php (modified) (3 diffs)
• slib.php (modified) (6 diffs)

branches/beta/data/lib/glib.php

@@ -86 +86 @@
  * [Ãí¼á] -
  *----------------------------------------------------------------------*/
-function gfDebugLog($obj){
+function gfDebugLog($obj, $path = DEBUG_LOG_PATH){
         gfPrintLog("*** start Debug ***");
         ob_start();
@@ -92 +92 @@
         $buffer = ob_get_contents();
         ob_end_clean();
-        $fp = fopen(LOG_PATH, "a+");
+        $fp = fopen($path, "a+");
         fwrite( $fp, $buffer."\n" );
         fclose( $fp );
@@ -98 +98 @@
 
         // ¥í¥°¥Æ¡¼¥·¥ç¥ó
-        gfLogRotation(MAX_LOG_QUANTITY, MAX_LOG_SIZE, LOG_PATH);
+        gfLogRotation(MAX_LOG_QUANTITY, MAX_LOG_SIZE, $path);
 }
 

branches/beta/data/lib/slib.php

@@ -1659 +1659 @@
 }
 
-/* ¼õÃí´°Î»¥á¡¼¥ëÁ÷¿® */
-function sfSendOrderMail($order_id, $template_id, $subject = "", $header = "", $footer = "", $send = true) {
+/** ¼õÃí´°Î»¥á¡¼¥ëÁ÷¿®
+ *  $template_id ¤¬ 1¡§·ÈÂÓÍѥƥó¥×¥ì¡¼¥È¡¢0¡§PCÍѥƥó¥×¥ì¡¼¥È
+ */
+function sfSendOrderMail($order_id, $template_id, $subject = "", $body, $send = true) {
     global $arrMAILTPLPATH;
     
@@ -1670 +1672 @@
     $objQuery = new SC_Query();
         
-    if($subject == "" && $header == "" && $footer == "") {
+    if($subject == "" && $body == "" ) {
         // ¥á¡¼¥ë¥Æ¥ó¥×¥ì¡¼¥È¾ðÊó¤Î¼èÆÀ
         $where = "template_id = ?";
-        $arrRet = $objQuery->select("subject, header, footer", "dtb_mailtemplate", $where, array('1'));
-        $objPage->tpl_header = $arrRet[0]['header'];
-        $objPage->tpl_footer = $arrRet[0]['footer'];
+        $arrRet = $objQuery->select("subject, body", "dtb_mailtemplate", $where, array($template_id));
+        $objPage->tpl_body = $arrRet[0]['body'];
         $tmp_subject = $arrRet[0]['subject'];
     } else {
-        $objPage->tpl_header = $header;
-        $objPage->tpl_footer = $footer;
+        $objPage->tpl_body = $body;
         $tmp_subject = $subject;
     }
@@ -1693 +1693 @@
     // ¸ÜµÒ¾ðÊó¤Î¼èÆÀ
     $customer_id = $arrOrder['customer_id'];
-    $arrRet = $objQuery->select("point", "dtb_customer", "customer_id = ?", array($customer_id));
+    $arrRet = $objQuery->select("point,name01,name02", "dtb_customer", "customer_id = ?", array($customer_id));
     $arrCustomer = $arrRet[0];
 
@@ -1724 +1724 @@
     // ¥á¡¼¥ëËÜʸ¤Î¼èÆÀ
     $objMailView->assignobj($objPage);
-    $body = $objMailView->fetch($arrMAILTPLPATH[$template_id]);
-    
+    $name = $objPage->arrCustomer['name01']." ".$objPage->arrCustomer['name02'];
+    $objPage->tpl_body = ereg_replace( "(\{name\})", $name ,  $objPage->tpl_body );
+    $tmp_subject = ereg_replace( "(\{name\})", $name ,  $tmp_subject );
+    
+    // $template_id==1¤Ï·ÈÂÓÍÑ
+    if($template_id == '1'){
+       $body = $objMailView->fetch($arrMAILTPLPATH[1]);
+       $body = ereg_replace( "(\{order\})", $body ,  $objPage->tpl_body );
+    }else{
+       $body = $objMailView->fetch($arrMAILTPLPATH[0]); 
+       $body = ereg_replace( "(\{order\})", $body ,  $objPage->tpl_body );
+    }
+    
     // ¥á¡¼¥ëÁ÷¿®½èÍý
     $objSendMail = new GC_SendMail();
@@ -1744 +1755 @@
         }
     }
-
     return $objSendMail;
 }
@@ -2923 +2933 @@
 }
 
-/* ¥Ç¥Ð¥Ã¥°ÍÑ ------------------------------------------------------------------------------------------------*/
-function sfPrintR($obj) {
-    print("<div style='font-size: 12px;color: #00FF00;'>\n");
-    print("<strong>**¥Ç¥Ð¥Ã¥°Ãæ**</strong><br />\n");
-    print("<pre>\n");
-    print_r($obj);
-    print("</pre>\n");
-    print("<strong>**¥Ç¥Ð¥Ã¥°Ãæ**</strong></div>\n");
+/** ¥Ç¥Ð¥Ã¥°ÍÑ´Ø¿ô **/
+
+/**
+ *  ÅϤµ¤ì¤¿ÊÑ¿ô¤òDump¤¹¤ë
+ *
+ *  @param  mixed  $obj   Dump¤·¤¿¤¤ÊÑ¿ô
+ *  @param  string $color ½ÐÎϤ¹¤ë¿§
+ *  
+ *  @return void ¤Ê¤·
+ */
+function sfPrintR($obj, $color='green') {
+    if ( DEBUG_MODE === false ) {
+        return;
+    }
+    
+    $arrColor = array(
+        'green' => '#00FF00',
+        'red'   => '#FF0000',
+        'blue'  => '#0000FF'
+    );
+    
+    if ( empty($arrColor[$color]) ) {
+        $color = $arrColor['green'];
+    } else {
+        $color = $arrColor[$color];
+    }
+    
+    print("<div style='font-size: 12px;color: $color;'>\n");
+    print("<strong>**¥Ç¥Ð¥Ã¥°Ãæ**</strong><br />\n");
+    print("<pre>\n");
+    print_r($obj);
+    print("</pre>\n");
+    print("<strong>**¥Ç¥Ð¥Ã¥°Ãæ**</strong></div>\n");
 }