Merge pull request #19 from MonkDev/feature/support-multiple-shows

Support multiple shows

Author: DaveZMB

README.md

@@ -126,6 +126,45 @@ in associative array form. So, for example, a sermon's title can be accessed at
 
 If a failure occurs, `get` throws a `Monk\Cms\Exception`.
 
+### Multiple shows
+
+If you want to use `show` key to format API output, there are 2 ways
+
+#### 1. Using inline string
+
+For example:
+
+```php
+$cms->get(array(
+  'module'  => 'smallgroup',
+  'display' => 'list',
+  'order' => 'recent',
+  'emailencode' => 'no',
+  'howmany' => 1,
+  'page' => 1,
+  'show' => "___starttime format='g:ia'__ __endtime format='g:ia'__",
+));
+```
+
+#### 2. Using an array
+
+For example:
+
+```php
+$cms->get(array(
+  'module'  => 'smallgroup',
+  'display' => 'list',
+  'order' => 'recent',
+  'emailencode' => 'no',
+  'howmany' => 1,
+  'page' => 1,
+  'show' => [
+    "__starttime format='g:ia'__",
+    "__endtime format='g:ia'__"
+  ]
+));
+```
+
 Development
 -----------
 

lib/Monk/Cms.php

@@ -153,16 +153,23 @@ private static function buildRequestQueryParams(array $queryParams)
         $count = 0;
 
         foreach ($queryParams as $key => $value) {
-            $queryParam = "{$key}_:_{$value}";
-
-            if ($key == 'module') {
-                $queryParam = $value;
-            } elseif ($value === true) {
-                $queryParam = $key;
+            if ($key==="show" && is_array($value)) {
+                foreach ($value as $showValue) {
+                    $queryParam = "{$key}_:_{$showValue}";
+                    $query["arg{$count}"] = $queryParam;
+                    $count++;
+                }
+            } else {
+                $queryParam = "{$key}_:_{$value}";
+
+                if ($key == 'module') {
+                    $queryParam = $value;
+                } elseif ($value === true) {
+                    $queryParam = $key;
+                }
+                $query["arg{$count}"] = $queryParam;
+                $count++;
             }
-
-            $query["arg{$count}"] = $queryParam;
-            $count++;
         }
 
         return $query;
@@ -183,8 +190,14 @@ private function buildRequestQueryString(array $queryParams)
         $query['SITEID'] = $config['siteId'];
         $query['CMSCODE'] = $config['cmsCode'];
         $query['CMSTYPE'] = $config['cmsType'];
-        $query['NR'] = count($queryParams);
-
+        if (isset($queryParams['show']) && is_array($queryParams['show'])) {
+            // To count the number of params correctly , we do not count
+            // if the value of the show key is an array. Therefore, we have -1.
+            // However,we care about its total items, so we add it
+            $query['NR'] = count($queryParams) + count($queryParams['show']) - 1;
+        } else {
+            $query['NR'] = count($queryParams);
+        }
         $query = array_merge($query, self::buildRequestQueryParams($queryParams));
 
         return http_build_query($query);
@@ -244,7 +257,7 @@ private function request(array $queryParams)
 
     /**
      * Replace placeholder values with the expected values
-     * 
+     *
      * @param string $body
      * @return string
      */