| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | hunk ./lib/action.php 2 | 
					
						
							|  |  |  | -/* | 
					
						
							|  |  |  | +/** | 
					
						
							|  |  |  | hunk ./lib/action.php 20 | 
					
						
							|  |  |  | -if (!defined('LACONICA')) { exit(1); } | 
					
						
							|  |  |  | +if (!defined('LACONICA')) { | 
					
						
							|  |  |  | +    exit(1); | 
					
						
							|  |  |  | +} | 
					
						
							|  |  |  | hunk ./lib/action.php 24 | 
					
						
							|  |  |  | -class Action { // lawsuit | 
					
						
							|  |  |  | +class Action // lawsuit | 
					
						
							|  |  |  | +{ | 
					
						
							|  |  |  | hunk ./lib/action.php 27 | 
					
						
							|  |  |  | -	var $args; | 
					
						
							|  |  |  | +    var $args; | 
					
						
							|  |  |  | hunk ./lib/action.php 29 | 
					
						
							|  |  |  | -	function Action() { | 
					
						
							|  |  |  | -	} | 
					
						
							|  |  |  | +    function Action() | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | +    { | 
					
						
							|  |  |  | +    } | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | hunk ./lib/action.php 33 | 
					
						
							|  |  |  | -	# For initializing members of the class | 
					
						
							|  |  |  | +    // For initializing members of the class | 
					
						
							|  |  |  | hunk ./lib/action.php 35 | 
					
						
							|  |  |  | -	function prepare($argarray) { | 
					
						
							|  |  |  | -		$this->args =& common_copy_args($argarray); | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | -		return true; | 
					
						
							|  |  |  | -	} | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | +    function prepare($argarray) | 
					
						
							|  |  |  | +    { | 
					
						
							|  |  |  | +        $this->args =& common_copy_args($argarray); | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | +        return true; | 
					
						
							|  |  |  | +    } | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | hunk ./lib/action.php 41 | 
					
						
							|  |  |  | -	# For comparison with If-Last-Modified | 
					
						
							|  |  |  | -	# If not applicable, return NULL | 
					
						
							|  |  |  | +    // For comparison with If-Last-Modified | 
					
						
							|  |  |  | +    // If not applicable, return null | 
					
						
							|  |  |  | hunk ./lib/action.php 44 | 
					
						
							|  |  |  | -	function last_modified() { | 
					
						
							|  |  |  | -		return NULL; | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | -	} | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | +    function last_modified() | 
					
						
							|  |  |  | +    { | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | +        return null; | 
					
						
							|  |  |  | +    } | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | hunk ./lib/action.php 49 | 
					
						
							|  |  |  | -	function etag() { | 
					
						
							|  |  |  | -		return NULL; | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | -	} | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | +    function etag() | 
					
						
							|  |  |  | +    { | 
					
						
							|  |  |  | +        return null; | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | +    } | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | hunk ./lib/action.php 54 | 
					
						
							|  |  |  | -	function is_readonly() { | 
					
						
							|  |  |  | -		return false; | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | -	} | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | +    function is_readonly() | 
					
						
							|  |  |  | +    { | 
					
						
							|  |  |  | +        return false; | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | +    } | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | hunk ./lib/action.php 59 | 
					
						
							|  |  |  | -	function arg($key, $def=NULL) { | 
					
						
							|  |  |  | -		if (array_key_exists($key, $this->args)) { | 
					
						
							|  |  |  | -			return $this->args[$key]; | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | -		} else { | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | -			return $def; | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | -		} | 
					
						
							|  |  |  | -	} | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | +    function arg($key, $def=null) | 
					
						
							|  |  |  | +    { | 
					
						
							|  |  |  | +        if (array_key_exists($key, $this->args)) { | 
					
						
							|  |  |  | +            return $this->args[$key]; | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | +        } else { | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | +            return $def; | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | +        } | 
					
						
							|  |  |  | +    } | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | hunk ./lib/action.php 68 | 
					
						
							|  |  |  | -	function trimmed($key, $def=NULL) { | 
					
						
							|  |  |  | -		$arg = $this->arg($key, $def); | 
					
						
							|  |  |  | -		return (is_string($arg)) ? trim($arg) : $arg; | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | -	} | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | +    function trimmed($key, $def=null) | 
					
						
							|  |  |  | +    { | 
					
						
							|  |  |  | +        $arg = $this->arg($key, $def); | 
					
						
							|  |  |  | +        return (is_string($arg)) ? trim($arg) : $arg; | 
					
						
							|  |  |  | +    } | 
					
						
							|  |  |  | hunk ./lib/action.php 74 | 
					
						
							|  |  |  | -	# Note: argarray ignored, since it's now passed in in prepare() | 
					
						
							|  |  |  | +    // Note: argarray ignored, since it's now passed in in prepare() | 
					
						
							|  |  |  | hunk ./lib/action.php 76 | 
					
						
							|  |  |  | -	function handle($argarray=NULL) { | 
					
						
							|  |  |  | +    function handle($argarray=null) | 
					
						
							|  |  |  | +    { | 
					
						
							|  |  |  | hunk ./lib/action.php 79 | 
					
						
							|  |  |  | -		$lm = $this->last_modified(); | 
					
						
							|  |  |  | -		$etag = $this->etag(); | 
					
						
							|  |  |  | +        $lm = $this->last_modified(); | 
					
						
							|  |  |  | +        $etag = $this->etag(); | 
					
						
							|  |  |  | hunk ./lib/action.php 82 | 
					
						
							|  |  |  | -		if ($etag) { | 
					
						
							|  |  |  | -			header('ETag: ' . $etag); | 
					
						
							|  |  |  | -		} | 
					
						
							|  |  |  | +        if ($etag) { | 
					
						
							|  |  |  | +            header('ETag: ' . $etag); | 
					
						
							|  |  |  | +        } | 
					
						
							|  |  |  | hunk ./lib/action.php 86 | 
					
						
							|  |  |  | -		if ($lm) { | 
					
						
							|  |  |  | -			header('Last-Modified: ' . date(DATE_RFC1123, $lm)); | 
					
						
							|  |  |  | -			$if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE']; | 
					
						
							|  |  |  | -			if ($if_modified_since) { | 
					
						
							|  |  |  | -				$ims = strtotime($if_modified_since); | 
					
						
							|  |  |  | -				if ($lm <= $ims) { | 
					
						
							|  |  |  | -					if (!$etag || $this->_has_etag($etag, $_SERVER['HTTP_IF_NONE_MATCH'])) { | 
					
						
							|  |  |  | -						header('HTTP/1.1 304 Not Modified'); | 
					
						
							|  |  |  | -						# Better way to do this? | 
					
						
							|  |  |  | -						exit(0); | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | -					} | 
					
						
							|  |  |  | -				} | 
					
						
							|  |  |  | -			} | 
					
						
							|  |  |  | -		} | 
					
						
							|  |  |  | -	} | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | +        if ($lm) { | 
					
						
							|  |  |  | +            header('Last-Modified: ' . date(DATE_RFC1123, $lm)); | 
					
						
							|  |  |  | +            $if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE']; | 
					
						
							|  |  |  | +            if ($if_modified_since) { | 
					
						
							|  |  |  | +                $ims = strtotime($if_modified_since); | 
					
						
							|  |  |  | +                if ($lm <= $ims) { | 
					
						
							|  |  |  | +                    if (!$etag || | 
					
						
							|  |  |  | +                        $this->_has_etag($etag, $_SERVER['HTTP_IF_NONE_MATCH'])) { | 
					
						
							|  |  |  | +                        header('HTTP/1.1 304 Not Modified'); | 
					
						
							|  |  |  | +                        // Better way to do this? | 
					
						
							|  |  |  | +                        exit(0); | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | +                    } | 
					
						
							|  |  |  | +                } | 
					
						
							|  |  |  | +            } | 
					
						
							|  |  |  | +        } | 
					
						
							|  |  |  | +    } | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | hunk ./lib/action.php 103 | 
					
						
							|  |  |  | -	function _has_etag($etag, $if_none_match) { | 
					
						
							|  |  |  | -		return ($if_none_match) && in_array($etag, explode(',', $if_none_match)); | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | -	} | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | +    function _has_etag($etag, $if_none_match) | 
					
						
							|  |  |  | +    { | 
					
						
							|  |  |  | +        return ($if_none_match) && in_array($etag, explode(',', $if_none_match)); | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | +    } | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | hunk ./lib/action.php 108 | 
					
						
							|  |  |  | -	function boolean($key, $def=false) { | 
					
						
							|  |  |  | -		$arg = strtolower($this->trimmed($key)); | 
					
						
							|  |  |  | +    function boolean($key, $def=false) | 
					
						
							|  |  |  | +    { | 
					
						
							|  |  |  | +        $arg = strtolower($this->trimmed($key)); | 
					
						
							|  |  |  | hunk ./lib/action.php 112 | 
					
						
							|  |  |  | -		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'))) { | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | -			return false; | 
					
						
							|  |  |  | -		} else { | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | -			return $def; | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | -		} | 
					
						
							|  |  |  | -	} | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | +        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; | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | +        } else { | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | +            return $def; | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | +        } | 
					
						
							|  |  |  | +    } | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | hunk ./lib/action.php 123 | 
					
						
							|  |  |  | -	function server_error($msg, $code=500) { | 
					
						
							|  |  |  | -		$action = $this->trimmed('action'); | 
					
						
							|  |  |  | -		common_debug("Server error '$code' on '$action': $msg", __FILE__); | 
					
						
							|  |  |  | -		common_server_error($msg, $code); | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | -	} | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | +    function server_error($msg, $code=500) | 
					
						
							|  |  |  | +    { | 
					
						
							|  |  |  | +        $action = $this->trimmed('action'); | 
					
						
							|  |  |  | +        common_debug("Server error '$code' on '$action': $msg", __FILE__); | 
					
						
							|  |  |  | +        common_server_error($msg, $code); | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | +    } | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | hunk ./lib/action.php 130 | 
					
						
							|  |  |  | -	function client_error($msg, $code=400) { | 
					
						
							|  |  |  | -		$action = $this->trimmed('action'); | 
					
						
							|  |  |  | -		common_debug("User error '$code' on '$action': $msg", __FILE__); | 
					
						
							|  |  |  | -		common_user_error($msg, $code); | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | -	} | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | +    function client_error($msg, $code=400) | 
					
						
							|  |  |  | +    { | 
					
						
							|  |  |  | +        $action = $this->trimmed('action'); | 
					
						
							|  |  |  | +        common_debug("User error '$code' on '$action': $msg", __FILE__); | 
					
						
							|  |  |  | +        common_user_error($msg, $code); | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | +    } | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | hunk ./lib/action.php 137 | 
					
						
							|  |  |  | -	function self_url() { | 
					
						
							|  |  |  | -		$action = $this->trimmed('action'); | 
					
						
							|  |  |  | -		$args = $this->args; | 
					
						
							|  |  |  | -		unset($args['action']); | 
					
						
							|  |  |  | -		foreach (array_keys($_COOKIE) as $cookie) { | 
					
						
							|  |  |  | -			unset($args[$cookie]); | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | -		} | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | -		return common_local_url($action, $args); | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | -	} | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | +    function self_url() | 
					
						
							|  |  |  | +    { | 
					
						
							|  |  |  | +        $action = $this->trimmed('action'); | 
					
						
							|  |  |  | +        $args = $this->args; | 
					
						
							|  |  |  | +        unset($args['action']); | 
					
						
							|  |  |  | +        foreach (array_keys($_COOKIE) as $cookie) { | 
					
						
							|  |  |  | +            unset($args[$cookie]); | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | +        } | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | +        return common_local_url($action, $args); | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | +    } | 
					
						
							| 
									
										
										
										
											2008-12-20 19:39:55 -05:00
										 |  |  | hunk ./lib/action.php 148 | 
					
						
							|  |  |  | -	function nav_menu($menu) { | 
					
						
							|  |  |  | +    function nav_menu($menu) | 
					
						
							|  |  |  | +    { | 
					
						
							|  |  |  | hunk ./lib/action.php 153 | 
					
						
							|  |  |  | -            common_menu_item(common_local_url($menuaction, isset($menudesc[2]) ? $menudesc[2] : NULL), | 
					
						
							|  |  |  | -							 $menudesc[0], | 
					
						
							|  |  |  | -							 $menudesc[1], | 
					
						
							|  |  |  | -							 $action == $menuaction); | 
					
						
							|  |  |  | +            common_menu_item(common_local_url($menuaction, | 
					
						
							|  |  |  | +                                              isset($menudesc[2]) ? $menudesc[2] : null), | 
					
						
							|  |  |  | +                             $menudesc[0], | 
					
						
							|  |  |  | +                             $menudesc[1], | 
					
						
							|  |  |  | +                             $action == $menuaction); | 
					
						
							|  |  |  | hunk ./lib/action.php 160 | 
					
						
							| 
									
										
										
										
											2008-12-20 19:30:16 -05:00
										 |  |  | -	} | 
					
						
							| 
									
										
										
										
											2008-12-20 19:23:32 -05:00
										 |  |  | +    } |