From c8b8f07af14ad2ce9d0c0267962dd3bbf6473a4b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 25 Aug 2009 18:12:20 -0400
Subject: change Laconica and Control Yourself to StatusNet in PHP files

---
 lib/unblockform.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/unblockform.php')

diff --git a/lib/unblockform.php b/lib/unblockform.php
index 6a8831b29..1b9a88960 100644
--- a/lib/unblockform.php
+++ b/lib/unblockform.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Form for unblocking a user
  *
@@ -20,10 +20,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Form
- * @package   Laconica
+ * @package   StatusNet
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://laconi.ca/
  */
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/lib/form.php';
  * Form for unblocking a user
  *
  * @category Form
- * @package  Laconica
+ * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
-- 
cgit v1.2.3-54-g00ecf


From d35b2d3f3c2128b147a6fa897032262c1f632262 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 25 Aug 2009 18:16:46 -0400
Subject: change laconi.ca to status.net

---
 actions/accesstoken.php                        | 4 ++--
 actions/allrss.php                             | 4 ++--
 actions/attachment.php                         | 4 ++--
 actions/attachment_ajax.php                    | 4 ++--
 actions/attachment_thumbnail.php               | 4 ++--
 actions/avatarbynickname.php                   | 4 ++--
 actions/avatarsettings.php                     | 4 ++--
 actions/block.php                              | 4 ++--
 actions/blockedfromgroup.php                   | 6 +++---
 actions/confirmaddress.php                     | 4 ++--
 actions/conversation.php                       | 8 ++++----
 actions/deletenotice.php                       | 2 +-
 actions/disfavor.php                           | 4 ++--
 actions/doc.php                                | 4 ++--
 actions/editgroup.php                          | 4 ++--
 actions/emailsettings.php                      | 4 ++--
 actions/favor.php                              | 4 ++--
 actions/favorited.php                          | 4 ++--
 actions/favoritesrss.php                       | 4 ++--
 actions/featured.php                           | 4 ++--
 actions/finishaddopenid.php                    | 4 ++--
 actions/groupblock.php                         | 4 ++--
 actions/groupbyid.php                          | 4 ++--
 actions/groupdesignsettings.php                | 4 ++--
 actions/grouplogo.php                          | 4 ++--
 actions/groupmembers.php                       | 8 ++++----
 actions/grouprss.php                           | 4 ++--
 actions/groups.php                             | 4 ++--
 actions/groupsearch.php                        | 4 ++--
 actions/groupunblock.php                       | 4 ++--
 actions/imsettings.php                         | 4 ++--
 actions/inbox.php                              | 4 ++--
 actions/joingroup.php                          | 4 ++--
 actions/leavegroup.php                         | 4 ++--
 actions/login.php                              | 4 ++--
 actions/logout.php                             | 4 ++--
 actions/makeadmin.php                          | 4 ++--
 actions/microsummary.php                       | 4 ++--
 actions/newgroup.php                           | 4 ++--
 actions/newmessage.php                         | 4 ++--
 actions/newnotice.php                          | 4 ++--
 actions/noticesearch.php                       | 4 ++--
 actions/noticesearchrss.php                    | 4 ++--
 actions/nudge.php                              | 4 ++--
 actions/oembed.php                             | 4 ++--
 actions/openidsettings.php                     | 4 ++--
 actions/opensearch.php                         | 4 ++--
 actions/othersettings.php                      | 4 ++--
 actions/outbox.php                             | 4 ++--
 actions/passwordsettings.php                   | 4 ++--
 actions/peoplesearch.php                       | 6 +++---
 actions/peopletag.php                          | 4 ++--
 actions/profilesettings.php                    | 4 ++--
 actions/public.php                             | 8 ++++----
 actions/publicrss.php                          | 4 ++--
 actions/publictagcloud.php                     | 4 ++--
 actions/publicxrds.php                         | 4 ++--
 actions/register.php                           | 4 ++--
 actions/replies.php                            | 4 ++--
 actions/requesttoken.php                       | 4 ++--
 actions/showfavorites.php                      | 4 ++--
 actions/showgroup.php                          | 8 ++++----
 actions/showmessage.php                        | 4 ++--
 actions/shownotice.php                         | 4 ++--
 actions/showstream.php                         | 8 ++++----
 actions/smssettings.php                        | 4 ++--
 actions/subscribers.php                        | 4 ++--
 actions/subscriptions.php                      | 4 ++--
 actions/twitapigroups.php                      | 4 ++--
 actions/twitapisearchatom.php                  | 4 ++--
 actions/twitapisearchjson.php                  | 4 ++--
 actions/twitapistatusnet.php                   | 4 ++--
 actions/twitapitags.php                        | 4 ++--
 actions/twitapitrends.php                      | 4 ++--
 actions/twitterauthorization.php               | 2 +-
 actions/twittersettings.php                    | 4 ++--
 actions/unblock.php                            | 4 ++--
 actions/unsubscribe.php                        | 4 ++--
 actions/userbyid.php                           | 4 ++--
 actions/userdesignsettings.php                 | 4 ++--
 actions/usergroups.php                         | 4 ++--
 actions/xrds.php                               | 4 ++--
 lib/accountsettingsaction.php                  | 6 +++---
 lib/action.php                                 | 6 +++---
 lib/attachmentlist.php                         | 6 +++---
 lib/attachmentnoticesection.php                | 4 ++--
 lib/attachmenttagcloudsection.php              | 4 ++--
 lib/blockform.php                              | 4 ++--
 lib/clienterroraction.php                      | 4 ++--
 lib/clientexception.php                        | 4 ++--
 lib/common.php                                 | 2 +-
 lib/connectsettingsaction.php                  | 6 +++---
 lib/currentuserdesignaction.php                | 4 ++--
 lib/dberroraction.php                          | 4 ++--
 lib/dbqueuemanager.php                         | 2 +-
 lib/deleteaction.php                           | 2 +-
 lib/designsettings.php                         | 4 ++--
 lib/disfavorform.php                           | 4 ++--
 lib/error.php                                  | 4 ++--
 lib/event.php                                  | 4 ++--
 lib/facebookaction.php                         | 2 +-
 lib/favorform.php                              | 4 ++--
 lib/featureduserssection.php                   | 4 ++--
 lib/feed.php                                   | 4 ++--
 lib/feedlist.php                               | 4 ++--
 lib/form.php                                   | 4 ++--
 lib/groupdesignaction.php                      | 4 ++--
 lib/groupeditform.php                          | 4 ++--
 lib/grouplist.php                              | 4 ++--
 lib/groupminilist.php                          | 4 ++--
 lib/groupnav.php                               | 4 ++--
 lib/groupsbymemberssection.php                 | 4 ++--
 lib/groupsbypostssection.php                   | 4 ++--
 lib/groupsection.php                           | 4 ++--
 lib/grouptagcloudsection.php                   | 4 ++--
 lib/htmloutputter.php                          | 4 ++--
 lib/imagefile.php                              | 4 ++--
 lib/jabber.php                                 | 2 +-
 lib/joinform.php                               | 4 ++--
 lib/jsonsearchresultslist.php                  | 6 +++---
 lib/language.php                               | 2 +-
 lib/leaveform.php                              | 4 ++--
 lib/logingroupnav.php                          | 4 ++--
 lib/mail.php                                   | 2 +-
 lib/mailbox.php                                | 4 ++--
 lib/messageform.php                            | 4 ++--
 lib/microid.php                                | 4 ++--
 lib/noticeform.php                             | 4 ++--
 lib/noticelist.php                             | 6 +++---
 lib/noticesection.php                          | 4 ++--
 lib/nudgeform.php                              | 4 ++--
 lib/oauthclient.php                            | 6 +++---
 lib/ownerdesignaction.php                      | 4 ++--
 lib/parallelizingdaemon.php                    | 4 ++--
 lib/personalgroupnav.php                       | 4 ++--
 lib/personaltagcloudsection.php                | 4 ++--
 lib/plugin.php                                 | 4 ++--
 lib/popularnoticesection.php                   | 4 ++--
 lib/profileaction.php                          | 4 ++--
 lib/profilelist.php                            | 4 ++--
 lib/profileminilist.php                        | 4 ++--
 lib/profilesection.php                         | 4 ++--
 lib/publicgroupnav.php                         | 4 ++--
 lib/queuemanager.php                           | 2 +-
 lib/router.php                                 | 4 ++--
 lib/rssaction.php                              | 4 ++--
 lib/searchaction.php                           | 4 ++--
 lib/searchgroupnav.php                         | 4 ++--
 lib/section.php                                | 4 ++--
 lib/servererroraction.php                      | 4 ++--
 lib/serverexception.php                        | 4 ++--
 lib/settingsaction.php                         | 4 ++--
 lib/snapshot.php                               | 6 +++---
 lib/stompqueuemanager.php                      | 2 +-
 lib/subgroupnav.php                            | 4 ++--
 lib/subpeopletagcloudsection.php               | 4 ++--
 lib/subscribeform.php                          | 4 ++--
 lib/subscriberspeopleselftagcloudsection.php   | 4 ++--
 lib/subscriberspeopletagcloudsection.php       | 4 ++--
 lib/subscriptionlist.php                       | 4 ++--
 lib/subscriptionspeopleselftagcloudsection.php | 4 ++--
 lib/subscriptionspeopletagcloudsection.php     | 4 ++--
 lib/tagcloudsection.php                        | 4 ++--
 lib/theme.php                                  | 2 +-
 lib/topposterssection.php                      | 4 ++--
 lib/twitteroauthclient.php                     | 4 ++--
 lib/unblockform.php                            | 4 ++--
 lib/unqueuemanager.php                         | 2 +-
 lib/unsubscribeform.php                        | 4 ++--
 lib/webcolor.php                               | 2 +-
 lib/widget.php                                 | 4 ++--
 lib/xmloutputter.php                           | 4 ++--
 lib/xmlstringer.php                            | 4 ++--
 scripts/synctwitterfriends.php                 | 2 +-
 scripts/twitterstatusfetcher.php               | 2 +-
 scripts/update_translations.php                | 2 +-
 176 files changed, 355 insertions(+), 355 deletions(-)

(limited to 'lib/unblockform.php')

