projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
52b198a
)
disable_http_auth as an option
author
Alan
<alan@roojs.com>
Thu, 19 May 2022 05:52:44 +0000
(13:52 +0800)
committer
Alan
<alan@roojs.com>
Thu, 19 May 2022 05:52:44 +0000
(13:52 +0800)
DataObjects/Core_person.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_person.php
b/DataObjects/Core_person.php
index
160a058
..
8799d54
100644
(file)
--- a/
DataObjects/Core_person.php
+++ b/
DataObjects/Core_person.php
@@
-256,16
+256,12
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
// do not start a session if we are using http auth...
// we have a situation where the app is behind a http access and is also login
// need to work out a way to handle that.
// do not start a session if we are using http auth...
// we have a situation where the app is behind a http access and is also login
// need to work out a way to handle that.
-
- $session_started = false;
- if (php_sapi_name() != "cli" && empty($_SERVER['PHP_AUTH_USER']) && empty($_COOKIE['PHPSESSID'])) {
- $session_started = false;
- @session_start();
+
+ if (php_sapi_name() != "cli" && empty($_SERVER['PHP_AUTH_USER']) && !empty($ff->disable_http_auth)) {
+ @session_start();
}
}
-
-
- $ff= HTML_FlexyFramework::get();
+
$sesPrefix = $this->sesPrefix();
$sesPrefix = $this->sesPrefix();
@@
-312,9
+308,7
@@
class Pman_Core_DataObjects_Core_person extends DB_DataObject
}
// at this point all http auth stuff is done, so we can init session
}
// at this point all http auth stuff is done, so we can init session
- if (php_sapi_name() != "cli" && !$session_started) {
- @session_start();
- }
+
//die("test init");
if (!$this->canInitializeSystem()) {
//die("test init");
if (!$this->canInitializeSystem()) {