From: Evan Prodromou <evan@prodromou.name>
Date: Tue, 23 Dec 2008 19:49:23 +0000 (-0500)
Subject: move opening brace of class declaration to next line
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b264c03d32d04d7a33d28a5830848660f4484943;p=quix0rs-gnu-social.git

move opening brace of class declaration to next line

Another gigantor PEAR coding standards patch. Here, I've moved the
opening curly bracket on a class statement to the following line.

darcs-hash:20081223194923-84dde-77a93de314caadbcb5b70bf346a4648be77a864e.gz
---

diff --git a/_darcs/inventory b/_darcs/inventory
index 0c5a7d9b50..347e0fb3fd 100644
--- a/_darcs/inventory
+++ b/_darcs/inventory
@@ -85,4 +85,11 @@ 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.
  
+] 
+[move opening brace of class declaration to next line
+Evan Prodromou <evan@prodromou.name>**20081223194923
+ 
+ Another gigantor PEAR coding standards patch. Here, I've moved the
+ opening curly bracket on a class statement to the following line.
+ 
 ] 
\ No newline at end of file
diff --git a/_darcs/patches/20081223194923-84dde-77a93de314caadbcb5b70bf346a4648be77a864e.gz b/_darcs/patches/20081223194923-84dde-77a93de314caadbcb5b70bf346a4648be77a864e.gz
new file mode 100644
index 0000000000..6675082793
Binary files /dev/null and b/_darcs/patches/20081223194923-84dde-77a93de314caadbcb5b70bf346a4648be77a864e.gz differ
diff --git a/_darcs/pristine/actions/accesstoken.php b/_darcs/pristine/actions/accesstoken.php
index cab5425bfa..072ce27eb5 100644
--- a/_darcs/pristine/actions/accesstoken.php
+++ b/_darcs/pristine/actions/accesstoken.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class AccesstokenAction extends Action {
+class AccesstokenAction extends Action
+{
     function handle($args)
     {
         parent::handle($args);
diff --git a/_darcs/pristine/actions/all.php b/_darcs/pristine/actions/all.php
index 028a3679a4..526ac5f408 100644
--- a/_darcs/pristine/actions/all.php
+++ b/_darcs/pristine/actions/all.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/actions/showstream.php');
 
-class AllAction extends StreamAction {
+class AllAction extends StreamAction
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/allrss.php b/_darcs/pristine/actions/allrss.php
index 9c20cd4163..660afb9e2d 100644
--- a/_darcs/pristine/actions/allrss.php
+++ b/_darcs/pristine/actions/allrss.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class AllrssAction extends Rss10Action {
+class AllrssAction extends Rss10Action
+{
 
     var $user = null;
 
diff --git a/_darcs/pristine/actions/api.php b/_darcs/pristine/actions/api.php
index 8ccd86f0bb..dfdefe3b09 100644
--- a/_darcs/pristine/actions/api.php
+++ b/_darcs/pristine/actions/api.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class ApiAction extends Action {
+class ApiAction extends Action
+{
 
     var $user;
     var $content_type;
diff --git a/_darcs/pristine/actions/avatarbynickname.php b/_darcs/pristine/actions/avatarbynickname.php
index 4aeb4112ae..666f386f66 100644
--- a/_darcs/pristine/actions/avatarbynickname.php
+++ b/_darcs/pristine/actions/avatarbynickname.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class AvatarbynicknameAction extends Action {
+class AvatarbynicknameAction extends Action
+{
     function handle($args)
     {
         parent::handle($args);
diff --git a/_darcs/pristine/actions/block.php b/_darcs/pristine/actions/block.php
index 702adcffae..c1ff7c0446 100644
--- a/_darcs/pristine/actions/block.php
+++ b/_darcs/pristine/actions/block.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class BlockAction extends Action {
+class BlockAction extends Action
+{
 
     var $profile = null;
 
diff --git a/_darcs/pristine/actions/confirmaddress.php b/_darcs/pristine/actions/confirmaddress.php
index d926864a6c..1d5c53ff2e 100644
--- a/_darcs/pristine/actions/confirmaddress.php
+++ b/_darcs/pristine/actions/confirmaddress.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class ConfirmaddressAction extends Action {
+class ConfirmaddressAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/deletenotice.php b/_darcs/pristine/actions/deletenotice.php
index 4f00db6174..e9b4b32549 100644
--- a/_darcs/pristine/actions/deletenotice.php
+++ b/_darcs/pristine/actions/deletenotice.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/deleteaction.php');
 
-class DeletenoticeAction extends DeleteAction {
+class DeletenoticeAction extends DeleteAction
+{
     function handle($args)
     {
         parent::handle($args);
diff --git a/_darcs/pristine/actions/deleteprofile.php b/_darcs/pristine/actions/deleteprofile.php
index b1c346cb22..e12fe131a7 100644
--- a/_darcs/pristine/actions/deleteprofile.php
+++ b/_darcs/pristine/actions/deleteprofile.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class DeleteprofileAction extends Action {
+class DeleteprofileAction extends Action
+{
     function handle($args)
     {
         parent::handle($args);
diff --git a/_darcs/pristine/actions/disfavor.php b/_darcs/pristine/actions/disfavor.php
index f0b5284531..74aae86cc7 100644
--- a/_darcs/pristine/actions/disfavor.php
+++ b/_darcs/pristine/actions/disfavor.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class DisfavorAction extends Action {
+class DisfavorAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/doc.php b/_darcs/pristine/actions/doc.php
index 441ac19a7b..856025e665 100644
--- a/_darcs/pristine/actions/doc.php
+++ b/_darcs/pristine/actions/doc.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class DocAction extends Action {
+class DocAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/emailsettings.php b/_darcs/pristine/actions/emailsettings.php
index 7f08efd29a..3fa8ce2968 100644
--- a/_darcs/pristine/actions/emailsettings.php
+++ b/_darcs/pristine/actions/emailsettings.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 
-class EmailsettingsAction extends SettingsAction {
+class EmailsettingsAction extends SettingsAction
+{
 
     function get_instructions()
     {
diff --git a/_darcs/pristine/actions/facebookhome.php b/_darcs/pristine/actions/facebookhome.php
index 006f35eca8..dcdb102e65 100644
--- a/_darcs/pristine/actions/facebookhome.php
+++ b/_darcs/pristine/actions/facebookhome.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/facebookaction.php');
 
-class FacebookhomeAction extends FacebookAction {
+class FacebookhomeAction extends FacebookAction
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/facebookinvite.php b/_darcs/pristine/actions/facebookinvite.php
index fc226e65ae..48a820e44b 100644
--- a/_darcs/pristine/actions/facebookinvite.php
+++ b/_darcs/pristine/actions/facebookinvite.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/facebookaction.php');
 
-class FacebookinviteAction extends FacebookAction {
+class FacebookinviteAction extends FacebookAction
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/facebookremove.php b/_darcs/pristine/actions/facebookremove.php
index 79dc32e497..a200fefbfe 100644
--- a/_darcs/pristine/actions/facebookremove.php
+++ b/_darcs/pristine/actions/facebookremove.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/facebookaction.php');
 
-class FacebookremoveAction extends FacebookAction {
+class FacebookremoveAction extends FacebookAction
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/facebooksettings.php b/_darcs/pristine/actions/facebooksettings.php
index 03ad578137..38542d4b6f 100644
--- a/_darcs/pristine/actions/facebooksettings.php
+++ b/_darcs/pristine/actions/facebooksettings.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/facebookaction.php');
 
-class FacebooksettingsAction extends FacebookAction {
+class FacebooksettingsAction extends FacebookAction
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/favor.php b/_darcs/pristine/actions/favor.php
index 3ec4af0b5e..8103f8181b 100644
--- a/_darcs/pristine/actions/favor.php
+++ b/_darcs/pristine/actions/favor.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/mail.php');
 
-class FavorAction extends Action {
+class FavorAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/favorited.php b/_darcs/pristine/actions/favorited.php
index d479e1b3e4..71a9e026e5 100644
--- a/_darcs/pristine/actions/favorited.php
+++ b/_darcs/pristine/actions/favorited.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/stream.php');
 
-class FavoritedAction extends StreamAction {
+class FavoritedAction extends StreamAction
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/favoritesrss.php b/_darcs/pristine/actions/favoritesrss.php
index aa8a3c6f4d..8c7ce52bf1 100644
--- a/_darcs/pristine/actions/favoritesrss.php
+++ b/_darcs/pristine/actions/favoritesrss.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class FavoritesrssAction extends Rss10Action {
+class FavoritesrssAction extends Rss10Action
+{
 
     var $user = null;
     
diff --git a/_darcs/pristine/actions/featured.php b/_darcs/pristine/actions/featured.php
index 1763adeab1..2bf8b0b815 100644
--- a/_darcs/pristine/actions/featured.php
+++ b/_darcs/pristine/actions/featured.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/stream.php');
 require_once(INSTALLDIR.'/lib/profilelist.php');
 
-class FeaturedAction extends StreamAction {
+class FeaturedAction extends StreamAction
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/finishaddopenid.php b/_darcs/pristine/actions/finishaddopenid.php
index d8409b6e99..0ce1680aa6 100644
--- a/_darcs/pristine/actions/finishaddopenid.php
+++ b/_darcs/pristine/actions/finishaddopenid.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
-class FinishaddopenidAction extends Action {
+class FinishaddopenidAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/finishimmediate.php b/_darcs/pristine/actions/finishimmediate.php
index c4a1c1af9b..0964c39f44 100644
--- a/_darcs/pristine/actions/finishimmediate.php
+++ b/_darcs/pristine/actions/finishimmediate.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
-class FinishimmediateAction extends Action {
+class FinishimmediateAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/finishopenidlogin.php b/_darcs/pristine/actions/finishopenidlogin.php
index eb52d73b18..bdb8516a32 100644
--- a/_darcs/pristine/actions/finishopenidlogin.php
+++ b/_darcs/pristine/actions/finishopenidlogin.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
-class FinishopenidloginAction extends Action {
+class FinishopenidloginAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/finishremotesubscribe.php b/_darcs/pristine/actions/finishremotesubscribe.php
index 5aace4fa95..cee3a18187 100644
--- a/_darcs/pristine/actions/finishremotesubscribe.php
+++ b/_darcs/pristine/actions/finishremotesubscribe.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class FinishremotesubscribeAction extends Action {
+class FinishremotesubscribeAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/foaf.php b/_darcs/pristine/actions/foaf.php
index 27548bfffe..30e98960c1 100644
--- a/_darcs/pristine/actions/foaf.php
+++ b/_darcs/pristine/actions/foaf.php
@@ -23,7 +23,8 @@ define('LISTENER', 1);
 define('LISTENEE', -1);
 define('BOTH', 0);
 
-class FoafAction extends Action {
+class FoafAction extends Action
+{
 
     function is_readonly()
     {
diff --git a/_darcs/pristine/actions/imsettings.php b/_darcs/pristine/actions/imsettings.php
index 56fb147588..8ecf200ec9 100644
--- a/_darcs/pristine/actions/imsettings.php
+++ b/_darcs/pristine/actions/imsettings.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 require_once(INSTALLDIR.'/lib/jabber.php');
 
-class ImsettingsAction extends SettingsAction {
+class ImsettingsAction extends SettingsAction
+{
 
     function get_instructions()
     {
diff --git a/_darcs/pristine/actions/invite.php b/_darcs/pristine/actions/invite.php
index b0fc799589..80e022a3df 100644
--- a/_darcs/pristine/actions/invite.php
+++ b/_darcs/pristine/actions/invite.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class InviteAction extends Action {
+class InviteAction extends Action
+{
 
     function is_readonly()
     {
diff --git a/_darcs/pristine/actions/login.php b/_darcs/pristine/actions/login.php
index 6ad07b6106..8600d44fd3 100644
--- a/_darcs/pristine/actions/login.php
+++ b/_darcs/pristine/actions/login.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class LoginAction extends Action {
+class LoginAction extends Action
+{
 
     function is_readonly()
     {
diff --git a/_darcs/pristine/actions/logout.php b/_darcs/pristine/actions/logout.php
index effb5abbe9..201378730d 100644
--- a/_darcs/pristine/actions/logout.php
+++ b/_darcs/pristine/actions/logout.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
-class LogoutAction extends Action {
+class LogoutAction extends Action
+{
     
     function is_readonly()
     {
diff --git a/_darcs/pristine/actions/microsummary.php b/_darcs/pristine/actions/microsummary.php
index a19a26dcf4..13ddc4e3ed 100644
--- a/_darcs/pristine/actions/microsummary.php
+++ b/_darcs/pristine/actions/microsummary.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class MicrosummaryAction extends Action {
+class MicrosummaryAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/newmessage.php b/_darcs/pristine/actions/newmessage.php
index 0a537ad2d3..27fa9d5182 100644
--- a/_darcs/pristine/actions/newmessage.php
+++ b/_darcs/pristine/actions/newmessage.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class NewmessageAction extends Action {
+class NewmessageAction extends Action
+{
     
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/newnotice.php b/_darcs/pristine/actions/newnotice.php
index 1f6117c1e9..c412e893de 100644
--- a/_darcs/pristine/actions/newnotice.php
+++ b/_darcs/pristine/actions/newnotice.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR . '/lib/noticelist.php';
 
-class NewnoticeAction extends Action {
+class NewnoticeAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/noticesearch.php b/_darcs/pristine/actions/noticesearch.php
index 782c8fe98d..b36fc8ad20 100644
--- a/_darcs/pristine/actions/noticesearch.php
+++ b/_darcs/pristine/actions/noticesearch.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/searchaction.php');
 
 # XXX common parent for people and content search?
 
-class NoticesearchAction extends SearchAction {
+class NoticesearchAction extends SearchAction
+{
 
     function get_instructions()
     {
diff --git a/_darcs/pristine/actions/noticesearchrss.php b/_darcs/pristine/actions/noticesearchrss.php
index c41d348733..20fe0ff2ab 100644
--- a/_darcs/pristine/actions/noticesearchrss.php
+++ b/_darcs/pristine/actions/noticesearchrss.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class NoticesearchrssAction extends Rss10Action {
+class NoticesearchrssAction extends Rss10Action
+{
 
     function init()
     {
diff --git a/_darcs/pristine/actions/nudge.php b/_darcs/pristine/actions/nudge.php
index e0268e9d00..a6480a5827 100644
--- a/_darcs/pristine/actions/nudge.php
+++ b/_darcs/pristine/actions/nudge.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/mail.php');
 
-class NudgeAction extends Action {
+class NudgeAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/openidlogin.php b/_darcs/pristine/actions/openidlogin.php
index b8681215ef..09679e372e 100644
--- a/_darcs/pristine/actions/openidlogin.php
+++ b/_darcs/pristine/actions/openidlogin.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
-class OpenidloginAction extends Action {
+class OpenidloginAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/openidsettings.php b/_darcs/pristine/actions/openidsettings.php
index ce4143d41c..039236048a 100644
--- a/_darcs/pristine/actions/openidsettings.php
+++ b/_darcs/pristine/actions/openidsettings.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 require_once(INSTALLDIR.'/lib/openid.php');
 
-class OpenidsettingsAction extends SettingsAction {
+class OpenidsettingsAction extends SettingsAction
+{
 
     function get_instructions()
     {
diff --git a/_darcs/pristine/actions/opensearch.php b/_darcs/pristine/actions/opensearch.php
index f9c6f4c572..96691fa6f3 100644
--- a/_darcs/pristine/actions/opensearch.php
+++ b/_darcs/pristine/actions/opensearch.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class OpensearchAction extends Action {
+class OpensearchAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/othersettings.php b/_darcs/pristine/actions/othersettings.php
index dc1bcd02bc..c2f08934c0 100644
--- a/_darcs/pristine/actions/othersettings.php
+++ b/_darcs/pristine/actions/othersettings.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 
-class OthersettingsAction extends SettingsAction {
+class OthersettingsAction extends SettingsAction
+{
 
     function get_instructions()
     {
diff --git a/_darcs/pristine/actions/peoplesearch.php b/_darcs/pristine/actions/peoplesearch.php
index 6d3f6a73f4..0d0fae4e5c 100644
--- a/_darcs/pristine/actions/peoplesearch.php
+++ b/_darcs/pristine/actions/peoplesearch.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/searchaction.php');
 require_once(INSTALLDIR.'/lib/profilelist.php');
 
-class PeoplesearchAction extends SearchAction {
+class PeoplesearchAction extends SearchAction
+{
 
     function get_instructions()
     {
@@ -69,7 +70,8 @@ class PeoplesearchAction extends SearchAction {
     }
 }
 
-class PeopleSearchResults extends ProfileList {
+class PeopleSearchResults extends ProfileList
+{
 
     var $terms = null;
     var $pattern = null;
diff --git a/_darcs/pristine/actions/peopletag.php b/_darcs/pristine/actions/peopletag.php
index c7e4630261..13a0b7a413 100644
--- a/_darcs/pristine/actions/peopletag.php
+++ b/_darcs/pristine/actions/peopletag.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/profilelist.php');
 
-class PeopletagAction extends Action {
+class PeopletagAction extends Action
+{
     
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/postnotice.php b/_darcs/pristine/actions/postnotice.php
index 8b0781dfd4..dec62a678f 100644
--- a/_darcs/pristine/actions/postnotice.php
+++ b/_darcs/pristine/actions/postnotice.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class PostnoticeAction extends Action {
+class PostnoticeAction extends Action
+{
     function handle($args)
     {
         parent::handle($args);
diff --git a/_darcs/pristine/actions/profilesettings.php b/_darcs/pristine/actions/profilesettings.php
index beb9979d05..6c22a7933f 100644
--- a/_darcs/pristine/actions/profilesettings.php
+++ b/_darcs/pristine/actions/profilesettings.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 
-class ProfilesettingsAction extends SettingsAction {
+class ProfilesettingsAction extends SettingsAction
+{
 
     function get_instructions()
     {
diff --git a/_darcs/pristine/actions/public.php b/_darcs/pristine/actions/public.php
index 62be3da998..039e885e6b 100644
--- a/_darcs/pristine/actions/public.php
+++ b/_darcs/pristine/actions/public.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/stream.php');
 
-class PublicAction extends StreamAction {
+class PublicAction extends StreamAction
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/publicrss.php b/_darcs/pristine/actions/publicrss.php
index 8e554122e0..822bc2db76 100644
--- a/_darcs/pristine/actions/publicrss.php
+++ b/_darcs/pristine/actions/publicrss.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class PublicrssAction extends Rss10Action {
+class PublicrssAction extends Rss10Action
+{
 
     function init()
     {
diff --git a/_darcs/pristine/actions/publicxrds.php b/_darcs/pristine/actions/publicxrds.php
index 63c80d81e1..3d731d79fa 100644
--- a/_darcs/pristine/actions/publicxrds.php
+++ b/_darcs/pristine/actions/publicxrds.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/openid.php');
 
 # XXX: factor out similarities with XrdsAction
 
-class PublicxrdsAction extends Action {
+class PublicxrdsAction extends Action
+{
 
     function is_readonly()
     {
diff --git a/_darcs/pristine/actions/recoverpassword.php b/_darcs/pristine/actions/recoverpassword.php
index a482d47110..bb6ef81d60 100644
--- a/_darcs/pristine/actions/recoverpassword.php
+++ b/_darcs/pristine/actions/recoverpassword.php
@@ -23,7 +23,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 define(MAX_RECOVERY_TIME, 24 * 60 * 60);
 
-class RecoverpasswordAction extends Action {
+class RecoverpasswordAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/register.php b/_darcs/pristine/actions/register.php
index 444e67e357..ac14879e25 100644
--- a/_darcs/pristine/actions/register.php
+++ b/_darcs/pristine/actions/register.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class RegisterAction extends Action {
+class RegisterAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/remotesubscribe.php b/_darcs/pristine/actions/remotesubscribe.php
index 02c0268496..a9494772eb 100644
--- a/_darcs/pristine/actions/remotesubscribe.php
+++ b/_darcs/pristine/actions/remotesubscribe.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class RemotesubscribeAction extends Action {
+class RemotesubscribeAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/replies.php b/_darcs/pristine/actions/replies.php
index da2f27f31f..eceeb4d650 100644
--- a/_darcs/pristine/actions/replies.php
+++ b/_darcs/pristine/actions/replies.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/actions/showstream.php');
 
-class RepliesAction extends StreamAction {
+class RepliesAction extends StreamAction
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/repliesrss.php b/_darcs/pristine/actions/repliesrss.php
index 19ab0866a3..5f85f8d2e8 100644
--- a/_darcs/pristine/actions/repliesrss.php
+++ b/_darcs/pristine/actions/repliesrss.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class RepliesrssAction extends Rss10Action {
+class RepliesrssAction extends Rss10Action
+{
 
     var $user = null;
 
diff --git a/_darcs/pristine/actions/requesttoken.php b/_darcs/pristine/actions/requesttoken.php
index 0918467566..a745487393 100644
--- a/_darcs/pristine/actions/requesttoken.php
+++ b/_darcs/pristine/actions/requesttoken.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class RequesttokenAction extends Action {
+class RequesttokenAction extends Action
+{
     
     function is_readonly()
     {
diff --git a/_darcs/pristine/actions/showfavorites.php b/_darcs/pristine/actions/showfavorites.php
index 8131cac676..f4344833d9 100644
--- a/_darcs/pristine/actions/showfavorites.php
+++ b/_darcs/pristine/actions/showfavorites.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/actions/showstream.php');
 
-class ShowfavoritesAction extends StreamAction {
+class ShowfavoritesAction extends StreamAction
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/showmessage.php b/_darcs/pristine/actions/showmessage.php
index b706fe2fa5..25330a568f 100644
--- a/_darcs/pristine/actions/showmessage.php
+++ b/_darcs/pristine/actions/showmessage.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/mailbox.php');
 
-class ShowmessageAction extends MailboxAction {
+class ShowmessageAction extends MailboxAction
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/shownotice.php b/_darcs/pristine/actions/shownotice.php
index abdaa72cac..2df09cb3fc 100644
--- a/_darcs/pristine/actions/shownotice.php
+++ b/_darcs/pristine/actions/shownotice.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/stream.php');
 
-class ShownoticeAction extends StreamAction {
+class ShownoticeAction extends StreamAction
+{
 
     var $notice = null;
     var $profile = null;
diff --git a/_darcs/pristine/actions/showstream.php b/_darcs/pristine/actions/showstream.php
index c31bce87ab..e4e5d96d15 100644
--- a/_darcs/pristine/actions/showstream.php
+++ b/_darcs/pristine/actions/showstream.php
@@ -24,7 +24,8 @@ require_once(INSTALLDIR.'/lib/stream.php');
 define('SUBSCRIPTIONS_PER_ROW', 4);
 define('SUBSCRIPTIONS', 80);
 
-class ShowstreamAction extends StreamAction {
+class ShowstreamAction extends StreamAction
+{
 
     function handle($args)
     {
@@ -449,14 +450,16 @@ class ShowstreamAction extends StreamAction {
 
 # We don't show the author for a profile, since we already know who it is!
 
-class ProfileNoticeList extends NoticeList {
+class ProfileNoticeList extends NoticeList
+{
     function newListItem($notice)
     {
         return new ProfileNoticeListItem($notice);
     }
 }
 
-class ProfileNoticeListItem extends NoticeListItem {
+class ProfileNoticeListItem extends NoticeListItem
+{
     function showAuthor()
     {
         return;
diff --git a/_darcs/pristine/actions/smssettings.php b/_darcs/pristine/actions/smssettings.php
index 444da25902..fad71135cc 100644
--- a/_darcs/pristine/actions/smssettings.php
+++ b/_darcs/pristine/actions/smssettings.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 require_once(INSTALLDIR.'/actions/emailsettings.php');
 
-class SmssettingsAction extends EmailsettingsAction {
+class SmssettingsAction extends EmailsettingsAction
+{
 
     function get_instructions()
     {
diff --git a/_darcs/pristine/actions/subedit.php b/_darcs/pristine/actions/subedit.php
index 8741028573..1142b7a032 100644
--- a/_darcs/pristine/actions/subedit.php
+++ b/_darcs/pristine/actions/subedit.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SubeditAction extends Action {
+class SubeditAction extends Action
+{
 
     var $profile = null;
 
diff --git a/_darcs/pristine/actions/subscribe.php b/_darcs/pristine/actions/subscribe.php
index 93884f0818..f33d1d2077 100644
--- a/_darcs/pristine/actions/subscribe.php
+++ b/_darcs/pristine/actions/subscribe.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SubscribeAction extends Action {
+class SubscribeAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/subscribers.php b/_darcs/pristine/actions/subscribers.php
index 8c7805f51f..31d0468d90 100644
--- a/_darcs/pristine/actions/subscribers.php
+++ b/_darcs/pristine/actions/subscribers.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/gallery.php');
 
-class SubscribersAction extends GalleryAction {
+class SubscribersAction extends GalleryAction
+{
 
     function gallery_type()
     {
@@ -59,7 +60,8 @@ class SubscribersAction extends GalleryAction {
     }
 }
 
-class SubscribersList extends ProfileList {
+class SubscribersList extends ProfileList
+{
     function show_owner_controls($profile)
     {
         common_block_form($profile, array('action' => 'subscribers',
diff --git a/_darcs/pristine/actions/subscriptions.php b/_darcs/pristine/actions/subscriptions.php
index ad4a3f9e51..afe8fb2609 100644
--- a/_darcs/pristine/actions/subscriptions.php
+++ b/_darcs/pristine/actions/subscriptions.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/gallery.php');
 
-class SubscriptionsAction extends GalleryAction {
+class SubscriptionsAction extends GalleryAction
+{
 
     function gallery_type()
     {
@@ -59,7 +60,8 @@ class SubscriptionsAction extends GalleryAction {
     }
 }
 
-class SubscriptionsList extends ProfileList {
+class SubscriptionsList extends ProfileList
+{
 
     function show_owner_controls($profile)
     {
diff --git a/_darcs/pristine/actions/sup.php b/_darcs/pristine/actions/sup.php
index 2a139b3221..6a1897585a 100644
--- a/_darcs/pristine/actions/sup.php
+++ b/_darcs/pristine/actions/sup.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SupAction extends Action {
+class SupAction extends Action
+{
     
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/tag.php b/_darcs/pristine/actions/tag.php
index d7b35d6136..8a3f90c16a 100644
--- a/_darcs/pristine/actions/tag.php
+++ b/_darcs/pristine/actions/tag.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/actions/showstream.php');
 define('TAGS_PER_PAGE', 100);
 
-class TagAction extends StreamAction {
+class TagAction extends StreamAction
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/tagother.php b/_darcs/pristine/actions/tagother.php
index ed17ac531f..ff6788cc62 100644
--- a/_darcs/pristine/actions/tagother.php
+++ b/_darcs/pristine/actions/tagother.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 
-class TagotherAction extends Action {
+class TagotherAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/tagrss.php b/_darcs/pristine/actions/tagrss.php
index bb4edf4730..912d71413d 100644
--- a/_darcs/pristine/actions/tagrss.php
+++ b/_darcs/pristine/actions/tagrss.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class TagrssAction extends Rss10Action {
+class TagrssAction extends Rss10Action
+{
 
     function init()
     {
diff --git a/_darcs/pristine/actions/twitapiaccount.php b/_darcs/pristine/actions/twitapiaccount.php
index d5e9143c26..79e1ed990d 100644
--- a/_darcs/pristine/actions/twitapiaccount.php
+++ b/_darcs/pristine/actions/twitapiaccount.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapiaccountAction extends TwitterapiAction {
+class TwitapiaccountAction extends TwitterapiAction
+{
 
     function verify_credentials($args, $apidata)
     {
diff --git a/_darcs/pristine/actions/twitapiblocks.php b/_darcs/pristine/actions/twitapiblocks.php
index 2170141f1f..5d64f2f7d8 100644
--- a/_darcs/pristine/actions/twitapiblocks.php
+++ b/_darcs/pristine/actions/twitapiblocks.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapiblocksAction extends TwitterapiAction {
+class TwitapiblocksAction extends TwitterapiAction
+{
 
     function create($args, $apidata)
     {
diff --git a/_darcs/pristine/actions/twitapidirect_messages.php b/_darcs/pristine/actions/twitapidirect_messages.php
index e9f7aa0bf1..e0731f66fb 100644
--- a/_darcs/pristine/actions/twitapidirect_messages.php
+++ b/_darcs/pristine/actions/twitapidirect_messages.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class Twitapidirect_messagesAction extends TwitterapiAction {
+class Twitapidirect_messagesAction extends TwitterapiAction
+{
 
     function direct_messages($args, $apidata)
     {
diff --git a/_darcs/pristine/actions/twitapifavorites.php b/_darcs/pristine/actions/twitapifavorites.php
index e7a43f7705..55e04732f5 100644
--- a/_darcs/pristine/actions/twitapifavorites.php
+++ b/_darcs/pristine/actions/twitapifavorites.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapifavoritesAction extends TwitterapiAction {
+class TwitapifavoritesAction extends TwitterapiAction
+{
 
     function favorites($args, $apidata)
     {
diff --git a/_darcs/pristine/actions/twitapifriendships.php b/_darcs/pristine/actions/twitapifriendships.php
index 5eca962983..ba4afe441e 100644
--- a/_darcs/pristine/actions/twitapifriendships.php
+++ b/_darcs/pristine/actions/twitapifriendships.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapifriendshipsAction extends TwitterapiAction {
+class TwitapifriendshipsAction extends TwitterapiAction
+{
 
     function create($args, $apidata)
     {
diff --git a/_darcs/pristine/actions/twitapihelp.php b/_darcs/pristine/actions/twitapihelp.php
index 27262f089a..1b84cb11bb 100644
--- a/_darcs/pristine/actions/twitapihelp.php
+++ b/_darcs/pristine/actions/twitapihelp.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapihelpAction extends TwitterapiAction {
+class TwitapihelpAction extends TwitterapiAction
+{
 
     /* Returns the string "ok" in the requested format with a 200 OK HTTP status code.
      * URL:http://identi.ca/api/help/test.format
diff --git a/_darcs/pristine/actions/twitapinotifications.php b/_darcs/pristine/actions/twitapinotifications.php
index e24d3829c1..a19d652c3d 100644
--- a/_darcs/pristine/actions/twitapinotifications.php
+++ b/_darcs/pristine/actions/twitapinotifications.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
 # This naming convention looks real sick
-class TwitapinotificationsAction extends TwitterapiAction {
+class TwitapinotificationsAction extends TwitterapiAction
+{
 
     function follow($args, $apidata)
     {
diff --git a/_darcs/pristine/actions/twitapistatuses.php b/_darcs/pristine/actions/twitapistatuses.php
index f280184c0a..e629d5cc41 100644
--- a/_darcs/pristine/actions/twitapistatuses.php
+++ b/_darcs/pristine/actions/twitapistatuses.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapistatusesAction extends TwitterapiAction {
+class TwitapistatusesAction extends TwitterapiAction
+{
 
     function public_timeline($args, $apidata)
     {
diff --git a/_darcs/pristine/actions/twitapiusers.php b/_darcs/pristine/actions/twitapiusers.php
index 4644e6be66..409986985c 100644
--- a/_darcs/pristine/actions/twitapiusers.php
+++ b/_darcs/pristine/actions/twitapiusers.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapiusersAction extends TwitterapiAction {
+class TwitapiusersAction extends TwitterapiAction
+{
 
     function show($args, $apidata)
     {
diff --git a/_darcs/pristine/actions/twittersettings.php b/_darcs/pristine/actions/twittersettings.php
index 1f55b31b62..26dede0ac2 100644
--- a/_darcs/pristine/actions/twittersettings.php
+++ b/_darcs/pristine/actions/twittersettings.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
 
 define('SUBSCRIPTIONS', 80);
 
-class TwittersettingsAction extends SettingsAction {
+class TwittersettingsAction extends SettingsAction
+{
 
     function get_instructions()
     {
diff --git a/_darcs/pristine/actions/unblock.php b/_darcs/pristine/actions/unblock.php
index 66ce0c879e..112304f71b 100644
--- a/_darcs/pristine/actions/unblock.php
+++ b/_darcs/pristine/actions/unblock.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class UnblockAction extends Action {
+class UnblockAction extends Action
+{
 
     var $profile = null;
 
diff --git a/_darcs/pristine/actions/unsubscribe.php b/_darcs/pristine/actions/unsubscribe.php
index e4e04aaa03..1c2e136359 100644
--- a/_darcs/pristine/actions/unsubscribe.php
+++ b/_darcs/pristine/actions/unsubscribe.php
@@ -17,7 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class UnsubscribeAction extends Action {
+class UnsubscribeAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/updateprofile.php b/_darcs/pristine/actions/updateprofile.php
index 2cfff1b516..abb034c81e 100644
--- a/_darcs/pristine/actions/updateprofile.php
+++ b/_darcs/pristine/actions/updateprofile.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class UpdateprofileAction extends Action {
+class UpdateprofileAction extends Action
+{
     
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/userauthorization.php b/_darcs/pristine/actions/userauthorization.php
index c73d515d37..05efbc16c7 100644
--- a/_darcs/pristine/actions/userauthorization.php
+++ b/_darcs/pristine/actions/userauthorization.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/omb.php');
 define('TIMESTAMP_THRESHOLD', 300);
 
-class UserauthorizationAction extends Action {
+class UserauthorizationAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/actions/userbyid.php b/_darcs/pristine/actions/userbyid.php
index d7b4088bde..d57ed21a54 100644
--- a/_darcs/pristine/actions/userbyid.php
+++ b/_darcs/pristine/actions/userbyid.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class UserbyidAction extends Action {
+class UserbyidAction extends Action
+{
     
     function is_readonly()
     {                
diff --git a/_darcs/pristine/actions/userrss.php b/_darcs/pristine/actions/userrss.php
index c758a44e2a..1e9fe121f0 100644
--- a/_darcs/pristine/actions/userrss.php
+++ b/_darcs/pristine/actions/userrss.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class UserrssAction extends Rss10Action {
+class UserrssAction extends Rss10Action
+{
 
     var $user = null;
 
diff --git a/_darcs/pristine/actions/xrds.php b/_darcs/pristine/actions/xrds.php
index 1d4961d465..7edc6aa39c 100644
--- a/_darcs/pristine/actions/xrds.php
+++ b/_darcs/pristine/actions/xrds.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class XrdsAction extends Action {
+class XrdsAction extends Action
+{
 
     function is_readonly()
     {                
diff --git a/_darcs/pristine/classes/Channel.php b/_darcs/pristine/classes/Channel.php
index 02ece9c0f5..2e3e4e8d4a 100644
--- a/_darcs/pristine/classes/Channel.php
+++ b/_darcs/pristine/classes/Channel.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class Channel {
+class Channel
+{
     
     function on($user)
     {
@@ -47,7 +48,8 @@ class Channel {
     }
 }
 
-class XMPPChannel extends Channel {
+class XMPPChannel extends Channel
+{
 
     var $conn = null;
     
@@ -104,7 +106,8 @@ class XMPPChannel extends Channel {
 }
 
 
-class WebChannel extends Channel {
+class WebChannel extends Channel
+{
 
     function source()
     {
@@ -138,7 +141,8 @@ class WebChannel extends Channel {
 }
 
 
-class AjaxWebChannel extends WebChannel {
+class AjaxWebChannel extends WebChannel
+{
 
     function output($user, $text)
     {
@@ -166,7 +170,8 @@ class AjaxWebChannel extends WebChannel {
 }
 
 
-class MailChannel extends Channel {
+class MailChannel extends Channel
+{
 
     var $addr = null;
 
diff --git a/_darcs/pristine/classes/Command.php b/_darcs/pristine/classes/Command.php
index 407a6ecba8..eacbdacb36 100644
--- a/_darcs/pristine/classes/Command.php
+++ b/_darcs/pristine/classes/Command.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/classes/Channel.php');
 
-class Command {
+class Command
+{
     
     var $user = null;
     
@@ -36,20 +37,24 @@ class Command {
     }
 }
 
-class UnimplementedCommand extends Command {
+class UnimplementedCommand extends Command
+{
     function execute($channel)
     {
         $channel->error($this->user, _("Sorry, this command is not yet implemented."));
     }
 }
 
-class TrackingCommand extends UnimplementedCommand {
+class TrackingCommand extends UnimplementedCommand
+{
 }
 
-class TrackOffCommand extends UnimplementedCommand {
+class TrackOffCommand extends UnimplementedCommand
+{
 }
 
-class TrackCommand extends UnimplementedCommand {
+class TrackCommand extends UnimplementedCommand
+{
     var $word = null;
     function __construct($user, $word)
     {
@@ -58,7 +63,8 @@ class TrackCommand extends UnimplementedCommand {
     }
 }
 
-class UntrackCommand extends UnimplementedCommand {
+class UntrackCommand extends UnimplementedCommand
+{
     var $word = null;
     function __construct($user, $word)
     {
@@ -67,7 +73,8 @@ class UntrackCommand extends UnimplementedCommand {
     }
 }
 
-class NudgeCommand extends UnimplementedCommand {
+class NudgeCommand extends UnimplementedCommand
+{
     var $other = null;
     function __construct($user, $other)
     {
@@ -76,7 +83,8 @@ class NudgeCommand extends UnimplementedCommand {
     }
 }
 
-class InviteCommand extends UnimplementedCommand {
+class InviteCommand extends UnimplementedCommand
+{
     var $other = null;
     function __construct($user, $other)
     {
@@ -85,7 +93,8 @@ class InviteCommand extends UnimplementedCommand {
     }
 }
 
-class StatsCommand extends Command {
+class StatsCommand extends Command
+{
     function execute($channel)
     {
 
@@ -110,7 +119,8 @@ class StatsCommand extends Command {
     }
 }
 
-class FavCommand extends Command {
+class FavCommand extends Command
+{
     
     var $other = null;
     
@@ -157,7 +167,8 @@ class FavCommand extends Command {
     }
 }
 
-class WhoisCommand extends Command {
+class WhoisCommand extends Command
+{
     var $other = null;
     function __construct($user, $other)
     {
@@ -193,7 +204,8 @@ class WhoisCommand extends Command {
     }
 }
 
-class MessageCommand extends Command {
+class MessageCommand extends Command
+{
     var $other = null;
     var $text = null;
     function __construct($user, $other, $text)
@@ -237,7 +249,8 @@ class MessageCommand extends Command {
     }
 }
 
-class GetCommand extends Command {
+class GetCommand extends Command
+{
     
     var $other = null;
     
@@ -269,7 +282,8 @@ class GetCommand extends Command {
     }
 }
 
-class SubCommand extends Command {
+class SubCommand extends Command
+{
     
     var $other = null;
     
@@ -297,7 +311,8 @@ class SubCommand extends Command {
     }
 }
 
-class UnsubCommand extends Command {
+class UnsubCommand extends Command
+{
 
     var $other = null;
     
@@ -324,7 +339,8 @@ class UnsubCommand extends Command {
     }
 }
 
-class OffCommand extends Command {
+class OffCommand extends Command
+{
     var $other = null;
     function __construct($user, $other=null)
     {
@@ -345,7 +361,8 @@ class OffCommand extends Command {
     }
 }
 
-class OnCommand extends Command {
+class OnCommand extends Command
+{
     var $other = null;
     function __construct($user, $other=null)
     {
@@ -367,7 +384,8 @@ class OnCommand extends Command {
     }
 }
 
-class HelpCommand extends Command {
+class HelpCommand extends Command
+{
     function execute($channel)
     {
         $channel->output($this->user,
diff --git a/_darcs/pristine/classes/CommandInterpreter.php b/_darcs/pristine/classes/CommandInterpreter.php
index ff078bb05f..f409ed07f0 100644
--- a/_darcs/pristine/classes/CommandInterpreter.php
+++ b/_darcs/pristine/classes/CommandInterpreter.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/classes/Command.php');
 
-class CommandInterpreter {
+class CommandInterpreter
+{
     
     function handle_command($user, $text)
     {
diff --git a/_darcs/pristine/classes/NoticeWrapper.php b/_darcs/pristine/classes/NoticeWrapper.php
index e1b27c2f7e..233340ccd6 100644
--- a/_darcs/pristine/classes/NoticeWrapper.php
+++ b/_darcs/pristine/classes/NoticeWrapper.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/classes/Notice.php');
 
-class NoticeWrapper extends Notice {
+class NoticeWrapper extends Notice
+{
 
     public $id;                              // int(4)  primary_key not_null
     public $profile_id;                      // int(4)   not_null
diff --git a/_darcs/pristine/lib/Shorturl_api.php b/_darcs/pristine/lib/Shorturl_api.php
index f3f4f08dfd..fe106cb837 100644
--- a/_darcs/pristine/lib/Shorturl_api.php
+++ b/_darcs/pristine/lib/Shorturl_api.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class ShortUrlApi {
+class ShortUrlApi
+{
     protected $service_url;
 
     function __construct($service_url)
@@ -69,7 +70,8 @@ class ShortUrlApi {
     }
 }
 
-class LilUrl extends ShortUrlApi {
+class LilUrl extends ShortUrlApi
+{
     function __construct()
     {
         parent::__construct('http://ur1.ca/');
@@ -88,7 +90,8 @@ class LilUrl extends ShortUrlApi {
 }
 
 
-class PtitUrl extends ShortUrlApi {
+class PtitUrl extends ShortUrlApi
+{
     function __construct()
     {
         parent::__construct('http://ptiturl.com/?creer=oui&action=Reduire&url=');
@@ -106,7 +109,8 @@ class PtitUrl extends ShortUrlApi {
     }
 }
 
-class TightUrl extends ShortUrlApi {
+class TightUrl extends ShortUrlApi
+{
     function __construct()
     {
         parent::__construct('http://2tu.us/?save=y&url=');
diff --git a/_darcs/pristine/lib/deleteaction.php b/_darcs/pristine/lib/deleteaction.php
index a6e3651218..9e89c0a549 100644
--- a/_darcs/pristine/lib/deleteaction.php
+++ b/_darcs/pristine/lib/deleteaction.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class DeleteAction extends Action {
+class DeleteAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/lib/facebookaction.php b/_darcs/pristine/lib/facebookaction.php
index 43464b19b4..d5b7ed0fb8 100644
--- a/_darcs/pristine/lib/facebookaction.php
+++ b/_darcs/pristine/lib/facebookaction.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/extlib/facebook/facebook.php');
 
-class FacebookAction extends Action {
+class FacebookAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/lib/oauthstore.php b/_darcs/pristine/lib/oauthstore.php
index faae82db15..7ad3be20e2 100644
--- a/_darcs/pristine/lib/oauthstore.php
+++ b/_darcs/pristine/lib/oauthstore.php
@@ -21,9 +21,10 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class LaconicaOAuthDataStore extends OAuthDataStore {
+class LaconicaOAuthDataStore extends OAuthDataStore
+{
 
-    # We keep a record of who's contacted us
+    // We keep a record of who's contacted us
 
     function lookup_consumer($consumer_key)
     {
@@ -75,8 +76,8 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
         $t->consumer_key = $consumer->key;
         $t->tok = common_good_rand(16);
         $t->secret = common_good_rand(16);
-        $t->type = 0; # request
-        $t->state = 0; # unauthorized
+        $t->type = 0; // request
+        $t->state = 0; // unauthorized
         $t->created = DB_DataObject_Cast::dateTime();
         if (!$t->insert()) {
             return null;
@@ -85,7 +86,7 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
         }
     }
 
-    # defined in OAuthDataStore, but not implemented anywhere
+    // defined in OAuthDataStore, but not implemented anywhere
 
     function fetch_request_token($consumer)
     {
@@ -98,14 +99,14 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
         $rt = new Token();
         $rt->consumer_key = $consumer->key;
         $rt->tok = $token->key;
-        $rt->type = 0; # request
-        if ($rt->find(true) && $rt->state == 1) { # authorized
+        $rt->type = 0; // request
+        if ($rt->find(true) && $rt->state == 1) { // authorized
             common_debug('request token found.', __FILE__);
             $at = new Token();
             $at->consumer_key = $consumer->key;
             $at->tok = common_good_rand(16);
             $at->secret = common_good_rand(16);
-            $at->type = 1; # access
+            $at->type = 1; // access
             $at->created = DB_DataObject_Cast::dateTime();
             if (!$at->insert()) {
                 $e = $at->_lastError;
@@ -113,15 +114,15 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
                 return null;
             } else {
                 common_debug('access token "'.$at->tok.'" inserted', __FILE__);
-                # burn the old one
+                // burn the old one
                 $orig_rt = clone($rt);
-                $rt->state = 2; # used
+                $rt->state = 2; // used
                 if (!$rt->update($orig_rt)) {
                     return null;
                 }
                 common_debug('request token "'.$rt->tok.'" updated', __FILE__);
-                # Update subscription
-                # XXX: mixing levels here
+                // Update subscription
+                // XXX: mixing levels here
                 $sub = Subscription::staticGet('token', $rt->tok);
                 if (!$sub) {
                     return null;
@@ -142,7 +143,7 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
         }
     }
 
-    # defined in OAuthDataStore, but not implemented anywhere
+    // defined in OAuthDataStore, but not implemented anywhere
 
     function fetch_access_token($consumer)
     {
diff --git a/_darcs/pristine/lib/personal.php b/_darcs/pristine/lib/personal.php
index 34ebe68942..02b01fece4 100644
--- a/_darcs/pristine/lib/personal.php
+++ b/_darcs/pristine/lib/personal.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class PersonalAction extends Action {
+class PersonalAction extends Action
+{
     
     function is_readonly()
     {
diff --git a/_darcs/pristine/lib/profilelist.php b/_darcs/pristine/lib/profilelist.php
index 60737c3d41..bda05daf3b 100644
--- a/_darcs/pristine/lib/profilelist.php
+++ b/_darcs/pristine/lib/profilelist.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 define('PROFILES_PER_PAGE', 20);
 
-class ProfileList {
+class ProfileList
+{
 
     var $profile = null;
     var $owner = null;
diff --git a/_darcs/pristine/lib/queuehandler.php b/_darcs/pristine/lib/queuehandler.php
index 48487f8e9e..9ce9e32b3b 100644
--- a/_darcs/pristine/lib/queuehandler.php
+++ b/_darcs/pristine/lib/queuehandler.php
@@ -25,7 +25,8 @@ require_once(INSTALLDIR.'/lib/daemon.php');
 require_once(INSTALLDIR.'/classes/Queue_item.php');
 require_once(INSTALLDIR.'/classes/Notice.php');
 
-class QueueHandler extends Daemon {
+class QueueHandler extends Daemon
+{
 
     var $_id = 'generic';
 
diff --git a/_darcs/pristine/lib/rssaction.php b/_darcs/pristine/lib/rssaction.php
index e02e1febb1..9564cfb460 100644
--- a/_darcs/pristine/lib/rssaction.php
+++ b/_darcs/pristine/lib/rssaction.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 define('DEFAULT_RSS_LIMIT', 48);
 
-class Rss10Action extends Action {
+class Rss10Action extends Action
+{
 
     # This will contain the details of each feed item's author and be used to generate SIOC data.
     var $creators = array();
diff --git a/_darcs/pristine/lib/search_engines.php b/_darcs/pristine/lib/search_engines.php
index e96570d63b..559107910c 100644
--- a/_darcs/pristine/lib/search_engines.php
+++ b/_darcs/pristine/lib/search_engines.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SearchEngine {
+class SearchEngine
+{
     protected $target;
     protected $table;
 
@@ -45,7 +46,8 @@ class SearchEngine {
     }
 }
 
-class SphinxSearch extends SearchEngine {
+class SphinxSearch extends SearchEngine
+{
     private $sphinx;
     private $connected;
 
@@ -103,7 +105,8 @@ class SphinxSearch extends SearchEngine {
     }
 }
 
-class MySQLSearch extends SearchEngine {
+class MySQLSearch extends SearchEngine
+{
     function query($q)
     {
         if ('identica_people' === $this->table)
@@ -115,7 +118,8 @@ class MySQLSearch extends SearchEngine {
     }
 }
 
-class PGSearch extends SearchEngine {
+class PGSearch extends SearchEngine
+{
     function query($q)
     {
         if ('identica_people' === $this->table)
diff --git a/_darcs/pristine/lib/searchaction.php b/_darcs/pristine/lib/searchaction.php
index 12a44a8611..bc90fac1aa 100644
--- a/_darcs/pristine/lib/searchaction.php
+++ b/_darcs/pristine/lib/searchaction.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SearchAction extends Action {
+class SearchAction extends Action
+{
 
     function is_readonly()
     {
diff --git a/_darcs/pristine/lib/settingsaction.php b/_darcs/pristine/lib/settingsaction.php
index 5979c11f00..46f713fa85 100644
--- a/_darcs/pristine/lib/settingsaction.php
+++ b/_darcs/pristine/lib/settingsaction.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SettingsAction extends Action {
+class SettingsAction extends Action
+{
 
     function handle($args)
     {
diff --git a/_darcs/pristine/lib/stream.php b/_darcs/pristine/lib/stream.php
index 45fbb9bd97..73758adee6 100644
--- a/_darcs/pristine/lib/stream.php
+++ b/_darcs/pristine/lib/stream.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/personal.php');
 require_once(INSTALLDIR.'/lib/noticelist.php');
 
-class StreamAction extends PersonalAction {
+class StreamAction extends PersonalAction
+{
 
     function public_views_menu()
     {
diff --git a/_darcs/pristine/lib/twitterapi.php b/_darcs/pristine/lib/twitterapi.php
index 3cddfa9c95..50bcb06fe9 100644
--- a/_darcs/pristine/lib/twitterapi.php
+++ b/_darcs/pristine/lib/twitterapi.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class TwitterapiAction extends Action {
+class TwitterapiAction extends Action
+{
 
     var $auth_user;
 
diff --git a/_darcs/pristine/lib/xmppqueuehandler.php b/_darcs/pristine/lib/xmppqueuehandler.php
index 0a73403f93..91015fd450 100644
--- a/_darcs/pristine/lib/xmppqueuehandler.php
+++ b/_darcs/pristine/lib/xmppqueuehandler.php
@@ -28,7 +28,8 @@ require_once(INSTALLDIR.'/lib/queuehandler.php');
  * superclass.
  */
 
-class XmppQueueHandler extends QueueHandler {
+class XmppQueueHandler extends QueueHandler
+{
     
     function start()
     {
diff --git a/_darcs/pristine/scripts/enjitqueuehandler.php b/_darcs/pristine/scripts/enjitqueuehandler.php
index 55d73e08c4..3a4f8315d3 100644
--- a/_darcs/pristine/scripts/enjitqueuehandler.php
+++ b/_darcs/pristine/scripts/enjitqueuehandler.php
@@ -33,7 +33,8 @@ require_once(INSTALLDIR . '/lib/queuehandler.php');
 
 set_error_handler('common_error_handler');
 
-class EnjitQueueHandler extends QueueHandler {
+class EnjitQueueHandler extends QueueHandler
+{
     
     function transport()
     {
diff --git a/_darcs/pristine/scripts/jabberqueuehandler.php b/_darcs/pristine/scripts/jabberqueuehandler.php
index ea26aaf791..924fc45453 100644
--- a/_darcs/pristine/scripts/jabberqueuehandler.php
+++ b/_darcs/pristine/scripts/jabberqueuehandler.php
@@ -33,7 +33,8 @@ require_once(INSTALLDIR . '/lib/xmppqueuehandler.php');
 
 set_error_handler('common_error_handler');
 
-class JabberQueueHandler extends XmppQueueHandler {
+class JabberQueueHandler extends XmppQueueHandler
+{
 
     var $conn = null;
 
diff --git a/_darcs/pristine/scripts/maildaemon.php b/_darcs/pristine/scripts/maildaemon.php
index 6100cd21be..b9facec1a5 100644
--- a/_darcs/pristine/scripts/maildaemon.php
+++ b/_darcs/pristine/scripts/maildaemon.php
@@ -34,7 +34,8 @@ require_once('Mail/mimeDecode.php');
 # FIXME: we use both Mail_mimeDecode and mailparse
 # Need to move everything to mailparse
 
-class MailerDaemon {
+class MailerDaemon
+{
 
     function __construct()
     {
diff --git a/_darcs/pristine/scripts/ombqueuehandler.php b/_darcs/pristine/scripts/ombqueuehandler.php
index 299381aceb..cdcea51dc7 100644
--- a/_darcs/pristine/scripts/ombqueuehandler.php
+++ b/_darcs/pristine/scripts/ombqueuehandler.php
@@ -33,7 +33,8 @@ require_once(INSTALLDIR . '/lib/queuehandler.php');
 
 set_error_handler('common_error_handler');
 
-class OmbQueueHandler extends QueueHandler {
+class OmbQueueHandler extends QueueHandler
+{
     
     function transport()
     {
diff --git a/_darcs/pristine/scripts/publicqueuehandler.php b/_darcs/pristine/scripts/publicqueuehandler.php
index b3542e5c57..5075c12df5 100644
--- a/_darcs/pristine/scripts/publicqueuehandler.php
+++ b/_darcs/pristine/scripts/publicqueuehandler.php
@@ -33,7 +33,8 @@ require_once(INSTALLDIR . '/lib/xmppqueuehandler.php');
 
 set_error_handler('common_error_handler');
 
-class PublicQueueHandler extends XmppQueueHandler {
+class PublicQueueHandler extends XmppQueueHandler
+{
     
     function transport()
     {
diff --git a/_darcs/pristine/scripts/smsqueuehandler.php b/_darcs/pristine/scripts/smsqueuehandler.php
index c962ad095f..38f2f11feb 100644
--- a/_darcs/pristine/scripts/smsqueuehandler.php
+++ b/_darcs/pristine/scripts/smsqueuehandler.php
@@ -33,7 +33,8 @@ require_once(INSTALLDIR . '/lib/queuehandler.php');
 
 set_error_handler('common_error_handler');
 
-class SmsQueueHandler extends QueueHandler {
+class SmsQueueHandler extends QueueHandler
+{
     
     function transport()
     {
diff --git a/_darcs/pristine/scripts/xmppconfirmhandler.php b/_darcs/pristine/scripts/xmppconfirmhandler.php
index 1eb932330a..2b8b085ce8 100644
--- a/_darcs/pristine/scripts/xmppconfirmhandler.php
+++ b/_darcs/pristine/scripts/xmppconfirmhandler.php
@@ -35,7 +35,8 @@ set_error_handler('common_error_handler');
 
 define('CLAIM_TIMEOUT', 1200);
 
-class XmppConfirmHandler extends XmppQueueHandler {
+class XmppConfirmHandler extends XmppQueueHandler
+{
 
     var $_id = 'confirm';
     
diff --git a/_darcs/pristine/scripts/xmppdaemon.php b/_darcs/pristine/scripts/xmppdaemon.php
index 28ac647253..01fe8914f1 100644
--- a/_darcs/pristine/scripts/xmppdaemon.php
+++ b/_darcs/pristine/scripts/xmppdaemon.php
@@ -37,7 +37,8 @@ set_error_handler('common_error_handler');
 # in jabber.php, which create a new XMPP class. A more elegant (?) solution
 # might be to use make this a subclass of XMPP.
 
-class XMPPDaemon extends Daemon {
+class XMPPDaemon extends Daemon
+{
 
     function XMPPDaemon($resource=null)
     {
diff --git a/_darcs/tentative_pristine b/_darcs/tentative_pristine
index c8cd444612..573c67a4fb 100644
--- a/_darcs/tentative_pristine
+++ b/_darcs/tentative_pristine
@@ -1,225 +1,593 @@
-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 ./actions/accesstoken.php 24
+-class AccesstokenAction extends Action {
++class AccesstokenAction extends Action
++{
+hunk ./actions/all.php 24
+-class AllAction extends StreamAction {
++class AllAction extends StreamAction
++{
+hunk ./actions/allrss.php 26
+-class AllrssAction extends Rss10Action {
++class AllrssAction extends Rss10Action
++{
+hunk ./actions/api.php 22
+-class ApiAction extends Action {
++class ApiAction extends Action
++{
+hunk ./actions/avatarbynickname.php 22
+-class AvatarbynicknameAction extends Action {
++class AvatarbynicknameAction extends Action
++{
+hunk ./actions/block.php 22
+-class BlockAction extends Action {
++class BlockAction extends Action
++{
+hunk ./actions/confirmaddress.php 22
+-class ConfirmaddressAction extends Action {
++class ConfirmaddressAction extends Action
++{
+hunk ./actions/deletenotice.php 24
+-class DeletenoticeAction extends DeleteAction {
++class DeletenoticeAction extends DeleteAction
++{
+hunk ./actions/deleteprofile.php 22
+-class DeleteprofileAction extends Action {
++class DeleteprofileAction extends Action
++{
+hunk ./actions/disfavor.php 22
+-class DisfavorAction extends Action {
++class DisfavorAction extends Action
++{
+hunk ./actions/doc.php 22
+-class DocAction extends Action {
++class DocAction extends Action
++{
+hunk ./actions/emailsettings.php 24
+-class EmailsettingsAction extends SettingsAction {
++class EmailsettingsAction extends SettingsAction
++{
+hunk ./actions/facebookhome.php 24
+-class FacebookhomeAction extends FacebookAction {
++class FacebookhomeAction extends FacebookAction
++{
+hunk ./actions/facebookinvite.php 24
+-class FacebookinviteAction extends FacebookAction {
++class FacebookinviteAction extends FacebookAction
++{
+hunk ./actions/facebookremove.php 24
+-class FacebookremoveAction extends FacebookAction {
++class FacebookremoveAction extends FacebookAction
++{
+hunk ./actions/facebooksettings.php 24
+-class FacebooksettingsAction extends FacebookAction {
++class FacebooksettingsAction extends FacebookAction
++{
+hunk ./actions/favor.php 24
+-class FavorAction extends Action {
++class FavorAction extends Action
++{
+hunk ./actions/favorited.php 24
+-class FavoritedAction extends StreamAction {
++class FavoritedAction extends StreamAction
++{
+hunk ./actions/favoritesrss.php 26
+-class FavoritesrssAction extends Rss10Action {
++class FavoritesrssAction extends Rss10Action
++{
+hunk ./actions/featured.php 25
+-class FeaturedAction extends StreamAction {
++class FeaturedAction extends StreamAction
++{
+hunk ./actions/finishaddopenid.php 24
+-class FinishaddopenidAction extends Action {
++class FinishaddopenidAction extends Action
++{
+hunk ./actions/finishimmediate.php 24
+-class FinishimmediateAction extends Action {
++class FinishimmediateAction extends Action
++{
+hunk ./actions/finishopenidlogin.php 24
+-class FinishopenidloginAction extends Action {
++class FinishopenidloginAction extends Action
++{
+hunk ./actions/finishremotesubscribe.php 24
+-class FinishremotesubscribeAction extends Action {
++class FinishremotesubscribeAction extends Action
++{
+hunk ./actions/foaf.php 26
+-class FoafAction extends Action {
++class FoafAction extends Action
++{
+hunk ./actions/imsettings.php 25
+-class ImsettingsAction extends SettingsAction {
++class ImsettingsAction extends SettingsAction
++{
+hunk ./actions/invite.php 22
+-class InviteAction extends Action {
++class InviteAction extends Action
++{
+hunk ./actions/login.php 22
+-class LoginAction extends Action {
++class LoginAction extends Action
++{
+hunk ./actions/logout.php 24
+-class LogoutAction extends Action {
++class LogoutAction extends Action
++{
+hunk ./actions/microsummary.php 22
+-class MicrosummaryAction extends Action {
++class MicrosummaryAction extends Action
++{
+hunk ./actions/newmessage.php 22
+-class NewmessageAction extends Action {
++class NewmessageAction extends Action
++{
+hunk ./actions/newnotice.php 24
+-class NewnoticeAction extends Action {
++class NewnoticeAction extends Action
++{
+hunk ./actions/noticesearch.php 26
+-class NoticesearchAction extends SearchAction {
++class NoticesearchAction extends SearchAction
++{
+hunk ./actions/noticesearchrss.php 26
+-class NoticesearchrssAction extends Rss10Action {
++class NoticesearchrssAction extends Rss10Action
++{
+hunk ./actions/nudge.php 24
+-class NudgeAction extends Action {
++class NudgeAction extends Action
++{
+hunk ./actions/openidlogin.php 24
+-class OpenidloginAction extends Action {
++class OpenidloginAction extends Action
++{
+hunk ./actions/openidsettings.php 25
+-class OpenidsettingsAction extends SettingsAction {
++class OpenidsettingsAction extends SettingsAction
++{
+hunk ./actions/opensearch.php 22
+-class OpensearchAction extends Action {
++class OpensearchAction extends Action
++{
+hunk ./actions/othersettings.php 24
+-class OthersettingsAction extends SettingsAction {
++class OthersettingsAction extends SettingsAction
++{
+hunk ./actions/peoplesearch.php 25
+-class PeoplesearchAction extends SearchAction {
++class PeoplesearchAction extends SearchAction
++{
+hunk ./actions/peoplesearch.php 73
+-class PeopleSearchResults extends ProfileList {
++class PeopleSearchResults extends ProfileList
++{
+hunk ./actions/peopletag.php 24
+-class PeopletagAction extends Action {
++class PeopletagAction extends Action
++{
+hunk ./actions/postnotice.php 24
+-class PostnoticeAction extends Action {
++class PostnoticeAction extends Action
++{
+hunk ./actions/profilesettings.php 24
+-class ProfilesettingsAction extends SettingsAction {
++class ProfilesettingsAction extends SettingsAction
++{
+hunk ./actions/public.php 24
+-class PublicAction extends StreamAction {
++class PublicAction extends StreamAction
++{
+hunk ./actions/publicrss.php 26
+-class PublicrssAction extends Rss10Action {
++class PublicrssAction extends Rss10Action
++{
+hunk ./actions/publicxrds.php 26
+-class PublicxrdsAction extends Action {
++class PublicxrdsAction extends Action
++{
+hunk ./actions/recoverpassword.php 26
+-class RecoverpasswordAction extends Action {
++class RecoverpasswordAction extends Action
++{
+hunk ./actions/register.php 22
+-class RegisterAction extends Action {
++class RegisterAction extends Action
++{
+hunk ./actions/remotesubscribe.php 24
+-class RemotesubscribeAction extends Action {
++class RemotesubscribeAction extends Action
++{
+hunk ./actions/replies.php 24
+-class RepliesAction extends StreamAction {
++class RepliesAction extends StreamAction
++{
+hunk ./actions/repliesrss.php 26
+-class RepliesrssAction extends Rss10Action {
++class RepliesrssAction extends Rss10Action
++{
+hunk ./actions/requesttoken.php 24
+-class RequesttokenAction extends Action {
++class RequesttokenAction extends Action
++{
+hunk ./actions/showfavorites.php 24
+-class ShowfavoritesAction extends StreamAction {
++class ShowfavoritesAction extends StreamAction
++{
+hunk ./actions/showmessage.php 24
+-class ShowmessageAction extends MailboxAction {
++class ShowmessageAction extends MailboxAction
++{
+hunk ./actions/shownotice.php 24
+-class ShownoticeAction extends StreamAction {
++class ShownoticeAction extends StreamAction
++{
+hunk ./actions/showstream.php 27
+-class ShowstreamAction extends StreamAction {
++class ShowstreamAction extends StreamAction
++{
+hunk ./actions/showstream.php 453
+-class ProfileNoticeList extends NoticeList {
++class ProfileNoticeList extends NoticeList
++{
+hunk ./actions/showstream.php 461
+-class ProfileNoticeListItem extends NoticeListItem {
++class ProfileNoticeListItem extends NoticeListItem
++{
+hunk ./actions/smssettings.php 25
+-class SmssettingsAction extends EmailsettingsAction {
++class SmssettingsAction extends EmailsettingsAction
++{
+hunk ./actions/subedit.php 22
+-class SubeditAction extends Action {
++class SubeditAction extends Action
++{
+hunk ./actions/subscribe.php 22
+-class SubscribeAction extends Action {
++class SubscribeAction extends Action
++{
+hunk ./actions/subscribers.php 24
+-class SubscribersAction extends GalleryAction {
++class SubscribersAction extends GalleryAction
++{
+hunk ./actions/subscribers.php 63
+-class SubscribersList extends ProfileList {
++class SubscribersList extends ProfileList
++{
+hunk ./actions/subscriptions.php 24
+-class SubscriptionsAction extends GalleryAction {
++class SubscriptionsAction extends GalleryAction
++{
+hunk ./actions/subscriptions.php 63
+-class SubscriptionsList extends ProfileList {
++class SubscriptionsList extends ProfileList
++{
+hunk ./actions/sup.php 22
+-class SupAction extends Action {
++class SupAction extends Action
++{
+hunk ./actions/tag.php 25
+-class TagAction extends StreamAction {
++class TagAction extends StreamAction
++{
+hunk ./actions/tagother.php 24
+-class TagotherAction extends Action {
++class TagotherAction extends Action
++{
+hunk ./actions/tagrss.php 26
+-class TagrssAction extends Rss10Action {
++class TagrssAction extends Rss10Action
++{
+hunk ./actions/twitapiaccount.php 24
+-class TwitapiaccountAction extends TwitterapiAction {
++class TwitapiaccountAction extends TwitterapiAction
++{
+hunk ./actions/twitapiblocks.php 24
+-class TwitapiblocksAction extends TwitterapiAction {
++class TwitapiblocksAction extends TwitterapiAction
++{
+hunk ./actions/twitapidirect_messages.php 24
+-class Twitapidirect_messagesAction extends TwitterapiAction {
++class Twitapidirect_messagesAction extends TwitterapiAction
++{
+hunk ./actions/twitapifavorites.php 24
+-class TwitapifavoritesAction extends TwitterapiAction {
++class TwitapifavoritesAction extends TwitterapiAction
++{
+hunk ./actions/twitapifriendships.php 24
+-class TwitapifriendshipsAction extends TwitterapiAction {
++class TwitapifriendshipsAction extends TwitterapiAction
++{
+hunk ./actions/twitapihelp.php 24
+-class TwitapihelpAction extends TwitterapiAction {
++class TwitapihelpAction extends TwitterapiAction
++{
+hunk ./actions/twitapinotifications.php 25
+-class TwitapinotificationsAction extends TwitterapiAction {
++class TwitapinotificationsAction extends TwitterapiAction
++{
+hunk ./actions/twitapistatuses.php 24
+-class TwitapistatusesAction extends TwitterapiAction {
++class TwitapistatusesAction extends TwitterapiAction
++{
+hunk ./actions/twitapiusers.php 24
+-class TwitapiusersAction extends TwitterapiAction {
++class TwitapiusersAction extends TwitterapiAction
++{
+hunk ./actions/twittersettings.php 26
+-class TwittersettingsAction extends SettingsAction {
++class TwittersettingsAction extends SettingsAction
++{
+hunk ./actions/unblock.php 22
+-class UnblockAction extends Action {
++class UnblockAction extends Action
++{
+hunk ./actions/unsubscribe.php 20
+-class UnsubscribeAction extends Action {
++class UnsubscribeAction extends Action
++{
+hunk ./actions/updateprofile.php 24
+-class UpdateprofileAction extends Action {
++class UpdateprofileAction extends Action
++{
+hunk ./actions/userauthorization.php 25
+-class UserauthorizationAction extends Action {
++class UserauthorizationAction extends Action
++{
+hunk ./actions/userbyid.php 22
+-class UserbyidAction extends Action {
++class UserbyidAction extends Action
++{
+hunk ./actions/userrss.php 26
+-class UserrssAction extends Rss10Action {
++class UserrssAction extends Rss10Action
++{
+hunk ./actions/xrds.php 24
+-class XrdsAction extends Action {
++class XrdsAction extends Action
++{
+hunk ./classes/Channel.php 22
+-class Channel {
++class Channel
++{
+hunk ./classes/Channel.php 51
+-class XMPPChannel extends Channel {
++class XMPPChannel extends Channel
++{
+hunk ./classes/Channel.php 109
+-class WebChannel extends Channel {
++class WebChannel extends Channel
++{
+hunk ./classes/Channel.php 144
+-class AjaxWebChannel extends WebChannel {
++class AjaxWebChannel extends WebChannel
++{
+hunk ./classes/Channel.php 173
+-class MailChannel extends Channel {
++class MailChannel extends Channel
++{
+hunk ./classes/Command.php 24
+-class Command {
++class Command
++{
+hunk ./classes/Command.php 40
+-class UnimplementedCommand extends Command {
++class UnimplementedCommand extends Command
++{
+hunk ./classes/Command.php 48
+-class TrackingCommand extends UnimplementedCommand {
++class TrackingCommand extends UnimplementedCommand
++{
+hunk ./classes/Command.php 52
+-class TrackOffCommand extends UnimplementedCommand {
++class TrackOffCommand extends UnimplementedCommand
++{
+hunk ./classes/Command.php 56
+-class TrackCommand extends UnimplementedCommand {
++class TrackCommand extends UnimplementedCommand
++{
+hunk ./classes/Command.php 66
+-class UntrackCommand extends UnimplementedCommand {
++class UntrackCommand extends UnimplementedCommand
++{
+hunk ./classes/Command.php 76
+-class NudgeCommand extends UnimplementedCommand {
++class NudgeCommand extends UnimplementedCommand
++{
+hunk ./classes/Command.php 86
+-class InviteCommand extends UnimplementedCommand {
++class InviteCommand extends UnimplementedCommand
++{
+hunk ./classes/Command.php 96
+-class StatsCommand extends Command {
++class StatsCommand extends Command
++{
+hunk ./classes/Command.php 122
+-class FavCommand extends Command {
++class FavCommand extends Command
++{
+hunk ./classes/Command.php 170
+-class WhoisCommand extends Command {
++class WhoisCommand extends Command
++{
+hunk ./classes/Command.php 207
+-class MessageCommand extends Command {
++class MessageCommand extends Command
++{
+hunk ./classes/Command.php 252
+-class GetCommand extends Command {
++class GetCommand extends Command
++{
+hunk ./classes/Command.php 285
+-class SubCommand extends Command {
++class SubCommand extends Command
++{
+hunk ./classes/Command.php 314
+-class UnsubCommand extends Command {
++class UnsubCommand extends Command
++{
+hunk ./classes/Command.php 342
+-class OffCommand extends Command {
++class OffCommand extends Command
++{
+hunk ./classes/Command.php 364
+-class OnCommand extends Command {
++class OnCommand extends Command
++{
+hunk ./classes/Command.php 387
+-class HelpCommand extends Command {
++class HelpCommand extends Command
++{
+hunk ./classes/CommandInterpreter.php 24
+-class CommandInterpreter {
++class CommandInterpreter
++{
+hunk ./classes/NoticeWrapper.php 24
+-class NoticeWrapper extends Notice {
++class NoticeWrapper extends Notice
++{
+hunk ./lib/Shorturl_api.php 22
+-class ShortUrlApi {
++class ShortUrlApi
++{
+hunk ./lib/Shorturl_api.php 73
+-class LilUrl extends ShortUrlApi {
++class LilUrl extends ShortUrlApi
++{
+hunk ./lib/Shorturl_api.php 93
+-class PtitUrl extends ShortUrlApi {
++class PtitUrl extends ShortUrlApi
++{
+hunk ./lib/Shorturl_api.php 112
+-class TightUrl extends ShortUrlApi {
++class TightUrl extends ShortUrlApi
++{
+hunk ./lib/deleteaction.php 22
+-class DeleteAction extends Action {
++class DeleteAction extends Action
++{
+hunk ./lib/facebookaction.php 24
+-class FacebookAction extends Action {
++class FacebookAction extends Action
++{
+hunk ./lib/oauthstore.php 24
+-class LaconicaOAuthDataStore extends OAuthDataStore {
++class LaconicaOAuthDataStore extends OAuthDataStore
++{
+hunk ./lib/oauthstore.php 27
+-    # We keep a record of who's contacted us
++    // We keep a record of who's contacted us
+hunk ./lib/oauthstore.php 79
+-        $t->type = 0; # request
+-        $t->state = 0; # unauthorized
++        $t->type = 0; // request
++        $t->state = 0; // unauthorized
+hunk ./lib/oauthstore.php 89
+-    # defined in OAuthDataStore, but not implemented anywhere
++    // defined in OAuthDataStore, but not implemented anywhere
 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 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)) {
+-        $rt->type = 0; # request
+-        if ($rt->find(true) && $rt->state == 1) { # authorized
++        $rt->type = 0; // request
++        if ($rt->find(true) && $rt->state == 1) { // authorized
+hunk ./lib/oauthstore.php 109
+-            $at->type = 1; # access
++            $at->type = 1; // access
+hunk ./lib/oauthstore.php 117
+-                # burn the old one
++                // burn the old one
+hunk ./lib/oauthstore.php 119
+-                $rt->state = 2; # used
++                $rt->state = 2; // used
+hunk ./lib/oauthstore.php 124
+-                # Update subscription
+-                # XXX: mixing levels here
++                // Update subscription
++                // XXX: mixing levels here
+hunk ./lib/oauthstore.php 146
+-    # defined in OAuthDataStore, but not implemented anywhere
++    // defined in OAuthDataStore, but not implemented anywhere
+hunk ./lib/personal.php 22
+-class PersonalAction extends Action {
++class PersonalAction extends Action
++{
+hunk ./lib/profilelist.php 25
+-class ProfileList {
++class ProfileList
++{
+hunk ./lib/queuehandler.php 28
+-class QueueHandler extends Daemon {
++class QueueHandler extends Daemon
++{
+hunk ./lib/rssaction.php 24
+-class Rss10Action extends Action {
++class Rss10Action extends Action
++{
+hunk ./lib/search_engines.php 22
+-class SearchEngine {
++class SearchEngine
++{
+hunk ./lib/search_engines.php 49
+-class SphinxSearch extends SearchEngine {
++class SphinxSearch extends SearchEngine
++{
+hunk ./lib/search_engines.php 108
+-class MySQLSearch extends SearchEngine {
++class MySQLSearch extends SearchEngine
++{
+hunk ./lib/search_engines.php 121
+-class PGSearch extends SearchEngine {
++class PGSearch extends SearchEngine
++{
+hunk ./lib/searchaction.php 22
+-class SearchAction extends Action {
++class SearchAction extends Action
++{
+hunk ./lib/settingsaction.php 22
+-class SettingsAction extends Action {
++class SettingsAction extends Action
++{
+hunk ./lib/stream.php 25
+-class StreamAction extends PersonalAction {
++class StreamAction extends PersonalAction
++{
+hunk ./lib/twitterapi.php 22
+-class TwitterapiAction extends Action {
++class TwitterapiAction extends Action
++{
+hunk ./lib/xmppqueuehandler.php 31
+-class XmppQueueHandler extends QueueHandler {
++class XmppQueueHandler extends QueueHandler
++{
+hunk ./scripts/enjitqueuehandler.php 36
+-class EnjitQueueHandler extends QueueHandler {
++class EnjitQueueHandler extends QueueHandler
++{
+hunk ./scripts/jabberqueuehandler.php 36
+-class JabberQueueHandler extends XmppQueueHandler {
++class JabberQueueHandler extends XmppQueueHandler
++{
+hunk ./scripts/maildaemon.php 37
+-class MailerDaemon {
++class MailerDaemon
++{
+hunk ./scripts/ombqueuehandler.php 36
+-class OmbQueueHandler extends QueueHandler {
++class OmbQueueHandler extends QueueHandler
++{
+hunk ./scripts/publicqueuehandler.php 36
+-class PublicQueueHandler extends XmppQueueHandler {
++class PublicQueueHandler extends XmppQueueHandler
++{
+hunk ./scripts/smsqueuehandler.php 36
+-class SmsQueueHandler extends QueueHandler {
++class SmsQueueHandler extends QueueHandler
++{
+hunk ./scripts/xmppconfirmhandler.php 38
+-class XmppConfirmHandler extends XmppQueueHandler {
++class XmppConfirmHandler extends XmppQueueHandler
++{
+hunk ./scripts/xmppdaemon.php 40
+-class XMPPDaemon extends Daemon {
++class XMPPDaemon extends Daemon
++{
diff --git a/actions/accesstoken.php b/actions/accesstoken.php
index cab5425bfa..072ce27eb5 100644
--- a/actions/accesstoken.php
+++ b/actions/accesstoken.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class AccesstokenAction extends Action {
+class AccesstokenAction extends Action
+{
     function handle($args)
     {
         parent::handle($args);
diff --git a/actions/all.php b/actions/all.php
index 028a3679a4..526ac5f408 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/actions/showstream.php');
 
-class AllAction extends StreamAction {
+class AllAction extends StreamAction
+{
 
     function handle($args)
     {
diff --git a/actions/allrss.php b/actions/allrss.php
index 9c20cd4163..660afb9e2d 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class AllrssAction extends Rss10Action {
+class AllrssAction extends Rss10Action
+{
 
     var $user = null;
 
diff --git a/actions/api.php b/actions/api.php
index 8ccd86f0bb..dfdefe3b09 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class ApiAction extends Action {
+class ApiAction extends Action
+{
 
     var $user;
     var $content_type;
diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
index 4aeb4112ae..666f386f66 100644
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class AvatarbynicknameAction extends Action {
+class AvatarbynicknameAction extends Action
+{
     function handle($args)
     {
         parent::handle($args);
diff --git a/actions/block.php b/actions/block.php
index 702adcffae..c1ff7c0446 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class BlockAction extends Action {
+class BlockAction extends Action
+{
 
     var $profile = null;
 
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index d926864a6c..1d5c53ff2e 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class ConfirmaddressAction extends Action {
+class ConfirmaddressAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index 4f00db6174..e9b4b32549 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/deleteaction.php');
 
-class DeletenoticeAction extends DeleteAction {
+class DeletenoticeAction extends DeleteAction
+{
     function handle($args)
     {
         parent::handle($args);
diff --git a/actions/deleteprofile.php b/actions/deleteprofile.php
index b1c346cb22..e12fe131a7 100644
--- a/actions/deleteprofile.php
+++ b/actions/deleteprofile.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class DeleteprofileAction extends Action {
+class DeleteprofileAction extends Action
+{
     function handle($args)
     {
         parent::handle($args);
diff --git a/actions/disfavor.php b/actions/disfavor.php
index f0b5284531..74aae86cc7 100644
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class DisfavorAction extends Action {
+class DisfavorAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/doc.php b/actions/doc.php
index 441ac19a7b..856025e665 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class DocAction extends Action {
+class DocAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 7f08efd29a..3fa8ce2968 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 
-class EmailsettingsAction extends SettingsAction {
+class EmailsettingsAction extends SettingsAction
+{
 
     function get_instructions()
     {
diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index 006f35eca8..dcdb102e65 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/facebookaction.php');
 
-class FacebookhomeAction extends FacebookAction {
+class FacebookhomeAction extends FacebookAction
+{
 
     function handle($args)
     {
diff --git a/actions/facebookinvite.php b/actions/facebookinvite.php
index fc226e65ae..48a820e44b 100644
--- a/actions/facebookinvite.php
+++ b/actions/facebookinvite.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/facebookaction.php');
 
-class FacebookinviteAction extends FacebookAction {
+class FacebookinviteAction extends FacebookAction
+{
 
     function handle($args)
     {
diff --git a/actions/facebookremove.php b/actions/facebookremove.php
index 79dc32e497..a200fefbfe 100644
--- a/actions/facebookremove.php
+++ b/actions/facebookremove.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/facebookaction.php');
 
-class FacebookremoveAction extends FacebookAction {
+class FacebookremoveAction extends FacebookAction
+{
 
     function handle($args)
     {
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index 03ad578137..38542d4b6f 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/facebookaction.php');
 
-class FacebooksettingsAction extends FacebookAction {
+class FacebooksettingsAction extends FacebookAction
+{
 
     function handle($args)
     {
diff --git a/actions/favor.php b/actions/favor.php
index 3ec4af0b5e..8103f8181b 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/mail.php');
 
-class FavorAction extends Action {
+class FavorAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/favorited.php b/actions/favorited.php
index d479e1b3e4..71a9e026e5 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/stream.php');
 
-class FavoritedAction extends StreamAction {
+class FavoritedAction extends StreamAction
+{
 
     function handle($args)
     {
diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php
index aa8a3c6f4d..8c7ce52bf1 100644
--- a/actions/favoritesrss.php
+++ b/actions/favoritesrss.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class FavoritesrssAction extends Rss10Action {
+class FavoritesrssAction extends Rss10Action
+{
 
     var $user = null;
     
diff --git a/actions/featured.php b/actions/featured.php
index 1763adeab1..2bf8b0b815 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/stream.php');
 require_once(INSTALLDIR.'/lib/profilelist.php');
 
-class FeaturedAction extends StreamAction {
+class FeaturedAction extends StreamAction
+{
 
     function handle($args)
     {
diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php
index d8409b6e99..0ce1680aa6 100644
--- a/actions/finishaddopenid.php
+++ b/actions/finishaddopenid.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
-class FinishaddopenidAction extends Action {
+class FinishaddopenidAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/finishimmediate.php b/actions/finishimmediate.php
index c4a1c1af9b..0964c39f44 100644
--- a/actions/finishimmediate.php
+++ b/actions/finishimmediate.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
-class FinishimmediateAction extends Action {
+class FinishimmediateAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index eb52d73b18..bdb8516a32 100644
--- a/actions/finishopenidlogin.php
+++ b/actions/finishopenidlogin.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
-class FinishopenidloginAction extends Action {
+class FinishopenidloginAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index 5aace4fa95..cee3a18187 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class FinishremotesubscribeAction extends Action {
+class FinishremotesubscribeAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/foaf.php b/actions/foaf.php
index 27548bfffe..30e98960c1 100644
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -23,7 +23,8 @@ define('LISTENER', 1);
 define('LISTENEE', -1);
 define('BOTH', 0);
 
-class FoafAction extends Action {
+class FoafAction extends Action
+{
 
     function is_readonly()
     {
diff --git a/actions/imsettings.php b/actions/imsettings.php
index 56fb147588..8ecf200ec9 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 require_once(INSTALLDIR.'/lib/jabber.php');
 
-class ImsettingsAction extends SettingsAction {
+class ImsettingsAction extends SettingsAction
+{
 
     function get_instructions()
     {
diff --git a/actions/invite.php b/actions/invite.php
index b0fc799589..80e022a3df 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class InviteAction extends Action {
+class InviteAction extends Action
+{
 
     function is_readonly()
     {
diff --git a/actions/login.php b/actions/login.php
index 6ad07b6106..8600d44fd3 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class LoginAction extends Action {
+class LoginAction extends Action
+{
 
     function is_readonly()
     {
diff --git a/actions/logout.php b/actions/logout.php
index effb5abbe9..201378730d 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
-class LogoutAction extends Action {
+class LogoutAction extends Action
+{
     
     function is_readonly()
     {
diff --git a/actions/microsummary.php b/actions/microsummary.php
index a19a26dcf4..13ddc4e3ed 100644
--- a/actions/microsummary.php
+++ b/actions/microsummary.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class MicrosummaryAction extends Action {
+class MicrosummaryAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/newmessage.php b/actions/newmessage.php
index 0a537ad2d3..27fa9d5182 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class NewmessageAction extends Action {
+class NewmessageAction extends Action
+{
     
     function handle($args)
     {
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 1f6117c1e9..c412e893de 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR . '/lib/noticelist.php';
 
-class NewnoticeAction extends Action {
+class NewnoticeAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 782c8fe98d..b36fc8ad20 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/searchaction.php');
 
 # XXX common parent for people and content search?
 
-class NoticesearchAction extends SearchAction {
+class NoticesearchAction extends SearchAction
+{
 
     function get_instructions()
     {
diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php
index c41d348733..20fe0ff2ab 100644
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class NoticesearchrssAction extends Rss10Action {
+class NoticesearchrssAction extends Rss10Action
+{
 
     function init()
     {
diff --git a/actions/nudge.php b/actions/nudge.php
index e0268e9d00..a6480a5827 100644
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/mail.php');
 
-class NudgeAction extends Action {
+class NudgeAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index b8681215ef..09679e372e 100644
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
-class OpenidloginAction extends Action {
+class OpenidloginAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index ce4143d41c..039236048a 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 require_once(INSTALLDIR.'/lib/openid.php');
 
-class OpenidsettingsAction extends SettingsAction {
+class OpenidsettingsAction extends SettingsAction
+{
 
     function get_instructions()
     {
diff --git a/actions/opensearch.php b/actions/opensearch.php
index f9c6f4c572..96691fa6f3 100644
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class OpensearchAction extends Action {
+class OpensearchAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/othersettings.php b/actions/othersettings.php
index dc1bcd02bc..c2f08934c0 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 
-class OthersettingsAction extends SettingsAction {
+class OthersettingsAction extends SettingsAction
+{
 
     function get_instructions()
     {
diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 6d3f6a73f4..0d0fae4e5c 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/searchaction.php');
 require_once(INSTALLDIR.'/lib/profilelist.php');
 
-class PeoplesearchAction extends SearchAction {
+class PeoplesearchAction extends SearchAction
+{
 
     function get_instructions()
     {
@@ -69,7 +70,8 @@ class PeoplesearchAction extends SearchAction {
     }
 }
 
-class PeopleSearchResults extends ProfileList {
+class PeopleSearchResults extends ProfileList
+{
 
     var $terms = null;
     var $pattern = null;
diff --git a/actions/peopletag.php b/actions/peopletag.php
index c7e4630261..13a0b7a413 100644
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/profilelist.php');
 
-class PeopletagAction extends Action {
+class PeopletagAction extends Action
+{
     
     function handle($args)
     {
diff --git a/actions/postnotice.php b/actions/postnotice.php
index 8b0781dfd4..dec62a678f 100644
--- a/actions/postnotice.php
+++ b/actions/postnotice.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class PostnoticeAction extends Action {
+class PostnoticeAction extends Action
+{
     function handle($args)
     {
         parent::handle($args);
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index beb9979d05..6c22a7933f 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 
-class ProfilesettingsAction extends SettingsAction {
+class ProfilesettingsAction extends SettingsAction
+{
 
     function get_instructions()
     {
diff --git a/actions/public.php b/actions/public.php
index 62be3da998..039e885e6b 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/stream.php');
 
-class PublicAction extends StreamAction {
+class PublicAction extends StreamAction
+{
 
     function handle($args)
     {
diff --git a/actions/publicrss.php b/actions/publicrss.php
index 8e554122e0..822bc2db76 100644
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class PublicrssAction extends Rss10Action {
+class PublicrssAction extends Rss10Action
+{
 
     function init()
     {
diff --git a/actions/publicxrds.php b/actions/publicxrds.php
index 63c80d81e1..3d731d79fa 100644
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/openid.php');
 
 # XXX: factor out similarities with XrdsAction
 
-class PublicxrdsAction extends Action {
+class PublicxrdsAction extends Action
+{
 
     function is_readonly()
     {
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index a482d47110..bb6ef81d60 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -23,7 +23,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 define(MAX_RECOVERY_TIME, 24 * 60 * 60);
 
-class RecoverpasswordAction extends Action {
+class RecoverpasswordAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/register.php b/actions/register.php
index 444e67e357..ac14879e25 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class RegisterAction extends Action {
+class RegisterAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 02c0268496..a9494772eb 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class RemotesubscribeAction extends Action {
+class RemotesubscribeAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/replies.php b/actions/replies.php
index da2f27f31f..eceeb4d650 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/actions/showstream.php');
 
-class RepliesAction extends StreamAction {
+class RepliesAction extends StreamAction
+{
 
     function handle($args)
     {
diff --git a/actions/repliesrss.php b/actions/repliesrss.php
index 19ab0866a3..5f85f8d2e8 100644
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class RepliesrssAction extends Rss10Action {
+class RepliesrssAction extends Rss10Action
+{
 
     var $user = null;
 
diff --git a/actions/requesttoken.php b/actions/requesttoken.php
index 0918467566..a745487393 100644
--- a/actions/requesttoken.php
+++ b/actions/requesttoken.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class RequesttokenAction extends Action {
+class RequesttokenAction extends Action
+{
     
     function is_readonly()
     {
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index 8131cac676..f4344833d9 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/actions/showstream.php');
 
-class ShowfavoritesAction extends StreamAction {
+class ShowfavoritesAction extends StreamAction
+{
 
     function handle($args)
     {
diff --git a/actions/showmessage.php b/actions/showmessage.php
index b706fe2fa5..25330a568f 100644
--- a/actions/showmessage.php
+++ b/actions/showmessage.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/mailbox.php');
 
-class ShowmessageAction extends MailboxAction {
+class ShowmessageAction extends MailboxAction
+{
 
     function handle($args)
     {
diff --git a/actions/shownotice.php b/actions/shownotice.php
index abdaa72cac..2df09cb3fc 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/stream.php');
 
-class ShownoticeAction extends StreamAction {
+class ShownoticeAction extends StreamAction
+{
 
     var $notice = null;
     var $profile = null;
diff --git a/actions/showstream.php b/actions/showstream.php
index c31bce87ab..e4e5d96d15 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -24,7 +24,8 @@ require_once(INSTALLDIR.'/lib/stream.php');
 define('SUBSCRIPTIONS_PER_ROW', 4);
 define('SUBSCRIPTIONS', 80);
 
-class ShowstreamAction extends StreamAction {
+class ShowstreamAction extends StreamAction
+{
 
     function handle($args)
     {
@@ -449,14 +450,16 @@ class ShowstreamAction extends StreamAction {
 
 # We don't show the author for a profile, since we already know who it is!
 
-class ProfileNoticeList extends NoticeList {
+class ProfileNoticeList extends NoticeList
+{
     function newListItem($notice)
     {
         return new ProfileNoticeListItem($notice);
     }
 }
 
-class ProfileNoticeListItem extends NoticeListItem {
+class ProfileNoticeListItem extends NoticeListItem
+{
     function showAuthor()
     {
         return;
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 444da25902..fad71135cc 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 require_once(INSTALLDIR.'/actions/emailsettings.php');
 
-class SmssettingsAction extends EmailsettingsAction {
+class SmssettingsAction extends EmailsettingsAction
+{
 
     function get_instructions()
     {
diff --git a/actions/subedit.php b/actions/subedit.php
index 8741028573..1142b7a032 100644
--- a/actions/subedit.php
+++ b/actions/subedit.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SubeditAction extends Action {
+class SubeditAction extends Action
+{
 
     var $profile = null;
 
diff --git a/actions/subscribe.php b/actions/subscribe.php
index 93884f0818..f33d1d2077 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SubscribeAction extends Action {
+class SubscribeAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/subscribers.php b/actions/subscribers.php
index 8c7805f51f..31d0468d90 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/gallery.php');
 
-class SubscribersAction extends GalleryAction {
+class SubscribersAction extends GalleryAction
+{
 
     function gallery_type()
     {
@@ -59,7 +60,8 @@ class SubscribersAction extends GalleryAction {
     }
 }
 
-class SubscribersList extends ProfileList {
+class SubscribersList extends ProfileList
+{
     function show_owner_controls($profile)
     {
         common_block_form($profile, array('action' => 'subscribers',
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index ad4a3f9e51..afe8fb2609 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/gallery.php');
 
-class SubscriptionsAction extends GalleryAction {
+class SubscriptionsAction extends GalleryAction
+{
 
     function gallery_type()
     {
@@ -59,7 +60,8 @@ class SubscriptionsAction extends GalleryAction {
     }
 }
 
-class SubscriptionsList extends ProfileList {
+class SubscriptionsList extends ProfileList
+{
 
     function show_owner_controls($profile)
     {
diff --git a/actions/sup.php b/actions/sup.php
index 2a139b3221..6a1897585a 100644
--- a/actions/sup.php
+++ b/actions/sup.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SupAction extends Action {
+class SupAction extends Action
+{
     
     function handle($args)
     {
diff --git a/actions/tag.php b/actions/tag.php
index d7b35d6136..8a3f90c16a 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/actions/showstream.php');
 define('TAGS_PER_PAGE', 100);
 
-class TagAction extends StreamAction {
+class TagAction extends StreamAction
+{
 
     function handle($args)
     {
diff --git a/actions/tagother.php b/actions/tagother.php
index ed17ac531f..ff6788cc62 100644
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 
-class TagotherAction extends Action {
+class TagotherAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/tagrss.php b/actions/tagrss.php
index bb4edf4730..912d71413d 100644
--- a/actions/tagrss.php
+++ b/actions/tagrss.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class TagrssAction extends Rss10Action {
+class TagrssAction extends Rss10Action
+{
 
     function init()
     {
diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index d5e9143c26..79e1ed990d 100644
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapiaccountAction extends TwitterapiAction {
+class TwitapiaccountAction extends TwitterapiAction
+{
 
     function verify_credentials($args, $apidata)
     {
diff --git a/actions/twitapiblocks.php b/actions/twitapiblocks.php
index 2170141f1f..5d64f2f7d8 100644
--- a/actions/twitapiblocks.php
+++ b/actions/twitapiblocks.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapiblocksAction extends TwitterapiAction {
+class TwitapiblocksAction extends TwitterapiAction
+{
 
     function create($args, $apidata)
     {
diff --git a/actions/twitapidirect_messages.php b/actions/twitapidirect_messages.php
index e9f7aa0bf1..e0731f66fb 100644
--- a/actions/twitapidirect_messages.php
+++ b/actions/twitapidirect_messages.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class Twitapidirect_messagesAction extends TwitterapiAction {
+class Twitapidirect_messagesAction extends TwitterapiAction
+{
 
     function direct_messages($args, $apidata)
     {
diff --git a/actions/twitapifavorites.php b/actions/twitapifavorites.php
index e7a43f7705..55e04732f5 100644
--- a/actions/twitapifavorites.php
+++ b/actions/twitapifavorites.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapifavoritesAction extends TwitterapiAction {
+class TwitapifavoritesAction extends TwitterapiAction
+{
 
     function favorites($args, $apidata)
     {
diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index 5eca962983..ba4afe441e 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapifriendshipsAction extends TwitterapiAction {
+class TwitapifriendshipsAction extends TwitterapiAction
+{
 
     function create($args, $apidata)
     {
diff --git a/actions/twitapihelp.php b/actions/twitapihelp.php
index 27262f089a..1b84cb11bb 100644
--- a/actions/twitapihelp.php
+++ b/actions/twitapihelp.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapihelpAction extends TwitterapiAction {
+class TwitapihelpAction extends TwitterapiAction
+{
 
     /* Returns the string "ok" in the requested format with a 200 OK HTTP status code.
      * URL:http://identi.ca/api/help/test.format
diff --git a/actions/twitapinotifications.php b/actions/twitapinotifications.php
index e24d3829c1..a19d652c3d 100644
--- a/actions/twitapinotifications.php
+++ b/actions/twitapinotifications.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
 # This naming convention looks real sick
-class TwitapinotificationsAction extends TwitterapiAction {
+class TwitapinotificationsAction extends TwitterapiAction
+{
 
     function follow($args, $apidata)
     {
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index f280184c0a..e629d5cc41 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapistatusesAction extends TwitterapiAction {
+class TwitapistatusesAction extends TwitterapiAction
+{
 
     function public_timeline($args, $apidata)
     {
diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index 4644e6be66..409986985c 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapiusersAction extends TwitterapiAction {
+class TwitapiusersAction extends TwitterapiAction
+{
 
     function show($args, $apidata)
     {
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 1f55b31b62..26dede0ac2 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
 
 define('SUBSCRIPTIONS', 80);
 
-class TwittersettingsAction extends SettingsAction {
+class TwittersettingsAction extends SettingsAction
+{
 
     function get_instructions()
     {
diff --git a/actions/unblock.php b/actions/unblock.php
index 66ce0c879e..112304f71b 100644
--- a/actions/unblock.php
+++ b/actions/unblock.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class UnblockAction extends Action {
+class UnblockAction extends Action
+{
 
     var $profile = null;
 
diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index e4e04aaa03..1c2e136359 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -17,7 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class UnsubscribeAction extends Action {
+class UnsubscribeAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index 2cfff1b516..abb034c81e 100644
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class UpdateprofileAction extends Action {
+class UpdateprofileAction extends Action
+{
     
     function handle($args)
     {
diff --git a/actions/userauthorization.php b/actions/userauthorization.php
index c73d515d37..05efbc16c7 100644
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/omb.php');
 define('TIMESTAMP_THRESHOLD', 300);
 
-class UserauthorizationAction extends Action {
+class UserauthorizationAction extends Action
+{
 
     function handle($args)
     {
diff --git a/actions/userbyid.php b/actions/userbyid.php
index d7b4088bde..d57ed21a54 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class UserbyidAction extends Action {
+class UserbyidAction extends Action
+{
     
     function is_readonly()
     {                
diff --git a/actions/userrss.php b/actions/userrss.php
index c758a44e2a..1e9fe121f0 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -23,7 +23,8 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 // Formatting of RSS handled by Rss10Action
 
-class UserrssAction extends Rss10Action {
+class UserrssAction extends Rss10Action
+{
 
     var $user = null;
 
diff --git a/actions/xrds.php b/actions/xrds.php
index 1d4961d465..7edc6aa39c 100644
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class XrdsAction extends Action {
+class XrdsAction extends Action
+{
 
     function is_readonly()
     {                
diff --git a/classes/Channel.php b/classes/Channel.php
index 02ece9c0f5..2e3e4e8d4a 100644
--- a/classes/Channel.php
+++ b/classes/Channel.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class Channel {
+class Channel
+{
     
     function on($user)
     {
@@ -47,7 +48,8 @@ class Channel {
     }
 }
 
-class XMPPChannel extends Channel {
+class XMPPChannel extends Channel
+{
 
     var $conn = null;
     
@@ -104,7 +106,8 @@ class XMPPChannel extends Channel {
 }
 
 
-class WebChannel extends Channel {
+class WebChannel extends Channel
+{
 
     function source()
     {
@@ -138,7 +141,8 @@ class WebChannel extends Channel {
 }
 
 
-class AjaxWebChannel extends WebChannel {
+class AjaxWebChannel extends WebChannel
+{
 
     function output($user, $text)
     {
@@ -166,7 +170,8 @@ class AjaxWebChannel extends WebChannel {
 }
 
 
-class MailChannel extends Channel {
+class MailChannel extends Channel
+{
 
     var $addr = null;
 
diff --git a/classes/Command.php b/classes/Command.php
index 407a6ecba8..eacbdacb36 100644
--- a/classes/Command.php
+++ b/classes/Command.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/classes/Channel.php');
 
-class Command {
+class Command
+{
     
     var $user = null;
     
@@ -36,20 +37,24 @@ class Command {
     }
 }
 
-class UnimplementedCommand extends Command {
+class UnimplementedCommand extends Command
+{
     function execute($channel)
     {
         $channel->error($this->user, _("Sorry, this command is not yet implemented."));
     }
 }
 
-class TrackingCommand extends UnimplementedCommand {
+class TrackingCommand extends UnimplementedCommand
+{
 }
 
-class TrackOffCommand extends UnimplementedCommand {
+class TrackOffCommand extends UnimplementedCommand
+{
 }
 
-class TrackCommand extends UnimplementedCommand {
+class TrackCommand extends UnimplementedCommand
+{
     var $word = null;
     function __construct($user, $word)
     {
@@ -58,7 +63,8 @@ class TrackCommand extends UnimplementedCommand {
     }
 }
 
-class UntrackCommand extends UnimplementedCommand {
+class UntrackCommand extends UnimplementedCommand
+{
     var $word = null;
     function __construct($user, $word)
     {
@@ -67,7 +73,8 @@ class UntrackCommand extends UnimplementedCommand {
     }
 }
 
-class NudgeCommand extends UnimplementedCommand {
+class NudgeCommand extends UnimplementedCommand
+{
     var $other = null;
     function __construct($user, $other)
     {
@@ -76,7 +83,8 @@ class NudgeCommand extends UnimplementedCommand {
     }
 }
 
-class InviteCommand extends UnimplementedCommand {
+class InviteCommand extends UnimplementedCommand
+{
     var $other = null;
     function __construct($user, $other)
     {
@@ -85,7 +93,8 @@ class InviteCommand extends UnimplementedCommand {
     }
 }
 
-class StatsCommand extends Command {
+class StatsCommand extends Command
+{
     function execute($channel)
     {
 
@@ -110,7 +119,8 @@ class StatsCommand extends Command {
     }
 }
 
-class FavCommand extends Command {
+class FavCommand extends Command
+{
     
     var $other = null;
     
@@ -157,7 +167,8 @@ class FavCommand extends Command {
     }
 }
 
-class WhoisCommand extends Command {
+class WhoisCommand extends Command
+{
     var $other = null;
     function __construct($user, $other)
     {
@@ -193,7 +204,8 @@ class WhoisCommand extends Command {
     }
 }
 
-class MessageCommand extends Command {
+class MessageCommand extends Command
+{
     var $other = null;
     var $text = null;
     function __construct($user, $other, $text)
@@ -237,7 +249,8 @@ class MessageCommand extends Command {
     }
 }
 
-class GetCommand extends Command {
+class GetCommand extends Command
+{
     
     var $other = null;
     
@@ -269,7 +282,8 @@ class GetCommand extends Command {
     }
 }
 
-class SubCommand extends Command {
+class SubCommand extends Command
+{
     
     var $other = null;
     
@@ -297,7 +311,8 @@ class SubCommand extends Command {
     }
 }
 
-class UnsubCommand extends Command {
+class UnsubCommand extends Command
+{
 
     var $other = null;
     
@@ -324,7 +339,8 @@ class UnsubCommand extends Command {
     }
 }
 
-class OffCommand extends Command {
+class OffCommand extends Command
+{
     var $other = null;
     function __construct($user, $other=null)
     {
@@ -345,7 +361,8 @@ class OffCommand extends Command {
     }
 }
 
-class OnCommand extends Command {
+class OnCommand extends Command
+{
     var $other = null;
     function __construct($user, $other=null)
     {
@@ -367,7 +384,8 @@ class OnCommand extends Command {
     }
 }
 
-class HelpCommand extends Command {
+class HelpCommand extends Command
+{
     function execute($channel)
     {
         $channel->output($this->user,
diff --git a/classes/CommandInterpreter.php b/classes/CommandInterpreter.php
index ff078bb05f..f409ed07f0 100644
--- a/classes/CommandInterpreter.php
+++ b/classes/CommandInterpreter.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/classes/Command.php');
 
-class CommandInterpreter {
+class CommandInterpreter
+{
     
     function handle_command($user, $text)
     {
diff --git a/classes/NoticeWrapper.php b/classes/NoticeWrapper.php
index e1b27c2f7e..233340ccd6 100644
--- a/classes/NoticeWrapper.php
+++ b/classes/NoticeWrapper.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/classes/Notice.php');
 
-class NoticeWrapper extends Notice {
+class NoticeWrapper extends Notice
+{
 
     public $id;                              // int(4)  primary_key not_null
     public $profile_id;                      // int(4)   not_null
diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php
index f3f4f08dfd..fe106cb837 100644
--- a/lib/Shorturl_api.php
+++ b/lib/Shorturl_api.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class ShortUrlApi {
+class ShortUrlApi
+{
     protected $service_url;
 
     function __construct($service_url)
@@ -69,7 +70,8 @@ class ShortUrlApi {
     }
 }
 
-class LilUrl extends ShortUrlApi {
+class LilUrl extends ShortUrlApi
+{
     function __construct()
     {
         parent::__construct('http://ur1.ca/');
@@ -88,7 +90,8 @@ class LilUrl extends ShortUrlApi {
 }
 
 
-class PtitUrl extends ShortUrlApi {
+class PtitUrl extends ShortUrlApi
+{
     function __construct()
     {
         parent::__construct('http://ptiturl.com/?creer=oui&action=Reduire&url=');
@@ -106,7 +109,8 @@ class PtitUrl extends ShortUrlApi {
     }
 }
 
-class TightUrl extends ShortUrlApi {
+class TightUrl extends ShortUrlApi
+{
     function __construct()
     {
         parent::__construct('http://2tu.us/?save=y&url=');
diff --git a/lib/deleteaction.php b/lib/deleteaction.php
index a6e3651218..9e89c0a549 100644
--- a/lib/deleteaction.php
+++ b/lib/deleteaction.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class DeleteAction extends Action {
+class DeleteAction extends Action
+{
 
     function handle($args)
     {
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index 43464b19b4..d5b7ed0fb8 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/extlib/facebook/facebook.php');
 
-class FacebookAction extends Action {
+class FacebookAction extends Action
+{
 
     function handle($args)
     {
diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index faae82db15..7ad3be20e2 100644
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -21,9 +21,10 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
-class LaconicaOAuthDataStore extends OAuthDataStore {
+class LaconicaOAuthDataStore extends OAuthDataStore
+{
 
-    # We keep a record of who's contacted us
+    // We keep a record of who's contacted us
 
     function lookup_consumer($consumer_key)
     {
@@ -75,8 +76,8 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
         $t->consumer_key = $consumer->key;
         $t->tok = common_good_rand(16);
         $t->secret = common_good_rand(16);
-        $t->type = 0; # request
-        $t->state = 0; # unauthorized
+        $t->type = 0; // request
+        $t->state = 0; // unauthorized
         $t->created = DB_DataObject_Cast::dateTime();
         if (!$t->insert()) {
             return null;
@@ -85,7 +86,7 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
         }
     }
 
-    # defined in OAuthDataStore, but not implemented anywhere
+    // defined in OAuthDataStore, but not implemented anywhere
 
     function fetch_request_token($consumer)
     {
@@ -98,14 +99,14 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
         $rt = new Token();
         $rt->consumer_key = $consumer->key;
         $rt->tok = $token->key;
-        $rt->type = 0; # request
-        if ($rt->find(true) && $rt->state == 1) { # authorized
+        $rt->type = 0; // request
+        if ($rt->find(true) && $rt->state == 1) { // authorized
             common_debug('request token found.', __FILE__);
             $at = new Token();
             $at->consumer_key = $consumer->key;
             $at->tok = common_good_rand(16);
             $at->secret = common_good_rand(16);
-            $at->type = 1; # access
+            $at->type = 1; // access
             $at->created = DB_DataObject_Cast::dateTime();
             if (!$at->insert()) {
                 $e = $at->_lastError;
@@ -113,15 +114,15 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
                 return null;
             } else {
                 common_debug('access token "'.$at->tok.'" inserted', __FILE__);
-                # burn the old one
+                // burn the old one
                 $orig_rt = clone($rt);
-                $rt->state = 2; # used
+                $rt->state = 2; // used
                 if (!$rt->update($orig_rt)) {
                     return null;
                 }
                 common_debug('request token "'.$rt->tok.'" updated', __FILE__);
-                # Update subscription
-                # XXX: mixing levels here
+                // Update subscription
+                // XXX: mixing levels here
                 $sub = Subscription::staticGet('token', $rt->tok);
                 if (!$sub) {
                     return null;
@@ -142,7 +143,7 @@ class LaconicaOAuthDataStore extends OAuthDataStore {
         }
     }
 
-    # defined in OAuthDataStore, but not implemented anywhere
+    // defined in OAuthDataStore, but not implemented anywhere
 
     function fetch_access_token($consumer)
     {
diff --git a/lib/personal.php b/lib/personal.php
index 34ebe68942..02b01fece4 100644
--- a/lib/personal.php
+++ b/lib/personal.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class PersonalAction extends Action {
+class PersonalAction extends Action
+{
     
     function is_readonly()
     {
diff --git a/lib/profilelist.php b/lib/profilelist.php
index 60737c3d41..bda05daf3b 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 define('PROFILES_PER_PAGE', 20);
 
-class ProfileList {
+class ProfileList
+{
 
     var $profile = null;
     var $owner = null;
diff --git a/lib/queuehandler.php b/lib/queuehandler.php
index 48487f8e9e..9ce9e32b3b 100644
--- a/lib/queuehandler.php
+++ b/lib/queuehandler.php
@@ -25,7 +25,8 @@ require_once(INSTALLDIR.'/lib/daemon.php');
 require_once(INSTALLDIR.'/classes/Queue_item.php');
 require_once(INSTALLDIR.'/classes/Notice.php');
 
-class QueueHandler extends Daemon {
+class QueueHandler extends Daemon
+{
 
     var $_id = 'generic';
 
diff --git a/lib/rssaction.php b/lib/rssaction.php
index e02e1febb1..9564cfb460 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 define('DEFAULT_RSS_LIMIT', 48);
 
-class Rss10Action extends Action {
+class Rss10Action extends Action
+{
 
     # This will contain the details of each feed item's author and be used to generate SIOC data.
     var $creators = array();
diff --git a/lib/search_engines.php b/lib/search_engines.php
index e96570d63b..559107910c 100644
--- a/lib/search_engines.php
+++ b/lib/search_engines.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SearchEngine {
+class SearchEngine
+{
     protected $target;
     protected $table;
 
@@ -45,7 +46,8 @@ class SearchEngine {
     }
 }
 
-class SphinxSearch extends SearchEngine {
+class SphinxSearch extends SearchEngine
+{
     private $sphinx;
     private $connected;
 
@@ -103,7 +105,8 @@ class SphinxSearch extends SearchEngine {
     }
 }
 
-class MySQLSearch extends SearchEngine {
+class MySQLSearch extends SearchEngine
+{
     function query($q)
     {
         if ('identica_people' === $this->table)
@@ -115,7 +118,8 @@ class MySQLSearch extends SearchEngine {
     }
 }
 
-class PGSearch extends SearchEngine {
+class PGSearch extends SearchEngine
+{
     function query($q)
     {
         if ('identica_people' === $this->table)
diff --git a/lib/searchaction.php b/lib/searchaction.php
index 12a44a8611..bc90fac1aa 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SearchAction extends Action {
+class SearchAction extends Action
+{
 
     function is_readonly()
     {
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 5979c11f00..46f713fa85 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SettingsAction extends Action {
+class SettingsAction extends Action
+{
 
     function handle($args)
     {
diff --git a/lib/stream.php b/lib/stream.php
index 45fbb9bd97..73758adee6 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -22,7 +22,8 @@ if (!defined('LACONICA')) { exit(1); }
 require_once(INSTALLDIR.'/lib/personal.php');
 require_once(INSTALLDIR.'/lib/noticelist.php');
 
-class StreamAction extends PersonalAction {
+class StreamAction extends PersonalAction
+{
 
     function public_views_menu()
     {
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 3cddfa9c95..50bcb06fe9 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class TwitterapiAction extends Action {
+class TwitterapiAction extends Action
+{
 
     var $auth_user;
 
diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php
index 0a73403f93..91015fd450 100644
--- a/lib/xmppqueuehandler.php
+++ b/lib/xmppqueuehandler.php
@@ -28,7 +28,8 @@ require_once(INSTALLDIR.'/lib/queuehandler.php');
  * superclass.
  */
 
-class XmppQueueHandler extends QueueHandler {
+class XmppQueueHandler extends QueueHandler
+{
     
     function start()
     {
diff --git a/scripts/enjitqueuehandler.php b/scripts/enjitqueuehandler.php
index 55d73e08c4..3a4f8315d3 100755
--- a/scripts/enjitqueuehandler.php
+++ b/scripts/enjitqueuehandler.php
@@ -33,7 +33,8 @@ require_once(INSTALLDIR . '/lib/queuehandler.php');
 
 set_error_handler('common_error_handler');
 
-class EnjitQueueHandler extends QueueHandler {
+class EnjitQueueHandler extends QueueHandler
+{
     
     function transport()
     {
diff --git a/scripts/jabberqueuehandler.php b/scripts/jabberqueuehandler.php
index ea26aaf791..924fc45453 100755
--- a/scripts/jabberqueuehandler.php
+++ b/scripts/jabberqueuehandler.php
@@ -33,7 +33,8 @@ require_once(INSTALLDIR . '/lib/xmppqueuehandler.php');
 
 set_error_handler('common_error_handler');
 
-class JabberQueueHandler extends XmppQueueHandler {
+class JabberQueueHandler extends XmppQueueHandler
+{
 
     var $conn = null;
 
diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php
index 6100cd21be..b9facec1a5 100755
--- a/scripts/maildaemon.php
+++ b/scripts/maildaemon.php
@@ -34,7 +34,8 @@ require_once('Mail/mimeDecode.php');
 # FIXME: we use both Mail_mimeDecode and mailparse
 # Need to move everything to mailparse
 
-class MailerDaemon {
+class MailerDaemon
+{
 
     function __construct()
     {
diff --git a/scripts/ombqueuehandler.php b/scripts/ombqueuehandler.php
index 299381aceb..cdcea51dc7 100755
--- a/scripts/ombqueuehandler.php
+++ b/scripts/ombqueuehandler.php
@@ -33,7 +33,8 @@ require_once(INSTALLDIR . '/lib/queuehandler.php');
 
 set_error_handler('common_error_handler');
 
-class OmbQueueHandler extends QueueHandler {
+class OmbQueueHandler extends QueueHandler
+{
     
     function transport()
     {
diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php
index b3542e5c57..5075c12df5 100755
--- a/scripts/publicqueuehandler.php
+++ b/scripts/publicqueuehandler.php
@@ -33,7 +33,8 @@ require_once(INSTALLDIR . '/lib/xmppqueuehandler.php');
 
 set_error_handler('common_error_handler');
 
-class PublicQueueHandler extends XmppQueueHandler {
+class PublicQueueHandler extends XmppQueueHandler
+{
     
     function transport()
     {
diff --git a/scripts/smsqueuehandler.php b/scripts/smsqueuehandler.php
index c962ad095f..38f2f11feb 100755
--- a/scripts/smsqueuehandler.php
+++ b/scripts/smsqueuehandler.php
@@ -33,7 +33,8 @@ require_once(INSTALLDIR . '/lib/queuehandler.php');
 
 set_error_handler('common_error_handler');
 
-class SmsQueueHandler extends QueueHandler {
+class SmsQueueHandler extends QueueHandler
+{
     
     function transport()
     {
diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index 1eb932330a..2b8b085ce8 100755
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -35,7 +35,8 @@ set_error_handler('common_error_handler');
 
 define('CLAIM_TIMEOUT', 1200);
 
-class XmppConfirmHandler extends XmppQueueHandler {
+class XmppConfirmHandler extends XmppQueueHandler
+{
 
     var $_id = 'confirm';
     
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 28ac647253..01fe8914f1 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -37,7 +37,8 @@ set_error_handler('common_error_handler');
 # in jabber.php, which create a new XMPP class. A more elegant (?) solution
 # might be to use make this a subclass of XMPP.
 
-class XMPPDaemon extends Daemon {
+class XMPPDaemon extends Daemon
+{
 
     function XMPPDaemon($resource=null)
     {