define LACONICA and accept LACONICA for backwards compatibility

diff --git a/actions/accesstoken.php b/actions/accesstoken.php
index f1ddfc6a177eef773fcecaa1143cefd4376b92b6..c99aaeded32ab74b544d1a532ec9630c0a784b3d 100644 (file)
--- a/actions/accesstoken.php
+++ b/actions/accesstoken.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/all.php b/actions/all.php
index 6dbab080f8ec20bbff15b73ede6834075f0eab72..bfde3a7e4ad051a392841abb910a449ab717dc2a 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 a5447fa9fc9b336e5bd5631098b448e3462c2815..57efb73f0e85275df28109accaabd2aae2cc110a 100644 (file)
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/api.php b/actions/api.php
index 91f30e87abac9f919f180336c5f162ae1f2d6762..93e33085f93346bb2474dc6c856693d0624a22ac 100644 (file)
--- a/actions/api.php
+++ b/actions/api.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 5d11faad855aa645489a826209373f73cbbbeda7..6981354d10546262c85c8f7f00bf19376b87058e 100644 (file)
--- 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 af37c9bcb5510d0a2323b369f646e4809909e2cb..1e07280750267a30dd13510fabeda0e83175ae20 100644 (file)
--- 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 7add8e278da5cb1cf3e54baebc7e103ec8ea3402..7d0ac97a6906f53bff785009940a938160b7d543 100644 (file)
--- 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 e7ebaeee2d1c443742d75b8007b9430747327a75..537950792f18367046d9ac231d0b64b941724715 100644 (file)
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 54baef88fb34263bf4eae4110b283dd8da56d3cc..0bc439ff122a944f653ca8bd7978e38ec77d691a 100644 (file)
--- 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 2441c6fba450a4c383a651e4fac110c3aa2e61bd..408f16434b3fab2c1a37efd250b19fc3facbe81f 100644 (file)
--- a/actions/block.php
+++ b/actions/block.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php
index 5b5c8bcfaaf66335790ab0b13aaf072ea2a7a452..ca4a711cb7dcc0b845e7a54fffe3a705589a2023 100644 (file)
--- 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 94cd6ddf4b01a0c045f94fb44fd9e33c36c12fd0..2016942862197af7def453190a3429ee17436051 100644 (file)
--- 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 c4a4e80dacc4551406aac47494bb43e73c957b80..900a724ef302ac2c14c3be8f9003dc8e0e3f4dd1 100644 (file)
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index 8f6e9bdd1f229a92f6eeb62dfd6c0a4a41d83307..3d040f2fa91ed7b7e736c5be7d744d61667aeaea 100644 (file)
--- 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 25230ceac87d285a8c8a1e3feed0688812f81aa5..6269f1bd25aa56022bc5cc076b8dcd0899d00ae0 100644 (file)
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/doc.php b/actions/doc.php
index 1adb9b0750cbabc04848c110a0d9f38a13a6997a..68295234c5ca1c7a2f6d74fe2f922ac730de9cc5 100644 (file)
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/editgroup.php b/actions/editgroup.php
index 62a6290566ddcd6f365eb6b1bd4bbca5af62d8d2..cac910e9bc56d96ca17580ed3a2494ee343ad19a 100644 (file)
--- 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 1b4d73bbf0ac13dec6f4477508327fae0b48d0b8..af528a892ef877556b02dc05b173a1171f612d2e 100644 (file)
--- 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 a54d22a473cdcf22a185515219d24de76f1cd3d6..70f20520530d2140ea7a4709d9fa2736d70160ae 100644 (file)
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 aa84865859834de3525ec941331875ed1054d25f..6dfc9d688189a68f3a3270e1e5512bdac4d5d96f 100644 (file)
--- a/actions/facebookinvite.php
+++ b/actions/facebookinvite.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/facebooklogin.php b/actions/facebooklogin.php
index 64d24dd407774a479c261ce4a7031dbc72b28c54..8ac2477ab4e41e0371140d8d9f956c1256cda74b 100644 (file)
--- a/actions/facebooklogin.php
+++ b/actions/facebooklogin.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 1547fb780195e391db02a9988c6c595d6c18737a..ae231c0fb39c560f2e8c923b9adc157c0e63ab54 100644 (file)
--- a/actions/facebookremove.php
+++ b/actions/facebookremove.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 817a11828ce2ee530a87653cee37b0def8482fb7..84bdde9101ec227eafaabfb62e59c271b7500353 100644 (file)
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 a995188c3c6c3c690cf71874a684edd9efa130bc..2aeb1da6134df6ff19a1d7bce8150c89262a7c18 100644 (file)
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/favorited.php b/actions/favorited.php
index 006dd54883aa760703349703e2fab2878fd5e580..5ba508cdf5e592bfb95ecd16444c0c180fd92cbe 100644 (file)
--- 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 0302d10e5fdaa0eb7ec035d98fd6195c4854b79b..2d5ce985416d9e9d83f32b9f9d1a55082d7f6ebe 100644 (file)
--- a/actions/favoritesrss.php
+++ b/actions/favoritesrss.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/featured.php b/actions/featured.php
index f38068eb6853629464f86ba5e9e8a52fc416bebc..39bf09d8f07b125e278ba20315aea786ec2d0145 100644 (file)
--- 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 005a13169a8d1951b0b18b4cb88238cf9190e420..10c59a96122aa267c2e5c951af8c77235c46cff8 100644 (file)
--- a/actions/file.php
+++ b/actions/file.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 40939d44b3387c1b89c3ee43bb2fc950f8f1dc3f..b6de4f2448791e90357a47619845d8ac3491fb4a 100644 (file)
--- 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 07da72fc0ff69a1372bdbe74e58c716c8f881182..9ac03698529f8569eebcf4a1c6048582a539298b 100644 (file)
--- a/actions/finishopenidlogin.php
+++ b/actions/finishopenidlogin.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 5df36070fa54715c1596da68b22b4cd517f11127..871bc3d2d131c3d8fbd7b1c33deb598ca461ebfc 100644 (file)
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 d3ab098f4db1b1f2a7b80fa063e0817d6e98c63c..4dae9dfc19aeae6dafc73236ea2068556920e333 100644 (file)
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 e98f13224eaaac35ee5d13d22ffc0bf0ab301741..979a56a81d4ab92793f7956f148320f477ef2355 100644 (file)
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/groupbyid.php b/actions/groupbyid.php
index bc0709f4f6f9f35e9e2a3c15140e9cfc70be683a..52cfaddfc3298d7a520235e31ca9001146a7765e 100644 (file)
--- 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 baef31018f4a73dd9b594352cea56cf28488bc7f..cd86e3b0511d02f7b07728b835fe4870423ae0ba 100644 (file)
--- 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 30f865248b4c61223680213c8a0c0d70e925a811..c6f376915ef2e44ef2c0696c2fe549c59da30bc1 100644 (file)
--- 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 5a4ea27abefed123261a576a88bb615c4f17167b..dcbdd375972272a709afe0fee6cb7c2805095653 100644 (file)
--- 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 7cd85c1af1e8282b8712d6e94bc20d5094bfd401..70c1ded488e89c46ff9397b5a3da65f27b30e923 100644 (file)
--- 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 53b95c84812080031f14e4940386538490341cca..10a1d5964d374ac2d18118223b3f297ca5211ed5 100644 (file)
--- 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 fc825a6fd2c1bad9446fbcef12d61bca400649ae..bbd4c3a74aa89a471be744cf1331701aba11856c 100644 (file)
--- a/actions/groupsearch.php
+++ b/actions/groupsearch.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/groupunblock.php b/actions/groupunblock.php
index 248b2a0a7be21beddedfcb50ecda202c23ef215a..dd6b15c26c20a61a4a214c0c2fa7a9ee4ad2f75d 100644 (file)
--- a/actions/groupunblock.php
+++ b/actions/groupunblock.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 145cd7ed2c91eb6918c1e01bf7b3a7ebaadbd8fb..f57933b43f28473ac4bca190559df4ccf29c1698 100644 (file)
--- 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 f5f7d8bcb104a15d88ff1a69c908a70930fe925c..6cb7f9e157df07a5d5862546dc3a1924051dd208 100644 (file)
--- 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 d8f15705bcdaabfc98b46ff6a60384cbb8c75fcf..ab43a2491d581edfb17120d50cbb32f02eb2b65c 100644 (file)
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 32b59efa081a69a91383bbb3e0c9ab2180d9f8e2..0209dd43fddcf3fc74b9ed70e7993752e96acce1 100644 (file)
--- 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 27b5ea0177116599ae3ac810fa6d0d76cb4982fb..60b22e147d735978090f36d0ecc10644ee07b6c2 100644 (file)
--- 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 1452369662ff4003af4b66d346e9b4952a470134..37f3c54ffb95b770195cc94033a482ddaa65e46d 100644 (file)
--- 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 eda5cefe5bf15eae09c327cfd55b5e09c2c4d1b2..298b2a484b58088a76e7bf334a2dc55c746b7dd2 100644 (file)
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/makeadmin.php b/actions/makeadmin.php
index 7866f42c15ff015dd44ce6df6f65b51844300363..2dfddebc27dd21cc3eba8110cb5926e8535aceec 100644 (file)
--- a/actions/makeadmin.php
+++ b/actions/makeadmin.php
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/microsummary.php b/actions/microsummary.php
index 8f2d34998b9a853bd4c13313b8bc0b623272a52c..5c01a9ce0f0646b945191f955da90b184fef262f 100644 (file)
--- a/actions/microsummary.php
+++ b/actions/microsummary.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/newgroup.php b/actions/newgroup.php
index 544dd3818407a36d5ba806952423a064031cd6b9..01cb636aaf80a43555221836eb1485bd7b7e0fa6 100644 (file)
--- 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 5798715463749554d0741f393b2436d7edd324db..828a339cfe1db56578b9b22db06f88e71c9cbba0 100644 (file)
--- 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 4b542815bbb011fbda6b7d994e1b485722d52a6d..00a822860e5065a442eb40431b62fa87fec72c0f 100644 (file)
--- 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 e268c69abf0623f46e0cf98fc4db2efe5af968ea..1188e7e10fb3f881876e5e9eb37bcf0a9c230800 100644 (file)
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php
index 67bca01b53540d58105e6b1e8dd5926d5ebe07e1..f59ad79625366453f9f272655ba529d2a2a342c8 100644 (file)
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/nudge.php b/actions/nudge.php
index b699a31441994e705c1219bf9f6df1a72133eabd..cf5f773e71061e7f93600b6b9478ea4797f19528 100644 (file)
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/oembed.php b/actions/oembed.php
index 5f6751b5a80d907e5a59469fec03cc1ad282d262..e287b6ae2a9563972ea2dac524bf379a8e789adb 100644 (file)
--- 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 42d7409387b13a3c03dbc2f63449fd4bb9e2bcd6..4b53386943044c3d01b37d11cf9c0df0f86408d6 100644 (file)
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 09e678e3c9612c0d6c431747699e66643e605df0..13da64a4f650a6663287a1b0e6f4a575f8330b24 100644 (file)
--- 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 8ef13dd7a6fa8733311c781d62a7124620828cfd..d5e6698f3880a07b43110058abd934f680d01b4d 100644 (file)
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/othersettings.php b/actions/othersettings.php
index 244c34eabb1163ca4ee020315f904c912a297297..8b674161a89bb1a28408e4e91b158083a5492167 100644 (file)
--- 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 a1fc81dfda22f106396f96bc8a0c52a7635cf9f6..537fad3ef4560bdcada86358536d89fb16443695 100644 (file)
--- 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 e7cd0ab510b39034fb87d454afadedf6dad973b4..ec842600f6c1c252206aa7a1a5f117e93140c99f 100644 (file)
--- 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 43c966f9c12b5cf78b64c33352ca35920727ac6a..ba0f71e392165acb4fa9d55d99ab6765ebe2187d 100644 (file)
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/peopletag.php b/actions/peopletag.php
index 0c5321faedc0f5f3dd85406b487b7bd8f908aa40..6dbbc926161c87b9c31b5b9d9d51d2764965fc9f 100644 (file)
--- 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 883cd53fbc8c83f0867ee8d97779e7979330f350..e775ca17e83e6359ebefefe3711d86a13c485a8f 100644 (file)
--- a/actions/postnotice.php
+++ b/actions/postnotice.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 2f9d2bac9324faea3b86dcdcd839de5dab443e2d..f9c16351d36eb15e4b27566229662a67c261dc6d 100644 (file)
--- 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 f8ecc0e785cdcee74674622782121693a497fa57..d426648f3d3623ad214adc00a3d748ef930749e9 100644 (file)
--- 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 0d75ffc35805b173ff3b20237dd683a592f2a3c9..593888b9f66fd6fee0bd0f59333f4c174fc51dec 100644 (file)
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index 026827fbe54d0b7450e6881c2d5b23b1d220b0e7..60bb53e27c934d9682b6ac616144d20d6c890294 100644 (file)
--- 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 921106a5f4c87b68b2e2ec9bc59bae615c291d9f..209a10e3d4fa00f605e2cd2156ec501d85a0122d 100644 (file)
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 279f1cef1208b3eb391b08d7da3d0dcca3c7a399..9776c1fb4482cb335c5fd9fe3b50b80d3385b117 100644 (file)
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 a219c03d86e6d27fbeee9c8a157ad2e84b7ceba2..c431aeee3e356fd01002fd70e93f56ef57ecb01b 100644 (file)
--- 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 79327578171b3f5b72009a0bcbe5c3f13ac19bb3..374392d4a31df096599dc11cc2e59f002566aeaa 100644 (file)
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 954d7ce19b83ead391d111139d94111680d64b67..cca43023097c2f11ff5806cf629488cd88831bd9 100644 (file)
--- 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 5115453b79a48b104c359139c832acd57135d9f8..c71c9226fb59dbc0e9cba5d8c5c23ad2f1a30a99 100644 (file)
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 243844c4bc66de36ae6a88239a5a8533d30f5a43..48fe1db08f1ea13cef4eec9b6ce59b8f68cc9e13 100644 (file)
--- a/actions/requesttoken.php
+++ b/actions/requesttoken.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index 9734496bac891c8f0decade759b85b8a3631a4d9..0f7a66330242be0a588c05f0b19a16b6e306e4b8 100644 (file)
--- 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 965b933e23e831e822ee7feeef88b58a3000ff60..8157ee3c852f0884288e058c8e83bae90bc88806 100644 (file)
--- 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 5d23fb13f3e1eb2b016ab1bdc8295e84c476e4df..db757948baba6e64bbb731d9eeaa1530d819caaf 100644 (file)
--- 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 4f7c3af7fe69b33b563a493f05f3afb3aab85f5e..3bc52b2dbc7bae3fef45a4bf7cedc24df156bc38 100644 (file)
--- 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 93730812c4db3d85d74a4fd97baa0cc5188662a9..4d3067eed37275e35144fc2ecd292e956a0c4954 100644 (file)
--- 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 bfe49feeec5796898f0dbcbdebc38259b63e2d9a..b956ccebaaa178773fa8c05459535ab91ce03576 100644 (file)
--- 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 3320bdc599c2d2c47baa473e938d4cd894733424..cf6589e50420baafb6cf2b5fa50711109e6bb1c9 100644 (file)
--- a/actions/subedit.php
+++ b/actions/subedit.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 fb1fb5e6bbe758fb7bd8f6f802d08c75641e10f9..4c46806e4047bcb211dcbffa71e2e2e8e376e076 100644 (file)
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 3000f17b0c61821086aba442d8bd1632572976b7..f7d08d9d0b03d35493368982a18214c831af709c 100644 (file)
--- 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 8cad9e3b4a40e8f3a239ab23b20dfe8c8f063014..b1c6682283c2ab1473219cfb077d2fb7f43b206c 100644 (file)
--- 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 b635de194f5e8f6b123ebead7c5adc6a6e6fcb3a..5daf0a1c1ddaf53f083d42213b90950f3c7976dd 100644 (file)
--- a/actions/sup.php
+++ b/actions/sup.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 935d00ab06641c81ab692a6ecc1bd121e48f1237..f0ab30308cb3b5f2803b2e096189554677c3879f 100644 (file)
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 aaca46355f7dde2f5972e9a9e5abe0e538785a1c..c3f43be8ba42fac0b44e20e2dc4a740ab721e5f8 100644 (file)
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 135b12135d84dad523482d16a3a2e758bba5ed34..75cbfa274b58bc0ed54c24ce26976ad6cbf7ba4f 100644 (file)
--- a/actions/tagrss.php
+++ b/actions/tagrss.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 dc043ddd3269089b98bad941266f60557e7bade8..93c8443c9f79c9b88136319ae06eb127267f616d 100644 (file)
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/twitapiblocks.php b/actions/twitapiblocks.php
index 808e79220ff2785404f6f80098f44ecf710c6e24..ed17946aefb20a6c7923ae2993b6611284d6270b 100644 (file)
--- a/actions/twitapiblocks.php
+++ b/actions/twitapiblocks.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/twitapidirect_messages.php b/actions/twitapidirect_messages.php
index 8511fcbe2e022085e8bb913909a8e422ebbbee67..dbe55804b16337aada7f06f373c481e19eb96d44 100644 (file)
--- a/actions/twitapidirect_messages.php
+++ b/actions/twitapidirect_messages.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/twitapifavorites.php b/actions/twitapifavorites.php
index d812b503499294412c796eaae9c43600a6f440b1..f8943fe2dddef179666af985bcdcd4b2bbaa69c0 100644 (file)
--- a/actions/twitapifavorites.php
+++ b/actions/twitapifavorites.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index 015a5dbaed2f577a297eb003f808e9808473e055..f2ea46910ee92edbf0c0618b1e51e66787085e0a 100644 (file)
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php
index c3e028c175c9122be956becfa0ad5790b0b418d6..214fa8214f9b6e19a5fe73885bec4ed90302c30b 100644 (file)
--- 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 3fc232f64cfb877777e65a311bc32ca1756959ce..81381620e7aa65f9d90c40ced74a2ad91cbc5547 100644 (file)
--- a/actions/twitapihelp.php
+++ b/actions/twitapihelp.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/twitapinotifications.php b/actions/twitapinotifications.php
index 7bc9dd14b6eba1b50e783f1e100321e8781540ee..0653e69ab5fef0f99a7380d1538aba878ea2384e 100644 (file)
--- a/actions/twitapinotifications.php
+++ b/actions/twitapinotifications.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 3ccd8c5b6195f66b3e44765db4c91cd75fa23847..2f587d604ffe5016258336183ffdbded64f61af9 100644 (file)
--- 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 1732951762233746680080dbeca7ee8a8d9e6cf2..c628ee624a2a3498d7ff4a24cf329f6663a127f8 100644 (file)
--- 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 e522b63579a1f7f712e8f6564d66fc7a9d0a992d..edee239a03e67dc2f7c44919ac5d6adf98e14d84 100644 (file)
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/twitapistatusnet.php b/actions/twitapistatusnet.php
index c75e5e858c93be4f62bc030d4e9b7fd4d6ec44a5..490f11dce2882f8622b327d215f7ff91c7eb1495 100644 (file)
--- 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 0f2b571c6eb332aff738e0bdd5b962aca0d00141..2bb7ee01abb0cb98034fa92524a501806c1abd57 100644 (file)
--- 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 436451c0f2fb7d11b985796ed2515f18d4c6e069..83ab28f35d6236fa233c6f1f0a7b6aee5e82e039 100644 (file)
--- 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 853a6b8fad15c525383f82fc6ab2958b786003c5..703fa6754f8367967ec9fbeea326db5b57777e5f 100644 (file)
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/twitterauthorization.php b/actions/twitterauthorization.php
index 3745a67cf9b4e8e867144008695b70d9e39c50e0..630ac426fd02248251472a0e1117a0115f102a7a 100644 (file)
--- 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 c23fa2ff82cc3e8c7fbb873f1ff084523b7311b5..563d867a49be7dd6b3357f12b93308acdb09e1a0 100644 (file)
--- 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 43f454340dc4c9b90f778ef36bca4aaa2acc87c1..dc28d5d54a70c3b534956efc0b29bdf45842e6c3 100644 (file)
--- a/actions/unblock.php
+++ b/actions/unblock.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index bedea9f285e63b8971d32e8673dd212958768866..4a5863489ec7249d54f3011b82a75dab17d63c8b 100644 (file)
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index d4868640111e290842f9691e9f07deb213991d3a..9a4cf8e4659b6f51c09fb23a48993457efd52014 100644 (file)
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 38329a2c70ffc2c02026ea8bc27ca038484dd209..a9ac1f256f79eb3bef2e445fe2fbab668c33089e 100644 (file)
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 4ed78688b6996e7443b936b0dc8c7d84acbb03c6..802bcb0815384d5c94295d0c4eadd85350480204 100644 (file)
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php
index 07d160984fc0eb4e8f740aa6a777d08970882032..568c1d62424ea047bb601f66f479ef7718899251 100644 (file)
--- 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 7cdc132b8bd79d8efba589ea1ac0875a123aa6aa..84e105153de8b19cdc3429c1cd349d2b3479aa1f 100644 (file)
--- 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 1437a4c229342d2734040ccde71e39ec5f8d9b63..fa6d588cdf4358f7c2f99f37853bb10b7e3de8b7 100644 (file)
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 86f7d7616bacaadf93de026e4dcec671aa2c162f..def10e4cf7bd90d8af6b6263eec7af093dfb1fbe 100644 (file)
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/classes/Design.php b/classes/Design.php
index c4820bf1ebc4d0a823594e81a2d6504c7b48dd80..89ae50c8cb9d72b9a17be6f43d1731890c328503 100644 (file)
--- a/classes/Design.php
+++ b/classes/Design.php
@@ -17,7 +17,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/classes/File.php b/classes/File.php
index 063c164257d24899cd3fe80ac9587337a6fda2af..0cebfc55e33563a68e67625f19a786959feb2ab5 100644 (file)
--- a/classes/File.php
+++ b/classes/File.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 c28f5c39611456c5a97df589dc55474b3081d0ee..6be6518152f7f9dcebe9e3e71e06b33d0d0b2386 100644 (file)
--- a/classes/File_oembed.php
+++ b/classes/File_oembed.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 832d66b2b9eacd7a6667bffd8ade0bff1e3b4879..76b18f672d3e23d969b50f69052e29f6f08acf81 100644 (file)
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 2c0689f947e7323e57cb03077f6a8127d2197abd..f8b70356c7eda8a0cfbb64a5aafe1e6d29f187ec 100644 (file)
--- a/classes/File_thumbnail.php
+++ b/classes/File_thumbnail.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 ea5751042649e4cc3a2f350d493ccab179549cf5..e3db91b205ab597f7c46dfdcd36f0dd01f953ed8 100644 (file)
--- a/classes/File_to_post.php
+++ b/classes/File_to_post.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 93bb75796da2573781f46f76e1a31038ae4acb68..be3d0a6c6f09583479d379594d08fef2dba6f18d 100644 (file)
--- a/classes/Group_alias.php
+++ b/classes/Group_alias.php
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 bd8b2492655123845f3c9b36f1d5c51def140fff..de2cf5f6eb12c694a34d059f447e3ce4add972fd 100644 (file)
--- a/classes/Group_block.php
+++ b/classes/Group_block.php
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 e2935cfc5cb659b9907778c2b15ba95f09cd4a2c..9c2ac3e01ca7f4c179bc29b2bac567b6eefd00d0 100644 (file)
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 607f355717fe7ee88880e5bd0668c6961d86b33a..e597128641e141c9cec793e0adbc7b2af4b195e7 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 60f11cd710f5df370baf842cce9562960e72b96c..d3e7853b1bd804eeb35adb0cc4eccec7cbd143fe 100644 (file)
--- a/classes/Notice_inbox.php
+++ b/classes/Notice_inbox.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 9824157535f70d11fa754739281088cbe6e6d0ff..6ad0e7a3a3b3f3884fbe221466cb034938550551 100644 (file)
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 b218244e32a225f8ee73e96852835772ff414143..2d87edaa0af84cfb4058ee47448a76727a228e66 100644 (file)
--- a/classes/Profile_block.php
+++ b/classes/Profile_block.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 9d100412aba9dfe6d13112c664880d2ff6a23963..9f7bfeadcc79e40582e95ab74c5d2ba22cb7330c 100644 (file)
--- a/classes/Remote_profile.php
+++ b/classes/Remote_profile.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 04958b61de61e91965d3c5c741bdd2d7f48c6a12..d641edbbe408af12c87bdcd32a416672429d2eeb 100644 (file)
--- a/classes/Session.php
+++ b/classes/Session.php
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 e91bba1acc99c66b64e1da7cc87b2cb432d24638..d526cb4d617ab49651df4138617bc43f944edd80 100644 (file)
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 0e2b5a30741aa5bdb15f1927074fe53691b7a68b..fedfd5f19eeec5212a898fb967a00371dd23f56a 100644 (file)
--- a/classes/Subscription.php
+++ b/classes/Subscription.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('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 529957649be5395a1a884da27cf855d9bb40128d..14d3cf54fac608caf62f386f090b3d24eb77fdf0 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/index.php b/index.php
index bbb78b6a92932d39ab8480fa9ea900f680d67bcd..7669778f64e68a60081da00feb564494e4f78117 100644 (file)
--- 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 9e01ff738eaaf4bb26a4ad32d2a1c2a00d41347f..d278bcc17862267e7318d264179dc3ee2bd4b6ab 100644 (file)
--- a/install.php
+++ b/install.php
@@ -363,7 +363,7 @@ function writeConf($sitename, $server, $path, $fancy, $db)
 {
     // assemble configuration file in a string
     $cfg =  "<?php\n".
-            "if (!defined('STATUSNET')) { exit(1); }\n\n".
+            "if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }\n\n".
             
             // site name
             "\$config['site']['name'] = '$sitename';\n\n".

diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php
index 018b917c177d04a388e591320985b4ca19a7b9ee..6402dbc099615918d7ee777330b61abfe3c8873b 100644 (file)
--- 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 337d34e9aafc3a19ae0a004bcb1828ca3bc08377..798116163798b728fd2df6ae335dd57c2b944629 100644 (file)
--- 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 cb922f60e006a3676f1d90922fc9dfa3bebf4e2a..4033b6578bad2b2c89e65faab98fcbe9d45cfaf7 100644 (file)
--- 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 424714e908c46f8a6795e9eaff1e75501390f7bc..8a1cdd96e1f03363a766361b0582f3bfc7acf6ce 100644 (file)
--- 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 a713a10853f890ab264bfe20d19f8a9514acfc1f..51ceca85762c184adfe864060d35992b92a8a5ee 100644 (file)
--- 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 b98de8b6fd188f28fa545be13e8531433cc15a91..578c171ff591bdba3e8bde5533a263ae90ce684a 100644 (file)
--- 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 fc5145ad0d48ba6c8a67f8a7a4c76895f965c8d8..e2f85ae0255c87938e212cdda973db3db5142243 100644 (file)
--- 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 cfec321a18732a39dbd55c61359c1721435507cc..4820d09afed0597c9f5649843fc36d7220c8ad9b 100644 (file)
--- 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 95d576a3c137d08636ce221fe34c6e308c4f7567..3cd168786c9d69e89343170e19cdda7bf27a308c 100644 (file)
--- 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 2a1a51b721617da12b9a1e407e6c9611e71d0bf3..7d007a75675775ee35fa67dc89ea79acb2774426 100644 (file)
--- 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 5981f8bb8c997b7dc3958aa47d6013e1ed10286a..01c013a0114c2ac3e47515ea1f8b97b5fc274d81 100644 (file)
--- 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 eac4b2cd9716189537480ca71b530565e2f926ee..91a20b81092922abc8769df91b274ff95271dc3f 100644 (file)
--- 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 6babcba4f5c71b5cdb5f6de1afa083f02f794bdb..ac6bf73c8e6a0a816f363415fa8d24b1e1c7a16e 100644 (file)
--- 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 e658eaeb235cf1b59d995bfc8b414767aa0d1a5a..030d560aa83b174254c7e7339e1f9561d0ce06e8 100644 (file)
--- 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 058585565f8629695b85caebdca37fc554ae2555..2095a7cebfed12373e654d037221a1b4a4ef2e61 100644 (file)
--- 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 e28b8caf67426d7a657f8ccc3c6d8fe6d76437ed..c2f38cd00bce98c201a2cfe7ae383140cbcd8345 100644 (file)
--- 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 9a3e1e7e9dde7958b6f3643cdbb58521cf89f732..4c2491e97bca284cb6234820b0749f4e61241517 100644 (file)
--- 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 bd8ccdd3109276e5e551be1ef6f0e3d17d56c670..2cb66a022ddcae11d970846d9f5ec12af0d1a4c6 100644 (file)
--- 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 89bed93ed891664b120961b3e198d0d601792d11..f702820c612902d120e121b307ee4c4183bcdec6 100644 (file)
--- 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 21cb9d79331b5037be4efef7333109a776d0b5f2..fe42225974ff8c9d797ac83b7b3c9eb0b2a245a3 100644 (file)
--- 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 f3a022fece680abaa916c79207a85406e44ab956..5b135b38ad5be62c395c7e709c4b02eb3aa94e2f 100644 (file)
--- 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 e7bba8a47ba1381bcf56eddd48eec62cca7f82f3..0c521db08124a29d77259ae3dfb25df5dadb0f49 100644 (file)
--- 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 106bbfd041fef3f8828a2676e10bb8f4b04bf465..4819b71b4c10968343e101f69e59970140110c6b 100644 (file)
--- 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 62797d1dd09a3536c88cccfd8fa29ebba495da4e..ca67a094af0442821f5c74034199393ea70ba600 100644 (file)
--- 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 d38c5b1309310b379a9cd89003d4f5d516541a28..625df7c8b5695b98a0792afe95f7454362eb9fd6 100644 (file)
--- 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 3065ff623e1218d32ebbdb35e943ee8e3f702192..f0753a25ed997391191df748cad43c755ace375a 100644 (file)
--- 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 8660c75ed3af2e3230af98b6e873bfe5567a7c76..e9fb6fdff3e392620291763044858a603627d834 100644 (file)
--- 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 2a750bf7786a396264354f65823f901a111a419f..9ae83f5e886e00bac74c39dcbf06579c4ea8a229 100644 (file)
--- 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 dffb6bce4c9fe55a6e7dfd68f0aeb16b4f1b64ad..87b7a5cba91c42d0aea1b55ff62eea7a2e1d8712 100644 (file)
--- 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 0cbb5f8c0e470e5ed3535af628c3caac99aa629d..18cc7b9295ff7d2cd127bf72a8cd132967ca2f0b 100644 (file)
--- 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 a9de600fe9bcc0153393223dde07684431bcdd80..3eb3964e87fa393361b68dfc0f3ff72ffe354653 100644 (file)
--- 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 8ae6a23d5e5142b1cd1b7b53ad4b5233e1133530..a649c2ee3b258cecdecc67eb6bd2dea69064fab4 100644 (file)
--- 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 b042fb1b69124fbc7107172dcef2f9a0e738dc7f..b41c5b5f8488c0898fe10f83ff1c726939d31d94 100644 (file)
--- 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 4864d4657e56f003eefebd1579d39b6928763cf5..dff81eff536f07e345b38681a115a45f555c9493 100644 (file)
--- 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 f8ed180f127dc978015eee7a9d24e0e90ebb1ec2..31cf378c8a821077a494585b9e141b241a6ce34f 100644 (file)
--- 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 156afe6692bb163f4cb61a37f6cd450e942b8430..19b35eddb8aa5821906926977fde2cba1b6a6af1 100644 (file)
--- 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 1c2a1c88f7f388be25fb7f7c73e45676f15c834e..45d49aba6687b10dc7c0169c1db41d5e392cda53 100644 (file)
--- 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 e3887bfd27ec267b07920ef5b7738e5fe3093e63..7327f9e1a06610b34dba5b87a8fca55e03be685e 100644 (file)
--- 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 93699f62c85e4130c6fb257e5a94bc0a54959862..091cf48457ce0bdb9330d62d78b9ff7363ef1944 100644 (file)
--- 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 1da8406f332b289fd3df736402afd97ccf34fcf9..8ad7dc20fa3645e4e731387b96b8014614ba8643 100644 (file)
--- 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 2619fd9d3bed9bca2a8e536dd76f195f81260941..88f46148140b3d9904074e583d5dc74bc7fafc84 100644 (file)
--- 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 0054c4def767937a458466fc2763177b40c4dcd7..3dcdce5dbf349b87b629e9186bcb98ef519d22a9 100644 (file)
--- 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 47c94dd4582b935c00c2beae97d371a11c038b75..aefb553aac928b311ace9b44aa65f324adab002c 100644 (file)
--- 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 a315d0abd7b2a456407ebf14f92bc95ed385ab46..569bfa87344c8997149d39c37ae70f139980d91a 100644 (file)
--- 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 2039ef689687d714d711612c58dccbc0a14bfbde..561a4ddb82184b4f4fd0a2b2e4ad2d0fc201d9e7 100644 (file)
--- 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 7068da0eb7692e9f01ea47663bbc51eec56b4ab5..e63d96ee8080148a183d855dce49c84344d86a39 100644 (file)
--- 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 5e8682c032e64c20e5f01218c094e860552e6f53..f740e329a4e0e4b787cede75577c0f0124a07079 100644 (file)
--- 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 31bf79d2f9905f55b73b2a1859224a2961651d96..df585406cc87f11744e6bd98b81557f9c52689b7 100644 (file)
--- 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 9391775f182388ae54874f9178f217aa615cad14..a09bf1060a7837dbccba26ed8d7256df2e98bcfb 100644 (file)
--- 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 a8e514d059e9c837ae9e139395dfc380f50b0b27..6431bfdcc8297c880c05f23fb3cf4a38d12109db 100644 (file)
--- 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 179042456760292100690712eb9c8632ca6d8923..e2e7d7607ffc47d02aa9727d4b64781c0142e2a4 100644 (file)
--- 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 7b6d7d21fdb541053ca3edfb9f18d0d7840e4c5c..1e3a45142c678d7cdf5fd3a89a47b39303dcf709 100644 (file)
--- 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 4d6de98bce2bfdfd5b3a5c1aaec32ab4d2dacc05..ec85e4a5c1aec5c3448b3650c2dc2b88117f9512 100644 (file)
--- 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 e7c3f9a540ff2e8b2e31a8885ea7843f580f15aa..b223932efe2c4a5b683cef20188f8a9606601b27 100644 (file)
--- 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 d6346cde7ec26866ad1fd92277c0ad39c60e9821..3f13b5846269ce036d973ec98989d246a8a768e9 100644 (file)
--- 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 bd965a3bfed29f3ee743833293056a1d01919dbf..cc10cea8f98ed9c1948ac40ecc53960a069f9565 100644 (file)
--- 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 151926008128bd5e685ea21076d9a31bfe445c41..6db07b20f781c9e2cf901a6e631760b681e80f41 100644 (file)
--- 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 0a03d8125d8f5d82cae51fa0004423cf51bf9841..0d62445991a4b5a08399217248c3556a1267c4d5 100644 (file)
--- 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 87df4f30b619ca6f42c3af29e2a1f1676c34791c..7a2c46f0056ba32066892aa6b8450a5246d93e1b 100644 (file)
--- 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 3ee2c9907142bd9b2a08b95bc3010a57a9bd702e..d557f10c06fae6ba0df596c047437cd8a741a2fd 100644 (file)
--- 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 664e9bbd37a9a93d8a3dbfe6572e66b27c62b364..517115de0497521448c5abdd214f11bee9a29f3e 100644 (file)
--- 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 61d1ff676c37295728081183c0114bd0867bd5ff..cdde1feca081fdc922cb032c8522158ae31bfd76 100644 (file)
--- 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 c10b0941d6a61a76e899e89e21296922ce939deb..0b29d58ca60386b9331de6ad7a330cab9191ca14 100644 (file)
--- 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 48b4fa18f6fdc9fe8fba937ba70d889485464d86..175bf8440b61b3f76608b398a2015112b667e424 100644 (file)
--- 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 4f53eee6b1fbc6118ab8a5a4c4445c029fa18546..87d7be5a7597296bb2c2d777358f7365455beb5d 100644 (file)
--- 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 22e8e5468e9108c81e770cfab6b914f4101ab3e8..35b914a50c056303fe02222d3600f1837b7c8196 100644 (file)
--- 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 8b0c3b87e2dad57153ef82a31efa9c21592ddf6b..e3a39ad8b7f19bf821deda74e4997334110c5281 100644 (file)
--- 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 251da5e45c903642ad4b41171690352e18a57ffa..331430b3ef67b4565541e216be71ee3662967355 100644 (file)
--- 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 13058d320c109c62baf376202eb11cc6cb2cd98a..079170d802ddcc2c813c8da2722c4ba297552abc 100644 (file)
--- 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 31658afe2d5423e5bd1aba92272abcd613734671..504b1b7f75c64ea12e4b04580a607ddb8d04d1fa 100644 (file)
--- 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 a442bfc705c0a8a24ea8983ae4386e32af043b2c..ae9cbdebb491dd8f4c4f97f11f16857c80d33b48 100644 (file)
--- 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 867fe41b83a1e3985311bb5cdfc529d549e53a99..8c65a97c668667b3ea05fe97a5f7d4fa91fe1ef2 100644 (file)
--- 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 b7b4a8e59c63b63d0f955b250891929f62f7ed8f..b25b1705f565cdc3dd7c0a0b62305d347771ab86 100644 (file)
--- 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 44c9003a002ebbb7abf064cea8986043fd060fad..60611e48d0f0a22a9fc87434a74e90773f532dbe 100644 (file)
--- 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 74513e2ea1645f370bfdca6bba01a1bac1c87304..69f6ff468edf0ac66a8cf182a2fd0d1841b9a443 100644 (file)
--- 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 a935eb1027661fac57e41a8ba2d2124a5ed2dd88..0d9f85a8f18a5f623628bfec448b68002ce9390e 100644 (file)
--- 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 bf79e0abcd4a05710fa6fff6f650790245e7ceb8..677365ea9d6f1f101b078b293b3173f9a845f036 100644 (file)
--- 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 d605d458d73fc2114ef359eb26a4f6376fac6088..53a3a70fa723fd9af5ab50d91a491aff0138bde2 100644 (file)
--- 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 9ed3832a68323aa4c84ef0b6dc230b5e031d624c..c6400605ea9bdc1936829b8e2d92e19c3350159c 100644 (file)
--- 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 856866ae9d3f66f2e17eae93203862c641091a8b..7dc9765ad6b6b95da8cc440a8deba8799321c4c3 100644 (file)
--- 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 aba196db92a9c4e793d443ed23235cae9734cee0..a1f305f5b74e076cdda6256b8bb04a6e1d1cbdae 100644 (file)
--- 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 b15fe3a6cbae9360f0d884676e09b95906a0b49c..ede846e5b02e852e5473a336af04160d410188f9 100644 (file)
--- 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 590bec38cf065fc067c21b2cf6055f02adf6a31b..2748b59e1864a249e95217fe93d7b169c790322d 100644 (file)
--- 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 8909c5a74fc4d5c6334dee55bdc6a2da7aa5b95a..b23a82240d734998fc6fb235c88c901ab97ddf26 100644 (file)
--- 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 ae3949b75ee16dae4c0a30b08875c25c2027a039..68c89c84217f3e1228e436ef2f2eaecc64fce8eb 100644 (file)
--- 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 c7216f9748236a1f99100dc1235ccea5a56dbf07..ae2a6db61cbb32b5346b08ed92b1eaa7d5cbf12c 100644 (file)
--- 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 c35f39f2c2825a4c950e4b6665db949db76fc9da..5a570ae2823e8625fb35049b796a313fb3188c0b 100644 (file)
--- 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 a850dbc86922d55ae3211bacf2a4e39c52591ee7..284996b5917b104d72141faca6646c640f35c35a 100644 (file)
--- 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 0767196e9fcbb23ba8cc92d73b7ce99935abbb76..89f63e32116f37a14838f123e2e412004838a234 100644 (file)
--- 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 839e2b1618ba70acc0bdb0bbe069ee60c3b70b0d..9be60dfa1481eccbb32aa85e6dacaf246ed6087a 100644 (file)
--- 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 38d93946f5baf741cc23ee3f2e8b8d57b74d7e3d..fde24b282e17d097df805eeacf9fb7b37cbc36ee 100644 (file)
--- 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 20533dbe2d8dbb51ae3d8051b32c92c7be0b5a1b..692f5d96620a86f904f166986f370ff49e3ae4a8 100644 (file)
--- 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 ceec3dff024d837f593b1292ef79665daf84b72e..08e3e85383b18fc92d5241891d1acb1dff8f57b0 100644 (file)
--- 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 7d8348d441513551fb43b803183681a06cac5aad..cbb6a98ebde5d0b33e0b5aa675f6a12720c2bb7b 100644 (file)
--- 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 504744519878c5a8c7ef947466e77726e6ae668e..7546ffa98a38e0c533929be384e5a6815516646e 100644 (file)
--- 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 2c713f36672c89faa059d8333f5324e45a9473c7..c8099978fa46c57e3c61db759405b3da33b95916 100644 (file)
--- 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 e8f6e21ba9228d20dff828a8ef77761db780456a..3da522fc519a88d83a25a6093c856e059d378160 100644 (file)
--- 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 c6310dc0f450970c300a76d30ef42a4a7244b878..f1343757c22b67bdc43c9d528326cbdbab4c5f92 100644 (file)
--- 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 0ce343e11e199c034b405ffe2e9f367cbdf1afe0..cb6a87515f9cdc86c001ce2985fccfbf627ae036 100644 (file)
--- 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 922e6794fee6e9e3756155c25bc83924930e5e3f..6fa603fa2ac89286b47e2b00924808be40577f4f 100644 (file)
--- 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 43bc4a481f6165afb60269eb515e9f43d1118e8b..0258c8649e8c89e9776b6cf327829aa1025653a5 100644 (file)
--- 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 7d2788d71e51c379bbf30846fd8217a35c7aab47..5f06e491df2c2182fef496be074d419efe5c987c 100644 (file)
--- 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 bd17ab09c4641435ad14fb732195653ecc036d14..b505e40d3957e8d13012fe8d9d3ecf5497ace903 100644 (file)
--- 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 45a8e2c0d52c2f3fdaed3250c6a214a4ad3eb6ac..f28fc9088c47b1449b91a0575f4656e43b3abf2e 100644 (file)
--- 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');
 

diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php
index 49b6d42b1e4e8b8539897860c2426a5d91bcea26..b7539727030c76d83d309c655e1d0c24fb835eec 100644 (file)
--- 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 d7ac2b8591386a86512c047a07890ac685c67551..300d1e9a2488e7430becd87e7c5f0a95cafae092 100644 (file)
--- 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 782f7198ae3fd4ed6eb991379ee6df309c27561b..6e12c20403cc0a9e5a52038d0b2e131672134102 100644 (file)
--- 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 a4ecbada15fccde6eacaecf895f45a8dbf4628f8..29724d6bdfa6e2227ec28b9fe468d493e148c658 100644 (file)
--- 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 50c525c7504d91684797ab2992e82f75a08d7cde..2bc790d5a04999ae3395a76f1e44705ba7f0ebaa 100644 (file)
--- a/plugins/FBConnect/FBC_XDReceiver.php
+++ b/plugins/FBConnect/FBC_XDReceiver.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/plugins/FBConnect/FBConnectLogin.php b/plugins/FBConnect/FBConnectLogin.php
index ae304f242fb3d48efe698af4e9acc50cc481b567..5696d884896d4ba8f6ba5a028b33d4c4a4ad8fa3 100644 (file)
--- a/plugins/FBConnect/FBConnectLogin.php
+++ b/plugins/FBConnect/FBConnectLogin.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 

diff --git a/plugins/FBConnect/FBConnectPlugin.php b/plugins/FBConnect/FBConnectPlugin.php
index fb50cc4c9e014c12d683a80c64c7037f7598103c..593b49b4ed4810ec391387d0e78ffa909c60cbc6 100644 (file)
--- 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 fbb4199809d7b422c961371a9b025f4ba08fb644..911c567873e74935175ca80fee869170cab195f4 100644 (file)
--- 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 59422e5d937e70ee781502c79e142c3c07e7e224..c955298cb934f4d1b9f27c146fa3e03e0e8a28bc 100644 (file)
--- 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 4cb05693b66b8f6bca2d794b88082136cd4974ba..5b345d7c2fa339af694f7bcb5d613789992c46aa 100644 (file)
--- 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 9ecf70030d44285b34a7990b6569f4bedb3089a0..82eca3d08c0d1cd67700ee69394563af534d5a73 100644 (file)
--- 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 9767f95d267324fd245f12cad03595c2c0d71b27..94cf0ccd17572f911ed3ea3a8a6b356734b6af16 100644 (file)
--- 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 eba527b8d69a8ea15c22b743aa148b8262377965..5cfebd8ee8a7bd908f8d21339268a1baa8a8c0ec 100755 (executable)
--- 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 0640fcc4f451be83f978d6eb90fb8ff79be4bdd5..d55a538853cbab49bcd7c85eb5c7d61b8ba7c91c 100755 (executable)
--- 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 2ccb7ce80d31a7243fd1ebdc9b5e0302372fcda5..359cd6cce46570d06b1e3f458326a80787443cdc 100755 (executable)
--- 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 63dd6b35a41133c00657800eba9a1968c97788da..7328635d3c744ca34de4ea1358f5b477904ab1f2 100755 (executable)
--- 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 4f02b55ec718517aa4840a12ce22bc186b94af9d..f145c1f0b67206081a60448e739400a33b1e4b5e 100755 (executable)
--- 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');