Changeset 21925 for branches/version-2_12-dev/data/class/SC_CartSession.php

Timestamp:

2012/06/19 16:15:24 (12 years ago)

Author:

pineray

Message:

#1669 #1859 初期化漏れ、無駄な変数等

File:

• branches/version-2_12-dev/data/class/SC_CartSession.php (modified) (8 diffs)

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

@@ -51 +51 @@
         }
         // 1世代古いコピー情報は、削除しておく
-        foreach ($_SESSION as $k => $val) {
+        foreach (array_keys($_SESSION) as $k) {
             if ($k != $this->key_tmp && preg_match('/^savecart_/', $k)) {
                 unset($this->cartSession[$productTypeId][$k]);
@@ -87 +87 @@
             // 一時カートのクリア
             unset($_SESSION[$this->key_tmp]);
-            $this->cartSession[$productTypeId][$key]['cancel_purchase'] = true;
+            $this->cartSession[$productTypeId]['cancel_purchase'] = true;
         } else {
             $this->cartSession[$productTypeId]['cancel_purchase'] = false;
@@ -96 +96 @@
     // 次に割り当てるカートのIDを取得する
     function getNextCartID($productTypeId) {
-        foreach ($this->cartSession[$productTypeId] as $key => $val) {
-            $arrRet[] = $this->cartSession[$productTypeId][$key]['cart_no'];
-        }
-        return max($arrRet) + 1;
+        $count = array();
+        foreach (array_keys($this->cartSession[$productTypeId]) as $key) {
+            $count[] = $this->cartSession[$productTypeId][$key]['cart_no'];
+        }
+        return max($count) + 1;
     }
 
@@ -143 +144 @@
         $max = 0;
         if (count($this->cartSession[$productTypeId]) > 0) {
-            foreach ($this->cartSession[$productTypeId] as $key => $val) {
+            foreach (array_keys($this->cartSession[$productTypeId]) as $key) {
                 if (is_numeric($key)) {
                     if ($max < $key) {
@@ -393 +394 @@
     function getAllProductID($productTypeId) {
         $max = $this->getMax($productTypeId);
+        $productIDs = array();
         for ($i = 0; $i <= $max; $i++) {
             if ($this->cartSession[$productTypeId][$i]['cart_no'] != '') {
-                $arrRet[] = $this->cartSession[$productTypeId][$i]['id'][0];
-            }
-        }
-        return $arrRet;
+                $productIDs[] = $this->cartSession[$productTypeId][$i]['id'][0];
+            }
+        }
+        return $productIDs;
     }
 
@@ -409 +411 @@
     function getAllProductClassID($productTypeId) {
         $max = $this->getMax($productTypeId);
+        $productClassIDs = array();
         for ($i = 0; $i <= $max; $i++) {
             if ($this->cartSession[$productTypeId][$i]['cart_no'] != '') {
-                $arrRet[] = $this->cartSession[$productTypeId][$i]['id'];
-            }
-        }
-        return $arrRet;
+                $productClassIDs[] = $this->cartSession[$productTypeId][$i]['id'];
+            }
+        }
+        return $productClassIDs;
     }
 
@@ -497 +500 @@
      */
     function getProductClassId($cart_no, $productTypeId) {
-        for ($i = 0; $i <= $max; $i++) {
+        for ($i = 0; $i < count($this->cartSession[$productTypeId]); $i++) {
             if ($this->cartSession[$productTypeId][$i]['cart_no'] == $cart_no) {
                 return $this->cartSession[$productTypeId][$i]['id'];
@@ -625 +628 @@
     ) {
 
+        $results = array();
         $total_point = $this->getAllProductsPoint($productTypeId);
         $results['tax'] = $this->getAllProductsTax($productTypeId);