nas/todo_api
2
1
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Merge branch 'VyseExhale-patch-1'

Browse source
This commit is contained in:
Maurits van der Schee 2017-03-16 18:14:21 +01:00
commit 2b515bd9b5
1 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

32
api.php
View file

@ -1134,9 +1134,9 @@ class PHP_CRUD_API {
return $values; return $values;
} }
protected function applyBeforeHandler(&$action,&$database,&$table,&$id,&$callback,&$inputs) { protected function applyBeforeHandler(&$action,&$database,&$table,&$id,&$callback,&$input) {
if (is_callable($callback,true)) { if (is_callable($callback,true)) {
$callback($action,$database,$table,$id,$inputs); $callback($action,$database,$table,$id,$input);
} }
} }
@ -1862,13 +1862,6 @@ class PHP_CRUD_API {
$page = $this->processPageParameter($page); $page = $this->processPageParameter($page);
$orderings = $this->processOrderingsParameter($orderings); $orderings = $this->processOrderingsParameter($orderings);
// input
$multi = (strpos($key[0],',')!==false) || (strlen($post)?($post[0]=='['):false);
$inputs = $this->retrieveInputs($post);
if ($before) {
$this->applyBeforeHandler($action,$database,$tables[0],$key[0],$before,$inputs);
}
// reflection // reflection
list($tables,$collect,$select) = $this->findRelations($tables,$database,$auto_include); list($tables,$collect,$select) = $this->findRelations($tables,$database,$auto_include);
$fields = $this->findFields($tables,$columns,$exclude,$select,$database); $fields = $this->findFields($tables,$columns,$exclude,$select,$database);
@ -1880,17 +1873,34 @@ class PHP_CRUD_API {
if ($tenancy_function) $this->applyTenancyFunction($tenancy_function,$action,$database,$fields,$filters); if ($tenancy_function) $this->applyTenancyFunction($tenancy_function,$action,$database,$fields,$filters);
if ($column_authorizer) $this->applyColumnAuthorizer($column_authorizer,$action,$database,$fields); if ($column_authorizer) $this->applyColumnAuthorizer($column_authorizer,$action,$database,$fields);
// input
$multi = (strpos($key[0],',')!==false) || (strlen($post)?($post[0]=='['):false);
if ($before && $action == 'delete' && $multi) {
$inputs = array();
for($i=1; $i <= count(explode(',', $key[0])); $i++) {
$inputs[] = (object) array();
}
} else {
$inputs = $this->retrieveInputs($post);
}
$originalAction = $action;
foreach ($inputs as $k=>$context) { foreach ($inputs as $k=>$context) {
//echo $k.' - ';
$input = $this->filterInputByFields($context,$fields[$tables[0]]); $input = $this->filterInputByFields($context,$fields[$tables[0]]);
if ($tenancy_function) $this->applyInputTenancy($tenancy_function,$action,$database,$tables[0],$input,$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_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 ($input_validator) $this->applyInputValidator($input_validator,$action,$database,$tables[0],$input,$fields[$tables[0]],$context);
$this->convertInputs($input,$fields[$tables[0]]); $this->convertInputs($input,$fields[$tables[0]]);
if ($before) {
$action = $originalAction;
$this->applyBeforeHandler($action,$database,$tables[0],$ids[$k],$before,$input);
}
$inputs[$k] = $input; $inputs[$k] = $input;
} }
return compact('action','database','tables','key','page','filters','fields','orderings','transform','multi','inputs','collect','select','before','after'); return compact('action','database','tables','key','page','filters','fields','orderings','transform','multi','inputs','collect','select','before','after');
} }