X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Faction.php;h=a4cae7066c0e06b34ccf3012d151333498b46993;hb=0299b6f2caa5b3b956c9e00a17d6cf3c72966396;hp=67eaf9ed7a65fbaad400a16794687a600fb37215;hpb=310ef22fd996a21642cc63b33829cc1f397269d7;p=quix0rs-gnu-social.git diff --git a/lib/action.php b/lib/action.php index 67eaf9ed7a..a4cae7066c 100644 --- a/lib/action.php +++ b/lib/action.php @@ -48,14 +48,28 @@ class Action { // lawsuit } function boolean($key, $def=false) { - $arg = $this->arg($key); - return (is_null($arg)) ? $def : - (strcasecmp($arg, 'true')) ? true : - (strcasecmp($arg, 'yes')) ? true : - (strcasecmp($arg, '1')) ? true : - (strcasecmp($arg, 'false')) ? false : - (strcasecmp($arg, 'no')) ? false : - (strcasecmp($arg, '0')) ? false : - $def; + $arg = strtolower($this->trimmed($key)); + + if (is_null($arg)) { + return $def; + } else if (in_array($arg, array('true', 'yes', '1'))) { + return true; + } else if (in_array($arg, array('false', 'no', '0'))) { + return false; + } else { + return $def; + } + } + + function server_error($msg, $code=500) { + $action = $this->trimmed('action'); + common_debug("Server error '$code' on '$action': $msg", __FILE__); + common_server_error($msg, $code); + } + + function client_error($msg, $code=400) { + $action = $this->trimmed('action'); + common_debug("User error '$code' on '$action': $msg", __FILE__); + common_user_error($msg, $code); } }