summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
Diffstat (limited to 'actions')
-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
82 files changed, 265 insertions, 265 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/
*/