X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Faction.php;h=a4cae7066c0e06b34ccf3012d151333498b46993;hb=0299b6f2caa5b3b956c9e00a17d6cf3c72966396;hp=c882f0696efe3cc291771c682aee6c10cbbdbddf;hpb=a5b660a468ef94f8d96ed5b93774567e5d832136;p=quix0rs-gnu-social.git

diff --git a/lib/action.php b/lib/action.php
index c882f0696e..a4cae7066c 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -1,18 +1,18 @@
 <?php
-/* 
+/*
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -22,22 +22,54 @@ if (!defined('LACONICA')) { exit(1); }
 class Action { // lawsuit
 
 	var $args;
-	
+
 	function Action() {
 	}
-	
+
 	function arg($key) {
-		if (array_has_key($this->args, $key)) {
+		if (array_key_exists($key, $this->args)) {
 			return $this->args[$key];
 		} else {
 			return NULL;
 		}
 	}
+
+	function trimmed($key) {
+		$arg = $this->arg($key);
+		return (is_string($arg)) ? trim($arg) : $arg;
+	}
 	
-	function handle($args) {
+	function handle($argarray) {
+		$strip = get_magic_quotes_gpc();
 		$this->args = array();
-		foreach ($args as $k => $v) {
-			$this->args[$k] = $v;
+		foreach ($argarray as $k => $v) {
+			$this->args[$k] = ($strip) ? stripslashes($v) : $v;
+		}
+	}
+	
+	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'))) {
+			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);
+	}
 }