Changeset 354 for trunk

Timestamp:

Jun 11, 2009 4:37:41 PM (15 years ago)

Author:

quinn

Message:

Refactored the sum() function in Cart.inc.php.

Location:

trunk

Files:

• lib/Cart.inc.php (modified) (2 diffs)
• services/logs.php (modified) (1 diff)

trunk/lib/Cart.inc.php

@@ -247 +247 @@
     * Return the sum of the numeric values stored under the specified key for cart items.
     * 0 will be returned if key is invalid or not filled with numeric values.
+    * Most commonly, $cart->sum() will be called when checking out to retrieve the total
+    * cost of the items in the cart.
     *
     * @access   public
@@ -257 +259 @@
     function sum($key='extended_price')
     {
+        $sum = 0;
         switch ($key) {
         case 'items' :
-            return sizeof($_SESSION['_cart'][$this->_ns]['items']);
-
-                case 'extended_price' :
-                $sum = 0;
+            $sum = sizeof($_SESSION['_cart'][$this->_ns]['items']);
+
+        case 'extended_price' :
             foreach ($_SESSION['_cart'][$this->_ns]['items'] as $item_id => $specs) {
                 $sum += isset($specs[$key]) && is_numeric($specs[$key]) ? $specs[$key] : 0;
             }
-            return $sum;
+
         default :
-                $sum = 0;
+            // Retreive arbitrary values stored in the cart (shipping, air miles, etc).
             foreach ($_SESSION['_cart'][$this->_ns]['items'] as $item_id => $specs) {
                 $sum += isset($specs[$key]) && is_numeric($specs[$key]) ? $specs[$key] * $specs['quantity'] : 0;
             }
-            return $sum;
-        }
+            if (!isset($specs[$key])) {
+                $app->logMsg(sprintf('Could not sum up nonexistent value: %s', $key), LOG_ERR, __FILE__, __LINE__);
+            }
+        }
+        return $sum;
     }
 

trunk/services/logs.php

@@ -25 +25 @@
 $valid_file_extensions = array('', 'txt', 'log');
 
-// Files that cannot be deleted (preg search expressions).
+// Files that shouldn't be deleted (preg search expressions).
 $no_delete_files = '/^php_error_log$|^access_log$|^error_log$|^ssl_request_log$/';
 
-// Files that cannot be cleared (preg search expressions).
+// Files that shouldn't be cleared (preg search expressions).
 $no_clear_files = '/__|^access_log$|^error_log$|^ssl_request_log$/';
 
-// Files that cannot be archived (preg search expressions).
+// Files that shouldn't be archived (preg search expressions).
 $no_archive_files = '/__|^access_log$|^error_log$|^ssl_request_log$/';
 
-// Files that cannot be archived (preg search expressions).
+// Files that shouldn't be downloaded (preg search expressions).
 $no_download_files = '/^$/';