projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ab3bc60
)
DataObjects/Core_person.php
author
Alan Knowles
<alan@roojs.com>
Mon, 15 Oct 2018 05:13:56 +0000
(13:13 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 15 Oct 2018 05:13:56 +0000
(13:13 +0800)
DataObjects/Core_person.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_person.php
b/DataObjects/Core_person.php
index
3c2e4e6
..
4dbdab2
100644
(file)
--- a/
DataObjects/Core_person.php
+++ b/
DataObjects/Core_person.php
@@
-291,12
+291,20
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
}
}
+ $auto_auth_allow = false;
+ if (!empty($ff->Pman['local_autoauth']) && $ff->Pman['local_autoauth'] === true) {
+ $auto_auth_allow = true;
+ }
+ if (empty($_SERVER['PATH_INFO']) || $_SERVER['PATH_INFO'] == '/Login') {
+ $auto_auth_allow = false;
+ }
+
// local auth -
$default_admin = false;
if (!empty($ff->Pman['local_autoauth']) &&
($ff->Pman['local_autoauth'] === true) &&
(
// local auth -
$default_admin = false;
if (!empty($ff->Pman['local_autoauth']) &&
($ff->Pman['local_autoauth'] === true) &&
(
- empty($_SERVER['PATH_INFO']) || // auto-auth is disabled for home page
+ !empty($_SERVER['PATH_INFO']) || // auto-auth is disabled for home page and login
$_SERVER['PATH_INFO'] != '/Login'
) && // auto-auth is disabled for home page
(!empty($_SERVER['SERVER_ADDR'])) &&
$_SERVER['PATH_INFO'] != '/Login'
) && // auto-auth is disabled for home page
(!empty($_SERVER['SERVER_ADDR'])) &&
@@
-313,7
+321,7
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
)
) {
)
) {
-
$group = DB_DataObject::factory('core_group');
+ $group = DB_DataObject::factory('core_group');
$group->get('name', 'Administrators');
$member = DB_DataObject::factory('core_group_member');
$group->get('name', 'Administrators');
$member = DB_DataObject::factory('core_group_member');