Kolab Groupware OBS

kolab-webadmin.spec Changed

@@ -55,16 +55,23 @@
 Requires:       webserver
 %endif
 
-%if 0%{?rhel} < 8
 Requires:       mozldap-tools
-%else
-Requires:       openldap-clients
-%endif
-Requires:       php-gettext
-Requires:       php-ldap
-Requires:       php-mbstring
-Requires:       php-mysqlnd
-Requires:       php-iconv
+#Requires:       php-Smarty >= 3.1.7
+#Requires:       php-pear(HTTP_Request2)
+#%if 0%{?suse_version}
+#Requires:       php-pear-Mail
+#%else
+#Requires:       php-pear(Mail)
+#%endif
+#Requires:       php-pear(Net_Socket)
+#Requires:       php-pear(Net_LDAP2)
+#Requires:       php-kolab-net-ldap3
+#Requires:       php-pear(Net_SMTP)
+#Requires:       php-pear(Net_URL2)
+#Requires:       php-gettext
+#Requires:       php-ldap
+#Requires:       php-mbstring
+#Requires:       php-mysqlnd
 
 %description
 Web based admin - and user interface for the Kolab Groupware Server
@@ -82,13 +89,6 @@
 
 %build
 
-%if 0%{?rhel} >= 8
-#Mod php has been deprecated and the php_ options no longer work
-sed -i '/php_/s/^/#/' doc/kolab-webadmin.conf
-sed -i '/php_/s/^/#/' doc/hosted-kolab.conf
-rm public_html/api/.htaccess
-%endif
-
 %install
 mkdir -p \
     %{buildroot}/%{_datadir}/%{name}/ \
@@ -100,7 +100,7 @@
 rm -rf lib/ext/
 
 cp -a bin %{buildroot}/%{_datadir}/%{name}/.
-cp -a vendor/ lib/ public_html/ hosted/ %{buildroot}/%{_datadir}/%{name}/.
+cp -a lib/ public_html/ hosted/ %{buildroot}/%{_datadir}/%{name}/.
 cp -a doc/kolab-webadmin.conf %{buildroot}/%{_ap_sysconfdir}/conf.d/
 cp -a doc/hosted-kolab.conf %{buildroot}/%{_ap_sysconfdir}/conf.d/
 pushd %{buildroot}/%{_datadir}/%{name}/

buildtarball.sh Changed

debian.changelog Changed

debian.control Changed

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

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

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ,
-    "content-hash": "e3c72f4c19a9800a83f0e0ede288f1c5",
+    "content-hash": "ef9c39a67aefbc297c125b4d1e2b5919",
     "packages": 
         {
             "name": "kolab/net_ldap3",
@@ -12,7 +12,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git",
-                "reference": "5a319cf437d75aad564ce7fd076cc5423722868b"
+                "reference": "6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a"
             },
             "require": {
                 "pear/net_ldap2": ">=2.0.12",
@@ -52,7 +52,7 @@
                 "pear",
                 "vlv"
             ,
-            "time": "2023-06-07T08:32:15+00:00"
+            "time": "2023-01-21T11:19:47+00:00"
         },
         {
             "name": "pear/console_getopt",
@@ -107,39 +107,44 @@
         },
         {
             "name": "pear/http_request2",
-            "version": "v2.5.1",
+            "version": "v2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/HTTP_Request2.git",
-                "reference": "db4ce7844f838d3adca0513a77420c0fec22ed2d"
+                "reference": "3599cf0fe455a4e281da464f6510bfc5c2ce54c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/HTTP_Request2/zipball/db4ce7844f838d3adca0513a77420c0fec22ed2d",
-                "reference": "db4ce7844f838d3adca0513a77420c0fec22ed2d",
+                "url": "https://api.github.com/repos/pear/HTTP_Request2/zipball/3599cf0fe455a4e281da464f6510bfc5c2ce54c4",
+                "reference": "3599cf0fe455a4e281da464f6510bfc5c2ce54c4",
                 "shasum": ""
             },
             "require": {
                 "pear/net_url2": "^2.2.0",
                 "pear/pear_exception": "^1.0.0",
-                "php": ">=5.6.0"
-            },
-            "require-dev": {
-                "yoast/phpunit-polyfills": "^1.0.0"
+                "php": ">=5.2.0"
             },
             "suggest": {
-                "ext-curl": "Allows using cURL as a request backend.",
                 "ext-fileinfo": "Adds support for looking up mime-types using finfo.",
-                "ext-openssl": "Allows handling SSL requests when not using cURL.",
-                "ext-zlib": "Allows handling gzip compressed responses."
+                "ext-zlib": "Allows handling gzip compressed responses.",
+                "lib-curl": "Allows using cURL as a request backend.",
+                "lib-openssl": "Allows handling SSL requests when not using cURL."
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-trunk": "2.2-dev"
+                }
+            },
             "autoload": {
                 "psr-0": {
                     "HTTP_Request2": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
+            "include-path": 
+                "./"
+            ,
             "license": 
                 "BSD-3-Clause"
             ,
@@ -150,7 +155,7 @@
                 }
             ,
             "description": "Provides an easy way to perform HTTP requests.",
-            "homepage": "https://pear.php.net/package/HTTP_Request2",
+            "homepage": "http://pear.php.net/package/HTTP_Request2",
             "keywords": 
                 "PEAR",
                 "curl",
@@ -158,11 +163,10 @@
                 "request"
             ,
             "support": {
-                "docs": "https://pear.php.net/manual/en/package.http.http-request2.php",
-                "issues": "https://github.com/pear/HTTP_Request2/issues",
+                "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name=HTTP_Request2",
                 "source": "https://github.com/pear/HTTP_Request2"
             },
-            "time": "2022-01-06T18:20:25+00:00"
+            "time": "2016-02-13T20:20:39+00:00"
         },
         {
             "name": "pear/mail",
@@ -638,7 +642,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=5.6.0"
+        "php": ">=5.4.0"
     },
     "platform-dev": ,
     "plugin-api-version": "2.1.0"

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(!empty($params'type') ? $params'type' . '_ou' : 'ou');
+        $base_dn = $this->_subject_base_dn($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 (!empty($_SESSION'user') && !empty($_SESSION'user'->user_bind_dn)) {
+        if ($_SESSION'user' && $_SESSION'user'->user_bind_dn) {
             $bind_dn = $_SESSION'user'->user_bind_dn;
             $bind_pw = $_SESSION'user'->user_bind_pw;
         }
@@ -1405,7 +1405,6 @@
     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,14 +64,11 @@
      */
     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();
 
-        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;
-        }
+        $postdata'type_key' = $type_key;
 
         foreach ($attributes as $attr_name) {
             if (empty($attr_name)) {
@@ -113,11 +110,13 @@
      */
     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' => isset($postdata'search') ? $postdata'search' : null,
+            'search' => $postdata'search',
             'list'   => array(),
         );
 
@@ -162,15 +161,12 @@
      */
     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 (!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)) {
+        if ($key_name) {
             $postdata'type_key' = $key_name;
         }
 
@@ -233,7 +229,7 @@
                 }
             }
 
-            $validate = isset($attribs'form_fields'$attr_name'validate') ? $attribs'form_fields'$attr_name'validate' : null;
+            $validate = $attribs'form_fields'$attr_name'validate';
 
             // deprecated value: false = VALIDATE_NONE
             if ($validate === false) {
@@ -243,7 +239,7 @@
             if ($validate == self::VALIDATE_NONE) {
                 $result$attr_name = $attr_value;
             }
-            else if (!empty($attribs'form_fields'$attr_name'optional') && $attr_value === '') {
+            else if ($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'  => !empty($postdata'is_default') ? 1 : 0,
+            'is_default'  => $postdata'is_default' ? 1 : 0,
         );
 
         if ($postdata'type' == 'user') {
@@ -112,10 +112,13 @@
         }
 
         // there can be only one default
-        if (!empty($postdata'is_default')) {
+        if ($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;
@@ -183,13 +186,13 @@
         $query = array(
             'key'         => $postdata'key',
             'name'        => $postdata'name',
-            'description' => !empty($postdata'description') ? $postdata'description' : '',
+            'description' => $postdata'description' ? $postdata'description' : '',
             'attributes'  => json_encode($postdata'attributes'),
-            'is_default'  => !empty($postdata'is_default') ? 1 : 0,
+            'is_default'  => $postdata'is_default' ? 1 : 0,
         );
 
         if ($postdata'type' == 'user') {
-            $query'used_for' = !empty($postdata'used_for') && $postdata'used_for' == 'hosted' ? 'hosted' : null;
+            $query'used_for' = $postdata'used_for' == 'hosted' ? 'hosted' : null;
         }
 
         foreach ($query as $idx => $value) {
@@ -204,10 +207,13 @@
         }
 
         // there can be only one default
-        if (!empty($postdata'is_default')) {
+        if ($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/api/kolab_api_service_user.php Changed

@@ -180,28 +180,6 @@
     }
 
     /**
-     * Reset user passwordRetryCount.
-     *
-     * @param array $get  GET parameters
-     * @param array $post POST parameters
-     *
-     * @return bool True on success, False on failure
-     */
-    public function user_reset_password_retry_count($getdata, $postdata)
-    {
-        $user_id = $postdata'id';
-
-        if (empty($user_id)) {
-            return false;
-        }
-
-        $auth   = Auth::get_instance();
-        $result = $auth->user_edit($user_id, array('passwordretrycount' => 0));
-
-        return $result !== false;
-    }
-
-    /**
      * Effective rights on user record.
      *
      * @param array $get  GET parameters
@@ -231,14 +209,12 @@
             return false;
         }
 
-        $auth    = Auth::get_instance();
-        $attrs   = $this->object_attributes('user');
-        $attrs = 'passwordRetryCount';
-
+        $auth   = Auth::get_instance();
+        $attrs  = $this->object_attributes('user');
         $result = $auth->user_info($getdata'id', $attrs);
 
         // normalize result
-        $result = $this->parse_result_attributes('user', $result, array('passwordretrycount'));
+        $result = $this->parse_result_attributes('user', $result);
 
         Log::trace("user.info on " . $getdata'id' . " parsed result: " . var_export($result, TRUE));

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

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

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);
+        $output = $this->ou_form(null, $data, true);
 
         $this->output->set_object('taskcontent', $output);
     }
@@ -85,7 +85,6 @@
     {
         $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');
@@ -97,7 +96,7 @@
                 $style = 'display:none';
             }
 
-            if (!empty($item'has_children')) {
+            if ($item'has_children') {
                 $tree .= '<span class="expando font-icon"></span>';
             }
             else if ($max_tree_level) {
@@ -162,7 +161,7 @@
             'type'    => kolab_form::INPUT_SELECT,
             'options' => array_merge(array(''), $this->ou_list()),
             'escaped' => true,
-            'default' => isset($data'base_dn') ? $data'base_dn' : null,
+            'default' => $data'base_dn',
         );
 
         // 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,8 +274,7 @@
 
         $rows = $head = $foot = array();
         $cols = array('name');
-        $i = 0;
-        $foot_body = '';
+        $i    = 0;
 
         // table header
         $head0'cells' = array('class' => 'name', 'body' => $this->translate('type.list'));
@@ -335,7 +334,7 @@
             $this->output->command('set_watermark', 'taskcontent');
         }
 
-        $this->output->set_env('search_request', !empty($search_request) ? base64_encode(serialize($search_request)) : null);
+        $this->output->set_env('search_request', $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));
@@ -456,7 +455,7 @@
         $add_mode = empty($data'id');
         $title    = $add_mode ? $this->translate('type.add') : $data'name';
 
-        $data'id' = !empty($data'id') ? ($data'type' . ':' . $data'id') : null;
+        $data'id' = $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);
@@ -481,7 +480,7 @@
         }
 
         // Get the rights on the entry and attribute level
-        $data'effective_rights' = $this->effective_rights('type', isset($data'id') ? $data'id' : null);
+        $data'effective_rights' = $this->effective_rights('type', $data'id');
         $attribute_rights         = (array) $data'effective_rights''attribute';
         $entry_rights             = (array) $data'effective_rights''entry';
 
@@ -490,16 +489,16 @@
             'key' => array(
                 'type' => kolab_form::INPUT_TEXT,
                 'required' => true,
-                'value' => isset($data'key') ? $data'key' : '',
+                'value' => $data'key',
             ),
             'name' => array(
                 'type' => kolab_form::INPUT_TEXT,
                 'required' => true,
-                'value' => isset($data'name') ? $data'name' : '',
+                'value' => $data'name',
             ),
             'description' => array(
                 'type'  => kolab_form::INPUT_TEXTAREA,
-                'value' => isset($data'description') ? $data'description' : '',
+                'value' => $data'description',
             ),
             'objectclass' => array(
                 'type'     => kolab_form::INPUT_SELECT,
@@ -525,10 +524,13 @@
             ),
         );
 
+        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);
-        $admin_auto_fields_rw = false;
 
         foreach ($fields as $idx => $field) {
             if (!array_key_exists($idx, $attribute_rights)) {
@@ -633,7 +635,7 @@
         }
 
         // get attributes list from $data
-        if (!empty($data) && count($data) > 1 && !empty($data'attributes')) {
+        if (!empty($data) && count($data) > 1) {
             $attributes = array_merge(
                 array_keys((array) $data'attributes''auto_form_fields'),
                 array_keys((array) $data'attributes''form_fields'),
@@ -656,10 +658,10 @@
         // defined attributes
         foreach ($attributes as $attr) {
             $row          = $cells;
-            $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;
+            $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';
             $valtype      = 'normal';
             $value        = '';
 
@@ -670,7 +672,7 @@
                 $type = 'text-autocomplete';
             }
 
-            if (!empty($data'attributes''fields'$attr)) {
+            if ($data'attributes''fields'$attr) {
                 $valtype = 'static';
                 $_data   = $data'attributes''fields'$attr;
                 $_data   = is_array($_data) ? implode(',', $_data) : $_data;
@@ -679,7 +681,7 @@
             else if (isset($data'attributes''auto_form_fields'$attr)) {
                 $valtype = 'auto';
 
-                if (isset($data'attributes''auto_form_fields'$attr'data') && is_array($data'attributes''auto_form_fields'$attr'data')) {
+                if (is_array($data'attributes''auto_form_fields'$attr'data')) {
                     $_data = implode(',', $data'attributes''auto_form_fields'$attr'data');
                 }
                 else {
@@ -700,7 +702,7 @@
                 }
             }
 
-            $n_validate = ($validate === false ? 'none' : $validate) ? $validate : 'default';
+            $n_validate = $validate === false ? 'none' : $validate ? $validate : 'default';
 
             // set cell content
             $row'name''body'     = !empty($available$attr) ? $available$attr : $attr;
@@ -737,10 +739,10 @@
                 'valtype'  => $valtype,
                 'optional' => $optional,
                 'validate' => $n_validate,
-                '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,
+                'maxcount' => $data'attributes''form_fields'$attr'maxcount',
+                'data'     => $_data,
+                'values'   => $data'attributes''form_fields'$attr'values',
+                'default'  => $data'attributes''form_fields'$attr'default',
             );
         }
 
@@ -770,17 +772,15 @@
             'attribute.validate.extended'
         );
 
-        $out = kolab_html::table($table);
-
         // Add attribute link
         if (in_array('write', $rights)) {
-            $out .= kolab_html::a(array(
+            $link = kolab_html::a(array(
                 'href' => '#add_attr', 'class' => 'add_attr',
                 'onclick' => "kadm.type_attr_add()",
                 'content' =>  $this->translate('attribute.add')), true);
         }
 
-        return $out;
+        return kolab_html::table($table) . $link;
     }
 
     /**

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

@@ -71,7 +71,7 @@
     public function action_add()
     {
         $data   = $this->get_input('data', 'POST');
-        $output = $this->user_form(null, $data);
+        $output = $this->user_form(null, $data, true);
 
         $this->output->set_object('taskcontent', $output);
     }
@@ -172,18 +172,8 @@
             'astvoicemailpassword'      => 'asterisk',
         );
 
-        // Special attributes/functionality
-        $custom_fields = array();
-        if (!empty($data'id') && isset($data'passwordretrycount')) {
-            $custom_fields'passwordretrycount' = array(
-                'section' => 'system',
-                'type' => kolab_form::INPUT_CUSTOM,
-                'value' => (int) $data'passwordretrycount',
-            );
-        }
-
         // Prepare fields
-        $form = $this->form_prepare('user', $data, array('userpassword2'), null, $fields_map'type_id', $custom_fields);
+        $form = $this->form_prepare('user', $data, array('userpassword2'), null, $fields_map'type_id');
         list($fields, $types, $type, $add_mode) = $form;
 
         // Add password confirmation
@@ -204,33 +194,20 @@
         // Create mode
         if ($add_mode) {
             // copy password to password confirm field
-            $data'userpassword2' = isset($data'userpassword') ? $data'userpassword' : '';
+            $data'userpassword2' = $data'userpassword';
 
             // Page title
             $title = $this->translate('user.add');
         }
         // Edit mode
         else {
-            $title = isset($data'displayname') ? $data'displayname' : null;
+            $title = $data'displayname';
             if (empty($title)) {
                 $title = $data'cn';
             }
 
             // remove password
             $data'userpassword' = '';
-
-            // Add Reset button for passwordRetyCount attribute, if user has permissions
-            if (!empty($fields'passwordretrycount') && empty($fields'passwordretrycount''readonly')
-                && $data'passwordretrycount' > 0
-            ) {
-                $fields'passwordretrycount''suffix' = kolab_html::a(array(
-                        'content' => $this->translate('search.reset'),
-                        'href'    => '#',
-                        'id'      => 'passwordretrycountreset',
-                        'onclick' => "kadm.reset_password_retry_count()",
-                        'class'   => 'btn-sm',
-                ));
-            }
         }
 
         // Create form object and populate with fields

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,6 +254,16 @@
             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();
@@ -295,7 +305,13 @@
             }
         }
 
-        return $object_types;
+        if ($devel_mode == null) {
+            return $this->cache'object_types'$object_name = $object_types;
+        }
+        else {
+            return $object_types;
+        }
+
     }
 
     /**
@@ -319,7 +335,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") {
@@ -335,19 +351,19 @@
             foreach ($type_attrs'form_fields' as $key => $value) {
                 Log::trace("Running parse input attributes for key $key");
 
-                $type = !empty($value'type') ? $value'type' : (!empty($type_attrs'auto_form_fields'$key'type') ? $type_attrs'auto_form_fields'$key'type' : '');
+                $type = $value'type' ?: ($type_attrs'auto_form_fields'$key ? $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 = isset($attribs$key) ? $attribs$key : null;
+                    Log::trace("Either \$attribs'" . $key . "' is not empty or the field is optional");
+                    $result$key = $attribs$key;
                 }
             }
         }
@@ -370,14 +386,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;
@@ -414,7 +430,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
@@ -456,10 +472,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;
@@ -490,7 +506,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')) {
@@ -510,11 +526,10 @@
      *
      * @param string $object_name  Name of the object (user, group, etc.)
      * @param array  $attrs        Entry attributes
-     * @param array  $special      List of extra attributes (for special use)
      *
      * @return array Entry attributes
      */
-    public function parse_result_attributes($object_name, $attrs = array(), $special = array())
+    public function parse_result_attributes($object_name, $attrs = array())
     {
         if (empty($attrs) || !is_array($attrs)) {
             return $attrs;
@@ -546,7 +561,7 @@
 
             // remove attributes not listed in object type definition
             // @TODO: make this optional?
-            $attributes = array_flip(array_merge($attributes, array($unique_attr), $special));
+            $attributes = array_flip(array_merge($attributes, array($unique_attr)));
             $attrs      = array_intersect_key($attrs, $attributes);
         }
 /*

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

@@ -50,7 +50,6 @@
     protected $page_size    = 20;
     protected $list_attribs = array();
     protected $list_module;
-    protected $domain;
 
     protected $search_attribs = array(
         'name'  => array('cn', 'displayname'),
@@ -208,8 +207,8 @@
             $login = $this->get_input('login', 'POST', true);
 
             if ($login'username') {
-                $login'username' = isset($login'username') ? trim($login'username') : '';
-                $login'domain'   = isset($login'domain') ? trim($login'domain') : '';
+                $login'username' = trim($login'username');
+                $login'domain'   = trim($login'domain');
 
                 $result = $this->api->login($login'username', $login'password', $login'domain', true);
 
@@ -279,7 +278,7 @@
         else if (!empty($_SESSION'user') && !empty($_SESSION'user''token')) {
             // Validate session
             $timeout = $this->config_get('session_timeout', 3600);
-            if ($timeout && !empty($_SESSION'time') && $_SESSION'time' < time() - $timeout) {
+            if ($timeout && $_SESSION'time' && $_SESSION'time' < time() - $timeout) {
                 $this->action_logout(true);
             }
 
@@ -712,13 +711,9 @@
             }
         }
 
-        $domain = !empty($this->domain) ? $this->domain : $_SESSION'user''domain';
+        $domain = $this->domain ? $this->domain : $_SESSION'user''domain';
 
-        if (!$all) {
-            return isset($list$domain) ? $list$domain : null;
-        }
-
-        return $list;
+        return !$all ? $list$domain : $list;
     }
 
     /**
@@ -810,7 +805,7 @@
                     'type'      => 'text',
                     'id'        => 'login_name',
                     'name'      => 'loginusername',
-                    'value'     => isset($post'username') ? $post'username' : '',
+                    'value'     => $post'username',
                     'placeholder' => $this->translate('login.username'),
                     'autofocus' => true))
         ));
@@ -861,17 +856,20 @@
     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'multiple' = $field_type == 'multiselect';
+            $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;
+            }
 
             break;
 
@@ -903,7 +901,8 @@
             break;
 
         case 'text-quota':
-            $result'type' = kolab_form::INPUT_TEXTQUOTA;
+            $result'type'    = kolab_form::INPUT_TEXTQUOTA;
+            $result'default' = $field'default';
             break;
 
         case 'aci':
@@ -927,6 +926,7 @@
         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,6 +964,9 @@
                     );
                 }
             }
+            else {
+                $result'default' = $field'default';
+            }
 
             if (isset($field'maxlength')) {
                 $result'maxlength' = $field'maxlength';
@@ -971,7 +974,6 @@
         }
 
         $result'required' = empty($field'optional');
-        $result'default'  = isset($field'default') ? $field'default' : null;
 
         return $result;
     }
@@ -996,7 +998,7 @@
             $resp = $resp->get($field'name');
             unset($data'attributes');
 
-            $default         = !empty($data$field'name') ? $data$field'name' : (isset($resp'default') ? $resp'default' : null);
+            $default         = empty($data$field'name') ? $resp'default' : $data$field'name';
             $field'values' = $resp'list';
         }
 
@@ -1038,11 +1040,10 @@
      * @param array  $extra_fields Extra field names
      * @param string $used_for     Object types filter
      * @param string $id_section   Name of section for type_id field
-     * @param array  $custom_fields Extra fields definitions
      *
      * @return array Fields list, Object types list, Current type ID
      */
-    protected function form_prepare($name, &$data, $extra_fields = array(), $used_for = null, $id_section = null, $custom_fields = array())
+    protected function form_prepare($name, &$data, $extra_fields = array(), $used_for = null, $id_section = null)
     {
         $types        = (array) $this->object_types($name, $used_for);
         $add_mode     = empty($data'id');
@@ -1063,7 +1064,7 @@
         else {
             // find default object type
             foreach ($types as $type_id => $type) {
-                if (!empty($type'is_default')) {
+                if ($type'is_default') {
                     $default = $type_id;
                     break;
                 }
@@ -1071,7 +1072,7 @@
 
             reset($types);
 
-            $data'type_id' = $type = (isset($default) ? $default : key($types));
+            $data'type_id' = $type = ($default !== null ? $default : key($types));
         }
 
         if ($type) {
@@ -1155,10 +1156,8 @@
             }
         }
 
-        $fields += $custom_fields;
-
         // Get the rights on the entry and attribute level
-        $data'effective_rights' = $this->effective_rights($name, isset($data'id') ? $data'id' : null);
+        $data'effective_rights' = $this->effective_rights($name, $data'id');
         $attribute_rights         = (array) $data'effective_rights''attribute';
         $entry_rights             = (array) $data'effective_rights''entry';
 
@@ -1342,7 +1341,7 @@
     {
         // Assign sections to fields
         foreach ($fields as $idx => $field) {
-            if (empty($field'section')) {
+            if (!$field'section') {
                 $fields$idx'section' = isset($fields_map$idx) ? $fields_map$idx : 'other';
             }
         }
@@ -1389,11 +1388,11 @@
                 $field'description' = "$name.$idx.desc";
                 $field'section'     = $section_idx;
 
-                if (empty($field'value') && isset($data$idx) && $data$idx !== '') {
+                if (empty($field'value') && $data$idx !== null && $data$idx !== '') {
                     $value = $data$idx;
 
                     // Convert data for the list field with autocompletion
-                    if (!empty($field'data-type') && $field'data-type' == 'list') {
+                    if ($field'data-type' == 'list') {
                         if (!is_array($value)) {
                             if (!empty($field'data-autocomplete')) {
                                 $value = array($value => $value);
@@ -1407,7 +1406,7 @@
                     }
 
                     if (is_array($value)) {
-                        $value = @implode("\n", $value);
+                        $value = implode("\n", $value);
                     }
 
                     $field'value' = $value;
@@ -1415,7 +1414,7 @@
                 else if ($add_mode && !isset($field'value')) {
                     // read default from config, e.g. default_quota
                     if (!isset($field'default')) {
-                        $conf_name = 'default_' . (!empty($conf_aliases$idx) ? $conf_aliases$idx : $idx);
+                        $conf_name = 'default_' . ($conf_aliases$idx ?: $idx);
                         $field'default' = $this->config->get($domain, $conf_name);
                     }
 
@@ -1433,7 +1432,7 @@
                     $assoc_fields$idx = !empty($data$idx) ? $data$idx : array();
                 }
 
-                if (!empty($field'type') && $field'type' == kolab_form::INPUT_CHECKBOX && !isset($field'checked')) {
+                if ($field'type' == kolab_form::INPUT_CHECKBOX && !isset($field'checked')) {
                     $field'checked' = $field'value' == 'TRUE';
                     $field'value' = 'TRUE';
                 }
@@ -1469,7 +1468,7 @@
 
                 if (empty($field'readonly') && empty($field'disabled')) {
                     // count writeable fields
-                    if (!empty($field'type') && $field'type' != kolab_form::INPUT_HIDDEN) {
+                    if ($field'type' && $field'type' != kolab_form::INPUT_HIDDEN) {
                         $writeable++;
                     }
                     if ($idx != "userpassword2") {
@@ -1521,14 +1520,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', !empty($data'entrydn') ? $data'entrydn' : null);
+        $this->output->set_env('entrydn', $data'entrydn');
         $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") : (isset($data'cn') ? $data'cn' : null);
+            $title = $add_mode ? $this->translate("$name.add") : $data'cn';
         }
 
         $form->set_title(kolab_html::escape($title));
@@ -1723,7 +1722,6 @@
         $i    = 0;
 
         $table_class = 'list';
-        $foot_body = '';
 
         // table header
         $head0'cells' = array('class' => 'name', 'body' => $this->translate($task . '.list'));
@@ -1749,7 +1747,6 @@
 
             $foot_body = kolab_html::span(array('content' => $prev . $count_str . $next));
         }
-
         $foot0'cells' = array('class' => 'listnav', 'body' => $foot_body);
 
         // table body
@@ -1802,7 +1799,7 @@
             $this->output->command('set_watermark', 'taskcontent');
         }
 
-        $this->output->set_env('search_request', !empty($search_request) ? base64_encode(serialize($search_request)) : null);
+        $this->output->set_env('search_request', $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 (!empty($element'type') && $element'type' == self::INPUT_HIDDEN) {
+                    if ($element'type' == self::INPUT_HIDDEN) {
                         $hidden = self::get_element($element);
                         continue;
                     }
@@ -159,7 +159,7 @@
                 continue;
             }
 
-            if (!empty($element'type') && $element'type' == self::INPUT_HIDDEN) {
+            if ($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 (!empty($this->attribs'id')) {
+        if ($this->attribs'id') {
             $content .= kolab_html::script('kadm.form_init(\'' . $this->attribs'id' . '\')');
         }
 
@@ -222,9 +222,9 @@
             $attrib'class' .= ' required';
         }
 
-        if (!empty($element'type') && $element'type' == self::INPUT_CONTENT) {
+        if ($element'type' == self::INPUT_CONTENT) {
             $attrib'content' = kolab_html::div(array(
-                'class'   => isset($element'class') ? $element'class' : '',
+                '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) && !empty($element'input-group')) {
+            if (is_array($element) && $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 (!empty($attribs'type') && $attribs'type' == 'checkbox' && !empty($attribs'readonly')) {
+        if ($attribs'type' == 'checkbox' && $attribs'readonly') {
             // readonly checkbox should be disabled, otherwise the user could still check or uncheck the box
             $attribs'disabled' = 'disabled';
         }
 
-        if (!empty($attribs'type') && ($attribs'type' == 'button' || $attribs'type' == 'submit')) {
-            self::set_class($attribs, 'btn');
+        if ($attribs'type' == 'button' || $attribs'type' == 'submit') {
+            $attribs'class' = trim($attribs'class' . ' btn');
 
             if (!preg_match('/btn-/', $attribs'class')) {
                 $attribs'class' .= ' btn-' . (strpos($attribs'class', 'submit') !== false ? 'primary' : 'secondary');
             }
         }
-        else if (!empty($attribs'type') && $attribs'type' == 'checkbox') {
+        else if ($attribs'type' == 'checkbox') {
             // TODO: Bootstrap style
         }
         else {
-            self::set_class($attribs, 'form-control');
+            $attribs'class' = trim($attribs'class' . ' form-control');
         }
 
         return sprintf('<input%s />', self::attrib_string($attribs, $elem_attribs));
@@ -246,7 +246,7 @@
             $content = self::escape($content);
         }
 
-        self::set_class($attribs, 'form-control');
+        $attribs'class' = trim($attribs'class' . ' form-control');
 
         return sprintf('<textarea%s>%s</textarea>',
             self::attrib_string($attribs, $elem_attribs), $content);
@@ -291,7 +291,7 @@
             }
         }
 
-        self::set_class($attribs, 'custom-select');
+        $attribs'class' = trim($attribs'class' . ' custom-select');
 
         return sprintf('<select%s>%s</select>',
             self::attrib_string($attribs, $elem_attribs), implode("\n", $content));
@@ -534,18 +534,4 @@
 
         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/lib/locale/en_US.php Changed

kolab-webadmin-3.2.16.tar.gz/public_html/js/kolab_admin.js Changed

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

@@ -1,11 +1,11 @@
 <div id="task_content">
     <h1>Kolab Web Administration Panel</h1>
     <p>
-        This is the Kolab Web Administration Panel client interface for <a href="https://kolab.org">Kolab Groupware</a>, developed by <a href="https://apheleia-it.ch">Apheleia IT</a>.
+        This is the Kolab Web Administration Panel client interface for <a href="http://www.kolab.org">Kolab Groupware</a>, developed by <a href="http://www.kolabsys.com">Kolab Systems AG</a>.
     </p>
 
     <p>
-        The Kolab WAP client interface is licensed under the conditions set forth in the <a href="https://www.gnu.org/licenses/agpl-3.0.html">GNU Affero General Public License version 3</a> (AGPLv3) or, at your option, any later version of the GNU Affero GPL license (AGPLv3+).
+        The Kolab WAP client interface is licensed under the conditions set forth in the <a href="http://www.gnu.org/licenses/agpl-3.0.html">GNU Affero General Public License version 3</a> (AGPLv3) or, at your option, any later version of the GNU Affero GPL license (AGPLv3+).
     </p>
 
     <h2>Authors</h2>
@@ -25,7 +25,7 @@
 
     <h2>Documentation</h2>
     <p>
-        Documentation for Kolab Groupware Web Administration Panel can be found at <a href="http://docs.kolab.org/">the Kolab Groupware documentation site</a>.
+        Documentation for the Kolab Groupware Web Administration Panel and backend API can be found at <a href="http://docs.kolab.org/">the Kolab Groupware documentation site</a>.
     </p>
 
     <h2>Feedback</h2>
@@ -35,16 +35,16 @@
     <p>
         <ul>
             <li>
-                <a href="https://lists.kolab.org/mailman/listinfo/users">Users mailing list</a>, for help installing, configuring or operating, other general questions and comments. (<a href="mailto:users-subscribe@lists.kolab.org">subscribe</a>, <a href="https://lists.kolab.org/pipermail/users/">archives</a>)
+                <a href="http://lists.kolab.org/mailman/listinfo/users">Users mailing list</a>, for help installing, configuring or operating, other general questions and comments. (<a href="mailto:users-subscribe@lists.kolab.org">subscribe</a>, <a href="http://lists.kolab.org/pipermail/users/">archives</a>)
             </li>
             <li>
-                <a href="https://lists.kolab.org/mailman/listinfo/devel">Development mailing list</a>, for enhancement requests, compatibility issues and general inquiries. (<a href="mailto:devel-subscribe@lists.kolab.org">subscribe</a>, <a href="https://lists.kolab.org/pipermail/devel/">archives</a>)
+                <a href="http://lists.kolab.org/mailman/listinfo/devel">Development mailing list</a>, for enhancement requests, compatibility issues and general inquiries. (<a href="mailto:devel-subscribe@lists.kolab.org">subscribe</a>, <a href="http://lists.kolab.org/pipermail/devel/">archives</a>)
             </li>
             <li>
-                Our <a href="https://git.kolab.org/">issue tracker</a>,
+                Our <a href="https://issues.kolab.org/">issue tracker</a>,
             </li>
             <li>
-                The <a href="https://freenode.net">IRC Channel</a> on freenode: <a href="irc://irc.freenode.net/kolab">#kolab</a>.
+                The <a href="http://freenode.net/using_the_network.shtml">IRC Channel</a> on freenode: <a href="irc://irc.freenode.net/kolab">#kolab</a>.
             </li>
         </ul>
     </p>

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

@@ -1,23 +1,22 @@
 <div id="task_content">
     <h1>Kolab Web Administration Panel</h1>
     <p>
-        This is the Kolab Web Administration Panel client interface for Kolab Enterprise, developed and supported by <a href="https://apheleia-it.ch">Apheleia IT</a>.
+        This is the Kolab Web Administration Panel client interface for Kolab Enterprise, developed and supported by <a href="http://www.kolabsys.com/">Kolab Systems AG</a>.
     </p>
 
     <p>
-        The Kolab WAP client interface is licensed under the conditions set forth in the <a href="https://www.gnu.org/licenses/agpl-3.0.html">GNU Affero General Public License version 3</a> (AGPLv3) or, at your option, any later version of the GNU Affero GPL license (AGPLv3+).
+        The Kolab WAP client interface is licensed under the conditions set forth in the <a href="http://www.gnu.org/licenses/agpl-3.0.html">GNU Affero General Public License version 3</a> (AGPLv3) or, at your option, any later version of the GNU Affero GPL license (AGPLv3+).
     </p>
 
     <h2>Documentation</h2>
     <p>
-        Documentation for the Kolab Groupware Web Administration Panel and backend API can be found at <a href="https://docs.kolab.org/">the Kolab Groupware documentation site</a>.
+        Documentation for the Kolab Groupware Web Administration Panel and backend API can be found at <a href="http://docs.kolab.org/">the Kolab Groupware documentation site</a>.
     </p>
 
     <h2>Support</h2>
     <p>
-        This version of Kolab Enterprise is supported by Apheleia IT.
+        This version of Kolab Enterprise is supported by Kolab Systems. 
 If you have server support tickets left, you can create a new ticket by 
-emailing <a href="mailto:support@apheleia-it.ch">support@apheleia-it.ch</a>.
-Please keep in mind that we only accept one issue per ticket. If you need new server support tickets, please send email to <a href="mailto:sales@apheleia-it.ch">sales@apheleia-it.ch</a>.
+emailing <a href="mailto:support@kolabsys.com">support@kolabsys.com</a>. Please keep in mind that we only accept one issue per ticket. If you need new server support tickets, please send email to <a href="mailto:sales@kolabsys.com">sales@kolabsys.com</a>.
     </p>
 </div>

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

@@ -3,7 +3,7 @@
 <h1>Kolab Groupware Solution</h1>
 <p>
 This is the server of the Kolab Groupware Solution,
-a <a href="https://fsfe.org/about/basics/freesoftware">Free Software</a>
+a <a href="http://fsfe.org/about/basics/freesoftware">Free Software</a>
 Personal Information Management (PIM) solution developed by the
 <a href="https://kolab.org/">Kolab.org Community</a>. Any installation of
 the Kolab Groupware Solution would normally include one or more of these
@@ -17,6 +17,9 @@
 
 <p>
 There is a wide variety of reasons why Kolab should be your choice.
+Several of them have been put together for different target groups in the
+<a href="http://files.kolabsys.com/Public/Handouts/">Handouts for
+the Kolab Groupware Solution by Kolab Systems</a>.
 To summarize just some points, Kolab is your solution, if
 </p>
 
@@ -30,8 +33,8 @@
     <li>strategic issues are important to you, e.g. you need sovereignty of the software you deploy;</li>
     <li>your users should be fully productive whether they are on- or offline;</li>
     <li>you want the flexibility to create solutions for your specialised needs;</li>
-    <li>you want <a href="https://fsfe.org/about/basics/freesoftware">Free Software</a>/Open Source,
-        but also want the <a href="https://apheleia-it.ch">professional support</a> without having
+    <li>you want <a href="http://fsfe.org/about/basics/freesoftware">Free Software</a>/Open Source,
+        but also want the <a href="http://kolabsys.com/">professional support</a> without having
         to resort to proprietary lock-in.
     </li>
 </ul>
@@ -40,14 +43,14 @@
 
 <ul>
     <li><a href="https://kolab.org">Kolab Community Web Site</a></li>
-    <li><a href="https://blogs.fsfe.org/greve/?p=431">Article: 'The Kolab Story' by Georg Greve</a></li>
+    <li><a href="http://blogs.fsfe.org/greve/?p=431">Article: 'The Kolab Story' by Georg Greve</a></li>
 </ul>
 
 <h2>Warranties &amp; Professional Support</h2>
 
 <p>
 This is the <b>Kolab.org Development Edition</b> of the Kolab Groupware Server.
-It is provided by Apheleia IT as fully <a href="https://fsfe.org/about/basics/freesoftware">Free Software</a>
+It is provided by Kolab Systems as fully <a href="http://fsfe.org/about/basics/freesoftware">Free Software</a>
 and you can use it to the fullest extent and any purpose. There are no license
 costs or other obligations other than those set forth in the respective
 Free Software licenses of the various components. <b>There are no warranties
@@ -57,7 +60,7 @@
 
 <p>
 There is a wide variety of commercial support options and warranties available
-by <a href="https://apheleia-it.ch">Apheleia IT</a> and its
+by <a href="/admin/kolab/kolabsystems.php">Kolab Systems AG</a> and its
 network of partners, the Kolab Enterprise Community. This support comes with
 access to the additionally quality assured and hardened <b>Kolab Enterprise</b>
 edition, which like the Kolab.org edition is fully available as Free Software,
@@ -65,7 +68,7 @@
 </p>
 
 <p>
-Apheleia IT will only provide very limited <a href="https://aphelaia-it.ch">community assistance</a>
+Kolab Systems AG will only provide very limited <a href="https://kolabsys.com/community-assistance">community assistance</a>
 for the Kolab.org Edition on a case-by-case basis, but with no guaranteed response times,
 as availability permits, and at rates that may be adjusted due to the work load
 at the time of the request.
@@ -83,7 +86,7 @@
         <tr>
             <td>Support channels</td>
             <td><b>Wiki &amp; public mailing lists only</b></td>
-            <td><em>Apheleia IT Ticketing</em></td>
+            <td><em>Kolab Systems Ticketing</em></td>
         </tr>
         <tr>
             <td>Guaranteed response times</td>
@@ -124,11 +127,11 @@
 </p>
 
 <p>
-Apheleia IT provides an overview of all available
-<a href="https://apheleia-it.ch">Service Level Agreements (SLA)</a>.
+Kolab Systems provides an overview of all available
+<a href="https://kolabsys.com/pricing">Service Level Agreements (SLA)</a>.
 To upgrade your installation to Kolab Enterprise, please contact
-<a href="mailto:sales@apheleia-it.ch">sales@apheleia-it.ch</a> or visit their
-<a href="https://apheleia-it.ch">web page</a>.
+<a href="mailto:sales@kolabsys.com">sales@kolabsys.com</a> or visit their
+<a href="http://kolabsys.com/contact">web page</a>.
 </p>
 
 </div>

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

@@ -1,13 +1,13 @@
 <div id="task_content">
 
 <div align="center" class="mb-3">
-<a href="https://kolabsys.com/">
+<a href="http://kolabsys.com/">
     <img src="{$skin_path}images/kolabsystems.png" alt="Kolab Systems AG" />
 </a>
 </div>
 
 <p>
-Founded in Z&uuml;rich in 2010, <a href="https://kolabsys.com">Kolab Systems AG</a>
+Founded in Z&uuml;rich in 2010, <a href="http://kolabsys.com">Kolab Systems AG</a>
 is the global leader in Kolab Technology. Together with its partners
 in the Kolab Enterprise Community, Kolab Systems provides quality assurance,
 integration, support, training, certification of individuals and third-party products,
@@ -20,12 +20,12 @@
 <h2>Looking for professional support for your Kolab Groupware Solution?</h2>
 
 <p>
-Kolab Systems provides a wide range of <a href="https://kolabsys.com/pricing">Service Level Agreements (SLA)</a>
+Kolab Systems provides a wide range of <a href="http://kolabsys.com/pricing">Service Level Agreements (SLA)</a>
 which range from fully self-supported installations to maintained installations with
 reaction times as low as 1 hour. These are provided exclusively on Kolab Systems' Kolab Enterprise
 edition. To upgrade your installation to Kolab Enterprise, please contact
 <a href="mailto:sales@kolabsys.com">sales@kolabsys.com</a> or visit their
-<a href="https://kolabsys.com/contact">web page</a>.
+<a href="http://kolabsys.com/contact">web page</a>.
 </p>
 
 <h2>Our Development Partners</h2>
@@ -36,11 +36,11 @@
 </p>
 
 <ul>
-    <li><a href="https://www.pardus.de">P@rdus</a></li>
-    <li><a href="https://www.intevation.de">Intevation</a></li>
-    <li><a href="https://www.kdab.com">KDAB</a></li>
-    <li><a href="https://www.libertech.fr/default.htm">Libertech</a></li>
-    <li><a href="https://www.tbits.de">TBits</a></li>
+    <li><a href="http://www.pardus.de">P@rdus</a></li>
+    <li><a href="http://www.intevation.de">Intevation</a></li>
+    <li><a href="http://www.kdab.com">KDAB</a></li>
+    <li><a href="http://www.libertech.fr/default.htm">Libertech</a></li>
+    <li><a href="http://www.tbits.de">TBits</a></li>
     <li>...and all the community contributors.</li>
 </ul>

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

@@ -4,8 +4,8 @@
 
 <p>
 This is the server of the Kolab Groupware Solution. It is
-<a href="https://fsfe.org/about/basics/freesoftware">Free Software</a>
-developed by the <a href="https://kolab.org/">Kolab Community</a>,
+<a href="http://fsfe.org/about/basics/freesoftware">Free Software</a>
+developed by the <a href="http://www.kolab.org/">Kolab Community</a>,
 which works in collaboration with and as part of many other communities
 and projects to bring you this software.
 </p>
@@ -13,37 +13,37 @@
 <p>
 For this server, Free Software communities and projects that the Kolab Community is a part of and builds upon include:
 <ul>
-    <li><a href="https://www.ijs.si/software/amavisd/">amavisd-new</a> (Mail Scanner)</li>
-    <li><a href="https://www.apache.org/">Apache</a> (HTTP Server)</li>
-    <li><a href="https://www.clamav.net/">ClamAV</a> (Virus Scanner)</li>
-    <li><a href="https://www.cyrusimap.org/">Cyrus</a> (IMAP Server &amp; Database)</li>
-    <li><a href="https://www.port389.org/">389 Directory Server</a> (LDAP Server)</li>
-    <li><a href="https://www.postfix.org/">Postfix</a> (MTA)</li>
-    <li><a href="https://spamassassin.apache.org/">SpamAssassin</a> (SPAM Filter)</li>
-    <li><a href="https://www.syncroton.org/">Syncroton</a> (ActiveSync Support)</li>
-    <li><a href="https://www.roundcube.net/">Roundcube</a> (Web client)</li>
-    <li><a href="https://www.python.org/">Python</a> (Server side scripting &amp; glue)</li>
-    <li><a href="https://www.php.net/">PHP</a> (Server side scripting &amp; glue)</li>
-    <li><a href="https://smarty.php.net/">Smarty Template Engine</a> (This interface)</li>
+    <li><a href="http://www.ijs.si/software/amavisd/">amavisd-new</a> (Mail Scanner)</li>
+    <li><a href="http://www.apache.org/">Apache</a> (HTTP Server)</li>
+    <li><a href="http://www.clamav.net/">ClamAV</a> (Virus Scanner)</li>
+    <li><a href="http://www.cyrusimap.org/">Cyrus</a> (IMAP Server &amp; Database)</li>
+    <li><a href="http://www.port389.org/">389 Directory Server</a> (LDAP Server)</li>
+    <li><a href="http://www.postfix.org/">Postfix</a> (MTA)</li>
+    <li><a href="http://spamassassin.apache.org/">SpamAssassin</a> (SPAM Filter)</li>
+    <li><a href="http://www.syncroton.org/">Syncroton</a> (ActiveSync Support)</li>
+    <li><a href="http://www.roundcube.net/">Roundcube</a> (Web client)</li>
+    <li><a href="http://www.python.org/">Python</a> (Server side scripting &amp; glue)</li>
+    <li><a href="http://www.php.net/">PHP</a> (Server side scripting &amp; glue)</li>
+    <li><a href="http://smarty.php.net/">Smarty Template Engine</a> (This interface)</li>
 </ul>
 </p>
 
 <p>
-For the <a href="https://kolab.org/clients">clients</a>, Free Software communities and projects that the Kolab Community is a part of and builds upon include:
+For the <a href="http://kolab.org/clients">clients</a>, Free Software communities and projects that the Kolab Community is a part of and builds upon include:
 <ul>
-    <li><a href="https://www.kde.org/">K Desktop Environment (KDE)</a></li>
-    <li><a href="https://www.mozilla.org/">Mozilla (Thunderbird &amp; Lightning)</a></li>
-    <li><a href="https://www.gnome.org/">GNOME (Evolution)</a></li>
+    <li><a href="http://www.kde.org/">K Desktop Environment (KDE)</a></li>
+    <li><a href="http://www.mozilla.org/">Mozilla (Thunderbird &amp; Lightning)</a></li>
+    <li><a href="http://www.gnome.org/">GNOME (Evolution)</a></li>
 </ul>
 </p>
 
 <h2>History &amp; Credits</h2>
 
 <p>
-In 2010, <a href="https://www.intevation.de">Intevation</a>, <a href="http://www.kdab.com/">KDAB</a>,
-<a href="https://uk.linkedin.com/in/pauljadams">Dr. Paul Adams</a> and
-<a href="https://ch.linkedin.com/in/georggreve">Georg Greve</a> worked together to re-launch
-the professional support of the Kolab Groupware Solution into the <a href="https://kolabsys.com">Kolab Systems AG</a>,
+In 2010, <a href="http://www.intevation.de">Intevation</a>, <a href="http://www.kdab.com/">KDAB</a>,
+<a href="http://uk.linkedin.com/in/pauljadams">Dr. Paul Adams</a> and
+<a href="http://ch.linkedin.com/in/georggreve">Georg Greve</a> worked together to re-launch
+the professional support of the Kolab Groupware Solution into the <a href="http://kolabsys.com">Kolab Systems AG</a>,
 which took the place of the Kolab-Konsortium.
 </p>
 
@@ -56,14 +56,14 @@
 </p>
 
 <p>
-If you want to join the community, please visit <a href="https://kolab.org">https://kolab.org</a>.
+If you want to join the community, please visit <a href="http://kolab.org">http://kolab.org</a>.
 </p>
 
 <h3>History before 2010</h3>
 
 <p>
 The Kolab project owes a great deal of thanks to the people of the
-<a href="https://www.openpkg.org/">OpenPKG</a> project. OpenPKG allowed Kolab to run on many
+<a href="http://www.openpkg.org/">OpenPKG</a> project. OpenPKG allowed Kolab to run on many
 diverse platforms in a reliable and predictable manner, by providing a common, easy-to-install,
 cross-platform base on which to build the server.
 </p>
@@ -72,37 +72,37 @@
 To use all Kolab2 features you need an interoperable client. The KDE Kolab Client was
 the first such client to be developed and is still considered the reference platform
 for others to follow. The KDE groupware component Kontact can act as Kolab2 Client.
-Many thanks to the <a href="https://www.kde.org">KDE Project</a> for providing such
+Many thanks to the <a href="http://www.kde.org">KDE Project</a> for providing such
 a powerful base on which to build this client solution.
 </p>
 
 <p>
 Users of Outlook on Microsoft Windows are able to use a proprietary plug-in to inter-operate
 with the Kolab server. For Kolab2 the preferred plug-in is the
-<a href="https://www.toltec.co.za/">Toltec Plug-in</a> by Radley Network Technologies CC.
+<a href="http://www.toltec.co.za/">Toltec Plug-in</a> by Radley Network Technologies CC.
 Radley has worked closely with the Kolab community to help develop the Kolab2 storage format.
 </p>
 
 <p>
 A list of additional Outlook plug-ins that provide interoperability with the Kolab server
-is <a href="https://kolab.org/clients#outlook">maintained on the Kolab website</a>.
+is <a href="http://kolab.org/clients#outlook">maintained on the Kolab website</a>.
 </p>
 
 <p>
-There was also a <a href="https://kolab.org/clients#roundcube">web-based client</a>
+There was also a <a href="http://kolab.org/clients#roundcube">web-based client</a>
 in development which provides full groupware functionality to mobile users through a web interface.
 It allows users to access their email, calendars, tasks, etc. from anywhere in the world,
 by simply connecting through a standard web browser. The web client would not have been
-possible without the excellent <a href="https://www.roundcube.net/">Roundcube project</a> on which to build.
+possible without the excellent <a href="http://www.roundcube.net/">Roundcube project</a> on which to build.
 </p>
 
 <p>
 As Kolab is a Free Software project, anyone can help to extend the functionality of the software.
 An active community has developed around the software with many people throughout the world contributing.
 The project was originally started in 2002 by a joint-venture of three companies:
-<a href="https://www.erfrakon.com/">erfrakon</a> (design, architecture and server);
-<a href="https://www.intevation.de">Intevation</a> (project management) and
-<a href="https://www.klaralvdalens-datakonsult.se/">Klar&auml;lvdalens Datakonsult</a> (client).
+<a href="http://www.erfrakon.com/">erfrakon</a> (design, architecture and server);
+<a href="http://www.intevation.de">Intevation</a> (project management) and
+<a href="http://www.klaralvdalens-datakonsult.se/">Klar&auml;lvdalens Datakonsult</a> (client).
 </p>
 
 <p>

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 ComposerAutoloaderInitd44907dcd6da784734afdb1f132b97ec
+class ComposerAutoloaderInit0016beb2f0c3d197ddcaa17ced2bbbfa
 {
     private static $loader;
 
@@ -24,9 +24,9 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInitd44907dcd6da784734afdb1f132b97ec', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit0016beb2f0c3d197ddcaa17ced2bbbfa', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInitd44907dcd6da784734afdb1f132b97ec', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit0016beb2f0c3d197ddcaa17ced2bbbfa', '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\ComposerStaticInitd44907dcd6da784734afdb1f132b97ec::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit0016beb2f0c3d197ddcaa17ced2bbbfa::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 ComposerStaticInitd44907dcd6da784734afdb1f132b97ec
+class ComposerStaticInit0016beb2f0c3d197ddcaa17ced2bbbfa
 {
     public static $prefixesPsr0 = array (
         'N' => 
@@ -237,9 +237,9 @@
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixesPsr0 = ComposerStaticInitd44907dcd6da784734afdb1f132b97ec::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInitd44907dcd6da784734afdb1f132b97ec::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInitd44907dcd6da784734afdb1f132b97ec::$classMap;
+            $loader->prefixesPsr0 = ComposerStaticInit0016beb2f0c3d197ddcaa17ced2bbbfa::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInit0016beb2f0c3d197ddcaa17ced2bbbfa::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInit0016beb2f0c3d197ddcaa17ced2bbbfa::$classMap;
 
         }, null, ClassLoader::class);
     }

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

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

@@ -7,13 +7,13 @@
             "source": {
                 "type": "git",
                 "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git",
-                "reference": "5a319cf437d75aad564ce7fd076cc5423722868b"
+                "reference": "6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a"
             },
             "require": {
                 "pear/net_ldap2": ">=2.0.12",
                 "php": ">=5.3.3"
             },
-            "time": "2023-06-07T08:32:15+00:00",
+            "time": "2023-01-21T11:19:47+00:00",
             "default-branch": true,
             "type": "library",
             "installation-source": "source",
@@ -107,35 +107,37 @@
         },
         {
             "name": "pear/http_request2",
-            "version": "v2.5.1",
-            "version_normalized": "2.5.1.0",
+            "version": "v2.3.0",
+            "version_normalized": "2.3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/HTTP_Request2.git",
-                "reference": "db4ce7844f838d3adca0513a77420c0fec22ed2d"
+                "reference": "3599cf0fe455a4e281da464f6510bfc5c2ce54c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/HTTP_Request2/zipball/db4ce7844f838d3adca0513a77420c0fec22ed2d",
-                "reference": "db4ce7844f838d3adca0513a77420c0fec22ed2d",
+                "url": "https://api.github.com/repos/pear/HTTP_Request2/zipball/3599cf0fe455a4e281da464f6510bfc5c2ce54c4",
+                "reference": "3599cf0fe455a4e281da464f6510bfc5c2ce54c4",
                 "shasum": ""
             },
             "require": {
                 "pear/net_url2": "^2.2.0",
                 "pear/pear_exception": "^1.0.0",
-                "php": ">=5.6.0"
-            },
-            "require-dev": {
-                "yoast/phpunit-polyfills": "^1.0.0"
+                "php": ">=5.2.0"
             },
             "suggest": {
-                "ext-curl": "Allows using cURL as a request backend.",
                 "ext-fileinfo": "Adds support for looking up mime-types using finfo.",
-                "ext-openssl": "Allows handling SSL requests when not using cURL.",
-                "ext-zlib": "Allows handling gzip compressed responses."
+                "ext-zlib": "Allows handling gzip compressed responses.",
+                "lib-curl": "Allows using cURL as a request backend.",
+                "lib-openssl": "Allows handling SSL requests when not using cURL."
             },
-            "time": "2022-01-06T18:20:25+00:00",
+            "time": "2016-02-13T20:20:39+00:00",
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-trunk": "2.2-dev"
+                }
+            },
             "installation-source": "dist",
             "autoload": {
                 "psr-0": {
@@ -143,6 +145,9 @@
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
+            "include-path": 
+                "./"
+            ,
             "license": 
                 "BSD-3-Clause"
             ,
@@ -153,7 +158,7 @@
                 }
             ,
             "description": "Provides an easy way to perform HTTP requests.",
-            "homepage": "https://pear.php.net/package/HTTP_Request2",
+            "homepage": "http://pear.php.net/package/HTTP_Request2",
             "keywords": 
                 "PEAR",
                 "curl",
@@ -161,8 +166,7 @@
                 "request"
             ,
             "support": {
-                "docs": "https://pear.php.net/manual/en/package.http.http-request2.php",
-                "issues": "https://github.com/pear/HTTP_Request2/issues",
+                "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name=HTTP_Request2",
                 "source": "https://github.com/pear/HTTP_Request2"
             },
             "install-path": "../pear/http_request2"

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

@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '46f21ed9ac58149729ddb843f964fc07811011e3',
+        'reference' => 'd2f531414aa7020909a419bc3bf2162ef88969a5',
         'name' => 'kolab/webadmin',
         'dev' => true,
     ),
@@ -18,7 +18,7 @@
             'aliases' => array(
                 0 => '9999999-dev',
             ),
-            'reference' => '5a319cf437d75aad564ce7fd076cc5423722868b',
+            'reference' => '6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a',
             'dev_requirement' => false,
         ),
         'kolab/webadmin' => array(
@@ -27,7 +27,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '46f21ed9ac58149729ddb843f964fc07811011e3',
+            'reference' => 'd2f531414aa7020909a419bc3bf2162ef88969a5',
             'dev_requirement' => false,
         ),
         'pear/console_getopt' => array(
@@ -40,12 +40,12 @@
             'dev_requirement' => false,
         ),
         'pear/http_request2' => array(
-            'pretty_version' => 'v2.5.1',
-            'version' => '2.5.1.0',
+            'pretty_version' => 'v2.3.0',
+            'version' => '2.3.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/http_request2',
             'aliases' => array(),
-            'reference' => 'db4ce7844f838d3adca0513a77420c0fec22ed2d',
+            'reference' => '3599cf0fe455a4e281da464f6510bfc5c2ce54c4',
             'dev_requirement' => false,
         ),
         'pear/mail' => array(

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

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 @@
-5a319cf437d75aad564ce7fd076cc5423722868b	refs/heads/master
-5a319cf437d75aad564ce7fd076cc5423722868b	refs/remotes/origin/HEAD
-5a319cf437d75aad564ce7fd076cc5423722868b	refs/remotes/origin/master
+6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a	refs/heads/master
+6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a	refs/remotes/origin/HEAD
+6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a	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,8 +23,6 @@
 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 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
+0000000000000000000000000000000000000000 6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a Christian Mollekopf <mollekopf@apheleia-it.ch> 1682347660 +0200	clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
+6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a 6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a Christian Mollekopf <mollekopf@apheleia-it.ch> 1682347660 +0200	checkout: moving from master to master
+6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a 6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a Christian Mollekopf <mollekopf@apheleia-it.ch> 1682347660 +0200	reset: moving to 6d44013d92e9aabcfa1fca6fee0ee8d9888a8d9a

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-c885a578207b2d2d8d2d19f7b0dedbb6f2c16071.idx Deleted

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

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

kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-e875ecaa35cf0127024509ed84dc8f9f5eaf4291.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 = 
-        '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'
-    ;
+    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"
+    );
 
     /*
      * Manipulate configuration through the config_set and config_get methods.
@@ -87,17 +87,16 @@
      *       'service_bind_pw' => 'Welcome2KolabSystems',
      *       'root_dn'         => 'dc=example,dc=org',
      */
-    protected $config = 
+    protected $config = array(
         '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      = ;
+    protected $icache      = array();
     protected $cache;
 
     // Use public method config_set('log_hook', $callback) to have $callback be
@@ -130,7 +129,7 @@
      * @param array $config Configuration parameters. After initialization use
      *                      the config_set() method.
      */
-    public function __construct($config = )
+    public function __construct($config = array())
     {
         if (!empty($config) && is_array($config)) {
             foreach ($config as $key => $value) {
@@ -151,7 +150,7 @@
     /**
      *  Add multiple entries to the directory information tree in one go.
      */
-    public function add_entries($entries, $attributes = )
+    public function add_entries($entries, $attributes = array())
     {
         // If $entries is an associative array, it's keys are DNs and its
         // values are the attributes for that DN.
@@ -159,7 +158,7 @@
         // If $entries is a non-associative array, the attributes are expected
         // to be positional in $attributes.
 
-        $result_set = ;
+        $result_set = array();
 
         if (array_keys($entries) == range(0, count($entries) - 1)) {
             // $entries is sequential
@@ -275,28 +274,28 @@
         // Then add the replication agreements
         foreach ($replica_hosts as $num => $replica_host) {
             $ldap = new Net_LDAP3($this->config);
-            $ldap->config_set('hosts', $replica_host);
+            $ldap->config_set('hosts', array($replica_host));
             $ldap->connect();
             $ldap->bind($this->_current_bind_dn, $this->_current_bind_pw);
 
-            $attrs = 
+            $attrs = array(
                 'nsDS5ReplicaBindDN',
                 'nsDS5ReplicaType',
                 'nsds5ReplicaPurgeDelay',
                 'nsDS5Flags'
-            ;
+            );
 
             $replica_attrs = $ldap->get_entry_attributes($replica_dn, $attrs);
-            $replica_attrs = array_merge((array) $replica_attrs, 
+            $replica_attrs = array_merge((array) $replica_attrs, array(
                 'cn' => 'replica',
-                'objectclass' => 
+                'objectclass' => array(
                     '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';
 
@@ -329,21 +328,19 @@
 
                 $this->_debug("Adding a replication agreement for $domain_root_dn to $replicate_to_host on " . $replica_host);
 
-                $attrs = 
+                $attrs = array(
                     'objectclass',
                     'nsDS5ReplicaBindDN',
                     'nsDS5ReplicaCredentials',
                     'nsDS5ReplicaTransportInfo',
-                    'nsDS5ReplicaBindMethod'
-                ;
-
-                list($host, $port) = strpos($replicate_to_host, ':') !== false ? explode(':', $replicate_to_host) : $replicate_to_host, 389;
+                    'nsDS5ReplicaBindMethod',
+                    'nsDS5ReplicaHost',
+                    'nsDS5ReplicaPort'
+                );
 
                 $replica_agreement_attrs = $ldap->get_entry_attributes($replica_agreement_tpl_dn, $attrs);
-                $replica_agreement_attrs'cn' = array_shift(explode('.', $replicate_to_host)) . str_replace('dc=', ',', '_', '', $domain_root_dn);
+                $replica_agreement_attrs'cn' = array_shift(explode('.', $replicate_to_host)) . str_replace(array('dc=',','), array('_',''), $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));
@@ -366,27 +363,27 @@
             foreach ($result->entries(true) as $agreement_dn => $agreement_attrs) {
                 $this->modify_entry_attributes(
                     $agreement_dn,
-                    
-                        'replace' => 
+                    array(
+                        'replace' => array(
                             'nsds5BeginReplicaRefresh' => 'start',
-                        ,
-                    
+                        ),
+                    )
                 );
             }
         }
     }
 
-    public function attribute_details($attributes = )
+    public function attribute_details($attributes = array())
     {
         $schema = $this->init_schema();
 
         if (!$schema) {
-            return ;
+            return array();
         }
 
         $attribs = $schema->getAll('attributes');
 
-        $attributes_details = ;
+        $attributes_details = array();
 
         foreach ($attributes as $attribute) {
             if (array_key_exists($attribute, $attribs)) {
@@ -418,18 +415,18 @@
             }
 
             // The relevant parts only, please
-            $attributes_details$attribute = 
+            $attributes_details$attribute = array(
                 '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 = )
+    public function attributes_allowed($objectclasses = array())
     {
         $this->_debug("Listing allowed_attributes for objectclasses", $objectclasses);
 
@@ -442,9 +439,9 @@
             return false;
         }
 
-        $may          = ;
-        $must         = ;
-        $superclasses = ;
+        $may          = array();
+        $must         = array();
+        $superclasses = array();
 
         foreach ($objectclasses as $objectclass) {
             $superclass = $schema->superclass($objectclass);
@@ -467,7 +464,7 @@
         $must         = array_unique($must);
         $superclasses = array_unique($superclasses);
 
-        return 'may' => $may, 'must' => $must, 'super' => $superclasses;
+        return array('may' => $may, 'must' => $must, 'super' => $superclasses);
     }
 
     public function classes_allowed()
@@ -478,7 +475,7 @@
         }
 
         $list    = $schema->getAll('objectclasses');
-        $classes = ;
+        $classes = array();
 
         foreach ($list as $class) {
             $classes = $class'name';
@@ -545,18 +542,17 @@
     public function config_get($key, $default = null)
     {
         if (!empty($this->_config_get_hook)) {
-            return call_user_func_array($this->_config_get_hook, $key, $value);
+            return call_user_func_array($this->_config_get_hook, array($key, $value));
         }
-
-        if (method_exists($this, "config_get_{$key}")) {
-            return call_user_func($this, "config_get_{$key}", $value);
+        else if (method_exists($this, "config_get_{$key}")) {
+            return call_user_func(array($this, "config_get_$key"), $value);
         }
-
-        if (!isset($this->config$key)) {
+        else if (!isset($this->config$key)) {
             return $default;
         }
-
-        return $this->config$key;
+        else {
+            return $this->config$key;
+        }
     }
 
     /**
@@ -575,10 +571,10 @@
         }
 
         if (!empty($this->_config_set_hook)) {
-            call_user_func($this->_config_set_hook, $key, $value);
+            call_user_func($this->_config_set_hook, array($key, $value));
         }
         else if (method_exists($this, "config_set_{$key}")) {
-            call_user_func_array($this, "config_set_{$key}", $value);
+            call_user_func_array(array($this, "config_set_$key"), array($value));
         }
         else if (property_exists($this, $key)) {
             $this->$key = $value;
@@ -609,14 +605,13 @@
             return true;
         }
 
-        $hosts = !empty($host) ? $host : $this->config_get('hosts', );
+        $hosts = !empty($host) ? $host : $this->config_get('hosts', array());
         $port  = $this->config_get('port', 389);
 
         foreach ((array) $hosts as $host) {
-            $ldap_uri = $this->_host2uri($host, $port);
-            $this->_debug("C: Connect {$ldap_uri}");
+            $this->_debug("C: Connect " . $host . (strpos($host, ':') ? '' : ":$port") . "");
 
-            if ($lc = @ldap_connect($ldap_uri)) {
+            if ($lc = @ldap_connect($host, $port)) {
                 if ($this->config_get('use_tls', false) === true) {
                     if (!ldap_start_tls($lc)) {
                         $this->_debug("S: Could not start TLS. " . ldap_error($lc));
@@ -640,7 +635,7 @@
                     ldap_set_option($lc, LDAP_OPT_REFERRALS, (bool) $referrals);
                 }
 
-                $this->_current_host = $ldap_uri;
+                $this->_current_host = $host;
                 $this->conn          = $lc;
 
                 break;
@@ -728,25 +723,23 @@
 
         if (PHP_VERSION_ID >= 70300) {
             // Note: This get_entry() have to request all attributes to be working
-            $result = $this->get_entry($entry_dn, '*', 
-                    
+            $result = $this->get_entry($entry_dn, array('*'), array(
+                    array(
                         'oid'        => self::CONTROL_EFFECTIVE_RIGHTS,
                         'value'      => 'dn:' . $this->_current_bind_dn,
                         'iscritical' => true,
-                    ,
-                );
+                    ),
+                ));
 
             if (!empty($result)) {
-                $attributes = 
+                $attributes = array(
                     'dn'                   => $entry_dn,
-                    'attributelevelrights' => ,
-                    'entrylevelrights'     => ,
-                ;
-
-                foreach ('aclrights', 'attributelevelrights', 'entrylevelrights' as $attr_name) {
-                    if (!empty($result$attr_name)) {
-                        $attr_value = $result$attr_name;
+                    'attributelevelrights' => array(),
+                    'entrylevelrights'     => array(),
+                );
 
+                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);
@@ -780,9 +773,6 @@
             $moz_ldapsearch = "/usr/lib/mozldap/ldapsearch";
         }
         if (!is_file($moz_ldapsearch)) {
-            $moz_ldapsearch = "/usr/bin/ldapsearch";
-        }
-        if (!is_file($moz_ldapsearch)) {
             $moz_ldapsearch = null;
         }
 
@@ -791,28 +781,23 @@
             return null;
         }
 
-        $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?
+        $output = array();
+        $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)
+            );
 
         if ($this->vendor_name() == "Oracle Corporation") {
             // For Oracle DSEE
@@ -820,10 +805,6 @@
             $command = escapeshellarg(self::CONTROL_EFFECTIVE_RIGHTS . ':true');
             $command = "-c";
             $command = escapeshellarg('dn:' . $this->_current_bind_dn);
-        } else if ($moz_ldapsearch == "/usr/bin/ldapsearch") {
-            // Modern 389 DS:
-            $command = "-E";
-            $command = escapeshellarg("!" . self::CONTROL_EFFECTIVE_RIGHTS . '=:dn:' . $this->_current_bind_dn);
         } else {
             // For 389 DS:
             $command = "-J";
@@ -858,7 +839,7 @@
             return null;
         }
 
-        $lines = ;
+        $lines = array();
         foreach ($output as $line_num => $line) {
             if (substr($line, 0, 1) == " ") {
                 $linescount($lines)-1 .= trim($line);
@@ -868,11 +849,11 @@
             }
         }
 
-        $attributes = 
+        $attributes = array(
             'dn'                   => $subject_dn,
-            'attributelevelrights' => ,
-            'entrylevelrights'     => ,
-        ;
+            'attributelevelrights' => array(),
+            'entrylevelrights'     => array(),
+        );
 
         if ($this->vendor_name() == "Oracle Corporation") {
             // Example for attribute level rights:
@@ -916,7 +897,7 @@
      *
      * @return string Entry DN string
      */
-    public function entry_dn($subject, $attributes = , $base_dn = null)
+    public function entry_dn($subject, $attributes = array(), $base_dn = null)
     {
         $this->_debug("Net_LDAP3::entry_dn($subject)");
         $is_dn = ldap_explode_dn($subject, 1);
@@ -937,7 +918,7 @@
 
         $this->_debug("Using unique_attribute " . var_export($unique_attr, true) . " at " . __FILE__ . ":" . __LINE__);
 
-        $attributes  = array_merge($unique_attr => $subject, (array) $attributes);
+        $attributes  = array_merge(array($unique_attr => $subject), (array)$attributes);
         $subject     = $this->entry_find_by_attribute($attributes, $base_dn);
 
         if (!empty($subject)) {
@@ -984,7 +965,7 @@
 
     public function find_user_groups($member_dn)
     {
-        $groups  = ;
+        $groups  = array();
         $root_dn = $this->config_get('root_dn');
 
         // TODO: Do not query for both, it's either one or the other
@@ -1021,7 +1002,7 @@
         $result = $this->get_entry($subject_dn, $attributes);
 
         if (!$result) {
-            return ;
+            return array();
         }
 
         if (!in_array('*', $attributes) && !in_array('dn', $attributes)) {
@@ -1041,7 +1022,7 @@
      *
      * @return array Hash array (keys in original case)
      */
-    public function get_entry($dn, $attributes = "*", $controls = )
+    public function get_entry($dn, $attributes = array("*"), $controls = array())
     {
         $rec = null;
 
@@ -1083,7 +1064,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', );
+        $replica_hosts = $this->config_get('replica_hosts', array());
         $root_dn       = $this->config_get('config_root_dn');
 
         if (!empty($replica_hosts)) {
@@ -1094,9 +1075,7 @@
         $ldap->connect();
         $ldap->bind($this->_current_bind_dn, $this->_current_bind_pw);
 
-        $host_attrs = 'nsds5replicahost', 'nsds5replicaport';
-
-        $result = $ldap->search($root_dn, '(objectclass=nsds5replicationagreement)', 'sub', $host_attrs);
+        $result = $ldap->search($root_dn, '(objectclass=nsds5replicationagreement)', 'sub', array('nsds5replicahost'));
 
         if (!$result) {
             $this->_debug("No replicas configured");
@@ -1106,9 +1085,8 @@
         $this->_debug("Replication agreements found: " . var_export($result->entries(true), true));
 
         foreach ($result->entries(true) as $dn => $attrs) {
-            $host = $attrs'nsds5replicahost' . ':' . !empty($attrs'nsds5replicaport') ? $attrs'nsds5replicaport' : 389;
-            if (!in_array($host, $replica_hosts)) {
-                $replica_hosts = $host;
+            if (!in_array($attrs'nsds5replicahost', $replica_hosts)) {
+                $replica_hosts = $attrs'nsds5replicahost';
             }
         }
 
@@ -1121,11 +1099,11 @@
         $ldap->close();
 
         foreach ($replica_hosts as $replica_host) {
-            $ldap->config_set('hosts', $replica_host);
+            $ldap->config_set('hosts', array($replica_host));
             $ldap->connect();
             $ldap->bind($this->_current_bind_dn, $this->_current_bind_pw);
 
-            $result = $ldap->search($root_dn, '(objectclass=nsds5replicationagreement)', 'sub', $host_attrs);
+            $result = $ldap->search($root_dn, '(objectclass=nsds5replicationagreement)', 'sub', array('nsds5replicahost'));
             if (!$result) {
                 $this->_debug("No replicas configured on $replica_host");
                 $ldap->close();
@@ -1133,9 +1111,8 @@
             }
 
             foreach ($result->entries(true) as $dn => $attrs) {
-                $host = $attrs'nsds5replicahost' . ':' . !empty($attrs'nsds5replicaport') ? $attrs'nsds5replicaport' : 389;
-                if (!in_array($host, $replica_hosts)) {
-                    $replica_hosts = $host;
+                if (!in_array($attrs'nsds5replicahost', $replica_hosts)) {
+                    $replica_hosts = $attrs'nsds5replicahost';
                 }
             }
 
@@ -1222,12 +1199,12 @@
 
         $this->_debug("Net::LDAP3::login() original filter: " . $filter);
 
-        $replace_patterns = 
+        $replace_patterns = array(
             '/%s/' => $username,
             '/%d/' => $domain,
             '/%U/' => $localpart,
             '/%r/' => $realm
-        ;
+        );
 
         $filter = preg_replace(array_keys($replace_patterns), array_values($replace_patterns), $filter);
 
@@ -1272,20 +1249,20 @@
         $this->_debug("Net_LDAP3::list_group_members($dn)");
 
         if (is_array($entry) && in_array('objectclass', $entry)) {
-            if (!in_array('groupofnames', 'groupofuniquenames', 'groupofurls', $entry'objectclass')) {
+            if (!in_array(array('groupofnames', 'groupofuniquenames', 'groupofurls'), $entry'objectclass')) {
                 $this->_debug("Called list_group_members on a non-group!");
-                return ;
+                return array();
             }
         }
         else {
-            $entry = $this->get_entry_attributes($dn, 'member', 'uniquemember', 'memberurl', 'objectclass');
+            $entry = $this->get_entry_attributes($dn, array('member', 'uniquemember', 'memberurl', 'objectclass'));
 
             if (!$entry) {
-                return ;
+                return array();
             }
         }
 
-        $group_members = ;
+        $group_members = array();
 
         foreach ((array)$entry'objectclass' as $objectclass) {
             switch (strtolower($objectclass)) {
@@ -1318,19 +1295,17 @@
 
         $this->_debug("Net_LDAP3::modify_entry() using rdn attribute: " . $rdn_attr);
 
-        $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()
-        ;
+        $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()
+        );
 
         // This is me cheating. Remove this special attribute.
         if (array_key_exists('ou', $old_attrs) || array_key_exists('ou', $new_attrs)) {
-            $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);
+            $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';
             unset($old_attrs'ou');
             unset($new_attrs'ou');
         }
@@ -1379,7 +1354,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 = ;
+                                    $_attr_to_remove = array();
 
                                     foreach ($old_attrs$attr as $value) {
                                         if (strtolower($value) != strtolower($new_attrs$attr)) {
@@ -1631,7 +1606,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 = 'dn', $props = , $count_only = false)
+    public function search($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $attrs = array('dn'), $props = array(), $count_only = false)
     {
         $controls = null;
 
@@ -1646,7 +1621,7 @@
 
         // make sure attributes list is not empty
         if (empty($attrs)) {
-            $attrs = 'dn';
+            $attrs = array('dn');
         }
         // make sure filter is not empty
         if (empty($filter)) {
@@ -1661,7 +1636,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, 'numSubOrdinates', 0, 0, 0))
+                ($result_count = @$ns_function($this->conn, $base_dn, $sub_filter, array('numSubOrdinates'), 0, 0, 0))
             ) {
                 $counts = ldap_get_entries($this->conn, $result_count);
                 for ($vlv_count = $j = 0; $j < $counts'count'; $j++) {
@@ -1673,7 +1648,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, 'dn', $props, true);
+                $vlv_count = $this->search($base_dn, $filter, $scope, array('dn'), $props, true);
             }
 
             $controls = $this->_vlv_set_controls($sort, $this->list_page, $this->page_size,
@@ -1772,7 +1747,7 @@
      *
      * @see Net_LDAP3::search()
      */
-    public function search_entries($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $attrs = 'dn', $props = )
+    public function search_entries($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $attrs = array('dn'), $props = array())
     {
         $this->_debug("Net_LDAP3::search_entries with search " . var_export($props, true));
 
@@ -1817,14 +1792,13 @@
             return null;
         }
 
-        $operators = '=', '~=', '>=', '<=';
+        $operators = array('=', '~=', '>=', '<=');
         $filter    = '';
 
         foreach ((array) $search'params' as $field => $param) {
             $value = (array) $param'value';
-            $type = isset($param'type') ? strval($param'type') : null;
 
-            switch ($type) {
+            switch ((string)$param'type') {
                 case 'prefix':
                     $prefix = '';
                     $suffix = '*';
@@ -1846,7 +1820,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('Net_LDAP3', 'unified_dn', $value);
+                        $value = array_map(array('Net_LDAP3', 'unified_dn'), $value);
                     }
 
                     break;
@@ -1864,14 +1838,14 @@
                     break;
             }
 
-            $operator = $type && in_array($type, $operators) ? $type : '=';
+            $operator = $param'type' && in_array($param'type', $operators) ? $param'type' : '=';
 
             if (count($value) < 2) {
                 $value = array_pop($value);
             }
 
             if (is_array($value)) {
-                $val_filter = ;
+                $val_filter = array();
                 foreach ($value as $val) {
                     $val          = self::quote_string($val);
                     $val_filter = "(" . $field . $operator . $prefix . $val . $suffix . ")";
@@ -1885,9 +1859,8 @@
         }
 
         // join search parameters with specified operator ('OR' or 'AND')
-        if (!empty($search'params') && count($search'params') > 1) {
-            $operator = !empty($search'operator') && $search'operator' == 'AND' ? '&' : '|';
-            $filter = '(' . $operator . $filter . ')';
+        if (count($search'params') > 1) {
+            $filter = '(' . ($search'operator' == 'AND' ? '&' : '|') . $filter . ')';
         }
 
         return $filter;
@@ -1915,7 +1888,7 @@
      */
     public static function normalize_entry($entry, $flat = false)
     {
-        $rec = ;
+        $rec = array();
 
         for ($i=0; $i < $entry'count'; $i++) {
             $attr = $entry$i;
@@ -1939,10 +1912,10 @@
     public static function normalize_result($_result)
     {
         if (!is_array($_result)) {
-            return ;
+            return array();
         }
 
-        $result = ;
+        $result = array();
 
         for ($x = 0; $x < $_result'count'; $x++) {
             $dn    = $_result$x'dn';
@@ -2147,12 +2120,12 @@
             return $this->_vlv_indexes_and_searches;
         }
 
-        $this->_vlv_indexes_and_searches = ;
+        $this->_vlv_indexes_and_searches = array();
 
         $config_root_dn = $this->config_get('config_root_dn');
 
         if (empty($config_root_dn)) {
-            return ;
+            return array();
         }
 
         if ($cached_config = $this->get_cache_data('vlvconfig')) {
@@ -2165,11 +2138,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, '*', 0, 0, 0);
+        $search_result = ldap_search($this->conn, $config_root_dn, $search_filter, array('*'), 0, 0, 0);
 
         if ($search_result === false) {
             $this->_debug("S: " . ldap_error($this->conn));
-            return ;
+            return array();
         }
 
         $this->_debug("S: " . ldap_count_entries($this->conn, $search_result) . " record(s) found");
@@ -2177,7 +2150,7 @@
         $vlv_searches = new Net_LDAP3_Result($this->conn, $config_root_dn, $search_filter, 'sub', $search_result);
 
         if ($vlv_searches->count() < 1) {
-            return ;
+            return array();
         }
 
         foreach ($vlv_searches->entries(true) as $vlv_search_dn => $vlv_search_attrs) {
@@ -2189,7 +2162,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, '*', 0, 0, 0);
+            $index_result = ldap_search($this->conn, $vlv_search_dn, $index_filter, array('*'), 0, 0, 0);
 
             if ($index_result === false) {
                 $this->_debug("S: " . ldap_error($this->conn));
@@ -2202,19 +2175,19 @@
             $vlv_indexes = $vlv_indexes->entries(true);
 
             // Reset this one for each VLV search.
-            $_vlv_sort = ;
+            $_vlv_sort = array();
 
             foreach ($vlv_indexes as $vlv_index_dn => $vlv_index_attrs) {
                 $_vlv_sort = explode(' ', trim($vlv_index_attrs'vlvsort'));
             }
 
-            $this->_vlv_indexes_and_searches = 
-                $_vlv_base_dn => 
+            $this->_vlv_indexes_and_searches = array(
+                $_vlv_base_dn => array(
                     'scope'  => self::scopeint2str($_vlv_scope),
                     'filter' => strtolower($_vlv_filter),
                     'sort'   => $_vlv_sort,
-                ,
-            ;
+                ),
+            );
         }
 
         // cache this
@@ -2234,26 +2207,22 @@
         $tls  = $this->config_get('use_tls', false);
 
         foreach ((array) $this->config_get('hosts') as $host) {
-            $ldap_uri = $this->_host2uri($host, $port);
-            $this->_debug("C: Connect {$ldap_uri}");
+            $this->_debug("C: Connect $host:$port");
 
-            $_ldap_cfg = 
+            $_ldap_cfg = array(
                 '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 = 
+            $_ldap_schema_cache_cfg = array(
                 'max_age' => 86400,
-                'path' => sprintf(
-                    '%s/%s-Net_LDAP2_Schema.cache',
-                    sys_get_temp_dir() ?: '/tmp',
-                    str_replace('://', '/', ':', $ldap_uri)
-                ),
-            ;
+                'path' => sprintf('%s/%s-Net_LDAP2_Schema.cache',
+                    sys_get_temp_dir() ?: '/tmp', str_replace('://', ':', $host) . (strpos($host, ":$port") ? '' : ":$port")),
+            );
 
             $_ldap = Net_LDAP2::connect($_ldap_cfg);
 
@@ -2290,7 +2259,7 @@
         $this->_debug("Net_LDAP3::list_group_member($dn)");
 
         $members       = (array) $members;
-        $group_members = ;
+        $group_members = array();
 
         // remove possible 'count' item
         unset($members'count');
@@ -2298,7 +2267,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, 'member', 'uniquemember', 'memberurl', 'objectclass');
+            $member_entry = $this->get_entry_attributes($member, array('member', 'uniquemember', 'memberurl', 'objectclass'));
 
             if (empty($member_entry)) {
                 continue;
@@ -2322,14 +2291,14 @@
     {
         $this->_debug("Net_LDAP3::list_group_uniquemember($dn)", $entry);
 
-        $uniquemembers = (array) $uniquemembers;
-        $group_members = ;
+        $uniquemembers = (array)($uniquemembers);
+        $group_members = array();
 
         // remove possible 'count' item
         unset($uniquemembers'count');
 
         foreach ($uniquemembers as $member) {
-            $member_entry = $this->get_entry_attributes($member, 'member', 'uniquemember', 'memberurl', 'objectclass');
+            $member_entry = $this->get_entry_attributes($member, array('member', 'uniquemember', 'memberurl', 'objectclass'));
 
             if (empty($member_entry)) {
                 continue;
@@ -2353,9 +2322,9 @@
     {
         $this->_debug("Net_LDAP3::list_group_memberurl($dn)");
 
-        $group_members = ;
+        $group_members = array();
         $memberurls    = (array) $memberurls;
-        $attributes    = 'member', 'uniquemember', 'memberurl', 'objectclass';
+        $attributes    = array('member', 'uniquemember', 'memberurl', 'objectclass');
 
         // remove possible 'count' item
         unset($memberurls'count');
@@ -2370,7 +2339,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
@@ -2502,7 +2471,7 @@
 
         switch ($_acl_components1) {
             case "entryLevel":
-                $attributes'entrylevelrights' = ;
+                $attributes'entrylevelrights' = Array();
                 $_acl_value = explode(',', $_acl_value);
 
                 foreach ($_acl_value as $right) {
@@ -2515,7 +2484,7 @@
                 break;
 
             case "attributeLevel":
-                $attributes'attributelevelrights'$_acl_components2 = ;
+                $attributes'attributelevelrights'$_acl_components2 = Array();
                 $_acl_value = explode(',', $_acl_value);
 
                 foreach ($_acl_value as $right) {
@@ -2536,14 +2505,14 @@
     {
         $attribute_value  = str_replace(", ", ",", $attribute_value);
         $attribute_values = explode(",", $attribute_value);
-        $attribute_value  = ;
+        $attribute_value  = array();
 
         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 = ;
+            $attribute_value$access_attribute = array();
 
             for ($i = 0; $i < strlen($access_value); $i++) {
                 $method = $this->attribute_level_rights_mapsubstr($access_value, $i, 1);
@@ -2559,7 +2528,7 @@
 
     protected function parse_entry_level_rights($attribute_value)
     {
-        $_attribute_value = ;
+        $_attribute_value = array();
 
         for ($i = 0; $i < strlen($attribute_value); $i++) {
             $method = $this->entry_level_rights_mapsubstr($attribute_value, $i, 1);
@@ -2591,14 +2560,14 @@
         if ($this->_metadata === null) {
             $this->_debug("Obtaining LDAP server metadata");
 
-            $result = $this->get_entry('', 'vendorname', 'supportedcontrol');
+            $result = $this->get_entry('', array('vendorname', 'supportedcontrol'));
 
             if ($result) {
                 $this->_metadata = $result;
                 $this->_debug("LDAP Server metadata: " . var_export($result, true));
             }
             else {
-                $this->_metadata = ;
+                $this->_metadata = array();
                 $this->_warning("LDAP: Failed to get server metadata");
             }
         }
@@ -2651,14 +2620,14 @@
      */
     private function __log($level, $args)
     {
-        $msg = ;
+        $msg = array();
 
         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, $level, $msg);
+            call_user_func_array($this->_log_hook, array($level, $msg));
             return;
         }
 
@@ -2697,7 +2666,7 @@
         }
 
         if ($is_dn) {
-            $replace = 
+            $replace = array(
                 ',' => '\2c',
                 '=' => '\3d',
                 '+' => '\2b',
@@ -2707,16 +2676,16 @@
                 "\\"=> '\5c',
                 '"' => '\22',
                 '#' => '\23'
-            ;
+            );
         }
         else {
-            $replace = 
+            $replace = array(
                 '*' => '\2a',
                 '(' => '\28',
                 ')' => '\29',
                 "\\" => '\5c',
                 '/' => '\2f'
-            ;
+            );
         }
 
         if ($reverse) {
@@ -2735,10 +2704,10 @@
      */
     public static function unified_dn($str)
     {
-        $result = ;
+        $result = array();
 
         foreach (explode(',', $str) as $token) {
-            list($attr, $value) = strpos($token, '=') !== false ? explode('=', $token, 2) : $token, '';
+            list($attr, $value) = explode('=', $token, 2);
 
             $pos = 0;
             while (preg_match('/\\\\0-9a-fA-F{2}/', $value, $matches, PREG_OFFSET_CAPTURE, $pos)) {
@@ -2818,16 +2787,16 @@
      */
     private function _vlv_set_controls($sort, $list_page, $page_size, $search = null)
     {
-        $sort_ctrl = 
+        $sort_ctrl = array(
             '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  = 
+        $vlv_ctrl  = array(
             'oid' => self::CONTROL_VLV_REQUEST,
             'value' => self::_vlv_ber_encode(
                     $offset = ($list_page-1) * $page_size + 1,
@@ -2835,13 +2804,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 = $sort_ctrl, $vlv_ctrl;
+        $controls = array($sort_ctrl, $vlv_ctrl);
 
         if (PHP_VERSION_ID >= 70305) {
             return $controls;
@@ -2983,26 +2952,6 @@
     }
 
     /**
-     * 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
@@ -3036,7 +2985,7 @@
                     }
 
                     $this->mc_available += intval($this->cache->addServer(
-                        $host, $port, $pconnect, 1, 1, 15, false, $this, 'memcache_failure'));
+                        $host, $port, $pconnect, 1, 1, 15, false, array($this, 'memcache_failure')));
                 }
 
                 // test connection and failover (will result in $this->mc_available == 0 on complete failure)
@@ -3056,7 +3005,7 @@
      */
     public function memcache_failure($host, $port)
     {
-        static $seen = ;
+        static $seen = array();
 
         // only report once
         if (!$seen"$host:$port"++) {
@@ -3162,7 +3111,7 @@
      *
      * @return array|bool Domain attributes (plus 'dn' attribute) or False if not found
      */
-    public function find_domain($domain, $attributes = '*')
+    public function find_domain($domain, $attributes = array('*'))
     {
         if (empty($domain)) {
             return false;

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/.travis.yml Added

@@ -0,0 +1,34 @@
+language: php
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+install: pear install Net_URL2
+addons:
+  hosts:
+    - hr2.local
+    - www.hr2.local
+before_script:
+  # directory for apache logs
+  - mkdir -p $TRAVIS_BUILD_DIR/logs
+  # As described @ http://docs.travis-ci.com/user/languages/php/#Apache-%2B-PHP
+  - sudo apt-get update
+  - sudo apt-get install apache2 libapache2-mod-php5
+  #- sudo apt-get install apache2 libapache2-mod-fastcgi
+  # enable php-fpm
+  #- sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
+  #- sudo a2enmod rewrite actions fastcgi alias
+  #- echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  #- ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
+  # configure apache virtual hosts
+  - sudo cp -f tests/travis-ci-apache /etc/apache2/sites-available/default
+  - sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
+  - sudo service apache2 restart
+  # use travis config for network-backed tests
+  - cp tests/NetworkConfig.php.travis tests/NetworkConfig.php
+script: phpunit tests
+after_failure:
+  - cat $TRAVIS_BUILD_DIR/logs/hr2-error.log
+  - cat $TRAVIS_BUILD_DIR/logs/hr2-access.log

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/Changelog.md Deleted

@@ -1,53 +0,0 @@
-# Changelog
-
-## 2.5.1 - 2022-01-06
-
-* The package runs under PHP 8.1 without `E_DEPRECATED` messages (see issue #25)
-* Updated Public Suffix List
-
-## 2.5.0 - 2021-07-12
-
-### Fixed
-* Socket adapter will now retry writing to socket rather than throw an exception if `fwrite()` call returns zero written bytes (issue #23)
-
-### Changed
-* Socket adapter will use only TLS 1.2 and TLS 1.3 (the latter is available on PHP 7.4+) 
-* Upgraded tests for PHPUnit 9 compatibility, PHPUnit Polyfills package is used to run them on PHP 5.6 to PHP 8
-* Test suite now runs on Github Actions rather than on Travis
-* Updated Public Suffix List
-
-## 2.4.2 - 2020-09-24
-### Fixed
-Socket adapter could prematurely end receiving the response body due to `fread()` call returning an empty string
-
-## 2.4.1 - 2020-08-01
-### Fixed
-* Switch socket to blocking mode when enabling crypto, this fixes HTTPS requests
-  through proxy with Socket adapter (issue #20)
-* Add `.gitattributes` file to omit installing tests (issue #19)
-
-## 2.4.0 - 2020-07-26
-
-* Minimum required version is now PHP 5.6, as using older versions for HTTPS
-  requests may be insecure
-* Removed support for magic_quotes_runtime, as get_magic_quotes_runtime()
-  was deprecated in PHP 7.4 and the functionality itself was disabled 
-  since PHP 5.4 (PEAR bug #23839)
-* Socket adapter now uses socket in non-blocking mode, as some configurations
-  could have problems with timeouts in HTTPS requests (PEAR bug #21229)
-* Fixed bogus size check error with gzipped responses larger than 4 GiB
-  uncompressed (PEAR bug #21239)
-* Use current "Intermediate compatibility" cipher list
-* Updated Public Suffix List
-
-The package is now 100% autoload-compatible, when installed with composer it
-no longer uses include-path and does not contain require_once statements
-
-PEAR bug #23839: https://pear.php.net/bugs/bug.php?id=23839
-PEAR bug #21229: https://pear.php.net/bugs/bug.php?id=21229
-PEAR bug #21239: https://pear.php.net/bugs/bug.php?id=21239
-PHPUnit Polyfills package: https://github.com/Yoast/PHPUnit-Polyfills
-issue #19: https://github.com/pear/HTTP_Request2/issues/19
-issue #20: https://github.com/pear/HTTP_Request2/issues/20
-issue #23: https://github.com/pear/HTTP_Request2/issues/23
-issue #25: https://github.com/pear/HTTP_Request2/issues/25
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/HTTP/Request2.php Changed

@@ -13,20 +13,22 @@
  * @category  HTTP
  * @package   HTTP_Request2
  * @author    Alexey Borzov <avb@php.net>
- * @copyright 2008-2022 Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
  * @link      http://pear.php.net/package/HTTP_Request2
  */
 
-// pear-package-only /**
-// pear-package-only  * A class representing an URL as per RFC 3986.
-// pear-package-only  */
-// pear-package-only require_once 'Net/URL2.php';
+/**
+ * A class representing an URL as per RFC 3986.
+ */
+if (!class_exists('Net_URL2', true)) {
+    require_once 'Net/URL2.php';
+}
 
-// pear-package-only /**
-// pear-package-only  * Exception class for HTTP_Request2 package
-// pear-package-only  */
-// pear-package-only require_once 'HTTP/Request2/Exception.php';
+/**
+ * Exception class for HTTP_Request2 package
+ */
+require_once 'HTTP/Request2/Exception.php';
 
 /**
  * Class representing a HTTP request message
@@ -41,8 +43,7 @@
  */
 class HTTP_Request2 implements SplSubject
 {
-    /**
-     * #@+
+    /**#@+
      * Constants for HTTP request methods
      *
      * @link http://tools.ietf.org/html/rfc2616#section-5.1.1
@@ -55,32 +56,25 @@
     const METHOD_DELETE  = 'DELETE';
     const METHOD_TRACE   = 'TRACE';
     const METHOD_CONNECT = 'CONNECT';
-    /**
-     * #@-
-     */
+    /**#@-*/
 
-    /**
-     * #@+
+    /**#@+
      * Constants for HTTP authentication schemes
      *
      * @link http://tools.ietf.org/html/rfc2617
      */
     const AUTH_BASIC  = 'basic';
     const AUTH_DIGEST = 'digest';
-    /**
-     * #@-
-     */
+    /**#@-*/
 
     /**
      * Regular expression used to check for invalid symbols in RFC 2616 tokens
-     *
      * @link http://pear.php.net/bugs/bug.php?id=15630
      */
     const REGEXP_INVALID_TOKEN = '!\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\\?={}\s!';
 
     /**
      * Regular expression used to check for invalid symbols in cookie strings
-     *
      * @link http://pear.php.net/bugs/bug.php?id=15630
      * @link http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
      */
@@ -88,55 +82,48 @@
 
     /**
      * Fileinfo magic database resource
-     *
-     * @var resource
-     * @see detectMimeType()
+     * @var  resource
+     * @see  detectMimeType()
      */
     private static $_fileinfoDb;
 
     /**
      * Observers attached to the request (instances of SplObserver)
-     *
-     * @var array
+     * @var  array
      */
-    protected $observers = ;
+    protected $observers = array();
 
     /**
      * Request URL
-     *
-     * @var Net_URL2
+     * @var  Net_URL2
      */
     protected $url;
 
     /**
      * Request method
-     *
-     * @var string
+     * @var  string
      */
     protected $method = self::METHOD_GET;
 
     /**
      * Authentication data
-     *
-     * @var array
-     * @see getAuth()
+     * @var  array
+     * @see  getAuth()
      */
     protected $auth;
 
     /**
      * Request headers
-     *
-     * @var array
+     * @var  array
      */
-    protected $headers = ;
+    protected $headers = array();
 
     /**
      * Configuration parameters
-     *
-     * @var array
-     * @see setConfig()
+     * @var  array
+     * @see  setConfig()
      */
-    protected $config = 
+    protected $config = array(
         'adapter'           => 'HTTP_Request2_Adapter_Socket',
         'connect_timeout'   => 10,
         'timeout'           => 0,
@@ -165,51 +152,45 @@
         'follow_redirects'  => false,
         'max_redirects'     => 5,
         'strict_redirects'  => false
-    ;
+    );
 
     /**
      * Last event in request / response handling, intended for observers
-     *
-     * @var array
-     * @see getLastEvent()
+     * @var  array
+     * @see  getLastEvent()
      */
-    protected $lastEvent = 
+    protected $lastEvent = array(
         'name' => 'start',
         'data' => null
-    ;
+    );
 
     /**
      * Request body
-     *
-     * @var string|resource
-     * @see setBody()
+     * @var  string|resource
+     * @see  setBody()
      */
     protected $body = '';
 
     /**
      * Array of POST parameters
-     *
-     * @var array
+     * @var  array
      */
-    protected $postParams = ;
+    protected $postParams = array();
 
     /**
      * Array of file uploads (for multipart/form-data POST requests)
-     *
-     * @var array
+     * @var  array
      */
-    protected $uploads = ;
+    protected $uploads = array();
 
     /**
      * Adapter used to perform actual HTTP request
-     *
-     * @var HTTP_Request2_Adapter
+     * @var  HTTP_Request2_Adapter
      */
     protected $adapter;
 
     /**
      * Cookie jar to persist cookies between requests
-     *
      * @var HTTP_Request2_CookieJar
      */
     protected $cookieJar = null;
@@ -224,7 +205,7 @@
      * @param array           $config Configuration for this Request instance
      */
     public function __construct(
-        $url = null, $method = self::METHOD_GET, array $config = 
+        $url = null, $method = self::METHOD_GET, array $config = array()
     ) {
         $this->setConfig($config);
         if (!empty($url)) {
@@ -234,8 +215,8 @@
             $this->setMethod($method);
         }
         $this->setHeader(
-            'user-agent', 'HTTP_Request2/2.5.1 ' .
-            '(https://github.com/pear/HTTP_Request2) PHP/' . phpversion()
+            'user-agent', 'HTTP_Request2/@package_version@ ' .
+            '(http://pear.php.net/package/http_request2) PHP/' . phpversion()
         );
     }
 
@@ -248,14 +229,14 @@
      *
      * @param string|Net_URL2 $url Request URL
      *
-     * @return $this
-     * @throws HTTP_Request2_LogicException
+     * @return   HTTP_Request2
+     * @throws   HTTP_Request2_LogicException
      */
     public function setUrl($url)
     {
         if (is_string($url)) {
             $url = new Net_URL2(
-                $url, Net_URL2::OPTION_USE_BRACKETS => $this->config'use_brackets'
+                $url, array(Net_URL2::OPTION_USE_BRACKETS => $this->config'use_brackets')
             );
         }
         if (!$url instanceof Net_URL2) {
@@ -282,7 +263,7 @@
     /**
      * Returns the request URL
      *
-     * @return Net_URL2
+     * @return   Net_URL2
      */
     public function getUrl()
     {
@@ -294,8 +275,8 @@
      *
      * @param string $method one of the methods defined in RFC 2616
      *
-     * @return $this
-     * @throws HTTP_Request2_LogicException if the method name is invalid
+     * @return   HTTP_Request2
+     * @throws   HTTP_Request2_LogicException if the method name is invalid
      */
     public function setMethod($method)
     {
@@ -314,7 +295,7 @@
     /**
      * Returns the request method
      *
-     * @return string
+     * @return   string
      */
     public function getMethod()
     {
@@ -372,8 +353,8 @@
      *                                   ('parameter name' => 'parameter value')
      * @param mixed        $value        parameter value if $nameOrConfig is not an array
      *
-     * @return $this
-     * @throws HTTP_Request2_LogicException If the parameter is unknown
+     * @return   HTTP_Request2
+     * @throws   HTTP_Request2_LogicException If the parameter is unknown
      */
     public function setConfig($nameOrConfig, $value = null)
     {
@@ -384,15 +365,13 @@
 
         } elseif ('proxy' == $nameOrConfig) {
             $url = new Net_URL2($value);
-            $this->setConfig(
-                
-                    'proxy_type'     => $url->getScheme(),
-                    'proxy_host'     => $url->getHost(),
-                    'proxy_port'     => $url->getPort(),
-                    'proxy_user'     => rawurldecode($url->getUser()),
-                    'proxy_password' => rawurldecode($url->getPassword())
-                
-            );
+            $this->setConfig(array(
+                'proxy_type'     => $url->getScheme(),
+                'proxy_host'     => $url->getHost(),
+                'proxy_port'     => $url->getPort(),
+                'proxy_user'     => rawurldecode($url->getUser()),
+                'proxy_password' => rawurldecode($url->getPassword())
+            ));
 
         } else {
             if (!array_key_exists($nameOrConfig, $this->config)) {
@@ -412,9 +391,9 @@
      *
      * @param string $name parameter name
      *
-     * @return mixed   value of $name parameter, array of all configuration
+     * @return   mixed   value of $name parameter, array of all configuration
      *                   parameters if $name is not given
-     * @throws HTTP_Request2_LogicException If the parameter is unknown
+     * @throws   HTTP_Request2_LogicException If the parameter is unknown
      */
     public function getConfig($name = null)
     {
@@ -430,24 +409,24 @@
     }
 
     /**
-     * Sets the authentication data
+     * Sets the autentification data
      *
      * @param string $user     user name
      * @param string $password password
      * @param string $scheme   authentication scheme
      *
-     * @return $this
+     * @return   HTTP_Request2
      */
     public function setAuth($user, $password = '', $scheme = self::AUTH_BASIC)
     {
         if (empty($user)) {
             $this->auth = null;
         } else {
-            $this->auth = 
+            $this->auth = array(
                 'user'     => (string)$user,
                 'password' => (string)$password,
                 'scheme'   => $scheme
-            ;
+            );
         }
 
         return $this;
@@ -459,7 +438,7 @@
      * The array has the keys 'user', 'password' and 'scheme', where 'scheme'
      * is one of the HTTP_Request2::AUTH_* constants.
      *
-     * @return array
+     * @return   array
      */
     public function getAuth()
     {
@@ -491,8 +470,8 @@
      * @param bool              $replace whether to replace previous header with the
      *                                   same name or append to its value
      *
-     * @return $this
-     * @throws HTTP_Request2_LogicException
+     * @return   HTTP_Request2
+     * @throws   HTTP_Request2_LogicException
      */
     public function setHeader($name, $value = null, $replace = true)
     {
@@ -543,7 +522,7 @@
      * The array is of the form ('header name' => 'header value'), header names
      * are lowercased
      *
-     * @return array
+     * @return   array
      */
     public function getHeaders()
     {
@@ -564,15 +543,15 @@
      * @param string $name  cookie name
      * @param string $value cookie value
      *
-     * @return $this
-     * @throws HTTP_Request2_LogicException
-     * @see    setCookieJar()
+     * @return   HTTP_Request2
+     * @throws   HTTP_Request2_LogicException
+     * @see      setCookieJar()
      */
     public function addCookie($name, $value)
     {
         if (!empty($this->cookieJar)) {
             $this->cookieJar->store(
-                'name' => $name, 'value' => $value, $this->url
+                array('name' => $name, 'value' => $value), $this->url
             );
 
         } else {
@@ -597,13 +576,13 @@
      * fstat() and rewind() operations.
      *
      * @param string|resource|HTTP_Request2_MultipartBody $body       Either a
-     *                                                                string with the body or filename containing body or
-     *                                                                pointer to an open file or object with multipart body data
+     *               string with the body or filename containing body or
+     *               pointer to an open file or object with multipart body data
      * @param bool                                        $isFilename Whether
-     *                                                                first parameter is a filename
+     *               first parameter is a filename
      *
-     * @return $this
-     * @throws HTTP_Request2_LogicException
+     * @return   HTTP_Request2
+     * @throws   HTTP_Request2_LogicException
      */
     public function setBody($body, $isFilename = false)
     {
@@ -620,7 +599,7 @@
                 $this->setHeader('content-type', $fileData'type');
             }
         }
-        $this->postParams = $this->uploads = ;
+        $this->postParams = $this->uploads = array();
 
         return $this;
     }
@@ -628,7 +607,7 @@
     /**
      * Returns the request body
      *
-     * @return string|resource|HTTP_Request2_MultipartBody
+     * @return   string|resource|HTTP_Request2_MultipartBody
      */
     public function getBody()
     {
@@ -644,7 +623,7 @@
                 return str_replace('%7E', '~', $body);
 
             } elseif (0 === strpos($this->headers'content-type', 'multipart/form-data')) {
-                // pear-package-only require_once 'HTTP/Request2/MultipartBody.php';
+                require_once 'HTTP/Request2/MultipartBody.php';
                 return new HTTP_Request2_MultipartBody(
                     $this->postParams, $this->uploads, $this->getConfig('use_brackets')
                 );
@@ -667,30 +646,30 @@
      *
      * @param string                $fieldName    name of file-upload field
      * @param string|resource|array $filename     full name of local file,
-     *                                            pointer to open file or an array of files
+     *               pointer to open file or an array of files
      * @param string                $sendFilename filename to send in the request
      * @param string                $contentType  content-type of file being uploaded
      *
-     * @return $this
-     * @throws HTTP_Request2_LogicException
+     * @return   HTTP_Request2
+     * @throws   HTTP_Request2_LogicException
      */
     public function addUpload(
         $fieldName, $filename, $sendFilename = null, $contentType = null
     ) {
         if (!is_array($filename)) {
             $fileData = $this->fopenWrapper($filename, empty($contentType));
-            $this->uploads$fieldName = 
+            $this->uploads$fieldName = array(
                 'fp'        => $fileData'fp',
                 'filename'  => !empty($sendFilename)? $sendFilename
                                 :(is_string($filename)? basename($filename): 'anonymous.blob') ,
                 'size'      => $fileData'size',
                 'type'      => empty($contentType)? $fileData'type': $contentType
-            ;
+            );
         } else {
-            $fps = $names = $sizes = $types = ;
+            $fps = $names = $sizes = $types = array();
             foreach ($filename as $f) {
                 if (!is_array($f)) {
-                    $f = $f;
+                    $f = array($f);
                 }
                 $fileData = $this->fopenWrapper($f0, empty($f2));
                 $fps   = $fileData'fp';
@@ -699,9 +678,9 @@
                 $sizes = $fileData'size';
                 $types = empty($f2)? $fileData'type': $f2;
             }
-            $this->uploads$fieldName = 
+            $this->uploads$fieldName = array(
                 'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types
-            ;
+            );
         }
         if (empty($this->headers'content-type')
             || 'application/x-www-form-urlencoded' == $this->headers'content-type'
@@ -718,7 +697,7 @@
      * @param string|array $name  parameter name or array ('name' => 'value')
      * @param mixed        $value parameter value (can be an array)
      *
-     * @return $this
+     * @return   HTTP_Request2
      */
     public function addPostParameter($name, $value = null)
     {
@@ -736,13 +715,10 @@
         return $this;
     }
 
-    #ReturnTypeWillChange
     /**
      * Attaches a new observer
      *
      * @param SplObserver $observer any object implementing SplObserver
-     *
-     * @return void
      */
     public function attach(SplObserver $observer)
     {
@@ -754,13 +730,10 @@
         $this->observers = $observer;
     }
 
-    #ReturnTypeWillChange
     /**
      * Detaches an existing observer
      *
      * @param SplObserver $observer any object implementing SplObserver
-     *
-     * @return void
      */
     public function detach(SplObserver $observer)
     {
@@ -772,11 +745,8 @@
         }
     }
 
-    #ReturnTypeWillChange
     /**
      * Notifies all observers
-     *
-     * @return void
      */
     public function notify()
     {
@@ -793,15 +763,13 @@
      *
      * @param string $name event name
      * @param mixed  $data event data
-     *
-     * @return void
      */
     public function setLastEvent($name, $data = null)
     {
-        $this->lastEvent = 
+        $this->lastEvent = array(
             'name' => $name,
             'data' => $data
-        ;
+        );
         $this->notify();
     }
 
@@ -837,7 +805,7 @@
      * Different adapters may not send all the event types. Mock adapter does
      * not send any events to the observers.
      *
-     * @return array   The array has two keys: 'name' and 'data'
+     * @return   array   The array has two keys: 'name' and 'data'
      */
     public function getLastEvent()
     {
@@ -858,8 +826,8 @@
      *
      * @param string|HTTP_Request2_Adapter $adapter Adapter to use
      *
-     * @return $this
-     * @throws HTTP_Request2_LogicException
+     * @return   HTTP_Request2
+     * @throws   HTTP_Request2_LogicException
      */
     public function setAdapter($adapter)
     {
@@ -868,7 +836,7 @@
                 if (false === strpos($adapter, '_')) {
                     $adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);
                 }
-                if (!class_exists($adapter, true)
+                if (!class_exists($adapter, false)
                     && preg_match('/^HTTP_Request2_Adapter_(a-zA-Z0-9+)$/', $adapter)
                 ) {
                     include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';
@@ -903,12 +871,14 @@
      * @param HTTP_Request2_CookieJar|bool $jar Existing CookieJar object, true to
      *                                          create a new one, false to remove
      *
-     * @return $this
+     * @return HTTP_Request2
      * @throws HTTP_Request2_LogicException
      */
     public function setCookieJar($jar = true)
     {
-        // pear-package-only require_once 'HTTP/Request2/CookieJar.php';
+        if (!class_exists('HTTP_Request2_CookieJar', false)) {
+            require_once 'HTTP/Request2/CookieJar.php';
+        }
 
         if ($jar instanceof HTTP_Request2_CookieJar) {
             $this->cookieJar = $jar;
@@ -939,15 +909,15 @@
     /**
      * Sends the request and returns the response
      *
-     * @throws HTTP_Request2_Exception
-     * @return HTTP_Request2_Response
+     * @throws   HTTP_Request2_Exception
+     * @return   HTTP_Request2_Response
      */
     public function send()
     {
         // Sanity check for URL
         if (!$this->url instanceof Net_URL2
             || !$this->url->isAbsolute()
-            || !in_array(strtolower($this->url->getScheme()), 'https', 'http')
+            || !in_array(strtolower($this->url->getScheme()), array('https', 'http'))
         ) {
             throw new HTTP_Request2_LogicException(
                 'HTTP_Request2 needs an absolute HTTP(S) request URL, '
@@ -960,6 +930,11 @@
         if (empty($this->adapter)) {
             $this->setAdapter($this->getConfig('adapter'));
         }
+        // magic_quotes_runtime may break file uploads and chunked response
+        // processing; see bug #4543. Don't use ini_get() here; see bug #16440.
+        if ($magicQuotes = get_magic_quotes_runtime()) {
+            set_magic_quotes_runtime(false);
+        }
         // force using single byte encoding if mbstring extension overloads
         // strlen() and substr(); see bug #1781, bug #10605
         if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
@@ -968,12 +943,21 @@
         }
 
         try {
-            return $this->adapter->sendRequest($this);
-        } finally {
-            if (!empty($oldEncoding)) {
-                mb_internal_encoding($oldEncoding);
-            }
+            $response = $this->adapter->sendRequest($this);
+        } catch (Exception $e) {
+        }
+        // cleanup in either case (poor man's "finally" clause)
+        if ($magicQuotes) {
+            set_magic_quotes_runtime(true);
         }
+        if (!empty($oldEncoding)) {
+            mb_internal_encoding($oldEncoding);
+        }
+        // rethrow the exception
+        if (!empty($e)) {
+            throw $e;
+        }
+        return $response;
     }
 
     /**
@@ -981,8 +965,8 @@
      *
      * @param string|resource $file       file name or pointer to open file
      * @param bool            $detectType whether to try autodetecting MIME
-     *                                    type of file, will only work if $file is a
-     *                                    filename, not pointer
+     *                        type of file, will only work if $file is a
+     *                        filename, not pointer
      *
      * @return array array('fp' => file pointer, 'size' => file size, 'type' => MIME type)
      * @throws HTTP_Request2_LogicException
@@ -995,11 +979,11 @@
                 HTTP_Request2_Exception::INVALID_ARGUMENT
             );
         }
-        $fileData = 
+        $fileData = array(
             'fp'   => is_string($file)? null: $file,
             'type' => 'application/octet-stream',
             'size' => 0
-        ;
+        );
         if (is_string($file)) {
             if (!($fileData'fp' = @fopen($file, 'rb'))) {
                 $error = error_get_last();
@@ -1030,7 +1014,7 @@
      *
      * @param string $filename file name
      *
-     * @return string  file MIME type
+     * @return   string  file MIME type
      */
     protected static function detectMimeType($filename)
     {

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/HTTP/Request2/Adapter.php Changed

@@ -13,15 +13,15 @@
  * @category  HTTP
  * @package   HTTP_Request2
  * @author    Alexey Borzov <avb@php.net>
- * @copyright 2008-2022 Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
  * @link      http://pear.php.net/package/HTTP_Request2
  */
 
-// pear-package-only /**
-// pear-package-only  * Class representing a HTTP response
-// pear-package-only  */
-// pear-package-only require_once 'HTTP/Request2/Response.php';
+/**
+ * Class representing a HTTP response
+ */
+require_once 'HTTP/Request2/Response.php';
 
 /**
  * Base class for HTTP_Request2 adapters
@@ -41,10 +41,9 @@
 {
     /**
      * A list of methods that MUST NOT have a request body, per RFC 2616
-     *
-     * @var array
+     * @var  array
      */
-    protected static $bodyDisallowed = 'TRACE';
+    protected static $bodyDisallowed = array('TRACE');
 
     /**
      * Methods having defined semantics for request body
@@ -56,27 +55,24 @@
      * @link http://pear.php.net/bugs/bug.php?id=12900
      * @link http://pear.php.net/bugs/bug.php?id=14740
      */
-    protected static $bodyRequired = 'POST', 'PUT';
+    protected static $bodyRequired = array('POST', 'PUT');
 
     /**
      * Request being sent
-     *
-     * @var HTTP_Request2
+     * @var  HTTP_Request2
      */
     protected $request;
 
     /**
      * Request body
-     *
-     * @var string|resource|HTTP_Request2_MultipartBody
-     * @see HTTP_Request2::getBody()
+     * @var  string|resource|HTTP_Request2_MultipartBody
+     * @see  HTTP_Request2::getBody()
      */
     protected $requestBody;
 
     /**
      * Length of the request body
-     *
-     * @var integer
+     * @var  integer
      */
     protected $contentLength;
 
@@ -85,19 +81,17 @@
      *
      * @param HTTP_Request2 $request HTTP request message
      *
-     * @return HTTP_Request2_Response
-     * @throws HTTP_Request2_Exception
+     * @return   HTTP_Request2_Response
+     * @throws   HTTP_Request2_Exception
      */
     abstract public function sendRequest(HTTP_Request2 $request);
 
     /**
      * Calculates length of the request body, adds proper headers
      *
-     * @param array $headers associative array of request headers, this method
-     *                       will add proper 'Content-Length' and 'Content-Type'
-     *                       headers to this array (or remove them if not needed)
-     *
-     * @return void
+     * @param array &$headers associative array of request headers, this method
+     *                        will add proper 'Content-Length' and 'Content-Type'
+     *                        headers to this array (or remove them if not needed)
      */
     protected function calculateRequestLength(&$headers)
     {

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/HTTP/Request2/Adapter/Curl.php Changed

@@ -13,15 +13,15 @@
  * @category  HTTP
  * @package   HTTP_Request2
  * @author    Alexey Borzov <avb@php.net>
- * @copyright 2008-2022 Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
  * @link      http://pear.php.net/package/HTTP_Request2
  */
 
-// pear-package-only /**
-// pear-package-only  * Base class for HTTP_Request2 adapters
-// pear-package-only  */
-// pear-package-only require_once 'HTTP/Request2/Adapter.php';
+/**
+ * Base class for HTTP_Request2 adapters
+ */
+require_once 'HTTP/Request2/Adapter.php';
 
 /**
  * Adapter for HTTP_Request2 wrapping around cURL extension
@@ -37,110 +37,101 @@
 {
     /**
      * Mapping of header names to cURL options
-     *
-     * @var array
+     * @var  array
      */
-    protected static $headerMap = 
+    protected static $headerMap = array(
         'accept-encoding' => CURLOPT_ENCODING,
         'cookie'          => CURLOPT_COOKIE,
         'referer'         => CURLOPT_REFERER,
         'user-agent'      => CURLOPT_USERAGENT
-    ;
+    );
 
     /**
      * Mapping of SSL context options to cURL options
-     *
-     * @var array
+     * @var  array
      */
-    protected static $sslContextMap = 
+    protected static $sslContextMap = array(
         'ssl_verify_peer' => CURLOPT_SSL_VERIFYPEER,
         'ssl_cafile'      => CURLOPT_CAINFO,
         'ssl_capath'      => CURLOPT_CAPATH,
         'ssl_local_cert'  => CURLOPT_SSLCERT,
         'ssl_passphrase'  => CURLOPT_SSLCERTPASSWD
-    ;
+    );
 
     /**
      * Mapping of CURLE_* constants to Exception subclasses and error codes
-     *
-     * @var array
+     * @var  array
      */
-    protected static $errorMap = 
-        CURLE_UNSUPPORTED_PROTOCOL  => 'HTTP_Request2_MessageException',
-                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT,
-        CURLE_COULDNT_RESOLVE_PROXY => 'HTTP_Request2_ConnectionException',
-        CURLE_COULDNT_RESOLVE_HOST  => 'HTTP_Request2_ConnectionException',
-        CURLE_COULDNT_CONNECT       => 'HTTP_Request2_ConnectionException',
+    protected static $errorMap = array(
+        CURLE_UNSUPPORTED_PROTOCOL  => array('HTTP_Request2_MessageException',
+                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),
+        CURLE_COULDNT_RESOLVE_PROXY => array('HTTP_Request2_ConnectionException'),
+        CURLE_COULDNT_RESOLVE_HOST  => array('HTTP_Request2_ConnectionException'),
+        CURLE_COULDNT_CONNECT       => array('HTTP_Request2_ConnectionException'),
         // error returned from write callback
-        CURLE_WRITE_ERROR           => 'HTTP_Request2_MessageException',
-                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT,
-        CURLE_OPERATION_TIMEOUTED   => 'HTTP_Request2_MessageException',
-                                             HTTP_Request2_Exception::TIMEOUT,
-        CURLE_HTTP_RANGE_ERROR      => 'HTTP_Request2_MessageException',
-        CURLE_SSL_CONNECT_ERROR     => 'HTTP_Request2_ConnectionException',
-        CURLE_LIBRARY_NOT_FOUND     => 'HTTP_Request2_LogicException',
-                                             HTTP_Request2_Exception::MISCONFIGURATION,
-        CURLE_FUNCTION_NOT_FOUND    => 'HTTP_Request2_LogicException',
-                                             HTTP_Request2_Exception::MISCONFIGURATION,
-        CURLE_ABORTED_BY_CALLBACK   => 'HTTP_Request2_MessageException',
-                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT,
-        CURLE_TOO_MANY_REDIRECTS    => 'HTTP_Request2_MessageException',
-                                             HTTP_Request2_Exception::TOO_MANY_REDIRECTS,
-        CURLE_SSL_PEER_CERTIFICATE  => 'HTTP_Request2_ConnectionException',
-        CURLE_GOT_NOTHING           => 'HTTP_Request2_MessageException',
-        CURLE_SSL_ENGINE_NOTFOUND   => 'HTTP_Request2_LogicException',
-                                             HTTP_Request2_Exception::MISCONFIGURATION,
-        CURLE_SSL_ENGINE_SETFAILED  => 'HTTP_Request2_LogicException',
-                                             HTTP_Request2_Exception::MISCONFIGURATION,
-        CURLE_SEND_ERROR            => 'HTTP_Request2_MessageException',
-        CURLE_RECV_ERROR            => 'HTTP_Request2_MessageException',
-        CURLE_SSL_CERTPROBLEM       => 'HTTP_Request2_LogicException',
-                                             HTTP_Request2_Exception::INVALID_ARGUMENT,
-        CURLE_SSL_CIPHER            => 'HTTP_Request2_ConnectionException',
-        CURLE_SSL_CACERT            => 'HTTP_Request2_ConnectionException',
-        CURLE_BAD_CONTENT_ENCODING  => 'HTTP_Request2_MessageException',
-    ;
+        CURLE_WRITE_ERROR           => array('HTTP_Request2_MessageException',
+                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),
+        CURLE_OPERATION_TIMEOUTED   => array('HTTP_Request2_MessageException',
+                                             HTTP_Request2_Exception::TIMEOUT),
+        CURLE_HTTP_RANGE_ERROR      => array('HTTP_Request2_MessageException'),
+        CURLE_SSL_CONNECT_ERROR     => array('HTTP_Request2_ConnectionException'),
+        CURLE_LIBRARY_NOT_FOUND     => array('HTTP_Request2_LogicException',
+                                             HTTP_Request2_Exception::MISCONFIGURATION),
+        CURLE_FUNCTION_NOT_FOUND    => array('HTTP_Request2_LogicException',
+                                             HTTP_Request2_Exception::MISCONFIGURATION),
+        CURLE_ABORTED_BY_CALLBACK   => array('HTTP_Request2_MessageException',
+                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),
+        CURLE_TOO_MANY_REDIRECTS    => array('HTTP_Request2_MessageException',
+                                             HTTP_Request2_Exception::TOO_MANY_REDIRECTS),
+        CURLE_SSL_PEER_CERTIFICATE  => array('HTTP_Request2_ConnectionException'),
+        CURLE_GOT_NOTHING           => array('HTTP_Request2_MessageException'),
+        CURLE_SSL_ENGINE_NOTFOUND   => array('HTTP_Request2_LogicException',
+                                             HTTP_Request2_Exception::MISCONFIGURATION),
+        CURLE_SSL_ENGINE_SETFAILED  => array('HTTP_Request2_LogicException',
+                                             HTTP_Request2_Exception::MISCONFIGURATION),
+        CURLE_SEND_ERROR            => array('HTTP_Request2_MessageException'),
+        CURLE_RECV_ERROR            => array('HTTP_Request2_MessageException'),
+        CURLE_SSL_CERTPROBLEM       => array('HTTP_Request2_LogicException',
+                                             HTTP_Request2_Exception::INVALID_ARGUMENT),
+        CURLE_SSL_CIPHER            => array('HTTP_Request2_ConnectionException'),
+        CURLE_SSL_CACERT            => array('HTTP_Request2_ConnectionException'),
+        CURLE_BAD_CONTENT_ENCODING  => array('HTTP_Request2_MessageException'),
+    );
 
     /**
      * Response being received
-     *
-     * @var HTTP_Request2_Response
+     * @var  HTTP_Request2_Response
      */
     protected $response;
 
     /**
      * Whether 'sentHeaders' event was sent to observers
-     *
-     * @var boolean
+     * @var  boolean
      */
     protected $eventSentHeaders = false;
 
     /**
      * Whether 'receivedHeaders' event was sent to observers
-     *
      * @var boolean
      */
     protected $eventReceivedHeaders = false;
 
     /**
      * Whether 'sentBoody' event was sent to observers
-     *
      * @var boolean
      */
     protected $eventSentBody = false;
 
     /**
      * Position within request body
-     *
-     * @var integer
-     * @see callbackReadBody()
+     * @var  integer
+     * @see  callbackReadBody()
      */
     protected $position = 0;
 
     /**
      * Information about last transfer, as returned by curl_getinfo()
-     *
-     * @var array
+     * @var  array
      */
     protected $lastInfo;
 
@@ -170,8 +161,8 @@
      *
      * @param HTTP_Request2 $request HTTP request message
      *
-     * @return HTTP_Request2_Response
-     * @throws HTTP_Request2_Exception
+     * @return   HTTP_Request2_Response
+     * @throws   HTTP_Request2_Exception
      */
     public function sendRequest(HTTP_Request2 $request)
     {
@@ -190,18 +181,23 @@
 
         try {
             if (false === curl_exec($ch = $this->createCurlHandle())) {
-                throw self::wrapCurlError($ch);
+                $e = self::wrapCurlError($ch);
             }
-        } finally {
-            if (isset($ch)) {
-                $this->lastInfo = curl_getinfo($ch);
-                if (CURLE_OK !== curl_errno($ch)) {
-                    $this->request->setLastEvent('warning', curl_error($ch));
-                }
-                curl_close($ch);
+        } catch (Exception $e) {
+        }
+        if (isset($ch)) {
+            $this->lastInfo = curl_getinfo($ch);
+            if (CURLE_OK !== curl_errno($ch)) {
+                $this->request->setLastEvent('warning', curl_error($ch));
             }
-            $response = $this->response;
-            unset($this->request, $this->requestBody, $this->response);
+            curl_close($ch);
+        }
+
+        $response = $this->response;
+        unset($this->request, $this->requestBody, $this->response);
+
+        if (!empty($e)) {
+            throw $e;
         }
 
         if ($jar = $request->getCookieJar()) {
@@ -217,7 +213,7 @@
     /**
      * Returns information about last transfer
      *
-     * @return array   associative array as returned by curl_getinfo()
+     * @return   array   associative array as returned by curl_getinfo()
      */
     public function getInfo()
     {
@@ -227,29 +223,27 @@
     /**
      * Creates a new cURL handle and populates it with data from the request
      *
-     * @return resource    a cURL handle, as created by curl_init()
-     * @throws HTTP_Request2_LogicException
-     * @throws HTTP_Request2_NotImplementedException
+     * @return   resource    a cURL handle, as created by curl_init()
+     * @throws   HTTP_Request2_LogicException
+     * @throws   HTTP_Request2_NotImplementedException
      */
     protected function createCurlHandle()
     {
         $ch = curl_init();
 
-        curl_setopt_array(
-            $ch, 
-                // setup write callbacks
-                CURLOPT_HEADERFUNCTION => $this, 'callbackWriteHeader',
-                CURLOPT_WRITEFUNCTION  => $this, 'callbackWriteBody',
-                // buffer size
-                CURLOPT_BUFFERSIZE     => $this->request->getConfig('buffer_size'),
-                // connection timeout
-                CURLOPT_CONNECTTIMEOUT => $this->request->getConfig('connect_timeout'),
-                // save full outgoing headers, in case someone is interested
-                CURLINFO_HEADER_OUT    => true,
-                // request url
-                CURLOPT_URL            => $this->request->getUrl()->getUrl()
-            
-        );
+        curl_setopt_array($ch, array(
+            // setup write callbacks
+            CURLOPT_HEADERFUNCTION => array($this, 'callbackWriteHeader'),
+            CURLOPT_WRITEFUNCTION  => array($this, 'callbackWriteBody'),
+            // buffer size
+            CURLOPT_BUFFERSIZE     => $this->request->getConfig('buffer_size'),
+            // connection timeout
+            CURLOPT_CONNECTTIMEOUT => $this->request->getConfig('connect_timeout'),
+            // save full outgoing headers, in case someone is interested
+            CURLINFO_HEADER_OUT    => true,
+            // request url
+            CURLOPT_URL            => $this->request->getUrl()->getUrl()
+        ));
 
         // set up redirects
         if (!$this->request->getConfig('follow_redirects')) {
@@ -393,7 +387,7 @@
         }
 
         // set headers not having special keys
-        $headersFmt = ;
+        $headersFmt = array();
         foreach ($headers as $name => $value) {
             $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
             $headersFmt  = $canonicalName . ': ' . $value;
@@ -410,10 +404,8 @@
      * and setting it as CURLOPT_POSTFIELDS, so it isn't recommended for large
      * file uploads, use Socket adapter instead.
      *
-     * @param resource $ch      cURL handle
-     * @param array    $headers Request headers
-     *
-     * @return void
+     * @param resource $ch       cURL handle
+     * @param array    &$headers Request headers
      */
     protected function workaroundPhpBug47204($ch, &$headers)
     {
@@ -422,10 +414,10 @@
         // https://pear.php.net/bugs/bug.php?id=20440 for PUTs
         if (!$this->request->getConfig('follow_redirects')
             && (!($auth = $this->request->getAuth())
-            || HTTP_Request2::AUTH_DIGEST !== $auth'scheme')
+                || HTTP_Request2::AUTH_DIGEST != $auth'scheme')
             || HTTP_Request2::METHOD_POST !== $this->request->getMethod()
         ) {
-            curl_setopt($ch, CURLOPT_READFUNCTION, $this, 'callbackReadBody');
+            curl_setopt($ch, CURLOPT_READFUNCTION, array($this, 'callbackReadBody'));
 
         } else {
             // rewind may be needed, read the whole body into memory
@@ -452,7 +444,7 @@
      * @param resource $fd     file descriptor (not used)
      * @param integer  $length maximum length of data to return
      *
-     * @return string      part of the request body, up to $length bytes
+     * @return   string      part of the request body, up to $length bytes
      */
     protected function callbackReadBody($ch, $fd, $length)
     {
@@ -485,8 +477,8 @@
      * @param resource $ch     cURL handle
      * @param string   $string response header (with trailing CRLF)
      *
-     * @return integer     number of bytes saved
-     * @see    HTTP_Request2_Response::parseHeaderLine()
+     * @return   integer     number of bytes saved
+     * @see      HTTP_Request2_Response::parseHeaderLine()
      */
     protected function callbackWriteHeader($ch, $string)
     {
@@ -533,7 +525,7 @@
 
                     // for versions lower than 5.2.10, check the redirection URL protocol
                     if (!defined('CURLOPT_REDIR_PROTOCOLS') && $redirectUrl->isAbsolute()
-                        && !in_array($redirectUrl->getScheme(), 'http', 'https')
+                        && !in_array($redirectUrl->getScheme(), array('http', 'https'))
                     ) {
                         return -1;
                     }
@@ -561,9 +553,9 @@
      * @param resource $ch     cURL handle (not used)
      * @param string   $string part of the response body
      *
-     * @return integer     number of bytes saved
-     * @throws HTTP_Request2_MessageException
-     * @see    HTTP_Request2_Response::appendBody()
+     * @return   integer     number of bytes saved
+     * @throws   HTTP_Request2_MessageException
+     * @see      HTTP_Request2_Response::appendBody()
      */
     protected function callbackWriteBody($ch, $string)
     {

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/HTTP/Request2/Adapter/Mock.php Changed

@@ -13,15 +13,15 @@
  * @category  HTTP
  * @package   HTTP_Request2
  * @author    Alexey Borzov <avb@php.net>
- * @copyright 2008-2022 Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
  * @link      http://pear.php.net/package/HTTP_Request2
  */
 
-// pear-package-only /**
-// pear-package-only  * Base class for HTTP_Request2 adapters
-// pear-package-only  */
-// pear-package-only require_once 'HTTP/Request2/Adapter.php';
+/**
+ * Base class for HTTP_Request2 adapters
+ */
+require_once 'HTTP/Request2/Adapter.php';
 
 /**
  * Mock adapter intended for testing
@@ -51,10 +51,9 @@
 {
     /**
      * A queue of responses to be returned by sendRequest()
-     *
-     * @var array
+     * @var  array
      */
-    protected $responses = ;
+    protected $responses = array();
 
     /**
      * Returns the next response from the queue built by addResponse()
@@ -66,8 +65,8 @@
      *
      * @param HTTP_Request2 $request HTTP request message
      *
-     * @return HTTP_Request2_Response
-     * @throws Exception
+     * @return   HTTP_Request2_Response
+     * @throws   Exception
      */
     public function sendRequest(HTTP_Request2 $request)
     {
@@ -103,8 +102,7 @@
      * @param string $url      A request URL this response should be valid for
      *                         (see {@link http://pear.php.net/bugs/bug.php?id=19276})
      *
-     * @return void
-     * @throws HTTP_Request2_Exception
+     * @throws   HTTP_Request2_Exception
      */
     public function addResponse($response, $url = null)
     {
@@ -112,12 +110,12 @@
             $response = self::createResponseFromString($response);
         } elseif (is_resource($response)) {
             $response = self::createResponseFromFile($response);
-        } elseif (!$response instanceof HTTP_Request2_Response 
-            && !$response instanceof Exception
+        } elseif (!$response instanceof HTTP_Request2_Response &&
+                  !$response instanceof Exception
         ) {
             throw new HTTP_Request2_Exception('Parameter is not a valid response');
         }
-        $this->responses = $response, $url;
+        $this->responses = array($response, $url);
     }
 
     /**
@@ -125,8 +123,8 @@
      *
      * @param string $str string containing HTTP response message
      *
-     * @return HTTP_Request2_Response
-     * @throws HTTP_Request2_Exception
+     * @return   HTTP_Request2_Response
+     * @throws   HTTP_Request2_Exception
      */
     public static function createResponseFromString($str)
     {
@@ -148,8 +146,8 @@
      *
      * @param resource $fp file pointer returned by fopen()
      *
-     * @return HTTP_Request2_Response
-     * @throws HTTP_Request2_Exception
+     * @return   HTTP_Request2_Response
+     * @throws   HTTP_Request2_Exception
      */
     public static function createResponseFromFile($fp)
     {

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/HTTP/Request2/Adapter/Socket.php Changed

@@ -13,16 +13,16 @@
  * @category  HTTP
  * @package   HTTP_Request2
  * @author    Alexey Borzov <avb@php.net>
- * @copyright 2008-2022 Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
  * @link      http://pear.php.net/package/HTTP_Request2
  */
 
-// pear-package-only /** Base class for HTTP_Request2 adapters */
-// pear-package-only require_once 'HTTP/Request2/Adapter.php';
+/** Base class for HTTP_Request2 adapters */
+require_once 'HTTP/Request2/Adapter.php';
 
-// pear-package-only /** Socket wrapper class */
-// pear-package-only require_once 'HTTP/Request2/SocketWrapper.php';
+/** Socket wrapper class */
+require_once 'HTTP/Request2/SocketWrapper.php';
 
 /**
  * Socket-based adapter for HTTP_Request2
@@ -51,11 +51,10 @@
 
     /**
      * Connected sockets, needed for Keep-Alive support
-     *
-     * @var array
-     * @see connect()
+     * @var  array
+     * @see  connect()
      */
-    protected static $sockets = ;
+    protected static $sockets = array();
 
     /**
      * Data for digest authentication scheme
@@ -67,37 +66,33 @@
      * duplicate requests to digest-protected resources after we have already
      * received the challenge.
      *
-     * @var array
+     * @var  array
      */
-    protected static $challenges = ;
+    protected static $challenges = array();
 
     /**
      * Connected socket
-     *
-     * @var HTTP_Request2_SocketWrapper
-     * @see connect()
+     * @var  HTTP_Request2_SocketWrapper
+     * @see  connect()
      */
     protected $socket;
 
     /**
      * Challenge used for server digest authentication
-     *
-     * @var array
+     * @var  array
      */
     protected $serverChallenge;
 
     /**
      * Challenge used for proxy digest authentication
-     *
-     * @var array
+     * @var  array
      */
     protected $proxyChallenge;
 
     /**
      * Remaining length of the current chunk, when reading chunked response
-     *
-     * @var integer
-     * @see readChunked()
+     * @var  integer
+     * @see  readChunked()
      */
     protected $chunkLength = 0;
 
@@ -107,13 +102,12 @@
      * Starts at 'max_redirects' configuration parameter and is reduced on each
      * subsequent redirect. An Exception will be thrown once it reaches zero.
      *
-     * @var integer
+     * @var  integer
      */
     protected $redirectCountdown = null;
 
     /**
      * Whether to wait for "100 Continue" response before sending request body
-     *
      * @var bool
      */
     protected $expect100Continue = false;
@@ -123,8 +117,8 @@
      *
      * @param HTTP_Request2 $request HTTP request message
      *
-     * @return HTTP_Request2_Response
-     * @throws HTTP_Request2_Exception
+     * @return   HTTP_Request2_Response
+     * @throws   HTTP_Request2_Exception
      */
     public function sendRequest(HTTP_Request2 $request)
     {
@@ -175,11 +169,13 @@
 
         } catch (Exception $e) {
             $this->disconnect();
+        }
+
+        unset($this->request, $this->requestBody);
+
+        if (!empty($e)) {
             $this->redirectCountdown = null;
             throw $e;
-
-        } finally {
-            unset($this->request, $this->requestBody);
         }
 
         if (!$request->getConfig('follow_redirects') || !$response->isRedirect()) {
@@ -193,8 +189,8 @@
     /**
      * Connects to the remote server
      *
-     * @return bool    whether the connection can be persistent
-     * @throws HTTP_Request2_Exception
+     * @return   bool    whether the connection can be persistent
+     * @throws   HTTP_Request2_Exception
      */
     protected function connect()
     {
@@ -254,19 +250,26 @@
                      (!empty($headers'connection') &&
                       'Keep-Alive' == $headers'connection');
 
-        $options = ;
+        $options = array();
         if ($ip = $this->request->getConfig('local_ip')) {
-            $options'socket' = 
+            $options'socket' = array(
                 'bindto' => (false === strpos($ip, ':') ? $ip : '' . $ip . '') . ':0'
-            ;
+            );
         }
         if ($secure || $tunnel) {
-            $options'ssl' = ;
+            $options'ssl' = array();
             foreach ($this->request->getConfig() as $name => $value) {
                 if ('ssl_' == substr($name, 0, 4) && null !== $value) {
                     if ('ssl_verify_host' == $name) {
-                        $options'ssl''verify_peer_name' = $value;
-                        $options'ssl''peer_name'        = $reqHost;
+                        if (version_compare(phpversion(), '5.6', '<')) {
+                            if ($value) {
+                                $options'ssl''CN_match' = $reqHost;
+                            }
+
+                        } else {
+                            $options'ssl''verify_peer_name' = $value;
+                            $options'ssl''peer_name'        = $reqHost;
+                        }
 
                     } else {
                         $options'ssl'substr($name, 4) = $value;
@@ -278,7 +281,7 @@
 
         // Use global request timeout if given, see feature requests #5735, #8964
         if ($timeout = $this->request->getConfig('timeout')) {
-            $deadline = microtime(true) + $timeout;
+            $deadline = time() + $timeout;
         } else {
             $deadline = null;
         }
@@ -302,7 +305,7 @@
 
         } else {
             if ($socksProxy) {
-                // pear-package-only require_once 'HTTP/Request2/SOCKS5.php';
+                require_once 'HTTP/Request2/SOCKS5.php';
 
                 $this->socket = new HTTP_Request2_SOCKS5(
                     $remote, $this->request->getConfig('connect_timeout'),
@@ -342,17 +345,15 @@
      * sees that we are connected to a proxy server (duh!) rather than the server
      * that presents its certificate.
      *
-     * @link http://tools.ietf.org/html/rfc2817#section-5.2
-     *
-     * @return void
-     * @throws HTTP_Request2_Exception
+     * @link     http://tools.ietf.org/html/rfc2817#section-5.2
+     * @throws   HTTP_Request2_Exception
      */
     protected function establishTunnel()
     {
         $donor   = new self;
         $connect = new HTTP_Request2(
             $this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,
-            array_merge($this->request->getConfig(), 'adapter' => $donor)
+            array_merge($this->request->getConfig(), array('adapter' => $donor))
         );
         $response = $connect->send();
         // Need any successful (2XX) response
@@ -370,35 +371,33 @@
      * Checks whether current connection may be reused or should be closed
      *
      * @param boolean                $requestKeepAlive whether connection could
-     *                                                 be persistent in the first place
+     *                               be persistent in the first place
      * @param HTTP_Request2_Response $response         response object to check
      *
-     * @return boolean
+     * @return   boolean
      */
     protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)
     {
         // Do not close socket on successful CONNECT request
-        if (HTTP_Request2::METHOD_CONNECT === $this->request->getMethod()
+        if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod()
             && 200 <= $response->getStatus() && 300 > $response->getStatus()
         ) {
             return true;
         }
 
-        $lengthKnown = 'chunked' === strtolower($response->getHeader('transfer-encoding') ?: '')
+        $lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding'))
                        || null !== $response->getHeader('content-length')
                        // no body possible for such responses, see also request #17031
-                       || HTTP_Request2::METHOD_HEAD === $this->request->getMethod()
-                       || in_array($response->getStatus(), 204, 304);
-        $persistent  = 'keep-alive' === strtolower($response->getHeader('connection') ?: '') ||
+                       || HTTP_Request2::METHOD_HEAD == $this->request->getMethod()
+                       || in_array($response->getStatus(), array(204, 304));
+        $persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||
                        (null === $response->getHeader('connection') &&
-                        '1.1' === $response->getVersion());
+                        '1.1' == $response->getVersion());
         return $requestKeepAlive && $lengthKnown && $persistent;
     }
 
     /**
      * Disconnects from the remote server
-     *
-     * @return void
      */
     protected function disconnect()
     {
@@ -418,8 +417,8 @@
      * @param HTTP_Request2          $request  Original request
      * @param HTTP_Request2_Response $response Response containing redirect
      *
-     * @return HTTP_Request2_Response      Response from a new location
-     * @throws HTTP_Request2_Exception
+     * @return   HTTP_Request2_Response      Response from a new location
+     * @throws   HTTP_Request2_Exception
      */
     protected function handleRedirect(
         HTTP_Request2 $request, HTTP_Request2_Response $response
@@ -437,11 +436,11 @@
         }
         $redirectUrl = new Net_URL2(
             $response->getHeader('location'),
-            Net_URL2::OPTION_USE_BRACKETS => $request->getConfig('use_brackets')
+            array(Net_URL2::OPTION_USE_BRACKETS => $request->getConfig('use_brackets'))
         );
         // refuse non-HTTP redirect
         if ($redirectUrl->isAbsolute()
-            && !in_array($redirectUrl->getScheme(), 'http', 'https')
+            && !in_array($redirectUrl->getScheme(), array('http', 'https'))
         ) {
             $this->redirectCountdown = null;
             throw new HTTP_Request2_MessageException(
@@ -458,7 +457,7 @@
         $redirect->setUrl($redirectUrl);
         if (303 == $response->getStatus()
             || (!$request->getConfig('strict_redirects')
-            && in_array($response->getStatus(), 301, 302))
+                && in_array($response->getStatus(), array(301, 302)))
         ) {
             $redirect->setMethod(HTTP_Request2::METHOD_GET);
             $redirect->setBody('');
@@ -485,8 +484,8 @@
      *
      * @param HTTP_Request2_Response $response response to check
      *
-     * @return boolean whether another request should be performed
-     * @throws HTTP_Request2_Exception in case of unsupported challenge parameters
+     * @return   boolean whether another request should be performed
+     * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
      */
     protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)
     {
@@ -510,7 +509,7 @@
         }
 
         if (!empty($challenge'domain')) {
-            $prefixes = ;
+            $prefixes = array();
             foreach (preg_split('/\\s+/', $challenge'domain') as $prefix) {
                 // don't bother with different servers
                 if ('/' == substr($prefix, 0, 1)) {
@@ -519,7 +518,7 @@
             }
         }
         if (empty($prefixes)) {
-            $prefixes = $host . '/';
+            $prefixes = array($host . '/');
         }
 
         $ret = true;
@@ -550,8 +549,8 @@
      *
      * @param HTTP_Request2_Response $response response to check
      *
-     * @return boolean whether another request should be performed
-     * @throws HTTP_Request2_Exception in case of unsupported challenge parameters
+     * @return   boolean whether another request should be performed
+     * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
      */
     protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)
     {
@@ -601,9 +600,9 @@
      *
      * @param string $headerValue value of WWW-Authenticate or Proxy-Authenticate header
      *
-     * @return mixed   associative array with challenge parameters, false if
+     * @return   mixed   associative array with challenge parameters, false if
      *                   no challenge is present in header value
-     * @throws HTTP_Request2_NotImplementedException in case of unsupported challenge parameters
+     * @throws   HTTP_Request2_NotImplementedException in case of unsupported challenge parameters
      */
     protected function parseDigestChallenge($headerValue)
     {
@@ -615,9 +614,9 @@
         }
 
         preg_match_all('!' . $authParam . '!', $matches0, $params);
-        $paramsAry   = ;
-        $knownParams = 'realm', 'domain', 'nonce', 'opaque', 'stale',
-                             'algorithm', 'qop';
+        $paramsAry   = array();
+        $knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',
+                             'algorithm', 'qop');
         for ($i = 0; $i < count($params0); $i++) {
             // section 3.2.1: Any unrecognized directive MUST be ignored.
             if (in_array($params1$i, $knownParams)) {
@@ -651,18 +650,16 @@
     /**
      * Parses Proxy-Authentication-Info header value and updates challenge
      *
-     * @param array  $challenge   challenge to update
+     * @param array  &$challenge  challenge to update
      * @param string $headerValue value of Proxy-Authentication-Info header
      *
-     * @return void
-     *
-     * @todo validate server rspauth response
+     * @todo     validate server rspauth response
      */
     protected function updateChallenge(&$challenge, $headerValue)
     {
         $authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
                        self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';
-        $paramsAry   = ;
+        $paramsAry   = array();
 
         preg_match_all($authParam, $headerValue, $params);
         for ($i = 0; $i < count($params0); $i++) {
@@ -682,13 +679,13 @@
     /**
      * Creates a value for Proxy-Authorization header when using digest authentication
      *
-     * @param string $user      user name
-     * @param string $password  password
-     * @param string $url       request URL
-     * @param array  $challenge digest challenge parameters
+     * @param string $user       user name
+     * @param string $password   password
+     * @param string $url        request URL
+     * @param array  &$challenge digest challenge parameters
      *
-     * @return string  value of Proxy-Authorization request header
-     * @link   http://tools.ietf.org/html/rfc2617#section-3.2.2
+     * @return   string  value of Proxy-Authorization request header
+     * @link     http://tools.ietf.org/html/rfc2617#section-3.2.2
      */
     protected function createDigestResponse($user, $password, $url, &$challenge)
     {
@@ -714,7 +711,7 @@
                 $challenge'cnonce' . ':auth:' . $a2
             );
         }
-        return 'Digest username="' . str_replace('\\', '"', '\\\\', '\\"', $user) . '", ' .
+        return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .
                'realm="' . $challenge'realm' . '", ' .
                'nonce="' . $challenge'nonce' . '", ' .
                'uri="' . $url . '", ' .
@@ -730,12 +727,11 @@
     /**
      * Adds 'Authorization' header (if needed) to request headers array
      *
-     * @param array  $headers     request headers
+     * @param array  &$headers    request headers
      * @param string $requestHost request host (needed for digest authentication)
      * @param string $requestUrl  request URL (needed for digest authentication)
      *
-     * @return void
-     * @throws HTTP_Request2_NotImplementedException
+     * @throws   HTTP_Request2_NotImplementedException
      */
     protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)
     {
@@ -777,18 +773,17 @@
     /**
      * Adds 'Proxy-Authorization' header (if needed) to request headers array
      *
-     * @param array  $headers    request headers
+     * @param array  &$headers   request headers
      * @param string $requestUrl request URL (needed for digest authentication)
      *
-     * @return void
-     * @throws HTTP_Request2_NotImplementedException
+     * @throws   HTTP_Request2_NotImplementedException
      */
     protected function addProxyAuthorizationHeader(&$headers, $requestUrl)
     {
         if (!$this->request->getConfig('proxy_host')
             || !($user = $this->request->getConfig('proxy_user'))
             || (0 == strcasecmp('https', $this->request->getUrl()->getScheme())
-            && HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())
+                && HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())
         ) {
             return;
         }
@@ -826,8 +821,8 @@
     /**
      * Creates the string with the Request-Line and request headers
      *
-     * @return string
-     * @throws HTTP_Request2_Exception
+     * @return   string
+     * @throws   HTTP_Request2_Exception
      */
     protected function prepareHeaders()
     {
@@ -901,18 +896,16 @@
      * > 14.20) with the "100-continue" expectation if it does not intend
      * > to send a request body.
      *
-     * @param array $headers Array of headers prepared for the request
+     * @param array &$headers Array of headers prepared for the request
      *
-     * @return void
      * @throws HTTP_Request2_LogicException
-     *
      * @link http://pear.php.net/bugs/bug.php?id=19233
      * @link http://tools.ietf.org/html/rfc2616#section-8.2.3
      */
     protected function updateExpectHeader(&$headers)
     {
         $this->expect100Continue = false;
-        $expectations = ;
+        $expectations = array();
         if (isset($headers'expect')) {
             if ('' === $headers'expect') {
                 // empty 'Expect' header is technically invalid, so just get rid of it
@@ -968,8 +961,7 @@
     /**
      * Sends the request body
      *
-     * @return void
-     * @throws HTTP_Request2_MessageException
+     * @throws   HTTP_Request2_MessageException
      */
     protected function writeBody()
     {
@@ -1011,8 +1003,8 @@
     /**
      * Reads the remote server's response
      *
-     * @return HTTP_Request2_Response
-     * @throws HTTP_Request2_Exception
+     * @return   HTTP_Request2_Response
+     * @throws   HTTP_Request2_Exception
      */
     protected function readResponse()
     {
@@ -1042,15 +1034,15 @@
             if ($this->expect100Continue && 100 == $response->getStatus()) {
                 return $response;
             }
-        } while (in_array($response->getStatus(), 100, 101));
+        } while (in_array($response->getStatus(), array(100, 101)));
 
         $this->request->setLastEvent('receivedHeaders', $response);
 
         // No body possible in such responses
         if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod()
             || (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod()
-            && 200 <= $response->getStatus() && 300 > $response->getStatus())
-            || in_array($response->getStatus(), 204, 304)
+                && 200 <= $response->getStatus() && 300 > $response->getStatus())
+            || in_array($response->getStatus(), array(204, 304))
         ) {
             return $response;
         }
@@ -1083,7 +1075,7 @@
                 if ($this->request->getConfig('store_body')) {
                     $response->appendBody($data);
                 }
-                if (!in_array($response->getHeader('content-encoding'), 'identity', null)) {
+                if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {
                     $this->request->setLastEvent('receivedEncodedBodyPart', $data);
                 } else {
                     $this->request->setLastEvent('receivedBodyPart', $data);
@@ -1107,8 +1099,8 @@
      *
      * @param int $bufferSize buffer size to use for reading
      *
-     * @return string
-     * @throws HTTP_Request2_MessageException
+     * @return   string
+     * @throws   HTTP_Request2_MessageException
      */
     protected function readChunked($bufferSize)
     {

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/HTTP/Request2/ConnectionException.php Deleted

@@ -1,38 +0,0 @@
-<?php
-/**
- * Exception classes for HTTP_Request2 package
- *
- * PHP version 5
- *
- * LICENSE
- *
- * This source file is subject to BSD 3-Clause License that is bundled
- * with this package in the file LICENSE and available at the URL
- * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
- *
- * @category  HTTP
- * @package   HTTP_Request2
- * @author    Alexey Borzov <avb@php.net>
- * @copyright 2008-2022 Alexey Borzov <avb@php.net>
- * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
- * @link      http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Exception thrown when connection to a web or proxy server fails
- *
- * The exception will not contain a package error code, but will contain
- * native error code, as returned by stream_socket_client() or curl_errno().
- *
- * @category HTTP
- * @package  HTTP_Request2
- * @author   Alexey Borzov <avb@php.net>
- * @license  http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
- * @version  Release: @package_version@
- * @link     http://pear.php.net/package/HTTP_Request2
- */
-class HTTP_Request2_ConnectionException extends HTTP_Request2_Exception
-{
-}
-
-?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/HTTP/Request2/CookieJar.php Changed

@@ -13,13 +13,13 @@
  * @category  HTTP
  * @package   HTTP_Request2
  * @author    Alexey Borzov <avb@php.net>
- * @copyright 2008-2022 Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
  * @link      http://pear.php.net/package/HTTP_Request2
  */
 
-// pear-package-only /** Class representing a HTTP request message */
-// pear-package-only require_once 'HTTP/Request2.php';
+/** Class representing a HTTP request message */
+require_once 'HTTP/Request2.php';
 
 /**
  * Stores cookies and passes them between HTTP requests
@@ -47,36 +47,32 @@
      *
      * @var array
      */
-    protected $cookies = ;
+    protected $cookies = array();
 
     /**
      * Whether session cookies should be serialized when serializing the jar
-     *
      * @var bool
      */
     protected $serializeSession = false;
 
     /**
      * Whether Public Suffix List should be used for domain matching
-     *
      * @var bool
      */
     protected $useList = true;
 
     /**
      * Whether an attempt to store an invalid cookie should be ignored, rather than cause an Exception
-     *
      * @var bool
      */
     protected $ignoreInvalid = false;
 
     /**
      * Array with Public Suffix List data
-     *
      * @var  array
      * @link http://publicsuffix.org/
      */
-    protected static $psl = ;
+    protected static $psl = array();
 
     /**
      * Class constructor, sets various options
@@ -129,13 +125,13 @@
      *                         {@link HTTP_Request2_Response::getCookies()}
      * @param Net_URL2 $setter URL of the document that sent Set-Cookie header
      *
-     * @return array    Updated cookie array
-     * @throws HTTP_Request2_LogicException
-     * @throws HTTP_Request2_MessageException
+     * @return   array    Updated cookie array
+     * @throws   HTTP_Request2_LogicException
+     * @throws   HTTP_Request2_MessageException
      */
     protected function checkAndUpdateFields(array $cookie, Net_URL2 $setter = null)
     {
-        if ($missing = array_diff('name', 'value', array_keys($cookie))) {
+        if ($missing = array_diff(array('name', 'value'), array_keys($cookie))) {
             throw new HTTP_Request2_LogicException(
                 "Cookie array should contain 'name' and 'value' fields",
                 HTTP_Request2_Exception::MISSING_VALUE
@@ -153,7 +149,7 @@
                 HTTP_Request2_Exception::INVALID_ARGUMENT
             );
         }
-        $cookie += 'domain' => '', 'path' => '', 'expires' => null, 'secure' => false;
+        $cookie += array('domain' => '', 'path' => '', 'expires' => null, 'secure' => false);
 
         // Need ISO-8601 date @ UTC timezone
         if (!empty($cookie'expires')
@@ -227,10 +223,10 @@
             && (is_null($cookie'expires') || $cookie'expires' > $this->now())
         ) {
             if (!isset($this->cookies$cookie'domain')) {
-                $this->cookies$cookie'domain' = ;
+                $this->cookies$cookie'domain' = array();
             }
             if (!isset($this->cookies$cookie'domain'$cookie'path')) {
-                $this->cookies$cookie'domain'$cookie'path' = ;
+                $this->cookies$cookie'domain'$cookie'path' = array();
             }
             $this->cookies$cookie'domain'$cookie'path'$cookie'name' = $cookie;
 
@@ -246,8 +242,8 @@
      *
      * @param HTTP_Request2_Response $response HTTP response message
      * @param Net_URL2               $setter   original request URL, needed for
-     *                                         setting default domain/path. If not given,
-     *                                         effective URL from response will be used.
+     *                               setting default domain/path. If not given,
+     *                               effective URL from response will be used.
      *
      * @return bool whether all cookies were successfully stored
      * @throws HTTP_Request2_LogicException
@@ -290,7 +286,7 @@
         $path   = $url->getPath();
         $secure = 0 == strcasecmp($url->getScheme(), 'https');
 
-        $matched = $ret = ;
+        $matched = $ret = array();
         foreach (array_keys($this->cookies) as $domain) {
             if ($this->domainMatch($host, $domain)) {
                 foreach (array_keys($this->cookies$domain) as $cPath) {
@@ -326,7 +322,7 @@
      */
     public function getAll()
     {
-        $cookies = ;
+        $cookies = array();
         foreach (array_keys($this->cookies) as $domain) {
             foreach (array_keys($this->cookies$domain) as $path) {
                 foreach ($this->cookies$domain$path as $name => $cookie) {
@@ -341,8 +337,6 @@
      * Sets whether session cookies should be serialized when serializing the jar
      *
      * @param boolean $serialize serialize?
-     *
-     * @return void
      */
     public function serializeSessionCookies($serialize)
     {
@@ -353,9 +347,6 @@
      * Sets whether invalid cookies should be silently ignored or cause an Exception
      *
      * @param boolean $ignore ignore?
-     *
-     * @return void
-     *
      * @link http://pear.php.net/bugs/bug.php?id=19937
      * @link http://pear.php.net/bugs/bug.php?id=20401
      */
@@ -383,9 +374,7 @@
      *
      * @param boolean $useList use the list?
      *
-     * @return void
-     *
-     * @link http://publicsuffix.org/learn/
+     * @link     http://publicsuffix.org/learn/
      */
     public function usePublicSuffixList($useList)
     {
@@ -397,20 +386,10 @@
      *
      * @return string
      *
-     * @see Serializable::serialize()
+     * @see    Serializable::serialize()
      */
     public function serialize()
     {
-        return serialize($this->__serialize());
-    }
-
-    /**
-     * Returns an associative array of key/value pairs that represent the serialized form of the object
-     *
-     * @return array
-     */
-    public function __serialize()
-    {
         $cookies = $this->getAll();
         if (!$this->serializeSession) {
             for ($i = count($cookies) - 1; $i >= 0; $i--) {
@@ -419,12 +398,12 @@
                 }
             }
         }
-        return 
+        return serialize(array(
             'cookies'          => $cookies,
             'serializeSession' => $this->serializeSession,
             'useList'          => $this->useList,
             'ignoreInvalid'    => $this->ignoreInvalid
-        ;
+        ));
     }
 
     /**
@@ -432,23 +411,12 @@
      *
      * @param string $serialized string representation
      *
-     * @return void
+     * @see   Serializable::unserialize()
      */
     public function unserialize($serialized)
     {
-        $this->__unserialize(unserialize($serialized));
-    }
-
-    /**
-     * Constructs the object from array serialized form
-     *
-     * @param array $data serialized form (as generated by {@see __serialize()}
-     *
-     * @return void
-     */
-    public function __unserialize(array $data)
-    {
-        $now = $this->now();
+        $data = unserialize($serialized);
+        $now  = $this->now();
         $this->serializeSessionCookies($data'serializeSession');
         $this->usePublicSuffixList($data'useList');
         if (array_key_exists('ignoreInvalid', $data)) {
@@ -459,10 +427,10 @@
                 continue;
             }
             if (!isset($this->cookies$cookie'domain')) {
-                $this->cookies$cookie'domain' = ;
+                $this->cookies$cookie'domain' = array();
             }
             if (!isset($this->cookies$cookie'domain'$cookie'path')) {
-                $this->cookies$cookie'domain'$cookie'path' = ;
+                $this->cookies$cookie'domain'$cookie'path' = array();
             }
             $this->cookies$cookie'domain'$cookie'path'$cookie'name' = $cookie;
         }
@@ -478,7 +446,7 @@
      * @param string $requestHost  request host
      * @param string $cookieDomain cookie domain
      *
-     * @return bool    match success
+     * @return   bool    match success
      */
     public function domainMatch($requestHost, $cookieDomain)
     {
@@ -522,7 +490,7 @@
             $path = '@data_dir@' . DIRECTORY_SEPARATOR . 'HTTP_Request2';
             if (0 === strpos($path, '@' . 'data_dir@')) {
                 $path = realpath(
-                    __DIR__ . DIRECTORY_SEPARATOR . '..'
+                    dirname(__FILE__) . DIRECTORY_SEPARATOR . '..'
                     . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'data'
                 );
             }
@@ -555,7 +523,8 @@
      */
     protected static function checkDomainsList(array $domainParts, $listNode)
     {
-        $sub = array_pop($domainParts);
+        $sub    = array_pop($domainParts);
+        $result = null;
 
         if (!is_array($listNode) || is_null($sub)
             || array_key_exists('!' . $sub, $listNode)
@@ -572,7 +541,7 @@
             return $sub;
         }
 
-        return (strlen($result ?: '') > 0) ? ($result . '.' . $sub) : null;
+        return (strlen($result) > 0) ? ($result . '.' . $sub) : null;
     }
 }
 ?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/HTTP/Request2/Exception.php Changed

@@ -13,15 +13,15 @@
  * @category  HTTP
  * @package   HTTP_Request2
  * @author    Alexey Borzov <avb@php.net>
- * @copyright 2008-2022 Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
  * @link      http://pear.php.net/package/HTTP_Request2
  */
 
-// pear-package-only /**
-// pear-package-only  * Base class for exceptions in PEAR
-// pear-package-only  */
-// pear-package-only require_once 'PEAR/Exception.php';
+/**
+ * Base class for exceptions in PEAR
+ */
+require_once 'PEAR/Exception.php';
 
 /**
  * Base exception class for HTTP_Request2 package
@@ -36,47 +36,28 @@
  */
 class HTTP_Request2_Exception extends PEAR_Exception
 {
-    /**
-     * An invalid argument was passed to a method
-     */
+    /** An invalid argument was passed to a method */
     const INVALID_ARGUMENT   = 1;
-    /**
-     * Some required value was not available
-     */
+    /** Some required value was not available */
     const MISSING_VALUE      = 2;
-    /**
-     * Request cannot be processed due to errors in PHP configuration
-     */
+    /** Request cannot be processed due to errors in PHP configuration */
     const MISCONFIGURATION   = 3;
-    /**
-     * Error reading the local file
-     */
+    /** Error reading the local file */
     const READ_ERROR         = 4;
 
-    /**
-     * Server returned a response that does not conform to HTTP protocol
-     */
+    /** Server returned a response that does not conform to HTTP protocol */
     const MALFORMED_RESPONSE = 10;
-    /**
-     * Failure decoding Content-Encoding or Transfer-Encoding of response
-     */
+    /** Failure decoding Content-Encoding or Transfer-Encoding of response */
     const DECODE_ERROR       = 20;
-    /**
-     * Operation timed out
-     */
+    /** Operation timed out */
     const TIMEOUT            = 30;
-    /**
-     * Number of redirects exceeded 'max_redirects' configuration parameter
-     */
+    /** Number of redirects exceeded 'max_redirects' configuration parameter */
     const TOO_MANY_REDIRECTS = 40;
-    /**
-     * Redirect to a protocol other than http(s)://
-     */
+    /** Redirect to a protocol other than http(s):// */
     const NON_HTTP_REDIRECT  = 50;
 
     /**
      * Native error code
-     *
      * @var int
      */
     private $_nativeCode;
@@ -109,10 +90,71 @@
     }
 }
 
-// backwards compatibility, include the child exceptions if installed with PEAR installer
-// pear-package-only require_once 'HTTP/Request2/ConnectionException.php';
-// pear-package-only require_once 'HTTP/Request2/LogicException.php';
-// pear-package-only require_once 'HTTP/Request2/MessageException.php';
-// pear-package-only require_once 'HTTP/Request2/NotImplementedException.php';
+/**
+ * Exception thrown in case of missing features
+ *
+ * @category HTTP
+ * @package  HTTP_Request2
+ * @author   Alexey Borzov <avb@php.net>
+ * @license  http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @version  Release: @package_version@
+ * @link     http://pear.php.net/package/HTTP_Request2
+ */
+class HTTP_Request2_NotImplementedException extends HTTP_Request2_Exception
+{
+}
 
+/**
+ * Exception that represents error in the program logic
+ *
+ * This exception usually implies a programmer's error, like passing invalid
+ * data to methods or trying to use PHP extensions that weren't installed or
+ * enabled. Usually exceptions of this kind will be thrown before request even
+ * starts.
+ *
+ * The exception will usually contain a package error code.
+ *
+ * @category HTTP
+ * @package  HTTP_Request2
+ * @author   Alexey Borzov <avb@php.net>
+ * @license  http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @version  Release: @package_version@
+ * @link     http://pear.php.net/package/HTTP_Request2
+ */
+class HTTP_Request2_LogicException extends HTTP_Request2_Exception
+{
+}
+
+/**
+ * Exception thrown when connection to a web or proxy server fails
+ *
+ * The exception will not contain a package error code, but will contain
+ * native error code, as returned by stream_socket_client() or curl_errno().
+ *
+ * @category HTTP
+ * @package  HTTP_Request2
+ * @author   Alexey Borzov <avb@php.net>
+ * @license  http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @version  Release: @package_version@
+ * @link     http://pear.php.net/package/HTTP_Request2
+ */
+class HTTP_Request2_ConnectionException extends HTTP_Request2_Exception
+{
+}
+
+/**
+ * Exception thrown when sending or receiving HTTP message fails
+ *
+ * The exception may contain both package error code and native error code.
+ *
+ * @category HTTP
+ * @package  HTTP_Request2
+ * @author   Alexey Borzov <avb@php.net>
+ * @license  http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @version  Release: @package_version@
+ * @link     http://pear.php.net/package/HTTP_Request2
+ */
+class HTTP_Request2_MessageException extends HTTP_Request2_Exception
+{
+}
 ?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/HTTP/Request2/LogicException.php Deleted

@@ -1,42 +0,0 @@
-<?php
-/**
- * Exception classes for HTTP_Request2 package
- *
- * PHP version 5
- *
- * LICENSE
- *
- * This source file is subject to BSD 3-Clause License that is bundled
- * with this package in the file LICENSE and available at the URL
- * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
- *
- * @category  HTTP
- * @package   HTTP_Request2
- * @author    Alexey Borzov <avb@php.net>
- * @copyright 2008-2022 Alexey Borzov <avb@php.net>
- * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
- * @link      http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Exception that represents error in the program logic
- *
- * This exception usually implies a programmer's error, like passing invalid
- * data to methods or trying to use PHP extensions that weren't installed or
- * enabled. Usually exceptions of this kind will be thrown before request even
- * starts.
- *
- * The exception will usually contain a package error code.
- *
- * @category HTTP
- * @package  HTTP_Request2
- * @author   Alexey Borzov <avb@php.net>
- * @license  http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
- * @version  Release: @package_version@
- * @link     http://pear.php.net/package/HTTP_Request2
- */
-class HTTP_Request2_LogicException extends HTTP_Request2_Exception
-{
-}
-
-?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/HTTP/Request2/MessageException.php Deleted

@@ -1,37 +0,0 @@
-<?php
-/**
- * Exception classes for HTTP_Request2 package
- *
- * PHP version 5
- *
- * LICENSE
- *
- * This source file is subject to BSD 3-Clause License that is bundled
- * with this package in the file LICENSE and available at the URL
- * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
- *
- * @category  HTTP
- * @package   HTTP_Request2
- * @author    Alexey Borzov <avb@php.net>
- * @copyright 2008-2022 Alexey Borzov <avb@php.net>
- * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
- * @link      http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Exception thrown when sending or receiving HTTP message fails
- *
- * The exception may contain both package error code and native error code.
- *
- * @category HTTP
- * @package  HTTP_Request2
- * @author   Alexey Borzov <avb@php.net>
- * @license  http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
- * @version  Release: @package_version@
- * @link     http://pear.php.net/package/HTTP_Request2
- */
-class HTTP_Request2_MessageException extends HTTP_Request2_Exception
-{
-}
-
-?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/HTTP/Request2/MultipartBody.php Changed

@@ -13,13 +13,13 @@
  * @category  HTTP
  * @package   HTTP_Request2
  * @author    Alexey Borzov <avb@php.net>
- * @copyright 2008-2022 Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
  * @link      http://pear.php.net/package/HTTP_Request2
  */
 
-// pear-package-only /** Exception class for HTTP_Request2 package */
-// pear-package-only require_once 'HTTP/Request2/Exception.php';
+/** Exception class for HTTP_Request2 package */
+require_once 'HTTP/Request2/Exception.php';
 
 /**
  * Class for building multipart/form-data request body
@@ -39,36 +39,31 @@
 {
     /**
      * MIME boundary
-     *
-     * @var string
+     * @var  string
      */
     private $_boundary;
 
     /**
      * Form parameters added via {@link HTTP_Request2::addPostParameter()}
-     *
-     * @var array
+     * @var  array
      */
-    private $_params = ;
+    private $_params = array();
 
     /**
      * File uploads added via {@link HTTP_Request2::addUpload()}
-     *
-     * @var array
+     * @var  array
      */
-    private $_uploads = ;
+    private $_uploads = array();
 
     /**
      * Header for parts with parameters
-     *
-     * @var string
+     * @var  string
      */
     private $_headerParam = "--%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n";
 
     /**
      * Header for parts with uploads
-     *
-     * @var string
+     * @var  string
      */
     private $_headerUpload = "--%s\r\nContent-Disposition: form-data; name=\"%s\"; filename=\"%s\"\r\nContent-Type: %s\r\n\r\n";
 
@@ -78,9 +73,9 @@
      * First number is index of "current" part, second number is position within
      * "current" part
      *
-     * @var array
+     * @var  array
      */
-    private $_pos = 0, 0;
+    private $_pos = array(0, 0);
 
 
     /**
@@ -97,13 +92,13 @@
         $this->_params = self::_flattenArray('', $params, $useBrackets);
         foreach ($uploads as $fieldName => $f) {
             if (!is_array($f'fp')) {
-                $this->_uploads = $f + 'name' => $fieldName;
+                $this->_uploads = $f + array('name' => $fieldName);
             } else {
                 for ($i = 0; $i < count($f'fp'); $i++) {
-                    $upload = 
+                    $upload = array(
                         'name' => ($useBrackets? $fieldName . '' . $i . '': $fieldName)
-                    ;
-                    foreach ('fp', 'filename', 'size', 'type' as $key) {
+                    );
+                    foreach (array('fp', 'filename', 'size', 'type') as $key) {
                         $upload$key = $f$key$i;
                     }
                     $this->_uploads = $upload;
@@ -115,7 +110,7 @@
     /**
      * Returns the length of the body to use in Content-Length header
      *
-     * @return integer
+     * @return   integer
      */
     public function getLength()
     {
@@ -136,7 +131,7 @@
     /**
      * Returns the boundary to use in Content-Type header
      *
-     * @return string
+     * @return   string
      */
     public function getBoundary()
     {
@@ -151,8 +146,8 @@
      *
      * @param integer $length Number of bytes to read
      *
-     * @return string  Up to $length bytes of data, empty string if at end
-     * @throws HTTP_Request2_LogicException
+     * @return   string  Up to $length bytes of data, empty string if at end
+     * @throws   HTTP_Request2_LogicException
      */
     public function read($length)
     {
@@ -204,7 +199,7 @@
                 $length  -= min(strlen($closing) - $this->_pos1, $length);
             }
             if ($length > 0) {
-                $this->_pos     = $this->_pos0 + 1, 0;
+                $this->_pos     = array($this->_pos0 + 1, 0);
             } else {
                 $this->_pos1 += $oldLength;
             }
@@ -216,12 +211,10 @@
      * Sets the current position to the start of the body
      *
      * This allows reusing the same body in another request
-     *
-     * @return void
      */
     public function rewind()
     {
-        $this->_pos = 0, 0;
+        $this->_pos = array(0, 0);
         foreach ($this->_uploads as $u) {
             rewind($u'fp');
         }
@@ -233,7 +226,7 @@
      * Note that it reads all file uploads into memory so it is a good idea not
      * to use this method with large file uploads and rely on read() instead.
      *
-     * @return string
+     * @return   string
      */
     public function __toString()
     {
@@ -250,14 +243,14 @@
      * @param mixed  $values      item's values
      * @param bool   $useBrackets whether to append  to array variables' names
      *
-     * @return array   array with the following items: array('item name', 'item value');
+     * @return   array   array with the following items: array('item name', 'item value');
      */
     private static function _flattenArray($name, $values, $useBrackets)
     {
         if (!is_array($values)) {
-            return $name, $values;
+            return array(array($name, $values));
         } else {
-            $ret = ;
+            $ret = array();
             foreach ($values as $k => $v) {
                 if (empty($name)) {
                     $newName = $k;

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/HTTP/Request2/NotImplementedException.php Deleted

@@ -1,35 +0,0 @@
-<?php
-/**
- * Exception classes for HTTP_Request2 package
- *
- * PHP version 5
- *
- * LICENSE
- *
- * This source file is subject to BSD 3-Clause License that is bundled
- * with this package in the file LICENSE and available at the URL
- * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
- *
- * @category  HTTP
- * @package   HTTP_Request2
- * @author    Alexey Borzov <avb@php.net>
- * @copyright 2008-2022 Alexey Borzov <avb@php.net>
- * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
- * @link      http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Exception thrown in case of missing features
- *
- * @category HTTP
- * @package  HTTP_Request2
- * @author   Alexey Borzov <avb@php.net>
- * @license  http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
- * @version  Release: @package_version@
- * @link     http://pear.php.net/package/HTTP_Request2
- */
-class HTTP_Request2_NotImplementedException extends HTTP_Request2_Exception
-{
-}
-
-?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/HTTP/Request2/Observer/Log.php Changed

@@ -14,15 +14,15 @@
  * @package   HTTP_Request2
  * @author    David Jean Louis <izi@php.net>
  * @author    Alexey Borzov <avb@php.net>
- * @copyright 2008-2022 Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
  * @link      http://pear.php.net/package/HTTP_Request2
  */
 
-// pear-package-only /**
-// pear-package-only  * Exception class for HTTP_Request2 package
-// pear-package-only  */
-// pear-package-only require_once 'HTTP/Request2/Exception.php';
+/**
+ * Exception class for HTTP_Request2 package
+ */
+require_once 'HTTP/Request2/Exception.php';
 
 /**
  * A debug observer useful for debugging / testing.
@@ -83,14 +83,14 @@
      *
      * @var array $events
      */
-    public $events = 
+    public $events = array(
         'connect',
         'sentHeaders',
         'sentBody',
         'receivedHeaders',
         'receivedBody',
         'disconnect',
-    ;
+    );
 
     // }}}
     // __construct() {{{
@@ -104,7 +104,7 @@
      *
      * @return void
      */
-    public function __construct($target = 'php://output', array $events = )
+    public function __construct($target = 'php://output', array $events = array())
     {
         if (!empty($events)) {
             $this->events = $events;
@@ -119,7 +119,6 @@
     // }}}
     // update() {{{
 
-    #ReturnTypeWillChange
     /**
      * Called when the request notifies us of an event.
      *
@@ -149,12 +148,10 @@
             $this->log('> ' . $event'data' . ' byte(s) sent');
             break;
         case 'receivedHeaders':
-            $this->log(
-                sprintf(
-                    '< HTTP/%s %s %s', $event'data'->getVersion(),
-                    $event'data'->getStatus(), $event'data'->getReasonPhrase()
-                )
-            );
+            $this->log(sprintf(
+                '< HTTP/%s %s %s', $event'data'->getVersion(),
+                $event'data'->getStatus(), $event'data'->getReasonPhrase()
+            ));
             $headers = $event'data'->getHeader();
             foreach ($headers as $key => $val) {
                 $this->log('< ' . $key . ': ' . $val);

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/HTTP/Request2/Observer/UncompressingDownload.php Changed

@@ -14,12 +14,12 @@
  * @package   HTTP_Request2
  * @author    Delian Krustev <krustev@krustev.net>
  * @author    Alexey Borzov <avb@php.net>
- * @copyright 2008-2022 Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
  * @link      http://pear.php.net/package/HTTP_Request2
  */
 
-// pear-package-only require_once 'HTTP/Request2/Response.php';
+require_once 'HTTP/Request2/Response.php';
 
 /**
  * An observer that saves response body to stream, possibly uncompressing it
@@ -102,56 +102,48 @@
 {
     /**
      * The stream to write response body to
-     *
      * @var resource
      */
     private $_stream;
 
     /**
-     * 'zlib.inflate' filter possibly added to stream
-     *
+     * zlib.inflate filter possibly added to stream
      * @var resource
      */
     private $_streamFilter;
 
     /**
      * The value of response's Content-Encoding header
-     *
      * @var string
      */
     private $_encoding;
 
     /**
      * Whether the observer is still waiting for gzip/deflate header
-     *
      * @var bool
      */
     private $_processingHeader = true;
 
     /**
      * Starting position in the stream observer writes to
-     *
      * @var int
      */
     private $_startPosition = 0;
 
     /**
      * Maximum bytes to write
-     *
      * @var int|null
      */
     private $_maxDownloadSize;
 
     /**
      * Whether response being received is a redirect
-     *
      * @var bool
      */
     private $_redirect = false;
 
     /**
      * Accumulated body chunks that may contain (gzip) header
-     *
      * @var string
      */
     private $_possibleHeader = '';
@@ -174,7 +166,6 @@
         }
     }
 
-    #ReturnTypeWillChange
     /**
      * Called when the request notifies us of an event.
      *
@@ -194,7 +185,7 @@
         case 'receivedHeaders':
             $this->_processingHeader = true;
             $this->_redirect = $event'data'->isRedirect();
-            $this->_encoding = strtolower($event'data'->getHeader('content-encoding') ?: '');
+            $this->_encoding = strtolower($event'data'->getHeader('content-encoding'));
             $this->_possibleHeader = '';
             break;
 
@@ -256,12 +247,10 @@
             if ($this->_maxDownloadSize
                 && ftell($this->_stream) - $this->_startPosition > $this->_maxDownloadSize
             ) {
-                throw new HTTP_Request2_MessageException(
-                    sprintf(
-                        'Body length limit (%d bytes) reached',
-                        $this->_maxDownloadSize
-                    )
-                );
+                throw new HTTP_Request2_MessageException(sprintf(
+                    'Body length limit (%d bytes) reached',
+                    $this->_maxDownloadSize
+                ));
             }
             break;

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/HTTP/Request2/Response.php Changed

@@ -13,15 +13,15 @@
  * @category  HTTP
  * @package   HTTP_Request2
  * @author    Alexey Borzov <avb@php.net>
- * @copyright 2008-2022 Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
  * @link      http://pear.php.net/package/HTTP_Request2
  */
 
-// pear-package-only /**
-// pear-package-only  * Exception class for HTTP_Request2 package
-// pear-package-only  */
-// pear-package-only require_once 'HTTP/Request2/Exception.php';
+/**
+ * Exception class for HTTP_Request2 package
+ */
+require_once 'HTTP/Request2/Exception.php';
 
 /**
  * Class representing a HTTP response
@@ -55,14 +55,12 @@
 {
     /**
      * HTTP protocol version (e.g. 1.0, 1.1)
-     *
-     * @var string
+     * @var  string
      */
     protected $version;
 
     /**
      * Status code
-     *
      * @var  integer
      * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
      */
@@ -70,7 +68,6 @@
 
     /**
      * Reason phrase
-     *
      * @var  string
      * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
      */
@@ -78,38 +75,34 @@
 
     /**
      * Effective URL (may be different from original request URL in case of redirects)
-     *
-     * @var string
+     * @var  string
      */
     protected $effectiveUrl;
 
     /**
      * Associative array of response headers
-     *
-     * @var array
+     * @var  array
      */
-    protected $headers = ;
+    protected $headers = array();
 
     /**
      * Cookies set in the response
-     *
-     * @var array
+     * @var  array
      */
-    protected $cookies = ;
+    protected $cookies = array();
 
     /**
      * Name of last header processed by parseHederLine()
      *
      * Used to handle the headers that span multiple lines
      *
-     * @var string
+     * @var  string
      */
     protected $lastHeader = null;
 
     /**
      * Response body
-     *
-     * @var string
+     * @var  string
      */
     protected $body = '';
 
@@ -119,7 +112,7 @@
      * cURL provides the decoded body to the callback; if we are reading from
      * socket the body is still gzipped / deflated
      *
-     * @var bool
+     * @var  bool
      */
     protected $bodyEncoded;
 
@@ -129,7 +122,7 @@
      * @var  array
      * @link http://tools.ietf.org/html/rfc2616#section-10
      */
-    protected static $phrases = 
+    protected static $phrases = array(
 
         // 1xx: Informational - Request received, continuing process
         100 => 'Continue',
@@ -186,7 +179,7 @@
         505 => 'HTTP Version Not Supported',
         509 => 'Bandwidth Limit Exceeded',
 
-    ;
+    );
 
     /**
      * Returns the default reason phrase for the given code or all reason phrases
@@ -214,7 +207,7 @@
      * @param bool   $bodyEncoded  Whether body is still encoded by Content-Encoding
      * @param string $effectiveUrl Effective URL of the response
      *
-     * @throws HTTP_Request2_MessageException if status line is invalid according to spec
+     * @throws   HTTP_Request2_MessageException if status line is invalid according to spec
      */
     public function __construct($statusLine, $bodyEncoded = true, $effectiveUrl = null)
     {
@@ -240,8 +233,6 @@
      * empty string in the end.
      *
      * @param string $headerLine Line from HTTP response
-     *
-     * @return void
      */
     public function parseHeaderLine($headerLine)
     {
@@ -252,7 +243,7 @@
             if (!empty($this->headers'set-cookie')) {
                 $cookies = is_array($this->headers'set-cookie')?
                            $this->headers'set-cookie':
-                           $this->headers'set-cookie';
+                           array($this->headers'set-cookie');
                 foreach ($cookies as $cookieString) {
                     $this->parseCookie($cookieString);
                 }
@@ -272,7 +263,7 @@
                 $this->headers$name = $value;
             } else {
                 if (!is_array($this->headers$name)) {
-                    $this->headers$name = $this->headers$name;
+                    $this->headers$name = array($this->headers$name);
                 }
                 $this->headers$name = $value;
             }
@@ -294,18 +285,16 @@
      *
      * @param string $cookieString value of Set-Cookie header
      *
-     * @return void
-     *
-     * @link http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
+     * @link     http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
      */
     protected function parseCookie($cookieString)
     {
-        $cookie = 
+        $cookie = array(
             'expires' => null,
             'domain'  => null,
             'path'    => null,
             'secure'  => false
-        ;
+        );
 
         if (!strpos($cookieString, ';')) {
             // Only a name=value pair
@@ -346,8 +335,6 @@
      * Appends a string to the response body
      *
      * @param string $bodyChunk part of response body
-     *
-     * @return void
      */
     public function appendBody($bodyChunk)
     {
@@ -370,7 +357,7 @@
     /**
      * Returns the status code
      *
-     * @return integer
+     * @return   integer
      */
     public function getStatus()
     {
@@ -380,7 +367,7 @@
     /**
      * Returns the reason phrase
      *
-     * @return string
+     * @return   string
      */
     public function getReasonPhrase()
     {
@@ -390,11 +377,11 @@
     /**
      * Whether response is a redirect that can be automatically handled by HTTP_Request2
      *
-     * @return bool
+     * @return   bool
      */
     public function isRedirect()
     {
-        return in_array($this->code, 300, 301, 302, 303, 307)
+        return in_array($this->code, array(300, 301, 302, 303, 307))
                && isset($this->headers'location');
     }
 
@@ -403,7 +390,7 @@
      *
      * @param string $headerName Name of header to return
      *
-     * @return string|array    Value of $headerName header (null if header is
+     * @return   string|array    Value of $headerName header (null if header is
      *                           not present), array of all response headers if
      *                           $headerName is null
      */
@@ -420,7 +407,7 @@
     /**
      * Returns cookies set in response
      *
-     * @return array
+     * @return   array
      */
     public function getCookies()
     {
@@ -430,13 +417,13 @@
     /**
      * Returns the body of the response
      *
-     * @return string
-     * @throws HTTP_Request2_Exception if body cannot be decoded
+     * @return   string
+     * @throws   HTTP_Request2_Exception if body cannot be decoded
      */
     public function getBody()
     {
         if (0 == strlen($this->body) || !$this->bodyEncoded
-            || !in_array(strtolower($this->getHeader('content-encoding') ?: ''), 'gzip', 'deflate')
+            || !in_array(strtolower($this->getHeader('content-encoding')), array('gzip', 'deflate'))
         ) {
             return $this->body;
 
@@ -449,23 +436,28 @@
             try {
                 switch (strtolower($this->getHeader('content-encoding'))) {
                 case 'gzip':
-                    return self::decodeGzip($this->body);
+                    $decoded = self::decodeGzip($this->body);
                     break;
                 case 'deflate':
-                    return self::decodeDeflate($this->body);
-                }
-            } finally {
-                if (!empty($oldEncoding)) {
-                    mb_internal_encoding($oldEncoding);
+                    $decoded = self::decodeDeflate($this->body);
                 }
+            } catch (Exception $e) {
             }
+
+            if (!empty($oldEncoding)) {
+                mb_internal_encoding($oldEncoding);
+            }
+            if (!empty($e)) {
+                throw $e;
+            }
+            return $decoded;
         }
     }
 
     /**
      * Get the HTTP version of the response
      *
-     * @return string
+     * @return   string
      */
     public function getVersion()
     {
@@ -615,10 +607,10 @@
      *
      * @param string $data gzip-encoded data
      *
-     * @return string  decoded data
-     * @throws HTTP_Request2_LogicException
-     * @throws HTTP_Request2_MessageException
-     * @link   http://tools.ietf.org/html/rfc1952
+     * @return   string  decoded data
+     * @throws   HTTP_Request2_LogicException
+     * @throws   HTTP_Request2_MessageException
+     * @link     http://tools.ietf.org/html/rfc1952
      */
     public static function decodeGzip($data)
     {
@@ -647,16 +639,12 @@
                 'gzinflate() call failed',
                 HTTP_Request2_Exception::DECODE_ERROR
             );
-
-            // GZIP stores the size of the compressed data in bytes modulo
-            // 2^32. To accommodate large file transfers, apply this to the
-            // observed data size. This allows file downloads above 4 GiB.
-        } elseif ((0xffffffff & $dataSize) !== (0xffffffff & strlen($unpacked))) {
+        } elseif ($dataSize != strlen($unpacked)) {
             throw new HTTP_Request2_MessageException(
                 'Data size check failed',
                 HTTP_Request2_Exception::DECODE_ERROR
             );
-        } elseif ((0xffffffff & $dataCrc) !== (0xffffffff & crc32($unpacked))) {
+        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
             throw new HTTP_Request2_MessageException(
                 'Data CRC check failed',
                 HTTP_Request2_Exception::DECODE_ERROR
@@ -670,8 +658,8 @@
      *
      * @param string $data deflate-encoded data
      *
-     * @return string  decoded data
-     * @throws HTTP_Request2_LogicException
+     * @return   string  decoded data
+     * @throws   HTTP_Request2_LogicException
      */
     public static function decodeDeflate($data)
     {

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/HTTP/Request2/SOCKS5.php Changed

@@ -13,13 +13,13 @@
  * @category  HTTP
  * @package   HTTP_Request2
  * @author    Alexey Borzov <avb@php.net>
- * @copyright 2008-2022 Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
  * @link      http://pear.php.net/package/HTTP_Request2
  */
 
-// pear-package-only /** Socket wrapper class used by Socket Adapter */
-// pear-package-only require_once 'HTTP/Request2/SocketWrapper.php';
+/** Socket wrapper class used by Socket Adapter */
+require_once 'HTTP/Request2/SocketWrapper.php';
 
 /**
  * SOCKS5 proxy connection class (used by Socket Adapter)
@@ -49,7 +49,7 @@
      * @throws HTTP_Request2_MessageException
      */
     public function __construct(
-        $address, $timeout = 10, array $contextOptions = ,
+        $address, $timeout = 10, array $contextOptions = array(),
         $username = null, $password = null
     ) {
         parent::__construct($address, $timeout, $contextOptions);
@@ -85,10 +85,9 @@
      * @param string $username Proxy user name
      * @param string $password Proxy password
      *
-     * @return void
      * @throws HTTP_Request2_ConnectionException
      * @throws HTTP_Request2_MessageException
-     * @link   http://tools.ietf.org/html/rfc1929
+     * @link http://tools.ietf.org/html/rfc1929
      */
     protected function performAuthentication($username, $password)
     {
@@ -110,7 +109,6 @@
      * @param string $remoteHost Remote host
      * @param int    $remotePort Remote port
      *
-     * @return void
      * @throws HTTP_Request2_ConnectionException
      * @throws HTTP_Request2_MessageException
      */

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/HTTP/Request2/SocketWrapper.php Changed

@@ -13,13 +13,13 @@
  * @category  HTTP
  * @package   HTTP_Request2
  * @author    Alexey Borzov <avb@php.net>
- * @copyright 2008-2022 Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
  * @link      http://pear.php.net/package/HTTP_Request2
  */
 
-// pear-package-only /** Exception classes for HTTP_Request2 package */
-// pear-package-only require_once 'HTTP/Request2/Exception.php';
+/** Exception classes for HTTP_Request2 package */
+require_once 'HTTP/Request2/Exception.php';
 
 /**
  * Socket wrapper class used by Socket Adapter
@@ -40,28 +40,24 @@
 {
     /**
      * PHP warning messages raised during stream_socket_client() call
-     *
      * @var array
      */
-    protected $connectionWarnings = ;
+    protected $connectionWarnings = array();
 
     /**
      * Connected socket
-     *
      * @var resource
      */
     protected $socket;
 
     /**
      * Sum of start time and global timeout, exception will be thrown if request continues past this time
-     *
-     * @var float
+     * @var  integer
      */
     protected $deadline;
 
     /**
      * Global timeout value, mostly for exception messages
-     *
      * @var integer
      */
     protected $timeout;
@@ -77,36 +73,39 @@
      * @throws HTTP_Request2_LogicException
      * @throws HTTP_Request2_ConnectionException
      */
-    public function __construct($address, $timeout, array $contextOptions = )
+    public function __construct($address, $timeout, array $contextOptions = array())
     {
         if (!empty($contextOptions)
             && !isset($contextOptions'socket') && !isset($contextOptions'ssl')
         ) {
             // Backwards compatibility with 2.1.0 and 2.1.1 releases
-            $contextOptions = 'ssl' => $contextOptions;
+            $contextOptions = array('ssl' => $contextOptions);
         }
         if (isset($contextOptions'ssl')) {
-            $cryptoMethod = STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
-            if (defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT')) {
-                $cryptoMethod |= STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT;
-            }
-            $contextOptions'ssl' += 
+            $contextOptions'ssl' += array(
                 // Using "Intermediate compatibility" cipher bundle from
                 // https://wiki.mozilla.org/Security/Server_Side_TLS
-                'ciphers' =>             'TLS_AES_128_GCM_SHA256:'
-                                         . 'TLS_AES_256_GCM_SHA384:'
-                                         . 'TLS_CHACHA20_POLY1305_SHA256:'
-                                         . 'ECDHE-ECDSA-AES128-GCM-SHA256:'
-                                         . 'ECDHE-RSA-AES128-GCM-SHA256:'
-                                         . 'ECDHE-ECDSA-AES256-GCM-SHA384:'
-                                         . 'ECDHE-RSA-AES256-GCM-SHA384:'
-                                         . 'ECDHE-ECDSA-CHACHA20-POLY1305:'
-                                         . 'ECDHE-RSA-CHACHA20-POLY1305:'
-                                         . 'DHE-RSA-AES128-GCM-SHA256:'
-                                         . 'DHE-RSA-AES256-GCM-SHA384',
-                'disable_compression' => true,
-                'crypto_method'       => $cryptoMethod
-            ;
+                'ciphers' => 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:'
+                             . 'ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:'
+                             . 'DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:'
+                             . 'ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:'
+                             . 'ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:'
+                             . 'ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:'
+                             . 'ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:'
+                             . 'DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:'
+                             . 'DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:'
+                             . 'ECDHE-RSA-DES-CBC3-SHA:ECDHE-ECDSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:'
+                             . 'AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:'
+                             . 'AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:'
+                             . '!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA'
+            );
+            if (version_compare(phpversion(), '5.4.13', '>=')) {
+                $contextOptions'ssl''disable_compression' = true;
+                if (version_compare(phpversion(), '5.6', '>=')) {
+                    $contextOptions'ssl''crypto_method' = STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT
+                                                              | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
+                }
+            }
         }
         $context = stream_context_create();
         foreach ($contextOptions as $wrapper => $options) {
@@ -118,7 +117,7 @@
                 }
             }
         }
-        set_error_handler($this, 'connectionWarningsHandler');
+        set_error_handler(array($this, 'connectionWarningsHandler'));
         $this->socket = stream_socket_client(
             $address, $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $context
         );
@@ -136,9 +135,6 @@
                 "Unable to connect to {$address}. Error: {$error}", 0, $errno
             );
         }
-        // Run socket in non-blocking mode, to prevent possible problems with
-        // HTTPS requests not timing out properly (see bug #21229)
-        stream_set_blocking($this->socket, false);
     }
 
     /**
@@ -154,28 +150,16 @@
      *
      * @param int $length Reads up to this number of bytes
      *
-     * @return string|false Data read from socket by fread()
-     * @throws HTTP_Request2_MessageException     In case of timeout
+     * @return   string Data read from socket
+     * @throws   HTTP_Request2_MessageException     In case of timeout
      */
     public function read($length)
     {
-        // Looks like stream_select() may return true, but then fread() will return an empty string...
-        // For some reason or other happens mostly with servers behind Cloudflare.
-        // Let's do the fread() call in a loop until either an error/eof or non-empty string:
-        do {
-            $data     = false;
-            $timeouts = $this->_getTimeoutsForStreamSelect();
-
-            $r = $this->socket;
-            $w = ;
-            $e = ;
-            if (stream_select($r, $w, $e, $timeouts0, $timeouts1)) {
-                $data = fread($this->socket, $length);
-            }
-
-            $this->checkTimeout();
-        } while ('' === $data && !$this->eof());
-
+        if ($this->deadline) {
+            stream_set_timeout($this->socket, max($this->deadline - time(), 1));
+        }
+        $data = fread($this->socket, $length);
+        $this->checkTimeout();
         return $data;
     }
 
@@ -189,33 +173,37 @@
      * @param int $localTimeout timeout value to use just for this call
      *                          (used when waiting for "100 Continue" response)
      *
-     * @return string Available data up to the newline (not including newline)
-     * @throws HTTP_Request2_MessageException     In case of timeout
+     * @return   string Available data up to the newline (not including newline)
+     * @throws   HTTP_Request2_MessageException     In case of timeout
      */
     public function readLine($bufferSize, $localTimeout = null)
     {
         $line = '';
         while (!feof($this->socket)) {
             if (null !== $localTimeout) {
-                $timeouts = $localTimeout, 0;
-                $started  = microtime(true);
-            } else {
-                $timeouts = $this->_getTimeoutsForStreamSelect();
+                stream_set_timeout($this->socket, $localTimeout);
+            } elseif ($this->deadline) {
+                stream_set_timeout($this->socket, max($this->deadline - time(), 1));
             }
 
-            $r = $this->socket;
-            $w = ;
-            $e = ;
-            if (stream_select($r, $w, $e, $timeouts0, $timeouts1)) {
-                $line .= @fgets($this->socket, $bufferSize);
-            }
+            $line .= @fgets($this->socket, $bufferSize);
 
             if (null === $localTimeout) {
                 $this->checkTimeout();
-            } elseif (microtime(true) - $started > $localTimeout) {
-                throw new HTTP_Request2_MessageException(
-                    "readLine() call timed out", HTTP_Request2_Exception::TIMEOUT
-                );
+
+            } else {
+                $info = stream_get_meta_data($this->socket);
+                // reset socket timeout if we don't have request timeout specified,
+                // prevents further calls failing with a bogus Exception
+                if (!$this->deadline) {
+                    $default = (int)@ini_get('default_socket_timeout');
+                    stream_set_timeout($this->socket, $default > 0 ? $default : PHP_INT_MAX);
+                }
+                if ($info'timed_out') {
+                    throw new HTTP_Request2_MessageException(
+                        "readLine() call timed out", HTTP_Request2_Exception::TIMEOUT
+                    );
+                }
             }
             if (substr($line, -1) == "\n") {
                 return rtrim($line, "\r\n");
@@ -234,39 +222,16 @@
      */
     public function write($data)
     {
-        $totalWritten = 0;
-        while (strlen($data) && !$this->eof()) {
-            $written  = 0;
-            $error    = null;
-            $timeouts = $this->_getTimeoutsForStreamSelect();
-
-            $r = null;
-            $w = $this->socket;
-            $e = null;
-            if (stream_select($r, $w, $e, $timeouts0, $timeouts1)) {
-                set_error_handler(
-                    static function ($errNo, $errStr) use (&$error) {
-                        if (0 !== (E_NOTICE | E_WARNING) & $errNo) {
-                            $error = $errStr;
-                        }
-                    }
-                );
-                $written = fwrite($this->socket, $data);
-                restore_error_handler();
-            }
-            $this->checkTimeout();
-
-            // php_sockop_write() defined in /main/streams/xp_socket.c may return zero written bytes for non-blocking
-            // sockets in case of transient errors. These writes will not have notices raised and should be retried
-            if (false === $written || 0 === $written && null !== $error) {
-                throw new HTTP_Request2_MessageException(
-                    'Error writing request' . (null === $error ? '' : ': ' . $error)
-                );
-            }
-            $data = substr($data, $written);
-            $totalWritten += $written;
+        if ($this->deadline) {
+            stream_set_timeout($this->socket, max($this->deadline - time(), 1));
+        }
+        $written = fwrite($this->socket, $data);
+        $this->checkTimeout();
+        // http://www.php.net/manual/en/function.fwrite.php#96951
+        if ($written < strlen($data)) {
+            throw new HTTP_Request2_MessageException('Error writing request');
         }
-        return $totalWritten;
+        return $written;
     }
 
     /**
@@ -282,22 +247,13 @@
     /**
      * Sets request deadline
      *
-     * If null is passed for $deadline then deadline will be calculated based
-     * on default_socket_timeout PHP setting. This is done to keep BC with previous
-     * versions that used blocking sockets.
-     *
-     * @param float|null $deadline Exception will be thrown if request continues
-     *                             past this time
-     * @param int        $timeout  Original request timeout value, to use in
-     *                             Exception message
-     *
-     * @return void
+     * @param int $deadline Exception will be thrown if request continues
+     *                      past this time
+     * @param int $timeout  Original request timeout value, to use in
+     *                      Exception message
      */
     public function setDeadline($deadline, $timeout)
     {
-        if (null === $deadline && 0 < ($defaultTimeout = (int)ini_get('default_socket_timeout'))) {
-            $deadline = microtime(true) + $defaultTimeout;
-        }
         $this->deadline = $deadline;
         $this->timeout  = $timeout;
     }
@@ -305,39 +261,34 @@
     /**
      * Turns on encryption on a socket
      *
-     * @return void
      * @throws HTTP_Request2_ConnectionException
      */
     public function enableCrypto()
     {
-        $cryptoMethod = STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
-        if (defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT')) {
-            $cryptoMethod |= STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT;
+        if (version_compare(phpversion(), '5.6', '<')) {
+            $cryptoMethod = STREAM_CRYPTO_METHOD_TLS_CLIENT;
+        } else {
+            $cryptoMethod = STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT
+                            | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
         }
 
-        try {
-            stream_set_blocking($this->socket, true);
-            if (!stream_socket_enable_crypto($this->socket, true, $cryptoMethod)) {
-                throw new HTTP_Request2_ConnectionException(
-                    'Failed to enable secure connection when connecting through proxy'
-                );
-            }
-        } finally {
-            stream_set_blocking($this->socket, false);
+        if (!stream_socket_enable_crypto($this->socket, true, $cryptoMethod)) {
+            throw new HTTP_Request2_ConnectionException(
+                'Failed to enable secure connection when connecting through proxy'
+            );
         }
     }
 
     /**
      * Throws an Exception if stream timed out
      *
-     * @return void
      * @throws HTTP_Request2_MessageException
      */
     protected function checkTimeout()
     {
         $info = stream_get_meta_data($this->socket);
-        if ($info'timed_out' || $this->deadline && microtime(true) > $this->deadline) {
-            $reason = $this->timeout
+        if ($info'timed_out' || $this->deadline && time() > $this->deadline) {
+            $reason = $this->deadline
                 ? "after {$this->timeout} second(s)"
                 : 'due to default_socket_timeout php.ini setting';
             throw new HTTP_Request2_MessageException(
@@ -347,27 +298,6 @@
     }
 
     /**
-     * Returns timeouts based on deadline for use with stream_select()
-     *
-     * @return array First element is $tv_sec parameter for stream_select(),
-     *               second element is $tv_usec
-     */
-    private function _getTimeoutsForStreamSelect()
-    {
-        if (!$this->deadline) {
-            return null, null;
-        }
-        $parts = array_map(
-            'intval',
-            explode('.', sprintf('%.6F', $this->deadline - microtime(true)))
-        );
-        if (0 > $parts0 || 0 === $parts0 && $parts1 < 50000) {
-            return 0, 50000;
-        }
-        return $parts;
-    }
-
-    /**
      * Error handler to use during stream_socket_client() call
      *
      * One stream_socket_client() call may produce *multiple* PHP warnings

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/README.md Changed

@@ -1,7 +1,7 @@
 
 # HTTP_Request2
 
-!Build Status(https://github.com/pear/HTTP_Request2/workflows/Continuous%20Integration/badge.svg?branch=trunk)(https://github.com/pear/HTTP_Request2/actions?query=branch%3Atrunk+workflow%3A%22Continuous+Integration%22)
+!Build Status(https://travis-ci.org/pear/HTTP_Request2.svg?branch=trunk)(https://travis-ci.org/pear/HTTP_Request2)
 
 Provides an easy way to perform HTTP requests, uses pluggable adapters
 
@@ -15,32 +15,19 @@
 
 This package is PEAR HTTP_Request2 and has been migrated from PEAR SVN
 
-Please report all issues via the GitHub issues.
+Please report all issues via the PEAR bug tracker.
 
 Pull requests are welcome.
 
-PEAR HTTP_Request: https://pear.php.net/package/HTTP_Request/
-PEAR HTTP_Request2: https://pear.php.net/package/HTTP_Request2/
+PEAR HTTP_Request: http://pear.php.net/package/HTTP_Request/
+PEAR HTTP_Request2: http://pear.php.net/package/HTTP_Request2/
 PEAR SVN: https://svn.php.net/repository/pear/packages/HTTP_Request2
-GitHub issues: https://github.com/pear/HTTP_Request2/issues
-
-## Installation
-
-The package may be installed either with PEAR
-
-    $ pear install HTTP_Request2
-
-or with composer
-
-    $ composer require pear/http_request2
-
-Since release 2.4 composer installation relies completely on autoloading and does not contain `require_once` calls or 
-use `include-path` option.
+PEAR bug tracker: http://pear.php.net/bugs/search.php?cmd=display&package_name=HTTP_Request2
 
 ## Basic usage
 
 ```PHP
-require_once 'HTTP/Request2.php'; // Only when installed with PEAR
+require_once 'HTTP/Request2.php';
 
 $request = new HTTP_Request2('http://pear.php.net/', HTTP_Request2::METHOD_GET);
 try {
@@ -60,38 +47,36 @@
 
 ...is available on PEAR website
 
- * Numerous configuration options(https://pear.php.net/manual/en/package.http.http-request2.config.php)
- * How to populate the request object(https://pear.php.net/manual/en/package.http.http-request2.request.php)
- * Description of available adapters(https://pear.php.net/manual/en/package.http.http-request2.adapters.php)
- * Processing of HTTP response(https://pear.php.net/manual/en/package.http.http-request2.response.php)
- * Monitoring the progress of request with observers(https://pear.php.net/manual/en/package.http.http-request2.observers.php)
- * Possible exceptions(https://pear.php.net/manual/en/package.http.http-request2.exceptions.php)
+ * Numerous configuration options(http://pear.php.net/manual/en/package.http.http-request2.config.php)
+ * How to populate the request object(http://pear.php.net/manual/en/package.http.http-request2.request.php)
+ * Description of available adapters(http://pear.php.net/manual/en/package.http.http-request2.adapters.php)
+ * Processing of HTTP response(http://pear.php.net/manual/en/package.http.http-request2.response.php)
+ * Monitoring the progress of request with observers(http://pear.php.net/manual/en/package.http.http-request2.observers.php)
+ * Possible exceptions(http://pear.php.net/manual/en/package.http.http-request2.exceptions.php)
 
-Generated API documentation(https://pear.php.net/package/HTTP_Request2/docs/latest/) for the current release is also there.
+Generated API documentation(http://pear.php.net/package/HTTP_Request2/docs/latest/) for the current release is also there.
 
 ## Testing, Packaging and Installing (Pear)
 
-To test, run
+To test, run either
 
     $ phpunit tests/
 
-after installing dependencies with composer. You can also test the installed package with
-
-    $ phpunit PEAR tests dir/HTTP_Request2
+or
 
-Since PEAR package needs its `require_once` statements re-enabled, please run the helper file before packaging and
-installing
+    $ pear run-tests -r
 
-    $ php pear-package-helper.php
+You may need to set up the NetworkConfig.php file if you want to perform tests that interact with a web server.
+Its template is NetworkConfig.php.dist file, consult it for the details.
 
-Then to build, simply
+To build, simply
 
-    $ pear package .pear-package/package.xml
+    $ pear package
 
 To install from scratch
 
-    $ pear install .pear-package/package.xml
+    $ pear install package.xml
 
 To upgrade
 
-    $ pear upgrade -f .pear-package/package.xml
+    $ pear upgrade -f package.xml

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

@@ -3,7 +3,7 @@
     "description" : "Provides an easy way to perform HTTP requests.",
     "type"        : "library",
     "keywords"    :  "http", "request", "pear", "curl" ,
-    "homepage"    : "https://pear.php.net/package/HTTP_Request2",
+    "homepage"    : "http://pear.php.net/package/HTTP_Request2",
     "license"     : "BSD-3-Clause",
     "authors"     : 
         {
@@ -12,30 +12,31 @@
         }
     ,
     "support": {
-        "issues": "https://github.com/pear/HTTP_Request2/issues",
-        "source": "https://github.com/pear/HTTP_Request2",
-        "docs":   "https://pear.php.net/manual/en/package.http.http-request2.php"
+        "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name=HTTP_Request2",
+        "source": "https://github.com/pear/HTTP_Request2"
     },
     "require"     : {
-        "php"                 : ">=5.6.0",
+        "php"                 : ">=5.2.0",
         "pear/net_url2"       : "^2.2.0",
         "pear/pear_exception" : "^1.0.0"
     },
-    "require-dev": {
-        "yoast/phpunit-polyfills" : "^1.0.0"
-    },
     "suggest"     : {
         "ext-fileinfo" : "Adds support for looking up mime-types using finfo.",
         "ext-zlib"     : "Allows handling gzip compressed responses.",
-        "ext-curl"     : "Allows using cURL as a request backend.",
-        "ext-openssl"  : "Allows handling SSL requests when not using cURL."
+        "lib-curl"     : "Allows using cURL as a request backend.",
+        "lib-openssl"  : "Allows handling SSL requests when not using cURL."
     },
     "autoload": {
         "psr-0": {
             "HTTP_Request2" : ""
         }
     },
-    "autoload-dev": {
-        "classmap": "tests"
+    "include-path": 
+        "./"
+    ,
+    "extra": {
+        "branch-alias": {
+            "dev-trunk": "2.2-dev"
+        }
     }
 }

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/data/generate-list.php Changed

@@ -12,7 +12,7 @@
 /** URL to download Public Suffix List from */
 define('LIST_URL',    'https://publicsuffix.org/list/public_suffix_list.dat');
 /** Name of PHP file to write */
-define('OUTPUT_FILE', __DIR__ . '/public-suffix-list.php');
+define('OUTPUT_FILE', dirname(__FILE__) . '/public-suffix-list.php');
 
 require_once 'HTTP/Request2.php';
 
@@ -21,7 +21,7 @@
     $part = trim(array_pop($tldParts));
 
     if (!array_key_exists($part, $node)) {
-        $node$part = ;
+        $node$part = array();
     }
 
     if (0 < count($tldParts)) {
@@ -41,7 +41,7 @@
     if (0 == ($count = count($valueTree))) {
         fwrite($fp, 'true');
     } else {
-        fwrite($fp, "\n");
+        fwrite($fp, "array(\n");
         for ($keys = array_keys($valueTree), $i = 0; $i < $count; $i++) {
             writeNode($fp, $valueTree$keys$i, $keys$i, $indent + 1);
             if ($i + 1 != $count) {
@@ -50,17 +50,17 @@
                 fwrite($fp, "\n");
             }
         }
-        fwrite($fp, str_repeat(' ', $indent) . "");
+        fwrite($fp, str_repeat(' ', $indent) . ")");
     }
 }
 
 
 try {
-    $request  = new HTTP_Request2(LIST_URL, HTTP_Request2::METHOD_GET, 
+    $request  = new HTTP_Request2(LIST_URL, HTTP_Request2::METHOD_GET, array(
         // Provide path to your CA file and change 'ssl_verify_peer' to true to enable peer validation
         // 'ssl_cafile' => '... path to your Certificate Authority file ...',
         'ssl_verify_peer' => false
-    );
+    ));
     $response = $request->send();
     if (200 != $response->getStatus()) {
         throw new Exception("List download URL returned status: " .
@@ -70,7 +70,7 @@
     if (false === strpos($list, '// ===BEGIN ICANN DOMAINS===')) {
         throw new Exception("List download URL does not contain expected phrase");
     }
-    if (!($fp = @fopen(OUTPUT_FILE, 'wb'))) {
+    if (!($fp = @fopen(OUTPUT_FILE, 'wt'))) {
         throw new Exception("Unable to open " . OUTPUT_FILE);
     }
 
@@ -78,7 +78,7 @@
     die($e->getMessage());
 }
 
-$tldTree = ;
+$tldTree = array();
 $license = true;
 
 fwrite($fp, "<?php\n");

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/data/public-suffix-list.php Changed

@@ -1,25 +1,21 @@
 <?php
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-// Please pull this list from, and only from https://publicsuffix.org/list/public_suffix_list.dat,
-// rather than any other VCS sites. Pulling from any other URL is not guaranteed to be supported.
-// Instructions on pulling and using this list can be found at https://publicsuffix.org/list/.
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-return 
- 'ac' => 
+return array(
+ 'ac' => array(
   'com' => true,
   'edu' => true,
   'gov' => true,
   'net' => true,
   'mil' => true,
-  'org' => true,
-  'drr' => true
- ,
- 'ad' => 
+  'org' => true
+ ),
+ 'ad' => array(
   'nom' => true
- ,
- 'ae' => 
+ ),
+ 'ae' => array(
   'co' => true,
   'net' => true,
   'org' => true,
@@ -28,8 +24,8 @@
   'gov' => true,
   'mil' => true,
   'blogspot' => true
- ,
- 'aero' => 
+ ),
+ 'aero' => array(
   'accident-investigation' => true,
   'accident-prevention' => true,
   'aerobatic' => true,
@@ -74,6 +70,7 @@
   'express' => true,
   'federation' => true,
   'flight' => true,
+  'freight' => true,
   'fuel' => true,
   'gliding' => true,
   'government' => true,
@@ -116,29 +113,28 @@
   'union' => true,
   'workinggroup' => true,
   'works' => true
- ,
- 'af' => 
+ ),
+ 'af' => array(
   'gov' => true,
   'com' => true,
   'org' => true,
   'net' => true,
   'edu' => true
- ,
- 'ag' => 
+ ),
+ 'ag' => array(
   'com' => true,
   'org' => true,
   'net' => true,
   'co' => true,
   'nom' => true
- ,
- 'ai' => 
+ ),
+ 'ai' => array(
   'off' => true,
   'com' => true,
   'net' => true,
-  'org' => true,
-  'uwu' => true
- ,
- 'al' => 
+  'org' => true
+ ),
+ 'al' => array(
   'com' => true,
   'edu' => true,
   'gov' => true,
@@ -146,129 +142,78 @@
   'net' => true,
   'org' => true,
   'blogspot' => true
- ,
- 'am' => 
-  'co' => true,
-  'com' => true,
-  'commune' => true,
-  'net' => true,
-  'org' => true,
-  'radio' => true,
-  'blogspot' => true,
-  'neko' => true,
-  'nyaa' => true
- ,
- 'ao' => 
+ ),
+ 'am' => array(
+  'blogspot' => true
+ ),
+ 'ao' => array(
   'ed' => true,
   'gv' => true,
   'og' => true,
   'co' => true,
   'pb' => true,
   'it' => true
- ,
+ ),
  'aq' => true,
- 'ar' => 
-  'bet' => true,
-  'com' => 
+ 'ar' => array(
+  'com' => array(
    'blogspot' => true
-  ,
-  'coop' => true,
+  ),
   'edu' => true,
   'gob' => true,
   'gov' => true,
   'int' => true,
   'mil' => true,
-  'musica' => true,
-  'mutual' => true,
   'net' => true,
   'org' => true,
-  'senasa' => true,
   'tur' => true
- ,
- 'arpa' => 
+ ),
+ 'arpa' => array(
   'e164' => true,
   'in-addr' => true,
   'ip6' => true,
   'iris' => true,
   'uri' => true,
   'urn' => true
- ,
- 'as' => 
+ ),
+ 'as' => array(
   'gov' => true
- ,
- 'asia' => 
-  'cloudns' => true
- ,
- 'at' => 
-  'ac' => 
-   'sth' => true
-  ,
-  'co' => 
+ ),
+ 'asia' => true,
+ 'at' => array(
+  'ac' => true,
+  'co' => array(
    'blogspot' => true
-  ,
+  ),
   'gv' => true,
   'or' => true,
-  'funkfeuer' => 
-   'wien' => true
-  ,
-  'futurecms' => 
-   '*' => true,
-   'ex' => 
-    '*' => true
-   ,
-   'in' => 
-    '*' => true
-   
-  ,
-  'futurehosting' => true,
-  'futuremailing' => true,
-  'ortsinfo' => 
-   'ex' => 
-    '*' => true
-   ,
-   'kunden' => 
-    '*' => true
-   
-  ,
   'biz' => true,
   'info' => true,
-  'priv' => true,
-  'myspreadshop' => true,
-  '12hp' => true,
-  '2ix' => true,
-  '4lima' => true,
-  'lima-city' => true
- ,
- 'au' => 
-  'com' => 
-   'blogspot' => true,
-   'cloudlets' => 
-    'mel' => true
-   ,
-   'myspreadshop' => true
-  ,
+  'priv' => true
+ ),
+ 'au' => array(
+  'com' => array(
+   'blogspot' => true
+  ),
   'net' => true,
   'org' => true,
-  'edu' => 
+  'edu' => array(
    'act' => true,
-   'catholic' => true,
-   'nsw' => 
-    'schools' => true
-   ,
+   'nsw' => true,
    'nt' => true,
    'qld' => true,
    'sa' => true,
    'tas' => true,
    'vic' => true,
    'wa' => true
-  ,
-  'gov' => 
+  ),
+  'gov' => array(
    'qld' => true,
    'sa' => true,
    'tas' => true,
    'vic' => true,
    'wa' => true
-  ,
+  ),
   'asn' => true,
   'id' => true,
   'info' => true,
@@ -282,21 +227,12 @@
   'tas' => true,
   'vic' => true,
   'wa' => true
- ,
- 'aw' => 
+ ),
+ 'aw' => array(
   'com' => true
- ,
- 'ax' => 
-  'be' => true,
-  'cat' => true,
-  'es' => true,
-  'eu' => true,
-  'gg' => true,
-  'mc' => true,
-  'us' => true,
-  'xy' => true
- ,
- 'az' => 
+ ),
+ 'ax' => true,
+ 'az' => array(
   'com' => true,
   'net' => true,
   'int' => true,
@@ -309,18 +245,21 @@
   'name' => true,
   'pro' => true,
   'biz' => true
- ,
- 'ba' => 
-  'com' => true,
+ ),
+ 'ba' => array(
+  'org' => true,
+  'net' => true,
   'edu' => true,
   'gov' => true,
   'mil' => true,
-  'net' => true,
-  'org' => true,
+  'unsa' => true,
+  'unbi' => true,
+  'co' => true,
+  'com' => true,
   'rs' => true,
   'blogspot' => true
- ,
- 'bb' => 
+ ),
+ 'bb' => array(
   'biz' => true,
   'co' => true,
   'com' => true,
@@ -331,29 +270,18 @@
   'org' => true,
   'store' => true,
   'tv' => true
- ,
- 'bd' => 
+ ),
+ 'bd' => array(
   '*' => true
- ,
- 'be' => 
+ ),
+ 'be' => array(
   'ac' => true,
-  'webhosting' => true,
-  'blogspot' => true,
-  'interhostsolutions' => 
-   'cloud' => true
-  ,
-  'kuleuven' => 
-   'ezproxy' => true
-  ,
-  'myspreadshop' => true,
-  'transurl' => 
-   '*' => true
-  
- ,
- 'bf' => 
+  'blogspot' => true
+ ),
+ 'bf' => array(
   'gov' => true
- ,
- 'bg' => 
+ ),
+ 'bg' => array(
   'a' => true,
   'b' => true,
   'c' => true,
@@ -390,26 +318,23 @@
   '7' => true,
   '8' => true,
   '9' => true,
-  'blogspot' => true,
-  'barsy' => true
- ,
- 'bh' => 
+  'blogspot' => true
+ ),
+ 'bh' => array(
   'com' => true,
   'edu' => true,
   'net' => true,
   'org' => true,
   'gov' => true
- ,
- 'bi' => 
+ ),
+ 'bi' => array(
   'co' => true,
   'com' => true,
   'edu' => true,
   'or' => true,
   'org' => true
- ,
- 'biz' => 
-  'cloudns' => true,
-  'jozi' => true,
+ ),
+ 'biz' => array(
   'dyndns' => true,
   'for-better' => true,
   'for-more' => true,
@@ -417,324 +342,147 @@
   'for-the' => true,
   'selfip' => true,
   'webhop' => true,
-  'orx' => true,
-  'mmafan' => true,
-  'myftp' => true,
-  'no-ip' => true,
   'dscloud' => true
- ,
- 'bj' => 
+ ),
+ 'bj' => array(
   'asso' => true,
   'barreau' => true,
   'gouv' => true,
   'blogspot' => true
- ,
- 'bm' => 
+ ),
+ 'bm' => array(
   'com' => true,
   'edu' => true,
   'gov' => true,
   'net' => true,
   'org' => true
- ,
- 'bn' => 
+ ),
+ 'bn' => array(
+  '*' => true
+ ),
+ 'bo' => array(
   'com' => true,
   'edu' => true,
   'gov' => true,
-  'net' => true,
-  'org' => true,
-  'co' => true
- ,
- 'bo' => 
-  'com' => true,
-  'edu' => true,
   'gob' => true,
   'int' => true,
   'org' => true,
   'net' => true,
   'mil' => true,
-  'tv' => true,
-  'web' => true,
-  'academia' => true,
-  'agro' => true,
-  'arte' => true,
-  'blog' => true,
-  'bolivia' => true,
-  'ciencia' => true,
-  'cooperativa' => true,
-  'democracia' => true,
-  'deporte' => true,
-  'ecologia' => true,
-  'economia' => true,
-  'empresa' => true,
-  'indigena' => true,
-  'industria' => true,
-  'info' => true,
-  'medicina' => true,
-  'movimiento' => true,
-  'musica' => true,
-  'natural' => true,
-  'nombre' => true,
-  'noticias' => true,
-  'patria' => true,
-  'politica' => true,
-  'profesional' => true,
-  'plurinacional' => true,
-  'pueblo' => true,
-  'revista' => true,
-  'salud' => true,
-  'tecnologia' => true,
-  'tksat' => true,
-  'transporte' => true,
-  'wiki' => true
- ,
- 'br' => 
-  '9guacu' => true,
-  'abc' => true,
+  'tv' => true
+ ),
+ 'br' => array(
   'adm' => true,
   'adv' => true,
   'agr' => true,
-  'aju' => true,
   'am' => true,
-  'anani' => true,
-  'aparecida' => true,
-  'app' => true,
   'arq' => true,
   'art' => true,
   'ato' => true,
   'b' => true,
-  'barueri' => true,
-  'belem' => true,
-  'bhz' => true,
-  'bib' => true,
   'bio' => true,
   'blog' => true,
   'bmd' => true,
-  'boavista' => true,
-  'bsb' => true,
-  'campinagrande' => true,
-  'campinas' => true,
-  'caxias' => true,
   'cim' => true,
   'cng' => true,
   'cnt' => true,
-  'com' => 
-   'blogspot' => true,
-   'virtualcloud' => 
-    'scale' => 
-     'users' => true
-    
-   
-  ,
-  'contagem' => true,
+  'com' => array(
+   'blogspot' => true
+  ),
   'coop' => true,
-  'coz' => true,
-  'cri' => true,
-  'cuiaba' => true,
-  'curitiba' => true,
-  'def' => true,
-  'des' => true,
-  'det' => true,
-  'dev' => true,
   'ecn' => true,
   'eco' => true,
   'edu' => true,
   'emp' => true,
-  'enf' => true,
   'eng' => true,
   'esp' => true,
   'etc' => true,
   'eti' => true,
   'far' => true,
-  'feira' => true,
   'flog' => true,
-  'floripa' => true,
   'fm' => true,
   'fnd' => true,
-  'fortal' => true,
   'fot' => true,
-  'foz' => true,
   'fst' => true,
   'g12' => true,
-  'geo' => true,
   'ggf' => true,
-  'goiania' => true,
-  'gov' => 
-   'ac' => true,
-   'al' => true,
-   'am' => true,
-   'ap' => true,
-   'ba' => true,
-   'ce' => true,
-   'df' => true,
-   'es' => true,
-   'go' => true,
-   'ma' => true,
-   'mg' => true,
-   'ms' => true,
-   'mt' => true,
-   'pa' => true,
-   'pb' => true,
-   'pe' => true,
-   'pi' => true,
-   'pr' => true,
-   'rj' => true,
-   'rn' => true,
-   'ro' => true,
-   'rr' => true,
-   'rs' => true,
-   'sc' => true,
-   'se' => true,
-   'sp' => true,
-   'to' => true
-  ,
-  'gru' => true,
+  'gov' => true,
   'imb' => true,
   'ind' => true,
   'inf' => true,
-  'jab' => true,
-  'jampa' => true,
-  'jdf' => true,
-  'joinville' => true,
   'jor' => true,
   'jus' => true,
-  'leg' => 
-   'ac' => true,
-   'al' => true,
-   'am' => true,
-   'ap' => true,
-   'ba' => true,
-   'ce' => true,
-   'df' => true,
-   'es' => true,
-   'go' => true,
-   'ma' => true,
-   'mg' => true,
-   'ms' => true,
-   'mt' => true,
-   'pa' => true,
-   'pb' => true,
-   'pe' => true,
-   'pi' => true,
-   'pr' => true,
-   'rj' => true,
-   'rn' => true,
-   'ro' => true,
-   'rr' => true,
-   'rs' => true,
-   'sc' => true,
-   'se' => true,
-   'sp' => true,
-   'to' => true
-  ,
+  'leg' => true,
   'lel' => true,
-  'log' => true,
-  'londrina' => true,
-  'macapa' => true,
-  'maceio' => true,
-  'manaus' => true,
-  'maringa' => true,
   'mat' => true,
   'med' => true,
   'mil' => true,
-  'morena' => true,
   'mp' => true,
   'mus' => true,
-  'natal' => true,
   'net' => true,
-  'niteroi' => true,
-  'nom' => 
+  'nom' => array(
    '*' => true
-  ,
+  ),
   'not' => true,
   'ntr' => true,
   'odo' => true,
-  'ong' => true,
   'org' => true,
-  'osasco' => true,
-  'palmas' => true,
-  'poa' => true,
   'ppg' => true,
   'pro' => true,
   'psc' => true,
   'psi' => true,
-  'pvh' => true,
   'qsl' => true,
   'radio' => true,
   'rec' => true,
-  'recife' => true,
-  'rep' => true,
-  'ribeirao' => true,
-  'rio' => true,
-  'riobranco' => true,
-  'riopreto' => true,
-  'salvador' => true,
-  'sampa' => true,
-  'santamaria' => true,
-  'santoandre' => true,
-  'saobernardo' => true,
-  'saogonca' => true,
-  'seg' => true,
-  'sjc' => true,
   'slg' => true,
-  'slz' => true,
-  'sorocaba' => true,
   'srv' => true,
   'taxi' => true,
-  'tc' => true,
-  'tec' => true,
   'teo' => true,
-  'the' => true,
   'tmp' => true,
   'trd' => true,
   'tur' => true,
   'tv' => true,
-  'udi' => true,
   'vet' => true,
-  'vix' => true,
   'vlog' => true,
   'wiki' => true,
   'zlg' => true
- ,
- 'bs' => 
+ ),
+ 'bs' => array(
   'com' => true,
   'net' => true,
   'org' => true,
   'edu' => true,
-  'gov' => true,
-  'we' => true
- ,
- 'bt' => 
+  'gov' => true
+ ),
+ 'bt' => array(
   'com' => true,
   'edu' => true,
   'gov' => true,
   'net' => true,
   'org' => true
- ,
+ ),
  'bv' => true,
- 'bw' => 
+ 'bw' => array(
   'co' => true,
   'org' => true
- ,
- 'by' => 
+ ),
+ 'by' => array(
   'gov' => true,
   'mil' => true,
-  'com' => 
+  'com' => array(
    'blogspot' => true
-  ,
-  'of' => true,
-  'mycloud' => true,
-  'mediatech' => true
- ,
- 'bz' => 
+  ),
+  'of' => true
+ ),
+ 'bz' => array(
   'com' => true,
   'net' => true,
   'org' => true,
   'edu' => true,
   'gov' => true,
-  'za' => true,
-  'gsj' => true
- ,
- 'ca' => 
+  'za' => true
+ ),
+ 'ca' => array(
   'ab' => true,
   'bc' => true,
   'mb' => true,
@@ -750,61 +498,27 @@
   'sk' => true,
   'yk' => true,
   'gc' => true,
-  'barsy' => true,
-  'awdev' => 
-   '*' => true
-  ,
   'co' => true,
-  'blogspot' => true,
-  'no-ip' => true,
-  'myspreadshop' => true
- ,
+  'blogspot' => true
+ ),
  'cat' => true,
- 'cc' => 
-  'cloudns' => true,
+ 'cc' => array(
   'ftpaccess' => true,
   'game-server' => true,
   'myphotos' => true,
-  'scrapping' => true,
-  'twmail' => true,
-  'csx' => true,
-  'fantasyleague' => true,
-  'spawn' => 
-   'instances' => true
-  
- ,
- 'cd' => 
+  'scrapping' => true
+ ),
+ 'cd' => array(
   'gov' => true
- ,
- 'cf' => 
+ ),
+ 'cf' => array(
   'blogspot' => true
- ,
+ ),
  'cg' => true,
- 'ch' => 
-  'square7' => true,
-  'blogspot' => true,
-  'flow' => 
-   'ae' => 
-    'alp1' => true
-   ,
-   'appengine' => true
-  ,
-  'linkyard-cloud' => true,
-  'dnsking' => true,
-  'gotdns' => true,
-  'myspreadshop' => true,
-  'firenet' => 
-   '*' => true,
-   'svc' => 
-    '*' => true
-   
-  ,
-  '12hp' => true,
-  '2ix' => true,
-  '4lima' => true,
-  'lima-city' => true
- ,
- 'ci' => 
+ 'ch' => array(
+  'blogspot' => true
+ ),
+ 'ci' => array(
   'org' => true,
   'or' => true,
   'com' => true,
@@ -819,46 +533,34 @@
   'int' => true,
   'presse' => true,
   'md' => true,
-  'gouv' => true,
-  'fin' => true,
-  'nl' => true
- ,
- 'ck' => 
+  'gouv' => true
+ ),
+ 'ck' => array(
   '*' => true,
   '!www' => true
- ,
- 'cl' => 
-  'co' => true,
-  'gob' => true,
+ ),
+ 'cl' => array(
   'gov' => true,
+  'gob' => true,
+  'co' => true,
   'mil' => true,
   'blogspot' => true
- ,
- 'cm' => 
+ ),
+ 'cm' => array(
   'co' => true,
   'com' => true,
   'gov' => true,
   'net' => true
- ,
- 'cn' => 
+ ),
+ 'cn' => array(
   'ac' => true,
-  'com' => 
-   'amazonaws' => 
-    'compute' => 
-     '*' => true
-    ,
-    'eb' => 
-     'cn-north-1' => true,
-     'cn-northwest-1' => true
-    ,
-    'elb' => 
-     '*' => true
-    ,
-    'cn-north-1' => 
+  'com' => array(
+   'amazonaws' => array(
+    'cn-north-1' => array(
      's3' => true
-    
-   
-  ,
+    )
+   )
+  ),
   'edu' => true,
   'gov' => true,
   'net' => true,
@@ -901,13 +603,17 @@
   'hk' => true,
   'mo' => true,
   'tw' => true,
-  'instantcloud' => true
- ,
- 'co' => 
+  'amazonaws' => array(
+   'compute' => array(
+    'cn-north-1' => true
+   )
+  )
+ ),
+ 'co' => array(
   'arts' => true,
-  'com' => 
+  'com' => array(
    'blogspot' => true
-  ,
+  ),
   'edu' => true,
   'firm' => true,
   'gov' => true,
@@ -918,225 +624,76 @@
   'nom' => true,
   'org' => true,
   'rec' => true,
-  'web' => true,
-  'carrd' => true,
-  'crd' => true,
-  'otap' => 
-   '*' => true
-  ,
-  'leadpages' => true,
-  'lpages' => true,
-  'mypi' => true,
-  'n4t' => true,
-  'repl' => 
-   'id' => true
-  ,
-  'supabase' => true
- ,
- 'com' => 
-  'devcdnaccesso' => 
-   '*' => true
-  ,
-  'adobeaemcloud' => 
-   'dev' => 
-    '*' => true
-   
-  ,
-  'kasserver' => true,
-  'amazonaws' => 
-   'compute' => 
-    '*' => true
-   ,
-   'compute-1' => 
-    '*' => true
-   ,
-   'us-east-1' => 
-    'dualstack' => 
-     's3' => true
-    
-   ,
-   'elb' => 
-    '*' => true
-   ,
+  'web' => true
+ ),
+ 'com' => array(
+  'amazonaws' => array(
+   'compute' => array(
+    'ap-northeast-1' => true,
+    'ap-northeast-2' => true,
+    'ap-southeast-1' => true,
+    'ap-southeast-2' => true,
+    'eu-central-1' => true,
+    'eu-west-1' => true,
+    'sa-east-1' => true,
+    'us-gov-west-1' => true,
+    'us-west-1' => true,
+    'us-west-2' => true
+   ),
+   'compute-1' => array(
+    'z-1' => true,
+    'z-2' => true
+   ),
+   'us-east-1' => true,
+   'elb' => true,
    's3' => true,
    's3-ap-northeast-1' => true,
    's3-ap-northeast-2' => true,
-   's3-ap-south-1' => true,
    's3-ap-southeast-1' => true,
    's3-ap-southeast-2' => true,
-   's3-ca-central-1' => true,
    's3-eu-central-1' => true,
    's3-eu-west-1' => true,
-   's3-eu-west-2' => true,
-   's3-eu-west-3' => true,
    's3-external-1' => true,
+   's3-external-2' => true,
    's3-fips-us-gov-west-1' => true,
    's3-sa-east-1' => true,
    's3-us-gov-west-1' => true,
-   's3-us-east-2' => true,
    's3-us-west-1' => true,
    's3-us-west-2' => true,
-   'ap-northeast-2' => 
-    's3' => true,
-    'dualstack' => 
-     's3' => true
-    ,
-    's3-website' => true
-   ,
-   'ap-south-1' => 
-    's3' => true,
-    'dualstack' => 
-     's3' => true
-    ,
-    's3-website' => true
-   ,
-   'ca-central-1' => 
-    's3' => true,
-    'dualstack' => 
-     's3' => true
-    ,
-    's3-website' => true
-   ,
-   'eu-central-1' => 
-    's3' => true,
-    'dualstack' => 
-     's3' => true
-    ,
-    's3-website' => true
-   ,
-   'eu-west-2' => 
-    's3' => true,
-    'dualstack' => 
-     's3' => true
-    ,
-    's3-website' => true
-   ,
-   'eu-west-3' => 
-    's3' => true,
-    'dualstack' => 
-     's3' => true
-    ,
-    's3-website' => true
-   ,
-   'us-east-2' => 
-    's3' => true,
-    'dualstack' => 
-     's3' => true
-    ,
-    's3-website' => true
-   ,
-   'ap-northeast-1' => 
-    'dualstack' => 
-     's3' => true
-    
-   ,
-   'ap-southeast-1' => 
-    'dualstack' => 
-     's3' => true
-    
-   ,
-   'ap-southeast-2' => 
-    'dualstack' => 
-     's3' => true
-    
-   ,
-   'eu-west-1' => 
-    'dualstack' => 
-     's3' => true
-    
-   ,
-   'sa-east-1' => 
-    'dualstack' => 
-     's3' => true
-    
-   ,
-   's3-website-us-east-1' => true,
-   's3-website-us-west-1' => true,
-   's3-website-us-west-2' => true,
-   's3-website-ap-northeast-1' => true,
-   's3-website-ap-southeast-1' => true,
-   's3-website-ap-southeast-2' => true,
-   's3-website-eu-west-1' => true,
-   's3-website-sa-east-1' => true
-  ,
-  'elasticbeanstalk' => 
-   'ap-northeast-1' => true,
-   'ap-northeast-2' => true,
-   'ap-northeast-3' => true,
-   'ap-south-1' => true,
-   'ap-southeast-1' => true,
-   'ap-southeast-2' => true,
-   'ca-central-1' => true,
-   'eu-central-1' => true,
-   'eu-west-1' => true,
-   'eu-west-2' => true,
-   'eu-west-3' => true,
-   'sa-east-1' => true,
-   'us-east-1' => true,
-   'us-east-2' => true,
-   'us-gov-west-1' => true,
-   'us-west-1' => true,
-   'us-west-2' => true
-  ,
-  'awsglobalaccelerator' => true,
-  'siiites' => true,
-  'appspacehosted' => true,
-  'appspaceusercontent' => true,
-  'on-aptible' => true,
-  'myasustor' => true,
-  'balena-devices' => true,
+   'ap-northeast-2' => array(
+    's3' => true
+   ),
+   'eu-central-1' => array(
+    's3' => true
+   )
+  ),
+  'elasticbeanstalk' => true,
   'betainabox' => true,
-  'boutir' => true,
-  'bplaced' => true,
-  'cafjs' => true,
+  'ar' => true,
   'br' => true,
   'cn' => true,
   'de' => true,
   'eu' => true,
+  'gb' => true,
+  'hu' => true,
   'jpn' => true,
+  'kr' => true,
   'mex' => true,
+  'no' => true,
+  'qc' => true,
   'ru' => true,
   'sa' => true,
+  'se' => true,
   'uk' => true,
   'us' => true,
-  'za' => true,
-  'ar' => true,
-  'hu' => true,
-  'kr' => true,
-  'no' => true,
-  'qc' => true,
   'uy' => true,
+  'za' => true,
   'africa' => true,
+  'xenapponazure' => true,
   'gr' => true,
   'co' => true,
-  'jdevcloud' => true,
-  'wpdevcloud' => true,
   'cloudcontrolled' => true,
   'cloudcontrolapp' => true,
-  'trycloudflare' => true,
-  'customer-oci' => 
-   '*' => true,
-   'oci' => 
-    '*' => true
-   ,
-   'ocp' => 
-    '*' => true
-   ,
-   'ocs' => 
-    '*' => true
-   
-  ,
-  'dattolocal' => true,
-  'dattorelay' => true,
-  'dattoweb' => true,
-  'mydatto' => true,
-  'builtwithdark' => true,
-  'datadetect' => 
-   'demo' => true,
-   'instance' => true
-  ,
-  'ddns5' => true,
-  'drayddns' => true,
   'dreamhosters' => true,
   'mydrobo' => true,
   'dyndns-at-home' => true,
@@ -1289,282 +846,42 @@
   'space-to-rent' => true,
   'teaches-yoga' => true,
   'writesthisblog' => true,
-  'digitaloceanspaces' => 
-   '*' => true
-  ,
-  'ddnsfree' => true,
-  'ddnsgeek' => true,
-  'giize' => true,
-  'gleeze' => true,
-  'kozow' => true,
-  'loseyourip' => true,
-  'ooguy' => true,
-  'theworkpc' => true,
-  'mytuleap' => true,
-  'tuleap-partners' => true,
-  'evennode' => 
-   'eu-1' => true,
-   'eu-2' => true,
-   'eu-3' => true,
-   'eu-4' => true,
-   'us-1' => true,
-   'us-2' => true,
-   'us-3' => true,
-   'us-4' => true
-  ,
-  'onfabrica' => true,
-  'fbsbx' => 
-   'apps' => true
-  ,
-  'fastly-terrarium' => true,
-  'fastvps-server' => true,
-  'mydobiss' => true,
   'firebaseapp' => true,
-  'fldrv' => true,
-  'forgeblocks' => true,
-  'framercanvas' => true,
-  'freebox-os' => true,
-  'freeboxos' => true,
-  'freemyip' => true,
-  'gentapps' => true,
-  'gentlentapis' => true,
+  'flynnhub' => true,
   'githubusercontent' => true,
-  '0emm' => 
-   '*' => true
-  ,
-  'appspot' => 
-   'r' => 
-    '*' => true
-   
-  ,
+  'ro' => true,
+  'appspot' => true,
+  'blogspot' => true,
   'codespot' => true,
   'googleapis' => true,
   'googlecode' => true,
   'pagespeedmobilizer' => true,
-  'publishproxy' => true,
   'withgoogle' => true,
   'withyoutube' => true,
-  'blogspot' => true,
-  'awsmppl' => true,
   'herokuapp' => true,
   'herokussl' => true,
-  'myravendb' => true,
-  'impertrixcdn' => true,
-  'impertrix' => true,
-  'smushcdn' => true,
-  'wphostedmail' => true,
-  'wpmucdn' => true,
-  'pixolino' => true,
-  'amscompute' => true,
-  'clicketcloud' => true,
-  'dopaas' => true,
-  'hidora' => true,
-  'hosted-by-previder' => 
-   'paas' => true
-  ,
-  'hosteur' => 
-   'rag-cloud' => true,
-   'rag-cloud-ch' => true
-  ,
-  'ik-server' => 
-   'jcloud' => true,
-   'jcloud-ver-jpc' => true
-  ,
-  'jelastic' => 
-   'demo' => true
-  ,
-  'kilatiron' => true,
-  'massivegrid' => 
-   'paas' => true
-  ,
-  'wafaicloud' => 
-   'jed' => true,
-   'lon' => true,
-   'ryd' => true
-  ,
-  'joyent' => 
-   'cns' => 
-    '*' => true
-   
-  ,
-  'lpusercontent' => true,
-  'lmpm' => 
-   'app' => true
-  ,
-  'linode' => 
-   'members' => true,
-   'nodebalancer' => 
-    '*' => true
-   
-  ,
-  'linodeobjects' => 
-   '*' => true
-  ,
-  'linodeusercontent' => 
-   'ip' => true
-  ,
-  'barsycenter' => true,
-  'barsyonline' => true,
-  'mazeplay' => true,
-  'miniserver' => true,
-  'meteorapp' => 
-   'eu' => true
-  ,
-  'hostedpi' => true,
-  'mythic-beasts' => 
-   'customer' => true,
-   'caracal' => true,
-   'fentiger' => true,
-   'lynx' => true,
-   'ocelot' => true,
-   'oncilla' => true,
-   'onza' => true,
-   'sphinx' => true,
-   'vs' => true,
-   'x' => true,
-   'yali' => true
-  ,
-  'nospamproxy' => 
-   'cloud' => true
-  ,
   '4u' => true,
   'nfshost' => true,
-  '001www' => true,
-  'ddnslive' => true,
-  'myiphost' => true,
-  'blogsyte' => true,
-  'ciscofreak' => true,
-  'damnserver' => true,
-  'ditchyourip' => true,
-  'dnsiskinky' => true,
-  'dynns' => true,
-  'geekgalaxy' => true,
-  'health-carereform' => true,
-  'homesecuritymac' => true,
-  'homesecuritypc' => true,
-  'myactivedirectory' => true,
-  'mysecuritycamera' => true,
-  'net-freaks' => true,
-  'onthewifi' => true,
-  'point2this' => true,
-  'quicksytes' => true,
-  'securitytactics' => true,
-  'serveexchange' => true,
-  'servehumour' => true,
-  'servep2p' => true,
-  'servesarcasm' => true,
-  'stufftoread' => true,
-  'unusualperson' => true,
-  'workisboring' => true,
-  '3utilities' => true,
-  'ddnsking' => true,
-  'myvnc' => true,
-  'servebeer' => true,
-  'servecounterstrike' => true,
-  'serveftp' => true,
-  'servegame' => true,
-  'servehalflife' => true,
-  'servehttp' => true,
-  'serveirc' => true,
-  'servemp3' => true,
-  'servepics' => true,
-  'servequake' => true,
-  'observableusercontent' => 
-   'static' => true
-  ,
-  'orsites' => true,
   'operaunite' => true,
-  'authgear-staging' => true,
-  'authgearapps' => true,
-  'skygearapp' => true,
   'outsystemscloud' => true,
-  'ownprovider' => true,
-  'pgfog' => true,
   'pagefrontapp' => true,
-  'pagexl' => true,
-  'paywhirl' => 
-   '*' => true
-  ,
   'gotpantheon' => true,
-  'platter-app' => true,
-  'pleskns' => true,
-  'postman-echo' => true,
-  'prgmr' => 
+  'prgmr' => array(
    'xen' => true
-  ,
-  'pythonanywhere' => 
-   'eu' => true
-  ,
-  'qualifioapp' => true,
-  'qbuser' => true,
+  ),
   'qa2' => true,
-  'dev-myqnapcloud' => true,
-  'alpha-myqnapcloud' => true,
-  'myqnapcloud' => true,
-  'quipelements' => 
-   '*' => true
-  ,
   'rackmaze' => true,
   'rhcloud' => true,
-  'render' => 
-   'app' => true
-  ,
-  'onrender' => true,
-  'logoip' => true,
-  'scrysec' => true,
-  'firewall-gateway' => true,
-  'myshopblocks' => true,
-  'myshopify' => true,
-  'shopitsite' => true,
-  '1kapp' => true,
-  'appchizi' => true,
-  'applinzi' => true,
   'sinaapp' => true,
   'vipsinaapp' => true,
-  'bounty-full' => 
-   'alpha' => true,
-   'beta' => true
-  ,
-  'try-snowplow' => true,
-  'stackhero-network' => true,
-  'playstation-cloud' => true,
-  'myspreadshop' => true,
-  'stdlib' => 
-   'api' => true
-  ,
-  'temp-dns' => true,
+  '1kapp' => true,
   'dsmynas' => true,
   'familyds' => true,
-  'reservd' => true,
-  'thingdustdata' => true,
-  'bloxcms' => true,
-  'townnews-staging' => true,
-  'typeform' => 
-   'pro' => true
-  ,
   'hk' => true,
-  'wafflecell' => true,
-  'idnblogger' => true,
-  'indowapblog' => true,
-  'reserve-online' => true,
-  'hotelwithflight' => true,
-  'remotewd' => true,
-  'wiardweb' => 
-   'pages' => true
-  ,
-  'woltlab-demo' => true,
-  'wpenginepowered' => 
-   'js' => true
-  ,
-  'wixsite' => true,
-  'xnbay' => 
-   'u2' => true,
-   'u2-local' => true
-  ,
   'yolasite' => true
- ,
+ ),
  'coop' => true,
- 'cr' => 
+ 'cr' => array(
   'ac' => true,
   'co' => true,
   'ed' => true,
@@ -1572,43 +889,34 @@
   'go' => true,
   'or' => true,
   'sa' => true
- ,
- 'cu' => 
+ ),
+ 'cu' => array(
   'com' => true,
   'edu' => true,
   'org' => true,
   'net' => true,
   'gov' => true,
   'inf' => true
- ,
- 'cv' => 
-  'com' => true,
-  'edu' => true,
-  'int' => true,
-  'nome' => true,
-  'org' => true,
+ ),
+ 'cv' => array(
   'blogspot' => true
- ,
- 'cw' => 
+ ),
+ 'cw' => array(
   'com' => true,
   'edu' => true,
   'net' => true,
   'org' => true
- ,
- 'cx' => 
+ ),
+ 'cx' => array(
   'gov' => true,
-  'ath' => true,
-  'info' => true
- ,
- 'cy' => 
+  'ath' => true
+ ),
+ 'cy' => array(
   'ac' => true,
   'biz' => true,
-  'com' => 
-   'blogspot' => true,
-   'scaleforce' => 
-    'j' => true
-   
-  ,
+  'com' => array(
+   'blogspot' => true
+  ),
   'ekloges' => true,
   'gov' => true,
   'ltd' => true,
@@ -1619,130 +927,33 @@
   'press' => true,
   'pro' => true,
   'tm' => true
- ,
- 'cz' => 
+ ),
+ 'cz' => array(
   'co' => true,
-  'realm' => true,
-  'e4' => true,
-  'blogspot' => true,
-  'metacentrum' => 
-   'cloud' => 
-    '*' => true
-   ,
-   'custom' => true
-  ,
-  'muni' => 
-   'cloud' => 
-    'flt' => true,
-    'usr' => true
-   
-  
- ,
- 'de' => 
-  'bplaced' => true,
-  'square7' => true,
-  'com' => true,
-  'cosidns' => 
-   'dyn' => true
-  ,
-  'dynamisches-dns' => true,
-  'dnsupdater' => true,
-  'internet-dns' => true,
-  'l-o-g-i-n' => true,
-  'dnshome' => true,
+  'blogspot' => true
+ ),
+ 'de' => array(
+  'com' => true,
   'fuettertdasnetz' => true,
   'isteingeek' => true,
   'istmein' => true,
   'lebtimnetz' => true,
   'leitungsen' => true,
   'traeumtgerade' => true,
-  'ddnss' => 
-   'dyn' => true,
-   'dyndns' => true
-  ,
-  'dyndns1' => true,
-  'dyn-ip24' => true,
-  'home-webserver' => 
-   'dyn' => true
-  ,
-  'myhome-server' => true,
-  'frusky' => 
-   '*' => true
-  ,
-  'goip' => true,
-  'blogspot' => true,
-  'günstigbestellen' => true,
-  'günstigliefern' => true,
-  'hs-heilbronn' => 
-   'it' => 
-    'pages' => true
-   
-  ,
-  'dyn-berlin' => true,
-  'in-berlin' => true,
-  'in-brb' => true,
-  'in-butter' => true,
-  'in-dsl' => true,
-  'in-vpn' => true,
-  'mein-iserv' => true,
-  'schulserver' => true,
-  'test-iserv' => true,
-  'keymachine' => true,
-  'git-repos' => true,
-  'lcube-server' => true,
-  'svn-repos' => true,
-  'barsy' => true,
-  'logoip' => true,
-  'firewall-gateway' => true,
-  'my-gateway' => true,
-  'my-router' => true,
-  'spdns' => true,
-  'speedpartner' => 
-   'customer' => true
-  ,
-  'myspreadshop' => true,
-  'taifun-dns' => true,
-  '12hp' => true,
-  '2ix' => true,
-  '4lima' => true,
-  'lima-city' => true,
-  'dd-dns' => true,
-  'dray-dns' => true,
-  'draydns' => true,
-  'dyn-vpn' => true,
-  'dynvpn' => true,
-  'mein-vigor' => true,
-  'my-vigor' => true,
-  'my-wan' => true,
-  'syno-ds' => true,
-  'synology-diskstation' => true,
-  'synology-ds' => true,
-  'uberspace' => 
-   '*' => true
-  ,
-  'virtualuser' => true,
-  'virtual-user' => true,
-  'community-pro' => true,
-  'diskussionsbereich' => true
- ,
+  'blogspot' => true
+ ),
  'dj' => true,
- 'dk' => 
-  'biz' => true,
-  'co' => true,
-  'firm' => true,
-  'reg' => true,
-  'store' => true,
-  'blogspot' => true,
-  'myspreadshop' => true
- ,
- 'dm' => 
+ 'dk' => array(
+  'blogspot' => true
+ ),
+ 'dm' => array(
   'com' => true,
   'net' => true,
   'org' => true,
   'edu' => true,
   'gov' => true
- ,
- 'do' => 
+ ),
+ 'do' => array(
   'art' => true,
   'com' => true,
   'edu' => true,
@@ -1753,20 +964,18 @@
   'org' => true,
   'sld' => true,
   'web' => true
- ,
- 'dz' => 
-  'art' => true,
-  'asso' => true,
+ ),
+ 'dz' => array(
   'com' => true,
-  'edu' => true,
-  'gov' => true,
   'org' => true,
   'net' => true,
+  'gov' => true,
+  'edu' => true,
+  'asso' => true,
   'pol' => true,
-  'soc' => true,
-  'tm' => true
- ,
- 'ec' => 
+  'art' => true
+ ),
+ 'ec' => array(
   'com' => true,
   'info' => true,
   'net' => true,
@@ -1778,33 +987,27 @@
   'edu' => true,
   'gov' => true,
   'gob' => true,
-  'mil' => true,
-  'base' => true,
-  'official' => true
- ,
- 'edu' => 
-  'rit' => 
-   'git-pages' => true
-  
- ,
- 'ee' => 
+  'mil' => true
+ ),
+ 'edu' => true,
+ 'ee' => array(
   'edu' => true,
   'gov' => true,
   'riik' => true,
   'lib' => true,
   'med' => true,
-  'com' => 
+  'com' => array(
    'blogspot' => true
-  ,
+  ),
   'pri' => true,
   'aip' => true,
   'org' => true,
   'fie' => true
- ,
- 'eg' => 
-  'com' => 
+ ),
+ 'eg' => array(
+  'com' => array(
    'blogspot' => true
-  ,
+  ),
   'edu' => true,
   'eun' => true,
   'gov' => true,
@@ -1813,21 +1016,20 @@
   'net' => true,
   'org' => true,
   'sci' => true
- ,
- 'er' => 
+ ),
+ 'er' => array(
   '*' => true
- ,
- 'es' => 
-  'com' => 
+ ),
+ 'es' => array(
+  'com' => array(
    'blogspot' => true
-  ,
+  ),
   'nom' => true,
   'org' => true,
   'gob' => true,
-  'edu' => true,
-  'myspreadshop' => true
- ,
- 'et' => 
+  'edu' => true
+ ),
+ 'et' => array(
   'com' => true,
   'gov' => true,
   'org' => true,
@@ -1836,67 +1038,30 @@
   'name' => true,
   'info' => true,
   'net' => true
- ,
- 'eu' => 
-  'mycd' => true,
-  'cloudns' => true,
-  'dogado' => 
-   'jelastic' => true
-  ,
-  'barsy' => true,
-  'wellbeingzone' => true,
-  'spdns' => true,
-  'transurl' => 
-   '*' => true
-  ,
-  'diskstation' => true
- ,
- 'fi' => 
+ ),
+ 'eu' => true,
+ 'fi' => array(
   'aland' => true,
-  'dy' => true,
   'blogspot' => true,
-  'häkkinen' => true,
-  'iki' => true,
-  'cloudplatform' => 
-   'fi' => true
-  ,
-  'datacenter' => 
-   'demo' => true,
-   'paas' => true
-  ,
-  'myspreadshop' => true
- ,
- 'fj' => 
-  'ac' => true,
-  'biz' => true,
-  'com' => true,
-  'gov' => true,
-  'info' => true,
-  'mil' => true,
-  'name' => true,
-  'net' => true,
-  'org' => true,
-  'pro' => true
- ,
- 'fk' => 
+  'iki' => true
+ ),
+ 'fj' => array(
   '*' => true
- ,
- 'fm' => 
-  'com' => true,
-  'edu' => true,
-  'net' => true,
-  'org' => true,
-  'radio' => true
- ,
+ ),
+ 'fk' => array(
+  '*' => true
+ ),
+ 'fm' => true,
  'fo' => true,
- 'fr' => 
-  'asso' => true,
+ 'fr' => array(
   'com' => true,
-  'gouv' => true,
+  'asso' => true,
   'nom' => true,
   'prd' => true,
+  'presse' => true,
   'tm' => true,
   'aeroport' => true,
+  'assedic' => true,
   'avocat' => true,
   'avoues' => true,
   'cci' => true,
@@ -1904,6 +1069,7 @@
   'chirurgiens-dentistes' => true,
   'experts-comptables' => true,
   'geometre-expert' => true,
+  'gouv' => true,
   'greta' => true,
   'huissier-justice' => true,
   'medecin' => true,
@@ -1911,25 +1077,12 @@
   'pharmacien' => true,
   'port' => true,
   'veterinaire' => true,
-  'en-root' => true,
-  'fbx-os' => true,
-  'fbxos' => true,
-  'freebox-os' => true,
-  'freeboxos' => true,
-  'blogspot' => true,
-  'goupile' => true,
-  'on-web' => true,
-  'chirurgiens-dentistes-en-france' => true,
-  'myspreadshop' => true,
-  'ynh' => true
- ,
+  'blogspot' => true
+ ),
  'ga' => true,
  'gb' => true,
- 'gd' => 
-  'edu' => true,
-  'gov' => true
- ,
- 'ge' => 
+ 'gd' => true,
+ 'ge' => array(
   'com' => true,
   'edu' => true,
   'gov' => true,
@@ -1937,104 +1090,85 @@
   'mil' => true,
   'net' => true,
   'pvt' => true
- ,
+ ),
  'gf' => true,
- 'gg' => 
+ 'gg' => array(
   'co' => true,
   'net' => true,
-  'org' => true,
-  'kaas' => true,
-  'cya' => true,
-  'panel' => 
-   'daemon' => true
-  
- ,
- 'gh' => 
+  'org' => true
+ ),
+ 'gh' => array(
   'com' => true,
   'edu' => true,
   'gov' => true,
   'org' => true,
   'mil' => true
- ,
- 'gi' => 
+ ),
+ 'gi' => array(
   'com' => true,
   'ltd' => true,
   'gov' => true,
   'mod' => true,
   'edu' => true,
   'org' => true
- ,
- 'gl' => 
+ ),
+ 'gl' => array(
   'co' => true,
   'com' => true,
   'edu' => true,
   'net' => true,
-  'org' => true,
-  'biz' => true,
-  'xx' => true
- ,
+  'org' => true
+ ),
  'gm' => true,
- 'gn' => 
+ 'gn' => array(
   'ac' => true,
   'com' => true,
   'edu' => true,
   'gov' => true,
   'org' => true,
   'net' => true
- ,
+ ),
  'gov' => true,
- 'gp' => 
+ 'gp' => array(
   'com' => true,
   'net' => true,
   'mobi' => true,
   'edu' => true,
   'org' => true,
-  'asso' => true,
-  'app' => true
- ,
+  'asso' => true
+ ),
  'gq' => true,
- 'gr' => 
+ 'gr' => array(
   'com' => true,
   'edu' => true,
   'net' => true,
   'org' => true,
   'gov' => true,
   'blogspot' => true
- ,
+ ),
  'gs' => true,
- 'gt' => 
+ 'gt' => array(
   'com' => true,
   'edu' => true,
   'gob' => true,
   'ind' => true,
   'mil' => true,
   'net' => true,
-  'org' => true,
-  'blog' => true,
-  'de' => true,
-  'to' => true
- ,
- 'gu' => 
-  'com' => true,
-  'edu' => true,
-  'gov' => true,
-  'guam' => true,
-  'info' => true,
-  'net' => true,
-  'org' => true,
-  'web' => true
- ,
+  'org' => true
+ ),
+ 'gu' => array(
+  '*' => true
+ ),
  'gw' => true,
- 'gy' => 
+ 'gy' => array(
   'co' => true,
   'com' => true,
   'edu' => true,
   'gov' => true,
   'net' => true,
-  'org' => true,
-  'be' => true
- ,
- 'hk' => 
+  'org' => true
+ ),
+ 'hk' => array(
   'com' => true,
   'edu' => true,
   'gov' => true,
@@ -2057,29 +1191,26 @@
   '組織' => true,
   '組织' => true,
   'blogspot' => true,
-  'secaas' => true,
   'ltd' => true,
   'inc' => true
- ,
+ ),
  'hm' => true,
- 'hn' => 
+ 'hn' => array(
   'com' => true,
   'edu' => true,
   'org' => true,
   'net' => true,
   'mil' => true,
-  'gob' => true,
-  'cc' => true
- ,
- 'hr' => 
+  'gob' => true
+ ),
+ 'hr' => array(
   'iz' => true,
   'from' => true,
   'name' => true,
   'com' => true,
-  'blogspot' => true,
-  'free' => true
- ,
- 'ht' => 
+  'blogspot' => true
+ ),
+ 'ht' => array(
   'com' => true,
   'shop' => true,
   'firm' => true,
@@ -2097,8 +1228,8 @@
   'rel' => true,
   'gouv' => true,
   'perso' => true
- ,
- 'hu' => 
+ ),
+ 'hu' => array(
   'co' => true,
   'info' => true,
   'org' => true,
@@ -2131,64 +1262,51 @@
   'utazas' => true,
   'video' => true,
   'blogspot' => true
- ,
- 'id' => 
+ ),
+ 'id' => array(
   'ac' => true,
   'biz' => true,
-  'co' => 
+  'co' => array(
    'blogspot' => true
-  ,
+  ),
   'desa' => true,
   'go' => true,
   'mil' => true,
-  'my' => 
-   'rss' => 
-    '*' => true
-   
-  ,
+  'my' => true,
   'net' => true,
   'or' => true,
-  'ponpes' => true,
   'sch' => true,
-  'web' => true,
-  'flap' => true,
-  'forte' => true,
-  'bloger' => true,
-  'wblog' => true
- ,
- 'ie' => 
+  'web' => true
+ ),
+ 'ie' => array(
   'gov' => true,
-  'blogspot' => true,
-  'myspreadshop' => true
- ,
- 'il' => 
+  'blogspot' => true
+ ),
+ 'il' => array(
   'ac' => true,
-  'co' => 
-   'ravpage' => true,
-   'blogspot' => true,
-   'tabitorder' => true
-  ,
+  'co' => array(
+   'blogspot' => true
+  ),
   'gov' => true,
   'idf' => true,
   'k12' => true,
   'muni' => true,
   'net' => true,
   'org' => true
- ,
- 'im' => 
+ ),
+ 'im' => array(
   'ac' => true,
-  'co' => 
+  'co' => array(
    'ltd' => true,
    'plc' => true
-  ,
+  ),
   'com' => true,
   'net' => true,
   'org' => true,
   'tt' => true,
-  'tv' => true,
-  'ro' => true
- ,
- 'in' => 
+  'tv' => true
+ ),
+ 'in' => array(
   'co' => true,
   'firm' => true,
   'net' => true,
@@ -2201,15 +1319,9 @@
   'res' => true,
   'gov' => true,
   'mil' => true,
-  'web' => true,
-  'cloudns' => true,
-  'blogspot' => true,
-  'barsy' => true,
-  'supabase' => true
- ,
- 'info' => 
-  'cloudns' => true,
-  'dynamic-dns' => true,
+  'blogspot' => true
+ ),
+ 'info' => array(
   'dyndns' => true,
   'barrel-of-knowledge' => true,
   'barrell-of-knowledge' => true,
@@ -2219,159 +1331,28 @@
   'here-for-more' => true,
   'knowsitall' => true,
   'selfip' => true,
-  'webhop' => true,
-  'barsy' => true,
-  'mayfirst' => true,
-  'forumz' => true,
-  'nsupdate' => true,
-  'dvrcam' => true,
-  'ilovecollege' => true,
-  'no-ip' => true,
-  'dnsupdate' => true,
-  'v-info' => true
- ,
- 'int' => 
+  'webhop' => true
+ ),
+ 'int' => array(
   'eu' => true
- ,
- 'io' => 
+ ),
+ 'io' => array(
   'com' => true,
-  'apigee' => true,
-  'b-data' => true,
-  'backplaneapp' => true,
-  'banzaicloud' => 
-   'app' => true,
-   'backyards' => 
-    '*' => true
-   
-  ,
-  'bitbucket' => true,
-  'bluebite' => true,
-  'boxfuse' => true,
-  'browsersafetymark' => true,
-  'bigv' => 
-   'uk0' => true
-  ,
-  'cleverapps' => true,
-  'dappnode' => 
-   'dyndns' => true
-  ,
-  'dedyn' => true,
-  'drud' => true,
-  'definima' => true,
-  'fh-muenster' => true,
-  'shw' => true,
-  'forgerock' => 
-   'id' => true
-  ,
-  'ghost' => true,
   'github' => true,
-  'gitlab' => true,
-  'lolipop' => true,
-  'hasura-app' => true,
-  'hostyhosting' => true,
-  'moonscale' => 
-   '*' => true
-  ,
-  'beebyte' => 
-   'paas' => true
-  ,
-  'beebyteapp' => 
-   'sekd1' => true
-  ,
-  'jele' => true,
-  'unispace' => 
-   'cloud-fr1' => true
-  ,
-  'webthings' => true,
-  'loginline' => true,
-  'barsy' => true,
-  'azurecontainer' => 
-   '*' => true
-  ,
   'ngrok' => true,
-  'nodeart' => 
-   'stage' => true
-  ,
   'nid' => true,
-  'pantheonsite' => true,
-  'dyn53' => true,
-  'pstmn' => 
-   'mock' => true
-  ,
-  'protonet' => true,
-  'qoto' => true,
-  'qcx' => 
-   'sys' => 
-    '*' => true
-   
-  ,
-  'vaporcloud' => true,
-  'vbrplsbx' => 
-   'g' => true
-  ,
-  'on-k3s' => 
-   '*' => true
-  ,
-  'on-rio' => 
-   '*' => true
-  ,
-  'readthedocs' => true,
-  'resindevice' => true,
-  'resinstaging' => 
-   'devices' => true
-  ,
-  'hzc' => true,
-  'sandcats' => true,
-  'shiftcrypto' => true,
-  'shiftedit' => true,
-  'mo-siemens' => true,
-  'lair' => 
-   'apps' => true
-  ,
-  'stolos' => 
-   '*' => true
-  ,
-  'spacekit' => true,
-  'utwente' => true,
-  's5y' => 
-   '*' => true
-  ,
-  'edugit' => true,
-  'telebit' => true,
-  'thingdust' => 
-   'dev' => 
-    'cust' => true,
-    'reservd' => true
-   ,
-   'disrec' => 
-    'cust' => true,
-    'reservd' => true
-   ,
-   'prod' => 
-    'cust' => true
-   ,
-   'testing' => 
-    'cust' => true,
-    'reservd' => true
-   
-  ,
-  'tickets' => true,
-  'upli' => true,
-  '2038' => true,
-  'wedeploy' => true,
-  'editorx' => true,
-  'basicserver' => true,
-  'virtualserver' => true
- ,
- 'iq' => 
+  'pantheon' => true,
+  'sandcats' => true
+ ),
+ 'iq' => array(
   'gov' => true,
   'edu' => true,
   'mil' => true,
   'com' => true,
   'org' => true,
   'net' => true
- ,
- 'ir' => 
+ ),
+ 'ir' => array(
   'ac' => true,
   'co' => true,
   'gov' => true,
@@ -2381,8 +1362,8 @@
   'sch' => true,
   'ایران' => true,
   'ايران' => true
- ,
- 'is' => 
+ ),
+ 'is' => array(
   'net' => true,
   'com' => true,
   'edu' => true,
@@ -2391,8 +1372,8 @@
   'int' => true,
   'cupcake' => true,
   'blogspot' => true
- ,
- 'it' => 
+ ),
+ 'it' => array(
   'gov' => true,
   'edu' => true,
   'abr' => true,
@@ -2447,12 +1428,6 @@
   'taa' => true,
   'tos' => true,
   'toscana' => true,
-  'trentin-sud-tirol' => true,
-  'trentin-süd-tirol' => true,
-  'trentin-sudtirol' => true,
-  'trentin-südtirol' => true,
-  'trentin-sued-tirol' => true,
-  'trentin-suedtirol' => true,
   'trentino-a-adige' => true,
   'trentino-aadige' => true,
   'trentino-alto-adige' => true,
@@ -2460,12 +1435,9 @@
   'trentino-s-tirol' => true,
   'trentino-stirol' => true,
   'trentino-sud-tirol' => true,
-  'trentino-süd-tirol' => true,
   'trentino-sudtirol' => true,
-  'trentino-südtirol' => true,
   'trentino-sued-tirol' => true,
   'trentino-suedtirol' => true,
-  'trentino' => true,
   'trentinoa-adige' => true,
   'trentinoaadige' => true,
   'trentinoalto-adige' => true,
@@ -2473,17 +1445,9 @@
   'trentinos-tirol' => true,
   'trentinostirol' => true,
   'trentinosud-tirol' => true,
-  'trentinosüd-tirol' => true,
   'trentinosudtirol' => true,
-  'trentinosüdtirol' => true,
   'trentinosued-tirol' => true,
   'trentinosuedtirol' => true,
-  'trentinsud-tirol' => true,
-  'trentinsüd-tirol' => true,
-  'trentinsudtirol' => true,
-  'trentinsüdtirol' => true,
-  'trentinsued-tirol' => true,
-  'trentinsuedtirol' => true,
   'tuscany' => true,
   'umb' => true,
   'umbria' => true,
@@ -2498,13 +1462,7 @@
   'valled-aosta' => true,
   'valledaosta' => true,
   'vallee-aoste' => true,
-  'vallée-aoste' => true,
-  'vallee-d-aoste' => true,
-  'vallée-d-aoste' => true,
   'valleeaoste' => true,
-  'valléeaoste' => true,
-  'valleedaoste' => true,
-  'valléedaoste' => true,
   'vao' => true,
   'vda' => true,
   'ven' => true,
@@ -2536,9 +1494,6 @@
   'av' => true,
   'avellino' => true,
   'ba' => true,
-  'balsan-sudtirol' => true,
-  'balsan-südtirol' => true,
-  'balsan-suedtirol' => true,
   'balsan' => true,
   'bari' => true,
   'barletta-trani-andria' => true,
@@ -2553,21 +1508,13 @@
   'bn' => true,
   'bo' => true,
   'bologna' => true,
-  'bolzano-altoadige' => true,
   'bolzano' => true,
-  'bozen-sudtirol' => true,
-  'bozen-südtirol' => true,
-  'bozen-suedtirol' => true,
   'bozen' => true,
   'br' => true,
   'brescia' => true,
   'brindisi' => true,
   'bs' => true,
   'bt' => true,
-  'bulsan-sudtirol' => true,
-  'bulsan-südtirol' => true,
-  'bulsan-suedtirol' => true,
-  'bulsan' => true,
   'bz' => true,
   'ca' => true,
   'cagliari' => true,
@@ -2585,9 +1532,7 @@
   'cb' => true,
   'ce' => true,
   'cesena-forli' => true,
-  'cesena-forlì' => true,
   'cesenaforli' => true,
-  'cesenaforlì' => true,
   'ch' => true,
   'chieti' => true,
   'ci' => true,
@@ -2618,9 +1563,7 @@
   'fm' => true,
   'foggia' => true,
   'forli-cesena' => true,
-  'forlì-cesena' => true,
   'forlicesena' => true,
-  'forlìcesena' => true,
   'fr' => true,
   'frosinone' => true,
   'ge' => true,
@@ -2751,7 +1694,6 @@
   'sr' => true,
   'ss' => true,
   'suedtirol' => true,
-  'südtirol' => true,
   'sv' => true,
   'ta' => true,
   'taranto' => true,
@@ -2770,6 +1712,7 @@
   'traniandriabarletta' => true,
   'tranibarlettaandria' => true,
   'trapani' => true,
+  'trentino' => true,
   'trento' => true,
   'treviso' => true,
   'trieste' => true,
@@ -2799,33 +1742,17 @@
   'vs' => true,
   'vt' => true,
   'vv' => true,
-  'blogspot' => true,
-  'neen' => 
-   'jc' => true
-  ,
-  'tim' => 
-   'open' => 
-    'jelastic' => 
-     'cloud' => true
-    
-   
-  ,
-  '16-b' => true,
-  '32-b' => true,
-  '64-b' => true,
-  'myspreadshop' => true,
-  'syncloud' => true
- ,
- 'je' => 
+  'blogspot' => true
+ ),
+ 'je' => array(
   'co' => true,
   'net' => true,
-  'org' => true,
-  'of' => true
- ,
- 'jm' => 
+  'org' => true
+ ),
+ 'jm' => array(
   '*' => true
- ,
- 'jo' => 
+ ),
+ 'jo' => array(
   'com' => true,
   'org' => true,
   'net' => true,
@@ -2834,9 +1761,9 @@
   'gov' => true,
   'mil' => true,
   'name' => true
- ,
+ ),
  'jobs' => true,
- 'jp' => 
+ 'jp' => array(
   'ac' => true,
   'ad' => true,
   'co' => true,
@@ -2844,14 +1771,9 @@
   'go' => true,
   'gr' => true,
   'lg' => true,
-  'ne' => 
-   'aseinet' => 
-    'user' => true
-   ,
-   'gehirn' => true
-  ,
+  'ne' => true,
   'or' => true,
-  'aichi' => 
+  'aichi' => array(
    'aisai' => true,
    'ama' => true,
    'anjo' => true,
@@ -2904,8 +1826,8 @@
    'toyota' => true,
    'tsushima' => true,
    'yatomi' => true
-  ,
-  'akita' => 
+  ),
+  'akita' => array(
    'akita' => true,
    'daisen' => true,
    'fujisato' => true,
@@ -2934,8 +1856,8 @@
    'semboku' => true,
    'yokote' => true,
    'yurihonjo' => true
-  ,
-  'aomori' => 
+  ),
+  'aomori' => array(
    'aomori' => true,
    'gonohe' => true,
    'hachinohe' => true,
@@ -2958,8 +1880,8 @@
    'towada' => true,
    'tsugaru' => true,
    'tsuruta' => true
-  ,
-  'chiba' => 
+  ),
+  'chiba' => array(
    'abiko' => true,
    'asahi' => true,
    'chonan' => true,
@@ -3018,8 +1940,8 @@
    'yokaichiba' => true,
    'yokoshibahikari' => true,
    'yotsukaido' => true
-  ,
-  'ehime' => 
+  ),
+  'ehime' => array(
    'ainan' => true,
    'honai' => true,
    'ikata' => true,
@@ -3042,8 +1964,8 @@
    'uchiko' => true,
    'uwajima' => true,
    'yawatahama' => true
-  ,
-  'fukui' => 
+  ),
+  'fukui' => array(
    'echizen' => true,
    'eiheiji' => true,
    'fukui' => true,
@@ -3059,8 +1981,8 @@
    'takahama' => true,
    'tsuruga' => true,
    'wakasa' => true
-  ,
-  'fukuoka' => 
+  ),
+  'fukuoka' => array(
    'ashiya' => true,
    'buzen' => true,
    'chikugo' => true,
@@ -3124,8 +2046,8 @@
    'yame' => true,
    'yanagawa' => true,
    'yukuhashi' => true
-  ,
-  'fukushima' => 
+  ),
+  'fukushima' => array(
    'aizubange' => true,
    'aizumisato' => true,
    'aizuwakamatsu' => true,
@@ -3177,8 +2099,8 @@
    'yamatsuri' => true,
    'yanaizu' => true,
    'yugawa' => true
-  ,
-  'gifu' => 
+  ),
+  'gifu' => array(
    'anpachi' => true,
    'ena' => true,
    'gifu' => true,
@@ -3217,8 +2139,8 @@
    'yamagata' => true,
    'yaotsu' => true,
    'yoro' => true
-  ,
-  'gunma' => 
+  ),
+  'gunma' => array(
    'annaka' => true,
    'chiyoda' => true,
    'fujioka' => true,
@@ -3255,8 +2177,8 @@
    'tsumagoi' => true,
    'ueno' => true,
    'yoshioka' => true
-  ,
-  'hiroshima' => 
+  ),
+  'hiroshima' => array(
    'asaminami' => true,
    'daiwa' => true,
    'etajima' => true,
@@ -3282,8 +2204,8 @@
    'shinichi' => true,
    'shobara' => true,
    'takehara' => true
-  ,
-  'hokkaido' => 
+  ),
+  'hokkaido' => array(
    'abashiri' => true,
    'abira' => true,
    'aibetsu' => true,
@@ -3426,8 +2348,8 @@
    'wassamu' => true,
    'yakumo' => true,
    'yoichi' => true
-  ,
-  'hyogo' => 
+  ),
+  'hyogo' => array(
    'aioi' => true,
    'akashi' => true,
    'ako' => true,
@@ -3474,8 +2396,8 @@
    'yashiro' => true,
    'yoka' => true,
    'yokawa' => true
-  ,
-  'ibaraki' => 
+  ),
+  'ibaraki' => array(
    'ami' => true,
    'asahi' => true,
    'bando' => true,
@@ -3527,8 +2449,8 @@
    'yamagata' => true,
    'yawara' => true,
    'yuki' => true
-  ,
-  'ishikawa' => 
+  ),
+  'ishikawa' => array(
    'anamizu' => true,
    'hakui' => true,
    'hakusan' => true,
@@ -3548,8 +2470,8 @@
    'tsurugi' => true,
    'uchinada' => true,
    'wajima' => true
-  ,
-  'iwate' => 
+  ),
+  'iwate' => array(
    'fudai' => true,
    'fujisawa' => true,
    'hanamaki' => true,
@@ -3584,8 +2506,8 @@
    'tono' => true,
    'yahaba' => true,
    'yamada' => true
-  ,
-  'kagawa' => 
+  ),
+  'kagawa' => array(
    'ayagawa' => true,
    'higashikagawa' => true,
    'kanonji' => true,
@@ -3601,8 +2523,8 @@
    'uchinomi' => true,
    'utazu' => true,
    'zentsuji' => true
-  ,
-  'kagoshima' => 
+  ),
+  'kagoshima' => array(
    'akune' => true,
    'amami' => true,
    'hioki' => true,
@@ -3623,8 +2545,8 @@
    'soo' => true,
    'tarumizu' => true,
    'yusui' => true
-  ,
-  'kanagawa' => 
+  ),
+  'kanagawa' => array(
    'aikawa' => true,
    'atsugi' => true,
    'ayase' => true,
@@ -3655,8 +2577,8 @@
    'yugawara' => true,
    'zama' => true,
    'zushi' => true
-  ,
-  'kochi' => 
+  ),
+  'kochi' => array(
    'aki' => true,
    'geisei' => true,
    'hidaka' => true,
@@ -3688,15 +2610,18 @@
    'umaji' => true,
    'yasuda' => true,
    'yusuhara' => true
-  ,
-  'kumamoto' => 
+  ),
+  'kumamoto' => array(
    'amakusa' => true,
    'arao' => true,
    'aso' => true,
    'choyo' => true,
    'gyokuto' => true,
+   'hitoyoshi' => true,
    'kamiamakusa' => true,
+   'kashima' => true,
    'kikuchi' => true,
+   'kosa' => true,
    'kumamoto' => true,
    'mashiki' => true,
    'mifune' => true,
@@ -3713,8 +2638,8 @@
    'yamaga' => true,
    'yamato' => true,
    'yatsushiro' => true
-  ,
-  'kyoto' => 
+  ),
+  'kyoto' => array(
    'ayabe' => true,
    'fukuchiyama' => true,
    'higashiyama' => true,
@@ -3746,8 +2671,8 @@
    'wazuka' => true,
    'yamashina' => true,
    'yawata' => true
-  ,
-  'mie' => 
+  ),
+  'mie' => array(
    'asahi' => true,
    'inabe' => true,
    'ise' => true,
@@ -3778,8 +2703,8 @@
    'ureshino' => true,
    'watarai' => true,
    'yokkaichi' => true
-  ,
-  'miyagi' => 
+  ),
+  'miyagi' => array(
    'furukawa' => true,
    'higashimatsushima' => true,
    'ishinomaki' => true,
@@ -3787,6 +2712,7 @@
    'kakuda' => true,
    'kami' => true,
    'kawasaki' => true,
+   'kesennuma' => true,
    'marumori' => true,
    'matsushima' => true,
    'minamisanriku' => true,
@@ -3812,8 +2738,8 @@
    'watari' => true,
    'yamamoto' => true,
    'zao' => true
-  ,
-  'miyazaki' => 
+  ),
+  'miyazaki' => array(
    'aya' => true,
    'ebino' => true,
    'gokase' => true,
@@ -3841,8 +2767,8 @@
    'takanabe' => true,
    'takazaki' => true,
    'tsuno' => true
-  ,
-  'nagano' => 
+  ),
+  'nagano' => array(
    'achi' => true,
    'agematsu' => true,
    'anan' => true,
@@ -3918,8 +2844,8 @@
    'yamanouchi' => true,
    'yasaka' => true,
    'yasuoka' => true
-  ,
-  'nagasaki' => 
+  ),
+  'nagasaki' => array(
    'chijiwa' => true,
    'futsu' => true,
    'goto' => true,
@@ -3942,8 +2868,8 @@
    'togitsu' => true,
    'tsushima' => true,
    'unzen' => true
-  ,
-  'nara' => 
+  ),
+  'nara' => array(
    'ando' => true,
    'gose' => true,
    'heguri' => true,
@@ -3982,8 +2908,8 @@
    'yamatotakada' => true,
    'yamazoe' => true,
    'yoshino' => true
-  ,
-  'niigata' => 
+  ),
+  'niigata' => array(
    'aga' => true,
    'agano' => true,
    'gosen' => true,
@@ -4018,8 +2944,8 @@
    'yahiko' => true,
    'yoita' => true,
    'yuzawa' => true
-  ,
-  'oita' => 
+  ),
+  'oita' => array(
    'beppu' => true,
    'bungoono' => true,
    'bungotakada' => true,
@@ -4039,8 +2965,8 @@
    'usa' => true,
    'usuki' => true,
    'yufu' => true
-  ,
-  'okayama' => 
+  ),
+  'okayama' => array(
    'akaiwa' => true,
    'asakuchi' => true,
    'bizen' => true,
@@ -4067,8 +2993,8 @@
    'tsuyama' => true,
    'wake' => true,
    'yakage' => true
-  ,
-  'okinawa' => 
+  ),
+  'okinawa' => array(
    'aguni' => true,
    'ginowan' => true,
    'ginoza' => true,
@@ -4111,8 +3037,8 @@
    'yonabaru' => true,
    'yonaguni' => true,
    'zamami' => true
-  ,
-  'osaka' => 
+  ),
+  'osaka' => array(
    'abeno' => true,
    'chihayaakasaka' => true,
    'chuo' => true,
@@ -4163,8 +3089,8 @@
    'toyonaka' => true,
    'toyono' => true,
    'yao' => true
-  ,
-  'saga' => 
+  ),
+  'saga' => array(
    'ariake' => true,
    'arita' => true,
    'fukudomi' => true,
@@ -4191,8 +3117,8 @@
    'tara' => true,
    'tosu' => true,
    'yoshinogari' => true
-  ,
-  'saitama' => 
+  ),
+  'saitama' => array(
    'arakawa' => true,
    'asaka' => true,
    'chichibu' => true,
@@ -4262,8 +3188,8 @@
    'yoshida' => true,
    'yoshikawa' => true,
    'yoshimi' => true
-  ,
-  'shiga' => 
+  ),
+  'shiga' => array(
    'aisho' => true,
    'gamo' => true,
    'higashiomi' => true,
@@ -4287,8 +3213,8 @@
    'torahime' => true,
    'toyosato' => true,
    'yasu' => true
-  ,
-  'shimane' => 
+  ),
+  'shimane' => array(
    'akagi' => true,
    'ama' => true,
    'gotsu' => true,
@@ -4312,8 +3238,8 @@
    'yakumo' => true,
    'yasugi' => true,
    'yatsuka' => true
-  ,
-  'shizuoka' => 
+  ),
+  'shizuoka' => array(
    'arai' => true,
    'atami' => true,
    'fuji' => true,
@@ -4350,8 +3276,8 @@
    'susono' => true,
    'yaizu' => true,
    'yoshida' => true
-  ,
-  'tochigi' => 
+  ),
+  'tochigi' => array(
    'ashikaga' => true,
    'bato' => true,
    'haga' => true,
@@ -4383,8 +3309,8 @@
    'ujiie' => true,
    'utsunomiya' => true,
    'yaita' => true
-  ,
-  'tokushima' => 
+  ),
+  'tokushima' => array(
    'aizumi' => true,
    'anan' => true,
    'ichiba' => true,
@@ -4402,8 +3328,8 @@
    'shishikui' => true,
    'tokushima' => true,
    'wajiki' => true
-  ,
-  'tokyo' => 
+  ),
+  'tokyo' => array(
    'adachi' => true,
    'akiruno' => true,
    'akishima' => true,
@@ -4461,8 +3387,8 @@
    'taito' => true,
    'tama' => true,
    'toshima' => true
-  ,
-  'tottori' => 
+  ),
+  'tottori' => array(
    'chizu' => true,
    'hino' => true,
    'kawahara' => true,
@@ -4476,8 +3402,8 @@
    'wakasa' => true,
    'yazu' => true,
    'yonago' => true
-  ,
-  'toyama' => 
+  ),
+  'toyama' => array(
    'asahi' => true,
    'fuchu' => true,
    'fukumitsu' => true,
@@ -4502,8 +3428,8 @@
    'unazuki' => true,
    'uozu' => true,
    'yamada' => true
-  ,
-  'wakayama' => 
+  ),
+  'wakayama' => array(
    'arida' => true,
    'aridagawa' => true,
    'gobo' => true,
@@ -4533,8 +3459,8 @@
    'wakayama' => true,
    'yuasa' => true,
    'yura' => true
-  ,
-  'yamagata' => 
+  ),
+  'yamagata' => array(
    'asahi' => true,
    'funagata' => true,
    'higashine' => true,
@@ -4569,8 +3495,8 @@
    'yamanobe' => true,
    'yonezawa' => true,
    'yuza' => true
-  ,
-  'yamaguchi' => 
+  ),
+  'yamaguchi' => array(
    'abu' => true,
    'hagi' => true,
    'hikari' => true,
@@ -4587,8 +3513,8 @@
    'toyota' => true,
    'ube' => true,
    'yuu' => true
-  ,
-  'yamanashi' => 
+  ),
+  'yamanashi' => array(
    'chuo' => true,
    'doshi' => true,
    'fuefuki' => true,
@@ -4617,7 +3543,7 @@
    'uenohara' => true,
    'yamanakako' => true,
    'yamanashi' => true
-  ,
+  ),
   '栃木' => true,
   '愛知' => true,
   '愛媛' => true,
@@ -4665,74 +3591,54 @@
   '高知' => true,
   '鳥取' => true,
   '鹿児島' => true,
-  'kawasaki' => 
+  'kawasaki' => array(
    '*' => true,
    '!city' => true
-  ,
-  'kitakyushu' => 
+  ),
+  'kitakyushu' => array(
    '*' => true,
    '!city' => true
-  ,
-  'kobe' => 
+  ),
+  'kobe' => array(
    '*' => true,
    '!city' => true
-  ,
-  'nagoya' => 
+  ),
+  'nagoya' => array(
    '*' => true,
    '!city' => true
-  ,
-  'sapporo' => 
+  ),
+  'sapporo' => array(
    '*' => true,
    '!city' => true
-  ,
-  'sendai' => 
+  ),
+  'sendai' => array(
    '*' => true,
    '!city' => true
-  ,
-  'yokohama' => 
+  ),
+  'yokohama' => array(
    '*' => true,
    '!city' => true
-  ,
-  'buyshop' => true,
-  'fashionstore' => true,
-  'handcrafted' => true,
-  'kawaiishop' => true,
-  'supersale' => true,
-  'theshop' => true,
-  'usercontent' => true,
+  ),
   'blogspot' => true
- ,
- 'ke' => 
-  'ac' => true,
-  'co' => 
+ ),
+ 'ke' => array(
+  '*' => true,
+  'co' => array(
    'blogspot' => true
-  ,
-  'go' => true,
-  'info' => true,
-  'me' => true,
-  'mobi' => true,
-  'ne' => true,
-  'or' => true,
-  'sc' => true
- ,
- 'kg' => 
+  )
+ ),
+ 'kg' => array(
   'org' => true,
   'net' => true,
   'com' => true,
   'edu' => true,
   'gov' => true,
-  'mil' => true,
-  'blog' => true,
-  'io' => true,
-  'jp' => true,
-  'tv' => true,
-  'uk' => true,
-  'us' => true
- ,
- 'kh' => 
+  'mil' => true
+ ),
+ 'kh' => array(
   '*' => true
- ,
- 'ki' => 
+ ),
+ 'ki' => array(
   'edu' => true,
   'biz' => true,
   'net' => true,
@@ -4740,8 +3646,8 @@
   'gov' => true,
   'info' => true,
   'com' => true
- ,
- 'km' => 
+ ),
+ 'km' => array(
   'org' => true,
   'nom' => true,
   'gov' => true,
@@ -4759,22 +3665,22 @@
   'pharmaciens' => true,
   'veterinaire' => true,
   'gouv' => true
- ,
- 'kn' => 
+ ),
+ 'kn' => array(
   'net' => true,
   'org' => true,
   'edu' => true,
   'gov' => true
- ,
- 'kp' => 
+ ),
+ 'kp' => array(
   'com' => true,
   'edu' => true,
   'gov' => true,
   'org' => true,
   'rep' => true,
   'tra' => true
- ,
- 'kr' => 
+ ),
+ 'kr' => array(
   'ac' => true,
   'co' => true,
   'es' => true,
@@ -4805,36 +3711,26 @@
   'seoul' => true,
   'ulsan' => true,
   'blogspot' => true
- ,
- 'kw' => 
-  'com' => true,
-  'edu' => true,
-  'emb' => true,
-  'gov' => true,
-  'ind' => true,
-  'net' => true,
-  'org' => true
- ,
- 'ky' => 
+ ),
+ 'kw' => array(
+  '*' => true
+ ),
+ 'ky' => array(
   'edu' => true,
   'gov' => true,
   'com' => true,
   'org' => true,
   'net' => true
- ,
- 'kz' => 
+ ),
+ 'kz' => array(
   'org' => true,
   'edu' => true,
   'net' => true,
   'gov' => true,
   'mil' => true,
-  'com' => true,
-  'jcloud' => true,
-  'kazteleport' => 
-   'upaas' => true
-  
- ,
- 'la' => 
+  'com' => true
+ ),
+ 'la' => array(
   'int' => true,
   'net' => true,
   'info' => true,
@@ -4843,30 +3739,27 @@
   'per' => true,
   'com' => true,
   'org' => true,
-  'bnr' => true,
   'c' => true
- ,
- 'lb' => 
+ ),
+ 'lb' => array(
   'com' => true,
   'edu' => true,
   'gov' => true,
   'net' => true,
   'org' => true
- ,
- 'lc' => 
+ ),
+ 'lc' => array(
   'com' => true,
   'net' => true,
   'co' => true,
   'org' => true,
   'edu' => true,
-  'gov' => true,
-  'oy' => true
- ,
- 'li' => 
-  'blogspot' => true,
-  'caa' => true
- ,
- 'lk' => 
+  'gov' => true
+ ),
+ 'li' => array(
+  'blogspot' => true
+ ),
+ 'lk' => array(
   'gov' => true,
   'sch' => true,
   'net' => true,
@@ -4882,34 +3775,26 @@
   'grp' => true,
   'hotel' => true,
   'ac' => true
- ,
- 'lr' => 
+ ),
+ 'lr' => array(
   'com' => true,
   'edu' => true,
   'gov' => true,
   'org' => true,
   'net' => true
- ,
- 'ls' => 
-  'ac' => true,
-  'biz' => true,
+ ),
+ 'ls' => array(
   'co' => true,
-  'edu' => true,
-  'gov' => true,
-  'info' => true,
-  'net' => true,
-  'org' => true,
-  'sc' => true,
-  'de' => true
- ,
- 'lt' => 
+  'org' => true
+ ),
+ 'lt' => array(
   'gov' => true,
   'blogspot' => true
- ,
- 'lu' => 
+ ),
+ 'lu' => array(
   'blogspot' => true
- ,
- 'lv' => 
+ ),
+ 'lv' => array(
   'com' => true,
   'edu' => true,
   'gov' => true,
@@ -4919,8 +3804,8 @@
   'net' => true,
   'asn' => true,
   'conf' => true
- ,
- 'ly' => 
+ ),
+ 'ly' => array(
   'com' => true,
   'net' => true,
   'gov' => true,
@@ -4930,27 +3815,23 @@
   'med' => true,
   'org' => true,
   'id' => true
- ,
- 'ma' => 
+ ),
+ 'ma' => array(
   'co' => true,
   'net' => true,
   'gov' => true,
   'org' => true,
   'ac' => true,
   'press' => true
- ,
- 'mc' => 
+ ),
+ 'mc' => array(
   'tm' => true,
   'asso' => true
- ,
- 'md' => 
-  'blogspot' => true,
-  'at' => true,
-  'de' => true,
-  'jp' => true,
-  'to' => true
- ,
- 'me' => 
+ ),
+ 'md' => array(
+  'blogspot' => true
+ ),
+ 'me' => array(
   'co' => true,
   'net' => true,
   'org' => true,
@@ -4959,48 +3840,13 @@
   'gov' => true,
   'its' => true,
   'priv' => true,
-  'c66' => true,
-  'daplie' => 
-   'localhost' => true
-  ,
-  'edgestack' => true,
-  'couk' => true,
-  'ukco' => true,
-  'filegear' => true,
-  'filegear-au' => true,
-  'filegear-de' => true,
-  'filegear-gb' => true,
-  'filegear-ie' => true,
-  'filegear-jp' => true,
-  'filegear-sg' => true,
-  'glitch' => true,
-  'ravendb' => true,
-  'lohmus' => true,
-  'barsy' => true,
-  'mcpe' => true,
-  'mcdir' => true,
-  'soundcast' => true,
-  'tcp4' => true,
-  'brasilia' => true,
-  'ddns' => true,
-  'dnsfor' => true,
-  'hopto' => true,
-  'loginto' => true,
-  'noip' => true,
-  'webhop' => true,
-  'vp4' => true,
   'diskstation' => true,
   'dscloud' => true,
   'i234' => true,
   'myds' => true,
-  'synology' => true,
-  'tbits' => true,
-  'wbq' => true,
-  'wedeploy' => true,
-  'yombo' => true,
-  'nohost' => true
- ,
- 'mg' => 
+  'synology' => true
+ ),
+ 'mg' => array(
   'org' => true,
   'nom' => true,
   'gov' => true,
@@ -5010,10 +3856,10 @@
   'mil' => true,
   'com' => true,
   'co' => true
- ,
+ ),
  'mh' => true,
  'mil' => true,
- 'mk' => 
+ 'mk' => array(
   'com' => true,
   'org' => true,
   'net' => true,
@@ -5022,8 +3868,8 @@
   'inf' => true,
   'name' => true,
   'blogspot' => true
- ,
- 'ml' => 
+ ),
+ 'ml' => array(
   'com' => true,
   'edu' => true,
   'gouv' => true,
@@ -5031,53 +3877,48 @@
   'net' => true,
   'org' => true,
   'presse' => true
- ,
- 'mm' => 
+ ),
+ 'mm' => array(
   '*' => true
- ,
- 'mn' => 
+ ),
+ 'mn' => array(
   'gov' => true,
   'edu' => true,
   'org' => true,
   'nyc' => true
- ,
- 'mo' => 
+ ),
+ 'mo' => array(
   'com' => true,
   'net' => true,
   'org' => true,
   'edu' => true,
   'gov' => true
- ,
- 'mobi' => 
-  'barsy' => true,
+ ),
+ 'mobi' => array(
   'dscloud' => true
- ,
- 'mp' => 
-  'ju' => true
- ,
+ ),
+ 'mp' => true,
  'mq' => true,
- 'mr' => 
+ 'mr' => array(
   'gov' => true,
   'blogspot' => true
- ,
- 'ms' => 
+ ),
+ 'ms' => array(
   'com' => true,
   'edu' => true,
   'gov' => true,
   'net' => true,
-  'org' => true,
-  'lab' => true,
-  'minisite' => true
- ,
- 'mt' => 
-  'com' => 
+  'org' => true
+ ),
+ 'mt' => array(
+  'com' => array(
    'blogspot' => true
-  ,
+  ),
   'edu' => true,
   'net' => true,
   'org' => true
- ,
- 'mu' => 
+ ),
+ 'mu' => array(
   'com' => true,
   'net' => true,
   'org' => true,
@@ -5085,8 +3926,8 @@
   'ac' => true,
   'co' => true,
   'or' => true
- ,
- 'museum' => 
+ ),
+ 'museum' => array(
   'academy' => true,
   'agriculture' => true,
   'air' => true,
@@ -5453,6 +4294,8 @@
   'norfolk' => true,
   'north' => true,
   'nrw' => true,
+  'nuernberg' => true,
+  'nuremberg' => true,
   'nyc' => true,
   'nyny' => true,
   'oceanographic' => true,
@@ -5633,8 +4476,8 @@
   'zoology' => true,
   'ירושלים' => true,
   'иком' => true
- ,
- 'mv' => 
+ ),
+ 'mv' => array(
   'aero' => true,
   'biz' => true,
   'com' => true,
@@ -5649,8 +4492,8 @@
   'net' => true,
   'org' => true,
   'pro' => true
- ,
- 'mw' => 
+ ),
+ 'mw' => array(
   'ac' => true,
   'biz' => true,
   'co' => true,
@@ -5662,37 +4505,30 @@
   'museum' => true,
   'net' => true,
   'org' => true
- ,
- 'mx' => 
+ ),
+ 'mx' => array(
   'com' => true,
   'org' => true,
   'gob' => true,
   'edu' => true,
   'net' => true,
   'blogspot' => true
- ,
- 'my' => 
-  'biz' => true,
+ ),
+ 'my' => array(
   'com' => true,
-  'edu' => true,
-  'gov' => true,
-  'mil' => true,
-  'name' => true,
   'net' => true,
   'org' => true,
-  'blogspot' => true
- ,
- 'mz' => 
-  'ac' => true,
-  'adv' => true,
-  'co' => true,
-  'edu' => true,
   'gov' => true,
+  'edu' => true,
   'mil' => true,
-  'net' => true,
-  'org' => true
- ,
- 'na' => 
+  'name' => true,
+  'blogspot' => true
+ ),
+ 'mz' => array(
+  '*' => true,
+  '!teledata' => true
+ ),
+ 'na' => array(
   'info' => true,
   'pro' => true,
   'name' => true,
@@ -5710,60 +4546,31 @@
   'co' => true,
   'com' => true,
   'org' => true
- ,
- 'name' => 
-  'her' => 
+ ),
+ 'name' => array(
+  'her' => array(
    'forgot' => true
-  ,
-  'his' => 
+  ),
+  'his' => array(
    'forgot' => true
-  
- ,
- 'nc' => 
-  'asso' => true,
-  'nom' => true
- ,
+  )
+ ),
+ 'nc' => array(
+  'asso' => true
+ ),
  'ne' => true,
- 'net' => 
-  'adobeaemcloud' => true,
-  'alwaysdata' => true,
+ 'net' => array(
   'cloudfront' => true,
-  't3l3p0rt' => true,
-  'appudo' => true,
-  'atlassian-dev' => 
-   'prod' => 
-    'cdn' => true
-   
-  ,
-  'myfritz' => true,
-  'onavstack' => true,
-  'shopselect' => true,
-  'blackbaudcdn' => true,
-  'boomla' => true,
-  'bplaced' => true,
-  'square7' => true,
   'gb' => true,
   'hu' => true,
   'jp' => true,
   'se' => true,
   'uk' => true,
   'in' => true,
-  'clickrising' => true,
-  'cloudaccess' => true,
   'cdn77-ssl' => true,
-  'cdn77' => 
+  'cdn77' => array(
    'r' => true
-  ,
-  'feste-ip' => true,
-  'knx-server' => true,
-  'static-access' => true,
-  'cryptonomic' => 
-   '*' => true
-  ,
-  'dattolocal' => true,
-  'mydatto' => true,
-  'debian' => true,
-  'bitbridge' => true,
+  ),
   'at-band-camp' => true,
   'blogdns' => true,
   'broke-it' => true,
@@ -5799,157 +4606,27 @@
   'serveftp' => true,
   'thruhere' => true,
   'webhop' => true,
-  'definima' => true,
-  'casacam' => true,
-  'dynu' => true,
-  'dynv6' => true,
-  'twmail' => true,
-  'ru' => true,
-  'channelsdvr' => 
-   'u' => true
-  ,
-  'fastlylb' => 
-   'map' => true
-  ,
-  'fastly' => 
-   'freetls' => true,
-   'map' => true,
-   'prod' => 
+  'fastly' => array(
+   'ssl' => array(
     'a' => true,
+    'b' => true,
     'global' => true
-   ,
-   'ssl' => 
+   ),
+   'prod' => array(
     'a' => true,
-    'b' => true,
     'global' => true
-   
-  ,
-  'edgeapp' => true,
-  'flynnhosting' => true,
-  'cdn-edges' => true,
+   )
+  ),
   'cloudfunctions' => true,
-  'moonscale' => true,
-  'in-dsl' => true,
-  'in-vpn' => true,
-  'ipifony' => true,
-  'iobb' => true,
-  'cloudjiffy' => 
-   'fra1-de' => true,
-   'west1-us' => true
-  ,
-  'elastx' => 
-   'jls-sto1' => true,
-   'jls-sto2' => true,
-   'jls-sto3' => true
-  ,
-  'faststacks' => true,
-  'massivegrid' => 
-   'paas' => 
-    'fr-1' => true,
-    'lon-1' => true,
-    'lon-2' => true,
-    'ny-1' => true,
-    'ny-2' => true,
-    'sg-1' => true
-   
-  ,
-  'saveincloud' => 
-   'jelastic' => true,
-   'nordeste-idc' => true
-  ,
-  'scaleforce' => 
-   'j' => true
-  ,
-  'tsukaeru' => 
-   'jelastic' => true
-  ,
-  'kinghost' => true,
-  'uni5' => true,
-  'krellian' => true,
-  'barsy' => true,
-  'memset' => true,
   'azurewebsites' => true,
   'azure-mobile' => true,
   'cloudapp' => true,
-  'azurestaticapps' => 
-   'centralus' => true,
-   'eastasia' => true,
-   'eastus2' => true,
-   'westeurope' => true,
-   'westus2' => true
-  ,
-  'dnsup' => true,
-  'hicam' => true,
-  'now-dns' => true,
-  'ownip' => true,
-  'vpndns' => true,
-  'eating-organic' => true,
-  'mydissent' => true,
-  'myeffect' => true,
-  'mymediapc' => true,
-  'mypsx' => true,
-  'mysecuritycamera' => true,
-  'nhlfan' => true,
-  'no-ip' => true,
-  'pgafan' => true,
-  'privatizehealthinsurance' => true,
-  'bounceme' => true,
-  'ddns' => true,
-  'redirectme' => true,
-  'serveblog' => true,
-  'serveminecraft' => true,
-  'sytes' => true,
-  'cloudycluster' => true,
-  'ovh' => 
-   'webpaas' => 
-    '*' => true
-   ,
-   'hosting' => 
-    '*' => true
-   
-  ,
-  'bar0' => true,
-  'bar1' => true,
-  'bar2' => true,
   'rackmaze' => true,
-  'schokokeks' => true,
-  'firewall-gateway' => true,
-  'seidat' => true,
-  'senseering' => true,
-  'siteleaf' => true,
-  'vps-host' => 
-   'jelastic' => 
-    'atl' => true,
-    'njs' => true,
-    'ric' => true
-   
-  ,
-  'myspreadshop' => true,
-  'srcf' => 
-   'soc' => true,
-   'user' => true
-  ,
-  'supabase' => true,
   'dsmynas' => true,
   'familyds' => true,
-  'tailscale' => 
-   'beta' => true
-  ,
-  'ts' => true,
-  'torproject' => 
-   'pages' => true
-  ,
-  'fastblog' => true,
-  'reserve-online' => true,
-  'community-pro' => true,
-  'meinforum' => true,
-  'yandexcloud' => 
-   'storage' => true,
-   'website' => true
-  ,
   'za' => true
- ,
- 'nf' => 
+ ),
+ 'nf' => array(
   'com' => true,
   'net' => true,
   'per' => true,
@@ -5960,11 +4637,11 @@
   'info' => true,
   'other' => true,
   'store' => true
- ,
- 'ng' => 
-  'com' => 
+ ),
+ 'ng' => array(
+  'com' => array(
    'blogspot' => true
-  ,
+  ),
   'edu' => true,
   'gov' => true,
   'i' => true,
@@ -5973,42 +4650,30 @@
   'name' => true,
   'net' => true,
   'org' => true,
-  'sch' => true,
-  'col' => true,
-  'firm' => true,
-  'gen' => true,
-  'ltd' => true,
-  'ngo' => true
- ,
- 'ni' => 
-  'ac' => true,
-  'biz' => true,
-  'co' => true,
+  'sch' => true
+ ),
+ 'ni' => array(
   'com' => true,
-  'edu' => true,
   'gob' => true,
-  'in' => true,
-  'info' => true,
-  'int' => true,
-  'mil' => true,
-  'net' => true,
-  'nom' => true,
+  'edu' => true,
   'org' => true,
-  'web' => true
- ,
- 'nl' => 
+  'nom' => true,
+  'net' => true,
+  'mil' => true,
   'co' => true,
-  'hosting-cluster' => true,
-  'blogspot' => true,
-  'khplay' => true,
-  'myspreadshop' => true,
-  'transurl' => 
-   '*' => true
-  ,
-  'cistron' => true,
-  'demon' => true
- ,
- 'no' => 
+  'biz' => true,
+  'web' => true,
+  'int' => true,
+  'ac' => true,
+  'in' => true,
+  'info' => true
+ ),
+ 'nl' => array(
+  'bv' => true,
+  'co' => true,
+  'blogspot' => true
+ ),
+ 'no' => array(
   'fhs' => true,
   'vgs' => true,
   'fylkesbibl' => true,
@@ -6021,69 +4686,69 @@
   'dep' => true,
   'kommune' => true,
   'herad' => true,
-  'aa' => 
+  'aa' => array(
    'gs' => true
-  ,
-  'ah' => 
+  ),
+  'ah' => array(
    'gs' => true
-  ,
-  'bu' => 
+  ),
+  'bu' => array(
    'gs' => true
-  ,
-  'fm' => 
+  ),
+  'fm' => array(
    'gs' => true
-  ,
-  'hl' => 
+  ),
+  'hl' => array(
    'gs' => true
-  ,
-  'hm' => 
+  ),
+  'hm' => array(
    'gs' => true
-  ,
-  'jan-mayen' => 
+  ),
+  'jan-mayen' => array(
    'gs' => true
-  ,
-  'mr' => 
+  ),
+  'mr' => array(
    'gs' => true
-  ,
-  'nl' => 
+  ),
+  'nl' => array(
    'gs' => true
-  ,
-  'nt' => 
+  ),
+  'nt' => array(
    'gs' => true
-  ,
-  'of' => 
+  ),
+  'of' => array(
    'gs' => true
-  ,
-  'ol' => 
+  ),
+  'ol' => array(
    'gs' => true
-  ,
-  'oslo' => 
+  ),
+  'oslo' => array(
    'gs' => true
-  ,
-  'rl' => 
+  ),
+  'rl' => array(
    'gs' => true
-  ,
-  'sf' => 
+  ),
+  'sf' => array(
    'gs' => true
-  ,
-  'st' => 
+  ),
+  'st' => array(
    'gs' => true
-  ,
-  'svalbard' => 
+  ),
+  'svalbard' => array(
    'gs' => true
-  ,
-  'tm' => 
+  ),
+  'tm' => array(
    'gs' => true
-  ,
-  'tr' => 
+  ),
+  'tr' => array(
    'gs' => true
-  ,
-  'va' => 
+  ),
+  'va' => array(
    'gs' => true
-  ,
-  'vf' => 
+  ),
+  'vf' => array(
    'gs' => true
-  ,
+  ),
   'akrehamn' => true,
   'åkrehamn' => true,
   'algard' => true,
@@ -6220,16 +4885,16 @@
   'bykle' => true,
   'barum' => true,
   'bærum' => true,
-  'telemark' => 
+  'telemark' => array(
    'bo' => true,
    'bø' => true
-  ,
-  'nordland' => 
+  ),
+  'nordland' => array(
    'bo' => true,
    'bø' => true,
    'heroy' => true,
    'herøy' => true
-  ,
+  ),
   'bievat' => true,
   'bievát' => true,
   'bomlo' => true,
@@ -6343,14 +5008,14 @@
   'hemne' => true,
   'hemnes' => true,
   'hemsedal' => true,
-  'more-og-romsdal' => 
+  'more-og-romsdal' => array(
    'heroy' => true,
    'sande' => true
-  ,
-  'møre-og-romsdal' => 
+  ),
+  'møre-og-romsdal' => array(
    'herøy' => true,
    'sande' => true
-  ,
+  ),
   'hitra' => true,
   'hjartdal' => true,
   'hjelmeland' => true,
@@ -6511,12 +5176,12 @@
   'narviika' => true,
   'naustdal' => true,
   'nedre-eiker' => true,
-  'akershus' => 
+  'akershus' => array(
    'nes' => true
-  ,
-  'buskerud' => 
+  ),
+  'buskerud' => array(
    'nes' => true
-  ,
+  ),
   'nesna' => true,
   'nesodden' => true,
   'nesseby' => true,
@@ -6555,14 +5220,14 @@
   'ørskog' => true,
   'orsta' => true,
   'ørsta' => true,
-  'hedmark' => 
+  'hedmark' => array(
    'os' => true,
    'valer' => true,
    'våler' => true
-  ,
-  'hordaland' => 
+  ),
+  'hordaland' => array(
    'os' => true
-  ,
+  ),
   'osen' => true,
   'osteroy' => true,
   'osterøy' => true,
@@ -6625,9 +5290,9 @@
   'sálát' => true,
   'sálat' => true,
   'samnanger' => true,
-  'vestfold' => 
+  'vestfold' => array(
    'sande' => true
-  ,
+  ),
   'sandefjord' => true,
   'sandnes' => true,
   'sandoy' => true,
@@ -6799,20 +5464,19 @@
   'vågsøy' => true,
   'vaga' => true,
   'vågå' => true,
-  'ostfold' => 
+  'ostfold' => array(
    'valer' => true
-  ,
-  'østfold' => 
+  ),
+  'østfold' => array(
    'våler' => true
-  ,
+  ),
   'co' => true,
-  'blogspot' => true,
-  'myspreadshop' => true
- ,
- 'np' => 
+  'blogspot' => true
+ ),
+ 'np' => array(
   '*' => true
- ,
- 'nr' => 
+ ),
+ 'nr' => array(
   'biz' => true,
   'info' => true,
   'gov' => true,
@@ -6820,18 +5484,17 @@
   'org' => true,
   'net' => true,
   'com' => true
- ,
- 'nu' => 
+ ),
+ 'nu' => array(
   'merseine' => true,
   'mine' => true,
-  'shacknet' => true,
-  'enterprisecloud' => true
- ,
- 'nz' => 
+  'shacknet' => true
+ ),
+ 'nz' => array(
   'ac' => true,
-  'co' => 
+  'co' => array(
    'blogspot' => true
-  ,
+  ),
   'cri' => true,
   'geek' => true,
   'gen' => true,
@@ -6846,8 +5509,8 @@
   'org' => true,
   'parliament' => true,
   'school' => true
- ,
- 'om' => 
+ ),
+ 'om' => array(
   'co' => true,
   'com' => true,
   'edu' => true,
@@ -6857,36 +5520,24 @@
   'net' => true,
   'org' => true,
   'pro' => true
- ,
- 'onion' => true,
- 'org' => 
-  'altervista' => true,
-  'amune' => 
-   'tele' => true
-  ,
-  'pimienta' => true,
-  'poivron' => true,
-  'potager' => true,
-  'sweetpepper' => true,
+ ),
+ 'org' => array(
   'ae' => true,
   'us' => true,
-  'certmgr' => true,
-  'cdn77' => 
+  'cdn77' => array(
    'c' => true,
    'rsc' => true
-  ,
-  'cdn77-secure' => 
-   'origin' => 
+  ),
+  'cdn77-secure' => array(
+   'origin' => array(
     'ssl' => true
-   
-  ,
-  'cloudns' => true,
+   )
+  ),
   'duckdns' => true,
-  'tunk' => true,
-  'dyndns' => 
+  'dyndns' => array(
    'go' => true,
    'home' => true
-  ,
+  ),
   'blogdns' => true,
   'blogsite' => true,
   'boldlygoingnowhere' => true,
@@ -6936,13 +5587,7 @@
   'servegame' => true,
   'stuff-4-sale' => true,
   'webhop' => true,
-  'ddnss' => true,
-  'accesscam' => true,
-  'camdvr' => true,
-  'freeddns' => true,
-  'mywire' => true,
-  'webredirect' => true,
-  'eu' => 
+  'eu' => array(
    'al' => true,
    'asso' => true,
    'at' => true,
@@ -6998,64 +5643,14 @@
    'tr' => true,
    'uk' => true,
    'us' => true
-  ,
-  'twmail' => true,
-  'fedorainfracloud' => true,
-  'fedorapeople' => true,
-  'fedoraproject' => 
-   'cloud' => true,
-   'os' => 
-    'app' => true
-   ,
-   'stg' => 
-    'os' => 
-     'app' => true
-    
-   
-  ,
-  'freedesktop' => true,
-  'hepforge' => true,
-  'in-dsl' => true,
-  'in-vpn' => true,
-  'js' => true,
-  'barsy' => true,
-  'mayfirst' => true,
-  'mozilla-iot' => true,
+  ),
   'bmoattachments' => true,
-  'dynserv' => true,
-  'now-dns' => true,
-  'cable-modem' => true,
-  'collegefan' => true,
-  'couchpotatofries' => true,
-  'mlbfan' => true,
-  'mysecuritycamera' => true,
-  'nflfan' => true,
-  'read-books' => true,
-  'ufcfan' => true,
-  'hopto' => true,
-  'myftp' => true,
-  'no-ip' => true,
-  'zapto' => true,
-  'httpbin' => true,
-  'pubtls' => true,
-  'my-firewall' => true,
-  'myfirewall' => true,
-  'spdns' => true,
-  'small-web' => true,
   'dsmynas' => true,
   'familyds' => true,
-  'teckids' => 
-   's3' => true
-  ,
-  'tuxfamily' => true,
-  'diskstation' => true,
   'hk' => true,
-  'wmflabs' => true,
-  'toolforge' => true,
-  'wmcloud' => true,
   'za' => true
- ,
- 'pa' => 
+ ),
+ 'pa' => array(
   'ac' => true,
   'gob' => true,
   'com' => true,
@@ -7067,8 +5662,8 @@
   'abo' => true,
   'med' => true,
   'nom' => true
- ,
- 'pe' => 
+ ),
+ 'pe' => array(
   'edu' => true,
   'gob' => true,
   'nom' => true,
@@ -7077,16 +5672,16 @@
   'com' => true,
   'net' => true,
   'blogspot' => true
- ,
- 'pf' => 
+ ),
+ 'pf' => array(
   'com' => true,
   'org' => true,
   'edu' => true
- ,
- 'pg' => 
+ ),
+ 'pg' => array(
   '*' => true
- ,
- 'ph' => 
+ ),
+ 'ph' => array(
   'com' => true,
   'net' => true,
   'org' => true,
@@ -7095,8 +5690,8 @@
   'ngo' => true,
   'mil' => true,
   'i' => true
- ,
- 'pk' => 
+ ),
+ 'pk' => array(
   'com' => true,
   'net' => true,
   'edu' => true,
@@ -7111,8 +5706,8 @@
   'gop' => true,
   'gos' => true,
   'info' => true
- ,
- 'pl' => 
+ ),
+ 'pl' => array(
   'com' => true,
   'net' => true,
   'org' => true,
@@ -7146,7 +5741,7 @@
   'tourism' => true,
   'travel' => true,
   'turystyka' => true,
-  'gov' => 
+  'gov' => array(
    'ap' => true,
    'ic' => true,
    'is' => true,
@@ -7194,7 +5789,7 @@
    'wuoz' => true,
    'konsulat' => true,
    'oirm' => true
-  ,
+  ),
   'augustow' => true,
   'babia-gora' => true,
   'bedzin' => true,
@@ -7314,18 +5909,6 @@
   'zarow' => true,
   'zgora' => true,
   'zgorzelec' => true,
-  'beep' => true,
-  'ecommerce-shop' => true,
-  'shoparena' => true,
-  'homesklep' => true,
-  'sdscloud' => true,
-  'unicloud' => true,
-  'krasnik' => true,
-  'leczna' => true,
-  'lubartow' => true,
-  'lublin' => true,
-  'poniatowa' => true,
-  'swidnik' => true,
   'co' => true,
   'art' => true,
   'gliwice' => true,
@@ -7333,25 +5916,22 @@
   'poznan' => true,
   'wroc' => true,
   'zakopane' => true,
-  'myspreadshop' => true,
   'gda' => true,
   'gdansk' => true,
   'gdynia' => true,
   'med' => true,
   'sopot' => true
- ,
- 'pm' => 
-  'own' => true
- ,
- 'pn' => 
+ ),
+ 'pm' => true,
+ 'pn' => array(
   'gov' => true,
   'co' => true,
   'org' => true,
   'edu' => true,
   'net' => true
- ,
+ ),
  'post' => true,
- 'pr' => 
+ 'pr' => array(
   'com' => true,
   'net' => true,
   'org' => true,
@@ -7365,8 +5945,8 @@
   'est' => true,
   'prof' => true,
   'ac' => true
- ,
- 'pro' => 
+ ),
+ 'pro' => array(
   'aaa' => true,
   'aca' => true,
   'acct' => true,
@@ -7377,14 +5957,9 @@
   'jur' => true,
   'law' => true,
   'med' => true,
-  'recht' => true,
-  'cloudns' => true,
-  'dnstrace' => 
-   'bci' => true
-  ,
-  'barsy' => true
- ,
- 'ps' => 
+  'recht' => true
+ ),
+ 'ps' => array(
   'edu' => true,
   'gov' => true,
   'sec' => true,
@@ -7392,8 +5967,8 @@
   'com' => true,
   'org' => true,
   'net' => true
- ,
- 'pt' => 
+ ),
+ 'pt' => array(
   'net' => true,
   'gov' => true,
   'org' => true,
@@ -7403,18 +5978,16 @@
   'com' => true,
   'nome' => true,
   'blogspot' => true
- ,
- 'pw' => 
+ ),
+ 'pw' => array(
   'co' => true,
   'ne' => true,
   'or' => true,
   'ed' => true,
   'go' => true,
-  'belau' => true,
-  'cloudns' => true,
-  'x443' => true
- ,
- 'py' => 
+  'belau' => true
+ ),
+ 'py' => array(
   'com' => true,
   'coop' => true,
   'edu' => true,
@@ -7422,8 +5995,8 @@
   'mil' => true,
   'net' => true,
   'org' => true
- ,
- 'qa' => 
+ ),
+ 'qa' => array(
   'com' => true,
   'edu' => true,
   'gov' => true,
@@ -7433,14 +6006,14 @@
   'org' => true,
   'sch' => true,
   'blogspot' => true
- ,
- 're' => 
+ ),
+ 're' => array(
   'asso' => true,
   'com' => true,
   'nom' => true,
   'blogspot' => true
- ,
- 'ro' => 
+ ),
+ 'ro' => array(
   'arts' => true,
   'com' => true,
   'firm' => true,
@@ -7452,95 +6025,162 @@
   'store' => true,
   'tm' => true,
   'www' => true,
-  'co' => true,
-  'shop' => true,
-  'blogspot' => true,
-  'barsy' => true
- ,
- 'rs' => 
+  'blogspot' => true
+ ),
+ 'rs' => array(
   'ac' => true,
   'co' => true,
   'edu' => true,
   'gov' => true,
   'in' => true,
   'org' => true,
-  'brendly' => 
-   'shop' => true
-  ,
-  'blogspot' => true,
-  'ua' => true,
-  'ox' => true
- ,
- 'ru' => 
+  'blogspot' => true
+ ),
+ 'ru' => array(
   'ac' => true,
+  'com' => true,
   'edu' => true,
-  'gov' => true,
   'int' => true,
-  'mil' => true,
-  'test' => true,
-  'eurodir' => true,
+  'net' => true,
+  'org' => true,
+  'pp' => true,
   'adygeya' => true,
+  'altai' => true,
+  'amur' => true,
+  'arkhangelsk' => true,
+  'astrakhan' => true,
   'bashkiria' => true,
+  'belgorod' => true,
   'bir' => true,
+  'bryansk' => true,
+  'buryatia' => true,
   'cbg' => true,
-  'com' => true,
+  'chel' => true,
+  'chelyabinsk' => true,
+  'chita' => true,
+  'chukotka' => true,
+  'chuvashia' => true,
   'dagestan' => true,
+  'dudinka' => true,
+  'e-burg' => true,
   'grozny' => true,
+  'irkutsk' => true,
+  'ivanovo' => true,
+  'izhevsk' => true,
+  'jar' => true,
+  'joshkar-ola' => true,
   'kalmykia' => true,
-  'kustanai' => true,
+  'kaluga' => true,
+  'kamchatka' => true,
+  'karelia' => true,
+  'kazan' => true,
+  'kchr' => true,
+  'kemerovo' => true,
+  'khabarovsk' => true,
+  'khakassia' => true,
+  'khv' => true,
+  'kirov' => true,
+  'koenig' => true,
+  'komi' => true,
+  'kostroma' => true,
+  'krasnoyarsk' => true,
+  'kuban' => true,
+  'kurgan' => true,
+  'kursk' => true,
+  'lipetsk' => true,
+  'magadan' => true,
+  'mari' => true,
+  'mari-el' => true,
   'marine' => true,
   'mordovia' => true,
   'msk' => true,
-  'mytis' => true,
+  'murmansk' => true,
   'nalchik' => true,
+  'nnov' => true,
   'nov' => true,
-  'pyatigorsk' => true,
+  'novosibirsk' => true,
+  'nsk' => true,
+  'omsk' => true,
+  'orenburg' => true,
+  'oryol' => true,
+  'palana' => true,
+  'penza' => true,
+  'perm' => true,
+  'ptz' => true,
+  'rnd' => true,
+  'ryazan' => true,
+  'sakhalin' => true,
+  'samara' => true,
+  'saratov' => true,
+  'simbirsk' => true,
+  'smolensk' => true,
   'spb' => true,
+  'stavropol' => true,
+  'stv' => true,
+  'surgut' => true,
+  'tambov' => true,
+  'tatarstan' => true,
+  'tom' => true,
+  'tomsk' => true,
+  'tsaritsyn' => true,
+  'tsk' => true,
+  'tula' => true,
+  'tuva' => true,
+  'tver' => true,
+  'tyumen' => true,
+  'udm' => true,
+  'udmurtia' => true,
+  'ulan-ude' => true,
   'vladikavkaz' => true,
   'vladimir' => true,
-  'blogspot' => true,
-  'na4u' => true,
-  'mircloud' => true,
-  'regruhosting' => 
-   'jelastic' => true
-  ,
-  'myjino' => 
-   'hosting' => 
-    '*' => true
-   ,
-   'landing' => 
-    '*' => true
-   ,
-   'spectrum' => 
-    '*' => true
-   ,
-   'vps' => 
-    '*' => true
-   
-  ,
-  'cldmail' => 
-   'hb' => true
-  ,
-  'mcdir' => 
-   'vps' => true
-  ,
-  'mcpre' => true,
+  'vladivostok' => true,
+  'volgograd' => true,
+  'vologda' => true,
+  'voronezh' => true,
+  'vrn' => true,
+  'vyatka' => true,
+  'yakutia' => true,
+  'yamal' => true,
+  'yaroslavl' => true,
+  'yekaterinburg' => true,
+  'yuzhno-sakhalinsk' => true,
+  'amursk' => true,
+  'baikal' => true,
+  'cmw' => true,
+  'fareast' => true,
+  'jamal' => true,
+  'kms' => true,
+  'k-uralsk' => true,
+  'kustanai' => true,
+  'kuzbass' => true,
+  'mytis' => true,
+  'nakhodka' => true,
+  'nkz' => true,
+  'norilsk' => true,
+  'oskol' => true,
+  'pyatigorsk' => true,
+  'rubtsovsk' => true,
+  'snz' => true,
+  'syzran' => true,
+  'vdonsk' => true,
+  'zgrad' => true,
+  'gov' => true,
+  'mil' => true,
+  'test' => true,
+  'blogspot' => true
+ ),
+ 'rw' => array(
+  'gov' => true,
   'net' => true,
-  'org' => true,
-  'pp' => true,
-  'lk3' => true,
-  'ras' => true
- ,
- 'rw' => 
+  'edu' => true,
   'ac' => true,
+  'com' => true,
   'co' => true,
-  'coop' => true,
-  'gov' => true,
+  'int' => true,
   'mil' => true,
-  'net' => true,
-  'org' => true
- ,
- 'sa' => 
+  'gouv' => true
+ ),
+ 'sa' => array(
   'com' => true,
   'net' => true,
   'org' => true,
@@ -7549,22 +6189,22 @@
   'pub' => true,
   'edu' => true,
   'sch' => true
- ,
- 'sb' => 
+ ),
+ 'sb' => array(
   'com' => true,
   'edu' => true,
   'gov' => true,
   'net' => true,
   'org' => true
- ,
- 'sc' => 
+ ),
+ 'sc' => array(
   'com' => true,
   'gov' => true,
   'net' => true,
   'org' => true,
   'edu' => true
- ,
- 'sd' => 
+ ),
+ 'sd' => array(
   'com' => true,
   'net' => true,
   'org' => true,
@@ -7573,8 +6213,8 @@
   'tv' => true,
   'gov' => true,
   'info' => true
- ,
- 'se' => 
+ ),
+ 'se' => array(
   'a' => true,
   'ac' => true,
   'b' => true,
@@ -7615,61 +6255,44 @@
   'y' => true,
   'z' => true,
   'com' => true,
-  'blogspot' => true,
-  'conf' => true,
-  'iopsys' => true,
-  'itcouldbewor' => true,
-  'myspreadshop' => true,
-  'paba' => 
-   'su' => true
-  
- ,
- 'sg' => 
+  'blogspot' => true
+ ),
+ 'sg' => array(
   'com' => true,
   'net' => true,
   'org' => true,
   'gov' => true,
   'edu' => true,
   'per' => true,
-  'blogspot' => true,
-  'enscaled' => true
- ,
- 'sh' => 
+  'blogspot' => true
+ ),
+ 'sh' => array(
   'com' => true,
   'net' => true,
   'gov' => true,
   'org' => true,
   'mil' => true,
-  'bip' => true,
-  'hashbang' => true,
-  'platform' => 
-   'bc' => true,
-   'ent' => true,
-   'eu' => true,
-   'us' => true
-  ,
-  'now' => true,
-  'vxl' => true,
-  'wedeploy' => true
- ,
- 'si' => 
-  'gitapp' => true,
-  'gitpage' => true,
+  'platform' => array(
+   '*' => true
+  ),
+  'hashbang' => true
+ ),
+ 'si' => array(
   'blogspot' => true
- ,
+ ),
  'sj' => true,
- 'sk' => 
+ 'sk' => array(
   'blogspot' => true
- ,
- 'sl' => 
+ ),
+ 'sl' => array(
   'com' => true,
   'net' => true,
   'edu' => true,
   'gov' => true,
   'org' => true
- ,
+ ),
  'sm' => true,
- 'sn' => 
+ 'sn' => array(
   'art' => true,
   'com' => true,
   'edu' => true,
@@ -7678,141 +6301,101 @@
   'perso' => true,
   'univ' => true,
   'blogspot' => true
- ,
- 'so' => 
+ ),
+ 'so' => array(
   'com' => true,
-  'edu' => true,
-  'gov' => true,
-  'me' => true,
   'net' => true,
-  'org' => true,
-  'sch' => true
- ,
+  'org' => true
+ ),
  'sr' => true,
- 'ss' => 
-  'biz' => true,
-  'com' => true,
-  'edu' => true,
-  'gov' => true,
-  'me' => true,
-  'net' => true,
-  'org' => true,
-  'sch' => true
- ,
- 'st' => 
+ 'st' => array(
   'co' => true,
   'com' => true,
   'consulado' => true,
   'edu' => true,
   'embaixada' => true,
+  'gov' => true,
   'mil' => true,
   'net' => true,
   'org' => true,
   'principe' => true,
   'saotome' => true,
-  'store' => true,
-  'noho' => true
- ,
- 'su' => 
-  'abkhazia' => true,
+  'store' => true
+ ),
+ 'su' => array(
   'adygeya' => true,
-  'aktyubinsk' => true,
   'arkhangelsk' => true,
-  'armenia' => true,
-  'ashgabad' => true,
-  'azerbaijan' => true,
   'balashov' => true,
   'bashkiria' => true,
   'bryansk' => true,
-  'bukhara' => true,
-  'chimkent' => true,
   'dagestan' => true,
-  'east-kazakhstan' => true,
-  'exnet' => true,
-  'georgia' => true,
   'grozny' => true,
   'ivanovo' => true,
-  'jambyl' => true,
   'kalmykia' => true,
   'kaluga' => true,
-  'karacol' => true,
-  'karaganda' => true,
   'karelia' => true,
   'khakassia' => true,
   'krasnodar' => true,
   'kurgan' => true,
-  'kustanai' => true,
   'lenug' => true,
-  'mangyshlak' => true,
   'mordovia' => true,
   'msk' => true,
   'murmansk' => true,
   'nalchik' => true,
-  'navoi' => true,
-  'north-kazakhstan' => true,
   'nov' => true,
   'obninsk' => true,
   'penza' => true,
   'pokrovsk' => true,
   'sochi' => true,
   'spb' => true,
-  'tashkent' => true,
-  'termez' => true,
   'togliatti' => true,
   'troitsk' => true,
-  'tselinograd' => true,
   'tula' => true,
   'tuva' => true,
   'vladikavkaz' => true,
   'vladimir' => true,
   'vologda' => true
- ,
- 'sv' => 
+ ),
+ 'sv' => array(
   'com' => true,
   'edu' => true,
   'gob' => true,
   'org' => true,
   'red' => true
- ,
- 'sx' => 
+ ),
+ 'sx' => array(
   'gov' => true
- ,
- 'sy' => 
+ ),
+ 'sy' => array(
   'edu' => true,
   'gov' => true,
   'net' => true,
   'mil' => true,
   'com' => true,
   'org' => true
- ,
- 'sz' => 
+ ),
+ 'sz' => array(
   'co' => true,
   'ac' => true,
   'org' => true
- ,
- 'tc' => 
-  'ch' => true,
-  'me' => true,
-  'we' => true
- ,
- 'td' => 
+ ),
+ 'tc' => true,
+ 'td' => array(
   'blogspot' => true
- ,
+ ),
  'tel' => true,
  'tf' => true,
  'tg' => true,
- 'th' => 
+ 'th' => array(
   'ac' => true,
   'co' => true,
   'go' => true,
   'in' => true,
   'mi' => true,
   'net' => true,
-  'or' => true,
-  'online' => true,
-  'shop' => true
- ,
- 'tj' => 
+  'or' => true
+ ),
+ 'tj' => array(
   'ac' => true,
   'biz' => true,
   'co' => true,
@@ -7828,12 +6411,12 @@
   'org' => true,
   'test' => true,
   'web' => true
- ,
+ ),
  'tk' => true,
- 'tl' => 
+ 'tl' => array(
   'gov' => true
- ,
- 'tm' => 
+ ),
+ 'tm' => array(
   'com' => true,
   'co' => true,
   'org' => true,
@@ -7842,68 +6425,66 @@
   'gov' => true,
   'mil' => true,
   'edu' => true
- ,
- 'tn' => 
+ ),
+ 'tn' => array(
   'com' => true,
   'ens' => true,
   'fin' => true,
   'gov' => true,
   'ind' => true,
-  'info' => true,
   'intl' => true,
-  'mincom' => true,
   'nat' => true,
   'net' => true,
   'org' => true,
+  'info' => true,
   'perso' => true,
   'tourism' => true,
-  'orangecloud' => true
- ,
- 'to' => 
+  'edunet' => true,
+  'rnrt' => true,
+  'rns' => true,
+  'rnu' => true,
+  'mincom' => true,
+  'agrinet' => true,
+  'defense' => true,
+  'turen' => true
+ ),
+ 'to' => array(
   'com' => true,
   'gov' => true,
   'net' => true,
   'org' => true,
   'edu' => true,
-  'mil' => true,
-  '611' => true,
-  'oya' => true,
-  'rdv' => true,
-  'vpnplus' => true,
-  'quickconnect' => 
-   'direct' => true
-  ,
-  'nyan' => true
- ,
- 'tr' => 
-  'av' => true,
-  'bbs' => true,
-  'bel' => true,
-  'biz' => true,
-  'com' => 
+  'mil' => true
+ ),
+ 'tr' => array(
+  'com' => array(
    'blogspot' => true
-  ,
-  'dr' => true,
-  'edu' => true,
+  ),
+  'info' => true,
+  'biz' => true,
+  'net' => true,
+  'org' => true,
+  'web' => true,
   'gen' => true,
+  'tv' => true,
+  'av' => true,
+  'dr' => true,
+  'bbs' => true,
+  'name' => true,
+  'tel' => true,
   'gov' => true,
-  'info' => true,
+  'bel' => true,
+  'pol' => true,
   'mil' => true,
   'k12' => true,
+  'edu' => true,
   'kep' => true,
-  'name' => true,
-  'net' => true,
-  'org' => true,
-  'pol' => true,
-  'tel' => true,
-  'tsk' => true,
-  'tv' => true,
-  'web' => true,
-  'nc' => 
+  'nc' => array(
    'gov' => true
-  
- ,
- 'tt' => 
+  )
+ ),
+ 'travel' => true,
+ 'tt' => array(
   'co' => true,
   'com' => true,
   'org' => true,
@@ -7921,20 +6502,18 @@
   'name' => true,
   'gov' => true,
   'edu' => true
- ,
- 'tv' => 
+ ),
+ 'tv' => array(
   'dyndns' => true,
   'better-than' => true,
   'on-the-web' => true,
   'worse-than' => true
- ,
- 'tw' => 
+ ),
+ 'tw' => array(
   'edu' => true,
   'gov' => true,
   'mil' => true,
-  'com' => 
-   'mymailer' => true
-  ,
+  'com' => true,
   'net' => true,
   'org' => true,
   'idv' => true,
@@ -7944,10 +6523,9 @@
   '網路' => true,
   '組織' => true,
   '商業' => true,
-  'url' => true,
   'blogspot' => true
- ,
- 'tz' => 
+ ),
+ 'tz' => array(
   'ac' => true,
   'co' => true,
   'go' => true,
@@ -7960,8 +6538,8 @@
   'or' => true,
   'sc' => true,
   'tv' => true
- ,
- 'ua' => 
+ ),
+ 'ua' => array(
   'com' => true,
   'edu' => true,
   'gov' => true,
@@ -7982,6 +6560,7 @@
   'dn' => true,
   'dnepropetrovsk' => true,
   'dnipropetrovsk' => true,
+  'dominic' => true,
   'donetsk' => true,
   'dp' => true,
   'if' => true,
@@ -8037,16 +6616,11 @@
   'zhytomyr' => true,
   'zp' => true,
   'zt' => true,
-  'cc' => true,
-  'inf' => true,
-  'ltd' => true,
-  'cx' => true,
   'biz' => true,
   'co' => true,
-  'pp' => true,
-  'v' => true
- ,
- 'ug' => 
+  'pp' => true
+ ),
+ 'ug' => array(
   'co' => true,
   'or' => true,
   'ac' => true,
@@ -8056,392 +6630,337 @@
   'com' => true,
   'org' => true,
   'blogspot' => true
- ,
- 'uk' => 
+ ),
+ 'uk' => array(
   'ac' => true,
-  'co' => 
-   'bytemark' => 
-    'dh' => true,
-    'vm' => true
-   ,
-   'blogspot' => true,
-   'layershift' => 
-    'j' => true
-   ,
-   'barsy' => true,
-   'barsyonline' => true,
-   'retrosnub' => 
-    'cust' => true
-   ,
-   'nh-serv' => true,
-   'no-ip' => true,
-   'wellbeingzone' => true,
-   'adimo' => true,
-   'myspreadshop' => true,
-   'gwiddle' => true
-  ,
-  'gov' => 
-   'service' => true,
-   'homeoffice' => true
-  ,
+  'co' => array(
+   'blogspot' => true
+  ),
+  'gov' => array(
+   'service' => true
+  ),
   'ltd' => true,
   'me' => true,
   'net' => true,
   'nhs' => true,
-  'org' => 
-   'glug' => true,
-   'lug' => true,
-   'lugs' => true,
-   'affinitylottery' => true,
-   'raffleentry' => true,
-   'weeklylottery' => true
-  ,
+  'org' => true,
   'plc' => true,
   'police' => true,
-  'sch' => 
+  'sch' => array(
    '*' => true
-  ,
-  'conn' => true,
-  'copro' => true,
-  'hosp' => true,
-  'pymnt' => true,
-  'barsy' => true
- ,
- 'us' => 
+  )
+ ),
+ 'us' => array(
   'dni' => true,
   'fed' => true,
   'isa' => true,
   'kids' => true,
   'nsn' => true,
-  'ak' => 
+  'ak' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'al' => 
+  ),
+  'al' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'ar' => 
+  ),
+  'ar' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'as' => 
+  ),
+  'as' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'az' => 
+  ),
+  'az' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'ca' => 
+  ),
+  'ca' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'co' => 
+  ),
+  'co' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'ct' => 
+  ),
+  'ct' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'dc' => 
+  ),
+  'dc' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'de' => 
+  ),
+  'de' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'fl' => 
+  ),
+  'fl' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'ga' => 
+  ),
+  'ga' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'gu' => 
+  ),
+  'gu' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'hi' => 
+  ),
+  'hi' => array(
    'cc' => true,
    'lib' => true
-  ,
-  'ia' => 
+  ),
+  'ia' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'id' => 
+  ),
+  'id' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'il' => 
+  ),
+  'il' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'in' => 
+  ),
+  'in' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'ks' => 
+  ),
+  'ks' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'ky' => 
+  ),
+  'ky' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'la' => 
+  ),
+  'la' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'ma' => 
-   'k12' => 
+  ),
+  'ma' => array(
+   'k12' => array(
     'pvt' => true,
     'chtr' => true,
     'paroch' => true
-   ,
+   ),
    'cc' => true,
    'lib' => true
-  ,
-  'md' => 
+  ),
+  'md' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'me' => 
+  ),
+  'me' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'mi' => 
+  ),
+  'mi' => array(
    'k12' => true,
    'cc' => true,
-   'lib' => true,
-   'ann-arbor' => true,
-   'cog' => true,
-   'dst' => true,
-   'eaton' => true,
-   'gen' => true,
-   'mus' => true,
-   'tec' => true,
-   'washtenaw' => true
-  ,
-  'mn' => 
+   'lib' => true
+  ),
+  'mn' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'mo' => 
+  ),
+  'mo' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'ms' => 
+  ),
+  'ms' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'mt' => 
+  ),
+  'mt' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'nc' => 
+  ),
+  'nc' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'nd' => 
+  ),
+  'nd' => array(
    'cc' => true,
    'lib' => true
-  ,
-  'ne' => 
+  ),
+  'ne' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'nh' => 
+  ),
+  'nh' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'nj' => 
+  ),
+  'nj' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'nm' => 
+  ),
+  'nm' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'nv' => 
+  ),
+  'nv' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'ny' => 
+  ),
+  'ny' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'oh' => 
+  ),
+  'oh' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'ok' => 
+  ),
+  'ok' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'or' => 
+  ),
+  'or' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'pa' => 
+  ),
+  'pa' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'pr' => 
+  ),
+  'pr' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'ri' => 
+  ),
+  'ri' => array(
+   'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'sc' => 
+  ),
+  'sc' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'sd' => 
+  ),
+  'sd' => array(
    'cc' => true,
    'lib' => true
-  ,
-  'tn' => 
+  ),
+  'tn' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'tx' => 
+  ),
+  'tx' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'ut' => 
+  ),
+  'ut' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'vi' => 
+  ),
+  'vi' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'vt' => 
+  ),
+  'vt' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'va' => 
+  ),
+  'va' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'wa' => 
+  ),
+  'wa' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'wi' => 
+  ),
+  'wi' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'wv' => 
+  ),
+  'wv' => array(
    'cc' => true
-  ,
-  'wy' => 
+  ),
+  'wy' => array(
    'k12' => true,
    'cc' => true,
    'lib' => true
-  ,
-  'graphox' => true,
-  'cloudns' => true,
-  'drud' => true,
+  ),
   'is-by' => true,
   'land-4-sale' => true,
-  'stuff-4-sale' => true,
-  'enscaled' => 
-   'phx' => true
-  ,
-  'mircloud' => true,
-  'freeddns' => true,
-  'golffan' => true,
-  'noip' => true,
-  'pointto' => true,
-  'platterp' => true
- ,
- 'uy' => 
-  'com' => 
+  'stuff-4-sale' => true
+ ),
+ 'uy' => array(
+  'com' => array(
    'blogspot' => true
-  ,
+  ),
   'edu' => true,
   'gub' => true,
   'mil' => true,
   'net' => true,
   'org' => true
- ,
- 'uz' => 
+ ),
+ 'uz' => array(
   'co' => true,
   'com' => true,
   'net' => true,
   'org' => true
- ,
+ ),
  'va' => true,
- 'vc' => 
+ 'vc' => array(
   'com' => true,
   'net' => true,
   'org' => true,
   'gov' => true,
   'mil' => true,
-  'edu' => true,
-  'gv' => 
-   'd' => true
-  ,
-  '0e' => true
- ,
- 've' => 
+  'edu' => true
+ ),
+ 've' => array(
   'arts' => true,
-  'bib' => true,
   'co' => true,
   'com' => true,
   'e12' => true,
@@ -8453,25 +6972,21 @@
   'int' => true,
   'mil' => true,
   'net' => true,
-  'nom' => true,
   'org' => true,
-  'rar' => true,
   'rec' => true,
   'store' => true,
   'tec' => true,
   'web' => true
- ,
- 'vg' => 
-  'at' => true
- ,
- 'vi' => 
+ ),
+ 'vg' => true,
+ 'vi' => array(
   'co' => true,
   'com' => true,
   'k12' => true,
   'net' => true,
   'org' => true
- ,
- 'vn' => 
+ ),
+ 'vn' => array(
   'com' => true,
   'net' => true,
   'org' => true,
@@ -8485,66 +7000,36 @@
   'pro' => true,
   'health' => true,
   'blogspot' => true
- ,
- 'vu' => 
+ ),
+ 'vu' => array(
   'com' => true,
   'edu' => true,
   'net' => true,
-  'org' => true,
-  'cn' => true,
-  'blog' => true,
-  'dev' => true,
-  'me' => true
- ,
+  'org' => true
+ ),
  'wf' => true,
- 'ws' => 
+ 'ws' => array(
   'com' => true,
   'net' => true,
   'org' => true,
   'gov' => true,
   'edu' => true,
-  'advisor' => 
-   '*' => true
-  ,
-  'cloud66' => true,
   'dyndns' => true,
   'mypets' => true
- ,
- 'yt' => 
-  'org' => true
- ,
+ ),
+ 'yt' => true,
  'امارات' => true,
  'հայ' => true,
  'বাংলা' => true,
- 'бг' => true,
- 'البحرين' => true,
  'бел' => true,
  '中国' => true,
  '中國' => true,
  'الجزائر' => true,
  'مصر' => true,
- 'ею' => true,
- 'ευ' => true,
- 'موريتانيا' => true,
  'გე' => true,
  'ελ' => true,
- '香港' => 
-  '公司' => true,
-  '教育' => true,
-  '政府' => true,
-  '個人' => true,
-  '網絡' => true,
-  '組織' => true
- ,
- 'ಭಾರತ' => true,
- 'ଭାରତ' => true,
- 'ভাৰত' => true,
- 'भारतम्' => true,
- 'भारोत' => true,
- 'ڀارت' => true,
- 'ഭാരതം' => true,
+ '香港' => true,
  'भारत' => true,
- 'بارت' => true,
  'بھارت' => true,
  'భారత్' => true,
  'ભારત' => true,
@@ -8557,7 +7042,6 @@
  'الاردن' => true,
  '한국' => true,
  'қаз' => true,
- 'ລາວ' => true,
  'ලංකා' => true,
  'இலங்கை' => true,
  'المغرب' => true,
@@ -8570,14 +7054,14 @@
  'پاکستان' => true,
  'پاكستان' => true,
  'فلسطين' => true,
- 'срб' => 
+ 'срб' => array(
   'пр' => true,
   'орг' => true,
   'обр' => true,
   'од' => true,
   'упр' => true,
   'ак' => true
- ,
+ ),
  'рф' => true,
  'قطر' => true,
  'السعودية' => true,
@@ -8589,14 +7073,7 @@
  'சிங்கப்பூர்' => true,
  'سورية' => true,
  'سوريا' => true,
- 'ไทย' => 
-  'ศึกษา' => true,
-  'ธุรกิจ' => true,
-  'รัฐบาล' => true,
-  'ทหาร' => true,
-  'เน็ต' => true,
-  'องค์กร' => true
- ,
+ 'ไทย' => true,
  'تونس' => true,
  '台灣' => true,
  '台湾' => true,
@@ -8604,21 +7081,16 @@
  'укр' => true,
  'اليمن' => true,
  'xxx' => true,
- 'ye' => 
-  'com' => true,
-  'edu' => true,
-  'gov' => true,
-  'net' => true,
-  'mil' => true,
-  'org' => true
- ,
- 'za' => 
+ 'ye' => array(
+  '*' => true
+ ),
+ 'za' => array(
   'ac' => true,
   'agric' => true,
   'alt' => true,
-  'co' => 
+  'co' => array(
    'blogspot' => true
-  ,
+  ),
   'edu' => true,
   'gov' => true,
   'grondar' => true,
@@ -8626,34 +7098,19 @@
   'mil' => true,
   'net' => true,
   'ngo' => true,
-  'nic' => true,
   'nis' => true,
   'nom' => true,
   'org' => true,
   'school' => true,
   'tm' => true,
   'web' => true
- ,
- 'zm' => 
-  'ac' => true,
-  'biz' => true,
-  'co' => true,
-  'com' => true,
-  'edu' => true,
-  'gov' => true,
-  'info' => true,
-  'mil' => true,
-  'net' => true,
-  'org' => true,
-  'sch' => true
- ,
- 'zw' => 
-  'ac' => true,
-  'co' => true,
-  'gov' => true,
-  'mil' => true,
-  'org' => true
- ,
+ ),
+ 'zm' => array(
+  '*' => true
+ ),
+ 'zw' => array(
+  '*' => true
+ ),
  'aaa' => true,
  'aarp' => true,
  'abarth' => true,
@@ -8664,24 +7121,26 @@
  'able' => true,
  'abogado' => true,
  'abudhabi' => true,
- 'academy' => 
-  'official' => true
- ,
+ 'academy' => true,
  'accenture' => true,
  'accountant' => true,
  'accountants' => true,
  'aco' => true,
+ 'active' => true,
  'actor' => true,
  'adac' => true,
  'ads' => true,
  'adult' => true,
  'aeg' => true,
  'aetna' => true,
+ 'afamilycompany' => true,
  'afl' => true,
  'africa' => true,
+ 'africamagic' => true,
  'agakhan' => true,
  'agency' => true,
  'aig' => true,
+ 'aigo' => true,
  'airbus' => true,
  'airforce' => true,
  'airtel' => true,
@@ -8694,7 +7153,6 @@
  'ally' => true,
  'alsace' => true,
  'alstom' => true,
- 'amazon' => true,
  'americanexpress' => true,
  'americanfamily' => true,
  'amex' => true,
@@ -8707,41 +7165,13 @@
  'anz' => true,
  'aol' => true,
  'apartments' => true,
- 'app' => 
-  'clerk' => true,
-  'clerkstage' => true,
-  'wnext' => true,
-  'platform0' => true,
-  'ondigitalocean' => true,
-  'edgecompute' => true,
-  'fireweb' => true,
-  'onflashdrive' => true,
-  'framer' => true,
-  'run' => 
-   'a' => true
-  ,
-  'web' => true,
-  'hasura' => true,
-  'loginline' => true,
-  'netlify' => true,
-  'developer' => 
-   '*' => true
-  ,
-  'noop' => true,
-  'northflank' => 
-   '*' => true
-  ,
-  'telebit' => true,
-  'vercel' => true,
-  'bookonline' => true
- ,
+ 'app' => true,
  'apple' => true,
  'aquarelle' => true,
  'arab' => true,
  'aramco' => true,
  'archi' => true,
  'army' => true,
- 'art' => true,
  'arte' => true,
  'asda' => true,
  'associates' => true,
@@ -8772,10 +7202,7 @@
  'barefoot' => true,
  'bargains' => true,
  'baseball' => true,
- 'basketball' => 
-  'aus' => true,
-  'nz' => true
- ,
+ 'basketball' => true,
  'bauhaus' => true,
  'bayern' => true,
  'bbc' => true,
@@ -8800,12 +7227,14 @@
  'bio' => true,
  'black' => true,
  'blackfriday' => true,
+ 'blanco' => true,
  'blockbuster' => true,
  'blog' => true,
  'bloomberg' => true,
  'blue' => true,
  'bms' => true,
  'bmw' => true,
+ 'bnl' => true,
  'bnpparibas' => true,
  'boats' => true,
  'boehringer' => true,
@@ -8815,6 +7244,7 @@
  'boo' => true,
  'book' => true,
  'booking' => true,
+ 'boots' => true,
  'bosch' => true,
  'bostik' => true,
  'boston' => true,
@@ -8830,12 +7260,8 @@
  'budapest' => true,
  'bugatti' => true,
  'build' => true,
- 'builders' => 
-  'cloudsite' => true
- ,
- 'business' => 
-  'co' => true
- ,
+ 'builders' => true,
+ 'business' => true,
  'buy' => true,
  'buzz' => true,
  'bzh' => true,
@@ -8844,7 +7270,6 @@
  'cal' => true,
  'call' => true,
  'calvinklein' => true,
- 'cam' => true,
  'camera' => true,
  'camp' => true,
  'cancerresearch' => true,
@@ -8859,12 +7284,10 @@
  'career' => true,
  'careers' => true,
  'cars' => true,
- 'casa' => 
-  'nabu' => 
-   'ui' => true
-  
- ,
+ 'cartier' => true,
+ 'casa' => true,
  'case' => true,
+ 'caseih' => true,
  'cash' => true,
  'casino' => true,
  'catering' => true,
@@ -8873,6 +7296,7 @@
  'cbn' => true,
  'cbre' => true,
  'cbs' => true,
+ 'ceb' => true,
  'center' => true,
  'ceo' => true,
  'cern' => true,
@@ -8880,13 +7304,14 @@
  'cfd' => true,
  'chanel' => true,
  'channel' => true,
- 'charity' => true,
  'chase' => true,
  'chat' => true,
  'cheap' => true,
  'chintai' => true,
+ 'chloe' => true,
  'christmas' => true,
  'chrome' => true,
+ 'chrysler' => true,
  'church' => true,
  'cipriani' => true,
  'circle' => true,
@@ -8902,94 +7327,17 @@
  'clinic' => true,
  'clinique' => true,
  'clothing' => true,
- 'cloud' => 
-  'banzai' => 
-   '*' => true
-  ,
-  'elementor' => true,
-  'encoway' => 
-   'eu' => true
-  ,
-  'statics' => 
-   '*' => true
-  ,
-  'ravendb' => true,
-  'axarnet' => 
-   'es-1' => true
-  ,
-  'diadem' => true,
-  'jelastic' => 
-   'vip' => true
-  ,
-  'jele' => true,
-  'jenv-aruba' => 
-   'aruba' => 
-    'eur' => 
-     'it1' => true
-    
-   ,
-   'it1' => true
-  ,
-  'keliweb' => 
-   'cs' => true
-  ,
-  'oxa' => 
-   'tn' => true,
-   'uk' => true
-  ,
-  'primetel' => 
-   'uk' => true
-  ,
-  'reclaim' => 
-   'ca' => true,
-   'uk' => true,
-   'us' => true
-  ,
-  'trendhosting' => 
-   'ch' => true,
-   'de' => true
-  ,
-  'jotelulu' => true,
-  'kuleuven' => true,
-  'linkyard' => true,
-  'magentosite' => 
-   '*' => true
-  ,
-  'perspecta' => true,
-  'vapor' => true,
-  'on-rancher' => 
-   '*' => true
-  ,
-  'sensiosite' => 
-   '*' => true
-  ,
-  'trafficplex' => true,
-  'urown' => true,
-  'voorloper' => true
- ,
- 'club' => 
-  'cloudns' => true,
-  'jele' => true,
-  'barsy' => true,
-  'pony' => true
- ,
+ 'cloud' => true,
+ 'club' => true,
  'clubmed' => true,
  'coach' => true,
- 'codes' => 
-  'owo' => 
-   '*' => true
-  
- ,
+ 'codes' => true,
  'coffee' => true,
  'college' => true,
  'cologne' => true,
  'comcast' => true,
  'commbank' => true,
- 'community' => 
-  'nog' => true,
-  'ravendb' => true,
-  'myforum' => true
- ,
+ 'community' => true,
  'company' => true,
  'compare' => true,
  'computer' => true,
@@ -9001,16 +7349,12 @@
  'contractors' => true,
  'cooking' => true,
  'cookingchannel' => true,
- 'cool' => 
-  'elementor' => true,
-  'de' => true
- ,
+ 'cool' => true,
  'corsica' => true,
  'country' => true,
  'coupon' => true,
  'coupons' => true,
  'courses' => true,
- 'cpa' => true,
  'credit' => true,
  'creditcard' => true,
  'creditunion' => true,
@@ -9026,7 +7370,6 @@
  'dabur' => true,
  'dad' => true,
  'dance' => true,
- 'data' => true,
  'date' => true,
  'dating' => true,
  'datsun' => true,
@@ -9045,50 +7388,12 @@
  'dental' => true,
  'dentist' => true,
  'desi' => true,
- 'design' => 
-  'bss' => true
- ,
- 'dev' => 
-  'lcl' => 
-   '*' => true
-  ,
-  'lclstage' => 
-   '*' => true
-  ,
-  'stg' => 
-   '*' => true
-  ,
-  'stgstage' => 
-   '*' => true
-  ,
-  'pages' => true,
-  'workers' => true,
-  'curv' => true,
-  'deno' => true,
-  'deno-staging' => true,
-  'fly' => true,
-  'githubpreview' => true,
-  'gateway' => 
-   '*' => true
-  ,
-  'iserv' => true,
-  'loginline' => true,
-  'mediatech' => true,
-  'platter-app' => true,
-  'shiftcrypto' => true,
-  'vercel' => true,
-  'webhare' => 
-   '*' => true
-  
- ,
+ 'design' => true,
+ 'dev' => true,
  'dhl' => true,
  'diamonds' => true,
  'diet' => true,
- 'digital' => 
-  'cloudapps' => 
-   'london' => true
-  
- ,
+ 'digital' => true,
  'direct' => true,
  'directory' => true,
  'discount' => true,
@@ -9097,60 +7402,48 @@
  'diy' => true,
  'dnp' => true,
  'docs' => true,
- 'doctor' => true,
+ 'dodge' => true,
  'dog' => true,
+ 'doha' => true,
  'domains' => true,
+ 'doosan' => true,
  'dot' => true,
  'download' => true,
  'drive' => true,
+ 'dstv' => true,
  'dtv' => true,
  'dubai' => true,
+ 'duck' => true,
  'dunlop' => true,
+ 'duns' => true,
  'dupont' => true,
  'durban' => true,
  'dvag' => true,
- 'dvr' => true,
- 'earth' => 
-  'dapps' => 
-   '*' => true,
-   'bzz' => 
-    '*' => true
-   
-  
- ,
+ 'dwg' => true,
+ 'earth' => true,
  'eat' => true,
- 'eco' => true,
  'edeka' => true,
- 'education' => 
-  'co' => true
- ,
+ 'education' => true,
  'email' => true,
  'emerck' => true,
+ 'emerson' => true,
  'energy' => true,
  'engineer' => true,
  'engineering' => true,
  'enterprises' => true,
+ 'epost' => true,
  'epson' => true,
  'equipment' => true,
  'ericsson' => true,
  'erni' => true,
  'esq' => true,
- 'estate' => 
-  'compute' => 
-   '*' => true
-  
- ,
+ 'estate' => true,
+ 'esurance' => true,
  'etisalat' => true,
  'eurovision' => true,
- 'eus' => 
-  'party' => 
-   'user' => true
-  
- ,
- 'events' => 
-  'koobin' => true,
-  'co' => true
- ,
+ 'eus' => true,
+ 'events' => true,
+ 'everbank' => true,
  'exchange' => true,
  'expert' => true,
  'exposed' => true,
@@ -9159,19 +7452,13 @@
  'fage' => true,
  'fail' => true,
  'fairwinds' => true,
- 'faith' => 
-  'ybo' => true
- ,
+ 'faith' => true,
  'family' => true,
  'fan' => true,
  'fans' => true,
- 'farm' => 
-  'storj' => true
- ,
+ 'farm' => true,
  'farmers' => true,
- 'fashion' => 
-  'of' => true
- ,
+ 'fashion' => true,
  'fast' => true,
  'fedex' => true,
  'feedback' => true,
@@ -9183,9 +7470,7 @@
  'film' => true,
  'final' => true,
  'finance' => true,
- 'financial' => 
-  'co' => true
- ,
+ 'financial' => true,
  'fire' => true,
  'firestone' => true,
  'firmdale' => true,
@@ -9198,9 +7483,9 @@
  'flir' => true,
  'florist' => true,
  'flowers' => true,
+ 'flsmidth' => true,
  'fly' => true,
  'foo' => true,
- 'food' => true,
  'foodnetwork' => true,
  'football' => true,
  'ford' => true,
@@ -9217,7 +7502,7 @@
  'frontier' => true,
  'ftr' => true,
  'fujitsu' => true,
- 'fun' => true,
+ 'fujixerox' => true,
  'fund' => true,
  'furniture' => true,
  'futbol' => true,
@@ -9230,11 +7515,8 @@
  'games' => true,
  'gap' => true,
  'garden' => true,
- 'gay' => true,
  'gbiz' => true,
- 'gdn' => 
-  'cnpy' => true
- ,
+ 'gdn' => true,
  'gea' => true,
  'gent' => true,
  'genting' => true,
@@ -9244,12 +7526,12 @@
  'gifts' => true,
  'gives' => true,
  'giving' => true,
+ 'glade' => true,
  'glass' => true,
  'gle' => true,
  'global' => true,
  'globo' => true,
  'gmail' => true,
- 'gmbh' => true,
  'gmo' => true,
  'gmx' => true,
  'godaddy' => true,
@@ -9257,26 +7539,19 @@
  'goldpoint' => true,
  'golf' => true,
  'goo' => true,
+ 'goodhands' => true,
  'goodyear' => true,
- 'goog' => 
-  'cloud' => true,
-  'translate' => true,
-  'usercontent' => 
-   '*' => true
-  
- ,
+ 'goog' => true,
  'google' => true,
  'gop' => true,
  'got' => true,
+ 'gotv' => true,
  'grainger' => true,
  'graphics' => true,
  'gratis' => true,
  'green' => true,
  'gripe' => true,
- 'grocery' => true,
- 'group' => 
-  'discourse' => true
- ,
+ 'group' => true,
  'guardian' => true,
  'gucci' => true,
  'guge' => true,
@@ -9290,9 +7565,7 @@
  'hbo' => true,
  'hdfc' => true,
  'hdfcbank' => true,
- 'health' => 
-  'hra' => true
- ,
+ 'health' => true,
  'healthcare' => true,
  'help' => true,
  'helsinki' => true,
@@ -9312,30 +7585,17 @@
  'homes' => true,
  'homesense' => true,
  'honda' => true,
+ 'honeywell' => true,
  'horse' => true,
- 'hospital' => true,
- 'host' => 
-  'cloudaccess' => true,
-  'freesite' => true,
-  'fastvps' => true,
-  'myfast' => true,
-  'tempurl' => true,
-  'wpmudev' => true,
-  'jele' => true,
-  'mircloud' => true,
-  'pcloud' => true,
-  'half' => true
- ,
- 'hosting' => 
-  'opencraft' => true
- ,
+ 'host' => true,
+ 'hosting' => true,
  'hot' => true,
  'hoteles' => true,
- 'hotels' => true,
  'hotmail' => true,
  'house' => true,
  'how' => true,
  'hsbc' => true,
+ 'htc' => true,
  'hughes' => true,
  'hyatt' => true,
  'hyundai' => true,
@@ -9345,12 +7605,12 @@
  'icu' => true,
  'ieee' => true,
  'ifm' => true,
+ 'iinet' => true,
  'ikano' => true,
  'imamat' => true,
  'imdb' => true,
  'immo' => true,
  'immobilien' => true,
- 'inc' => true,
  'industries' => true,
  'infiniti' => true,
  'ing' => true,
@@ -9358,23 +7618,29 @@
  'institute' => true,
  'insurance' => true,
  'insure' => true,
+ 'intel' => true,
  'international' => true,
  'intuit' => true,
  'investments' => true,
  'ipiranga' => true,
  'irish' => true,
+ 'iselect' => true,
  'ismaili' => true,
  'ist' => true,
  'istanbul' => true,
  'itau' => true,
  'itv' => true,
+ 'iveco' => true,
+ 'iwc' => true,
  'jaguar' => true,
  'java' => true,
  'jcb' => true,
+ 'jcp' => true,
  'jeep' => true,
  'jetzt' => true,
  'jewelry' => true,
  'jio' => true,
+ 'jlc' => true,
  'jll' => true,
  'jmp' => true,
  'jnj' => true,
@@ -9392,7 +7658,6 @@
  'kerryproperties' => true,
  'kfh' => true,
  'kia' => true,
- 'kids' => true,
  'kim' => true,
  'kinder' => true,
  'kindle' => true,
@@ -9403,24 +7668,19 @@
  'kosher' => true,
  'kpmg' => true,
  'kpn' => true,
- 'krd' => 
-  'co' => true,
-  'edu' => true
- ,
+ 'krd' => true,
  'kred' => true,
  'kuokgroup' => true,
+ 'kyknet' => true,
  'kyoto' => true,
  'lacaixa' => true,
+ 'ladbrokes' => true,
  'lamborghini' => true,
  'lamer' => true,
  'lancaster' => true,
  'lancia' => true,
- 'land' => 
-  'static' => 
-   'dev' => true,
-   'sites' => true
-  
- ,
+ 'lancome' => true,
+ 'land' => true,
  'landrover' => true,
  'lanxess' => true,
  'lasalle' => true,
@@ -9437,6 +7697,7 @@
  'lego' => true,
  'lexus' => true,
  'lgbt' => true,
+ 'liaison' => true,
  'lidl' => true,
  'life' => true,
  'lifeinsurance' => true,
@@ -9448,32 +7709,18 @@
  'limo' => true,
  'lincoln' => true,
  'linde' => true,
- 'link' => 
-  'cyon' => true,
-  'mypep' => true,
-  'dweb' => 
-   '*' => true
-  
- ,
+ 'link' => true,
  'lipsy' => true,
- 'live' => 
-  'hlx' => true
- ,
+ 'live' => true,
  'living' => true,
- 'llc' => true,
- 'llp' => true,
+ 'lixil' => true,
  'loan' => true,
  'loans' => true,
  'locker' => true,
  'locus' => true,
  'loft' => true,
- 'lol' => 
-  'omg' => true
- ,
- 'london' => 
-  'in' => true,
-  'of' => true
- ,
+ 'lol' => true,
+ 'london' => true,
  'lotte' => true,
  'lotto' => true,
  'love' => true,
@@ -9482,6 +7729,7 @@
  'ltd' => true,
  'ltda' => true,
  'lundbeck' => true,
+ 'lupin' => true,
  'luxe' => true,
  'luxury' => true,
  'macys' => true,
@@ -9490,22 +7738,18 @@
  'maison' => true,
  'makeup' => true,
  'man' => true,
- 'management' => 
-  'router' => true
- ,
+ 'management' => true,
  'mango' => true,
- 'map' => true,
  'market' => true,
- 'marketing' => 
-  'from' => true,
-  'with' => true
- ,
+ 'marketing' => true,
  'markets' => true,
  'marriott' => true,
  'marshalls' => true,
  'maserati' => true,
  'mattel' => true,
  'mba' => true,
+ 'mcd' => true,
+ 'mcdonalds' => true,
  'mckinsey' => true,
  'med' => true,
  'media' => true,
@@ -9513,14 +7757,10 @@
  'melbourne' => true,
  'meme' => true,
  'memorial' => true,
- 'men' => 
-  'for' => true,
-  'repair' => true
- ,
- 'menu' => 
-  'barsy' => true
- ,
- 'merckmsd' => true,
+ 'men' => true,
+ 'menu' => true,
+ 'meo' => true,
+ 'metlife' => true,
  'miami' => true,
  'microsoft' => true,
  'mini' => true,
@@ -9530,17 +7770,17 @@
  'mlb' => true,
  'mls' => true,
  'mma' => true,
- 'mobile' => true,
+ 'mnet' => true,
+ 'mobily' => true,
  'moda' => true,
  'moe' => true,
  'moi' => true,
- 'mom' => 
-  'and' => true,
-  'for' => true
- ,
+ 'mom' => true,
  'monash' => true,
  'money' => true,
  'monster' => true,
+ 'montblanc' => true,
+ 'mopar' => true,
  'mormon' => true,
  'mortgage' => true,
  'moscow' => true,
@@ -9548,33 +7788,31 @@
  'motorcycles' => true,
  'mov' => true,
  'movie' => true,
+ 'movistar' => true,
  'msd' => true,
  'mtn' => true,
+ 'mtpc' => true,
  'mtr' => true,
- 'music' => true,
+ 'multichoice' => true,
  'mutual' => true,
+ 'mutuelle' => true,
+ 'mzansimagic' => true,
  'nab' => true,
+ 'nadex' => true,
  'nagoya' => true,
+ 'naspers' => true,
+ 'nationwide' => true,
  'natura' => true,
  'navy' => true,
  'nba' => true,
  'nec' => true,
  'netbank' => true,
  'netflix' => true,
- 'network' => 
-  'alces' => 
-   '*' => true
-  ,
-  'co' => true,
-  'arvo' => true,
-  'azimuth' => true,
-  'tlon' => true
- ,
+ 'network' => true,
  'neustar' => true,
  'new' => true,
- 'news' => 
-  'noticeable' => true
- ,
+ 'newholland' => true,
+ 'news' => true,
  'next' => true,
  'nextdirect' => true,
  'nexus' => true,
@@ -9599,6 +7837,7 @@
  'nyc' => true,
  'obi' => true,
  'observer' => true,
+ 'off' => true,
  'office' => true,
  'okinawa' => true,
  'olayan' => true,
@@ -9606,77 +7845,54 @@
  'oldnavy' => true,
  'ollo' => true,
  'omega' => true,
- 'one' => 
-  'onred' => 
-   'staging' => true
-  ,
-  'for' => true,
-  'under' => true,
-  'service' => true,
-  'homelink' => true
- ,
+ 'one' => true,
  'ong' => true,
  'onl' => true,
- 'online' => 
-  'eero' => true,
-  'eero-stage' => true,
-  'barsy' => true
- ,
+ 'online' => true,
+ 'onyourside' => true,
  'ooo' => true,
  'open' => true,
  'oracle' => true,
  'orange' => true,
  'organic' => true,
+ 'orientexpress' => true,
  'origins' => true,
  'osaka' => true,
  'otsuka' => true,
  'ott' => true,
- 'ovh' => 
-  'nerdpol' => true
- ,
- 'page' => 
-  'hlx' => true,
-  'hlx3' => true,
-  'pdns' => true,
-  'plesk' => true,
-  'prvcy' => true,
-  'magnet' => true
- ,
+ 'ovh' => true,
+ 'page' => true,
+ 'pamperedchef' => true,
  'panasonic' => true,
+ 'panerai' => true,
  'paris' => true,
  'pars' => true,
  'partners' => true,
  'parts' => true,
- 'party' => 
-  'ybo' => true
- ,
+ 'party' => true,
  'passagens' => true,
  'pay' => true,
+ 'payu' => true,
  'pccw' => true,
  'pet' => true,
  'pfizer' => true,
  'pharmacy' => true,
- 'phd' => true,
  'philips' => true,
- 'phone' => true,
  'photo' => true,
  'photography' => true,
  'photos' => true,
  'physio' => true,
+ 'piaget' => true,
  'pics' => true,
  'pictet' => true,
- 'pictures' => 
-  '1337' => true
- ,
+ 'pictures' => true,
  'pid' => true,
  'pin' => true,
  'ping' => true,
  'pink' => true,
  'pioneer' => true,
  'pizza' => true,
- 'place' => 
-  'co' => true
- ,
+ 'place' => true,
  'play' => true,
  'playstation' => true,
  'plumbing' => true,
@@ -9685,9 +7901,7 @@
  'pohl' => true,
  'poker' => true,
  'politie' => true,
- 'porn' => 
-  'indie' => true
- ,
+ 'porn' => true,
  'pramerica' => true,
  'praxi' => true,
  'press' => true,
@@ -9702,15 +7916,14 @@
  'protection' => true,
  'pru' => true,
  'prudential' => true,
- 'pub' => 
-  'barsy' => true
- ,
+ 'pub' => true,
  'pwc' => true,
  'qpon' => true,
  'quebec' => true,
  'quest' => true,
+ 'qvc' => true,
  'racing' => true,
- 'radio' => true,
+ 'raid' => true,
  'read' => true,
  'realestate' => true,
  'realtor' => true,
@@ -9732,50 +7945,32 @@
  'republican' => true,
  'rest' => true,
  'restaurant' => true,
- 'review' => 
-  'ybo' => true
- ,
+ 'review' => true,
  'reviews' => true,
  'rexroth' => true,
  'rich' => true,
  'richardli' => true,
  'ricoh' => true,
+ 'rightathome' => true,
  'ril' => true,
  'rio' => true,
- 'rip' => 
-  'clan' => true
- ,
+ 'rip' => true,
+ 'rmit' => true,
  'rocher' => true,
- 'rocks' => 
-  'myddns' => true,
-  'lima-city' => true,
-  'webspace' => true
- ,
+ 'rocks' => true,
  'rodeo' => true,
  'rogers' => true,
  'room' => true,
  'rsvp' => true,
- 'rugby' => true,
  'ruhr' => true,
- 'run' => 
-  'hs' => true,
-  'development' => true,
-  'ravendb' => true,
-  'servers' => true,
-  'code' => 
-   '*' => true
-  ,
-  'repl' => true
- ,
+ 'run' => true,
  'rwe' => true,
  'ryukyu' => true,
  'saarland' => true,
  'safe' => true,
  'safety' => true,
  'sakura' => true,
- 'sale' => 
-  'for' => true
- ,
+ 'sale' => true,
  'salon' => true,
  'samsclub' => true,
  'samsung' => true,
@@ -9783,6 +7978,7 @@
  'sandvikcoromant' => true,
  'sanofi' => true,
  'sap' => true,
+ 'sapo' => true,
  'sarl' => true,
  'sas' => true,
  'save' => true,
@@ -9797,25 +7993,17 @@
  'school' => true,
  'schule' => true,
  'schwarz' => true,
- 'science' => 
-  'ybo' => true
- ,
- 'scot' => 
-  'edu' => true,
-  'gov' => 
-   'service' => true
-  
- ,
- 'search' => true,
+ 'science' => true,
+ 'scjohnson' => true,
+ 'scor' => true,
+ 'scot' => true,
  'seat' => true,
  'secure' => true,
  'security' => true,
  'seek' => true,
  'select' => true,
  'sener' => true,
- 'services' => 
-  'loginline' => true
- ,
+ 'services' => true,
  'ses' => true,
  'seven' => true,
  'sew' => true,
@@ -9829,43 +8017,14 @@
  'shia' => true,
  'shiksha' => true,
  'shoes' => true,
- 'shop' => 
-  'base' => true,
-  'hoplix' => true,
-  'barsy' => true
- ,
- 'shopping' => true,
  'shouji' => true,
  'show' => true,
  'showtime' => true,
+ 'shriram' => true,
  'silk' => true,
  'sina' => true,
  'singles' => true,
- 'site' => 
-  'cloudera' => 
-   '*' => true
-  ,
-  'cyon' => true,
-  'fnwk' => true,
-  'folionetwork' => true,
-  'fastvps' => true,
-  'jele' => true,
-  'lelux' => true,
-  'loginline' => true,
-  'barsy' => true,
-  'mintere' => true,
-  'omniwe' => true,
-  'opensocial' => true,
-  'platformsh' => 
-   '*' => true
-  ,
-  'tst' => 
-   '*' => true
-  ,
-  'byen' => true,
-  'srht' => true,
-  'novecore' => true
- ,
+ 'site' => true,
  'ski' => true,
  'skin' => true,
  'sky' => true,
@@ -9880,56 +8039,45 @@
  'software' => true,
  'sohu' => true,
  'solar' => true,
- 'solutions' => 
-  'diher' => 
-   '*' => true
-  
- ,
+ 'solutions' => true,
  'song' => true,
  'sony' => true,
  'soy' => true,
- 'spa' => true,
- 'space' => 
-  'myfast' => true,
-  'uber' => true,
-  'xs4all' => true
- ,
- 'sport' => true,
+ 'space' => true,
+ 'spiegel' => true,
  'spot' => true,
+ 'spreadbetting' => true,
  'srl' => true,
+ 'srt' => true,
  'stada' => true,
  'staples' => true,
  'star' => true,
+ 'starhub' => true,
  'statebank' => true,
  'statefarm' => true,
+ 'statoil' => true,
  'stc' => true,
  'stcgroup' => true,
  'stockholm' => true,
  'storage' => true,
- 'store' => 
-  'sellfy' => true,
-  'shopware' => true,
-  'storebase' => true
- ,
- 'stream' => true,
+ 'store' => true,
  'studio' => true,
  'study' => true,
  'style' => true,
  'sucks' => true,
+ 'supersport' => true,
  'supplies' => true,
  'supply' => true,
- 'support' => 
-  'barsy' => true
- ,
+ 'support' => true,
  'surf' => true,
  'surgery' => true,
  'suzuki' => true,
  'swatch' => true,
+ 'swiftcover' => true,
  'swiss' => true,
  'sydney' => true,
- 'systems' => 
-  'knightpoint' => true
- ,
+ 'symantec' => true,
+ 'systems' => true,
  'tab' => true,
  'taipei' => true,
  'talk' => true,
@@ -9942,20 +8090,18 @@
  'taxi' => true,
  'tci' => true,
  'tdk' => true,
- 'team' => 
-  'discourse' => true,
-  'jelastic' => true
- ,
+ 'team' => true,
  'tech' => true,
- 'technology' => 
-  'co' => true
- ,
+ 'technology' => true,
+ 'telecity' => true,
+ 'telefonica' => true,
  'temasek' => true,
  'tennis' => true,
  'teva' => true,
  'thd' => true,
  'theater' => true,
  'theatre' => true,
+ 'theguardian' => true,
  'tiaa' => true,
  'tickets' => true,
  'tienda' => true,
@@ -9967,15 +8113,10 @@
  'tjx' => true,
  'tkmaxx' => true,
  'tmall' => true,
- 'today' => 
-  'prequalifyme' => true
- ,
+ 'today' => true,
  'tokyo' => true,
  'tools' => true,
- 'top' => 
-  'now-dns' => true,
-  'ntdll' => true
- ,
+ 'top' => true,
  'toray' => true,
  'toshiba' => true,
  'total' => true,
@@ -9983,12 +8124,9 @@
  'town' => true,
  'toyota' => true,
  'toys' => true,
- 'trade' => 
-  'ybo' => true
- ,
+ 'trade' => true,
  'trading' => true,
  'training' => true,
- 'travel' => true,
  'travelchannel' => true,
  'travelers' => true,
  'travelersinsurance' => true,
@@ -10001,6 +8139,7 @@
  'tvs' => true,
  'ubank' => true,
  'ubs' => true,
+ 'uconnect' => true,
  'unicom' => true,
  'university' => true,
  'uno' => true,
@@ -10024,6 +8163,8 @@
  'virgin' => true,
  'visa' => true,
  'vision' => true,
+ 'vista' => true,
+ 'vistaprint' => true,
  'viva' => true,
  'vivo' => true,
  'vlaanderen' => true,
@@ -10040,6 +8181,7 @@
  'walter' => true,
  'wang' => true,
  'wanggou' => true,
+ 'warman' => true,
  'watch' => true,
  'watches' => true,
  'weather' => true,
@@ -10047,6 +8189,7 @@
  'webcam' => true,
  'weber' => true,
  'website' => true,
+ 'wed' => true,
  'wedding' => true,
  'weibo' => true,
  'weir' => true,
@@ -10054,19 +8197,14 @@
  'wien' => true,
  'wiki' => true,
  'williamhill' => true,
- 'win' => 
-  'that' => true
- ,
+ 'win' => true,
  'windows' => true,
  'wine' => true,
  'winners' => true,
  'wme' => true,
  'wolterskluwer' => true,
  'woodside' => true,
- 'work' => 
-  'from' => true,
-  'to' => true
- ,
+ 'work' => true,
  'works' => true,
  'world' => true,
  'wow' => true,
@@ -10083,10 +8221,12 @@
  '慈善' => true,
  '集团' => true,
  '在线' => true,
+ '大众汽车' => true,
  '点看' => true,
  'คอม' => true,
  '八卦' => true,
  'موقع' => true,
+ '一号店' => true,
  '公益' => true,
  '公司' => true,
  '香格里拉' => true,
@@ -10106,7 +8246,6 @@
  'орг' => true,
  'नेट' => true,
  'ストア' => true,
- 'アマゾン' => true,
  '삼성' => true,
  '商标' => true,
  '商店' => true,
@@ -10114,6 +8253,7 @@
  'дети' => true,
  'ポイント' => true,
  '新闻' => true,
+ '工行' => true,
  '家電' => true,
  'كوم' => true,
  '中文网' => true,
@@ -10129,15 +8269,16 @@
  '餐厅' => true,
  '网络' => true,
  'ком' => true,
- '亚马逊' => true,
  '诺基亚' => true,
  '食品' => true,
  '飞利浦' => true,
+ '手表' => true,
  '手机' => true,
  'ارامكو' => true,
  'العليان' => true,
  'اتصالات' => true,
  'بازار' => true,
+ 'موبايلي' => true,
  'ابوظبي' => true,
  'كاثوليك' => true,
  'همراه' => true,
@@ -10149,19 +8290,8 @@
  '机构' => true,
  '组织机构' => true,
  '健康' => true,
- '招聘' => true,
- 'рус' => 
-  'биз' => true,
-  'ком' => true,
-  'крым' => true,
-  'мир' => true,
-  'мск' => true,
-  'орг' => true,
-  'самара' => true,
-  'сочи' => true,
-  'спб' => true,
-  'я' => true
- ,
+ 'рус' => true,
+ '珠宝' => true,
  '大拿' => true,
  'みんな' => true,
  'グーグル' => true,
@@ -10180,15 +8310,8 @@
  '嘉里' => true,
  '广东' => true,
  '政务' => true,
- 'xyz' => 
-  'blogsite' => true,
-  'localzone' => true,
-  'crafting' => true,
-  'zapto' => true,
-  'telebit' => 
-   '*' => true
-  
- ,
+ 'xperia' => true,
+ 'xyz' => true,
  'yachts' => true,
  'yahoo' => true,
  'yamaxun' => true,
@@ -10203,14 +8326,8 @@
  'zara' => true,
  'zero' => true,
  'zip' => true,
- 'zone' => 
-  'cloud66' => true,
-  'hs' => true,
-  'triton' => 
-   '*' => true
-  ,
-  'lima' => true
- ,
+ 'zippo' => true,
+ 'zone' => true,
  'zuerich' => true
-;
+);
 ?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/docs/LICENSE Changed

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/docs/examples Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/docs/examples/upload-rapidshare.php Added

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Usage example for HTTP_Request2 package: uploading a file to rapidshare.com
+ *
+ * Inspired by Perl usage example: http://images.rapidshare.com/software/rsapi.pl
+ * Rapidshare API description: http://rapidshare.com/dev.html
+ */
+
+require_once 'HTTP/Request2.php';
+
+// You'll probably want to change this
+$filename = '/etc/passwd';
+
+try {
+    // First step: get an available upload server
+    $request = new HTTP_Request2(
+        'http://rapidshare.com/cgi-bin/rsapi.cgi?sub=nextuploadserver_v1'
+    );
+    $server  = $request->send()->getBody();
+    if (!preg_match('/^(\\d+)$/', $server)) {
+        throw new Exception("Invalid upload server: {$server}");
+    }
+
+    // Calculate file hash, we'll use it later to check upload
+    if (false === ($hash = @md5_file($filename))) {
+        throw new Exception("Cannot calculate MD5 hash of '{$filename}'");
+    }
+
+    // Second step: upload a file to the available server
+    $uploader = new HTTP_Request2(
+        "http://rs{$server}l3.rapidshare.com/cgi-bin/upload.cgi",
+        HTTP_Request2::METHOD_POST
+    );
+    // Adding the file
+    $uploader->addUpload('filecontent', $filename);
+    // This will tell server to return program-friendly output
+    $uploader->addPostParameter('rsapi_v1', '1');
+
+    $response = $uploader->send()->getBody();
+    if (!preg_match_all('/^(File^=+)=(.+)$/m', $response, $m, PREG_SET_ORDER)) {
+        throw new Exception("Invalid response: {$response}");
+    }
+    $rspAry = array();
+    foreach ($m as $item) {
+        $rspAry$item1 = $item2;
+    }
+    // Check that uploaded file has the same hash
+    if (empty($rspAry'File1.4')) {
+        throw new Exception("MD5 hash data not found in response");
+    } elseif ($hash != strtolower($rspAry'File1.4')) {
+        throw new Exception("Upload failed, local MD5 is {$hash}, uploaded MD5 is {$rspAry'File1.4'}");
+    }
+    echo "Upload succeeded\nDownload link: {$rspAry'File1.1'}\nDelete link: {$rspAry'File1.2'}\n";
+
+} catch (Exception $e) {
+    echo "Error: " . $e->getMessage();
+}
+?>

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/package.xml Added

@@ -0,0 +1,698 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package version="2.0"
+ xmlns="http://pear.php.net/dtd/package-2.0"
+ xmlns:tasks="http://pear.php.net/dtd/tasks-1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
+
+  <name>HTTP_Request2</name>
+  <channel>pear.php.net</channel>
+  <extends>HTTP_Request</extends>
+  <summary>Provides an easy way to perform HTTP requests.</summary>
+  <description>
+PHP5 rewrite of HTTP_Request package (with parts of HTTP_Client). Provides
+cleaner API and pluggable Adapters:
+  * Socket adapter, based on old HTTP_Request code,
+  * Curl adapter, wraps around PHP's cURL extension,
+  * Mock adapter, to use for testing packages dependent on HTTP_Request2.
+Supports POST requests with data and file uploads, basic and digest
+authentication, cookies, managing cookies across requests, proxies, gzip and
+deflate encodings, redirects, monitoring the request progress with Observers...
+  </description>
+  <lead>
+    <name>Alexey Borzov</name>
+    <user>avb</user>
+    <email>avb@php.net</email>
+    <active>yes</active>
+  </lead>
+  <date>2016-02-13</date>
+  <version>
+    <release>2.3.0</release>
+    <api>2.3.0</api>
+  </version>
+  <stability>
+    <release>stable</release>
+    <api>stable</api>
+  </stability>
+  <license uri="http://opensource.org/licenses/BSD-3-Clause">BSD 3-Clause License</license>
+  <notes>
+New features:
+ * New observer that can do on-the-fly decoding of compressed responses,
+   see HTTP_Request2_Observer_UncompressingDownload.
+   Thanks to Delian Krustev for initial implementation.
+ * CookieJar can now silently ignore invalid cookies with $jar-&gt;ignoreInvalidCookies(true);
+   instead of throwing an exception. See requests #19937 and #20401
+ * Adapters now dispatch a new 'warning' event, e.g. in case of incomplete response
+   body or broken 'chunked' encoding. Exception was thrown previously by Socket adapter
+   in the latter case, see bug #20228
+ * Improved security of HTTPS requests in Socket adapter
+   - Use 'tls://' instead of 'ssl://' in connection string to prevent fallback to
+     known insecure versions, use only TLS when enabling crypto via proxy (see bug #20462)
+   - On PHP 5.6+ require using only TLS 1.1 and TLS 1.2
+   - Do not use insecure ciphers
+ * Improved test suite, network-backed tests now run on Travis CI
+
+Changes and fixes:
+ * Curl adapter failed to send PUT request body with 'follow_redirects' on (bug #20440)
+ * Curl adapter supplied invalid cookie domain to CookieJar after redirect (bug #20561)
+ * Curl adapter now properly dispatches events while sending the request
+ * mime_content_type() returning false was handled incorrectly when guessing content-type
+ * Use 'peer_name' and 'verify_peer_name' SSL context options on PHP 5.6+
+   instead of deprecated 'CN_match'
+ * Public Suffix List updated to current version, its download location changed
+
+Note to Composer users: next package version will probably get rid of 'include-path'
+setting in composer.json favour of using autoloader.
+  </notes>
+  <contents>
+    <dir name="/">
+      <dir name="HTTP">
+        <dir name="Request2">
+          <dir name="Adapter">
+            <file role="php" name="Curl.php">
+              <tasks:replace from="@package_version@" to="version" type="package-info" />
+            </file>
+            <file role="php" name="Mock.php">
+              <tasks:replace from="@package_version@" to="version" type="package-info" />
+            </file>
+            <file role="php" name="Socket.php">
+              <tasks:replace from="@package_version@" to="version" type="package-info" />
+            </file>
+          </dir>
+          <file role="php" name="Adapter.php">
+            <tasks:replace from="@package_version@" to="version" type="package-info" />
+          </file>
+          <file role="php" name="CookieJar.php">
+            <tasks:replace from="@package_version@" to="version" type="package-info" />
+            <tasks:replace from="@data_dir@" to="data_dir" type="pear-config" />
+          </file>
+          <file role="php" name="Exception.php">
+            <tasks:replace from="@package_version@" to="version" type="package-info" />
+          </file>
+          <file role="php" name="MultipartBody.php">
+            <tasks:replace from="@package_version@" to="version" type="package-info" />
+          </file>
+          <file role="php" name="SocketWrapper.php">
+            <tasks:replace from="@package_version@" to="version" type="package-info" />
+          </file>
+          <file role="php" name="SOCKS5.php">
+            <tasks:replace from="@package_version@" to="version" type="package-info" />
+          </file>
+          <dir name="Observer">
+            <file role="php" name="Log.php">
+              <tasks:replace from="@package_version@" to="version" type="package-info" />
+            </file>
+            <file role="php" name="UncompressingDownload.php">
+              <tasks:replace from="@package_version@" to="version" type="package-info" />
+            </file>
+          </dir>
+          <file role="php" name="Response.php">
+            <tasks:replace from="@package_version@" to="version" type="package-info" />
+          </file>
+        </dir>
+        <file role="php" name="Request2.php">
+            <tasks:replace from="@package_version@" to="version" type="package-info" />
+        </file>
+      </dir>
+      <dir name="tests">
+        <dir name="_files">
+          <file role="test" name="bug_15305" />
+          <file role="test" name="bug_18169" />
+          <file role="test" name="empty.gif" />
+          <file role="test" name="plaintext.txt" />
+          <file role="test" name="response_cookies" />
+          <file role="test" name="response_deflate" />
+          <file role="test" name="response_gzip" />
+          <file role="test" name="response_gzip_broken" />
+          <file role="test" name="response_headers" />
+        </dir>
+        <dir name="_network">
+         <file role="test" name="basicauth.php" />
+         <file role="test" name="bug19934.php" />
+         <file role="test" name="bug20228.php" />
+         <file role="test" name="cookies.php" />
+         <file role="test" name="digestauth.php" />
+         <file role="test" name="download.php" />
+         <file role="test" name="getparameters.php" />
+         <file role="test" name="incompletebody.php" />
+         <file role="test" name="postparameters.php" />
+         <file role="test" name="rawpostdata.php" />
+         <file role="test" name="redirects.php" />
+         <file role="test" name="setcookie.php" />
+         <file role="test" name="timeout.php" />
+         <file role="test" name="uploads.php" />
+        </dir>
+        <dir name="Request2">
+          <dir name="Adapter">
+            <file role="test" name="AllTests.php" />
+            <file role="test" name="CommonNetworkTest.php" />
+            <file role="test" name="CurlTest.php" />
+            <file role="test" name="MockTest.php" />
+            <file role="test" name="SkippedTests.php" />
+            <file role="test" name="SocketProxyTest.php" />
+            <file role="test" name="SocketTest.php" />
+          </dir>
+          <file role="test" name="AllTests.php" />
+          <file role="test" name="CookieJarTest.php" />
+          <file role="test" name="MultipartBodyTest.php" />
+          <file role="test" name="ResponseTest.php" />
+        </dir>
+        <file role="test" name="AllTests.php" />
+        <file role="test" name="NetworkConfig.php.dist" />
+        <file role="test" name="ObserverTest.php" />
+        <file role="test" name="Request2Test.php" />
+        <file role="test" name="TestHelper.php">
+          <tasks:replace from="@package_version@" to="version" type="package-info" />
+        </file>
+      </dir>
+      <dir name="docs">
+        <file role="doc" name="LICENSE" />
+        <file role="doc" name="examples/upload-rapidshare.php" />
+      </dir>
+      <dir name="data">
+        <file role="data" name="generate-list.php" />
+        <file role="data" name="public-suffix-list.php" />
+      </dir>
+    </dir>
+  </contents>
+  <dependencies>
+    <required>
+      <php>
+        <min>5.2.0</min>
+      </php>
+      <pearinstaller>
+        <min>1.9.2</min>
+      </pearinstaller>
+      <package>
+        <name>Net_URL2</name>
+        <channel>pear.php.net</channel>
+        <min>2.2.0</min>
+      </package>
+      <package>
+        <name>PEAR</name>
+        <channel>pear.php.net</channel>
+        <min>1.9.2</min>
+      </package>
+    </required>
+    <optional>
+      <extension>
+        <name>curl</name>
+      </extension>
+      <extension>
+        <name>fileinfo</name>
+      </extension>
+      <extension>
+        <name>zlib</name>
+      </extension>
+      <extension>
+        <name>openssl</name>
+      </extension>
+    </optional>
+  </dependencies>
+  <phprelease>
+   <filelist>
+    <install as="LICENSE" name="docs/LICENSE" />
+    <install as="examples/upload-rapidshare.php" name="docs/examples/upload-rapidshare.php" />
+
+    <install as="generate-list.php" name="data/generate-list.php" />
+    <install as="public-suffix-list.php" name="data/public-suffix-list.php" />
+
+    <install as="AllTests.php" name="tests/AllTests.php" />
+    <install as="NetworkConfig.php.dist" name="tests/NetworkConfig.php.dist" />
+    <install as="ObserverTest.php" name="tests/ObserverTest.php" />
+    <install as="Request2Test.php" name="tests/Request2Test.php" />
+    <install as="TestHelper.php" name="tests/TestHelper.php" />
+
+    <install as="_files/bug_15305" name="tests/_files/bug_15305" />
+    <install as="_files/bug_18169" name="tests/_files/bug_18169" />
+    <install as="_files/empty.gif" name="tests/_files/empty.gif" />
+    <install as="_files/plaintext.txt" name="tests/_files/plaintext.txt" />
+    <install as="_files/response_cookies" name="tests/_files/response_cookies" />
+    <install as="_files/response_deflate" name="tests/_files/response_deflate" />
+    <install as="_files/response_gzip" name="tests/_files/response_gzip" />
+    <install as="_files/response_gzip_broken" name="tests/_files/response_gzip_broken" />
+    <install as="_files/response_headers" name="tests/_files/response_headers" />
+
+    <install as="_network/basicauth.php" name="tests/_network/basicauth.php" />
+    <install as="_network/bug19934.php" name="tests/_network/bug19934.php" />
+    <install as="_network/bug20228.php" name="tests/_network/bug20228.php" />
+    <install as="_network/cookies.php" name="tests/_network/cookies.php" />
+    <install as="_network/digestauth.php" name="tests/_network/digestauth.php" />
+    <install as="_network/download.php" name="tests/_network/download.php" />
+    <install as="_network/getparameters.php" name="tests/_network/getparameters.php" />
+    <install as="_network/incompletebody.php" name="tests/_network/incompletebody.php" />
+    <install as="_network/postparameters.php" name="tests/_network/postparameters.php" />
+    <install as="_network/rawpostdata.php" name="tests/_network/rawpostdata.php" />
+    <install as="_network/redirects.php" name="tests/_network/redirects.php" />
+    <install as="_network/setcookie.php" name="tests/_network/setcookie.php" />
+    <install as="_network/timeout.php" name="tests/_network/timeout.php" />
+    <install as="_network/uploads.php" name="tests/_network/uploads.php" />
+
+    <install as="Request2/AllTests.php" name="tests/Request2/AllTests.php" />
+    <install as="Request2/CookieJarTest.php" name="tests/Request2/CookieJarTest.php" />
+    <install as="Request2/MultipartBodyTest.php" name="tests/Request2/MultipartBodyTest.php" />
+    <install as="Request2/ResponseTest.php" name="tests/Request2/ResponseTest.php" />
+
+    <install as="Request2/Adapter/AllTests.php" name="tests/Request2/Adapter/AllTests.php" />
+    <install as="Request2/Adapter/CommonNetworkTest.php" name="tests/Request2/Adapter/CommonNetworkTest.php" />
+    <install as="Request2/Adapter/CurlTest.php" name="tests/Request2/Adapter/CurlTest.php" />
+    <install as="Request2/Adapter/MockTest.php" name="tests/Request2/Adapter/MockTest.php" />
+    <install as="Request2/Adapter/SkippedTests.php" name="tests/Request2/Adapter/SkippedTests.php" />
+    <install as="Request2/Adapter/SocketProxyTest.php" name="tests/Request2/Adapter/SocketProxyTest.php" />
+    <install as="Request2/Adapter/SocketTest.php" name="tests/Request2/Adapter/SocketTest.php" />
+   </filelist>
+  </phprelease>
+    <changelog>
+     <release>
+      <date>2014-01-16</date>
+      <version>
+       <release>2.2.1</release>
+       <api>2.2.0</api>
+      </version>
+      <stability>
+        <release>stable</release>
+        <api>stable</api>
+      </stability>
+      <license uri="http://opensource.org/licenses/BSD-3-Clause">BSD 3-Clause License</license>
+      <notes>
+ * Fixed a bogus timeout Exception in Socket adapter after waiting for
+   &quot;100 Continue&quot; response: the same one-second timeout was used
+   for further socket operations if explicit 'timeout' parameter was not set.
+   Thanks to Andrea Brancatelli (abrancatelli at schema31 dot it) for the report.
+ * Bundled a separate LICENSE file (request #20175). Updated phrasing and links
+   to mention 3-Clause BSD license the package actually uses.
+      </notes>
+     </release>
+     <release>
+      <date>2014-01-12</date>
+      <version>
+       <release>2.2.0</release>
+       <api>2.2.0</api>
+      </version>
+      <stability>
+       <release>stable</release>
+       <api>stable</api>
+      </stability>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+New features
+ * Socket adapter will send &quot;Expect: 100-continue&quot; header and wait for
+   &quot;100 Continue&quot; response by default before sending large request body
+   (request #19233). This can be disabled by setting an empty &quot;Expect&quot;
+   header, the same way as done with Curl adapter (see bug #15937)
+ * It is possible to specify a local IP address to bind to using 'local_ip'
+   configuration parameter (request #19515)
+
+Other changes and fixes
+ * An infinite loop was possible when using a stream wrapper instead of
+   a regular file with MultipartBody (bug #19934)
+ * Socket adapter will properly send chunked request body if
+   &quot;Transfer-Encoding: chunked&quot; header is set for the request (bug #20125)
+ * Updated Public Suffix List to the latest version and updated its download script
+ * Unit tests fixes
+      </notes>
+     </release>
+     <release>
+      <date>2012-04-08</date>
+      <version>
+       <release>2.1.1</release>
+       <api>2.1.0</api>
+      </version>
+      <stability>
+       <release>stable</release>
+       <api>stable</api>
+      </stability>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+Fixes for SOCKS5 proxies support in Socket adapter
+      </notes>
+     </release>
+     <release>
+      <date>2012-04-07</date>
+      <version>
+       <release>2.1.0</release>
+       <api>2.1.0</api>
+      </version>
+      <stability>
+       <release>stable</release>
+       <api>stable</api>
+      </stability>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+New features:
+ * Mock adapter can return responses based on request URL (request #19276)
+ * Support for SOCKS5 proxies, added 'proxy_type' configuration parameter
+   (request #19332)
+ * Proxy configuration may be given as an URL, e.g.
+   $request-&gt;setConfig('proxy', 'socks5://localhost:1080');
+
+Other changes and fixes:
+ * Coding standards fixes (request #14990)
+ * Unit tests now run from SVN checkout and under PHPUnit 3.6.x
+ * Explicit dependency on PEAR (until PEAR_Exception is a separate package)
+ * Get rid of track_errors, use a more robust solution (bug #19337)
+ * Additional class_exists() check in setAdapter() (request #19344)
+ * Public suffix list updated to current version
+      </notes>
+     </release>
+     <release>
+      <date>2011-10-20</date>
+      <version>
+       <release>2.0.0</release>
+       <api>2.0.0</api>
+      </version>
+      <stability>
+       <release>stable</release>
+       <api>stable</api>
+      </stability>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+2.0.0RC2 repackaged as stable and depending on stable Net_URL2. No code changes.
+      </notes>
+     </release>
+     <release>
+      <date>2011-10-01</date>
+      <version>
+        <release>2.0.0RC2</release>
+        <api>2.0.0</api>
+      </version>
+      <stability>
+        <release>beta</release>
+        <api>stable</api>
+      </stability>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+  * Added an accessor method for HTTP_Request2_Response::$phrases (request #18716)
+  * HTTP_Request2::send() throws an exception if URL is not provided
+    rather than dies with a fatal error (bug #18755)
+  * Public Suffix List updated to current version
+      </notes>
+     </release>
+     <release>
+      <date>2011-05-06</date>
+      <version>
+        <release>2.0.0RC1</release>
+        <api>2.0.0</api>
+      </version>
+      <stability>
+        <release>beta</release>
+        <api>stable</api>
+      </stability>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+SSL options for Curl Adapter are always set, this prevents errors when
+redirecting from HTTP to HTTPS (bug #18443)
+      </notes>
+     </release>
+      <release>
+      <version>
+        <release>2.0.0beta3</release>
+        <api>2.0.0</api>
+      </version>
+      <stability>
+        <release>beta</release>
+        <api>beta</api>
+      </stability>
+      <date>2011-04-03</date>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+  * Added getEffectiveUrl() method to Response object, it returns the URL
+    response was received from, possibly after redirects (request #18412)
+  * Curl Adapter didn't send body for PUT requests sometimes (bug #18421)
+      </notes>
+      </release>
+      <release>
+      <version>
+        <release>2.0.0beta2</release>
+        <api>2.0.0</api>
+      </version>
+      <stability>
+        <release>beta</release>
+        <api>beta</api>
+      </stability>
+      <date>2011-03-25</date>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+  * Unit tests can now be run under recent PHPUnit versions (3.5+)
+  * Public Suffix List updated to current version
+  * PHP warning produced by stream_socket_client() in Socket adapter is now
+    added to Exception message (bug #18331)
+      </notes>
+      </release>
+      <release>
+      <version>
+        <release>2.0.0beta1</release>
+        <api>2.0.0</api>
+      </version>
+      <stability>
+        <release>beta</release>
+        <api>beta</api>
+      </stability>
+      <date>2011-02-27</date>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+Additions and changes:
+  * Implemented cookie jar that allows to store and pass cookies across HTTP
+    requests (see request #18225)
+  * Added several specialized subclasses of HTTP_Request2_Exception, they are
+    now thrown instead of the parent. Also added error codes and possibility
+    to get native error code (as returned by stream_socket_client() and
+    curl_errno()) (request #16762)
+  * An additional 'sentBody' event is now sent to Observers (request #16828)
+  * setBody() and addUpload() can now accept file pointers (request #16863)
+
+Bugfixes:
+  * Incorrect check in Socket Adapter prevented Keep-alive from working in
+    some cases (bug #17031)
+      </notes>
+      </release>
+      <release>
+      <version>
+        <release>0.6.0</release>
+        <api>0.6.0</api>
+      </version>
+      <stability>
+        <release>alpha</release>
+        <api>alpha</api>
+      </stability>
+      <date>2011-02-14</date>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+Additions and changes:
+  * Added test suite that interacts with a webserver. Please refer to
+    tests/NetworkConfig.php.dist for instructions.
+  * Packaging changes: docs/ and tests/ contents are installed without
+    redundant subdirectories.
+  * Added a $replace parameter to HTTP_Request2::setHeader() that controls
+    whether new header value will overwrite previous one or be appended
+    to it (request #17507)
+
+Bugfixes:
+  * Fixed a typo in Curl Adapter that prevented 'strict_redirects' from working
+  * Curl Adapter will throw an exception if CURLOPT_FOLLOWLOCATION can not be
+    enabled due to PHP setup (bug #17450)
+  * Allow parameters in manually set Content-Type headers (bug #17460)
+  * Properly reset redirect limit if multiple requests are performed with the
+    same instance of Socket Adapter (bug #17826)
+  * Response::getBody() no longer tries to decode empty strings (bug #18169)
+      </notes>
+      </release>
+      <release>
+      <version>
+        <release>0.5.2</release>
+        <api>0.5.0</api>
+      </version>
+      <stability>
+        <release>alpha</release>
+        <api>alpha</api>
+      </stability>
+      <date>2010-04-21</date>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+ * magic_quotes_runtime PHP setting could be incorrectly enabled after
+   performing the request (bug #16440)
+ * Unit tests fixes (bugs #17079, #17106, #17326)
+ * Observer_Log now appends to the log file rather than rewrites it (thanks to
+   troelskn at gmail dot com for reporting)
+      </notes>
+      </release>
+      <release>
+      <version>
+        <release>0.5.1</release>
+        <api>0.5.0</api>
+      </version>
+      <stability>
+        <release>alpha</release>
+        <api>alpha</api>
+      </stability>
+      <date>2009-11-21</date>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+ * Content-Type request header is no longer removed for POST and PUT requests
+   with empty request body (request #16799).
+ * CURLOPT_NOBODY option is now set when doing HEAD requests with Curl adapter.
+      </notes>
+      </release>
+      <release>
+      <version>
+        <release>0.5.0</release>
+        <api>0.5.0</api>
+      </version>
+      <stability>
+        <release>alpha</release>
+        <api>alpha</api>
+      </stability>
+      <date>2009-11-18</date>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+ * Redirect support added, new configuration parameters 'follow_redirects',
+   'max_redirects' and 'strict_redirects' available
+
+ * Implemented workaround for PHP bug #47204, Curl Adapter can now handle
+   Digest authentication and redirects when doing POST requests, unfortunately
+   this requires loading the entire request body into memory.
+ * Config parameter 'use_brackets' is propagated to created instances of Net_URL2
+ * Prevent memory leaks due to circular references (request #16646)
+ * Fixed a misleading error message when timing out due to default_socket_timeout
+ * HTTP_Request2::setBody() can now accept an instance of HTTP_Request2_MultipartBody
+   without trying to convert it to string
+ * Calling HTTP_Request2::setBody() now clears post parameters and uploads
+      </notes>
+      </release>
+      <release>
+      <version>
+        <release>0.4.1</release>
+        <api>0.4.0</api>
+      </version>
+      <stability>
+        <release>alpha</release>
+        <api>alpha</api>
+      </stability>
+      <date>2009-09-14</date>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+ * Decoding of gzipped responses failed if mbstring.func_overload was enabled
+   (bug #16555)
+ * Changed boundary generation in multipart bodies to work correctly with
+   rapidshare.com, added first usage example: file uploading to rapidshare.com
+ * Added forgotten optional dependency on OpenSSL PHP extension
+      </notes>
+      </release>
+      <release>
+      <version>
+        <release>0.4.0</release>
+        <api>0.4.0</api>
+      </version>
+      <stability>
+       <release>alpha</release>
+       <api>alpha</api>
+      </stability>
+      <date>2009-05-03</date>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+ * Added 'store_body' config parameter, if set to false it will prevent storing
+   the response body in Response object (request #15881)
+ * HTTP_Request2::setHeader() method now works as documented, setHeader('name')
+   will remove the 'name' header, while setHeader('name', '') will set 'name'
+   header to empty value (bug #15937)
+ * Custom 'Host' header will not be overwritten by generated one (bug #16146)
+ * When trying to reuse the connected socket in Socket adapter, make sure that
+   it is still connected (bug #16149)
+      </notes>
+      </release>
+      <release>
+      <version>
+        <release>0.3.0</release>
+        <api>0.3.0</api>
+      </version>
+      <stability>
+        <release>alpha</release>
+        <api>alpha</api>
+      </stability>
+      <date>2009-01-28</date>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+ API changes:
+  * Removed HTTP_Request2::getConfigValue() method
+
+ Feature additions:
+  * Added digest authentication (RFC 2617) support to Socket adapter. Thanks
+    to Tom Snyder (tomsn at inetoffice dot com) who sent me a prototype
+    implementation for HTTP_Request a couple of years ago.
+  * Added HTTPS proxy support to Socket adapter, this works through CONNECT
+    request described in RFC 2817.
+  * Mock adapter can now throw an Exception instead of returning a response
+    if Exception object is added via its addResponse() method (request #15629)
+
+ Other changes and fixes:
+  * Support RFC 3986 by not encoding '~' in POST body (request #15368)
+  * Prevent an error with particular versions of PHP and Curl (bug #15617)
+  * Regular expressions used in HTTP_Request2 are now class constants
+    (request #15630)
+  * Curl adapter now throws an exception in case of malformed (non-HTTP)
+    response rather than dies with a fatal error (bug #15716)
+  * Curl handle wasn't closed in Curl adapter in case of error (bug #15721)
+  * Curl adapter sent an extra 'sentHeaders' event and returned bogus
+    response status when server returned 100-Continue response (bug #15785)
+      </notes>
+      </release>
+      <release>
+      <version>
+        <release>0.2.0</release>
+        <api>0.2.0</api>
+      </version>
+      <stability>
+        <release>alpha</release>
+        <api>alpha</api>
+      </stability>
+      <date>2009-01-07</date>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+ API changes:
+  * HTTP_Request2::getConfigValue() is deprecated and will be removed in next
+    release. Use HTTP_Request2::getConfig().
+  * Changed HTTP_Request2::setConfig() to accept a pair of parameter name and
+    parameter value in addition to array('parameter name' =&gt; 'value')
+  * Added HTTP_Request2::getConfig() method that can return a single
+    configuration parameter or the whole configuration array
+
+Other additions and changes:
+  * Added a debug Observer that can log request progress to a file or an
+    instance of PEAR::Log (thanks to David Jean Louis, request #15424)
+  * Added a new 'timeout' parameter that limits total number of seconds
+    a request can take (see requests #5735 and #8964)
+  * Added various SSL protocol options: 'ssl_verify_peer', 'ssl_verify_host',
+    'ssl_cafile', 'ssl_capath', 'ssl_local_cert', 'ssl_passphrase'. Note that
+    'ssl_verify_host' option behaves differently in Socket and Curl Adapters:
+    http://bugs.php.net/bug.php?id=47030
+
+Fixes:
+  * Fixed 'data error' when processing response encoded by 'deflate'
+    encoding (bug #15305)
+  * Curl Adapter now passes full request headers in 'sentHeaders' event
+      </notes>
+      </release>
+      <release>
+      <version>
+        <release>0.1.0</release>
+        <api>0.1.0</api>
+      </version>
+      <stability>
+        <release>alpha</release>
+        <api>alpha</api>
+      </stability>
+      <date>2008-11-17</date>
+      <license uri="http://opensource.org/licenses/bsd-license.php">BSD License</license>
+      <notes>
+Initial release. The features supported are mostly the same as those of
+HTTP_Request, with the following additional feature requests implemented:
+  * cURL extension support (request #5463)
+  * It is now possible to monitor the file upload progress with Observers
+    (request #7630)
+  * Added 'sentHeaders' notification providing the request headers to the
+    Observers (request #7633)
+  * Added support for 'deflate' encoding (request #11246)
+      </notes>
+    </release>
+  </changelog>
+</package>

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/AllTests.php Added

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Unit tests for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    if (strpos($_SERVER'argv'0, 'phpunit') === false) {
+        define('PHPUnit_MAIN_METHOD', 'HTTP_Request2_AllTests::main');
+    } else {
+        define('PHPUnit_MAIN_METHOD', false);
+    }
+}
+
+require_once dirname(__FILE__) . '/Request2Test.php';
+require_once dirname(__FILE__) . '/ObserverTest.php';
+require_once dirname(__FILE__) . '/Request2/AllTests.php';
+
+class HTTP_Request2_AllTests
+{
+    public static function main()
+    {
+        if (!class_exists('PHPUnit_TextUI_TestRunner', true)) {
+            require_once 'PHPUnit/TextUI/TestRunner.php';
+        }
+        PHPUnit_TextUI_TestRunner::run(self::suite());
+    }
+
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite('HTTP_Request2 package');
+
+        $suite->addTest(Request2_AllTests::suite());
+        $suite->addTestSuite('HTTP_Request2Test');
+        $suite->addTestSuite('HTTP_Request2_ObserverTest');
+
+        return $suite;
+    }
+}
+
+if (PHPUnit_MAIN_METHOD == 'HTTP_Request2_AllTests::main') {
+    HTTP_Request2_AllTests::main();
+}
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/NetworkConfig.php.dist Added

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Unit tests for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * This file contains configuration needed for running HTTP_Request2 tests
+ * that interact with the network. Do not edit this file, copy it to
+ * NetworkConfig.php and edit the copy instead.
+ */
+
+/**
+ * Base URL for HTTP_Request2 Adapters tests
+ *
+ * To enable the tests that actually perform network interaction, you should
+ * copy the contents of _network directory to a directory under your web
+ * server's document root or create a symbolic link to _network directory
+ * there. Set this constant to point to the URL of that directory.
+ */
+define('HTTP_REQUEST2_TESTS_BASE_URL',          null);
+
+/**
+ * URL that is protected by server digest authentication
+ *
+ * This is needed for testing of 100 Continue handling, we can't implement
+ * digest in PHP since it will kick in a bit later
+ */
+define('HTTP_REQUEST2_TESTS_DIGEST_URL',        null);
+
+/**#@+
+ * Proxy setup for Socket Adapter tests
+ *
+ * Set these constants to run additional tests for Socket Adapter using a HTTP
+ * proxy. If proxy host is not set then the tests will not be run.
+ */
+define('HTTP_REQUEST2_TESTS_PROXY_HOST',        null);
+define('HTTP_REQUEST2_TESTS_PROXY_PORT',        8080);
+define('HTTP_REQUEST2_TESTS_PROXY_USER',        '');
+define('HTTP_REQUEST2_TESTS_PROXY_PASSWORD',    '');
+define('HTTP_REQUEST2_TESTS_PROXY_AUTH_SCHEME', 'basic');
+define('HTTP_REQUEST2_TESTS_PROXY_TYPE',        'http');
+/**#@-*/
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/NetworkConfig.php.travis Added

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Unit tests for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * This file contains configuration needed for running HTTP_Request2 tests
+ * that interact with the network. Do not edit this file, copy it to
+ * NetworkConfig.php and edit the copy instead.
+ */
+
+/**
+ * Base URL for HTTP_Request2 Adapters tests
+ *
+ * To enable the tests that actually perform network interaction, you should
+ * copy the contents of _network directory to a directory under your web
+ * server's document root or create a symbolic link to _network directory
+ * there. Set this constant to point to the URL of that directory.
+ */
+define('HTTP_REQUEST2_TESTS_BASE_URL',          'http://hr2.local/');
+
+/**
+ * URL that is protected by server digest authentication
+ *
+ * This is needed for testing of 100 Continue handling, we can't implement
+ * digest in PHP since it will kick in a bit later
+ */
+define('HTTP_REQUEST2_TESTS_DIGEST_URL',        null);
+
+/**#@+
+ * Proxy setup for Socket Adapter tests
+ *
+ * Set these constants to run additional tests for Socket Adapter using a HTTP
+ * proxy. If proxy host is not set then the tests will not be run.
+ */
+define('HTTP_REQUEST2_TESTS_PROXY_HOST',        null);
+define('HTTP_REQUEST2_TESTS_PROXY_PORT',        8080);
+define('HTTP_REQUEST2_TESTS_PROXY_USER',        '');
+define('HTTP_REQUEST2_TESTS_PROXY_PASSWORD',    '');
+define('HTTP_REQUEST2_TESTS_PROXY_AUTH_SCHEME', 'basic');
+define('HTTP_REQUEST2_TESTS_PROXY_TYPE',        'http');
+/**#@-*/

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/ObserverTest.php Added

@@ -0,0 +1,95 @@
+<?php
+/**
+ * Unit tests for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+/** Sets up includes */
+require_once dirname(__FILE__) . '/TestHelper.php';
+
+/**
+ * Class representing a HTTP request
+ */
+require_once 'HTTP/Request2.php';
+
+/**
+ * Mock observer
+ */
+class HTTP_Request2_MockObserver implements SplObserver
+{
+    public $calls = 0;
+
+    public $event;
+
+    public function update (SplSubject $subject)
+    {
+        $this->calls++;
+        $this->event = $subject->getLastEvent();
+    }
+}
+
+/**
+ * Unit test for subject-observer pattern implementation in HTTP_Request2
+ */
+class HTTP_Request2_ObserverTest extends PHPUnit_Framework_TestCase
+{
+    public function testSetLastEvent()
+    {
+        $request  = new HTTP_Request2();
+        $observer = new HTTP_Request2_MockObserver();
+        $request->attach($observer);
+
+        $request->setLastEvent('foo', 'bar');
+        $this->assertEquals(1, $observer->calls);
+        $this->assertEquals(array('name' => 'foo', 'data' => 'bar'), $observer->event);
+
+        $request->setLastEvent('baz');
+        $this->assertEquals(2, $observer->calls);
+        $this->assertEquals(array('name' => 'baz', 'data' => null), $observer->event);
+    }
+
+    public function testAttachOnlyOnce()
+    {
+        $request   = new HTTP_Request2();
+        $observer  = new HTTP_Request2_MockObserver();
+        $observer2 = new HTTP_Request2_MockObserver();
+        $request->attach($observer);
+        $request->attach($observer2);
+        $request->attach($observer);
+
+        $request->setLastEvent('event', 'data');
+        $this->assertEquals(1, $observer->calls);
+        $this->assertEquals(1, $observer2->calls);
+    }
+
+    public function testDetach()
+    {
+        $request   = new HTTP_Request2();
+        $observer  = new HTTP_Request2_MockObserver();
+        $observer2 = new HTTP_Request2_MockObserver();
+
+        $request->attach($observer);
+        $request->detach($observer2); // should not be a error
+        $request->setLastEvent('first');
+
+        $request->detach($observer);
+        $request->setLastEvent('second');
+        $this->assertEquals(1, $observer->calls);
+        $this->assertEquals(array('name' => 'first', 'data' => null), $observer->event);
+    }
+}
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/Request2 Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/Request2/Adapter Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/Request2/Adapter/AllTests.php Added

@@ -0,0 +1,77 @@
+<?php
+/**
+ * Unit tests for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    if (strpos($_SERVER'argv'0, 'phpunit') === false) {
+        define('PHPUnit_MAIN_METHOD', 'Request2_Adapter_AllTests::main');
+    } else {
+        define('PHPUnit_MAIN_METHOD', false);
+    }
+}
+
+require_once dirname(__FILE__) . '/MockTest.php';
+require_once dirname(__FILE__) . '/SkippedTests.php';
+require_once dirname(__FILE__) . '/SocketTest.php';
+require_once dirname(__FILE__) . '/SocketProxyTest.php';
+require_once dirname(__FILE__) . '/CurlTest.php';
+
+class Request2_Adapter_AllTests
+{
+    public static function main()
+    {
+        if (!class_exists('PHPUnit_TextUI_TestRunner', true)) {
+            require_once 'PHPUnit/TextUI/TestRunner.php';
+        }
+        PHPUnit_TextUI_TestRunner::run(self::suite());
+    }
+
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite('HTTP_Request2 package - Request2 - Adapter');
+
+        $suite->addTestSuite('HTTP_Request2_Adapter_MockTest');
+        if (defined('HTTP_REQUEST2_TESTS_BASE_URL') && HTTP_REQUEST2_TESTS_BASE_URL) {
+            $suite->addTestSuite('HTTP_Request2_Adapter_SocketTest');
+        } else {
+            $suite->addTestSuite('HTTP_Request2_Adapter_Skip_SocketTest');
+        }
+        if (defined('HTTP_REQUEST2_TESTS_PROXY_HOST') && HTTP_REQUEST2_TESTS_PROXY_HOST
+            && defined('HTTP_REQUEST2_TESTS_BASE_URL') && HTTP_REQUEST2_TESTS_BASE_URL
+        ) {
+            $suite->addTestSuite('HTTP_Request2_Adapter_SocketProxyTest');
+        } else {
+            $suite->addTestSuite('HTTP_Request2_Adapter_Skip_SocketProxyTest');
+        }
+        if (defined('HTTP_REQUEST2_TESTS_BASE_URL') && HTTP_REQUEST2_TESTS_BASE_URL
+            && extension_loaded('curl')
+        ) {
+            $suite->addTestSuite('HTTP_Request2_Adapter_CurlTest');
+        } else {
+            $suite->addTestSuite('HTTP_Request2_Adapter_Skip_CurlTest');
+        }
+
+        return $suite;
+    }
+}
+
+if (PHPUnit_MAIN_METHOD == 'Request2_Adapter_AllTests::main') {
+    Request2_Adapter_AllTests::main();
+}
+?>

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/Request2/Adapter/CommonNetworkTest.php Added

@@ -0,0 +1,512 @@
+<?php
+/**
+ * Unit tests for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+/** Sets up includes */
+require_once dirname(dirname(dirname(__FILE__))) . '/TestHelper.php';
+
+/** Class representing a HTTP request */
+require_once 'HTTP/Request2.php';
+/** Class for building multipart/form-data request body */
+require_once 'HTTP/Request2/MultipartBody.php';
+/** An observer that saves response body to stream, possibly uncompressing it */
+require_once 'HTTP/Request2/Observer/UncompressingDownload.php';
+
+class SlowpokeBody extends HTTP_Request2_MultipartBody
+{
+    protected $doSleep;
+
+    public function rewind()
+    {
+        $this->doSleep = true;
+        parent::rewind();
+    }
+
+    public function read($length)
+    {
+        if ($this->doSleep) {
+            sleep(3);
+            $this->doSleep = false;
+        }
+        return parent::read($length);
+    }
+}
+
+class HeaderObserver implements SplObserver
+{
+    public $headers;
+
+    public function update(SplSubject $subject)
+    {
+        /* @var $subject HTTP_Request2 */
+        $event = $subject->getLastEvent();
+
+        // force a timeout when writing request body
+        if ('sentHeaders' == $event'name') {
+            $this->headers = $event'data';
+        }
+    }
+}
+
+class EventSequenceObserver implements SplObserver
+{
+    private $_watched = array();
+
+    public $sequence = array();
+
+    public function __construct(array $watchedEvents = array())
+    {
+        if (!empty($watchedEvents)) {
+            $this->_watched = $watchedEvents;
+        }
+    }
+
+    public function update(SplSubject $subject)
+    {
+        /* @var $subject HTTP_Request2 */
+        $event = $subject->getLastEvent();
+
+        if ($event'name' !== end($this->sequence)
+            && (empty($this->_watched) || in_array($event'name', $this->_watched, true))
+        ) {
+            $this->sequence = $event'name';
+        }
+    }
+}
+
+
+/**
+ * Tests for HTTP_Request2 package that require a working webserver
+ *
+ * The class contains some common tests that should be run for all Adapters,
+ * it is extended by their unit tests.
+ *
+ * You need to properly set up this test suite, refer to NetworkConfig.php.dist
+ */
+abstract class HTTP_Request2_Adapter_CommonNetworkTest extends PHPUnit_Framework_TestCase
+{
+   /**
+    * HTTP Request object
+    * @var HTTP_Request2
+    */
+    protected $request;
+
+   /**
+    * Base URL for remote test files
+    * @var string
+    */
+    protected $baseUrl;
+
+   /**
+    * Configuration for HTTP Request object
+    * @var array
+    */
+    protected $config = array();
+
+    protected function setUp()
+    {
+        if (!defined('HTTP_REQUEST2_TESTS_BASE_URL') || !HTTP_REQUEST2_TESTS_BASE_URL) {
+            $this->markTestSkipped('Base URL is not configured');
+
+        } else {
+            $this->baseUrl = rtrim(HTTP_REQUEST2_TESTS_BASE_URL, '/') . '/';
+            $name = strtolower(preg_replace('/^test/i', '', $this->getName())) . '.php';
+
+            $this->request = new HTTP_Request2(
+                $this->baseUrl . $name, HTTP_Request2::METHOD_GET, $this->config
+            );
+        }
+    }
+
+   /**
+    * Tests possibility to send GET parameters
+    *
+    * NB: Currently there are problems with Net_URL2::setQueryVariables(), thus
+    * array structure is simple: http://pear.php.net/bugs/bug.php?id=18267
+    */
+    public function testGetParameters()
+    {
+        $data = array(
+            'bar' => array(
+                'key' => 'value'
+            ),
+            'foo' => 'some value',
+            'numbered' => array('first', 'second')
+        );
+
+        $this->request->getUrl()->setQueryVariables($data);
+        $response = $this->request->send();
+        $this->assertEquals(serialize($data), $response->getBody());
+    }
+
+    public function testPostParameters()
+    {
+        $data = array(
+            'bar' => array(
+                'key' => 'some other value'
+            ),
+            'baz' => array(
+                'key1' => array(
+                    'key2' => 'yet another value'
+                )
+            ),
+            'foo' => 'some value',
+            'indexed' => array('first', 'second')
+        );
+        $events = array(
+            'sentHeaders', 'sentBodyPart', 'sentBody', 'receivedHeaders', 'receivedBodyPart', 'receivedBody'
+        );
+        $observer = new EventSequenceObserver($events);
+
+        $this->request->setMethod(HTTP_Request2::METHOD_POST)
+                      ->setHeader('Accept-Encoding', 'identity')
+                      ->addPostParameter($data)
+                      ->attach($observer);
+
+        $response = $this->request->send();
+        $this->assertEquals(serialize($data), $response->getBody());
+        $this->assertEquals($events, $observer->sequence);
+    }
+
+    public function testUploads()
+    {
+        $this->request->setMethod(HTTP_Request2::METHOD_POST)
+                      ->addUpload('foo', dirname(dirname(dirname(__FILE__))) . '/_files/empty.gif', 'picture.gif', 'image/gif')
+                      ->addUpload('bar', array(
+                                    array(dirname(dirname(dirname(__FILE__))) . '/_files/empty.gif', null, 'image/gif'),
+                                    array(dirname(dirname(dirname(__FILE__))) . '/_files/plaintext.txt', 'secret.txt', 'text/x-whatever')
+                                  ));
+
+        $response = $this->request->send();
+        $this->assertContains("foo picture.gif image/gif 43", $response->getBody());
+        $this->assertContains("bar0 empty.gif image/gif 43", $response->getBody());
+        $this->assertContains("bar1 secret.txt text/x-whatever 15", $response->getBody());
+    }
+
+    public function testRawPostData()
+    {
+        $data = 'Nothing to see here, move along';
+
+        $this->request->setMethod(HTTP_Request2::METHOD_POST)
+                      ->setBody($data);
+        $response = $this->request->send();
+        $this->assertEquals($data, $response->getBody());
+    }
+
+    public function testCookies()
+    {
+        $cookies = array(
+            'CUSTOMER'    => 'WILE_E_COYOTE',
+            'PART_NUMBER' => 'ROCKET_LAUNCHER_0001'
+        );
+
+        foreach ($cookies as $k => $v) {
+            $this->request->addCookie($k, $v);
+        }
+        $response = $this->request->send();
+        $this->assertEquals(serialize($cookies), $response->getBody());
+    }
+
+    public function testTimeout()
+    {
+        $this->request->setConfig('timeout', 2);
+        try {
+            $this->request->send();
+            $this->fail('Expected HTTP_Request2_Exception was not thrown');
+        } catch (HTTP_Request2_MessageException $e) {
+            $this->assertEquals(HTTP_Request2_Exception::TIMEOUT, $e->getCode());
+        }
+    }
+
+    public function testTimeoutInRequest()
+    {
+        $this->request->setConfig('timeout', 2)
+                      ->setUrl($this->baseUrl . 'postparameters.php')
+                      ->setBody(new SlowpokeBody(array('foo' => 'some value'), array()));
+        try {
+            $this->request->send();
+            $this->fail('Expected HTTP_Request2_MessageException was not thrown');
+        } catch (HTTP_Request2_MessageException $e) {
+            $this->assertEquals(HTTP_Request2_Exception::TIMEOUT, $e->getCode());
+        }
+    }
+
+    public function testBasicAuth()
+    {
+        $this->request->getUrl()->setQueryVariables(array(
+            'user' => 'luser',
+            'pass' => 'qwerty'
+        ));
+        $wrong = clone $this->request;
+
+        $this->request->setAuth('luser', 'qwerty');
+        $response = $this->request->send();
+        $this->assertEquals(200, $response->getStatus());
+
+        $wrong->setAuth('luser', 'password');
+        $response = $wrong->send();
+        $this->assertEquals(401, $response->getStatus());
+    }
+
+    public function testDigestAuth()
+    {
+        $this->request->getUrl()->setQueryVariables(array(
+            'user' => 'luser',
+            'pass' => 'qwerty'
+        ));
+        $wrong = clone $this->request;
+        $observer = new EventSequenceObserver(array('sentHeaders', 'receivedHeaders'));
+
+        $this->request->setAuth('luser', 'qwerty', HTTP_Request2::AUTH_DIGEST)
+            ->attach($observer);
+        $response = $this->request->send();
+        $this->assertEquals(200, $response->getStatus());
+        $this->assertEquals(
+            array('sentHeaders', 'receivedHeaders', 'sentHeaders', 'receivedHeaders'),
+            $observer->sequence
+        );
+
+        $wrong->setAuth('luser', 'password', HTTP_Request2::AUTH_DIGEST);
+        $response = $wrong->send();
+        $this->assertEquals(401, $response->getStatus());
+    }
+
+    public function testRedirectsDefault()
+    {
+        $observer = new EventSequenceObserver(array('sentHeaders', 'sentBodyPart', 'sentBody', 'receivedHeaders'));
+        $this->request->setUrl($this->baseUrl . 'redirects.php')
+                      ->setConfig(array('follow_redirects' => true, 'strict_redirects' => false))
+                      ->setMethod(HTTP_Request2::METHOD_POST)
+                      ->addPostParameter('foo', 'foo value')
+                      ->attach($observer);
+
+        $response = $this->request->send();
+        $this->assertContains('Method=GET', $response->getBody());
+        $this->assertNotContains('foo', $response->getBody());
+        $this->assertEquals($this->baseUrl . 'redirects.php?redirects=0', $response->getEffectiveUrl());
+        $this->assertEquals(
+            array('sentHeaders', 'sentBodyPart', 'sentBody', 'receivedHeaders', 'sentHeaders', 'receivedHeaders'),
+            $observer->sequence
+        );
+    }
+
+    public function testRedirectsStrict()
+    {
+        $observer = new EventSequenceObserver(array('sentHeaders', 'sentBodyPart', 'sentBody', 'receivedHeaders'));
+        $this->request->setUrl($this->baseUrl . 'redirects.php')
+                      ->setConfig(array('follow_redirects' => true, 'strict_redirects' => true))
+                      ->setMethod(HTTP_Request2::METHOD_POST)
+                      ->addPostParameter('foo', 'foo value')
+                      ->attach($observer);
+
+        $response = $this->request->send();
+        $this->assertContains('Method=POST', $response->getBody());
+        $this->assertContains('foo', $response->getBody());
+        $this->assertEquals(
+            array('sentHeaders', 'sentBodyPart', 'sentBody', 'receivedHeaders',
+                  'sentHeaders', 'sentBodyPart', 'sentBody', 'receivedHeaders'),
+            $observer->sequence
+        );
+    }
+
+    public function testRedirectsLimit()
+    {
+        $this->request->setUrl($this->baseUrl . 'redirects.php?redirects=4')
+                      ->setConfig(array('follow_redirects' => true, 'max_redirects' => 2));
+
+        try {
+            $this->request->send();
+            $this->fail('Expected HTTP_Request2_Exception was not thrown');
+        } catch (HTTP_Request2_MessageException $e) {
+            $this->assertEquals(HTTP_Request2_Exception::TOO_MANY_REDIRECTS, $e->getCode());
+        }
+    }
+
+    public function testRedirectsRelative()
+    {
+        $this->request->setUrl($this->baseUrl . 'redirects.php?special=relative')
+                      ->setConfig(array('follow_redirects' => true));
+
+        $response = $this->request->send();
+        $this->assertContains('did relative', $response->getBody());
+    }
+
+    public function testRedirectsNonHTTP()
+    {
+        $this->request->setUrl($this->baseUrl . 'redirects.php?special=ftp')
+                      ->setConfig(array('follow_redirects' => true));
+
+        try {
+            $this->request->send();
+            $this->fail('Expected HTTP_Request2_Exception was not thrown');
+        } catch (HTTP_Request2_MessageException $e) {
+            $this->assertEquals(HTTP_Request2_Exception::NON_HTTP_REDIRECT, $e->getCode());
+        }
+    }
+
+    public function testCookieJar()
+    {
+        $this->request->setUrl($this->baseUrl . 'setcookie.php?name=cookie_name&value=cookie_value');
+        $req2 = clone $this->request;
+
+        $this->request->setCookieJar()->send();
+        $jar = $this->request->getCookieJar();
+        $jar->store(
+            array('name' => 'foo', 'value' => 'bar'),
+            $this->request->getUrl()
+        );
+
+        $response = $req2->setUrl($this->baseUrl . 'cookies.php')->setCookieJar($jar)->send();
+        $this->assertEquals(
+            serialize(array('cookie_name' => 'cookie_value', 'foo' => 'bar')),
+            $response->getBody()
+        );
+    }
+
+    public function testCookieJarAndRedirect()
+    {
+        $this->request->setUrl($this->baseUrl . 'redirects.php?special=cookie')
+                      ->setConfig('follow_redirects', true)
+                      ->setCookieJar();
+
+        $response = $this->request->send();
+        $this->assertEquals(serialize(array('cookie_on_redirect' => 'success')), $response->getBody());
+    }
+
+    /**
+     * @link http://pear.php.net/bugs/bug.php?id=20125
+     */
+    public function testChunkedRequest()
+    {
+        $data = array(
+            'long'      => str_repeat('a', 1000),
+            'very_long' => str_repeat('b', 2000)
+        );
+
+        $this->request->setMethod(HTTP_Request2::METHOD_POST)
+                      ->setUrl($this->baseUrl . 'postparameters.php')
+                      ->setConfig('buffer_size', 512)
+                      ->setHeader('Transfer-Encoding', 'chunked')
+                      ->addPostParameter($data);
+
+        $response = $this->request->send();
+        $this->assertEquals(serialize($data), $response->getBody());
+    }
+
+    /**
+     * @link http://pear.php.net/bugs/bug.php?id=19233
+     * @link http://pear.php.net/bugs/bug.php?id=15937
+     */
+    public function testPreventExpectHeader()
+    {
+        $fp       = fopen(dirname(dirname(dirname(__FILE__))) . '/_files/bug_15305', 'rb');
+        $observer = new HeaderObserver();
+        $body     = new HTTP_Request2_MultipartBody(
+            array(),
+            array(
+                'upload' => array(
+                    'fp'       => $fp,
+                    'filename' => 'bug_15305',
+                    'type'     => 'application/octet-stream',
+                    'size'     => 16338
+                )
+            )
+        );
+
+        $this->request->setMethod(HTTP_Request2::METHOD_POST)
+                      ->setUrl($this->baseUrl . 'uploads.php')
+                      ->setHeader('Expect', '')
+                      ->setBody($body)
+                      ->attach($observer);
+
+        $response = $this->request->send();
+        $this->assertNotContains('Expect:', $observer->headers);
+        $this->assertContains('upload bug_15305 application/octet-stream 16338', $response->getBody());
+    }
+
+    public function testDownloadObserverWithPlainBody()
+    {
+        $fp       = fopen('php://memory', 'r+');
+        $observer = new HTTP_Request2_Observer_UncompressingDownload($fp);
+
+        $this->request->setConfig('store_body', false)
+                      ->setUrl($this->baseUrl . 'download.php')
+                      ->attach($observer);
+
+        $this->request->send();
+        rewind($fp);
+        $this->assertEquals(str_repeat('0123456789abcdef', 128), fread($fp, 8192));
+    }
+
+    public function testDownloadObserverWithGzippedBody()
+    {
+        $fp       = fopen('php://memory', 'r+');
+        $observer = new HTTP_Request2_Observer_UncompressingDownload($fp);
+
+        $this->request->setConfig('store_body', false)
+                      ->attach($observer);
+
+        $normal = clone $this->request;
+        $normal->setUrl($this->baseUrl . 'download.php?gzip')
+               ->send();
+
+        $slow = clone $this->request;
+        $slow->setUrl($this->baseUrl . 'download.php?gzip&slowpoke')
+             ->send();
+
+        rewind($fp);
+        $this->assertEquals(str_repeat('0123456789abcdef', 256), fread($fp, 8192));
+    }
+
+    /**
+     * @expectedException HTTP_Request2_MessageException
+     * @expectedExceptionMessage Body length limit
+     */
+    public function testDownloadObserverEnforcesSizeLimit()
+    {
+        $fp       = fopen('php://memory', 'r+');
+        $observer = new HTTP_Request2_Observer_UncompressingDownload($fp, 1000);
+
+        $this->request->setConfig('store_body', false)
+                      ->setUrl($this->baseUrl . 'download.php?gzip')
+                      ->attach($observer);
+
+        $this->request->send();
+    }
+
+    public function testIncompleteBody()
+    {
+        $events = array('receivedBodyPart', 'warning', 'receivedBody');
+        $this->request->setHeader('Accept-Encoding', 'identity');
+
+        $plain = clone $this->request;
+        $plain->attach($observer = new EventSequenceObserver($events));
+        $response = $plain->send();
+        $this->assertEquals('This is a test', $response->getBody());
+        $this->assertEquals($events, $observer->sequence);
+
+        $chunked = clone $this->request;
+        $chunked->getUrl()->setQueryVariable('chunked', 'yep');
+        $chunked->attach($observer = new EventSequenceObserver($events));
+        $response = $chunked->send();
+        $this->assertEquals('This is a test', $response->getBody());
+        $this->assertEquals($events, $observer->sequence);
+    }
+}
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/Request2/Adapter/CurlTest.php Added

@@ -0,0 +1,180 @@
+<?php
+/**
+ * Unit tests for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+/** Tests for HTTP_Request2 package that require a working webserver */
+require_once dirname(__FILE__) . '/CommonNetworkTest.php';
+
+class UploadSizeObserver implements SplObserver
+{
+    public $size;
+
+    public function update(SplSubject $subject)
+    {
+        /* @var $subject HTTP_Request2 */
+        $event = $subject->getLastEvent();
+
+        if ('sentBody' == $event'name') {
+            $this->size = $event'data';
+        }
+    }
+
+}
+
+/**
+ * Unit test for Curl Adapter of HTTP_Request2
+ */
+class HTTP_Request2_Adapter_CurlTest extends HTTP_Request2_Adapter_CommonNetworkTest
+{
+   /**
+    * Configuration for HTTP Request object
+    * @var array
+    */
+    protected $config = array(
+        'adapter' => 'HTTP_Request2_Adapter_Curl'
+    );
+
+   /**
+    * Checks whether redirect support in cURL is disabled by safe_mode or open_basedir
+    * @return bool
+    */
+    protected function isRedirectSupportDisabled()
+    {
+        return ini_get('safe_mode') || ini_get('open_basedir');
+    }
+
+    public function testRedirectsDefault()
+    {
+        if ($this->isRedirectSupportDisabled()) {
+            $this->markTestSkipped('Redirect support in cURL is disabled by safe_mode or open_basedir setting');
+        } else {
+            parent::testRedirectsDefault();
+        }
+    }
+
+    public function testRedirectsStrict()
+    {
+        if ($this->isRedirectSupportDisabled()) {
+            $this->markTestSkipped('Redirect support in cURL is disabled by safe_mode or open_basedir setting');
+        } elseif (version_compare(phpversion(), '5.3.2', '<')) {
+            $this->markTestSkipped('CURLOPT_POSTREDIR required for strict redirects, available in PHP 5.3.2+');
+        } else {
+            parent::testRedirectsStrict();
+        }
+    }
+
+    public function testRedirectsLimit()
+    {
+        if ($this->isRedirectSupportDisabled()) {
+            $this->markTestSkipped('Redirect support in cURL is disabled by safe_mode or open_basedir setting');
+        } else {
+            parent::testRedirectsLimit();
+        }
+    }
+
+    public function testRedirectsRelative()
+    {
+        if ($this->isRedirectSupportDisabled()) {
+            $this->markTestSkipped('Redirect support in cURL is disabled by safe_mode or open_basedir setting');
+        } else {
+            parent::testRedirectsRelative();
+        }
+    }
+
+    public function testRedirectsNonHTTP()
+    {
+        if ($this->isRedirectSupportDisabled()) {
+            $this->markTestSkipped('Redirect support in cURL is disabled by safe_mode or open_basedir setting');
+        } else {
+            parent::testRedirectsNonHTTP();
+        }
+    }
+
+    public function testCookieJarAndRedirect()
+    {
+        if ($this->isRedirectSupportDisabled()) {
+            $this->markTestSkipped('Redirect support in cURL is disabled by safe_mode or open_basedir setting');
+        } else {
+            parent::testCookieJarAndRedirect();
+        }
+    }
+
+    public function testBug17450()
+    {
+        if (!$this->isRedirectSupportDisabled()) {
+            $this->markTestSkipped('Neither safe_mode nor open_basedir is enabled');
+        }
+
+        $this->request->setUrl($this->baseUrl . 'redirects.php')
+                      ->setConfig(array('follow_redirects' => true));
+
+        try {
+            $this->request->send();
+            $this->fail('Expected HTTP_Request2_Exception was not thrown');
+
+        } catch (HTTP_Request2_LogicException $e) {
+            $this->assertEquals(HTTP_Request2_Exception::MISCONFIGURATION, $e->getCode());
+        }
+    }
+
+    public function testBug20440()
+    {
+        $this->request->setUrl($this->baseUrl . 'rawpostdata.php')
+            ->setMethod(HTTP_Request2::METHOD_PUT)
+            ->setHeader('Expect', '')
+            ->setBody('This is a test');
+
+        $noredirects = clone $this->request;
+        $noredirects->setConfig('follow_redirects', false)
+            ->attach($observer = new UploadSizeObserver());
+        $noredirects->send();
+        // Curl sends body with Transfer-encoding: chunked, so size can be larger
+        $this->assertGreaterThanOrEqual(14, $observer->size);
+
+        $redirects = clone $this->request;
+        $redirects->setConfig('follow_redirects', true)
+            ->attach($observer = new UploadSizeObserver());
+        $redirects->send();
+        $this->assertGreaterThanOrEqual(14, $observer->size);
+    }
+
+    /**
+     * An URL performing a redirect was used for storing cookies in a jar rather than target URL
+     *
+     * @link http://pear.php.net/bugs/bug.php?id=20561
+     */
+    public function testBug20561()
+    {
+        if ($this->isRedirectSupportDisabled()) {
+            $this->markTestSkipped('Redirect support in cURL is disabled by safe_mode or open_basedir setting');
+
+        } else {
+            $this->request->setUrl($this->baseUrl . 'redirects.php?special=youtube')
+                          ->setConfig(array(
+                                'follow_redirects' => true,
+                                'ssl_verify_peer'  => false
+                          ))
+                          ->setCookieJar(true);
+
+            $this->request->send();
+            $this->assertGreaterThan(0, count($this->request->getCookieJar()->getAll()));
+        }
+    }
+}
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/Request2/Adapter/MockTest.php Added

@@ -0,0 +1,157 @@
+<?php
+/**
+ * Unit tests for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+/** Sets up includes */
+require_once dirname(dirname(dirname(__FILE__))) . '/TestHelper.php';
+
+/**
+ * Class representing a HTTP request
+ */
+require_once 'HTTP/Request2.php';
+
+/**
+ * Mock adapter intended for testing
+ */
+require_once 'HTTP/Request2/Adapter/Mock.php';
+
+/**
+ * Unit test for HTTP_Request2_Response class
+ */
+class HTTP_Request2_Adapter_MockTest extends PHPUnit_Framework_TestCase
+{
+    public function testDefaultResponse()
+    {
+        $req = new HTTP_Request2('http://www.example.com/', HTTP_Request2::METHOD_GET,
+                                 array('adapter' => 'mock'));
+        $response = $req->send();
+        $this->assertEquals(400, $response->getStatus());
+        $this->assertEquals(0, count($response->getHeader()));
+        $this->assertEquals('', $response->getBody());
+    }
+
+    public function testResponseFromString()
+    {
+        $mock = new HTTP_Request2_Adapter_Mock();
+        $mock->addResponse(
+            "HTTP/1.1 200 OK\r\n" .
+            "Content-Type: text/plain; charset=iso-8859-1\r\n" .
+            "\r\n" .
+            "This is a string"
+        );
+        $req = new HTTP_Request2('http://www.example.com/');
+        $req->setAdapter($mock);
+
+        $response = $req->send();
+        $this->assertEquals(200, $response->getStatus());
+        $this->assertEquals(1, count($response->getHeader()));
+        $this->assertEquals('This is a string', $response->getBody());
+    }
+
+    public function testResponseFromFile()
+    {
+        $mock = new HTTP_Request2_Adapter_Mock();
+        $mock->addResponse(fopen(dirname(dirname(dirname(__FILE__))) .
+                           '/_files/response_headers', 'rb'));
+
+        $req = new HTTP_Request2('http://www.example.com/');
+        $req->setAdapter($mock);
+
+        $response = $req->send();
+        $this->assertEquals(200, $response->getStatus());
+        $this->assertEquals(7, count($response->getHeader()));
+        $this->assertEquals('Nothing to see here, move along.', $response->getBody());
+    }
+
+    public function testResponsesQueue()
+    {
+        $mock = new HTTP_Request2_Adapter_Mock();
+        $mock->addResponse(
+            "HTTP/1.1 301 Over there\r\n" .
+            "Location: http://www.example.com/newpage.html\r\n" .
+            "\r\n" .
+            "The document is over there"
+        );
+        $mock->addResponse(
+            "HTTP/1.1 200 OK\r\n" .
+            "Content-Type: text/plain; charset=iso-8859-1\r\n" .
+            "\r\n" .
+            "This is a string"
+        );
+
+        $req = new HTTP_Request2('http://www.example.com/');
+        $req->setAdapter($mock);
+        $this->assertEquals(301, $req->send()->getStatus());
+        $this->assertEquals(200, $req->send()->getStatus());
+        $this->assertEquals(400, $req->send()->getStatus());
+    }
+
+    /**
+     * Returning URL-specific responses
+     * @link http://pear.php.net/bugs/bug.php?id=19276
+     */
+    public function testRequest19276()
+    {
+        $mock = new HTTP_Request2_Adapter_Mock();
+        $mock->addResponse(
+            "HTTP/1.1 200 OK\r\n" .
+            "Content-Type: text/plain; charset=iso-8859-1\r\n" .
+            "\r\n" .
+            "This is a response from example.org",
+            'http://example.org/'
+        );
+        $mock->addResponse(
+            "HTTP/1.1 200 OK\r\n" .
+            "Content-Type: text/plain; charset=iso-8859-1\r\n" .
+            "\r\n" .
+            "This is a response from example.com",
+            'http://example.com/'
+        );
+
+        $req1 = new HTTP_Request2('http://localhost/');
+        $req1->setAdapter($mock);
+        $this->assertEquals(400, $req1->send()->getStatus());
+
+        $req2 = new HTTP_Request2('http://example.com/');
+        $req2->setAdapter($mock);
+        $this->assertContains('example.com', $req2->send()->getBody());
+
+        $req3 = new HTTP_Request2('http://example.org');
+        $req3->setAdapter($mock);
+        $this->assertContains('example.org', $req3->send()->getBody());
+    }
+
+    public function testResponseException()
+    {
+        $mock = new HTTP_Request2_Adapter_Mock();
+        $mock->addResponse(
+            new HTTP_Request2_Exception('Shit happens')
+        );
+        $req = new HTTP_Request2('http://www.example.com/');
+        $req->setAdapter($mock);
+        try {
+            $req->send();
+        } catch (Exception $e) {
+            $this->assertEquals('Shit happens', $e->getMessage());
+            return;
+        }
+        $this->fail('Expected HTTP_Request2_Exception was not thrown');
+    }
+}
+?>

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/Request2/Adapter/SkippedTests.php Added

@@ -0,0 +1,56 @@
+<?php
+/**
+ * Unit tests for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+/** Sets up includes */
+require_once dirname(dirname(dirname(__FILE__))) . '/TestHelper.php';
+
+/**
+ * Shows a skipped test if networked tests are not configured
+ */
+class HTTP_Request2_Adapter_Skip_SocketTest extends PHPUnit_Framework_TestCase
+{
+    public function testSocketAdapter()
+    {
+        $this->markTestSkipped('Socket Adapter tests need base URL configured.');
+    }
+}
+
+/**
+ * Shows a skipped test if proxy is not configured
+ */
+class HTTP_Request2_Adapter_Skip_SocketProxyTest extends PHPUnit_Framework_TestCase
+{
+    public function testSocketAdapterWithProxy()
+    {
+        $this->markTestSkipped('Socket Adapter proxy tests need base URL and proxy configured');
+    }
+}
+
+/**
+ * Shows a skipped test if networked tests are not configured or cURL extension is unavailable
+ */
+class HTTP_Request2_Adapter_Skip_CurlTest extends PHPUnit_Framework_TestCase
+{
+    public function testCurlAdapter()
+    {
+        $this->markTestSkipped('Curl Adapter tests need base URL configured and curl extension available');
+    }
+}
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/Request2/Adapter/SocketProxyTest.php Added

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Unit tests for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+/** Tests for HTTP_Request2 package that require a working webserver */
+require_once dirname(__FILE__) . '/CommonNetworkTest.php';
+
+/**
+ * Unit test for Socket Adapter of HTTP_Request2 working through proxy
+ */
+class HTTP_Request2_Adapter_SocketProxyTest extends HTTP_Request2_Adapter_CommonNetworkTest
+{
+   /**
+    * Configuration for HTTP Request object
+    * @var array
+    */
+    protected $config = array(
+        'adapter' => 'HTTP_Request2_Adapter_Socket'
+    );
+
+    protected function setUp()
+    {
+        if (!defined('HTTP_REQUEST2_TESTS_PROXY_HOST') || !HTTP_REQUEST2_TESTS_PROXY_HOST) {
+            $this->markTestSkipped('Proxy is not configured');
+
+        } else {
+            $this->config += array(
+                'proxy_host'        => HTTP_REQUEST2_TESTS_PROXY_HOST,
+                'proxy_port'        => HTTP_REQUEST2_TESTS_PROXY_PORT,
+                'proxy_user'        => HTTP_REQUEST2_TESTS_PROXY_USER,
+                'proxy_password'    => HTTP_REQUEST2_TESTS_PROXY_PASSWORD,
+                'proxy_auth_scheme' => HTTP_REQUEST2_TESTS_PROXY_AUTH_SCHEME,
+                'proxy_type'        => HTTP_REQUEST2_TESTS_PROXY_TYPE
+            );
+            parent::setUp();
+        }
+    }
+}
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/Request2/Adapter/SocketTest.php Added

@@ -0,0 +1,191 @@
+<?php
+/**
+ * Unit tests for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+/** Tests for HTTP_Request2 package that require a working webserver */
+require_once dirname(__FILE__) . '/CommonNetworkTest.php';
+
+/** Socket-based adapter for HTTP_Request2 */
+require_once 'HTTP/Request2/Adapter/Socket.php';
+
+/**
+ * Unit test for Socket Adapter of HTTP_Request2
+ */
+class HTTP_Request2_Adapter_SocketTest extends HTTP_Request2_Adapter_CommonNetworkTest
+{
+   /**
+    * Configuration for HTTP Request object
+    * @var array
+    */
+    protected $config = array(
+        'adapter' => 'HTTP_Request2_Adapter_Socket'
+    );
+
+    public function testBug17826()
+    {
+        $adapter = new HTTP_Request2_Adapter_Socket();
+
+        $request1 = new HTTP_Request2($this->baseUrl . 'redirects.php?redirects=2');
+        $request1->setConfig(array('follow_redirects' => true, 'max_redirects' => 3))
+                 ->setAdapter($adapter)
+                 ->send();
+
+        $request2 = new HTTP_Request2($this->baseUrl . 'redirects.php?redirects=2');
+        $request2->setConfig(array('follow_redirects' => true, 'max_redirects' => 3))
+                 ->setAdapter($adapter)
+                 ->send();
+    }
+
+
+    /**
+     * Infinite loop with stream wrapper passed as upload
+     *
+     * Dunno how the original reporter managed to pass a file pointer
+     * that doesn't support fstat() to MultipartBody, maybe he didn't use
+     * addUpload(). So we don't use it, either.
+     *
+     * @link http://pear.php.net/bugs/bug.php?id=19934
+     */
+    public function testBug19934()
+    {
+        if (!in_array('http', stream_get_wrappers())) {
+            $this->markTestSkipped("This test requires an HTTP fopen wrapper enabled");
+        }
+
+        $fp   = fopen($this->baseUrl . '/bug19934.php', 'rb');
+        $body = new HTTP_Request2_MultipartBody(
+            array(),
+            array(
+                'upload' => array(
+                    'fp'       => $fp,
+                    'filename' => 'foo.txt',
+                    'type'     => 'text/plain',
+                    'size'     => 20000
+                )
+            )
+        );
+        $this->request->setMethod(HTTP_Request2::METHOD_POST)
+                      ->setUrl($this->baseUrl . 'uploads.php')
+                      ->setBody($body);
+
+        set_error_handler(array($this, 'rewindWarningsHandler'));
+        $response = $this->request->send();
+        restore_error_handler();
+
+        $this->assertContains("upload foo.txt text/plain 20000", $response->getBody());
+    }
+
+    public function rewindWarningsHandler($errno, $errstr)
+    {
+        if (($errno & E_WARNING) && false !== strpos($errstr, 'rewind')) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Do not send request body twice to URLs protected by digest auth
+     *
+     * @link http://pear.php.net/bugs/bug.php?id=19233
+     */
+    public function test100ContinueHandling()
+    {
+        if (!defined('HTTP_REQUEST2_TESTS_DIGEST_URL') || !HTTP_REQUEST2_TESTS_DIGEST_URL) {
+            $this->markTestSkipped('This test requires an URL protected by server digest auth');
+        }
+
+        $fp   = fopen(dirname(dirname(dirname(__FILE__))) . '/_files/bug_15305', 'rb');
+        $body = $this->getMock(
+            'HTTP_Request2_MultipartBody', array('read'), array(
+                array(),
+                array(
+                    'upload' => array(
+                        'fp'       => $fp,
+                        'filename' => 'bug_15305',
+                        'type'     => 'application/octet-stream',
+                        'size'     => 16338
+                    )
+                )
+            )
+        );
+        $body->expects($this->never())->method('read');
+
+        $this->request->setMethod(HTTP_Request2::METHOD_POST)
+                      ->setUrl(HTTP_REQUEST2_TESTS_DIGEST_URL)
+                      ->setBody($body);
+
+        $this->assertEquals(401, $this->request->send()->getStatus());
+    }
+
+    public function test100ContinueTimeoutBug()
+    {
+        $fp       = fopen(dirname(dirname(dirname(__FILE__))) . '/_files/bug_15305', 'rb');
+        $body     = new HTTP_Request2_MultipartBody(
+            array(),
+            array(
+                'upload' => array(
+                    'fp'       => $fp,
+                    'filename' => 'bug_15305',
+                    'type'     => 'application/octet-stream',
+                    'size'     => 16338
+                )
+            )
+        );
+
+        $this->request->setMethod(HTTP_Request2::METHOD_POST)
+                      ->setUrl($this->baseUrl . 'uploads.php?slowpoke')
+                      ->setBody($body);
+
+        $response = $this->request->send();
+        $this->assertContains('upload bug_15305 application/octet-stream 16338', $response->getBody());
+    }
+
+    /**
+     * Socket adapter should not throw an exception (invalid chunk length '')
+     * if a buggy server doesn't send last zero-length chunk when using chunked encoding
+     *
+     * @link http://pear.php.net/bugs/bug.php?id=20228
+     */
+    public function testBug20228()
+    {
+        $events = array('receivedBodyPart', 'warning', 'receivedBody');
+        $this->request->setHeader('Accept-Encoding', 'identity')
+            ->attach($observer = new EventSequenceObserver($events));
+        $response = $this->request->send();
+        $this->assertEquals('This is a test', $response->getBody());
+        $this->assertEquals($events, $observer->sequence);
+    }
+
+    public function testHowsMySSL()
+    {
+        $this->request->setUrl('https://www.howsmyssl.com/a/check')
+            ->setConfig('ssl_verify_peer', false);
+
+        if (null === ($responseData = json_decode($this->request->send()->getBody(), true))) {
+            $this->fail('Cannot decode JSON from howsmyssl.com response');
+        }
+
+        $this->assertEmpty($responseData'insecure_cipher_suites');
+
+        if (version_compare(phpversion(), '5.6', '>=')) {
+            $this->assertEquals('Probably Okay', $responseData'rating');
+        }
+    }
+}
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/Request2/AllTests.php Added

@@ -0,0 +1,60 @@
+<?php
+/**
+ * Unit tests for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    if (strpos($_SERVER'argv'0, 'phpunit') === false) {
+        define('PHPUnit_MAIN_METHOD', 'Request2_AllTests::main');
+    } else {
+        define('PHPUnit_MAIN_METHOD', false);
+    }
+}
+
+require_once dirname(__FILE__) . '/CookieJarTest.php';
+require_once dirname(__FILE__) . '/MultipartBodyTest.php';
+require_once dirname(__FILE__) . '/ResponseTest.php';
+require_once dirname(__FILE__) . '/Adapter/AllTests.php';
+
+class Request2_AllTests
+{
+    public static function main()
+    {
+        if (!class_exists('PHPUnit_TextUI_TestRunner', true)) {
+            require_once 'PHPUnit/TextUI/TestRunner.php';
+        }
+        PHPUnit_TextUI_TestRunner::run(self::suite());
+    }
+
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite('HTTP_Request2 package - Request2');
+
+        $suite->addTestSuite('HTTP_Request2_CookieJarTest');
+        $suite->addTestSuite('HTTP_Request2_MultipartBodyTest');
+        $suite->addTestSuite('HTTP_Request2_ResponseTest');
+        $suite->addTest(Request2_Adapter_AllTests::suite());
+
+        return $suite;
+    }
+}
+
+if (PHPUnit_MAIN_METHOD == 'Request2_AllTests::main') {
+    Request2_AllTests::main();
+}
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/Request2/CookieJarTest.php Added

@@ -0,0 +1,403 @@
+<?php
+/**
+ * Unit tests for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+/** Sets up includes */
+require_once dirname(dirname(__FILE__)) . '/TestHelper.php';
+/** Stores cookies and passes them between HTTP requests */
+require_once 'HTTP/Request2/CookieJar.php';
+/** Mock adapter intended for testing */
+require_once 'HTTP/Request2/Adapter/Mock.php';
+
+/**
+ * Unit test for HTTP_Request2_CookieJar class
+ */
+class HTTP_Request2_CookieJarTest extends PHPUnit_Framework_TestCase
+{
+   /**
+    * Cookie jar instance being tested
+    * @var HTTP_Request2_CookieJar
+    */
+    protected $jar;
+
+    protected function setUp()
+    {
+        $this->jar = new HTTP_Request2_CookieJar();
+    }
+
+   /**
+    * Test that we can't store junk "cookies" in jar
+    *
+    * @dataProvider invalidCookieProvider
+    * @expectedException HTTP_Request2_LogicException
+    */
+    public function testStoreInvalid($cookie)
+    {
+        $this->jar->store($cookie);
+    }
+
+    /**
+     * Per feature requests, allow to ignore invalid cookies rather than throw exceptions
+     *
+     * @link http://pear.php.net/bugs/bug.php?id=19937
+     * @link http://pear.php.net/bugs/bug.php?id=20401
+     * @dataProvider invalidCookieProvider
+     */
+    public function testCanIgnoreInvalidCookies($cookie)
+    {
+        $this->jar->ignoreInvalidCookies(true);
+        $this->assertFalse($this->jar->store($cookie));
+    }
+
+    /**
+     * Ignore setting a cookie from "parallel" subdomain when relevant option is on
+     *
+     * @link http://pear.php.net/bugs/bug.php?id=20401
+     */
+    public function testRequest20401()
+    {
+        $this->jar->ignoreInvalidCookies(true);
+        $response = HTTP_Request2_Adapter_Mock::createResponseFromFile(
+            fopen(dirname(dirname(__FILE__)) . '/_files/response_cookies', 'rb')
+        );
+        $setter   = new Net_URL2('http://pecl.php.net/');
+
+        $this->assertFalse($this->jar->addCookiesFromResponse($response, $setter));
+        $this->assertCount(3, $this->jar->getAll());
+    }
+
+
+   /**
+    *
+    * @dataProvider noPSLDomainsProvider
+    */
+    public function testDomainMatchNoPSL($requestHost, $cookieDomain, $expected)
+    {
+        $this->jar->usePublicSuffixList(false);
+        $this->assertEquals($expected, $this->jar->domainMatch($requestHost, $cookieDomain));
+    }
+
+   /**
+    *
+    * @dataProvider PSLDomainsProvider
+    */
+    public function testDomainMatchPSL($requestHost, $cookieDomain, $expected)
+    {
+        $this->jar->usePublicSuffixList(true);
+        $this->assertEquals($expected, $this->jar->domainMatch($requestHost, $cookieDomain));
+    }
+
+    public function testConvertExpiresToISO8601()
+    {
+        $dt = new DateTime();
+        $dt->setTimezone(new DateTimeZone('UTC'));
+        $dt->modify('+1 day');
+
+        $this->jar->store(array(
+            'name'    => 'foo',
+            'value'   => 'bar',
+            'domain'  => '.example.com',
+            'path'    => '/',
+            'expires' => $dt->format(DateTime::COOKIE),
+            'secure'  => false
+        ));
+        $cookies = $this->jar->getAll();
+        $this->assertEquals($cookies0'expires', $dt->format(DateTime::ISO8601));
+    }
+
+    public function testProblem2038()
+    {
+        $this->jar->store(array(
+            'name'    => 'foo',
+            'value'   => 'bar',
+            'domain'  => '.example.com',
+            'path'    => '/',
+            'expires' => 'Sun, 01 Jan 2040 03:04:05 GMT',
+            'secure'  => false
+        ));
+        $cookies = $this->jar->getAll();
+        $this->assertEquals(array(array(
+            'name'    => 'foo',
+            'value'   => 'bar',
+            'domain'  => '.example.com',
+            'path'    => '/',
+            'expires' => '2040-01-01T03:04:05+0000',
+            'secure'  => false
+        )), $cookies);
+    }
+
+    public function testStoreExpired()
+    {
+        $base = array(
+            'name'    => 'foo',
+            'value'   => 'bar',
+            'domain'  => '.example.com',
+            'path'    => '/',
+            'secure'  => false
+        );
+
+        $dt = new DateTime();
+        $dt->setTimezone(new DateTimeZone('UTC'));
+        $dt->modify('-1 day');
+        $yesterday = $dt->format(DateTime::COOKIE);
+
+        $dt->modify('+2 days');
+        $tomorrow = $dt->format(DateTime::COOKIE);
+
+        $this->jar->store($base + array('expires' => $yesterday));
+        $this->assertEquals(0, count($this->jar->getAll()));
+
+        $this->jar->store($base + array('expires' => $tomorrow));
+        $this->assertEquals(1, count($this->jar->getAll()));
+        $this->jar->store($base + array('expires' => $yesterday));
+        $this->assertEquals(0, count($this->jar->getAll()));
+    }
+
+   /**
+    *
+    * @dataProvider cookieAndSetterProvider
+    */
+    public function testGetDomainAndPathFromSetter($cookie, $setter, $expected)
+    {
+        $this->jar->store($cookie, $setter);
+        $expected = array_merge($cookie, $expected);
+        $cookies  = $this->jar->getAll();
+        $this->assertEquals($expected, $cookies0);
+    }
+
+   /**
+    *
+    * @dataProvider cookieMatchProvider
+    */
+    public function testGetMatchingCookies($url, $expectedCount)
+    {
+        $cookies = array(
+            array('domain' => '.example.com', 'path' => '/', 'secure' => false),
+            array('domain' => '.example.com', 'path' => '/', 'secure' => true),
+            array('domain' => '.example.com', 'path' => '/path', 'secure' => false),
+            array('domain' => '.example.com', 'path' => '/other', 'secure' => false),
+            array('domain' => 'example.com', 'path' => '/', 'secure' => false),
+            array('domain' => 'www.example.com', 'path' => '/', 'secure' => false),
+            array('domain' => 'specific.example.com', 'path' => '/path', 'secure' => false),
+            array('domain' => 'nowww.example.com', 'path' => '/', 'secure' => false),
+        );
+
+        for ($i = 0; $i < count($cookies); $i++) {
+            $this->jar->store($cookies$i + array('expires' => null, 'name' => "cookie{$i}", 'value' => "cookie_{$i}_value"));
+        }
+
+        $this->assertEquals($expectedCount, count($this->jar->getMatching(new Net_URL2($url))));
+    }
+
+    public function testLongestPathFirst()
+    {
+        $cookie = array(
+            'name'    => 'foo',
+            'domain'  => '.example.com',
+        );
+        foreach (array('/', '/specific/path/', '/specific/') as $path) {
+            $this->jar->store($cookie + array('path' => $path, 'value' => str_replace('/', '_', $path)));
+        }
+        $this->assertEquals(
+            'foo=_specific_path_; foo=_specific_; foo=_',
+            $this->jar->getMatching(new Net_URL2('http://example.com/specific/path/file.php'), true)
+        );
+    }
+
+    public function testSerializable()
+    {
+        $dt = new DateTime();
+        $dt->setTimezone(new DateTimeZone('UTC'));
+        $dt->modify('+1 day');
+        $cookie = array('domain' => '.example.com', 'path' => '/', 'secure' => false, 'value' => 'foo');
+
+        $this->jar->store($cookie + array('name' => 'session', 'expires' => null));
+        $this->jar->store($cookie + array('name' => 'long', 'expires' => $dt->format(DateTime::COOKIE)));
+
+        $newJar  = unserialize(serialize($this->jar));
+        $cookies = $newJar->getAll();
+        $this->assertEquals(1, count($cookies));
+        $this->assertEquals('long', $cookies0'name');
+
+        $this->jar->serializeSessionCookies(true);
+        $newJar = unserialize(serialize($this->jar));
+        $this->assertEquals($this->jar->getAll(), $newJar->getAll());
+    }
+
+    public function testRemoveExpiredOnUnserialize()
+    {
+        $dt = new DateTime();
+        $dt->setTimezone(new DateTimeZone('UTC'));
+        $dt->modify('+2 seconds');
+
+        $this->jar->store(array(
+            'name'    => 'foo',
+            'value'   => 'bar',
+            'domain'  => '.example.com',
+            'path'    => '/',
+            'expires' => $dt->format(DateTime::COOKIE),
+        ));
+
+        $serialized = serialize($this->jar);
+        sleep(2);
+        $newJar = unserialize($serialized);
+        $this->assertEquals(array(), $newJar->getAll());
+    }
+
+    public static function invalidCookieProvider()
+    {
+        return array(
+            array(array()),
+            array(array('name' => 'foo')),
+            array(array(
+                'name'    => 'a name',
+                'value'   => 'bar',
+                'domain'  => '.example.com',
+                'path'    => '/',
+            )),
+            array(array(
+                'name'    => 'foo',
+                'value'   => 'a value',
+                'domain'  => '.example.com',
+                'path'    => '/',
+            )),
+            array(array(
+                'name'    => 'foo',
+                'value'   => 'bar',
+                'domain'  => '.example.com',
+                'path'    => null,
+            )),
+            array(array(
+                'name'    => 'foo',
+                'value'   => 'bar',
+                'domain'  => null,
+                'path'    => '/',
+            )),
+            array(array(
+                'name'    => 'foo',
+                'value'   => 'bar',
+                'domain'  => '.example.com',
+                'path'    => '/',
+                'expires' => 'invalid date',
+            )),
+        );
+    }
+
+    public static function noPSLdomainsProvider()
+    {
+        return array(
+            array('localhost', 'localhost', true),
+            array('www.example.com', 'www.example.com', true),
+            array('127.0.0.1', '127.0.0.1', true),
+            array('127.0.0.1', '.0.0.1', false),
+            array('www.example.com', '.example.com', true),
+            array('deep.within.example.com', '.example.com', true),
+            array('example.com', '.com', false),
+            array('anotherexample.com', 'example.com', false),
+            array('whatever.msk.ru', '.msk.ru', true),
+            array('whatever.co.uk', '.co.uk', true),
+            array('whatever.bd', '.whatever.bd', true),
+            array('whatever.tokyo.jp', '.whatever.tokyo.jp', true),
+            array('metro.tokyo.jp', '.metro.tokyo.jp', true),
+            array('foo.bar', '.foo.bar', true)
+        );
+    }
+
+    public static function PSLdomainsProvider()
+    {
+        return array(
+            array('localhost', 'localhost', true),
+            array('www.example.com', 'www.example.com', true),
+            array('127.0.0.1', '127.0.0.1', true),
+            array('127.0.0.1', '.0.0.1', false),
+            array('www.example.com', '.example.com', true),
+            array('deep.within.example.com', '.example.com', true),
+            array('example.com', '.com', false),
+            array('anotherexample.com', 'example.com', false),
+            array('whatever.msk.ru', '.msk.ru', false),
+            array('whatever.co.uk', '.co.uk', false),
+            array('whatever.bd', '.whatever.bd', false),
+            array('whatever.bn', '.whatever.bn', false),
+            array('nic.tr', '.nic.tr', true),
+            array('foo.bar', '.foo.bar', true)
+        );
+    }
+
+    public static function cookieAndSetterProvider()
+    {
+        return array(
+            array(
+                array(
+                    'name'    => 'foo',
+                    'value'   => 'bar',
+                    'domain'  => null,
+                    'path'    => null,
+                    'expires' => null,
+                    'secure'  => false
+                ),
+                new Net_Url2('http://example.com/directory/file.php'),
+                array(
+                    'domain'  => 'example.com',
+                    'path'    => '/directory/'
+                )
+            ),
+            array(
+                array(
+                    'name'    => 'foo',
+                    'value'   => 'bar',
+                    'domain'  => '.example.com',
+                    'path'    => null,
+                    'expires' => null,
+                    'secure'  => false
+                ),
+                new Net_Url2('http://example.com/path/to/file.php'),
+                array(
+                    'path'    => '/path/to/'
+                )
+            ),
+            array(
+                array(
+                    'name'    => 'foo',
+                    'value'   => 'bar',
+                    'domain'  => null,
+                    'path'    => '/',
+                    'expires' => null,
+                    'secure'  => false
+                ),
+                new Net_Url2('http://example.com/another/file.php'),
+                array(
+                    'domain'  => 'example.com'
+                )
+            )
+        );
+    }
+
+    public static function cookieMatchProvider()
+    {
+        return array(
+            array('http://www.example.com/path/file.php', 4),
+            array('https://www.example.com/path/file.php', 5),
+            array('http://example.com/path/file.php', 3),
+            array('http://specific.example.com/path/file.php', 4),
+            array('http://specific.example.com/other/file.php', 3),
+            array('http://another.example.com/another', 2)
+        );
+    }
+}
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/Request2/MultipartBodyTest.php Added

@@ -0,0 +1,102 @@
+<?php
+/**
+ * Unit tests for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+/** Sets up includes */
+require_once dirname(dirname(__FILE__)) . '/TestHelper.php';
+
+/**
+ * Class representing a HTTP request
+ */
+require_once 'HTTP/Request2.php';
+
+/**
+ * Unit test for HTTP_Request2_MultipartBody class
+ */
+class HTTP_Request2_MultipartBodyTest extends PHPUnit_Framework_TestCase
+{
+    public function testUploadSimple()
+    {
+        $req = new HTTP_Request2(null, HTTP_Request2::METHOD_POST);
+        $body = $req->addPostParameter('foo', 'I am a parameter')
+                    ->addUpload('upload', dirname(dirname(__FILE__)) . '/_files/plaintext.txt')
+                    ->getBody();
+
+        $this->assertTrue($body instanceof HTTP_Request2_MultipartBody);
+        $asString = $body->__toString();
+        $boundary = $body->getBoundary();
+        $this->assertEquals($body->getLength(), strlen($asString));
+        $this->assertContains('This is a test.', $asString);
+        $this->assertContains('I am a parameter', $asString);
+        $this->assertRegexp("!--{$boundary}--\r\n$!", $asString);
+    }
+
+   /**
+    *
+    * @expectedException HTTP_Request2_LogicException
+    */
+    public function testRequest16863()
+    {
+        $req  = new HTTP_Request2(null, HTTP_Request2::METHOD_POST);
+        $fp   = fopen(dirname(dirname(__FILE__)) . '/_files/plaintext.txt', 'rb');
+        $body = $req->addUpload('upload', $fp)
+                    ->getBody();
+
+        $asString = $body->__toString();
+        $this->assertContains('name="upload"; filename="anonymous.blob"', $asString);
+        $this->assertContains('This is a test.', $asString);
+
+        $req->addUpload('bad_upload', fopen('php://input', 'rb'));
+    }
+
+    public function testStreaming()
+    {
+        $req = new HTTP_Request2(null, HTTP_Request2::METHOD_POST);
+        $body = $req->addPostParameter('foo', 'I am a parameter')
+                    ->addUpload('upload', dirname(dirname(__FILE__)) . '/_files/plaintext.txt')
+                    ->getBody();
+        $asString = '';
+        while ($part = $body->read(10)) {
+            $asString .= $part;
+        }
+        $this->assertEquals($body->getLength(), strlen($asString));
+        $this->assertContains('This is a test.', $asString);
+        $this->assertContains('I am a parameter', $asString);
+    }
+
+    public function testUploadArray()
+    {
+        $req = new HTTP_Request2(null, HTTP_Request2::METHOD_POST);
+        $body = $req->addUpload('upload', array(
+                                    array(dirname(dirname(__FILE__)) . '/_files/plaintext.txt', 'bio.txt', 'text/plain'),
+                                    array(fopen(dirname(dirname(__FILE__)) . '/_files/empty.gif', 'rb'), 'photo.gif', 'image/gif')
+                                ))
+                    ->getBody();
+        $asString = $body->__toString();
+        $this->assertContains(file_get_contents(dirname(dirname(__FILE__)) . '/_files/empty.gif'), $asString);
+        $this->assertContains('name="upload0"; filename="bio.txt"', $asString);
+        $this->assertContains('name="upload1"; filename="photo.gif"', $asString);
+
+        $body2 = $req->setConfig(array('use_brackets' => false))->getBody();
+        $asString = $body2->__toString();
+        $this->assertContains('name="upload"; filename="bio.txt"', $asString);
+        $this->assertContains('name="upload"; filename="photo.gif"', $asString);
+    }
+}
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/Request2/ResponseTest.php Added

@@ -0,0 +1,128 @@
+<?php
+/**
+ * Unit tests for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+/** Sets up includes */
+require_once dirname(dirname(__FILE__)) . '/TestHelper.php';
+
+/**
+ * Class representing a HTTP response
+ */
+require_once 'HTTP/Request2/Response.php';
+
+/**
+ * Unit test for HTTP_Request2_Response class
+ */
+class HTTP_Request2_ResponseTest extends PHPUnit_Framework_TestCase
+{
+   /**
+    *
+    * @expectedException HTTP_Request2_MessageException
+    */
+    public function testParseStatusLine()
+    {
+        $response = new HTTP_Request2_Response('HTTP/1.1 200 OK');
+        $this->assertEquals('1.1', $response->getVersion());
+        $this->assertEquals(200, $response->getStatus());
+        $this->assertEquals('OK', $response->getReasonPhrase());
+
+        $response2 = new HTTP_Request2_Response('HTTP/1.2 222 Nishtyak!');
+        $this->assertEquals('1.2', $response2->getVersion());
+        $this->assertEquals(222, $response2->getStatus());
+        $this->assertEquals('Nishtyak!', $response2->getReasonPhrase());
+
+        $response3 = new HTTP_Request2_Response('Invalid status line');
+    }
+
+    public function testParseHeaders()
+    {
+        $response = $this->readResponseFromFile('response_headers');
+        $this->assertEquals(7, count($response->getHeader()));
+        $this->assertEquals('PHP/6.2.2', $response->getHeader('X-POWERED-BY'));
+        $this->assertEquals('text/html; charset=windows-1251', $response->getHeader('cOnTeNt-TyPe'));
+        $this->assertEquals('accept-charset, user-agent', $response->getHeader('vary'));
+    }
+
+    public function testParseCookies()
+    {
+        $response = $this->readResponseFromFile('response_cookies');
+        $cookies  = $response->getCookies();
+        $this->assertEquals(4, count($cookies));
+        $expected = array(
+            array('name' => 'foo', 'value' => 'bar', 'expires' => null,
+                  'domain' => null, 'path' => null, 'secure' => false),
+            array('name' => 'PHPSESSID', 'value' => '1234567890abcdef1234567890abcdef',
+                  'expires' => null, 'domain' => null, 'path' => '/', 'secure' => true),
+            array('name' => 'A', 'value' => 'B=C', 'expires' => null,
+                  'domain' => null, 'path' => null, 'secure' => false),
+            array('name' => 'baz', 'value' => '%20a%20value', 'expires' => 'Sun, 03 Jan 2010 03:04:05 GMT',
+                  'domain' => 'pear.php.net', 'path' => null, 'secure' => false),
+        );
+        foreach ($cookies as $k => $cookie) {
+            $this->assertEquals($expected$k, $cookie);
+        }
+    }
+
+   /**
+    *
+    * @expectedException HTTP_Request2_MessageException
+    */
+    public function testGzipEncoding()
+    {
+        $response = $this->readResponseFromFile('response_gzip');
+        $this->assertEquals('0e964e9273c606c46afbd311b5ad4d77', md5($response->getBody()));
+
+        $response = $this->readResponseFromFile('response_gzip_broken');
+        $body = $response->getBody();
+    }
+
+    public function testDeflateEncoding()
+    {
+        $response = $this->readResponseFromFile('response_deflate');
+        $this->assertEquals('0e964e9273c606c46afbd311b5ad4d77', md5($response->getBody()));
+    }
+
+    public function testBug15305()
+    {
+        $response = $this->readResponseFromFile('bug_15305');
+        $this->assertEquals('c8c5088fc8a7652afef380f086c010a6', md5($response->getBody()));
+    }
+
+    public function testBug18169()
+    {
+        $response = $this->readResponseFromFile('bug_18169');
+        $this->assertEquals('', $response->getBody());
+    }
+
+    protected function readResponseFromFile($filename)
+    {
+        $fp       = fopen(dirname(dirname(__FILE__)) . '/_files/' . $filename, 'rb');
+        $response = new HTTP_Request2_Response(fgets($fp));
+        do {
+            $headerLine = fgets($fp);
+            $response->parseHeaderLine($headerLine);
+        } while ('' != trim($headerLine));
+
+        while (!feof($fp)) {
+            $response->appendBody(fread($fp, 1024));
+        }
+        return $response;
+    }
+}
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/Request2Test.php Added

@@ -0,0 +1,392 @@
+<?php
+/**
+ * Unit tests for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+/** Sets up includes */
+require_once dirname(__FILE__) . '/TestHelper.php';
+
+/**
+ * Class representing a HTTP request
+ */
+require_once 'HTTP/Request2.php';
+
+/**
+ * Unit test for HTTP_Request2 class
+ */
+class HTTP_Request2Test extends PHPUnit_Framework_TestCase
+{
+    public function testConstructorSetsDefaults()
+    {
+        $url = new Net_URL2('http://www.example.com/foo');
+        $req = new HTTP_Request2($url, HTTP_Request2::METHOD_POST, array('connect_timeout' => 666));
+
+        $this->assertSame($url, $req->getUrl());
+        $this->assertEquals(HTTP_Request2::METHOD_POST, $req->getMethod());
+        $this->assertEquals(666, $req->getConfig('connect_timeout'));
+    }
+
+   /**
+    *
+    * @expectedException HTTP_Request2_LogicException
+    */
+    public function testSetUrl()
+    {
+        $urlString = 'http://www.example.com/foo/bar.php';
+        $url       = new Net_URL2($urlString);
+
+        $req1 = new HTTP_Request2();
+        $req1->setUrl($url);
+        $this->assertSame($url, $req1->getUrl());
+
+        $req2 = new HTTP_Request2();
+        $req2->setUrl($urlString);
+        $this->assertInstanceOf('Net_URL2', $req2->getUrl());
+        $this->assertEquals($urlString, $req2->getUrl()->getUrl());
+
+        $req3 = new HTTP_Request2();
+        $req3->setUrl(array('This will cause an error'));
+    }
+
+    public function testConvertUserinfoToAuth()
+    {
+        $req = new HTTP_Request2();
+        $req->setUrl('http://foo:b%40r@www.example.com/');
+
+        $this->assertEquals('', (string)$req->getUrl()->getUserinfo());
+        $this->assertEquals(
+            array('user' => 'foo', 'password' => 'b@r', 'scheme' => HTTP_Request2::AUTH_BASIC),
+            $req->getAuth()
+        );
+    }
+
+   /**
+    *
+    * @expectedException HTTP_Request2_LogicException
+    */
+    public function testSetMethod()
+    {
+        $req = new HTTP_Request2();
+        $req->setMethod(HTTP_Request2::METHOD_PUT);
+        $this->assertEquals(HTTP_Request2::METHOD_PUT, $req->getMethod());
+
+        $req->setMethod('Invalid method');
+    }
+
+    public function testSetAndGetConfig()
+    {
+        $req = new HTTP_Request2();
+        $this->assertArrayHasKey('connect_timeout', $req->getConfig());
+
+        $req->setConfig(array('connect_timeout' => 123));
+        $this->assertEquals(123, $req->getConfig('connect_timeout'));
+        try {
+            $req->setConfig(array('foo' => 'unknown parameter'));
+            $this->fail('Expected HTTP_Request2_LogicException was not thrown');
+        } catch (HTTP_Request2_LogicException $e) {}
+
+        try {
+            $req->getConfig('bar');
+            $this->fail('Expected HTTP_Request2_LogicException was not thrown');
+        } catch (HTTP_Request2_LogicException $e) {}
+    }
+
+    public function testSetProxyAsUrl()
+    {
+        $req = new HTTP_Request2();
+        $req->setConfig('proxy', 'socks5://foo:bar%25baz@localhost:1080/');
+
+        $this->assertEquals('socks5', $req->getConfig('proxy_type'));
+        $this->assertEquals('localhost', $req->getConfig('proxy_host'));
+        $this->assertEquals(1080, $req->getConfig('proxy_port'));
+        $this->assertEquals('foo', $req->getConfig('proxy_user'));
+        $this->assertEquals('bar%baz', $req->getConfig('proxy_password'));
+    }
+
+   /**
+    *
+    * @expectedException HTTP_Request2_LogicException
+    */
+    public function testHeaders()
+    {
+        $req = new HTTP_Request2();
+        $autoHeaders = $req->getHeaders();
+
+        $req->setHeader('Foo', 'Bar');
+        $req->setHeader('Foo-Bar: value');
+        $req->setHeader(array('Another-Header' => 'another value', 'Yet-Another: other_value'));
+        $this->assertEquals(
+            array('foo-bar' => 'value', 'another-header' => 'another value',
+            'yet-another' => 'other_value', 'foo' => 'Bar') + $autoHeaders,
+            $req->getHeaders()
+        );
+
+        $req->setHeader('FOO-BAR');
+        $req->setHeader(array('aNOTHER-hEADER'));
+        $this->assertEquals(
+            array('yet-another' => 'other_value', 'foo' => 'Bar') + $autoHeaders,
+            $req->getHeaders()
+        );
+
+        $req->setHeader('Invalid header', 'value');
+    }
+
+    public function testBug15937()
+    {
+        $req = new HTTP_Request2();
+        $autoHeaders = $req->getHeaders();
+
+        $req->setHeader('Expect: ');
+        $req->setHeader('Foo', '');
+        $this->assertEquals(
+            array('expect' => '', 'foo' => '') + $autoHeaders,
+            $req->getHeaders()
+        );
+    }
+
+    public function testRequest17507()
+    {
+        $req = new HTTP_Request2();
+
+        $req->setHeader('accept-charset', 'iso-8859-1');
+        $req->setHeader('accept-charset', array('windows-1251', 'utf-8'), false);
+
+        $req->setHeader(array('accept' => 'text/html'));
+        $req->setHeader(array('accept' => 'image/gif'), null, false);
+
+        $headers = $req->getHeaders();
+
+        $this->assertEquals('iso-8859-1, windows-1251, utf-8', $headers'accept-charset');
+        $this->assertEquals('text/html, image/gif', $headers'accept');
+    }
+
+   /**
+    *
+    * @expectedException HTTP_Request2_LogicException
+    */
+    public function testCookies()
+    {
+        $req = new HTTP_Request2();
+        $req->addCookie('name', 'value');
+        $req->addCookie('foo', 'bar');
+        $headers = $req->getHeaders();
+        $this->assertEquals('name=value; foo=bar', $headers'cookie');
+
+        $req->addCookie('invalid cookie', 'value');
+    }
+
+    /**
+     *
+     * @expectedException HTTP_Request2_LogicException
+     */
+    public function testPlainBody()
+    {
+        $req = new HTTP_Request2();
+        $req->setBody('A string');
+        $this->assertEquals('A string', $req->getBody());
+
+        $req->setBody(dirname(__FILE__) . '/_files/plaintext.txt', true);
+        $headers = $req->getHeaders();
+        $this->assertRegexp(
+            '!^(text/plain|application/octet-stream)!',
+            $headers'content-type'
+        );
+        $this->assertEquals('This is a test.', fread($req->getBody(), 1024));
+
+        $req->setBody('missing file', true);
+    }
+
+   /**
+    *
+    * @expectedException HTTP_Request2_LogicException
+    */
+    public function testRequest16863()
+    {
+        $req = new HTTP_Request2();
+        $req->setBody(fopen(dirname(__FILE__) . '/_files/plaintext.txt', 'rb'));
+        $headers = $req->getHeaders();
+        $this->assertEquals('application/octet-stream', $headers'content-type');
+
+        $req->setBody(fopen('php://input', 'rb'));
+    }
+
+    public function testUrlencodedBody()
+    {
+        $req = new HTTP_Request2(null, HTTP_Request2::METHOD_POST);
+        $req->addPostParameter('foo', 'bar');
+        $req->addPostParameter(array('baz' => 'quux'));
+        $req->addPostParameter('foobar', array('one', 'two'));
+        $this->assertEquals(
+            'foo=bar&baz=quux&foobar%5B0%5D=one&foobar%5B1%5D=two',
+            $req->getBody()
+        );
+
+        $req->setConfig(array('use_brackets' => false));
+        $this->assertEquals(
+            'foo=bar&baz=quux&foobar=one&foobar=two',
+            $req->getBody()
+        );
+    }
+
+    public function testRequest15368()
+    {
+        $req = new HTTP_Request2(null, HTTP_Request2::METHOD_POST);
+        $req->addPostParameter('foo', 'te~st');
+        $this->assertContains('~', $req->getBody());
+    }
+
+   /**
+    *
+    * @expectedException HTTP_Request2_LogicException
+    * @expectedExceptionMessage missing file
+    */
+    public function testUpload()
+    {
+        $req = new HTTP_Request2(null, HTTP_Request2::METHOD_POST);
+        $req->addUpload('upload', dirname(__FILE__) . '/_files/plaintext.txt');
+
+        $headers = $req->getHeaders();
+        $this->assertEquals('multipart/form-data', $headers'content-type');
+
+        $req->addUpload('upload_2', 'missing file');
+    }
+
+    public function testPropagateUseBracketsToNetURL2()
+    {
+        $req = new HTTP_Request2('http://www.example.com/', HTTP_Request2::METHOD_GET,
+                                 array('use_brackets' => false));
+        $req->getUrl()->setQueryVariable('foo', array('bar', 'baz'));
+        $this->assertEquals('http://www.example.com/?foo=bar&foo=baz', $req->getUrl()->__toString());
+
+        $req->setConfig('use_brackets', true)->setUrl('http://php.example.com/');
+        $req->getUrl()->setQueryVariable('foo', array('bar', 'baz'));
+
+        $this->assertEquals('http://php.example.com/?foo=bar&foo=baz', $req->getUrl()->__toString());
+    }
+
+    public function testSetBodyRemovesPostParameters()
+    {
+        $req = new HTTP_Request2('http://www.example.com/', HTTP_Request2::METHOD_POST);
+        $req->addPostParameter('foo', 'bar');
+        $req->setBody('');
+        $this->assertEquals('', $req->getBody());
+    }
+
+    public function testPostParametersPrecedeSetBodyForPost()
+    {
+        $req = new HTTP_Request2('http://www.example.com/', HTTP_Request2::METHOD_POST);
+        $req->setBody('Request body');
+        $req->addPostParameter('foo', 'bar');
+
+        $this->assertEquals('foo=bar', $req->getBody());
+
+        $req->setMethod(HTTP_Request2::METHOD_PUT);
+        $this->assertEquals('Request body', $req->getBody());
+    }
+
+    public function testSetMultipartBody()
+    {
+        require_once 'HTTP/Request2/MultipartBody.php';
+
+        $req = new HTTP_Request2('http://www.example.com/', HTTP_Request2::METHOD_POST);
+        $body = new HTTP_Request2_MultipartBody(array('foo' => 'bar'), array());
+        $req->setBody($body);
+        $this->assertSame($body, $req->getBody());
+    }
+
+    public function testBug17460()
+    {
+        $req = new HTTP_Request2('http://www.example.com/', HTTP_Request2::METHOD_POST);
+        $req->addPostParameter('foo', 'bar')
+            ->setHeader('content-type', 'application/x-www-form-urlencoded; charset=UTF-8');
+
+        $this->assertEquals('foo=bar', $req->getBody());
+    }
+
+   /**
+    *
+    * @expectedException HTTP_Request2_LogicException
+    */
+    public function testCookieJar()
+    {
+        $req = new HTTP_Request2();
+        $this->assertNull($req->getCookieJar());
+
+        $req->setCookieJar();
+        $jar = $req->getCookieJar();
+        $this->assertInstanceOf('HTTP_Request2_CookieJar', $jar);
+
+        $req2 = new HTTP_Request2();
+        $req2->setCookieJar($jar);
+        $this->assertSame($jar, $req2->getCookieJar());
+
+        $req2->setCookieJar(null);
+        $this->assertNull($req2->getCookieJar());
+
+        $req2->setCookieJar('foo');
+    }
+
+    public function testAddCookieToJar()
+    {
+        $req = new HTTP_Request2();
+        $req->setCookieJar();
+
+        try {
+            $req->addCookie('foo', 'bar');
+            $this->fail('Expected HTTP_Request2_Exception was not thrown');
+        } catch (HTTP_Request2_LogicException $e) { }
+
+        $req->setUrl('http://example.com/path/file.php');
+        $req->addCookie('foo', 'bar');
+
+        $this->assertArrayNotHasKey('cookie', $req->getHeaders());
+        $cookies = $req->getCookieJar()->getAll();
+        $this->assertEquals(
+            array(
+                'name'    => 'foo',
+                'value'   => 'bar',
+                'domain'  => 'example.com',
+                'path'    => '/path/',
+                'expires' => null,
+                'secure'  => false
+            ),
+            $cookies0
+        );
+    }
+
+   /**
+    * @expectedException HTTP_Request2_LogicException
+    * @expectedExceptionMessage none
+    */
+    public function testDisallowEmptyUrls()
+    {
+        $req = new HTTP_Request2();
+        $req->send();
+    }
+
+   /**
+    * @expectedException HTTP_Request2_LogicException
+    * @expectedExceptionMessage '/foo/bar.php'
+    */
+    public function testDisallowRelativeUrls()
+    {
+        $req = new HTTP_Request2('/foo/bar.php');
+        $req->send();
+    }
+}
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/TestHelper.php Added

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Unit tests for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+// If running from SVN checkout, update include_path
+if ('@' . 'package_version@' == '@package_version@') {
+    $classPath   = realpath(dirname(dirname(__FILE__)));
+    $includePath = array($classPath);
+
+    foreach (explode(PATH_SEPARATOR, get_include_path()) as $component) {
+        if (false !== ($real = realpath($component)) && $real !== $classPath) {
+            $includePath = $real;
+        }
+    }
+
+    set_include_path(implode(PATH_SEPARATOR, $includePath));
+}
+
+if (strpos($_SERVER'argv'0, 'phpunit') === false) {
+    /** Include PHPUnit dependencies based on version */
+    require_once 'PHPUnit/Runner/Version.php';
+    if (version_compare(PHPUnit_Runner_Version::id(), '3.5.0', '>=')) {
+        require_once 'PHPUnit/Autoload.php';
+    } else {
+        require_once 'PHPUnit/Framework.php';
+    }
+}
+
+if (!defined('HTTP_REQUEST2_TESTS_BASE_URL')
+    && is_readable(dirname(__FILE__) . '/NetworkConfig.php')
+) {
+    require_once dirname(__FILE__) . '/NetworkConfig.php';
+}
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_files Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_files/bug_15305 Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_files/bug_18169 Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_files/empty.gif Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_files/plaintext.txt Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_files/response_cookies Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_files/response_deflate Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_files/response_gzip Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_files/response_gzip_broken Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_files/response_headers Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_network Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_network/basicauth.php Added

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Helper files for HTTP_Request2 unit tests. Should be accessible via HTTP.
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+$user       = isset($_SERVER'PHP_AUTH_USER') ? $_SERVER'PHP_AUTH_USER' : null;
+$pass       = isset($_SERVER'PHP_AUTH_PW') ? $_SERVER'PHP_AUTH_PW' : null;
+$wantedUser = isset($_GET'user') ? $_GET'user' : null;
+$wantedPass = isset($_GET'pass') ? $_GET'pass' : null;
+
+if (!$user || !$pass || $user != $wantedUser || $pass != $wantedPass) {
+    header('WWW-Authenticate: Basic realm="HTTP_Request2 tests"', true, 401);
+    echo "Login required";
+} else {
+    echo "Username={$user};Password={$pass}";
+}
+
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_network/bug19934.php Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_network/bug20228.php Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_network/cookies.php Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_network/digestauth.php Added

@@ -0,0 +1,83 @@
+<?php
+/**
+ * Helper files for HTTP_Request2 unit tests. Should be accessible via HTTP.
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Mostly borrowed from PHP manual and Socket Adapter implementation
+ *
+ * @link http://php.net/manual/en/features.http-auth.php
+ */
+
+/**
+ * Parses the Digest auth header
+ *
+ * @param string $txt
+ */
+function http_digest_parse($txt)
+{
+    $token  = '^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\\?={}\s+';
+    $quoted = '"(?:\\\\.|^\\\\")*"';
+
+    // protect against missing data
+    $needed_parts = array_flip(array('nonce', 'nc', 'cnonce', 'qop', 'username', 'uri', 'response'));
+    $data         = array();
+
+    preg_match_all("!({$token})\\s*=\\s*({$token}|{$quoted})!", $txt, $matches);
+    for ($i = 0; $i < count($matches0); $i++) {
+        // ignore unneeded parameters
+        if (isset($needed_parts$matches1$i)) {
+            unset($needed_parts$matches1$i);
+            if ('"' == substr($matches2$i, 0, 1)) {
+                $data$matches1$i = substr($matches2$i, 1, -1);
+            } else {
+                $data$matches1$i = $matches2$i;
+            }
+        }
+    }
+
+    return !empty($needed_parts) ? false : $data;
+}
+
+$realm      = 'HTTP_Request2 tests';
+$wantedUser = isset($_GET'user') ? $_GET'user' : null;
+$wantedPass = isset($_GET'pass') ? $_GET'pass' : null;
+$validAuth  = false;
+
+if (!empty($_SERVER'PHP_AUTH_DIGEST')
+    && ($data = http_digest_parse($_SERVER'PHP_AUTH_DIGEST'))
+    && $wantedUser == $data'username'
+) {
+    // generate the valid response
+    $a1       = md5($data'username' . ':' . $realm . ':' . $wantedPass);
+    $a2       = md5($_SERVER'REQUEST_METHOD' . ':' . $data'uri');
+    $response = md5($a1. ':' . $data'nonce' . ':' . $data'nc' . ':'
+                    . $data'cnonce' . ':' . $data'qop' . ':' . $a2);
+
+    // check valid response against existing one
+    $validAuth = ($data'response' == $response);
+}
+
+if (!$validAuth || empty($_SERVER'PHP_AUTH_DIGEST')) {
+    header('WWW-Authenticate: Digest realm="' . $realm .
+           '",qop="auth",nonce="' . uniqid() . '"', true, 401);
+    echo "Login required";
+} else {
+    echo "Username={$data'username'}";
+}
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_network/download.php Added

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Helper files for HTTP_Request2 unit tests. Should be accessible via HTTP.
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+$payload = str_repeat('0123456789abcdef', 128);
+
+if (array_key_exists('gzip', $_GET)) {
+    // we inject a long "filename" into the header to check whether the downloader
+    // can handle an incomplete header in "slowpoke" mode
+    $payload = pack('c4Vc2', 0x1f, 0x8b, 8, 8, time(), 2, 255)
+               . str_repeat('a_really_really_long_file_name', 10) . '.txt' . chr(0)
+               . gzdeflate($payload)
+               . pack('V2', crc32($payload), 2048);
+    header('Content-Encoding: gzip');
+}
+
+if (!array_key_exists('slowpoke', $_GET)) {
+    echo $payload;
+
+} else {
+    $pos    = 0;
+    $length = strlen($payload);
+    while ($pos < $length) {
+        echo substr($payload, $pos, 65);
+        $pos += 65;
+        flush();
+        usleep(50000);
+    }
+}
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_network/getparameters.php Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_network/incompletebody.php Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_network/postparameters.php Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_network/rawpostdata.php Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_network/redirects.php Added

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Helper files for HTTP_Request2 unit tests. Should be accessible via HTTP.
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+$redirects = isset($_GET'redirects')? $_GET'redirects': 1;
+$https     = !empty($_SERVER'HTTPS') && ('off' != strtolower($_SERVER'HTTPS'));
+$special   = isset($_GET'special')? $_GET'special': null;
+
+if ('ftp' == $special) {
+    header('Location: ftp://localhost/pub/exploit.exe', true, 301);
+
+} elseif ('youtube' == $special) {
+    header('Location: https://youtube.com/', true, 301);
+
+} elseif ('relative' == $special) {
+    header('Location: ./getparameters.php?msg=did%20relative%20redirect', true, 302);
+
+} elseif ('cookie' == $special) {
+    setcookie('cookie_on_redirect', 'success');
+    header('Location: ./cookies.php', true, 302);
+
+} elseif ($redirects > 0) {
+    $url = ($https? 'https': 'http') . '://' . $_SERVER'SERVER_NAME'
+           . (($https && 443 == $_SERVER'SERVER_PORT' || !$https && 80 == $_SERVER'SERVER_PORT')
+              ? '' : ':' . $_SERVER'SERVER_PORT')
+           . $_SERVER'PHP_SELF' . '?redirects=' . (--$redirects);
+    header('Location: ' . $url, true, 302);
+
+} else {
+    echo "Method=" . $_SERVER'REQUEST_METHOD' . ';';
+    var_dump($_POST);
+    var_dump($_GET);
+}
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_network/setcookie.php Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_network/timeout.php Added

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/_network/uploads.php Added

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Helper files for HTTP_Request2 unit tests. Should be accessible via HTTP.
+ *
+ * PHP version 5
+ *
+ * LICENSE
+ *
+ * This source file is subject to BSD 3-Clause License that is bundled
+ * with this package in the file LICENSE and available at the URL
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+ *
+ * @category  HTTP
+ * @package   HTTP_Request2
+ * @author    Alexey Borzov <avb@php.net>
+ * @copyright 2008-2016 Alexey Borzov <avb@php.net>
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+ * @link      http://pear.php.net/package/HTTP_Request2
+ */
+
+if (isset($_GET'slowpoke')) {
+    sleep(3);
+}
+
+if (!empty($_FILES)) {
+    foreach ($_FILES as $name => $file) {
+        if (is_array($file'name')) {
+            foreach($file'name' as $k => $v) {
+                echo "{$name}{$k} {$v} {$file'type'$k} {$file'size'$k}\n";
+            }
+        } else {
+            echo "{$name} {$file'name'} {$file'type'} {$file'size'}\n";
+        }
+    }
+}
+?>
\ No newline at end of file

kolab-webadmin-3.2.16.tar.gz/vendor/pear/http_request2/tests/travis-ci-apache Added

kolab-webadmin.dsc Changed

Changes of Revision 2