Changeset 15120 for branches/beta/data/lib

Timestamp:

2007/07/24 21:57:44 (17 years ago)

Author:

adati

Message:

1.4.2betaのマージ

Location:

branches/beta/data/lib

Files:

• glib.php (modified) (1 diff)
• slib.php (modified) (4 diffs)

branches/beta/data/lib/glib.php

@@ -170 +170 @@
             for($i = $count; 1 <= $i; $i--) {
                 $move_number = $i + 1;
-                
-                if(file_exists("$path.$move_number")) unlink("$path.$move_number");
-                copy("$dirname/" . $arrLog[$i - 1], "$path.$move_number");      
-                
+                @copy("$dirname/" . $arrLog[$i - 1], "$path.$move_number");
             }
             $ret = copy($path, "$path.1");

branches/beta/data/lib/slib.php

@@ -16 +16 @@
 // Á´¥Ú¡¼¥¸¶¦ÄÌ¥¨¥é¡¼
 $GLOBAL_ERR = "";
-
 // ¥¤¥ó¥¹¥È¡¼¥ë½é´ü½èÍý
 sfInitInstall();
@@ -1711 +1710 @@
  *  $template_id ¤¬ 1¡§·ÈÂÓÍѥƥó¥×¥ì¡¼¥È¡¢0¡§PCÍѥƥó¥×¥ì¡¼¥È
  */
-function sfSendOrderMail($order_id, $template_id, $subject = "", $body, $send = true) {
+function sfSendOrderMail($order_id, $template_id, $subject = "", $body = "", $send = true) {
     global $arrMAILTPLPATH;
     
@@ -1747 +1746 @@
     $objPage->arrCustomer = $arrCustomer;
     $objPage->arrOrder = $arrOrder;
-
+    
     //¤½¤Î¾·èºÑ¾ðÊó
     if($arrOrder['memo02'] != "") {
@@ -1773 +1772 @@
     // ¥á¡¼¥ëËÜʸ¤Î¼èÆÀ
     $objMailView->assignobj($objPage);
-    $name = $objPage->arrCustomer['name01']." ".$objPage->arrCustomer['name02'];
+    $name = $objPage->arrOrder['order_name01']." ".$objPage->arrOrder['order_name02'];
     $objPage->tpl_body = ereg_replace( "(\{name\})", $name ,  $objPage->tpl_body );
     $tmp_subject = ereg_replace( "(\{name\})", $name ,  $tmp_subject );