Update to 2.0.3

- Snippet: `where` parameter
Jako · Nov 18, 2014 · 7190b9b · 7190b9b
1 parent 0a4449e
commit 7190b9b
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 3 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,8 @@
 History
 ================================================================================
+- 2.0.3 November 18, 2014
+    - Snippet: `where` parameter
+
 - 2.0.2 October 10, 2014
     - Module: richtext is now possible
 

diff --git a/assets/tvs/multitv/includes/multitv.class.php b/assets/tvs/multitv/includes/multitv.class.php
@@ -915,6 +915,74 @@ function getMultiValue($params)
         return $tvOutput;
     }
 
+    function filterMultiValue($tvOutput, $params)
+    {
+        foreach ($params['where'] as $fieldclause => $value) {
+            $fieldclause = explode(':', $fieldclause, 2);
+            $fieldname = $fieldclause[0];
+            $fieldclause = (count($fieldclause) == 1) ? '' : $fieldclause[1];
+            switch (htmlspecialchars_decode($fieldclause)) {
+                case '':
+                    foreach ($tvOutput as $tvKey => $tvOut) {
+                        if ($tvOut[$fieldname] != $value) {
+                            unset($tvOutput[$tvKey]);
+                        }
+                    }
+                    break;
+                case '!=':
+                    foreach ($tvOutput as $tvKey => $tvOut) {
+                        if ($tvOut[$fieldname] == $value) {
+                            unset($tvOutput[$tvKey]);
+                        }
+                    }
+                    break;
+                case '>':
+                    foreach ($tvOutput as $tvKey => $tvOut) {
+                        if ($tvOut[$fieldname] <= $value) {
+                            unset($tvOutput[$tvKey]);
+                        }
+                    }
+                    break;
+                case '<':
+                    foreach ($tvOutput as $tvKey => $tvOut) {
+                        if ($tvOut[$fieldname] >= $value) {
+                            unset($tvOutput[$tvKey]);
+                        }
+                    }
+                    break;
+                case '>=':
+                    foreach ($tvOutput as $tvKey => $tvOut) {
+                        if ($tvOut[$fieldname] < $value) {
+                            unset($tvOutput[$tvKey]);
+                        }
+                    }
+                    break;
+                case '<=':
+                    foreach ($tvOutput as $tvKey => $tvOut) {
+                        if ($tvOut[$fieldname] > $value) {
+                            unset($tvOutput[$tvKey]);
+                        }
+                    }
+                    break;
+                case 'LIKE':
+                    foreach ($tvOutput as $tvKey => $tvOut) {
+                        if (strpos($tvOut[$fieldname], $value) === false) {
+                            unset($tvOutput[$tvKey]);
+                        }
+                    }
+                    break;
+                case 'NOT LIKE':
+                    foreach ($tvOutput as $tvKey => $tvOut) {
+                        if (strpos($tvOut[$fieldname], $value) !== false) {
+                            unset($tvOutput[$tvKey]);
+                        }
+                    }
+                    break;
+            }
+        }
+        return $tvOutput;
+    }
+
     function displayMultiValue($tvOutput, $params)
     {
         // replace masked placeholder tags (for templates that are set directly set in snippet call by @CODE)
@@ -926,7 +994,7 @@ function displayMultiValue($tvOutput, $params)
         $firstEmpty = true;
         if ($countOutput) {
             // check for first item empty
-            foreach ($tvOutput[0] as $value) {
+            foreach (current($tvOutput) as $value) {
                 if ($value != '') {
                     $firstEmpty = false;
                 }

diff --git a/assets/tvs/multitv/multitv.snippet.php b/assets/tvs/multitv/multitv.snippet.php
@@ -79,10 +79,14 @@
 $params['paginate'] = (isset($paginate) && $paginate) ? true : false;
 $params['offsetKey'] = (isset($offsetKey)) ? $offsetKey : 'page';
 $params['offset'] = ($params['paginate'] && ($params['display'] != 'all') && isset($_GET[$params['offsetKey']])) ? (intval($_GET[$params['offsetKey']]) - 1) * $params['display'] : $params['offset'];
+$params['where'] = isset($where) ? json_decode($where, true) : false;
 
 if (!empty($fromJson)) {
     $tvOutput = json_decode($fromJson, true);
 } else {
     $tvOutput = $multiTV->getMultiValue($params);
 }
+if ($params['where']) {
+    $tvOutput = $multiTV->filterMultiValue($tvOutput, $params);
+}
 return $multiTV->displayMultiValue($tvOutput, $params);
diff --git a/install/assets/modules/multiTV.tpl b/install/assets/modules/multiTV.tpl
@@ -5,7 +5,7 @@
  * CRUD module
  *
  * @category    snippet, module, tv
- * @version     2.0.1
+ * @version     2.0.3
  * @license     http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL)
  * @author      Jako
  * @internal    @properties &configs=Configurations;text;event_log

diff --git a/install/assets/snippets/multiTV.tpl b/install/assets/snippets/multiTV.tpl
@@ -5,7 +5,7 @@
  * Custom Template Variabe containing a sortable multi item list or a datatable
  *
  * @category    snippet, tv
- * @version     2.0.1
+ * @version     2.0.3
  * @license     http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL)
  * @author      Jako
  * @internal    @modx_category Content