Added multi-filter documentation and option for AND and OR using satisfy.

README.md

@@ -32,7 +32,7 @@ This is a single file application! Upload "api.php" somewhere and enjoy!
   - Permission system for databases and tables
   - JSONP support for cross-domain requests
   - Combined requests with support for multiple table names
-  - Pagination, sorting and search support
+  - Pagination, sorting, column selection and search support
   - Relation detection and filtering on foreign keys
   - Relation "transforms" for PHP and JavaScript
 
@@ -131,7 +131,7 @@ Search is implemented with the "filter" parameter. You need to specify the colum
   - ge: greater or equal (number is higher than or equal to value)
   - gt: greater than (number is higher than value)
   - in: in (number is in comma seperated list of values)
-
+  
 ```
 GET http://localhost/api.php/categories?filter=name,eq,Internet
 GET http://localhost/api.php/categories?filter=name,sw,Inter
@@ -139,10 +139,20 @@ GET http://localhost/api.php/categories?filter=id,le,1
 GET http://localhost/api.php/categories?filter=id,lt,2
 ```
 
+### List + Filter + Satisfy
+
+Multiple filters can be applied by using "filter[]" instead of "filter" as a parameter name. Then the parameter "satisfy" is used to indicate whether "all" (default) or "any" filter should be satisfied to lead to a match:
+
+```
+GET http://localhost/api.php/categories?filter[]=id,eq,1&filter[]=id,eq,3&satisfy=any
+GET http://localhost/api.php/categories?filter[]=id,ge,1&filter[]=id,le,3&satisfy=all
+GET http://localhost/api.php/categories?filter[]=id,ge,1&filter[]=id,le,3
+```
+
 Output:
 
 ```
-{"categories":{"columns":["id","name"],"records":[["1","Internet"]]}}
+{"categories":{"columns":["id","name"],"records":[["1","Internet"],["3","Web development"]]}}
 ```
 
 ### List + Column selection

api.php

@@ -457,6 +457,7 @@ class REST_CRUD_API {
 		$callback  = $this->parseGetParameter($get, 'callback', 'a-zA-Z0-9\-_', false);
 		$page      = $this->parseGetParameter($get, 'page', '0-9,', false);
 		$filters   = $this->parseGetParameterArray($get, 'filter', false, false);
+		$satisfy   = $this->parseGetParameter($get, 'satisfy', 'a-z', 'all');
 		$columns   = $this->parseGetParameter($get, 'columns', 'a-zA-Z0-9\-_,', false);
 		$order     = $this->parseGetParameter($get, 'order', 'a-zA-Z0-9\-_*,', false);
 		$transform = $this->parseGetParameter($get, 'transform', '1', false);
@@ -476,7 +477,7 @@ class REST_CRUD_API {
 
 		list($collect,$select) = $this->findRelations($table,$database,$db);
 
-		return compact('action','database','table','key','callback','page','filters','columns','order','transform','db','object','input','collect','select');
+		return compact('action','database','table','key','callback','page','filters','satisfy','columns','order','transform','db','object','input','collect','select');
 	}
 
 	protected function listCommand($parameters) {
@@ -494,7 +495,7 @@ class REST_CRUD_API {
 			$params[] = $table;
 			foreach ($filters as $i=>$filter) {
 				if (is_array($filter)) {
-					$sql .= $i==0?' WHERE ':' AND ';
+					$sql .= $i==0?' WHERE ':$satisfy=='all'?' AND ':' OR ';
 					$sql .= '"!" ! ?';
 					$params[] = $filter[0];
 					$params[] = $filter[1];
@@ -518,7 +519,7 @@ class REST_CRUD_API {
 		$params[] = $table;
 		foreach ($filters as $i=>$filter) {
 			if (is_array($filter)) {
-				$sql .= $i==0?' WHERE ':' AND ';
+				$sql .= $i==0?' WHERE ':$satisfy=='all'?' AND ':' OR ';
 				$sql .= '"!" ! ?';
 				$params[] = $filter[0];
 				$params[] = $filter[1];