Request 3171 (accepted)

kolab-webadmin-3.2.16.tar.gz/composer.lock Changed

kolab-webadmin-3.2.16.tar.gz/lib/Auth/LDAP.php Changed

@@ -684,7 +684,7 @@
     {
         $this->_log(LOG_DEBUG, "Auth::LDAP::list_organizationalunits(" . var_export($attributes, true) . ", " . var_export($search, true) . ", " . var_export($params, true));
 
-        $base_dn = $this->_subject_base_dn($params'type' ? $params'type' . '_ou' : 'ou');
+        $base_dn = $this->_subject_base_dn(!empty($params'type') ? $params'type' . '_ou' : 'ou');
         $filter  = $this->conf->get('ou_filter');
 
         if (!$filter) {
@@ -999,7 +999,7 @@
             // update session password
             if (!empty($result'replace') && !empty($result'replace''userpassword')) {
                 $pass = $result'replace''userpassword';
-                $_SESSION'user'->user_bind_pw = is_array($pass) ? implode($pass) : $pass;
+                $_SESSION'user'->user_bind_pw = is_array($pass) ? implode('', $pass) : $pass;
             }
         }
 
@@ -1079,7 +1079,7 @@
         }
 
         // connect and bind...
-        if ($_SESSION'user' && $_SESSION'user'->user_bind_dn) {
+        if (!empty($_SESSION'user') && !empty($_SESSION'user'->user_bind_dn)) {
             $bind_dn = $_SESSION'user'->user_bind_dn;
             $bind_pw = $_SESSION'user'->user_bind_pw;
         }
@@ -1405,6 +1405,7 @@
     private function sort_result($a, $b)
     {
         if (is_array($this->sort_result_key)) {
+            $str1 = $str2 = '';
             foreach ($this->sort_result_key as $attrib) {
                 if (array_key_exists($attrib, $a) && !$str1) {
                     $str1 = $a$attrib;

kolab-webadmin-3.2.16.tar.gz/lib/SQL.php Changed

kolab-webadmin-3.2.16.tar.gz/lib/SQL/mysql.php Changed

kolab-webadmin-3.2.16.tar.gz/lib/api/kolab_api_service_form_value.php Changed

@@ -64,11 +64,14 @@
      */
     public function generate($getdata, $postdata)
     {
-        $attribs    = $this->object_type_attributes($postdata'object_type', $postdata'type_id', $type_key);
         $attributes = (array) $postdata'attributes';
         $result     = array();
+        $attribs    = array();
 
-        $postdata'type_key' = $type_key;
+        if (!empty($postdata'object_type') && !empty($postdata'type_id')) {
+            $attribs = $this->object_type_attributes($postdata'object_type', $postdata'type_id', $type_key);
+            $postdata'type_key' = $type_key;
+        }
 
         foreach ($attributes as $attr_name) {
             if (empty($attr_name)) {
@@ -110,13 +113,11 @@
      */
     public function list_options($getdata, $postdata)
     {
-        //console($postdata);
-
         $attribs   = $this->object_type_attributes($postdata'object_type', $postdata'type_id', $key_name);
         $attr_name = $postdata'attribute';
         $result    = array(
             // return search value, so client can match response to request
-            'search' => $postdata'search',
+            'search' => isset($postdata'search') ? $postdata'search' : null,
             'list'   => array(),
         );
 
@@ -161,12 +162,15 @@
      */
     public function select_options($getdata, $postdata)
     {
-        //console("form_value.select_options postdata", $postdata);
-        $attribs    = $this->object_type_attributes($postdata'object_type', $postdata'type_id', $key_name);
         $attributes = (array) $postdata'attributes';
         $result     = array();
+        $attribs    = array();
 
-        if ($key_name) {
+        if (!empty($postdata'object_type') && !empty($postdata'type_id')) {
+            $attribs = $this->object_type_attributes($postdata'object_type', $postdata'type_id', $key_name);
+        }
+
+        if (!empty($key_name)) {
             $postdata'type_key' = $key_name;
         }
 
@@ -229,7 +233,7 @@
                 }
             }
 
-            $validate = $attribs'form_fields'$attr_name'validate';
+            $validate = isset($attribs'form_fields'$attr_name'validate') ? $attribs'form_fields'$attr_name'validate' : null;
 
             // deprecated value: false = VALIDATE_NONE
             if ($validate === false) {
@@ -239,7 +243,7 @@
             if ($validate == self::VALIDATE_NONE) {
                 $result$attr_name = $attr_value;
             }
-            else if ($attribs'form_fields'$attr_name'optional' && $attr_value === '') {
+            else if (!empty($attribs'form_fields'$attr_name'optional') && $attr_value === '') {
                 $result$attr_name = $attr_value;
             }
             else {

kolab-webadmin-3.2.16.tar.gz/lib/api/kolab_api_service_type.php Changed

@@ -94,7 +94,7 @@
             'name'        => $postdata'name',
             'description' => $postdata'description' ? $postdata'description' : '',
             'attributes'  => json_encode($postdata'attributes'),
-            'is_default'  => $postdata'is_default' ? 1 : 0,
+            'is_default'  => !empty($postdata'is_default') ? 1 : 0,
         );
 
         if ($postdata'type' == 'user') {
@@ -112,13 +112,10 @@
         }
 
         // there can be only one default
-        if ($postdata'is_default') {
+        if (!empty($postdata'is_default')) {
             $this->db->query("UPDATE `{$type}_types` SET `is_default` = 0 WHERE `id` <> " . intval($id));
         }
 
-        // update cache
-        $this->cache'object_types'$type$id = $postdata;
-
         $postdata'id' = $id;
 
         return $postdata;
@@ -186,13 +183,13 @@
         $query = array(
             'key'         => $postdata'key',
             'name'        => $postdata'name',
-            'description' => $postdata'description' ? $postdata'description' : '',
+            'description' => !empty($postdata'description') ? $postdata'description' : '',
             'attributes'  => json_encode($postdata'attributes'),
-            'is_default'  => $postdata'is_default' ? 1 : 0,
+            'is_default'  => !empty($postdata'is_default') ? 1 : 0,
         );
 
         if ($postdata'type' == 'user') {
-            $query'used_for' = $postdata'used_for' == 'hosted' ? 'hosted' : null;
+            $query'used_for' = !empty($postdata'used_for') && $postdata'used_for' == 'hosted' ? 'hosted' : null;
         }
 
         foreach ($query as $idx => $value) {
@@ -207,13 +204,10 @@
         }
 
         // there can be only one default
-        if ($postdata'is_default') {
+        if (!empty($postdata'is_default')) {
             $this->db->query("UPDATE `{$type}_types` SET `is_default` = 0 WHERE `id` <> " . intval($postdata'id'));
         }
 
-        // update cache
-        $this->cache'object_types'$type$id = $postdata;
-
         return $postdata;
     }

kolab-webadmin-3.2.16.tar.gz/lib/client/kolab_client_task_domain.php Changed

kolab-webadmin-3.2.16.tar.gz/lib/client/kolab_client_task_group.php Changed

kolab-webadmin-3.2.16.tar.gz/lib/client/kolab_client_task_ou.php Changed

@@ -60,7 +60,7 @@
     public function action_add()
     {
         $data   = $this->get_input('data', 'POST');
-        $output = $this->ou_form(null, $data, true);
+        $output = $this->ou_form(null, $data);
 
         $this->output->set_object('taskcontent', $output);
     }
@@ -85,6 +85,7 @@
     {
         $result = $this->ou_list_sort($result);
         $result = $this->ou_list_build_tree($result, $max_tree_level);
+        $i = 0;
 
         foreach ($result as $idx => $item) {
             $class = array('selectable');
@@ -96,7 +97,7 @@
                 $style = 'display:none';
             }
 
-            if ($item'has_children') {
+            if (!empty($item'has_children')) {
                 $tree .= '<span class="expando font-icon"></span>';
             }
             else if ($max_tree_level) {
@@ -161,7 +162,7 @@
             'type'    => kolab_form::INPUT_SELECT,
             'options' => array_merge(array(''), $this->ou_list()),
             'escaped' => true,
-            'default' => $data'base_dn',
+            'default' => isset($data'base_dn') ? $data'base_dn' : null,
         );
 
         // Create mode

kolab-webadmin-3.2.16.tar.gz/lib/client/kolab_client_task_resource.php Changed

kolab-webadmin-3.2.16.tar.gz/lib/client/kolab_client_task_role.php Changed

kolab-webadmin-3.2.16.tar.gz/lib/client/kolab_client_task_settings.php Changed

@@ -274,7 +274,8 @@
 
         $rows = $head = $foot = array();
         $cols = array('name');
-        $i    = 0;
+        $i = 0;
+        $foot_body = '';
 
         // table header
         $head0'cells' = array('class' => 'name', 'body' => $this->translate('type.list'));
@@ -334,7 +335,7 @@
             $this->output->command('set_watermark', 'taskcontent');
         }
 
-        $this->output->set_env('search_request', $search_request ? base64_encode(serialize($search_request)) : null);
+        $this->output->set_env('search_request', !empty($search_request) ? base64_encode(serialize($search_request)) : null);
         $this->output->set_env('list_page', $page);
         $this->output->set_env('list_count', $count);
         $this->output->set_env('list_size', count($result));
@@ -455,7 +456,7 @@
         $add_mode = empty($data'id');
         $title    = $add_mode ? $this->translate('type.add') : $data'name';
 
-        $data'id' = $data'id' ? $data'type'.':'.$data'id' : null;
+        $data'id' = !empty($data'id') ? ($data'type' . ':' . $data'id') : null;
 
         // Create form object and populate with fields
         $form = $this->form_create('type', $attribs, $sections, $fields, $fields_map, $data, $add_mode);
@@ -480,7 +481,7 @@
         }
 
         // Get the rights on the entry and attribute level
-        $data'effective_rights' = $this->effective_rights('type', $data'id');
+        $data'effective_rights' = $this->effective_rights('type', isset($data'id') ? $data'id' : null);
         $attribute_rights         = (array) $data'effective_rights''attribute';
         $entry_rights             = (array) $data'effective_rights''entry';
 
@@ -489,16 +490,16 @@
             'key' => array(
                 'type' => kolab_form::INPUT_TEXT,
                 'required' => true,
-                'value' => $data'key',
+                'value' => isset($data'key') ? $data'key' : '',
             ),
             'name' => array(
                 'type' => kolab_form::INPUT_TEXT,
                 'required' => true,
-                'value' => $data'name',
+                'value' => isset($data'name') ? $data'name' : '',
             ),
             'description' => array(
                 'type'  => kolab_form::INPUT_TEXTAREA,
-                'value' => $data'description',
+                'value' => isset($data'description') ? $data'description' : '',
             ),
             'objectclass' => array(
                 'type'     => kolab_form::INPUT_SELECT,
@@ -524,10 +525,6 @@
             ),
         );
 
-        if ($data'type' != 'user') {
-            unset($form_fields'used_for');
-        }
-
         // See if "administrators" (those who can delete and add back on the entry
         // level) may override the automatically generated contents of auto_form_fields.
         //$admin_auto_fields_rw = $this->config_get('admin_auto_fields_rw', false, Conf::BOOL);
@@ -636,7 +633,7 @@
         }
 
         // get attributes list from $data
-        if (!empty($data) && count($data) > 1) {
+        if (!empty($data) && count($data) > 1 && !empty($data'attributes')) {
             $attributes = array_merge(
                 array_keys((array) $data'attributes''auto_form_fields'),
                 array_keys((array) $data'attributes''form_fields'),
@@ -659,10 +656,10 @@
         // defined attributes
         foreach ($attributes as $attr) {
             $row          = $cells;
-            $type         = $data'attributes''form_fields'$attr'type' ?: 'text';
-            $optional     = $data'attributes''form_fields'$attr'optional';
-            $autocomplete = $data'attributes''form_fields'$attr'autocomplete';
-            $validate     = $data'attributes''form_fields'$attr'validate';
+            $type         = !empty($data'attributes''form_fields'$attr'type') ? $data'attributes''form_fields'$attr'type' : 'text';
+            $optional     = !empty($data'attributes''form_fields'$attr'optional');
+            $autocomplete = !empty($data'attributes''form_fields'$attr'autocomplete');
+            $validate     = !empty($data'attributes''form_fields'$attr'validate') ? $data'attributes''form_fields'$attr'validate' : null;
             $valtype      = 'normal';
             $value        = '';
 
@@ -673,7 +670,7 @@
                 $type = 'text-autocomplete';
             }
 
-            if ($data'attributes''fields'$attr) {
+            if (!empty($data'attributes''fields'$attr)) {
                 $valtype = 'static';
                 $_data   = $data'attributes''fields'$attr;
                 $_data   = is_array($_data) ? implode(',', $_data) : $_data;
@@ -682,7 +679,7 @@
             else if (isset($data'attributes''auto_form_fields'$attr)) {
                 $valtype = 'auto';
 
-                if (is_array($data'attributes''auto_form_fields'$attr'data')) {
+                if (isset($data'attributes''auto_form_fields'$attr'data') && is_array($data'attributes''auto_form_fields'$attr'data')) {
                     $_data = implode(',', $data'attributes''auto_form_fields'$attr'data');
                 }
                 else {
@@ -740,10 +737,10 @@
                 'valtype'  => $valtype,
                 'optional' => $optional,
                 'validate' => $n_validate,
-                'maxcount' => $data'attributes''form_fields'$attr'maxcount',
-                'data'     => $_data,
-                'values'   => $data'attributes''form_fields'$attr'values',
-                'default'  => $data'attributes''form_fields'$attr'default',
+                'maxcount' => isset($data'attributes''form_fields'$attr'maxcount') ? $data'attributes''form_fields'$attr'maxcount' : null,
+                'data'     => isset($_data) ? $_data : null,
+                'values'   => isset($data'attributes''form_fields'$attr'values') ? $data'attributes''form_fields'$attr'values' : null,
+                'default'  => isset($data'attributes''form_fields'$attr'default') ? $data'attributes''form_fields'$attr'default' : null,
             );
         }
 
@@ -773,15 +770,17 @@
             'attribute.validate.extended'
         );
 
+        $out = kolab_html::table($table);
+
         // Add attribute link
         if (in_array('write', $rights)) {
-            $link = kolab_html::a(array(
+            $out .= kolab_html::a(array(
                 'href' => '#add_attr', 'class' => 'add_attr',
                 'onclick' => "kadm.type_attr_add()",
                 'content' =>  $this->translate('attribute.add')), true);
         }
 
-        return kolab_html::table($table) . $link;
+        return $out;
     }
 
     /**

kolab-webadmin-3.2.16.tar.gz/lib/client/kolab_client_task_sharedfolder.php Changed

kolab-webadmin-3.2.16.tar.gz/lib/client/kolab_client_task_user.php Changed

kolab-webadmin-3.2.16.tar.gz/lib/kolab_api_controller.php Changed

kolab-webadmin-3.2.16.tar.gz/lib/kolab_api_service.php Changed

@@ -170,7 +170,7 @@
 
                 if (is_array($value)) {
                     foreach ($value as $_value) {
-                        $_value = $this->conf->expand($_value, $custom = Array('base_dn' => $this->base_dn()));
+                        $_value = $this->conf->expand($_value, $custom = array('base_dn' => $this->base_dn()));
 
                         if (in_array($_value, (array)$v)) {
                             $elem_values_score++;
@@ -179,7 +179,7 @@
 
                     $value = implode('', $value);
                 } else if (is_string($value)) {
-                    $value = $this->conf->expand($value, $custom = Array('base_dn' => $this->base_dn()));
+                    $value = $this->conf->expand($value, $custom = array('base_dn' => $this->base_dn()));
                 }
 
                 if (is_array($v)) {
@@ -254,16 +254,6 @@
             return array();
         }
 
-        $conf = Conf::get_instance();
-
-        $devel_mode = $conf->get('kolab_wap', 'devel_mode');
-
-        if ($devel_mode == null) {
-            if (!empty($this->cache'object_types') && !empty($this->cache'object_types'$object_name)) {
-                return $this->cache'object_types'$object_name;
-            }
-        }
-
         // get list of object types
         if ($object_name == 'domain') {
             $object_types = array();
@@ -305,13 +295,7 @@
             }
         }
 
-        if ($devel_mode == null) {
-            return $this->cache'object_types'$object_name = $object_types;
-        }
-        else {
-            return $object_types;
-        }
-
+        return $object_types;
     }
 
     /**
@@ -335,7 +319,7 @@
         $attribs'object_type' = $object_name;
         $validate_result = $form_service->validate(null, $attribs);
 
-        $special_attr_validate = Array();
+        $special_attr_validate = array();
 
         foreach ($validate_result as $attr_name => $value) {
             if ($value !== false && $value !== '' && $value !== null && $value !== "OK") {
@@ -351,19 +335,19 @@
             foreach ($type_attrs'form_fields' as $key => $value) {
                 Log::trace("Running parse input attributes for key $key");
 
-                $type = $value'type' ?: ($type_attrs'auto_form_fields'$key ? $type_attrs'auto_form_fields'$key'type' : '');
+                $type = !empty($value'type') ? $value'type' : (!empty($type_attrs'auto_form_fields'$key'type') ? $type_attrs'auto_form_fields'$key'type' : '');
 
                 if (($type == 'text' || empty($type)) && is_array($attribs$key)) {
                     $attribs$key = array_shift($attribs$key);
                 }
 
                 if (empty($attribs$key) && empty($value'optional')) {
-                    Log::error("\$attribs'" . $key . "' is empty, and the field is not optional");
+                    Log::error("\$attribs'{$key}' is empty, and the field is not optional");
                     throw new Exception("Missing input value for $key", 345);
                 }
                 else {
-                    Log::trace("Either \$attribs'" . $key . "' is not empty or the field is optional");
-                    $result$key = $attribs$key;
+                    Log::trace("Either \$attribs'{$key}' is not empty or the field is optional");
+                    $result$key = isset($attribs$key) ? $attribs$key : null;
                 }
             }
         }
@@ -386,14 +370,14 @@
         if (isset($type_attrs'fields')) {
             foreach ($type_attrs'fields' as $key => $value) {
                 if (!is_array($value)) {
-                    $value2 = $this->conf->expand($value, $custom = Array('base_dn' => $this->base_dn()));
+                    $value2 = $this->conf->expand($value, $custom = array('base_dn' => $this->base_dn()));
                     if ($value !== $value2) {
                         Log::trace("Made value " . var_export($value, TRUE) . " in to: " . var_export($value2, TRUE));
                         $value = $value2;
                     }
                 } else {
                     foreach ($value as $_key => $_value) {
-                        $_value2 = $this->conf->expand($_value, $custom = Array('base_dn' => $this->base_dn()));
+                        $_value2 = $this->conf->expand($_value, $custom = array('base_dn' => $this->base_dn()));
                         if ($_value !== $_value2) {
                             Log::trace("Made value " . var_export($_value, TRUE) . " in to: " . var_export($_value2, TRUE));
                             $value$_key = $_value2;
@@ -430,7 +414,7 @@
 
     protected function parse_list_attributes($post)
     {
-        $attributes = Array();
+        $attributes = array();
         // Attributes to return
         if (!empty($post'attributes') && is_array($post'attributes')) {
             // get only supported attributes
@@ -472,10 +456,10 @@
 
     protected function parse_list_params($post)
     {
-        $params = Array();
+        $params = array();
         if (!empty($post'sort_by')) {
             if (is_array($post'sort_by')) {
-                $params'sort_by' = Array();
+                $params'sort_by' = array();
                 foreach ($post'sort_by' as $attrib) {
                     if (in_array($attrib, $this->list_attribs)) {
                         $params'sort_by' = $attrib;
@@ -506,7 +490,7 @@
 
     protected function parse_list_search($post)
     {
-        $search = Array();
+        $search = array();
         // Search parameters
         if (!empty($post'search') && is_array($post'search')) {
             if (array_key_exists('params', $post'search')) {

kolab-webadmin-3.2.16.tar.gz/lib/kolab_client_task.php Changed

@@ -50,6 +50,7 @@
     protected $page_size    = 20;
     protected $list_attribs = array();
     protected $list_module;
+    protected $domain;
 
     protected $search_attribs = array(
         'name'  => array('cn', 'displayname'),
@@ -207,8 +208,8 @@
             $login = $this->get_input('login', 'POST', true);
 
             if ($login'username') {
-                $login'username' = trim($login'username');
-                $login'domain'   = trim($login'domain');
+                $login'username' = isset($login'username') ? trim($login'username') : '';
+                $login'domain'   = isset($login'domain') ? trim($login'domain') : '';
 
                 $result = $this->api->login($login'username', $login'password', $login'domain', true);
 
@@ -278,7 +279,7 @@
         else if (!empty($_SESSION'user') && !empty($_SESSION'user''token')) {
             // Validate session
             $timeout = $this->config_get('session_timeout', 3600);
-            if ($timeout && $_SESSION'time' && $_SESSION'time' < time() - $timeout) {
+            if ($timeout && !empty($_SESSION'time') && $_SESSION'time' < time() - $timeout) {
                 $this->action_logout(true);
             }
 
@@ -711,9 +712,13 @@
             }
         }
 
-        $domain = $this->domain ? $this->domain : $_SESSION'user''domain';
+        $domain = !empty($this->domain) ? $this->domain : $_SESSION'user''domain';
 
-        return !$all ? $list$domain : $list;
+        if (!$all) {
+            return isset($list$domain) ? $list$domain : null;
+        }
+
+        return $list;
     }
 
     /**
@@ -805,7 +810,7 @@
                     'type'      => 'text',
                     'id'        => 'login_name',
                     'name'      => 'loginusername',
-                    'value'     => $post'username',
+                    'value'     => isset($post'username') ? $post'username' : '',
                     'placeholder' => $this->translate('login.username'),
                     'autofocus' => true))
         ));
@@ -856,20 +861,17 @@
     protected function form_element_type($field, $data = array())
     {
         $result = array();
+        $field_type = !empty($field'type') ? $field'type' : null;
 
-        switch ($field'type') {
+        switch ($field_type) {
         case 'select':
         case 'multiselect':
             $opts = $this->form_element_select_data($field, $data);
 
-            $result'type'    = kolab_form::INPUT_SELECT;
-            $result'options' = $opts'options';
-            $result'value'   = $opts'default';
-            $result'default' = $field'default';
-
-            if ($field'type' == 'multiselect') {
-                $result'multiple' = true;
-            }
+            $result'type'     = kolab_form::INPUT_SELECT;
+            $result'options'  = $opts'options';
+            $result'value'    = $opts'default';
+            $result'multiple' = $field_type == 'multiselect';
 
             break;
 
@@ -901,8 +903,7 @@
             break;
 
         case 'text-quota':
-            $result'type'    = kolab_form::INPUT_TEXTQUOTA;
-            $result'default' = $field'default';
+            $result'type' = kolab_form::INPUT_TEXTQUOTA;
             break;
 
         case 'aci':
@@ -926,7 +927,6 @@
         case 'imap_acl':
             $result'type'      = kolab_form::INPUT_TEXTAREA;
             $result'data-type' = 'acl';
-            $result'default'   = $field'default';
 
             $this->output->add_translation('aci.new', 'aci.edit', 'aci.remove',
                 'button.ok', 'button.cancel', 'acl.all', 'acl.custom',
@@ -954,8 +954,8 @@
                 $result'type' = kolab_form::INPUT_TEXT;
             }
 
-            if ($field'type' && $field'type' != 'text') {
-                $result'data-type' = $field'type';
+            if ($field_type && $field_type != 'text') {
+                $result'data-type' = $field_type;
                 if ($field'type' == 'ldap_url') {
                     $this->output->add_translation('ldap.one', 'ldap.sub', 'ldap.base',
                         'ldap.host', 'ldap.basedn','ldap.scope', 'ldap.conditions',
@@ -964,9 +964,6 @@
                     );
                 }
             }
-            else {
-                $result'default' = $field'default';
-            }
 
             if (isset($field'maxlength')) {
                 $result'maxlength' = $field'maxlength';
@@ -974,6 +971,7 @@
         }
 
         $result'required' = empty($field'optional');
+        $result'default'  = isset($field'default') ? $field'default' : null;
 
         return $result;
     }
@@ -998,7 +996,7 @@
             $resp = $resp->get($field'name');
             unset($data'attributes');
 
-            $default         = empty($data$field'name') ? $resp'default' : $data$field'name';
+            $default         = !empty($data$field'name') ? $data$field'name' : (isset($resp'default') ? $resp'default' : null);
             $field'values' = $resp'list';
         }
 
@@ -1065,7 +1063,7 @@
         else {
             // find default object type
             foreach ($types as $type_id => $type) {
-                if ($type'is_default') {
+                if (!empty($type'is_default')) {
                     $default = $type_id;
                     break;
                 }
@@ -1073,7 +1071,7 @@
 
             reset($types);
 
-            $data'type_id' = $type = ($default !== null ? $default : key($types));
+            $data'type_id' = $type = (isset($default) ? $default : key($types));
         }
 
         if ($type) {
@@ -1160,7 +1158,7 @@
         $fields += $custom_fields;
 
         // Get the rights on the entry and attribute level
-        $data'effective_rights' = $this->effective_rights($name, $data'id');
+        $data'effective_rights' = $this->effective_rights($name, isset($data'id') ? $data'id' : null);
         $attribute_rights         = (array) $data'effective_rights''attribute';
         $entry_rights             = (array) $data'effective_rights''entry';
 
@@ -1344,7 +1342,7 @@
     {
         // Assign sections to fields
         foreach ($fields as $idx => $field) {
-            if (!$field'section') {
+            if (empty($field'section')) {
                 $fields$idx'section' = isset($fields_map$idx) ? $fields_map$idx : 'other';
             }
         }
@@ -1391,11 +1389,11 @@
                 $field'description' = "$name.$idx.desc";
                 $field'section'     = $section_idx;
 
-                if (empty($field'value') && $data$idx !== null && $data$idx !== '') {
+                if (empty($field'value') && isset($data$idx) && $data$idx !== '') {
                     $value = $data$idx;
 
                     // Convert data for the list field with autocompletion
-                    if ($field'data-type' == 'list') {
+                    if (!empty($field'data-type') && $field'data-type' == 'list') {
                         if (!is_array($value)) {
                             if (!empty($field'data-autocomplete')) {
                                 $value = array($value => $value);
@@ -1409,7 +1407,7 @@
                     }
 
                     if (is_array($value)) {
-                        $value = implode("\n", $value);
+                        $value = @implode("\n", $value);
                     }
 
                     $field'value' = $value;
@@ -1417,7 +1415,7 @@
                 else if ($add_mode && !isset($field'value')) {
                     // read default from config, e.g. default_quota
                     if (!isset($field'default')) {
-                        $conf_name = 'default_' . ($conf_aliases$idx ?: $idx);
+                        $conf_name = 'default_' . (!empty($conf_aliases$idx) ? $conf_aliases$idx : $idx);
                         $field'default' = $this->config->get($domain, $conf_name);
                     }
 
@@ -1435,7 +1433,7 @@
                     $assoc_fields$idx = !empty($data$idx) ? $data$idx : array();
                 }
 
-                if ($field'type' == kolab_form::INPUT_CHECKBOX && !isset($field'checked')) {
+                if (!empty($field'type') && $field'type' == kolab_form::INPUT_CHECKBOX && !isset($field'checked')) {
                     $field'checked' = $field'value' == 'TRUE';
                     $field'value' = 'TRUE';
                 }
@@ -1471,7 +1469,7 @@
 
                 if (empty($field'readonly') && empty($field'disabled')) {
                     // count writeable fields
-                    if ($field'type' && $field'type' != kolab_form::INPUT_HIDDEN) {
+                    if (!empty($field'type') && $field'type' != kolab_form::INPUT_HIDDEN) {
                         $writeable++;
                     }
                     if ($idx != "userpassword2") {
@@ -1523,14 +1521,14 @@
         $this->output->set_env('assoc_fields', $assoc_fields);
         $this->output->set_env('required_fields', $req_fields);
         $this->output->set_env('autocomplete_min_length', $ac_min_len);
-        $this->output->set_env('entrydn', $data'entrydn');
+        $this->output->set_env('entrydn', !empty($data'entrydn') ? $data'entrydn' : null);
         $this->output->add_translation('form.required.empty', 'form.maxcount.exceeded',
             $name . '.add.success', $name . '.edit.success', $name . '.delete.success',
             $name . '.delete.confirm', $name . '.delete.force',
             'add', 'edit', 'delete');
 
         if (empty($title)) {
-            $title = $add_mode ? $this->translate("$name.add") : $data'cn';
+            $title = $add_mode ? $this->translate("$name.add") : (isset($data'cn') ? $data'cn' : null);
         }
 
         $form->set_title(kolab_html::escape($title));
@@ -1725,6 +1723,7 @@
         $i    = 0;
 
         $table_class = 'list';
+        $foot_body = '';
 
         // table header
         $head0'cells' = array('class' => 'name', 'body' => $this->translate($task . '.list'));
@@ -1750,6 +1749,7 @@
 
             $foot_body = kolab_html::span(array('content' => $prev . $count_str . $next));
         }
+
         $foot0'cells' = array('class' => 'listnav', 'body' => $foot_body);
 
         // table body
@@ -1802,7 +1802,7 @@
             $this->output->command('set_watermark', 'taskcontent');
         }
 
-        $this->output->set_env('search_request', $search_request ? base64_encode(serialize($search_request)) : null);
+        $this->output->set_env('search_request', !empty($search_request) ? base64_encode(serialize($search_request)) : null);
         $this->output->set_env('list_page', $page);
         $this->output->set_env('list_count', $count);
         $this->output->set_env('list_size', count($result));

kolab-webadmin-3.2.16.tar.gz/lib/kolab_form.php Changed

@@ -134,7 +134,7 @@
                         continue;
                     }
 
-                    if ($element'type' == self::INPUT_HIDDEN) {
+                    if (!empty($element'type') && $element'type' == self::INPUT_HIDDEN) {
                         $hidden = self::get_element($element);
                         continue;
                     }
@@ -159,7 +159,7 @@
                 continue;
             }
 
-            if ($element'type' == self::INPUT_HIDDEN) {
+            if (!empty($element'type') && $element'type' == self::INPUT_HIDDEN) {
                 $hidden = self::get_element($element);
                 continue;
             }
@@ -204,7 +204,7 @@
         }
 
         // Add event trigger, so UI can rebuild the form e.g. adding tabs
-        if ($this->attribs'id') {
+        if (!empty($this->attribs'id')) {
             $content .= kolab_html::script('kadm.form_init(\'' . $this->attribs'id' . '\')');
         }
 
@@ -222,9 +222,9 @@
             $attrib'class' .= ' required';
         }
 
-        if ($element'type' == self::INPUT_CONTENT) {
+        if (!empty($element'type') && $element'type' == self::INPUT_CONTENT) {
             $attrib'content' = kolab_html::div(array(
-                'class'   => $element'class',
+                'class'   => isset($element'class') ? $element'class' : '',
                 'content' => $element'content',
             ));
         }
@@ -233,7 +233,7 @@
             $content = self::get_element($element);
             $class   = 'col-sm-9' . ($content0 != '<' ? ' form-control-plaintext' : '');
 
-            if (is_array($element) && $element'input-group') {
+            if (is_array($element) && !empty($element'input-group')) {
                 $class .= ' input-group';
             }

kolab-webadmin-3.2.16.tar.gz/lib/kolab_html.php Changed

@@ -127,7 +127,7 @@
     {
         $cell_attribs = array_merge(self::$td_attribs, self::$common_attribs, self::$event_attribs);
         $tag = $is_head ? 'th' : 'td';
-        $cell .= '<' . $tag . self::attrib_string($attribs, $cell_attribs) . '>';
+        $cell = '<' . $tag . self::attrib_string($attribs, $cell_attribs) . '>';
 
         if (isset($attribs'body')) {
             $cell .= $attribs'body';
@@ -150,23 +150,23 @@
         $elem_attribs = array_merge(self::$input_attribs, self::$input_event_attribs,
             self::$common_attribs, self::$event_attribs);
 
-        if ($attribs'type' == 'checkbox' && $attribs'readonly') {
+        if (!empty($attribs'type') && $attribs'type' == 'checkbox' && !empty($attribs'readonly')) {
             // readonly checkbox should be disabled, otherwise the user could still check or uncheck the box
             $attribs'disabled' = 'disabled';
         }
 
-        if ($attribs'type' == 'button' || $attribs'type' == 'submit') {
-            $attribs'class' = trim($attribs'class' . ' btn');
+        if (!empty($attribs'type') && ($attribs'type' == 'button' || $attribs'type' == 'submit')) {
+            self::set_class($attribs, 'btn');
 
             if (!preg_match('/btn-/', $attribs'class')) {
                 $attribs'class' .= ' btn-' . (strpos($attribs'class', 'submit') !== false ? 'primary' : 'secondary');
             }
         }
-        else if ($attribs'type' == 'checkbox') {
+        else if (!empty($attribs'type') && $attribs'type' == 'checkbox') {
             // TODO: Bootstrap style
         }
         else {
-            $attribs'class' = trim($attribs'class' . ' form-control');
+            self::set_class($attribs, 'form-control');
         }
 
         return sprintf('<input%s />', self::attrib_string($attribs, $elem_attribs));
@@ -246,7 +246,7 @@
             $content = self::escape($content);
         }
 
-        $attribs'class' = trim($attribs'class' . ' form-control');
+        self::set_class($attribs, 'form-control');
 
         return sprintf('<textarea%s>%s</textarea>',
             self::attrib_string($attribs, $elem_attribs), $content);
@@ -291,7 +291,7 @@
             }
         }
 
-        $attribs'class' = trim($attribs'class' . ' custom-select');
+        self::set_class($attribs, 'custom-select');
 
         return sprintf('<select%s>%s</select>',
             self::attrib_string($attribs, $elem_attribs), implode("\n", $content));
@@ -534,4 +534,18 @@
 
         return htmlspecialchars($value, ENT_COMPAT, KADM_CHARSET);
     }
+
+    /**
+     * Set 'class' attribute
+     */
+    protected static function set_class(&$attribs, $add)
+    {
+        $classes = array($add);
+
+        if (!empty($attribs'class')) {
+            $classes = $attribs'class';
+        }
+
+        $attribs'class' = implode(' ', $classes);
+    }
 }

kolab-webadmin-3.2.16.tar.gz/lib/kolab_json_output.php Changed

kolab-webadmin-3.2.16.tar.gz/lib/kolab_recipient_policy.php Changed

kolab-webadmin-3.2.16.tar.gz/lib/kolab_utils.php Changed

kolab-webadmin-3.2.16.tar.gz/public_html/skins/default/templates/main.html Changed

kolab-webadmin-3.2.16.tar.gz/vendor/autoload.php Changed

kolab-webadmin-3.2.16.tar.gz/vendor/composer/autoload_real.php Changed

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit5d7217136c935d31e940c54a7a75cb78
+class ComposerAutoloaderInitd44907dcd6da784734afdb1f132b97ec
 {
     private static $loader;
 
@@ -24,9 +24,9 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit5d7217136c935d31e940c54a7a75cb78', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitd44907dcd6da784734afdb1f132b97ec', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit5d7217136c935d31e940c54a7a75cb78', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitd44907dcd6da784734afdb1f132b97ec', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths = get_include_path();
@@ -36,7 +36,7 @@
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit5d7217136c935d31e940c54a7a75cb78::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitd44907dcd6da784734afdb1f132b97ec::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {

kolab-webadmin-3.2.16.tar.gz/vendor/composer/autoload_static.php Changed

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit5d7217136c935d31e940c54a7a75cb78
+class ComposerStaticInitd44907dcd6da784734afdb1f132b97ec
 {
     public static $prefixesPsr0 = array (
         'N' => 
@@ -237,9 +237,9 @@
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixesPsr0 = ComposerStaticInit5d7217136c935d31e940c54a7a75cb78::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit5d7217136c935d31e940c54a7a75cb78::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInit5d7217136c935d31e940c54a7a75cb78::$classMap;
+            $loader->prefixesPsr0 = ComposerStaticInitd44907dcd6da784734afdb1f132b97ec::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInitd44907dcd6da784734afdb1f132b97ec::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInitd44907dcd6da784734afdb1f132b97ec::$classMap;
 
         }, null, ClassLoader::class);
     }

kolab-webadmin-3.2.16.tar.gz/vendor/composer/installed.json Changed

kolab-webadmin-3.2.16.tar.gz/vendor/composer/installed.php Changed

@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '86f093e1f9abb7eca80faae964ce7eea282bef72',
+        'reference' => '46f21ed9ac58149729ddb843f964fc07811011e3',
         'name' => 'kolab/webadmin',
         'dev' => true,
     ),
@@ -18,7 +18,7 @@
             'aliases' => array(
                 0 => '9999999-dev',
             ),
-            'reference' => '5fa4880317618d053afb32ee2b3a6f388ef1b38d',
+            'reference' => '5a319cf437d75aad564ce7fd076cc5423722868b',
             'dev_requirement' => false,
         ),
         'kolab/webadmin' => array(
@@ -27,7 +27,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '86f093e1f9abb7eca80faae964ce7eea282bef72',
+            'reference' => '46f21ed9ac58149729ddb843f964fc07811011e3',
             'dev_requirement' => false,
         ),
         'pear/console_getopt' => array(

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/ORIG_HEAD Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/index Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/info/refs Changed

@@ -1,6 +1,6 @@
-5fa4880317618d053afb32ee2b3a6f388ef1b38d	refs/heads/master
-5fa4880317618d053afb32ee2b3a6f388ef1b38d	refs/remotes/origin/HEAD
-5fa4880317618d053afb32ee2b3a6f388ef1b38d	refs/remotes/origin/master
+5a319cf437d75aad564ce7fd076cc5423722868b	refs/heads/master
+5a319cf437d75aad564ce7fd076cc5423722868b	refs/remotes/origin/HEAD
+5a319cf437d75aad564ce7fd076cc5423722868b	refs/remotes/origin/master
 b51b8121f82b9296565e93cc95788ddff1b06514	refs/tags/pear-Net-LDAP3-1.0.0
 6ab1a1b73e1cdc0a2ab76fd7c184b37dd9628480	refs/tags/pear-Net-LDAP3-1.0.0^{}
 3e7503645609fac9d54bc963afbbddc668bef16c	refs/tags/pear-Net-LDAP3-1.0.1
@@ -23,6 +23,8 @@
 1b5db5d2e3dd64560372c77583460366bf9f16bf	refs/tags/pear-Net-LDAP3-1.1.3
 e1835e36fa5d3434f9804670fc3cdd16992ec66a	refs/tags/pear-Net-LDAP3-1.1.3^{}
 ec4f0d6918aa4b5364e99e1132e0a5a9b3ab23ab	refs/tags/pear-Net-LDAP3-1.1.4
+5a319cf437d75aad564ce7fd076cc5423722868b	refs/tags/pear-Net-LDAP3-1.1.5
 4a380eeb67eb433976d47fd47f44745fb0978c50	refs/tags/v1.1.1
 e1835e36fa5d3434f9804670fc3cdd16992ec66a	refs/tags/v1.1.3
 ec4f0d6918aa4b5364e99e1132e0a5a9b3ab23ab	refs/tags/v1.1.4
+5a319cf437d75aad564ce7fd076cc5423722868b	refs/tags/v1.1.5

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/logs/HEAD Changed

@@ -1,3 +1,3 @@
-0000000000000000000000000000000000000000 5fa4880317618d053afb32ee2b3a6f388ef1b38d Christian Mollekopf <mollekopf@apheleia-it.ch> 1683888880 +0200	clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
-5fa4880317618d053afb32ee2b3a6f388ef1b38d 5fa4880317618d053afb32ee2b3a6f388ef1b38d Christian Mollekopf <mollekopf@apheleia-it.ch> 1683888880 +0200	checkout: moving from master to master
-5fa4880317618d053afb32ee2b3a6f388ef1b38d 5fa4880317618d053afb32ee2b3a6f388ef1b38d Christian Mollekopf <mollekopf@apheleia-it.ch> 1683888880 +0200	reset: moving to 5fa4880317618d053afb32ee2b3a6f388ef1b38d
+0000000000000000000000000000000000000000 5a319cf437d75aad564ce7fd076cc5423722868b Christian Mollekopf <mollekopf@apheleia-it.ch> 1686583944 +0200	clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
+5a319cf437d75aad564ce7fd076cc5423722868b 5a319cf437d75aad564ce7fd076cc5423722868b Christian Mollekopf <mollekopf@apheleia-it.ch> 1686583944 +0200	checkout: moving from master to master
+5a319cf437d75aad564ce7fd076cc5423722868b 5a319cf437d75aad564ce7fd076cc5423722868b Christian Mollekopf <mollekopf@apheleia-it.ch> 1686583944 +0200	reset: moving to 5a319cf437d75aad564ce7fd076cc5423722868b

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/heads/master Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/remotes/origin/HEAD Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/objects/info/packs Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-9000a48131cbccc467cb4ef37bd8b9a5236c5c4e.idx Deleted

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-9000a48131cbccc467cb4ef37bd8b9a5236c5c4e.pack Deleted

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-c885a578207b2d2d8d2d19f7b0dedbb6f2c16071.idx Added

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-c885a578207b2d2d8d2d19f7b0dedbb6f2c16071.pack Added

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/packed-refs Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/refs/heads/master Changed

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/lib/Net/LDAP3.php Changed

@@ -49,22 +49,22 @@
     public $conn;
     public $vlv_active = false;
 
-    private $attribute_level_rights_map = array(
-        "r" => "read",
-        "s" => "search",
-        "w" => "write",
-        "o" => "delete",
-        "c" => "compare",
-        "W" => "write",
-        "O" => "delete"
-    );
-
-    private $entry_level_rights_map = array(
-        "a" => "add",
-        "d" => "delete",
-        "n" => "modrdn",
-        "v" => "read"
-    );
+    private $attribute_level_rights_map = 
+        'r' => 'read',
+        's' => 'search',
+        'w' => 'write',
+        'o' => 'delete',
+        'c' => 'compare',
+        'W' => 'write',
+        'O' => 'delete'
+    ;
+
+    private $entry_level_rights_map = 
+        'a' => 'add',
+        'd' => 'delete',
+        'n' => 'modrdn',
+        'v' => 'read'
+    ;
 
     /*
      * Manipulate configuration through the config_set and config_get methods.
@@ -87,16 +87,17 @@
      *       'service_bind_pw' => 'Welcome2KolabSystems',
      *       'root_dn'         => 'dc=example,dc=org',
      */
-    protected $config = array(
+    protected $config = 
         'sizelimit'      => 0,
         'timelimit'      => 0,
         'config_root_dn' => 'cn=config',
-    );
+        'vlv'            => null,
+    ;
 
     protected $debug_level = false;
     protected $list_page   = 1;
     protected $page_size   = 10;
-    protected $icache      = array();
+    protected $icache      = ;
     protected $cache;
 
     // Use public method config_set('log_hook', $callback) to have $callback be
@@ -129,7 +130,7 @@
      * @param array $config Configuration parameters. After initialization use
      *                      the config_set() method.
      */
-    public function __construct($config = array())
+    public function __construct($config = )
     {
         if (!empty($config) && is_array($config)) {
             foreach ($config as $key => $value) {
@@ -150,7 +151,7 @@
     /**
      *  Add multiple entries to the directory information tree in one go.
      */
-    public function add_entries($entries, $attributes = array())
+    public function add_entries($entries, $attributes = )
     {
         // If $entries is an associative array, it's keys are DNs and its
         // values are the attributes for that DN.
@@ -158,7 +159,7 @@
         // If $entries is a non-associative array, the attributes are expected
         // to be positional in $attributes.
 
-        $result_set = array();
+        $result_set = ;
 
         if (array_keys($entries) == range(0, count($entries) - 1)) {
             // $entries is sequential
@@ -274,28 +275,28 @@
         // Then add the replication agreements
         foreach ($replica_hosts as $num => $replica_host) {
             $ldap = new Net_LDAP3($this->config);
-            $ldap->config_set('hosts', array($replica_host));
+            $ldap->config_set('hosts', $replica_host);
             $ldap->connect();
             $ldap->bind($this->_current_bind_dn, $this->_current_bind_pw);
 
-            $attrs = array(
+            $attrs = 
                 'nsDS5ReplicaBindDN',
                 'nsDS5ReplicaType',
                 'nsds5ReplicaPurgeDelay',
                 'nsDS5Flags'
-            );
+            ;
 
             $replica_attrs = $ldap->get_entry_attributes($replica_dn, $attrs);
-            $replica_attrs = array_merge((array) $replica_attrs, array(
+            $replica_attrs = array_merge((array) $replica_attrs, 
                 'cn' => 'replica',
-                'objectclass' => array(
+                'objectclass' => 
                     'top',
                     'nsds5replica',
                     'extensibleobject',
-                ),
-                'nsDS5ReplicaId'   => ($max_repl_id + $num + 1),
+                ,
+                'nsDS5ReplicaId'   => $max_repl_id + $num + 1,
                 'nsDS5ReplicaRoot' => $domain_root_dn,
-            ));
+            );
 
             $new_replica_dn = 'cn=replica,cn="' . $domain_root_dn . '",cn=mapping tree,cn=config';
 
@@ -328,19 +329,21 @@
 
                 $this->_debug("Adding a replication agreement for $domain_root_dn to $replicate_to_host on " . $replica_host);
 
-                $attrs = array(
+                $attrs = 
                     'objectclass',
                     'nsDS5ReplicaBindDN',
                     'nsDS5ReplicaCredentials',
                     'nsDS5ReplicaTransportInfo',
-                    'nsDS5ReplicaBindMethod',
-                    'nsDS5ReplicaHost',
-                    'nsDS5ReplicaPort'
-                );
+                    'nsDS5ReplicaBindMethod'
+                ;
+
+                list($host, $port) = strpos($replicate_to_host, ':') !== false ? explode(':', $replicate_to_host) : $replicate_to_host, 389;
 
                 $replica_agreement_attrs = $ldap->get_entry_attributes($replica_agreement_tpl_dn, $attrs);
-                $replica_agreement_attrs'cn' = array_shift(explode('.', $replicate_to_host)) . str_replace(array('dc=',','), array('_',''), $domain_root_dn);
+                $replica_agreement_attrs'cn' = array_shift(explode('.', $replicate_to_host)) . str_replace('dc=', ',', '_', '', $domain_root_dn);
                 $replica_agreement_attrs'nsDS5ReplicaRoot' = $domain_root_dn;
+                $replica_agreement_attrs'nsDS5ReplicaHost' = $host;
+                $replica_agreement_attrs'nsDS5ReplicaPort' = $port;
                 $replica_agreement_dn = "cn=" . $replica_agreement_attrs'cn' . "," . $new_replica_dn;
 
                 $this->_debug("Adding $replica_agreement_dn to $replica_host with attributes: " . var_export($replica_agreement_attrs, true));
@@ -363,27 +366,27 @@
             foreach ($result->entries(true) as $agreement_dn => $agreement_attrs) {
                 $this->modify_entry_attributes(
                     $agreement_dn,
-                    array(
-                        'replace' => array(
+                    
+                        'replace' => 
                             'nsds5BeginReplicaRefresh' => 'start',
-                        ),
-                    )
+                        ,
+                    
                 );
             }
         }
     }
 
-    public function attribute_details($attributes = array())
+    public function attribute_details($attributes = )
     {
         $schema = $this->init_schema();
 
         if (!$schema) {
-            return array();
+            return ;
         }
 
         $attribs = $schema->getAll('attributes');
 
-        $attributes_details = array();
+        $attributes_details = ;
 
         foreach ($attributes as $attribute) {
             if (array_key_exists($attribute, $attribs)) {
@@ -415,18 +418,18 @@
             }
 
             // The relevant parts only, please
-            $attributes_details$attribute = array(
+            $attributes_details$attribute = 
                 'type'        => !empty($attrib_details'single-value') ? 'text' : 'list',
                 'description' => $attrib_details'desc',
                 'syntax'      => $attrib_details'syntax',
                 'max-length'  => $attrib_details'max-length' ?: false,
-            );
+            ;
         }
 
         return $attributes_details;
     }
 
-    public function attributes_allowed($objectclasses = array())
+    public function attributes_allowed($objectclasses = )
     {
         $this->_debug("Listing allowed_attributes for objectclasses", $objectclasses);
 
@@ -439,9 +442,9 @@
             return false;
         }
 
-        $may          = array();
-        $must         = array();
-        $superclasses = array();
+        $may          = ;
+        $must         = ;
+        $superclasses = ;
 
         foreach ($objectclasses as $objectclass) {
             $superclass = $schema->superclass($objectclass);
@@ -464,7 +467,7 @@
         $must         = array_unique($must);
         $superclasses = array_unique($superclasses);
 
-        return array('may' => $may, 'must' => $must, 'super' => $superclasses);
+        return 'may' => $may, 'must' => $must, 'super' => $superclasses;
     }
 
     public function classes_allowed()
@@ -475,7 +478,7 @@
         }
 
         $list    = $schema->getAll('objectclasses');
-        $classes = array();
+        $classes = ;
 
         foreach ($list as $class) {
             $classes = $class'name';
@@ -542,17 +545,18 @@
     public function config_get($key, $default = null)
     {
         if (!empty($this->_config_get_hook)) {
-            return call_user_func_array($this->_config_get_hook, array($key, $value));
+            return call_user_func_array($this->_config_get_hook, $key, $value);
         }
-        else if (method_exists($this, "config_get_{$key}")) {
-            return call_user_func(array($this, "config_get_$key"), $value);
+
+        if (method_exists($this, "config_get_{$key}")) {
+            return call_user_func($this, "config_get_{$key}", $value);
         }
-        else if (!isset($this->config$key)) {
+
+        if (!isset($this->config$key)) {
             return $default;
         }
-        else {
-            return $this->config$key;
-        }
+
+        return $this->config$key;
     }
 
     /**
@@ -571,10 +575,10 @@
         }
 
         if (!empty($this->_config_set_hook)) {
-            call_user_func($this->_config_set_hook, array($key, $value));
+            call_user_func($this->_config_set_hook, $key, $value);
         }
         else if (method_exists($this, "config_set_{$key}")) {
-            call_user_func_array(array($this, "config_set_$key"), array($value));
+            call_user_func_array($this, "config_set_{$key}", $value);
         }
         else if (property_exists($this, $key)) {
             $this->$key = $value;
@@ -605,13 +609,14 @@
             return true;
         }
 
-        $hosts = !empty($host) ? $host : $this->config_get('hosts', array());
+        $hosts = !empty($host) ? $host : $this->config_get('hosts', );
         $port  = $this->config_get('port', 389);
 
         foreach ((array) $hosts as $host) {
-            $this->_debug("C: Connect " . $host . (strpos($host, ':') ? '' : ":$port") . "");
+            $ldap_uri = $this->_host2uri($host, $port);
+            $this->_debug("C: Connect {$ldap_uri}");
 
-            if ($lc = @ldap_connect($host, $port)) {
+            if ($lc = @ldap_connect($ldap_uri)) {
                 if ($this->config_get('use_tls', false) === true) {
                     if (!ldap_start_tls($lc)) {
                         $this->_debug("S: Could not start TLS. " . ldap_error($lc));
@@ -635,7 +640,7 @@
                     ldap_set_option($lc, LDAP_OPT_REFERRALS, (bool) $referrals);
                 }
 
-                $this->_current_host = $host . (strpos($host, ':') ? '' : ":$port");
+                $this->_current_host = $ldap_uri;
                 $this->conn          = $lc;
 
                 break;
@@ -723,23 +728,25 @@
 
         if (PHP_VERSION_ID >= 70300) {
             // Note: This get_entry() have to request all attributes to be working
-            $result = $this->get_entry($entry_dn, array('*'), array(
-                    array(
+            $result = $this->get_entry($entry_dn, '*', 
+                    
                         'oid'        => self::CONTROL_EFFECTIVE_RIGHTS,
                         'value'      => 'dn:' . $this->_current_bind_dn,
                         'iscritical' => true,
-                    ),
-                ));
+                    ,
+                );
 
             if (!empty($result)) {
-                $attributes = array(
+                $attributes = 
                     'dn'                   => $entry_dn,
-                    'attributelevelrights' => array(),
-                    'entrylevelrights'     => array(),
-                );
+                    'attributelevelrights' => ,
+                    'entrylevelrights'     => ,
+                ;
+
+                foreach ('aclrights', 'attributelevelrights', 'entrylevelrights' as $attr_name) {
+                    if (!empty($result$attr_name)) {
+                        $attr_value = $result$attr_name;
 
-                foreach (array('aclrights', 'attributelevelrights', 'entrylevelrights') as $attr_name) {
-                    if ($attr_value = $result$attr_name) {
                         switch ($attr_name) {
                         case 'aclrights':
                             $this->parse_aclrights($attributes, $attr_value);
@@ -784,42 +791,29 @@
             return null;
         }
 
-        $output = array();
-
-        if ($moz_ldapsearch == "/usr/bin/ldapsearch") {
-            $command = Array(
-                    $moz_ldapsearch,
-                    '-x',
-                    '-h',
-                    preg_replace('|^a-z+://|i', '', $this->_current_host),
-                    '-b',
-                    escapeshellarg($entry_dn),
-                    '-s',
-                    'base',
-                    '-D',
-                    escapeshellarg($this->_current_bind_dn),
-                    '-w',
-                    escapeshellarg($this->_current_bind_pw)
-                );
-        } else {
-            $command = Array(
-                    $moz_ldapsearch,
-                    '-x',
-                    '-h',
-                    preg_replace('|^a-z+://|i', '', $this->_current_host),
-                    '-p',
-                    $this->config_get('port', 389),
-                    '-b',
-                    escapeshellarg($entry_dn),
-                    '-s',
-                    'base',
-                    '-D',
-                    escapeshellarg($this->_current_bind_dn),
-                    '-w',
-                    escapeshellarg($this->_current_bind_pw)
-                );
+        $output = ;
+        $command = 
+            $moz_ldapsearch,
+            '-x',
+            '-h',
+            parse_url($this->_current_host, PHP_URL_HOST),
+            '-b',
+            escapeshellarg($entry_dn),
+            '-s',
+            'base',
+            '-D',
+            escapeshellarg($this->_current_bind_dn),
+            '-w',
+            escapeshellarg($this->_current_bind_pw)
+        ;
+
+        if ($moz_ldapsearch != "/usr/bin/ldapsearch") {
+            $command = '-p';
+            $command = parse_url($this->_current_host, PHP_URL_PORT);
         }
 
+        // TODO: Can we use -H instead of -h and -p?
+
         if ($this->vendor_name() == "Oracle Corporation") {
             // For Oracle DSEE
             $command = "-J";
@@ -864,7 +858,7 @@
             return null;
         }
 
-        $lines = array();
+        $lines = ;
         foreach ($output as $line_num => $line) {
             if (substr($line, 0, 1) == " ") {
                 $linescount($lines)-1 .= trim($line);
@@ -874,11 +868,11 @@
             }
         }
 
-        $attributes = array(
+        $attributes = 
             'dn'                   => $subject_dn,
-            'attributelevelrights' => array(),
-            'entrylevelrights'     => array(),
-        );
+            'attributelevelrights' => ,
+            'entrylevelrights'     => ,
+        ;
 
         if ($this->vendor_name() == "Oracle Corporation") {
             // Example for attribute level rights:
@@ -922,7 +916,7 @@
      *
      * @return string Entry DN string
      */
-    public function entry_dn($subject, $attributes = array(), $base_dn = null)
+    public function entry_dn($subject, $attributes = , $base_dn = null)
     {
         $this->_debug("Net_LDAP3::entry_dn($subject)");
         $is_dn = ldap_explode_dn($subject, 1);
@@ -943,7 +937,7 @@
 
         $this->_debug("Using unique_attribute " . var_export($unique_attr, true) . " at " . __FILE__ . ":" . __LINE__);
 
-        $attributes  = array_merge(array($unique_attr => $subject), (array)$attributes);
+        $attributes  = array_merge($unique_attr => $subject, (array) $attributes);
         $subject     = $this->entry_find_by_attribute($attributes, $base_dn);
 
         if (!empty($subject)) {
@@ -990,7 +984,7 @@
 
     public function find_user_groups($member_dn)
     {
-        $groups  = array();
+        $groups  = ;
         $root_dn = $this->config_get('root_dn');
 
         // TODO: Do not query for both, it's either one or the other
@@ -1027,7 +1021,7 @@
         $result = $this->get_entry($subject_dn, $attributes);
 
         if (!$result) {
-            return array();
+            return ;
         }
 
         if (!in_array('*', $attributes) && !in_array('dn', $attributes)) {
@@ -1047,7 +1041,7 @@
      *
      * @return array Hash array (keys in original case)
      */
-    public function get_entry($dn, $attributes = array("*"), $controls = array())
+    public function get_entry($dn, $attributes = "*", $controls = )
     {
         $rec = null;
 
@@ -1089,7 +1083,7 @@
         $this->_debug("Finding replicas for this server.");
 
         // Search any host that is a replica for the current host
-        $replica_hosts = $this->config_get('replica_hosts', array());
+        $replica_hosts = $this->config_get('replica_hosts', );
         $root_dn       = $this->config_get('config_root_dn');
 
         if (!empty($replica_hosts)) {
@@ -1100,7 +1094,9 @@
         $ldap->connect();
         $ldap->bind($this->_current_bind_dn, $this->_current_bind_pw);
 
-        $result = $ldap->search($root_dn, '(objectclass=nsds5replicationagreement)', 'sub', array('nsds5replicahost'));
+        $host_attrs = 'nsds5replicahost', 'nsds5replicaport';
+
+        $result = $ldap->search($root_dn, '(objectclass=nsds5replicationagreement)', 'sub', $host_attrs);
 
         if (!$result) {
             $this->_debug("No replicas configured");
@@ -1110,8 +1106,9 @@
         $this->_debug("Replication agreements found: " . var_export($result->entries(true), true));
 
         foreach ($result->entries(true) as $dn => $attrs) {
-            if (!in_array($attrs'nsds5replicahost', $replica_hosts)) {
-                $replica_hosts = $attrs'nsds5replicahost';
+            $host = $attrs'nsds5replicahost' . ':' . !empty($attrs'nsds5replicaport') ? $attrs'nsds5replicaport' : 389;
+            if (!in_array($host, $replica_hosts)) {
+                $replica_hosts = $host;
             }
         }
 
@@ -1124,11 +1121,11 @@
         $ldap->close();
 
         foreach ($replica_hosts as $replica_host) {
-            $ldap->config_set('hosts', array($replica_host));
+            $ldap->config_set('hosts', $replica_host);
             $ldap->connect();
             $ldap->bind($this->_current_bind_dn, $this->_current_bind_pw);
 
-            $result = $ldap->search($root_dn, '(objectclass=nsds5replicationagreement)', 'sub', array('nsds5replicahost'));
+            $result = $ldap->search($root_dn, '(objectclass=nsds5replicationagreement)', 'sub', $host_attrs);
             if (!$result) {
                 $this->_debug("No replicas configured on $replica_host");
                 $ldap->close();
@@ -1136,8 +1133,9 @@
             }
 
             foreach ($result->entries(true) as $dn => $attrs) {
-                if (!in_array($attrs'nsds5replicahost', $replica_hosts)) {
-                    $replica_hosts = $attrs'nsds5replicahost';
+                $host = $attrs'nsds5replicahost' . ':' . !empty($attrs'nsds5replicaport') ? $attrs'nsds5replicaport' : 389;
+                if (!in_array($host, $replica_hosts)) {
+                    $replica_hosts = $host;
                 }
             }
 
@@ -1224,12 +1222,12 @@
 
         $this->_debug("Net::LDAP3::login() original filter: " . $filter);
 
-        $replace_patterns = array(
+        $replace_patterns = 
             '/%s/' => $username,
             '/%d/' => $domain,
             '/%U/' => $localpart,
             '/%r/' => $realm
-        );
+        ;
 
         $filter = preg_replace(array_keys($replace_patterns), array_values($replace_patterns), $filter);
 
@@ -1274,20 +1272,20 @@
         $this->_debug("Net_LDAP3::list_group_members($dn)");
 
         if (is_array($entry) && in_array('objectclass', $entry)) {
-            if (!in_array(array('groupofnames', 'groupofuniquenames', 'groupofurls'), $entry'objectclass')) {
+            if (!in_array('groupofnames', 'groupofuniquenames', 'groupofurls', $entry'objectclass')) {
                 $this->_debug("Called list_group_members on a non-group!");
-                return array();
+                return ;
             }
         }
         else {
-            $entry = $this->get_entry_attributes($dn, array('member', 'uniquemember', 'memberurl', 'objectclass'));
+            $entry = $this->get_entry_attributes($dn, 'member', 'uniquemember', 'memberurl', 'objectclass');
 
             if (!$entry) {
-                return array();
+                return ;
             }
         }
 
-        $group_members = array();
+        $group_members = ;
 
         foreach ((array)$entry'objectclass' as $objectclass) {
             switch (strtolower($objectclass)) {
@@ -1320,17 +1318,19 @@
 
         $this->_debug("Net_LDAP3::modify_entry() using rdn attribute: " . $rdn_attr);
 
-        $mod_array = array(
-            'add'       => array(), // For use with ldap_mod_add()
-            'del'       => array(), // For use with ldap_mod_del()
-            'replace'   => array(), // For use with ldap_mod_replace()
-            'rename'    => array(), // For use with ldap_rename()
-        );
+        $mod_array = 
+            'add'       => , // For use with ldap_mod_add()
+            'del'       => , // For use with ldap_mod_del()
+            'replace'   => , // For use with ldap_mod_replace()
+            'rename'    => , // For use with ldap_rename()
+        ;
 
         // This is me cheating. Remove this special attribute.
         if (array_key_exists('ou', $old_attrs) || array_key_exists('ou', $new_attrs)) {
-            $old_ou = is_array($old_attrs'ou') ? array_shift($old_attrs'ou') : $old_attrs'ou';
-            $new_ou = is_array($new_attrs'ou') ? array_shift($new_attrs'ou') : $new_attrs'ou';
+            $old_ou = isset($old_attrs'ou') && is_array($old_attrs'ou')
+                ? array_shift($old_attrs'ou') : (isset($old_attrs'ou') ? $old_attrs'ou' : null);
+            $new_ou = isset($new_attrs'ou') && is_array($new_attrs'ou')
+                ? array_shift($new_attrs'ou') : (isset($new_attrs'ou') ? $new_attrs'ou' : null);
             unset($old_attrs'ou');
             unset($new_attrs'ou');
         }
@@ -1379,7 +1379,7 @@
                                     $this->_debug("old attrs. is array, new attrs. is not array. new attr. exists in old attrs.");
 
                                     $rdn_attr_value  = array_shift($old_attrs$attr);
-                                    $_attr_to_remove = array();
+                                    $_attr_to_remove = ;
 
                                     foreach ($old_attrs$attr as $value) {
                                         if (strtolower($value) != strtolower($new_attrs$attr)) {
@@ -1631,7 +1631,7 @@
      *
      * @return mixed Net_LDAP3_Result object or number of entries (if $count_only=true) or False on failure
      */
-    public function search($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $attrs = array('dn'), $props = array(), $count_only = false)
+    public function search($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $attrs = 'dn', $props = , $count_only = false)
     {
         $controls = null;
 
@@ -1646,7 +1646,7 @@
 
         // make sure attributes list is not empty
         if (empty($attrs)) {
-            $attrs = array('dn');
+            $attrs = 'dn';
         }
         // make sure filter is not empty
         if (empty($filter)) {
@@ -1661,7 +1661,7 @@
             // when using VLV, we get the total count by...
             // ...either reading numSubOrdinates attribute
             if (($sub_filter = $this->config_get('numsub_filter')) &&
-                ($result_count = @$ns_function($this->conn, $base_dn, $sub_filter, array('numSubOrdinates'), 0, 0, 0))
+                ($result_count = @$ns_function($this->conn, $base_dn, $sub_filter, 'numSubOrdinates', 0, 0, 0))
             ) {
                 $counts = ldap_get_entries($this->conn, $result_count);
                 for ($vlv_count = $j = 0; $j < $counts'count'; $j++) {
@@ -1673,7 +1673,7 @@
             // by fetching all records dn and counting them
             else if (PHP_VERSION_ID < 70305 && !function_exists('ldap_parse_virtuallist_control')) {
                 // @FIXME: this search will ignore $props'search'
-                $vlv_count = $this->search($base_dn, $filter, $scope, array('dn'), $props, true);
+                $vlv_count = $this->search($base_dn, $filter, $scope, 'dn', $props, true);
             }
 
             $controls = $this->_vlv_set_controls($sort, $this->list_page, $this->page_size,
@@ -1772,7 +1772,7 @@
      *
      * @see Net_LDAP3::search()
      */
-    public function search_entries($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $attrs = array('dn'), $props = array())
+    public function search_entries($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $attrs = 'dn', $props = )
     {
         $this->_debug("Net_LDAP3::search_entries with search " . var_export($props, true));
 
@@ -1817,13 +1817,14 @@
             return null;
         }
 
-        $operators = array('=', '~=', '>=', '<=');
+        $operators = '=', '~=', '>=', '<=';
         $filter    = '';
 
         foreach ((array) $search'params' as $field => $param) {
             $value = (array) $param'value';
+            $type = isset($param'type') ? strval($param'type') : null;
 
-            switch ((string)$param'type') {
+            switch ($type) {
                 case 'prefix':
                     $prefix = '';
                     $suffix = '*';
@@ -1845,7 +1846,7 @@
                     // this is a common query to find entry by DN, make sure
                     // it is a unified DN so special characters are handled correctly
                     if ($field == 'entrydn') {
-                        $value = array_map(array('Net_LDAP3', 'unified_dn'), $value);
+                        $value = array_map('Net_LDAP3', 'unified_dn', $value);
                     }
 
                     break;
@@ -1863,14 +1864,14 @@
                     break;
             }
 
-            $operator = $param'type' && in_array($param'type', $operators) ? $param'type' : '=';
+            $operator = $type && in_array($type, $operators) ? $type : '=';
 
             if (count($value) < 2) {
                 $value = array_pop($value);
             }
 
             if (is_array($value)) {
-                $val_filter = array();
+                $val_filter = ;
                 foreach ($value as $val) {
                     $val          = self::quote_string($val);
                     $val_filter = "(" . $field . $operator . $prefix . $val . $suffix . ")";
@@ -1884,8 +1885,9 @@
         }
 
         // join search parameters with specified operator ('OR' or 'AND')
-        if (count($search'params') > 1) {
-            $filter = '(' . ($search'operator' == 'AND' ? '&' : '|') . $filter . ')';
+        if (!empty($search'params') && count($search'params') > 1) {
+            $operator = !empty($search'operator') && $search'operator' == 'AND' ? '&' : '|';
+            $filter = '(' . $operator . $filter . ')';
         }
 
         return $filter;
@@ -1913,7 +1915,7 @@
      */
     public static function normalize_entry($entry, $flat = false)
     {
-        $rec = array();
+        $rec = ;
 
         for ($i=0; $i < $entry'count'; $i++) {
             $attr = $entry$i;
@@ -1937,10 +1939,10 @@
     public static function normalize_result($_result)
     {
         if (!is_array($_result)) {
-            return array();
+            return ;
         }
 
-        $result = array();
+        $result = ;
 
         for ($x = 0; $x < $_result'count'; $x++) {
             $dn    = $_result$x'dn';
@@ -2145,12 +2147,12 @@
             return $this->_vlv_indexes_and_searches;
         }
 
-        $this->_vlv_indexes_and_searches = array();
+        $this->_vlv_indexes_and_searches = ;
 
         $config_root_dn = $this->config_get('config_root_dn');
 
         if (empty($config_root_dn)) {
-            return array();
+            return ;
         }
 
         if ($cached_config = $this->get_cache_data('vlvconfig')) {
@@ -2163,11 +2165,11 @@
 
         $this->_debug("C: Search base dn: $config_root_dn scope sub with filter $search_filter");
 
-        $search_result = ldap_search($this->conn, $config_root_dn, $search_filter, array('*'), 0, 0, 0);
+        $search_result = ldap_search($this->conn, $config_root_dn, $search_filter, '*', 0, 0, 0);
 
         if ($search_result === false) {
             $this->_debug("S: " . ldap_error($this->conn));
-            return array();
+            return ;
         }
 
         $this->_debug("S: " . ldap_count_entries($this->conn, $search_result) . " record(s) found");
@@ -2175,7 +2177,7 @@
         $vlv_searches = new Net_LDAP3_Result($this->conn, $config_root_dn, $search_filter, 'sub', $search_result);
 
         if ($vlv_searches->count() < 1) {
-            return array();
+            return ;
         }
 
         foreach ($vlv_searches->entries(true) as $vlv_search_dn => $vlv_search_attrs) {
@@ -2187,7 +2189,7 @@
             $this->_debug("C: Search base dn: $vlv_search_dn scope sub with filter $index_filter");
 
             // Multiple indexes may exist
-            $index_result = ldap_search($this->conn, $vlv_search_dn, $index_filter, array('*'), 0, 0, 0);
+            $index_result = ldap_search($this->conn, $vlv_search_dn, $index_filter, '*', 0, 0, 0);
 
             if ($index_result === false) {
                 $this->_debug("S: " . ldap_error($this->conn));
@@ -2200,19 +2202,19 @@
             $vlv_indexes = $vlv_indexes->entries(true);
 
             // Reset this one for each VLV search.
-            $_vlv_sort = array();
+            $_vlv_sort = ;
 
             foreach ($vlv_indexes as $vlv_index_dn => $vlv_index_attrs) {
                 $_vlv_sort = explode(' ', trim($vlv_index_attrs'vlvsort'));
             }
 
-            $this->_vlv_indexes_and_searches = array(
-                $_vlv_base_dn => array(
+            $this->_vlv_indexes_and_searches = 
+                $_vlv_base_dn => 
                     'scope'  => self::scopeint2str($_vlv_scope),
                     'filter' => strtolower($_vlv_filter),
                     'sort'   => $_vlv_sort,
-                ),
-            );
+                ,
+            ;
         }
 
         // cache this
@@ -2232,22 +2234,26 @@
         $tls  = $this->config_get('use_tls', false);
 
         foreach ((array) $this->config_get('hosts') as $host) {
-            $this->_debug("C: Connect $host:$port");
+            $ldap_uri = $this->_host2uri($host, $port);
+            $this->_debug("C: Connect {$ldap_uri}");
 
-            $_ldap_cfg = array(
+            $_ldap_cfg = 
                 'host'   => $host,
                 'port'   => $port,
                 'tls'    => $tls,
                 'version' => 3,
                 'binddn' => $this->config_get('service_bind_dn'),
                 'bindpw' => $this->config_get('service_bind_pw')
-            );
+            ;
 
-            $_ldap_schema_cache_cfg = array(
+            $_ldap_schema_cache_cfg = 
                 'max_age' => 86400,
-                'path' => sprintf('%s/%s-Net_LDAP2_Schema.cache',
-                    sys_get_temp_dir() ?: '/tmp', str_replace('://', ':', $host) . (strpos($host, ":$port") ? '' : ":$port")),
-            );
+                'path' => sprintf(
+                    '%s/%s-Net_LDAP2_Schema.cache',
+                    sys_get_temp_dir() ?: '/tmp',
+                    str_replace('://', '/', ':', $ldap_uri)
+                ),
+            ;
 
             $_ldap = Net_LDAP2::connect($_ldap_cfg);
 
@@ -2284,7 +2290,7 @@
         $this->_debug("Net_LDAP3::list_group_member($dn)");
 
         $members       = (array) $members;
-        $group_members = array();
+        $group_members = ;
 
         // remove possible 'count' item
         unset($members'count');
@@ -2292,7 +2298,7 @@
         // Use the member attributes to return an array of member ldap objects
         // NOTE that the member attribute is supposed to contain a DN
         foreach ($members as $member) {
-            $member_entry = $this->get_entry_attributes($member, array('member', 'uniquemember', 'memberurl', 'objectclass'));
+            $member_entry = $this->get_entry_attributes($member, 'member', 'uniquemember', 'memberurl', 'objectclass');
 
             if (empty($member_entry)) {
                 continue;
@@ -2316,14 +2322,14 @@
     {
         $this->_debug("Net_LDAP3::list_group_uniquemember($dn)", $entry);
 
-        $uniquemembers = (array)($uniquemembers);
-        $group_members = array();
+        $uniquemembers = (array) $uniquemembers;
+        $group_members = ;
 
         // remove possible 'count' item
         unset($uniquemembers'count');
 
         foreach ($uniquemembers as $member) {
-            $member_entry = $this->get_entry_attributes($member, array('member', 'uniquemember', 'memberurl', 'objectclass'));
+            $member_entry = $this->get_entry_attributes($member, 'member', 'uniquemember', 'memberurl', 'objectclass');
 
             if (empty($member_entry)) {
                 continue;
@@ -2347,9 +2353,9 @@
     {
         $this->_debug("Net_LDAP3::list_group_memberurl($dn)");
 
-        $group_members = array();
+        $group_members = ;
         $memberurls    = (array) $memberurls;
-        $attributes    = array('member', 'uniquemember', 'memberurl', 'objectclass');
+        $attributes    = 'member', 'uniquemember', 'memberurl', 'objectclass';
 
         // remove possible 'count' item
         unset($memberurls'count');
@@ -2364,7 +2370,7 @@
 
             foreach ($result->entries(true) as $entry_dn => $_entry) {
                 $group_members$entry_dn = $entry_dn;
-                $this->_debug("Found " . $entry_dn);
+                $this->_debug("Found {$entry_dn}");
 
                 if ($recurse) {
                     // Nested group
@@ -2496,7 +2502,7 @@
 
         switch ($_acl_components1) {
             case "entryLevel":
-                $attributes'entrylevelrights' = Array();
+                $attributes'entrylevelrights' = ;
                 $_acl_value = explode(',', $_acl_value);
 
                 foreach ($_acl_value as $right) {
@@ -2509,7 +2515,7 @@
                 break;
 
             case "attributeLevel":
-                $attributes'attributelevelrights'$_acl_components2 = Array();
+                $attributes'attributelevelrights'$_acl_components2 = ;
                 $_acl_value = explode(',', $_acl_value);
 
                 foreach ($_acl_value as $right) {
@@ -2530,14 +2536,14 @@
     {
         $attribute_value  = str_replace(", ", ",", $attribute_value);
         $attribute_values = explode(",", $attribute_value);
-        $attribute_value  = array();
+        $attribute_value  = ;
 
         foreach ($attribute_values as $access_right) {
             $access_right_components = explode(":", $access_right);
             $access_attribute        = strtolower(array_shift($access_right_components));
             $access_value            = array_shift($access_right_components);
 
-            $attribute_value$access_attribute = array();
+            $attribute_value$access_attribute = ;
 
             for ($i = 0; $i < strlen($access_value); $i++) {
                 $method = $this->attribute_level_rights_mapsubstr($access_value, $i, 1);
@@ -2553,7 +2559,7 @@
 
     protected function parse_entry_level_rights($attribute_value)
     {
-        $_attribute_value = array();
+        $_attribute_value = ;
 
         for ($i = 0; $i < strlen($attribute_value); $i++) {
             $method = $this->entry_level_rights_mapsubstr($attribute_value, $i, 1);
@@ -2585,14 +2591,14 @@
         if ($this->_metadata === null) {
             $this->_debug("Obtaining LDAP server metadata");
 
-            $result = $this->get_entry('', array('vendorname', 'supportedcontrol'));
+            $result = $this->get_entry('', 'vendorname', 'supportedcontrol');
 
             if ($result) {
                 $this->_metadata = $result;
                 $this->_debug("LDAP Server metadata: " . var_export($result, true));
             }
             else {
-                $this->_metadata = array();
+                $this->_metadata = ;
                 $this->_warning("LDAP: Failed to get server metadata");
             }
         }
@@ -2645,14 +2651,14 @@
      */
     private function __log($level, $args)
     {
-        $msg = array();
+        $msg = ;
 
         foreach ($args as $arg) {
             $msg = !is_string($arg) ? var_export($arg, true) : $arg;
         }
 
         if (!empty($this->_log_hook)) {
-            call_user_func_array($this->_log_hook, array($level, $msg));
+            call_user_func_array($this->_log_hook, $level, $msg);
             return;
         }
 
@@ -2691,7 +2697,7 @@
         }
 
         if ($is_dn) {
-            $replace = array(
+            $replace = 
                 ',' => '\2c',
                 '=' => '\3d',
                 '+' => '\2b',
@@ -2701,16 +2707,16 @@
                 "\\"=> '\5c',
                 '"' => '\22',
                 '#' => '\23'
-            );
+            ;
         }
         else {
-            $replace = array(
+            $replace = 
                 '*' => '\2a',
                 '(' => '\28',
                 ')' => '\29',
                 "\\" => '\5c',
                 '/' => '\2f'
-            );
+            ;
         }
 
         if ($reverse) {
@@ -2729,10 +2735,10 @@
      */
     public static function unified_dn($str)
     {
-        $result = array();
+        $result = ;
 
         foreach (explode(',', $str) as $token) {
-            list($attr, $value) = explode('=', $token, 2);
+            list($attr, $value) = strpos($token, '=') !== false ? explode('=', $token, 2) : $token, '';
 
             $pos = 0;
             while (preg_match('/\\\\0-9a-fA-F{2}/', $value, $matches, PREG_OFFSET_CAPTURE, $pos)) {
@@ -2812,16 +2818,16 @@
      */
     private function _vlv_set_controls($sort, $list_page, $page_size, $search = null)
     {
-        $sort_ctrl = array(
+        $sort_ctrl = 
             'oid'   => self::CONTROL_SORT_REQUEST,
             'value' => self::_sort_ber_encode($sort)
-        );
+        ;
 
         if (!empty($search)) {
             $this->_debug("_vlv_set_controls to include search: " . var_export($search, true));
         }
 
-        $vlv_ctrl  = array(
+        $vlv_ctrl  = 
             'oid' => self::CONTROL_VLV_REQUEST,
             'value' => self::_vlv_ber_encode(
                     $offset = ($list_page-1) * $page_size + 1,
@@ -2829,13 +2835,13 @@
                     $search
             ),
             'iscritical' => true
-        );
+        ;
 
         $this->_debug("C: set controls sort=" . join(' ', unpack('H'.(strlen($sort_ctrl'value')*2), $sort_ctrl'value'))
             . " (" . implode(',', (array) $sort) . ");"
             . " vlv=" . join(' ', (unpack('H'.(strlen($vlv_ctrl'value')*2), $vlv_ctrl'value'))) . " ($offset/$page_size)");
 
-        $controls = array($sort_ctrl, $vlv_ctrl);
+        $controls = $sort_ctrl, $vlv_ctrl;
 
         if (PHP_VERSION_ID >= 70305) {
             return $controls;
@@ -2977,6 +2983,26 @@
     }
 
     /**
+     * Convert LDAP host/port into URI
+     */
+    private static function _host2uri($host, $port = null)
+    {
+        if (stripos($host, 'ldapi://') === 0) {
+            return $host;
+        }
+
+        if (strpos($host, '://') === false) {
+            $host = ($port == 636 ? 'ldaps' : 'ldap') . '://' . $host;
+        }
+
+        if ($port && !preg_match('/:0-9+$/', $host)) {
+            $host .= ':' . $port;
+        }
+
+        return $host;
+    }
+
+    /**
      * Get global handle for cache access
      *
      * @return object Cache object
@@ -3010,7 +3036,7 @@
                     }
 
                     $this->mc_available += intval($this->cache->addServer(
-                        $host, $port, $pconnect, 1, 1, 15, false, array($this, 'memcache_failure')));
+                        $host, $port, $pconnect, 1, 1, 15, false, $this, 'memcache_failure'));
                 }
 
                 // test connection and failover (will result in $this->mc_available == 0 on complete failure)
@@ -3030,7 +3056,7 @@
      */
     public function memcache_failure($host, $port)
     {
-        static $seen = array();
+        static $seen = ;
 
         // only report once
         if (!$seen"$host:$port"++) {
@@ -3136,7 +3162,7 @@
      *
      * @return array|bool Domain attributes (plus 'dn' attribute) or False if not found
      */
-    public function find_domain($domain, $attributes = array('*'))
+    public function find_domain($domain, $attributes = '*')
     {
         if (empty($domain)) {
             return false;

Overview

Request 3171 (accepted)

Request History