Index: trunk/data/class/SC_CustomerList.php
===================================================================
--- trunk/data/class/SC_CustomerList.php	(revision 18007)
+++ trunk/data/class/SC_CustomerList.php	(revision 18562)
Index: trunk/data/class/SC_DbConn.php
===================================================================
--- trunk/data/class/SC_DbConn.php	(revision 18432)
+++ trunk/data/class/SC_DbConn.php	(revision 18562)
Index: trunk/data/class/helper/SC_Helper_Mobile.php
===================================================================
--- trunk/data/class/helper/SC_Helper_Mobile.php	(revision 17659)
+++ trunk/data/class/helper/SC_Helper_Mobile.php	(revision 18562)
Index: trunk/data/class/helper/SC_Helper_PageLayout.php
===================================================================
--- trunk/data/class/helper/SC_Helper_PageLayout.php	(revision 17340)
+++ trunk/data/class/helper/SC_Helper_PageLayout.php	(revision 18562)
Index: trunk/data/class/helper/SC_Helper_CSV.php
===================================================================
--- trunk/data/class/helper/SC_Helper_CSV.php	(revision 18177)
+++ trunk/data/class/helper/SC_Helper_CSV.php	(revision 18562)
@@ -99,52 +99,61 @@
     }
 
-
-    // CSV出力データを作成する。(商品)
-    function lfGetProductsCSV($where, $option, $arrval, $arrOutputCols) {
-        $objDb = new SC_Helper_DB_Ex();
-
-        $from = "vw_product_class AS prdcls";
-        $cols = SC_Utils_Ex::sfGetCommaList($arrOutputCols, true, array('category_id'));
-
-        $objQuery = new SC_Query();
-        $objQuery->setoption($option);
-
-        $list_data = $objQuery->select($cols, $from, $where, $arrval);
-        $max = count($list_data);
+    // CSVを送信する。(商品)
+    function sfDownloadProductsCsv($where, $arrval, $order) {
+
+        // CSV出力タイトル行の作成
+        $arrOutput = SC_Utils_Ex::sfSwapArray($this->sfgetCsvOutput(1, " WHERE csv_id = 1 AND status = 1"));
+        if (count($arrOutput) <= 0) return false; // 失敗終了
+        $arrOutputCols = $arrOutput['col'];
+
+        $objQuery = new SC_Query();
+        $objQuery->setorder($order);
+
+        $dataRows = $objQuery->select(
+             SC_Utils_Ex::sfGetCommaList($arrOutputCols, true, array('category_id'))
+            ,'vw_product_class AS prdcls'
+            ,$where
+            ,$arrval
+        );
 
         // 規格分類名一覧
         if (in_array('classcategory_id1', $arrOutputCols) || in_array('classcategory_id2', $arrOutputCols)) {
+            $objDb = new SC_Helper_DB_Ex();
             $arrClassCatName = $objDb->sfGetIDValueList("dtb_classcategory", "classcategory_id", "name");
         }
 
-        if (!isset($data)) $data = "";
-        for($i = 0; $i < $max; $i++) {
-            // 関連商品情報の付与
+        $outputArray = array();
+
+        // ヘッダ行
+        $outputArray[] = $arrOutput['disp_name'];
+
+        // データ行
+        foreach ($dataRows as $row) {
+            // 規格名1
             if (in_array('classcategory_id1', $arrOutputCols)) {
-                $list_data[$i]['classcategory_id1'] = $arrClassCatName[$list_data[$i]['classcategory_id1']];
-            }
+                $row['classcategory_id1'] = $arrClassCatName[$row['classcategory_id1']];
+            }
+
+            // 規格名2
             if (in_array('classcategory_id2', $arrOutputCols)) {
-                $list_data[$i]['classcategory_id2'] = $arrClassCatName[$list_data[$i]['classcategory_id2']];
-            }
-
+                $row['classcategory_id2'] = $arrClassCatName[$row['classcategory_id2']];
+            }
+
+            // カテゴリID
             if (in_array('category_id', $arrOutputCols)) {
-                $arrCategory_id = $objQuery->getCol("dtb_product_categories",
+                $row['category_id'] = $objQuery->getCol("dtb_product_categories",
                                   "category_id",
                                   "product_id = ?",
-                                  array($list_data[$i]['product_id']));
-
-                // カテゴリID 付与
-                for ($j = 0; $j < count($arrCategory_id); $j++) {
-                    $list_data[$i]['category_id'] .= $arrCategory_id[$j];
-                    if ($j < count($arrCategory_id) - 1) {
-                        $list_data[$i]['category_id'] .= "|";
-                    }
-                }
-            }
-
-            // 各項目をCSV出力用に変換する。
-            $data .= $this->lfMakeProductsCSV($list_data[$i]);
-        }
-        return $data;
+                                   array($row['product_id']));
+         }
+
+           $outputArray[] = $row;
+       }
+
+       // CSVを送信する。
+       $this->lfDownloadCsv($outputArray);
+
+       // 成功終了
+       return true;
     }
 
@@ -188,23 +197,36 @@
     }
 
