X-Git-Url: http://git.datanom.net/qtadmin.git/blobdiff_plain/e9bc08fcf82464f04a3fc04be9ecbf301bb906ab..HEAD:/lib/utils.inc.php?ds=sidebyside diff --git a/lib/utils.inc.php b/lib/utils.inc.php index 8f3175a..6e8f624 100644 --- a/lib/utils.inc.php +++ b/lib/utils.inc.php @@ -23,23 +23,53 @@ class Utils { __TITLE__ + + +
'; private $footer = '
'; @@ -224,7 +254,11 @@ class Utils { } else { // HTTP GET $data = json_decode($response['content']); - $result = $data->data; + if (is_object($data)) { + $result = $data->data; + } else { + $result = array('No result'); + } } } else { $result = ($data) ? false : array(); @@ -330,14 +364,18 @@ class Utils { } else { $domain = $p[1]; $dn = "mail=$user,ou=Users,domainName=$domain,$CFG->ldap_base_dn"; + $this->log('dn: '.var_export($dn, true), 4); $filter = "(&(objectclass=mailUser)(accountStatus=active)(mail=$user))"; + $this->log('filter: '.var_export($filter, true), 4); $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')); + $this->log('sr: '.var_export($sr, true), 4); $info = @ldap_get_entries($ds, $sr); // array + $this->log('info: '.var_export($info, true), 4); if ($info['count'] > 0) { // Log in to wblistadm server and get CSRFPreventionToken if ($this->getRestTicket($user, $pw)) { @@ -351,7 +389,7 @@ class Utils { } $this->settings['admin'] = ($admin == 'YES') ? true : false; } else { - $this->settings['loginStatus'] = 'Login failed'; + $this->settings['loginStatus'] = 'Login to wblistadm REST server failed'; } } else { $this->settings['loginStatus'] = 'Login failed';