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