-    // CSV出力データを作成する。(カテゴリ)
-    function lfGetCategoryCSV($where, $option, $arrval, $arrOutputCols) {
-        $objDb = new SC_Helper_DB_Ex();
-
-        $from = "dtb_category";
-        $cols = SC_Utils_Ex::sfGetCommaList($arrOutputCols);
-
-        $objQuery = new SC_Query();
-        $objQuery->setoption($option);
-
-        $list_data = $objQuery->select($cols, $from, $where, $arrval);
-        $max = count($list_data);
-
-        if (!isset($data)) $data = "";
-        for($i = 0; $i < $max; $i++) {
-            // 各項目をCSV出力用に変換する。
-            $data .= $this->lfMakeCSV($list_data[$i]);
-        }
-        return $data;
+    // CSVを送信する。(カテゴリ)
+    function sfDownloadCategoryCsv() {
+
+    // CSV出力タイトル行の作成
+    $arrOutput = SC_Utils_Ex::sfSwapArray($this->sfgetCsvOutput(5, " WHERE csv_id = 5 AND status = 1"));
+    if (count($arrOutput) <= 0) return false; // 失敗終了
+        $arrOutputCols = $arrOutput['col'];
+
+        $objQuery = new SC_Query();
+        $objQuery->setorder('rank DESC');
+
+        $dataRows = $objQuery->select(
+             SC_Utils_Ex::sfGetCommaList($arrOutputCols)
+            ,'dtb_category'
+            ,'del_flg = 0'
+        );
+
+        $outputArray = array();
+
+        // ヘッダ行
+        $outputArray[] = $arrOutput['disp_name'];
+
+        // データ行
+        foreach ($dataRows as $row) {
+            $outputArray[] = $row;
+        }
+
+        // CSVを送信する。
+        $this->lfDownloadCsv($outputArray, 'category');
+
+        // 成功終了
+        return true;
     }
 
@@ -231,12 +253,10 @@
     function lfMakeCSV($list) {
         $line = "";
-		
-		reset($list);
+
+        reset($list);
         while(list($key, $val) = each($list)){
             $tmp = "";
             switch($key) {
             case 'order_pref':
-                $tmp = $this->arrPref[$val];
-                break;
             case 'deliv_pref':
                 $tmp = $this->arrPref[$val];
@@ -255,37 +275,9 @@
     }
 
-    // 各項目をCSV出力用に変換する。(商品)
-    function lfMakeProductsCSV($list) {
-        $line = "";
-        if(is_array($list)) {
-			reset($list);
-        	while(list($key, $val) = each($list)){
-                $tmp = "";
-                switch($key) {
-                case 'point_rate':
-                    if($val == "") {
-                        $tmp = '0';
-                    } else {
-                        $tmp = $val;
-                    }
-                    break;
-                default:
-                    $tmp = $val;
-                    break;
-                }
-                $tmp = str_replace("\"", "\\\"", $tmp);
-                $line .= "\"".$tmp."\",";
-            }
-            // 文末の","を変換
-            $line = $this->replaceLineSuffix($line);
-        }
-        return $line;
-    }
-
     // 各項目をCSV出力用に変換する。(レビュー)
     function lfMakeReviewCSV($list) {
         $line = "";
-		reset($list);
-    	while(list($key, $val) = each($list)){
+        reset($list);
+        while(list($key, $val) = each($list)){
             $tmp = "";
             switch($key) {
@@ -316,6 +308,6 @@
     function lfMakeTrackbackCSV($list) {
         $line = "";
-		reset($list);
-    	while(list($key, $val) = each($list)){
+        reset($list);
+        while(list($key, $val) = each($list)){
             $tmp = "";
             switch($key) {
@@ -411,4 +403,67 @@
                                            );
     }
+
+
+    /**
+     * 1次元配列を1行のCSVとして返す
+     * 参考: http://jp.php.net/fputcsv
+     */
+    function sfArrayToCsv($fields, $delimiter = ',', $enclosure = '"', $arrayDelimiter = '|') {
+
+        if( strlen($delimiter) != 1 ) {
+            trigger_error('delimiter must be a single character', E_USER_WARNING);
+            return "";
+        }
+
+        if( strlen($enclosure) < 1 ) {
+            trigger_error('enclosure must be a single character', E_USER_WARNING);
+            return "";
+        }
+
+        foreach (array_keys($fields) as $key) {
+            $field =& $fields[$key];
+
+            // 配列を「|」区切りの文字列に変換する
+            if (is_array($field)) {
+                $field = implode($arrayDelimiter, $field);
+            }
+
+            /* enclose a field that contains a delimiter, an enclosure character, or a newline */
+            if (
+                   is_string($field)
+                && preg_match('/[' . preg_quote($delimiter) . preg_quote($enclosure) . '\\s]/', $field)
+            ) {
+                $field = $enclosure . preg_replace('/' . preg_quote($enclosure) . '/', $enclosure . $enclosure, $field) . $enclosure;
+            }
+        }
+
+        return implode($delimiter, $fields);
+    }
+
+    /**
+     * CSVを送信する。
+     */
+    function lfDownloadCsv($arrayData, $prefix = ""){
+
+        if($prefix == "") {
+            $dir_name = SC_Utils::sfUpDirName();
+            $file_name = $dir_name . date("ymdHis") .".csv";
+        } else {
+            $file_name = $prefix . date("ymdHis") .".csv";
+        }
+
+        /* HTTPヘッダの出力 */
+        Header("Content-disposition: attachment; filename=${file_name}");
+        Header("Content-type: application/octet-stream; name=${file_name}");
+        Header("Cache-Control: ");
+        Header("Pragma: ");
+
+        /* データを出力 */
+        foreach ($arrayData as $lineArray) {
+            $lineString = $this->sfArrayToCsv($lineArray);
+            $lineString = mb_convert_encoding($lineString, 'SJIS-Win');
+            echo $lineString . "\n";
+        }
+    }
 }
 ?>
Index: trunk/data/class/helper/SC_Helper_DB.php
===================================================================
--- trunk/data/class/helper/SC_Helper_DB.php	(revision 18432)
+++ trunk/data/class/helper/SC_Helper_DB.php	(revision 18562)
@@ -315,5 +315,8 @@
                         $limit = $arrData['sale_limit'];
                     } else {
-                        $limit = $arrData['stock'];
+                        // 購入制限数を在庫数に
+                        #$limit = $arrData['stock'];
+                        // 購入制限数をSALE_LIMIT_MAXに
+                        $limit = SALE_LIMIT_MAX;
                     }
                 } else {
@@ -322,5 +325,8 @@
                     }
                     if ($arrData['stock_unlimited'] != '1') {
-                        $limit = $arrData['stock'];
+                        // 購入制限数を在庫数に
+                        #$limit = $arrData['stock'];
+                        // 購入制限数をSALE_LIMIT_MAXに
+                        $limit = SALE_LIMIT_MAX;
                     }
                 }
@@ -1378,8 +1384,8 @@
 
     /**
-     * 配送時間を取得する.
+     * お届け時間を取得する.
      *
      * @param integer $payment_id 支払い方法ID
-     * @return array 配送時間の配列
+     * @return array お届け時間の配列
      */
     function sfGetDelivTime($payment_id = "") {
Index: trunk/data/class/SC_Query.php
===================================================================
--- trunk/data/class/SC_Query.php	(revision 18432)
+++ trunk/data/class/SC_Query.php	(revision 18562)
Index: trunk/data/class/SC_MobileKaraMail.php
===================================================================
--- trunk/data/class/SC_MobileKaraMail.php	(revision 16582)
+++ trunk/data/class/SC_MobileKaraMail.php	(revision 18562)
Index: trunk/data/class/SC_MobileUserAgent.php
===================================================================
--- trunk/data/class/SC_MobileUserAgent.php	(revision 17654)
+++ trunk/data/class/SC_MobileUserAgent.php	(revision 18562)
Index: trunk/data/class/SC_CheckError.php
===================================================================
--- trunk/data/class/SC_CheckError.php	(revision 17727)
+++ trunk/data/class/SC_CheckError.php	(revision 18562)
@@ -296,4 +296,5 @@
         }
 
+        $total_count = 0;
         for($i = 1; $i <= 3; $i++) {
             if(strlen($this->arrParam[$value[$i]]) > 0 && strlen($this->arrParam[$value[$i]]) > $value[4]) {
@@ -302,4 +303,10 @@
                 $this->arrErr[$value[$i]] .= "※ " . $value[0] . $i . "は数字で入力してください。<br />";
             }
+            $total_count += strlen($this->arrParam[$value[$i]]);
+        }
+
+        // 合計値チェック
+        if ($total_count > TEL_LEN) {
+            $this->arrErr[$value[3]] .= "※ " . $value[0] . "は" . TEL_LEN . "文字以内で入力してください。<br />";
         }
     }
Index: trunk/data/class/SC_MobileEmoji.php
===================================================================
--- trunk/data/class/SC_MobileEmoji.php	(revision 16582)
+++ trunk/data/class/SC_MobileEmoji.php	(revision 18562)
Index: trunk/data/class/util/GC_Utils.php
===================================================================
--- trunk/data/class/util/GC_Utils.php	(revision 17621)
+++ trunk/data/class/util/GC_Utils.php	(revision 18562)
Index: trunk/data/class/util/SC_Utils.php
===================================================================
--- trunk/data/class/util/SC_Utils.php	(revision 18432)
+++ trunk/data/class/util/SC_Utils.php	(revision 18562)
@@ -83,5 +83,23 @@
             if( !ereg('/install/', $_SERVER['PHP_SELF']) ) {
                 // インストールページに遷移させる
-                header('Location: ./install/');
+
+                $script_filename = $_SERVER['SCRIPT_FILENAME'];
+                list($real_root, $tmp) = explode('/html/', $script_filename);
+                $real_root = $real_root . '/html/';
+                $script_name = $_SERVER['SCRIPT_NAME'];
+                $url_dir = rtrim($script_name, basename($script_name));
+
+                if ($dh = opendir($real_root)) {
+                    $arrDir = array();
+                    while ($entry = readdir($dh)) {
+                        if (is_dir($real_root.$entry) && !in_array($entry, array('.', '..', '.svn', 'install'))) {
+                            $url_dir = rtrim($url_dir, $entry.'/');
+                        }
+                    }
+                    closedir($dh);
+                }
+
+                $location = $url_dir . '/install/';
+                header('Location: ' . $location);
                 exit;
             }
Index: trunk/data/class/SC_MobileImage.php
===================================================================
--- trunk/data/class/SC_MobileImage.php	(revision 18432)
+++ trunk/data/class/SC_MobileImage.php	(revision 18562)
Index: trunk/data/class/db/SC_DB_MasterData.php
===================================================================
--- trunk/data/class/db/SC_DB_MasterData.php	(revision 16582)
+++ trunk/data/class/db/SC_DB_MasterData.php	(revision 18562)
@@ -59,5 +59,5 @@
      *
      * 以下の順序でマスタデータを取得する.
-     * 1. MASTER_DATA_DIR のマスタデータキャッシュを include_once() で読み込む
+     * 1. MASTER_DATA_DIR のマスタデータキャッシュを include() で読み込む
      * 2. 1 で読み込んだ値をチェックし, 値が変数定義されていれば値を返す.
      *    されていなければ, 次の処理を行う.
@@ -79,5 +79,5 @@
         $valiable = "_" . $name . "_master";
         // キャッシュを読み込み
-        @include_once(MASTER_DATA_DIR . $name . ".php");
+        @include(MASTER_DATA_DIR . $name . ".php");
 
         // キャッシュがあれば, キャッシュの値を返す.
Index: trunk/data/class/SC_Fpdf.php
===================================================================
--- trunk/data/class/SC_Fpdf.php	(revision 18432)
+++ trunk/data/class/SC_Fpdf.php	(revision 18562)
Index: trunk/data/class/SC_Image.php
===================================================================
--- trunk/data/class/SC_Image.php	(revision 16680)
+++ trunk/data/class/SC_Image.php	(revision 18562)
Index: trunk/data/class/pages/campaign/LC_Page_CampaignEntry.php
===================================================================
--- trunk/data/class/pages/campaign/LC_Page_CampaignEntry.php	(revision 17382)
+++ trunk/data/class/pages/campaign/LC_Page_CampaignEntry.php	(revision 18562)
@@ -129,6 +129,6 @@
 
             if ($this->arrErr || $_POST["mode"] == "return") {		// 入力エラーのチェック
-                foreach($this->arrForm as $key => $val) {
-                    $this->$key = $val;
+                foreach($arrRegistColumn as $key) {
+                    $this->$key['column'] = $arrForm[$key['column']];
                 }
 
Index: trunk/data/class/pages/campaign/LC_Page_CampaignApplication.php
===================================================================
--- trunk/data/class/pages/campaign/LC_Page_CampaignApplication.php	(revision 17653)
+++ trunk/data/class/pages/campaign/LC_Page_CampaignApplication.php	(revision 18562)
@@ -120,5 +120,5 @@
 
                     if($orverlapping_flg) {
-                        if($this->lfOverlappingCheck($objCustomer->getValue('customer_id'), $objQuery)) {
+                        if($this->lfOverlappingCheck($objCustomer->getValue('customer_id'), $objCampaignSess->getCampaignId(), $objQuery)) {
                             $this->arrErr['login_email'] = "※ 複数回ご応募することは出来ません。";
                         }
@@ -253,6 +253,6 @@
      * 戻り値：フラグ (重複があったら true 重複がなかったら false)
      */
-    function lfOverlappingCheck($customer_id, &$objQuery) {
-        $count = $objQuery->count("dtb_campaign_order", "customer_id = ?", array($customer_id));
+    function lfOverlappingCheck($customer_id, $campaign_id, &$objQuery) {
+        $count = $objQuery->count("dtb_campaign_order", "customer_id = ? AND campaign_id = ?", array($customer_id, $campaign_id));
         if($count > 0) {
             return true;
Index: trunk/data/class/pages/mypage/LC_Page_Mypage_Favorite.php
===================================================================
--- trunk/data/class/pages/mypage/LC_Page_Mypage_Favorite.php	(revision 18007)
+++ trunk/data/class/pages/mypage/LC_Page_Mypage_Favorite.php	(revision 18562)
Index: trunk/data/class/pages/mypage/LC_Page_Mypage_History.php
===================================================================
--- trunk/data/class/pages/mypage/LC_Page_Mypage_History.php	(revision 18177)
+++ trunk/data/class/pages/mypage/LC_Page_Mypage_History.php	(revision 18562)
@@ -82,5 +82,5 @@
             // 支払い方法の取得
             $this->arrPayment = $objDb->sfGetIDValueList("dtb_payment", "payment_id", "payment_method");
-            // 配送時間の取得
+            // お届け時間の取得
             $arrRet = $objDb->sfGetDelivTime($this->arrDisp['payment_id']);
             $this->arrDelivTime = SC_Utils_Ex::sfArrKeyValue($arrRet, 'time_id', 'deliv_time');
Index: trunk/data/class/pages/mypage/LC_Page_Mypage_HistoryDetail.php
===================================================================
--- trunk/data/class/pages/mypage/LC_Page_Mypage_HistoryDetail.php	(revision 18177)
+++ trunk/data/class/pages/mypage/LC_Page_Mypage_HistoryDetail.php	(revision 18562)
@@ -91,5 +91,5 @@
             // 支払い方法の取得
             $this->arrPayment = $objDb->sfGetIDValueList("dtb_payment", "payment_id", "payment_method");
-            // 配送時間の取得
+            // お届け時間の取得
             $arrRet = $objDb->sfGetDelivTime($this->arrDisp['payment_id']);
             $this->arrDelivTime = SC_Utils_Ex::sfArrKeyValue($arrRet, 'time_id', 'deliv_time');
Index: trunk/data/class/pages/mypage/LC_Page_Mypage_Change.php
===================================================================
--- trunk/data/class/pages/mypage/LC_Page_Mypage_Change.php	(revision 18177)
+++ trunk/data/class/pages/mypage/LC_Page_Mypage_Change.php	(revision 18562)
@@ -473,6 +473,6 @@
         $this->objFormParam->addParam("郵便番号2", "zip02", ZIP02_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
         $this->objFormParam->addParam("都道府県", "pref", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $this->objFormParam->addParam("ご住所1", "addr01", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("ご住所2", "addr02", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("ご住所1", "addr01", MTEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("ご住所2", "addr02", MTEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("お電話番号1", "tel01", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
         $this->objFormParam->addParam("お電話番号2", "tel02", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
Index: trunk/data/class/pages/shopping/LC_Page_Shopping_Complete.php
===================================================================
--- trunk/data/class/pages/shopping/LC_Page_Shopping_Complete.php	(revision 18432)
+++ trunk/data/class/pages/shopping/LC_Page_Shopping_Complete.php	(revision 18562)
@@ -485,5 +485,5 @@
         }
 
-        // 別のお届け先を指定していない場合、配送先に登録住所をコピーする。
+        // 別のお届け先を指定していない場合、お届け先に登録住所をコピーする。
         if($arrData["deliv_check"] == "-1") {
             $sqlval['deliv_name01'] = $arrData['order_name01'];
Index: trunk/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- trunk/data/class/pages/shopping/LC_Page_Shopping_Payment.php	(revision 18432)
+++ trunk/data/class/pages/shopping/LC_Page_Shopping_Payment.php	(revision 18562)
@@ -164,9 +164,9 @@
         // 支払い方法の画像があるなしを取得（$img_show true:ある false:なし）
         $this->img_show = $this->lfGetImgShow($this->arrPayment);
-        // 配送時間の取得
+        // お届け時間の取得
         $arrRet = $objDb->sfGetDelivTime($this->objFormParam->getValue('payment_id'));
         $this->arrDelivTime = SC_Utils_Ex::sfArrKeyValue($arrRet, 'time_id', 'deliv_time');
 
-        // 配送日一覧の取得
+        // お届け日一覧の取得
         $this->arrDelivDate = $this->lfGetDelivDate();
 
@@ -251,5 +251,5 @@
 
         switch($_POST['mode']) {
-            // 支払い方法指定 → 配達日時指定
+            // 支払い方法指定 → お届け日時指定
         case 'deliv_date':
             // 入力値の変換
@@ -259,5 +259,5 @@
                 // 支払い方法の入力エラーなし
                 $this->tpl_mainpage = 'shopping/deliv_date.tpl';
-                $this->tpl_title = "配達日時指定";
+                $this->tpl_title = "お届け日時指定";
                 break;
             } else {
@@ -289,5 +289,5 @@
                     // 支払い方法の入力エラーなし
                     $this->tpl_mainpage = 'shopping/deliv_date.tpl';
-                    $this->tpl_title = "配達日時指定";
+                    $this->tpl_title = "お届け日時指定";
                 }
             }
@@ -317,9 +317,9 @@
         // 支払い方法の取得
         $this->arrPayment = $this->lfGetPayment($total_pretax);
-        // 配送時間の取得
+        // お届け時間の取得
         $arrRet = $objDb->sfGetDelivTime($this->objFormParam->getValue('payment_id'));
         $this->arrDelivTime = SC_Utils_Ex::sfArrKeyValue($arrRet, 'time_id', 'deliv_time');
 
-        // 配送日一覧の取得
+        // お届け日一覧の取得
         $this->arrDelivDate = $this->lfGetDelivDate();
 
@@ -343,8 +343,8 @@
         $this->objFormParam->addParam("お支払い方法", "payment_id", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("ポイント", "use_point", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK", "ZERO_START"));
-        $this->objFormParam->addParam("配達時間", "deliv_time_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
+        $this->objFormParam->addParam("お届け時間", "deliv_time_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("ご質問", "message", LTEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("ポイントを使用する", "point_check", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"), '2');
-        $this->objFormParam->addParam("配達日", "deliv_date", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("お届け日", "deliv_date", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK"));
     }
 
@@ -439,5 +439,5 @@
     }
 
-    /* 配送時間文字列の取得 */
+    /* お届け時間文字列の取得 */
     function lfGetDelivTimeInfo($time_id) {
         $objQuery = new SC_Query();
@@ -479,5 +479,5 @@
     }
 
-    /* 配達日一覧を取得する */
+    /* お届け日一覧を取得する */
     function lfGetDelivDate() {
         $objCartSess = new SC_CartSession();
@@ -537,5 +537,5 @@
                 break;
             }
-            //配達可能日のスタート値から、配達日の配列を取得する
+            //お届け可能日のスタート値から、お届け日の配列を取得する
             $arrDelivDate = $this->lfGetDateArray($start_day, DELIV_DATE_END_MAX);
         }
@@ -543,9 +543,9 @@
     }
 
-    //配達可能日のスタート値から、配達日の配列を取得する
+    //お届け可能日のスタート値から、お届け日の配列を取得する
     function lfGetDateArray($start_day, $end_day) {
         $masterData = new SC_DB_MasterData();
         $arrWDAY = $masterData->getMasterData("mtb_wday");
-        //配達可能日のスタート値がセットされていれば
+        //お届け可能日のスタート値がセットされていれば
         if($start_day >= 1) {
             $now_time = time();
Index: trunk/data/class/pages/shopping/LC_Page_Shopping_DelivAddr.php
===================================================================
--- trunk/data/class/pages/shopping/LC_Page_Shopping_DelivAddr.php	(revision 16582)
+++ trunk/data/class/pages/shopping/LC_Page_Shopping_DelivAddr.php	(revision 18562)
@@ -26,5 +26,5 @@
 
 /**
- * 配送先追加のページクラス
+ * お届け先追加のページクラス
  *
  * @package Page
Index: trunk/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- trunk/data/class/pages/shopping/LC_Page_Shopping.php	(revision 18432)
+++ trunk/data/class/pages/shopping/LC_Page_Shopping.php	(revision 18562)
@@ -338,6 +338,6 @@
         $this->objFormParam->addParam("郵便番号2", "order_zip02", ZIP02_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
         $this->objFormParam->addParam("都道府県", "order_pref", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $this->objFormParam->addParam("住所1", "order_addr01", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("住所2", "order_addr02", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("住所1", "order_addr01", MTEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("住所2", "order_addr02", MTEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("電話番号1", "order_tel01", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
         $this->objFormParam->addParam("電話番号2", "order_tel02", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
@@ -361,6 +361,6 @@
         $this->objFormParam->addParam("郵便番号2", "deliv_zip02", ZIP02_LEN, "n", array("NUM_CHECK", "NUM_COUNT_CHECK"));
         $this->objFormParam->addParam("都道府県", "deliv_pref", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $this->objFormParam->addParam("住所1", "deliv_addr01", STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("住所2", "deliv_addr02", STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("住所1", "deliv_addr01", MTEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("住所2", "deliv_addr02", MTEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("電話番号1", "deliv_tel01", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK"));
         $this->objFormParam->addParam("電話番号2", "deliv_tel02", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK"));
@@ -457,5 +457,5 @@
         $objQuery = new SC_Query();
 
-        // 別のお届け先を指定していない場合、配送先に登録住所をコピーする。
+        // 別のお届け先を指定していない場合、お届け先に登録住所をコピーする。
         if($arrData["deliv_check"] != "1") {
             $sqlval['deliv_name01'] = $arrData['order_name01'];
Index: trunk/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
===================================================================
--- trunk/data/class/pages/shopping/LC_Page_Shopping_Deliv.php	(revision 18432)
+++ trunk/data/class/pages/shopping/LC_Page_Shopping_Deliv.php	(revision 18562)
@@ -424,6 +424,6 @@
         $this->objFormParam->addParam("郵便番号2", "deliv_zip02", ZIP02_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
         $this->objFormParam->addParam("都道府県", "deliv_pref", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $this->objFormParam->addParam("住所1", "deliv_addr01", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("住所2", "deliv_addr02", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("住所1", "deliv_addr01", MTEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("住所2", "deliv_addr02", MTEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("電話番号1", "deliv_tel01", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
         $this->objFormParam->addParam("電話番号2", "deliv_tel02", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
Index: trunk/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php
===================================================================
--- trunk/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php	(revision 17037)
+++ trunk/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php	(revision 18562)
Index: trunk/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php
===================================================================
--- trunk/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php	(revision 17653)
+++ trunk/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php	(revision 18562)
Index: trunk/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- trunk/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 18432)
+++ trunk/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 18562)
@@ -111,4 +111,8 @@
         $objSiteInfo = new SC_SiteInfo();
         $objDb = new SC_Helper_DB_Ex();
+        $objDate = new SC_Date(1901); 
+        $this->arrYearDelivDate = $objDate->getYear('', date('Y'), '');
+        $this->arrMonthDelivDate = $objDate->getMonth(true);
+        $this->arrDayDelivDate = $objDate->getDay(true);
         $arrInfo = $objSiteInfo->data;
 
@@ -283,5 +287,5 @@
         // 支払い方法の取得
         $this->arrPayment = $objDb->sfGetIDValueList("dtb_payment", "payment_id", "payment_method");
-        // 配送時間の取得
+        // お届け時間の取得
         $arrRet = $objDb->sfGetDelivTime($this->objFormParam->getValue('payment_id'));
         $this->arrDelivTime = SC_Utils_Ex::sfArrKeyValue($arrRet, 'time_id', 'deliv_time');
@@ -343,11 +347,11 @@
         $this->objFormParam->addParam("郵便番号2", "order_zip02", ZIP02_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
         $this->objFormParam->addParam("都道府県", "order_pref", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $this->objFormParam->addParam("住所1", "order_addr01", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("住所2", "order_addr02", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("住所1", "order_addr01", MTEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("住所2", "order_addr02", MTEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("電話番号1", "order_tel01", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
         $this->objFormParam->addParam("電話番号2", "order_tel02", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
         $this->objFormParam->addParam("電話番号3", "order_tel03", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
 
-        // 配送先情報
+        // お届け先情報
         $this->objFormParam->addParam("お名前1", "deliv_name01", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("お名前2", "deliv_name02", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
@@ -357,6 +361,6 @@
         $this->objFormParam->addParam("郵便番号2", "deliv_zip02", ZIP02_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
         $this->objFormParam->addParam("都道府県", "deliv_pref", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $this->objFormParam->addParam("住所1", "deliv_addr01", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("住所2", "deliv_addr02", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("住所1", "deliv_addr01", MTEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("住所2", "deliv_addr02", MTEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("電話番号1", "deliv_tel01", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
         $this->objFormParam->addParam("電話番号2", "deliv_tel02", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
@@ -375,9 +379,9 @@
 
         $this->objFormParam->addParam("お支払い方法", "payment_id", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $this->objFormParam->addParam("配送時間ID", "deliv_time_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
+        $this->objFormParam->addParam("お届け時間ID", "deliv_time_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("対応状況", "status", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $this->objFormParam->addParam("配達日", "deliv_date", STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("お届け日", "deliv_date", STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("お支払方法名称", "payment_method");
-        $this->objFormParam->addParam("配送時間", "deliv_time");
+        $this->objFormParam->addParam("お届け時間", "deliv_time");
 
         // 受注詳細情報
@@ -406,4 +410,5 @@
         $this->objFormParam->addParam("受注日", "create_date");
         $this->objFormParam->addParam("発送日", "commit_date");
+        $this->objFormParam->addParam("お届け日", "deliv_date"); 
     }
 
@@ -419,5 +424,11 @@
             $this->objFormParam->setValue('total_point', $total_point);
             $this->objFormParam->setValue('point', $point);
+            $delivDate = split(" ", $arrRet[0]["deliv_date"]);
+            $delivDate = split("-", $delivDate[0]);
+            $this->objFormParam->setValue('deliv_date_year', $delivDate[0]);
+            $this->objFormParam->setValue('deliv_date_month', isset($delivDate[1]) ? $delivDate[1] : "");
+            $this->objFormParam->setValue('deliv_date_day', isset($delivDate[2]) ? $delivDate[2] : "");
             $this->arrForm = $arrRet[0];
+
             // 受注詳細データの取得
             $arrRet = $this->lfGetOrderDetail($order_id);
@@ -456,4 +467,10 @@
         $objErr = new SC_CheckError($arrRet);
         $objErr->arrErr = $this->objFormParam->checkError();
+
+        $objErr->doFunc(array("お届け日", "deliv_date_year", "deliv_date_month", "deliv_date_day"), array("CHECK_DATE"));
+
+        if (count($objErr->arrErr) >= 1) {
+            return $objErr->arrErr;
+        }
 
         return $objErr->arrErr;
@@ -538,7 +555,16 @@
             }
         }
+        $sqlval['update_date'] = 'Now()';
+
+        if (strlen($sqlval['deliv_date_year']) >= 0) {
+            $sqlval['deliv_date'] = $sqlval['deliv_date_year'] . '-' . $sqlval['deliv_date_month'] . '-' . $sqlval['deliv_date_day'];
+        }
+        unset($sqlval['deliv_date_year']);
+        unset($sqlval['deliv_date_month']);
+        unset($sqlval['deliv_date_day']);
 
         unset($sqlval['total_point']);
         unset($sqlval['point']);
+        unset($sqlval['commit_date']);
 
         $where = "order_id = ?";
@@ -574,9 +600,48 @@
         $objQuery->query($sql, $arrUpdData);
 
+        $arrDetail = $this->objFormParam->getSwapArray(array("product_id", "product_code", "product_name", "price", "quantity", "point_rate", "classcategory_id1", "classcategory_id2", "classcategory_name1", "classcategory_name2"));
+
+
+        // 変更しようとしている商品情報とDBに登録してある商品情報を比較することで、更新すべき数量を計算
+        $max = count($arrDetail);
+        $k = 0;
+        $arrStockData = array();
+        for($i = 0; $i < $max; $i++) {
+            if (!empty($arrDetail[$i]['product_id'])) {
+                $arrPreDetail = $objQuery->select('*', "dtb_order_detail", "order_id = ? AND product_id = ? AND classcategory_id1 = ? AND classcategory_id2 = ?", array($order_id, $arrDetail[$i]['product_id'], $arrDetail[$i]['classcategory_id1'], $arrDetail[$i]['classcategory_id2']));
+                if (!empty($arrPreDetail) && $arrPreDetail[0]['quantity'] != $arrDetail[$i]['quantity']) {
+                    // 数量が変更された商品
+                    $arrStockData[$k]['product_id'] = $arrDetail[$i]['product_id'];
+                    $arrStockData[$k]['classcategory_id1'] = $arrDetail[$i]['classcategory_id1'];
+                    $arrStockData[$k]['classcategory_id2'] = $arrDetail[$i]['classcategory_id2'];
+                    $arrStockData[$k]['quantity'] = $arrPreDetail[0]['quantity'] - $arrDetail[$i]['quantity'];
+                    ++$k;
+                } elseif (empty($arrPreDetail)) {
+                    // 新しく追加された商品 もしくは 違う商品に変更された商品
+                    $arrStockData[$k]['product_id'] = $arrDetail[$i]['product_id'];
+                    $arrStockData[$k]['classcategory_id1'] = $arrDetail[$i]['classcategory_id1'];
+                    $arrStockData[$k]['classcategory_id2'] = $arrDetail[$i]['classcategory_id2'];
+                    $arrStockData[$k]['quantity'] = -$arrDetail[$i]['quantity'];
+                    ++$k;
+                }
+                $objQuery->delete("dtb_order_detail", "order_id = ? AND product_id = ? AND classcategory_id1 = ? AND classcategory_id2 = ?", array($order_id, $arrDetail[$i]['product_id'], $arrDetail[$i]['classcategory_id1'], $arrDetail[$i]['classcategory_id2']));
+            }
+        }
+
+        // 上記の新しい商品のループでDELETEされなかった商品は、注文より削除された商品
+        $arrPreDetail = $objQuery->select('*', "dtb_order_detail", "order_id = ?", array($order_id));
+        foreach ($arrPreDetail AS $key=>$val) {
+            $arrStockData[$k]['product_id'] = $val['product_id'];
+            $arrStockData[$k]['classcategory_id1'] = $val['classcategory_id1'];
+            $arrStockData[$k]['classcategory_id2'] = $val['classcategory_id2'];
+            $arrStockData[$k]['quantity'] = $val['quantity'];
+            ++$k;
+        }
+
+        // 受注詳細データの初期化
+        $objQuery->delete("dtb_order_detail", $where, array($order_id));
+
+
         // 受注詳細データの更新
-        $arrDetail = $this->objFormParam->getSwapArray(array("product_id", "product_code", "product_name", "price", "quantity", "point_rate", "classcategory_id1", "classcategory_id2", "classcategory_name1", "classcategory_name2"));
-        $objQuery->delete("dtb_order_detail", $where, array($order_id));
-
-
         $max = count($arrDetail);
         for($i = 0; $i < $max; $i++) {
@@ -596,4 +661,18 @@
         }
 
+        // 在庫数調整
+        $status = $sqlval['status'];
+        if (ORDER_DELIV != $status && ORDER_CANCEL != $status) {
+            $stock_sql = "UPDATE dtb_products_class SET stock = stock + ? WHERE product_id = ? AND classcategory_id1 = ? AND classcategory_id2 = ?;";
+            foreach ($arrStockData AS $key=>$val) {
+                $stock_sqlval = array();
+                $stock_sqlval[] = $val['quantity'];
+                $stock_sqlval[] = $val['product_id'];
+                $stock_sqlval[] = $val['classcategory_id1'];
+                $stock_sqlval[] = $val['classcategory_id2'];
+
+                $objQuery->query($stock_sql, $stock_sqlval);
+            }
+        }
 
         $objQuery->commit();
@@ -683,5 +762,24 @@
             $sqlval['classcategory_name1'] = $arrDetail[$i]['classcategory_name1'];
             $sqlval['classcategory_name2'] = $arrDetail[$i]['classcategory_name2'];
+
             $objQuery->insert("dtb_order_detail", $sqlval);
+
+
+            // 在庫数減少処理
+            // 現在の実在庫数取得
+            $pre_stock = $objQuery->getone("SELECT stock FROM dtb_products_class WHERE product_id = ? AND classcategory_id1 = ?  AND classcategory_id2 = ?", array($arrDetail[$i]['product_id'], $arrDetail[$i]['classcategory_id1'], $arrDetail[$i]['classcategory_id2']));
+
+            $stock_sqlval = array();
+            $stock_sqlval['stock'] = intval($pre_stock - $arrDetail[$i]['quantity']);
+            if ($stock_sqlval['stock'] === 0) {
+                $stock_sqlval['stock'] = '0';
+            }
+
+            $st_params = array();
+            $st_params[] = $arrDetail[$i]['product_id'];
+            $st_params[] = $arrDetail[$i]['classcategory_id1'];
+            $st_params[] = $arrDetail[$i]['classcategory_id2'];
+
+            $objQuery->update("dtb_products_class", $stock_sqlval, 'product_id = ? AND classcategory_id1 = ? AND classcategory_id2 = ?', $st_params);
         }
         $objQuery->commit();
Index: trunk/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php
===================================================================
--- trunk/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php	(revision 18432)
+++ trunk/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php	(revision 18562)
Index: trunk/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php
===================================================================
--- trunk/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php	(revision 18007)
+++ trunk/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php	(revision 18562)
Index: trunk/data/class/pages/admin/contents/LC_Page_Admin_Contents.php
===================================================================
--- trunk/data/class/pages/admin/contents/LC_Page_Admin_Contents.php	(revision 17204)
+++ trunk/data/class/pages/admin/contents/LC_Page_Admin_Contents.php	(revision 18562)
@@ -81,6 +81,8 @@
 
             if ($this->arrErr = $this->lfErrorCheck()) {       // 入力エラーのチェック
-                foreach($_POST as $key => $val) {
-                    $this->$key = $val;
+                $arrParams = array("news_url", "news_title", "news_comment", "link_method");
+
+                foreach($arrParams as $key) {
+                    $this->$key = $_POST[$key];
                 }
                 $this->selected_year = $_POST["year"];
Index: trunk/data/class/pages/admin/contents/LC_Page_Admin_Contents_Inquiry.php
===================================================================
--- trunk/data/class/pages/admin/contents/LC_Page_Admin_Contents_Inquiry.php	(revision 17846)
+++ trunk/data/class/pages/admin/contents/LC_Page_Admin_Contents_Inquiry.php	(revision 18562)
@@ -110,4 +110,17 @@
                 for ( $j=0; $j<count( $_POST['question'][$i]['option'] ); $j++ ){
                     $_POST['question'][$i]['option'][$j] = mb_convert_kana( trim ( $_POST['question'][$i]['option'][$j] ) );
+                }
+            }
+
+            for( $i = 0; $i < count( $_POST["question"] ); $i++ ) {
+                if( $_POST["question"][$i]["kind"] == 3 || $_POST["question"][$i]["kind"] == 4  ) {
+                    $temp_data = array();
+                    // 項目間（テキストボックス）があいていたら詰めていく
+                    for( $j = 0; $j < count( $_POST["question"][$i]["option"] ); $j++ ) {
+                        if( strlen( $_POST["question"][$i]["option"][$j] ) > 0 ) $temp_data[] = mb_convert_kana( trim ( $_POST["question"][$i]["option"][$j]  ), "asKVn" );
+                    }
+                    $_POST["question"][$i]["option"] = $temp_data;
+                } else {
+                    $_POST["question"][$i]["option"] = NULL;
                 }
             }
@@ -294,16 +307,19 @@
             if( $_POST["question"][$i]["kind"] == 3 || $_POST["question"][$i]["kind"] == 4  ) {
 
-                $temp_data = array();
                 for( $j = 0; $j < count( $_POST["question"][$i]["option"] ); $j++ ) {
-
-                    // 項目間（テキストボックス）があいていたら詰めていく
-                    if( strlen( $_POST["question"][$i]["option"][$j] ) > 0 ) $temp_data[] = mb_convert_kana( trim ( $_POST["question"][$i]["option"][$j]  ), "asKVn" );
-
-                }
-
-                $_POST["question"][$i]["option"] = $temp_data;
+                    // 同じ回答がないかチェック
+                    if (strlen($_POST["question"][$i]["option"][$j]) > 0) {
+                        $checkArray = $_POST["question"][$i]["option"];
+                        // 自身の値をunset
+                        unset($checkArray[$j]);
+                        if (in_array($_POST["question"][$i]["option"][$j], $checkArray)) {
+                            $objErr->arrErr["question"][$i]["option"][$j] = "同じ質問に同じ回答は設定出来ません。";
+                        }
+                    }
+                }
 
                 if( ( strlen( $_POST["question"][$i] ["option"][0] ) == 0 ) || ( strlen( $_POST["question"][$i] ["option"][0] ) > 0
                                                                                  && strlen( $_POST["question"][$i] ["option"][1] ) == 0 ) ) $objErr->arrErr["question"][$i]['kind'] = "下記の2つ以上の項目に記入してください。";
+
             }
         }
Index: trunk/data/class/pages/admin/LC_Page_Admin_Home.php
===================================================================
--- trunk/data/class/pages/admin/LC_Page_Admin_Home.php	(revision 17204)
+++ trunk/data/class/pages/admin/LC_Page_Admin_Home.php	(revision 18562)
Index: trunk/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
===================================================================
--- trunk/data/class/pages/admin/basis/LC_Page_Admin_Basis.php	(revision 18007)
+++ trunk/data/class/pages/admin/basis/LC_Page_Admin_Basis.php	(revision 18562)
@@ -252,6 +252,6 @@
         // 住所チェック
         $objErr->doFunc(array("都道府県", "pref"), array("EXIST_CHECK"));
-        $objErr->doFunc(array("住所1", "addr01", STEXT_LEN), array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
-        $objErr->doFunc(array("住所2", "addr02", STEXT_LEN), array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+        $objErr->doFunc(array("住所1", "addr01", MTEXT_LEN), array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+        $objErr->doFunc(array("住所2", "addr02", MTEXT_LEN), array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
         // メールチェック
         $objErr->doFunc(array('商品注文受付メールアドレス', "email01", STEXT_LEN) ,array("EXIST_CHECK", "EMAIL_CHECK", "EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK"));
Index: trunk/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php
===================================================================
--- trunk/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php	(revision 17513)
+++ trunk/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php	(revision 18562)
@@ -122,5 +122,5 @@
 
         for($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) {
-            $this->objFormParam->addParam("配送時間$cnt", "deliv_time$cnt", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK"));
+            $this->objFormParam->addParam("お届け時間$cnt", "deliv_time$cnt", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK"));
         }
 
@@ -157,5 +157,5 @@
             $objQuery->update("dtb_deliv", $sqlval, $where, array($deliv_id));
 
-            // 配送時間の登録
+            // お届け時間の登録
             $table = "dtb_delivtime";
             $where = "deliv_id = ? AND time_id = ?";
@@ -216,5 +216,5 @@
 
             $sqlval = array();
-            // 配送時間の設定
+            // お届け時間の設定
             for($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) {
                 $keyname = "deliv_time$cnt";
@@ -257,5 +257,5 @@
         $arrRet = $objQuery->select($col, $table, $where, array($deliv_id));
         $this->objFormParam->setParam($arrRet[0]);
-        // 配送時間の取得
+        // お届け時間の取得
         $col = "deliv_time";
         $where = "deliv_id = ?  ORDER BY time_id";
Index: trunk/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
===================================================================
--- trunk/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php	(revision 16741)
+++ trunk/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php	(revision 18562)
@@ -137,6 +137,6 @@
         $this->objFormParam->addParam("郵便番号2", "law_zip02", ZIP02_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
         $this->objFormParam->addParam("都道府県", "law_pref", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $this->objFormParam->addParam("住所1", "law_addr01", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("住所2", "law_addr02", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("住所1", "law_addr01", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("住所2", "law_addr02", MTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("電話番号1", "law_tel01", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
         $this->objFormParam->addParam("電話番号2", "law_tel02", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK"));
Index: trunk/data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php
===================================================================
--- trunk/data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php	(revision 16939)
+++ trunk/data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php	(revision 18562)
Index: trunk/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php
===================================================================
--- trunk/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php	(revision 18432)
+++ trunk/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php	(revision 18562)
@@ -180,23 +180,8 @@
 
             $objCSV = new SC_Helper_CSV_Ex();
-            // オプションの指定
-            $option = "ORDER BY rank DESC";
-            // CSV出力タイトル行の作成
-            $arrOutput = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput(5, " WHERE csv_id = 5 AND status = 1"));
-
-            if (count($arrOutput) <= 0) break;
-
-            $arrOutputCols = $arrOutput['col'];
-            $arrOutputTitle = $arrOutput['disp_name'];
-
-            $head = SC_Utils_Ex::sfGetCSVList($arrOutputTitle);
-
-            $where = "del_flg = 0";
-            $arrval = array();
-            $data = $objCSV->lfGetCategoryCSV($where, $option, $arrval, $arrOutputCols);
-
-            // CSVを送信する。
-            SC_Utils_Ex::sfCSVDownload($head.$data, 'category');
-            exit;
+
+            // CSVを送信する。正常終了の場合、終了。
+            $objCSV->sfDownloadCategoryCsv() && exit;
+
             break;
         default:
Index: trunk/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php
===================================================================
--- trunk/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php	(revision 18432)
+++ trunk/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php	(revision 18562)
@@ -106,12 +106,14 @@
                     CHAR_CODE, CSV_TEMP_DIR);
 
+                    $fp = fopen($enc_filepath, "r");
+
+                    // 無効なファイルポインタが渡された場合はエラー表示
+                    if ($fp === false) {
+                        SC_Utils_Ex::sfDispError("");
+                    }
+
                     // レコード数を得る
-                    $rec_count = $this->lfCSVRecordCount($enc_filepath);
-                    if ($rec_count === false) {
-                        $err = false;
-                        $arrErr['bad_file_pointer'] = "※ 不正なファイルポインタが検出されました";
-                    }
-
-                    $fp = fopen($enc_filepath, "r");
+                    $rec_count = $this->lfCSVRecordCount($fp);
+
                     $line = 0;      // 行数
                     $regist = 0;    // 登録数
@@ -121,5 +123,4 @@
 
                     echo "■　CSV登録進捗状況 <br/><br/>\n";
-
                     while (!feof($fp) && !$err) {
                         $arrCSV = fgetcsv($fp, CSV_LINE_MAX);
@@ -192,6 +193,6 @@
                 exit;
                 break;
-            default:
-                break;
+        default:
+            break;
         }
 
@@ -342,19 +343,19 @@
      * CSVのカウント数を得る.
      *
-     * @param string $file_name ファイルパス
-     * @return mixed CSV のカウント数; $file_name が無効な場合は false
-     */
-    function lfCSVRecordCount($file_name) {
+     * @param resource $fp fopenを使用して作成したファイルポインタ
+     * @return integer CSV のカウント数
+     */
+    function lfCSVRecordCount($fp) {
         $count = 0;
-        $fp = fopen($file_name, "r");
-        if ($fp !== false) {
-            while(!feof($fp)) {
-                $arrCSV = fgetcsv($fp, CSV_LINE_MAX);
-                $count++;
-            }
-        } else {
-            return false;
-        }
-        return $count-1;
+        while(!feof($fp)) {
+            $arrCSV = fgetcsv($fp, CSV_LINE_MAX);
+            $count++;
+        }
+        // ファイルポインタを戻す
+        if (rewind($fp)) {
+            return $count-1;
+        } else {
+            SC_Utils_Ex::sfDispError("");
+        }
     }
 
Index: trunk/data/class/pages/admin/products/LC_Page_Admin_Products.php
===================================================================
--- trunk/data/class/pages/admin/products/LC_Page_Admin_Products.php	(revision 17834)
+++ trunk/data/class/pages/admin/products/LC_Page_Admin_Products.php	(revision 18562)
@@ -164,5 +164,5 @@
 
                     switch ($key) {
-                        case 'search_product_id':	// 商品ID
+                        case 'search_product_id': // 商品ID
                             $where .= " AND product_id = ?";
                             $view_where .= " AND product_id = ?";
@@ -179,10 +179,10 @@
                             $view_where = $where;
                             break;
-                        case 'search_name':			// 商品名
+                        case 'search_name': // 商品名
                             $where .= " AND name ILIKE ?";
                             $view_where .= " AND name ILIKE ?";
                             $arrval[] = "%$val%";
                             break;
-                        case 'search_category_id':	// カテゴリー
+                        case 'search_category_id': // カテゴリー
                             list($tmp_where, $tmp_arrval) = $objDb->sfGetCatWhere($val);
                             if($tmp_where != "") {
@@ -192,15 +192,15 @@
                             }
                             break;
-                        case 'search_product_code':	// 商品コード
+                        case 'search_product_code': // 商品コード
                             $where .= " AND product_id IN (SELECT product_id FROM dtb_products_class WHERE product_code ILIKE ? GROUP BY product_id)";
                             $view_where .= " AND EXISTS (SELECT product_id FROM dtb_products_class as cls WHERE cls.product_code ILIKE ? AND dtb_products.product_id = cls.product_id GROUP BY cls.product_id )";
                             $arrval[] = "%$val%";
                             break;
-                        case 'search_startyear':	// 登録更新日（FROM）
+                        case 'search_startyear': // 登録更新日（FROM）
                             $date = SC_Utils_Ex::sfGetTimestamp($_POST['search_startyear'], $_POST['search_startmonth'], $_POST['search_startday']);
                             $where.= " AND update_date >= '" . $_POST['search_startyear'] . "/" . $_POST['search_startmonth']. "/" .$_POST['search_startday'] . "'";
                             $view_where.= " AND update_date >= '" . $_POST['search_startyear'] . "/" . $_POST['search_startmonth']. "/" .$_POST['search_startday'] . "'";
                             break;
-                        case 'search_endyear':		// 登録更新日（TO）
+                        case 'search_endyear': // 登録更新日（TO）
                             $date = SC_Utils_Ex::sfGetTimestamp($_POST['search_endyear'], $_POST['search_endmonth'], $_POST['search_endday']);
                             $date = date('Y/m/d', strtotime($date) + 86400);
@@ -208,5 +208,5 @@
                             $view_where.= " AND update_date < date('" . $date . "')";
                             break;
-                        case 'search_product_flag':	//種別
+                        case 'search_product_flag': //種別
                             global $arrSTATUS;
                             $search_product_flag = SC_Utils_Ex::sfSearchCheckBoxes($val);
@@ -217,5 +217,5 @@
                             }
                             break;
-                        case 'search_status':		// ステータス
+                        case 'search_status': // ステータス
                             $tmp_where = "";
                             foreach ($val as $element){
@@ -244,88 +244,67 @@
 
                 switch($_POST['mode']) {
-                case 'csv':
-
-                    require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_CSV_Ex.php");
-
-                    $objCSV = new SC_Helper_CSV_Ex();
-                    // オプションの指定
-                    $option = "ORDER BY $order";
-                    // CSV出力タイトル行の作成
-                    $arrOutput = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput(1, " WHERE csv_id = 1 AND status = 1"));
-
-                    if (count($arrOutput) <= 0) break;
-
-                    $arrOutputCols = $arrOutput['col'];
-                    $arrOutputTitle = $arrOutput['disp_name'];
-
-                    $head = SC_Utils_Ex::sfGetCSVList($arrOutputTitle);
-
-                    $data = $objCSV->lfGetProductsCSV($where, $option, $arrval, $arrOutputCols);
-
-                    // CSVを送信する。
-                    SC_Utils_Ex::sfCSVDownload($head.$data);
-                    exit;
-                    break;
-                case 'delete_all':
-                    // 検索結果の取得
-                    $col = "product_id";
-                    $from = "vw_products_nonclass AS noncls ";
-                    $arrProducts = $objQuery->select($col, $from, $where, $arrval);
-                    // 検索結果をすべて削除
-                    $sqlval['del_flg'] = 1;
-                    $where = "product_id = ?";
-                    if (count($arrProducts) > 0) {
-                        foreach ($arrProducts as $key => $val) {
-                            $objQuery->update("dtb_products", $sqlval, $where, array($arrProducts[$key]["product_id"]));
+                    case 'csv':
+                        require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_CSV_Ex.php");
+
+                        $objCSV = new SC_Helper_CSV_Ex();
+
+                        // CSVを送信する。正常終了の場合、終了。
+                        $objCSV->sfDownloadProductsCsv($where, $arrval, $order) && exit;
+
+                        break;
+                    case 'delete_all':
+                        // 検索結果をすべて削除
+                        $where = "product_id IN (SELECT product_id FROM vw_products_allclass_detail AS alldtl WHERE $where)";
+                        $sqlval['del_flg'] = 1;
+                        $objQuery->update("dtb_products", $sqlval, $where, $arrval);
+                        $objQuery->delete("dtb_customer_favorite_products", $where, $arrval);
+                        break;
+                    default:
+                        // 読み込む列とテーブルの指定
+                        $col = "product_id, name, main_list_image, status, product_code_min, product_code_max, price02_min, price02_max, stock_min, stock_max, stock_unlimited_min, stock_unlimited_max, update_date";
+                        $from = "vw_products_allclass_detail AS alldtl ";
+
+                        // 行数の取得
+                        $linemax = $objQuery->count("dtb_products", $view_where, $arrval);
+                        $this->tpl_linemax = $linemax; // 何件が該当しました。表示用
+
+                        // ページ送りの処理
+                        if(is_numeric($_POST['search_page_max'])) {
+                            $page_max = $_POST['search_page_max'];
+                        } else {
+                            $page_max = SEARCH_PMAX;
                         }
-                    }
-                    break;
-                default:
-                    // 読み込む列とテーブルの指定
-                    $col = "product_id, name, category_id, main_list_image, status, product_code, price01, price02, stock, stock_unlimited";
-                    $from = "vw_products_nonclass AS noncls ";
-
-                    // 行数の取得
-                    $linemax = $objQuery->count("dtb_products", $view_where, $arrval);
-                    $this->tpl_linemax = $linemax;				// 何件が該当しました。表示用
-
-                    // ページ送りの処理
-                    if(is_numeric($_POST['search_page_max'])) {
-                        $page_max = $_POST['search_page_max'];
-                    } else {
-                        $page_max = SEARCH_PMAX;
-                    }
-
-                    // ページ送りの取得
-                    $objNavi = new SC_PageNavi($this->arrHidden['search_pageno'], $linemax, $page_max, "fnNaviSearchPage", NAVI_PMAX);
-                    $startno = $objNavi->start_row;
-                    $this->arrPagenavi = $objNavi->arrPagenavi;
-
-                    //キャンペーン商品検索時は、全結果の商品IDを変数に格納する
-                    if(isset($_POST['search_mode']) && $_POST['search_mode'] == 'campaign') {
-                        $arrRet = $objQuery->select($col, $from, $where, $arrval);
-                        if(count($arrRet) > 0) {
-                            $arrRet = sfSwapArray($arrRet);
-                            $pid = implode("-", $arrRet['product_id']);
-                            $this->arrHidden['campaign_product_id'] = $pid;
+
+                        // ページ送りの取得
+                        $objNavi = new SC_PageNavi($this->arrHidden['search_pageno'], $linemax, $page_max, "fnNaviSearchPage", NAVI_PMAX);
+                        $startno = $objNavi->start_row;
+                        $this->arrPagenavi = $objNavi->arrPagenavi;
+
+                        //キャンペーン商品検索時は、全結果の商品IDを変数に格納する
+                        if(isset($_POST['search_mode']) && $_POST['search_mode'] == 'campaign') {
+                            $arrRet = $objQuery->select($col, $from, $where, $arrval);
+                            if(count($arrRet) > 0) {
+                                $arrRet = sfSwapArray($arrRet);
+                                $pid = implode("-", $arrRet['product_id']);
+                                $this->arrHidden['campaign_product_id'] = $pid;
+                            }
                         }
-                    }
-
-                    // 取得範囲の指定(開始行番号、行数のセット)
-                    //                    if(DB_TYPE != "mysql") $objQuery->setlimitoffset($page_max, $startno);
-                    $objQuery->setlimitoffset($page_max, $startno);
-                    // 表示順序
-                    $objQuery->setorder($order);
-
-                    // 検索結果の取得
-                    $this->arrProducts = $objQuery->select($col, $from, $where, $arrval);
-
-                    // 各商品ごとのカテゴリIDを取得
-                    if (count($this->arrProducts) > 0) {
-                        foreach ($this->arrProducts as $key => $val) {
-                            $this->arrProducts[$key]["categories"] = $objDb->sfGetCategoryId($val["product_id"]);
-                            $objDb->g_category_on = false;
+
+                        // 取得範囲の指定(開始行番号、行数のセット)
+                        //                    if(DB_TYPE != "mysql") $objQuery->setlimitoffset($page_max, $startno);
+                        $objQuery->setlimitoffset($page_max, $startno);
+                        // 表示順序
+                        $objQuery->setorder($order);
+
+                        // 検索結果の取得
+                        $this->arrProducts = $objQuery->select($col, $from, $where, $arrval);
+
+                        // 各商品ごとのカテゴリIDを取得
+                        if (count($this->arrProducts) > 0) {
+                            foreach ($this->arrProducts as $key => $val) {
+                                $this->arrProducts[$key]["categories"] = $objDb->sfGetCategoryId($val["product_id"]);
+                                $objDb->g_category_on = false;
+                            }
                         }
-                    }
                 }
             }
@@ -354,9 +333,9 @@
         global $objPage;
         /*
-         *	文字列の変換
-         *	K :  「半角(ﾊﾝｶｸ)片仮名」を「全角片仮名」に変換
-         *	C :  「全角ひら仮名」を「全角かた仮名」に変換
-         *	V :  濁点付きの文字を一文字に変換。"K","H"と共に使用します
-         *	n :  「全角」数字を「半角(ﾊﾝｶｸ)」に変換
+         * 文字列の変換
+         * K :  「半角(ﾊﾝｶｸ)片仮名」を「全角片仮名」に変換
+         * C :  「全角ひら仮名」を「全角かた仮名」に変換
+         * V :  濁点付きの文字を一文字に変換。"K","H"と共に使用します
+         * n :  「全角」数字を「半角(ﾊﾝｶｸ)」に変換
          */
         $arrConvList['search_name'] = "KVa";
Index: trunk/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
===================================================================
--- trunk/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php	(revision 18007)
+++ trunk/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php	(revision 18562)
@@ -90,5 +90,5 @@
             $arrErr['csv_file'] = $this->objUpFile->makeTempFile('csv_file');
 
-            if($arrErr['css_file'] == "") {
+            if($arrErr['csv_file'] == "") {
                 $arrErr = $this->objUpFile->checkEXISTS();
             }
@@ -109,9 +109,14 @@
                 $enc_filepath = SC_Utils_Ex::sfEncodeFile($filepath,
                                                           CHAR_CODE, CSV_TEMP_DIR);
+                $fp = fopen($enc_filepath, "r");
+
+                // 無効なファイルポインタが渡された場合はエラー表示
+                if ($fp === false) {
+                    SC_Utils_Ex::sfDispError("");
+                }
 
                 // レコード数を得る
-                $rec_count = $this->lfCSVRecordCount($enc_filepath);
-
-                $fp = fopen($enc_filepath, "r");
+                $rec_count = $this->lfCSVRecordCount($fp);
+
                 $line = 0;      // 行数
                 $regist = 0;    // 登録数
@@ -490,17 +495,20 @@
      * CSVのカウント数を得る.
      *
-     * @param string $file_name ファイルパス
+     * @param resource $fp fopenを使用して作成したファイルポインタ
      * @return integer CSV のカウント数
      */
-    function lfCSVRecordCount($file_name) {
+    function lfCSVRecordCount($fp) {
 
         $count = 0;
-        $fp = fopen($file_name, "r");
         while(!feof($fp)) {
             $arrCSV = fgetcsv($fp, CSV_LINE_MAX);
             $count++;
         }
-
-        return $count-1;
+        // ファイルポインタを戻す
+        if (rewind($fp)) {
+            return $count-1;
+        } else {
+            SC_Utils_Ex::sfDispError("");
+        }
     }
 
Index: trunk/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php
===================================================================
--- trunk/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php	(revision 16832)
+++ trunk/data/class/pages/admin/system/LC_Page_Admin_System_Rank.php	(revision 18562)
Index: trunk/data/class/pages/cart/LC_Page_Cart.php
===================================================================
--- trunk/data/class/pages/cart/LC_Page_Cart.php	(revision 17653)
+++ trunk/data/class/pages/cart/LC_Page_Cart.php	(revision 18562)
@@ -72,5 +72,5 @@
 
         $objView = new SC_SiteView(false);
-        $objCartSess = new SC_CartSession("", false);
+        $objCartSess = new SC_CartSession();
         $objSiteSess = new SC_SiteSession();
         $objCampaignSess = new SC_CampaignSession();
@@ -191,5 +191,5 @@
 
         $objView = new SC_MobileView(false);
-        $objCartSess = new SC_CartSession("", false);
+        $objCartSess = new SC_CartSession();
         $objSiteSess = new SC_SiteSession();
         $objSiteInfo = $objView->objSiteInfo;
Index: trunk/data/class/pages/contact/LC_Page_Contact.php
===================================================================
--- trunk/data/class/pages/contact/LC_Page_Contact.php	(revision 17041)
+++ trunk/data/class/pages/contact/LC_Page_Contact.php	(revision 18562)
@@ -87,4 +87,5 @@
                                      array(  "column" => "addr02",		"convert" => "aKV" ),
                                      array(  "column" => "email",		"convert" => "a" ),
+                                     array(  "column" => "email02",		"convert" => "a" ),
                                      array(  "column" => "tel01",		"convert" => "n" ),
                                      array(  "column" => "tel02",		"convert" => "n" ),
@@ -108,6 +109,6 @@
                 $this->tpl_title = 'お問い合わせ(確認ページ)';
             } else {
-                foreach ($this->arrForm as $key => $val){
-                    $this->$key = $val;
+                foreach ($arrConvertColumn as $key) {
+                    $this->$key['column'] = $this->arrForm[$key['column']];
                 }
             }
@@ -115,6 +116,6 @@
 
             case 'return':
-            foreach ($_POST as $key => $val){
-                $this->$key = $val;
+                foreach ($arrConvertColumn as $key) {
+                    $this->$key['column'] = $_POST[$key['column']];
                 }
             break;
Index: trunk/data/class/pages/regist/LC_Page_Regist.php
===================================================================
--- trunk/data/class/pages/regist/LC_Page_Regist.php	(revision 18432)
+++ trunk/data/class/pages/regist/LC_Page_Regist.php	(revision 18562)
@@ -79,5 +79,5 @@
             if ($this->arrErr) {
                 SC_Utils_Ex::sfDispSiteError(FREE_ERROR_MSG, "", true, $this->arrErr["id"]);
-            
+
             } else {
                 $registSecretKey = $this->lfRegistData($_GET);			//本会員登録（フラグ変更）
@@ -186,7 +186,7 @@
         $where = "secret_key = ? AND status = 1";
 
-        $arrRet = $objQuery->select("point", "dtb_customer", $where, array($array["id"]));
-        // 会員登録時の加算ポイント(購入時会員登録の場合は、ポイント加算）
-        $arrRegist['point'] = $arrRet[0]['point'] + $this->arrInfo['welcome_point'];
+        // 会員登録時の加算ポイント(購入時会員登録かつ仮会員登録専用）
+        //$arrRet = $objQuery->select("point", "dtb_customer", $where, array($array["id"]));
+        //$arrRegist['point'] = $arrRet[0]['point'] + $this->arrInfo['welcome_point'];
 
         $objQuery->update("dtb_customer", $arrRegist, $where, array($array["id"]));
Index: trunk/data/class/pages/entry/LC_Page_Entry.php
===================================================================
--- trunk/data/class/pages/entry/LC_Page_Entry.php	(revision 18007)
+++ trunk/data/class/pages/entry/LC_Page_Entry.php	(revision 18562)
@@ -168,6 +168,6 @@
 
             if ($this->arrErr || $_POST["mode"] == "return") {		// 入力エラーのチェック
-                foreach($this->arrForm as $key => $val) {
-                    $this->$key = $val;
+                foreach($arrRegistColumn as $key) {
+                    $this->$key['column'] = $this->arrForm[$key['column']];
                 }
 
@@ -382,6 +382,6 @@
             }
 
-            foreach($this->arrForm as $key => $val) {
-                $this->$key = $val;
+            foreach($arrRegistColumn as $key) {
+                $this->$key['column'] = $this->arrForm[$key['column']];
             }
 
Index: trunk/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php
===================================================================
--- trunk/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php	(revision 18007)
+++ trunk/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php	(revision 18562)
Index: trunk/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php
===================================================================
--- trunk/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php	(revision 17344)
+++ trunk/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php	(revision 18562)
@@ -64,5 +64,6 @@
             // 文字サイズを制限する
             foreach($arrRet as $key => $val) {
-                $arrRet[$key] = SC_Utils_Ex::sfCutString($val, SEARCH_CATEGORY_LEN, false);
+                $str = SC_Utils_Ex::sfCutString($val, SEARCH_CATEGORY_LEN, false);
+                $arrRet[$key] = preg_replace('/　/', "&nbsp;", $str);
             }
         }
Index: trunk/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- trunk/data/class/pages/products/LC_Page_Products_Detail.php	(revision 18432)
+++ trunk/data/class/pages/products/LC_Page_Products_Detail.php	(revision 18562)
@@ -222,10 +222,4 @@
         $this->arrProductCode = $arrProductCode["product_code"];
 
-        // 購入制限数を取得
-        if($this->arrProduct['sale_unlimited'] == 1 || $this->arrProduct['sale_limit'] > SALE_LIMIT_MAX) {
-          $this->tpl_sale_limit = SALE_LIMIT_MAX;
-        } else {
-          $this->tpl_sale_limit = $this->arrProduct['sale_limit'];
-        }
         // サブタイトルを取得
         $arrCategory_id = $objDb->sfGetCategoryId($arrRet[0]['product_id'],'',$status);
@@ -445,11 +439,4 @@
         $arrProductCode = SC_Utils_Ex::sfswaparray($arrProductCode);
         $this->arrProductCode = $arrProductCode["product_code"];
-
-        // 購入制限数を取得
-        if($this->arrProduct['sale_unlimited'] == 1 || $this->arrProduct['sale_limit'] > SALE_LIMIT_MAX) {
-            $this->tpl_sale_limit = SALE_LIMIT_MAX;
-        } else {
-            $this->tpl_sale_limit = $this->arrProduct['sale_limit'];
-        }
 
         // サブタイトルを取得
Index: trunk/data/class/pages/products/LC_Page_Products_DetailImage.php
===================================================================
--- trunk/data/class/pages/products/LC_Page_Products_DetailImage.php	(revision 17698)
+++ trunk/data/class/pages/products/LC_Page_Products_DetailImage.php	(revision 18562)
@@ -54,5 +54,5 @@
     function process() {
         $objView = new SC_SiteView();
-        $objCartSess = new SC_CartSession("", false);
+        $objCartSess = new SC_CartSession();
         $objDb = new SC_Helper_DB_Ex();
 
Index: trunk/data/class/pages/products/LC_Page_Products_List.php
===================================================================
--- trunk/data/class/pages/products/LC_Page_Products_List.php	(revision 18432)
+++ trunk/data/class/pages/products/LC_Page_Products_List.php	(revision 18562)
@@ -478,4 +478,7 @@
         if (is_array($arrProduct_id) && !empty($arrProduct_id)) {
             $where .= ' AND product_id IN (' . implode(',', $arrProduct_id) . ')';
+        } else {
+            // 一致させない
+            $where .= ' AND 0<>0';
         }
 
@@ -542,6 +545,4 @@
             for($i = 0; $i < count($this->arrProducts); $i++) {
                 $this->lfMakeSelect($this->arrProducts[$i]['product_id'], $arrClassName, $arrClassCatName);
-                // 購入制限数を取得
-                $this->lfGetSaleLimit($this->arrProducts[$i]);
             }
         }
@@ -716,14 +717,4 @@
     }
 
-    // 購入制限数の設定
-    function lfGetSaleLimit($product) {
-        //在庫が無限または購入制限値が設定値より大きい場合
-        if($product['sale_unlimited'] == 1 || $product['sale_limit'] > SALE_LIMIT_MAX) {
-            $this->tpl_sale_limit[$product['product_id']] = SALE_LIMIT_MAX;
-        } else {
-            $this->tpl_sale_limit[$product['product_id']] = $product['sale_limit'];
-        }
-    }
-
     //支払方法の取得
     //payment_id    1:代金引換　2:銀行振り込み　3:現金書留
Index: trunk/data/class/SC_Initial.php
===================================================================
--- trunk/data/class/SC_Initial.php	(revision 18432)
+++ trunk/data/class/SC_Initial.php	(revision 18562)
@@ -38,5 +38,5 @@
 
         /** EC-CUBEのバージョン */
-        define('ECCUBE_VERSION', "2.4.2");
+        define('ECCUBE_VERSION', "2.4.3");
     }
 
Index: trunk/data/smarty_extends/modifier.script_escape.php
===================================================================
--- trunk/data/smarty_extends/modifier.script_escape.php	(revision 17464)
+++ trunk/data/smarty_extends/modifier.script_escape.php	(revision 18562)
Index: trunk/data/smarty_extends/modifier.numeric_emoji.php
===================================================================
--- trunk/data/smarty_extends/modifier.numeric_emoji.php	(revision 16329)
+++ trunk/data/smarty_extends/modifier.numeric_emoji.php	(revision 18562)
Index: trunk/data/smarty_extends/block.marquee.php
===================================================================
--- trunk/data/smarty_extends/block.marquee.php	(revision 16329)
+++ trunk/data/smarty_extends/block.marquee.php	(revision 18562)
Index: trunk/data/Smarty/templates/default/mobile/mypage/history_detail.tpl
===================================================================
--- trunk/data/Smarty/templates/default/mobile/mypage/history_detail.tpl	(revision 16582)
+++ trunk/data/Smarty/templates/default/mobile/mypage/history_detail.tpl	(revision 18562)
@@ -28,5 +28,5 @@
 注文番号:<!--{$arrDisp.order_id}--><br>
 <br>
-【配送先】<br>
+【お届け先】<br>
 	<!--{assign var=key1 value="deliv_name01"}--><!--{assign var=key2 value="deliv_name02"}-->
 	<!--{$arrDisp[$key1]|escape}-->&nbsp;<!--{$arrDisp[$key2]|escape}--><br>
@@ -37,5 +37,5 @@
 	<!--{assign var=key value="deliv_addr02"}--><!--{$arrDisp[$key]|escape}--><br>
 <br>
-【配送日時指定】<br>
+【お届け日時指定】<br>
 <!--{if $arrDisp.deliv_date eq "" and $arrDelivTime[$arrDisp.deliv_time_id] eq ""}-->
 	指定なし<br>
Index: trunk/data/Smarty/templates/default/mobile/shopping/confirm.tpl
===================================================================
--- trunk/data/Smarty/templates/default/mobile/shopping/confirm.tpl	(revision 17848)
+++ trunk/data/Smarty/templates/default/mobile/shopping/confirm.tpl	(revision 18562)
@@ -34,5 +34,5 @@
 <br>
 
-【配送先】<br>
+【お届け先】<br>
 <!--{* 別のお届け先が選択されている場合 *}-->
 <!--{if $arrData.deliv_check >= 1}-->
@@ -48,5 +48,5 @@
 <br>
 
-【配送日時指定】<br>
+【お届け日時指定】<br>
 日：<!--{$arrData.deliv_date|escape|default:"指定なし"}--><br>
 時間：<!--{$arrData.deliv_time|escape|default:"指定なし"}--><br>
Index: trunk/data/Smarty/templates/default/mobile/shopping/deliv_date.tpl
===================================================================
--- trunk/data/Smarty/templates/default/mobile/shopping/deliv_date.tpl	(revision 17848)
+++ trunk/data/Smarty/templates/default/mobile/shopping/deliv_date.tpl	(revision 18562)
@@ -35,5 +35,5 @@
 <!--{/if}-->
 
-■配送日指定<br>
+■お届け日<br>
 <!--{assign var=key value="deliv_date"}-->
 <!--{if $arrErr[$key] != ""}-->
@@ -50,5 +50,5 @@
 <br><br>
 
-■時間帯指定<br>
+■お届け時間<br>
 <!--{assign var=key value="deliv_time_id"}-->
 <!--{if $arrErr[$key] != ""}-->
Index: trunk/data/Smarty/templates/default/mobile/shopping/deliv.tpl
===================================================================
--- trunk/data/Smarty/templates/default/mobile/shopping/deliv.tpl	(revision 17848)
+++ trunk/data/Smarty/templates/default/mobile/shopping/deliv.tpl	(revision 18562)
@@ -22,5 +22,5 @@
  */
 *}-->
-<center>配送先指定</center>
+<center>お届け先指定</center>
 
 <hr>
@@ -42,5 +42,5 @@
 <input type="hidden" name="other_deliv_id" value="<!--{$arrAddr[cnt].other_deliv_id}-->">
 <!--{/if}-->
-■配送先<!--{$smarty.section.cnt.iteration}--><br>
+■お届け先<!--{$smarty.section.cnt.iteration}--><br>
 〒<!--{$arrAddr[cnt].zip01}-->-<!--{$arrAddr[cnt].zip02}--><br>
 <!--{assign var=key value=$arrAddr[cnt].pref}--><!--{$arrPref[$key]}--><!--{$arrAddr[cnt].addr01|escape}--><br>
Index: trunk/data/Smarty/templates/default/mobile/top.tpl
===================================================================
--- trunk/data/Smarty/templates/default/mobile/top.tpl	(revision 18432)
+++ trunk/data/Smarty/templates/default/mobile/top.tpl	(revision 18562)
@@ -52,5 +52,5 @@
 <!--{/if}-->
 <a href="guide/index.php" accesskey="4"><!--{4|numeric_emoji}-->ご利用ガイド</a><br>
-<a href="<!--{$smarty.const.MOBILE_SSL_URL}-->contact/index.php" accesskey="5"><!--{5|numeric_emoji}-->お問い合せ</a><br>
+<a href="<!--{$smarty.const.MOBILE_SSL_URL}-->contact/index.php?PHPSESSID=<!--{$smarty.get.PHPSESSID|urlencode}-->" accesskey="5"><!--{5|numeric_emoji}-->お問い合せ</a><br>
 <a href="mypage/index.php" accesskey="6" utn><!--{6|numeric_emoji}-->MYページ</a><br>
 <!-- ▲メニュー ここまで -->
Index: trunk/data/Smarty/templates/default/bloc/calendar.tpl
===================================================================
--- trunk/data/Smarty/templates/default/bloc/calendar.tpl	(revision 17250)
+++ trunk/data/Smarty/templates/default/bloc/calendar.tpl	(revision 18562)
Index: trunk/data/Smarty/templates/default/mypage/history.tpl
===================================================================
--- trunk/data/Smarty/templates/default/mypage/history.tpl	(revision 18007)
+++ trunk/data/Smarty/templates/default/mypage/history.tpl	(revision 18562)
@@ -33,8 +33,8 @@
     <strong>お支払い方法：&nbsp;</strong><!--{$arrPayment[$arrDisp.payment_id]|escape}-->
     <!--{if $arrDisp.deliv_time_id != ""}--><br />
-    <strong>お届け時間指定：&nbsp;</strong><!--{$arrDelivTime[$arrDisp.deliv_time_id]|escape}-->
+    <strong>お届け時間：&nbsp;</strong><!--{$arrDelivTime[$arrDisp.deliv_time_id]|escape}-->
     <!--{/if}-->
     <!--{if $arrDisp.deliv_date != ""}--><br />
-    <strong>お届け日指定：&nbsp;</strong><!--{$arrDisp.deliv_date|escape}-->
+    <strong>お届け日：&nbsp;</strong><!--{$arrDisp.deliv_date|escape}-->
     <!--{/if}-->
     </p>
Index: trunk/data/Smarty/templates/default/shopping/confirm.tpl
===================================================================
--- trunk/data/Smarty/templates/default/shopping/confirm.tpl	(revision 18432)
+++ trunk/data/Smarty/templates/default/shopping/confirm.tpl	(revision 18562)
@@ -194,8 +194,8 @@
       <!--お届け先ここまで-->
 
-      <table summary="お支払方法・お届け時間の指定・その他お問い合わせ" class="delivname">
+      <table summary="お支払方法・お届け日時の指定・その他お問い合わせ" class="delivname">
         <thead>
         <tr>
-          <th colspan="2">▼お支払方法・お届け時間の指定・その他お問い合わせ</th>
+          <th colspan="2">▼お支払方法・お届け日時の指定・その他お問い合わせ</th>
         </tr>
         </thead>
Index: trunk/data/Smarty/templates/default/shopping/payment.tpl
===================================================================
--- trunk/data/Smarty/templates/default/shopping/payment.tpl	(revision 18432)
+++ trunk/data/Smarty/templates/default/shopping/payment.tpl	(revision 18562)
@@ -43,5 +43,5 @@
           <tr>
             <th>選択</th>
-            <th colspan="<!--{if $img_show == false}-->2<!--{else}-->3<!--{/if}-->">お支払方法</th>
+            <th colspan="<!--{if $img_show == false}-->1<!--{else}-->2<!--{/if}-->">お支払方法</th>
           </tr>
           <!--{section name=cnt loop=$arrPayment}-->
@@ -52,10 +52,10 @@
               <label for="pay_<!--{$smarty.section.cnt.iteration}-->"><!--{$arrPayment[cnt].payment_method|escape}--><!--{if $arrPayment[cnt].note != ""}--><!--{/if}--></label>
             </td>
+           <!--{if $img_show}-->
+            <td>
             <!--{if $arrPayment[cnt].payment_image != ""}-->
-                <td>
-                    <img src="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$arrPayment[cnt].payment_image}-->" />
-                </td>
-            <!--{elseif $img_show == true}-->
-                <td></td>
+              <img src="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$arrPayment[cnt].payment_image}-->" />
+            <!--{/if}-->
+            </td>
             <!--{/if}-->
           </tr>
@@ -68,5 +68,5 @@
         <p>ご希望の方は、お届け時間を選択してください。</p>
         <div>
-          <!--★配達日指定★-->
+          <!--★お届け日★-->
           <!--{assign var=key value="deliv_date"}-->
           <span class="attention"><!--{$arrErr[$key]}--></span>
@@ -80,7 +80,8 @@
             </select>
           <!--{/if}-->
+          <!--★お届け時間★-->
           <!--{assign var=key value="deliv_time_id"}-->
           <span class="attention"><!--{$arrErr[$key]}--></span>
-          <em>お届け時間指定：</em>
+          <em>お届け時間：</em>
           <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
             <option value="" selected="">指定なし</option>
Index: trunk/data/Smarty/templates/default/shopping/nonmember_input.tpl
===================================================================
--- trunk/data/Smarty/templates/default/shopping/nonmember_input.tpl	(revision 16583)
+++ trunk/data/Smarty/templates/default/shopping/nonmember_input.tpl	(revision 18562)
@@ -170,5 +170,5 @@
           <!--{assign var=key value="deliv_check"}-->
           <input type="checkbox" name="<!--{$key}-->" value="1" onclick="fnCheckInputDeliv();" <!--{$arrForm[$key].value|sfGetChecked:1}--> id="deliv_label" />
-          <label for="deliv_label"><em>配送先を指定</em>　※上記に入力されたご住所と同一の場合は省略可能です。</label>
+          <label for="deliv_label"><em>お届け先を指定</em>　※上記に入力されたご住所と同一の場合は省略可能です。</label>
           </th>
         </tr>
Index: trunk/data/Smarty/templates/default/admin/system/parameter.tpl
===================================================================
--- trunk/data/Smarty/templates/default/admin/system/parameter.tpl	(revision 17330)
+++ trunk/data/Smarty/templates/default/admin/system/parameter.tpl	(revision 18562)
@@ -86,5 +86,5 @@
     <div>
       <!--{assign var=key value=$arrKeys[cnt]}-->
-      <input type="text" name="<!--{$arrKeys[cnt]|escape}-->" value="<!--{$arrValues[cnt]|escape}-->" size="64" style="<!--{if $arrErr.$key != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->">
+      <input type="text" name="<!--{$arrKeys[cnt]|escape}-->" value="<!--{$arrValues[cnt]|escape}-->" size="64" style="width: 370px;<!--{if $arrErr.$key != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->">
       <span class="red12"><!--{$arrErr.$key}--></span>
     </div>
Index: trunk/data/Smarty/templates/default/admin/contents/inquiry.tpl
===================================================================
--- trunk/data/Smarty/templates/default/admin/contents/inquiry.tpl	(revision 16761)
+++ trunk/data/Smarty/templates/default/admin/contents/inquiry.tpl	(revision 18562)
@@ -145,33 +145,41 @@
 							</tr>		
 							<!--{section name=question loop=$cnt_question}-->
+              <!--{assign var=index value=$smarty.section.question.index}-->
 							<tr class="fs12n">
 								<td width="140" bgcolor="#f2f1ec">質問<!--{$smarty.section.question.iteration}--><!--{if $smarty.section.question.iteration eq 1}--><span class="red">*</span><!--{/if}--></td>
 								<td width="637" bgcolor="#ffffff">
-								<input type="text" name="question[<!--{$smarty.section.question.index}-->][name]" size="70" class="box70" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$smarty.post.question[$smarty.section.question.index].name|escape}-->" <!--{if $ERROR.question[$smarty.section.question.index].name}--><!--{sfSetErrorStyle}--><!--{/if}-->>
-								<!--{if $ERROR.question[$smarty.section.question.index].name}--><br><span class="red"><!--{$ERROR.question[$smarty.section.question.index].name}--></span><!--{/if}-->
+								<input type="text" name="question[<!--{$index}-->][name]" size="70" class="box70" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$smarty.post.question[$index].name|escape}-->" <!--{if $ERROR.question[$index].name}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+								<!--{if $ERROR.question[$index].name}--><br><span class="red"><!--{$ERROR.question[$index].name}--></span><!--{/if}-->
 								</td>
 							</tr>
 							<tr class="fs12n" bgcolor="#ffffff">
 								<td colspan="2">
-								<span style=background-color:"<!--{$ERROR_COLOR.question[$smarty.section.question.index].kind}-->">
-								<!--{html_radios_ex onClick="func_disp(`$smarty.section.question.index`)" name="question[`$smarty.section.question.index`][kind]" options="$arrQuestion" selected="`$smarty.post.question[$smarty.section.question.index].kind`"}-->
+								<span style=background-color:"<!--{$ERROR_COLOR.question[$index].kind}-->">
+								<!--{html_radios_ex onClick="func_disp(`$index`)" name="question[`$index`][kind]" options="$arrQuestion" selected="`$smarty.post.question[$index].kind`"}-->
 								</span>
-								<!--{if $ERROR.question[$smarty.section.question.index].kind}--><br><span class="red"><!--{$ERROR.question[$smarty.section.question.index].kind}--></span><!--{/if}-->
-								</td>
-							</tr>
+								<!--{if $ERROR.question[$index].kind}--><br><span class="red"><!--{$ERROR.question[$index].kind}--></span><!--{/if}-->
+								</td>
+							</tr>
+              <!--{** 回答 **}-->
 							<tr class="fs12n" bgcolor="#ffffff"><td colspan="2">
-								<table id="TD<!--{$smarty.section.question.index}-->">
-								<tr class="fs12n" bgcolor="#ffffff">
-									<td colspan="2">1 <input type="text" name="question[<!--{$smarty.section.question.index}-->][option][0]" size="40" class="box40" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$smarty.post.question[$smarty.section.question.index].option.0|escape}-->" <!--{if $ERROR.question[$smarty.section.question.index].kind}--><!--{sfSetErrorStyle}--><!--{/if}-->>　2 <input type="text" name="question[<!--{$smarty.section.question.index}-->][option][1]" size="40" class="box40" value="<!--{$smarty.post.question[$smarty.section.question.index].option.1|escape}-->" <!--{if $ERROR.question[$smarty.section.question.index].kind}--><!--{sfSetErrorStyle}--><!--{/if}-->></td>
-								</tr>
-								<tr class="fs12n" bgcolor="#ffffff">
-									<td colspan="2">3 <input type="text" name="question[<!--{$smarty.section.question.index}-->][option][2]" size="40" class="box40" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$smarty.post.question[$smarty.section.question.index].option.2|escape}-->">　4 <input type="text" name="question[<!--{$smarty.section.question.index}-->][option][3]" size="40" class="box40" value="<!--{$smarty.post.question[$smarty.section.question.index].option.3|escape}-->"></td>
-								</tr>
-								<tr class="fs12n" bgcolor="#ffffff">
-									<td colspan="2">5 <input type="text" name="question[<!--{$smarty.section.question.index}-->][option][4]" size="40" class="box40" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$smarty.post.question[$smarty.section.question.index].option.4|escape}-->">　6 <input type="text" name="question[<!--{$smarty.section.question.index}-->][option][5]" size="40" class="box40" value="<!--{$smarty.post.question[$smarty.section.question.index].option.5|escape}-->"></td>
-								</tr>
-								<tr class="fs12n" bgcolor="#ffffff">
-									<td colspan="2">7 <input type="text" name="question[<!--{$smarty.section.question.index}-->][option][6]" size="40" class="box40" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$smarty.post.question[$smarty.section.question.index].option.6|escape}-->">　8 <input type="text" name="question[<!--{$smarty.section.question.index}-->][option][7]" size="40" class="box40" value="<!--{$smarty.post.question[$smarty.section.question.index].option.7|escape}-->"></td>
-								</tr>
+								<table id="TD<!--{$index}-->">
+							  <!--{section name=option loop=4 start=0 max=7}-->
+								  <tr class="fs12n" bgcolor="#ffffff">
+								  	<td colspan="2">
+                      <!--{assign var=option_index1 value=$smarty.section.option.index*2}-->
+                      <!--{assign var=option_index2 value=$option_index1+1}-->
+                      <!--{assign var=num1 value=$option_index1+1}-->
+                      <!--{assign var=num2 value=$option_index2+1}-->
+                      <!--{** 回答エラー **}-->
+                      <!--{assign var=error1 value=$ERROR.question[$index].option[$option_index1]}-->
+								      <!--{if $error1}--><span class="red"><!--{$error1}--></span><br /><!--{/if}-->
+                      <!--{assign var=error2 value=$ERROR.question[$index].option[$option_index2]}-->
+								      <!--{if $error2}--><span class="red"><!--{$error2}--></span><br /><!--{/if}-->
+                      <!--{** 回答フォーム **}-->
+                      <!--{$num1}--> <input type="text" name="question[<!--{$index}-->][option][<!--{$option_index1}-->]" size="40" class="box40" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$smarty.post.question[$index].option[$option_index1]|escape}-->" <!--{if $error1}--><!--{sfSetErrorStyle}--><!--{/if}-->>　
+                      <!--{$num2}--> <input type="text" name="question[<!--{$index}-->][option][<!--{$option_index2}-->]" size="40" class="box40" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$smarty.post.question[$index].option[$option_index2]|escape}-->" <!--{if $error2}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+                    </td>
+								  </tr>
+                <!--{/section}-->
 								</table>
 							</td></tr>
Index: trunk/data/Smarty/templates/default/admin/basis/delivery_input.tpl
===================================================================
--- trunk/data/Smarty/templates/default/admin/basis/delivery_input.tpl	(revision 16582)
+++ trunk/data/Smarty/templates/default/admin/basis/delivery_input.tpl	(revision 18562)
@@ -98,5 +98,5 @@
 										<!--{/if}-->
 										<tr class="fs12n">
-										<td width="100" bgcolor="#f2f1ec">配送時間<!--{$keyno}--></td>
+										<td width="100" bgcolor="#f2f1ec">お届け時間<!--{$keyno}--></td>
 										<!--{if $smarty.section.cnt.last}-->
 										<!--{assign var=colspan value="3"}-->	
@@ -107,5 +107,5 @@
 										<input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="20" class="box20" /></td>
 									<!--{else}-->
-										<td width="100" bgcolor="#f2f1ec">配送時間<!--{$keyno}--></td>
+										<td width="100" bgcolor="#f2f1ec">お届け時間<!--{$keyno}--></td>
 										<td width="248" bgcolor="#ffffff"><input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" size="20" class="box20" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /> </td>
 										</tr>
Index: trunk/data/Smarty/templates/default/admin/order/disp.tpl
===================================================================
--- trunk/data/Smarty/templates/default/admin/order/disp.tpl	(revision 18177)
+++ trunk/data/Smarty/templates/default/admin/order/disp.tpl	(revision 18562)
@@ -156,8 +156,8 @@
                         </table>
 
-                        <!--▼配送先情報ここから-->
+                        <!--▼お届け先情報ここから-->
                         <table width="678" border="0" cellspacing="1" cellpadding="8" summary=" ">
                             <tr class="fs12n">
-                                <td bgcolor="#f2f1ec" width="717" colspan="4">▼配送先情報</td>
+                                <td bgcolor="#f2f1ec" width="717" colspan="4">▼お届け先情報</td>
                             </tr>
                             <tr class="fs12n">
@@ -204,5 +204,5 @@
                             </tr>
                         </table>
-                        <!--▲配送先情報ここまで-->
+                        <!--▲お届け先情報ここまで-->
 
                         <table width="678" border="0" cellspacing="0" cellpadding="0" summary=" ">
@@ -323,5 +323,5 @@
                             <!--{/if}-->
                             <tr class="fs12n">
-                                <td bgcolor="#f0f0f0" colspan="5">▼時間指定</td>
+                                <td bgcolor="#f0f0f0" colspan="5">▼お届け指定</td>
                             </tr>
                             <tr class="fs12n">
@@ -331,5 +331,5 @@
                             </tr>
                             <tr class="fs12n">
-                                <td bgcolor="#f0f0f0" colspan="6">▼配達日指定</td>
+                                <td bgcolor="#f0f0f0" colspan="6">▼お届け日指定</td>
                             </tr>
                             <tr class="fs12n">
Index: trunk/data/Smarty/templates/default/admin/order/status.tpl
===================================================================
--- trunk/data/Smarty/templates/default/admin/order/status.tpl	(revision 18177)
+++ trunk/data/Smarty/templates/default/admin/order/status.tpl	(revision 18562)
@@ -70,5 +70,5 @@
 									<table border="0" cellspacing="0" cellpadding="0" summary=" ">
 										<tr>
-											<td>
+											<td align="center">
 												<select name="change_status">
 												<option value="" selected="selected" style="<!--{$Errormes|sfGetErrorColor}-->" >選択してください</option>
@@ -80,6 +80,10 @@
 												<option value="delete">削除</option>
 												</select>
+											<input type="button" name="regist" value="反映" onclick="fnSelectCheckSubmit();"></td>
+										</tr>
+										<tr>
+											<td>
+                        <span class="red12">※ <!--{$arrORDERSTATUS[$smarty.const.ORDER_CANCEL]}-->もしくは、削除に変更時には、在庫数を手動で戻してください。</span><br />
 											</td>
-											<td><input type="button" name="regist" value="反映" onclick="fnSelectCheckSubmit();"></td>
 										</tr>
 									</table>
Index: trunk/data/Smarty/templates/default/admin/order/edit.tpl
===================================================================
--- trunk/data/Smarty/templates/default/admin/order/edit.tpl	(revision 18432)
+++ trunk/data/Smarty/templates/default/admin/order/edit.tpl	(revision 18562)
@@ -169,5 +169,8 @@
                                     <option value="">選択してください</option>
                                     <!--{html_options options=$arrORDERSTATUS selected=$arrForm[$key].value}-->
-                                    </select>
+                                    </select><br />
+                                    <!--{if $smarty.get.mode != 'add'}-->
+                                    <span class="red12">※ <!--{$arrORDERSTATUS[$smarty.const.ORDER_CANCEL]}-->に変更時には、在庫数を手動で戻してください。</span>
+                                    <!--{/if}-->
                                 </td>
                             </tr>
@@ -310,8 +313,8 @@
                         </table>
 
-                        <!--▼配送先情報ここから-->
+                        <!--▼お届け先情報ここから-->
                         <table width="678" border="0" cellspacing="1" cellpadding="8" summary=" ">
                             <tr class="fs12n">
-                                <td bgcolor="#f2f1ec" width="717" colspan="4">▼配送先情報
+                                <td bgcolor="#f2f1ec" width="717" colspan="4">▼お届け先情報
                                 &nbsp;&nbsp;&nbsp;<input type="button" name="input_from_order_data" value="上記お客様情報をコピー" onclick="fnCopyFromOrderData();" /></td>
                             </tr>
@@ -393,5 +396,5 @@
                             </tr>
                         </table>
-                        <!--▲配送先情報ここまで-->
+                        <!--▲お届け先情報ここまで-->
 
                         <table width="678" border="0" cellspacing="0" cellpadding="0" summary=" ">
@@ -407,5 +410,7 @@
                                 <input type="button" name="add_product" value="商品の追加" onclick="win03('<!--{$smarty.const.SITE_URL}-->admin/order/product_select.php<!--{if $tpl_order_id}-->?order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500'); " />
                                 <br />
+<!--{**
                                 <span class="red">（商品の追加、及び数量の変更に伴う在庫数の変更は手動にてお願いします。)</span>
+**}-->
                                 <br />
                                 <span class="red12"><!--{$arrErr.product_id}--></span>
@@ -556,5 +561,5 @@
 
                             <tr class="fs12n">
-                                <td bgcolor="#f2f1ec" colspan="6">▼時間指定</td>
+                                <td bgcolor="#f2f1ec" colspan="6">▼お届け指定</td>
                             </tr>
                             <tr class="fs12n">
@@ -570,11 +575,18 @@
                             <!--{assign var=key value="deliv_date"}-->
                             <tr class="fs12n">
-                                <td bgcolor="#f2f1ec" colspan="6">▼配達日指定</td>
+                                <td bgcolor="#f2f1ec" colspan="6">▼お届け日指定</td>
                             </tr>
                             <tr class="fs12n">
                                 <td bgcolor="#ffffff" colspan="6">
-                                <!--{assign var=key value="deliv_date"}-->
-                                <span class="red12"><!--{$arrErr[$key]}--></span>
-                                <input name="<!--{$key|escape}-->" value="<!--{$arrForm[$key].value|escape}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="20" maxlength="<!--{$arrForm[$key].length}-->" />
+                                  <span class="attention"><!--{$arrErr.deliv_date_year}--></span> 
+                                  <select name="deliv_date_year" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"> 
+                                    <!--{html_options options=$arrYearDelivDate selected=$arrForm.deliv_date_year.value|default:""}--> 
+                                  </select>年 
+                                  <select name="deliv_date_month" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"> 
+                                    <!--{html_options options=$arrMonthDelivDate selected=$arrForm.deliv_date_month.value|default:""}--> 
+                                  </select>月 
+                                  <select name="deliv_date_day" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"> 
+                                    <!--{html_options options=$arrDayDelivDate selected=$arrForm.deliv_date_day.value|default:""}--> 
+                                  </select>日
                                 </td>
                             </tr>
Index: trunk/data/Smarty/templates/default/admin/order/index.tpl
===================================================================
--- trunk/data/Smarty/templates/default/admin/order/index.tpl	(revision 18177)
+++ trunk/data/Smarty/templates/default/admin/order/index.tpl	(revision 18562)
@@ -450,5 +450,5 @@
                             <td align="center"><a href="<!--{$smarty.server.PHP_SELF|escape}-->" onclick="fnChangeAction('<!--{$smarty.const.URL_ORDER_EDIT}-->'); fnModeSubmit('pre_edit', 'order_id', '<!--{$arrResults[cnt].order_id}-->'); return false;"><span class="icon_edit">編集</span></a></td>
                             <td align="center"><a href="<!--{$smarty.server.PHP_SELF|escape}-->" onclick="fnChangeAction('<!--{$smarty.const.URL_ORDER_MAIL}-->'); fnModeSubmit('pre_edit', 'order_id', '<!--{$arrResults[cnt].order_id}-->'); return false;"><span class="icon_mail">通知</span></a></td>
-                            <td align="center"><a href="<!--{$smarty.server.PHP_SELF|escape}-->" onclick="fnModeSubmit('delete', 'order_id', <!--{$arrResults[cnt].order_id}-->); return false;"><span class="icon_delete">削除</span></a></td>
+                            <td align="center"><a href="<!--{$smarty.server.PHP_SELF|escape}-->" onclick="fnModeSubmit('delete_order', 'order_id', <!--{$arrResults[cnt].order_id}-->); return false;"><span class="icon_delete">削除</span></a></td>
                         </tr>
                         <!--{/section}-->
Index: trunk/data/Smarty/templates/default/admin/order/pdf_input.tpl
===================================================================
--- trunk/data/Smarty/templates/default/admin/order/pdf_input.tpl	(revision 18177)
+++ trunk/data/Smarty/templates/default/admin/order/pdf_input.tpl	(revision 18562)
Index: trunk/data/include/image_converter.inc
===================================================================
--- trunk/data/include/image_converter.inc	(revision 18432)
+++ trunk/data/include/image_converter.inc	(revision 18562)
Index: trunk/data/include/mobile_emoji_map_softbank.inc
===================================================================
--- trunk/data/include/mobile_emoji_map_softbank.inc	(revision 15079)
+++ trunk/data/include/mobile_emoji_map_softbank.inc	(revision 18562)
Index: trunk/data/include/mobile_emoji_map_ezweb.inc
===================================================================
--- trunk/data/include/mobile_emoji_map_ezweb.inc	(revision 15079)
+++ trunk/data/include/mobile_emoji_map_ezweb.inc	(revision 18562)
Index: trunk/data/include/module.inc
===================================================================
--- trunk/data/include/module.inc	(revision 17618)
+++ trunk/data/include/module.inc	(revision 18562)
Index: trunk/data/include/mobile_emoji_map_docomo.inc
===================================================================
--- trunk/data/include/mobile_emoji_map_docomo.inc	(revision 15079)
+++ trunk/data/include/mobile_emoji_map_docomo.inc	(revision 18562)
Index: trunk/data/module/Mail/mimeDecode.php
===================================================================
--- trunk/data/module/Mail/mimeDecode.php	(revision 16300)
+++ trunk/data/module/Mail/mimeDecode.php	(revision 18562)
Index: trunk/data/module/Mail/mimePart.php
===================================================================
--- trunk/data/module/Mail/mimePart.php	(revision 16300)
+++ trunk/data/module/Mail/mimePart.php	(revision 18562)
Index: trunk/data/module/Mail/mime.php
===================================================================
--- trunk/data/module/Mail/mime.php	(revision 15532)
+++ trunk/data/module/Mail/mime.php	(revision 18562)
Index: trunk/data/module/SOAP/example/server.php
===================================================================
--- trunk/data/module/SOAP/example/server.php	(revision 16957)
+++ trunk/data/module/SOAP/example/server.php	(revision 18562)
Index: trunk/data/module/SOAP/example/wsdl_client.php
===================================================================
--- trunk/data/module/SOAP/example/wsdl_client.php	(revision 16957)
+++ trunk/data/module/SOAP/example/wsdl_client.php	(revision 18562)
Index: trunk/data/module/SOAP/example/email_gateway.php
===================================================================
--- trunk/data/module/SOAP/example/email_gateway.php	(revision 16957)
+++ trunk/data/module/SOAP/example/email_gateway.php	(revision 18562)
Index: trunk/data/module/SOAP/example/tcp_server.php
===================================================================
--- trunk/data/module/SOAP/example/tcp_server.php	(revision 16957)
+++ trunk/data/module/SOAP/example/tcp_server.php	(revision 18562)
Index: trunk/data/module/SOAP/example/com_client.php
===================================================================
--- trunk/data/module/SOAP/example/com_client.php	(revision 16957)
+++ trunk/data/module/SOAP/example/com_client.php	(revision 18562)
Index: trunk/data/module/SOAP/example/email_server.php
===================================================================
--- trunk/data/module/SOAP/example/email_server.php	(revision 16957)
+++ trunk/data/module/SOAP/example/email_server.php	(revision 18562)
Index: trunk/data/module/SOAP/example/client.php
===================================================================
--- trunk/data/module/SOAP/example/client.php	(revision 16957)
+++ trunk/data/module/SOAP/example/client.php	(revision 18562)
Index: trunk/data/module/SOAP/example/example_types.php
===================================================================
--- trunk/data/module/SOAP/example/example_types.php	(revision 16957)
+++ trunk/data/module/SOAP/example/example_types.php	(revision 18562)
Index: trunk/data/module/SOAP/example/example_server.php
===================================================================
--- trunk/data/module/SOAP/example/example_server.php	(revision 16957)
+++ trunk/data/module/SOAP/example/example_server.php	(revision 18562)
Index: trunk/data/module/SOAP/example/smtp.php
===================================================================
--- trunk/data/module/SOAP/example/smtp.php	(revision 16957)
+++ trunk/data/module/SOAP/example/smtp.php	(revision 18562)
Index: trunk/data/module/SOAP/example/tcp_client.php
===================================================================
--- trunk/data/module/SOAP/example/tcp_client.php	(revision 16957)
+++ trunk/data/module/SOAP/example/tcp_client.php	(revision 18562)
Index: trunk/data/module/SOAP/example/email_client.php
===================================================================
--- trunk/data/module/SOAP/example/email_client.php	(revision 16957)
+++ trunk/data/module/SOAP/example/email_client.php	(revision 18562)
Index: trunk/data/module/SOAP/example/email_pop_gateway.php
===================================================================
--- trunk/data/module/SOAP/example/email_pop_gateway.php	(revision 16957)
+++ trunk/data/module/SOAP/example/email_pop_gateway.php	(revision 18562)
Index: trunk/data/module/SOAP/example/disco_server.php
===================================================================
--- trunk/data/module/SOAP/example/disco_server.php	(revision 16957)
+++ trunk/data/module/SOAP/example/disco_server.php	(revision 18562)
Index: trunk/data/module/SOAP/example/attachment.php
===================================================================
--- trunk/data/module/SOAP/example/attachment.php	(revision 16957)
+++ trunk/data/module/SOAP/example/attachment.php	(revision 18562)
Index: trunk/data/module/SOAP/example/server2.php
===================================================================
--- trunk/data/module/SOAP/example/server2.php	(revision 16957)
+++ trunk/data/module/SOAP/example/server2.php	(revision 18562)
Index: trunk/data/module/SOAP/example/email_pop_server.php
===================================================================
--- trunk/data/module/SOAP/example/email_pop_server.php	(revision 16957)
+++ trunk/data/module/SOAP/example/email_pop_server.php	(revision 18562)
Index: trunk/data/module/SOAP/example/stockquote.php
===================================================================
--- trunk/data/module/SOAP/example/stockquote.php	(revision 16957)
+++ trunk/data/module/SOAP/example/stockquote.php	(revision 18562)
Index: trunk/data/module/SOAP/Server.php
===================================================================
--- trunk/data/module/SOAP/Server.php	(revision 16957)
+++ trunk/data/module/SOAP/Server.php	(revision 18562)
Index: trunk/data/module/SOAP/Transport/HTTP.php
===================================================================
--- trunk/data/module/SOAP/Transport/HTTP.php	(revision 16957)
+++ trunk/data/module/SOAP/Transport/HTTP.php	(revision 18562)
Index: trunk/data/module/SOAP/Transport/SMTP.php
===================================================================
--- trunk/data/module/SOAP/Transport/SMTP.php	(revision 16957)
+++ trunk/data/module/SOAP/Transport/SMTP.php	(revision 18562)
Index: trunk/data/module/SOAP/Transport/TCP.php
===================================================================
--- trunk/data/module/SOAP/Transport/TCP.php	(revision 16957)
+++ trunk/data/module/SOAP/Transport/TCP.php	(revision 18562)
Index: trunk/data/module/SOAP/WSDL.php
===================================================================
--- trunk/data/module/SOAP/WSDL.php	(revision 16957)
+++ trunk/data/module/SOAP/WSDL.php	(revision 18562)
Index: trunk/data/module/SOAP/Base.php
===================================================================
--- trunk/data/module/SOAP/Base.php	(revision 16957)
+++ trunk/data/module/SOAP/Base.php	(revision 18562)
Index: trunk/data/module/SOAP/tools/genproxy.php
===================================================================
--- trunk/data/module/SOAP/tools/genproxy.php	(revision 16957)
+++ trunk/data/module/SOAP/tools/genproxy.php	(revision 18562)
Index: trunk/data/module/SOAP/Fault.php
===================================================================
--- trunk/data/module/SOAP/Fault.php	(revision 16957)
+++ trunk/data/module/SOAP/Fault.php	(revision 18562)
Index: trunk/data/module/SOAP/Type/hexBinary.php
===================================================================
--- trunk/data/module/SOAP/Type/hexBinary.php	(revision 16957)
+++ trunk/data/module/SOAP/Type/hexBinary.php	(revision 18562)
Index: trunk/data/module/SOAP/Type/dateTime.php
===================================================================
--- trunk/data/module/SOAP/Type/dateTime.php	(revision 16957)
+++ trunk/data/module/SOAP/Type/dateTime.php	(revision 18562)
Index: trunk/data/module/SOAP/Type/duration.php
===================================================================
--- trunk/data/module/SOAP/Type/duration.php	(revision 16957)
+++ trunk/data/module/SOAP/Type/duration.php	(revision 18562)
Index: trunk/data/module/SOAP/Parser.php
===================================================================
--- trunk/data/module/SOAP/Parser.php	(revision 16957)
+++ trunk/data/module/SOAP/Parser.php	(revision 18562)
Index: trunk/data/module/SOAP/Transport.php
===================================================================
--- trunk/data/module/SOAP/Transport.php	(revision 16957)
+++ trunk/data/module/SOAP/Transport.php	(revision 18562)
Index: trunk/data/module/SOAP/Value.php
===================================================================
--- trunk/data/module/SOAP/Value.php	(revision 16957)
+++ trunk/data/module/SOAP/Value.php	(revision 18562)
Index: trunk/data/module/SOAP/Client.php
===================================================================
--- trunk/data/module/SOAP/Client.php	(revision 16957)
+++ trunk/data/module/SOAP/Client.php	(revision 18562)
Index: trunk/data/module/SOAP/Server/TCP.php
===================================================================
--- trunk/data/module/SOAP/Server/TCP.php	(revision 16957)
+++ trunk/data/module/SOAP/Server/TCP.php	(revision 18562)
Index: trunk/data/module/SOAP/Server/Email.php
===================================================================
--- trunk/data/module/SOAP/Server/Email.php	(revision 16957)
+++ trunk/data/module/SOAP/Server/Email.php	(revision 18562)
Index: trunk/data/module/SOAP/Server/Email_Gateway.php
===================================================================
--- trunk/data/module/SOAP/Server/Email_Gateway.php	(revision 16957)
+++ trunk/data/module/SOAP/Server/Email_Gateway.php	(revision 18562)
Index: trunk/data/module/SOAP/Disco.php
===================================================================
--- trunk/data/module/SOAP/Disco.php	(revision 16957)
+++ trunk/data/module/SOAP/Disco.php	(revision 18562)
Index: trunk/data/module/Net/UserAgent/Mobile/EZweb.php
===================================================================
--- trunk/data/module/Net/UserAgent/Mobile/EZweb.php	(revision 17128)
+++ trunk/data/module/Net/UserAgent/Mobile/EZweb.php	(revision 18562)
Index: trunk/data/module/Net/UserAgent/Mobile/DoCoMo.php
===================================================================
--- trunk/data/module/Net/UserAgent/Mobile/DoCoMo.php	(revision 17128)
+++ trunk/data/module/Net/UserAgent/Mobile/DoCoMo.php	(revision 18562)
Index: trunk/data/module/Net/UserAgent/Mobile/NonMobile.php
===================================================================
--- trunk/data/module/Net/UserAgent/Mobile/NonMobile.php	(revision 17128)
+++ trunk/data/module/Net/UserAgent/Mobile/NonMobile.php	(revision 18562)
Index: trunk/data/module/Net/UserAgent/Mobile/Common.php
===================================================================
--- trunk/data/module/Net/UserAgent/Mobile/Common.php	(revision 17128)
+++ trunk/data/module/Net/UserAgent/Mobile/Common.php	(revision 18562)
Index: trunk/data/module/Net/UserAgent/Mobile.php
===================================================================
--- trunk/data/module/Net/UserAgent/Mobile.php	(revision 17128)
+++ trunk/data/module/Net/UserAgent/Mobile.php	(revision 18562)
Index: trunk/data/module/SearchReplace.php
===================================================================
--- trunk/data/module/SearchReplace.php	(revision 15532)
+++ trunk/data/module/SearchReplace.php	(revision 18562)
Index: trunk/data/module/Calendar/docs/examples/20.php
===================================================================
--- trunk/data/module/Calendar/docs/examples/20.php	(revision 17143)
+++ trunk/data/module/Calendar/docs/examples/20.php	(revision 18562)
Index: trunk/data/module/pdf/pdf_parser.php
===================================================================
--- trunk/data/module/pdf/pdf_parser.php	(revision 18432)
+++ trunk/data/module/pdf/pdf_parser.php	(revision 18562)
Index: trunk/data/module/pdf/japanese.php
===================================================================
--- trunk/data/module/pdf/japanese.php	(revision 18432)
+++ trunk/data/module/pdf/japanese.php	(revision 18562)
Index: trunk/data/module/pdf/fpdi_pdf_parser.php
===================================================================
--- trunk/data/module/pdf/fpdi_pdf_parser.php	(revision 18432)
+++ trunk/data/module/pdf/fpdi_pdf_parser.php	(revision 18562)
Index: trunk/data/module/pdf/wrapper_functions.php
===================================================================
--- trunk/data/module/pdf/wrapper_functions.php	(revision 18432)
+++ trunk/data/module/pdf/wrapper_functions.php	(revision 18562)
Index: trunk/data/module/pdf/pdf_context.php
===================================================================
--- trunk/data/module/pdf/pdf_context.php	(revision 18432)
+++ trunk/data/module/pdf/pdf_context.php	(revision 18562)
Index: trunk/data/module/pdf/fpdf_tpl.php
===================================================================
--- trunk/data/module/pdf/fpdf_tpl.php	(revision 18432)
+++ trunk/data/module/pdf/fpdf_tpl.php	(revision 18562)
Index: trunk/data/module/pdf/font/helveticai.php
===================================================================
--- trunk/data/module/pdf/font/helveticai.php	(revision 18432)
+++ trunk/data/module/pdf/font/helveticai.php	(revision 18562)
Index: trunk/data/module/pdf/font/makefont/makefont.php
===================================================================
--- trunk/data/module/pdf/font/makefont/makefont.php	(revision 18432)
+++ trunk/data/module/pdf/font/makefont/makefont.php	(revision 18562)
Index: trunk/data/module/pdf/font/helveticabi.php
===================================================================
--- trunk/data/module/pdf/font/helveticabi.php	(revision 18432)
+++ trunk/data/module/pdf/font/helveticabi.php	(revision 18562)
Index: trunk/data/module/pdf/font/times.php
===================================================================
--- trunk/data/module/pdf/font/times.php	(revision 18432)
+++ trunk/data/module/pdf/font/times.php	(revision 18562)
Index: trunk/data/module/pdf/font/timesb.php
===================================================================
--- trunk/data/module/pdf/font/timesb.php	(revision 18432)
+++ trunk/data/module/pdf/font/timesb.php	(revision 18562)
Index: trunk/data/module/pdf/font/helvetica.php
===================================================================
--- trunk/data/module/pdf/font/helvetica.php	(revision 18432)
+++ trunk/data/module/pdf/font/helvetica.php	(revision 18562)
Index: trunk/data/module/pdf/font/symbol.php
===================================================================
--- trunk/data/module/pdf/font/symbol.php	(revision 18432)
+++ trunk/data/module/pdf/font/symbol.php	(revision 18562)
Index: trunk/data/module/pdf/font/helveticab.php
===================================================================
--- trunk/data/module/pdf/font/helveticab.php	(revision 18432)
+++ trunk/data/module/pdf/font/helveticab.php	(revision 18562)
Index: trunk/data/module/pdf/font/courier.php
===================================================================
--- trunk/data/module/pdf/font/courier.php	(revision 18432)
+++ trunk/data/module/pdf/font/courier.php	(revision 18562)
Index: trunk/data/module/pdf/font/timesi.php
===================================================================
--- trunk/data/module/pdf/font/timesi.php	(revision 18432)
+++ trunk/data/module/pdf/font/timesi.php	(revision 18562)
Index: trunk/data/module/pdf/font/timesbi.php
===================================================================
--- trunk/data/module/pdf/font/timesbi.php	(revision 18432)
+++ trunk/data/module/pdf/font/timesbi.php	(revision 18562)
Index: trunk/data/module/pdf/font/zapfdingbats.php
===================================================================
--- trunk/data/module/pdf/font/zapfdingbats.php	(revision 18432)
+++ trunk/data/module/pdf/font/zapfdingbats.php	(revision 18562)
Index: trunk/data/module/pdf/decoders/LZWDecode.php
===================================================================
--- trunk/data/module/pdf/decoders/LZWDecode.php	(revision 18432)
+++ trunk/data/module/pdf/decoders/LZWDecode.php	(revision 18562)
Index: trunk/data/module/pdf/decoders/ASCII85Decode.php
===================================================================
--- trunk/data/module/pdf/decoders/ASCII85Decode.php	(revision 18432)
+++ trunk/data/module/pdf/decoders/ASCII85Decode.php	(revision 18562)
Index: trunk/data/module/pdf/fpdi.php
===================================================================
--- trunk/data/module/pdf/fpdi.php	(revision 18432)
+++ trunk/data/module/pdf/fpdi.php	(revision 18562)
Index: trunk/data/mtb_constants_init.php
===================================================================
--- trunk/data/mtb_constants_init.php	(revision 18177)
+++ trunk/data/mtb_constants_init.php	(revision 18562)
@@ -334,5 +334,5 @@
 /** 商品サブ情報最大数 */
 define('PRODUCTSUB_MAX', 5);
-/** 配送時間の最大表示数 */
+/** お届け時間の最大表示数 */
 define('DELIVTIME_MAX', 16);
 /** 配送料金の最大表示数 */
@@ -443,5 +443,5 @@
 /** カートトップ */
 define('URL_CART_TOP', URL_DIR . "cart/index.php");
-/** 配送時間設定 */
+/** お届け時間設定 */
 define('URL_DELIV_TOP', URL_DIR . "shopping/deliv.php");
 /** Myページトップ */
@@ -503,5 +503,5 @@
 /** ベスト商品の最小登録数（登録数が満たない場合は表示しない。) */
 define('BEST_MIN', 3);
-/** 配達可能な日付以降のプルダウン表示最大日数 */
+/** お届け可能な日付以降のプルダウン表示最大日数 */
 define('DELIV_DATE_END_MAX', 21);
 /** 購入時強制会員登録(1:有効　0:無効) */
Index: trunk/data/require_base.php
===================================================================
--- trunk/data/require_base.php	(revision 17439)
+++ trunk/data/require_base.php	(revision 18562)
@@ -67,5 +67,4 @@
 require_once(CLASS_PATH . "SC_CustomerList.php");
 require_once(CLASS_PATH . "SC_Cookie.php");
-require_once(CLASS_PATH . "SC_Pdf.php");
 require_once(CLASS_PATH . "SC_MobileUserAgent.php");
 require_once(CLASS_PATH . "SC_MobileEmoji.php");
Index: trunk/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSVCategory_Ex.php
===================================================================
--- trunk/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSVCategory_Ex.php	(revision 17047)
+++ trunk/data/class_extends/page_extends/admin/products/LC_Page_Admin_Products_UploadCSVCategory_Ex.php	(revision 18562)
Index: trunk/data/script/receive_kara_mail.php
===================================================================
--- trunk/data/script/receive_kara_mail.php	(revision 16329)
+++ trunk/data/script/receive_kara_mail.php	(revision 18562)
Index: trunk/data/script/send_kara_mail.php
===================================================================
--- trunk/data/script/send_kara_mail.php	(revision 15532)
+++ trunk/data/script/send_kara_mail.php	(revision 18562)
