Only log locale sets that fail

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

diff --git a/lib/action.php b/lib/action.php
index a4cae7066c0e06b34ccf3012d151333498b46993..8f72b542b05214c2e68429d2326727749c8b185f 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -26,30 +26,30 @@ class Action { // lawsuit
        function Action() {
        }
 
-       function arg($key) {
+       function is_readonly() {
+               return false;
+       }
+
+       function arg($key, $def=NULL) {
                if (array_key_exists($key, $this->args)) {
                        return $this->args[$key];
                } else {
-                       return NULL;
+                       return $def;
                }
        }
 
-       function trimmed($key) {
-               $arg = $this->arg($key);
+       function trimmed($key, $def=NULL) {
+               $arg = $this->arg($key, $def);
                return (is_string($arg)) ? trim($arg) : $arg;
        }
-       
+
        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 = strtolower($this->trimmed($key));
-               
+
                if (is_null($arg)) {
                        return $def;
                } else if (in_array($arg, array('true', 'yes', '1'))) {
@@ -59,17 +59,36 @@ class Action { // lawsuit
                } 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);
+       }
+
+       function nav_menu($menu) {
+        $action = $this->trimmed('action');
+        common_element_start('ul', array('id' => 'nav_views'));
+        foreach ($menu as $menuaction => $menudesc) {
+            common_menu_item(common_local_url($menuaction, isset($menudesc[2]) ? $menudesc[2] : NULL),
+                                                        $menudesc[0],
+                                                        $menudesc[1],
+                                                        $action == $menuaction);
+        }
+        common_element_end('ul');
+       }
 }