add more debug info

[qtadmin.git] / lib / utils.inc.php

diff --git a/lib/utils.inc.php b/lib/utils.inc.php
index 3f793a5a75a49b39e843c40d963515e351ee1f77..6e8f6249da604fc7f3697c7e26783dd82117f87d 100644 (file)
--- a/lib/utils.inc.php
+++ b/lib/utils.inc.php
@@ -254,7 +254,11 @@ class Utils {
             } else {
                 // HTTP GET
                 $data = json_decode($response['content']);
             } 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();
             }
         } else {
             $result = ($data) ? false : array();


@@ -360,14 +364,18 @@ class Utils {
         } else {
             $domain = $p[1];
             $dn = "mail=$user,ou=Users,domainName=$domain,$CFG->ldap_base_dn";
         } 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))";
             $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'));
             $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
                     $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)) {
                     if ($info['count'] > 0) {
                         // Log in to wblistadm server and get CSRFPreventionToken
                         if ($this->getRestTicket($user, $pw)) {


@@ -381,7 +389,7 @@ class Utils {
                             }
                             $this->settings['admin'] = ($admin == 'YES') ? true : false;
                         } else {
                             }
                             $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';
                         }
                     } else {
                         $this->settings['loginStatus'] = 'Login failed';