summaryrefslogtreecommitdiff
path: root/_darcs
diff options
context:
space:
mode:
Diffstat (limited to '_darcs')
-rw-r--r--_darcs/inventory7
-rw-r--r--_darcs/patches/20081223194428-84dde-cb1a1e6f679acd68e864545c4d4dd8752d6a6257.gzbin0 -> 1727 bytes
-rw-r--r--_darcs/pristine/actions/accesstoken.php2
-rw-r--r--_darcs/pristine/actions/emailsettings.php16
-rw-r--r--_darcs/pristine/actions/finishremotesubscribe.php2
-rw-r--r--_darcs/pristine/actions/foaf.php4
-rw-r--r--_darcs/pristine/actions/imsettings.php12
-rw-r--r--_darcs/pristine/actions/othersettings.php4
-rw-r--r--_darcs/pristine/actions/profilesettings.php12
-rw-r--r--_darcs/pristine/actions/smssettings.php12
-rw-r--r--_darcs/pristine/actions/twitapifriendships.php2
-rw-r--r--_darcs/pristine/actions/twittersettings.php4
-rw-r--r--_darcs/pristine/actions/userauthorization.php18
-rw-r--r--_darcs/pristine/classes/Foreign_link.php6
-rw-r--r--_darcs/pristine/classes/Notice.php16
-rw-r--r--_darcs/pristine/classes/Queue_item.php2
-rw-r--r--_darcs/pristine/classes/User.php8
-rw-r--r--_darcs/pristine/lib/oauthstore.php8
-rw-r--r--_darcs/pristine/lib/omb.php8
-rw-r--r--_darcs/pristine/lib/util.php8
-rw-r--r--_darcs/pristine/scripts/sitemap.php6
-rw-r--r--_darcs/pristine/scripts/xmppconfirmhandler.php2
-rw-r--r--_darcs/tentative_pristine3887
23 files changed, 307 insertions, 3739 deletions
diff --git a/_darcs/inventory b/_darcs/inventory
index 844cdd799..0c5a7d9b5 100644
--- a/_darcs/inventory
+++ b/_darcs/inventory
@@ -78,4 +78,11 @@ Evan Prodromou <evan@prodromou.name>**20081223193323
definitions and move the opening brace to the next line (properly
indented... usually).
+]
+[TRUE => true, FALSE => false
+Evan Prodromou <evan@prodromou.name>**20081223194428
+
+ More PEAR coding standards global changes. Here, I've changed all
+ instances of TRUE to true and FALSE to false.
+
] \ No newline at end of file
diff --git a/_darcs/patches/20081223194428-84dde-cb1a1e6f679acd68e864545c4d4dd8752d6a6257.gz b/_darcs/patches/20081223194428-84dde-cb1a1e6f679acd68e864545c4d4dd8752d6a6257.gz
new file mode 100644
index 000000000..82d8fb3cc
--- /dev/null
+++ b/_darcs/patches/20081223194428-84dde-cb1a1e6f679acd68e864545c4d4dd8752d6a6257.gz
Binary files differ
diff --git a/_darcs/pristine/actions/accesstoken.php b/_darcs/pristine/actions/accesstoken.php
index 738ec071f..cab5425bf 100644
--- a/_darcs/pristine/actions/accesstoken.php
+++ b/_darcs/pristine/actions/accesstoken.php
@@ -33,7 +33,7 @@ class AccesstokenAction extends Action {
$server = omb_oauth_server();
common_debug('fetching the access token', __FILE__);
$token = $server->fetch_access_token($req);
- common_debug('got this token: "'.print_r($token,TRUE).'"', __FILE__);
+ common_debug('got this token: "'.print_r($token,true).'"', __FILE__);
common_debug('printing the access token', __FILE__);
print $token;
} catch (OAuthException $e) {
diff --git a/_darcs/pristine/actions/emailsettings.php b/_darcs/pristine/actions/emailsettings.php
index 3dcf7716f..7f08efd29 100644
--- a/_darcs/pristine/actions/emailsettings.php
+++ b/_darcs/pristine/actions/emailsettings.php
@@ -118,7 +118,7 @@ class EmailsettingsAction extends SettingsAction {
$confirm = new Confirm_address();
$confirm->user_id = $user->id;
$confirm->address_type = 'email';
- if ($confirm->find(TRUE)) {
+ if ($confirm->find(true)) {
return $confirm;
} else {
return null;
@@ -179,7 +179,7 @@ class EmailsettingsAction extends SettingsAction {
$result = $user->update($original);
- if ($result === FALSE) {
+ if ($result === false) {
common_log_db_error($user, 'UPDATE', __FILE__);
common_server_error(_('Couldn\'t update user.'));
return;
@@ -229,7 +229,7 @@ class EmailsettingsAction extends SettingsAction {
$result = $confirm->insert();
- if ($result === FALSE) {
+ if ($result === false) {
common_log_db_error($confirm, 'INSERT', __FILE__);
common_server_error(_('Couldn\'t insert confirmation code.'));
return;
@@ -239,7 +239,7 @@ class EmailsettingsAction extends SettingsAction {
$msg = _('A confirmation code was sent to the email address you added. Check your inbox (and spam box!) for the code and instructions on how to use it.');
- $this->show_form($msg, TRUE);
+ $this->show_form($msg, true);
}
function cancel_confirmation()
@@ -263,7 +263,7 @@ class EmailsettingsAction extends SettingsAction {
return;
}
- $this->show_form(_('Confirmation cancelled.'), TRUE);
+ $this->show_form(_('Confirmation cancelled.'), true);
}
function remove_address()
@@ -290,7 +290,7 @@ class EmailsettingsAction extends SettingsAction {
}
$user->query('COMMIT');
- $this->show_form(_('The address was removed.'), TRUE);
+ $this->show_form(_('The address was removed.'), true);
}
function remove_incoming()
@@ -310,7 +310,7 @@ class EmailsettingsAction extends SettingsAction {
$this->server_error(_("Couldn't update user record."));
}
- $this->show_form(_('Incoming email address removed.'), TRUE);
+ $this->show_form(_('Incoming email address removed.'), true);
}
function new_incoming()
@@ -325,7 +325,7 @@ class EmailsettingsAction extends SettingsAction {
$this->server_error(_("Couldn't update user record."));
}
- $this->show_form(_('New incoming email address added.'), TRUE);
+ $this->show_form(_('New incoming email address added.'), true);
}
function email_exists($email)
diff --git a/_darcs/pristine/actions/finishremotesubscribe.php b/_darcs/pristine/actions/finishremotesubscribe.php
index 38a56c962..5aace4fa9 100644
--- a/_darcs/pristine/actions/finishremotesubscribe.php
+++ b/_darcs/pristine/actions/finishremotesubscribe.php
@@ -278,7 +278,7 @@ class FinishremotesubscribeAction extends Action {
$req->to_postdata(),
array('User-Agent' => 'Laconica/' . LACONICA_VERSION));
- common_debug('got result: "'.print_r($result,TRUE).'"', __FILE__);
+ common_debug('got result: "'.print_r($result,true).'"', __FILE__);
if ($result->status != 200) {
return null;
diff --git a/_darcs/pristine/actions/foaf.php b/_darcs/pristine/actions/foaf.php
index 893e2a861..27548bfff 100644
--- a/_darcs/pristine/actions/foaf.php
+++ b/_darcs/pristine/actions/foaf.php
@@ -122,7 +122,7 @@ class FoafAction extends Action {
$other = User::staticGet('id', $sub->subscribed);
}
if (!$other) {
- common_debug('Got a bad subscription: '.print_r($sub,TRUE));
+ common_debug('Got a bad subscription: '.print_r($sub,true));
continue;
}
common_element('knows', array('rdf:resource' => $other->uri));
@@ -144,7 +144,7 @@ class FoafAction extends Action {
$other = User::staticGet('id', $sub->subscriber);
}
if (!$other) {
- common_debug('Got a bad subscription: '.print_r($sub,TRUE));
+ common_debug('Got a bad subscription: '.print_r($sub,true));
continue;
}
if (array_key_exists($other->uri, $person)) {
diff --git a/_darcs/pristine/actions/imsettings.php b/_darcs/pristine/actions/imsettings.php
index cccd5db49..56fb14758 100644
--- a/_darcs/pristine/actions/imsettings.php
+++ b/_darcs/pristine/actions/imsettings.php
@@ -93,7 +93,7 @@ class ImsettingsAction extends SettingsAction {
$confirm = new Confirm_address();
$confirm->user_id = $user->id;
$confirm->address_type = 'jabber';
- if ($confirm->find(TRUE)) {
+ if ($confirm->find(true)) {
return $confirm;
} else {
return null;
@@ -146,7 +146,7 @@ class ImsettingsAction extends SettingsAction {
$result = $user->update($original);
- if ($result === FALSE) {
+ if ($result === false) {
common_log_db_error($user, 'UPDATE', __FILE__);
common_server_error(_('Couldn\'t update user.'));
return;
@@ -196,7 +196,7 @@ class ImsettingsAction extends SettingsAction {
$result = $confirm->insert();
- if ($result === FALSE) {
+ if ($result === false) {
common_log_db_error($confirm, 'INSERT', __FILE__);
common_server_error(_('Couldn\'t insert confirmation code.'));
return;
@@ -210,7 +210,7 @@ class ImsettingsAction extends SettingsAction {
$msg = sprintf(_('A confirmation code was sent to the IM address you added. You must approve %s for sending messages to you.'), jabber_daemon_address());
- $this->show_form($msg, TRUE);
+ $this->show_form($msg, true);
}
function cancel_confirmation()
@@ -234,7 +234,7 @@ class ImsettingsAction extends SettingsAction {
return;
}
- $this->show_form(_('Confirmation cancelled.'), TRUE);
+ $this->show_form(_('Confirmation cancelled.'), true);
}
function remove_address()
@@ -263,7 +263,7 @@ class ImsettingsAction extends SettingsAction {
# XXX: unsubscribe to the old address
- $this->show_form(_('The address was removed.'), TRUE);
+ $this->show_form(_('The address was removed.'), true);
}
function jabber_exists($jabber)
diff --git a/_darcs/pristine/actions/othersettings.php b/_darcs/pristine/actions/othersettings.php
index 0c1418387..dc1bcd02b 100644
--- a/_darcs/pristine/actions/othersettings.php
+++ b/_darcs/pristine/actions/othersettings.php
@@ -53,7 +53,7 @@ class OthersettingsAction extends SettingsAction {
'metamark.net' => 'metamark.net'
);
- common_dropdown('urlshorteningservice', _('Service'), $services, _('Automatic shortening service to use.'), FALSE, $user->urlshorteningservice);
+ common_dropdown('urlshorteningservice', _('Service'), $services, _('Automatic shortening service to use.'), false, $user->urlshorteningservice);
common_submit('save', _('Save'));
@@ -174,7 +174,7 @@ class OthersettingsAction extends SettingsAction {
$result = $user->update($original);
- if ($result === FALSE) {
+ if ($result === false) {
common_log_db_error($user, 'UPDATE', __FILE__);
common_server_error(_('Couldn\'t update user.'));
return;
diff --git a/_darcs/pristine/actions/profilesettings.php b/_darcs/pristine/actions/profilesettings.php
index 7f7ee17a5..beb9979d0 100644
--- a/_darcs/pristine/actions/profilesettings.php
+++ b/_darcs/pristine/actions/profilesettings.php
@@ -96,13 +96,13 @@ class ProfilesettingsAction extends SettingsAction {
_('Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated'));
$language = common_language();
- common_dropdown('language', _('Language'), get_nice_language_list(), _('Preferred language'), TRUE, $language);
+ common_dropdown('language', _('Language'), get_nice_language_list(), _('Preferred language'), true, $language);
$timezone = common_timezone();
$timezones = array();
foreach(DateTimeZone::listIdentifiers() as $k => $v) {
$timezones[$v] = $v;
}
- common_dropdown('timezone', _('Timezone'), $timezones, _('What timezone are you normally in?'), TRUE, $timezone);
+ common_dropdown('timezone', _('Timezone'), $timezones, _('What timezone are you normally in?'), true, $timezone);
common_checkbox('autosubscribe', _('Automatically subscribe to whoever subscribes to me (best for non-humans)'),
($this->arg('autosubscribe')) ? $this->boolean('autosubscribe') : $user->autosubscribe);
@@ -278,7 +278,7 @@ class ProfilesettingsAction extends SettingsAction {
$result = $user->updateKeys($original);
- if ($result === FALSE) {
+ if ($result === false) {
common_log_db_error($user, 'UPDATE', __FILE__);
common_server_error(_('Couldn\'t update user.'));
return;
@@ -298,7 +298,7 @@ class ProfilesettingsAction extends SettingsAction {
$result = $user->update($original);
- if ($result === FALSE) {
+ if ($result === false) {
common_log_db_error($user, 'UPDATE', __FILE__);
common_server_error(_('Couldn\'t update user for autosubscribe.'));
return;
@@ -340,7 +340,7 @@ class ProfilesettingsAction extends SettingsAction {
common_broadcast_profile($profile);
- $this->show_form(_('Settings saved.'), TRUE);
+ $this->show_form(_('Settings saved.'), true);
}
@@ -434,7 +434,7 @@ class ProfilesettingsAction extends SettingsAction {
$user->password = common_munge_password($newpassword, $user->id);
$val = $user->validate();
- if ($val !== TRUE) {
+ if ($val !== true) {
$this->show_form(_('Error saving user; invalid.'));
return;
}
diff --git a/_darcs/pristine/actions/smssettings.php b/_darcs/pristine/actions/smssettings.php
index 470a042ed..444da2590 100644
--- a/_darcs/pristine/actions/smssettings.php
+++ b/_darcs/pristine/actions/smssettings.php
@@ -111,7 +111,7 @@ class SmssettingsAction extends EmailsettingsAction {
$confirm = new Confirm_address();
$confirm->user_id = $user->id;
$confirm->address_type = 'sms';
- if ($confirm->find(TRUE)) {
+ if ($confirm->find(true)) {
return $confirm;
} else {
return null;
@@ -165,7 +165,7 @@ class SmssettingsAction extends EmailsettingsAction {
$result = $user->update($original);
- if ($result === FALSE) {
+ if ($result === false) {
common_log_db_error($user, 'UPDATE', __FILE__);
common_server_error(_('Couldn\'t update user.'));
return;
@@ -215,7 +215,7 @@ class SmssettingsAction extends EmailsettingsAction {
$result = $confirm->insert();
- if ($result === FALSE) {
+ if ($result === false) {
common_log_db_error($confirm, 'INSERT', __FILE__);
common_server_error(_('Couldn\'t insert confirmation code.'));
return;
@@ -229,7 +229,7 @@ class SmssettingsAction extends EmailsettingsAction {
$msg = _('A confirmation code was sent to the phone number you added. Check your inbox (and spam box!) for the code and instructions on how to use it.');
- $this->show_form($msg, TRUE);
+ $this->show_form($msg, true);
}
function cancel_confirmation()
@@ -257,7 +257,7 @@ class SmssettingsAction extends EmailsettingsAction {
return;
}
- $this->show_form(_('Confirmation cancelled.'), TRUE);
+ $this->show_form(_('Confirmation cancelled.'), true);
}
function remove_address()
@@ -287,7 +287,7 @@ class SmssettingsAction extends EmailsettingsAction {
}
$user->query('COMMIT');
- $this->show_form(_('The address was removed.'), TRUE);
+ $this->show_form(_('The address was removed.'), true);
}
function sms_exists($sms)
diff --git a/_darcs/pristine/actions/twitapifriendships.php b/_darcs/pristine/actions/twitapifriendships.php
index a59cb543c..5eca96298 100644
--- a/_darcs/pristine/actions/twitapifriendships.php
+++ b/_darcs/pristine/actions/twitapifriendships.php
@@ -96,7 +96,7 @@ class TwitapifriendshipsAction extends TwitterapiAction {
$sub->subscriber = $user->id;
$sub->subscribed = $other->id;
- if ($sub->find(TRUE)) {
+ if ($sub->find(true)) {
$sub->query('BEGIN');
$sub->delete();
$sub->query('COMMIT');
diff --git a/_darcs/pristine/actions/twittersettings.php b/_darcs/pristine/actions/twittersettings.php
index 437bdd363..1f55b31b6 100644
--- a/_darcs/pristine/actions/twittersettings.php
+++ b/_darcs/pristine/actions/twittersettings.php
@@ -288,7 +288,7 @@ class TwittersettingsAction extends SettingsAction {
return;
}
- $this->show_form(_('Twitter account removed.'), TRUE);
+ $this->show_form(_('Twitter account removed.'), true);
}
function save_preferences()
@@ -325,7 +325,7 @@ class TwittersettingsAction extends SettingsAction {
$this->set_flags($flink, $noticesync, $replysync, $friendsync);
$result = $flink->update($original);
- if ($result === FALSE) {
+ if ($result === false) {
common_log_db_error($flink, 'UPDATE', __FILE__);
$this->show_form(_('Couldn\'t save Twitter preferences.'));
return;
diff --git a/_darcs/pristine/actions/userauthorization.php b/_darcs/pristine/actions/userauthorization.php
index ecaa33167..c73d515d3 100644
--- a/_darcs/pristine/actions/userauthorization.php
+++ b/_darcs/pristine/actions/userauthorization.php
@@ -211,7 +211,7 @@ class UserauthorizationAction extends Action {
$rt->tok = $token_field;
$rt->type = 0;
$rt->state = 0;
- common_debug('request token to look up: "'.print_r($rt,TRUE).'"');
+ common_debug('request token to look up: "'.print_r($rt,true).'"');
if ($rt->find(true)) {
common_debug('found request token to authorize', __FILE__);
$orig_rt = clone($rt);
@@ -221,7 +221,7 @@ class UserauthorizationAction extends Action {
return true;
}
}
- return FALSE;
+ return false;
}
# XXX: refactor with similar code in finishremotesubscribe.php
@@ -277,25 +277,25 @@ class UserauthorizationAction extends Action {
$profile->created = DB_DataObject_Cast::dateTime(); # current time
$id = $profile->insert();
if (!$id) {
- return FALSE;
+ return false;
}
$remote->id = $id;
}
if ($exists) {
if (!$remote->update($orig_remote)) {
- return FALSE;
+ return false;
}
} else {
$remote->created = DB_DataObject_Cast::dateTime(); # current time
if (!$remote->insert()) {
- return FALSE;
+ return false;
}
}
if ($avatar_url) {
if (!$this->add_avatar($profile, $avatar_url)) {
- return FALSE;
+ return false;
}
}
@@ -311,10 +311,10 @@ class UserauthorizationAction extends Action {
$sub->created = DB_DataObject_Cast::dateTime(); # current time
if (!$sub->insert()) {
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
function add_avatar($profile, $url)
@@ -440,7 +440,7 @@ class UserauthorizationAction extends Action {
$sub = new Subscription();
$sub->subscriber = $user->id;
$sub->subscribed = $remote->id;
- if ($sub->find(TRUE)) {
+ if ($sub->find(true)) {
throw new OAuthException("Already subscribed to user!");
}
}
diff --git a/_darcs/pristine/classes/Foreign_link.php b/_darcs/pristine/classes/Foreign_link.php
index 79a4d262d..9027ab901 100644
--- a/_darcs/pristine/classes/Foreign_link.php
+++ b/_darcs/pristine/classes/Foreign_link.php
@@ -35,7 +35,7 @@ class Foreign_link extends Memcached_DataObject
$flink->user_id = $user_id;
$flink->limit(1);
- if ($flink->find(TRUE)) {
+ if ($flink->find(true)) {
return $flink;
}
@@ -48,7 +48,7 @@ class Foreign_link extends Memcached_DataObject
$flink->foreign_id = $foreign_id;
$flink->limit(1);
- if ($flink->find(TRUE)) {
+ if ($flink->find(true)) {
return $flink;
}
@@ -64,7 +64,7 @@ class Foreign_link extends Memcached_DataObject
$fuser->limit(1);
- if ($fuser->find(TRUE)) {
+ if ($fuser->find(true)) {
return $fuser;
}
diff --git a/_darcs/pristine/classes/Notice.php b/_darcs/pristine/classes/Notice.php
index d3aa4e828..3eb653066 100644
--- a/_darcs/pristine/classes/Notice.php
+++ b/_darcs/pristine/classes/Notice.php
@@ -321,19 +321,19 @@ class Notice extends Memcached_DataObject
static function getStreamDirect($qry, $offset, $limit, $since_id, $before_id, $order, $since) {
- $needAnd = FALSE;
- $needWhere = TRUE;
+ $needAnd = false;
+ $needWhere = true;
if (preg_match('/\bWHERE\b/i', $qry)) {
- $needWhere = FALSE;
- $needAnd = TRUE;
+ $needWhere = false;
+ $needAnd = true;
}
if ($since_id > 0) {
if ($needWhere) {
$qry .= ' WHERE ';
- $needWhere = FALSE;
+ $needWhere = false;
} else {
$qry .= ' AND ';
}
@@ -345,7 +345,7 @@ class Notice extends Memcached_DataObject
if ($needWhere) {
$qry .= ' WHERE ';
- $needWhere = FALSE;
+ $needWhere = false;
} else {
$qry .= ' AND ';
}
@@ -357,7 +357,7 @@ class Notice extends Memcached_DataObject
if ($needWhere) {
$qry .= ' WHERE ';
- $needWhere = FALSE;
+ $needWhere = false;
} else {
$qry .= ' AND ';
}
@@ -411,7 +411,7 @@ class Notice extends Memcached_DataObject
# On a cache hit, return a DB-object-like wrapper
- if ($notices !== FALSE) {
+ if ($notices !== false) {
$wrapper = new NoticeWrapper(array_slice($notices, $offset, $limit));
return $wrapper;
}
diff --git a/_darcs/pristine/classes/Queue_item.php b/_darcs/pristine/classes/Queue_item.php
index 1b34d8ab4..9b909ec22 100644
--- a/_darcs/pristine/classes/Queue_item.php
+++ b/_darcs/pristine/classes/Queue_item.php
@@ -34,7 +34,7 @@ class Queue_item extends Memcached_DataObject
$qi->limit(1);
- $cnt = $qi->find(TRUE);
+ $cnt = $qi->find(true);
if ($cnt) {
# XXX: potential race condition
diff --git a/_darcs/pristine/classes/User.php b/_darcs/pristine/classes/User.php
index 90d0ccfe0..92ff8776b 100644
--- a/_darcs/pristine/classes/User.php
+++ b/_darcs/pristine/classes/User.php
@@ -199,7 +199,7 @@ class User extends Memcached_DataObject
if (!$id) {
common_log_db_error($profile, 'INSERT', __FILE__);
- return FALSE;
+ return false;
}
$user = new User();
@@ -233,7 +233,7 @@ class User extends Memcached_DataObject
if (!$result) {
common_log_db_error($user, 'INSERT', __FILE__);
- return FALSE;
+ return false;
}
# Everyone is subscribed to themself
@@ -247,7 +247,7 @@ class User extends Memcached_DataObject
if (!$result) {
common_log_db_error($subscription, 'INSERT', __FILE__);
- return FALSE;
+ return false;
}
if ($email && !$user->email) {
@@ -261,7 +261,7 @@ class User extends Memcached_DataObject
$result = $confirm->insert();
if (!$result) {
common_log_db_error($confirm, 'INSERT', __FILE__);
- return FALSE;
+ return false;
}
}
diff --git a/_darcs/pristine/lib/oauthstore.php b/_darcs/pristine/lib/oauthstore.php
index 7ec3ca655..faae82db1 100644
--- a/_darcs/pristine/lib/oauthstore.php
+++ b/_darcs/pristine/lib/oauthstore.php
@@ -59,13 +59,13 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
$n->consumer_key = $consumer->key;
$n->tok = $token->key;
$n->nonce = $nonce;
- if ($n->find(TRUE)) {
- return TRUE;
+ if ($n->find(true)) {
+ return true;
} else {
$n->timestamp = $timestamp;
$n->created = DB_DataObject_Cast::dateTime();
$n->insert();
- return FALSE;
+ return false;
}
}
@@ -99,7 +99,7 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
$rt->consumer_key = $consumer->key;
$rt->tok = $token->key;
$rt->type = 0; # request
- if ($rt->find(TRUE) && $rt->state == 1) { # authorized
+ if ($rt->find(true) && $rt->state == 1) { # authorized
common_debug('request token found.', __FILE__);
$at = new Token();
$at->consumer_key = $consumer->key;
diff --git a/_darcs/pristine/lib/omb.php b/_darcs/pristine/lib/omb.php
index c07bedab5..f2dbef5ba 100644
--- a/_darcs/pristine/lib/omb.php
+++ b/_darcs/pristine/lib/omb.php
@@ -139,7 +139,7 @@ function omb_broadcast_remote_subscribers($notice)
common_log(LOG_DEBUG, 'Posting to ' . $rp->postnoticeurl);
if (omb_post_notice_keys($notice, $rp->postnoticeurl, $rp->token, $rp->secret)) {
common_log(LOG_DEBUG, 'Finished to ' . $rp->postnoticeurl);
- $posted[$rp->postnoticeurl] = TRUE;
+ $posted[$rp->postnoticeurl] = true;
} else {
common_log(LOG_DEBUG, 'Failed posting to ' . $rp->postnoticeurl);
}
@@ -208,7 +208,7 @@ function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret)
$req->to_postdata(),
array('User-Agent' => 'Laconica/' . LACONICA_VERSION));
- common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__);
+ common_debug('Got HTTP result "'.print_r($result,true).'"', __FILE__);
if ($result->status == 403) { # not authorized, don't send again
common_debug('403 result, deleting subscription', __FILE__);
@@ -241,7 +241,7 @@ function omb_broadcast_profile($profile)
if ($rp) {
if (!$updated[$rp->updateprofileurl]) {
if (omb_update_profile($profile, $rp, $sub)) {
- $updated[$rp->updateprofileurl] = TRUE;
+ $updated[$rp->updateprofileurl] = true;
}
}
}
@@ -293,7 +293,7 @@ function omb_update_profile($profile, $remote_profile, $subscription)
$req->to_postdata(),
array('User-Agent' => 'Laconica/' . LACONICA_VERSION));
- common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__);
+ common_debug('Got HTTP result "'.print_r($result,true).'"', __FILE__);
if ($result->status == 403) { # not authorized, don't send again
common_debug('403 result, deleting subscription', __FILE__);
diff --git a/_darcs/pristine/lib/util.php b/_darcs/pristine/lib/util.php
index ed73b19e6..32201f2be 100644
--- a/_darcs/pristine/lib/util.php
+++ b/_darcs/pristine/lib/util.php
@@ -436,7 +436,7 @@ function common_checkbox($id, $label, $checked=false, $instructions=null, $value
common_element_end('p');
}
-function common_dropdown($id, $label, $content, $instructions=null, $blank_select=FALSE, $selected=null)
+function common_dropdown($id, $label, $content, $instructions=null, $blank_select=false, $selected=null)
{
common_element_start('p');
common_element('label', array('for' => $id), $label);
@@ -1018,7 +1018,7 @@ function common_relative_profile($sender, $nickname, $dt=null)
// XXX: use a join instead of a subquery
$recipient->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$sender->id.' and subscribed = id)', 'AND');
$recipient->whereAdd('nickname = "' . trim($nickname) . '"', 'AND');
- if ($recipient->find(TRUE)) {
+ if ($recipient->find(true)) {
// XXX: should probably differentiate between profiles with
// the same name by date of most recent update
return $recipient;
@@ -1028,7 +1028,7 @@ function common_relative_profile($sender, $nickname, $dt=null)
// XXX: use a join instead of a subquery
$recipient->whereAdd('EXISTS (SELECT subscriber from subscription where subscribed = '.$sender->id.' and subscriber = id)', 'AND');
$recipient->whereAdd('nickname = "' . trim($nickname) . '"', 'AND');
- if ($recipient->find(TRUE)) {
+ if ($recipient->find(true)) {
// XXX: should probably differentiate between profiles with
// the same name by date of most recent update
return $recipient;
@@ -2258,7 +2258,7 @@ function common_message_form($content, $user, $to)
$mutual_users->free();
unset($mutual_users);
- common_dropdown('to', _('To'), $mutual, null, FALSE, $to->id);
+ common_dropdown('to', _('To'), $mutual, null, false, $to->id);
common_element_start('p');
diff --git a/_darcs/pristine/scripts/sitemap.php b/_darcs/pristine/scripts/sitemap.php
index 504783e88..51a9bbd75 100644
--- a/_darcs/pristine/scripts/sitemap.php
+++ b/_darcs/pristine/scripts/sitemap.php
@@ -331,7 +331,7 @@ function parse_args()
$output_url = $args[u];
if (file_exists($output_dir)) {
- if (is_writable($output_dir) === FALSE) {
+ if (is_writable($output_dir) === false) {
error("$output_dir is not writable.");
}
} else {
@@ -366,11 +366,11 @@ function write_file($path, $data)
error('No data specified for writing.');
}
- if (($fh_out = fopen($path,'w')) === FALSE) {
+ if (($fh_out = fopen($path,'w')) === false) {
error("couldn't open $path for writing.");
}
- if (fwrite($fh_out, $data) === FALSE) {
+ if (fwrite($fh_out, $data) === false) {
error("couldn't write to $path.");
}
}
diff --git a/_darcs/pristine/scripts/xmppconfirmhandler.php b/_darcs/pristine/scripts/xmppconfirmhandler.php
index b059149bc..1eb932330 100644
--- a/_darcs/pristine/scripts/xmppconfirmhandler.php
+++ b/_darcs/pristine/scripts/xmppconfirmhandler.php
@@ -110,7 +110,7 @@ class XmppConfirmHandler extends XmppQueueHandler {
$confirm->address_type = 'jabber';
$confirm->orderBy('modified DESC');
$confirm->limit(1);
- if ($confirm->find(TRUE)) {
+ if ($confirm->find(true)) {
$this->log(LOG_INFO, 'Claiming confirmation for ' . $confirm->address);
# working around some weird DB_DataObject behaviour
$confirm->whereAdd(''); # clears where stuff
diff --git a/_darcs/tentative_pristine b/_darcs/tentative_pristine
index 4a4beb36c..c8cd44461 100644
--- a/_darcs/tentative_pristine
+++ b/_darcs/tentative_pristine
@@ -1,3664 +1,225 @@
-hunk ./actions/accesstoken.php 25
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/all.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/all.php 57
-- function show_header($user) {
-+ function show_header($user)
-+ {
-hunk ./actions/all.php 66
-- function show_top($user) {
-+ function show_top($user)
-+ {
-hunk ./actions/all.php 82
-- function show_notices($user) {
-+ function show_notices($user)
-+ {
-hunk ./actions/allrss.php 30
-- function init() {
-+ function init()
-+ {
-hunk ./actions/allrss.php 43
-- function get_notices($limit=0) {
-+ function get_notices($limit=0)
-+ {
-hunk ./actions/allrss.php 57
-- function get_channel() {
-+ function get_channel()
-+ {
-hunk ./actions/allrss.php 71
-- function get_image() {
-+ function get_image()
-+ {
-hunk ./actions/api.php 30
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/api.php 83
-- function process_command() {
-+ function process_command()
-+ {
-hunk ./actions/api.php 113
-- function requires_auth() {
-+ function requires_auth()
-+ {
-hunk ./actions/api.php 150
-- function show_basic_auth_error() {
-+ function show_basic_auth_error()
-+ {
-hunk ./actions/api.php 173
-- function is_readonly() {
-+ function is_readonly()
-+ {
-hunk ./actions/avatarbynickname.php 23
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/block.php 26
-- function prepare($args) {
-+ function prepare($args)
-+ {
-hunk ./actions/block.php 60
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/block.php 76
-- function are_you_sure_form() {
-+ function are_you_sure_form()
-+ {
-hunk ./actions/block.php 115
-- function block_profile() {
-+ function block_profile()
-+ {
-hunk ./actions/confirmaddress.php 24
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/deletenotice.php 25
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/deletenotice.php 37
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/deletenotice.php 42
-- function get_title() {
-+ function get_title()
-+ {
-hunk ./actions/deletenotice.php 47
-- function show_form($error=null) {
-+ function show_form($error=null)
-+ {
-hunk ./actions/deletenotice.php 74
-- function delete_notice() {
-+ function delete_notice()
-+ {
-hunk ./actions/deleteprofile.php 23
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/deleteprofile.php 36
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/deleteprofile.php 41
-- function form_header($title, $msg=null, $success=false) {
-+ function form_header($title, $msg=null, $success=false)
-+ {
-hunk ./actions/deleteprofile.php 49
-- function show_feeds_list($feeds) {
-+ function show_feeds_list($feeds)
-+ {
-hunk ./actions/deleteprofile.php 63
-- function common_feed_item($feed) {
-+ function common_feed_item($feed)
-+ {
-hunk ./actions/deleteprofile.php 92
-- function show_form($msg=null, $success=false) {
-+ function show_form($msg=null, $success=false)
-+ {
-hunk ./actions/deleteprofile.php 100
-- function show_confirm_delete_form() {
-+ function show_confirm_delete_form()
-+ {
-hunk ./actions/deleteprofile.php 130
-- function handle_post() {
-+ function handle_post()
-+ {
-hunk ./actions/deleteprofile.php 145
-- function delete_account() {
-+ function delete_account()
-+ {
-hunk ./actions/deleteprofile.php 231
-- function show_top($arr) {
-+ function show_top($arr)
-+ {
-hunk ./actions/deleteprofile.php 247
-- function settings_menu() {
-+ function settings_menu()
-+ {
-hunk ./actions/disfavor.php 24
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/doc.php 24
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/emailsettings.php 26
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/emailsettings.php 31
-- function show_form($msg=null, $success=false) {
-+ function show_form($msg=null, $success=false)
-+ {
-hunk ./actions/emailsettings.php 115
-- function get_confirmation() {
-+ function get_confirmation()
-+ {
-hunk ./actions/emailsettings.php 128
-- function handle_post() {
-+ function handle_post()
-+ {
-hunk ./actions/emailsettings.php 155
-- function save_preferences() {
-+ function save_preferences()
-+ {
-hunk ./actions/emailsettings.php 193
-- function add_address() {
-+ function add_address()
-+ {
-hunk ./actions/emailsettings.php 245
-- function cancel_confirmation() {
-+ function cancel_confirmation()
-+ {
-hunk ./actions/emailsettings.php 269
-- function remove_address() {
-+ function remove_address()
-+ {
-hunk ./actions/emailsettings.php 296
-- function remove_incoming() {
-+ function remove_incoming()
-+ {
-hunk ./actions/emailsettings.php 316
-- function new_incoming() {
-+ function new_incoming()
-+ {
-hunk ./actions/emailsettings.php 331
-- function email_exists($email) {
-+ function email_exists($email)
-+ {
-hunk ./actions/facebookhome.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/facebookhome.php 33
-- function login() {
-+ function login()
-+ {
-hunk ./actions/facebookhome.php 94
-- function show_home($facebook, $fbuid, $user) {
-+ function show_home($facebook, $fbuid, $user)
-+ {
-hunk ./actions/facebookhome.php 105
-- function show_notices($user) {
-+ function show_notices($user)
-+ {
-hunk ./actions/facebookinvite.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/facebookinvite.php 33
-- function display() {
-+ function display()
-+ {
-hunk ./actions/facebookremove.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/facebooksettings.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/facebooksettings.php 33
-- function display() {
-+ function display()
-+ {
-hunk ./actions/favor.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/favor.php 84
-- function notify($fave, $notice, $user) {
-+ function notify($fave, $notice, $user)
-+ {
-hunk ./actions/favorited.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/favorited.php 41
-- function show_top() {
-+ function show_top()
-+ {
-hunk ./actions/favorited.php 51
-- function show_header() {
-+ function show_header()
-+ {
-hunk ./actions/favorited.php 56
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/favorited.php 61
-- function show_notices($page) {
-+ function show_notices($page)
-+ {
-hunk ./actions/favoritesrss.php 30
-- function init() {
-+ function init()
-+ {
-hunk ./actions/favoritesrss.php 43
-- function get_notices($limit=0) {
-+ function get_notices($limit=0)
-+ {
-hunk ./actions/favoritesrss.php 59
-- function get_channel() {
-+ function get_channel()
-+ {
-hunk ./actions/favoritesrss.php 73
-- function get_image() {
-+ function get_image()
-+ {
-hunk ./actions/featured.php 27
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/featured.php 42
-- function show_top() {
-+ function show_top()
-+ {
-hunk ./actions/featured.php 52
-- function show_header() {
-+ function show_header()
-+ {
-hunk ./actions/featured.php 56
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/featured.php 61
-- function show_notices($page) {
-+ function show_notices($page)
-+ {
-hunk ./actions/finishaddopenid.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/finishaddopenid.php 36
-- function try_login() {
-+ function try_login()
-+ {
-hunk ./actions/finishaddopenid.php 100
-- function message($msg) {
-+ function message($msg)
-+ {
-hunk ./actions/finishimmediate.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/finishimmediate.php 57
-- function go_backto() {
-+ function go_backto()
-+ {
-hunk ./actions/finishopenidlogin.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/finishopenidlogin.php 56
-- function show_top($error=null) {
-+ function show_top($error=null)
-+ {
-hunk ./actions/finishopenidlogin.php 67
-- function show_form($error=null, $username=null) {
-+ function show_form($error=null, $username=null)
-+ {
-hunk ./actions/finishopenidlogin.php 105
-- function try_login() {
-+ function try_login()
-+ {
-hunk ./actions/finishopenidlogin.php 153
-- function message($msg) {
-+ function message($msg)
-+ {
-hunk ./actions/finishopenidlogin.php 160
-- function save_values($display, $canonical, $sreg) {
-+ function save_values($display, $canonical, $sreg)
-+ {
-hunk ./actions/finishopenidlogin.php 168
-- function get_saved_values() {
-+ function get_saved_values()
-+ {
-hunk ./actions/finishopenidlogin.php 175
-- function create_new_user() {
-+ function create_new_user()
-+ {
-hunk ./actions/finishopenidlogin.php 258
-- function connect_user() {
-+ function connect_user()
-+ {
-hunk ./actions/finishopenidlogin.php 298
-- function go_home($nickname) {
-+ function go_home($nickname)
-+ {
-hunk ./actions/finishopenidlogin.php 312
-- function best_new_nickname($display, $sreg) {
-+ function best_new_nickname($display, $sreg)
-+ {
-hunk ./actions/finishopenidlogin.php 346
-- function is_new_nickname($str) {
-+ function is_new_nickname($str)
-+ {
-hunk ./actions/finishopenidlogin.php 362
-- function openid_to_nickname($openid) {
-+ function openid_to_nickname($openid)
-+ {
-hunk ./actions/finishopenidlogin.php 376
-- function url_to_nickname($openid) {
-+ function url_to_nickname($openid)
-+ {
-hunk ./actions/finishopenidlogin.php 423
-- function xri_to_nickname($xri) {
-+ function xri_to_nickname($xri)
-+ {
-hunk ./actions/finishopenidlogin.php 437
-- function xri_base($xri) {
-+ function xri_base($xri)
-+ {
-hunk ./actions/finishopenidlogin.php 448
-- function nicknamize($str) {
-+ function nicknamize($str)
-+ {
-hunk ./actions/finishremotesubscribe.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/finishremotesubscribe.php 235
-- function add_avatar($profile, $url) {
-+ function add_avatar($profile, $url)
-+ {
-hunk ./actions/finishremotesubscribe.php 242
-- function access_token($omb) {
-+ function access_token($omb)
-+ {
-hunk ./actions/foaf.php 28
-- function is_readonly() {
-+ function is_readonly()
-+ {
-hunk ./actions/foaf.php 33
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/foaf.php 184
-- function show_ppd($foaf_url, $person_uri) {
-+ function show_ppd($foaf_url, $person_uri)
-+ {
-hunk ./actions/foaf.php 192
-- function show_microblogging_account($profile, $service=null) {
-+ function show_microblogging_account($profile, $service=null)
-+ {
-hunk ./actions/imsettings.php 27
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/imsettings.php 32
-- function show_form($msg=null, $success=false) {
-+ function show_form($msg=null, $success=false)
-+ {
-hunk ./actions/imsettings.php 90
-- function get_confirmation() {
-+ function get_confirmation()
-+ {
-hunk ./actions/imsettings.php 103
-- function handle_post() {
-+ function handle_post()
-+ {
-hunk ./actions/imsettings.php 126
-- function save_preferences() {
-+ function save_preferences()
-+ {
-hunk ./actions/imsettings.php 160
-- function add_address() {
-+ function add_address()
-+ {
-hunk ./actions/imsettings.php 216
-- function cancel_confirmation() {
-+ function cancel_confirmation()
-+ {
-hunk ./actions/imsettings.php 240
-- function remove_address() {
-+ function remove_address()
-+ {
-hunk ./actions/imsettings.php 269
-- function jabber_exists($jabber) {
-+ function jabber_exists($jabber)
-+ {
-hunk ./actions/invite.php 24
-- function is_readonly() {
-+ function is_readonly()
-+ {
-hunk ./actions/invite.php 29
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/invite.php 43
-- function send_invitations() {
-+ function send_invitations()
-+ {
-hunk ./actions/invite.php 118
-- function show_top($error=null) {
-+ function show_top($error=null)
-+ {
-hunk ./actions/invite.php 130
-- function show_form($error=null) {
-+ function show_form($error=null)
-+ {
-hunk ./actions/invite.php 157
-- function send_invitation($email, $user, $personal) {
-+ function send_invitation($email, $user, $personal)
-+ {
-hunk ./actions/login.php 24
-- function is_readonly() {
-+ function is_readonly()
-+ {
-hunk ./actions/login.php 29
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/login.php 41
-- function check_login() {
-+ function check_login()
-+ {
-hunk ./actions/login.php 106
-- function show_form($error=null) {
-+ function show_form($error=null)
-+ {
-hunk ./actions/login.php 127
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/login.php 146
-- function show_top($error=null) {
-+ function show_top($error=null)
-+ {
-hunk ./actions/logout.php 26
-- function is_readonly() {
-+ function is_readonly()
-+ {
-hunk ./actions/logout.php 31
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/microsummary.php 24
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/newmessage.php 24
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/newmessage.php 37
-- function save_new_message() {
-+ function save_new_message()
-+ {
-hunk ./actions/newmessage.php 94
-- function show_top($params) {
-+ function show_top($params)
-+ {
-hunk ./actions/newmessage.php 104
-- function show_form($msg=null) {
-+ function show_form($msg=null)
-+ {
-hunk ./actions/newmessage.php 135
-- function notify($from, $to, $message) {
-+ function notify($from, $to, $message)
-+ {
-hunk ./actions/newnotice.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/newnotice.php 47
-- function save_new_notice() {
-+ function save_new_notice()
-+ {
-hunk ./actions/newnotice.php 115
-- function ajax_error_msg($msg) {
-+ function ajax_error_msg($msg)
-+ {
-hunk ./actions/newnotice.php 127
-- function show_top($content=null) {
-+ function show_top($content=null)
-+ {
-hunk ./actions/newnotice.php 132
-- function show_form($msg=null) {
-+ function show_form($msg=null)
-+ {
-hunk ./actions/newnotice.php 154
-- function show_notice($notice) {
-+ function show_notice($notice)
-+ {
-hunk ./actions/noticesearch.php 28
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/noticesearch.php 33
-- function get_title() {
-+ function get_title()
-+ {
-hunk ./actions/noticesearch.php 38
-- function show_results($q, $page) {
-+ function show_results($q, $page)
-+ {
-hunk ./actions/noticesearch.php 78
-- function show_header($arr) {
-+ function show_header($arr)
-+ {
-hunk ./actions/noticesearch.php 94
-- function show_notice($notice, $terms) {
-+ function show_notice($notice, $terms)
-+ {
-hunk ./actions/noticesearch.php 157
-- function highlight($text, $terms) {
-+ function highlight($text, $terms)
-+ {
-hunk ./actions/noticesearchrss.php 28
-- function init() {
-+ function init()
-+ {
-hunk ./actions/noticesearchrss.php 33
-- function get_notices($limit=0) {
-+ function get_notices($limit=0)
-+ {
-hunk ./actions/noticesearchrss.php 59
-- function get_channel() {
-+ function get_channel()
-+ {
-hunk ./actions/noticesearchrss.php 70
-- function get_image() {
-+ function get_image()
-+ {
-hunk ./actions/nudge.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/nudge.php 75
-- function notify($user, $other) {
-+ function notify($user, $other)
-+ {
-hunk ./actions/openidlogin.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/openidlogin.php 60
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/openidlogin.php 65
-- function show_top($error=null) {
-+ function show_top($error=null)
-+ {
-hunk ./actions/openidlogin.php 78
-- function show_form($error=null, $openid_url) {
-+ function show_form($error=null, $openid_url)
-+ {
-hunk ./actions/openidsettings.php 27
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/openidsettings.php 34
-- function show_form($msg=null, $success=false) {
-+ function show_form($msg=null, $success=false)
-+ {
-hunk ./actions/openidsettings.php 121
-- function handle_post() {
-+ function handle_post()
-+ {
-hunk ./actions/openidsettings.php 142
-- function remove_openid() {
-+ function remove_openid()
-+ {
-hunk ./actions/opensearch.php 24
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/othersettings.php 26
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/othersettings.php 31
-- function show_form($msg=null, $success=false) {
-+ function show_form($msg=null, $success=false)
-+ {
-hunk ./actions/othersettings.php 68
-- function show_feeds_list($feeds) {
-+ function show_feeds_list($feeds)
-+ {
-hunk ./actions/othersettings.php 82
-- function common_feed_item($feed) {
-+ function common_feed_item($feed)
-+ {
-hunk ./actions/othersettings.php 138
-- function handle_post() {
-+ function handle_post()
-+ {
-hunk ./actions/othersettings.php 155
-- function save_preferences() {
-+ function save_preferences()
-+ {
-hunk ./actions/peoplesearch.php 27
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/peoplesearch.php 33
-- function get_title() {
-+ function get_title()
-+ {
-hunk ./actions/peoplesearch.php 38
-- function show_results($q, $page) {
-+ function show_results($q, $page)
-+ {
-hunk ./actions/peoplesearch.php 77
-- function __construct($profile, $terms) {
-+ function __construct($profile, $terms)
-+ {
-hunk ./actions/peoplesearch.php 85
-- function highlight($text) {
-+ function highlight($text)
-+ {
-hunk ./actions/peopletag.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/peopletag.php 54
-- function show_people($tag, $page) {
-+ function show_people($tag, $page)
-+ {
-hunk ./actions/peopletag.php 88
-- function show_top($tag) {
-+ function show_top($tag)
-+ {
-hunk ./actions/peopletag.php 99
-- function get_title() {
-+ function get_title()
-+ {
-hunk ./actions/peopletag.php 104
-- function show_header($arr) {
-+ function show_header($arr)
-+ {
-hunk ./actions/postnotice.php 25
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/postnotice.php 43
-- function save_notice(&$req, &$consumer, &$token) {
-+ function save_notice(&$req, &$consumer, &$token)
-+ {
-hunk ./actions/profilesettings.php 26
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/profilesettings.php 32
-- function show_form($msg=null, $success=false) {
-+ function show_form($msg=null, $success=false)
-+ {
-hunk ./actions/profilesettings.php 45
-- function handle_post() {
-+ function handle_post()
-+ {
-hunk ./actions/profilesettings.php 66
-- function show_settings_form() {
-+ function show_settings_form()
-+ {
-hunk ./actions/profilesettings.php 117
-- function show_avatar_form() {
-+ function show_avatar_form()
-+ {
-hunk ./actions/profilesettings.php 176
-- function show_password_form() {
-+ function show_password_form()
-+ {
-hunk ./actions/profilesettings.php 199
-- function save_profile() {
-+ function save_profile()
-+ {
-hunk ./actions/profilesettings.php 347
-- function upload_avatar() {
-+ function upload_avatar()
-+ {
-hunk ./actions/profilesettings.php 395
-- function nickname_exists($nickname) {
-+ function nickname_exists($nickname)
-+ {
-hunk ./actions/profilesettings.php 406
-- function change_password() {
-+ function change_password()
-+ {
-hunk ./actions/public.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/public.php 45
-- function show_top() {
-+ function show_top()
-+ {
-hunk ./actions/public.php 69
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/public.php 76
-- function show_header() {
-+ function show_header()
-+ {
-hunk ./actions/public.php 87
-- function show_notices($page) {
-+ function show_notices($page)
-+ {
-hunk ./actions/publicrss.php 28
-- function init() {
-+ function init()
-+ {
-hunk ./actions/publicrss.php 33
-- function get_notices($limit=0) {
-+ function get_notices($limit=0)
-+ {
-hunk ./actions/publicrss.php 47
-- function get_channel() {
-+ function get_channel()
-+ {
-hunk ./actions/publicrss.php 57
-- function get_image() {
-+ function get_image()
-+ {
-hunk ./actions/publicxrds.php 28
-- function is_readonly() {
-+ function is_readonly()
-+ {
-hunk ./actions/publicxrds.php 33
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/publicxrds.php 60
-- function show_service($type, $uri, $params=null, $sigs=null, $localId=null) {
-+ function show_service($type, $uri, $params=null, $sigs=null, $localId=null)
-+ {
-hunk ./actions/recoverpassword.php 28
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/recoverpassword.php 51
-- function check_code() {
-+ function check_code()
-+ {
-hunk ./actions/recoverpassword.php 118
-- function set_temp_user(&$user) {
-+ function set_temp_user(&$user)
-+ {
-hunk ./actions/recoverpassword.php 124
-- function get_temp_user() {
-+ function get_temp_user()
-+ {
-hunk ./actions/recoverpassword.php 134
-- function clear_temp_user() {
-+ function clear_temp_user()
-+ {
-hunk ./actions/recoverpassword.php 140
-- function show_top($msg=null) {
-+ function show_top($msg=null)
-+ {
-hunk ./actions/recoverpassword.php 155
-- function show_password_top($msg=null) {
-+ function show_password_top($msg=null)
-+ {
-hunk ./actions/recoverpassword.php 166
-- function show_form($msg=null) {
-+ function show_form($msg=null)
-+ {
-hunk ./actions/recoverpassword.php 184
-- function show_password_form($msg=null) {
-+ function show_password_form($msg=null)
-+ {
-hunk ./actions/recoverpassword.php 203
-- function recover_password() {
-+ function recover_password()
-+ {
-hunk ./actions/recoverpassword.php 287
-- function reset_password() {
-+ function reset_password()
-+ {
-hunk ./actions/register.php 24
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/register.php 39
-- function try_register() {
-+ function try_register()
-+ {
-hunk ./actions/register.php 138
-- function nickname_exists($nickname) {
-+ function nickname_exists($nickname)
-+ {
-hunk ./actions/register.php 146
-- function email_exists($email) {
-+ function email_exists($email)
-+ {
-hunk ./actions/register.php 156
-- function show_top($error=null) {
-+ function show_top($error=null)
-+ {
-hunk ./actions/register.php 172
-- function show_form($error=null) {
-+ function show_form($error=null)
-+ {
-hunk ./actions/register.php 245
-- function show_success() {
-+ function show_success()
-+ {
-hunk ./actions/remotesubscribe.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/remotesubscribe.php 51
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/remotesubscribe.php 60
-- function show_top($err=null) {
-+ function show_top($err=null)
-+ {
-hunk ./actions/remotesubscribe.php 73
-- function show_form($err=null) {
-+ function show_form($err=null)
-+ {
-hunk ./actions/remotesubscribe.php 93
-- function remote_subscription() {
-+ function remote_subscription()
-+ {
-hunk ./actions/remotesubscribe.php 160
-- function get_user() {
-+ function get_user()
-+ {
-hunk ./actions/remotesubscribe.php 170
-- function getOmb($xrds) {
-+ function getOmb($xrds)
-+ {
-hunk ./actions/remotesubscribe.php 231
-- function getXRD($main_service, $main_xrds) {
-+ function getXRD($main_service, $main_xrds)
-+ {
-hunk ./actions/remotesubscribe.php 253
-- function addServices($xrd, $types, &$omb) {
-+ function addServices($xrd, $types, &$omb)
-+ {
-hunk ./actions/remotesubscribe.php 267
-- function request_token($omb) {
-+ function request_token($omb)
-+ {
-hunk ./actions/remotesubscribe.php 312
-- function request_authorization($user, $omb, $token, $secret) {
-+ function request_authorization($user, $omb, $token, $secret)
-+ {
-hunk ./actions/remotesubscribe.php 394
-- function make_nonce() {
-+ function make_nonce()
-+ {
-hunk ./actions/replies.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/replies.php 57
-- function no_such_user() {
-+ function no_such_user()
-+ {
-hunk ./actions/replies.php 62
-- function show_header($user) {
-+ function show_header($user)
-+ {
-hunk ./actions/replies.php 71
-- function show_top($user) {
-+ function show_top($user)
-+ {
-hunk ./actions/replies.php 87
-- function show_replies($user) {
-+ function show_replies($user)
-+ {
-hunk ./actions/repliesrss.php 30
-- function init() {
-+ function init()
-+ {
-hunk ./actions/repliesrss.php 43
-- function get_notices($limit=0) {
-+ function get_notices($limit=0)
-+ {
-hunk ./actions/repliesrss.php 59
-- function get_channel() {
-+ function get_channel()
-+ {
-hunk ./actions/repliesrss.php 73
-- function get_image() {
-+ function get_image()
-+ {
-hunk ./actions/requesttoken.php 26
-- function is_readonly() {
-+ function is_readonly()
-+ {
-hunk ./actions/requesttoken.php 31
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/showfavorites.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/showfavorites.php 57
-- function show_header($user) {
-+ function show_header($user)
-+ {
-hunk ./actions/showfavorites.php 66
-- function show_top($user) {
-+ function show_top($user)
-+ {
-hunk ./actions/showfavorites.php 81
-- function show_notices($user) {
-+ function show_notices($user)
-+ {
-hunk ./actions/showmessage.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/showmessage.php 48
-- function get_message() {
-+ function get_message()
-+ {
-hunk ./actions/showmessage.php 55
-- function get_title($user, $page) {
-+ function get_title($user, $page)
-+ {
-hunk ./actions/showmessage.php 76
-- function get_messages($user, $page) {
-+ function get_messages($user, $page)
-+ {
-hunk ./actions/showmessage.php 84
-- function get_message_profile($message) {
-+ function get_message_profile($message)
-+ {
-hunk ./actions/showmessage.php 97
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/showmessage.php 102
-- function views_menu() {
-+ function views_menu()
-+ {
-hunk ./actions/shownotice.php 30
-- function prepare($args) {
-+ function prepare($args)
-+ {
-hunk ./actions/shownotice.php 55
-- function last_modified() {
-+ function last_modified()
-+ {
-hunk ./actions/shownotice.php 62
-- function etag() {
-+ function etag()
-+ {
-hunk ./actions/shownotice.php 72
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/shownotice.php 91
-- function show_header() {
-+ function show_header()
-+ {
-hunk ./actions/shownotice.php 111
-- function show_top() {
-+ function show_top()
-+ {
-hunk ./actions/shownotice.php 119
-- function no_such_notice() {
-+ function no_such_notice()
-+ {
-hunk ./actions/showstream.php 29
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/showstream.php 80
-- function show_top($user) {
-+ function show_top($user)
-+ {
-hunk ./actions/showstream.php 105
-- function show_header($user) {
-+ function show_header($user)
-+ {
-hunk ./actions/showstream.php 159
-- function no_such_user() {
-+ function no_such_user()
-+ {
-hunk ./actions/showstream.php 164
-- function show_profile($profile) {
-+ function show_profile($profile)
-+ {
-hunk ./actions/showstream.php 180
-- function show_personal($profile) {
-+ function show_personal($profile)
-+ {
-hunk ./actions/showstream.php 255
-- function show_remote_subscribe_link($profile) {
-+ function show_remote_subscribe_link($profile)
-+ {
-hunk ./actions/showstream.php 264
-- function show_unsubscribe_form($profile) {
-+ function show_unsubscribe_form($profile)
-+ {
-hunk ./actions/showstream.php 279
-- function show_subscriptions($profile) {
-+ function show_subscriptions($profile)
-+ {
-hunk ./actions/showstream.php 352
-- function show_statistics($profile) {
-+ function show_statistics($profile)
-+ {
-hunk ./actions/showstream.php 413
-- function show_notices($user) {
-+ function show_notices($user)
-+ {
-hunk ./actions/showstream.php 427
-- function show_last_notice($profile) {
-+ function show_last_notice($profile)
-+ {
-hunk ./actions/showstream.php 453
-- function newListItem($notice) {
-+ function newListItem($notice)
-+ {
-hunk ./actions/showstream.php 460
-- function showAuthor() {
-+ function showAuthor()
-+ {
-hunk ./actions/smssettings.php 27
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/smssettings.php 32
-- function show_form($msg=null, $success=false) {
-+ function show_form($msg=null, $success=false)
-+ {
-hunk ./actions/smssettings.php 108
-- function get_confirmation() {
-+ function get_confirmation()
-+ {
-hunk ./actions/smssettings.php 121
-- function handle_post() {
-+ function handle_post()
-+ {
-hunk ./actions/smssettings.php 151
-- function save_preferences() {
-+ function save_preferences()
-+ {
-hunk ./actions/smssettings.php 179
-- function add_address() {
-+ function add_address()
-+ {
-hunk ./actions/smssettings.php 235
-- function cancel_confirmation() {
-+ function cancel_confirmation()
-+ {
-hunk ./actions/smssettings.php 263
-- function remove_address() {
-+ function remove_address()
-+ {
-hunk ./actions/smssettings.php 293
-- function sms_exists($sms) {
-+ function sms_exists($sms)
-+ {
-hunk ./actions/smssettings.php 304
-- function carrier_select() {
-+ function carrier_select()
-+ {
-hunk ./actions/smssettings.php 329
-- function confirm_code() {
-+ function confirm_code()
-+ {
-hunk ./actions/subedit.php 26
-- function prepare($args) {
-+ function prepare($args)
-+ {
-hunk ./actions/subedit.php 60
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/subscribe.php 24
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/subscribers.php 26
-- function gallery_type() {
-+ function gallery_type()
-+ {
-hunk ./actions/subscribers.php 31
-- function get_instructions(&$profile) {
-+ function get_instructions(&$profile)
-+ {
-hunk ./actions/subscribers.php 41
-- function fields() {
-+ function fields()
-+ {
-hunk ./actions/subscribers.php 46
-- function div_class() {
-+ function div_class()
-+ {
-hunk ./actions/subscribers.php 51
-- function get_other(&$subs) {
-+ function get_other(&$subs)
-+ {
-hunk ./actions/subscribers.php 56
-- function profile_list_class() {
-+ function profile_list_class()
-+ {
-hunk ./actions/subscribers.php 63
-- function show_owner_controls($profile) {
-+ function show_owner_controls($profile)
-+ {
-hunk ./actions/subscriptions.php 26
-- function gallery_type() {
-+ function gallery_type()
-+ {
-hunk ./actions/subscriptions.php 31
-- function get_instructions(&$profile) {
-+ function get_instructions(&$profile)
-+ {
-hunk ./actions/subscriptions.php 41
-- function fields() {
-+ function fields()
-+ {
-hunk ./actions/subscriptions.php 46
-- function div_class() {
-+ function div_class()
-+ {
-hunk ./actions/subscriptions.php 51
-- function get_other(&$subs) {
-+ function get_other(&$subs)
-+ {
-hunk ./actions/subscriptions.php 56
-- function profile_list_class() {
-+ function profile_list_class()
-+ {
-hunk ./actions/subscriptions.php 64
-- function show_owner_controls($profile) {
-+ function show_owner_controls($profile)
-+ {
-hunk ./actions/sup.php 24
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/sup.php 46
-- function available_periods() {
-+ function available_periods()
-+ {
-hunk ./actions/sup.php 60
-- function get_updates($seconds) {
-+ function get_updates($seconds)
-+ {
-hunk ./actions/sup.php 81
-- function is_readonly() {
-+ function is_readonly()
-+ {
-hunk ./actions/tag.php 27
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/tag.php 50
-- function show_header($tag = false) {
-+ function show_header($tag = false)
-+ {
-hunk ./actions/tag.php 60
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/tag.php 65
-- function show_top($tag = false) {
-+ function show_top($tag = false)
-+ {
-hunk ./actions/tag.php 131
-- function show_tag($tag, $weight, $relative) {
-+ function show_tag($tag, $weight, $relative)
-+ {
-hunk ./actions/tag.php 157
-- function show_notices($tag) {
-+ function show_notices($tag)
-+ {
-hunk ./actions/tagother.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/tagother.php 53
-- function show_form($profile, $error=null) {
-+ function show_form($profile, $error=null)
-+ {
-hunk ./actions/tagother.php 108
-- function save_tags() {
-+ function save_tags()
-+ {
-hunk ./actions/tagother.php 184
-- function show_top($arr = null) {
-+ function show_top($arr = null)
-+ {
-hunk ./actions/tagrss.php 28
-- function init() {
-+ function init()
-+ {
-hunk ./actions/tagrss.php 41
-- function get_notices($limit=0) {
-+ function get_notices($limit=0)
-+ {
-hunk ./actions/tagrss.php 58
-- function get_channel() {
-+ function get_channel()
-+ {
-hunk ./actions/twitapiaccount.php 26
-- function verify_credentials($args, $apidata) {
-+ function verify_credentials($args, $apidata)
-+ {
-hunk ./actions/twitapiaccount.php 38
-- function end_session($args, $apidata) {
-+ function end_session($args, $apidata)
-+ {
-hunk ./actions/twitapiaccount.php 44
-- function update_location($args, $apidata) {
-+ function update_location($args, $apidata)
-+ {
-hunk ./actions/twitapiaccount.php 90
-- function update_delivery_device($args, $apidata) {
-+ function update_delivery_device($args, $apidata)
-+ {
-hunk ./actions/twitapiaccount.php 96
-- function rate_limit_status($args, $apidata) {
-+ function rate_limit_status($args, $apidata)
-+ {
-hunk ./actions/twitapiblocks.php 26
-- function create($args, $apidata) {
-+ function create($args, $apidata)
-+ {
-hunk ./actions/twitapiblocks.php 50
-- function destroy($args, $apidata) {
-+ function destroy($args, $apidata)
-+ {
-hunk ./actions/twitapidirect_messages.php 26
-- function direct_messages($args, $apidata) {
-+ function direct_messages($args, $apidata)
-+ {
-hunk ./actions/twitapidirect_messages.php 32
-- function sent($args, $apidata) {
-+ function sent($args, $apidata)
-+ {
-hunk ./actions/twitapidirect_messages.php 38
-- function show_messages($args, $apidata, $type) {
-+ function show_messages($args, $apidata, $type)
-+ {
-hunk ./actions/twitapidirect_messages.php 116
-- function create($args, $apidata) {
-+ function create($args, $apidata)
-+ {
-hunk ./actions/twitapidirect_messages.php 180
-- function destroy($args, $apidata) {
-+ function destroy($args, $apidata)
-+ {
-hunk ./actions/twitapidirect_messages.php 186
-- function show_xml_dmsgs($message) {
-+ function show_xml_dmsgs($message)
-+ {
-hunk ./actions/twitapidirect_messages.php 209
-- function show_json_dmsgs($message) {
-+ function show_json_dmsgs($message)
-+ {
-hunk ./actions/twitapidirect_messages.php 233
-- function show_rss_dmsgs($message, $title, $link, $subtitle) {
-+ function show_rss_dmsgs($message, $title, $link, $subtitle)
-+ {
-hunk ./actions/twitapidirect_messages.php 263
-- function show_atom_dmsgs($message, $title, $link, $subtitle) {
-+ function show_atom_dmsgs($message, $title, $link, $subtitle)
-+ {
-hunk ./actions/twitapidirect_messages.php 291
-- function notify($from, $to, $message) {
-+ function notify($from, $to, $message)
-+ {
-hunk ./actions/twitapifavorites.php 26
-- function favorites($args, $apidata) {
-+ function favorites($args, $apidata)
-+ {
-hunk ./actions/twitapifavorites.php 89
-- function create($args, $apidata) {
-+ function create($args, $apidata)
-+ {
-hunk ./actions/twitapifavorites.php 139
-- function destroy($args, $apidata) {
-+ function destroy($args, $apidata)
-+ {
-hunk ./actions/twitapifavorites.php 147
-- function notify($fave, $notice, $user) {
-+ function notify($fave, $notice, $user)
-+ {
-hunk ./actions/twitapifavorites.php 159
-- function notify_mail($other, $user, $notice) {
-+ function notify_mail($other, $user, $notice)
-+ {
-hunk ./actions/twitapifriendships.php 26
-- function create($args, $apidata) {
-+ function create($args, $apidata)
-+ {
-hunk ./actions/twitapifriendships.php 79
-- function destroy($args, $apidata) {
-+ function destroy($args, $apidata)
-+ {
-hunk ./actions/twitapifriendships.php 115
-- function exists($args, $apidata) {
-+ function exists($args, $apidata)
-+ {
-hunk ./actions/twitapihelp.php 30
-- function test($args, $apidata) {
-+ function test($args, $apidata)
-+ {
-hunk ./actions/twitapihelp.php 48
-- function downtime_schedule($args, $apidata) {
-+ function downtime_schedule($args, $apidata)
-+ {
-hunk ./actions/twitapinotifications.php 27
-- function follow($args, $apidata) {
-+ function follow($args, $apidata)
-+ {
-hunk ./actions/twitapinotifications.php 33
-- function leave($args, $apidata) {
-+ function leave($args, $apidata)
-+ {
-hunk ./actions/twitapistatuses.php 26
-- function public_timeline($args, $apidata) {
-+ function public_timeline($args, $apidata)
-+ {
-hunk ./actions/twitapistatuses.php 88
-- function friends_timeline($args, $apidata) {
-+ function friends_timeline($args, $apidata)
-+ {
-hunk ./actions/twitapistatuses.php 151
-- function user_timeline($args, $apidata) {
-+ function user_timeline($args, $apidata)
-+ {
-hunk ./actions/twitapistatuses.php 232
-- function update($args, $apidata) {
-+ function update($args, $apidata)
-+ {
-hunk ./actions/twitapistatuses.php 328
-- function replies($args, $apidata) {
-+ function replies($args, $apidata)
-+ {
-hunk ./actions/twitapistatuses.php 396
-- function show($args, $apidata) {
-+ function show($args, $apidata)
-+ {
-hunk ./actions/twitapistatuses.php 422
-- function destroy($args, $apidata) {
-+ function destroy($args, $apidata)
-+ {
-hunk ./actions/twitapistatuses.php 467
-- function friends($args, $apidata) {
-+ function friends($args, $apidata)
-+ {
-hunk ./actions/twitapistatuses.php 473
-- function followers($args, $apidata) {
-+ function followers($args, $apidata)
-+ {
-hunk ./actions/twitapistatuses.php 480
-- function subscriptions($apidata, $other_attr, $user_attr) {
-+ function subscriptions($apidata, $other_attr, $user_attr)
-+ {
-hunk ./actions/twitapistatuses.php 536
-- function show_profiles($profiles, $type) {
-+ function show_profiles($profiles, $type)
-+ {
-hunk ./actions/twitapistatuses.php 558
-- function featured($args, $apidata) {
-+ function featured($args, $apidata)
-+ {
-hunk ./actions/twitapistatuses.php 564
-- function supported($cmd) {
-+ function supported($cmd)
-+ {
-hunk ./actions/twitapiusers.php 26
-- function show($args, $apidata) {
-+ function show($args, $apidata)
-+ {
-hunk ./actions/twittersettings.php 28
-- function get_instructions() {
-+ function get_instructions()
-+ {
-hunk ./actions/twittersettings.php 34
-- function show_form($msg=null, $success=false) {
-+ function show_form($msg=null, $success=false)
-+ {
-hunk ./actions/twittersettings.php 96
-- function subscribed_twitter_users() {
-+ function subscribed_twitter_users()
-+ {
-hunk ./actions/twittersettings.php 125
-- function show_twitter_subscriptions() {
-+ function show_twitter_subscriptions()
-+ {
-hunk ./actions/twittersettings.php 187
-- function handle_post() {
-+ function handle_post()
-+ {
-hunk ./actions/twittersettings.php 208
-- function add_twitter_acct() {
-+ function add_twitter_acct()
-+ {
-hunk ./actions/twittersettings.php 270
-- function remove_twitter_acct() {
-+ function remove_twitter_acct()
-+ {
-hunk ./actions/twittersettings.php 294
-- function save_preferences() {
-+ function save_preferences()
-+ {
-hunk ./actions/twittersettings.php 341
-- function verify_credentials($screen_name, $password) {
-+ function verify_credentials($screen_name, $password)
-+ {
-hunk ./actions/twittersettings.php 365
-- function set_flags(&$flink, $noticesync, $replysync, $friendsync) {
-+ function set_flags(&$flink, $noticesync, $replysync, $friendsync)
-+ {
-hunk ./actions/unblock.php 26
-- function prepare($args) {
-+ function prepare($args)
-+ {
-hunk ./actions/unblock.php 60
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/unblock.php 68
-- function unblock_profile() {
-+ function unblock_profile()
-+ {
-hunk ./actions/unsubscribe.php 22
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/updateprofile.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/updateprofile.php 44
-- function update_profile($req, $consumer, $token) {
-+ function update_profile($req, $consumer, $token)
-+ {
-hunk ./actions/userauthorization.php 27
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/userauthorization.php 73
-- function show_form($req) {
-+ function show_form($req)
-+ {
-hunk ./actions/userauthorization.php 134
-- function send_authorization() {
-+ function send_authorization()
-+ {
-hunk ./actions/userauthorization.php 203
-- function authorize_token(&$req) {
-+ function authorize_token(&$req)
-+ {
-hunk ./actions/userauthorization.php 229
-- function save_remote_profile(&$req) {
-+ function save_remote_profile(&$req)
-+ {
-hunk ./actions/userauthorization.php 320
-- function add_avatar($profile, $url) {
-+ function add_avatar($profile, $url)
-+ {
-hunk ./actions/userauthorization.php 327
-- function show_accept_message($tok) {
-+ function show_accept_message($tok)
-+ {
-hunk ./actions/userauthorization.php 338
-- function show_reject_message($tok) {
-+ function show_reject_message($tok)
-+ {
-hunk ./actions/userauthorization.php 348
-- function store_request($req) {
-+ function store_request($req)
-+ {
-hunk ./actions/userauthorization.php 354
-- function clear_request() {
-+ function clear_request()
-+ {
-hunk ./actions/userauthorization.php 360
-- function get_stored_request() {
-+ function get_stored_request()
-+ {
-hunk ./actions/userauthorization.php 367
-- function get_new_request() {
-+ function get_new_request()
-+ {
-hunk ./actions/userauthorization.php 376
-- function validate_request(&$req) {
-+ function validate_request(&$req)
-+ {
-hunk ./actions/userauthorization.php 400
-- function validate_omb(&$req) {
-+ function validate_omb(&$req)
-+ {
-hunk ./actions/userauthorization.php 515
-- function check_version(&$req) {
-+ function check_version(&$req)
-+ {
-hunk ./actions/userauthorization.php 529
-- function get_consumer($datastore, $req) {
-+ function get_consumer($datastore, $req)
-+ {
-hunk ./actions/userauthorization.php 545
-- function get_token($datastore, &$req, $consumer) {/*{{{*/
-+ function get_token($datastore, &$req, $consumer)
-+ {/*{{{*/
-hunk ./actions/userauthorization.php 555
-- function check_timestamp(&$req) {
-+ function check_timestamp(&$req)
-+ {
-hunk ./actions/userauthorization.php 565
-- function check_nonce(&$datastore, &$req, $consumer, $token) {
-+ function check_nonce(&$datastore, &$req, $consumer, $token)
-+ {
-hunk ./actions/userauthorization.php 576
-- function check_signature(&$req, $consumer, $token) {
-+ function check_signature(&$req, $consumer, $token)
-+ {
-hunk ./actions/userauthorization.php 589
-- function get_signature_method(&$req) {
-+ function get_signature_method(&$req)
-+ {
-hunk ./actions/userbyid.php 24
-- function is_readonly() {
-+ function is_readonly()
-+ {
-hunk ./actions/userbyid.php 29
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/userrss.php 30
-- function init() {
-+ function init()
-+ {
-hunk ./actions/userrss.php 43
-- function get_notices($limit=0) {
-+ function get_notices($limit=0)
-+ {
-hunk ./actions/userrss.php 61
-- function get_channel() {
-+ function get_channel()
-+ {
-hunk ./actions/userrss.php 74
-- function get_image() {
-+ function get_image()
-+ {
-hunk ./actions/userrss.php 89
-- function init_rss($limit=0) {
-+ function init_rss($limit=0)
-+ {
-hunk ./actions/xrds.php 26
-- function is_readonly() {
-+ function is_readonly()
-+ {
-hunk ./actions/xrds.php 31
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./actions/xrds.php 43
-- function show_xrds($user) {
-+ function show_xrds($user)
-+ {
-hunk ./actions/xrds.php 114
-- function show_service($type, $uri, $params=null, $sigs=null, $localId=null) {
-+ function show_service($type, $uri, $params=null, $sigs=null, $localId=null)
-+ {
-hunk ./classes/Avatar.php 24
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Avatar',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Avatar',$k,$v); }
-hunk ./classes/Avatar.php 32
-- function delete() {
-+ function delete()
-+ {
-hunk ./classes/Avatar.php 43
-- function scale($size) {
-+ function scale($size)
-+ {
-hunk ./classes/Avatar.php 82
-- function to_image() {
-+ function to_image()
-+ {
-hunk ./classes/Avatar.php 96
-- function &pkeyGet($kv) {
-+ function &pkeyGet($kv)
-+ {
-hunk ./classes/Channel.php 24
-- function on($user) {
-+ function on($user)
-+ {
-hunk ./classes/Channel.php 29
-- function off($user) {
-+ function off($user)
-+ {
-hunk ./classes/Channel.php 34
-- function output($user, $text) {
-+ function output($user, $text)
-+ {
-hunk ./classes/Channel.php 39
-- function error($user, $text) {
-+ function error($user, $text)
-+ {
-hunk ./classes/Channel.php 44
-- function source() {
-+ function source()
-+ {
-hunk ./classes/Channel.php 54
-- function source() {
-+ function source()
-+ {
-hunk ./classes/Channel.php 59
-- function __construct($conn) {
-+ function __construct($conn)
-+ {
-hunk ./classes/Channel.php 64
-- function on($user) {
-+ function on($user)
-+ {
-hunk ./classes/Channel.php 69
-- function off($user) {
-+ function off($user)
-+ {
-hunk ./classes/Channel.php 74
-- function output($user, $text) {
-+ function output($user, $text)
-+ {
-hunk ./classes/Channel.php 80
-- function error($user, $text) {
-+ function error($user, $text)
-+ {
-hunk ./classes/Channel.php 86
-- function set_notify(&$user, $notify) {
-+ function set_notify(&$user, $notify)
-+ {
-hunk ./classes/Channel.php 109
-- function source() {
-+ function source()
-+ {
-hunk ./classes/Channel.php 114
-- function on($user) {
-+ function on($user)
-+ {
-hunk ./classes/Channel.php 119
-- function off($user) {
-+ function off($user)
-+ {
-hunk ./classes/Channel.php 124
-- function output($user, $text) {
-+ function output($user, $text)
-+ {
-hunk ./classes/Channel.php 134
-- function error($user, $text) {
-+ function error($user, $text)
-+ {
-hunk ./classes/Channel.php 143
-- function output($user, $text) {
-+ function output($user, $text)
-+ {
-hunk ./classes/Channel.php 155
-- function error($user, $text) {
-+ function error($user, $text)
-+ {
-hunk ./classes/Channel.php 173
-- function source() {
-+ function source()
-+ {
-hunk ./classes/Channel.php 178
-- function __construct($addr=null) {
-+ function __construct($addr=null)
-+ {
-hunk ./classes/Channel.php 183
-- function on($user) {
-+ function on($user)
-+ {
-hunk ./classes/Channel.php 188
-- function off($user) {
-+ function off($user)
-+ {
-hunk ./classes/Channel.php 193
-- function output($user, $text) {
-+ function output($user, $text)
-+ {
-hunk ./classes/Channel.php 204
-- function error($user, $text) {
-+ function error($user, $text)
-+ {
-hunk ./classes/Channel.php 215
-- function set_notify($user, $value) {
-+ function set_notify($user, $value)
-+ {
-hunk ./classes/Command.php 28
-- function __construct($user=null) {
-+ function __construct($user=null)
-+ {
-hunk ./classes/Command.php 33
-- function execute($channel) {
-+ function execute($channel)
-+ {
-hunk ./classes/Command.php 40
-- function execute($channel) {
-+ function execute($channel)
-+ {
-hunk ./classes/Command.php 54
-- function __construct($user, $word) {
-+ function __construct($user, $word)
-+ {
-hunk ./classes/Command.php 63
-- function __construct($user, $word) {
-+ function __construct($user, $word)
-+ {
-hunk ./classes/Command.php 72
-- function __construct($user, $other) {
-+ function __construct($user, $other)
-+ {
-hunk ./classes/Command.php 81
-- function __construct($user, $other) {
-+ function __construct($user, $other)
-+ {
-hunk ./classes/Command.php 89
-- function execute($channel) {
-+ function execute($channel)
-+ {
-hunk ./classes/Command.php 117
-- function __construct($user, $other) {
-+ function __construct($user, $other)
-+ {
-hunk ./classes/Command.php 123
-- function execute($channel) {
-+ function execute($channel)
-+ {
-hunk ./classes/Command.php 162
-- function __construct($user, $other) {
-+ function __construct($user, $other)
-+ {
-hunk ./classes/Command.php 168
-- function execute($channel) {
-+ function execute($channel)
-+ {
-hunk ./classes/Command.php 199
-- function __construct($user, $other, $text) {
-+ function __construct($user, $other, $text)
-+ {
-hunk ./classes/Command.php 206
-- function execute($channel) {
-+ function execute($channel)
-+ {
-hunk ./classes/Command.php 244
-- function __construct($user, $other) {
-+ function __construct($user, $other)
-+ {
-hunk ./classes/Command.php 250
-- function execute($channel) {
-+ function execute($channel)
-+ {
-hunk ./classes/Command.php 276
-- function __construct($user, $other) {
-+ function __construct($user, $other)
-+ {
-hunk ./classes/Command.php 282
-- function execute($channel) {
-+ function execute($channel)
-+ {
-hunk ./classes/Command.php 304
-- function __construct($user, $other) {
-+ function __construct($user, $other)
-+ {
-hunk ./classes/Command.php 310
-- function execute($channel) {
-+ function execute($channel)
-+ {
-hunk ./classes/Command.php 329
-- function __construct($user, $other=null) {
-+ function __construct($user, $other=null)
-+ {
-hunk ./classes/Command.php 334
-- function execute($channel) {
-+ function execute($channel)
-+ {
-hunk ./classes/Command.php 350
-- function __construct($user, $other=null) {
-+ function __construct($user, $other=null)
-+ {
-hunk ./classes/Command.php 356
-- function execute($channel) {
-+ function execute($channel)
-+ {
-hunk ./classes/Command.php 371
-- function execute($channel) {
-+ function execute($channel)
-+ {
-hunk ./classes/CommandInterpreter.php 26
-- function handle_command($user, $text) {
-+ function handle_command($user, $text)
-+ {
-hunk ./classes/Confirm_address.php 23
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Confirm_address',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Confirm_address',$k,$v); }
-hunk ./classes/Confirm_address.php 29
-- function sequenceKey() { return array(false, false); }
-+ function sequenceKey()
-+ { return array(false, false); }
-hunk ./classes/Consumer.php 19
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Consumer',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Consumer',$k,$v); }
-hunk ./classes/Fave.php 18
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Fave',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Fave',$k,$v); }
-hunk ./classes/Fave.php 35
-- function &pkeyGet($kv) {
-+ function &pkeyGet($kv)
-+ {
-hunk ./classes/Foreign_link.php 24
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Foreign_link',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Foreign_link',$k,$v); }
-hunk ./classes/Foreign_link.php 59
-- function getForeignUser() {
-+ function getForeignUser()
-+ {
-hunk ./classes/Foreign_link.php 74
-- function getUser() {
-+ function getUser()
-+ {
-hunk ./classes/Foreign_service.php 20
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Foreign_service',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Foreign_service',$k,$v); }
-hunk ./classes/Foreign_subscription.php 19
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Foreign_subscription',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Foreign_subscription',$k,$v); }
-hunk ./classes/Foreign_user.php 21
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Foreign_user',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Foreign_user',$k,$v); }
-hunk ./classes/Foreign_user.php 43
-- function updateKeys(&$orig) {
-+ function updateKeys(&$orig)
-+ {
-hunk ./classes/Invitation.php 20
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Invitation',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Invitation',$k,$v); }
-hunk ./classes/Memcached_DataObject.php 26
-- function &staticGet($cls, $k, $v=null) {
-+ function &staticGet($cls, $k, $v=null)
-+ {
-hunk ./classes/Memcached_DataObject.php 48
-- function &pkeyGet($cls, $kv) {
-+ function &pkeyGet($cls, $kv)
-+ {
-hunk ./classes/Memcached_DataObject.php 67
-- function insert() {
-+ function insert()
-+ {
-hunk ./classes/Memcached_DataObject.php 73
-- function update($orig=null) {
-+ function update($orig=null)
-+ {
-hunk ./classes/Memcached_DataObject.php 85
-- function delete() {
-+ function delete()
-+ {
-hunk ./classes/Memcached_DataObject.php 108
-- function keyTypes() {
-+ function keyTypes()
-+ {
-hunk ./classes/Memcached_DataObject.php 118
-- function encache() {
-+ function encache()
-+ {
-hunk ./classes/Memcached_DataObject.php 143
-- function decache() {
-+ function decache()
-+ {
-hunk ./classes/Memcached_DataObject.php 169
-- function multicache($cls, $kv) {
-+ function multicache($cls, $kv)
-+ {
-hunk ./classes/Memcached_DataObject.php 182
-- function getSearchEngine($table) {
-+ function getSearchEngine($table)
-+ {
-hunk ./classes/Message.php 25
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Message',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Message',$k,$v); }
-hunk ./classes/Message.php 31
-- function getFrom() {
-+ function getFrom()
-+ {
-hunk ./classes/Message.php 36
-- function getTo() {
-+ function getTo()
-+ {
-hunk ./classes/Nonce.php 21
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Nonce',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Nonce',$k,$v); }
-hunk ./classes/Notice.php 51
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Notice',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Notice',$k,$v); }
-hunk ./classes/Notice.php 57
-- function getProfile() {
-+ function getProfile()
-+ {
-hunk ./classes/Notice.php 62
-- function delete() {
-+ function delete()
-+ {
-hunk ./classes/Notice.php 70
-- function saveTags() {
-+ function saveTags()
-+ {
-hunk ./classes/Notice.php 191
-- function blowCaches($blowLast=false) {
-+ function blowCaches($blowLast=false)
-+ {
-hunk ./classes/Notice.php 200
-- function blowTagCache($blowLast=false) {
-+ function blowTagCache($blowLast=false)
-+ {
-hunk ./classes/Notice.php 219
-- function blowSubsCache($blowLast=false) {
-+ function blowSubsCache($blowLast=false)
-+ {
-hunk ./classes/Notice.php 240
-- function blowNoticeCache($blowLast=false) {
-+ function blowNoticeCache($blowLast=false)
-+ {
-hunk ./classes/Notice.php 253
-- function blowRepliesCache($blowLast=false) {
-+ function blowRepliesCache($blowLast=false)
-+ {
-hunk ./classes/Notice.php 272
-- function blowPublicCache($blowLast=false) {
-+ function blowPublicCache($blowLast=false)
-+ {
-hunk ./classes/Notice.php 285
-- function blowFavesCache($blowLast=false) {
-+ function blowFavesCache($blowLast=false)
-+ {
-hunk ./classes/Notice.php 491
-- function publicStream($offset=0, $limit=20, $since_id=0, $before_id=0, $since=null) {
-+ function publicStream($offset=0, $limit=20, $since_id=0, $before_id=0, $since=null)
-+ {
-hunk ./classes/Notice.php 514
-- function addToInboxes() {
-+ function addToInboxes()
-+ {
-hunk ./classes/Notice.php 538
-- function blowInboxes() {
-+ function blowInboxes()
-+ {
-hunk ./classes/NoticeWrapper.php 41
-- function __construct($arr) {
-+ function __construct($arr)
-+ {
-hunk ./classes/NoticeWrapper.php 46
-- function fetch() {
-+ function fetch()
-+ {
-hunk ./classes/Notice_inbox.php 36
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Notice_inbox',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Notice_inbox',$k,$v); }
-hunk ./classes/Notice_source.php 20
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Notice_source',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Notice_source',$k,$v); }
-hunk ./classes/Notice_tag.php 33
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Notice_tag',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Notice_tag',$k,$v); }
-hunk ./classes/Notice_tag.php 50
-- function blowCache() {
-+ function blowCache()
-+ {
-hunk ./classes/Profile.php 44
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Profile',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Profile',$k,$v); }
-hunk ./classes/Profile.php 50
-- function getAvatar($width, $height=null) {
-+ function getAvatar($width, $height=null)
-+ {
-hunk ./classes/Profile.php 60
-- function getOriginalAvatar() {
-+ function getOriginalAvatar()
-+ {
-hunk ./classes/Profile.php 72
-- function setOriginal($source) {
-+ function setOriginal($source)
-+ {
-hunk ./classes/Profile.php 124
-- function delete_avatars() {
-+ function delete_avatars()
-+ {
-hunk ./classes/Profile.php 135
-- function getBestName() {
-+ function getBestName()
-+ {
-hunk ./classes/Profile.php 141
-- function getCurrentNotice($dt=null) {
-+ function getCurrentNotice($dt=null)
-+ {
-hunk ./classes/Profile.php 156
-- function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0) {
-+ function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
-+ {
-hunk ./classes/Profile_block.php 39
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Profile_block',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Profile_block',$k,$v); }
-hunk ./classes/Profile_block.php 45
-- function get($blocker, $blocked) {
-+ function get($blocker, $blocked)
-+ {
-hunk ./classes/Profile_tag.php 19
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Profile_tag',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Profile_tag',$k,$v); }
-hunk ./classes/Queue_item.php 19
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Queue_item',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Queue_item',$k,$v); }
-hunk ./classes/Queue_item.php 25
-- function sequenceKey() { return array(false, false); }
-+ function sequenceKey()
-+ { return array(false, false); }
-hunk ./classes/Remember_me.php 18
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Remember_me',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Remember_me',$k,$v); }
-hunk ./classes/Remember_me.php 24
-- function sequenceKey() { return array(false, false); }
-+ function sequenceKey()
-+ { return array(false, false); }
-hunk ./classes/Remote_profile.php 41
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Remote_profile',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Remote_profile',$k,$v); }
-hunk ./classes/Reply.php 19
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Reply',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Reply',$k,$v); }
-hunk ./classes/Sms_carrier.php 20
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Sms_carrier',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Sms_carrier',$k,$v); }
-hunk ./classes/Sms_carrier.php 26
-- function toEmailAddress($sms) {
-+ function toEmailAddress($sms)
-+ {
-hunk ./classes/Subscription.php 43
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Subscription',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Subscription',$k,$v); }
-hunk ./classes/Subscription.php 49
-- function &pkeyGet($kv) {
-+ function &pkeyGet($kv)
-+ {
-hunk ./classes/Token.php 22
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Token',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('Token',$k,$v); }
-hunk ./classes/User.php 65
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('User',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('User',$k,$v); }
-hunk ./classes/User.php 71
-- function getProfile() {
-+ function getProfile()
-+ {
-hunk ./classes/User.php 76
-- function isSubscribed($other) {
-+ function isSubscribed($other)
-+ {
-hunk ./classes/User.php 87
-- function updateKeys(&$orig) {
-+ function updateKeys(&$orig)
-+ {
-hunk ./classes/User.php 115
-- function allowed_nickname($nickname) {
-+ function allowed_nickname($nickname)
-+ {
-hunk ./classes/User.php 126
-- function getCurrentNotice($dt=null) {
-+ function getCurrentNotice($dt=null)
-+ {
-hunk ./classes/User.php 135
-- function getCarrier() {
-+ function getCarrier()
-+ {
-hunk ./classes/User.php 140
-- function subscribeTo($other) {
-+ function subscribeTo($other)
-+ {
-hunk ./classes/User.php 155
-- function hasBlocked($other) {
-+ function hasBlocked($other)
-+ {
-hunk ./classes/User.php 283
-- function emailChanged() {
-+ function emailChanged()
-+ {
-hunk ./classes/User.php 298
-- function hasFave($notice) {
-+ function hasFave($notice)
-+ {
-hunk ./classes/User.php 331
-- function mutuallySubscribed($other) {
-+ function mutuallySubscribed($other)
-+ {
-hunk ./classes/User.php 337
-- function mutuallySubscribedUsers() {
-+ function mutuallySubscribedUsers()
-+ {
-hunk ./classes/User.php 352
-- function getReplies($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) {
-+ function getReplies($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null)
-+ {
-hunk ./classes/User.php 363
-- function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) {
-+ function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null)
-+ {
-hunk ./classes/User.php 373
-- function favoriteNotices($offset=0, $limit=NOTICES_PER_PAGE) {
-+ function favoriteNotices($offset=0, $limit=NOTICES_PER_PAGE)
-+ {
-hunk ./classes/User.php 384
-- function noticesWithFriends($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) {
-+ function noticesWithFriends($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null)
-+ {
-hunk ./classes/User.php 414
-- function blowFavesCache() {
-+ function blowFavesCache()
-+ {
-hunk ./classes/User.php 425
-- function getSelfTags() {
-+ function getSelfTags()
-+ {
-hunk ./classes/User.php 430
-- function setSelfTags($newtags) {
-+ function setSelfTags($newtags)
-+ {
-hunk ./classes/User.php 435
-- function block($other) {
-+ function block($other)
-+ {
-hunk ./classes/User.php 474
-- function unblock($other) {
-+ function unblock($other)
-+ {
-hunk ./classes/User_openid.php 20
-- function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('User_openid',$k,$v); }
-+ function staticGet($k,$v=null)
-+ { return Memcached_DataObject::staticGet('User_openid',$k,$v); }
-hunk ./lib/Shorturl_api.php 25
-- function __construct($service_url) {
-+ function __construct($service_url)
-+ {
-hunk ./lib/Shorturl_api.php 30
-- function shorten($url) {
-+ function shorten($url)
-+ {
-hunk ./lib/Shorturl_api.php 73
-- function __construct() {
-+ function __construct()
-+ {
-hunk ./lib/Shorturl_api.php 92
-- function __construct() {
-+ function __construct()
-+ {
-hunk ./lib/Shorturl_api.php 110
-- function __construct() {
-+ function __construct()
-+ {
-hunk ./lib/common.php 166
--function __autoload($class) {
-+function __autoload($class)
-+{
-hunk ./lib/deleteaction.php 24
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./lib/deleteaction.php 47
-- function show_top($arr=null) {
-+ function show_top($arr=null)
-+ {
-hunk ./lib/deleteaction.php 56
-- function get_title() {
-+ function get_title()
-+ {
-hunk ./lib/deleteaction.php 61
-- function show_header() {
-+ function show_header()
-+ {
-hunk ./lib/facebookaction.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./lib/facebookaction.php 31
-- function get_facebook() {
-+ function get_facebook()
-+ {
-hunk ./lib/facebookaction.php 38
-- function update_profile_box($facebook, $fbuid, $user) {
-+ function update_profile_box($facebook, $fbuid, $user)
-+ {
-hunk ./lib/facebookaction.php 92
-- function show_header($selected ='Home') {
-+ function show_header($selected ='Home')
-+ {
-hunk ./lib/facebookaction.php 115
-- function show_footer() {
-+ function show_footer()
-+ {
-hunk ./lib/facebookaction.php 121
-- function show_login_form() {
-+ function show_login_form()
-+ {
-hunk ./lib/facebookaction.php 157
-- function render_notice($notice) {
-+ function render_notice($notice)
-+ {
-hunk ./lib/facebookaction.php 217
-- function source_link($source) {
-+ function source_link($source)
-+ {
-hunk ./lib/facebookaction.php 246
-- function pagination($have_before, $have_after, $page, $fbaction, $args=null) {
-+ function pagination($have_before, $have_after, $page, $fbaction, $args=null)
-+ {
-hunk ./lib/facebookaction.php 278
-- function pagination_url($fbaction, $args=null) {
-+ function pagination_url($fbaction, $args=null)
-+ {
-hunk ./lib/oauthstore.php 28
-- function lookup_consumer($consumer_key) {
-+ function lookup_consumer($consumer_key)
-+ {
-hunk ./lib/oauthstore.php 43
-- function lookup_token($consumer, $token_type, $token_key) {
-+ function lookup_token($consumer, $token_type, $token_key)
-+ {
-hunk ./lib/oauthstore.php 56
-- function lookup_nonce($consumer, $token, $nonce, $timestamp) {
-+ function lookup_nonce($consumer, $token, $nonce, $timestamp)
-+ {
-hunk ./lib/oauthstore.php 72
-- function new_request_token($consumer) {
-+ function new_request_token($consumer)
-+ {
-hunk ./lib/oauthstore.php 90
-- function fetch_request_token($consumer) {
-+ function fetch_request_token($consumer)
-+ {
-hunk ./lib/oauthstore.php 95
-- function new_access_token($token, $consumer) {
-+ function new_access_token($token, $consumer)
-+ {
-hunk ./lib/oauthstore.php 147
-- function fetch_access_token($consumer) {
-+ function fetch_access_token($consumer)
-+ {
-hunk ./lib/omb.php 46
--function omb_oauth_consumer() {
-+function omb_oauth_consumer()
-+{
-hunk ./lib/omb.php 55
--function omb_oauth_server() {
-+function omb_oauth_server()
-+{
-hunk ./lib/omb.php 65
--function omb_oauth_datastore() {
-+function omb_oauth_datastore()
-+{
-hunk ./lib/omb.php 74
--function omb_hmac_sha1() {
-+function omb_hmac_sha1()
-+{
-hunk ./lib/omb.php 83
--function omb_get_services($xrd, $type) {
-+function omb_get_services($xrd, $type)
-+{
-hunk ./lib/omb.php 88
--function omb_service_filter($type) {
-+function omb_service_filter($type)
-+{
-hunk ./lib/omb.php 94
--function omb_match_service($service, $type) {
-+function omb_match_service($service, $type)
-+{
-hunk ./lib/omb.php 99
--function omb_service_uri($service) {
-+function omb_service_uri($service)
-+{
-hunk ./lib/omb.php 111
--function omb_local_id($service) {
-+function omb_local_id($service)
-+{
-hunk ./lib/omb.php 124
--function omb_broadcast_remote_subscribers($notice) {
-+function omb_broadcast_remote_subscribers($notice)
-+{
-hunk ./lib/omb.php 155
--function omb_post_notice($notice, $remote_profile, $subscription) {
-+function omb_post_notice($notice, $remote_profile, $subscription)
-+{
-hunk ./lib/omb.php 160
--function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret) {
-+function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret)
-+{
-hunk ./lib/omb.php 231
--function omb_broadcast_profile($profile) {
-+function omb_broadcast_profile($profile)
-+{
-hunk ./lib/omb.php 252
--function omb_update_profile($profile, $remote_profile, $subscription) {
-+function omb_update_profile($profile, $remote_profile, $subscription)
-+{
-hunk ./lib/openid.php 34
--function oid_store() {
-+function oid_store()
-+{
-hunk ./lib/openid.php 46
--function oid_consumer() {
-+function oid_consumer()
-+{
-hunk ./lib/openid.php 53
--function oid_clear_last() {
-+function oid_clear_last()
-+{
-hunk ./lib/openid.php 58
--function oid_set_last($openid_url) {
-+function oid_set_last($openid_url)
-+{
-hunk ./lib/openid.php 65
--function oid_get_last() {
-+function oid_get_last()
-+{
-hunk ./lib/openid.php 75
--function oid_link_user($id, $canonical, $display) {
-+function oid_link_user($id, $canonical, $display)
-+{
-hunk ./lib/openid.php 93
--function oid_get_user($openid_url) {
-+function oid_get_user($openid_url)
-+{
-hunk ./lib/openid.php 103
--function oid_check_immediate($openid_url, $backto=null) {
-+function oid_check_immediate($openid_url, $backto=null)
-+{
-hunk ./lib/openid.php 124
--function oid_authenticate($openid_url, $returnto, $immediate=false) {
-+function oid_authenticate($openid_url, $returnto, $immediate=false)
-+{
-hunk ./lib/openid.php 202
--function _oid_print_instructions() {
-+function _oid_print_instructions()
-+{
-hunk ./lib/openid.php 212
--function oid_update_user(&$user, &$sreg) {
-+function oid_update_user(&$user, &$sreg)
-+{
-hunk ./lib/personal.php 24
-- function is_readonly() {
-+ function is_readonly()
-+ {
-hunk ./lib/personal.php 29
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./lib/personal.php 35
-- function views_menu() {
-+ function views_menu()
-+ {
-hunk ./lib/personal.php 91
-- function show_feeds_list($feeds) {
-+ function show_feeds_list($feeds)
-+ {
-hunk ./lib/personal.php 104
-- function common_feed_item($feed) {
-+ function common_feed_item($feed)
-+ {
-hunk ./lib/personal.php 189
-- function source_link($source) {
-+ function source_link($source)
-+ {
-hunk ./lib/profilelist.php 31
-- function __construct($profile, $owner=null, $action=null) {
-+ function __construct($profile, $owner=null, $action=null)
-+ {
-hunk ./lib/profilelist.php 38
-- function show_list() {
-+ function show_list()
-+ {
-hunk ./lib/profilelist.php 58
-- function show() {
-+ function show()
-+ {
-hunk ./lib/profilelist.php 165
-- function show_owner_controls($profile) {
-+ function show_owner_controls($profile)
-+ {
-hunk ./lib/profilelist.php 170
-- function highlight($text) {
-+ function highlight($text)
-+ {
-hunk ./lib/queuehandler.php 32
-- function QueueHandler($id=null) {
-+ function QueueHandler($id=null)
-+ {
-hunk ./lib/queuehandler.php 39
-- function class_name() {
-+ function class_name()
-+ {
-hunk ./lib/queuehandler.php 44
-- function name() {
-+ function name()
-+ {
-hunk ./lib/queuehandler.php 49
-- function get_id() {
-+ function get_id()
-+ {
-hunk ./lib/queuehandler.php 54
-- function set_id($id) {
-+ function set_id($id)
-+ {
-hunk ./lib/queuehandler.php 59
-- function transport() {
-+ function transport()
-+ {
-hunk ./lib/queuehandler.php 64
-- function start() {
-+ function start()
-+ {
-hunk ./lib/queuehandler.php 68
-- function finish() {
-+ function finish()
-+ {
-hunk ./lib/queuehandler.php 72
-- function handle_notice($notice) {
-+ function handle_notice($notice)
-+ {
-hunk ./lib/queuehandler.php 77
-- function run() {
-+ function run()
-+ {
-hunk ./lib/queuehandler.php 123
-- function idle($timeout=0) {
-+ function idle($timeout=0)
-+ {
-hunk ./lib/queuehandler.php 130
-- function clear_old_claims() {
-+ function clear_old_claims()
-+ {
-hunk ./lib/queuehandler.php 140
-- function log($level, $msg) {
-+ function log($level, $msg)
-+ {
-hunk ./lib/rssaction.php 29
-- function is_readonly() {
-+ function is_readonly()
-+ {
-hunk ./lib/rssaction.php 34
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./lib/rssaction.php 44
-- function init() {
-+ function init()
-+ {
-hunk ./lib/rssaction.php 49
-- function get_notices() {
-+ function get_notices()
-+ {
-hunk ./lib/rssaction.php 54
-- function get_channel() {
-+ function get_channel()
-+ {
-hunk ./lib/rssaction.php 62
-- function get_image() {
-+ function get_image()
-+ {
-hunk ./lib/rssaction.php 67
-- function show_rss($limit=0) {
-+ function show_rss($limit=0)
-+ {
-hunk ./lib/rssaction.php 88
-- function show_channel($notices) {
-+ function show_channel($notices)
-+ {
-hunk ./lib/rssaction.php 117
-- function show_image() {
-+ function show_image()
-+ {
-hunk ./lib/rssaction.php 130
-- function show_item($notice) {
-+ function show_item($notice)
-+ {
-hunk ./lib/rssaction.php 149
-- function show_creators() {
-+ function show_creators()
-+ {
-hunk ./lib/rssaction.php 166
-- function init_rss() {
-+ function init_rss()
-+ {
-hunk ./lib/rssaction.php 198
-- function end_rss() {
-+ function end_rss()
-+ {
-hunk ./lib/search_engines.php 26
-- function __construct($target, $table) {
-+ function __construct($target, $table)
-+ {
-hunk ./lib/search_engines.php 32
-- function query($q) {
-+ function query($q)
-+ {
-hunk ./lib/search_engines.php 36
-- function limit($offset, $count, $rss = false) {
-+ function limit($offset, $count, $rss = false)
-+ {
-hunk ./lib/search_engines.php 41
-- function set_sort_mode($mode) {
-+ function set_sort_mode($mode)
-+ {
-hunk ./lib/search_engines.php 52
-- function __construct($target, $table) {
-+ function __construct($target, $table)
-+ {
-hunk ./lib/search_engines.php 66
-- function is_connected() {
-+ function is_connected()
-+ {
-hunk ./lib/search_engines.php 71
-- function limit($offset, $count, $rss = false) {
-+ function limit($offset, $count, $rss = false)
-+ {
-hunk ./lib/search_engines.php 88
-- function query($q) {
-+ function query($q)
-+ {
-hunk ./lib/search_engines.php 97
-- function set_sort_mode($mode) {
-+ function set_sort_mode($mode)
-+ {
-hunk ./lib/search_engines.php 107
-- function query($q) {
-+ function query($q)
-+ {
-hunk ./lib/search_engines.php 119
-- function query($q) {
-+ function query($q)
-+ {
-hunk ./lib/searchaction.php 24
-- function is_readonly() {
-+ function is_readonly()
-+ {
-hunk ./lib/searchaction.php 29
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./lib/searchaction.php 35
-- function show_top($arr=null) {
-+ function show_top($arr=null)
-+ {
-hunk ./lib/searchaction.php 52
-- function get_title() {
-+ function get_title()
-+ {
-hunk ./lib/searchaction.php 57
-- function show_header($arr) {
-+ function show_header($arr)
-+ {
-hunk ./lib/searchaction.php 62
-- function show_form($error=null) {
-+ function show_form($error=null)
-+ {
-hunk ./lib/searchaction.php 100
-- function search_menu() {
-+ function search_menu()
-+ {
-hunk ./lib/settingsaction.php 24
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./lib/settingsaction.php 44
-- function handle_post() {
-+ function handle_post()
-+ {
-hunk ./lib/settingsaction.php 49
-- function show_form($msg=null, $success=false) {
-+ function show_form($msg=null, $success=false)
-+ {
-hunk ./lib/settingsaction.php 54
-- function message($msg, $success) {
-+ function message($msg, $success)
-+ {
-hunk ./lib/settingsaction.php 62
-- function form_header($title, $msg=null, $success=false) {
-+ function form_header($title, $msg=null, $success=false)
-+ {
-hunk ./lib/settingsaction.php 70
-- function show_top($arr) {
-+ function show_top($arr)
-+ {
-hunk ./lib/settingsaction.php 86
-- function settings_menu() {
-+ function settings_menu()
-+ {
-hunk ./lib/stream.php 27
-- function public_views_menu() {
-+ function public_views_menu()
-+ {
-hunk ./lib/stream.php 52
-- function show_notice_list($notice) {
-+ function show_notice_list($notice)
-+ {
-hunk ./lib/subs.php 28
--function subs_subscribe_user($user, $other_nickname) {
-+function subs_subscribe_user($user, $other_nickname)
-+{
-hunk ./lib/subs.php 45
--function subs_subscribe_to($user, $other) {
-+function subs_subscribe_to($user, $other)
-+{
-hunk ./lib/subs.php 87
--function subs_notify($listenee, $listener) {
-+function subs_notify($listenee, $listener)
-+{
-hunk ./lib/subs.php 95
--function subs_notify_email($listenee, $listener) {
-+function subs_notify_email($listenee, $listener)
-+{
-hunk ./lib/subs.php 104
--function subs_unsubscribe_user($user, $other_nickname) {
-+function subs_unsubscribe_user($user, $other_nickname)
-+{
-hunk ./lib/subs.php 119
--function subs_unsubscribe_to($user, $other) {
-+function subs_unsubscribe_to($user, $other)
-+{
-hunk ./lib/theme.php 22
--function theme_file($relative) {
-+function theme_file($relative)
-+{
-hunk ./lib/theme.php 28
--function theme_path($relative) {
-+function theme_path($relative)
-+{
-hunk ./lib/twitter.php 22
--function get_twitter_data($uri, $screen_name, $password) {
-+function get_twitter_data($uri, $screen_name, $password)
-+{
-hunk ./lib/twitter.php 52
--function twitter_user_info($screen_name, $password) {
-+function twitter_user_info($screen_name, $password)
-+{
-hunk ./lib/twitter.php 71
--function update_twitter_user($fuser, $twitter_id, $screen_name) {
-+function update_twitter_user($fuser, $twitter_id, $screen_name)
-+{
-hunk ./lib/twitter.php 87
--function add_twitter_user($twitter_id, $screen_name) {
-+function add_twitter_user($twitter_id, $screen_name)
-+{
-hunk ./lib/twitter.php 112
--function save_twitter_user($twitter_id, $screen_name) {
-+function save_twitter_user($twitter_id, $screen_name)
-+{
-hunk ./lib/twitter.php 137
--function retreive_twitter_friends($twitter_id, $screen_name, $password) {
-+function retreive_twitter_friends($twitter_id, $screen_name, $password)
-+{
-hunk ./lib/twitter.php 172
--function save_twitter_friends($user, $twitter_id, $screen_name, $password) {
-+function save_twitter_friends($user, $twitter_id, $screen_name, $password)
-+{
-hunk ./lib/twitterapi.php 26
-- function handle($args) {
-+ function handle($args)
-+ {
-hunk ./lib/twitterapi.php 31
-- function twitter_user_array($profile, $get_notice=false) {
-+ function twitter_user_array($profile, $get_notice=false)
-+ {
-hunk ./lib/twitterapi.php 60
-- function twitter_status_array($notice, $include_user=true) {
-+ function twitter_status_array($notice, $include_user=true)
-+ {
-hunk ./lib/twitterapi.php 89
-- function twitter_rss_entry_array($notice) {
-+ function twitter_rss_entry_array($notice)
-+ {
-hunk ./lib/twitterapi.php 114
-- function twitter_rss_dmsg_array($message) {
-+ function twitter_rss_dmsg_array($message)
-+ {
-hunk ./lib/twitterapi.php 137
-- function twitter_dmsg_array($message) {
-+ function twitter_dmsg_array($message)
-+ {
-hunk ./lib/twitterapi.php 158
-- function show_twitter_xml_status($twitter_status) {
-+ function show_twitter_xml_status($twitter_status)
-+ {
-hunk ./lib/twitterapi.php 176
-- function show_twitter_xml_user($twitter_user, $role='user') {
-+ function show_twitter_xml_user($twitter_user, $role='user')
-+ {
-hunk ./lib/twitterapi.php 189
-- function show_twitter_rss_item($entry) {
-+ function show_twitter_rss_item($entry)
-+ {
-hunk ./lib/twitterapi.php 200
-- function show_twitter_atom_entry($entry) {
-+ function show_twitter_atom_entry($entry)
-+ {
-hunk ./lib/twitterapi.php 212
-- function show_json_objects($objects) {
-+ function show_json_objects($objects)
-+ {
-hunk ./lib/twitterapi.php 217
-- function show_single_xml_status($notice) {
-+ function show_single_xml_status($notice)
-+ {
-hunk ./lib/twitterapi.php 225
-- function show_single_json_status($notice) {
-+ function show_single_json_status($notice)
-+ {
-hunk ./lib/twitterapi.php 233
-- function show_single_xml_dmsg($message) {
-+ function show_single_xml_dmsg($message)
-+ {
-hunk ./lib/twitterapi.php 241
-- function show_single_json_dmsg($message) {
-+ function show_single_json_dmsg($message)
-+ {
-hunk ./lib/twitterapi.php 249
-- function show_twitter_xml_dmsg($twitter_dm) {
-+ function show_twitter_xml_dmsg($twitter_dm)
-+ {
-hunk ./lib/twitterapi.php 268
-- function show_xml_timeline($notice) {
-+ function show_xml_timeline($notice)
-+ {
-hunk ./lib/twitterapi.php 290
-- function show_rss_timeline($notice, $title, $link, $subtitle, $suplink=null) {
-+ function show_rss_timeline($notice, $title, $link, $subtitle, $suplink=null)
-+ {
-hunk ./lib/twitterapi.php 325
-- function show_atom_timeline($notice, $title, $id, $link, $subtitle=null, $suplink=null) {
-+ function show_atom_timeline($notice, $title, $id, $link, $subtitle=null, $suplink=null)
-+ {
-hunk ./lib/twitterapi.php 357
-- function show_json_timeline($notice) {
-+ function show_json_timeline($notice)
-+ {
-hunk ./lib/twitterapi.php 383
-- function date_twitter($dt) {
-+ function date_twitter($dt)
-+ {
-hunk ./lib/twitterapi.php 389
-- function replier_by_reply($reply_id) {
-+ function replier_by_reply($reply_id)
-+ {
-hunk ./lib/twitterapi.php 406
-- function count_subscriptions($profile) {
-+ function count_subscriptions($profile)
-+ {
-hunk ./lib/twitterapi.php 422
-- function init_document($type='xml') {
-+ function init_document($type='xml')
-+ {
-hunk ./lib/twitterapi.php 454
-- function end_document($type='xml') {
-+ function end_document($type='xml')
-+ {
-hunk ./lib/twitterapi.php 481
-- function client_error($msg, $code = 400, $content_type = 'json') {
-+ function client_error($msg, $code = 400, $content_type = 'json')
-+ {
-hunk ./lib/twitterapi.php 530
-- function init_twitter_rss() {
-+ function init_twitter_rss()
-+ {
-hunk ./lib/twitterapi.php 536
-- function end_twitter_rss() {
-+ function end_twitter_rss()
-+ {
-hunk ./lib/twitterapi.php 542
-- function init_twitter_atom() {
-+ function init_twitter_atom()
-+ {
-hunk ./lib/twitterapi.php 548
-- function end_twitter_atom() {
-+ function end_twitter_atom()
-+ {
-hunk ./lib/twitterapi.php 554
-- function show_profile($profile, $content_type='xml', $notice=null) {
-+ function show_profile($profile, $content_type='xml', $notice=null)
-+ {
-hunk ./lib/twitterapi.php 571
-- function get_user($id, $apidata=null) {
-+ function get_user($id, $apidata=null)
-+ {
-hunk ./lib/twitterapi.php 583
-- function get_profile($id) {
-+ function get_profile($id)
-+ {
-hunk ./lib/twitterapi.php 597
-- function source_link($source) {
-+ function source_link($source)
-+ {
-hunk ./lib/twitterapi.php 617
-- function show_extended_profile($user, $apidata) {
-+ function show_extended_profile($user, $apidata)
-+ {
-hunk ./lib/util.php 24
--function common_server_error($msg, $code=500) {
-+function common_server_error($msg, $code=500)
-+{
-hunk ./lib/util.php 48
--function common_user_error($msg, $code=400) {
-+function common_user_error($msg, $code=400)
-+{
-hunk ./lib/util.php 85
--function common_element_start($tag, $attrs=null) {
-+function common_element_start($tag, $attrs=null)
-+{
-hunk ./lib/util.php 98
--function common_element_end($tag) {
-+function common_element_end($tag)
-+{
-hunk ./lib/util.php 112
--function common_element($tag, $attrs=null, $content=null) {
-+function common_element($tag, $attrs=null, $content=null)
-+{
-hunk ./lib/util.php 122
--function common_start_xml($doc=null, $public=null, $system=null, $indent=true) {
-+function common_start_xml($doc=null, $public=null, $system=null, $indent=true)
-+{
-hunk ./lib/util.php 134
--function common_end_xml() {
-+function common_end_xml()
-+{
-hunk ./lib/util.php 141
--function common_init_locale($language=null) {
-+function common_init_locale($language=null)
-+{
-hunk ./lib/util.php 155
--function common_init_language() {
-+function common_init_language()
-+{
-hunk ./lib/util.php 172
--function common_show_header($pagetitle, $callable=null, $data=null, $headercall=null) {
-+function common_show_header($pagetitle, $callable=null, $data=null, $headercall=null)
-+{
-hunk ./lib/util.php 256
--function common_start_html($type=null, $indent=true) {
-+function common_start_html($type=null, $indent=true)
-+{
-hunk ./lib/util.php 288
--function common_show_footer() {
-+function common_show_footer()
-+{
-hunk ./lib/util.php 322
--function common_text($txt) {
-+function common_text($txt)
-+{
-hunk ./lib/util.php 328
--function common_raw($xml) {
-+function common_raw($xml)
-+{
-hunk ./lib/util.php 334
--function common_nav_menu() {
-+function common_nav_menu()
-+{
-hunk ./lib/util.php 362
--function common_foot_menu() {
-+function common_foot_menu()
-+{
-hunk ./lib/util.php 380
--function common_menu_item($url, $text, $title=null, $is_selected=false) {
-+function common_menu_item($url, $text, $title=null, $is_selected=false)
-+{
-hunk ./lib/util.php 395
--function common_input($id, $label, $value=null,$instructions=null) {
-+function common_input($id, $label, $value=null,$instructions=null)
-+{
+hunk ./actions/accesstoken.php 36
+- common_debug('got this token: "'.print_r($token,TRUE).'"', __FILE__);
++ common_debug('got this token: "'.print_r($token,true).'"', __FILE__);
+hunk ./actions/emailsettings.php 121
+- if ($confirm->find(TRUE)) {
++ if ($confirm->find(true)) {
+hunk ./actions/emailsettings.php 182
+- if ($result === FALSE) {
++ if ($result === false) {
+hunk ./actions/emailsettings.php 232
+- if ($result === FALSE) {
++ if ($result === false) {
+hunk ./actions/emailsettings.php 242
+- $this->show_form($msg, TRUE);
++ $this->show_form($msg, true);
+hunk ./actions/emailsettings.php 266
+- $this->show_form(_('Confirmation cancelled.'), TRUE);
++ $this->show_form(_('Confirmation cancelled.'), true);
+hunk ./actions/emailsettings.php 293
+- $this->show_form(_('The address was removed.'), TRUE);
++ $this->show_form(_('The address was removed.'), true);
+hunk ./actions/emailsettings.php 313
+- $this->show_form(_('Incoming email address removed.'), TRUE);
++ $this->show_form(_('Incoming email address removed.'), true);
+hunk ./actions/emailsettings.php 328
+- $this->show_form(_('New incoming email address added.'), TRUE);
++ $this->show_form(_('New incoming email address added.'), true);
+hunk ./actions/finishremotesubscribe.php 281
+- common_debug('got result: "'.print_r($result,TRUE).'"', __FILE__);
++ common_debug('got result: "'.print_r($result,true).'"', __FILE__);
+hunk ./actions/foaf.php 125
+- common_debug('Got a bad subscription: '.print_r($sub,TRUE));
++ common_debug('Got a bad subscription: '.print_r($sub,true));
+hunk ./actions/foaf.php 147
+- common_debug('Got a bad subscription: '.print_r($sub,TRUE));
++ common_debug('Got a bad subscription: '.print_r($sub,true));
+hunk ./actions/imsettings.php 96
+- if ($confirm->find(TRUE)) {
++ if ($confirm->find(true)) {
+hunk ./actions/imsettings.php 149
+- if ($result === FALSE) {
++ if ($result === false) {
+hunk ./actions/imsettings.php 199
+- if ($result === FALSE) {
++ if ($result === false) {
+hunk ./actions/imsettings.php 213
+- $this->show_form($msg, TRUE);
++ $this->show_form($msg, true);
+hunk ./actions/imsettings.php 237
+- $this->show_form(_('Confirmation cancelled.'), TRUE);
++ $this->show_form(_('Confirmation cancelled.'), true);
+hunk ./actions/imsettings.php 266
+- $this->show_form(_('The address was removed.'), TRUE);
++ $this->show_form(_('The address was removed.'), true);
+hunk ./actions/othersettings.php 56
+- common_dropdown('urlshorteningservice', _('Service'), $services, _('Automatic shortening service to use.'), FALSE, $user->urlshorteningservice);
++ common_dropdown('urlshorteningservice', _('Service'), $services, _('Automatic shortening service to use.'), false, $user->urlshorteningservice);
+hunk ./actions/othersettings.php 177
+- if ($result === FALSE) {
++ if ($result === false) {
+hunk ./actions/profilesettings.php 99
+- common_dropdown('language', _('Language'), get_nice_language_list(), _('Preferred language'), TRUE, $language);
++ common_dropdown('language', _('Language'), get_nice_language_list(), _('Preferred language'), true, $language);
+hunk ./actions/profilesettings.php 105
+- common_dropdown('timezone', _('Timezone'), $timezones, _('What timezone are you normally in?'), TRUE, $timezone);
++ common_dropdown('timezone', _('Timezone'), $timezones, _('What timezone are you normally in?'), true, $timezone);
+hunk ./actions/profilesettings.php 281
+- if ($result === FALSE) {
++ if ($result === false) {
+hunk ./actions/profilesettings.php 301
+- if ($result === FALSE) {
++ if ($result === false) {
+hunk ./actions/profilesettings.php 343
+- $this->show_form(_('Settings saved.'), TRUE);
++ $this->show_form(_('Settings saved.'), true);
+hunk ./actions/profilesettings.php 437
+- if ($val !== TRUE) {
++ if ($val !== true) {
+hunk ./actions/smssettings.php 114
+- if ($confirm->find(TRUE)) {
++ if ($confirm->find(true)) {
+hunk ./actions/smssettings.php 168
+- if ($result === FALSE) {
++ if ($result === false) {
+hunk ./actions/smssettings.php 218
+- if ($result === FALSE) {
++ if ($result === false) {
+hunk ./actions/smssettings.php 232
+- $this->show_form($msg, TRUE);
++ $this->show_form($msg, true);
+hunk ./actions/smssettings.php 260
+- $this->show_form(_('Confirmation cancelled.'), TRUE);
++ $this->show_form(_('Confirmation cancelled.'), true);
+hunk ./actions/smssettings.php 290
+- $this->show_form(_('The address was removed.'), TRUE);
++ $this->show_form(_('The address was removed.'), true);
+hunk ./actions/twitapifriendships.php 99
+- if ($sub->find(TRUE)) {
++ if ($sub->find(true)) {
+hunk ./actions/twittersettings.php 291
+- $this->show_form(_('Twitter account removed.'), TRUE);
++ $this->show_form(_('Twitter account removed.'), true);
+hunk ./actions/twittersettings.php 328
+- if ($result === FALSE) {
++ if ($result === false) {
+hunk ./actions/userauthorization.php 214
+- common_debug('request token to look up: "'.print_r($rt,TRUE).'"');
++ common_debug('request token to look up: "'.print_r($rt,true).'"');
+hunk ./actions/userauthorization.php 224
+- return FALSE;
++ return false;
+hunk ./actions/userauthorization.php 280
+- return FALSE;
++ return false;
+hunk ./actions/userauthorization.php 287
+- return FALSE;
++ return false;
+hunk ./actions/userauthorization.php 292
+- return FALSE;
++ return false;
+hunk ./actions/userauthorization.php 298
+- return FALSE;
++ return false;
+hunk ./actions/userauthorization.php 314
+- return FALSE;
++ return false;
+hunk ./actions/userauthorization.php 317
+- return TRUE;
++ return true;
+hunk ./actions/userauthorization.php 443
+- if ($sub->find(TRUE)) {
++ if ($sub->find(true)) {
+hunk ./classes/Foreign_link.php 38
+- if ($flink->find(TRUE)) {
++ if ($flink->find(true)) {
+hunk ./classes/Foreign_link.php 51
+- if ($flink->find(TRUE)) {
++ if ($flink->find(true)) {
+hunk ./classes/Foreign_link.php 67
+- if ($fuser->find(TRUE)) {
++ if ($fuser->find(true)) {
+hunk ./classes/Notice.php 324
+- $needAnd = FALSE;
+- $needWhere = TRUE;
++ $needAnd = false;
++ $needWhere = true;
+hunk ./classes/Notice.php 328
+- $needWhere = FALSE;
+- $needAnd = TRUE;
++ $needWhere = false;
++ $needAnd = true;
+hunk ./classes/Notice.php 336
+- $needWhere = FALSE;
++ $needWhere = false;
+hunk ./classes/Notice.php 348
+- $needWhere = FALSE;
++ $needWhere = false;
+hunk ./classes/Notice.php 360
+- $needWhere = FALSE;
++ $needWhere = false;
+hunk ./classes/Notice.php 414
+- if ($notices !== FALSE) {
++ if ($notices !== false) {
+hunk ./classes/Queue_item.php 37
+- $cnt = $qi->find(TRUE);
++ $cnt = $qi->find(true);
+hunk ./classes/User.php 202
+- return FALSE;
++ return false;
+hunk ./classes/User.php 236
+- return FALSE;
++ return false;
+hunk ./classes/User.php 250
+- return FALSE;
++ return false;
+hunk ./classes/User.php 264
+- return FALSE;
++ return false;
+hunk ./lib/oauthstore.php 62
+- if ($n->find(TRUE)) {
+- return TRUE;
++ if ($n->find(true)) {
++ return true;
+hunk ./lib/oauthstore.php 68
+- return FALSE;
++ return false;
+hunk ./lib/oauthstore.php 102
+- if ($rt->find(TRUE) && $rt->state == 1) { # authorized
++ if ($rt->find(true) && $rt->state == 1) { # authorized
+hunk ./lib/omb.php 142
+- $posted[$rp->postnoticeurl] = TRUE;
++ $posted[$rp->postnoticeurl] = true;
+hunk ./lib/omb.php 211
+- common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__);
++ common_debug('Got HTTP result "'.print_r($result,true).'"', __FILE__);
+hunk ./lib/omb.php 244
+- $updated[$rp->updateprofileurl] = TRUE;
++ $updated[$rp->updateprofileurl] = true;
+hunk ./lib/omb.php 296
+- common_debug('Got HTTP result "'.print_r($result,TRUE).'"', __FILE__);
++ common_debug('Got HTTP result "'.print_r($result,true).'"', __FILE__);
hunk ./lib/util.php 439
--function common_dropdown($id, $label, $content, $instructions=null, $blank_select=FALSE, $selected=null) {
-+function common_dropdown($id, $label, $content, $instructions=null, $blank_select=FALSE, $selected=null)
-+{
-hunk ./lib/util.php 460
--function common_hidden($id, $value) {
-+function common_hidden($id, $value)
-+{
-hunk ./lib/util.php 468
--function common_password($id, $label, $instructions=null) {
-+function common_password($id, $label, $instructions=null)
-+{
-hunk ./lib/util.php 483
--function common_submit($id, $label, $cls='submit') {
-+function common_submit($id, $label, $cls='submit')
-+{
-hunk ./lib/util.php 495
--function common_textarea($id, $label, $content=null, $instructions=null) {
-+function common_textarea($id, $label, $content=null, $instructions=null)
-+{
-hunk ./lib/util.php 510
--function common_timezone() {
-+function common_timezone()
-+{
-hunk ./lib/util.php 523
--function common_language() {
-+function common_language()
-+{
-hunk ./lib/util.php 549
--function common_munge_password($password, $id) {
-+function common_munge_password($password, $id)
-+{
-hunk ./lib/util.php 555
--function common_check_user($nickname, $password) {
-+function common_check_user($nickname, $password)
-+{
-hunk ./lib/util.php 575
--function common_logged_in() {
-+function common_logged_in()
-+{
-hunk ./lib/util.php 580
--function common_have_session() {
-+function common_have_session()
-+{
-hunk ./lib/util.php 585
--function common_ensure_session() {
-+function common_ensure_session()
-+{
-hunk ./lib/util.php 601
--function common_set_user($user) {
-+function common_set_user($user)
-+{
-hunk ./lib/util.php 626
--function common_set_cookie($key, $value, $expiration=0) {
-+function common_set_cookie($key, $value, $expiration=0)
-+{
-hunk ./lib/util.php 646
--function common_rememberme($user=null) {
-+function common_rememberme($user=null)
-+{
-hunk ./lib/util.php 686
--function common_remembered_user() {
-+function common_remembered_user()
-+{
-hunk ./lib/util.php 752
--function common_forgetme() {
-+function common_forgetme()
-+{
-hunk ./lib/util.php 758
--function common_current_user() {
-+function common_current_user()
-+{
-hunk ./lib/util.php 791
--function common_real_login($real=true) {
-+function common_real_login($real=true)
-+{
-hunk ./lib/util.php 797
--function common_is_real_login() {
-+function common_is_real_login()
-+{
-hunk ./lib/util.php 803
--function common_canonical_nickname($nickname) {
-+function common_canonical_nickname($nickname)
-+{
-hunk ./lib/util.php 810
--function common_canonical_email($email) {
-+function common_canonical_email($email)
-+{
-hunk ./lib/util.php 819
--function common_render_content($text, $notice) {
-+function common_render_content($text, $notice)
-+{
-hunk ./lib/util.php 829
--function common_render_text($text) {
-+function common_render_text($text)
-+{
-hunk ./lib/util.php 840
--function common_render_uri_thingy($matches) {
-+function common_render_uri_thingy($matches)
-+{
-hunk ./lib/util.php 875
--function common_longurl($short_url) {
-+function common_longurl($short_url)
-+{
-hunk ./lib/util.php 882
--function common_longurl2($uri) {
-+function common_longurl2($uri)
-+{
-hunk ./lib/util.php 890
--function common_shorten_links($text) {
-+function common_shorten_links($text)
-+{
-hunk ./lib/util.php 899
--function common_shorten_link($url, $reverse = false) {
-+function common_shorten_link($url, $reverse = false)
-+{
-hunk ./lib/util.php 961
--function common_xml_safe_str($str) {
-+function common_xml_safe_str($str)
-+{
-hunk ./lib/util.php 969
--function common_tag_link($tag) {
-+function common_tag_link($tag)
-+{
-hunk ./lib/util.php 976
--function common_canonical_tag($tag) {
-+function common_canonical_tag($tag)
-+{
-hunk ./lib/util.php 981
--function common_valid_profile_tag($str) {
-+function common_valid_profile_tag($str)
-+{
-hunk ./lib/util.php 986
--function common_at_link($sender_id, $nickname) {
-+function common_at_link($sender_id, $nickname)
-+{
-hunk ./lib/util.php 997
--function common_at_hash_link($sender_id, $tag) {
-+function common_at_hash_link($sender_id, $tag)
-+{
-hunk ./lib/util.php 1014
--function common_relative_profile($sender, $nickname, $dt=null) {
-+function common_relative_profile($sender, $nickname, $dt=null)
-+{
-hunk ./lib/util.php 1052
--function common_avatar_filename($id, $extension, $size=null, $extra=null) {
-+function common_avatar_filename($id, $extension, $size=null, $extra=null)
-+{
-hunk ./lib/util.php 1063
--function common_avatar_path($filename) {
-+function common_avatar_path($filename)
-+{
-hunk ./lib/util.php 1069
--function common_avatar_url($filename) {
-+function common_avatar_url($filename)
-+{
-hunk ./lib/util.php 1074
--function common_avatar_display_url($avatar) {
-+function common_avatar_display_url($avatar)
-+{
-hunk ./lib/util.php 1084
--function common_default_avatar($size) {
-+function common_default_avatar($size)
-+{
-hunk ./lib/util.php 1092
--function common_local_url($action, $args=null, $fragment=null) {
-+function common_local_url($action, $args=null, $fragment=null)
-+{
-hunk ./lib/util.php 1106
--function common_fancy_url($action, $args=null) {
-+function common_fancy_url($action, $args=null)
-+{
-hunk ./lib/util.php 1320
--function common_simple_url($action, $args=null) {
-+function common_simple_url($action, $args=null)
-+{
-hunk ./lib/util.php 1333
--function common_path($relative) {
-+function common_path($relative)
-+{
-hunk ./lib/util.php 1340
--function common_date_string($dt) {
-+function common_date_string($dt)
-+{
-hunk ./lib/util.php 1375
--function common_exact_date($dt) {
-+function common_exact_date($dt)
-+{
-hunk ./lib/util.php 1391
--function common_date_w3dtf($dt) {
-+function common_date_w3dtf($dt)
-+{
-hunk ./lib/util.php 1399
--function common_date_rfc2822($dt) {
-+function common_date_rfc2822($dt)
-+{
-hunk ./lib/util.php 1407
--function common_date_iso8601($dt) {
-+function common_date_iso8601($dt)
-+{
-hunk ./lib/util.php 1415
--function common_sql_now() {
-+function common_sql_now()
-+{
-hunk ./lib/util.php 1420
--function common_redirect($url, $code=307) {
-+function common_redirect($url, $code=307)
-+{
-hunk ./lib/util.php 1437
--function common_save_replies($notice) {
-+function common_save_replies($notice)
-+{
-hunk ./lib/util.php 1521
--function common_broadcast_notice($notice, $remote=false) {
-+function common_broadcast_notice($notice, $remote=false)
-+{
-hunk ./lib/util.php 1549
--function common_twitter_broadcast($notice, $flink) {
-+function common_twitter_broadcast($notice, $flink)
-+{
-hunk ./lib/util.php 1610
--function common_enqueue_notice($notice) {
-+function common_enqueue_notice($notice)
-+{
-hunk ./lib/util.php 1628
--function common_dequeue_notice($notice) {
-+function common_dequeue_notice($notice)
-+{
-hunk ./lib/util.php 1645
--function common_real_broadcast($notice, $remote=false) {
-+function common_real_broadcast($notice, $remote=false)
-+{
-hunk ./lib/util.php 1680
--function common_broadcast_profile($profile) {
-+function common_broadcast_profile($profile)
-+{
-hunk ./lib/util.php 1689
--function common_profile_url($nickname) {
-+function common_profile_url($nickname)
-+{
-hunk ./lib/util.php 1696
--function common_notice_form($action=null, $content=null) {
-+function common_notice_form($action=null, $content=null)
-+{
-hunk ./lib/util.php 1729
--function common_root_url() {
-+function common_root_url()
-+{
-hunk ./lib/util.php 1737
--function common_good_rand($bytes) {
-+function common_good_rand($bytes)
-+{
-hunk ./lib/util.php 1747
--function common_urandom($bytes) {
-+function common_urandom($bytes)
-+{
-hunk ./lib/util.php 1760
--function common_mtrand($bytes) {
-+function common_mtrand($bytes)
-+{
-hunk ./lib/util.php 1769
--function common_set_returnto($url) {
-+function common_set_returnto($url)
-+{
-hunk ./lib/util.php 1775
--function common_get_returnto() {
-+function common_get_returnto()
-+{
-hunk ./lib/util.php 1781
--function common_timestamp() {
-+function common_timestamp()
-+{
-hunk ./lib/util.php 1786
--function common_ensure_syslog() {
-+function common_ensure_syslog()
-+{
-hunk ./lib/util.php 1796
--function common_log($priority, $msg, $filename=null) {
-+function common_log($priority, $msg, $filename=null)
-+{
-hunk ./lib/util.php 1814
--function common_debug($msg, $filename=null) {
-+function common_debug($msg, $filename=null)
-+{
-hunk ./lib/util.php 1823
--function common_log_db_error(&$object, $verb, $filename=null) {
-+function common_log_db_error(&$object, $verb, $filename=null)
-+{
-hunk ./lib/util.php 1830
--function common_log_objstring(&$object) {
-+function common_log_objstring(&$object)
-+{
-hunk ./lib/util.php 1844
--function common_valid_http_url($url) {
-+function common_valid_http_url($url)
-+{
-hunk ./lib/util.php 1849
--function common_valid_tag($tag) {
-+function common_valid_tag($tag)
-+{
-hunk ./lib/util.php 1860
--function common_pagination($have_before, $have_after, $page, $action, $args=null) {
-+function common_pagination($have_before, $have_after, $page, $action, $args=null)
-+{
-hunk ./lib/util.php 1896
--function common_accept_to_prefs($accept, $def = '*/*') {
-+function common_accept_to_prefs($accept, $def = '*/*')
-+{
-hunk ./lib/util.php 1921
--function common_mime_type_match($type, $avail) {
-+function common_mime_type_match($type, $avail)
-+{
-hunk ./lib/util.php 1937
--function common_negotiate_type($cprefs, $sprefs) {
-+function common_negotiate_type($cprefs, $sprefs)
-+{
-hunk ./lib/util.php 1974
--function common_config($main, $sub) {
-+function common_config($main, $sub)
-+{
-hunk ./lib/util.php 1980
--function common_copy_args($from) {
-+function common_copy_args($from)
-+{
-hunk ./lib/util.php 1992
--function common_remove_magic_from_request() {
-+function common_remove_magic_from_request()
-+{
-hunk ./lib/util.php 2000
--function common_user_uri(&$user) {
-+function common_user_uri(&$user)
-+{
-hunk ./lib/util.php 2005
--function common_notice_uri(&$notice) {
-+function common_notice_uri(&$notice)
-+{
-hunk ./lib/util.php 2013
--function common_confirmation_code($bits) {
-+function common_confirmation_code($bits)
-+{
-hunk ./lib/util.php 2031
--function common_markup_to_html($c) {
-+function common_markup_to_html($c)
-+{
-hunk ./lib/util.php 2039
--function common_profile_avatar_url($profile, $size=AVATAR_PROFILE_SIZE) {
-+function common_profile_avatar_url($profile, $size=AVATAR_PROFILE_SIZE)
-+{
-hunk ./lib/util.php 2049
--function common_profile_uri($profile) {
-+function common_profile_uri($profile)
-+{
-hunk ./lib/util.php 2067
--function common_canonical_sms($sms) {
-+function common_canonical_sms($sms)
-+{
-hunk ./lib/util.php 2074
--function common_error_handler($errno, $errstr, $errfile, $errline, $errcontext) {
-+function common_error_handler($errno, $errstr, $errfile, $errline, $errcontext)
-+{
-hunk ./lib/util.php 2096
--function common_session_token() {
-+function common_session_token()
-+{
-hunk ./lib/util.php 2105
--function common_disfavor_form($notice) {
-+function common_disfavor_form($notice)
-+{
-hunk ./lib/util.php 2133
--function common_favor_form($notice) {
-+function common_favor_form($notice)
-+{
-hunk ./lib/util.php 2161
--function common_nudge_form($profile) {
-+function common_nudge_form($profile)
-+{
-hunk ./lib/util.php 2171
--function common_nudge_response() {
-+function common_nudge_response()
-+{
-hunk ./lib/util.php 2176
--function common_subscribe_form($profile) {
-+function common_subscribe_form($profile)
-+{
-hunk ./lib/util.php 2193
--function common_unsubscribe_form($profile) {
-+function common_unsubscribe_form($profile)
-+{
-hunk ./lib/util.php 2211
--function common_profile_new_message_nudge ($cur, $profile) {
-+function common_profile_new_message_nudge ($cur, $profile)
-+{
-hunk ./lib/util.php 2229
--function common_cache_key($extra) {
-+function common_cache_key($extra)
-+{
-hunk ./lib/util.php 2234
--function common_keyize($str) {
-+function common_keyize($str)
-+{
-hunk ./lib/util.php 2241
--function common_message_form($content, $user, $to) {
-+function common_message_form($content, $user, $to)
-+{
-hunk ./lib/util.php 2282
--function common_memcache() {
-+function common_memcache()
-+{
-hunk ./lib/util.php 2303
--function common_compatible_license($from, $to) {
-+function common_compatible_license($from, $to)
-+{
-hunk ./lib/util.php 2311
--function common_block_form($profile, $args=null) {
-+function common_block_form($profile, $args=null)
-+{
-hunk ./lib/util.php 2316
--function common_unblock_form($profile, $args=null) {
-+function common_unblock_form($profile, $args=null)
-+{
-hunk ./lib/util.php 2321
--function common_blocking_form($type, $label, $profile, $args=null) {
-+function common_blocking_form($type, $label, $profile, $args=null)
-+{
-hunk ./lib/xmppqueuehandler.php 33
-- function start() {
-+ function start()
-+ {
-hunk ./lib/xmppqueuehandler.php 47
-- function handle_reconnect(&$pl) {
-+ function handle_reconnect(&$pl)
-+ {
-hunk ./lib/xmppqueuehandler.php 53
-- function idle($timeout=0) {
-+ function idle($timeout=0)
-+ {
-hunk ./lib/xmppqueuehandler.php 66
-- function forward_message(&$pl) {
-+ function forward_message(&$pl)
-+ {
-hunk ./lib/xmppqueuehandler.php 81
-- function ofrom($from) {
-+ function ofrom($from)
-+ {
-hunk ./lib/xmppqueuehandler.php 89
-- function listener() {
-+ function listener()
-+ {
-hunk ./scripts/enjitqueuehandler.php 38
-- function transport() {
-+ function transport()
-+ {
-hunk ./scripts/enjitqueuehandler.php 43
-- function start() {
-+ function start()
-+ {
-hunk ./scripts/enjitqueuehandler.php 50
-- function handle_notice($notice) {
-+ function handle_notice($notice)
-+ {
-hunk ./scripts/jabberqueuehandler.php 40
-- function transport() {
-+ function transport()
-+ {
-hunk ./scripts/jabberqueuehandler.php 45
-- function handle_notice($notice) {
-+ function handle_notice($notice)
-+ {
-hunk ./scripts/maildaemon.php 39
-- function __construct() {
-+ function __construct()
-+ {
-hunk ./scripts/maildaemon.php 43
-- function handle_message($fname='php://stdin') {
-+ function handle_message($fname='php://stdin')
-+ {
-hunk ./scripts/maildaemon.php 71
-- function error($from, $msg) {
-+ function error($from, $msg)
-+ {
-hunk ./scripts/maildaemon.php 77
-- function user_from($from_hdr) {
-+ function user_from($from_hdr)
-+ {
-hunk ./scripts/maildaemon.php 92
-- function user_match_to($user, $to_hdr) {
-+ function user_match_to($user, $to_hdr)
-+ {
-hunk ./scripts/maildaemon.php 104
-- function handle_command($user, $from, $msg) {
-+ function handle_command($user, $from, $msg)
-+ {
-hunk ./scripts/maildaemon.php 115
-- function respond($from, $to, $response) {
-+ function respond($from, $to, $response)
-+ {
-hunk ./scripts/maildaemon.php 125
-- function log($level, $msg) {
-+ function log($level, $msg)
-+ {
-hunk ./scripts/maildaemon.php 130
-- function add_notice($user, $msg) {
-+ function add_notice($user, $msg)
-+ {
-hunk ./scripts/maildaemon.php 145
-- function parse_message($fname) {
-+ function parse_message($fname)
-+ {
-hunk ./scripts/maildaemon.php 179
-- function unsupported_type($type) {
-+ function unsupported_type($type)
-+ {
-hunk ./scripts/maildaemon.php 184
-- function cleanup_msg($msg) {
-+ function cleanup_msg($msg)
-+ {
-hunk ./scripts/ombqueuehandler.php 38
-- function transport() {
-+ function transport()
-+ {
-hunk ./scripts/ombqueuehandler.php 43
-- function start() {
-+ function start()
-+ {
-hunk ./scripts/ombqueuehandler.php 49
-- function handle_notice($notice) {
-+ function handle_notice($notice)
-+ {
-hunk ./scripts/ombqueuehandler.php 59
-- function finish() {
-+ function finish()
-+ {
-hunk ./scripts/ombqueuehandler.php 63
-- function is_remote($notice) {
-+ function is_remote($notice)
-+ {
-hunk ./scripts/publicqueuehandler.php 38
-- function transport() {
-+ function transport()
-+ {
-hunk ./scripts/publicqueuehandler.php 43
-- function handle_notice($notice) {
-+ function handle_notice($notice)
-+ {
-hunk ./scripts/sitemap.php 21
--function index_map() {
-+function index_map()
-+{
-hunk ./scripts/sitemap.php 44
--function standard_map() {
-+function standard_map()
-+{
-hunk ./scripts/sitemap.php 82
--function notices_map() {
-+function notices_map()
-+{
-hunk ./scripts/sitemap.php 121
--function user_map() {
-+function user_map()
-+{
-hunk ./scripts/sitemap.php 215
--function url($url_args) {
-+function url($url_args)
-+{
-hunk ./scripts/sitemap.php 246
--function sitemap($sitemap_args) {
-+function sitemap($sitemap_args)
-+{
-hunk ./scripts/sitemap.php 268
--function urlset($urlset_text) {
-+function urlset($urlset_text)
-+{
-hunk ./scripts/sitemap.php 279
--function sitemapindex($sitemapindex_text) {
-+function sitemapindex($sitemapindex_text)
-+{
-hunk ./scripts/sitemap.php 290
--function array_to_map($url_list, $filename_prefix) {
-+function array_to_map($url_list, $filename_prefix)
-+{
-hunk ./scripts/sitemap.php 309
--function parse_args() {
-+function parse_args()
-+{
-hunk ./scripts/sitemap.php 351
--function trailing_slash($path) {
-+function trailing_slash($path)
-+{
-hunk ./scripts/sitemap.php 361
--function write_file($path, $data) {
-+function write_file($path, $data)
-+{
-hunk ./scripts/sitemap.php 379
--function error ($error_msg) {
-+function error ($error_msg)
-+{
-hunk ./scripts/smsqueuehandler.php 38
-- function transport() {
-+ function transport()
-+ {
-hunk ./scripts/smsqueuehandler.php 43
-- function start() {
-+ function start()
-+ {
-hunk ./scripts/smsqueuehandler.php 49
-- function handle_notice($notice) {
-+ function handle_notice($notice)
-+ {
-hunk ./scripts/smsqueuehandler.php 54
-- function finish() {
-+ function finish()
-+ {
-hunk ./scripts/xmppconfirmhandler.php 42
-- function class_name() {
-+ function class_name()
-+ {
-hunk ./scripts/xmppconfirmhandler.php 47
-- function run() {
-+ function run()
-+ {
-hunk ./scripts/xmppconfirmhandler.php 104
-- function next_confirm() {
-+ function next_confirm()
-+ {
-hunk ./scripts/xmppconfirmhandler.php 131
-- function clear_old_confirm_claims() {
-+ function clear_old_confirm_claims()
-+ {
-hunk ./scripts/xmppdaemon.php 42
-- function XMPPDaemon($resource=null) {
-+ function XMPPDaemon($resource=null)
-+ {
-hunk ./scripts/xmppdaemon.php 60
-- function connect() {
-+ function connect()
-+ {
-hunk ./scripts/xmppdaemon.php 80
-- function name() {
-+ function name()
-+ {
-hunk ./scripts/xmppdaemon.php 85
-- function run() {
-+ function run()
-+ {
-hunk ./scripts/xmppdaemon.php 97
-- function handle_reconnect(&$pl) {
-+ function handle_reconnect(&$pl)
-+ {
-hunk ./scripts/xmppdaemon.php 103
-- function get_user($from) {
-+ function get_user($from)
-+ {
-hunk ./scripts/xmppdaemon.php 109
-- function handle_message(&$pl) {
-+ function handle_message(&$pl)
-+ {
-hunk ./scripts/xmppdaemon.php 166
-- function is_self($from) {
-+ function is_self($from)
-+ {
-hunk ./scripts/xmppdaemon.php 171
-- function get_ofrom($pl) {
-+ function get_ofrom($pl)
-+ {
-hunk ./scripts/xmppdaemon.php 206
-- function is_autoreply($txt) {
-+ function is_autoreply($txt)
-+ {
-hunk ./scripts/xmppdaemon.php 215
-- function is_otr($txt) {
-+ function is_otr($txt)
-+ {
-hunk ./scripts/xmppdaemon.php 224
-- function is_direct($txt) {
-+ function is_direct($txt)
-+ {
-hunk ./scripts/xmppdaemon.php 233
-- function from_site($address, $msg) {
-+ function from_site($address, $msg)
-+ {
-hunk ./scripts/xmppdaemon.php 239
-- function handle_command($user, $body) {
-+ function handle_command($user, $body)
-+ {
-hunk ./scripts/xmppdaemon.php 252
-- function add_notice(&$user, &$pl) {
-+ function add_notice(&$user, &$pl)
-+ {
-hunk ./scripts/xmppdaemon.php 275
-- function handle_presence(&$pl) {
-+ function handle_presence(&$pl)
-+ {
-hunk ./scripts/xmppdaemon.php 310
-- function log($level, $msg) {
-+ function log($level, $msg)
-+ {
-hunk ./scripts/xmppdaemon.php 315
-- function subscribed($to) {
-+ function subscribed($to)
-+ {
+-function common_dropdown($id, $label, $content, $instructions=null, $blank_select=FALSE, $selected=null)
++function common_dropdown($id, $label, $content, $instructions=null, $blank_select=false, $selected=null)
+hunk ./lib/util.php 1021
+- if ($recipient->find(TRUE)) {
++ if ($recipient->find(true)) {
+hunk ./lib/util.php 1031
+- if ($recipient->find(TRUE)) {
++ if ($recipient->find(true)) {
+hunk ./lib/util.php 2261
+- common_dropdown('to', _('To'), $mutual, null, FALSE, $to->id);
++ common_dropdown('to', _('To'), $mutual, null, false, $to->id);
+hunk ./scripts/sitemap.php 334
+- if (is_writable($output_dir) === FALSE) {
++ if (is_writable($output_dir) === false) {
+hunk ./scripts/sitemap.php 369
+- if (($fh_out = fopen($path,'w')) === FALSE) {
++ if (($fh_out = fopen($path,'w')) === false) {
+hunk ./scripts/sitemap.php 373
+- if (fwrite($fh_out, $data) === FALSE) {
++ if (fwrite($fh_out, $data) === false) {
+hunk ./scripts/xmppconfirmhandler.php 113
+- if ($confirm->find(TRUE)) {
++ if ($confirm->find(true)) {