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

This commit is contained in:
Brion Vibber 2010-10-08 11:23:53 -07:00
parent 5fe59322bc
commit a30ea4568f
9 changed files with 23 additions and 15 deletions

View File

@ -2,7 +2,10 @@
/** /**
* Table Definition for user_openid * Table Definition for user_openid
*/ */
require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
if (!defined('STATUSNET')) {
exit(1);
}
class User_openid extends Memcached_DataObject class User_openid extends Memcached_DataObject
{ {

View File

@ -2,7 +2,10 @@
/** /**
* Table Definition for user_openid_trustroot * 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 class User_openid_trustroot extends Memcached_DataObject
{ {

View File

@ -27,7 +27,7 @@
* @link http://status.net/ * @link http://status.net/
*/ */
if (!defined('STATUSNET') && !defined('LACONICA')) { if (!defined('STATUSNET')) {
exit(1); exit(1);
} }

View File

@ -17,7 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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/openid.php';

View File

@ -17,9 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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/User_openid.php'); }
require_once('Auth/OpenID.php'); require_once('Auth/OpenID.php');
require_once('Auth/OpenID/Consumer.php'); require_once('Auth/OpenID/Consumer.php');

View File

@ -17,7 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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/openid.php';

View File

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

View File

@ -27,11 +27,10 @@
* @link http://status.net/ * @link http://status.net/
*/ */
if (!defined('STATUSNET') && !defined('LACONICA')) { if (!defined('STATUSNET')) {
exit(1); exit(1);
} }
require_once INSTALLDIR.'/lib/accountsettingsaction.php';
require_once INSTALLDIR.'/plugins/OpenID/openid.php'; require_once INSTALLDIR.'/plugins/OpenID/openid.php';
/** /**

View File

@ -17,10 +17,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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/openid.php';
require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php');
class OpenidtrustAction extends Action class OpenidtrustAction extends Action
{ {