projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ec54aea
)
DataObjects/Core_person.php
author
Alan Knowles
<alan@roojs.com>
Mon, 22 Oct 2018 06:47:10 +0000
(14:47 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 22 Oct 2018 06:47:10 +0000
(14:47 +0800)
DataObjects/Core_person.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_person.php
b/DataObjects/Core_person.php
index
3ee20c6
..
aa23725
100644
(file)
--- a/
DataObjects/Core_person.php
+++ b/
DataObjects/Core_person.php
@@
-306,7
+306,8
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
if (!empty($ff->Pman['local_autoauth']) && $ff->Pman['local_autoauth'] === true) {
$auto_auth_allow = true;
}
- if (
+ if ( !empty($ff->Pman['local_autoauth'])
+ &&
(!empty($_SERVER['SERVER_ADDR'])) &&
(
$_SERVER['SERVER_ADDR'] == '127.0.0.1' &&
@@
-353,7
+354,7
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
$u->autoJoin();
$ff = HTML_FlexyFramework::get();
- if ($auto_auth_allow &&
+ if ($auto_auth_allow &&
($default_admin || $u->get('email', $ff->Pman['local_autoauth']))
) {