Changeset 20205 for branches/version-2_5-dev/data/class

Timestamp:

2011/02/19 19:48:25 (15 years ago)

Author:

fukuda

Message:

・/admin/mail/preview.php のリファクタリング
・使用していないmail_method=3に関するコードを削除

Location:

branches/version-2_5-dev/data/class

Files:

• helper/SC_Helper_Mail.php (modified) (1 diff)
• pages/admin/mail/LC_Page_Admin_Mail_Preview.php (modified) (1 diff)

branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php

@@ -355 +355 @@
         return $arrResults;
     }
+    
+    /**
+     * 保存されている送信履歴の取得
+     * @param integer 特定の送信履歴を取り出したい時はsend_idを指定。未指定時は全件取得
+     * @return　array 送信履歴情報を格納した配列
+     */
+    function sfGetSendHistory($send_id = null){
+        // 初期化
+        $where = '';
+        $objQuery =& SC_Query::getSingletonInstance();
+        
+        // 条件文
+        $where = 'del_flg = ?';
+        $arrValues[] = 0;
+        
+        //send_id指定時
+        if (SC_Utils_Ex::sfIsInt($send_id) === true) {
+            $where .= 'AND send_id = ?';
+            $arrValues[] = $send_id;
+        }
+        
+        // 表示順
+        $objQuery->setOrder("create_date DESC");
+        
+        $arrResults = $objQuery->select('*', 'dtb_send_history', $where, $arrValues);
+        return $arrResults;
+    }
 }
 ?>

branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php

@@ -63 +63 @@
      */
     function action() {
-        $objQuery = new SC_Query();
+        
+        $objMailHelper = new SC_Helper_Mail_Ex();
         $objSess = new SC_Session();
-        $objDate = new SC_Date();
-
         // 認証可否の判定
         SC_Utils_Ex::sfIsSuccess($objSess);
 
-        if (SC_Utils_Ex::sfIsInt($_GET['send_id'])
-                   || SC_Utils_Ex::sfIsInt($_GET['id'])){
-                       
-            if (is_numeric($_GET["send_id"])) {
-                $id = $_GET["send_id"];
-                $sql = "SELECT body, mail_method FROM dtb_send_history WHERE send_id = ?";
-            } else {
-                $sql = "SELECT body, mail_method FROM dtb_mailmaga_template WHERE template_id = ?";
-                $id = $_GET['id'];
+        switch ($this->getMode()) {
+        case 'template':
+            if (SC_Utils_Ex::sfIsInt($_GET['template_id'])){
+                $arrMail = $objMailHelper->sfGetMailTemplate($_GET['template_id']);
             }
-            $result = $objQuery->getAll($sql, array($id));
+            break;
+        case 'history';
+            if (SC_Utils_Ex::sfIsInt($_GET['send_id'])){
+                $arrMail = $objMailHelper->sfGetSendHistory($_GET['send_id']);
+            }
+            break;
+        default:
+        }
 
-            if ( $result ){
-                if ( $result[0]["mail_method"] == 2 ){
-                    // テキスト形式の時はタグ文字をエスケープ
-                    $this->escape_flag = 1;
-                }    
-                $this->body = $result[0]["body"];
-            }
-        }
+        $this->mail = $arrMail[0];
         $this->setTemplate($this->tpl_mainpage);
     }