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

Timestamp:

2010/10/12 11:55:47 (16 years ago)

Author:

eccuore

Message:

#792(ダウンロード販売機能) 大容量ファイル対策、Safari対応、オンライン決済時のお届け先非表示

Location:

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

Files:

• SC_CartSession.php (modified) (1 diff)
• helper/SC_Helper_DB.php (modified) (2 diffs)
• pages/mypage/LC_Page_Mypage_DownLoad.php (modified) (4 diffs)
• pages/shopping/LC_Page_Shopping_Complete.php (modified) (1 diff)
• pages/shopping/LC_Page_Shopping_Payment.php (modified) (1 diff)

branches/version-2_5-dev/data/class/SC_CartSession.php

@@ -317 +317 @@
         return $arrRet;
     }
-    // カート内にある商品ＩＤ＋カテゴリＩＤを全て取得する
-    function getAllProductClassID($key) {
-        $this->addKey($key);
-        $max = $this->getMax($key);
-        for($i = 0; $i <= $max; $i++) {
-            if($_SESSION[$key][$i]['cart_no'] != "") {
-                $arrRet[] = $_SESSION[$key][$i]['id'];
-            }
-        }
-        return $arrRet;
-    }
 
     function delAllProducts($key) {

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

@@ -1911 +1911 @@
      *
      * @param $objCartSess  SC_CartSession  カートセッション
-     * @return  bool        0:ダウンロード販売無 1:ダウンロード販売無 2:全てダウンロード販売
+     * @return  bool        0:実商品のみ 1:ダウンロード販売と実商品混在 2:全てダウンロード販売
      */
     function chkCartDown($objCartSess) {
@@ -1918 +1918 @@
         $nodown = false;
         $ret = 0;
-        $arrID = $objCartSess->getAllProductClassID();
-        $table =  <<< __EOS__
-            dtb_products_class pc LEFT JOIN dtb_class_combination cc1 ON pc.class_combination_id = cc1.class_combination_id
-            LEFT JOIN dtb_class_combination cc2 ON cc1.parent_class_combination_id = cc2.class_combination_id
-__EOS__;
-        $where =  <<< __EOS__
-            pc.product_id = ? AND
-            ( cc2.classcategory_id = ? OR cc2.classcategory_id IS NULL ) AND
-            ( cc1.classcategory_id = ? OR cc1.classcategory_id IS NULL )
-__EOS__;
+        $arrID = $objCartSess->getAllProductID();
+        $table = "dtb_products_class pc";
+        $where = "pc.product_class_id = ?";
         if(!is_null($arrID)){
             //カート内のIDから販売方法を取得
             foreach ($arrID as $rec) {
-                $arrRet = $objQuery->select("pc.down AS down", $table, $where, array($rec[0],$rec[1],$rec[2]));
+                $arrRet = $objQuery->select("pc.down AS down", $table, $where, array($rec));
                 if ($arrRet[0]['down'] == "2"){
                     $down = true;

branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php

@@ -21 +21 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-ini_set("memory_limit","100M");
 // {{{ requires
 require_once(CLASS_PATH . "pages/LC_Page.php");
@@ -76 +75 @@
         //ログインしている場合
             //DBから商品情報の読込
-
             $arrForm = $this->lfGetRealFileName($customer_id, $order_id, $product_id, $product_class_id);
-
             //ステータスが支払済み以上である事
             if ($arrForm["status"] < ORDER_DELIV){
@@ -92 +89 @@
                 SC_Utils_Ex::sfDispSiteError(DOWNFILE_NOT_FOUND,"",true);
             }
-            //ファイル名をエンコードする
-            $sdown_filename = mb_convert_encoding($arrForm["down_filename"], "Shift_JIS", "auto");
+            //ファイル名をエンコードする Safariの対策はUTF-8で様子を見る
+            $encoding = "Shift_JIS";
+            if(isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'],'Safari')) {
+                $encoding = "UTF-8";
+            }
+            $sdown_filename = mb_convert_encoding($arrForm["down_filename"], $encoding, "auto");
             //タイプ指定
             header("Content-Type: Application/octet-stream");
@@ -111 +112 @@
             ob_end_flush();
             flush();
-
             //ファイル読み込み
-            readfile($realpath);
+            $handle = fopen($realpath, "rb");
+            while (!feof($handle)) {
+                echo(fread($handle, DOWNLOAD_BLOCK*1024));
+                ob_flush();
+                flush();
+            }
+            fclose($handle);
         }
     }

branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php

@@ -476 +476 @@
 
         // 合計金額が0円の場合、もしくはオンライン決済の場合は、注文ステータスをORDER_PRE_END[入金済み]にする
-        if ( ( $sqlval['total'] == 0 ) or ( in_array($sqlval['payment_id'], split(",", CREDIT_PAYMENT)) == true ) ){
+        if ( ( $sqlval['total'] == 0 ) or ( in_array($sqlval['payment_id'], split(",", ONLINE_PAYMENT)) == true ) ){
             $sqlval = $this->lfchgPreEndStatus($sqlval);
         }

branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php

@@ -370 +370 @@
         if($this->cartdown != 0){
             //ダウンロード商品を含む場合は、オンライン決済以外は選択できない。
-            $arrval = explode(",", CREDIT_PAYMENT);
+            $arrval = explode(",", ONLINE_PAYMENT);
             $tmp_where = "";
             foreach ($arrval as $val) {