X-Git-Url: http://git.datanom.net/qtadmin.git/blobdiff_plain/85ec6a8443c33132d3a9bc3323d52fafa2c0194a..3056d1173b4c0225eea764cd1bdfae965b198c14:/lib/utils.inc.php
diff --git a/lib/utils.inc.php b/lib/utils.inc.php
index 21724ec..be2ccf9 100644
--- a/lib/utils.inc.php
+++ b/lib/utils.inc.php
@@ -4,12 +4,7 @@ require_once $CFG->root .'config.php';
class Utils {
- private static $_instance = null;
- private $server;
- private $user;
- private $is_admin;
- private $loginStatus;
- private $timeout;
+ private $settings;
private $header = '
@@ -28,36 +23,41 @@ class Utils {
private $heading = 'Session timeout:
__TITLE__
';
- private function __construct() {
+ public function __construct() {
global $CFG;
- $this->server = $_SERVER;
-
- $this->user = null;
- $this->is_admin = false;
- $this->loginStatus = 'Not logged in';
-
$this->startSession();
- if (isset($_SESSION['user'])) {
- $this->user = $_SESSION['user'];
- $this->loginStatus = 'OK';
- $this->is_admin = $_SESSION['is_admin'];
- } else {
- if ($CFG->auth_method == 'HTTP_AUTH') {
- if (isset($this->server['PHP_AUTH_USER'])) {
- $this->user = $this->server['PHP_AUTH_USER'];
- $this->loginStatus = 'OK';
- if ($CFG->admin_user == $this->user)
- $this->is_admin = true;
- }
+ if (! isset($_SESSION['settings'])) {
+ $this->initSettings();
+ }
+ $this->settings = $_SESSION['settings'];
+
+ if ($CFG->auth_method == 'HTTP_AUTH') {
+ if (isset($this->server['PHP_AUTH_USER'])) {
+ $this->settings['user'] = $this->server['PHP_AUTH_USER'];
+ $this->settings['loginStatus'] = 'OK';
+ if ($CFG->admin_user == $this->settings['user'])
+ $this->settings['admin'] = true;
}
}
- $_SESSION['user'] = $this->user;
- $_SESSION['is_admin'] = $this->is_admin;
}
- private function __clone() {}
+ private function initSettings() {
+ if ('' == session_id()) {
+ $this->startSession();
+ }
+
+ $this->settings = array(
+ 'server' => $_SERVER,
+ 'user' => null,
+ 'admin' => false,
+ 'loginStatus' => 'Not logged in',
+ 'timeout' => 0
+ );
+
+ $_SESSION['settings'] = $this->settings;
+ }
private function startSession() {
global $CFG;
@@ -74,31 +74,19 @@ class Utils {
ini_set('session.cookie_lifetime', $this->timeout);
session_start();
-
- //echo ini_get('session.gc_maxlifetime').':'.ini_get('session.cookie_lifetime');
}
- public static function getInstance() {
+ private function checkSession() {
global $CFG;
- if (!is_object(self::$_instance)) {
- self::$_instance = new Utils();
- }
-
$time = $_SERVER['REQUEST_TIME'];
if (isset($_SESSION['LAST_ACTIVITY']) &&
- ($time - $_SESSION['LAST_ACTIVITY']) >= self::$_instance->timeout) {
+ ($time - $_SESSION['LAST_ACTIVITY']) >= $this->settings['timeout']) {
echo 'R_TIME: '.date('c', $time).' L_ACT: '.date('c', $_SESSION['LAST_ACTIVITY']);
- exit;
- session_unset();
- session_destroy();
- self::$_instance->user = null;
- self::$_instance->is_admin = false;
+ $this->logout();
} else {
$_SESSION['LAST_ACTIVITY'] = $time;
}
-
- return self::$_instance;
}
public function logout() {
@@ -111,83 +99,98 @@ class Utils {
}
session_unset();
session_destroy();
- $this->user = null;
- $this->is_admin = false;
+ $this->settings = array();
}
public function isAdmin() {
- //file_put_contents('/tmp/login.txt', var_export($this, true));
- return $this->is_admin;
+ $admin = false;
+
+ if (isset($this->settings['admin'])) {
+ $admin = $this->settings['admin'];
+ }
+
+ return $admin;
}
public function login($user, $pw) {
global $CFG;
$result = false;
- unset($_SESSION['user']);
- unset($_SESSION['is_admin']);
- $this->user = null;
- $this->is_admin = false;
+ if ('' == session_id()) {
+ $this->startSession();
+ }
+
+ $this->settings['user'] = null;
+ $this->settings['admin'] = false;
$p = explode('@', $user);
if (count($p) != 2) {
- $this->loginStatus = 'Bad username';
- return false;
- }
- $domain = $p[1];
- $dn = "mail=$user,ou=Users,domainName=$domain,$CFG->ldap_base_dn";
- $filter = "(&(objectclass=mailUser)(accountStatus=active)(mail=$user))";
- $ds = @ldap_connect($CFG->ldap_dsn);
- if ($ds) {
- @ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
- $r = @ldap_bind($ds, $dn, $pw);
- if ($r) {
- $sr = @ldap_search($ds, $CFG->ldap_base_dn, $filter, array('mail','domainglobaladmin'));
- $info = @ldap_get_entries($ds, $sr); // array
- if ($info['count'] > 0) {
- $_SESSION['user'] = $user;
- $this->user = $user;
- $result = true;
- $this->loginStatus = 'OK';
- $admin = 'NO';
- if (isset($info[0]['domainglobaladmin'])) {
- $admin = $info[0]['domainglobaladmin'][0];
- $admin = strtoupper($admin);
+ $this->settings['loginStatus'] = 'Bad username';
+ } else {
+ $domain = $p[1];
+ $dn = "mail=$user,ou=Users,domainName=$domain,$CFG->ldap_base_dn";
+ $filter = "(&(objectclass=mailUser)(accountStatus=active)(mail=$user))";
+ $ds = @ldap_connect($CFG->ldap_dsn);
+ if ($ds) {
+ @ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
+ $r = @ldap_bind($ds, $dn, $pw);
+ if ($r) {
+ $sr = @ldap_search($ds, $CFG->ldap_base_dn, $filter, array('mail','domainglobaladmin'));
+ $info = @ldap_get_entries($ds, $sr); // array
+ if ($info['count'] > 0) {
+ $this->settings['user'] = $user;
+ $result = true;
+ $this->settings['loginStatus'] = 'OK';
+ $admin = 'NO';
+ if (isset($info[0]['domainglobaladmin'])) {
+ $admin = $info[0]['domainglobaladmin'][0];
+ $admin = strtoupper($admin);
+ }
+ $this->settings['admin'] = ($admin == 'YES') ? true : false;
+ } else {
+ $this->settings['loginStatus'] = 'Login failed';
}
- $this->is_admin = ($admin == 'YES') ? true : false;
- $_SESSION['is_admin'] = $this->is_admin;
} else {
- $this->loginStatus = 'Login failed';
+ $this->settings['loginStatus'] = ldap_error($ds);
}
+ @ldap_close($ds);
} else {
- $this->loginStatus = ldap_error($ds);
+ $this->settings['loginStatus'] = 'Connect to LDAP server failed';
}
- @ldap_close($ds);
- } else {
- $this->loginStatus = 'Connect to LDAP server failed';
}
+ $_SESSION['settings'] = $this->settings;
+
return $result;
}
public function getLoginStatus() {
- return $this->loginStatus;
+ $status = 'Not logged in';
+
+ if (isset($this->settings['loginStatus'])) {
+ $status = $this->settings['loginStatus'];
+ }
+
+ return $status;
}
public function isLoggedIn() {
global $CFG;
$loggedIn = false;
- if ($this->user) {
- $loggedIn = true;
- } else if (isset($_SESSION['user'])) {
- $this->user = $_SESSION['user'];
- $loggedIn = true;
- } else {
- if ($CFG->auth_method == 'HTTP_AUTH') {
- if (isset($this->server['PHP_AUTH_USER'])) {
- $this->user = $this->server['PHP_AUTH_USER'];
- $loggedIn = true;
+ if ('' == session_id()) {
+ $this->startSession();
+ }
+
+ if (isset($this->settings['user'])) {
+ if ($this->settings['user'] != null) {
+ $loggedIn = true;
+ } else {
+ if ($CFG->auth_method == 'HTTP_AUTH') {
+ if (isset($this->server['PHP_AUTH_USER'])) {
+ $this->settings['user'] = $this->server['PHP_AUTH_USER'];
+ $loggedIn = true;
+ }
}
}
}
@@ -195,14 +198,22 @@ class Utils {
if ($loggedIn == false) {
echo '$this->user: '.$this->user.' $_SESSION[\'user\']: '.$_SESSION['user'];
echo 'R_TIME: '.date('c', $_SERVER['REQUEST_TIME']).' L_ACT: '.date('c', $_SESSION['LAST_ACTIVITY']);
- exit;
+ //exit;
}
+
+ $_SESSION['settings'] = $this->settings;
+
return $loggedIn;
}
public function getUser() {
- $this->isLoggedIn();
- return $this->user;
+ $user = null;
+
+ if ($this->isLoggedIn()) {
+ $user = $this->settings['user'];
+ }
+
+ return $user;
}
public function getHeader() {