define LACONICA and accept LACONICA for backwards compatibility

104 files changed, 104 insertions, 104 deletions

diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php
index 018b917c1..6402dbc09 100644
--- a/lib/Shorturl_api.php
+++ b/lib/Shorturl_api.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class ShortUrlApi
 {
diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php
index 337d34e9a..798116163 100644
--- a/lib/accountsettingsaction.php
+++ b/lib/accountsettingsaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/action.php b/lib/action.php
index cb922f60e..4033b6578 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/arraywrapper.php b/lib/arraywrapper.php
index 424714e90..8a1cdd96e 100644
--- a/lib/arraywrapper.php
+++ b/lib/arraywrapper.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index a713a1085..51ceca857 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/attachmentnoticesection.php b/lib/attachmentnoticesection.php
index b98de8b6f..578c171ff 100644
--- a/lib/attachmentnoticesection.php
+++ b/lib/attachmentnoticesection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/attachmenttagcloudsection.php b/lib/attachmenttagcloudsection.php
index fc5145ad0..e2f85ae02 100644
--- a/lib/attachmenttagcloudsection.php
+++ b/lib/attachmenttagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/blockform.php b/lib/blockform.php
index cfec321a1..4820d09af 100644
--- a/lib/blockform.php
+++ b/lib/blockform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/channel.php b/lib/channel.php
index 95d576a3c..3cd168786 100644
--- a/lib/channel.php
+++ b/lib/channel.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class Channel
 {
diff --git a/lib/clienterroraction.php b/lib/clienterroraction.php
index 2a1a51b72..7d007a756 100644
--- a/lib/clienterroraction.php
+++ b/lib/clienterroraction.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/clientexception.php b/lib/clientexception.php
index 5981f8bb8..01c013a01 100644
--- a/lib/clientexception.php
+++ b/lib/clientexception.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/command.php b/lib/command.php
index eac4b2cd9..91a20b810 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/channel.php');
 
diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index 6babcba4f..ac6bf73c8 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/lib/command.php';
 
diff --git a/lib/common.php b/lib/common.php
index e658eaeb2..030d560aa 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 define('STATUSNET_VERSION', '0.8.1pre1');
 
diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php
index 058585565..2095a7ceb 100644
--- a/lib/connectsettingsaction.php
+++ b/lib/connectsettingsaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/currentuserdesignaction.php b/lib/currentuserdesignaction.php
index e28b8caf6..c2f38cd00 100644
--- a/lib/currentuserdesignaction.php
+++ b/lib/currentuserdesignaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/daemon.php b/lib/daemon.php
index 9a3e1e7e9..4c2491e97 100644
--- a/lib/daemon.php
+++ b/lib/daemon.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/dberroraction.php b/lib/dberroraction.php
index bd8ccdd31..2cb66a022 100644
--- a/lib/dberroraction.php
+++ b/lib/dberroraction.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/deleteaction.php b/lib/deleteaction.php
index 89bed93ed..f702820c6 100644
--- a/lib/deleteaction.php
+++ b/lib/deleteaction.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
      exit(1);
 }
 
diff --git a/lib/designsettings.php b/lib/designsettings.php
index 21cb9d793..fe4222597 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/disfavorform.php b/lib/disfavorform.php
index f3a022fec..5b135b38a 100644
--- a/lib/disfavorform.php
+++ b/lib/disfavorform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/error.php b/lib/error.php
index e7bba8a47..0c521db08 100644
--- a/lib/error.php
+++ b/lib/error.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/event.php b/lib/event.php
index 106bbfd04..4819b71b4 100644
--- a/lib/event.php
+++ b/lib/event.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index 62797d1dd..ca67a094a 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET'))
+if (!defined('STATUSNET') && !defined('LACONICA'))
 {
     exit(1);
 }
diff --git a/lib/favorform.php b/lib/favorform.php
index d38c5b130..625df7c8b 100644
--- a/lib/favorform.php
+++ b/lib/favorform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/featureduserssection.php b/lib/featureduserssection.php
index 3065ff623..f0753a25e 100644
--- a/lib/featureduserssection.php
+++ b/lib/featureduserssection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/feed.php b/lib/feed.php
index 8660c75ed..e9fb6fdff 100644
--- a/lib/feed.php
+++ b/lib/feed.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/feedlist.php b/lib/feedlist.php
index 2a750bf77..9ae83f5e8 100644
--- a/lib/feedlist.php
+++ b/lib/feedlist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/form.php b/lib/form.php
index dffb6bce4..87b7a5cba 100644
--- a/lib/form.php
+++ b/lib/form.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/galleryaction.php b/lib/galleryaction.php
index 0cbb5f8c0..18cc7b929 100644
--- a/lib/galleryaction.php
+++ b/lib/galleryaction.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/groupdesignaction.php b/lib/groupdesignaction.php
index a9de600fe..3eb3964e8 100644
--- a/lib/groupdesignaction.php
+++ b/lib/groupdesignaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/groupeditform.php b/lib/groupeditform.php
index 8ae6a23d5..a649c2ee3 100644
--- a/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/grouplist.php b/lib/grouplist.php
index b042fb1b6..b41c5b5f8 100644
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/groupminilist.php b/lib/groupminilist.php
index 4864d4657..dff81eff5 100644
--- a/lib/groupminilist.php
+++ b/lib/groupminilist.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/groupnav.php b/lib/groupnav.php
index f8ed180f1..31cf378c8 100644
--- a/lib/groupnav.php
+++ b/lib/groupnav.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/groupsbymemberssection.php b/lib/groupsbymemberssection.php
index 156afe669..19b35eddb 100644
--- a/lib/groupsbymemberssection.php
+++ b/lib/groupsbymemberssection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/groupsbypostssection.php b/lib/groupsbypostssection.php
index 1c2a1c88f..45d49aba6 100644
--- a/lib/groupsbypostssection.php
+++ b/lib/groupsbypostssection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/groupsection.php b/lib/groupsection.php
index e3887bfd2..7327f9e1a 100644
--- a/lib/groupsection.php
+++ b/lib/groupsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/grouptagcloudsection.php b/lib/grouptagcloudsection.php
index 93699f62c..091cf4845 100644
--- a/lib/grouptagcloudsection.php
+++ b/lib/grouptagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 1da8406f3..8ad7dc20f 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/imagefile.php b/lib/imagefile.php
index 2619fd9d3..88f461481 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/jabber.php b/lib/jabber.php
index 0054c4def..3dcdce5db 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/joinform.php b/lib/joinform.php
index 47c94dd45..aefb553aa 100644
--- a/lib/joinform.php
+++ b/lib/joinform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/jsonsearchresultslist.php b/lib/jsonsearchresultslist.php
index a315d0abd..569bfa873 100644
--- a/lib/jsonsearchresultslist.php
+++ b/lib/jsonsearchresultslist.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/language.php b/lib/language.php
index 2039ef689..561a4ddb8 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -28,7 +28,7 @@
  * @link     http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/leaveform.php b/lib/leaveform.php
index 7068da0eb..e63d96ee8 100644
--- a/lib/leaveform.php
+++ b/lib/leaveform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index 5e8682c03..f740e329a 100644
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/mail.php b/lib/mail.php
index 31bf79d2f..df585406c 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -30,7 +30,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/mailbox.php b/lib/mailbox.php
index 9391775f1..a09bf1060 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/messageform.php b/lib/messageform.php
index a8e514d05..6431bfdcc 100644
--- a/lib/messageform.php
+++ b/lib/messageform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/microid.php b/lib/microid.php
index 179042456..e2e7d7607 100644
--- a/lib/microid.php
+++ b/lib/microid.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 7b6d7d21f..1e3a45142 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 4d6de98bc..ec85e4a5c 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/noticesection.php b/lib/noticesection.php
index e7c3f9a54..b223932ef 100644
--- a/lib/noticesection.php
+++ b/lib/noticesection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/nudgeform.php b/lib/nudgeform.php
index d6346cde7..3f13b5846 100644
--- a/lib/nudgeform.php
+++ b/lib/nudgeform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/oauthclient.php b/lib/oauthclient.php
index bd965a3bf..cc10cea8f 100644
--- a/lib/oauthclient.php
+++ b/lib/oauthclient.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index 151926008..6db07b20f 100644
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
 
diff --git a/lib/omb.php b/lib/omb.php
index 0a03d8125..0d6244599 100644
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once('OAuth.php');
 require_once(INSTALLDIR.'/lib/oauthstore.php');
diff --git a/lib/openid.php b/lib/openid.php
index 87df4f30b..7a2c46f00 100644
--- a/lib/openid.php
+++ b/lib/openid.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/classes/User_openid.php');
 
diff --git a/lib/ownerdesignaction.php b/lib/ownerdesignaction.php
index 3ee2c9907..d557f10c0 100644
--- a/lib/ownerdesignaction.php
+++ b/lib/ownerdesignaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/parallelizingdaemon.php b/lib/parallelizingdaemon.php
index 664e9bbd3..517115de0 100644
--- a/lib/parallelizingdaemon.php
+++ b/lib/parallelizingdaemon.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 61d1ff676..cdde1feca 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/personaltagcloudsection.php b/lib/personaltagcloudsection.php
index c10b0941d..0b29d58ca 100644
--- a/lib/personaltagcloudsection.php
+++ b/lib/personaltagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/ping.php b/lib/ping.php
index 48b4fa18f..175bf8440 100644
--- a/lib/ping.php
+++ b/lib/ping.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 function ping_broadcast_notice($notice) {
 
diff --git a/lib/plugin.php b/lib/plugin.php
index 4f53eee6b..87d7be5a7 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php
index 22e8e5468..35b914a50 100644
--- a/lib/popularnoticesection.php
+++ b/lib/popularnoticesection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/profileaction.php b/lib/profileaction.php
index 8b0c3b87e..e3a39ad8b 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/profilelist.php b/lib/profilelist.php
index 251da5e45..331430b3e 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/profileminilist.php b/lib/profileminilist.php
index 13058d320..079170d80 100644
--- a/lib/profileminilist.php
+++ b/lib/profileminilist.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/profilesection.php b/lib/profilesection.php
index 31658afe2..504b1b7f7 100644
--- a/lib/profilesection.php
+++ b/lib/profilesection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index a442bfc70..ae9cbdebb 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/queuehandler.php b/lib/queuehandler.php
index 867fe41b8..8c65a97c6 100644
--- a/lib/queuehandler.php
+++ b/lib/queuehandler.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/daemon.php');
 require_once(INSTALLDIR.'/classes/Queue_item.php');
diff --git a/lib/router.php b/lib/router.php
index b7b4a8e59..b25b1705f 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/rssaction.php b/lib/rssaction.php
index 44c9003a0..60611e48d 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 define('DEFAULT_RSS_LIMIT', 48);
 
diff --git a/lib/search_engines.php b/lib/search_engines.php
index 74513e2ea..69f6ff468 100644
--- a/lib/search_engines.php
+++ b/lib/search_engines.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class SearchEngine
 {
diff --git a/lib/searchaction.php b/lib/searchaction.php
index a935eb102..0d9f85a8f 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php
index bf79e0abc..677365ea9 100644
--- a/lib/searchgroupnav.php
+++ b/lib/searchgroupnav.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/section.php b/lib/section.php
index d605d458d..53a3a70fa 100644
--- a/lib/section.php
+++ b/lib/section.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/servererroraction.php b/lib/servererroraction.php
index 9ed3832a6..c6400605e 100644
--- a/lib/servererroraction.php
+++ b/lib/servererroraction.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/serverexception.php b/lib/serverexception.php
index 856866ae9..7dc9765ad 100644
--- a/lib/serverexception.php
+++ b/lib/serverexception.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index aba196db9..a1f305f5b 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/snapshot.php b/lib/snapshot.php
index b15fe3a6c..ede846e5b 100644
--- a/lib/snapshot.php
+++ b/lib/snapshot.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/subgroupnav.php b/lib/subgroupnav.php
index 590bec38c..2748b59e1 100644
--- a/lib/subgroupnav.php
+++ b/lib/subgroupnav.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/subpeopletagcloudsection.php b/lib/subpeopletagcloudsection.php
index 8909c5a74..b23a82240 100644
--- a/lib/subpeopletagcloudsection.php
+++ b/lib/subpeopletagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/subs.php b/lib/subs.php
index ae3949b75..68c89c842 100644
--- a/lib/subs.php
+++ b/lib/subs.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once('XMPPHP/XMPP.php');
 
diff --git a/lib/subscribeform.php b/lib/subscribeform.php
index c7216f974..ae2a6db61 100644
--- a/lib/subscribeform.php
+++ b/lib/subscribeform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/subscriberspeopleselftagcloudsection.php b/lib/subscriberspeopleselftagcloudsection.php
index c35f39f2c..5a570ae28 100644
--- a/lib/subscriberspeopleselftagcloudsection.php
+++ b/lib/subscriberspeopleselftagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/subscriberspeopletagcloudsection.php b/lib/subscriberspeopletagcloudsection.php
index a850dbc86..284996b59 100644
--- a/lib/subscriberspeopletagcloudsection.php
+++ b/lib/subscriberspeopletagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index 0767196e9..89f63e321 100644
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/subscriptionspeopleselftagcloudsection.php b/lib/subscriptionspeopleselftagcloudsection.php
index 839e2b161..9be60dfa1 100644
--- a/lib/subscriptionspeopleselftagcloudsection.php
+++ b/lib/subscriptionspeopleselftagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/subscriptionspeopletagcloudsection.php b/lib/subscriptionspeopletagcloudsection.php
index 38d93946f..fde24b282 100644
--- a/lib/subscriptionspeopletagcloudsection.php
+++ b/lib/subscriptionspeopletagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/tagcloudsection.php b/lib/tagcloudsection.php
index 20533dbe2..692f5d966 100644
--- a/lib/tagcloudsection.php
+++ b/lib/tagcloudsection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/theme.php b/lib/theme.php
index ceec3dff0..08e3e8538 100644
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/topposterssection.php b/lib/topposterssection.php
index 7d8348d44..cbb6a98eb 100644
--- a/lib/topposterssection.php
+++ b/lib/topposterssection.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/twitter.php b/lib/twitter.php
index 504744519..7546ffa98 100644
--- a/lib/twitter.php
+++ b/lib/twitter.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 2c713f366..c8099978f 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/twitteroauthclient.php b/lib/twitteroauthclient.php
index e8f6e21ba..3da522fc5 100644
--- a/lib/twitteroauthclient.php
+++ b/lib/twitteroauthclient.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/unblockform.php b/lib/unblockform.php
index c6310dc0f..f1343757c 100644
--- a/lib/unblockform.php
+++ b/lib/unblockform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php
index 0ce343e11..cb6a87515 100644
--- a/lib/unsubscribeform.php
+++ b/lib/unsubscribeform.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/webcolor.php b/lib/webcolor.php
index 922e6794f..6fa603fa2 100644
--- a/lib/webcolor.php
+++ b/lib/webcolor.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
      exit(1);
 }
 
diff --git a/lib/widget.php b/lib/widget.php
index 43bc4a481..0258c8649 100644
--- a/lib/widget.php
+++ b/lib/widget.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/xmloutputter.php b/lib/xmloutputter.php
index 7d2788d71..5f06e491d 100644
--- a/lib/xmloutputter.php
+++ b/lib/xmloutputter.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/xmlstringer.php b/lib/xmlstringer.php
index bd17ab09c..b505e40d3 100644
--- a/lib/xmlstringer.php
+++ b/lib/xmlstringer.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php
index 45a8e2c0d..f28fc9088 100644
--- a/lib/xmppqueuehandler.php
+++ b/lib/xmppqueuehandler.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/queuehandler.php');