return;
}
- function clientError($msg, $code = 400, $format = 'xml')
+ function clientError($msg, $code = 400, $format = null)
{
$action = $this->trimmed('action');
+ if ($format === null) {
+ $format = $this->format;
+ }
common_debug("User error '$code' on '$action': $msg", __FILE__);
}
}
- function serverError($msg, $code = 500, $content_type = 'xml')
+ function serverError($msg, $code = 500, $content_type = null)
{
$action = $this->trimmed('action');
+ if ($content_type === null) {
+ $content_type = $this->format;
+ }
common_debug("Server error '$code' on '$action': $msg", __FILE__);
return;
}
+ private static function is_decimal($str)
+ {
+ return preg_match('/^[0-9]+$/', $str);
+ }
+
function getTargetUser($id)
{
if (empty($id)) {
// Twitter supports these other ways of passing the user ID
- if (is_numeric($this->arg('id'))) {
+ if (self::is_decimal($this->arg('id'))) {
return User::staticGet($this->arg('id'));
} else if ($this->arg('id')) {
$nickname = common_canonical_nickname($this->arg('id'));
} else if ($this->arg('user_id')) {
// This is to ensure that a non-numeric user_id still
// overrides screen_name even if it doesn't get used
- if (is_numeric($this->arg('user_id'))) {
+ if (self::is_decimal($this->arg('user_id'))) {
return User::staticGet('id', $this->arg('user_id'));
}
} else if ($this->arg('screen_name')) {
return $this->auth_user;
}
- } else if (is_numeric($id)) {
+ } else if (self::is_decimal($id)) {
return User::staticGet($id);
} else {
$nickname = common_canonical_nickname($id);
if (empty($id)) {
// Twitter supports these other ways of passing the user ID
- if (is_numeric($this->arg('id'))) {
+ if (self::is_decimal($this->arg('id'))) {
return Profile::staticGet($this->arg('id'));
} else if ($this->arg('id')) {
// Screen names currently can only uniquely identify a local user.
} else if ($this->arg('user_id')) {
// This is to ensure that a non-numeric user_id still
// overrides screen_name even if it doesn't get used
- if (is_numeric($this->arg('user_id'))) {
+ if (self::is_decimal($this->arg('user_id'))) {
return Profile::staticGet('id', $this->arg('user_id'));
}
} else if ($this->arg('screen_name')) {
$user = User::staticGet('nickname', $nickname);
return $user ? $user->getProfile() : null;
}
- } else if (is_numeric($id)) {
+ } else if (self::is_decimal($id)) {
return Profile::staticGet($id);
} else {
$nickname = common_canonical_nickname($id);
function getTargetGroup($id)
{
if (empty($id)) {
- if (is_numeric($this->arg('id'))) {
- return User_group::staticGet($this->arg('id'));
+ if (self::is_decimal($this->arg('id'))) {
+ return User_group::staticGet('id', $this->arg('id'));
} else if ($this->arg('id')) {
- $nickname = common_canonical_nickname($this->arg('id'));
- $local = Local_group::staticGet('nickname', $nickname);
- if (empty($local)) {
- return null;
- } else {
- return User_group::staticGet('id', $local->id);
- }
+ return User_group::getForNickname($this->arg('id'));
} else if ($this->arg('group_id')) {
- // This is to ensure that a non-numeric user_id still
- // overrides screen_name even if it doesn't get used
- if (is_numeric($this->arg('group_id'))) {
+ // This is to ensure that a non-numeric group_id still
+ // overrides group_name even if it doesn't get used
+ if (self::is_decimal($this->arg('group_id'))) {
return User_group::staticGet('id', $this->arg('group_id'));
}
} else if ($this->arg('group_name')) {
- $nickname = common_canonical_nickname($this->arg('group_name'));
- $local = Local_group::staticGet('nickname', $nickname);
- if (empty($local)) {
- return null;
- } else {
- return User_group::staticGet('id', $local->group_id);
- }
+ return User_group::getForNickname($this->arg('group_name'));
}
- } else if (is_numeric($id)) {
- return User_group::staticGet($id);
+ } else if (self::is_decimal($id)) {
+ return User_group::staticGet('id', $id);
} else {
- $nickname = common_canonical_nickname($id);
- $local = Local_group::staticGet('nickname', $nickname);
- if (empty($local)) {
- return null;
- } else {
- return User_group::staticGet('id', $local->group_id);
- }
+ return User_group::getForNickname($id);
}
}