some modifications to assuage phpcs

darcs-hash:20081221003955-84dde-d6e8067a579f70dcb707f4525e588920a2375f5c.gz
This commit is contained in:
Evan Prodromou 2008-12-20 19:39:55 -05:00
parent ee4db3d21c
commit 01a548a9fb
5 changed files with 422 additions and 3514 deletions

View File

@ -24,3 +24,5 @@ Evan Prodromou <evan@prodromou.name>**20081212171135]
Evan Prodromou <evan@prodromou.name>**20081221002332] Evan Prodromou <evan@prodromou.name>**20081221002332]
[reformatting for phpcs in lib/util.php [reformatting for phpcs in lib/util.php
Evan Prodromou <evan@prodromou.name>**20081221003016] Evan Prodromou <evan@prodromou.name>**20081221003016]
[some modifications to assuage phpcs
Evan Prodromou <evan@prodromou.name>**20081221003955]

View File

@ -1,5 +1,5 @@
<?php <?php
/* /**
* Laconica - a distributed open-source microblogging tool * Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, Inc. * Copyright (C) 2008, Controlez-Vous, Inc.
* *
@ -17,126 +17,145 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) {
exit(1);
}
class Action { // lawsuit class Action // lawsuit
{
var $args; var $args;
function Action() { function Action()
} {
}
# For initializing members of the class // For initializing members of the class
function prepare($argarray) { function prepare($argarray)
$this->args =& common_copy_args($argarray); {
return true; $this->args =& common_copy_args($argarray);
} return true;
}
# For comparison with If-Last-Modified // For comparison with If-Last-Modified
# If not applicable, return NULL // If not applicable, return null
function last_modified() { function last_modified()
return NULL; {
} return null;
}
function etag() { function etag()
return NULL; {
} return null;
}
function is_readonly() { function is_readonly()
return false; {
} return false;
}
function arg($key, $def=NULL) { function arg($key, $def=null)
if (array_key_exists($key, $this->args)) { {
return $this->args[$key]; if (array_key_exists($key, $this->args)) {
} else { return $this->args[$key];
return $def; } else {
} return $def;
} }
}
function trimmed($key, $def=NULL) { function trimmed($key, $def=null)
$arg = $this->arg($key, $def); {
return (is_string($arg)) ? trim($arg) : $arg; $arg = $this->arg($key, $def);
} return (is_string($arg)) ? trim($arg) : $arg;
}
# Note: argarray ignored, since it's now passed in in prepare() // Note: argarray ignored, since it's now passed in in prepare()
function handle($argarray=NULL) { function handle($argarray=null)
{
$lm = $this->last_modified(); $lm = $this->last_modified();
$etag = $this->etag(); $etag = $this->etag();
if ($etag) { if ($etag) {
header('ETag: ' . $etag); header('ETag: ' . $etag);
} }
if ($lm) { if ($lm) {
header('Last-Modified: ' . date(DATE_RFC1123, $lm)); header('Last-Modified: ' . date(DATE_RFC1123, $lm));
$if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE']; $if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
if ($if_modified_since) { if ($if_modified_since) {
$ims = strtotime($if_modified_since); $ims = strtotime($if_modified_since);
if ($lm <= $ims) { if ($lm <= $ims) {
if (!$etag || $this->_has_etag($etag, $_SERVER['HTTP_IF_NONE_MATCH'])) { if (!$etag ||
header('HTTP/1.1 304 Not Modified'); $this->_has_etag($etag, $_SERVER['HTTP_IF_NONE_MATCH'])) {
# Better way to do this? header('HTTP/1.1 304 Not Modified');
exit(0); // Better way to do this?
} exit(0);
} }
} }
} }
} }
}
function _has_etag($etag, $if_none_match) { function _has_etag($etag, $if_none_match)
return ($if_none_match) && in_array($etag, explode(',', $if_none_match)); {
} return ($if_none_match) && in_array($etag, explode(',', $if_none_match));
}
function boolean($key, $def=false) { function boolean($key, $def=false)
$arg = strtolower($this->trimmed($key)); {
$arg = strtolower($this->trimmed($key));
if (is_null($arg)) { if (is_null($arg)) {
return $def; return $def;
} else if (in_array($arg, array('true', 'yes', '1'))) { } else if (in_array($arg, array('true', 'yes', '1'))) {
return true; return true;
} else if (in_array($arg, array('false', 'no', '0'))) { } else if (in_array($arg, array('false', 'no', '0'))) {
return false; return false;
} else { } else {
return $def; return $def;
} }
} }
function server_error($msg, $code=500) { function server_error($msg, $code=500)
$action = $this->trimmed('action'); {
common_debug("Server error '$code' on '$action': $msg", __FILE__); $action = $this->trimmed('action');
common_server_error($msg, $code); common_debug("Server error '$code' on '$action': $msg", __FILE__);
} common_server_error($msg, $code);
}
function client_error($msg, $code=400) { function client_error($msg, $code=400)
$action = $this->trimmed('action'); {
common_debug("User error '$code' on '$action': $msg", __FILE__); $action = $this->trimmed('action');
common_user_error($msg, $code); common_debug("User error '$code' on '$action': $msg", __FILE__);
} common_user_error($msg, $code);
}
function self_url() { function self_url()
$action = $this->trimmed('action'); {
$args = $this->args; $action = $this->trimmed('action');
unset($args['action']); $args = $this->args;
foreach (array_keys($_COOKIE) as $cookie) { unset($args['action']);
unset($args[$cookie]); foreach (array_keys($_COOKIE) as $cookie) {
} unset($args[$cookie]);
return common_local_url($action, $args); }
} return common_local_url($action, $args);
}
function nav_menu($menu) { function nav_menu($menu)
{
$action = $this->trimmed('action'); $action = $this->trimmed('action');
common_element_start('ul', array('id' => 'nav_views')); common_element_start('ul', array('id' => 'nav_views'));
foreach ($menu as $menuaction => $menudesc) { foreach ($menu as $menuaction => $menudesc) {
common_menu_item(common_local_url($menuaction, isset($menudesc[2]) ? $menudesc[2] : NULL), common_menu_item(common_local_url($menuaction,
$menudesc[0], isset($menudesc[2]) ? $menudesc[2] : null),
$menudesc[1], $menudesc[0],
$action == $menuaction); $menudesc[1],
$action == $menuaction);
} }
common_element_end('ul'); common_element_end('ul');
} }
} }

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
<?php <?php
/* /**
* Laconica - a distributed open-source microblogging tool * Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, Inc. * Copyright (C) 2008, Controlez-Vous, Inc.
* *
@ -17,126 +17,145 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) {
exit(1);
}
class Action { // lawsuit class Action // lawsuit
{
var $args; var $args;
function Action() { function Action()
} {
}
# For initializing members of the class // For initializing members of the class
function prepare($argarray) { function prepare($argarray)
$this->args =& common_copy_args($argarray); {
return true; $this->args =& common_copy_args($argarray);
} return true;
}
# For comparison with If-Last-Modified // For comparison with If-Last-Modified
# If not applicable, return NULL // If not applicable, return null
function last_modified() { function last_modified()
return NULL; {
} return null;
}
function etag() { function etag()
return NULL; {
} return null;
}
function is_readonly() { function is_readonly()
return false; {
} return false;
}
function arg($key, $def=NULL) { function arg($key, $def=null)
if (array_key_exists($key, $this->args)) { {
return $this->args[$key]; if (array_key_exists($key, $this->args)) {
} else { return $this->args[$key];
return $def; } else {
} return $def;
} }
}
function trimmed($key, $def=NULL) { function trimmed($key, $def=null)
$arg = $this->arg($key, $def); {
return (is_string($arg)) ? trim($arg) : $arg; $arg = $this->arg($key, $def);
} return (is_string($arg)) ? trim($arg) : $arg;
}
# Note: argarray ignored, since it's now passed in in prepare() // Note: argarray ignored, since it's now passed in in prepare()
function handle($argarray=NULL) { function handle($argarray=null)
{
$lm = $this->last_modified(); $lm = $this->last_modified();
$etag = $this->etag(); $etag = $this->etag();
if ($etag) { if ($etag) {
header('ETag: ' . $etag); header('ETag: ' . $etag);
} }
if ($lm) { if ($lm) {
header('Last-Modified: ' . date(DATE_RFC1123, $lm)); header('Last-Modified: ' . date(DATE_RFC1123, $lm));
$if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE']; $if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
if ($if_modified_since) { if ($if_modified_since) {
$ims = strtotime($if_modified_since); $ims = strtotime($if_modified_since);
if ($lm <= $ims) { if ($lm <= $ims) {
if (!$etag || $this->_has_etag($etag, $_SERVER['HTTP_IF_NONE_MATCH'])) { if (!$etag ||
header('HTTP/1.1 304 Not Modified'); $this->_has_etag($etag, $_SERVER['HTTP_IF_NONE_MATCH'])) {
# Better way to do this? header('HTTP/1.1 304 Not Modified');
exit(0); // Better way to do this?
} exit(0);
} }
} }
} }
} }
}
function _has_etag($etag, $if_none_match) { function _has_etag($etag, $if_none_match)
return ($if_none_match) && in_array($etag, explode(',', $if_none_match)); {
} return ($if_none_match) && in_array($etag, explode(',', $if_none_match));
}
function boolean($key, $def=false) { function boolean($key, $def=false)
$arg = strtolower($this->trimmed($key)); {
$arg = strtolower($this->trimmed($key));
if (is_null($arg)) { if (is_null($arg)) {
return $def; return $def;
} else if (in_array($arg, array('true', 'yes', '1'))) { } else if (in_array($arg, array('true', 'yes', '1'))) {
return true; return true;
} else if (in_array($arg, array('false', 'no', '0'))) { } else if (in_array($arg, array('false', 'no', '0'))) {
return false; return false;
} else { } else {
return $def; return $def;
} }
} }
function server_error($msg, $code=500) { function server_error($msg, $code=500)
$action = $this->trimmed('action'); {
common_debug("Server error '$code' on '$action': $msg", __FILE__); $action = $this->trimmed('action');
common_server_error($msg, $code); common_debug("Server error '$code' on '$action': $msg", __FILE__);
} common_server_error($msg, $code);
}
function client_error($msg, $code=400) { function client_error($msg, $code=400)
$action = $this->trimmed('action'); {
common_debug("User error '$code' on '$action': $msg", __FILE__); $action = $this->trimmed('action');
common_user_error($msg, $code); common_debug("User error '$code' on '$action': $msg", __FILE__);
} common_user_error($msg, $code);
}
function self_url() { function self_url()
$action = $this->trimmed('action'); {
$args = $this->args; $action = $this->trimmed('action');
unset($args['action']); $args = $this->args;
foreach (array_keys($_COOKIE) as $cookie) { unset($args['action']);
unset($args[$cookie]); foreach (array_keys($_COOKIE) as $cookie) {
} unset($args[$cookie]);
return common_local_url($action, $args); }
} return common_local_url($action, $args);
}
function nav_menu($menu) { function nav_menu($menu)
{
$action = $this->trimmed('action'); $action = $this->trimmed('action');
common_element_start('ul', array('id' => 'nav_views')); common_element_start('ul', array('id' => 'nav_views'));
foreach ($menu as $menuaction => $menudesc) { foreach ($menu as $menuaction => $menudesc) {
common_menu_item(common_local_url($menuaction, isset($menudesc[2]) ? $menudesc[2] : NULL), common_menu_item(common_local_url($menuaction,
$menudesc[0], isset($menudesc[2]) ? $menudesc[2] : null),
$menudesc[1], $menudesc[0],
$action == $menuaction); $menudesc[1],
$action == $menuaction);
} }
common_element_end('ul'); common_element_end('ul');
} }
} }