Changeset 18758 for trunk/data/class/pages/admin/mail

Timestamp:

2010/07/20 13:25:33 (16 years ago)

Author:

kajiwara

Message:

EC-CUBE Ver2.4.4 分コミット。詳細はこちら（ http://www.ec-cube.net/release/detail.php?release_id=223）

Location:

trunk/data/class/pages/admin/mail

Files:

• LC_Page_Admin_Mail.php (modified) (4 diffs)
• LC_Page_Admin_Mail_History.php (modified) (2 diffs)
• LC_Page_Admin_Mail_Preview.php (modified) (1 diff)
• LC_Page_Admin_Mail_Sendmail.php (modified) (1 diff)
• LC_Page_Admin_Mail_Template.php (modified) (2 diffs)
• LC_Page_Admin_Mail_TemplateInput.php (modified) (1 diff)

trunk/data/class/pages/admin/mail/LC_Page_Admin_Mail.php

@@ -3 +3 @@
  * This file is part of EC-CUBE
  *
- * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
  *
  * http://www.lockon.co.jp/
@@ -253 +253 @@
 
                 // 取得範囲の指定(開始行番号、行数のセット)
-                $objQuery->setlimitoffset(SEARCH_PMAX, $startno);
+                $objQuery->setLimitOffset(SEARCH_PMAX, $startno);
                 // 表示順序
-                $objQuery->setorder("customer_id DESC");
+                $objQuery->setOrder("customer_id DESC");
 
                 // 検索結果の取得
@@ -412 +412 @@
             $arrVal[] = "%$val%";
             $objQuery = new SC_Query();
-            $objQuery->setgroupby("customer_id, order_id");
+            $objQuery->setGroupBy("customer_id, order_id");
             $arrRet = $objQuery->select($col, $from, $where, $arrVal);
             $arrCustomerOrderId = SC_Utils_Ex::sfArrKeyValues($arrRet, "customer_id", "order_id");
@@ -510 +510 @@
         $arrCampaign = null;
         $sql = "SELECT campaign_id, campaign_name FROM dtb_campaign ORDER BY update_date DESC";
-        $arrResult = $objQuery->getall($sql);
+        $arrResult = $objQuery->getAll($sql);
 
         foreach($arrResult as $arrVal) {

trunk/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php

@@ -3 +3 @@
  * This file is part of EC-CUBE
  *
- * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
  *
  * http://www.lockon.co.jp/
@@ -96 +96 @@
 
         // 取得範囲の指定(開始行番号、行数のセット)
-        $objQuery->setlimitoffset(SEARCH_PMAX, $startno);
+        $objQuery->setLimitOffset(SEARCH_PMAX, $startno);
 
         // 表示順序
         $order = "start_date DESC, send_id DESC";
-        $objQuery->setorder($order);
+        $objQuery->setOrder($order);
 
         // 検索結果の取得

trunk/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php

@@ -3 +3 @@
  * This file is part of EC-CUBE
  *
- * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
  *
  * http://www.lockon.co.jp/

trunk/data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php

@@ -3 +3 @@
  * This file is part of EC-CUBE
  *
- * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
  *
  * http://www.lockon.co.jp/

trunk/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php

@@ -3 +3 @@
  * This file is part of EC-CUBE
  *
- * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
  *
  * http://www.lockon.co.jp/
@@ -89 +89 @@
         $sql = "SELECT *, create_date as disp_date FROM dtb_mailmaga_template WHERE del_flg = 0 ORDER BY create_date DESC";
         $this->list_data = $conn->getAll($sql);
-        $this->list_data['disp_date'] = substr($this->list_data['disp_date'], 0, 19);
 
         $objView->assignobj($this);

trunk/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php

@@ -3 +3 @@
  * This file is part of EC-CUBE
  *
- * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
  *
  * http://www.lockon.co.jp/