Merge remote-tracking branch 'saggi-dw/date-filter'

Author: annda

_test/SearchConfigTest.php

@@ -30,7 +30,7 @@ public function test_filtervars_simple()
 
         $this->assertEquals('user baz', $searchConfig->applyFilterVars('$USER$ $PAGE$'));
         $this->assertEquals('$user', $searchConfig->applyFilterVars('$user'));
-
+        $this->assertEquals(date('Y-m-d'), $searchConfig->applyFilterVars('$DATE(now)$'));
     }
 
     public function test_filtervars_struct()

lang/de/lang.php

@@ -80,6 +80,7 @@
 $lang['Exception No data saved'] = 'Keine Daten gespeichert';
 $lang['Exception no sqlite'] = 'Das \'Struct Plugin\' benötigt das \'Sqlite Plugin\'. Bitte installieren und aktivieren.';
 $lang['Exception column not in table'] = 'Die Spalte %s existiert im Schema %s nicht.';
+$lang['Exception datefilter'] = 'Der Filter: \'<code>$Date(%s)$</code>\' enthält einen ungültigen Wert';
 $lang['Warning: no filters for cloud'] = 'Filter werden in \'Struct Clouds\' nicht unterstützt';
 $lang['sort'] = 'Nach dieser Spalte sortieren';
 $lang['next'] = 'Nächste Seite';

lang/en/lang.php

@@ -89,6 +89,7 @@
 $lang['Exception No data saved'] = 'No data saved';
 $lang['Exception no sqlite'] = 'The struct plugin requires the sqlite plugin. Please install and enable it.';
 $lang['Exception column not in table'] = 'There is no column %s in schema %s.';
+$lang['Exception datefilter'] = 'The filter: \'<code>$Date(%s)$</code>\' contains an unsupported value.';
 
 $lang['Warning: no filters for cloud'] = 'Filters are not supported for struct clouds.';
 

meta/SearchConfig.php

@@ -137,10 +137,22 @@ protected function applyFilterVars($filter)
         );
 
         // apply struct column placeholder (we support only one!)
+        // or apply date formula, given as strtotime
         if (preg_match('/^(.*?)(?:\$STRUCT\.(.*?)\$)(.*?)$/', $filter, $match)) {
             $filter = $this->applyFilterVarsStruct($match);
         } elseif (preg_match('/^(.*?)(?:\$USER\.(.*?)\$)(.*?)$/', $filter, $match)) {
             $filter = $this->applyFilterVarsUser($match);
+        } elseif (preg_match('/^(.*?)(?:\$DATE\((.*?)\)\$?)(.*?)$/', $filter, $match)) {
+            $toparse = $match[2];
+            if ($toparse == '') {
+                $toparse = 'now';
+            }
+            $timestamp = strtotime($toparse);
+            if ($timestamp === false) {
+                throw new StructException('datefilter', hsc($toparse));
+            } else {
+                $filter = str_replace($filter, date('Y-m-d', $timestamp), $filter);
+            }
         }
 
         return $filter;