From 865b716f0919b6e5133133cd6be53f4143660324 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 25 Aug 2009 18:42:34 -0400 Subject: change LACONICA to STATUSNET --- 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 +- 104 files changed, 118 insertions(+), 118 deletions(-) (limited to 'lib') diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php index 365ddff79..018b917c1 100644 --- a/lib/Shorturl_api.php +++ b/lib/Shorturl_api.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -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'); -- cgit v1.2.3-54-g00ecf