Kolab Groupware OBS

Changes of Revision 6

iRony-0.4.8.tar.gz/lib/Kolab/CalDAV/CalendarBackend.php Changed

iRony-0.4.8.tar.gz/lib/Kolab/CardDAV/LDAPDirectory.php Changed

@@ -62,7 +62,7 @@
         $this->addressBookInfo = array(
             'id' => self::DIRECTORY_NAME,
             'uri' => self::DIRECTORY_NAME,
-            '{DAV:}displayname' => $config'name' ?: "LDAP Directory",
+            '{DAV:}displayname' => !empty($config'name') ? $config'name' : "LDAP Directory",
             '{urn:ietf:params:xml:ns:carddav}supported-address-data' => new CardDAV\Xml\Property\SupportedAddressData(),
             'principaluri' => $principalUri,
         );
@@ -85,12 +85,12 @@
 
     private function connect()
     {
-      if (!isset($this->ldap)) {
-        $this->ldap = new rcube_ldap($this->config, $this->config'debug');
-        $this->ldap->set_pagesize($this->config'sizelimit' ?: 10000);
-      }
+        if (!isset($this->ldap)) {
+            $this->ldap = new rcube_ldap($this->config, $this->config'debug');
+            $this->ldap->set_pagesize(!empty($this->config'sizelimit') ? $this->config'sizelimit' : 10000);
+        }
 
-      return $this->ldap->ready ? $this->ldap : null;
+        return $this->ldap->ready ? $this->ldap : null;
     }
 
     /**
@@ -199,7 +199,7 @@
         $children = array();
 
         // return cached index
-        if (!$this->query && !$this->config'searchonly' && $this->cache && ($cached_index = $this->cache->get('index'))) {
+        if (!$this->query && empty($this->config'searchonly') && $this->cache && ($cached_index = $this->cache->get('index'))) {
             foreach ($cached_index as $uid => $c) {
                 $obj = array(
                     'id'   => $uid,
@@ -214,7 +214,7 @@
         }
 
         // query LDAP if we have a search query or listing is allowed
-        if (($this->query || !$this->config'searchonly') && ($ldap = $this->connect())) {
+        if (($this->query || empty($this->config'searchonly')) && ($ldap = $this->connect())) {
             // set pagesize from query limit attribute
             if ($this->query && $this->query->limit) {
                 $this->ldap->set_pagesize(intval($this->query->limit));