Normalize execution guards in OpenID plugin files; avoids annoying fatal errors when...

diff --git a/plugins/OpenID/User_openid.php b/plugins/OpenID/User_openid.php
index 1beff9ea304afebbeeec5c1391137ae0c802c2df..e34cf21f2cd142db5015c81d6d77a74e3b1e2d6a 100644 (file)
--- a/plugins/OpenID/User_openid.php
+++ b/plugins/OpenID/User_openid.php
@@ -2,7 +2,10 @@
 /**
  * Table Definition for user_openid
  */
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 class User_openid extends Memcached_DataObject
 {

diff --git a/plugins/OpenID/User_openid_trustroot.php b/plugins/OpenID/User_openid_trustroot.php
index 17c03afb02aee3dd707ac88c7fe077408e490b7c..69e0a3f3e0eb6485bd93462926bb4c4fffffb9aa 100644 (file)
--- a/plugins/OpenID/User_openid_trustroot.php
+++ b/plugins/OpenID/User_openid_trustroot.php
@@ -2,7 +2,10 @@
 /**
  * Table Definition for user_openid_trustroot
  */
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 class User_openid_trustroot extends Memcached_DataObject
 {

diff --git a/plugins/OpenID/finishaddopenid.php b/plugins/OpenID/finishaddopenid.php
index 47b3f7fb167c9de4890d8708013eb85e840edba4..6eb2f2d20637ec65c101326a090b55e3787b728a 100644 (file)
--- a/plugins/OpenID/finishaddopenid.php
+++ b/plugins/OpenID/finishaddopenid.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 

diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php
index 0c03b5c4db8b5758e9947c2c1d124aef9ddaed82..01dd61edb12002b756c6b9e177147f2a30dcbb2a 100644 (file)
--- a/plugins/OpenID/finishopenidlogin.php
+++ b/plugins/OpenID/finishopenidlogin.php
@@ -17,7 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 require_once INSTALLDIR.'/plugins/OpenID/openid.php';
 

diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php
index 1b93163e5f5efb307828e5aba64815e79ffa3ff8..ad251aa2cd93d577e7cc14cdf0786ead909d727e 100644 (file)
--- a/plugins/OpenID/openid.php
+++ b/plugins/OpenID/openid.php
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-
-require_once(INSTALLDIR.'/plugins/OpenID/User_openid.php');
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 require_once('Auth/OpenID.php');
 require_once('Auth/OpenID/Consumer.php');

diff --git a/plugins/OpenID/openidlogin.php b/plugins/OpenID/openidlogin.php
index 20d6e070cdb39599b352b3d1419152f867cd852b..4046068cfa661de946d877e73bddd23ba41a2d18 100644 (file)
--- a/plugins/OpenID/openidlogin.php
+++ b/plugins/OpenID/openidlogin.php
@@ -17,7 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 require_once INSTALLDIR.'/plugins/OpenID/openid.php';
 

diff --git a/plugins/OpenID/openidserver.php b/plugins/OpenID/openidserver.php
index b2cf1f8ac35fc3bed4351b7ec508a90ba99f6d31..ed9db4fd2865f728b21eaf1b6200195dad7c1e98 100644 (file)
--- a/plugins/OpenID/openidserver.php
+++ b/plugins/OpenID/openidserver.php
@@ -28,13 +28,11 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/action.php';
 require_once INSTALLDIR.'/plugins/OpenID/openid.php';
-require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php');
 
 /**
  * Settings for OpenID

diff --git a/plugins/OpenID/openidsettings.php b/plugins/OpenID/openidsettings.php
index 505e7d0ee36574660804ad9d894a968ed9155333..b7d5bd084d10142a86c8c8740ef90af025d8635c 100644 (file)
--- a/plugins/OpenID/openidsettings.php
+++ b/plugins/OpenID/openidsettings.php
@@ -27,11 +27,10 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/accountsettingsaction.php';
 require_once INSTALLDIR.'/plugins/OpenID/openid.php';
 
 /**

diff --git a/plugins/OpenID/openidtrust.php b/plugins/OpenID/openidtrust.php
index ed6ca73a47f71ca11e84d8cbf32f30c8a459f163..89f3150f6358344eda2fb832e2f137d2f8723489 100644 (file)
--- a/plugins/OpenID/openidtrust.php
+++ b/plugins/OpenID/openidtrust.php
@@ -17,10 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 require_once INSTALLDIR.'/plugins/OpenID/openid.php';
-require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php');
 
 class OpenidtrustAction extends Action
 {