diff --git a/actions/accesstoken.php b/actions/accesstoken.php
index a3684b229..064c6da24 100644
--- a/actions/accesstoken.php
+++ b/actions/accesstoken.php
@@ -9,7 +9,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/omb.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class AccesstokenAction extends Action
 {
diff --git a/actions/allrss.php b/actions/allrss.php
index 36db92d01..61aa5b475 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -10,7 +10,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -45,7 +45,7 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class AllrssAction extends Rss10Action
 {
diff --git a/actions/attachment.php b/actions/attachment.php
index 98da3b022..a1db8f8ba 100644
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/lib/attachmentlist.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class AttachmentAction extends Action
diff --git a/actions/attachment_ajax.php b/actions/attachment_ajax.php
index a334cfefb..e4e6431ba 100644
--- a/actions/attachment_ajax.php
+++ b/actions/attachment_ajax.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/actions/attachment.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class Attachment_ajaxAction extends AttachmentAction
diff --git a/actions/attachment_thumbnail.php b/actions/attachment_thumbnail.php
index bb450b371..e32571322 100644
--- a/actions/attachment_thumbnail.php
+++ b/actions/attachment_thumbnail.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/actions/attachment.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class Attachment_thumbnailAction extends AttachmentAction
diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
index 3e5ab0d3b..2e1149511 100644
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -9,7 +9,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -40,7 +40,7 @@ if (!defined('LACONICA')) {
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class AvatarbynicknameAction extends Action
 {
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index c1b98cef3..dec4049e4 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -25,7 +25,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -47,7 +47,7 @@ define('MAX_ORIGINAL', 480);
  * @author   Zach Copley <zach@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class AvatarsettingsAction extends AccountSettingsAction
diff --git a/actions/block.php b/actions/block.php
index def85c823..d0ac7836c 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -9,7 +9,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -40,7 +40,7 @@ if (!defined('LACONICA')) {
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class BlockAction extends Action
 {
diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php
index 7e521e944..9d1beab72 100644
--- a/actions/blockedfromgroup.php
+++ b/actions/blockedfromgroup.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class BlockedfromgroupAction extends GroupDesignAction
@@ -194,7 +194,7 @@ class GroupBlockListItem extends ProfileListItem
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      UnblockForm
  */
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 6bcc22938..dc6d4c339 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ConfirmaddressAction extends Action
diff --git a/actions/conversation.php b/actions/conversation.php
index 6c42d17b3..7f5483ef1 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -8,7 +8,7 @@
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2009, StatusNet, Inc.
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/noticelist.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ConversationAction extends Action
@@ -132,7 +132,7 @@ class ConversationAction extends Action
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ConversationTree extends NoticeList
@@ -253,7 +253,7 @@ class ConversationTree extends NoticeList
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ConversationTreeItem extends NoticeListItem
diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index 8022cfffd..22c3fc3b9 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
diff --git a/actions/disfavor.php b/actions/disfavor.php
index 6b8f024a6..ff78f79e6 100644
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -10,7 +10,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/favorform.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class DisfavorAction extends Action
 {
diff --git a/actions/doc.php b/actions/doc.php
index 989070672..bfa90e080 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -10,7 +10,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -41,7 +41,7 @@ if (!defined('LACONICA')) {
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class DocAction extends Action
 {
diff --git a/actions/editgroup.php b/actions/editgroup.php
index 0d6e191d8..1c27ecefb 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -26,7 +26,7 @@
  * @author   Zach Copley <zach@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -43,7 +43,7 @@ if (!defined('LACONICA')) {
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class EditgroupAction extends GroupDesignAction
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 661bd2caa..d54d94272 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -25,7 +25,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      Widget
  */
diff --git a/actions/favor.php b/actions/favor.php
index c5adf7a3b..d10beb8d6 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -10,7 +10,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/disfavorform.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class FavorAction extends Action
 {
diff --git a/actions/favorited.php b/actions/favorited.php
index e98f52b86..2929736ab 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -25,7 +25,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -46,7 +46,7 @@ require_once INSTALLDIR.'/lib/noticelist.php';
  * @author   Zach Copley <zach@controlyourself.ca>
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class FavoritedAction extends Action
diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php
index 63f3e58a0..3603c6e43 100644
--- a/actions/favoritesrss.php
+++ b/actions/favoritesrss.php
@@ -10,7 +10,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -46,7 +46,7 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  * @author   Robin Millette <millette@controlyourself.ca>
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class FavoritesrssAction extends Rss10Action
 {
diff --git a/actions/featured.php b/actions/featured.php
index f11e991ff..4211c67ea 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -25,7 +25,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/publicgroupnav.php';
  * @author   Zach Copley <zach@controlyourself.ca>
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class FeaturedAction extends Action
diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php
index d9255060c..98db9eb4f 100644
--- a/actions/finishaddopenid.php
+++ b/actions/finishaddopenid.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/openid.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class FinishaddopenidAction extends Action
diff --git a/actions/groupblock.php b/actions/groupblock.php
index cbd74831a..5b3dd545a 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -8,7 +8,7 @@
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class GroupblockAction extends Action
diff --git a/actions/groupbyid.php b/actions/groupbyid.php
index 34e4ad15c..9bbf8d3d2 100644
--- a/actions/groupbyid.php
+++ b/actions/groupbyid.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -45,7 +45,7 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class GroupbyidAction extends Action
diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php
index 130f60f25..973c1b802 100644
--- a/actions/groupdesignsettings.php
+++ b/actions/groupdesignsettings.php
@@ -25,7 +25,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -44,7 +44,7 @@ require_once INSTALLDIR . '/lib/designsettings.php';
  * @author   Zach Copley <zach@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class GroupDesignSettingsAction extends DesignSettingsAction
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index c5bcdd0a3..74e8e7136 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -25,7 +25,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -47,7 +47,7 @@ define('MAX_ORIGINAL', 480);
  * @author   Zach Copley <zach@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class GrouplogoAction extends GroupDesignAction
diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index cb81d2928..7df514758 100644
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/publicgroupnav.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class GroupmembersAction extends GroupDesignAction
@@ -224,7 +224,7 @@ class GroupMemberListItem extends ProfileListItem
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      BlockForm
  */
@@ -352,7 +352,7 @@ class GroupBlockForm extends Form
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class MakeAdminForm extends Form
diff --git a/actions/grouprss.php b/actions/grouprss.php
index b304dd3a5..21e493fe5 100644
--- a/actions/grouprss.php
+++ b/actions/grouprss.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -43,7 +43,7 @@ define('MEMBERS_PER_SECTION', 27);
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class groupRssAction extends Rss10Action
diff --git a/actions/groups.php b/actions/groups.php
index e05908956..e862428fc 100644
--- a/actions/groups.php
+++ b/actions/groups.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/grouplist.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class GroupsAction extends Action
diff --git a/actions/groupsearch.php b/actions/groupsearch.php
index 5976d9269..6d4979272 100644
--- a/actions/groupsearch.php
+++ b/actions/groupsearch.php
@@ -9,7 +9,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -43,7 +43,7 @@ if (!defined('LACONICA')) {
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class GroupsearchAction extends SearchAction
 {
diff --git a/actions/groupunblock.php b/actions/groupunblock.php
index 19a9e8ea3..fc7953836 100644
--- a/actions/groupunblock.php
+++ b/actions/groupunblock.php
@@ -8,7 +8,7 @@
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class GroupunblockAction extends Action
diff --git a/actions/imsettings.php b/actions/imsettings.php
index 3b43e12f7..bfad8eaf9 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/jabber.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      SettingsAction
  */
diff --git a/actions/inbox.php b/actions/inbox.php
index 1d63bc304..2ee766013 100644
--- a/actions/inbox.php
+++ b/actions/inbox.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/lib/mailbox.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  * @see      MailboxAction
  */
 
diff --git a/actions/joingroup.php b/actions/joingroup.php
index ee442b681..599cf50e3 100644
--- a/actions/joingroup.php
+++ b/actions/joingroup.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -41,7 +41,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class JoingroupAction extends Action
diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index 29194351d..a87e6225d 100644
--- a/actions/leavegroup.php
+++ b/actions/leavegroup.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -41,7 +41,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class LeavegroupAction extends Action
diff --git a/actions/login.php b/actions/login.php
index cfaf7b554..c187a587f 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class LoginAction extends Action
diff --git a/actions/logout.php b/actions/logout.php
index bd0b0c673..237348628 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -9,7 +9,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/openid.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class LogoutAction extends Action
 {
diff --git a/actions/makeadmin.php b/actions/makeadmin.php
index 483151330..9bc0d3710 100644
--- a/actions/makeadmin.php
+++ b/actions/makeadmin.php
@@ -8,7 +8,7 @@
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class MakeadminAction extends Action
diff --git a/actions/microsummary.php b/actions/microsummary.php
index 2af640db0..b5cfb974e 100644
--- a/actions/microsummary.php
+++ b/actions/microsummary.php
@@ -9,7 +9,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -40,7 +40,7 @@ if (!defined('LACONICA')) {
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class MicrosummaryAction extends Action
 {
diff --git a/actions/newgroup.php b/actions/newgroup.php
index 506017b4d..a1cbb4d4a 100644
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -41,7 +41,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class NewgroupAction extends Action
diff --git a/actions/newmessage.php b/actions/newmessage.php
index 5f485f5e2..ca9d3703a 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -26,7 +26,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ if (!defined('LACONICA')) {
  * @author   Zach Copley <zach@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class NewmessageAction extends Action
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 98532ee25..3fcf0df54 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -26,7 +26,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/noticelist.php';
  * @author   Zach Copley <zach@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class NewnoticeAction extends Action
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index ef2d5c906..59f2a5092 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -10,7 +10,7 @@
  * @author   Robin Millette <millette@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/searchaction.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  * @todo     common parent for people and content search?
  */
 class NoticesearchAction extends SearchAction
diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php
index b8fbd67e6..c49a5a1ba 100644
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -9,7 +9,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class NoticesearchrssAction extends Rss10Action
 {
diff --git a/actions/nudge.php b/actions/nudge.php
index 19a84ee32..ae9a37500 100644
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -10,7 +10,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/mail.php';
  * @author   Robin Millette <millette@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class NudgeAction extends Action
 {
diff --git a/actions/oembed.php b/actions/oembed.php
index 5c9853bd3..323652714 100644
--- a/actions/oembed.php
+++ b/actions/oembed.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -41,7 +41,7 @@ if (!defined('LACONICA')) {
  * @author    Craig Andrews <candrews@integralblue.com>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 class OembedAction extends Action
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index d69450f8a..86db7478a 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/openid.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class OpenidsettingsAction extends AccountSettingsAction
diff --git a/actions/opensearch.php b/actions/opensearch.php
index 89286480f..c32a34f61 100644
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -10,7 +10,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -43,7 +43,7 @@ if (!defined('LACONICA')) {
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class OpensearchAction extends Action
 {
diff --git a/actions/othersettings.php b/actions/othersettings.php
index afd6846d9..056a0c2d4 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -25,7 +25,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  * @author   Robin Millette <millette@controlyourself.ca>
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class OthersettingsAction extends AccountSettingsAction
diff --git a/actions/outbox.php b/actions/outbox.php
index a1d8c2fc4..869360efa 100644
--- a/actions/outbox.php
+++ b/actions/outbox.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/lib/mailbox.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  * @see      MailboxAction
  */
 
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index 2e289bc8a..905940557 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -25,7 +25,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class PasswordsettingsAction extends AccountSettingsAction
diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 6a30451ea..3bad19d83 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -9,7 +9,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/profilelist.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class PeoplesearchAction extends SearchAction
 {
@@ -97,7 +97,7 @@ class PeoplesearchAction extends SearchAction
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see PeoplesearchAction
  */
diff --git a/actions/peopletag.php b/actions/peopletag.php
index e3f74d232..310d91eea 100644
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -25,7 +25,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/profilelist.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      Action
  */
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 3ddf2f4af..390e85524 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -25,7 +25,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ProfilesettingsAction extends AccountSettingsAction
diff --git a/actions/public.php b/actions/public.php
index aea730606..2c8d2c4f9 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -46,7 +46,7 @@ define('MAX_PUBLIC_PAGE', 100);
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      PublicrssAction
  * @see      PublicxrdsAction
@@ -245,13 +245,13 @@ class PublicAction extends Action
     {
         if (! (common_config('site','closed') || common_config('site','inviteonly'))) {
             $m = sprintf(_('This is %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
-                           'based on the Free Software [StatusNet](http://laconi.ca/) tool. ' .
+                           'based on the Free Software [StatusNet](http://status.net/) tool. ' .
                            '[Join now](%%%%action.%s%%%%) to share notices about yourself with friends, family, and colleagues! ' .
                            '([Read more](%%%%doc.help%%%%))'),
                          (!common_config('site','openidonly')) ? 'register' : 'openidlogin');
         } else {
             $m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
-                   'based on the Free Software [StatusNet](http://laconi.ca/) tool.');
+                   'based on the Free Software [StatusNet](http://status.net/) tool.');
         }
         $this->elementStart('div', array('id' => 'anon_notice'));
         $this->raw(common_markup_to_html($m));
diff --git a/actions/publicrss.php b/actions/publicrss.php
index 382baa88a..6fc7dfa80 100644
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -10,7 +10,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -45,7 +45,7 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class PublicrssAction extends Rss10Action
 {
diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index 5ac091e8b..0fbd41901 100644
--- a/actions/publictagcloud.php
+++ b/actions/publictagcloud.php
@@ -26,7 +26,7 @@
  * @copyright 2008 Mike Cochrane
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) { exit(1); }
@@ -42,7 +42,7 @@ define('TAGS_PER_PAGE', 100);
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008 Mike Cochrane
  * @copyright 2008-2009 StatusNet, Inc.
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class PublictagcloudAction extends Action
diff --git a/actions/publicxrds.php b/actions/publicxrds.php
index 6b647ac8d..e30c7f8fb 100644
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -10,7 +10,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/openid.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @todo factor out similarities with XrdsAction
  */
diff --git a/actions/register.php b/actions/register.php
index 7ffb952a8..d256cb093 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class RegisterAction extends Action
diff --git a/actions/replies.php b/actions/replies.php
index b396a03b4..ff634ce6f 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class RepliesAction extends OwnerDesignAction
diff --git a/actions/requesttoken.php b/actions/requesttoken.php
index f36849e8a..8755fa447 100644
--- a/actions/requesttoken.php
+++ b/actions/requesttoken.php
@@ -10,7 +10,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/omb.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class RequesttokenAction extends Action
 {
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index 76ec48dad..5be2814d1 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ShowfavoritesAction extends OwnerDesignAction
diff --git a/actions/showgroup.php b/actions/showgroup.php
index d4f41052e..e33da9b9a 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -44,7 +44,7 @@ define('MEMBERS_PER_SECTION', 27);
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ShowgroupAction extends GroupDesignAction
@@ -448,14 +448,14 @@ class ShowgroupAction extends GroupDesignAction
     {
         if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
             $m = sprintf(_('**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
-                'based on the Free Software [StatusNet](http://laconi.ca/) tool. Its members share ' .
+                'based on the Free Software [StatusNet](http://status.net/) tool. Its members share ' .
                 'short messages about their life and interests. '.
                 '[Join now](%%%%action.%s%%%%) to become part of this group and many more! ([Read more](%%%%doc.help%%%%))'),
                      $this->group->nickname,
                      (!common_config('site','openidonly')) ? 'register' : 'openidlogin');
         } else {
             $m = sprintf(_('**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
-                'based on the Free Software [StatusNet](http://laconi.ca/) tool. Its members share ' .
+                'based on the Free Software [StatusNet](http://status.net/) tool. Its members share ' .
                 'short messages about their life and interests. '),
                      $this->group->nickname);
         }
diff --git a/actions/showmessage.php b/actions/showmessage.php
index f413018bb..d89e0792d 100644
--- a/actions/showmessage.php
+++ b/actions/showmessage.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 if (!defined('LACONICA')) { 
     exit(1); 
@@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/mailbox.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ShowmessageAction extends MailboxAction
diff --git a/actions/shownotice.php b/actions/shownotice.php
index 6d8d54051..7e83724a7 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ShownoticeAction extends OwnerDesignAction
diff --git a/actions/showstream.php b/actions/showstream.php
index 1cdf2c37e..68dabe681 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -51,7 +51,7 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ShowstreamAction extends ProfileAction
@@ -388,14 +388,14 @@ class ShowstreamAction extends ProfileAction
     {
         if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
             $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
-                 'based on the Free Software [StatusNet](http://laconi.ca/) tool. ' .
+                 'based on the Free Software [StatusNet](http://status.net/) tool. ' .
                  '[Join now](%%%%action.%s%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'),
                  $this->user->nickname,
                  (!common_config('site','openidonly')) ? 'register' : 'openidlogin',
                  $this->user->nickname);
         } else {
             $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
-                 'based on the Free Software [StatusNet](http://laconi.ca/) tool. '),
+                 'based on the Free Software [StatusNet](http://status.net/) tool. '),
                  $this->user->nickname, $this->user->nickname);
 	}
         $this->elementStart('div', array('id' => 'anon_notice'));
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 14f4b25aa..123c16316 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/lib/connectsettingsaction.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      SettingsAction
  */
diff --git a/actions/subscribers.php b/actions/subscribers.php
index f49a699f0..0f173e041 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -39,7 +39,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class SubscribersAction extends GalleryAction
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index c34a14469..a8c790531 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -39,7 +39,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 if (!defined('LACONICA')) { exit(1); }
diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php
index 5ac21faca..866492b7b 100644
--- a/actions/twitapigroups.php
+++ b/actions/twitapigroups.php
@@ -25,7 +25,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -45,7 +45,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
  class TwitapigroupsAction extends TwitterapiAction
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index 68d28a2af..560eb64d2 100644
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -24,7 +24,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  * @package  StatusNet
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      TwitterapiAction
  */
diff --git a/actions/twitapisearchjson.php b/actions/twitapisearchjson.php
index 57a5fb0ca..8c80aca3b 100644
--- a/actions/twitapisearchjson.php
+++ b/actions/twitapisearchjson.php
@@ -24,7 +24,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/jsonsearchresultslist.php';
  * @package  StatusNet
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  * @see      TwitterapiAction
  */
 
diff --git a/actions/twitapistatusnet.php b/actions/twitapistatusnet.php
index 47d6d787f..80ddb48a9 100644
--- a/actions/twitapistatusnet.php
+++ b/actions/twitapistatusnet.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 class TwitapilaconicaAction extends TwitterapiAction
diff --git a/actions/twitapitags.php b/actions/twitapitags.php
index 82f86d9ea..9480d5abd 100644
--- a/actions/twitapitags.php
+++ b/actions/twitapitags.php
@@ -25,7 +25,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -45,7 +45,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
  class TwitapitagsAction extends TwitterapiAction
diff --git a/actions/twitapitrends.php b/actions/twitapitrends.php
index 48db96d62..e6baf7c63 100644
--- a/actions/twitapitrends.php
+++ b/actions/twitapitrends.php
@@ -24,7 +24,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  * @package  StatusNet
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      TwitterapiAction
  */
diff --git a/actions/twitterauthorization.php b/actions/twitterauthorization.php
index 522702e7e..123aafbbd 100644
--- a/actions/twitterauthorization.php
+++ b/actions/twitterauthorization.php
@@ -24,7 +24,7 @@
  * @author    Zach Copely <zach@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index a93cf5af4..bb003c343 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/twitter.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      SettingsAction
  */
diff --git a/actions/unblock.php b/actions/unblock.php
index aacda8e7d..afd6cfcdf 100644
--- a/actions/unblock.php
+++ b/actions/unblock.php
@@ -9,7 +9,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -40,7 +40,7 @@ if (!defined('LACONICA')) {
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class UnblockAction extends Action
 {
diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 9f2701082..3ce96aefb 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -9,7 +9,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -40,7 +40,7 @@ if (!defined('LACONICA')) {
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class UnsubscribeAction extends Action
 {
diff --git a/actions/userbyid.php b/actions/userbyid.php
index 0e84e37eb..b6908846a 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -10,7 +10,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
 
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -41,7 +41,7 @@ if (!defined('LACONICA')) {
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class UserbyidAction extends Action
 {
diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php
index 498c7cb43..fc9c471cf 100644
--- a/actions/userdesignsettings.php
+++ b/actions/userdesignsettings.php
@@ -25,7 +25,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -44,7 +44,7 @@ require_once INSTALLDIR . '/lib/designsettings.php';
  * @author   Zach Copley <zach@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class UserDesignSettingsAction extends DesignSettingsAction
diff --git a/actions/usergroups.php b/actions/usergroups.php
index 0260961ba..9543eb480 100644
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/grouplist.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class UsergroupsAction extends OwnerDesignAction
diff --git a/actions/xrds.php b/actions/xrds.php
index de6db2045..0258f9b2d 100644
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -10,7 +10,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/omb.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class XrdsAction extends Action
 {
diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php
index 7027a8d65..972b3693e 100644
--- a/lib/accountsettingsaction.php
+++ b/lib/accountsettingsaction.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/lib/settingsaction.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      Widget
  */
@@ -69,7 +69,7 @@ class AccountSettingsAction extends SettingsAction
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      HTMLOutputter
  */
diff --git a/lib/action.php b/lib/action.php
index 2251c8aad..9507df3ba 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -49,7 +49,7 @@ require_once INSTALLDIR.'/lib/htmloutputter.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      HTMLOutputter
  */
@@ -761,7 +761,7 @@ class Action extends HTMLOutputter // lawsuit
         } else {
             $instr = _('**%%site.name%%** is a microblogging service. ');
         }
-        $instr .= sprintf(_('It runs the [StatusNet](http://laconi.ca/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), LACONICA_VERSION);
+        $instr .= sprintf(_('It runs the [StatusNet](http://status.net/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), LACONICA_VERSION);
         $output = common_markup_to_html($instr);
         $this->raw($output);
         $this->elementEnd('dd');
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index ca249537c..4a221ec35 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -44,7 +44,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  * @see      Notice
  * @see      NoticeListItem
  * @see      ProfileNoticeList
@@ -130,7 +130,7 @@ class AttachmentList extends Widget
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  * @see      NoticeList
  * @see      ProfileNoticeListItem
  */
diff --git a/lib/attachmentnoticesection.php b/lib/attachmentnoticesection.php
index f3a85afc5..127fe5824 100644
--- a/lib/attachmentnoticesection.php
+++ b/lib/attachmentnoticesection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class AttachmentNoticeSection extends NoticeSection
diff --git a/lib/attachmenttagcloudsection.php b/lib/attachmenttagcloudsection.php
index 9a4d5b9a4..d751079aa 100644
--- a/lib/attachmenttagcloudsection.php
+++ b/lib/attachmenttagcloudsection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class AttachmentTagCloudSection extends TagCloudSection
diff --git a/lib/blockform.php b/lib/blockform.php
index c06efedfd..e5ed31b0f 100644
--- a/lib/blockform.php
+++ b/lib/blockform.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/form.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      UnblockForm
  */
diff --git a/lib/clienterroraction.php b/lib/clienterroraction.php
index ca1e33e10..cf7129c93 100644
--- a/lib/clienterroraction.php
+++ b/lib/clienterroraction.php
@@ -10,7 +10,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/error.php';
  * @package  StatusNet
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class ClientErrorAction extends ErrorAction
 {
diff --git a/lib/clientexception.php b/lib/clientexception.php
index cab8dd513..c1492be74 100644
--- a/lib/clientexception.php
+++ b/lib/clientexception.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ClientException extends Exception
diff --git a/lib/common.php b/lib/common.php
index 48caa6112..c2d656636 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -218,7 +218,7 @@ $config =
         'snapshot' =>
         array('run' => 'web',
               'frequency' => 10000,
-              'reporturl' => 'http://laconi.ca/stats/report'),
+              'reporturl' => 'http://status.net/stats/report'),
         'attachments' =>
         array('server' => null,
               'dir' => INSTALLDIR . '/file/',
diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php
index 47504b0ea..75c825621 100644
--- a/lib/connectsettingsaction.php
+++ b/lib/connectsettingsaction.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/lib/settingsaction.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      Widget
  */
@@ -69,7 +69,7 @@ class ConnectSettingsAction extends SettingsAction
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      HTMLOutputter
  */
diff --git a/lib/currentuserdesignaction.php b/lib/currentuserdesignaction.php
index 8323eeccb..7ff7c3399 100644
--- a/lib/currentuserdesignaction.php
+++ b/lib/currentuserdesignaction.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -41,7 +41,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  */
 
diff --git a/lib/dberroraction.php b/lib/dberroraction.php
index c81f01fca..2b9fad4e6 100644
--- a/lib/dberroraction.php
+++ b/lib/dberroraction.php
@@ -9,7 +9,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -45,7 +45,7 @@ require_once INSTALLDIR.'/lib/servererroraction.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class DBErrorAction extends ServerErrorAction
diff --git a/lib/dbqueuemanager.php b/lib/dbqueuemanager.php
index 0e88c4de1..b1850925b 100644
--- a/lib/dbqueuemanager.php
+++ b/lib/dbqueuemanager.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 class DBQueueManager extends QueueManager
diff --git a/lib/deleteaction.php b/lib/deleteaction.php
index f444ed61e..fd4778cca 100644
--- a/lib/deleteaction.php
+++ b/lib/deleteaction.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
diff --git a/lib/designsettings.php b/lib/designsettings.php
index 62ec8c92c..103b1cd65 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -25,7 +25,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -46,7 +46,7 @@ require_once INSTALLDIR . '/lib/webcolor.php';
  * @author   Zach Copley <zach@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class DesignSettingsAction extends AccountSettingsAction
diff --git a/lib/disfavorform.php b/lib/disfavorform.php
index c3780b0df..e6b22fc70 100644
--- a/lib/disfavorform.php
+++ b/lib/disfavorform.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/form.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      FavorForm
  */
diff --git a/lib/error.php b/lib/error.php
index 261a25157..fc749adfc 100644
--- a/lib/error.php
+++ b/lib/error.php
@@ -10,7 +10,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -40,7 +40,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class ErrorAction extends Action
 {
diff --git a/lib/event.php b/lib/event.php
index 31bfd0e5b..1bfcdb67d 100644
--- a/lib/event.php
+++ b/lib/event.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @todo     Define a system for using Event instances
  */
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index e9e6aec51..753447f8b 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -24,7 +24,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA'))
diff --git a/lib/favorform.php b/lib/favorform.php
index fc21041db..0479105c5 100644
--- a/lib/favorform.php
+++ b/lib/favorform.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/form.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      DisfavorForm
  */
diff --git a/lib/featureduserssection.php b/lib/featureduserssection.php
index f8bdb0b7e..b8a971415 100644
--- a/lib/featureduserssection.php
+++ b/lib/featureduserssection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class FeaturedUsersSection extends ProfileSection
diff --git a/lib/feed.php b/lib/feed.php
index f3a85ee5f..5e0f9add7 100644
--- a/lib/feed.php
+++ b/lib/feed.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -41,7 +41,7 @@ if (!defined('LACONICA')) {
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class Feed
diff --git a/lib/feedlist.php b/lib/feedlist.php
index d0173ca29..da114c491 100644
--- a/lib/feedlist.php
+++ b/lib/feedlist.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ if (!defined('LACONICA')) {
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      Action::showExportList()
  */
diff --git a/lib/form.php b/lib/form.php
index 928c64bff..61c20fd48 100644
--- a/lib/form.php
+++ b/lib/form.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -45,7 +45,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      HTMLOutputter
  */
diff --git a/lib/groupdesignaction.php b/lib/groupdesignaction.php
index 1a4f7d01d..ff2532026 100644
--- a/lib/groupdesignaction.php
+++ b/lib/groupdesignaction.php
@@ -24,7 +24,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -41,7 +41,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  */
 class GroupDesignAction extends Action {
diff --git a/lib/groupeditform.php b/lib/groupeditform.php
index 1fe85ac30..ae9eb17b9 100644
--- a/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/form.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      UnsubscribeForm
  */
diff --git a/lib/grouplist.php b/lib/grouplist.php
index 8b208dcd0..47406bb2c 100644
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -25,7 +25,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -43,7 +43,7 @@ define('GROUPS_PER_PAGE', 20);
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class GroupList extends Widget
diff --git a/lib/groupminilist.php b/lib/groupminilist.php
index 553daeea6..2b74a6ef8 100644
--- a/lib/groupminilist.php
+++ b/lib/groupminilist.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ define('GROUPS_PER_MINILIST', 27);
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class GroupMiniList extends GroupList
diff --git a/lib/groupnav.php b/lib/groupnav.php
index 595dcd629..e3daff6a4 100644
--- a/lib/groupnav.php
+++ b/lib/groupnav.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      HTMLOutputter
  */
diff --git a/lib/groupsbymemberssection.php b/lib/groupsbymemberssection.php
index 6126be49a..c8bf546f9 100644
--- a/lib/groupsbymemberssection.php
+++ b/lib/groupsbymemberssection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class GroupsByMembersSection extends GroupSection
diff --git a/lib/groupsbypostssection.php b/lib/groupsbypostssection.php
index 1fdb6ed7b..e78efeeb4 100644
--- a/lib/groupsbypostssection.php
+++ b/lib/groupsbypostssection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class GroupsByPostsSection extends GroupSection
diff --git a/lib/groupsection.php b/lib/groupsection.php
index da3b4173d..203ac3cb2 100644
--- a/lib/groupsection.php
+++ b/lib/groupsection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -43,7 +43,7 @@ define('GROUPS_PER_SECTION', 6);
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class GroupSection extends Section
diff --git a/lib/grouptagcloudsection.php b/lib/grouptagcloudsection.php
index aba792088..afd2eba44 100644
--- a/lib/grouptagcloudsection.php
+++ b/lib/grouptagcloudsection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class GroupTagCloudSection extends TagCloudSection
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 1710db21a..714107710 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -51,7 +51,7 @@ define('PAGE_TYPE_PREFS',
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      Action
  * @see      XMLOutputter
diff --git a/lib/imagefile.php b/lib/imagefile.php
index e4114cfe3..ec4349d6c 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -25,7 +25,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ if (!defined('LACONICA')) {
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ImageFile
diff --git a/lib/jabber.php b/lib/jabber.php
index 8b6b6322b..375a3e50f 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
diff --git a/lib/joinform.php b/lib/joinform.php
index 181b19acb..a19e014de 100644
--- a/lib/joinform.php
+++ b/lib/joinform.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/form.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      UnsubscribeForm
  */
diff --git a/lib/jsonsearchresultslist.php b/lib/jsonsearchresultslist.php
index 2a7d087e9..7ff32f829 100644
--- a/lib/jsonsearchresultslist.php
+++ b/lib/jsonsearchresultslist.php
@@ -24,7 +24,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  */
 
@@ -150,7 +150,7 @@ class JSONSearchResultsList
  * @package  StatusNet
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  * @see      JSONSearchResultsList
  */
 
diff --git a/lib/language.php b/lib/language.php
index 5ae4c00c4..49c5a7317 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -25,7 +25,7 @@
  * @author   Ciaran Gultnieks <ciaran@ciarang.com>
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 if (!defined('LACONICA')) {
diff --git a/lib/leaveform.php b/lib/leaveform.php
index 778af3061..3e37e45ff 100644
--- a/lib/leaveform.php
+++ b/lib/leaveform.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/form.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      UnsubscribeForm
  */
diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index c92707fe8..49a90cf80 100644
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      Widget
  */
diff --git a/lib/mail.php b/lib/mail.php
index a26ef0596..23bea22ef 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -27,7 +27,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
diff --git a/lib/mailbox.php b/lib/mailbox.php
index 0194b76f4..e628d952e 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ define('MESSAGES_PER_PAGE', 20);
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  * @see      InboxAction
  * @see      OutboxAction
  */
diff --git a/lib/messageform.php b/lib/messageform.php
index 483d961f6..cf80858c7 100644
--- a/lib/messageform.php
+++ b/lib/messageform.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/form.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      HTMLOutputter
  */
diff --git a/lib/microid.php b/lib/microid.php
index 83746efee..6fee71acf 100644
--- a/lib/microid.php
+++ b/lib/microid.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  * @see      http://microid.org/
  */
 
diff --git a/lib/noticeform.php b/lib/noticeform.php
index d5826f306..1452b2e1e 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/form.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      HTMLOutputter
  */
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 64d8cccba..46fc73bc1 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -48,7 +48,7 @@ require_once INSTALLDIR.'/lib/attachmentlist.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  * @see      Notice
  * @see      NoticeListItem
  * @see      ProfileNoticeList
@@ -136,7 +136,7 @@ class NoticeList extends Widget
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  * @see      NoticeList
  * @see      ProfileNoticeListItem
  */
diff --git a/lib/noticesection.php b/lib/noticesection.php
index 7a969c2d7..622883119 100644
--- a/lib/noticesection.php
+++ b/lib/noticesection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -43,7 +43,7 @@ define('NOTICES_PER_SECTION', 6);
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class NoticeSection extends Section
diff --git a/lib/nudgeform.php b/lib/nudgeform.php
index ffecce747..01dea3d36 100644
--- a/lib/nudgeform.php
+++ b/lib/nudgeform.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/form.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      DisfavorForm
  */
diff --git a/lib/oauthclient.php b/lib/oauthclient.php
index a2ee0878f..e9463bb53 100644
--- a/lib/oauthclient.php
+++ b/lib/oauthclient.php
@@ -24,7 +24,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ require_once 'OAuth.php';
  * @package  StatusNet
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  */
 class OAuthClientCurlException extends Exception
@@ -54,7 +54,7 @@ class OAuthClientCurlException extends Exception
  * @package  StatusNet
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  */
 class OAuthClient
diff --git a/lib/ownerdesignaction.php b/lib/ownerdesignaction.php
index f53954fea..e1400fd92 100644
--- a/lib/ownerdesignaction.php
+++ b/lib/ownerdesignaction.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  */
 
diff --git a/lib/parallelizingdaemon.php b/lib/parallelizingdaemon.php
index 8e09a3a41..6735427ce 100644
--- a/lib/parallelizingdaemon.php
+++ b/lib/parallelizingdaemon.php
@@ -25,7 +25,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ declare(ticks = 1);
  * @author   Zach Copley <zach@controlyourself.ca>
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ParallelizingDaemon extends Daemon
diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 49513eb2f..0faa7a10d 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -48,7 +48,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      HTMLOutputter
  */
diff --git a/lib/personaltagcloudsection.php b/lib/personaltagcloudsection.php
index 1b8d9fa2d..57c5b84a1 100644
--- a/lib/personaltagcloudsection.php
+++ b/lib/personaltagcloudsection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class PersonalTagCloudSection extends TagCloudSection
diff --git a/lib/plugin.php b/lib/plugin.php
index 437cf03a1..97ff8f19a 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -48,7 +48,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      Event
  */
diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php
index 64abd8847..496305168 100644
--- a/lib/popularnoticesection.php
+++ b/lib/popularnoticesection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -41,7 +41,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class PopularNoticeSection extends NoticeSection
diff --git a/lib/profileaction.php b/lib/profileaction.php
index 19673a76d..1ca9830b8 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/groupminilist.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ProfileAction extends OwnerDesignAction
diff --git a/lib/profilelist.php b/lib/profilelist.php
index 5ee2fd499..eb9bd222f 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -25,7 +25,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @author   Zach Copley <zach@controlyourself.ca>
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ProfileList extends Widget
diff --git a/lib/profileminilist.php b/lib/profileminilist.php
index ea0a3d042..d5a2f387e 100644
--- a/lib/profileminilist.php
+++ b/lib/profileminilist.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ define('PROFILES_PER_MINILIST', 27);
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ProfileMiniList extends ProfileList
diff --git a/lib/profilesection.php b/lib/profilesection.php
index 79a751504..9f71d6b36 100644
--- a/lib/profilesection.php
+++ b/lib/profilesection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -43,7 +43,7 @@ define('PROFILES_PER_SECTION', 6);
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ProfileSection extends Section
diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index d26a74909..c9c51d003 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      Widget
  */
diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index 37091af49..8a37453ec 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 class QueueManager
diff --git a/lib/router.php b/lib/router.php
index fd9780b22..e5f651401 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once 'Net/URL/Mapper.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class Router
diff --git a/lib/rssaction.php b/lib/rssaction.php
index 21d85144d..93a47f14e 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -25,7 +25,7 @@
  * @author    Earle Martin <earle@downlode.org>
  * @copyright 2008-9 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) { exit(1); }
@@ -354,7 +354,7 @@ class Rss10Action extends Action
                                               'xmlns:rdfs' =>
                                               'http://www.w3.org/2000/01/rdf-schema#',
                                               'xmlns:laconica' =>
-                                              'http://laconi.ca/ont/',
+                                              'http://status.net/ont/',
                                               'xmlns' => 'http://purl.org/rss/1.0/'));
         $this->elementStart('sioc:Site', array('rdf:about' => common_root_url()));
         $this->element('sioc:name', null, common_config('site', 'name'));
diff --git a/lib/searchaction.php b/lib/searchaction.php
index 4da2c012d..5a0e3b897 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -9,7 +9,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/searchgroupnav.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class SearchAction extends Action
 {
diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php
index f47b9a2bc..7673e96c8 100644
--- a/lib/searchgroupnav.php
+++ b/lib/searchgroupnav.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      Widget
  */
diff --git a/lib/section.php b/lib/section.php
index de00e82ce..faf043025 100644
--- a/lib/section.php
+++ b/lib/section.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class Section extends Widget
diff --git a/lib/servererroraction.php b/lib/servererroraction.php
index a976778bf..cee2e54fd 100644
--- a/lib/servererroraction.php
+++ b/lib/servererroraction.php
@@ -10,7 +10,7 @@
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
@@ -50,7 +50,7 @@ require_once INSTALLDIR.'/lib/error.php';
  * @package  StatusNet
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ServerErrorAction extends ErrorAction
diff --git a/lib/serverexception.php b/lib/serverexception.php
index 4ce3887e4..634d52d24 100644
--- a/lib/serverexception.php
+++ b/lib/serverexception.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ServerException extends Exception
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 5118e588e..7b0e0b1b5 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      Widget
  */
diff --git a/lib/snapshot.php b/lib/snapshot.php
index e2b86a52f..868389668 100644
--- a/lib/snapshot.php
+++ b/lib/snapshot.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * This class will collect statistics on the site and report them to
  * a statistics server of the admin's choice. (Default is the big one
- * at laconi.ca.)
+ * at status.net.)
  *
  * It can either be called from a cron job, or run occasionally by the
  * Web site.
@@ -45,7 +45,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  */
 
diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index 34643114c..3894d9072 100644
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 require_once 'Stomp.php';
diff --git a/lib/subgroupnav.php b/lib/subgroupnav.php
index 2ff003d07..cc8744719 100644
--- a/lib/subgroupnav.php
+++ b/lib/subgroupnav.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class SubGroupNav extends Widget
diff --git a/lib/subpeopletagcloudsection.php b/lib/subpeopletagcloudsection.php
index c224c9c19..c626535bd 100644
--- a/lib/subpeopletagcloudsection.php
+++ b/lib/subpeopletagcloudsection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class SubPeopleTagCloudSection extends TagCloudSection
diff --git a/lib/subscribeform.php b/lib/subscribeform.php
index 79531329d..5bfede664 100644
--- a/lib/subscribeform.php
+++ b/lib/subscribeform.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/form.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      UnsubscribeForm
  */
diff --git a/lib/subscriberspeopleselftagcloudsection.php b/lib/subscriberspeopleselftagcloudsection.php
index 55c97111d..bef8c8f3b 100644
--- a/lib/subscriberspeopleselftagcloudsection.php
+++ b/lib/subscriberspeopleselftagcloudsection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class SubscribersPeopleSelfTagCloudSection extends SubPeopleTagCloudSection
diff --git a/lib/subscriberspeopletagcloudsection.php b/lib/subscriberspeopletagcloudsection.php
index ae6d6803e..2481cb74f 100644
--- a/lib/subscriberspeopletagcloudsection.php
+++ b/lib/subscriberspeopletagcloudsection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class SubscribersPeopleTagCloudSection extends SubPeopleTagCloudSection
diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index 9d27519ac..e7a8302c5 100644
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -25,7 +25,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/profilelist.php';
  * @author   Zach Copley <zach@controlyourself.ca>
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class SubscriptionList extends ProfileList
diff --git a/lib/subscriptionspeopleselftagcloudsection.php b/lib/subscriptionspeopleselftagcloudsection.php
index 7efa6e157..d2ea85c75 100644
--- a/lib/subscriptionspeopleselftagcloudsection.php
+++ b/lib/subscriptionspeopleselftagcloudsection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class SubscriptionsPeopleSelfTagCloudSection extends SubPeopleTagCloudSection
diff --git a/lib/subscriptionspeopletagcloudsection.php b/lib/subscriptionspeopletagcloudsection.php
index 7ad6e79a4..fe26f9afa 100644
--- a/lib/subscriptionspeopletagcloudsection.php
+++ b/lib/subscriptionspeopletagcloudsection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class SubscriptionsPeopleTagCloudSection extends SubPeopleTagCloudSection
diff --git a/lib/tagcloudsection.php b/lib/tagcloudsection.php
index 57260efac..8278c90d4 100644
--- a/lib/tagcloudsection.php
+++ b/lib/tagcloudsection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -43,7 +43,7 @@ define('TAGS_PER_SECTION', 20);
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class TagCloudSection extends Section
diff --git a/lib/theme.php b/lib/theme.php
index 5bd3cb69b..734284b27 100644
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
diff --git a/lib/topposterssection.php b/lib/topposterssection.php
index 604ffb2e8..ddb110450 100644
--- a/lib/topposterssection.php
+++ b/lib/topposterssection.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -41,7 +41,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class TopPostersSection extends ProfileSection
diff --git a/lib/twitteroauthclient.php b/lib/twitteroauthclient.php
index 12a4068be..6555858d9 100644
--- a/lib/twitteroauthclient.php
+++ b/lib/twitteroauthclient.php
@@ -24,7 +24,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Zach Copley <zach@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  */
 class TwitterOAuthClient extends OAuthClient
diff --git a/lib/unblockform.php b/lib/unblockform.php
index 1b9a88960..e302f3843 100644
--- a/lib/unblockform.php
+++ b/lib/unblockform.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/form.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      BlockForm
  */
diff --git a/lib/unqueuemanager.php b/lib/unqueuemanager.php
index ddfe6c085..5ac1a2ff3 100644
--- a/lib/unqueuemanager.php
+++ b/lib/unqueuemanager.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 class UnQueueManager
diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php
index 2fe06752e..6699a294c 100644
--- a/lib/unsubscribeform.php
+++ b/lib/unsubscribeform.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/form.php';
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      SubscribeForm
  */
diff --git a/lib/webcolor.php b/lib/webcolor.php
index 986b411c5..230e04a1f 100644
--- a/lib/webcolor.php
+++ b/lib/webcolor.php
@@ -24,7 +24,7 @@
  * @author    Zach Copley <zach@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
diff --git a/lib/widget.php b/lib/widget.php
index 8a132fc52..abb8037c5 100644
--- a/lib/widget.php
+++ b/lib/widget.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -44,7 +44,7 @@ if (!defined('LACONICA')) {
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      HTMLOutputter
  */
diff --git a/lib/xmloutputter.php b/lib/xmloutputter.php
index 253633751..cd6b8eb41 100644
--- a/lib/xmloutputter.php
+++ b/lib/xmloutputter.php
@@ -25,7 +25,7 @@
  * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -44,7 +44,7 @@ if (!defined('LACONICA')) {
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  * @see      Action
  * @see      HTMLOutputter
  */
diff --git a/lib/xmlstringer.php b/lib/xmlstringer.php
index 1e14ec60f..5a7189cbd 100644
--- a/lib/xmlstringer.php
+++ b/lib/xmlstringer.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@controlyourself.ca>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('LACONICA')) {
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  * @see      Action
  * @see      HTMLOutputter
  */
diff --git a/scripts/synctwitterfriends.php b/scripts/synctwitterfriends.php
index f4f714f59..caec9977a 100755
--- a/scripts/synctwitterfriends.php
+++ b/scripts/synctwitterfriends.php
@@ -41,7 +41,7 @@ require_once INSTALLDIR . '/lib/parallelizingdaemon.php';
  * @author   Zach Copley <zach@controlyourself.ca>
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 $helptext = <<<END_OF_TWITTER_HELP
diff --git a/scripts/twitterstatusfetcher.php b/scripts/twitterstatusfetcher.php
index 474ec452e..38ddb3a5f 100755
--- a/scripts/twitterstatusfetcher.php
+++ b/scripts/twitterstatusfetcher.php
@@ -50,7 +50,7 @@ require_once INSTALLDIR . '/lib/daemon.php';
  * @author   Zach Copley <zach@controlyourself.ca>
  * @author   Evan Prodromou <evan@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 // NOTE: an Avatar path MUST be set in config.php for this
diff --git a/scripts/update_translations.php b/scripts/update_translations.php
index b3ca8c70b..0dee4f5a5 100755
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -42,7 +42,7 @@ $languages = get_all_languages();
 foreach ($languages as $language) {
 
     $code = $language['lang'];
-    $file_url = 'http://laconi.ca/pootle/' . $code .
+    $file_url = 'http://status.net/pootle/' . $code .
         '/laconica/LC_MESSAGES/laconica.po';
     $lcdir = INSTALLDIR . '/locale/' . $code;
     $msgdir = "$lcdir/LC_MESSAGES";
-- 
cgit v1.2.3-54-g00ecf


From ae883ceb9b4689f6c1dd3aecdc4a844eda7d179a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 25 Aug 2009 18:19:04 -0400
Subject: change controlyourself.ca to status.net

---
 actions/accesstoken.php                        |  8 ++++----
 actions/allrss.php                             |  8 ++++----
 actions/attachment.php                         |  4 ++--
 actions/attachment_ajax.php                    |  4 ++--
 actions/attachment_thumbnail.php               |  4 ++--
 actions/avatarbynickname.php                   |  8 ++++----
 actions/avatarsettings.php                     | 10 +++++-----
 actions/block.php                              |  8 ++++----
 actions/blockedfromgroup.php                   |  8 ++++----
 actions/confirmaddress.php                     |  4 ++--
 actions/conversation.php                       |  8 ++++----
 actions/deletenotice.php                       |  4 ++--
 actions/disfavor.php                           |  8 ++++----
 actions/doc.php                                |  8 ++++----
 actions/editgroup.php                          | 10 +++++-----
 actions/emailsettings.php                      |  8 ++++----
 actions/favor.php                              |  8 ++++----
 actions/favorited.php                          |  8 ++++----
 actions/favoritesrss.php                       | 10 +++++-----
 actions/featured.php                           |  8 ++++----
 actions/finishaddopenid.php                    |  4 ++--
 actions/groupblock.php                         |  4 ++--
 actions/groupbyid.php                          |  6 +++---
 actions/groupdesignsettings.php                |  8 ++++----
 actions/grouplogo.php                          | 10 +++++-----
 actions/groupmembers.php                       | 12 ++++++------
 actions/grouprss.php                           |  6 +++---
 actions/groups.php                             |  6 +++---
 actions/groupsearch.php                        |  8 ++++----
 actions/groupunblock.php                       |  4 ++--
 actions/imsettings.php                         |  4 ++--
 actions/inbox.php                              |  4 ++--
 actions/joingroup.php                          |  4 ++--
 actions/leavegroup.php                         |  4 ++--
 actions/login.php                              |  4 ++--
 actions/logout.php                             |  8 ++++----
 actions/makeadmin.php                          |  4 ++--
 actions/microsummary.php                       |  8 ++++----
 actions/newgroup.php                           |  6 +++---
 actions/newmessage.php                         | 12 ++++++------
 actions/newnotice.php                          | 12 ++++++------
 actions/noticesearch.php                       | 10 +++++-----
 actions/noticesearchrss.php                    |  8 ++++----
 actions/nudge.php                              | 10 +++++-----
 actions/oembed.php                             |  2 +-
 actions/openidsettings.php                     |  4 ++--
 actions/opensearch.php                         |  8 ++++----
 actions/othersettings.php                      |  8 ++++----
 actions/outbox.php                             |  4 ++--
 actions/passwordsettings.php                   |  8 ++++----
 actions/peoplesearch.php                       | 12 ++++++------
 actions/peopletag.php                          |  8 ++++----
 actions/profilesettings.php                    |  8 ++++----
 actions/public.php                             |  4 ++--
 actions/publicrss.php                          |  8 ++++----
 actions/publictagcloud.php                     |  4 ++--
 actions/publicxrds.php                         |  8 ++++----
 actions/register.php                           |  4 ++--
 actions/replies.php                            |  4 ++--
 actions/requesttoken.php                       |  8 ++++----
 actions/showfavorites.php                      |  4 ++--
 actions/showgroup.php                          |  6 +++---
 actions/showmessage.php                        |  4 ++--
 actions/shownotice.php                         |  4 ++--
 actions/showstream.php                         |  6 +++---
 actions/smssettings.php                        |  4 ++--
 actions/subscribers.php                        |  6 +++---
 actions/subscriptions.php                      |  6 +++---
 actions/twitapigroups.php                      |  4 ++--
 actions/twitapisearchatom.php                  |  4 ++--
 actions/twitapisearchjson.php                  |  4 ++--
 actions/twitapistatusnet.php                   |  4 ++--
 actions/twitapitags.php                        |  4 ++--
 actions/twitapitrends.php                      |  4 ++--
 actions/twitterauthorization.php               |  2 +-
 actions/twittersettings.php                    |  4 ++--
 actions/unblock.php                            |  8 ++++----
 actions/unsubscribe.php                        |  8 ++++----
 actions/userbyid.php                           |  8 ++++----
 actions/userdesignsettings.php                 |  8 ++++----
 actions/usergroups.php                         |  6 +++---
 actions/xrds.php                               |  8 ++++----
 lib/accountsettingsaction.php                  |  6 +++---
 lib/action.php                                 |  8 ++++----
 lib/attachmentlist.php                         |  8 ++++----
 lib/attachmentnoticesection.php                |  4 ++--
 lib/attachmenttagcloudsection.php              |  4 ++--
 lib/blockform.php                              |  8 ++++----
 lib/clienterroraction.php                      |  6 +++---
 lib/clientexception.php                        |  4 ++--
 lib/connectsettingsaction.php                  |  6 +++---
 lib/currentuserdesignaction.php                |  4 ++--
 lib/dberroraction.php                          |  6 +++---
 lib/dbqueuemanager.php                         |  2 +-
 lib/deleteaction.php                           |  4 ++--
 lib/designsettings.php                         |  8 ++++----
 lib/disfavorform.php                           |  8 ++++----
 lib/error.php                                  |  6 +++---
 lib/event.php                                  |  4 ++--
 lib/facebookaction.php                         |  2 +-
 lib/favorform.php                              |  8 ++++----
 lib/featureduserssection.php                   |  4 ++--
 lib/feed.php                                   |  6 +++---
 lib/feedlist.php                               |  8 ++++----
 lib/form.php                                   |  8 ++++----
 lib/groupdesignaction.php                      |  4 ++--
 lib/groupeditform.php                          |  8 ++++----
 lib/grouplist.php                              |  4 ++--
 lib/groupminilist.php                          |  4 ++--
 lib/groupnav.php                               |  8 ++++----
 lib/groupsbymemberssection.php                 |  4 ++--
 lib/groupsbypostssection.php                   |  4 ++--
 lib/groupsection.php                           |  4 ++--
 lib/grouptagcloudsection.php                   |  4 ++--
 lib/htmloutputter.php                          |  8 ++++----
 lib/imagefile.php                              |  8 ++++----
 lib/jabber.php                                 |  2 +-
 lib/joinform.php                               |  8 ++++----
 lib/jsonsearchresultslist.php                  |  6 +++---
 lib/language.php                               |  2 +-
 lib/leaveform.php                              |  8 ++++----
 lib/logingroupnav.php                          |  4 ++--
 lib/mail.php                                   |  8 ++++----
 lib/mailbox.php                                |  4 ++--
 lib/messageform.php                            |  8 ++++----
 lib/microid.php                                |  4 ++--
 lib/noticeform.php                             |  8 ++++----
 lib/noticelist.php                             |  8 ++++----
 lib/noticesection.php                          |  4 ++--
 lib/nudgeform.php                              |  8 ++++----
 lib/oauthclient.php                            |  6 +++---
 lib/ownerdesignaction.php                      |  4 ++--
 lib/parallelizingdaemon.php                    |  8 ++++----
 lib/personalgroupnav.php                       |  8 ++++----
 lib/personaltagcloudsection.php                |  4 ++--
 lib/plugin.php                                 |  4 ++--
 lib/popularnoticesection.php                   |  4 ++--
 lib/profileaction.php                          |  6 +++---
 lib/profilelist.php                            |  6 +++---
 lib/profileminilist.php                        |  4 ++--
 lib/profilesection.php                         |  4 ++--
 lib/publicgroupnav.php                         |  6 +++---
 lib/queuemanager.php                           |  4 ++--
 lib/router.php                                 |  4 ++--
 lib/rssaction.php                              |  2 +-
 lib/searchaction.php                           |  8 ++++----
 lib/searchgroupnav.php                         |  4 ++--
 lib/section.php                                |  4 ++--
 lib/servererroraction.php                      |  6 +++---
 lib/serverexception.php                        |  4 ++--
 lib/settingsaction.php                         |  4 ++--
 lib/snapshot.php                               |  4 ++--
 lib/stompqueuemanager.php                      |  4 ++--
 lib/subgroupnav.php                            |  4 ++--
 lib/subpeopletagcloudsection.php               |  4 ++--
 lib/subscribeform.php                          |  8 ++++----
 lib/subscriberspeopleselftagcloudsection.php   |  4 ++--
 lib/subscriberspeopletagcloudsection.php       |  4 ++--
 lib/subscriptionlist.php                       |  6 +++---
 lib/subscriptionspeopleselftagcloudsection.php |  4 ++--
 lib/subscriptionspeopletagcloudsection.php     |  4 ++--
 lib/tagcloudsection.php                        |  4 ++--
 lib/theme.php                                  |  4 ++--
 lib/topposterssection.php                      |  4 ++--
 lib/twitteroauthclient.php                     |  4 ++--
 lib/unblockform.php                            |  8 ++++----
 lib/unqueuemanager.php                         |  4 ++--
 lib/unsubscribeform.php                        |  8 ++++----
 lib/webcolor.php                               |  2 +-
 lib/widget.php                                 |  8 ++++----
 lib/xmloutputter.php                           |  8 ++++----
 lib/xmlstringer.php                            |  4 ++--
 scripts/synctwitterfriends.php                 |  4 ++--
 scripts/twitterstatusfetcher.php               |  4 ++--
 174 files changed, 510 insertions(+), 510 deletions(-)

(limited to 'lib/unblockform.php')

diff --git a/actions/accesstoken.php b/actions/accesstoken.php
index 064c6da24..551c2e4d8 100644
--- a/actions/accesstoken.php
+++ b/actions/accesstoken.php
@@ -6,8 +6,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/omb.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/allrss.php b/actions/allrss.php
index 61aa5b475..0313ef611 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -7,8 +7,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -42,8 +42,8 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/attachment.php b/actions/attachment.php
index a1db8f8ba..f417d47ee 100644
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -21,7 +21,7 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/lib/attachmentlist.php';
  *
  * @category Personal
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/attachment_ajax.php b/actions/attachment_ajax.php
index e4e6431ba..6701a9463 100644
--- a/actions/attachment_ajax.php
+++ b/actions/attachment_ajax.php
@@ -21,7 +21,7 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/actions/attachment.php';
  *
  * @category Personal
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/attachment_thumbnail.php b/actions/attachment_thumbnail.php
index e32571322..e27480424 100644
--- a/actions/attachment_thumbnail.php
+++ b/actions/attachment_thumbnail.php
@@ -21,7 +21,7 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/actions/attachment.php';
  *
  * @category Personal
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
index 2e1149511..0b0d77aad 100644
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -6,8 +6,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -37,8 +37,8 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index dec4049e4..d5be3463b 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -21,8 +21,8 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -43,9 +43,9 @@ define('MAX_ORIGINAL', 480);
  *
  * @category Settings
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/block.php b/actions/block.php
index d0ac7836c..9687783a8 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -6,8 +6,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -37,8 +37,8 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php
index 9d1beab72..dea868fc6 100644
--- a/actions/blockedfromgroup.php
+++ b/actions/blockedfromgroup.php
@@ -21,7 +21,7 @@
  *
  * @category  Group
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Group
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
@@ -191,8 +191,8 @@ class GroupBlockListItem extends ProfileListItem
  *
  * @category Form
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index dc6d4c339..2b7b949a4 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -21,7 +21,7 @@
  *
  * @category  Confirm
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -40,7 +40,7 @@ if (!defined('LACONICA')) {
  *
  * @category Confirm
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/conversation.php b/actions/conversation.php
index 7f5483ef1..b284e4dd7 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -6,7 +6,7 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/noticelist.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
@@ -130,7 +130,7 @@ class ConversationAction extends Action
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
@@ -251,7 +251,7 @@ class ConversationTree extends NoticeList
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index 22c3fc3b9..24f70b5db 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -21,8 +21,8 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
diff --git a/actions/disfavor.php b/actions/disfavor.php
index ff78f79e6..67b16bfd3 100644
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -7,8 +7,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -40,8 +40,8 @@ require_once INSTALLDIR.'/lib/favorform.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/doc.php b/actions/doc.php
index bfa90e080..522441824 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -7,8 +7,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -38,8 +38,8 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/editgroup.php b/actions/editgroup.php
index 1c27ecefb..ea317f365 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -21,9 +21,9 @@
  *
  * @category  Group
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @author   Zach Copley <zach@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -40,8 +40,8 @@ if (!defined('LACONICA')) {
  *
  * @category Group
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index d54d94272..8bd1c74c4 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -21,8 +21,8 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  *
  * @category Settings
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/actions/favor.php b/actions/favor.php
index d10beb8d6..17d0d9d17 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -7,8 +7,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -41,8 +41,8 @@ require_once INSTALLDIR.'/lib/disfavorform.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/favorited.php b/actions/favorited.php
index 2929736ab..445c30767 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -21,8 +21,8 @@
  *
  * @category  Public
  * @package   StatusNet
- * @author    Zach Copley <zach@controlyourself.ca>
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -43,8 +43,8 @@ require_once INSTALLDIR.'/lib/noticelist.php';
  *
  * @category Personal
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php
index 3603c6e43..0c6c4b8f9 100644
--- a/actions/favoritesrss.php
+++ b/actions/favoritesrss.php
@@ -7,8 +7,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -42,9 +42,9 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/featured.php b/actions/featured.php
index 4211c67ea..ac1912ba3 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -21,8 +21,8 @@
  *
  * @category  Public
  * @package   StatusNet
- * @author    Zach Copley <zach@controlyourself.ca>
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -40,8 +40,8 @@ require_once INSTALLDIR.'/lib/publicgroupnav.php';
  *
  * @category Public
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php
index 98db9eb4f..f8d88587d 100644
--- a/actions/finishaddopenid.php
+++ b/actions/finishaddopenid.php
@@ -21,7 +21,7 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/lib/openid.php';
  *
  * @category Settings
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/groupblock.php b/actions/groupblock.php
index 5b3dd545a..7735e2dcf 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -6,7 +6,7 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/groupbyid.php b/actions/groupbyid.php
index 9bbf8d3d2..8775676f7 100644
--- a/actions/groupbyid.php
+++ b/actions/groupbyid.php
@@ -21,8 +21,8 @@
  *
  * @category  Group
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  *
  * @category Group
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php
index 973c1b802..aae4ae865 100644
--- a/actions/groupdesignsettings.php
+++ b/actions/groupdesignsettings.php
@@ -21,8 +21,8 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,8 +41,8 @@ require_once INSTALLDIR . '/lib/designsettings.php';
  *
  * @category Settings
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index 74e8e7136..f9354d458 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -21,8 +21,8 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -43,9 +43,9 @@ define('MAX_ORIGINAL', 480);
  *
  * @category Settings
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index 7df514758..265d2ca0e 100644
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -21,7 +21,7 @@
  *
  * @category  Group
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,7 +39,7 @@ require_once INSTALLDIR.'/lib/publicgroupnav.php';
  *
  * @category Group
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
@@ -221,8 +221,8 @@ class GroupMemberListItem extends ProfileListItem
  *
  * @category Form
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
@@ -349,8 +349,8 @@ class GroupBlockForm extends Form
  *
  * @category Form
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/grouprss.php b/actions/grouprss.php
index 21e493fe5..ad6094032 100644
--- a/actions/grouprss.php
+++ b/actions/grouprss.php
@@ -21,8 +21,8 @@
  *
  * @category  Group
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,7 +41,7 @@ define('MEMBERS_PER_SECTION', 27);
  *
  * @category Group
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/groups.php b/actions/groups.php
index e862428fc..09216e613 100644
--- a/actions/groups.php
+++ b/actions/groups.php
@@ -21,8 +21,8 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/grouplist.php';
  *
  * @category Personal
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/groupsearch.php b/actions/groupsearch.php
index 6d4979272..a7004366f 100644
--- a/actions/groupsearch.php
+++ b/actions/groupsearch.php
@@ -6,8 +6,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -40,8 +40,8 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/groupunblock.php b/actions/groupunblock.php
index fc7953836..45d70841c 100644
--- a/actions/groupunblock.php
+++ b/actions/groupunblock.php
@@ -6,7 +6,7 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/imsettings.php b/actions/imsettings.php
index bfad8eaf9..3e89b6f66 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -21,7 +21,7 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,7 +39,7 @@ require_once INSTALLDIR.'/lib/jabber.php';
  *
  * @category Settings
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/actions/inbox.php b/actions/inbox.php
index 2ee766013..757461fe8 100644
--- a/actions/inbox.php
+++ b/actions/inbox.php
@@ -21,7 +21,7 @@
  *
  * @category  Message
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/lib/mailbox.php';
  *
  * @category Message
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  * @see      MailboxAction
diff --git a/actions/joingroup.php b/actions/joingroup.php
index 599cf50e3..bf19a2ad9 100644
--- a/actions/joingroup.php
+++ b/actions/joingroup.php
@@ -21,7 +21,7 @@
  *
  * @category  Group
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,7 +39,7 @@ if (!defined('LACONICA')) {
  *
  * @category Group
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index a87e6225d..347440ed6 100644
--- a/actions/leavegroup.php
+++ b/actions/leavegroup.php
@@ -21,7 +21,7 @@
  *
  * @category  Group
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,7 +39,7 @@ if (!defined('LACONICA')) {
  *
  * @category Group
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/login.php b/actions/login.php
index c187a587f..020f5ea63 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -21,7 +21,7 @@
  *
  * @category  Login
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Personal
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/logout.php b/actions/logout.php
index 237348628..6e147ccc0 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -6,8 +6,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/openid.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/makeadmin.php b/actions/makeadmin.php
index 9bc0d3710..7ab41fa6e 100644
--- a/actions/makeadmin.php
+++ b/actions/makeadmin.php
@@ -6,7 +6,7 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/microsummary.php b/actions/microsummary.php
index b5cfb974e..585ef788a 100644
--- a/actions/microsummary.php
+++ b/actions/microsummary.php
@@ -6,8 +6,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -37,8 +37,8 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/newgroup.php b/actions/newgroup.php
index a1cbb4d4a..f16c25f1a 100644
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -21,8 +21,8 @@
  *
  * @category  Group
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,7 +39,7 @@ if (!defined('LACONICA')) {
  *
  * @category Group
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/newmessage.php b/actions/newmessage.php
index ca9d3703a..9ca3e66e1 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -21,9 +21,9 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Zach Copley <zach@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Zach Copley <zach@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,9 +38,9 @@ if (!defined('LACONICA')) {
  *
  * @category Personal
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 3fcf0df54..bc1b7b06a 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -21,9 +21,9 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Zach Copley <zach@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Zach Copley <zach@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -40,9 +40,9 @@ require_once INSTALLDIR.'/lib/noticelist.php';
  *
  * @category Personal
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 59f2a5092..fc849f4dc 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -6,9 +6,9 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -40,8 +40,8 @@ require_once INSTALLDIR.'/lib/searchaction.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  * @todo     common parent for people and content search?
diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php
index c49a5a1ba..a1d36ff56 100644
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -6,8 +6,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -41,8 +41,8 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/nudge.php b/actions/nudge.php
index ae9a37500..58ec0cbc0 100644
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -7,8 +7,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -40,9 +40,9 @@ require_once INSTALLDIR.'/lib/mail.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/oembed.php b/actions/oembed.php
index 323652714..3940a4db4 100644
--- a/actions/oembed.php
+++ b/actions/oembed.php
@@ -21,7 +21,7 @@
  *
  * @category  Twitter
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 86db7478a..581254651 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -21,7 +21,7 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/openid.php';
  *
  * @category Settings
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/opensearch.php b/actions/opensearch.php
index c32a34f61..81efcea9b 100644
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -7,8 +7,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -40,8 +40,8 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/othersettings.php b/actions/othersettings.php
index 056a0c2d4..3953bbb88 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -21,8 +21,8 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Robin Millette <millette@controlyourself.ca>
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Robin Millette <millette@status.net>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,8 +41,8 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  *
  * @category Settings
  * @package  StatusNet
- * @author   Robin Millette <millette@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Robin Millette <millette@status.net>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/outbox.php b/actions/outbox.php
index 869360efa..726934ae6 100644
--- a/actions/outbox.php
+++ b/actions/outbox.php
@@ -21,7 +21,7 @@
  *
  * @category  Message
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/lib/mailbox.php';
  *
  * @category Message
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  * @see      MailboxAction
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index 905940557..43188030f 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -21,8 +21,8 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  *
  * @category Settings
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 3bad19d83..e083faf62 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -6,8 +6,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -40,8 +40,8 @@ require_once INSTALLDIR.'/lib/profilelist.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
@@ -94,8 +94,8 @@ class PeoplesearchAction extends SearchAction
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
diff --git a/actions/peopletag.php b/actions/peopletag.php
index 310d91eea..bf15e1e2e 100644
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -21,8 +21,8 @@
  *
  * @category  Action
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/profilelist.php';
  *
  * @category Output
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 390e85524..013e3ac82 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -21,8 +21,8 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  *
  * @category Settings
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/public.php b/actions/public.php
index 2c8d2c4f9..4ea48a2ff 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -21,7 +21,7 @@
  *
  * @category  Public
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -44,7 +44,7 @@ define('MAX_PUBLIC_PAGE', 100);
  *
  * @category Public
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/actions/publicrss.php b/actions/publicrss.php
index 6fc7dfa80..55ef3c66b 100644
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -7,8 +7,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -42,8 +42,8 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index 0fbd41901..de987184b 100644
--- a/actions/publictagcloud.php
+++ b/actions/publictagcloud.php
@@ -22,7 +22,7 @@
  * @category  Public
  * @package   StatusNet
  * @author    Mike Cochrane <mikec@mikenz.geek.nz>
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 Mike Cochrane
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -39,7 +39,7 @@ define('TAGS_PER_PAGE', 100);
  * @category Personal
  * @package  StatusNet
  * @author    Mike Cochrane <mikec@mikenz.geek.nz>
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 Mike Cochrane
  * @copyright 2008-2009 StatusNet, Inc.
  * @link     http://status.net/
diff --git a/actions/publicxrds.php b/actions/publicxrds.php
index e30c7f8fb..afc5463d3 100644
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -7,8 +7,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -40,8 +40,8 @@ require_once INSTALLDIR.'/lib/openid.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
diff --git a/actions/register.php b/actions/register.php
index d256cb093..35c1ddd4b 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -21,7 +21,7 @@
  *
  * @category  Login
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Login
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/replies.php b/actions/replies.php
index ff634ce6f..37c1f33e6 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -21,7 +21,7 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  *
  * @category Personal
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/requesttoken.php b/actions/requesttoken.php
index 8755fa447..1ece3e6b0 100644
--- a/actions/requesttoken.php
+++ b/actions/requesttoken.php
@@ -7,8 +7,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -40,8 +40,8 @@ require_once INSTALLDIR.'/lib/omb.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index 5be2814d1..41178c5a9 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -21,7 +21,7 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  *
  * @category Personal
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/showgroup.php b/actions/showgroup.php
index e33da9b9a..ed980233a 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -21,8 +21,8 @@
  *
  * @category  Group
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -42,7 +42,7 @@ define('MEMBERS_PER_SECTION', 27);
  *
  * @category Group
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/showmessage.php b/actions/showmessage.php
index d89e0792d..522fec490 100644
--- a/actions/showmessage.php
+++ b/actions/showmessage.php
@@ -21,7 +21,7 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,7 +39,7 @@ require_once INSTALLDIR.'/lib/mailbox.php';
  * 
  * @category Personal
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/shownotice.php b/actions/shownotice.php
index 7e83724a7..92911effb 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -21,7 +21,7 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  *
  * @category Personal
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/showstream.php b/actions/showstream.php
index 68dabe681..76482e97a 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -21,8 +21,8 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -49,7 +49,7 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  *
  * @category Personal
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 123c16316..587cf7d58 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -21,7 +21,7 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/lib/connectsettingsaction.php';
  *
  * @category Settings
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/actions/subscribers.php b/actions/subscribers.php
index 0f173e041..66a531c3f 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -21,8 +21,8 @@
  *
  * @category  Social
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -37,7 +37,7 @@ if (!defined('LACONICA')) {
  *
  * @category Social
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index a8c790531..656dea688 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -21,8 +21,8 @@
  *
  * @category  Social
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -37,7 +37,7 @@ if (!defined('LACONICA')) {
  *
  * @category Social
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php
index 866492b7b..f39975237 100644
--- a/actions/twitapigroups.php
+++ b/actions/twitapigroups.php
@@ -22,7 +22,7 @@
  * @category  Twitter
  * @package   StatusNet
  * @author    Craig Andrews
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  * @category  Twitter
  * @package   StatusNet
  * @author    Craig Andrews
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index 560eb64d2..5ecec9684 100644
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -21,7 +21,7 @@
  *
  * @category  Search
  * @package   StatusNet
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  *
  * @category Search
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/actions/twitapisearchjson.php b/actions/twitapisearchjson.php
index 8c80aca3b..73735c5b5 100644
--- a/actions/twitapisearchjson.php
+++ b/actions/twitapisearchjson.php
@@ -21,7 +21,7 @@
  *
  * @category  Search
  * @package   StatusNet
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,7 +39,7 @@ require_once INSTALLDIR.'/lib/jsonsearchresultslist.php';
  *
  * @category Search
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  * @see      TwitterapiAction
diff --git a/actions/twitapistatusnet.php b/actions/twitapistatusnet.php
index 80ddb48a9..ff159f207 100644
--- a/actions/twitapistatusnet.php
+++ b/actions/twitapistatusnet.php
@@ -21,7 +21,7 @@
  *
  * @category  Twitter
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  *
  * @category  Twitter
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
diff --git a/actions/twitapitags.php b/actions/twitapitags.php
index 9480d5abd..9ed9970a3 100644
--- a/actions/twitapitags.php
+++ b/actions/twitapitags.php
@@ -22,7 +22,7 @@
  * @category  Twitter
  * @package   StatusNet
  * @author    Craig Andrews
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  * @category  Twitter
  * @package   StatusNet
  * @author    Craig Andrews
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
diff --git a/actions/twitapitrends.php b/actions/twitapitrends.php
index e6baf7c63..f76601768 100644
--- a/actions/twitapitrends.php
+++ b/actions/twitapitrends.php
@@ -21,7 +21,7 @@
  *
  * @category  Search
  * @package   StatusNet
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
  *
  * @category Search
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/actions/twitterauthorization.php b/actions/twitterauthorization.php
index 123aafbbd..1861c1fcb 100644
--- a/actions/twitterauthorization.php
+++ b/actions/twitterauthorization.php
@@ -21,7 +21,7 @@
  *
  * @category  TwitterauthorizationAction
  * @package   StatusNet
- * @author    Zach Copely <zach@controlyourself.ca>
+ * @author    Zach Copely <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index bb003c343..389097667 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -21,7 +21,7 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,7 +39,7 @@ require_once INSTALLDIR.'/lib/twitter.php';
  *
  * @category Settings
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/actions/unblock.php b/actions/unblock.php
index afd6cfcdf..e4dbf4ca7 100644
--- a/actions/unblock.php
+++ b/actions/unblock.php
@@ -6,8 +6,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -37,8 +37,8 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 3ce96aefb..91d06cfa6 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -6,8 +6,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -37,8 +37,8 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/userbyid.php b/actions/userbyid.php
index b6908846a..5fa929a93 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -7,8 +7,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
 
@@ -38,8 +38,8 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php
index fc9c471cf..312ca1150 100644
--- a/actions/userdesignsettings.php
+++ b/actions/userdesignsettings.php
@@ -21,8 +21,8 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,8 +41,8 @@ require_once INSTALLDIR . '/lib/designsettings.php';
  *
  * @category Settings
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/usergroups.php b/actions/usergroups.php
index 9543eb480..fa7068a3b 100644
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -21,8 +21,8 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/grouplist.php';
  *
  * @category Personal
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/actions/xrds.php b/actions/xrds.php
index 0258f9b2d..ef1ebaed0 100644
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -7,8 +7,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -40,8 +40,8 @@ require_once INSTALLDIR.'/lib/omb.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php
index 972b3693e..d5dc0b217 100644
--- a/lib/accountsettingsaction.php
+++ b/lib/accountsettingsaction.php
@@ -21,7 +21,7 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/lib/settingsaction.php';
  *
  * @category Settings
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
@@ -67,7 +67,7 @@ class AccountSettingsAction extends SettingsAction
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/action.php b/lib/action.php
index 9507df3ba..fdfb6ebc6 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -21,8 +21,8 @@
  *
  * @category  Action
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -46,8 +46,8 @@ require_once INSTALLDIR.'/lib/htmloutputter.php';
  *
  * @category Output
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 4a221ec35..51fc40457 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -21,8 +21,8 @@
  *
  * @category  UI
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -42,7 +42,7 @@ if (!defined('LACONICA')) {
  *
  * @category UI
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  * @see      Notice
@@ -128,7 +128,7 @@ class AttachmentList extends Widget
  *
  * @category UI
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  * @see      NoticeList
diff --git a/lib/attachmentnoticesection.php b/lib/attachmentnoticesection.php
index 127fe5824..630a149ac 100644
--- a/lib/attachmentnoticesection.php
+++ b/lib/attachmentnoticesection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/attachmenttagcloudsection.php b/lib/attachmenttagcloudsection.php
index d751079aa..83b561104 100644
--- a/lib/attachmenttagcloudsection.php
+++ b/lib/attachmenttagcloudsection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/blockform.php b/lib/blockform.php
index e5ed31b0f..403ac59fe 100644
--- a/lib/blockform.php
+++ b/lib/blockform.php
@@ -21,8 +21,8 @@
  *
  * @category  Form
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @category Form
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/clienterroraction.php b/lib/clienterroraction.php
index cf7129c93..cd7d85221 100644
--- a/lib/clienterroraction.php
+++ b/lib/clienterroraction.php
@@ -7,8 +7,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -40,7 +40,7 @@ require_once INSTALLDIR.'/lib/error.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/lib/clientexception.php b/lib/clientexception.php
index c1492be74..bf26ec2eb 100644
--- a/lib/clientexception.php
+++ b/lib/clientexception.php
@@ -21,7 +21,7 @@
  *
  * @category  Exception
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  *
  * @category Exception
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php
index 75c825621..03142d4e5 100644
--- a/lib/connectsettingsaction.php
+++ b/lib/connectsettingsaction.php
@@ -21,7 +21,7 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/lib/settingsaction.php';
  *
  * @category Settings
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
@@ -67,7 +67,7 @@ class ConnectSettingsAction extends SettingsAction
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/currentuserdesignaction.php b/lib/currentuserdesignaction.php
index 7ff7c3399..874e3ff98 100644
--- a/lib/currentuserdesignaction.php
+++ b/lib/currentuserdesignaction.php
@@ -21,7 +21,7 @@
  *
  * @category  Action
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,7 +39,7 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/dberroraction.php b/lib/dberroraction.php
index 2b9fad4e6..a56ad9369 100644
--- a/lib/dberroraction.php
+++ b/lib/dberroraction.php
@@ -6,8 +6,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/servererroraction.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/lib/dbqueuemanager.php b/lib/dbqueuemanager.php
index b1850925b..750300928 100644
--- a/lib/dbqueuemanager.php
+++ b/lib/dbqueuemanager.php
@@ -21,7 +21,7 @@
  *
  * @category  QueueManager
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
diff --git a/lib/deleteaction.php b/lib/deleteaction.php
index fd4778cca..4320ad21b 100644
--- a/lib/deleteaction.php
+++ b/lib/deleteaction.php
@@ -21,8 +21,8 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
diff --git a/lib/designsettings.php b/lib/designsettings.php
index 103b1cd65..a531c10f1 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -21,8 +21,8 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -43,8 +43,8 @@ require_once INSTALLDIR . '/lib/webcolor.php';
  *
  * @category Settings
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/disfavorform.php b/lib/disfavorform.php
index e6b22fc70..3d045d522 100644
--- a/lib/disfavorform.php
+++ b/lib/disfavorform.php
@@ -21,8 +21,8 @@
  *
  * @category  Form
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @category Form
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/error.php b/lib/error.php
index fc749adfc..554156e53 100644
--- a/lib/error.php
+++ b/lib/error.php
@@ -7,8 +7,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/lib/event.php b/lib/event.php
index 1bfcdb67d..5df875be1 100644
--- a/lib/event.php
+++ b/lib/event.php
@@ -21,7 +21,7 @@
  *
  * @category  Event
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  *
  * @category Event
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index 753447f8b..b547c4474 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -21,7 +21,7 @@
  *
  * @category  Faceboook
  * @package   StatusNet
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
diff --git a/lib/favorform.php b/lib/favorform.php
index 0479105c5..ea6fd57c4 100644
--- a/lib/favorform.php
+++ b/lib/favorform.php
@@ -21,8 +21,8 @@
  *
  * @category  Form
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @category Form
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/featureduserssection.php b/lib/featureduserssection.php
index b8a971415..daea881a9 100644
--- a/lib/featureduserssection.php
+++ b/lib/featureduserssection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/feed.php b/lib/feed.php
index 5e0f9add7..43137503f 100644
--- a/lib/feed.php
+++ b/lib/feed.php
@@ -21,7 +21,7 @@
  *
  * @category  Feed
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,8 +38,8 @@ if (!defined('LACONICA')) {
  *
  * @category Feed
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/feedlist.php b/lib/feedlist.php
index da114c491..bb1a0016a 100644
--- a/lib/feedlist.php
+++ b/lib/feedlist.php
@@ -21,8 +21,8 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ if (!defined('LACONICA')) {
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/form.php b/lib/form.php
index 61c20fd48..b5547dbcd 100644
--- a/lib/form.php
+++ b/lib/form.php
@@ -21,8 +21,8 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -42,8 +42,8 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/groupdesignaction.php b/lib/groupdesignaction.php
index ff2532026..50321097a 100644
--- a/lib/groupdesignaction.php
+++ b/lib/groupdesignaction.php
@@ -21,7 +21,7 @@
  *
  * @category  Action
  * @package   StatusNet
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,7 +39,7 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/groupeditform.php b/lib/groupeditform.php
index ae9eb17b9..c88fd88f4 100644
--- a/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@ -21,8 +21,8 @@
  *
  * @category  Form
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @category Form
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/grouplist.php b/lib/grouplist.php
index 47406bb2c..965052625 100644
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -22,7 +22,7 @@
  *
  * @category  Public
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,7 +41,7 @@ define('GROUPS_PER_PAGE', 20);
  *
  * @category Public
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/groupminilist.php b/lib/groupminilist.php
index 2b74a6ef8..9007b4fb0 100644
--- a/lib/groupminilist.php
+++ b/lib/groupminilist.php
@@ -21,7 +21,7 @@
  *
  * @category  Public
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -40,7 +40,7 @@ define('GROUPS_PER_MINILIST', 27);
  *
  * @category Public
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/groupnav.php b/lib/groupnav.php
index e3daff6a4..909783132 100644
--- a/lib/groupnav.php
+++ b/lib/groupnav.php
@@ -21,8 +21,8 @@
  *
  * @category  Action
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,8 +41,8 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @category Output
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/groupsbymemberssection.php b/lib/groupsbymemberssection.php
index c8bf546f9..c799bc166 100644
--- a/lib/groupsbymemberssection.php
+++ b/lib/groupsbymemberssection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/groupsbypostssection.php b/lib/groupsbypostssection.php
index e78efeeb4..256b164bc 100644
--- a/lib/groupsbypostssection.php
+++ b/lib/groupsbypostssection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/groupsection.php b/lib/groupsection.php
index 203ac3cb2..95d33569d 100644
--- a/lib/groupsection.php
+++ b/lib/groupsection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,7 +41,7 @@ define('GROUPS_PER_SECTION', 6);
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/grouptagcloudsection.php b/lib/grouptagcloudsection.php
index afd2eba44..085e2d25b 100644
--- a/lib/grouptagcloudsection.php
+++ b/lib/grouptagcloudsection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 714107710..565b148fa 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -21,8 +21,8 @@
  *
  * @category  Output
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -48,8 +48,8 @@ define('PAGE_TYPE_PREFS',
  *
  * @category Output
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/imagefile.php b/lib/imagefile.php
index ec4349d6c..bdff9874d 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -21,8 +21,8 @@
  *
  * @category  Image
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ if (!defined('LACONICA')) {
  *
  * @category Image
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/jabber.php b/lib/jabber.php
index 375a3e50f..99226b04e 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -21,7 +21,7 @@
  *
  * @category  Network
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
diff --git a/lib/joinform.php b/lib/joinform.php
index a19e014de..eb06f1de6 100644
--- a/lib/joinform.php
+++ b/lib/joinform.php
@@ -21,8 +21,8 @@
  *
  * @category  Form
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @category Form
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/jsonsearchresultslist.php b/lib/jsonsearchresultslist.php
index 7ff32f829..f17db334b 100644
--- a/lib/jsonsearchresultslist.php
+++ b/lib/jsonsearchresultslist.php
@@ -21,7 +21,7 @@
  *
  * @category  Search
  * @package   StatusNet
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Search
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
@@ -148,7 +148,7 @@ class JSONSearchResultsList
  *
  * @category UI
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  * @see      JSONSearchResultsList
diff --git a/lib/language.php b/lib/language.php
index 49c5a7317..d278f5ab4 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -23,7 +23,7 @@
  * @package  StatusNet
  * @author   Matthew Gregg <matthew.gregg@gmail.com>
  * @author   Ciaran Gultnieks <ciaran@ciarang.com>
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/leaveform.php b/lib/leaveform.php
index 3e37e45ff..1dab6d99e 100644
--- a/lib/leaveform.php
+++ b/lib/leaveform.php
@@ -21,8 +21,8 @@
  *
  * @category  Form
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @category Form
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index 49a90cf80..39548a271 100644
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -21,7 +21,7 @@
  *
  * @category  Menu
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @category Output
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/mail.php b/lib/mail.php
index 23bea22ef..a9c94f2f9 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -21,10 +21,10 @@
  *
  * @category  Mail
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Zach Copley <zach@controlyourself.ca>
- * @author    Robin Millette <millette@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Zach Copley <zach@status.net>
+ * @author    Robin Millette <millette@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
diff --git a/lib/mailbox.php b/lib/mailbox.php
index e628d952e..cd4bcba02 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -21,7 +21,7 @@
  *
  * @category  Message
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ define('MESSAGES_PER_PAGE', 20);
  *
  * @category Message
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  * @see      InboxAction
diff --git a/lib/messageform.php b/lib/messageform.php
index cf80858c7..ea93b8cf6 100644
--- a/lib/messageform.php
+++ b/lib/messageform.php
@@ -21,8 +21,8 @@
  *
  * @category  Form
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @category Form
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/microid.php b/lib/microid.php
index 6fee71acf..e4160e94e 100644
--- a/lib/microid.php
+++ b/lib/microid.php
@@ -21,7 +21,7 @@
  *
  * @category  ID
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category ID
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  * @see      http://microid.org/
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 1452b2e1e..7f4e59fa1 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -21,8 +21,8 @@
  *
  * @category  Form
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,8 +41,8 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @category Form
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 46fc73bc1..1b2a57aad 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -21,8 +21,8 @@
  *
  * @category  UI
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -46,7 +46,7 @@ require_once INSTALLDIR.'/lib/attachmentlist.php';
  *
  * @category UI
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  * @see      Notice
@@ -134,7 +134,7 @@ class NoticeList extends Widget
  *
  * @category UI
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  * @see      NoticeList
diff --git a/lib/noticesection.php b/lib/noticesection.php
index 622883119..145545fbe 100644
--- a/lib/noticesection.php
+++ b/lib/noticesection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,7 +41,7 @@ define('NOTICES_PER_SECTION', 6);
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/nudgeform.php b/lib/nudgeform.php
index 01dea3d36..23ccb26b6 100644
--- a/lib/nudgeform.php
+++ b/lib/nudgeform.php
@@ -21,8 +21,8 @@
  *
  * @category  Form
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @category Form
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/oauthclient.php b/lib/oauthclient.php
index e9463bb53..e1fc47264 100644
--- a/lib/oauthclient.php
+++ b/lib/oauthclient.php
@@ -21,7 +21,7 @@
  *
  * @category  Action
  * @package   StatusNet
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ require_once 'OAuth.php';
  *
  * @category Integration
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
@@ -52,7 +52,7 @@ class OAuthClientCurlException extends Exception
  *
  * @category Integration
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/ownerdesignaction.php b/lib/ownerdesignaction.php
index e1400fd92..216da6ef8 100644
--- a/lib/ownerdesignaction.php
+++ b/lib/ownerdesignaction.php
@@ -21,7 +21,7 @@
  *
  * @category  Action
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -40,7 +40,7 @@ if (!defined('LACONICA')) {
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/parallelizingdaemon.php b/lib/parallelizingdaemon.php
index 6735427ce..d10fea0e4 100644
--- a/lib/parallelizingdaemon.php
+++ b/lib/parallelizingdaemon.php
@@ -21,8 +21,8 @@
  *
  * @category  Daemon
  * @package   StatusNet
- * @author    Zach Copley <zach@controlyourself.ca>
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ declare(ticks = 1);
  *
  * @category Daemon
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 0faa7a10d..8a5e6322e 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -21,8 +21,8 @@
  *
  * @category  Action
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -45,8 +45,8 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @category Output
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/personaltagcloudsection.php b/lib/personaltagcloudsection.php
index 57c5b84a1..bb7b8386d 100644
--- a/lib/personaltagcloudsection.php
+++ b/lib/personaltagcloudsection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/plugin.php b/lib/plugin.php
index 97ff8f19a..e6cf6f7cc 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -21,7 +21,7 @@
  *
  * @category  Plugin
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -46,7 +46,7 @@ if (!defined('LACONICA')) {
  *
  * @category Plugin
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php
index 496305168..4906fd8b7 100644
--- a/lib/popularnoticesection.php
+++ b/lib/popularnoticesection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,7 +39,7 @@ if (!defined('LACONICA')) {
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/profileaction.php b/lib/profileaction.php
index 1ca9830b8..25e9aab5d 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -21,8 +21,8 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/groupminilist.php';
  *
  * @category Personal
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/profilelist.php b/lib/profilelist.php
index eb9bd222f..e54060dff 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -22,7 +22,7 @@
  *
  * @category  Public
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @category Public
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/profileminilist.php b/lib/profileminilist.php
index d5a2f387e..9d13ef167 100644
--- a/lib/profileminilist.php
+++ b/lib/profileminilist.php
@@ -21,7 +21,7 @@
  *
  * @category  Public
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -40,7 +40,7 @@ define('PROFILES_PER_MINILIST', 27);
  *
  * @category Public
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/profilesection.php b/lib/profilesection.php
index 9f71d6b36..f8a65a9dc 100644
--- a/lib/profilesection.php
+++ b/lib/profilesection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,7 +41,7 @@ define('PROFILES_PER_SECTION', 6);
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index c9c51d003..46c47abb1 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -21,7 +21,7 @@
  *
  * @category  Menu
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,8 +38,8 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @category Output
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index 8a37453ec..43105b7a8 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -21,8 +21,8 @@
  *
  * @category  QueueManager
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
diff --git a/lib/router.php b/lib/router.php
index e5f651401..ba30ea476 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -21,7 +21,7 @@
  *
  * @category  URL
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -40,7 +40,7 @@ require_once 'Net/URL/Mapper.php';
  *
  * @category URL
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/rssaction.php b/lib/rssaction.php
index 93a47f14e..608c4dab5 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -21,7 +21,7 @@
  *
  * @category  Mail
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Earle Martin <earle@downlode.org>
  * @copyright 2008-9 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
diff --git a/lib/searchaction.php b/lib/searchaction.php
index 5a0e3b897..724f53f59 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -6,8 +6,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/searchgroupnav.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php
index 7673e96c8..7237f2302 100644
--- a/lib/searchgroupnav.php
+++ b/lib/searchgroupnav.php
@@ -21,7 +21,7 @@
  *
  * @category  Menu
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @category Output
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/section.php b/lib/section.php
index faf043025..24bcd7f65 100644
--- a/lib/section.php
+++ b/lib/section.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/servererroraction.php b/lib/servererroraction.php
index cee2e54fd..672741871 100644
--- a/lib/servererroraction.php
+++ b/lib/servererroraction.php
@@ -7,8 +7,8 @@
  *
  * @category Action
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  *
@@ -48,7 +48,7 @@ require_once INSTALLDIR.'/lib/error.php';
  *
  * @category Action
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
diff --git a/lib/serverexception.php b/lib/serverexception.php
index 634d52d24..864e544d8 100644
--- a/lib/serverexception.php
+++ b/lib/serverexception.php
@@ -21,7 +21,7 @@
  *
  * @category  Exception
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ if (!defined('LACONICA')) {
  *
  * @category Exception
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 7b0e0b1b5..a84d650b8 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -21,7 +21,7 @@
  *
  * @category  Settings
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Settings
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/snapshot.php b/lib/snapshot.php
index 868389668..fadbcae4b 100644
--- a/lib/snapshot.php
+++ b/lib/snapshot.php
@@ -21,7 +21,7 @@
  *
  * @category  Stats
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -43,7 +43,7 @@ if (!defined('LACONICA')) {
  *
  * @category Stats
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index 3894d9072..f059b42f0 100644
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -21,8 +21,8 @@
  *
  * @category  QueueManager
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
diff --git a/lib/subgroupnav.php b/lib/subgroupnav.php
index cc8744719..dcda61136 100644
--- a/lib/subgroupnav.php
+++ b/lib/subgroupnav.php
@@ -21,7 +21,7 @@
  *
  * @category  Subs
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @category Subs
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/subpeopletagcloudsection.php b/lib/subpeopletagcloudsection.php
index c626535bd..c99d603ce 100644
--- a/lib/subpeopletagcloudsection.php
+++ b/lib/subpeopletagcloudsection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/subscribeform.php b/lib/subscribeform.php
index 5bfede664..6bd2ea588 100644
--- a/lib/subscribeform.php
+++ b/lib/subscribeform.php
@@ -21,8 +21,8 @@
  *
  * @category  Form
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @category Form
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/subscriberspeopleselftagcloudsection.php b/lib/subscriberspeopleselftagcloudsection.php
index bef8c8f3b..af0671378 100644
--- a/lib/subscriberspeopleselftagcloudsection.php
+++ b/lib/subscriberspeopleselftagcloudsection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/subscriberspeopletagcloudsection.php b/lib/subscriberspeopletagcloudsection.php
index 2481cb74f..837613a70 100644
--- a/lib/subscriberspeopletagcloudsection.php
+++ b/lib/subscriberspeopletagcloudsection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index e7a8302c5..101687d41 100644
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -22,7 +22,7 @@
  *
  * @category  Public
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/profilelist.php';
  *
  * @category Public
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/subscriptionspeopleselftagcloudsection.php b/lib/subscriptionspeopleselftagcloudsection.php
index d2ea85c75..bf2471a0b 100644
--- a/lib/subscriptionspeopleselftagcloudsection.php
+++ b/lib/subscriptionspeopleselftagcloudsection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/subscriptionspeopletagcloudsection.php b/lib/subscriptionspeopletagcloudsection.php
index fe26f9afa..fc0aabfdc 100644
--- a/lib/subscriptionspeopletagcloudsection.php
+++ b/lib/subscriptionspeopletagcloudsection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/tagcloudsection.php b/lib/tagcloudsection.php
index 8278c90d4..ed84999f0 100644
--- a/lib/tagcloudsection.php
+++ b/lib/tagcloudsection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,7 +41,7 @@ define('TAGS_PER_SECTION', 20);
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/theme.php b/lib/theme.php
index 734284b27..e52566b97 100644
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -21,8 +21,8 @@
  *
  * @category  Paths
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
diff --git a/lib/topposterssection.php b/lib/topposterssection.php
index ddb110450..dd72dfc4c 100644
--- a/lib/topposterssection.php
+++ b/lib/topposterssection.php
@@ -21,7 +21,7 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,7 +39,7 @@ if (!defined('LACONICA')) {
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/lib/twitteroauthclient.php b/lib/twitteroauthclient.php
index 6555858d9..ca3b347ab 100644
--- a/lib/twitteroauthclient.php
+++ b/lib/twitteroauthclient.php
@@ -21,7 +21,7 @@
  *
  * @category  Integration
  * @package   StatusNet
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Integration
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/unblockform.php b/lib/unblockform.php
index e302f3843..336aeda93 100644
--- a/lib/unblockform.php
+++ b/lib/unblockform.php
@@ -21,8 +21,8 @@
  *
  * @category  Form
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @category Form
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/unqueuemanager.php b/lib/unqueuemanager.php
index 5ac1a2ff3..3cdad0b54 100644
--- a/lib/unqueuemanager.php
+++ b/lib/unqueuemanager.php
@@ -21,8 +21,8 @@
  *
  * @category  QueueManager
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php
index 6699a294c..5bf42fdfe 100644
--- a/lib/unsubscribeform.php
+++ b/lib/unsubscribeform.php
@@ -21,8 +21,8 @@
  *
  * @category  Form
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -39,8 +39,8 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @category Form
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/webcolor.php b/lib/webcolor.php
index 230e04a1f..ee74fa8f6 100644
--- a/lib/webcolor.php
+++ b/lib/webcolor.php
@@ -21,7 +21,7 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
diff --git a/lib/widget.php b/lib/widget.php
index abb8037c5..0c52748f3 100644
--- a/lib/widget.php
+++ b/lib/widget.php
@@ -21,8 +21,8 @@
  *
  * @category  Widget
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,8 +41,8 @@ if (!defined('LACONICA')) {
  *
  * @category Widget
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
diff --git a/lib/xmloutputter.php b/lib/xmloutputter.php
index cd6b8eb41..d7bb1bf00 100644
--- a/lib/xmloutputter.php
+++ b/lib/xmloutputter.php
@@ -21,8 +21,8 @@
  *
  * @category  Output
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,8 +41,8 @@ if (!defined('LACONICA')) {
  *
  * @category Output
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  * @see      Action
diff --git a/lib/xmlstringer.php b/lib/xmlstringer.php
index 5a7189cbd..f8d8793e6 100644
--- a/lib/xmlstringer.php
+++ b/lib/xmlstringer.php
@@ -21,7 +21,7 @@
  *
  * @category  Output
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -36,7 +36,7 @@ if (!defined('LACONICA')) {
  *
  * @category Output
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  * @see      Action
diff --git a/scripts/synctwitterfriends.php b/scripts/synctwitterfriends.php
index caec9977a..545cb23b3 100755
--- a/scripts/synctwitterfriends.php
+++ b/scripts/synctwitterfriends.php
@@ -38,8 +38,8 @@ require_once INSTALLDIR . '/lib/parallelizingdaemon.php';
  *
  * @category Twitter
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
diff --git a/scripts/twitterstatusfetcher.php b/scripts/twitterstatusfetcher.php
index 38ddb3a5f..f25690e58 100755
--- a/scripts/twitterstatusfetcher.php
+++ b/scripts/twitterstatusfetcher.php
@@ -47,8 +47,8 @@ require_once INSTALLDIR . '/lib/daemon.php';
  *
  * @category Twitter
  * @package  StatusNet
- * @author   Zach Copley <zach@controlyourself.ca>
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-- 
cgit v1.2.3-54-g00ecf


From 865b716f0919b6e5133133cd6be53f4143660324 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 25 Aug 2009 18:42:34 -0400
Subject: change LACONICA to STATUSNET

---
 actions/accesstoken.php                         |  2 +-
 actions/all.php                                 |  2 +-
 actions/allrss.php                              |  2 +-
 actions/api.php                                 |  2 +-
 actions/attachment.php                          |  2 +-
 actions/attachment_ajax.php                     |  2 +-
 actions/attachment_thumbnail.php                |  2 +-
 actions/avatarbynickname.php                    |  2 +-
 actions/avatarsettings.php                      |  2 +-
 actions/block.php                               |  2 +-
 actions/blockedfromgroup.php                    |  2 +-
 actions/confirmaddress.php                      |  2 +-
 actions/conversation.php                        |  2 +-
 actions/deletenotice.php                        |  2 +-
 actions/disfavor.php                            |  2 +-
 actions/doc.php                                 |  2 +-
 actions/editgroup.php                           |  2 +-
 actions/emailsettings.php                       |  2 +-
 actions/facebookhome.php                        |  2 +-
 actions/facebookinvite.php                      |  2 +-
 actions/facebooklogin.php                       |  2 +-
 actions/facebookremove.php                      |  2 +-
 actions/facebooksettings.php                    |  2 +-
 actions/favor.php                               |  2 +-
 actions/favorited.php                           |  2 +-
 actions/favoritesrss.php                        |  2 +-
 actions/featured.php                            |  2 +-
 actions/file.php                                |  2 +-
 actions/finishaddopenid.php                     |  2 +-
 actions/finishopenidlogin.php                   |  2 +-
 actions/finishremotesubscribe.php               |  4 ++--
 actions/foaf.php                                |  2 +-
 actions/groupblock.php                          |  2 +-
 actions/groupbyid.php                           |  2 +-
 actions/groupdesignsettings.php                 |  2 +-
 actions/grouplogo.php                           |  2 +-
 actions/groupmembers.php                        |  2 +-
 actions/grouprss.php                            |  2 +-
 actions/groups.php                              |  2 +-
 actions/groupsearch.php                         |  2 +-
 actions/groupunblock.php                        |  2 +-
 actions/imsettings.php                          |  2 +-
 actions/inbox.php                               |  2 +-
 actions/invite.php                              |  2 +-
 actions/joingroup.php                           |  2 +-
 actions/leavegroup.php                          |  2 +-
 actions/login.php                               |  2 +-
 actions/logout.php                              |  2 +-
 actions/makeadmin.php                           |  2 +-
 actions/microsummary.php                        |  2 +-
 actions/newgroup.php                            |  2 +-
 actions/newmessage.php                          |  2 +-
 actions/newnotice.php                           |  2 +-
 actions/noticesearch.php                        |  2 +-
 actions/noticesearchrss.php                     |  2 +-
 actions/nudge.php                               |  2 +-
 actions/oembed.php                              |  2 +-
 actions/openidlogin.php                         |  2 +-
 actions/openidsettings.php                      |  2 +-
 actions/opensearch.php                          |  2 +-
 actions/othersettings.php                       |  2 +-
 actions/outbox.php                              |  2 +-
 actions/passwordsettings.php                    |  2 +-
 actions/peoplesearch.php                        |  2 +-
 actions/peopletag.php                           |  2 +-
 actions/postnotice.php                          |  2 +-
 actions/profilesettings.php                     |  2 +-
 actions/public.php                              |  2 +-
 actions/publicrss.php                           |  2 +-
 actions/publictagcloud.php                      |  2 +-
 actions/publicxrds.php                          |  2 +-
 actions/recoverpassword.php                     |  2 +-
 actions/register.php                            |  2 +-
 actions/remotesubscribe.php                     |  4 ++--
 actions/replies.php                             |  2 +-
 actions/repliesrss.php                          |  2 +-
 actions/requesttoken.php                        |  2 +-
 actions/showfavorites.php                       |  2 +-
 actions/showgroup.php                           |  2 +-
 actions/showmessage.php                         |  2 +-
 actions/shownotice.php                          |  2 +-
 actions/showstream.php                          |  2 +-
 actions/smssettings.php                         |  2 +-
 actions/subedit.php                             |  2 +-
 actions/subscribe.php                           |  2 +-
 actions/subscribers.php                         |  2 +-
 actions/subscriptions.php                       |  4 ++--
 actions/sup.php                                 |  2 +-
 actions/tag.php                                 |  2 +-
 actions/tagother.php                            |  2 +-
 actions/tagrss.php                              |  2 +-
 actions/twitapiaccount.php                      |  2 +-
 actions/twitapiblocks.php                       |  2 +-
 actions/twitapidirect_messages.php              |  2 +-
 actions/twitapifavorites.php                    |  2 +-
 actions/twitapifriendships.php                  |  2 +-
 actions/twitapigroups.php                       |  2 +-
 actions/twitapihelp.php                         |  2 +-
 actions/twitapinotifications.php                |  2 +-
 actions/twitapisearchatom.php                   |  2 +-
 actions/twitapisearchjson.php                   |  2 +-
 actions/twitapistatuses.php                     |  2 +-
 actions/twitapistatusnet.php                    |  6 +++---
 actions/twitapitags.php                         |  2 +-
 actions/twitapitrends.php                       |  2 +-
 actions/twitapiusers.php                        |  2 +-
 actions/twitterauthorization.php                |  2 +-
 actions/twittersettings.php                     |  2 +-
 actions/unblock.php                             |  2 +-
 actions/unsubscribe.php                         |  2 +-
 actions/updateprofile.php                       |  2 +-
 actions/userauthorization.php                   |  2 +-
 actions/userbyid.php                            |  2 +-
 actions/userdesignsettings.php                  |  2 +-
 actions/usergroups.php                          |  2 +-
 actions/userrss.php                             |  2 +-
 actions/xrds.php                                |  2 +-
 classes/Design.php                              |  2 +-
 classes/File.php                                |  2 +-
 classes/File_oembed.php                         |  2 +-
 classes/File_redirection.php                    |  2 +-
 classes/File_thumbnail.php                      |  2 +-
 classes/File_to_post.php                        |  2 +-
 classes/Group_alias.php                         |  2 +-
 classes/Group_block.php                         |  2 +-
 classes/Memcached_DataObject.php                |  2 +-
 classes/Notice.php                              |  2 +-
 classes/Notice_inbox.php                        |  2 +-
 classes/Profile.php                             |  2 +-
 classes/Profile_block.php                       |  2 +-
 classes/Remote_profile.php                      |  2 +-
 classes/Session.php                             |  2 +-
 classes/Status_network.php                      |  2 +-
 classes/Subscription.php                        |  2 +-
 classes/User.php                                |  2 +-
 index.php                                       |  2 +-
 install.php                                     |  2 +-
 lib/Shorturl_api.php                            |  2 +-
 lib/accountsettingsaction.php                   |  2 +-
 lib/action.php                                  | 10 +++++-----
 lib/arraywrapper.php                            |  2 +-
 lib/attachmentlist.php                          |  2 +-
 lib/attachmentnoticesection.php                 |  2 +-
 lib/attachmenttagcloudsection.php               |  2 +-
 lib/blockform.php                               |  2 +-
 lib/channel.php                                 |  2 +-
 lib/clienterroraction.php                       |  2 +-
 lib/clientexception.php                         |  2 +-
 lib/command.php                                 |  2 +-
 lib/commandinterpreter.php                      |  2 +-
 lib/common.php                                  |  4 ++--
 lib/connectsettingsaction.php                   |  2 +-
 lib/currentuserdesignaction.php                 |  2 +-
 lib/daemon.php                                  |  2 +-
 lib/dberroraction.php                           |  2 +-
 lib/deleteaction.php                            |  2 +-
 lib/designsettings.php                          |  2 +-
 lib/disfavorform.php                            |  2 +-
 lib/error.php                                   |  2 +-
 lib/event.php                                   |  2 +-
 lib/facebookaction.php                          |  2 +-
 lib/favorform.php                               |  2 +-
 lib/featureduserssection.php                    |  2 +-
 lib/feed.php                                    |  2 +-
 lib/feedlist.php                                |  2 +-
 lib/form.php                                    |  2 +-
 lib/galleryaction.php                           |  2 +-
 lib/groupdesignaction.php                       |  2 +-
 lib/groupeditform.php                           |  2 +-
 lib/grouplist.php                               |  2 +-
 lib/groupminilist.php                           |  2 +-
 lib/groupnav.php                                |  2 +-
 lib/groupsbymemberssection.php                  |  2 +-
 lib/groupsbypostssection.php                    |  2 +-
 lib/groupsection.php                            |  2 +-
 lib/grouptagcloudsection.php                    |  2 +-
 lib/htmloutputter.php                           |  6 +++---
 lib/imagefile.php                               |  2 +-
 lib/jabber.php                                  |  2 +-
 lib/joinform.php                                |  2 +-
 lib/jsonsearchresultslist.php                   |  2 +-
 lib/language.php                                |  2 +-
 lib/leaveform.php                               |  2 +-
 lib/logingroupnav.php                           |  2 +-
 lib/mail.php                                    |  2 +-
 lib/mailbox.php                                 |  2 +-
 lib/messageform.php                             |  2 +-
 lib/microid.php                                 |  2 +-
 lib/noticeform.php                              |  2 +-
 lib/noticelist.php                              |  2 +-
 lib/noticesection.php                           |  2 +-
 lib/nudgeform.php                               |  2 +-
 lib/oauthclient.php                             |  2 +-
 lib/oauthstore.php                              |  2 +-
 lib/omb.php                                     |  6 +++---
 lib/openid.php                                  |  2 +-
 lib/ownerdesignaction.php                       |  2 +-
 lib/parallelizingdaemon.php                     |  2 +-
 lib/personalgroupnav.php                        |  2 +-
 lib/personaltagcloudsection.php                 |  2 +-
 lib/ping.php                                    |  8 ++++----
 lib/plugin.php                                  |  2 +-
 lib/popularnoticesection.php                    |  2 +-
 lib/profileaction.php                           |  2 +-
 lib/profilelist.php                             |  2 +-
 lib/profileminilist.php                         |  2 +-
 lib/profilesection.php                          |  2 +-
 lib/publicgroupnav.php                          |  2 +-
 lib/queuehandler.php                            |  2 +-
 lib/router.php                                  |  2 +-
 lib/rssaction.php                               |  2 +-
 lib/search_engines.php                          |  2 +-
 lib/searchaction.php                            |  2 +-
 lib/searchgroupnav.php                          |  2 +-
 lib/section.php                                 |  2 +-
 lib/servererroraction.php                       |  2 +-
 lib/serverexception.php                         |  2 +-
 lib/settingsaction.php                          |  2 +-
 lib/snapshot.php                                |  6 +++---
 lib/subgroupnav.php                             |  2 +-
 lib/subpeopletagcloudsection.php                |  2 +-
 lib/subs.php                                    |  2 +-
 lib/subscribeform.php                           |  2 +-
 lib/subscriberspeopleselftagcloudsection.php    |  2 +-
 lib/subscriberspeopletagcloudsection.php        |  2 +-
 lib/subscriptionlist.php                        |  2 +-
 lib/subscriptionspeopleselftagcloudsection.php  |  2 +-
 lib/subscriptionspeopletagcloudsection.php      |  2 +-
 lib/tagcloudsection.php                         |  2 +-
 lib/theme.php                                   |  2 +-
 lib/topposterssection.php                       |  2 +-
 lib/twitter.php                                 |  2 +-
 lib/twitterapi.php                              |  2 +-
 lib/twitteroauthclient.php                      |  2 +-
 lib/unblockform.php                             |  2 +-
 lib/unsubscribeform.php                         |  2 +-
 lib/webcolor.php                                |  2 +-
 lib/widget.php                                  |  2 +-
 lib/xmloutputter.php                            |  2 +-
 lib/xmlstringer.php                             |  2 +-
 lib/xmppqueuehandler.php                        |  2 +-
 plugins/Autocomplete/AutocompletePlugin.php     |  2 +-
 plugins/BlogspamNetPlugin.php                   |  4 ++--
 plugins/Comet/CometPlugin.php                   |  2 +-
 plugins/FBConnect/FBCLoginGroupNav.php          |  2 +-
 plugins/FBConnect/FBCSettingsNav.php            |  2 +-
 plugins/FBConnect/FBC_XDReceiver.php            |  2 +-
 plugins/FBConnect/FBConnectLogin.php            |  2 +-
 plugins/FBConnect/FBConnectPlugin.php           |  2 +-
 plugins/FBConnect/FBConnectSettings.php         |  2 +-
 plugins/GoogleAnalyticsPlugin.php               |  2 +-
 plugins/InfiniteScroll/InfiniteScrollPlugin.php |  2 +-
 plugins/LinkbackPlugin.php                      |  4 ++--
 plugins/Meteor/MeteorPlugin.php                 |  2 +-
 plugins/PiwikAnalyticsPlugin.php                |  2 +-
 plugins/Realtime/RealtimePlugin.php             |  2 +-
 plugins/TemplatePlugin.php                      |  2 +-
 plugins/WikiHashtagsPlugin.php                  |  4 ++--
 plugins/recaptcha/recaptcha.php                 |  2 +-
 scripts/fixup_hashtags.php                      |  2 +-
 scripts/fixup_inboxes.php                       |  2 +-
 scripts/fixup_notices_rendered.php              |  2 +-
 scripts/fixup_replies.php                       |  2 +-
 scripts/update_translations.php                 |  2 +-
 tests/HashTagDetectionTest.php                  |  2 +-
 tests/URLDetectionTest.php                      |  2 +-
 266 files changed, 288 insertions(+), 288 deletions(-)

(limited to 'lib/unblockform.php')

diff --git a/actions/accesstoken.php b/actions/accesstoken.php
index 551c2e4d8..f1ddfc6a1 100644
--- a/actions/accesstoken.php
+++ b/actions/accesstoken.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/all.php b/actions/all.php
index 5a26efa28..6dbab080f 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/personalgroupnav.php';
 require_once INSTALLDIR.'/lib/noticelist.php';
diff --git a/actions/allrss.php b/actions/allrss.php
index 0313ef611..a5447fa9f 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/api.php b/actions/api.php
index 2e9cc6618..897e848c1 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class ApiAction extends Action
 {
diff --git a/actions/attachment.php b/actions/attachment.php
index f417d47ee..5d11faad8 100644
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/attachment_ajax.php b/actions/attachment_ajax.php
index 6701a9463..af37c9bcb 100644
--- a/actions/attachment_ajax.php
+++ b/actions/attachment_ajax.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/attachment_thumbnail.php b/actions/attachment_thumbnail.php
index e27480424..7add8e278 100644
--- a/actions/attachment_thumbnail.php
+++ b/actions/attachment_thumbnail.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
index 0b0d77aad..e7ebaeee2 100644
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index d5be3463b..54baef88f 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/block.php b/actions/block.php
index 9687783a8..2441c6fba 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php
index dea868fc6..5b5c8bcfa 100644
--- a/actions/blockedfromgroup.php
+++ b/actions/blockedfromgroup.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 2b7b949a4..94cd6ddf4 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/conversation.php b/actions/conversation.php
index b284e4dd7..c4a4e80da 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index 24f70b5db..8f6e9bdd1 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/disfavor.php b/actions/disfavor.php
index 67b16bfd3..25230ceac 100644
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/doc.php b/actions/doc.php
index 522441824..1adb9b075 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/editgroup.php b/actions/editgroup.php
index ea317f365..62a629056 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -29,7 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 8bd1c74c4..1b4d73bbf 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index f9dc4523e..a54d22a47 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/facebookaction.php';
 
diff --git a/actions/facebookinvite.php b/actions/facebookinvite.php
index 5bd03e99a..aa8486585 100644
--- a/actions/facebookinvite.php
+++ b/actions/facebookinvite.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/facebooklogin.php b/actions/facebooklogin.php
index c4b14e75f..64d24dd40 100644
--- a/actions/facebooklogin.php
+++ b/actions/facebooklogin.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/facebookaction.php');
 
diff --git a/actions/facebookremove.php b/actions/facebookremove.php
index aa492dbc4..1547fb780 100644
--- a/actions/facebookremove.php
+++ b/actions/facebookremove.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/facebookaction.php';
 
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index 310179967..817a11828 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/facebookaction.php';
 
diff --git a/actions/favor.php b/actions/favor.php
index 17d0d9d17..a995188c3 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/favorited.php b/actions/favorited.php
index 445c30767..006dd5488 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php
index 0c6c4b8f9..0302d10e5 100644
--- a/actions/favoritesrss.php
+++ b/actions/favoritesrss.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/featured.php b/actions/featured.php
index ac1912ba3..f38068eb6 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/file.php b/actions/file.php
index a8ff547f8..005a13169 100644
--- a/actions/file.php
+++ b/actions/file.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/actions/shownotice.php');
 
diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php
index f8d88587d..40939d44b 100644
--- a/actions/finishaddopenid.php
+++ b/actions/finishaddopenid.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index 37aba87f0..07da72fc0 100644
--- a/actions/finishopenidlogin.php
+++ b/actions/finishopenidlogin.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index bd6dbf2a6..5df36070f 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
@@ -284,7 +284,7 @@ class FinishremotesubscribeAction extends Action
         $fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
         $result = $fetcher->post($req->get_normalized_http_url(),
                                  $req->to_postdata(),
-                                 array('User-Agent: StatusNet/' . LACONICA_VERSION));
+                                 array('User-Agent: StatusNet/' . STATUSNET_VERSION));
 
         common_debug('got result: "'.print_r($result,true).'"', __FILE__);
 
diff --git a/actions/foaf.php b/actions/foaf.php
index 66086b6a4..d3ab098f4 100644
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 define('LISTENER', 1);
 define('LISTENEE', -1);
diff --git a/actions/groupblock.php b/actions/groupblock.php
index 7735e2dcf..e98f13224 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/groupbyid.php b/actions/groupbyid.php
index 8775676f7..bc0709f4f 100644
--- a/actions/groupbyid.php
+++ b/actions/groupbyid.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php
index aae4ae865..baef31018 100644
--- a/actions/groupdesignsettings.php
+++ b/actions/groupdesignsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index f9354d458..30f865248 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index 265d2ca0e..5a4ea27ab 100644
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/grouprss.php b/actions/grouprss.php
index ad6094032..7cd85c1af 100644
--- a/actions/grouprss.php
+++ b/actions/grouprss.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/groups.php b/actions/groups.php
index 09216e613..53b95c848 100644
--- a/actions/groups.php
+++ b/actions/groups.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/groupsearch.php b/actions/groupsearch.php
index a7004366f..fc825a6fd 100644
--- a/actions/groupsearch.php
+++ b/actions/groupsearch.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/groupunblock.php b/actions/groupunblock.php
index 45d70841c..248b2a0a7 100644
--- a/actions/groupunblock.php
+++ b/actions/groupunblock.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/imsettings.php b/actions/imsettings.php
index 3e89b6f66..145cd7ed2 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/inbox.php b/actions/inbox.php
index 757461fe8..f5f7d8bcb 100644
--- a/actions/inbox.php
+++ b/actions/inbox.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/invite.php b/actions/invite.php
index 64a2061c3..d8f15705b 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class InviteAction extends CurrentUserDesignAction
 {
diff --git a/actions/joingroup.php b/actions/joingroup.php
index bf19a2ad9..32b59efa0 100644
--- a/actions/joingroup.php
+++ b/actions/joingroup.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index 347440ed6..27b5ea017 100644
--- a/actions/leavegroup.php
+++ b/actions/leavegroup.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/login.php b/actions/login.php
index 020f5ea63..145236966 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/logout.php b/actions/logout.php
index 6e147ccc0..eda5cefe5 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/makeadmin.php b/actions/makeadmin.php
index 7ab41fa6e..7866f42c1 100644
--- a/actions/makeadmin.php
+++ b/actions/makeadmin.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/microsummary.php b/actions/microsummary.php
index 585ef788a..8f2d34998 100644
--- a/actions/microsummary.php
+++ b/actions/microsummary.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/newgroup.php b/actions/newgroup.php
index f16c25f1a..544dd3818 100644
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/newmessage.php b/actions/newmessage.php
index 9ca3e66e1..579871546 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -29,7 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/newnotice.php b/actions/newnotice.php
index bc1b7b06a..4b542815b 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -29,7 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index fc849f4dc..e268c69ab 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php
index a1d36ff56..67bca01b5 100644
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/nudge.php b/actions/nudge.php
index 58ec0cbc0..b699a3144 100644
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/oembed.php b/actions/oembed.php
index 3940a4db4..5f6751b5a 100644
--- a/actions/oembed.php
+++ b/actions/oembed.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index 813808523..42d740938 100644
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 581254651..09e678e3c 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/opensearch.php b/actions/opensearch.php
index 81efcea9b..8ef13dd7a 100644
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/othersettings.php b/actions/othersettings.php
index 3953bbb88..244c34eab 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/outbox.php b/actions/outbox.php
index 726934ae6..a1fc81dfd 100644
--- a/actions/outbox.php
+++ b/actions/outbox.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index 43188030f..e7cd0ab51 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index e083faf62..43c966f9c 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/peopletag.php b/actions/peopletag.php
index bf15e1e2e..0c5321fae 100644
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/postnotice.php b/actions/postnotice.php
index ab8d4339b..883cd53fb 100644
--- a/actions/postnotice.php
+++ b/actions/postnotice.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 013e3ac82..2f9d2bac9 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/public.php b/actions/public.php
index 4ea48a2ff..f8ecc0e78 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/publicrss.php b/actions/publicrss.php
index 55ef3c66b..0d75ffc35 100644
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index de987184b..026827fbe 100644
--- a/actions/publictagcloud.php
+++ b/actions/publictagcloud.php
@@ -29,7 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 define('TAGS_PER_PAGE', 100);
 
diff --git a/actions/publicxrds.php b/actions/publicxrds.php
index afc5463d3..921106a5f 100644
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index a68a05996..279f1cef1 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 # You have 24 hours to claim your password
 
diff --git a/actions/register.php b/actions/register.php
index 35c1ddd4b..a219c03d8 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index d0d5a0384..793275781 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
@@ -323,7 +323,7 @@ class RemotesubscribeAction extends Action
 
         $result = $fetcher->post($req->get_normalized_http_url(),
                                  $req->to_postdata(),
-                                 array('User-Agent: StatusNet/' . LACONICA_VERSION));
+                                 array('User-Agent: StatusNet/' . STATUSNET_VERSION));
         if ($result->status != 200) {
             return null;
         }
diff --git a/actions/replies.php b/actions/replies.php
index 37c1f33e6..954d7ce19 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/repliesrss.php b/actions/repliesrss.php
index 35a77fab8..5115453b7 100644
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/rssaction.php');
 
diff --git a/actions/requesttoken.php b/actions/requesttoken.php
index 1ece3e6b0..243844c4b 100644
--- a/actions/requesttoken.php
+++ b/actions/requesttoken.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index 41178c5a9..9734496ba 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/showgroup.php b/actions/showgroup.php
index ed980233a..965b933e2 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/showmessage.php b/actions/showmessage.php
index 522fec490..5d23fb13f 100644
--- a/actions/showmessage.php
+++ b/actions/showmessage.php
@@ -26,7 +26,7 @@
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
-if (!defined('LACONICA')) { 
+if (!defined('STATUSNET')) { 
     exit(1); 
 }
 
diff --git a/actions/shownotice.php b/actions/shownotice.php
index 92911effb..4f7c3af7f 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/showstream.php b/actions/showstream.php
index 76482e97a..93730812c 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 587cf7d58..bfe49feee 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/subedit.php b/actions/subedit.php
index 853ac12a2..3320bdc59 100644
--- a/actions/subedit.php
+++ b/actions/subedit.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class SubeditAction extends Action
 {
diff --git a/actions/subscribe.php b/actions/subscribe.php
index aa701637b..fb1fb5e6b 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class SubscribeAction extends Action
 {
diff --git a/actions/subscribers.php b/actions/subscribers.php
index 66a531c3f..3000f17b0 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 656dea688..8cad9e3b4 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -42,7 +42,7 @@ if (!defined('LACONICA')) {
  * @link     http://status.net/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class SubscriptionsAction extends GalleryAction
 {
diff --git a/actions/sup.php b/actions/sup.php
index 46fdc1857..b635de194 100644
--- a/actions/sup.php
+++ b/actions/sup.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class SupAction extends Action
 {
diff --git a/actions/tag.php b/actions/tag.php
index fd29942a2..935d00ab0 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class TagAction extends Action
 {
diff --git a/actions/tagother.php b/actions/tagother.php
index 8f3ab7f65..aaca46355 100644
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 
diff --git a/actions/tagrss.php b/actions/tagrss.php
index 00746257e..135b12135 100644
--- a/actions/tagrss.php
+++ b/actions/tagrss.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/rssaction.php');
 
diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index 505f893ae..dc043ddd3 100644
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapiblocks.php b/actions/twitapiblocks.php
index 10b97367e..808e79220 100644
--- a/actions/twitapiblocks.php
+++ b/actions/twitapiblocks.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapidirect_messages.php b/actions/twitapidirect_messages.php
index 70e3ef64e..8511fcbe2 100644
--- a/actions/twitapidirect_messages.php
+++ b/actions/twitapidirect_messages.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapifavorites.php b/actions/twitapifavorites.php
index 243a40e65..d812b5034 100644
--- a/actions/twitapifavorites.php
+++ b/actions/twitapifavorites.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index b730edcdf..015a5dbae 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php
index f39975237..4d2388919 100644
--- a/actions/twitapigroups.php
+++ b/actions/twitapigroups.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapihelp.php b/actions/twitapihelp.php
index ef8f6be93..3fc232f64 100644
--- a/actions/twitapihelp.php
+++ b/actions/twitapihelp.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapinotifications.php b/actions/twitapinotifications.php
index 80da040e0..7bc9dd14b 100644
--- a/actions/twitapinotifications.php
+++ b/actions/twitapinotifications.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index 5ecec9684..d3e17650d 100644
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapisearchjson.php b/actions/twitapisearchjson.php
index 73735c5b5..173295176 100644
--- a/actions/twitapisearchjson.php
+++ b/actions/twitapisearchjson.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index 4a9f4a5e5..e522b6357 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapistatusnet.php b/actions/twitapistatusnet.php
index ff159f207..a36c162d9 100644
--- a/actions/twitapistatusnet.php
+++ b/actions/twitapistatusnet.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -70,12 +70,12 @@ class TwitapilaconicaAction extends TwitterapiAction
         switch ($apidata['content-type']) {
          case 'xml':
             $this->init_document('xml');
-            $this->element('version', null, LACONICA_VERSION);
+            $this->element('version', null, STATUSNET_VERSION);
             $this->end_document('xml');
             break;
          case 'json':
             $this->init_document('json');
-            print '"'.LACONICA_VERSION.'"';
+            print '"'.STATUSNET_VERSION.'"';
             $this->end_document('json');
             break;
          default:
diff --git a/actions/twitapitags.php b/actions/twitapitags.php
index 9ed9970a3..f889ae8c0 100644
--- a/actions/twitapitags.php
+++ b/actions/twitapitags.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapitrends.php b/actions/twitapitrends.php
index f76601768..436451c0f 100644
--- a/actions/twitapitrends.php
+++ b/actions/twitapitrends.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index c28a37ab7..853a6b8fa 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twitterauthorization.php b/actions/twitterauthorization.php
index 1861c1fcb..3745a67cf 100644
--- a/actions/twitterauthorization.php
+++ b/actions/twitterauthorization.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 389097667..c23fa2ff8 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/unblock.php b/actions/unblock.php
index e4dbf4ca7..43f454340 100644
--- a/actions/unblock.php
+++ b/actions/unblock.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 91d06cfa6..bedea9f28 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index b31a6d14c..d48686401 100644
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
diff --git a/actions/userauthorization.php b/actions/userauthorization.php
index 3c099b8f6..38329a2c7 100644
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 define('TIMESTAMP_THRESHOLD', 300);
diff --git a/actions/userbyid.php b/actions/userbyid.php
index 5fa929a93..4ed78688b 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php
index 312ca1150..07d160984 100644
--- a/actions/userdesignsettings.php
+++ b/actions/userdesignsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/usergroups.php b/actions/usergroups.php
index fa7068a3b..7cdc132b8 100644
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/actions/userrss.php b/actions/userrss.php
index 20e65b083..1437a4c22 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/rssaction.php');
 
diff --git a/actions/xrds.php b/actions/xrds.php
index ef1ebaed0..86f7d7616 100644
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/classes/Design.php b/classes/Design.php
index d82a0668d..c4820bf1e 100644
--- a/classes/Design.php
+++ b/classes/Design.php
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/classes/File.php b/classes/File.php
index 1a97b51c9..063c16425 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 require_once INSTALLDIR.'/classes/File_redirection.php';
diff --git a/classes/File_oembed.php b/classes/File_oembed.php
index ab2115f0b..c28f5c396 100644
--- a/classes/File_oembed.php
+++ b/classes/File_oembed.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index 3ff934d35..832d66b2b 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 require_once INSTALLDIR.'/classes/File.php';
diff --git a/classes/File_thumbnail.php b/classes/File_thumbnail.php
index dd23a3d03..2c0689f94 100644
--- a/classes/File_thumbnail.php
+++ b/classes/File_thumbnail.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
diff --git a/classes/File_to_post.php b/classes/File_to_post.php
index f7677fd50..ea5751042 100644
--- a/classes/File_to_post.php
+++ b/classes/File_to_post.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
diff --git a/classes/Group_alias.php b/classes/Group_alias.php
index 0696fabf1..93bb75796 100644
--- a/classes/Group_alias.php
+++ b/classes/Group_alias.php
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
diff --git a/classes/Group_block.php b/classes/Group_block.php
index fb1be76bb..bd8b24926 100644
--- a/classes/Group_block.php
+++ b/classes/Group_block.php
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index e94f03ab2..e2935cfc5 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
diff --git a/classes/Notice.php b/classes/Notice.php
index 952f99453..607f35571 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 /**
  * Table Definition for notice
diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php
index 77cf79347..60f11cd71 100644
--- a/classes/Notice_inbox.php
+++ b/classes/Notice_inbox.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
diff --git a/classes/Profile.php b/classes/Profile.php
index beeea0f89..982415753 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 /**
  * Table Definition for profile
diff --git a/classes/Profile_block.php b/classes/Profile_block.php
index 28ce259f8..b218244e3 100644
--- a/classes/Profile_block.php
+++ b/classes/Profile_block.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 /**
  * Table Definition for profile_block
diff --git a/classes/Remote_profile.php b/classes/Remote_profile.php
index cac67d37e..9d100412a 100644
--- a/classes/Remote_profile.php
+++ b/classes/Remote_profile.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 /**
  * Table Definition for remote_profile
diff --git a/classes/Session.php b/classes/Session.php
index 55453eb23..04958b61d 100644
--- a/classes/Session.php
+++ b/classes/Session.php
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
diff --git a/classes/Status_network.php b/classes/Status_network.php
index e399b5e84..78c1640cd 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class Status_network extends DB_DataObject
 {
diff --git a/classes/Subscription.php b/classes/Subscription.php
index f42235caa..0e2b5a307 100644
--- a/classes/Subscription.php
+++ b/classes/Subscription.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 /**
  * Table Definition for subscription
diff --git a/classes/User.php b/classes/User.php
index 7df93b7c5..529957649 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/index.php b/index.php
index e1857a55d..56e76be9f 100644
--- a/index.php
+++ b/index.php
@@ -18,7 +18,7 @@
  */
 
 define('INSTALLDIR', dirname(__FILE__));
-define('LACONICA', true);
+define('STATUSNET', true);
 
 require_once INSTALLDIR . '/lib/common.php';
 
diff --git a/install.php b/install.php
index af1f2ca34..f9056727b 100644
--- a/install.php
+++ b/install.php
@@ -363,7 +363,7 @@ function writeConf($sitename, $server, $path, $fancy, $db)
 {
     // assemble configuration file in a string
     $cfg =  "<?php\n".
-            "if (!defined('LACONICA')) { exit(1); }\n\n".
+            "if (!defined('STATUSNET')) { exit(1); }\n\n".
             
             // site name
             "\$config['site']['name'] = '$sitename';\n\n".
diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php
index 365ddff79..018b917c1 100644
--- a/lib/Shorturl_api.php
+++ b/lib/Shorturl_api.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class ShortUrlApi
 {
diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php
index d5dc0b217..337d34e9a 100644
--- a/lib/accountsettingsaction.php
+++ b/lib/accountsettingsaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/action.php b/lib/action.php
index fdfb6ebc6..dd9d87a6c 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -204,16 +204,16 @@ class Action extends HTMLOutputter // lawsuit
 
             if (Event::handle('StartShowUAStyles', array($this))) {
                 $this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
-                               'href="'.theme_path('css/ie.css', 'base').'?version='.LACONICA_VERSION.'" /><![endif]');
+                               'href="'.theme_path('css/ie.css', 'base').'?version='.STATUSNET_VERSION.'" /><![endif]');
                 foreach (array(6,7) as $ver) {
                     if (file_exists(theme_file('css/ie'.$ver.'.css', 'base'))) {
                         // Yes, IE people should be put in jail.
                         $this->comment('[if lte IE '.$ver.']><link rel="stylesheet" type="text/css" '.
-                                       'href="'.theme_path('css/ie'.$ver.'.css', 'base').'?version='.LACONICA_VERSION.'" /><![endif]');
+                                       'href="'.theme_path('css/ie'.$ver.'.css', 'base').'?version='.STATUSNET_VERSION.'" /><![endif]');
                     }
                 }
                 $this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
-                               'href="'.theme_path('css/ie.css', null).'?version='.LACONICA_VERSION.'" /><![endif]');
+                               'href="'.theme_path('css/ie.css', null).'?version='.STATUSNET_VERSION.'" /><![endif]');
                 Event::handle('EndShowUAStyles', array($this));
             }
 
@@ -761,7 +761,7 @@ class Action extends HTMLOutputter // lawsuit
         } else {
             $instr = _('**%%site.name%%** is a microblogging service. ');
         }
-        $instr .= sprintf(_('It runs the [StatusNet](http://status.net/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), LACONICA_VERSION);
+        $instr .= sprintf(_('It runs the [StatusNet](http://status.net/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), STATUSNET_VERSION);
         $output = common_markup_to_html($instr);
         $this->raw($output);
         $this->elementEnd('dd');
diff --git a/lib/arraywrapper.php b/lib/arraywrapper.php
index 5e349e9a0..424714e90 100644
--- a/lib/arraywrapper.php
+++ b/lib/arraywrapper.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 51fc40457..a713a1085 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/attachmentnoticesection.php b/lib/attachmentnoticesection.php
index 630a149ac..b98de8b6f 100644
--- a/lib/attachmentnoticesection.php
+++ b/lib/attachmentnoticesection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/attachmenttagcloudsection.php b/lib/attachmenttagcloudsection.php
index 83b561104..fc5145ad0 100644
--- a/lib/attachmenttagcloudsection.php
+++ b/lib/attachmenttagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/blockform.php b/lib/blockform.php
index 403ac59fe..cfec321a1 100644
--- a/lib/blockform.php
+++ b/lib/blockform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/channel.php b/lib/channel.php
index 9cd16843d..95d576a3c 100644
--- a/lib/channel.php
+++ b/lib/channel.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class Channel
 {
diff --git a/lib/clienterroraction.php b/lib/clienterroraction.php
index cd7d85221..2a1a51b72 100644
--- a/lib/clienterroraction.php
+++ b/lib/clienterroraction.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/clientexception.php b/lib/clientexception.php
index bf26ec2eb..5981f8bb8 100644
--- a/lib/clientexception.php
+++ b/lib/clientexception.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/command.php b/lib/command.php
index 78b17c74c..eac4b2cd9 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/channel.php');
 
diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index 628f55c2a..6babcba4f 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/command.php';
 
diff --git a/lib/common.php b/lib/common.php
index c2d656636..f8cf93717 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
-define('LACONICA_VERSION', '0.8.1pre1');
+define('STATUSNET_VERSION', '0.8.1pre1');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php
index 03142d4e5..058585565 100644
--- a/lib/connectsettingsaction.php
+++ b/lib/connectsettingsaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/currentuserdesignaction.php b/lib/currentuserdesignaction.php
index 874e3ff98..e28b8caf6 100644
--- a/lib/currentuserdesignaction.php
+++ b/lib/currentuserdesignaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/daemon.php b/lib/daemon.php
index 200314e20..9a3e1e7e9 100644
--- a/lib/daemon.php
+++ b/lib/daemon.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/dberroraction.php b/lib/dberroraction.php
index a56ad9369..bd8ccdd31 100644
--- a/lib/dberroraction.php
+++ b/lib/dberroraction.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/deleteaction.php b/lib/deleteaction.php
index 4320ad21b..89bed93ed 100644
--- a/lib/deleteaction.php
+++ b/lib/deleteaction.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
      exit(1);
 }
 
diff --git a/lib/designsettings.php b/lib/designsettings.php
index a531c10f1..21cb9d793 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/disfavorform.php b/lib/disfavorform.php
index 3d045d522..f3a022fec 100644
--- a/lib/disfavorform.php
+++ b/lib/disfavorform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/error.php b/lib/error.php
index 554156e53..e7bba8a47 100644
--- a/lib/error.php
+++ b/lib/error.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/event.php b/lib/event.php
index 5df875be1..106bbfd04 100644
--- a/lib/event.php
+++ b/lib/event.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index b547c4474..e7c78f070 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA'))
+if (!defined('STATUSNET'))
 {
     exit(1);
 }
diff --git a/lib/favorform.php b/lib/favorform.php
index ea6fd57c4..d38c5b130 100644
--- a/lib/favorform.php
+++ b/lib/favorform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/featureduserssection.php b/lib/featureduserssection.php
index daea881a9..3065ff623 100644
--- a/lib/featureduserssection.php
+++ b/lib/featureduserssection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/feed.php b/lib/feed.php
index 43137503f..8660c75ed 100644
--- a/lib/feed.php
+++ b/lib/feed.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/feedlist.php b/lib/feedlist.php
index bb1a0016a..2a750bf77 100644
--- a/lib/feedlist.php
+++ b/lib/feedlist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/form.php b/lib/form.php
index b5547dbcd..dffb6bce4 100644
--- a/lib/form.php
+++ b/lib/form.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/galleryaction.php b/lib/galleryaction.php
index 83245df21..0cbb5f8c0 100644
--- a/lib/galleryaction.php
+++ b/lib/galleryaction.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/groupdesignaction.php b/lib/groupdesignaction.php
index 50321097a..a9de600fe 100644
--- a/lib/groupdesignaction.php
+++ b/lib/groupdesignaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/groupeditform.php b/lib/groupeditform.php
index c88fd88f4..8ae6a23d5 100644
--- a/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/grouplist.php b/lib/grouplist.php
index 965052625..b042fb1b6 100644
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/groupminilist.php b/lib/groupminilist.php
index 9007b4fb0..4864d4657 100644
--- a/lib/groupminilist.php
+++ b/lib/groupminilist.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/groupnav.php b/lib/groupnav.php
index 909783132..f8ed180f1 100644
--- a/lib/groupnav.php
+++ b/lib/groupnav.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/groupsbymemberssection.php b/lib/groupsbymemberssection.php
index c799bc166..156afe669 100644
--- a/lib/groupsbymemberssection.php
+++ b/lib/groupsbymemberssection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/groupsbypostssection.php b/lib/groupsbypostssection.php
index 256b164bc..1c2a1c88f 100644
--- a/lib/groupsbypostssection.php
+++ b/lib/groupsbypostssection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/groupsection.php b/lib/groupsection.php
index 95d33569d..e3887bfd2 100644
--- a/lib/groupsection.php
+++ b/lib/groupsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/grouptagcloudsection.php b/lib/grouptagcloudsection.php
index 085e2d25b..93699f62c 100644
--- a/lib/grouptagcloudsection.php
+++ b/lib/grouptagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 565b148fa..1da8406f3 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -352,7 +352,7 @@ class HTMLOutputter extends XMLOutputter
         $url = parse_url($src);
         if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment))
         {
-            $src = common_path($src) . '?version=' . LACONICA_VERSION;
+            $src = common_path($src) . '?version=' . STATUSNET_VERSION;
         }
         $this->element('script', array('type' => $type,
                                                'src' => $src),
@@ -374,7 +374,7 @@ class HTMLOutputter extends XMLOutputter
         if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment))
         {
             if(file_exists(theme_file($src,$theme))){
-               $src = theme_path($src, $theme) . '?version=' . LACONICA_VERSION;
+               $src = theme_path($src, $theme) . '?version=' . STATUSNET_VERSION;
             }else{
                $src = common_path($src);
             }
diff --git a/lib/imagefile.php b/lib/imagefile.php
index bdff9874d..2619fd9d3 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/jabber.php b/lib/jabber.php
index 99226b04e..0054c4def 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/joinform.php b/lib/joinform.php
index eb06f1de6..47c94dd45 100644
--- a/lib/joinform.php
+++ b/lib/joinform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/jsonsearchresultslist.php b/lib/jsonsearchresultslist.php
index f17db334b..a315d0abd 100644
--- a/lib/jsonsearchresultslist.php
+++ b/lib/jsonsearchresultslist.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/language.php b/lib/language.php
index d278f5ab4..2039ef689 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -28,7 +28,7 @@
  * @link     http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/leaveform.php b/lib/leaveform.php
index 1dab6d99e..7068da0eb 100644
--- a/lib/leaveform.php
+++ b/lib/leaveform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index 39548a271..5e8682c03 100644
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/mail.php b/lib/mail.php
index a9c94f2f9..31bf79d2f 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -30,7 +30,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/mailbox.php b/lib/mailbox.php
index cd4bcba02..9391775f1 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/messageform.php b/lib/messageform.php
index ea93b8cf6..a8e514d05 100644
--- a/lib/messageform.php
+++ b/lib/messageform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/microid.php b/lib/microid.php
index e4160e94e..179042456 100644
--- a/lib/microid.php
+++ b/lib/microid.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 7f4e59fa1..7b6d7d21f 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 1b2a57aad..4d6de98bc 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/noticesection.php b/lib/noticesection.php
index 145545fbe..e7c3f9a54 100644
--- a/lib/noticesection.php
+++ b/lib/noticesection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/nudgeform.php b/lib/nudgeform.php
index 23ccb26b6..d6346cde7 100644
--- a/lib/nudgeform.php
+++ b/lib/nudgeform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/oauthclient.php b/lib/oauthclient.php
index e1fc47264..bd965a3bf 100644
--- a/lib/oauthclient.php
+++ b/lib/oauthclient.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index 6e2565bc7..151926008 100644
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
diff --git a/lib/omb.php b/lib/omb.php
index 8c0dfd6a2..0a03d8125 100644
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once('OAuth.php');
 require_once(INSTALLDIR.'/lib/oauthstore.php');
@@ -202,7 +202,7 @@ function omb_post_notice_keys($notice, $postnoticeurl, $tk, $secret)
 
     $result = $fetcher->post($req->get_normalized_http_url(),
                              $req->to_postdata(),
-                             array('User-Agent: StatusNet/' . LACONICA_VERSION));
+                             array('User-Agent: StatusNet/' . STATUSNET_VERSION));
 
     if ($result->status == 403) { # not authorized, don't send again
         common_debug('403 result, deleting subscription', __FILE__);
@@ -282,7 +282,7 @@ function omb_update_profile($profile, $remote_profile, $subscription)
 
     $result = $fetcher->post($req->get_normalized_http_url(),
                              $req->to_postdata(),
-                             array('User-Agent: StatusNet/' . LACONICA_VERSION));
+                             array('User-Agent: StatusNet/' . STATUSNET_VERSION));
 
     if (empty($result) || !$result) {
         common_debug("Unable to contact " . $req->get_normalized_http_url());
diff --git a/lib/openid.php b/lib/openid.php
index 28dc36018..87df4f30b 100644
--- a/lib/openid.php
+++ b/lib/openid.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/classes/User_openid.php');
 
diff --git a/lib/ownerdesignaction.php b/lib/ownerdesignaction.php
index 216da6ef8..3ee2c9907 100644
--- a/lib/ownerdesignaction.php
+++ b/lib/ownerdesignaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/parallelizingdaemon.php b/lib/parallelizingdaemon.php
index d10fea0e4..664e9bbd3 100644
--- a/lib/parallelizingdaemon.php
+++ b/lib/parallelizingdaemon.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 8a5e6322e..61d1ff676 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/personaltagcloudsection.php b/lib/personaltagcloudsection.php
index bb7b8386d..c10b0941d 100644
--- a/lib/personaltagcloudsection.php
+++ b/lib/personaltagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/ping.php b/lib/ping.php
index 2ae4316c3..48b4fa18f 100644
--- a/lib/ping.php
+++ b/lib/ping.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 function ping_broadcast_notice($notice) {
 
@@ -47,7 +47,7 @@ function ping_broadcast_notice($notice) {
             $context = stream_context_create(array('http' => array('method' => "POST",
                                                                    'header' =>
                                                                    "Content-Type: text/xml\r\n".
-                                                                   "User-Agent: StatusNet/".LACONICA_VERSION."\r\n",
+                                                                   "User-Agent: StatusNet/".STATUSNET_VERSION."\r\n",
                                                                    'content' => $req)));
             $file = file_get_contents($notify_url, false, $context);
 
@@ -81,11 +81,11 @@ function ping_broadcast_notice($notice) {
 
             if ($type === 'get') {
                 $result = $fetcher->get($notify_url . '?' . http_build_query($args),
-                                        array('User-Agent: StatusNet/'.LACONICA_VERSION));
+                                        array('User-Agent: StatusNet/'.STATUSNET_VERSION));
             } else {
                 $result = $fetcher->post($notify_url,
                                          http_build_query($args),
-                                         array('User-Agent: StatusNet/'.LACONICA_VERSION));
+                                         array('User-Agent: StatusNet/'.STATUSNET_VERSION));
             }
             if ($result->status != '200') {
                 common_log(LOG_WARNING,
diff --git a/lib/plugin.php b/lib/plugin.php
index e6cf6f7cc..4f53eee6b 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php
index 4906fd8b7..22e8e5468 100644
--- a/lib/popularnoticesection.php
+++ b/lib/popularnoticesection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/profileaction.php b/lib/profileaction.php
index 25e9aab5d..8b0c3b87e 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/profilelist.php b/lib/profilelist.php
index e54060dff..251da5e45 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/profileminilist.php b/lib/profileminilist.php
index 9d13ef167..13058d320 100644
--- a/lib/profileminilist.php
+++ b/lib/profileminilist.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/profilesection.php b/lib/profilesection.php
index f8a65a9dc..31658afe2 100644
--- a/lib/profilesection.php
+++ b/lib/profilesection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index 46c47abb1..a442bfc70 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/queuehandler.php b/lib/queuehandler.php
index d3d091f2f..ba64ad929 100644
--- a/lib/queuehandler.php
+++ b/lib/queuehandler.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/daemon.php');
 require_once(INSTALLDIR.'/classes/Queue_item.php');
diff --git a/lib/router.php b/lib/router.php
index ba30ea476..e91b2c537 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/rssaction.php b/lib/rssaction.php
index 608c4dab5..878309dce 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 define('DEFAULT_RSS_LIMIT', 48);
 
diff --git a/lib/search_engines.php b/lib/search_engines.php
index 2dd7bb49a..74513e2ea 100644
--- a/lib/search_engines.php
+++ b/lib/search_engines.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 class SearchEngine
 {
diff --git a/lib/searchaction.php b/lib/searchaction.php
index 724f53f59..a935eb102 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php
index 7237f2302..bf79e0abc 100644
--- a/lib/searchgroupnav.php
+++ b/lib/searchgroupnav.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/section.php b/lib/section.php
index 24bcd7f65..d605d458d 100644
--- a/lib/section.php
+++ b/lib/section.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/servererroraction.php b/lib/servererroraction.php
index 672741871..9ed3832a6 100644
--- a/lib/servererroraction.php
+++ b/lib/servererroraction.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/serverexception.php b/lib/serverexception.php
index 864e544d8..856866ae9 100644
--- a/lib/serverexception.php
+++ b/lib/serverexception.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index a84d650b8..aba196db9 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/snapshot.php b/lib/snapshot.php
index fadbcae4b..b15fe3a6c 100644
--- a/lib/snapshot.php
+++ b/lib/snapshot.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -125,7 +125,7 @@ class Snapshot
 
         // Some basic identification stuff
 
-        $this->stats['version']    = LACONICA_VERSION;
+        $this->stats['version']    = STATUSNET_VERSION;
         $this->stats['phpversion'] = phpversion();
         $this->stats['name']       = common_config('site', 'name');
         $this->stats['root']       = common_root_url();
@@ -181,7 +181,7 @@ class Snapshot
                       'header'  => 'Content-type: '.
                                    'application/x-www-form-urlencoded',
                       'content' => $postdata,
-                      'user_agent' => 'StatusNet/'.LACONICA_VERSION
+                      'user_agent' => 'StatusNet/'.STATUSNET_VERSION
                       )
                 );
 
diff --git a/lib/subgroupnav.php b/lib/subgroupnav.php
index dcda61136..590bec38c 100644
--- a/lib/subgroupnav.php
+++ b/lib/subgroupnav.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/subpeopletagcloudsection.php b/lib/subpeopletagcloudsection.php
index c99d603ce..8909c5a74 100644
--- a/lib/subpeopletagcloudsection.php
+++ b/lib/subpeopletagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/subs.php b/lib/subs.php
index c30a81a98..ae3949b75 100644
--- a/lib/subs.php
+++ b/lib/subs.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once('XMPPHP/XMPP.php');
 
diff --git a/lib/subscribeform.php b/lib/subscribeform.php
index 6bd2ea588..c7216f974 100644
--- a/lib/subscribeform.php
+++ b/lib/subscribeform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/subscriberspeopleselftagcloudsection.php b/lib/subscriberspeopleselftagcloudsection.php
index af0671378..c35f39f2c 100644
--- a/lib/subscriberspeopleselftagcloudsection.php
+++ b/lib/subscriberspeopleselftagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/subscriberspeopletagcloudsection.php b/lib/subscriberspeopletagcloudsection.php
index 837613a70..a850dbc86 100644
--- a/lib/subscriberspeopletagcloudsection.php
+++ b/lib/subscriberspeopletagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index 101687d41..0767196e9 100644
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/subscriptionspeopleselftagcloudsection.php b/lib/subscriptionspeopleselftagcloudsection.php
index bf2471a0b..839e2b161 100644
--- a/lib/subscriptionspeopleselftagcloudsection.php
+++ b/lib/subscriptionspeopleselftagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/subscriptionspeopletagcloudsection.php b/lib/subscriptionspeopletagcloudsection.php
index fc0aabfdc..38d93946f 100644
--- a/lib/subscriptionspeopletagcloudsection.php
+++ b/lib/subscriptionspeopletagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/tagcloudsection.php b/lib/tagcloudsection.php
index ed84999f0..20533dbe2 100644
--- a/lib/tagcloudsection.php
+++ b/lib/tagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/theme.php b/lib/theme.php
index e52566b97..ceec3dff0 100644
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/topposterssection.php b/lib/topposterssection.php
index dd72dfc4c..7d8348d44 100644
--- a/lib/topposterssection.php
+++ b/lib/topposterssection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/twitter.php b/lib/twitter.php
index ed12d3592..504744519 100644
--- a/lib/twitter.php
+++ b/lib/twitter.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index db44c93e1..2c713f366 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/twitteroauthclient.php b/lib/twitteroauthclient.php
index ca3b347ab..e8f6e21ba 100644
--- a/lib/twitteroauthclient.php
+++ b/lib/twitteroauthclient.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/unblockform.php b/lib/unblockform.php
index 336aeda93..c6310dc0f 100644
--- a/lib/unblockform.php
+++ b/lib/unblockform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php
index 5bf42fdfe..0ce343e11 100644
--- a/lib/unsubscribeform.php
+++ b/lib/unsubscribeform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/webcolor.php b/lib/webcolor.php
index ee74fa8f6..922e6794f 100644
--- a/lib/webcolor.php
+++ b/lib/webcolor.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
      exit(1);
 }
 
diff --git a/lib/widget.php b/lib/widget.php
index 0c52748f3..43bc4a481 100644
--- a/lib/widget.php
+++ b/lib/widget.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/xmloutputter.php b/lib/xmloutputter.php
index d7bb1bf00..7d2788d71 100644
--- a/lib/xmloutputter.php
+++ b/lib/xmloutputter.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/xmlstringer.php b/lib/xmlstringer.php
index f8d8793e6..bd17ab09c 100644
--- a/lib/xmlstringer.php
+++ b/lib/xmlstringer.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php
index 91ecbcbba..ac3d98509 100644
--- a/lib/xmppqueuehandler.php
+++ b/lib/xmppqueuehandler.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/queuehandler.php');
 
diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php
index 1fbb0dbec..49b6d42b1 100644
--- a/plugins/Autocomplete/AutocompletePlugin.php
+++ b/plugins/Autocomplete/AutocompletePlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/plugins/BlogspamNetPlugin.php b/plugins/BlogspamNetPlugin.php
index 602ced661..c14569746 100644
--- a/plugins/BlogspamNetPlugin.php
+++ b/plugins/BlogspamNetPlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -139,6 +139,6 @@ class BlogspamNetPlugin extends Plugin
 
     function userAgent()
     {
-        return 'BlogspamNetPlugin/'.BLOGSPAMNETPLUGIN_VERSION . ' StatusNet/' . LACONICA_VERSION;
+        return 'BlogspamNetPlugin/'.BLOGSPAMNETPLUGIN_VERSION . ' StatusNet/' . STATUSNET_VERSION;
     }
 }
diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php
index c3a5d0fbc..d7ac2b859 100644
--- a/plugins/Comet/CometPlugin.php
+++ b/plugins/Comet/CometPlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/plugins/FBConnect/FBCLoginGroupNav.php b/plugins/FBConnect/FBCLoginGroupNav.php
index 763578d46..782f7198a 100644
--- a/plugins/FBConnect/FBCLoginGroupNav.php
+++ b/plugins/FBConnect/FBCLoginGroupNav.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/plugins/FBConnect/FBCSettingsNav.php b/plugins/FBConnect/FBCSettingsNav.php
index be6c0ea9b..a4ecbada1 100644
--- a/plugins/FBConnect/FBCSettingsNav.php
+++ b/plugins/FBConnect/FBCSettingsNav.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/plugins/FBConnect/FBC_XDReceiver.php b/plugins/FBConnect/FBC_XDReceiver.php
index 19251cca4..50c525c75 100644
--- a/plugins/FBConnect/FBC_XDReceiver.php
+++ b/plugins/FBConnect/FBC_XDReceiver.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/plugins/FBConnect/FBConnectLogin.php b/plugins/FBConnect/FBConnectLogin.php
index 1ffcc7878..ae304f242 100644
--- a/plugins/FBConnect/FBConnectLogin.php
+++ b/plugins/FBConnect/FBConnectLogin.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/plugins/FBConnect/FBConnectPlugin.php b/plugins/FBConnect/FBConnectPlugin.php
index ae24e7a73..fb50cc4c9 100644
--- a/plugins/FBConnect/FBConnectPlugin.php
+++ b/plugins/FBConnect/FBConnectPlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/plugins/FBConnect/FBConnectSettings.php b/plugins/FBConnect/FBConnectSettings.php
index c3f108a9e..fbb419980 100644
--- a/plugins/FBConnect/FBConnectSettings.php
+++ b/plugins/FBConnect/FBConnectSettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/plugins/GoogleAnalyticsPlugin.php b/plugins/GoogleAnalyticsPlugin.php
index 01010e264..7f3d209ee 100644
--- a/plugins/GoogleAnalyticsPlugin.php
+++ b/plugins/GoogleAnalyticsPlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
index 69a56afdd..59422e5d9 100644
--- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php
+++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/plugins/LinkbackPlugin.php b/plugins/LinkbackPlugin.php
index 7bf7fa619..c49f70de0 100644
--- a/plugins/LinkbackPlugin.php
+++ b/plugins/LinkbackPlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -225,6 +225,6 @@ class LinkbackPlugin extends Plugin
     function userAgent()
     {
         return 'LinkbackPlugin/'.LINKBACKPLUGIN_VERSION .
-          ' StatusNet/' . LACONICA_VERSION;
+          ' StatusNet/' . STATUSNET_VERSION;
     }
 }
diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php
index a288cad64..4cb05693b 100644
--- a/plugins/Meteor/MeteorPlugin.php
+++ b/plugins/Meteor/MeteorPlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php
index 3238292a6..902d1744d 100644
--- a/plugins/PiwikAnalyticsPlugin.php
+++ b/plugins/PiwikAnalyticsPlugin.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 4f05934d7..9ecf70030 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/plugins/TemplatePlugin.php b/plugins/TemplatePlugin.php
index 0f4daa734..b56fa3dbd 100644
--- a/plugins/TemplatePlugin.php
+++ b/plugins/TemplatePlugin.php
@@ -15,7 +15,7 @@
  * @link      http://megapump.com/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/plugins/WikiHashtagsPlugin.php b/plugins/WikiHashtagsPlugin.php
index 72217cc83..0c5649aa4 100644
--- a/plugins/WikiHashtagsPlugin.php
+++ b/plugins/WikiHashtagsPlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -104,6 +104,6 @@ class WikiHashtagsPlugin extends Plugin
     function userAgent()
     {
         return 'WikiHashtagsPlugin/'.WIKIHASHTAGSPLUGIN_VERSION .
-          ' StatusNet/' . LACONICA_VERSION;
+          ' StatusNet/' . STATUSNET_VERSION;
     }
 }
diff --git a/plugins/recaptcha/recaptcha.php b/plugins/recaptcha/recaptcha.php
index a9a17e1ea..9767f95d2 100644
--- a/plugins/recaptcha/recaptcha.php
+++ b/plugins/recaptcha/recaptcha.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
diff --git a/scripts/fixup_hashtags.php b/scripts/fixup_hashtags.php
index f663eb689..eba527b8d 100755
--- a/scripts/fixup_hashtags.php
+++ b/scripts/fixup_hashtags.php
@@ -25,7 +25,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('LACONICA', true);
+define('STATUSNET', true);
 
 require_once(INSTALLDIR . '/lib/common.php');
 
diff --git a/scripts/fixup_inboxes.php b/scripts/fixup_inboxes.php
index 53af5e1a8..0640fcc4f 100755
--- a/scripts/fixup_inboxes.php
+++ b/scripts/fixup_inboxes.php
@@ -30,7 +30,7 @@ set_time_limit(0);
 mb_internal_encoding('UTF-8');
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('LACONICA', true);
+define('STATUSNET', true);
 
 require_once(INSTALLDIR . '/lib/common.php');
 
diff --git a/scripts/fixup_notices_rendered.php b/scripts/fixup_notices_rendered.php
index 9e707dab0..2ccb7ce80 100755
--- a/scripts/fixup_notices_rendered.php
+++ b/scripts/fixup_notices_rendered.php
@@ -25,7 +25,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('LACONICA', true);
+define('STATUSNET', true);
 
 require_once(INSTALLDIR . '/lib/common.php');
 
diff --git a/scripts/fixup_replies.php b/scripts/fixup_replies.php
index 39ec268f3..63dd6b35a 100755
--- a/scripts/fixup_replies.php
+++ b/scripts/fixup_replies.php
@@ -25,7 +25,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('LACONICA', true);
+define('STATUSNET', true);
 
 require_once(INSTALLDIR . '/lib/common.php');
 
diff --git a/scripts/update_translations.php b/scripts/update_translations.php
index 0dee4f5a5..8120f636f 100755
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -25,7 +25,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('LACONICA', true);
+define('STATUSNET', true);
 
 require_once(INSTALLDIR . '/lib/common.php');
 
diff --git a/tests/HashTagDetectionTest.php b/tests/HashTagDetectionTest.php
index 901e0611c..9afe34657 100644
--- a/tests/HashTagDetectionTest.php
+++ b/tests/HashTagDetectionTest.php
@@ -6,7 +6,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('LACONICA', true);
+define('STATUSNET', true);
 
 require_once INSTALLDIR . '/lib/common.php';
 
diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index 7b2e8c5ae..767f895bb 100644
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -6,7 +6,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('LACONICA', true);
+define('STATUSNET', true);
 
 require_once INSTALLDIR . '/lib/common.php';
 
-- 
cgit v1.2.3-54-g00ecf


From df86aa721455fde537608d5faeaaf92075afb738 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 26 Aug 2009 10:41:36 -0400
Subject: define LACONICA and accept LACONICA for backwards compatibility

---
 actions/accesstoken.php                         | 2 +-
 actions/all.php                                 | 2 +-
 actions/allrss.php                              | 2 +-
 actions/api.php                                 | 2 +-
 actions/attachment.php                          | 2 +-
 actions/attachment_ajax.php                     | 2 +-
 actions/attachment_thumbnail.php                | 2 +-
 actions/avatarbynickname.php                    | 2 +-
 actions/avatarsettings.php                      | 2 +-
 actions/block.php                               | 2 +-
 actions/blockedfromgroup.php                    | 2 +-
 actions/confirmaddress.php                      | 2 +-
 actions/conversation.php                        | 2 +-
 actions/deletenotice.php                        | 2 +-
 actions/disfavor.php                            | 2 +-
 actions/doc.php                                 | 2 +-
 actions/editgroup.php                           | 2 +-
 actions/emailsettings.php                       | 2 +-
 actions/facebookhome.php                        | 2 +-
 actions/facebookinvite.php                      | 2 +-
 actions/facebooklogin.php                       | 2 +-
 actions/facebookremove.php                      | 2 +-
 actions/facebooksettings.php                    | 2 +-
 actions/favor.php                               | 2 +-
 actions/favorited.php                           | 2 +-
 actions/favoritesrss.php                        | 2 +-
 actions/featured.php                            | 2 +-
 actions/file.php                                | 2 +-
 actions/finishaddopenid.php                     | 2 +-
 actions/finishopenidlogin.php                   | 2 +-
 actions/finishremotesubscribe.php               | 2 +-
 actions/foaf.php                                | 2 +-
 actions/groupblock.php                          | 2 +-
 actions/groupbyid.php                           | 2 +-
 actions/groupdesignsettings.php                 | 2 +-
 actions/grouplogo.php                           | 2 +-
 actions/groupmembers.php                        | 2 +-
 actions/grouprss.php                            | 2 +-
 actions/groups.php                              | 2 +-
 actions/groupsearch.php                         | 2 +-
 actions/groupunblock.php                        | 2 +-
 actions/imsettings.php                          | 2 +-
 actions/inbox.php                               | 2 +-
 actions/invite.php                              | 2 +-
 actions/joingroup.php                           | 2 +-
 actions/leavegroup.php                          | 2 +-
 actions/login.php                               | 2 +-
 actions/logout.php                              | 2 +-
 actions/makeadmin.php                           | 2 +-
 actions/microsummary.php                        | 2 +-
 actions/newgroup.php                            | 2 +-
 actions/newmessage.php                          | 2 +-
 actions/newnotice.php                           | 2 +-
 actions/noticesearch.php                        | 2 +-
 actions/noticesearchrss.php                     | 2 +-
 actions/nudge.php                               | 2 +-
 actions/oembed.php                              | 2 +-
 actions/openidlogin.php                         | 2 +-
 actions/openidsettings.php                      | 2 +-
 actions/opensearch.php                          | 2 +-
 actions/othersettings.php                       | 2 +-
 actions/outbox.php                              | 2 +-
 actions/passwordsettings.php                    | 2 +-
 actions/peoplesearch.php                        | 2 +-
 actions/peopletag.php                           | 2 +-
 actions/postnotice.php                          | 2 +-
 actions/profilesettings.php                     | 2 +-
 actions/public.php                              | 2 +-
 actions/publicrss.php                           | 2 +-
 actions/publictagcloud.php                      | 2 +-
 actions/publicxrds.php                          | 2 +-
 actions/recoverpassword.php                     | 2 +-
 actions/register.php                            | 2 +-
 actions/remotesubscribe.php                     | 2 +-
 actions/replies.php                             | 2 +-
 actions/repliesrss.php                          | 2 +-
 actions/requesttoken.php                        | 2 +-
 actions/showfavorites.php                       | 2 +-
 actions/showgroup.php                           | 2 +-
 actions/showmessage.php                         | 2 +-
 actions/shownotice.php                          | 2 +-
 actions/showstream.php                          | 2 +-
 actions/smssettings.php                         | 2 +-
 actions/subedit.php                             | 2 +-
 actions/subscribe.php                           | 2 +-
 actions/subscribers.php                         | 2 +-
 actions/subscriptions.php                       | 4 ++--
 actions/sup.php                                 | 2 +-
 actions/tag.php                                 | 2 +-
 actions/tagother.php                            | 2 +-
 actions/tagrss.php                              | 2 +-
 actions/twitapiaccount.php                      | 2 +-
 actions/twitapiblocks.php                       | 2 +-
 actions/twitapidirect_messages.php              | 2 +-
 actions/twitapifavorites.php                    | 2 +-
 actions/twitapifriendships.php                  | 2 +-
 actions/twitapigroups.php                       | 2 +-
 actions/twitapihelp.php                         | 2 +-
 actions/twitapinotifications.php                | 2 +-
 actions/twitapisearchatom.php                   | 2 +-
 actions/twitapisearchjson.php                   | 2 +-
 actions/twitapistatuses.php                     | 2 +-
 actions/twitapistatusnet.php                    | 2 +-
 actions/twitapitags.php                         | 2 +-
 actions/twitapitrends.php                       | 2 +-
 actions/twitapiusers.php                        | 2 +-
 actions/twitterauthorization.php                | 2 +-
 actions/twittersettings.php                     | 2 +-
 actions/unblock.php                             | 2 +-
 actions/unsubscribe.php                         | 2 +-
 actions/updateprofile.php                       | 2 +-
 actions/userauthorization.php                   | 2 +-
 actions/userbyid.php                            | 2 +-
 actions/userdesignsettings.php                  | 2 +-
 actions/usergroups.php                          | 2 +-
 actions/userrss.php                             | 2 +-
 actions/xrds.php                                | 2 +-
 classes/Design.php                              | 2 +-
 classes/File.php                                | 2 +-
 classes/File_oembed.php                         | 2 +-
 classes/File_redirection.php                    | 2 +-
 classes/File_thumbnail.php                      | 2 +-
 classes/File_to_post.php                        | 2 +-
 classes/Group_alias.php                         | 2 +-
 classes/Group_block.php                         | 2 +-
 classes/Memcached_DataObject.php                | 2 +-
 classes/Notice.php                              | 2 +-
 classes/Notice_inbox.php                        | 2 +-
 classes/Profile.php                             | 2 +-
 classes/Profile_block.php                       | 2 +-
 classes/Remote_profile.php                      | 2 +-
 classes/Session.php                             | 2 +-
 classes/Status_network.php                      | 2 +-
 classes/Subscription.php                        | 2 +-
 classes/User.php                                | 2 +-
 index.php                                       | 1 +
 install.php                                     | 2 +-
 lib/Shorturl_api.php                            | 2 +-
 lib/accountsettingsaction.php                   | 2 +-
 lib/action.php                                  | 2 +-
 lib/arraywrapper.php                            | 2 +-
 lib/attachmentlist.php                          | 2 +-
 lib/attachmentnoticesection.php                 | 2 +-
 lib/attachmenttagcloudsection.php               | 2 +-
 lib/blockform.php                               | 2 +-
 lib/channel.php                                 | 2 +-
 lib/clienterroraction.php                       | 2 +-
 lib/clientexception.php                         | 2 +-
 lib/command.php                                 | 2 +-
 lib/commandinterpreter.php                      | 2 +-
 lib/common.php                                  | 2 +-
 lib/connectsettingsaction.php                   | 2 +-
 lib/currentuserdesignaction.php                 | 2 +-
 lib/daemon.php                                  | 2 +-
 lib/dberroraction.php                           | 2 +-
 lib/deleteaction.php                            | 2 +-
 lib/designsettings.php                          | 2 +-
 lib/disfavorform.php                            | 2 +-
 lib/error.php                                   | 2 +-
 lib/event.php                                   | 2 +-
 lib/facebookaction.php                          | 2 +-
 lib/favorform.php                               | 2 +-
 lib/featureduserssection.php                    | 2 +-
 lib/feed.php                                    | 2 +-
 lib/feedlist.php                                | 2 +-
 lib/form.php                                    | 2 +-
 lib/galleryaction.php                           | 2 +-
 lib/groupdesignaction.php                       | 2 +-
 lib/groupeditform.php                           | 2 +-
 lib/grouplist.php                               | 2 +-
 lib/groupminilist.php                           | 2 +-
 lib/groupnav.php                                | 2 +-
 lib/groupsbymemberssection.php                  | 2 +-
 lib/groupsbypostssection.php                    | 2 +-
 lib/groupsection.php                            | 2 +-
 lib/grouptagcloudsection.php                    | 2 +-
 lib/htmloutputter.php                           | 2 +-
 lib/imagefile.php                               | 2 +-
 lib/jabber.php                                  | 2 +-
 lib/joinform.php                                | 2 +-
 lib/jsonsearchresultslist.php                   | 2 +-
 lib/language.php                                | 2 +-
 lib/leaveform.php                               | 2 +-
 lib/logingroupnav.php                           | 2 +-
 lib/mail.php                                    | 2 +-
 lib/mailbox.php                                 | 2 +-
 lib/messageform.php                             | 2 +-
 lib/microid.php                                 | 2 +-
 lib/noticeform.php                              | 2 +-
 lib/noticelist.php                              | 2 +-
 lib/noticesection.php                           | 2 +-
 lib/nudgeform.php                               | 2 +-
 lib/oauthclient.php                             | 2 +-
 lib/oauthstore.php                              | 2 +-
 lib/omb.php                                     | 2 +-
 lib/openid.php                                  | 2 +-
 lib/ownerdesignaction.php                       | 2 +-
 lib/parallelizingdaemon.php                     | 2 +-
 lib/personalgroupnav.php                        | 2 +-
 lib/personaltagcloudsection.php                 | 2 +-
 lib/ping.php                                    | 2 +-
 lib/plugin.php                                  | 2 +-
 lib/popularnoticesection.php                    | 2 +-
 lib/profileaction.php                           | 2 +-
 lib/profilelist.php                             | 2 +-
 lib/profileminilist.php                         | 2 +-
 lib/profilesection.php                          | 2 +-
 lib/publicgroupnav.php                          | 2 +-
 lib/queuehandler.php                            | 2 +-
 lib/router.php                                  | 2 +-
 lib/rssaction.php                               | 2 +-
 lib/search_engines.php                          | 2 +-
 lib/searchaction.php                            | 2 +-
 lib/searchgroupnav.php                          | 2 +-
 lib/section.php                                 | 2 +-
 lib/servererroraction.php                       | 2 +-
 lib/serverexception.php                         | 2 +-
 lib/settingsaction.php                          | 2 +-
 lib/snapshot.php                                | 2 +-
 lib/subgroupnav.php                             | 2 +-
 lib/subpeopletagcloudsection.php                | 2 +-
 lib/subs.php                                    | 2 +-
 lib/subscribeform.php                           | 2 +-
 lib/subscriberspeopleselftagcloudsection.php    | 2 +-
 lib/subscriberspeopletagcloudsection.php        | 2 +-
 lib/subscriptionlist.php                        | 2 +-
 lib/subscriptionspeopleselftagcloudsection.php  | 2 +-
 lib/subscriptionspeopletagcloudsection.php      | 2 +-
 lib/tagcloudsection.php                         | 2 +-
 lib/theme.php                                   | 2 +-
 lib/topposterssection.php                       | 2 +-
 lib/twitter.php                                 | 2 +-
 lib/twitterapi.php                              | 2 +-
 lib/twitteroauthclient.php                      | 2 +-
 lib/unblockform.php                             | 2 +-
 lib/unsubscribeform.php                         | 2 +-
 lib/webcolor.php                                | 2 +-
 lib/widget.php                                  | 2 +-
 lib/xmloutputter.php                            | 2 +-
 lib/xmlstringer.php                             | 2 +-
 lib/xmppqueuehandler.php                        | 2 +-
 plugins/Autocomplete/AutocompletePlugin.php     | 2 +-
 plugins/Comet/CometPlugin.php                   | 2 +-
 plugins/FBConnect/FBCLoginGroupNav.php          | 2 +-
 plugins/FBConnect/FBCSettingsNav.php            | 2 +-
 plugins/FBConnect/FBC_XDReceiver.php            | 2 +-
 plugins/FBConnect/FBConnectLogin.php            | 2 +-
 plugins/FBConnect/FBConnectPlugin.php           | 2 +-
 plugins/FBConnect/FBConnectSettings.php         | 2 +-
 plugins/InfiniteScroll/InfiniteScrollPlugin.php | 2 +-
 plugins/Meteor/MeteorPlugin.php                 | 2 +-
 plugins/Realtime/RealtimePlugin.php             | 2 +-
 plugins/recaptcha/recaptcha.php                 | 2 +-
 scripts/fixup_hashtags.php                      | 1 +
 scripts/fixup_inboxes.php                       | 1 +
 scripts/fixup_notices_rendered.php              | 1 +
 scripts/fixup_replies.php                       | 1 +
 scripts/update_translations.php                 | 1 +
 258 files changed, 259 insertions(+), 253 deletions(-)

(limited to 'lib/unblockform.php')

diff --git a/actions/accesstoken.php b/actions/accesstoken.php
index f1ddfc6a1..c99aaeded 100644
--- a/actions/accesstoken.php
+++ b/actions/accesstoken.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/all.php b/actions/all.php
index 6dbab080f..bfde3a7e4 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/personalgroupnav.php';
 require_once INSTALLDIR.'/lib/noticelist.php';
diff --git a/actions/allrss.php b/actions/allrss.php
index a5447fa9f..57efb73f0 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/api.php b/actions/api.php
index 91f30e87a..93e33085f 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class ApiAction extends Action
 {
diff --git a/actions/attachment.php b/actions/attachment.php
index 5d11faad8..6981354d1 100644
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/attachment_ajax.php b/actions/attachment_ajax.php
index af37c9bcb..1e0728075 100644
--- a/actions/attachment_ajax.php
+++ b/actions/attachment_ajax.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/attachment_thumbnail.php b/actions/attachment_thumbnail.php
index 7add8e278..7d0ac97a6 100644
--- a/actions/attachment_thumbnail.php
+++ b/actions/attachment_thumbnail.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
index e7ebaeee2..537950792 100644
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 54baef88f..0bc439ff1 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/block.php b/actions/block.php
index 2441c6fba..408f16434 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php
index 5b5c8bcfa..ca4a711cb 100644
--- a/actions/blockedfromgroup.php
+++ b/actions/blockedfromgroup.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 94cd6ddf4..201694286 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/conversation.php b/actions/conversation.php
index c4a4e80da..900a724ef 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index 8f6e9bdd1..3d040f2fa 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/disfavor.php b/actions/disfavor.php
index 25230ceac..6269f1bd2 100644
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/doc.php b/actions/doc.php
index 1adb9b075..68295234c 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/editgroup.php b/actions/editgroup.php
index 62a629056..cac910e9b 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -29,7 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 1b4d73bbf..af528a892 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index a54d22a47..70f205205 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/facebookaction.php';
 
diff --git a/actions/facebookinvite.php b/actions/facebookinvite.php
index aa8486585..6dfc9d688 100644
--- a/actions/facebookinvite.php
+++ b/actions/facebookinvite.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/facebooklogin.php b/actions/facebooklogin.php
index 64d24dd40..8ac2477ab 100644
--- a/actions/facebooklogin.php
+++ b/actions/facebooklogin.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/facebookaction.php');
 
diff --git a/actions/facebookremove.php b/actions/facebookremove.php
index 1547fb780..ae231c0fb 100644
--- a/actions/facebookremove.php
+++ b/actions/facebookremove.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/facebookaction.php';
 
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index 817a11828..84bdde910 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/facebookaction.php';
 
diff --git a/actions/favor.php b/actions/favor.php
index a995188c3..2aeb1da61 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/favorited.php b/actions/favorited.php
index 006dd5488..5ba508cdf 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php
index 0302d10e5..2d5ce9854 100644
--- a/actions/favoritesrss.php
+++ b/actions/favoritesrss.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/featured.php b/actions/featured.php
index f38068eb6..39bf09d8f 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/file.php b/actions/file.php
index 005a13169..10c59a961 100644
--- a/actions/file.php
+++ b/actions/file.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/actions/shownotice.php');
 
diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php
index 40939d44b..b6de4f244 100644
--- a/actions/finishaddopenid.php
+++ b/actions/finishaddopenid.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index 07da72fc0..9ac036985 100644
--- a/actions/finishopenidlogin.php
+++ b/actions/finishopenidlogin.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index 5df36070f..871bc3d2d 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
diff --git a/actions/foaf.php b/actions/foaf.php
index d3ab098f4..4dae9dfc1 100644
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 define('LISTENER', 1);
 define('LISTENEE', -1);
diff --git a/actions/groupblock.php b/actions/groupblock.php
index e98f13224..979a56a81 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/groupbyid.php b/actions/groupbyid.php
index bc0709f4f..52cfaddfc 100644
--- a/actions/groupbyid.php
+++ b/actions/groupbyid.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php
index baef31018..cd86e3b05 100644
--- a/actions/groupdesignsettings.php
+++ b/actions/groupdesignsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index 30f865248..c6f376915 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index 5a4ea27ab..dcbdd3759 100644
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/grouprss.php b/actions/grouprss.php
index 7cd85c1af..70c1ded48 100644
--- a/actions/grouprss.php
+++ b/actions/grouprss.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/groups.php b/actions/groups.php
index 53b95c848..10a1d5964 100644
--- a/actions/groups.php
+++ b/actions/groups.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/groupsearch.php b/actions/groupsearch.php
index fc825a6fd..bbd4c3a74 100644
--- a/actions/groupsearch.php
+++ b/actions/groupsearch.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/groupunblock.php b/actions/groupunblock.php
index 248b2a0a7..dd6b15c26 100644
--- a/actions/groupunblock.php
+++ b/actions/groupunblock.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/imsettings.php b/actions/imsettings.php
index 145cd7ed2..f57933b43 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/inbox.php b/actions/inbox.php
index f5f7d8bcb..6cb7f9e15 100644
--- a/actions/inbox.php
+++ b/actions/inbox.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/invite.php b/actions/invite.php
index d8f15705b..ab43a2491 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class InviteAction extends CurrentUserDesignAction
 {
diff --git a/actions/joingroup.php b/actions/joingroup.php
index 32b59efa0..0209dd43f 100644
--- a/actions/joingroup.php
+++ b/actions/joingroup.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index 27b5ea017..60b22e147 100644
--- a/actions/leavegroup.php
+++ b/actions/leavegroup.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/login.php b/actions/login.php
index 145236966..37f3c54ff 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/logout.php b/actions/logout.php
index eda5cefe5..298b2a484 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/makeadmin.php b/actions/makeadmin.php
index 7866f42c1..2dfddebc2 100644
--- a/actions/makeadmin.php
+++ b/actions/makeadmin.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/microsummary.php b/actions/microsummary.php
index 8f2d34998..5c01a9ce0 100644
--- a/actions/microsummary.php
+++ b/actions/microsummary.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/newgroup.php b/actions/newgroup.php
index 544dd3818..01cb636aa 100644
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/newmessage.php b/actions/newmessage.php
index 579871546..828a339cf 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -29,7 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 4b542815b..00a822860 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -29,7 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index e268c69ab..1188e7e10 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php
index 67bca01b5..f59ad7962 100644
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/nudge.php b/actions/nudge.php
index b699a3144..cf5f773e7 100644
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/oembed.php b/actions/oembed.php
index 5f6751b5a..e287b6ae2 100644
--- a/actions/oembed.php
+++ b/actions/oembed.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index 42d740938..4b5338694 100644
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 09e678e3c..13da64a4f 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/opensearch.php b/actions/opensearch.php
index 8ef13dd7a..d5e6698f3 100644
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/othersettings.php b/actions/othersettings.php
index 244c34eab..8b674161a 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/outbox.php b/actions/outbox.php
index a1fc81dfd..537fad3ef 100644
--- a/actions/outbox.php
+++ b/actions/outbox.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index e7cd0ab51..ec842600f 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 43c966f9c..ba0f71e39 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/peopletag.php b/actions/peopletag.php
index 0c5321fae..6dbbc9261 100644
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/postnotice.php b/actions/postnotice.php
index 883cd53fb..e775ca17e 100644
--- a/actions/postnotice.php
+++ b/actions/postnotice.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 2f9d2bac9..f9c16351d 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/public.php b/actions/public.php
index f8ecc0e78..d426648f3 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/publicrss.php b/actions/publicrss.php
index 0d75ffc35..593888b9f 100644
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index 026827fbe..60bb53e27 100644
--- a/actions/publictagcloud.php
+++ b/actions/publictagcloud.php
@@ -29,7 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 define('TAGS_PER_PAGE', 100);
 
diff --git a/actions/publicxrds.php b/actions/publicxrds.php
index 921106a5f..209a10e3d 100644
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 279f1cef1..9776c1fb4 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 # You have 24 hours to claim your password
 
diff --git a/actions/register.php b/actions/register.php
index a219c03d8..c431aeee3 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 793275781..374392d4a 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
diff --git a/actions/replies.php b/actions/replies.php
index 954d7ce19..cca430230 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/repliesrss.php b/actions/repliesrss.php
index 5115453b7..c71c9226f 100644
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/rssaction.php');
 
diff --git a/actions/requesttoken.php b/actions/requesttoken.php
index 243844c4b..48fe1db08 100644
--- a/actions/requesttoken.php
+++ b/actions/requesttoken.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index 9734496ba..0f7a66330 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/showgroup.php b/actions/showgroup.php
index 965b933e2..8157ee3c8 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/showmessage.php b/actions/showmessage.php
index 5d23fb13f..db757948b 100644
--- a/actions/showmessage.php
+++ b/actions/showmessage.php
@@ -26,7 +26,7 @@
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
-if (!defined('STATUSNET')) { 
+if (!defined('STATUSNET') && !defined('LACONICA')) { 
     exit(1); 
 }
 
diff --git a/actions/shownotice.php b/actions/shownotice.php
index 4f7c3af7f..3bc52b2db 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/showstream.php b/actions/showstream.php
index 93730812c..4d3067eed 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/smssettings.php b/actions/smssettings.php
index bfe49feee..b956cceba 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/subedit.php b/actions/subedit.php
index 3320bdc59..cf6589e50 100644
--- a/actions/subedit.php
+++ b/actions/subedit.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class SubeditAction extends Action
 {
diff --git a/actions/subscribe.php b/actions/subscribe.php
index fb1fb5e6b..4c46806e4 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class SubscribeAction extends Action
 {
diff --git a/actions/subscribers.php b/actions/subscribers.php
index 3000f17b0..f7d08d9d0 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 8cad9e3b4..b1c668228 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -42,7 +42,7 @@ if (!defined('STATUSNET')) {
  * @link     http://status.net/
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class SubscriptionsAction extends GalleryAction
 {
diff --git a/actions/sup.php b/actions/sup.php
index b635de194..5daf0a1c1 100644
--- a/actions/sup.php
+++ b/actions/sup.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class SupAction extends Action
 {
diff --git a/actions/tag.php b/actions/tag.php
index 935d00ab0..f0ab30308 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class TagAction extends Action
 {
diff --git a/actions/tagother.php b/actions/tagother.php
index aaca46355..c3f43be8b 100644
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 
diff --git a/actions/tagrss.php b/actions/tagrss.php
index 135b12135..75cbfa274 100644
--- a/actions/tagrss.php
+++ b/actions/tagrss.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/rssaction.php');
 
diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index dc043ddd3..93c8443c9 100644
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapiblocks.php b/actions/twitapiblocks.php
index 808e79220..ed17946ae 100644
--- a/actions/twitapiblocks.php
+++ b/actions/twitapiblocks.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapidirect_messages.php b/actions/twitapidirect_messages.php
index 8511fcbe2..dbe55804b 100644
--- a/actions/twitapidirect_messages.php
+++ b/actions/twitapidirect_messages.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapifavorites.php b/actions/twitapifavorites.php
index d812b5034..f8943fe2d 100644
--- a/actions/twitapifavorites.php
+++ b/actions/twitapifavorites.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index 015a5dbae..f2ea46910 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php
index c3e028c17..214fa8214 100644
--- a/actions/twitapigroups.php
+++ b/actions/twitapigroups.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapihelp.php b/actions/twitapihelp.php
index 3fc232f64..81381620e 100644
--- a/actions/twitapihelp.php
+++ b/actions/twitapihelp.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapinotifications.php b/actions/twitapinotifications.php
index 7bc9dd14b..0653e69ab 100644
--- a/actions/twitapinotifications.php
+++ b/actions/twitapinotifications.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index 3ccd8c5b6..2f587d604 100644
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapisearchjson.php b/actions/twitapisearchjson.php
index 173295176..c628ee624 100644
--- a/actions/twitapisearchjson.php
+++ b/actions/twitapisearchjson.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index e522b6357..edee239a0 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapistatusnet.php b/actions/twitapistatusnet.php
index c75e5e858..490f11dce 100644
--- a/actions/twitapistatusnet.php
+++ b/actions/twitapistatusnet.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapitags.php b/actions/twitapitags.php
index 0f2b571c6..2bb7ee01a 100644
--- a/actions/twitapitags.php
+++ b/actions/twitapitags.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapitrends.php b/actions/twitapitrends.php
index 436451c0f..83ab28f35 100644
--- a/actions/twitapitrends.php
+++ b/actions/twitapitrends.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index 853a6b8fa..703fa6754 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twitterauthorization.php b/actions/twitterauthorization.php
index 3745a67cf..630ac426f 100644
--- a/actions/twitterauthorization.php
+++ b/actions/twitterauthorization.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index c23fa2ff8..563d867a4 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/unblock.php b/actions/unblock.php
index 43f454340..dc28d5d54 100644
--- a/actions/unblock.php
+++ b/actions/unblock.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index bedea9f28..4a5863489 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index d48686401..9a4cf8e46 100644
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
diff --git a/actions/userauthorization.php b/actions/userauthorization.php
index 38329a2c7..a9ac1f256 100644
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 define('TIMESTAMP_THRESHOLD', 300);
diff --git a/actions/userbyid.php b/actions/userbyid.php
index 4ed78688b..802bcb081 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php
index 07d160984..568c1d624 100644
--- a/actions/userdesignsettings.php
+++ b/actions/userdesignsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/usergroups.php b/actions/usergroups.php
index 7cdc132b8..84e105153 100644
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/actions/userrss.php b/actions/userrss.php
index 1437a4c22..fa6d588cd 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/rssaction.php');
 
diff --git a/actions/xrds.php b/actions/xrds.php
index 86f7d7616..def10e4cf 100644
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/classes/Design.php b/classes/Design.php
index c4820bf1e..89ae50c8c 100644
--- a/classes/Design.php
+++ b/classes/Design.php
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/classes/File.php b/classes/File.php
index 063c16425..0cebfc55e 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 require_once INSTALLDIR.'/classes/File_redirection.php';
diff --git a/classes/File_oembed.php b/classes/File_oembed.php
index c28f5c396..6be651815 100644
--- a/classes/File_oembed.php
+++ b/classes/File_oembed.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index 832d66b2b..76b18f672 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 require_once INSTALLDIR.'/classes/File.php';
diff --git a/classes/File_thumbnail.php b/classes/File_thumbnail.php
index 2c0689f94..f8b70356c 100644
--- a/classes/File_thumbnail.php
+++ b/classes/File_thumbnail.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
diff --git a/classes/File_to_post.php b/classes/File_to_post.php
index ea5751042..e3db91b20 100644
--- a/classes/File_to_post.php
+++ b/classes/File_to_post.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
diff --git a/classes/Group_alias.php b/classes/Group_alias.php
index 93bb75796..be3d0a6c6 100644
--- a/classes/Group_alias.php
+++ b/classes/Group_alias.php
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
diff --git a/classes/Group_block.php b/classes/Group_block.php
index bd8b24926..de2cf5f6e 100644
--- a/classes/Group_block.php
+++ b/classes/Group_block.php
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index e2935cfc5..9c2ac3e01 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
diff --git a/classes/Notice.php b/classes/Notice.php
index 607f35571..e59712864 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 /**
  * Table Definition for notice
diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php
index 60f11cd71..d3e7853b1 100644
--- a/classes/Notice_inbox.php
+++ b/classes/Notice_inbox.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
diff --git a/classes/Profile.php b/classes/Profile.php
index 982415753..6ad0e7a3a 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 /**
  * Table Definition for profile
diff --git a/classes/Profile_block.php b/classes/Profile_block.php
index b218244e3..2d87edaa0 100644
--- a/classes/Profile_block.php
+++ b/classes/Profile_block.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 /**
  * Table Definition for profile_block
diff --git a/classes/Remote_profile.php b/classes/Remote_profile.php
index 9d100412a..9f7bfeadc 100644
--- a/classes/Remote_profile.php
+++ b/classes/Remote_profile.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 /**
  * Table Definition for remote_profile
diff --git a/classes/Session.php b/classes/Session.php
index 04958b61d..d641edbbe 100644
--- a/classes/Session.php
+++ b/classes/Session.php
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
diff --git a/classes/Status_network.php b/classes/Status_network.php
index e91bba1ac..d526cb4d6 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class Status_network extends DB_DataObject
 {
diff --git a/classes/Subscription.php b/classes/Subscription.php
index 0e2b5a307..fedfd5f19 100644
--- a/classes/Subscription.php
+++ b/classes/Subscription.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 /**
  * Table Definition for subscription
diff --git a/classes/User.php b/classes/User.php
index 529957649..14d3cf54f 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/index.php b/index.php
index bbb78b6a9..7669778f6 100644
--- a/index.php
+++ b/index.php
@@ -19,6 +19,7 @@
 
 define('INSTALLDIR', dirname(__FILE__));
 define('STATUSNET', true);
+define('LACONICA', true); // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 
diff --git a/install.php b/install.php
index 9e01ff738..d278bcc17 100644
--- a/install.php
+++ b/install.php
@@ -363,7 +363,7 @@ function writeConf($sitename, $server, $path, $fancy, $db)
 {
     // assemble configuration file in a string
     $cfg =  "<?php\n".
-            "if (!defined('STATUSNET')) { exit(1); }\n\n".
+            "if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }\n\n".
             
             // site name
             "\$config['site']['name'] = '$sitename';\n\n".
diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php
index 018b917c1..6402dbc09 100644
--- a/lib/Shorturl_api.php
+++ b/lib/Shorturl_api.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class ShortUrlApi
 {
diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php
index 337d34e9a..798116163 100644
--- a/lib/accountsettingsaction.php
+++ b/lib/accountsettingsaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/action.php b/lib/action.php
index cb922f60e..4033b6578 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/arraywrapper.php b/lib/arraywrapper.php
index 424714e90..8a1cdd96e 100644
--- a/lib/arraywrapper.php
+++ b/lib/arraywrapper.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index a713a1085..51ceca857 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/attachmentnoticesection.php b/lib/attachmentnoticesection.php
index b98de8b6f..578c171ff 100644
--- a/lib/attachmentnoticesection.php
+++ b/lib/attachmentnoticesection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/attachmenttagcloudsection.php b/lib/attachmenttagcloudsection.php
index fc5145ad0..e2f85ae02 100644
--- a/lib/attachmenttagcloudsection.php
+++ b/lib/attachmenttagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/blockform.php b/lib/blockform.php
index cfec321a1..4820d09af 100644
--- a/lib/blockform.php
+++ b/lib/blockform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/channel.php b/lib/channel.php
index 95d576a3c..3cd168786 100644
--- a/lib/channel.php
+++ b/lib/channel.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class Channel
 {
diff --git a/lib/clienterroraction.php b/lib/clienterroraction.php
index 2a1a51b72..7d007a756 100644
--- a/lib/clienterroraction.php
+++ b/lib/clienterroraction.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/clientexception.php b/lib/clientexception.php
index 5981f8bb8..01c013a01 100644
--- a/lib/clientexception.php
+++ b/lib/clientexception.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/command.php b/lib/command.php
index eac4b2cd9..91a20b810 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/channel.php');
 
diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index 6babcba4f..ac6bf73c8 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/command.php';
 
diff --git a/lib/common.php b/lib/common.php
index e658eaeb2..030d560aa 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 define('STATUSNET_VERSION', '0.8.1pre1');
 
diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php
index 058585565..2095a7ceb 100644
--- a/lib/connectsettingsaction.php
+++ b/lib/connectsettingsaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/currentuserdesignaction.php b/lib/currentuserdesignaction.php
index e28b8caf6..c2f38cd00 100644
--- a/lib/currentuserdesignaction.php
+++ b/lib/currentuserdesignaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/daemon.php b/lib/daemon.php
index 9a3e1e7e9..4c2491e97 100644
--- a/lib/daemon.php
+++ b/lib/daemon.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/dberroraction.php b/lib/dberroraction.php
index bd8ccdd31..2cb66a022 100644
--- a/lib/dberroraction.php
+++ b/lib/dberroraction.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/deleteaction.php b/lib/deleteaction.php
index 89bed93ed..f702820c6 100644
--- a/lib/deleteaction.php
+++ b/lib/deleteaction.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
      exit(1);
 }
 
diff --git a/lib/designsettings.php b/lib/designsettings.php
index 21cb9d793..fe4222597 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/disfavorform.php b/lib/disfavorform.php
index f3a022fec..5b135b38a 100644
--- a/lib/disfavorform.php
+++ b/lib/disfavorform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/error.php b/lib/error.php
index e7bba8a47..0c521db08 100644
--- a/lib/error.php
+++ b/lib/error.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/event.php b/lib/event.php
index 106bbfd04..4819b71b4 100644
--- a/lib/event.php
+++ b/lib/event.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index 62797d1dd..ca67a094a 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET'))
+if (!defined('STATUSNET') && !defined('LACONICA'))
 {
     exit(1);
 }
diff --git a/lib/favorform.php b/lib/favorform.php
index d38c5b130..625df7c8b 100644
--- a/lib/favorform.php
+++ b/lib/favorform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/featureduserssection.php b/lib/featureduserssection.php
index 3065ff623..f0753a25e 100644
--- a/lib/featureduserssection.php
+++ b/lib/featureduserssection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/feed.php b/lib/feed.php
index 8660c75ed..e9fb6fdff 100644
--- a/lib/feed.php
+++ b/lib/feed.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/feedlist.php b/lib/feedlist.php
index 2a750bf77..9ae83f5e8 100644
--- a/lib/feedlist.php
+++ b/lib/feedlist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/form.php b/lib/form.php
index dffb6bce4..87b7a5cba 100644
--- a/lib/form.php
+++ b/lib/form.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/galleryaction.php b/lib/galleryaction.php
index 0cbb5f8c0..18cc7b929 100644
--- a/lib/galleryaction.php
+++ b/lib/galleryaction.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/groupdesignaction.php b/lib/groupdesignaction.php
index a9de600fe..3eb3964e8 100644
--- a/lib/groupdesignaction.php
+++ b/lib/groupdesignaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/groupeditform.php b/lib/groupeditform.php
index 8ae6a23d5..a649c2ee3 100644
--- a/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/grouplist.php b/lib/grouplist.php
index b042fb1b6..b41c5b5f8 100644
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/groupminilist.php b/lib/groupminilist.php
index 4864d4657..dff81eff5 100644
--- a/lib/groupminilist.php
+++ b/lib/groupminilist.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/groupnav.php b/lib/groupnav.php
index f8ed180f1..31cf378c8 100644
--- a/lib/groupnav.php
+++ b/lib/groupnav.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/groupsbymemberssection.php b/lib/groupsbymemberssection.php
index 156afe669..19b35eddb 100644
--- a/lib/groupsbymemberssection.php
+++ b/lib/groupsbymemberssection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/groupsbypostssection.php b/lib/groupsbypostssection.php
index 1c2a1c88f..45d49aba6 100644
--- a/lib/groupsbypostssection.php
+++ b/lib/groupsbypostssection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/groupsection.php b/lib/groupsection.php
index e3887bfd2..7327f9e1a 100644
--- a/lib/groupsection.php
+++ b/lib/groupsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/grouptagcloudsection.php b/lib/grouptagcloudsection.php
index 93699f62c..091cf4845 100644
--- a/lib/grouptagcloudsection.php
+++ b/lib/grouptagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 1da8406f3..8ad7dc20f 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/imagefile.php b/lib/imagefile.php
index 2619fd9d3..88f461481 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/jabber.php b/lib/jabber.php
index 0054c4def..3dcdce5db 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/joinform.php b/lib/joinform.php
index 47c94dd45..aefb553aa 100644
--- a/lib/joinform.php
+++ b/lib/joinform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/jsonsearchresultslist.php b/lib/jsonsearchresultslist.php
index a315d0abd..569bfa873 100644
--- a/lib/jsonsearchresultslist.php
+++ b/lib/jsonsearchresultslist.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/language.php b/lib/language.php
index 2039ef689..561a4ddb8 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -28,7 +28,7 @@
  * @link     http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/leaveform.php b/lib/leaveform.php
index 7068da0eb..e63d96ee8 100644
--- a/lib/leaveform.php
+++ b/lib/leaveform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index 5e8682c03..f740e329a 100644
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/mail.php b/lib/mail.php
index 31bf79d2f..df585406c 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -30,7 +30,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/mailbox.php b/lib/mailbox.php
index 9391775f1..a09bf1060 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/messageform.php b/lib/messageform.php
index a8e514d05..6431bfdcc 100644
--- a/lib/messageform.php
+++ b/lib/messageform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/microid.php b/lib/microid.php
index 179042456..e2e7d7607 100644
--- a/lib/microid.php
+++ b/lib/microid.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 7b6d7d21f..1e3a45142 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 4d6de98bc..ec85e4a5c 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/noticesection.php b/lib/noticesection.php
index e7c3f9a54..b223932ef 100644
--- a/lib/noticesection.php
+++ b/lib/noticesection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/nudgeform.php b/lib/nudgeform.php
index d6346cde7..3f13b5846 100644
--- a/lib/nudgeform.php
+++ b/lib/nudgeform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/oauthclient.php b/lib/oauthclient.php
index bd965a3bf..cc10cea8f 100644
--- a/lib/oauthclient.php
+++ b/lib/oauthclient.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index 151926008..6db07b20f 100644
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
diff --git a/lib/omb.php b/lib/omb.php
index 0a03d8125..0d6244599 100644
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once('OAuth.php');
 require_once(INSTALLDIR.'/lib/oauthstore.php');
diff --git a/lib/openid.php b/lib/openid.php
index 87df4f30b..7a2c46f00 100644
--- a/lib/openid.php
+++ b/lib/openid.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/classes/User_openid.php');
 
diff --git a/lib/ownerdesignaction.php b/lib/ownerdesignaction.php
index 3ee2c9907..d557f10c0 100644
--- a/lib/ownerdesignaction.php
+++ b/lib/ownerdesignaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/parallelizingdaemon.php b/lib/parallelizingdaemon.php
index 664e9bbd3..517115de0 100644
--- a/lib/parallelizingdaemon.php
+++ b/lib/parallelizingdaemon.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 61d1ff676..cdde1feca 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/personaltagcloudsection.php b/lib/personaltagcloudsection.php
index c10b0941d..0b29d58ca 100644
--- a/lib/personaltagcloudsection.php
+++ b/lib/personaltagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/ping.php b/lib/ping.php
index 48b4fa18f..175bf8440 100644
--- a/lib/ping.php
+++ b/lib/ping.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 function ping_broadcast_notice($notice) {
 
diff --git a/lib/plugin.php b/lib/plugin.php
index 4f53eee6b..87d7be5a7 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php
index 22e8e5468..35b914a50 100644
--- a/lib/popularnoticesection.php
+++ b/lib/popularnoticesection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/profileaction.php b/lib/profileaction.php
index 8b0c3b87e..e3a39ad8b 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/profilelist.php b/lib/profilelist.php
index 251da5e45..331430b3e 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/profileminilist.php b/lib/profileminilist.php
index 13058d320..079170d80 100644
--- a/lib/profileminilist.php
+++ b/lib/profileminilist.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/profilesection.php b/lib/profilesection.php
index 31658afe2..504b1b7f7 100644
--- a/lib/profilesection.php
+++ b/lib/profilesection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index a442bfc70..ae9cbdebb 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/queuehandler.php b/lib/queuehandler.php
index 867fe41b8..8c65a97c6 100644
--- a/lib/queuehandler.php
+++ b/lib/queuehandler.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/daemon.php');
 require_once(INSTALLDIR.'/classes/Queue_item.php');
diff --git a/lib/router.php b/lib/router.php
index b7b4a8e59..b25b1705f 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/rssaction.php b/lib/rssaction.php
index 44c9003a0..60611e48d 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 define('DEFAULT_RSS_LIMIT', 48);
 
diff --git a/lib/search_engines.php b/lib/search_engines.php
index 74513e2ea..69f6ff468 100644
--- a/lib/search_engines.php
+++ b/lib/search_engines.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class SearchEngine
 {
diff --git a/lib/searchaction.php b/lib/searchaction.php
index a935eb102..0d9f85a8f 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php
index bf79e0abc..677365ea9 100644
--- a/lib/searchgroupnav.php
+++ b/lib/searchgroupnav.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/section.php b/lib/section.php
index d605d458d..53a3a70fa 100644
--- a/lib/section.php
+++ b/lib/section.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/servererroraction.php b/lib/servererroraction.php
index 9ed3832a6..c6400605e 100644
--- a/lib/servererroraction.php
+++ b/lib/servererroraction.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/serverexception.php b/lib/serverexception.php
index 856866ae9..7dc9765ad 100644
--- a/lib/serverexception.php
+++ b/lib/serverexception.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index aba196db9..a1f305f5b 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/snapshot.php b/lib/snapshot.php
index b15fe3a6c..ede846e5b 100644
--- a/lib/snapshot.php
+++ b/lib/snapshot.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/subgroupnav.php b/lib/subgroupnav.php
index 590bec38c..2748b59e1 100644
--- a/lib/subgroupnav.php
+++ b/lib/subgroupnav.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/subpeopletagcloudsection.php b/lib/subpeopletagcloudsection.php
index 8909c5a74..b23a82240 100644
--- a/lib/subpeopletagcloudsection.php
+++ b/lib/subpeopletagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/subs.php b/lib/subs.php
index ae3949b75..68c89c842 100644
--- a/lib/subs.php
+++ b/lib/subs.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once('XMPPHP/XMPP.php');
 
diff --git a/lib/subscribeform.php b/lib/subscribeform.php
index c7216f974..ae2a6db61 100644
--- a/lib/subscribeform.php
+++ b/lib/subscribeform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/subscriberspeopleselftagcloudsection.php b/lib/subscriberspeopleselftagcloudsection.php
index c35f39f2c..5a570ae28 100644
--- a/lib/subscriberspeopleselftagcloudsection.php
+++ b/lib/subscriberspeopleselftagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/subscriberspeopletagcloudsection.php b/lib/subscriberspeopletagcloudsection.php
index a850dbc86..284996b59 100644
--- a/lib/subscriberspeopletagcloudsection.php
+++ b/lib/subscriberspeopletagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index 0767196e9..89f63e321 100644
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/subscriptionspeopleselftagcloudsection.php b/lib/subscriptionspeopleselftagcloudsection.php
index 839e2b161..9be60dfa1 100644
--- a/lib/subscriptionspeopleselftagcloudsection.php
+++ b/lib/subscriptionspeopleselftagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/subscriptionspeopletagcloudsection.php b/lib/subscriptionspeopletagcloudsection.php
index 38d93946f..fde24b282 100644
--- a/lib/subscriptionspeopletagcloudsection.php
+++ b/lib/subscriptionspeopletagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/tagcloudsection.php b/lib/tagcloudsection.php
index 20533dbe2..692f5d966 100644
--- a/lib/tagcloudsection.php
+++ b/lib/tagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/theme.php b/lib/theme.php
index ceec3dff0..08e3e8538 100644
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/topposterssection.php b/lib/topposterssection.php
index 7d8348d44..cbb6a98eb 100644
--- a/lib/topposterssection.php
+++ b/lib/topposterssection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/twitter.php b/lib/twitter.php
index 504744519..7546ffa98 100644
--- a/lib/twitter.php
+++ b/lib/twitter.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 2c713f366..c8099978f 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/twitteroauthclient.php b/lib/twitteroauthclient.php
index e8f6e21ba..3da522fc5 100644
--- a/lib/twitteroauthclient.php
+++ b/lib/twitteroauthclient.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/unblockform.php b/lib/unblockform.php
index c6310dc0f..f1343757c 100644
--- a/lib/unblockform.php
+++ b/lib/unblockform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php
index 0ce343e11..cb6a87515 100644
--- a/lib/unsubscribeform.php
+++ b/lib/unsubscribeform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/webcolor.php b/lib/webcolor.php
index 922e6794f..6fa603fa2 100644
--- a/lib/webcolor.php
+++ b/lib/webcolor.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
      exit(1);
 }
 
diff --git a/lib/widget.php b/lib/widget.php
index 43bc4a481..0258c8649 100644
--- a/lib/widget.php
+++ b/lib/widget.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/xmloutputter.php b/lib/xmloutputter.php
index 7d2788d71..5f06e491d 100644
--- a/lib/xmloutputter.php
+++ b/lib/xmloutputter.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/xmlstringer.php b/lib/xmlstringer.php
index bd17ab09c..b505e40d3 100644
--- a/lib/xmlstringer.php
+++ b/lib/xmlstringer.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php
index 45a8e2c0d..f28fc9088 100644
--- a/lib/xmppqueuehandler.php
+++ b/lib/xmppqueuehandler.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/queuehandler.php');
 
diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php
index 49b6d42b1..b75397270 100644
--- a/plugins/Autocomplete/AutocompletePlugin.php
+++ b/plugins/Autocomplete/AutocompletePlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php
index d7ac2b859..300d1e9a2 100644
--- a/plugins/Comet/CometPlugin.php
+++ b/plugins/Comet/CometPlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/plugins/FBConnect/FBCLoginGroupNav.php b/plugins/FBConnect/FBCLoginGroupNav.php
index 782f7198a..6e12c2040 100644
--- a/plugins/FBConnect/FBCLoginGroupNav.php
+++ b/plugins/FBConnect/FBCLoginGroupNav.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/plugins/FBConnect/FBCSettingsNav.php b/plugins/FBConnect/FBCSettingsNav.php
index a4ecbada1..29724d6bd 100644
--- a/plugins/FBConnect/FBCSettingsNav.php
+++ b/plugins/FBConnect/FBCSettingsNav.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/plugins/FBConnect/FBC_XDReceiver.php b/plugins/FBConnect/FBC_XDReceiver.php
index 50c525c75..2bc790d5a 100644
--- a/plugins/FBConnect/FBC_XDReceiver.php
+++ b/plugins/FBConnect/FBC_XDReceiver.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/plugins/FBConnect/FBConnectLogin.php b/plugins/FBConnect/FBConnectLogin.php
index ae304f242..5696d8848 100644
--- a/plugins/FBConnect/FBConnectLogin.php
+++ b/plugins/FBConnect/FBConnectLogin.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/plugins/FBConnect/FBConnectPlugin.php b/plugins/FBConnect/FBConnectPlugin.php
index fb50cc4c9..593b49b4e 100644
--- a/plugins/FBConnect/FBConnectPlugin.php
+++ b/plugins/FBConnect/FBConnectPlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/plugins/FBConnect/FBConnectSettings.php b/plugins/FBConnect/FBConnectSettings.php
index fbb419980..911c56787 100644
--- a/plugins/FBConnect/FBConnectSettings.php
+++ b/plugins/FBConnect/FBConnectSettings.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
index 59422e5d9..c955298cb 100644
--- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php
+++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php
index 4cb05693b..5b345d7c2 100644
--- a/plugins/Meteor/MeteorPlugin.php
+++ b/plugins/Meteor/MeteorPlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 9ecf70030..82eca3d08 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/plugins/recaptcha/recaptcha.php b/plugins/recaptcha/recaptcha.php
index 9767f95d2..94cf0ccd1 100644
--- a/plugins/recaptcha/recaptcha.php
+++ b/plugins/recaptcha/recaptcha.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/scripts/fixup_hashtags.php b/scripts/fixup_hashtags.php
index eba527b8d..5cfebd8ee 100755
--- a/scripts/fixup_hashtags.php
+++ b/scripts/fixup_hashtags.php
@@ -26,6 +26,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 define('STATUSNET', true);
+define('LACONICA', true); // compatibility
 
 require_once(INSTALLDIR . '/lib/common.php');
 
diff --git a/scripts/fixup_inboxes.php b/scripts/fixup_inboxes.php
index 0640fcc4f..d55a53885 100755
--- a/scripts/fixup_inboxes.php
+++ b/scripts/fixup_inboxes.php
@@ -31,6 +31,7 @@ mb_internal_encoding('UTF-8');
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 define('STATUSNET', true);
+define('LACONICA', true); // compatibility
 
 require_once(INSTALLDIR . '/lib/common.php');
 
diff --git a/scripts/fixup_notices_rendered.php b/scripts/fixup_notices_rendered.php
index 2ccb7ce80..359cd6cce 100755
--- a/scripts/fixup_notices_rendered.php
+++ b/scripts/fixup_notices_rendered.php
@@ -26,6 +26,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 define('STATUSNET', true);
+define('LACONICA', true); // compatibility
 
 require_once(INSTALLDIR . '/lib/common.php');
 
diff --git a/scripts/fixup_replies.php b/scripts/fixup_replies.php
index 63dd6b35a..7328635d3 100755
--- a/scripts/fixup_replies.php
+++ b/scripts/fixup_replies.php
@@ -26,6 +26,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 define('STATUSNET', true);
+define('LACONICA', true); // compatibility
 
 require_once(INSTALLDIR . '/lib/common.php');
 
diff --git a/scripts/update_translations.php b/scripts/update_translations.php
index 4f02b55ec..f145c1f0b 100755
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -26,6 +26,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 define('STATUSNET', true);
+define('LACONICA', true); // compatibility
 
 require_once(INSTALLDIR . '/lib/common.php');
 
-- 
cgit v1.2.3-54-g00ecf