wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some phpcs fixups

Browse Source
This commit is contained in:
Evan Prodromou 2009-03-28 17:42:45 -04:00
parent fe426a3152
commit eacdf329b6
1 changed files with 52 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
classes/User.php
View File

@ -1,7 +1,7 @@
<?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, 2009, Control Yourself, Inc.
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU Affero General Public License as published by
@ -17,11 +17,14 @@
* 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);
}
/** /**
* Table Definition for user * Table Definition for user
*/ */
require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
require_once 'Validate.php'; require_once 'Validate.php';
@ -79,13 +82,13 @@ class User extends Memcached_DataObject
function isSubscribed($other) function isSubscribed($other)
{ {
assert(!is_null($other)); assert(!is_null($other));
# XXX: cache results of this query // XXX: cache results of this query
$sub = Subscription::pkeyGet(array('subscriber' => $this->id, $sub = Subscription::pkeyGet(array('subscriber' => $this->id,
'subscribed' => $other->id)); 'subscribed' => $other->id));
return (is_null($sub)) ? false : true; return (is_null($sub)) ? false : true;
} }
# 'update' won't write key columns, so we have to do it ourselves. // 'update' won't write key columns, so we have to do it ourselves.
function updateKeys(&$orig) function updateKeys(&$orig)
{ {
@ -96,7 +99,7 @@ class User extends Memcached_DataObject
} }
} }
if (count($parts) == 0) { if (count($parts) == 0) {
# No changes // No changes
return true; return true;
} }
$toupdate = implode(', ', $parts); $toupdate = implode(', ', $parts);
@ -117,7 +120,7 @@ class User extends Memcached_DataObject
function allowed_nickname($nickname) function allowed_nickname($nickname)
{ {
# XXX: should already be validated for size, content, etc. // XXX: should already be validated for size, content, etc.
static $blacklist = array('rss', 'xrds', 'doc', 'main', static $blacklist = array('rss', 'xrds', 'doc', 'main',
'settings', 'notice', 'user', 'settings', 'notice', 'user',
'search', 'avatar', 'tag', 'tags', 'search', 'avatar', 'tag', 'tags',
@ -147,7 +150,7 @@ class User extends Memcached_DataObject
$sub->subscriber = $this->id; $sub->subscriber = $this->id;
$sub->subscribed = $other->id; $sub->subscribed = $other->id;
$sub->created = common_sql_now(); # current time $sub->created = common_sql_now(); // current time
if (!$sub->insert()) { if (!$sub->insert()) {
return false; return false;
@ -173,7 +176,7 @@ class User extends Memcached_DataObject
static function register($fields) { static function register($fields) {
# MAGICALLY put fields into current scope // MAGICALLY put fields into current scope
extract($fields); extract($fields);
@ -211,11 +214,11 @@ class User extends Memcached_DataObject
$user->id = $id; $user->id = $id;
$user->nickname = $nickname; $user->nickname = $nickname;
if (!empty($password)) { # may not have a password for OpenID users if (!empty($password)) { // may not have a password for OpenID users
$user->password = common_munge_password($password, $id); $user->password = common_munge_password($password, $id);
} }
# Users who respond to invite email have proven their ownership of that address // Users who respond to invite email have proven their ownership of that address
if (!empty($code)) { if (!empty($code)) {
$invite = Invitation::staticGet($code); $invite = Invitation::staticGet($code);
@ -240,7 +243,7 @@ class User extends Memcached_DataObject
return false; return false;
} }
# Everyone is subscribed to themself // Everyone is subscribed to themself
$subscription = new Subscription(); $subscription = new Subscription();
$subscription->subscriber = $user->id; $subscription->subscriber = $user->id;
@ -324,7 +327,7 @@ class User extends Memcached_DataObject
return $user; return $user;
} }
# Things we do when the email changes // Things we do when the email changes
function emailChanged() function emailChanged()
{ {
@ -345,35 +348,36 @@ class User extends Memcached_DataObject
{ {
$cache = common_memcache(); $cache = common_memcache();
# XXX: Kind of a hack. // XXX: Kind of a hack.
if ($cache) { if ($cache) {
# This is the stream of favorite notices, in rev chron // This is the stream of favorite notices, in rev chron
# order. This forces it into cache. // order. This forces it into cache.
$faves = $this->favoriteNotices(0, NOTICE_CACHE_WINDOW); $faves = $this->favoriteNotices(0, NOTICE_CACHE_WINDOW);
$cnt = 0; $cnt = 0;
while ($faves->fetch()) { while ($faves->fetch()) {
if ($faves->id < $notice->id) { if ($faves->id < $notice->id) {
# If we passed it, it's not a fave // If we passed it, it's not a fave
return false; return false;
} else if ($faves->id == $notice->id) { } else if ($faves->id == $notice->id) {
# If it matches a cached notice, then it's a fave // If it matches a cached notice, then it's a fave
return true; return true;
} }
$cnt++; $cnt++;
} }
# If we're not past the end of the cache window, // If we're not past the end of the cache window,
# then the cache has all available faves, so this one // then the cache has all available faves, so this one
# is not a fave. // is not a fave.
if ($cnt < NOTICE_CACHE_WINDOW) { if ($cnt < NOTICE_CACHE_WINDOW) {
return false; return false;
} }
# Otherwise, cache doesn't have all faves; // Otherwise, cache doesn't have all faves;
# fall through to the default // fall through to the default
} }
$fave = Fave::pkeyGet(array('user_id' => $this->id, $fave = Fave::pkeyGet(array('user_id' => $this->id,
'notice_id' => $notice->id)); 'notice_id' => $notice->id));
return ((is_null($fave)) ? false : true); return ((is_null($fave)) ? false : true);
} }
function mutuallySubscribed($other) function mutuallySubscribed($other)
{ {
return $this->isSubscribed($other) && return $this->isSubscribed($other) &&
@ -382,8 +386,7 @@ class User extends Memcached_DataObject
function mutuallySubscribedUsers() function mutuallySubscribedUsers()
{ {
// 3-way join; probably should get cached
# 3-way join; probably should get cached
$UT = common_config('db','type')=='pgsql'?'"user"':'user'; $UT = common_config('db','type')=='pgsql'?'"user"':'user';
$qry = "SELECT $UT.* " . $qry = "SELECT $UT.* " .
"FROM subscription sub1 JOIN $UT ON sub1.subscribed = $UT.id " . "FROM subscription sub1 JOIN $UT ON sub1.subscribed = $UT.id " .
@ -432,8 +435,8 @@ class User extends Memcached_DataObject
{ {
$enabled = common_config('inboxes', 'enabled'); $enabled = common_config('inboxes', 'enabled');
# Complicated code, depending on whether we support inboxes yet // Complicated code, depending on whether we support inboxes yet
# XXX: make this go away when inboxes become mandatory // XXX: make this go away when inboxes become mandatory
if ($enabled === false || if ($enabled === false ||
($enabled == 'transitional' && $this->inboxed == 0)) { ($enabled == 'transitional' && $this->inboxed == 0)) {
@ -449,7 +452,7 @@ class User extends Memcached_DataObject
'SELECT notice.* ' . 'SELECT notice.* ' .
'FROM notice JOIN notice_inbox ON notice.id = notice_inbox.notice_id ' . 'FROM notice JOIN notice_inbox ON notice.id = notice_inbox.notice_id ' .
'WHERE notice_inbox.user_id = %d '; 'WHERE notice_inbox.user_id = %d ';
# NOTE: we override ORDER // NOTE: we override ORDER
$order = null; $order = null;
} }
return Notice::getStream(sprintf($qry, $this->id), return Notice::getStream(sprintf($qry, $this->id),
@ -462,8 +465,8 @@ class User extends Memcached_DataObject
{ {
$cache = common_memcache(); $cache = common_memcache();
if ($cache) { if ($cache) {
# Faves don't happen chronologically, so we need to blow // Faves don't happen chronologically, so we need to blow
# ;last cache, too // ;last cache, too
$cache->delete(common_cache_key('user:faves:'.$this->id)); $cache->delete(common_cache_key('user:faves:'.$this->id));
$cache->delete(common_cache_key('user:faves:'.$this->id).';last'); $cache->delete(common_cache_key('user:faves:'.$this->id).';last');
} }
@ -481,12 +484,11 @@ class User extends Memcached_DataObject
function block($other) function block($other)
{ {
// Add a new block record
# Add a new block record
$block = new Profile_block(); $block = new Profile_block();
# Begin a transaction // Begin a transaction
$block->query('BEGIN'); $block->query('BEGIN');
@ -500,7 +502,7 @@ class User extends Memcached_DataObject
return false; return false;
} }
# Cancel their subscription, if it exists // Cancel their subscription, if it exists
$sub = Subscription::pkeyGet(array('subscriber' => $other->id, $sub = Subscription::pkeyGet(array('subscriber' => $other->id,
'subscribed' => $this->id)); 'subscribed' => $this->id));
@ -520,8 +522,7 @@ class User extends Memcached_DataObject
function unblock($other) function unblock($other)
{ {
// Get the block record
# Get the block record
$block = Profile_block::get($this->id, $other->id); $block = Profile_block::get($this->id, $other->id);