diff --git a/actions/accesstoken.php b/actions/accesstoken.php
index f1ddfc6a17..c99aaeded3 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 6dbab080f8..bfde3a7e4a 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 a5447fa9fc..57efb73f0e 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 91f30e87ab..93e33085f9 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 5d11faad85..6981354d10 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 af37c9bcb5..1e07280750 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 7add8e278d..7d0ac97a69 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 e7ebaeee2d..537950792f 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 54baef88fb..0bc439ff12 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 2441c6fba4..408f16434b 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 5b5c8bcfaa..ca4a711cb7 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 94cd6ddf4b..2016942862 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 c4a4e80dac..900a724ef3 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 8f6e9bdd1f..3d040f2fa9 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 25230ceac8..6269f1bd25 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 1adb9b0750..68295234c5 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 62a6290566..cac910e9bc 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 1b4d73bbf0..af528a892e 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 a54d22a473..70f2052053 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 aa84865859..6dfc9d6881 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 64d24dd407..8ac2477ab4 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 1547fb7801..ae231c0fb3 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 817a11828c..84bdde9101 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 a995188c3c..2aeb1da613 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 006dd54883..5ba508cdf5 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 0302d10e5f..2d5ce98541 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 f38068eb68..39bf09d8f0 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 005a13169a..10c59a9612 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 40939d44b3..b6de4f2448 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 07da72fc0f..9ac0369852 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 5df36070fa..871bc3d2d1 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 d3ab098f4d..4dae9dfc19 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 e98f13224e..979a56a81d 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 bc0709f4f6..52cfaddfc3 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 baef31018f..cd86e3b051 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 30f865248b..c6f376915e 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 5a4ea27abe..dcbdd37597 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 7cd85c1af1..70c1ded488 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 53b95c8481..10a1d5964d 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 fc825a6fd2..bbd4c3a74a 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 248b2a0a7b..dd6b15c26c 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 145cd7ed2c..f57933b43f 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 f5f7d8bcb1..6cb7f9e157 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 d8f15705bc..ab43a2491d 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 32b59efa08..0209dd43fd 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 27b5ea0177..60b22e147d 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 1452369662..37f3c54ffb 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 eda5cefe5b..298b2a484b 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 7866f42c15..2dfddebc27 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 8f2d34998b..5c01a9ce0f 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 544dd38184..01cb636aaf 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 5798715463..828a339cfe 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 4b542815bb..00a822860e 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 e268c69abf..1188e7e10f 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 67bca01b53..f59ad79625 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 b699a31441..cf5f773e71 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 5f6751b5a8..e287b6ae2a 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 42d7409387..4b53386943 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 09e678e3c9..13da64a4f6 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 8ef13dd7a6..d5e6698f38 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 244c34eabb..8b674161a8 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 a1fc81dfda..537fad3ef4 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 e7cd0ab510..ec842600f6 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 43c966f9c1..ba0f71e392 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 0c5321faed..6dbbc92616 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 883cd53fbc..e775ca17e8 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 2f9d2bac93..f9c16351d3 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 f8ecc0e785..d426648f3d 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 0d75ffc358..593888b9f6 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 026827fbe5..60bb53e27c 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 921106a5f4..209a10e3d4 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 279f1cef12..9776c1fb44 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 a219c03d86..c431aeee3e 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 7932757817..374392d4a3 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 954d7ce19b..cca4302309 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 5115453b79..c71c9226fb 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 243844c4bc..48fe1db08f 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 9734496bac..0f7a663302 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 965b933e23..8157ee3c85 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 5d23fb13f3..db757948ba 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 4f7c3af7fe..3bc52b2dbc 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 93730812c4..4d3067eed3 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 bfe49feeec..b956ccebaa 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 3320bdc599..cf6589e504 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 fb1fb5e6bb..4c46806e40 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 3000f17b0c..f7d08d9d0b 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 8cad9e3b4a..b1c6682283 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 b635de194f..5daf0a1c1d 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 935d00ab06..f0ab30308c 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 aaca46355f..c3f43be8ba 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 135b12135d..75cbfa274b 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 dc043ddd32..93c8443c9f 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 808e79220f..ed17946aef 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 8511fcbe2e..dbe55804b1 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 d812b50349..f8943fe2dd 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 015a5dbaed..f2ea46910e 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 c3e028c175..214fa8214f 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 3fc232f64c..81381620e7 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 7bc9dd14b6..0653e69ab5 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 3ccd8c5b61..2f587d604f 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 1732951762..c628ee624a 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 e522b63579..edee239a03 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 c75e5e858c..490f11dce2 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 0f2b571c6e..2bb7ee01ab 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 436451c0f2..83ab28f35d 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 853a6b8fad..703fa6754f 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 3745a67cf9..630ac426fd 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 c23fa2ff82..563d867a49 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 43f454340d..dc28d5d54a 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 bedea9f285..4a5863489e 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 d486864011..9a4cf8e465 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 38329a2c70..a9ac1f256f 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 4ed78688b6..802bcb0815 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 07d160984f..568c1d6242 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 7cdc132b8b..84e105153d 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 1437a4c229..fa6d588cdf 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 86f7d7616b..def10e4cf7 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 c4820bf1eb..89ae50c8cb 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 063c164257..0cebfc55e3 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 c28f5c3961..6be6518152 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 832d66b2b9..76b18f672d 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 2c0689f947..f8b70356c7 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 ea57510426..e3db91b205 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 93bb75796d..be3d0a6c6f 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 bd8b249265..de2cf5f6eb 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 e2935cfc5c..9c2ac3e01c 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 607f355717..e597128641 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 60f11cd710..d3e7853b1b 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 9824157535..6ad0e7a3a3 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 b218244e32..2d87edaa0a 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 9d100412ab..9f7bfeadcc 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 04958b61de..d641edbbe4 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 e91bba1acc..d526cb4d61 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 0e2b5a3074..fedfd5f19e 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 529957649b..14d3cf54fa 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 bbb78b6a92..7669778f64 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 9e01ff738e..d278bcc178 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 337d34e9aa..7981161637 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 cb922f60e0..4033b6578b 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 424714e908..8a1cdd96e1 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 a713a10853..51ceca8576 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 b98de8b6fd..578c171ff5 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 fc5145ad0d..e2f85ae025 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 cfec321a18..4820d09afe 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 95d576a3c1..3cd168786c 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 2a1a51b721..7d007a7567 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 5981f8bb8c..01c013a011 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 eac4b2cd97..91a20b8109 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 6babcba4f5..ac6bf73c8e 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 e658eaeb23..030d560aa8 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 058585565f..2095a7cebf 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 e28b8caf67..c2f38cd00b 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 9a3e1e7e9d..4c2491e97b 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 bd8ccdd310..2cb66a022d 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 89bed93ed8..f702820c61 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 21cb9d7933..fe42225974 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 f3a022fece..5b135b38ad 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 e7bba8a47b..0c521db081 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 106bbfd041..4819b71b4c 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 62797d1dd0..ca67a094af 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 d38c5b1309..625df7c8b5 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 3065ff623e..f0753a25ed 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 8660c75ed3..e9fb6fdff3 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 2a750bf778..9ae83f5e88 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 dffb6bce4c..87b7a5cba9 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 0cbb5f8c0e..18cc7b9295 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 a9de600fe9..3eb3964e87 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 8ae6a23d5e..a649c2ee3b 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 b042fb1b69..b41c5b5f84 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 4864d4657e..dff81eff53 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 f8ed180f12..31cf378c8a 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 156afe6692..19b35eddb8 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 1c2a1c88f7..45d49aba66 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 e3887bfd27..7327f9e1a0 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 93699f62c8..091cf48457 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 1da8406f33..8ad7dc20fa 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 2619fd9d3b..88f4614814 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 0054c4def7..3dcdce5dbf 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 47c94dd458..aefb553aac 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 a315d0abd7..569bfa8734 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 2039ef6896..561a4ddb82 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 7068da0eb7..e63d96ee80 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 5e8682c032..f740e329a4 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 31bf79d2f9..df585406cc 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 9391775f18..a09bf1060a 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 a8e514d059..6431bfdcc8 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 1790424567..e2e7d7607f 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 7b6d7d21fd..1e3a45142c 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 4d6de98bce..ec85e4a5c1 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 e7c3f9a540..b223932efe 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 d6346cde7e..3f13b58462 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 bd965a3bfe..cc10cea8f9 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 1519260081..6db07b20f7 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 0a03d8125d..0d62445991 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 87df4f30b6..7a2c46f005 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 3ee2c99071..d557f10c06 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 664e9bbd37..517115de04 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 61d1ff676c..cdde1feca0 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 c10b0941d6..0b29d58ca6 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 48b4fa18f6..175bf8440b 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 4f53eee6b1..87d7be5a75 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 22e8e5468e..35b914a50c 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 8b0c3b87e2..e3a39ad8b7 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 251da5e45c..331430b3ef 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 13058d320c..079170d802 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 31658afe2d..504b1b7f75 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 a442bfc705..ae9cbdebb4 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 867fe41b83..8c65a97c66 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 b7b4a8e59c..b25b1705f5 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 44c9003a00..60611e48d0 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 74513e2ea1..69f6ff468e 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 a935eb1027..0d9f85a8f1 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 bf79e0abcd..677365ea9d 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 d605d458d7..53a3a70fa7 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 9ed3832a68..c6400605ea 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 856866ae9d..7dc9765ad6 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 aba196db92..a1f305f5b7 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 b15fe3a6cb..ede846e5b0 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 590bec38cf..2748b59e18 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 8909c5a74f..b23a82240d 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 ae3949b75e..68c89c8421 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 c7216f9748..ae2a6db61c 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 c35f39f2c2..5a570ae282 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 a850dbc869..284996b591 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 0767196e9f..89f63e3211 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 839e2b1618..9be60dfa14 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 38d93946f5..fde24b282e 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 20533dbe2d..692f5d9662 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 ceec3dff02..08e3e85383 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 7d8348d441..cbb6a98ebd 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 5047445198..7546ffa98a 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 2c713f3667..c8099978fa 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 e8f6e21ba9..3da522fc51 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 c6310dc0f4..f1343757c2 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 0ce343e11e..cb6a87515f 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 922e6794fe..6fa603fa2a 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 43bc4a481f..0258c8649e 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 7d2788d71e..5f06e491df 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 bd17ab09c4..b505e40d39 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 45a8e2c0d5..f28fc9088c 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 49b6d42b1e..b753972703 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 d7ac2b8591..300d1e9a24 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 782f7198ae..6e12c20403 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 a4ecbada15..29724d6bdf 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 50c525c750..2bc790d5a0 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 fb50cc4c9e..593b49b4ed 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 fbb4199809..911c567873 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 59422e5d93..c955298cb9 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 4cb05693b6..5b345d7c2f 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 9ecf70030d..82eca3d08c 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 9767f95d26..94cf0ccd17 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 eba527b8d6..5cfebd8ee8 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 0640fcc4f4..d55a538853 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 2ccb7ce80d..359cd6cce4 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 63dd6b35a4..7328635d3c 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 4f02b55ec7..f145c1f0b6 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');