Merge branch 'master' into patch-1

Author: mevdschee

README.md

@@ -766,6 +766,24 @@ Note that the 'inputs' parameter is writable and is an array. The array may cont
 
 The 'before' function allows modification of the request parameters and can (for instance) be used to implement soft delete behavior.
 
+```php
+'before'=>function(&$cmd, &$db, &$tab, &$id, &$in) { 
+	if ($cmd == 'delete') {
+		$cmd = 'update'; // change command to update
+		foreach($in as $k => $o) {
+			$in[$k]->deleted = date('Y-m-d H:i:s', time());
+		}				
+	}
+			
+},
+'column_authorizer'=>function($cmd, $db ,$tab, $col) { 
+	return ( ! in_array($col, array('deleted')));
+},
+'record_filter'=>function($cmd,$db,$tab) { 
+	return array('deleted,is,null');
+}
+```
+
 ## Custom actions
 
 After any operation the 'after' function is called that allows you to do some custom actions.

api.php

@@ -1873,22 +1873,26 @@ protected function getParameters($settings) {
 		if ($tenancy_function) $this->applyTenancyFunction($tenancy_function,$action,$database,$fields,$filters);
 		if ($column_authorizer) $this->applyColumnAuthorizer($column_authorizer,$action,$database,$fields);
 
+		// input
 		$multi = strpos($key[0],',')!==false;
 		$inputs = array();
+		$contexts = array();
 		if (strlen($post)) {
-			// input
 			$multi = $post[0]=='[';
 			$contexts = $this->retrieveInputs($post);
-			foreach ($contexts as $context) {
-				$input = $this->filterInputByFields($context,$fields[$tables[0]]);
+		}
+		if ($before) {
+			$this->applyBeforeHandler($action,$database,$tables[0],$key[0],$before,$contexts);
+		}
+		foreach ($contexts as $context) {
+			$input = $this->filterInputByFields($context,$fields[$tables[0]]);
 
-				if ($tenancy_function) $this->applyInputTenancy($tenancy_function,$action,$database,$tables[0],$input,$fields[$tables[0]]);
-				if ($input_sanitizer) $this->applyInputSanitizer($input_sanitizer,$action,$database,$tables[0],$input,$fields[$tables[0]]);
-				if ($input_validator) $this->applyInputValidator($input_validator,$action,$database,$tables[0],$input,$fields[$tables[0]],$context);
+			if ($tenancy_function) $this->applyInputTenancy($tenancy_function,$action,$database,$tables[0],$input,$fields[$tables[0]]);
+			if ($input_sanitizer) $this->applyInputSanitizer($input_sanitizer,$action,$database,$tables[0],$input,$fields[$tables[0]]);
+			if ($input_validator) $this->applyInputValidator($input_validator,$action,$database,$tables[0],$input,$fields[$tables[0]],$context);
 
-				$this->convertInputs($input,$fields[$tables[0]]);
-				$inputs[] = $input;
-			}
+			$this->convertInputs($input,$fields[$tables[0]]);
+			$inputs[] = $input;
 		}
 
 		return compact('action','database','tables','key','page','filters','fields','orderings','transform','multi','inputs','collect','select','before','after');