Changes for dynamic collection size calculation

Author: Russ P

aweber_api/aweber_collection.php

@@ -41,11 +41,15 @@ public function getById($id) {
      * @return void
      */
     protected function _getPageParams($start=0, $size=20) {
-        $params = array(
-            'ws.start' => $start,
-            'ws.size'  => $size,
-        );
-        ksort($params);
+        if ($start > 0) {
+            $params = array(
+                'ws.start' => $start,
+                'ws.size'  => $size,
+            );
+            ksort($params);
+        } else {
+            $params = array();
+        }
         return $params;
     }
 
@@ -64,6 +68,28 @@ protected function _type() {
         return $type;
     }
 
+    /**
+     * _calculatePageSize
+     *
+     * Calculates the page size of this collection based on the data in the 
+     * next and prev links.
+     *
+     * @access protected
+     * @return integer
+     */
+    protected function _calculatePageSize() {
+        if (isset($this->data['next_collection_link'])) {
+            $url = $this->data['next_collection_link'];
+            $urlParts = parse_url($url);
+            if (empty($urlParts['query'])) return $this->pageSize;
+            $query = array();
+            parse_str($urlParts['query'], $query);
+            if (empty($query['ws_size'])) return $this->pageSize;
+            $this->pageSize = $query['ws_size'];
+        }
+        return $this->pageSize;
+    }
+
     /**
      * _loadPageForOffset
      * 
@@ -77,6 +103,7 @@ protected function _type() {
      * @return void
      */
     protected function _loadPageForOffset($offset, $attempt=1) {
+        $this->_calculatePageSize();
         $start = round($offset / $this->pageSize) * $this->pageSize;
         $params = $this->_getPageParams($start, $this->pageSize);
 

aweber_api/aweber_entry.php

@@ -73,7 +73,7 @@ public function __get($value) {
         if (in_array($value, $this->_privateData)) {
             return null;
         }
-        if (array_key_exists($value, $this->data)) {
+        if (!empty($this->data) && array_key_exists($value, $this->data)) {
             return $this->data[$value];
         }
         if ($value == 'type') return $this->_type();