using bogus attribute of $rm

[quix0rs-gnu-social.git] / lib / action.php

diff --git a/lib/action.php b/lib/action.php
index 67eaf9ed7a65fbaad400a16794687a600fb37215..81b2283124575c15cbb61ceee0c54d1a031e56ff 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -40,22 +40,39 @@ class Action { // lawsuit
        }
        
        function handle($argarray) {
-               $strip = get_magic_quotes_gpc();
-               $this->args = array();
-               foreach ($argarray as $k => $v) {
-                       $this->args[$k] = ($strip) ? stripslashes($v) : $v;
-               }
+               $this->args =& common_copy_args($argarray);
        }
        
        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);
+       }
+       
+       function self_url() {
+               $action = $this->trimmed('action');
+               $args = $this->args;
+               unset($args['action']);
+               return common_local_url($action, $args);
        }
 }