Index: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php	(revision 20168)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php	(revision 20203)
@@ -80,5 +80,5 @@
             // テンプレートプルダウン変更時
 
-            if ( SC_Utils_Ex::sfCheckNumLength( $_POST['template_id']) ){
+            if ( SC_Utils_Ex::sfIsInt( $_POST['template_id']) ){
                 $result = $this->lfGetMailTemplateByTemplateID($_POST['template_id']);
                 if ( $result ){
@@ -90,5 +90,5 @@
             break;
         case 'regist':
-            if (SC_Utils_Ex::sfCheckNumLength( $_POST['template_id']) ){
+            if (SC_Utils_Ex::sfIsInt( $_POST['template_id']) ){
 
                 // POSTデータの引き継ぎ
Index: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php	(revision 20198)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php	(revision 20203)
@@ -173,5 +173,5 @@
              query:配信履歴「確認」
             */
-            if (SC_Utils_Ex::sfCheckNumLength($_GET["send_id"])) {
+            if (SC_Utils_Ex::sfIsInt($_GET["send_id"])) {
                 // 送信履歴より、送信条件確認画面
                 $sql = "SELECT search_data FROM dtb_send_history WHERE send_id = ?";
@@ -675,5 +675,5 @@
     function getTemplateData(&$objQuery, $id){
 
-        if ( SC_Utils_Ex::sfCheckNumLength($id) ){
+        if ( SC_Utils_Ex::sfIsInt($id) ){
             $sql = "SELECT * FROM dtb_mailmaga_template WHERE template_id = ? ORDER BY template_id DESC";
             $result = $objQuery->getAll( $sql, array($id) );
Index: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php	(revision 20116)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php	(revision 20203)
@@ -82,5 +82,5 @@
         case 'delete':
             // 削除時
-            if (SC_Utils_Ex::sfCheckNumLength($_GET['send_id'])) {
+            if (SC_Utils_Ex::sfIsInt($_GET['send_id'])) {
                 $sql = "UPDATE dtb_send_history SET del_flg = 1 WHERE send_id = ?";
                 $objQuery->query($sql, array($_GET['send_id']) );
Index: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php	(revision 20198)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php	(revision 20203)
@@ -70,53 +70,7 @@
         SC_Utils_Ex::sfIsSuccess($objSess);
 
-        if (!isset($_POST['body'])) $_POST['body'] = "";
-        if (!isset($_REQUEST['method'])) $_REQUEST['method'] = "";
-        if (!isset($_REQUEST['id'])) $_REQUEST['id'] = "";
-        if (!isset($_GET['send_id'])) $_GET['send_id'] = "";
-
-        if ( $_POST['body'] ){
-            $this->body = $_POST['body'];
-
-            // HTMLメールテンプレートのプレビュー
-        } elseif ($_REQUEST["method"] == "template"
-                  && SC_Utils_Ex::sfCheckNumLength($_REQUEST['id'])) {
-
-            $sql = "SELECT * FROM dtb_mailmaga_template WHERE template_id = ?";
-            $result = $objQuery->getAll($sql, array($_REQUEST["id"]));
-            $this->list_data = $result[0];
-
-            // メイン商品の情報取得
-            // FIXME SC_Product クラスを使用した実装
-            $sql = "SELECT name, main_image, point_rate, deliv_fee, price01_min, price01_max, price02_min, price02_max FROM vw_products_allclass AS allcls WHERE product_id = ?";
-            $main = $objQuery->getAll($sql, array($this->list_data["main_product_id"]));
-            $this->list_data["main"] = $main[0];
-
-            // サブ商品の情報取得
-            // FIXME SC_Product クラスを使用した実装
-            $sql = "SELECT product_id, name, main_list_image, price01_min, price01_max, price02_min, price02_max FROM vw_products_allclass WHERE product_id = ?";
-            $k = 0;
-            $l = 0;
-            for ($i = 1; $i <= 12; $i ++) {
-                if ($l == 4) {
-                    $l = 0;
-                    $k ++;
-                }
-                $result = "";
-                $j = sprintf("%02d", $i);
-                if ($i > 0 && $i < 5 ) $k = 0;
-                if ($i > 4 && $i < 9 ) $k = 1;
-                if ($i > 8 && $i < 13 ) $k = 2;
-
-                if (is_numeric($this->list_data["sub_product_id" .$j])) {
-                    $result = $objQuery->getAll($sql, array($this->list_data["sub_product_id" .$j]));
-                    $this->list_data["sub"][$k][$l] = $result[0];
-                    $this->list_data["sub"][$k]["data_exists"] = "OK";	//当該段にデータが１つ以上存在するフラグ
-                }
-                $l ++;
-            }
-            $this->tpl_mainpage = 'mail/html_template.tpl';
-
-        } elseif (SC_Utils_Ex::sfCheckNumLength($_GET['send_id'])
-                   || SC_Utils_Ex::sfCheckNumLength($_GET['id'])){
+        if (SC_Utils_Ex::sfIsInt($_GET['send_id'])
+                   || SC_Utils_Ex::sfIsInt($_GET['id'])){
+                       
             if (is_numeric($_GET["send_id"])) {
                 $id = $_GET["send_id"];
@@ -132,5 +86,5 @@
                     // テキスト形式の時はタグ文字をエスケープ
                     $this->escape_flag = 1;
-                }
+                }    
                 $this->body = $result[0]["body"];
             }
Index: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php	(revision 20198)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php	(revision 20203)
@@ -78,5 +78,5 @@
         switch ($this->getMode()) {
         case 'delete':
-            if ( SC_Utils_Ex::sfCheckNumLength($_GET['id'])===true ){
+            if ( SC_Utils_Ex::sfIsInt($_GET['id'])===true ){
                 $this->lfDeleteMailTemplate($_GET['id']);
                 $this->objDisplay->reload(null, true);
@@ -86,5 +86,5 @@
             break;
         }
-        $this->list_data = $objMailHelper->sfGetMailTemplate();
+        $this->arrTemplates = $objMailHelper->sfGetMailTemplate();
     }
 
@@ -105,7 +105,8 @@
     function lfDeleteMailTemplate($template_id){
         $objQuery =& SC_Query::getSingletonInstance();
-        $sqlval["del_flg"] = "1";
-        $arrValIn[] = $template_id;
-        $objQuery->update("dtb_mailmaga_template", $sqlval, "template_id = ?", $arrValIn);
+        $objQuery->update("dtb_mailmaga_template",
+                          array('del_flg' =>1),
+                          "template_id = ?",
+                          array($template_id));
     }
 
Index: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php	(revision 20116)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php	(revision 20203)
@@ -91,5 +91,5 @@
         case 'edit':
             // モードによる処理分岐
-            if ( SC_Utils_Ex::sfCheckNumLength($_GET['template_id'])===true ){
+            if ( SC_Utils_Ex::sfIsInt($_GET['template_id'])===true ){
                 // 編集
                 $sql = "SELECT * FROM dtb_mailmaga_template WHERE template_id = ? AND del_flg = 0";
Index: branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php	(revision 20116)
+++ branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php	(revision 20203)
@@ -116,5 +116,5 @@
 
         // カテゴリID取得 無いときはトップページ
-        if ( SC_Utils_Ex::sfCheckNumLength($_POST['category_id']) ){
+        if ( SC_Utils_Ex::sfIsInt($_POST['category_id']) ){
             $this->category_id = $_POST['category_id'];
         } else {
Index: branches/version-2_5-dev/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_5-dev/data/class/util/SC_Utils.php	(revision 20133)
+++ branches/version-2_5-dev/data/class/util/SC_Utils.php	(revision 20203)
@@ -671,19 +671,4 @@
     }
 
-    /* DBに渡す数値のチェック
-     * 10桁以上はオーバーフローエラーを起こすので。
-     */
-    function sfCheckNumLength( $value ){
-        if ( ! is_numeric($value)  ){
-            return false;
-        }
-
-        if ( strlen($value) > 9 ) {
-            return false;
-        }
-
-        return true;
-    }
-
     // 一致した値のキー名を取得
     function sfSearchKey($array, $word, $default) {
Index: branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php	(revision 20198)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php	(revision 20203)
@@ -331,12 +331,11 @@
     /**
      * 保存されているメールテンプレートの取得
-     * @param array $arrParams 特定IDのテンプレートを取り出したい時は$arrParams['template_id']で指定
+     * @param integer 特定IDのテンプレートを取り出したい時はtemplate_idを指定。未指定時は全件取得
      * @return　array メールテンプレート情報を格納した配列
      * @todo   表示順も引数で変更できるように
      */
-    function sfGetMailTemplate($arrParams = array()){
+    function sfGetMailTemplate($template_id = null){
         // 初期化
         $where = '';
-        $arrValues = array();
         $objQuery =& SC_Query::getSingletonInstance();
         
@@ -345,7 +344,7 @@
         $arrValues[] = 0;
         //template_id指定時
-        if (isset($arrParams['template_id'])) {
+        if (SC_Utils_Ex::sfIsInt($template_id) === true) {
             $where .= 'AND template_id = ?';
-            $arrValues[] = $arrParams['template_id'];
+            $arrValues[] = $template_id;
         }