projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
54fe24a
)
DataObjects/Core_person.php
author
Alan Knowles
<alan@roojs.com>
Mon, 15 Oct 2018 05:15:09 +0000
(13:15 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 15 Oct 2018 05:15:09 +0000
(13:15 +0800)
DataObjects/Core_person.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_person.php
b/DataObjects/Core_person.php
index
629edd6
..
213e3d5
100644
(file)
--- a/
DataObjects/Core_person.php
+++ b/
DataObjects/Core_person.php
@@
-340,20
+340,7
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
$u = DB_DataObject::factory($this->tableName());
$ff = HTML_FlexyFramework::get();
$u = DB_DataObject::factory($this->tableName());
$ff = HTML_FlexyFramework::get();
- if (!empty($ff->Pman['local_autoauth']) &&
- ($ff->Pman['local_autoauth'] === true) &&
- (!empty($_SERVER['SERVER_ADDR'])) &&
- (
- (
- $_SERVER['SERVER_ADDR'] == '127.0.0.1' &&
- $_SERVER['REMOTE_ADDR'] == '127.0.0.1'
- )
- ||
- (
- $_SERVER['SERVER_ADDR'] == '::1' &&
- $_SERVER['REMOTE_ADDR'] == '::1'
- )
- ) &&
+ if ($auto_auth_allow &&
($default_admin || $u->get('email', $ff->Pman['local_autoauth']))
) {
($default_admin || $u->get('email', $ff->Pman['local_autoauth']))
) {