From c8b8f07af14ad2ce9d0c0267962dd3bbf6473a4b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 25 Aug 2009 18:12:20 -0400 Subject: change Laconica and Control Yourself to StatusNet in PHP files --- index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'index.php') diff --git a/index.php b/index.php index be62fe1f3..f08a7d1ba 100644 --- a/index.php +++ b/index.php @@ -1,7 +1,7 @@ Date: Tue, 25 Aug 2009 18:14:12 -0400 Subject: a distributed -> the distributed --- actions/accesstoken.php | 2 +- actions/all.php | 2 +- actions/allrss.php | 2 +- actions/api.php | 2 +- actions/avatarbynickname.php | 2 +- actions/block.php | 2 +- actions/conversation.php | 2 +- actions/disfavor.php | 2 +- actions/doc.php | 2 +- actions/facebookhome.php | 2 +- actions/facebookinvite.php | 2 +- actions/facebooklogin.php | 2 +- actions/facebookremove.php | 2 +- actions/facebooksettings.php | 2 +- actions/favor.php | 2 +- actions/favoritesrss.php | 2 +- actions/file.php | 2 +- actions/finishopenidlogin.php | 2 +- actions/finishremotesubscribe.php | 2 +- actions/foaf.php | 2 +- actions/groupblock.php | 2 +- actions/groupsearch.php | 2 +- actions/groupunblock.php | 2 +- actions/invite.php | 2 +- actions/logout.php | 2 +- actions/makeadmin.php | 2 +- actions/microsummary.php | 2 +- actions/noticesearch.php | 2 +- actions/noticesearchrss.php | 2 +- actions/nudge.php | 2 +- actions/openidlogin.php | 2 +- actions/opensearch.php | 2 +- actions/peoplesearch.php | 2 +- actions/postnotice.php | 2 +- actions/publicrss.php | 2 +- actions/publicxrds.php | 2 +- actions/recoverpassword.php | 2 +- actions/remotesubscribe.php | 2 +- actions/repliesrss.php | 2 +- actions/requesttoken.php | 2 +- actions/subedit.php | 2 +- actions/subscribe.php | 2 +- actions/sup.php | 2 +- actions/tag.php | 2 +- actions/tagother.php | 2 +- actions/tagrss.php | 2 +- actions/twitapiaccount.php | 2 +- actions/twitapiblocks.php | 2 +- actions/twitapidirect_messages.php | 2 +- actions/twitapifavorites.php | 2 +- actions/twitapifriendships.php | 2 +- actions/twitapihelp.php | 2 +- actions/twitapinotifications.php | 2 +- actions/twitapistatuses.php | 2 +- actions/twitapiusers.php | 2 +- actions/unblock.php | 2 +- actions/unsubscribe.php | 2 +- actions/updateprofile.php | 2 +- actions/userauthorization.php | 2 +- actions/userbyid.php | 2 +- actions/userrss.php | 2 +- actions/xrds.php | 2 +- classes/File.php | 2 +- classes/File_oembed.php | 2 +- classes/File_redirection.php | 2 +- classes/File_thumbnail.php | 2 +- classes/File_to_post.php | 2 +- classes/Group_alias.php | 2 +- classes/Group_block.php | 2 +- classes/Memcached_DataObject.php | 2 +- classes/Notice.php | 2 +- classes/Notice_inbox.php | 2 +- classes/Notice_tag.php | 2 +- classes/Profile.php | 2 +- classes/Profile_block.php | 2 +- classes/Remote_profile.php | 2 +- classes/Session.php | 2 +- classes/Status_network.php | 2 +- classes/Subscription.php | 2 +- classes/User.php | 2 +- index.php | 2 +- install.php | 2 +- lib/Shorturl_api.php | 2 +- lib/arraywrapper.php | 2 +- lib/channel.php | 2 +- lib/clienterroraction.php | 2 +- lib/command.php | 2 +- lib/commandinterpreter.php | 2 +- lib/common.php | 2 +- lib/daemon.php | 2 +- lib/dberroraction.php | 2 +- lib/error.php | 2 +- lib/facebookutil.php | 2 +- lib/galleryaction.php | 2 +- lib/oauthstore.php | 2 +- lib/omb.php | 2 +- lib/openid.php | 2 +- lib/ping.php | 2 +- lib/queuehandler.php | 2 +- lib/search_engines.php | 2 +- lib/searchaction.php | 2 +- lib/servererroraction.php | 2 +- lib/subs.php | 2 +- lib/twitter.php | 2 +- lib/twitterapi.php | 2 +- lib/util.php | 2 +- lib/xmppqueuehandler.php | 2 +- scripts/allsites.php | 2 +- scripts/createsim.php | 2 +- scripts/decache.php | 2 +- scripts/enjitqueuehandler.php | 2 +- scripts/facebookqueuehandler.php | 2 +- scripts/fixup_conversations.php | 2 +- scripts/fixup_hashtags.php | 2 +- scripts/fixup_inboxes.php | 2 +- scripts/fixup_notices_rendered.php | 2 +- scripts/fixup_replies.php | 2 +- scripts/fixup_utf8.php | 2 +- scripts/getpiddir.php | 2 +- scripts/getvaliddaemons.php | 2 +- scripts/inbox_users.php | 2 +- scripts/jabberqueuehandler.php | 2 +- scripts/maildaemon.php | 2 +- scripts/ombqueuehandler.php | 2 +- scripts/pingqueuehandler.php | 2 +- scripts/publicqueuehandler.php | 2 +- scripts/reportsnapshot.php | 2 +- scripts/sessiongc.php | 2 +- scripts/setpassword.php | 2 +- scripts/showcache.php | 2 +- scripts/sitemap.php | 2 +- scripts/smsqueuehandler.php | 2 +- scripts/synctwitterfriends.php | 2 +- scripts/triminboxes.php | 2 +- scripts/twitterqueuehandler.php | 2 +- scripts/twitterstatusfetcher.php | 2 +- scripts/uncache_users.php | 2 +- scripts/update_translations.php | 2 +- scripts/xmppconfirmhandler.php | 2 +- scripts/xmppdaemon.php | 2 +- 140 files changed, 140 insertions(+), 140 deletions(-) (limited to 'index.php') diff --git a/actions/accesstoken.php b/actions/accesstoken.php index c008854e9..a3684b229 100644 --- a/actions/accesstoken.php +++ b/actions/accesstoken.php @@ -11,7 +11,7 @@ * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://laconi.ca/ * - * StatusNet - a distributed open-source microblogging tool + * StatusNet - the distributed open-source microblogging tool * Copyright (C) 2008, 2009, StatusNet, Inc. * * This program is free software: you can redistribute it and/or modify diff --git a/actions/all.php b/actions/all.php index b4ef8d189..5a26efa28 100644 --- a/actions/all.php +++ b/actions/all.php @@ -1,6 +1,6 @@ Date: Tue, 25 Aug 2009 18:42:34 -0400 Subject: change LACONICA to STATUSNET --- actions/accesstoken.php | 2 +- actions/all.php | 2 +- actions/allrss.php | 2 +- actions/api.php | 2 +- actions/attachment.php | 2 +- actions/attachment_ajax.php | 2 +- actions/attachment_thumbnail.php | 2 +- actions/avatarbynickname.php | 2 +- actions/avatarsettings.php | 2 +- actions/block.php | 2 +- actions/blockedfromgroup.php | 2 +- actions/confirmaddress.php | 2 +- actions/conversation.php | 2 +- actions/deletenotice.php | 2 +- actions/disfavor.php | 2 +- actions/doc.php | 2 +- actions/editgroup.php | 2 +- actions/emailsettings.php | 2 +- actions/facebookhome.php | 2 +- actions/facebookinvite.php | 2 +- actions/facebooklogin.php | 2 +- actions/facebookremove.php | 2 +- actions/facebooksettings.php | 2 +- actions/favor.php | 2 +- actions/favorited.php | 2 +- actions/favoritesrss.php | 2 +- actions/featured.php | 2 +- actions/file.php | 2 +- actions/finishaddopenid.php | 2 +- actions/finishopenidlogin.php | 2 +- actions/finishremotesubscribe.php | 4 ++-- actions/foaf.php | 2 +- actions/groupblock.php | 2 +- actions/groupbyid.php | 2 +- actions/groupdesignsettings.php | 2 +- actions/grouplogo.php | 2 +- actions/groupmembers.php | 2 +- actions/grouprss.php | 2 +- actions/groups.php | 2 +- actions/groupsearch.php | 2 +- actions/groupunblock.php | 2 +- actions/imsettings.php | 2 +- actions/inbox.php | 2 +- actions/invite.php | 2 +- actions/joingroup.php | 2 +- actions/leavegroup.php | 2 +- actions/login.php | 2 +- actions/logout.php | 2 +- actions/makeadmin.php | 2 +- actions/microsummary.php | 2 +- actions/newgroup.php | 2 +- actions/newmessage.php | 2 +- actions/newnotice.php | 2 +- actions/noticesearch.php | 2 +- actions/noticesearchrss.php | 2 +- actions/nudge.php | 2 +- actions/oembed.php | 2 +- actions/openidlogin.php | 2 +- actions/openidsettings.php | 2 +- actions/opensearch.php | 2 +- actions/othersettings.php | 2 +- actions/outbox.php | 2 +- actions/passwordsettings.php | 2 +- actions/peoplesearch.php | 2 +- actions/peopletag.php | 2 +- actions/postnotice.php | 2 +- actions/profilesettings.php | 2 +- actions/public.php | 2 +- actions/publicrss.php | 2 +- actions/publictagcloud.php | 2 +- actions/publicxrds.php | 2 +- actions/recoverpassword.php | 2 +- actions/register.php | 2 +- actions/remotesubscribe.php | 4 ++-- actions/replies.php | 2 +- actions/repliesrss.php | 2 +- actions/requesttoken.php | 2 +- actions/showfavorites.php | 2 +- actions/showgroup.php | 2 +- actions/showmessage.php | 2 +- actions/shownotice.php | 2 +- actions/showstream.php | 2 +- actions/smssettings.php | 2 +- actions/subedit.php | 2 +- actions/subscribe.php | 2 +- actions/subscribers.php | 2 +- actions/subscriptions.php | 4 ++-- actions/sup.php | 2 +- actions/tag.php | 2 +- actions/tagother.php | 2 +- actions/tagrss.php | 2 +- actions/twitapiaccount.php | 2 +- actions/twitapiblocks.php | 2 +- actions/twitapidirect_messages.php | 2 +- actions/twitapifavorites.php | 2 +- actions/twitapifriendships.php | 2 +- actions/twitapigroups.php | 2 +- actions/twitapihelp.php | 2 +- actions/twitapinotifications.php | 2 +- actions/twitapisearchatom.php | 2 +- actions/twitapisearchjson.php | 2 +- actions/twitapistatuses.php | 2 +- actions/twitapistatusnet.php | 6 +++--- actions/twitapitags.php | 2 +- actions/twitapitrends.php | 2 +- actions/twitapiusers.php | 2 +- actions/twitterauthorization.php | 2 +- actions/twittersettings.php | 2 +- actions/unblock.php | 2 +- actions/unsubscribe.php | 2 +- actions/updateprofile.php | 2 +- actions/userauthorization.php | 2 +- actions/userbyid.php | 2 +- actions/userdesignsettings.php | 2 +- actions/usergroups.php | 2 +- actions/userrss.php | 2 +- actions/xrds.php | 2 +- classes/Design.php | 2 +- classes/File.php | 2 +- classes/File_oembed.php | 2 +- classes/File_redirection.php | 2 +- classes/File_thumbnail.php | 2 +- classes/File_to_post.php | 2 +- classes/Group_alias.php | 2 +- classes/Group_block.php | 2 +- classes/Memcached_DataObject.php | 2 +- classes/Notice.php | 2 +- classes/Notice_inbox.php | 2 +- classes/Profile.php | 2 +- classes/Profile_block.php | 2 +- classes/Remote_profile.php | 2 +- classes/Session.php | 2 +- classes/Status_network.php | 2 +- classes/Subscription.php | 2 +- classes/User.php | 2 +- index.php | 2 +- install.php | 2 +- lib/Shorturl_api.php | 2 +- lib/accountsettingsaction.php | 2 +- lib/action.php | 10 +++++----- lib/arraywrapper.php | 2 +- lib/attachmentlist.php | 2 +- lib/attachmentnoticesection.php | 2 +- lib/attachmenttagcloudsection.php | 2 +- lib/blockform.php | 2 +- lib/channel.php | 2 +- lib/clienterroraction.php | 2 +- lib/clientexception.php | 2 +- lib/command.php | 2 +- lib/commandinterpreter.php | 2 +- lib/common.php | 4 ++-- lib/connectsettingsaction.php | 2 +- lib/currentuserdesignaction.php | 2 +- lib/daemon.php | 2 +- lib/dberroraction.php | 2 +- lib/deleteaction.php | 2 +- lib/designsettings.php | 2 +- lib/disfavorform.php | 2 +- lib/error.php | 2 +- lib/event.php | 2 +- lib/facebookaction.php | 2 +- lib/favorform.php | 2 +- lib/featureduserssection.php | 2 +- lib/feed.php | 2 +- lib/feedlist.php | 2 +- lib/form.php | 2 +- lib/galleryaction.php | 2 +- lib/groupdesignaction.php | 2 +- lib/groupeditform.php | 2 +- lib/grouplist.php | 2 +- lib/groupminilist.php | 2 +- lib/groupnav.php | 2 +- lib/groupsbymemberssection.php | 2 +- lib/groupsbypostssection.php | 2 +- lib/groupsection.php | 2 +- lib/grouptagcloudsection.php | 2 +- lib/htmloutputter.php | 6 +++--- lib/imagefile.php | 2 +- lib/jabber.php | 2 +- lib/joinform.php | 2 +- lib/jsonsearchresultslist.php | 2 +- lib/language.php | 2 +- lib/leaveform.php | 2 +- lib/logingroupnav.php | 2 +- lib/mail.php | 2 +- lib/mailbox.php | 2 +- lib/messageform.php | 2 +- lib/microid.php | 2 +- lib/noticeform.php | 2 +- lib/noticelist.php | 2 +- lib/noticesection.php | 2 +- lib/nudgeform.php | 2 +- lib/oauthclient.php | 2 +- lib/oauthstore.php | 2 +- lib/omb.php | 6 +++--- lib/openid.php | 2 +- lib/ownerdesignaction.php | 2 +- lib/parallelizingdaemon.php | 2 +- lib/personalgroupnav.php | 2 +- lib/personaltagcloudsection.php | 2 +- lib/ping.php | 8 ++++---- lib/plugin.php | 2 +- lib/popularnoticesection.php | 2 +- lib/profileaction.php | 2 +- lib/profilelist.php | 2 +- lib/profileminilist.php | 2 +- lib/profilesection.php | 2 +- lib/publicgroupnav.php | 2 +- lib/queuehandler.php | 2 +- lib/router.php | 2 +- lib/rssaction.php | 2 +- lib/search_engines.php | 2 +- lib/searchaction.php | 2 +- lib/searchgroupnav.php | 2 +- lib/section.php | 2 +- lib/servererroraction.php | 2 +- lib/serverexception.php | 2 +- lib/settingsaction.php | 2 +- lib/snapshot.php | 6 +++--- lib/subgroupnav.php | 2 +- lib/subpeopletagcloudsection.php | 2 +- lib/subs.php | 2 +- lib/subscribeform.php | 2 +- lib/subscriberspeopleselftagcloudsection.php | 2 +- lib/subscriberspeopletagcloudsection.php | 2 +- lib/subscriptionlist.php | 2 +- lib/subscriptionspeopleselftagcloudsection.php | 2 +- lib/subscriptionspeopletagcloudsection.php | 2 +- lib/tagcloudsection.php | 2 +- lib/theme.php | 2 +- lib/topposterssection.php | 2 +- lib/twitter.php | 2 +- lib/twitterapi.php | 2 +- lib/twitteroauthclient.php | 2 +- lib/unblockform.php | 2 +- lib/unsubscribeform.php | 2 +- lib/webcolor.php | 2 +- lib/widget.php | 2 +- lib/xmloutputter.php | 2 +- lib/xmlstringer.php | 2 +- lib/xmppqueuehandler.php | 2 +- plugins/Autocomplete/AutocompletePlugin.php | 2 +- plugins/BlogspamNetPlugin.php | 4 ++-- plugins/Comet/CometPlugin.php | 2 +- plugins/FBConnect/FBCLoginGroupNav.php | 2 +- plugins/FBConnect/FBCSettingsNav.php | 2 +- plugins/FBConnect/FBC_XDReceiver.php | 2 +- plugins/FBConnect/FBConnectLogin.php | 2 +- plugins/FBConnect/FBConnectPlugin.php | 2 +- plugins/FBConnect/FBConnectSettings.php | 2 +- plugins/GoogleAnalyticsPlugin.php | 2 +- plugins/InfiniteScroll/InfiniteScrollPlugin.php | 2 +- plugins/LinkbackPlugin.php | 4 ++-- plugins/Meteor/MeteorPlugin.php | 2 +- plugins/PiwikAnalyticsPlugin.php | 2 +- plugins/Realtime/RealtimePlugin.php | 2 +- plugins/TemplatePlugin.php | 2 +- plugins/WikiHashtagsPlugin.php | 4 ++-- plugins/recaptcha/recaptcha.php | 2 +- scripts/fixup_hashtags.php | 2 +- scripts/fixup_inboxes.php | 2 +- scripts/fixup_notices_rendered.php | 2 +- scripts/fixup_replies.php | 2 +- scripts/update_translations.php | 2 +- tests/HashTagDetectionTest.php | 2 +- tests/URLDetectionTest.php | 2 +- 266 files changed, 288 insertions(+), 288 deletions(-) (limited to 'index.php') diff --git a/actions/accesstoken.php b/actions/accesstoken.php index 551c2e4d8..f1ddfc6a1 100644 --- a/actions/accesstoken.php +++ b/actions/accesstoken.php @@ -28,7 +28,7 @@ * along with this program. If not, see . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 = ". */ -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]>comment('[if lte IE '.$ver.']>comment('[if IE]>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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 . */ -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 @@ . */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET')) { exit(1); } diff --git a/plugins/FBConnect/FBConnectPlugin.php b/plugins/FBConnect/FBConnectPlugin.php index ae24e7a73..fb50cc4c9 100644 --- a/plugins/FBConnect/FBConnectPlugin.php +++ b/plugins/FBConnect/FBConnectPlugin.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET')) { exit(1); } diff --git a/plugins/FBConnect/FBConnectSettings.php b/plugins/FBConnect/FBConnectSettings.php index c3f108a9e..fbb419980 100644 --- a/plugins/FBConnect/FBConnectSettings.php +++ b/plugins/FBConnect/FBConnectSettings.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET')) { exit(1); } diff --git a/plugins/GoogleAnalyticsPlugin.php b/plugins/GoogleAnalyticsPlugin.php index 01010e264..7f3d209ee 100644 --- a/plugins/GoogleAnalyticsPlugin.php +++ b/plugins/GoogleAnalyticsPlugin.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET')) { exit(1); } diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php index 69a56afdd..59422e5d9 100644 --- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php +++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET')) { exit(1); } diff --git a/plugins/LinkbackPlugin.php b/plugins/LinkbackPlugin.php index 7bf7fa619..c49f70de0 100644 --- a/plugins/LinkbackPlugin.php +++ b/plugins/LinkbackPlugin.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET')) { exit(1); } @@ -225,6 +225,6 @@ class LinkbackPlugin extends Plugin function userAgent() { return 'LinkbackPlugin/'.LINKBACKPLUGIN_VERSION . - ' StatusNet/' . LACONICA_VERSION; + ' StatusNet/' . STATUSNET_VERSION; } } diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php index a288cad64..4cb05693b 100644 --- a/plugins/Meteor/MeteorPlugin.php +++ b/plugins/Meteor/MeteorPlugin.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET')) { exit(1); } diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php index 3238292a6..902d1744d 100644 --- a/plugins/PiwikAnalyticsPlugin.php +++ b/plugins/PiwikAnalyticsPlugin.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET')) { exit(1); } diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 4f05934d7..9ecf70030 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET')) { exit(1); } diff --git a/plugins/TemplatePlugin.php b/plugins/TemplatePlugin.php index 0f4daa734..b56fa3dbd 100644 --- a/plugins/TemplatePlugin.php +++ b/plugins/TemplatePlugin.php @@ -15,7 +15,7 @@ * @link http://megapump.com/ */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET')) { exit(1); } diff --git a/plugins/WikiHashtagsPlugin.php b/plugins/WikiHashtagsPlugin.php index 72217cc83..0c5649aa4 100644 --- a/plugins/WikiHashtagsPlugin.php +++ b/plugins/WikiHashtagsPlugin.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET')) { exit(1); } @@ -104,6 +104,6 @@ class WikiHashtagsPlugin extends Plugin function userAgent() { return 'WikiHashtagsPlugin/'.WIKIHASHTAGSPLUGIN_VERSION . - ' StatusNet/' . LACONICA_VERSION; + ' StatusNet/' . STATUSNET_VERSION; } } diff --git a/plugins/recaptcha/recaptcha.php b/plugins/recaptcha/recaptcha.php index a9a17e1ea..9767f95d2 100644 --- a/plugins/recaptcha/recaptcha.php +++ b/plugins/recaptcha/recaptcha.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET')) { exit(1); } diff --git a/scripts/fixup_hashtags.php b/scripts/fixup_hashtags.php index f663eb689..eba527b8d 100755 --- a/scripts/fixup_hashtags.php +++ b/scripts/fixup_hashtags.php @@ -25,7 +25,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { } define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); -define('LACONICA', true); +define('STATUSNET', true); require_once(INSTALLDIR . '/lib/common.php'); diff --git a/scripts/fixup_inboxes.php b/scripts/fixup_inboxes.php index 53af5e1a8..0640fcc4f 100755 --- a/scripts/fixup_inboxes.php +++ b/scripts/fixup_inboxes.php @@ -30,7 +30,7 @@ set_time_limit(0); mb_internal_encoding('UTF-8'); define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); -define('LACONICA', true); +define('STATUSNET', true); require_once(INSTALLDIR . '/lib/common.php'); diff --git a/scripts/fixup_notices_rendered.php b/scripts/fixup_notices_rendered.php index 9e707dab0..2ccb7ce80 100755 --- a/scripts/fixup_notices_rendered.php +++ b/scripts/fixup_notices_rendered.php @@ -25,7 +25,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { } define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); -define('LACONICA', true); +define('STATUSNET', true); require_once(INSTALLDIR . '/lib/common.php'); diff --git a/scripts/fixup_replies.php b/scripts/fixup_replies.php index 39ec268f3..63dd6b35a 100755 --- a/scripts/fixup_replies.php +++ b/scripts/fixup_replies.php @@ -25,7 +25,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { } define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); -define('LACONICA', true); +define('STATUSNET', true); require_once(INSTALLDIR . '/lib/common.php'); diff --git a/scripts/update_translations.php b/scripts/update_translations.php index 0dee4f5a5..8120f636f 100755 --- a/scripts/update_translations.php +++ b/scripts/update_translations.php @@ -25,7 +25,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { } define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); -define('LACONICA', true); +define('STATUSNET', true); require_once(INSTALLDIR . '/lib/common.php'); diff --git a/tests/HashTagDetectionTest.php b/tests/HashTagDetectionTest.php index 901e0611c..9afe34657 100644 --- a/tests/HashTagDetectionTest.php +++ b/tests/HashTagDetectionTest.php @@ -6,7 +6,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { } define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); -define('LACONICA', true); +define('STATUSNET', true); require_once INSTALLDIR . '/lib/common.php'; diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php index 7b2e8c5ae..767f895bb 100644 --- a/tests/URLDetectionTest.php +++ b/tests/URLDetectionTest.php @@ -6,7 +6,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { } define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); -define('LACONICA', true); +define('STATUSNET', true); require_once INSTALLDIR . '/lib/common.php'; -- cgit v1.2.3-54-g00ecf From 3567b9d708971f9075db1fd847158c3c15a04e23 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 25 Aug 2009 18:53:24 -0400 Subject: global search and replace for laconica -> statusnet --- README | 42 +++++++++++++++++----------------- actions/api.php | 10 ++++---- actions/twitapigroups.php | 8 +++---- actions/twitapisearchatom.php | 2 +- actions/twitapistatusnet.php | 8 +++---- actions/twitapitags.php | 4 ++-- classes/Status_network.php | 2 +- config.php.sample | 14 ++++++------ db/notice_source.sql | 2 +- index.php | 2 +- install.php | 4 ++-- js/identica-badge.js | 16 ++++++------- lib/action.php | 2 +- lib/common.php | 16 ++++++------- lib/facebookaction.php | 4 ++-- lib/router.php | 24 +++++++++---------- lib/rssaction.php | 4 ++-- lib/util.php | 8 +++---- locale/bg_BG/LC_MESSAGES/statusnet.po | 10 ++++---- locale/ca_ES/LC_MESSAGES/statusnet.po | 6 ++--- locale/cs_CZ/LC_MESSAGES/statusnet.po | 6 ++--- locale/de_DE/LC_MESSAGES/statusnet.po | 6 ++--- locale/el_GR/LC_MESSAGES/statusnet.po | 6 ++--- locale/en_GB/LC_MESSAGES/statusnet.po | 8 +++---- locale/es/LC_MESSAGES/statusnet.po | 6 ++--- locale/fi/LC_MESSAGES/statusnet.po | 6 ++--- locale/fr_FR/LC_MESSAGES/statusnet.po | 28 +++++++++++------------ locale/he_IL/LC_MESSAGES/statusnet.po | 10 ++++---- locale/it_IT/LC_MESSAGES/statusnet.mo | Bin 80184 -> 80186 bytes locale/it_IT/LC_MESSAGES/statusnet.po | 16 ++++++------- locale/ja_JP/LC_MESSAGES/statusnet.po | 10 ++++---- locale/ko_KR/LC_MESSAGES/statusnet.po | 6 ++--- locale/mk_MK/LC_MESSAGES/statusnet.mo | Bin 37729 -> 37731 bytes locale/mk_MK/LC_MESSAGES/statusnet.po | 14 ++++++------ locale/nb_NO/LC_MESSAGES/statusnet.po | 8 +++---- locale/nl_NL/LC_MESSAGES/statusnet.po | 6 ++--- locale/nn_NO/LC_MESSAGES/statusnet.po | 6 ++--- locale/pl_PL/LC_MESSAGES/statusnet.po | 10 ++++---- locale/pt/LC_MESSAGES/statusnet.po | 6 ++--- locale/pt_BR/LC_MESSAGES/statusnet.mo | Bin 76796 -> 76797 bytes locale/pt_BR/LC_MESSAGES/statusnet.po | 8 +++---- locale/ru_RU/LC_MESSAGES/statusnet.po | 8 +++---- locale/statusnet.po | 6 ++--- locale/sv_SE/LC_MESSAGES/statusnet.po | 6 ++--- locale/te_IN/LC_MESSAGES/statusnet.po | 10 ++++---- locale/tr_TR/LC_MESSAGES/statusnet.po | 8 +++---- locale/uk_UA/LC_MESSAGES/statusnet.po | 8 +++---- locale/vi_VN/LC_MESSAGES/statusnet.mo | Bin 50649 -> 50650 bytes locale/vi_VN/LC_MESSAGES/statusnet.po | 8 +++---- locale/zh_CN/LC_MESSAGES/statusnet.po | 6 ++--- locale/zh_TW/LC_MESSAGES/statusnet.po | 6 ++--- plugins/Autocomplete/Autocomplete.js | 2 +- plugins/PiwikAnalyticsPlugin.php | 4 ++-- plugins/TemplatePlugin.php | 4 ++-- scripts/delete_status_network.sh | 2 +- scripts/rebuilddb_psql.sh | 4 ++-- scripts/setup_status_network.sh | 4 ++-- scripts/statusnet.spec | 28 +++++++++++------------ scripts/twitterstatusfetcher.php | 2 +- scripts/update_pot.sh | 2 +- scripts/update_translations.php | 10 ++++---- sphinx.conf.sample | 2 +- theme/readme.txt | 4 ++-- 63 files changed, 244 insertions(+), 244 deletions(-) (limited to 'index.php') diff --git a/README b/README index 83f893daa..195d1b4ec 100644 --- a/README +++ b/README @@ -231,9 +231,9 @@ especially if you've previously installed PHP/MySQL packages. 1. Unpack the tarball you downloaded on your Web server. Usually a command like this will work: - tar zxf laconica-0.8.0.tar.gz + tar zxf statusnet-0.8.0.tar.gz - ...which will make a laconica-0.8.0 subdirectory in your current + ...which will make a statusnet-0.8.0 subdirectory in your current directory. (If you don't have shell access on your Web server, you may have to unpack the tarball on your local computer and FTP the files to the server.) @@ -241,11 +241,11 @@ especially if you've previously installed PHP/MySQL packages. 2. Move the tarball to a directory of your choosing in your Web root directory. Usually something like this will work: - mv laconica-0.8.0 /var/www/mublog + mv statusnet-0.8.0 /var/www/mublog This will make your StatusNet instance available in the mublog path of your server, like "http://example.net/mublog". "microblog" or - "laconica" might also be good path names. If you know how to + "statusnet" might also be good path names. If you know how to configure virtual hosts on your web server, you can try setting up "http://micro.example.net/" or the like. @@ -276,7 +276,7 @@ especially if you've previously installed PHP/MySQL packages. 5. Create a database to hold your microblog data. Something like this should work: - mysqladmin -u "username" --password="password" create laconica + mysqladmin -u "username" --password="password" create statusnet Note that StatusNet must have its own database; you can't share the database with another program. You can name it whatever you want, @@ -290,7 +290,7 @@ especially if you've previously installed PHP/MySQL packages. database. If you have shell access, this will probably work from the MySQL shell: - GRANT ALL on laconica.* + GRANT ALL on statusnet.* TO 'lacuser'@'localhost' IDENTIFIED BY 'lacpassword'; @@ -398,7 +398,7 @@ For this to work, there *must* be a domain or sub-domain for which all 1. Run the SQL script carrier.sql in your StatusNet database. This will usually work: - mysql -u "lacuser" --password="lacpassword" laconica < db/carrier.sql + mysql -u "lacuser" --password="lacpassword" statusnet < db/carrier.sql This will populate your database with a list of wireless carriers that support email SMS gateways. @@ -412,7 +412,7 @@ For this to work, there *must* be a domain or sub-domain for which all 2. Edit /etc/aliases on your mail server and add the following line: - *: /path/to/laconica/scripts/maildaemon.php + *: /path/to/statusnet/scripts/maildaemon.php 3. Run whatever code you need to to update your aliases database. For many mail servers (Postfix, Exim, Sendmail), this should work: @@ -813,7 +813,7 @@ instructions; read to the end first before trying them. Otherwise, go to your StatusNet directory and AFTER YOU MAKE A BACKUP run the rebuilddb.sh script like this: - ./scripts/rebuilddb.sh rootuser rootpassword database db/laconica.sql + ./scripts/rebuilddb.sh rootuser rootpassword database db/statusnet.sql Here, rootuser and rootpassword are the username and password for a user who can drop and create databases as well as tables; typically @@ -835,7 +835,7 @@ precooked data in the DB. All upgraders should check out the inboxes options below. NOTE: the database definition file, stoica.ini, has been renamed to -laconica.ini (since this is the recommended database name). If you +statusnet.ini (since this is the recommended database name). If you have a line in your config.php pointing to the old name, you'll need to update it. @@ -907,12 +907,12 @@ of the defaults are defined), you will lose your configuration options in any upgrade, and you will wish that you had been more careful. Starting with version 0.7.1, you can put config files in the -/etc/laconica/ directory on your server, if it exists. Config files +/etc/statusnet/ directory on your server, if it exists. Config files will be included in this order: -* /etc/laconica/laconica.php - server-wide config -* /etc/laconica/.php - for a virtual host -* /etc/laconica/_.php - for a path +* /etc/statusnet/laconica.php - server-wide config +* /etc/statusnet/.php - for a virtual host +* /etc/statusnet/_.php - for a path * INSTALLDIR/config.php - for a particular implementation Almost all configuration options are made through a two-dimensional @@ -1010,9 +1010,9 @@ database: a DSN (Data Source Name) for your StatusNet database. This is where 'protocol' is 'mysql' or 'mysqli' (or possibly 'postgresql', if you really know what you're doing), 'username' is the username, 'password' is the password, and etc. -ini_yourdbname: if your database is not named 'laconica', you'll need +ini_yourdbname: if your database is not named 'statusnet', you'll need to set this to point to the location of the - laconica.ini file. Note that the real name of your database + statusnet.ini file. Note that the real name of your database should go in there, not literally 'yourdbname'. db_driver: You can try changing this to 'MDB2' to use the other driver type for DB_DataObject, but note that it breaks the OpenID @@ -1044,7 +1044,7 @@ By default, StatusNet sites log error messages to the syslog facility. (You can override this using the 'logfile' parameter described above). appname: The name that StatusNet uses to log messages. By default it's - "laconica", but if you have more than one installation on the + "statusnet", but if you have more than one installation on the server, you may want to change the name for each instance so you can track log messages more easily. priority: level to log at. Currently ignored. @@ -1296,7 +1296,7 @@ integration A catch-all for integration with other systems. source: The name to use for the source of posts to Twitter. Defaults - to 'laconica', but if you request your own source name from + to 'statusnet', but if you request your own source name from Twitter , you can use that here instead. Status updates on Twitter will then have links to your site. @@ -1595,7 +1595,7 @@ If you're adventurous or impatient, you may want to install the development version of StatusNet. To get it, use the git version control tool like so: - git clone http://status.net/software/laconica.git + git clone http://status.net/software/statusnet.git To keep it up-to-date, use 'git pull'. Watch for conflicts! @@ -1605,8 +1605,8 @@ Further information There are several ways to get more information about StatusNet. * There is a mailing list for StatusNet developers and admins at - http://mail.status.net/mailman/listinfo/laconica-dev -* The #laconica IRC channel on freenode.net . + http://mail.status.net/mailman/listinfo/statusnet-dev +* The #statusnet IRC channel on freenode.net . * The StatusNet wiki, http://status.net/trac/ Feedback diff --git a/actions/api.php b/actions/api.php index 897e848c1..91f30e87a 100644 --- a/actions/api.php +++ b/actions/api.php @@ -125,9 +125,9 @@ class ApiAction extends Action 'users/show', 'help/test', 'help/downtime_schedule', - 'laconica/version', - 'laconica/config', - 'laconica/wadl', + 'statusnet/version', + 'statusnet/config', + 'statusnet/wadl', 'tags/timeline', 'oembed/oembed', 'groups/show', @@ -147,11 +147,11 @@ class ApiAction extends Action $fullname = "$this->api_action/$this->api_method"; - // If the site is "private", all API methods except laconica/config + // If the site is "private", all API methods except statusnet/config // need authentication if (common_config('site', 'private')) { - return $fullname != 'laconica/config' || false; + return $fullname != 'statusnet/config' || false; } // bareauth: only needs auth if without an argument or query param specifying user diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php index 4d2388919..c3e028c17 100644 --- a/actions/twitapigroups.php +++ b/actions/twitapigroups.php @@ -88,7 +88,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php'; $this->show_rss_groups($group, $title, $link, $subtitle); break; case 'atom': - $selfuri = common_root_url() . 'api/laconica/groups/list/' . $user->id . '.atom'; + $selfuri = common_root_url() . 'api/statusnet/groups/list/' . $user->id . '.atom'; $this->show_atom_groups($group, $title, $id, $link, $subtitle, $selfuri); break; @@ -135,7 +135,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php'; $this->show_rss_groups($group, $title, $link, $subtitle); break; case 'atom': - $selfuri = common_root_url() . 'api/laconica/groups/list_all.atom'; + $selfuri = common_root_url() . 'api/statusnet/groups/list_all.atom'; $this->show_atom_groups($group, $title, $id, $link, $subtitle, $selfuri); break; @@ -216,11 +216,11 @@ require_once INSTALLDIR.'/lib/twitterapi.php'; case 'atom': if (isset($apidata['api_arg'])) { $selfuri = common_root_url() . - 'api/laconica/groups/timeline/' . + 'api/statusnet/groups/timeline/' . $apidata['api_arg'] . '.atom'; } else { $selfuri = common_root_url() . - 'api/laconica/groups/timeline.atom'; + 'api/statusnet/groups/timeline.atom'; } $this->show_atom_timeline($notice, $title, $id, $link, $subtitle, null, $selfuri); diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index d3e17650d..3ccd8c5b6 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -227,7 +227,7 @@ class TwitapisearchatomAction extends TwitterapiAction $server = common_config('site', 'server'); $sitename = common_config('site', 'name'); - // XXX: Use xmlns:laconica instead? + // XXX: Use xmlns:statusnet instead? $this->elementStart('feed', array('xmlns' => 'http://www.w3.org/2005/Atom', diff --git a/actions/twitapistatusnet.php b/actions/twitapistatusnet.php index a36c162d9..c75e5e858 100644 --- a/actions/twitapistatusnet.php +++ b/actions/twitapistatusnet.php @@ -36,7 +36,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php'; /** * StatusNet-specific API methods * - * This class handles all /laconica/ API methods. + * This class handles all /statusnet/ API methods. * * @category Twitter * @package StatusNet @@ -46,14 +46,14 @@ require_once INSTALLDIR.'/lib/twitterapi.php'; * @link http://status.net/ */ -class TwitapilaconicaAction extends TwitterapiAction +class TwitapistatusnetAction extends TwitterapiAction { /** * A version stamp for the API * * Returns a version number for this version of StatusNet, which * should make things a bit easier for upgrades. - * URL: http://identi.ca/api/laconica/version.(xml|json) + * URL: http://identi.ca/api/statusnet/version.(xml|json) * Formats: xml, json * * @param array $args Web arguments @@ -89,7 +89,7 @@ class TwitapilaconicaAction extends TwitterapiAction * Gives a full dump of configuration variables for this instance * of StatusNet, minus variables that may be security-sensitive (like * passwords). - * URL: http://identi.ca/api/laconica/config.(xml|json) + * URL: http://identi.ca/api/statusnet/config.(xml|json) * Formats: xml, json * * @param array $args Web arguments diff --git a/actions/twitapitags.php b/actions/twitapitags.php index f889ae8c0..0f2b571c6 100644 --- a/actions/twitapitags.php +++ b/actions/twitapitags.php @@ -93,11 +93,11 @@ require_once INSTALLDIR.'/lib/twitterapi.php'; case 'atom': if (isset($apidata['api_arg'])) { $selfuri = common_root_url() . - 'api/laconica/tags/timeline/' . + 'api/statusnet/tags/timeline/' . $apidata['api_arg'] . '.atom'; } else { $selfuri = common_root_url() . - 'api/laconica/tags/timeline.atom'; + 'api/statusnet/tags/timeline.atom'; } $this->show_atom_timeline($notice, $title, $id, $link, $subtitle, null, $selfuri); diff --git a/classes/Status_network.php b/classes/Status_network.php index 78c1640cd..e91bba1ac 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -71,7 +71,7 @@ class Status_network extends DB_DataObject } static function cacheKey($k, $v) { - return 'laconica:' . self::$base . ':status_network:'.$k.':'.$v; + return 'statusnet:' . self::$base . ':status_network:'.$k.':'.$v; } static function memGet($k, $v) diff --git a/config.php.sample b/config.php.sample index 0fc5163b7..e73489990 100644 --- a/config.php.sample +++ b/config.php.sample @@ -15,7 +15,7 @@ if (!defined('LACONICA')) { exit(1); } $config['site']['name'] = 'Just another Laconica microblog'; $config['site']['server'] = 'localhost'; -$config['site']['path'] = 'laconica'; +$config['site']['path'] = 'statusnet'; // $config['site']['fancy'] = false; // $config['site']['theme'] = 'default'; // Sets the site's default design values @@ -44,7 +44,7 @@ $config['site']['path'] = 'laconica'; // $config['site']['private'] = true; // If you want logging sent to a file instead of syslog -// $config['site']['logfile'] = '/tmp/laconica.log'; +// $config['site']['logfile'] = '/tmp/statusnet.log'; // Change the syslog facility that Laconica logs to (default is LOG_USER) // $config['syslog']['facility'] = LOG_LOCAL7; @@ -58,8 +58,8 @@ $config['site']['path'] = 'laconica'; // This is a PEAR DB DSN, see http://pear.php.net/manual/en/package.database.db.intro-dsn.php // Set it to match your actual database -$config['db']['database'] = 'mysql://laconica:microblog@localhost/laconica'; -// $config['db']['ini_your_db_name'] = $config['db']['schema_location'].'/laconica.ini'; +$config['db']['database'] = 'mysql://statusnet:microblog@localhost/laconica'; +// $config['db']['ini_your_db_name'] = $config['db']['schema_location'].'/statusnet.ini'; // *** WARNING *** WARNING *** WARNING *** WARNING *** // Setting debug to a non-zero value will expose your DATABASE PASSWORD to Web users. // !!!!!! DO NOT SET THIS ON PRODUCTION SERVERS !!!!!! DB_DataObject's bug, btw, not @@ -154,15 +154,15 @@ $config['sphinx']['port'] = 3312; // using stomp requires an external message queue server // $config['queue']['subsystem'] = 'stomp'; // $config['queue']['stomp_server'] = 'tcp://localhost:61613'; -// use different queue_basename for each laconica instance managed by the server -// $config['queue']['queue_basename'] = 'laconica'; +// use different queue_basename for each statusnet instance managed by the server +// $config['queue']['queue_basename'] = 'statusnet'; // The following customise the behaviour of the various daemons: // $config['daemon']['piddir'] = '/var/run'; // $config['daemon']['user'] = false; // $config['daemon']['group'] = false; -// For installations with high traffic, laconica can use MemCached to cache +// For installations with high traffic, statusnet can use MemCached to cache // frequently requested information. Only enable the following if you have // MemCached up and running: // $config['memcached']['enabled'] = false; diff --git a/db/notice_source.sql b/db/notice_source.sql index f590d1b97..8d114ac30 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -17,7 +17,7 @@ VALUES ('gravity', 'Gravity', 'http://mobileways.de/gravity', now()), ('Gwibber','Gwibber','http://launchpad.net/gwibber', now()), ('HelloTxt','HelloTxt','http://hellotxt.com/', now()), - ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()), + ('identicatools','Laconica Tools','http://bitbucketlabs.net/statusnet-tools/', now()), ('identichat','identichat','http://identichat.prosody.im/', now()), ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()), ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()), diff --git a/index.php b/index.php index 56e76be9f..bbb78b6a9 100644 --- a/index.php +++ b/index.php @@ -93,7 +93,7 @@ function checkMirror($action_obj, $args) // on the master DB $config['db']['database_rw'] = $config['db']['database']; - $config['db']['ini_rw'] = INSTALLDIR.'/classes/laconica.ini'; + $config['db']['ini_rw'] = INSTALLDIR.'/classes/statusnet.ini'; foreach ($alwaysRW as $table) { $config['db']['table_'.$table] = 'rw'; diff --git a/install.php b/install.php index f9056727b..9e01ff738 100644 --- a/install.php +++ b/install.php @@ -284,7 +284,7 @@ function pgsql_db_installer($host, $database, $username, $password) { updateStatus("Running database script..."); //wrap in transaction; pg_query($conn, 'BEGIN'); - $res = runDbScript(INSTALLDIR.'/db/laconica_pg.sql', $conn, 'pgsql'); + $res = runDbScript(INSTALLDIR.'/db/statusnet_pg.sql', $conn, 'pgsql'); if ($res === false) { updateStatus("Can't run database script.", true); @@ -335,7 +335,7 @@ function mysql_db_installer($host, $database, $username, $password) { return false; } updateStatus("Running database script..."); - $res = runDbScript(INSTALLDIR.'/db/laconica.sql', $conn); + $res = runDbScript(INSTALLDIR.'/db/statusnet.sql', $conn); if ($res === false) { updateStatus("Can't run database script.", true); showForm(); diff --git a/js/identica-badge.js b/js/identica-badge.js index ffa55ae93..49c42b70c 100644 --- a/js/identica-badge.js +++ b/js/identica-badge.js @@ -119,7 +119,7 @@ $.s.className = trueName; $.s.h = document.createElement('H3'); $.s.h.a = document.createElement('A'); - $.s.h.a.target = '_laconica'; + $.s.h.a.target = '_statusnet'; $.s.h.appendChild($.s.h.a); $.s.appendChild($.s.h); $.s.r = document.createElement('UL'); @@ -184,11 +184,11 @@ var icon = document.createElement('A'); if (r[i] && r[i].url) { icon.href = r[i].url; - icon.target = '_laconica'; + icon.target = '_statusnet'; icon.title = 'Visit ' + r[i].screen_name + ' at ' + r[i].url; } else { icon.href = 'http://' + $.a.server + '/' + r[i].screen_name; - icon.target = '_laconica'; + icon.target = '_statusnet'; icon.title = 'Visit ' + r[i].screen_name + ' at http://' + $.a.server + '/' + r[i].screen_name; } @@ -215,14 +215,14 @@ var date_link = document.createElement('A'); date_link.innerHTML = r[i].status.created_at.split(/\+/)[0]; date_link.href = 'http://' + $.a.server + '/notice/' + r[i].status.id; - date_link.target = '_laconica'; + date_link.target = '_statusnet'; updated.appendChild(date_link); if (r[i].status.in_reply_to_status_id) { updated.appendChild(document.createTextNode(' in reply to ')); var in_reply_to = document.createElement('A'); in_reply_to.innerHTML = r[i].status.in_reply_to_status_id; in_reply_to.href = 'http://' + $.a.server + '/notice/' + r[i].status.in_reply_to_status_id; - in_reply_to.target = '_laconica'; + in_reply_to.target = '_statusnet'; updated.appendChild(in_reply_to); } } else { @@ -233,9 +233,9 @@ if (r[i].status && r[i].status.text) { var raw = r[i].status.text; var cooked = raw; - cooked = cooked.replace(/http:\/\/([^ ]+)/g, "http://$1"); - cooked = cooked.replace(/@([\w*]+)/g, '@$1'); - cooked = cooked.replace(/#([\w*]+)/g, '#$1'); + cooked = cooked.replace(/http:\/\/([^ ]+)/g, "http://$1"); + cooked = cooked.replace(/@([\w*]+)/g, '@$1'); + cooked = cooked.replace(/#([\w*]+)/g, '#$1'); p.innerHTML = cooked; } li.appendChild(p); diff --git a/lib/action.php b/lib/action.php index dd9d87a6c..a99c885dd 100644 --- a/lib/action.php +++ b/lib/action.php @@ -754,7 +754,7 @@ class Action extends HTMLOutputter // lawsuit */ function showStatusNetLicense() { - $this->element('dt', array('id' => 'site_laconica_license'), _('StatusNet software license')); + $this->element('dt', array('id' => 'site_statusnet_license'), _('StatusNet software license')); $this->elementStart('dd', null); if (common_config('site', 'broughtby')) { $instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). '); diff --git a/lib/common.php b/lib/common.php index f8cf93717..c3e83789f 100644 --- a/lib/common.php +++ b/lib/common.php @@ -119,14 +119,14 @@ $config = 'shorturllength' => 30, 'dupelimit' => 60), # default for same person saying the same thing 'syslog' => - array('appname' => 'laconica', # for syslog + array('appname' => 'statusnet', # for syslog 'priority' => 'debug', # XXX: currently ignored 'facility' => LOG_USER), 'queue' => array('enabled' => false, 'subsystem' => 'db', # default to database, or 'stomp' 'stomp_server' => null, - 'queue_basename' => 'laconica', + 'queue_basename' => 'statusnet', 'stomp_username' => null, 'stomp_password' => null, ), @@ -341,11 +341,11 @@ function addPlugin($name, $attrs = null) if (isset($conffile)) { $_config_files = array($conffile); } else { - $_config_files = array('/etc/laconica/laconica.php', - '/etc/laconica/'.$_server.'.php'); + $_config_files = array('/etc/statusnet/laconica.php', + '/etc/statusnet/'.$_server.'.php'); if (strlen($_path) > 0) { - $_config_files[] = '/etc/laconica/'.$_server.'_'.$_path.'.php'; + $_config_files[] = '/etc/statusnet/'.$_server.'_'.$_path.'.php'; } $_config_files[] = INSTALLDIR.'/config.php'; @@ -368,12 +368,12 @@ function _have_config() // XXX: Throw a conniption if database not installed -// Fixup for laconica.ini +// Fixup for statusnet.ini $_db_name = substr($config['db']['database'], strrpos($config['db']['database'], '/') + 1); -if ($_db_name != 'laconica' && !array_key_exists('ini_'.$_db_name, $config['db'])) { - $config['db']['ini_'.$_db_name] = INSTALLDIR.'/classes/laconica.ini'; +if ($_db_name != 'statusnet' && !array_key_exists('ini_'.$_db_name, $config['db'])) { + $config['db']['ini_'.$_db_name] = INSTALLDIR.'/classes/statusnet.ini'; } // Ignore openidonly if OpenID is disabled diff --git a/lib/facebookaction.php b/lib/facebookaction.php index e7c78f070..62797d1dd 100644 --- a/lib/facebookaction.php +++ b/lib/facebookaction.php @@ -373,7 +373,7 @@ class FacebookAction extends Action display:inline-block; } - #facebook_laconica_app { + #facebook_statusnet_app { text-indent:-9999px; height:16px; width:16px; @@ -672,7 +672,7 @@ class FacebookProfileBoxNotice extends FacebookNoticeListItem $this->app_uri = 'http://apps.facebook.com/' . $app_props['canvas_name']; $this->app_name = $app_props['application_name']; - $this->out->elementStart('a', array('id' => 'facebook_laconica_app', + $this->out->elementStart('a', array('id' => 'facebook_statusnet_app', 'href' => $this->app_uri)); $this->out->text($this->app_name); $this->out->elementEnd('a'); diff --git a/lib/router.php b/lib/router.php index e91b2c537..b7b4a8e59 100644 --- a/lib/router.php +++ b/lib/router.php @@ -395,30 +395,30 @@ class Router array('action' => 'api', 'apiaction' => 'help')); - // laconica + // statusnet - $m->connect('api/laconica/:method', + $m->connect('api/statusnet/:method', array('action' => 'api', - 'apiaction' => 'laconica')); + 'apiaction' => 'statusnet')); - $m->connect('api/laconica/:method', + $m->connect('api/statusnet/:method', array('action' => 'api', - 'apiaction' => 'laconica')); + 'apiaction' => 'statusnet')); // Groups //'list' has to be handled differently, as php will not allow a method to be named 'list' - $m->connect('api/laconica/groups/list/:argument', + $m->connect('api/statusnet/groups/list/:argument', array('action' => 'api', 'method' => 'list_groups', 'apiaction' => 'groups')); foreach (array('xml', 'json', 'rss', 'atom') as $e) { - $m->connect('api/laconica/groups/list.' . $e, + $m->connect('api/statusnet/groups/list.' . $e, array('action' => 'api', 'method' => 'list_groups.' . $e, 'apiaction' => 'groups')); } - $m->connect('api/laconica/groups/:method', + $m->connect('api/statusnet/groups/:method', array('action' => 'api', 'apiaction' => 'statuses'), array('method' => '(list_all|)(\.(atom|rss|xml|json))?')); @@ -428,20 +428,20 @@ class Router 'apiaction' => 'statuses'), array('method' => '(|user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)')); - $m->connect('api/laconica/groups/:method/:argument', + $m->connect('api/statusnet/groups/:method/:argument', array('action' => 'api', 'apiaction' => 'groups')); - $m->connect('api/laconica/groups/:method', + $m->connect('api/statusnet/groups/:method', array('action' => 'api', 'apiaction' => 'groups')); // Tags - $m->connect('api/laconica/tags/:method/:argument', + $m->connect('api/statusnet/tags/:method/:argument', array('action' => 'api', 'apiaction' => 'tags')); - $m->connect('api/laconica/tags/:method', + $m->connect('api/statusnet/tags/:method', array('action' => 'api', 'apiaction' => 'tags')); diff --git a/lib/rssaction.php b/lib/rssaction.php index 878309dce..44c9003a0 100644 --- a/lib/rssaction.php +++ b/lib/rssaction.php @@ -244,7 +244,7 @@ class Rss10Action extends Action $this->element('dc:creator', null, ($profile->fullname) ? $profile->fullname : $profile->nickname); $this->element('foaf:maker', array('rdf:resource' => $creator_uri)); $this->element('sioc:has_creator', array('rdf:resource' => $creator_uri.'#acct')); - $this->element('laconica:postIcon', array('rdf:resource' => $profile->avatarUrl())); + $this->element('statusnet:postIcon', array('rdf:resource' => $profile->avatarUrl())); $this->element('cc:licence', array('rdf:resource' => common_config('license', 'url'))); if ($notice->reply_to) { $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to)); @@ -353,7 +353,7 @@ class Rss10Action extends Action 'http://rdfs.org/sioc/types#', 'xmlns:rdfs' => 'http://www.w3.org/2000/01/rdf-schema#', - 'xmlns:laconica' => + 'xmlns:statusnet' => 'http://status.net/ont/', 'xmlns' => 'http://purl.org/rss/1.0/')); $this->elementStart('sioc:Site', array('rdf:about' => common_root_url())); diff --git a/lib/util.php b/lib/util.php index dbd0e0a0f..4ad5c48f5 100644 --- a/lib/util.php +++ b/lib/util.php @@ -54,9 +54,9 @@ function common_init_language() $language = common_language(); // So we don't have to make people install the gettext locales $locale_set = common_init_locale($language); - bindtextdomain("laconica", common_config('site','locale_path')); - bind_textdomain_codeset("laconica", "UTF-8"); - textdomain("laconica"); + bindtextdomain("statusnet", common_config('site','locale_path')); + bind_textdomain_codeset("statusnet", "UTF-8"); + textdomain("statusnet"); setlocale(LC_CTYPE, 'C'); if(!$locale_set) { common_log(LOG_INFO,'Language requested:'.$language.' - locale could not be set:',__FILE__); @@ -1319,7 +1319,7 @@ function common_cache_key($extra) $base_key = common_keyize(common_config('site', 'name')); } - return 'laconica:' . $base_key . ':' . $extra; + return 'statusnet:' . $base_key . ':' . $extra; } function common_keyize($str) diff --git a/locale/bg_BG/LC_MESSAGES/statusnet.po b/locale/bg_BG/LC_MESSAGES/statusnet.po index 2c359f0e8..c0bc8379f 100644 --- a/locale/bg_BG/LC_MESSAGES/statusnet.po +++ b/locale/bg_BG/LC_MESSAGES/statusnet.po @@ -1,9 +1,9 @@ -# #-#-#-#-# laconica.pot (StatusNet 0.6.4) #-#-#-#-# +# #-#-#-#-# statusnet.pot (StatusNet 0.6.4) #-#-#-#-# # StatusNet Bulgarian translation. # Copyright (C) 2008 # This file is distributed under the same license as the StatusNet package. # Yasen Pramatarov , 2008 -# Stoyan Zhekov , 2008 +# Stoyan Zhekov , 2008 # msgid "" msgstr "" @@ -276,8 +276,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -302,7 +302,7 @@ msgstr "Не е открит методът в API." #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/ca_ES/LC_MESSAGES/statusnet.po b/locale/ca_ES/LC_MESSAGES/statusnet.po index 65ea42c8d..44944c8ba 100644 --- a/locale/ca_ES/LC_MESSAGES/statusnet.po +++ b/locale/ca_ES/LC_MESSAGES/statusnet.po @@ -276,8 +276,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -302,7 +302,7 @@ msgstr "No s'ha trobat el mètode API!" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/cs_CZ/LC_MESSAGES/statusnet.po b/locale/cs_CZ/LC_MESSAGES/statusnet.po index e2c40ae12..aee74f1af 100644 --- a/locale/cs_CZ/LC_MESSAGES/statusnet.po +++ b/locale/cs_CZ/LC_MESSAGES/statusnet.po @@ -241,8 +241,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -267,7 +267,7 @@ msgstr "" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/de_DE/LC_MESSAGES/statusnet.po b/locale/de_DE/LC_MESSAGES/statusnet.po index 4124224d7..ed0252879 100644 --- a/locale/de_DE/LC_MESSAGES/statusnet.po +++ b/locale/de_DE/LC_MESSAGES/statusnet.po @@ -277,8 +277,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -303,7 +303,7 @@ msgstr "API-Methode nicht gefunden!" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/el_GR/LC_MESSAGES/statusnet.po b/locale/el_GR/LC_MESSAGES/statusnet.po index f3fe65499..314dd358c 100644 --- a/locale/el_GR/LC_MESSAGES/statusnet.po +++ b/locale/el_GR/LC_MESSAGES/statusnet.po @@ -228,8 +228,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -254,7 +254,7 @@ msgstr "" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 3810a904e..a105d2b86 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# #-#-#-#-# laconica.new.pot (PACKAGE VERSION) #-#-#-#-# +# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -273,8 +273,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -299,7 +299,7 @@ msgstr "API method not found!" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 6fd5060ac..c0e69e3a7 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -279,8 +279,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -305,7 +305,7 @@ msgstr "¡No se encontró el método de la API!" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 0d3f0a511..5a53dd2df 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -281,8 +281,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -307,7 +307,7 @@ msgstr "API-metodia ei löytynyt!" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/fr_FR/LC_MESSAGES/statusnet.po b/locale/fr_FR/LC_MESSAGES/statusnet.po index 1a4426180..23365960b 100644 --- a/locale/fr_FR/LC_MESSAGES/statusnet.po +++ b/locale/fr_FR/LC_MESSAGES/statusnet.po @@ -1,12 +1,12 @@ -# #-#-#-#-# laconica-no-duplicates.po (0.43) #-#-#-#-# +# #-#-#-#-# statusnet-no-duplicates.po (0.43) #-#-#-#-# # French translations for StatusNet package # Traductions françaises du paquet StatusNet. # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the StatusNet package. # Florian Birée , 2008. # For translation choices and other informations, please read -# -# #-#-#-#-# laconica.new.pot (PACKAGE VERSION) #-#-#-#-# +# +# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -326,8 +326,8 @@ msgstr "" #: actions/twitapifavorites.php:102 #: actions/twitapifriendships.php:121 #: actions/twitapihelp.php:44 -#: actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 +#: actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 #: actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 #: actions/twitapistatuses.php:228 @@ -372,7 +372,7 @@ msgstr "Méthode API non trouvée !" #: actions/twitapidirect_messages.php:184 #: actions/twitapifavorites.php:143 #: actions/twitapihelp.php:52 -#: actions/twitapilaconica.php:172 +#: actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 #: actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 @@ -958,9 +958,9 @@ msgstr "Erreur de base de donnée en insérant le hashtag : %s" msgid "DB error inserting reply: %s" msgstr "Erreur de base de donnée en insérant la réponse :%s" -# De #-#-#-#-# laconica-no-duplicates.po (0.43) #-#-#-#-#\n +# De #-#-#-#-# statusnet-no-duplicates.po (0.43) #-#-#-#-#\n # Nouveau message\n -# #-#-#-#-# laconica.new.pot (PACKAGE VERSION) #-#-#-#-#\n +# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-#\n # à "Supprimer l'avis" #: ../actions/deletenotice.php:41 #: actions/deletenotice.php:41 @@ -5742,9 +5742,9 @@ msgstr "%1$s a ajouté votre statut depuis %2$s" msgid "From" msgstr "De" -# De #-#-#-#-# laconica-no-duplicates.po (0.43) #-#-#-#-#\n +# De #-#-#-#-# statusnet-no-duplicates.po (0.43) #-#-#-#-#\n # Nouveau message\n -# #-#-#-#-# laconica.new.pot (PACKAGE VERSION) #-#-#-#-#\n +# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-#\n # à "Supprimer l'avis" #: lib/messageform.php:110 msgid "Send a direct notice" @@ -5771,18 +5771,18 @@ msgstr "Répondre à ce statut" msgid "Reply" msgstr "Répondre" -# De #-#-#-#-# laconica-no-duplicates.po (0.43) #-#-#-#-#\n +# De #-#-#-#-# statusnet-no-duplicates.po (0.43) #-#-#-#-#\n # Nouveau message\n -# #-#-#-#-# laconica.new.pot (PACKAGE VERSION) #-#-#-#-#\n +# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-#\n # à "Supprimer l'avis" #: lib/noticelist.php:471 #: lib/noticelist.php:474 msgid "Delete this notice" msgstr "Supprimer ce statut" -# De #-#-#-#-# laconica-no-duplicates.po (0.43) #-#-#-#-#\n +# De #-#-#-#-# statusnet-no-duplicates.po (0.43) #-#-#-#-#\n # Nouveau message\n -# #-#-#-#-# laconica.new.pot (PACKAGE VERSION) #-#-#-#-#\n +# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-#\n # à "Supprimer l'avis" #: lib/noticelist.php:474 msgid "Delete" diff --git a/locale/he_IL/LC_MESSAGES/statusnet.po b/locale/he_IL/LC_MESSAGES/statusnet.po index 4644540ca..8d43dfeaa 100644 --- a/locale/he_IL/LC_MESSAGES/statusnet.po +++ b/locale/he_IL/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# #-#-#-#-# laconica.pot (PACKAGE VERSION) #-#-#-#-# +# #-#-#-#-# statusnet.pot (PACKAGE VERSION) #-#-#-#-# # Hebrew translation for StatusNet # תרגום לעברית של לאקוניה # Copyright (C) 2008 COPYRIGHT HOLDER @@ -7,7 +7,7 @@ # קובץ זה מופץ תחת רשיון זהה לזה של החבילה לאקוניקה # Hezy Amiel חזי עמיאל , 2008. # -# #-#-#-#-# laconica.new.pot (PACKAGE VERSION) #-#-#-#-# +# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -247,8 +247,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -273,7 +273,7 @@ msgstr "" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/it_IT/LC_MESSAGES/statusnet.mo b/locale/it_IT/LC_MESSAGES/statusnet.mo index 87c242f03..95764f1e2 100644 Binary files a/locale/it_IT/LC_MESSAGES/statusnet.mo and b/locale/it_IT/LC_MESSAGES/statusnet.mo differ diff --git a/locale/it_IT/LC_MESSAGES/statusnet.po b/locale/it_IT/LC_MESSAGES/statusnet.po index f67f870a5..1a59adf85 100644 --- a/locale/it_IT/LC_MESSAGES/statusnet.po +++ b/locale/it_IT/LC_MESSAGES/statusnet.po @@ -1,12 +1,12 @@ -# Italian translation of laconica -# Copyright (C) 2008 THE laconica'S COPYRIGHT HOLDER -# This file is distributed under the same license as the laconica package. +# Italian translation of statusnet +# Copyright (C) 2008 THE statusnet'S COPYRIGHT HOLDER +# This file is distributed under the same license as the statusnet package. # Milo Casagrande , 2008 # # msgid "" msgstr "" -"Project-Id-Version: laconica\n" +"Project-Id-Version: statusnet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-01-25 16:24+0000\n" "PO-Revision-Date: 2009-06-04 14:09+0000\n" @@ -286,8 +286,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -312,7 +312,7 @@ msgstr "Metodo delle API non trovato!" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." @@ -4583,7 +4583,7 @@ msgstr "Esplorazione secondaria del sito" #: lib/action.php:602 lib/action.php:623 msgid "StatusNet software license" -msgstr "Licenza del software laconica" +msgstr "Licenza del software statusnet" #: lib/action.php:630 msgid "All " diff --git a/locale/ja_JP/LC_MESSAGES/statusnet.po b/locale/ja_JP/LC_MESSAGES/statusnet.po index 37fde0ecb..bb7d777ba 100644 --- a/locale/ja_JP/LC_MESSAGES/statusnet.po +++ b/locale/ja_JP/LC_MESSAGES/statusnet.po @@ -1,10 +1,10 @@ -# #-#-#-#-# laconica.pot (PACKAGE VERSION) #-#-#-#-# +# #-#-#-#-# statusnet.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Toshiya TSURU , 2008 # -# #-#-#-#-# laconica.new.pot (PACKAGE VERSION) #-#-#-#-# +# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -245,8 +245,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -271,7 +271,7 @@ msgstr "" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/ko_KR/LC_MESSAGES/statusnet.po b/locale/ko_KR/LC_MESSAGES/statusnet.po index df9981992..dd7edc510 100644 --- a/locale/ko_KR/LC_MESSAGES/statusnet.po +++ b/locale/ko_KR/LC_MESSAGES/statusnet.po @@ -254,8 +254,8 @@ msgstr "추가한 휴대폰으로 인증 코드를 보냈습니다. 수신함( #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -280,7 +280,7 @@ msgstr "API 메서드를 찾을 수 없습니다." #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/mk_MK/LC_MESSAGES/statusnet.mo b/locale/mk_MK/LC_MESSAGES/statusnet.mo index c916d0292..0ac378c79 100644 Binary files a/locale/mk_MK/LC_MESSAGES/statusnet.mo and b/locale/mk_MK/LC_MESSAGES/statusnet.mo differ diff --git a/locale/mk_MK/LC_MESSAGES/statusnet.po b/locale/mk_MK/LC_MESSAGES/statusnet.po index 2b8a12acc..d4c4eb235 100644 --- a/locale/mk_MK/LC_MESSAGES/statusnet.po +++ b/locale/mk_MK/LC_MESSAGES/statusnet.po @@ -1,10 +1,10 @@ -# #-#-#-#-# laconica.pot (PACKAGE VERSION) #-#-#-#-# +# #-#-#-#-# statusnet.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. # Copyright (C) 2008 FREE SOFTWARE MACEDONIA # This file is distributed under the same license as the PACKAGE package. # IGOR STAMATOVSKI , 2008. # -# #-#-#-#-# laconica.new.pot (PACKAGE VERSION) #-#-#-#-# +# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -22,8 +22,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# laconica.pot (PACKAGE VERSION) #-#-#-#-#\n" -"#-#-#-#-# laconica.new.pot (PACKAGE VERSION) #-#-#-#-#\n" +"#-#-#-#-# statusnet.pot (PACKAGE VERSION) #-#-#-#-#\n" +"#-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-#\n" #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68 #: actions/noticesearchrss.php:88 @@ -249,8 +249,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -275,7 +275,7 @@ msgstr "" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/nb_NO/LC_MESSAGES/statusnet.po b/locale/nb_NO/LC_MESSAGES/statusnet.po index 3c93acd23..116513857 100644 --- a/locale/nb_NO/LC_MESSAGES/statusnet.po +++ b/locale/nb_NO/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# #-#-#-#-# laconica.new.pot (PACKAGE VERSION) #-#-#-#-# +# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -249,8 +249,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -275,7 +275,7 @@ msgstr "API-metode ikke funnet!" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/nl_NL/LC_MESSAGES/statusnet.po b/locale/nl_NL/LC_MESSAGES/statusnet.po index 14b7783ee..6cc0a52c4 100644 --- a/locale/nl_NL/LC_MESSAGES/statusnet.po +++ b/locale/nl_NL/LC_MESSAGES/statusnet.po @@ -276,8 +276,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -302,7 +302,7 @@ msgstr "API functie niet gevonden" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/nn_NO/LC_MESSAGES/statusnet.po b/locale/nn_NO/LC_MESSAGES/statusnet.po index d0dd92366..4da276adb 100644 --- a/locale/nn_NO/LC_MESSAGES/statusnet.po +++ b/locale/nn_NO/LC_MESSAGES/statusnet.po @@ -268,8 +268,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -294,7 +294,7 @@ msgstr "Fann ikkje API-metode." #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/pl_PL/LC_MESSAGES/statusnet.po b/locale/pl_PL/LC_MESSAGES/statusnet.po index 321e49573..e866145b2 100644 --- a/locale/pl_PL/LC_MESSAGES/statusnet.po +++ b/locale/pl_PL/LC_MESSAGES/statusnet.po @@ -1,10 +1,10 @@ -# #-#-#-#-# laconica.pot (PACKAGE VERSION) #-#-#-#-# +# #-#-#-#-# statusnet.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Paweł Wilk , 2008. # -# #-#-#-#-# laconica.new.pot (PACKAGE VERSION) #-#-#-#-# +# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -263,8 +263,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -289,7 +289,7 @@ msgstr "metoda API nie znaleziona!" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 7d866679d..779d7489e 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -273,8 +273,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -299,7 +299,7 @@ msgstr "Método da API não encontrado!" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo index 819cdb35b..9db1638b0 100644 Binary files a/locale/pt_BR/LC_MESSAGES/statusnet.mo and b/locale/pt_BR/LC_MESSAGES/statusnet.mo differ diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 456122de6..7fae3f5f3 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -2,7 +2,7 @@ # Frederico Goncalves Guimaraes , 2009. msgid "" msgstr "" -"Project-Id-Version: laconica\n" +"Project-Id-Version: statusnet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-01-25 16:24+0000\n" "PO-Revision-Date: 2009-07-14 11:24+0000\n" @@ -274,8 +274,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -300,7 +300,7 @@ msgstr "O método da API não foi encontrado!" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/ru_RU/LC_MESSAGES/statusnet.po b/locale/ru_RU/LC_MESSAGES/statusnet.po index fa85ee740..8a553a37f 100644 --- a/locale/ru_RU/LC_MESSAGES/statusnet.po +++ b/locale/ru_RU/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# #-#-#-#-# laconica.new.pot (PACKAGE VERSION) #-#-#-#-# +# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -244,8 +244,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -270,7 +270,7 @@ msgstr "Метод API не найден!" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/statusnet.po b/locale/statusnet.po index ebdc9603a..c7ac6ac9b 100644 --- a/locale/statusnet.po +++ b/locale/statusnet.po @@ -247,8 +247,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -286,7 +286,7 @@ msgstr "" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46 #: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104 diff --git a/locale/sv_SE/LC_MESSAGES/statusnet.po b/locale/sv_SE/LC_MESSAGES/statusnet.po index fdea771b9..d0a5001da 100644 --- a/locale/sv_SE/LC_MESSAGES/statusnet.po +++ b/locale/sv_SE/LC_MESSAGES/statusnet.po @@ -271,8 +271,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -297,7 +297,7 @@ msgstr "API-metoden hittades inte!" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/te_IN/LC_MESSAGES/statusnet.po b/locale/te_IN/LC_MESSAGES/statusnet.po index 83f9f46dc..4576f3613 100644 --- a/locale/te_IN/LC_MESSAGES/statusnet.po +++ b/locale/te_IN/LC_MESSAGES/statusnet.po @@ -1,10 +1,10 @@ -# #-#-#-#-# laconica.pot (PACKAGE VERSION) #-#-#-#-# +# #-#-#-#-# statusnet.pot (PACKAGE VERSION) #-#-#-#-# # StatusNet Telugu Translation # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the StatusNet package. # Veeven , 2008. # -# #-#-#-#-# laconica.new.pot (PACKAGE VERSION) #-#-#-#-# +# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -237,8 +237,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -263,7 +263,7 @@ msgstr "" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/tr_TR/LC_MESSAGES/statusnet.po b/locale/tr_TR/LC_MESSAGES/statusnet.po index b6cb260f8..e67fbf33c 100644 --- a/locale/tr_TR/LC_MESSAGES/statusnet.po +++ b/locale/tr_TR/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# #-#-#-#-# laconica.new.pot (PACKAGE VERSION) #-#-#-#-# +# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -245,8 +245,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -271,7 +271,7 @@ msgstr "" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/uk_UA/LC_MESSAGES/statusnet.po b/locale/uk_UA/LC_MESSAGES/statusnet.po index 396e78508..55cea21c3 100644 --- a/locale/uk_UA/LC_MESSAGES/statusnet.po +++ b/locale/uk_UA/LC_MESSAGES/statusnet.po @@ -1,4 +1,4 @@ -# #-#-#-#-# laconica.new.pot (PACKAGE VERSION) #-#-#-#-# +# #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -280,8 +280,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -306,7 +306,7 @@ msgstr "API метод не знайдено!" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/vi_VN/LC_MESSAGES/statusnet.mo b/locale/vi_VN/LC_MESSAGES/statusnet.mo index 6ac9a37c2..65add28b4 100644 Binary files a/locale/vi_VN/LC_MESSAGES/statusnet.mo and b/locale/vi_VN/LC_MESSAGES/statusnet.mo differ diff --git a/locale/vi_VN/LC_MESSAGES/statusnet.po b/locale/vi_VN/LC_MESSAGES/statusnet.po index 595004d8a..af34d5210 100644 --- a/locale/vi_VN/LC_MESSAGES/statusnet.po +++ b/locale/vi_VN/LC_MESSAGES/statusnet.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: laconica\n" +"Project-Id-Version: statusnet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-01-25 16:24+0000\n" "PO-Revision-Date: 2009-05-10 05:27+0000\n" @@ -271,8 +271,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -297,7 +297,7 @@ msgstr "Phương thức API không tìm thấy!" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 28188fce3..529d2f4f8 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -258,8 +258,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -284,7 +284,7 @@ msgstr "API 方法未实现！" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 707fa3191..a94187518 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -237,8 +237,8 @@ msgstr "" #: actions/twitapiusers.php:55 actions/twitapiaccount.php:37 #: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85 #: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121 -#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82 -#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79 +#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82 +#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429 @@ -263,7 +263,7 @@ msgstr "" #: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45 #: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143 -#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172 +#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37 #: actions/twitapistatuses.php:562 msgid "API method under construction." diff --git a/plugins/Autocomplete/Autocomplete.js b/plugins/Autocomplete/Autocomplete.js index e799c11e5..dfadea004 100644 --- a/plugins/Autocomplete/Autocomplete.js +++ b/plugins/Autocomplete/Autocomplete.js @@ -17,7 +17,7 @@ $(document).ready(function(){ }); } ); - $.getJSON($('address .url')[0].href+'/api/laconica/groups/list.json?user_id=' + current_user['id'] + '&callback=?', + $.getJSON($('address .url')[0].href+'/api/statusnet/groups/list.json?user_id=' + current_user['id'] + '&callback=?', function(groups){ $('#notice_data-text').autocomplete(groups, { multiple: true, diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php index 902d1744d..85a24c132 100644 --- a/plugins/PiwikAnalyticsPlugin.php +++ b/plugins/PiwikAnalyticsPlugin.php @@ -45,7 +45,7 @@ if (!defined('STATUSNET')) { * * exchange example.com/piwik/ with the url to your piwik installation and * make sure you don't forget the final / - * exchange id with the ID your laconica installation has in your Piwik analytics + * exchange id with the ID your statusnet installation has in your Piwik analytics * * @category Plugin * @package StatusNet @@ -60,7 +60,7 @@ class PiwikAnalyticsPlugin extends Plugin { /** the base of your Piwik installation */ var $piwikroot = null; - /** the Piwik Id of your laconica installation */ + /** the Piwik Id of your statusnet installation */ var $piwikId = null; /** diff --git a/plugins/TemplatePlugin.php b/plugins/TemplatePlugin.php index b56fa3dbd..cfa051162 100644 --- a/plugins/TemplatePlugin.php +++ b/plugins/TemplatePlugin.php @@ -195,7 +195,7 @@ class TemplatePlugin extends Plugin { ); // use the PHP template - // unless laconica config: + // unless statusnet config: // $config['template']['mode'] = 'html'; if (!(common_config('template', 'mode') == 'html')) { $tpl_file = $this->templateFolder() . '/index.php'; @@ -326,7 +326,7 @@ class TemplateAction extends Action } /** - * Function for retrieving a laconica display section + * Function for retrieving a statusnet display section * * requires one parameter, the name of the section * section names are listed in the comments of the TemplatePlugin class diff --git a/scripts/delete_status_network.sh b/scripts/delete_status_network.sh index 32187382c..f55f1486b 100755 --- a/scripts/delete_status_network.sh +++ b/scripts/delete_status_network.sh @@ -1,6 +1,6 @@ #!/bin/bash -source /etc/laconica/setup.cfg +source /etc/statusnet/setup.cfg export nickname=$1 diff --git a/scripts/rebuilddb_psql.sh b/scripts/rebuilddb_psql.sh index 9ade515ad..6b15b9212 100755 --- a/scripts/rebuilddb_psql.sh +++ b/scripts/rebuilddb_psql.sh @@ -15,7 +15,7 @@ # # You MUST run this script as the 'postgres' user. # You MUST be able to write to /tmp/rebuilddb_psql.sql -# You MUST specify the laconica database user and database name on the +# You MUST specify the statusnet database user and database name on the # command line, e.g. ./rebuilddb_psql.sh myuser mydbname # @@ -27,7 +27,7 @@ cd `dirname $0` pg_dump -a -D --disable-trigger $DB > /tmp/rebuilddb_psql.sql psql -c "drop schema public cascade; create schema public;" $DB psql -c "grant all privileges on schema public to $user;" $DB -psql $DB < ../db/laconica_pg.sql +psql $DB < ../db/statusnet_pg.sql psql $DB < /tmp/rebuilddb_psql.sql for tab in `psql -c '\dts' $DB -tA | cut -d\| -f2`; do psql -c "ALTER TABLE \"$tab\" OWNER TO $user;" $DB diff --git a/scripts/setup_status_network.sh b/scripts/setup_status_network.sh index 17440640e..d40d4724f 100755 --- a/scripts/setup_status_network.sh +++ b/scripts/setup_status_network.sh @@ -1,6 +1,6 @@ #!/bin/bash -source /etc/laconica/setup.cfg +source /etc/statusnet/setup.cfg export nickname=$1 export sitename=$2 @@ -13,7 +13,7 @@ export username=$nickname$USERBASE mysqladmin -h $DBHOST -u $ADMIN --password=$ADMINPASS create $database -for f in laconica.sql innodb.sql sms_carrier.sql foreign_services.sql notice_source.sql; do +for f in statusnet.sql innodb.sql sms_carrier.sql foreign_services.sql notice_source.sql; do mysql -h $DBHOST -u $ADMIN --password=$ADMINPASS $database < ../db/$f; done diff --git a/scripts/statusnet.spec b/scripts/statusnet.spec index 331e10671..2019d8abb 100644 --- a/scripts/statusnet.spec +++ b/scripts/statusnet.spec @@ -4,11 +4,11 @@ BuildRequires: php-pear BuildRequires: httpd-devel -Name: laconica +Name: statusnet Version: %{LACVER} Release: 1%{?dist} License: GAGPL v3 or later -Source: laconica-%{version}.tar.gz +Source: statusnet-%{version}.tar.gz Group: Applications/Internet Summary: Laconica, the Open Source microblogging platform BuildArch: noarch @@ -49,16 +49,16 @@ similar service to sites like Twitter, Jaiku, and Plurk. mkdir -p %{buildroot}%{wwwpath} cp -a * %{buildroot}%{wwwpath} -mkdir -p %{buildroot}%{_datadir}/laconica -cp -a db %{buildroot}%{_datadir}/laconica/db +mkdir -p %{buildroot}%{_datadir}/statusnet +cp -a db %{buildroot}%{_datadir}/statusnet/db -mkdir -p %{buildroot}%{_datadir}/laconica/avatar +mkdir -p %{buildroot}%{_datadir}/statusnet/avatar mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d -cat > %{buildroot}%{_sysconfdir}/httpd/conf.d/laconica.conf <<"EOF" -Alias /laconica/ "/var/www/laconica/" +cat > %{buildroot}%{_sysconfdir}/httpd/conf.d/statusnet.conf <<"EOF" +Alias /statusnet/ "/var/www/laconica/" - + Options Indexes FollowSymLinks AllowOverride All Order allow,deny @@ -73,17 +73,17 @@ rm -rf %buildroot %defattr(-,root,root) %dir %{wwwpath} %{wwwpath}/* -%{_datadir}/laconica/* -%attr(-,apache,apache) %dir %{_datadir}/laconica/avatar +%{_datadir}/statusnet/* +%attr(-,apache,apache) %dir %{_datadir}/statusnet/avatar %doc COPYING README doc-src/* -%config(noreplace) %{_sysconfdir}/httpd/conf.d/laconica.conf +%config(noreplace) %{_sysconfdir}/httpd/conf.d/statusnet.conf %changelog * Wed Apr 03 2009 Zach Copley - 0.7.3 - Changed version number to 0.7.3. * Fri Mar 13 2009 Ken Sedgwick - 0.7.2.1-1 -- Factored laconica version to the first line of the file. +- Factored statusnet version to the first line of the file. * Wed Mar 03 2009 Zach Copley - 0.7.2 - Changed version number to 0.7.2. @@ -92,7 +92,7 @@ rm -rf %buildroot - Modified RPM for Fedora. * Thu Feb 13 2009 tuukka.pasanen@ilmi.fi -- packaged laconica version 0.7.1 +- packaged statusnet version 0.7.1 * Wed Feb 04 2009 tuukka.pasanen@ilmi.fi -- packaged laconica version 0.7.0 using the buildservice spec file wizard +- packaged statusnet version 0.7.0 using the buildservice spec file wizard diff --git a/scripts/twitterstatusfetcher.php b/scripts/twitterstatusfetcher.php index f25690e58..9a74ae99d 100755 --- a/scripts/twitterstatusfetcher.php +++ b/scripts/twitterstatusfetcher.php @@ -54,7 +54,7 @@ require_once INSTALLDIR . '/lib/daemon.php'; */ // NOTE: an Avatar path MUST be set in config.php for this -// script to work: e.g.: $config['avatar']['path'] = '/laconica/avatar'; +// script to work: e.g.: $config['avatar']['path'] = '/statusnet/avatar'; class TwitterStatusFetcher extends ParallelizingDaemon { diff --git a/scripts/update_pot.sh b/scripts/update_pot.sh index a7f5e4d3a..dbbe4354f 100755 --- a/scripts/update_pot.sh +++ b/scripts/update_pot.sh @@ -1,3 +1,3 @@ cd `dirname $0` cd .. -xgettext --from-code=UTF-8 --default-domain=laconica --output=locale/laconica.po --language=PHP --join-existing actions/*.php classes/*.php lib/*.php scripts/*.php +xgettext --from-code=UTF-8 --default-domain=statusnet --output=locale/laconica.po --language=PHP --join-existing actions/*.php classes/*.php lib/*.php scripts/*.php diff --git a/scripts/update_translations.php b/scripts/update_translations.php index 8120f636f..1f291dc42 100755 --- a/scripts/update_translations.php +++ b/scripts/update_translations.php @@ -30,7 +30,7 @@ define('STATUSNET', true); require_once(INSTALLDIR . '/lib/common.php'); // Master StatusNet .pot file location (created by update_pot.sh) -$laconica_pot = INSTALLDIR . '/locale/laconica.po'; +$statusnet_pot = INSTALLDIR . '/locale/laconica.po'; set_time_limit(60); @@ -43,11 +43,11 @@ foreach ($languages as $language) { $code = $language['lang']; $file_url = 'http://status.net/pootle/' . $code . - '/laconica/LC_MESSAGES/laconica.po'; + '/statusnet/LC_MESSAGES/laconica.po'; $lcdir = INSTALLDIR . '/locale/' . $code; $msgdir = "$lcdir/LC_MESSAGES"; - $pofile = "$msgdir/laconica.po"; - $mofile = "$msgdir/laconica.mo"; + $pofile = "$msgdir/statusnet.po"; + $mofile = "$msgdir/statusnet.mo"; /* Check for an existing */ if (!is_dir($msgdir)) { @@ -71,7 +71,7 @@ foreach ($languages as $language) { if (sha1($new_file) != $existingSHA1 || !file_exists($mofile)) { echo "Updating ".$code."\n"; file_put_contents($pofile, $new_file); - system(sprintf('msgmerge -U %s %s', $pofile, $laconica_pot)); + system(sprintf('msgmerge -U %s %s', $pofile, $statusnet_pot)); system(sprintf('msgfmt -f -o %s %s', $mofile, $pofile)); } else { echo "Unchanged - ".$code."\n"; diff --git a/sphinx.conf.sample b/sphinx.conf.sample index 8204b9db6..3de62f637 100644 --- a/sphinx.conf.sample +++ b/sphinx.conf.sample @@ -1,5 +1,5 @@ # -# Minimal Sphinx configuration sample for laconica +# Minimal Sphinx configuration sample for statusnet # source src1 diff --git a/theme/readme.txt b/theme/readme.txt index 3794eecb3..151b1fb71 100644 --- a/theme/readme.txt +++ b/theme/readme.txt @@ -1,4 +1,4 @@ -/** Howto: create a laconica theme +/** Howto: create a statusnet theme * * @package StatusNet * @author Sarven Capadisli @@ -18,7 +18,7 @@ Location of key paths and files under theme/: ./default/images/ ./base/display.css contains layout, typography rules: -Only alter this file if you want to change the layout of the site. Please note that, any updates to this in future laconica releases may not be compatible with your version. +Only alter this file if you want to change the layout of the site. Please note that, any updates to this in future statusnet releases may not be compatible with your version. ./default/css/display.css contains only the background images and colour rules: This file is a good basis for creating your own theme. -- cgit v1.2.3-54-g00ecf From df86aa721455fde537608d5faeaaf92075afb738 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 26 Aug 2009 10:41:36 -0400 Subject: define LACONICA and accept LACONICA for backwards compatibility --- actions/accesstoken.php | 2 +- actions/all.php | 2 +- actions/allrss.php | 2 +- actions/api.php | 2 +- actions/attachment.php | 2 +- actions/attachment_ajax.php | 2 +- actions/attachment_thumbnail.php | 2 +- actions/avatarbynickname.php | 2 +- actions/avatarsettings.php | 2 +- actions/block.php | 2 +- actions/blockedfromgroup.php | 2 +- actions/confirmaddress.php | 2 +- actions/conversation.php | 2 +- actions/deletenotice.php | 2 +- actions/disfavor.php | 2 +- actions/doc.php | 2 +- actions/editgroup.php | 2 +- actions/emailsettings.php | 2 +- actions/facebookhome.php | 2 +- actions/facebookinvite.php | 2 +- actions/facebooklogin.php | 2 +- actions/facebookremove.php | 2 +- actions/facebooksettings.php | 2 +- actions/favor.php | 2 +- actions/favorited.php | 2 +- actions/favoritesrss.php | 2 +- actions/featured.php | 2 +- actions/file.php | 2 +- actions/finishaddopenid.php | 2 +- actions/finishopenidlogin.php | 2 +- actions/finishremotesubscribe.php | 2 +- actions/foaf.php | 2 +- actions/groupblock.php | 2 +- actions/groupbyid.php | 2 +- actions/groupdesignsettings.php | 2 +- actions/grouplogo.php | 2 +- actions/groupmembers.php | 2 +- actions/grouprss.php | 2 +- actions/groups.php | 2 +- actions/groupsearch.php | 2 +- actions/groupunblock.php | 2 +- actions/imsettings.php | 2 +- actions/inbox.php | 2 +- actions/invite.php | 2 +- actions/joingroup.php | 2 +- actions/leavegroup.php | 2 +- actions/login.php | 2 +- actions/logout.php | 2 +- actions/makeadmin.php | 2 +- actions/microsummary.php | 2 +- actions/newgroup.php | 2 +- actions/newmessage.php | 2 +- actions/newnotice.php | 2 +- actions/noticesearch.php | 2 +- actions/noticesearchrss.php | 2 +- actions/nudge.php | 2 +- actions/oembed.php | 2 +- actions/openidlogin.php | 2 +- actions/openidsettings.php | 2 +- actions/opensearch.php | 2 +- actions/othersettings.php | 2 +- actions/outbox.php | 2 +- actions/passwordsettings.php | 2 +- actions/peoplesearch.php | 2 +- actions/peopletag.php | 2 +- actions/postnotice.php | 2 +- actions/profilesettings.php | 2 +- actions/public.php | 2 +- actions/publicrss.php | 2 +- actions/publictagcloud.php | 2 +- actions/publicxrds.php | 2 +- actions/recoverpassword.php | 2 +- actions/register.php | 2 +- actions/remotesubscribe.php | 2 +- actions/replies.php | 2 +- actions/repliesrss.php | 2 +- actions/requesttoken.php | 2 +- actions/showfavorites.php | 2 +- actions/showgroup.php | 2 +- actions/showmessage.php | 2 +- actions/shownotice.php | 2 +- actions/showstream.php | 2 +- actions/smssettings.php | 2 +- actions/subedit.php | 2 +- actions/subscribe.php | 2 +- actions/subscribers.php | 2 +- actions/subscriptions.php | 4 ++-- actions/sup.php | 2 +- actions/tag.php | 2 +- actions/tagother.php | 2 +- actions/tagrss.php | 2 +- actions/twitapiaccount.php | 2 +- actions/twitapiblocks.php | 2 +- actions/twitapidirect_messages.php | 2 +- actions/twitapifavorites.php | 2 +- actions/twitapifriendships.php | 2 +- actions/twitapigroups.php | 2 +- actions/twitapihelp.php | 2 +- actions/twitapinotifications.php | 2 +- actions/twitapisearchatom.php | 2 +- actions/twitapisearchjson.php | 2 +- actions/twitapistatuses.php | 2 +- actions/twitapistatusnet.php | 2 +- actions/twitapitags.php | 2 +- actions/twitapitrends.php | 2 +- actions/twitapiusers.php | 2 +- actions/twitterauthorization.php | 2 +- actions/twittersettings.php | 2 +- actions/unblock.php | 2 +- actions/unsubscribe.php | 2 +- actions/updateprofile.php | 2 +- actions/userauthorization.php | 2 +- actions/userbyid.php | 2 +- actions/userdesignsettings.php | 2 +- actions/usergroups.php | 2 +- actions/userrss.php | 2 +- actions/xrds.php | 2 +- classes/Design.php | 2 +- classes/File.php | 2 +- classes/File_oembed.php | 2 +- classes/File_redirection.php | 2 +- classes/File_thumbnail.php | 2 +- classes/File_to_post.php | 2 +- classes/Group_alias.php | 2 +- classes/Group_block.php | 2 +- classes/Memcached_DataObject.php | 2 +- classes/Notice.php | 2 +- classes/Notice_inbox.php | 2 +- classes/Profile.php | 2 +- classes/Profile_block.php | 2 +- classes/Remote_profile.php | 2 +- classes/Session.php | 2 +- classes/Status_network.php | 2 +- classes/Subscription.php | 2 +- classes/User.php | 2 +- index.php | 1 + install.php | 2 +- lib/Shorturl_api.php | 2 +- lib/accountsettingsaction.php | 2 +- lib/action.php | 2 +- lib/arraywrapper.php | 2 +- lib/attachmentlist.php | 2 +- lib/attachmentnoticesection.php | 2 +- lib/attachmenttagcloudsection.php | 2 +- lib/blockform.php | 2 +- lib/channel.php | 2 +- lib/clienterroraction.php | 2 +- lib/clientexception.php | 2 +- lib/command.php | 2 +- lib/commandinterpreter.php | 2 +- lib/common.php | 2 +- lib/connectsettingsaction.php | 2 +- lib/currentuserdesignaction.php | 2 +- lib/daemon.php | 2 +- lib/dberroraction.php | 2 +- lib/deleteaction.php | 2 +- lib/designsettings.php | 2 +- lib/disfavorform.php | 2 +- lib/error.php | 2 +- lib/event.php | 2 +- lib/facebookaction.php | 2 +- lib/favorform.php | 2 +- lib/featureduserssection.php | 2 +- lib/feed.php | 2 +- lib/feedlist.php | 2 +- lib/form.php | 2 +- lib/galleryaction.php | 2 +- lib/groupdesignaction.php | 2 +- lib/groupeditform.php | 2 +- lib/grouplist.php | 2 +- lib/groupminilist.php | 2 +- lib/groupnav.php | 2 +- lib/groupsbymemberssection.php | 2 +- lib/groupsbypostssection.php | 2 +- lib/groupsection.php | 2 +- lib/grouptagcloudsection.php | 2 +- lib/htmloutputter.php | 2 +- lib/imagefile.php | 2 +- lib/jabber.php | 2 +- lib/joinform.php | 2 +- lib/jsonsearchresultslist.php | 2 +- lib/language.php | 2 +- lib/leaveform.php | 2 +- lib/logingroupnav.php | 2 +- lib/mail.php | 2 +- lib/mailbox.php | 2 +- lib/messageform.php | 2 +- lib/microid.php | 2 +- lib/noticeform.php | 2 +- lib/noticelist.php | 2 +- lib/noticesection.php | 2 +- lib/nudgeform.php | 2 +- lib/oauthclient.php | 2 +- lib/oauthstore.php | 2 +- lib/omb.php | 2 +- lib/openid.php | 2 +- lib/ownerdesignaction.php | 2 +- lib/parallelizingdaemon.php | 2 +- lib/personalgroupnav.php | 2 +- lib/personaltagcloudsection.php | 2 +- lib/ping.php | 2 +- lib/plugin.php | 2 +- lib/popularnoticesection.php | 2 +- lib/profileaction.php | 2 +- lib/profilelist.php | 2 +- lib/profileminilist.php | 2 +- lib/profilesection.php | 2 +- lib/publicgroupnav.php | 2 +- lib/queuehandler.php | 2 +- lib/router.php | 2 +- lib/rssaction.php | 2 +- lib/search_engines.php | 2 +- lib/searchaction.php | 2 +- lib/searchgroupnav.php | 2 +- lib/section.php | 2 +- lib/servererroraction.php | 2 +- lib/serverexception.php | 2 +- lib/settingsaction.php | 2 +- lib/snapshot.php | 2 +- lib/subgroupnav.php | 2 +- lib/subpeopletagcloudsection.php | 2 +- lib/subs.php | 2 +- lib/subscribeform.php | 2 +- lib/subscriberspeopleselftagcloudsection.php | 2 +- lib/subscriberspeopletagcloudsection.php | 2 +- lib/subscriptionlist.php | 2 +- lib/subscriptionspeopleselftagcloudsection.php | 2 +- lib/subscriptionspeopletagcloudsection.php | 2 +- lib/tagcloudsection.php | 2 +- lib/theme.php | 2 +- lib/topposterssection.php | 2 +- lib/twitter.php | 2 +- lib/twitterapi.php | 2 +- lib/twitteroauthclient.php | 2 +- lib/unblockform.php | 2 +- lib/unsubscribeform.php | 2 +- lib/webcolor.php | 2 +- lib/widget.php | 2 +- lib/xmloutputter.php | 2 +- lib/xmlstringer.php | 2 +- lib/xmppqueuehandler.php | 2 +- plugins/Autocomplete/AutocompletePlugin.php | 2 +- plugins/Comet/CometPlugin.php | 2 +- plugins/FBConnect/FBCLoginGroupNav.php | 2 +- plugins/FBConnect/FBCSettingsNav.php | 2 +- plugins/FBConnect/FBC_XDReceiver.php | 2 +- plugins/FBConnect/FBConnectLogin.php | 2 +- plugins/FBConnect/FBConnectPlugin.php | 2 +- plugins/FBConnect/FBConnectSettings.php | 2 +- plugins/InfiniteScroll/InfiniteScrollPlugin.php | 2 +- plugins/Meteor/MeteorPlugin.php | 2 +- plugins/Realtime/RealtimePlugin.php | 2 +- plugins/recaptcha/recaptcha.php | 2 +- scripts/fixup_hashtags.php | 1 + scripts/fixup_inboxes.php | 1 + scripts/fixup_notices_rendered.php | 1 + scripts/fixup_replies.php | 1 + scripts/update_translations.php | 1 + 258 files changed, 259 insertions(+), 253 deletions(-) (limited to 'index.php') diff --git a/actions/accesstoken.php b/actions/accesstoken.php index f1ddfc6a1..c99aaeded 100644 --- a/actions/accesstoken.php +++ b/actions/accesstoken.php @@ -28,7 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/all.php b/actions/all.php index 6dbab080f..bfde3a7e4 100644 --- a/actions/all.php +++ b/actions/all.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/lib/personalgroupnav.php'; require_once INSTALLDIR.'/lib/noticelist.php'; diff --git a/actions/allrss.php b/actions/allrss.php index a5447fa9f..57efb73f0 100644 --- a/actions/allrss.php +++ b/actions/allrss.php @@ -29,7 +29,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/api.php b/actions/api.php index 91f30e87a..93e33085f 100644 --- a/actions/api.php +++ b/actions/api.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } class ApiAction extends Action { diff --git a/actions/attachment.php b/actions/attachment.php index 5d11faad8..6981354d1 100644 --- a/actions/attachment.php +++ b/actions/attachment.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/attachment_ajax.php b/actions/attachment_ajax.php index af37c9bcb..1e0728075 100644 --- a/actions/attachment_ajax.php +++ b/actions/attachment_ajax.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/attachment_thumbnail.php b/actions/attachment_thumbnail.php index 7add8e278..7d0ac97a6 100644 --- a/actions/attachment_thumbnail.php +++ b/actions/attachment_thumbnail.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php index e7ebaeee2..537950792 100644 --- a/actions/avatarbynickname.php +++ b/actions/avatarbynickname.php @@ -28,7 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php index 54baef88f..0bc439ff1 100644 --- a/actions/avatarsettings.php +++ b/actions/avatarsettings.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/block.php b/actions/block.php index 2441c6fba..408f16434 100644 --- a/actions/block.php +++ b/actions/block.php @@ -28,7 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php index 5b5c8bcfa..ca4a711cb 100644 --- a/actions/blockedfromgroup.php +++ b/actions/blockedfromgroup.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php index 94cd6ddf4..201694286 100644 --- a/actions/confirmaddress.php +++ b/actions/confirmaddress.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/conversation.php b/actions/conversation.php index c4a4e80da..900a724ef 100644 --- a/actions/conversation.php +++ b/actions/conversation.php @@ -27,7 +27,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/deletenotice.php b/actions/deletenotice.php index 8f6e9bdd1..3d040f2fa 100644 --- a/actions/deletenotice.php +++ b/actions/deletenotice.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/disfavor.php b/actions/disfavor.php index 25230ceac..6269f1bd2 100644 --- a/actions/disfavor.php +++ b/actions/disfavor.php @@ -29,7 +29,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/doc.php b/actions/doc.php index 1adb9b075..68295234c 100644 --- a/actions/doc.php +++ b/actions/doc.php @@ -29,7 +29,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/editgroup.php b/actions/editgroup.php index 62a629056..cac910e9b 100644 --- a/actions/editgroup.php +++ b/actions/editgroup.php @@ -29,7 +29,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/emailsettings.php b/actions/emailsettings.php index 1b4d73bbf..af528a892 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/facebookhome.php b/actions/facebookhome.php index a54d22a47..70f205205 100644 --- a/actions/facebookhome.php +++ b/actions/facebookhome.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/lib/facebookaction.php'; diff --git a/actions/facebookinvite.php b/actions/facebookinvite.php index aa8486585..6dfc9d688 100644 --- a/actions/facebookinvite.php +++ b/actions/facebookinvite.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/facebooklogin.php b/actions/facebooklogin.php index 64d24dd40..8ac2477ab 100644 --- a/actions/facebooklogin.php +++ b/actions/facebooklogin.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/facebookaction.php'); diff --git a/actions/facebookremove.php b/actions/facebookremove.php index 1547fb780..ae231c0fb 100644 --- a/actions/facebookremove.php +++ b/actions/facebookremove.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/lib/facebookaction.php'; diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php index 817a11828..84bdde910 100644 --- a/actions/facebooksettings.php +++ b/actions/facebooksettings.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/lib/facebookaction.php'; diff --git a/actions/favor.php b/actions/favor.php index a995188c3..2aeb1da61 100644 --- a/actions/favor.php +++ b/actions/favor.php @@ -29,7 +29,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/favorited.php b/actions/favorited.php index 006dd5488..5ba508cdf 100644 --- a/actions/favorited.php +++ b/actions/favorited.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php index 0302d10e5..2d5ce9854 100644 --- a/actions/favoritesrss.php +++ b/actions/favoritesrss.php @@ -29,7 +29,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/featured.php b/actions/featured.php index f38068eb6..39bf09d8f 100644 --- a/actions/featured.php +++ b/actions/featured.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/file.php b/actions/file.php index 005a13169..10c59a961 100644 --- a/actions/file.php +++ b/actions/file.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/actions/shownotice.php'); diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php index 40939d44b..b6de4f244 100644 --- a/actions/finishaddopenid.php +++ b/actions/finishaddopenid.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php index 07da72fc0..9ac036985 100644 --- a/actions/finishopenidlogin.php +++ b/actions/finishopenidlogin.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/openid.php'); diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php index 5df36070f..871bc3d2d 100644 --- a/actions/finishremotesubscribe.php +++ b/actions/finishremotesubscribe.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/omb.php'); diff --git a/actions/foaf.php b/actions/foaf.php index d3ab098f4..4dae9dfc1 100644 --- a/actions/foaf.php +++ b/actions/foaf.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } define('LISTENER', 1); define('LISTENEE', -1); diff --git a/actions/groupblock.php b/actions/groupblock.php index e98f13224..979a56a81 100644 --- a/actions/groupblock.php +++ b/actions/groupblock.php @@ -27,7 +27,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/groupbyid.php b/actions/groupbyid.php index bc0709f4f..52cfaddfc 100644 --- a/actions/groupbyid.php +++ b/actions/groupbyid.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php index baef31018..cd86e3b05 100644 --- a/actions/groupdesignsettings.php +++ b/actions/groupdesignsettings.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/grouplogo.php b/actions/grouplogo.php index 30f865248..c6f376915 100644 --- a/actions/grouplogo.php +++ b/actions/grouplogo.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/groupmembers.php b/actions/groupmembers.php index 5a4ea27ab..dcbdd3759 100644 --- a/actions/groupmembers.php +++ b/actions/groupmembers.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/grouprss.php b/actions/grouprss.php index 7cd85c1af..70c1ded48 100644 --- a/actions/grouprss.php +++ b/actions/grouprss.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/groups.php b/actions/groups.php index 53b95c848..10a1d5964 100644 --- a/actions/groups.php +++ b/actions/groups.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/groupsearch.php b/actions/groupsearch.php index fc825a6fd..bbd4c3a74 100644 --- a/actions/groupsearch.php +++ b/actions/groupsearch.php @@ -28,7 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/groupunblock.php b/actions/groupunblock.php index 248b2a0a7..dd6b15c26 100644 --- a/actions/groupunblock.php +++ b/actions/groupunblock.php @@ -27,7 +27,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/imsettings.php b/actions/imsettings.php index 145cd7ed2..f57933b43 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/inbox.php b/actions/inbox.php index f5f7d8bcb..6cb7f9e15 100644 --- a/actions/inbox.php +++ b/actions/inbox.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/invite.php b/actions/invite.php index d8f15705b..ab43a2491 100644 --- a/actions/invite.php +++ b/actions/invite.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } class InviteAction extends CurrentUserDesignAction { diff --git a/actions/joingroup.php b/actions/joingroup.php index 32b59efa0..0209dd43f 100644 --- a/actions/joingroup.php +++ b/actions/joingroup.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/leavegroup.php b/actions/leavegroup.php index 27b5ea017..60b22e147 100644 --- a/actions/leavegroup.php +++ b/actions/leavegroup.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/login.php b/actions/login.php index 145236966..37f3c54ff 100644 --- a/actions/login.php +++ b/actions/login.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/logout.php b/actions/logout.php index eda5cefe5..298b2a484 100644 --- a/actions/logout.php +++ b/actions/logout.php @@ -28,7 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/makeadmin.php b/actions/makeadmin.php index 7866f42c1..2dfddebc2 100644 --- a/actions/makeadmin.php +++ b/actions/makeadmin.php @@ -27,7 +27,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/microsummary.php b/actions/microsummary.php index 8f2d34998..5c01a9ce0 100644 --- a/actions/microsummary.php +++ b/actions/microsummary.php @@ -28,7 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/newgroup.php b/actions/newgroup.php index 544dd3818..01cb636aa 100644 --- a/actions/newgroup.php +++ b/actions/newgroup.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/newmessage.php b/actions/newmessage.php index 579871546..828a339cf 100644 --- a/actions/newmessage.php +++ b/actions/newmessage.php @@ -29,7 +29,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/newnotice.php b/actions/newnotice.php index 4b542815b..00a822860 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -29,7 +29,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/noticesearch.php b/actions/noticesearch.php index e268c69ab..1188e7e10 100644 --- a/actions/noticesearch.php +++ b/actions/noticesearch.php @@ -29,7 +29,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php index 67bca01b5..f59ad7962 100644 --- a/actions/noticesearchrss.php +++ b/actions/noticesearchrss.php @@ -28,7 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/nudge.php b/actions/nudge.php index b699a3144..cf5f773e7 100644 --- a/actions/nudge.php +++ b/actions/nudge.php @@ -29,7 +29,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/oembed.php b/actions/oembed.php index 5f6751b5a..e287b6ae2 100644 --- a/actions/oembed.php +++ b/actions/oembed.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/openidlogin.php b/actions/openidlogin.php index 42d740938..4b5338694 100644 --- a/actions/openidlogin.php +++ b/actions/openidlogin.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/openid.php'); diff --git a/actions/openidsettings.php b/actions/openidsettings.php index 09e678e3c..13da64a4f 100644 --- a/actions/openidsettings.php +++ b/actions/openidsettings.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/opensearch.php b/actions/opensearch.php index 8ef13dd7a..d5e6698f3 100644 --- a/actions/opensearch.php +++ b/actions/opensearch.php @@ -29,7 +29,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/othersettings.php b/actions/othersettings.php index 244c34eab..8b674161a 100644 --- a/actions/othersettings.php +++ b/actions/othersettings.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/outbox.php b/actions/outbox.php index a1fc81dfd..537fad3ef 100644 --- a/actions/outbox.php +++ b/actions/outbox.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php index e7cd0ab51..ec842600f 100644 --- a/actions/passwordsettings.php +++ b/actions/passwordsettings.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php index 43c966f9c..ba0f71e39 100644 --- a/actions/peoplesearch.php +++ b/actions/peoplesearch.php @@ -28,7 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/peopletag.php b/actions/peopletag.php index 0c5321fae..6dbbc9261 100644 --- a/actions/peopletag.php +++ b/actions/peopletag.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/postnotice.php b/actions/postnotice.php index 883cd53fb..e775ca17e 100644 --- a/actions/postnotice.php +++ b/actions/postnotice.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/omb.php'); diff --git a/actions/profilesettings.php b/actions/profilesettings.php index 2f9d2bac9..f9c16351d 100644 --- a/actions/profilesettings.php +++ b/actions/profilesettings.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/public.php b/actions/public.php index f8ecc0e78..d426648f3 100644 --- a/actions/public.php +++ b/actions/public.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/publicrss.php b/actions/publicrss.php index 0d75ffc35..593888b9f 100644 --- a/actions/publicrss.php +++ b/actions/publicrss.php @@ -29,7 +29,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php index 026827fbe..60bb53e27 100644 --- a/actions/publictagcloud.php +++ b/actions/publictagcloud.php @@ -29,7 +29,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } define('TAGS_PER_PAGE', 100); diff --git a/actions/publicxrds.php b/actions/publicxrds.php index 921106a5f..209a10e3d 100644 --- a/actions/publicxrds.php +++ b/actions/publicxrds.php @@ -29,7 +29,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php index 279f1cef1..9776c1fb4 100644 --- a/actions/recoverpassword.php +++ b/actions/recoverpassword.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } # You have 24 hours to claim your password diff --git a/actions/register.php b/actions/register.php index a219c03d8..c431aeee3 100644 --- a/actions/register.php +++ b/actions/register.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php index 793275781..374392d4a 100644 --- a/actions/remotesubscribe.php +++ b/actions/remotesubscribe.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/omb.php'); diff --git a/actions/replies.php b/actions/replies.php index 954d7ce19..cca430230 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/repliesrss.php b/actions/repliesrss.php index 5115453b7..c71c9226f 100644 --- a/actions/repliesrss.php +++ b/actions/repliesrss.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/rssaction.php'); diff --git a/actions/requesttoken.php b/actions/requesttoken.php index 243844c4b..48fe1db08 100644 --- a/actions/requesttoken.php +++ b/actions/requesttoken.php @@ -29,7 +29,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/showfavorites.php b/actions/showfavorites.php index 9734496ba..0f7a66330 100644 --- a/actions/showfavorites.php +++ b/actions/showfavorites.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/showgroup.php b/actions/showgroup.php index 965b933e2..8157ee3c8 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/showmessage.php b/actions/showmessage.php index 5d23fb13f..db757948b 100644 --- a/actions/showmessage.php +++ b/actions/showmessage.php @@ -26,7 +26,7 @@ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/shownotice.php b/actions/shownotice.php index 4f7c3af7f..3bc52b2db 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/showstream.php b/actions/showstream.php index 93730812c..4d3067eed 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/smssettings.php b/actions/smssettings.php index bfe49feee..b956cceba 100644 --- a/actions/smssettings.php +++ b/actions/smssettings.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/subedit.php b/actions/subedit.php index 3320bdc59..cf6589e50 100644 --- a/actions/subedit.php +++ b/actions/subedit.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } class SubeditAction extends Action { diff --git a/actions/subscribe.php b/actions/subscribe.php index fb1fb5e6b..4c46806e4 100644 --- a/actions/subscribe.php +++ b/actions/subscribe.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } class SubscribeAction extends Action { diff --git a/actions/subscribers.php b/actions/subscribers.php index 3000f17b0..f7d08d9d0 100644 --- a/actions/subscribers.php +++ b/actions/subscribers.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/subscriptions.php b/actions/subscriptions.php index 8cad9e3b4..b1c668228 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } @@ -42,7 +42,7 @@ if (!defined('STATUSNET')) { * @link http://status.net/ */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } class SubscriptionsAction extends GalleryAction { diff --git a/actions/sup.php b/actions/sup.php index b635de194..5daf0a1c1 100644 --- a/actions/sup.php +++ b/actions/sup.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } class SupAction extends Action { diff --git a/actions/tag.php b/actions/tag.php index 935d00ab0..f0ab30308 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } class TagAction extends Action { diff --git a/actions/tagother.php b/actions/tagother.php index aaca46355..c3f43be8b 100644 --- a/actions/tagother.php +++ b/actions/tagother.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/settingsaction.php'); diff --git a/actions/tagrss.php b/actions/tagrss.php index 135b12135..75cbfa274 100644 --- a/actions/tagrss.php +++ b/actions/tagrss.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/rssaction.php'); diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php index dc043ddd3..93c8443c9 100644 --- a/actions/twitapiaccount.php +++ b/actions/twitapiaccount.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/twitapiblocks.php b/actions/twitapiblocks.php index 808e79220..ed17946ae 100644 --- a/actions/twitapiblocks.php +++ b/actions/twitapiblocks.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/twitapidirect_messages.php b/actions/twitapidirect_messages.php index 8511fcbe2..dbe55804b 100644 --- a/actions/twitapidirect_messages.php +++ b/actions/twitapidirect_messages.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/twitapifavorites.php b/actions/twitapifavorites.php index d812b5034..f8943fe2d 100644 --- a/actions/twitapifavorites.php +++ b/actions/twitapifavorites.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php index 015a5dbae..f2ea46910 100644 --- a/actions/twitapifriendships.php +++ b/actions/twitapifriendships.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php index c3e028c17..214fa8214 100644 --- a/actions/twitapigroups.php +++ b/actions/twitapigroups.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/twitapihelp.php b/actions/twitapihelp.php index 3fc232f64..81381620e 100644 --- a/actions/twitapihelp.php +++ b/actions/twitapihelp.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/twitapinotifications.php b/actions/twitapinotifications.php index 7bc9dd14b..0653e69ab 100644 --- a/actions/twitapinotifications.php +++ b/actions/twitapinotifications.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/twitterapi.php'); diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index 3ccd8c5b6..2f587d604 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/twitapisearchjson.php b/actions/twitapisearchjson.php index 173295176..c628ee624 100644 --- a/actions/twitapisearchjson.php +++ b/actions/twitapisearchjson.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php index e522b6357..edee239a0 100644 --- a/actions/twitapistatuses.php +++ b/actions/twitapistatuses.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/twitapistatusnet.php b/actions/twitapistatusnet.php index c75e5e858..490f11dce 100644 --- a/actions/twitapistatusnet.php +++ b/actions/twitapistatusnet.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/twitapitags.php b/actions/twitapitags.php index 0f2b571c6..2bb7ee01a 100644 --- a/actions/twitapitags.php +++ b/actions/twitapitags.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/twitapitrends.php b/actions/twitapitrends.php index 436451c0f..83ab28f35 100644 --- a/actions/twitapitrends.php +++ b/actions/twitapitrends.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php index 853a6b8fa..703fa6754 100644 --- a/actions/twitapiusers.php +++ b/actions/twitapiusers.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/twitterauthorization.php b/actions/twitterauthorization.php index 3745a67cf..630ac426f 100644 --- a/actions/twitterauthorization.php +++ b/actions/twitterauthorization.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/twittersettings.php b/actions/twittersettings.php index c23fa2ff8..563d867a4 100644 --- a/actions/twittersettings.php +++ b/actions/twittersettings.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/unblock.php b/actions/unblock.php index 43f454340..dc28d5d54 100644 --- a/actions/unblock.php +++ b/actions/unblock.php @@ -28,7 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php index bedea9f28..4a5863489 100644 --- a/actions/unsubscribe.php +++ b/actions/unsubscribe.php @@ -28,7 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/updateprofile.php b/actions/updateprofile.php index d48686401..9a4cf8e46 100644 --- a/actions/updateprofile.php +++ b/actions/updateprofile.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/omb.php'); diff --git a/actions/userauthorization.php b/actions/userauthorization.php index 38329a2c7..a9ac1f256 100644 --- a/actions/userauthorization.php +++ b/actions/userauthorization.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/omb.php'); define('TIMESTAMP_THRESHOLD', 300); diff --git a/actions/userbyid.php b/actions/userbyid.php index 4ed78688b..802bcb081 100644 --- a/actions/userbyid.php +++ b/actions/userbyid.php @@ -29,7 +29,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php index 07d160984..568c1d624 100644 --- a/actions/userdesignsettings.php +++ b/actions/userdesignsettings.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/usergroups.php b/actions/usergroups.php index 7cdc132b8..84e105153 100644 --- a/actions/usergroups.php +++ b/actions/usergroups.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/actions/userrss.php b/actions/userrss.php index 1437a4c22..fa6d588cd 100644 --- a/actions/userrss.php +++ b/actions/userrss.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/rssaction.php'); diff --git a/actions/xrds.php b/actions/xrds.php index 86f7d7616..def10e4cf 100644 --- a/actions/xrds.php +++ b/actions/xrds.php @@ -29,7 +29,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/classes/Design.php b/classes/Design.php index c4820bf1e..89ae50c8c 100644 --- a/classes/Design.php +++ b/classes/Design.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/classes/File.php b/classes/File.php index 063c16425..0cebfc55e 100644 --- a/classes/File.php +++ b/classes/File.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; require_once INSTALLDIR.'/classes/File_redirection.php'; diff --git a/classes/File_oembed.php b/classes/File_oembed.php index c28f5c396..6be651815 100644 --- a/classes/File_oembed.php +++ b/classes/File_oembed.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; diff --git a/classes/File_redirection.php b/classes/File_redirection.php index 832d66b2b..76b18f672 100644 --- a/classes/File_redirection.php +++ b/classes/File_redirection.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; require_once INSTALLDIR.'/classes/File.php'; diff --git a/classes/File_thumbnail.php b/classes/File_thumbnail.php index 2c0689f94..f8b70356c 100644 --- a/classes/File_thumbnail.php +++ b/classes/File_thumbnail.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; diff --git a/classes/File_to_post.php b/classes/File_to_post.php index ea5751042..e3db91b20 100644 --- a/classes/File_to_post.php +++ b/classes/File_to_post.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; diff --git a/classes/Group_alias.php b/classes/Group_alias.php index 93bb75796..be3d0a6c6 100644 --- a/classes/Group_alias.php +++ b/classes/Group_alias.php @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; diff --git a/classes/Group_block.php b/classes/Group_block.php index bd8b24926..de2cf5f6e 100644 --- a/classes/Group_block.php +++ b/classes/Group_block.php @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index e2935cfc5..9c2ac3e01 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; diff --git a/classes/Notice.php b/classes/Notice.php index 607f35571..e59712864 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } /** * Table Definition for notice diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php index 60f11cd71..d3e7853b1 100644 --- a/classes/Notice_inbox.php +++ b/classes/Notice_inbox.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; diff --git a/classes/Profile.php b/classes/Profile.php index 982415753..6ad0e7a3a 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } /** * Table Definition for profile diff --git a/classes/Profile_block.php b/classes/Profile_block.php index b218244e3..2d87edaa0 100644 --- a/classes/Profile_block.php +++ b/classes/Profile_block.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } /** * Table Definition for profile_block diff --git a/classes/Remote_profile.php b/classes/Remote_profile.php index 9d100412a..9f7bfeadc 100644 --- a/classes/Remote_profile.php +++ b/classes/Remote_profile.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } /** * Table Definition for remote_profile diff --git a/classes/Session.php b/classes/Session.php index 04958b61d..d641edbbe 100644 --- a/classes/Session.php +++ b/classes/Session.php @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; diff --git a/classes/Status_network.php b/classes/Status_network.php index e91bba1ac..d526cb4d6 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } class Status_network extends DB_DataObject { diff --git a/classes/Subscription.php b/classes/Subscription.php index 0e2b5a307..fedfd5f19 100644 --- a/classes/Subscription.php +++ b/classes/Subscription.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } /** * Table Definition for subscription diff --git a/classes/User.php b/classes/User.php index 529957649..14d3cf54f 100644 --- a/classes/User.php +++ b/classes/User.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/index.php b/index.php index bbb78b6a9..7669778f6 100644 --- a/index.php +++ b/index.php @@ -19,6 +19,7 @@ define('INSTALLDIR', dirname(__FILE__)); define('STATUSNET', true); +define('LACONICA', true); // compatibility require_once INSTALLDIR . '/lib/common.php'; diff --git a/install.php b/install.php index 9e01ff738..d278bcc17 100644 --- a/install.php +++ b/install.php @@ -363,7 +363,7 @@ function writeConf($sitename, $server, $path, $fancy, $db) { // assemble configuration file in a string $cfg = ". */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } class ShortUrlApi { diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php index 337d34e9a..798116163 100644 --- a/lib/accountsettingsaction.php +++ b/lib/accountsettingsaction.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/action.php b/lib/action.php index cb922f60e..4033b6578 100644 --- a/lib/action.php +++ b/lib/action.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/arraywrapper.php b/lib/arraywrapper.php index 424714e90..8a1cdd96e 100644 --- a/lib/arraywrapper.php +++ b/lib/arraywrapper.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php index a713a1085..51ceca857 100644 --- a/lib/attachmentlist.php +++ b/lib/attachmentlist.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/attachmentnoticesection.php b/lib/attachmentnoticesection.php index b98de8b6f..578c171ff 100644 --- a/lib/attachmentnoticesection.php +++ b/lib/attachmentnoticesection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/attachmenttagcloudsection.php b/lib/attachmenttagcloudsection.php index fc5145ad0..e2f85ae02 100644 --- a/lib/attachmenttagcloudsection.php +++ b/lib/attachmenttagcloudsection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/blockform.php b/lib/blockform.php index cfec321a1..4820d09af 100644 --- a/lib/blockform.php +++ b/lib/blockform.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/channel.php b/lib/channel.php index 95d576a3c..3cd168786 100644 --- a/lib/channel.php +++ b/lib/channel.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } class Channel { diff --git a/lib/clienterroraction.php b/lib/clienterroraction.php index 2a1a51b72..7d007a756 100644 --- a/lib/clienterroraction.php +++ b/lib/clienterroraction.php @@ -29,7 +29,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/clientexception.php b/lib/clientexception.php index 5981f8bb8..01c013a01 100644 --- a/lib/clientexception.php +++ b/lib/clientexception.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/command.php b/lib/command.php index eac4b2cd9..91a20b810 100644 --- a/lib/command.php +++ b/lib/command.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/channel.php'); diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php index 6babcba4f..ac6bf73c8 100644 --- a/lib/commandinterpreter.php +++ b/lib/commandinterpreter.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once INSTALLDIR.'/lib/command.php'; diff --git a/lib/common.php b/lib/common.php index e658eaeb2..030d560aa 100644 --- a/lib/common.php +++ b/lib/common.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } define('STATUSNET_VERSION', '0.8.1pre1'); diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php index 058585565..2095a7ceb 100644 --- a/lib/connectsettingsaction.php +++ b/lib/connectsettingsaction.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/currentuserdesignaction.php b/lib/currentuserdesignaction.php index e28b8caf6..c2f38cd00 100644 --- a/lib/currentuserdesignaction.php +++ b/lib/currentuserdesignaction.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/daemon.php b/lib/daemon.php index 9a3e1e7e9..4c2491e97 100644 --- a/lib/daemon.php +++ b/lib/daemon.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/dberroraction.php b/lib/dberroraction.php index bd8ccdd31..2cb66a022 100644 --- a/lib/dberroraction.php +++ b/lib/dberroraction.php @@ -28,7 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/deleteaction.php b/lib/deleteaction.php index 89bed93ed..f702820c6 100644 --- a/lib/deleteaction.php +++ b/lib/deleteaction.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/designsettings.php b/lib/designsettings.php index 21cb9d793..fe4222597 100644 --- a/lib/designsettings.php +++ b/lib/designsettings.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/disfavorform.php b/lib/disfavorform.php index f3a022fec..5b135b38a 100644 --- a/lib/disfavorform.php +++ b/lib/disfavorform.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/error.php b/lib/error.php index e7bba8a47..0c521db08 100644 --- a/lib/error.php +++ b/lib/error.php @@ -29,7 +29,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/event.php b/lib/event.php index 106bbfd04..4819b71b4 100644 --- a/lib/event.php +++ b/lib/event.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/facebookaction.php b/lib/facebookaction.php index 62797d1dd..ca67a094a 100644 --- a/lib/facebookaction.php +++ b/lib/facebookaction.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/favorform.php b/lib/favorform.php index d38c5b130..625df7c8b 100644 --- a/lib/favorform.php +++ b/lib/favorform.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/featureduserssection.php b/lib/featureduserssection.php index 3065ff623..f0753a25e 100644 --- a/lib/featureduserssection.php +++ b/lib/featureduserssection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/feed.php b/lib/feed.php index 8660c75ed..e9fb6fdff 100644 --- a/lib/feed.php +++ b/lib/feed.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/feedlist.php b/lib/feedlist.php index 2a750bf77..9ae83f5e8 100644 --- a/lib/feedlist.php +++ b/lib/feedlist.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/form.php b/lib/form.php index dffb6bce4..87b7a5cba 100644 --- a/lib/form.php +++ b/lib/form.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/galleryaction.php b/lib/galleryaction.php index 0cbb5f8c0..18cc7b929 100644 --- a/lib/galleryaction.php +++ b/lib/galleryaction.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/groupdesignaction.php b/lib/groupdesignaction.php index a9de600fe..3eb3964e8 100644 --- a/lib/groupdesignaction.php +++ b/lib/groupdesignaction.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/groupeditform.php b/lib/groupeditform.php index 8ae6a23d5..a649c2ee3 100644 --- a/lib/groupeditform.php +++ b/lib/groupeditform.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/grouplist.php b/lib/grouplist.php index b042fb1b6..b41c5b5f8 100644 --- a/lib/grouplist.php +++ b/lib/grouplist.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/groupminilist.php b/lib/groupminilist.php index 4864d4657..dff81eff5 100644 --- a/lib/groupminilist.php +++ b/lib/groupminilist.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/groupnav.php b/lib/groupnav.php index f8ed180f1..31cf378c8 100644 --- a/lib/groupnav.php +++ b/lib/groupnav.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/groupsbymemberssection.php b/lib/groupsbymemberssection.php index 156afe669..19b35eddb 100644 --- a/lib/groupsbymemberssection.php +++ b/lib/groupsbymemberssection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/groupsbypostssection.php b/lib/groupsbypostssection.php index 1c2a1c88f..45d49aba6 100644 --- a/lib/groupsbypostssection.php +++ b/lib/groupsbypostssection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/groupsection.php b/lib/groupsection.php index e3887bfd2..7327f9e1a 100644 --- a/lib/groupsection.php +++ b/lib/groupsection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/grouptagcloudsection.php b/lib/grouptagcloudsection.php index 93699f62c..091cf4845 100644 --- a/lib/grouptagcloudsection.php +++ b/lib/grouptagcloudsection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index 1da8406f3..8ad7dc20f 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/imagefile.php b/lib/imagefile.php index 2619fd9d3..88f461481 100644 --- a/lib/imagefile.php +++ b/lib/imagefile.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/jabber.php b/lib/jabber.php index 0054c4def..3dcdce5db 100644 --- a/lib/jabber.php +++ b/lib/jabber.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/joinform.php b/lib/joinform.php index 47c94dd45..aefb553aa 100644 --- a/lib/joinform.php +++ b/lib/joinform.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/jsonsearchresultslist.php b/lib/jsonsearchresultslist.php index a315d0abd..569bfa873 100644 --- a/lib/jsonsearchresultslist.php +++ b/lib/jsonsearchresultslist.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/language.php b/lib/language.php index 2039ef689..561a4ddb8 100644 --- a/lib/language.php +++ b/lib/language.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/leaveform.php b/lib/leaveform.php index 7068da0eb..e63d96ee8 100644 --- a/lib/leaveform.php +++ b/lib/leaveform.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php index 5e8682c03..f740e329a 100644 --- a/lib/logingroupnav.php +++ b/lib/logingroupnav.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/mail.php b/lib/mail.php index 31bf79d2f..df585406c 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -30,7 +30,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/mailbox.php b/lib/mailbox.php index 9391775f1..a09bf1060 100644 --- a/lib/mailbox.php +++ b/lib/mailbox.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/messageform.php b/lib/messageform.php index a8e514d05..6431bfdcc 100644 --- a/lib/messageform.php +++ b/lib/messageform.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/microid.php b/lib/microid.php index 179042456..e2e7d7607 100644 --- a/lib/microid.php +++ b/lib/microid.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/noticeform.php b/lib/noticeform.php index 7b6d7d21f..1e3a45142 100644 --- a/lib/noticeform.php +++ b/lib/noticeform.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/noticelist.php b/lib/noticelist.php index 4d6de98bc..ec85e4a5c 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/noticesection.php b/lib/noticesection.php index e7c3f9a54..b223932ef 100644 --- a/lib/noticesection.php +++ b/lib/noticesection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/nudgeform.php b/lib/nudgeform.php index d6346cde7..3f13b5846 100644 --- a/lib/nudgeform.php +++ b/lib/nudgeform.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/oauthclient.php b/lib/oauthclient.php index bd965a3bf..cc10cea8f 100644 --- a/lib/oauthclient.php +++ b/lib/oauthclient.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/oauthstore.php b/lib/oauthstore.php index 151926008..6db07b20f 100644 --- a/lib/oauthstore.php +++ b/lib/oauthstore.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/omb.php'); diff --git a/lib/omb.php b/lib/omb.php index 0a03d8125..0d6244599 100644 --- a/lib/omb.php +++ b/lib/omb.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once('OAuth.php'); require_once(INSTALLDIR.'/lib/oauthstore.php'); diff --git a/lib/openid.php b/lib/openid.php index 87df4f30b..7a2c46f00 100644 --- a/lib/openid.php +++ b/lib/openid.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/classes/User_openid.php'); diff --git a/lib/ownerdesignaction.php b/lib/ownerdesignaction.php index 3ee2c9907..d557f10c0 100644 --- a/lib/ownerdesignaction.php +++ b/lib/ownerdesignaction.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/parallelizingdaemon.php b/lib/parallelizingdaemon.php index 664e9bbd3..517115de0 100644 --- a/lib/parallelizingdaemon.php +++ b/lib/parallelizingdaemon.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php index 61d1ff676..cdde1feca 100644 --- a/lib/personalgroupnav.php +++ b/lib/personalgroupnav.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/personaltagcloudsection.php b/lib/personaltagcloudsection.php index c10b0941d..0b29d58ca 100644 --- a/lib/personaltagcloudsection.php +++ b/lib/personaltagcloudsection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/ping.php b/lib/ping.php index 48b4fa18f..175bf8440 100644 --- a/lib/ping.php +++ b/lib/ping.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } function ping_broadcast_notice($notice) { diff --git a/lib/plugin.php b/lib/plugin.php index 4f53eee6b..87d7be5a7 100644 --- a/lib/plugin.php +++ b/lib/plugin.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php index 22e8e5468..35b914a50 100644 --- a/lib/popularnoticesection.php +++ b/lib/popularnoticesection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/profileaction.php b/lib/profileaction.php index 8b0c3b87e..e3a39ad8b 100644 --- a/lib/profileaction.php +++ b/lib/profileaction.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/profilelist.php b/lib/profilelist.php index 251da5e45..331430b3e 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/profileminilist.php b/lib/profileminilist.php index 13058d320..079170d80 100644 --- a/lib/profileminilist.php +++ b/lib/profileminilist.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/profilesection.php b/lib/profilesection.php index 31658afe2..504b1b7f7 100644 --- a/lib/profilesection.php +++ b/lib/profilesection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php index a442bfc70..ae9cbdebb 100644 --- a/lib/publicgroupnav.php +++ b/lib/publicgroupnav.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/queuehandler.php b/lib/queuehandler.php index 867fe41b8..8c65a97c6 100644 --- a/lib/queuehandler.php +++ b/lib/queuehandler.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/daemon.php'); require_once(INSTALLDIR.'/classes/Queue_item.php'); diff --git a/lib/router.php b/lib/router.php index b7b4a8e59..b25b1705f 100644 --- a/lib/router.php +++ b/lib/router.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/rssaction.php b/lib/rssaction.php index 44c9003a0..60611e48d 100644 --- a/lib/rssaction.php +++ b/lib/rssaction.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } define('DEFAULT_RSS_LIMIT', 48); diff --git a/lib/search_engines.php b/lib/search_engines.php index 74513e2ea..69f6ff468 100644 --- a/lib/search_engines.php +++ b/lib/search_engines.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } class SearchEngine { diff --git a/lib/searchaction.php b/lib/searchaction.php index a935eb102..0d9f85a8f 100644 --- a/lib/searchaction.php +++ b/lib/searchaction.php @@ -28,7 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php index bf79e0abc..677365ea9 100644 --- a/lib/searchgroupnav.php +++ b/lib/searchgroupnav.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/section.php b/lib/section.php index d605d458d..53a3a70fa 100644 --- a/lib/section.php +++ b/lib/section.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/servererroraction.php b/lib/servererroraction.php index 9ed3832a6..c6400605e 100644 --- a/lib/servererroraction.php +++ b/lib/servererroraction.php @@ -29,7 +29,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/serverexception.php b/lib/serverexception.php index 856866ae9..7dc9765ad 100644 --- a/lib/serverexception.php +++ b/lib/serverexception.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/settingsaction.php b/lib/settingsaction.php index aba196db9..a1f305f5b 100644 --- a/lib/settingsaction.php +++ b/lib/settingsaction.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/snapshot.php b/lib/snapshot.php index b15fe3a6c..ede846e5b 100644 --- a/lib/snapshot.php +++ b/lib/snapshot.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/subgroupnav.php b/lib/subgroupnav.php index 590bec38c..2748b59e1 100644 --- a/lib/subgroupnav.php +++ b/lib/subgroupnav.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/subpeopletagcloudsection.php b/lib/subpeopletagcloudsection.php index 8909c5a74..b23a82240 100644 --- a/lib/subpeopletagcloudsection.php +++ b/lib/subpeopletagcloudsection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/subs.php b/lib/subs.php index ae3949b75..68c89c842 100644 --- a/lib/subs.php +++ b/lib/subs.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once('XMPPHP/XMPP.php'); diff --git a/lib/subscribeform.php b/lib/subscribeform.php index c7216f974..ae2a6db61 100644 --- a/lib/subscribeform.php +++ b/lib/subscribeform.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/subscriberspeopleselftagcloudsection.php b/lib/subscriberspeopleselftagcloudsection.php index c35f39f2c..5a570ae28 100644 --- a/lib/subscriberspeopleselftagcloudsection.php +++ b/lib/subscriberspeopleselftagcloudsection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/subscriberspeopletagcloudsection.php b/lib/subscriberspeopletagcloudsection.php index a850dbc86..284996b59 100644 --- a/lib/subscriberspeopletagcloudsection.php +++ b/lib/subscriberspeopletagcloudsection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php index 0767196e9..89f63e321 100644 --- a/lib/subscriptionlist.php +++ b/lib/subscriptionlist.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/subscriptionspeopleselftagcloudsection.php b/lib/subscriptionspeopleselftagcloudsection.php index 839e2b161..9be60dfa1 100644 --- a/lib/subscriptionspeopleselftagcloudsection.php +++ b/lib/subscriptionspeopleselftagcloudsection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/subscriptionspeopletagcloudsection.php b/lib/subscriptionspeopletagcloudsection.php index 38d93946f..fde24b282 100644 --- a/lib/subscriptionspeopletagcloudsection.php +++ b/lib/subscriptionspeopletagcloudsection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/tagcloudsection.php b/lib/tagcloudsection.php index 20533dbe2..692f5d966 100644 --- a/lib/tagcloudsection.php +++ b/lib/tagcloudsection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/theme.php b/lib/theme.php index ceec3dff0..08e3e8538 100644 --- a/lib/theme.php +++ b/lib/theme.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/topposterssection.php b/lib/topposterssection.php index 7d8348d44..cbb6a98eb 100644 --- a/lib/topposterssection.php +++ b/lib/topposterssection.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/twitter.php b/lib/twitter.php index 504744519..7546ffa98 100644 --- a/lib/twitter.php +++ b/lib/twitter.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/twitterapi.php b/lib/twitterapi.php index 2c713f366..c8099978f 100644 --- a/lib/twitterapi.php +++ b/lib/twitterapi.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/twitteroauthclient.php b/lib/twitteroauthclient.php index e8f6e21ba..3da522fc5 100644 --- a/lib/twitteroauthclient.php +++ b/lib/twitteroauthclient.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/unblockform.php b/lib/unblockform.php index c6310dc0f..f1343757c 100644 --- a/lib/unblockform.php +++ b/lib/unblockform.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php index 0ce343e11..cb6a87515 100644 --- a/lib/unsubscribeform.php +++ b/lib/unsubscribeform.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/webcolor.php b/lib/webcolor.php index 922e6794f..6fa603fa2 100644 --- a/lib/webcolor.php +++ b/lib/webcolor.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/widget.php b/lib/widget.php index 43bc4a481..0258c8649 100644 --- a/lib/widget.php +++ b/lib/widget.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/xmloutputter.php b/lib/xmloutputter.php index 7d2788d71..5f06e491d 100644 --- a/lib/xmloutputter.php +++ b/lib/xmloutputter.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/xmlstringer.php b/lib/xmlstringer.php index bd17ab09c..b505e40d3 100644 --- a/lib/xmlstringer.php +++ b/lib/xmlstringer.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php index 45a8e2c0d..f28fc9088 100644 --- a/lib/xmppqueuehandler.php +++ b/lib/xmppqueuehandler.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET')) { exit(1); } +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/queuehandler.php'); diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php index 49b6d42b1..b75397270 100644 --- a/plugins/Autocomplete/AutocompletePlugin.php +++ b/plugins/Autocomplete/AutocompletePlugin.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php index d7ac2b859..300d1e9a2 100644 --- a/plugins/Comet/CometPlugin.php +++ b/plugins/Comet/CometPlugin.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/plugins/FBConnect/FBCLoginGroupNav.php b/plugins/FBConnect/FBCLoginGroupNav.php index 782f7198a..6e12c2040 100644 --- a/plugins/FBConnect/FBCLoginGroupNav.php +++ b/plugins/FBConnect/FBCLoginGroupNav.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/plugins/FBConnect/FBCSettingsNav.php b/plugins/FBConnect/FBCSettingsNav.php index a4ecbada1..29724d6bd 100644 --- a/plugins/FBConnect/FBCSettingsNav.php +++ b/plugins/FBConnect/FBCSettingsNav.php @@ -28,7 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/plugins/FBConnect/FBC_XDReceiver.php b/plugins/FBConnect/FBC_XDReceiver.php index 50c525c75..2bc790d5a 100644 --- a/plugins/FBConnect/FBC_XDReceiver.php +++ b/plugins/FBConnect/FBC_XDReceiver.php @@ -1,6 +1,6 @@ . */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/plugins/FBConnect/FBConnectPlugin.php b/plugins/FBConnect/FBConnectPlugin.php index fb50cc4c9..593b49b4e 100644 --- a/plugins/FBConnect/FBConnectPlugin.php +++ b/plugins/FBConnect/FBConnectPlugin.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/plugins/FBConnect/FBConnectSettings.php b/plugins/FBConnect/FBConnectSettings.php index fbb419980..911c56787 100644 --- a/plugins/FBConnect/FBConnectSettings.php +++ b/plugins/FBConnect/FBConnectSettings.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php index 59422e5d9..c955298cb 100644 --- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php +++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php index 4cb05693b..5b345d7c2 100644 --- a/plugins/Meteor/MeteorPlugin.php +++ b/plugins/Meteor/MeteorPlugin.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 9ecf70030..82eca3d08 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/plugins/recaptcha/recaptcha.php b/plugins/recaptcha/recaptcha.php index 9767f95d2..94cf0ccd1 100644 --- a/plugins/recaptcha/recaptcha.php +++ b/plugins/recaptcha/recaptcha.php @@ -27,7 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } diff --git a/scripts/fixup_hashtags.php b/scripts/fixup_hashtags.php index eba527b8d..5cfebd8ee 100755 --- a/scripts/fixup_hashtags.php +++ b/scripts/fixup_hashtags.php @@ -26,6 +26,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); define('STATUSNET', true); +define('LACONICA', true); // compatibility require_once(INSTALLDIR . '/lib/common.php'); diff --git a/scripts/fixup_inboxes.php b/scripts/fixup_inboxes.php index 0640fcc4f..d55a53885 100755 --- a/scripts/fixup_inboxes.php +++ b/scripts/fixup_inboxes.php @@ -31,6 +31,7 @@ mb_internal_encoding('UTF-8'); define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); define('STATUSNET', true); +define('LACONICA', true); // compatibility require_once(INSTALLDIR . '/lib/common.php'); diff --git a/scripts/fixup_notices_rendered.php b/scripts/fixup_notices_rendered.php index 2ccb7ce80..359cd6cce 100755 --- a/scripts/fixup_notices_rendered.php +++ b/scripts/fixup_notices_rendered.php @@ -26,6 +26,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); define('STATUSNET', true); +define('LACONICA', true); // compatibility require_once(INSTALLDIR . '/lib/common.php'); diff --git a/scripts/fixup_replies.php b/scripts/fixup_replies.php index 63dd6b35a..7328635d3 100755 --- a/scripts/fixup_replies.php +++ b/scripts/fixup_replies.php @@ -26,6 +26,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); define('STATUSNET', true); +define('LACONICA', true); // compatibility require_once(INSTALLDIR . '/lib/common.php'); diff --git a/scripts/update_translations.php b/scripts/update_translations.php index 4f02b55ec..f145c1f0b 100755 --- a/scripts/update_translations.php +++ b/scripts/update_translations.php @@ -26,6 +26,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); define('STATUSNET', true); +define('LACONICA', true); // compatibility require_once(INSTALLDIR . '/lib/common.php'); -- cgit v1.2.3-54-g00ecf