bn8/eesyphp
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Url::add_url_handler(): clean code and return bool

Browse source
This commit is contained in:
Benjamin Renard 2023-02-16 00:21:57 +01:00
parent 5ce273cfad
commit c900324860
1 changed files with 30 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/Url.php
View file

@ -79,13 +79,14 @@ class Url {
* authenticated users (optional, default: true if the
* special force_authentication function is defined,
* false otherwise)
* @param boolean $override Allow override if a command already exists with the
* @param boolean $overwrite Allow overwrite if a command already exists with the
* same name (optional, default: false)
* @param boolean $api_mode Enable API mode (optional, default: false)
* @param array|string|null $methods HTTP method (optional, default: array('GET', 'POST'))
* @return bool
**/
public static function add_url_handler($pattern, $handler=null, $additional_info=null,
$authenticated=null, $override=true, $api_mode=false,
$authenticated=null, $overwrite=true, $api_mode=false,
$methods=null) {
$authenticated = (
is_null($authenticated)?
@ -97,31 +98,26 @@ class Url {
elseif (!is_array($methods))
$methods = array($methods);
if (is_array($pattern)) {
$error = false;
if (is_null($handler))
foreach($pattern as $p => $h)
self :: add_url_handler(
$p, $h, $additional_info, $authenticated, $override, $api_mode, $methods);
if (
!self :: add_url_handler(
$p, $h, $additional_info, $authenticated, $overwrite, $api_mode, $methods)
) $error = true;
else
foreach($pattern as $p)
self :: add_url_handler(
$p, $handler, $additional_info, $authenticated, $override, $api_mode, $methods);
if (
!self :: add_url_handler(
$p, $handler, $additional_info, $authenticated, $overwrite, $api_mode, $methods)
) $error = true;
return !$error;
}
else {
if (!isset(self :: $patterns[$pattern])) {
self :: $patterns[$pattern] = array(
'handler' => $handler,
'additional_info' => (
is_array($additional_info)?
$additional_info:array()
),
'authenticated' => $authenticated,
'api_mode' => $api_mode,
'methods' => $methods,
);
}
elseif ($override) {
if (!isset(self :: $patterns[$pattern]) || $overwrite) {
if (isset(self :: $patterns[$pattern]))
Log :: debug(
"URL : override pattern '%s' with handler '%s' (old handler = '%s')".
"URL : overwrite pattern '%s' with handler '%s' (old handler = '%s')".
$pattern, format_callable($handler), vardump(self :: $patterns[$pattern])
);
self :: $patterns[$pattern] = array(
@ -134,11 +130,10 @@ class Url {
'api_mode' => $api_mode,
'methods' => $methods,
);
return true;
}
else {
Log :: debug("URL : pattern '$pattern' already defined : do not override.");
}
}
Log :: debug("URL : pattern '$pattern' already defined : do not overwrite.");
return false;
}
/**