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