projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent endless recursive sent subfolder names - see: http://thread.gmane.org/gmane...
[squirrelmail.git]
/
plugins
/
administrator
/
auth.php
diff --git
a/plugins/administrator/auth.php
b/plugins/administrator/auth.php
index 472beaf8a00a868f6558c79494e1d9efb45d7797..edfca36fcdcd8b9b1d2972287246c6398a4e6ce4 100644
(file)
--- a/
plugins/administrator/auth.php
+++ b/
plugins/administrator/auth.php
@@
-1,14
+1,15
@@
<?php
<?php
+
/**
* Administrator plugin - Authentication routines
*
* This function tell other modules what users have access
* to the plugin.
*
/**
* Administrator plugin - Authentication routines
*
* This function tell other modules what users have access
* to the plugin.
*
- * @version $Id$
* @author Philippe Mingo
* @author Philippe Mingo
- * @copyright
(c) 1999-2005
The SquirrelMail Project Team
+ * @copyright
1999-2012
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
* @package plugins
* @subpackage administrator
*/
* @package plugins
* @subpackage administrator
*/
@@
-19,15
+20,21
@@
* @return boolean
*/
function adm_check_user() {
* @return boolean
*/
function adm_check_user() {
- global $PHP_SELF;
- require_once(SM_PATH . 'functions/global.php');
+ global $plugins;
+
+ /* fail if the plugin is not enabled */
+ if ( !in_array('administrator', $plugins) ) {
+ return FALSE;
+ }
if ( !sqgetGlobalVar('username',$username,SQ_SESSION) ) {
$username = '';
}
/* This needs to be first, for all non_options pages */
if ( !sqgetGlobalVar('username',$username,SQ_SESSION) ) {
$username = '';
}
/* This needs to be first, for all non_options pages */
- if (strpos('options.php', $PHP_SELF)) {
+ //if (!defined('PAGE_NAME') || strpos(PAGE_NAME, 'options') === FALSE) {
+ if (!defined('PAGE_NAME')
+ || (PAGE_NAME != 'administrator_options' && PAGE_NAME != 'options')) {
$auth = FALSE;
} else if (file_exists(SM_PATH . 'plugins/administrator/admins')) {
$auths = file(SM_PATH . 'plugins/administrator/admins');
$auth = FALSE;
} else if (file_exists(SM_PATH . 'plugins/administrator/admins')) {
$auths = file(SM_PATH . 'plugins/administrator/admins');
@@
-58,4
+65,3
@@
function adm_check_user() {
function adm_array_trim(&$value,$key) {
$value=trim($value);
}
function adm_array_trim(&$value,$key) {
$value=trim($value);
}
-?>
\ No newline at end of file