@@ -37,7 +37,7 @@

 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}

 Name:           iRony

-Version:        0.4.3

+Version:        0.4.4

 Release:       1%{?dist}

 Summary:        DAV for Kolab Groupware

@@ -185,6 +185,9 @@

 %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name}

 %changelog

+* Fri Oct 16 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.4-1

+- Release of version 0.4.4

+

 * Thu Jan 16 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.3-1

 - Release of version 0.4.3

​

@@ -1,3 +1,9 @@

+irony (0.4.4-1~kolab1) unstable; urgency=low

+

+  * Release of version 0.4.4

+

+ -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Fri, 16 Oct 2020 12:12:13 +0100

+

 irony (0.4.3-1~kolab2) unstable; urgency=low

   * Release of version 0.4.3

​

@@ -1,57 +0,0 @@

-<?php

-/*

- +--------------------------------------------------------------------------+

- | This file is part of the Kolab File API                                  |

- |                                                                          |

- | Copyright (C) 2012-2018, Kolab Systems AG                                |

- |                                                                          |

- | This program is free software: you can redistribute it and/or modify     |

- | it under the terms of the GNU Affero General Public License as published |

- | by the Free Software Foundation, either version 3 of the License, or     |

- | (at your option) any later version.                                      |

- |                                                                          |

- | This program is distributed in the hope that it will be useful,          |

- | but WITHOUT ANY WARRANTY; without even the implied warranty of           |

- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             |

- | GNU Affero General Public License for more details.                      |

- |                                                                          |

- | You should have received a copy of the GNU Affero General Public License |

- | along with this program. If not, see <http://www.gnu.org/licenses/>      |

- +--------------------------------------------------------------------------+

- | Author: Aleksander Machniak <machniak@kolabsys.com>                      |

- +--------------------------------------------------------------------------+

-*/

-

-class file_api_autocomplete extends file_api_common

-{

-    /**

-     * Request handler

-     */

-    public function handle()

-    {

-        parent::handle();

-

-        if (!isset($this->args['search']) || $this->args['search'] === '') {

-            throw new Exception("Missing search keyword", file_api_core::ERROR_CODE);

-        }

-

-        if (isset($this->args['folder']) && $this->args['folder'] !== '') {

-            list($driver, $path) = $this->api->get_driver($this->args['folder']);

-        }

-        else {

-            $driver = $this->api->get_backend();

-        }

-

-        if (!empty($this->args['mode'])) {

-            $mode = 0;

-            $mode += stripos($this->args['mode'], 'user') !== false ? file_storage::SEARCH_USER : 0;

-            $mode += stripos($this->args['mode'], 'group') !== false ? file_storage::SEARCH_GROUP : 0;

-        }

-

-        if (empty($mode)) {

-            $mode = file_storage::SEARCH_USER;

-        }

-

-        return $driver->autocomplete($this->args['search'], $mode);

-    }

-}

​

@@ -1,345 +0,0 @@

-<?php

-/**

- +--------------------------------------------------------------------------+

- | This file is part of the Kolab File API                                  |

- |                                                                          |

- | Copyright (C) 2012-2015, Kolab Systems AG                                |

- |                                                                          |

- | This program is free software: you can redistribute it and/or modify     |

- | it under the terms of the GNU Affero General Public License as published |

- | by the Free Software Foundation, either version 3 of the License, or     |

- | (at your option) any later version.                                      |

- |                                                                          |

- | This program is distributed in the hope that it will be useful,          |

- | but WITHOUT ANY WARRANTY; without even the implied warranty of           |

- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             |

- | GNU Affero General Public License for more details.                      |

- |                                                                          |

- | You should have received a copy of the GNU Affero General Public License |

- | along with this program. If not, see <http://www.gnu.org/licenses/>      |

- +--------------------------------------------------------------------------+

- | Author: Aleksander Machniak <machniak@kolabsys.com>                      |

- +--------------------------------------------------------------------------+

-*/

-

-class file_api_document extends file_api_common

-{

-    /**

-     * Request handler

-     */

-    public function handle()

-    {

-        $method     = $_SERVER['REQUEST_METHOD'];

-        $this->args = $_GET;

-

-        if ($method == 'POST' && !empty($_SERVER['HTTP_X_HTTP_METHOD'])) {

-            $method = $_SERVER['HTTP_X_HTTP_METHOD'];

-        }

-

-        // Invitation notifications

-        if ($this->args['method'] == 'invitations') {

-            return $this->invitations();

-        }

-

-        // Sessions list

-        if ($this->args['method'] == 'sessions') {

-            return $this->sessions();

-        }

-

-        // Session and invitations management

-        if (strpos($this->args['method'], 'document_') === 0) {

-            if ($_SERVER['REQUEST_METHOD'] == 'POST') {

-                $post = file_get_contents('php://input');

-                $this->args += (array) json_decode($post, true);

-                unset($post);

-            }

-

-            if (empty($this->args['id'])) {

-                throw new Exception("Missing document ID.", file_api_core::ERROR_CODE);

-            }

-

-            switch ($this->args['method']) {

-                case 'document_delete':

-                case 'document_invite':

-                case 'document_request':

-                case 'document_decline':

-                case 'document_accept':

-                case 'document_cancel':

-                case 'document_info':

-                    return $this->{$this->args['method']}($this->args['id']);

-            }

-        }

-        // Document content actions for Manticore

-        else if ($method == 'PUT' || $method == 'GET') {

-            if (empty($this->args['id'])) {

-                throw new Exception("Missing document ID.", file_api_core::ERROR_CODE);

-            }

-

-            return $this->{'document_' . strtolower($method)}($this->args['id']);

-        }

-

-        throw new Exception("Unknown method", file_api_core::ERROR_INVALID);

-    }

-

-    /**

-     * Get file path from manticore session identifier

-     */

-    protected function get_file_path($id)

-    {

-        $document = new file_document($this->api);

-

-        $file = $document->session_file($id);

-

-        return $file['file'];

-    }

-

-    /**

-     * Get invitations list

-     */

-    protected function invitations()

-    {

-        $timestamp = new DateTime('now', new DateTimeZone('UTC'));

-        $timestamp = $timestamp->format('U');

-

-        // Initial tracking request, return just the current timestamp

-        if ($this->args['timestamp'] == -1) {

-            return array('timestamp' => $timestamp);

-            // @TODO: in this mode we should likely return all invitations

-            // that require user action, otherwise we may skip some unintentionally

-        }

-

-        $document = new file_document($this->api);

-        $filter   = array();

-

-        if ($this->args['timestamp']) {

-            $filter['timestamp'] = $this->args['timestamp'];

-        }

-

-        $list = $document->invitations_list($filter);

-

-        return array(

-            'list'      => $list,

-            'timestamp' => $timestamp,

-        );

-    }

-

-    /**

-     * Get sessions list

-     */

-    protected function sessions()

-    {

-        $document = new file_document($this->api);

-

-        $params = array(

-            'reverse' => rcube_utils::get_boolean((string) $this->args['reverse']),

-        );

-

-        if (!empty($this->args['sort'])) {

-            $params['sort'] = strtolower($this->args['sort']);

-        }

-

-        return $document->sessions_list($params);

-    }

-

-    /**

-     * Close (delete) manticore session

-     */

-    protected function document_delete($id)

-    {

-        $document = file_document::get_handler($this->api, $id);

-

-        if (!$document->session_delete($id)) {

-            throw new Exception("Failed deleting the document session.", file_api_core::ERROR_CODE);

-        }

-    }

-

-    /**

-     * Invite/add a session participant(s)

-     */

-    protected function document_invite($id)

-    {

-        $document = file_document::get_handler($this->api, $id);

-        $users    = $this->args['users'];

-        $comment  = $this->args['comment'];

-

-        if (empty($users)) {

-            throw new Exception("Invalid arguments.", file_api_core::ERROR_CODE);

-        }

-

-        foreach ((array) $users as $user) {

-            if (!empty($user['user'])) {

-                $document->invitation_create($id, $user['user'], file_document::STATUS_INVITED, $comment, $user['name']);

-

-                $result[] = array(

-                    'session_id' => $id,

-                    'user'       => $user['user'],

-                    'user_name'  => $user['name'],

-                    'status'     => file_document::STATUS_INVITED,

-                );

-            }

-        }

-

-        return array(

-            'list' => $result,

-        );

-    }

-

-    /**

-     * Request an invitation to a session

-     */

-    protected function document_request($id)

-    {

-        $document = file_document::get_handler($this->api, $id);

-        $document->invitation_create($id, null, file_document::STATUS_REQUESTED, $this->args['comment']);

-    }

-

-    /**

-     * Decline an invitation to a session

-     */

-    protected function document_decline($id)

-    {

-        $document = file_document::get_handler($this->api, $id);

-        $document->invitation_update($id, $this->args['user'], file_document::STATUS_DECLINED, $this->args['comment']);

-    }

-

-    /**

-     * Accept an invitation to a session

-     */

-    protected function document_accept($id)

-    {

-        $document = file_document::get_handler($this->api, $id);

-        $document->invitation_update($id, $this->args['user'], file_document::STATUS_ACCEPTED, $this->args['comment']);

-    }

-

-    /**

-     * Remove a session participant(s) - cancel invitations

-     */

-    protected function document_cancel($id)

-    {

-        $document = file_document::get_handler($this->api, $id);

-        $users    = $this->args['users'];

-

-        if (empty($users)) {

-            throw new Exception("Invalid arguments.", file_api_core::ERROR_CODE);

-        }

-

-        foreach ((array) $users as $user) {

-            $document->invitation_delete($id, $user);

-            $result[] = $user;

-        }

-

-        return array(

-            'list' => $result,

-        );

-    }

-

-    /**

-     * Return document informations

-     */

-    protected function document_info($id, $extended = true)

-    {

-        $document = file_document::get_handler($this->api, $id);

-        $file     = $document->session_file($id);

-        $rcube    = rcube::get_instance();

-

-        try {

-            list($driver, $path) = $this->api->get_driver($file['file']);

-            $result = $driver->file_info($path);

-        }

-        catch (Exception $e) {

-            // invited users may have no permission,

-            // use file data from the session

-            $result = array(

-                'size'     => $file['size'],

-                'name'     => $file['name'],

-                'modified' => $file['modified'],

-                'type'     => $file['type'],

-            );

-        }

-

-        if ($extended) {

-            $session = $document->session_info($id);

-

-            $result['owner']      = $session['owner'];

-            $result['owner_name'] = $session['owner_name'];

-            $result['user']       = $rcube->user->get_username();

-            $result['readonly']   = !empty($session['readonly']);

-            $result['origin']     = $session['origin'];

-

-            if ($result['owner'] == $result['user']) {

-                $result['user_name'] = $result['owner_name'];

-            }

-            else {

-                $result['user_name'] = $this->api->resolve_user($result['user']) ?: '';

-            }

-        }

-

-        return $result;

-    }

-

-    /**

-     * Update document file content

-     */

-    protected function document_put($id)

-    {

-        $file = $this->get_file_path($id);

-        list($driver, $path) = $this->api->get_driver($file);

-

-        $length   = rcube_utils::request_header('Content-Length');

-        $tmp_dir  = unslashify($this->api->config->get('temp_dir'));

-        $tmp_path = tempnam($tmp_dir, 'chwalaUpload');

-

-        // Create stream to copy input into a temp file

-        $input    = fopen('php://input', 'r');

-        $tmp_file = fopen($tmp_path, 'w');

-

-        if (!$input || !$tmp_file) {

-            throw new Exception("Failed opening input or temp file stream.", file_api_core::ERROR_CODE);

-        }

-

-        // Create temp file from the input

-        $copied = stream_copy_to_stream($input, $tmp_file);

-

-        fclose($input);

-        fclose($tmp_file);

-

-        if ($copied < $length) {

-            throw new Exception("Failed writing to temp file.", file_api_core::ERROR_CODE);

-        }

-

-        $file_data = array(

-            'path' => $tmp_path,

-            'type' => rcube_mime::file_content_type($tmp_path, $file),

-        );

-

-        $driver->file_update($path, $file_data);

-

-        // remove the temp file

-        unlink($tmp_path);

-

-        // Update the file metadata in session

-        $file_data = $driver->file_info($file);

-        $document  = file_document::get_handler($this->api, $this->args['id']);

-        $document->session_update($this->args['id'], $file_data);

-    }

-

-    /**

-     * Return document file content

-     */

-    protected function document_get($id)

-    {

-        $file = $this->get_file_path($id);

-        list($driver, $path) = $this->api->get_driver($file);

-

-        try {

-            $params = array('force-type' => 'application/vnd.oasis.opendocument.text');

-

-            $driver->file_get($path, $params);

-        }

-        catch (Exception $e) {

-            header("HTTP/1.0 " . file_api_core::ERROR_CODE . " " . $e->getMessage());

-        }

-

-        $this->api->output_send();

-    }

-}

​

@@ -1,61 +0,0 @@

-<?php

-/**

- +--------------------------------------------------------------------------+

- | This file is part of the Kolab File API                                  |

- |                                                                          |

- | Copyright (C) 2012-2015, Kolab Systems AG                                |

- |                                                                          |

- | This program is free software: you can redistribute it and/or modify     |

- | it under the terms of the GNU Affero General Public License as published |

- | by the Free Software Foundation, either version 3 of the License, or     |

- | (at your option) any later version.                                      |

- |                                                                          |

- | This program is distributed in the hope that it will be useful,          |

- | but WITHOUT ANY WARRANTY; without even the implied warranty of           |

- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             |

- | GNU Affero General Public License for more details.                      |

- |                                                                          |

- | You should have received a copy of the GNU Affero General Public License |

- | along with this program. If not, see <http://www.gnu.org/licenses/>      |

- +--------------------------------------------------------------------------+

- | Author: Aleksander Machniak <machniak@kolabsys.com>                      |

- +--------------------------------------------------------------------------+

-*/

-

-class file_api_folder_info extends file_api_common

-{

-    /**

-     * Request handler

-     */

-    public function handle()

-    {

-        parent::handle();

-

-        if (!isset($this->args['folder']) || $this->args['folder'] === '') {

-            throw new Exception("Missing folder name", file_api_core::ERROR_CODE);

-        }

-

-        $result = array(

-            'folder' => $this->args['folder'],

-        );

-

-        if (!empty($this->args['rights']) && rcube_utils::get_boolean((string) $this->args['rights'])) {

-            $result['rights'] = $this->folder_rights($this->args['folder']);

-        }

-

-        if (!empty($this->args['sessions']) && rcube_utils::get_boolean((string) $this->args['sessions'])) {

-             $result['sessions'] = $this->folder_sessions($this->args['folder']);

-        }

-

-        return $result;

-    }

-

-    /**

-     * Get editing sessions

-     */

-    protected function folder_sessions($folder)

-    {

-        $manticore = new file_manticore($this->api);

-        return $manticore->session_find($folder);

-    }

-}

​

@@ -1,48 +0,0 @@

-<?php

-/*

- +--------------------------------------------------------------------------+

- | This file is part of the Kolab File API                                  |

- |                                                                          |

- | Copyright (C) 2012-2015, Kolab Systems AG                                |

- |                                                                          |

- | This program is free software: you can redistribute it and/or modify     |

- | it under the terms of the GNU Affero General Public License as published |

- | by the Free Software Foundation, either version 3 of the License, or     |

- | (at your option) any later version.                                      |

- |                                                                          |

- | This program is distributed in the hope that it will be useful,          |

- | but WITHOUT ANY WARRANTY; without even the implied warranty of           |

- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             |

- | GNU Affero General Public License for more details.                      |

- |                                                                          |

- | You should have received a copy of the GNU Affero General Public License |

- | along with this program. If not, see <http://www.gnu.org/licenses/>      |

- +--------------------------------------------------------------------------+

- | Author: Aleksander Machniak <machniak@kolabsys.com>                      |

- +--------------------------------------------------------------------------+

-*/

-

-class file_api_folder_subscribe extends file_api_common

-{

-    /**

-     * Request handler

-     */

-    public function handle()

-    {

-        parent::handle();

-

-        if (!isset($this->args['folder']) || $this->args['folder'] === '') {

-            throw new Exception("Missing folder name", file_api_core::ERROR_CODE);

-        }

-

-        list($driver, $path) = $this->api->get_driver($this->args['folder']);

-

-        // subscribe mount point?

-        if ($driver->title() === $this->args['folder']) {

-            throw new Exception("Mount point is subscribed by default", file_api_core::ERROR_CODE);

-        }

-

-        // subscribe folder...

-        $driver->folder_subscribe($path);

-    }

-}

​

@@ -1,48 +0,0 @@

-<?php

-/*

- +--------------------------------------------------------------------------+

- | This file is part of the Kolab File API                                  |

- |                                                                          |

- | Copyright (C) 2012-2015, Kolab Systems AG                                |

- |                                                                          |

- | This program is free software: you can redistribute it and/or modify     |

- | it under the terms of the GNU Affero General Public License as published |

- | by the Free Software Foundation, either version 3 of the License, or     |

- | (at your option) any later version.                                      |

- |                                                                          |

- | This program is distributed in the hope that it will be useful,          |

- | but WITHOUT ANY WARRANTY; without even the implied warranty of           |

- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             |

- | GNU Affero General Public License for more details.                      |

- |                                                                          |

- | You should have received a copy of the GNU Affero General Public License |

- | along with this program. If not, see <http://www.gnu.org/licenses/>      |

- +--------------------------------------------------------------------------+

- | Author: Aleksander Machniak <machniak@kolabsys.com>                      |

- +--------------------------------------------------------------------------+

-*/

-

-class file_api_folder_unsubscribe extends file_api_common

-{

-    /**

-     * Request handler

-     */

-    public function handle()

-    {

-        parent::handle();

-

-        if (!isset($this->args['folder']) || $this->args['folder'] === '') {

-            throw new Exception("Missing folder name", file_api_core::ERROR_CODE);

-        }

-

-        list($driver, $path) = $this->api->get_driver($this->args['folder']);

-

-        // subscribe mount point?

-        if ($driver->title() === $this->args['folder']) {

-            throw new Exception("Mount point cannot be unsubscribed", file_api_core::ERROR_CODE);

-        }

-

-        // unsubscribe folder...

-        $driver->folder_unsubscribe($path);

-    }

-}

​

@@ -1,84 +0,0 @@

-<?php

-/*

- +--------------------------------------------------------------------------+

- | This file is part of the Kolab File API                                  |

- |                                                                          |

- | Copyright (C) 2012-2018, Kolab Systems AG                                |

- |                                                                          |

- | This program is free software: you can redistribute it and/or modify     |

- | it under the terms of the GNU Affero General Public License as published |

- | by the Free Software Foundation, either version 3 of the License, or     |

- | (at your option) any later version.                                      |

- |                                                                          |

- | This program is distributed in the hope that it will be useful,          |

- | but WITHOUT ANY WARRANTY; without even the implied warranty of           |

- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             |

- | GNU Affero General Public License for more details.                      |

- |                                                                          |

- | You should have received a copy of the GNU Affero General Public License |

- | along with this program. If not, see <http://www.gnu.org/licenses/>      |

- +--------------------------------------------------------------------------+

- | Author: Aleksander Machniak <machniak@kolabsys.com>                      |

- +--------------------------------------------------------------------------+

-*/

-

-class file_api_sharing extends file_api_common

-{

-    /**

-     * Request handler

-     */

-    public function handle()

-    {

-        parent::handle();

-

-        if (!isset($this->args['folder']) || $this->args['folder'] === '') {

-            throw new Exception("Missing folder name", file_api_core::ERROR_CODE);

-        }

-

-        list($driver, $path) = $this->api->get_driver($this->args['folder']);

-

-        if ($_SERVER['REQUEST_METHOD'] == 'POST') {

-            // Required arguments:

-            // - action: 'submit', 'update', 'delete'

-            // - mode: depends on the storage driver

-            return $driver->sharing($path, file_storage::SHARING_MODE_UPDATE, $this->args);

-        }

-

-        $form = $driver->sharing($path, file_storage::SHARING_MODE_FORM);

-

-        if (empty($form)) {

-            throw new Exception("Sharing not supported", file_api_core::ERROR_UNSUPPORTED);

-        }

-

-        $rights = $driver->sharing($path, file_storage::SHARING_MODE_RIGHTS);

-

-        $this->localize_form_data($form);

-

-        $result = array(

-            'form'   => $form,

-            'rights' => (array) $rights,

-        );

-

-        return $result;

-    }

-

-    /**

-     * Recurrent function to localize form data entries

-     */

-    protected function localize_form_data(&$data, $key = null, $self = null)

-    {

-        if (!$self) {

-            $self = $this;

-        }

-

-        if (in_array($key, array('title', 'placeholder', 'label', 'list_column_label'))) {

-            $data = $self->api->translate($data);

-        }

-        else if ($key == 'options') {

-            $data = array_map(array($self->api, 'translate'), $data);

-        }

-        else if (is_array($data)) {

-            array_walk($data, array($self, 'localize_form_data'), $self);

-        }

-    }

-}

​

@@ -1,221 +0,0 @@

-<?php

-/*

- +--------------------------------------------------------------------------+

- | This file is part of the Kolab File API                                  |

- |                                                                          |

- | Copyright (C) 2012-2018, Kolab Systems AG                                |

- |                                                                          |

- | This program is free software: you can redistribute it and/or modify     |

- | it under the terms of the GNU Affero General Public License as published |

- | by the Free Software Foundation, either version 3 of the License, or     |

- | (at your option) any later version.                                      |

- |                                                                          |

- | This program is distributed in the hope that it will be useful,          |

- | but WITHOUT ANY WARRANTY; without even the implied warranty of           |

- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             |

- | GNU Affero General Public License for more details.                      |

- |                                                                          |

- | You should have received a copy of the GNU Affero General Public License |

- | along with this program. If not, see <http://www.gnu.org/licenses/>      |

- +--------------------------------------------------------------------------+

- | Author: Aleksander Machniak <machniak@kolabsys.com>                      |

- +--------------------------------------------------------------------------+

-*/

-

-class kolab_file_autocomplete

-{

-    private $rc;

-    private $ldap;

-

-    /**

-     * Class constructor

-     */

-    public function __construct()

-    {

-        $this->rc = rcube::get_instance();

-    }

-

-    /**

-     * Search users/groups

-     */

-    public function search($search, $with_groups = false)

-    {

-        if (!$this->init_ldap()) {

-            return false;

-        }

-

-        $max  = (int) $this->rc->config->get('autocomplete_max', 15);

-        $mode = (int) $this->rc->config->get('addressbook_search_mode');

-        $me   = $this->rc->get_user_name();

-

-        $this->ldap->set_pagesize($max);

-

-        $result = $this->ldap->search('*', $search, $mode);

-        $users  = array();

-        $index  = array();

-

-        foreach ($result->records as $record) {

-            $user = $record['uid'];

-

-            if (is_array($user)) {

-                $user = array_filter($user);

-                $user = $user[0];

-            }

-

-            if (in_array($me, rcube_addressbook::get_col_values('email', $record, true))) {

-                continue;

-            }

-

-            if ($user) {

-                $display = rcube_addressbook::compose_search_name($record);

-                $user    = array('name' => $user, 'display' => $display);

-                $users[] = $user;

-                $index[] = $display ?: $user['name'];

-            }

-        }

-

-        $group_support = $this->rc->config->get('fileapi_groups');

-        $group_prefix  = $this->rc->config->get('fileapi_group_prefix');

-        $group_field   = $this->rc->config->get('fileapi_group_field', 'name');

-

-        if ($with_groups && $group_support && $group_field) {

-            $result = $this->ldap->list_groups($search, $mode);

-

-            foreach ($result as $record) {

-                $group    = $record['name'];

-                $group_id = is_array($record[$group_field]) ? $record[$group_field][0] : $record[$group_field];

-

-                if ($group) {

-                    $users[] = array('name' => ($group_prefix ? $group_prefix : '') . $group_id, 'display' => $group, 'type' => 'group');

-                    $index[] = $group;

-                }

-            }

-        }

-

-        if (count($users)) {

-            array_multisort($index, SORT_ASC, SORT_LOCALE_STRING, $users);

-        }

-

-        if (count($users) > $max) {

-            $users = array_slice($users, 0, $max);

-        }

-

-        return $users;

-    }

-

-    /**

-     * Resolve acl identifier to user/group name

-     */

-    public function resolve_uid($id, &$title = null)

-    {

-        $groups      = $this->rc->config->get('acl_groups');

-        $prefix      = $this->rc->config->get('acl_group_prefix');

-        $group_field = $this->rc->config->get('acl_group_field', 'name');

-

-        if ($groups && $prefix && strpos($id, $prefix) === 0) {

-            $gid = substr($id, strlen($prefix));

-

-            // Unfortunately this works only if group_field=name,

-            // list_groups() allows searching by group name only

-            if ($group_field === 'name' && $this->init_ldap()) {

-                $result = $this->ldap->list_groups($gid, rcube_addressbook::SEARCH_STRICT);

-

-                if (count($result) === 1 && ($record = $result[0])) {

-                    if ($record[$group_field] === $gid) {

-                        $display = $record['name'];

-                        if ($display != $gid) {

-                            $title = sprintf('%s (%s)', $display, $gid);

-                        }

-

-                        return $display;

-                    }

-                }

-            }

-

-            return $gid;

-        }

-

-        if ($this->init_ldap()) {

-            $this->ldap->set_pagesize('2');

-            // Note: 'uid' works here because we overwrite fieldmap in init_ldap() above

-            $result = $this->ldap->search('uid', $id, rcube_addressbook::SEARCH_STRICT);

-

-            if ($result->count === 1 && ($record = $result->first())) {

-                if ($record['uid'] === $id) {

-                    $title   = rcube_addressbook::compose_search_name($record);

-                    $display = rcube_addressbook::compose_list_name($record);

-

-                    return $display;

-                }

-            }

-        }

-

-        return $id;

-    }

-

-    /**

-     * Initializes autocomplete LDAP backend

-     */

-    private function init_ldap()

-    {

-        if ($this->ldap) {

-            return $this->ldap->ready;

-        }

-

-        // get LDAP config

-        $config = $this->rc->config->get('fileapi_users_source');

-

-        if (empty($config)) {

-            return false;

-        }

-

-        // not an array, use configured ldap_public source

-        if (!is_array($config)) {

-            $ldap_config = (array) $this->rc->config->get('ldap_public');

-            $config      = $ldap_config[$config];

-        }

-

-        $uid_field = $this->rc->config->get('fileapi_users_field', 'mail');

-        $filter    = $this->rc->config->get('fileapi_users_filter');

-        $debug     = $this->rc->config->get('ldap_debug');

-        $domain    = $this->rc->config->mail_domain($_SESSION['imap_host']);

-

-        if (empty($uid_field) || empty($config)) {

-            return false;

-        }

-

-        // get name attribute

-        if (!empty($config['fieldmap'])) {

-            $name_field = $config['fieldmap']['name'];

-        }

-        // ... no fieldmap, use the old method

-        if (empty($name_field)) {

-            $name_field = $config['name_field'];

-        }

-

-        // add UID field to fieldmap, so it will be returned in a record with name

-        $config['fieldmap']['name'] = $name_field;

-        $config['fieldmap']['uid']  = $uid_field;

-

-        // search in UID and name fields

-        // $name_field can be in a form of <field>:<modifier> (#1490591)

-        $name_field = preg_replace('/:.*$/', '', $name_field);

-        $search     = array_unique(array($name_field, $uid_field));

-

-        $config['search_fields']   = $search;

-        $config['required_fields'] = array($uid_field);

-

-        // set search filter

-        if ($filter) {

-            $config['filter'] = $filter;

-        }

-

-        // disable vlv

-        $config['vlv'] = false;

-

-        // Initialize LDAP connection

-        $this->ldap = new rcube_ldap($config, $debug, $domain);

-

-        return $this->ldap->ready;

-    }

-}

​

-(directory)

​

@@ -1,1115 +0,0 @@

-<?php

-/**

- +--------------------------------------------------------------------------+

- | This file is part of the Kolab File API                                  |

- |                                                                          |

- | Copyright (C) 2012-2015, Kolab Systems AG                                |

- |                                                                          |

- | This program is free software: you can redistribute it and/or modify     |

- | it under the terms of the GNU Affero General Public License as published |

- | by the Free Software Foundation, either version 3 of the License, or     |

- | (at your option) any later version.                                      |

- |                                                                          |

- | This program is distributed in the hope that it will be useful,          |

- | but WITHOUT ANY WARRANTY; without even the implied warranty of           |

- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             |

- | GNU Affero General Public License for more details.                      |

- |                                                                          |

- | You should have received a copy of the GNU Affero General Public License |

- | along with this program. If not, see <http://www.gnu.org/licenses/>      |

- +--------------------------------------------------------------------------+

- | Author: Aleksander Machniak <machniak@kolabsys.com>                      |

- +--------------------------------------------------------------------------+

-*/

-

-// try SabreDAV installed as described in README

-if (file_exists(__DIR__ . '/../../ext/SabreDAV/vendor/autoload.php')) {

-    require __DIR__ . '/../../ext/SabreDAV/vendor/autoload.php';

-}

-// fallback to System-installed package

-else {

-    require 'Sabre/autoload.php';

-}

-

-use Sabre\DAV\Client;

-

-class webdav_file_storage implements file_storage

-{

-    /**

-     * @var rcube

-     */

-    protected $rc;

-

-    /**

-     * @var array

-     */

-    protected $config = array();

-

-    /**

-     * @var string

-     */

-    protected $title;

-

-    /**

-     * @var Sabre\DAV\Client

-     */

-    protected $client;

-

-

-    /**

-     * Class constructor

-     */

-    public function __construct()

-    {

-        $this->rc = rcube::get_instance();

-    }

-

-    /**

-     * Authenticates a user

-     *

-     * @param string $username User name

-     * @param string $password User password

-     *

-     * @param bool True on success, False on failure

-     */

-    public function authenticate($username, $password)

-    {

-        $settings = array(

-            'baseUri'  => $this->config['baseuri'],

-            'userName' => $username,

-            'password' => $password,

-            'authType' => Client::AUTH_BASIC,

-        );

-

-        $client = new Client($settings);

-

-        try {

-            $client->propfind('', array());

-        }

-        catch (Exception $e) {

-            return false;

-        }

-

-        if ($this->title) {

-            $_SESSION[$this->title . '_webdav_user']  = $username;

-            $_SESSION[$this->title . '_webdav_pass']  = $this->rc->encrypt($password);

-            $this->client = $client;

-        }

-

-        return true;

-    }

-

-    /**

-     * Get password and name of authenticated user

-     *

-     * @return array Authenticated user data

-     */

-    public function auth_info()

-    {

-        return array(

-            'username' => $this->config['username'],

-            'password' => $this->config['password'],

-        );

-    }

-

-    /**

-     * Configures environment

-     *

-     * @param array  $config Configuration

-     * @param string $title  Source identifier

-     */

-    public function configure($config, $title = null)

-    {

-        if (!empty($config['host'])) {

-            $config['baseuri'] = $config['host'];

-        }

-

-        $this->config = array_merge($this->config, $config);

-        $this->title  = $title;

-    }

-

-    /**

-     * Initializes WebDAV client

-     */

-    protected function init()

-    {

-        if ($this->client !== null) {

-            return true;

-        }

-

-        // Load configuration for main driver

-        $config['baseuri'] = $this->rc->config->get('fileapi_webdav_baseuri');

-

-        if (!empty($config['baseuri'])) {

-            $config['username'] = $_SESSION['username'];

-            $config['password'] = $this->rc->decrypt($_SESSION['password']);

-        }

-

-        $this->config = array_merge($config, $this->config);

-

-        // Use session username if not set in configuration

-        if (!isset($this->config['username'])) {

-            $this->config['username'] = $_SESSION[$this->title . '_webdav_user'];

-        }

-        if (!isset($this->config['password'])) {

-            $this->config['password'] = $this->rc->decrypt($_SESSION[$this->title . '_webdav_pass']);

-        }

-

-        if (empty($this->config['baseuri'])) {

-            throw new Exception("Missing base URI of WebDAV server", file_storage::ERROR_NOAUTH);

-        }

-

-        $this->client = new Client(array(

-            'baseUri'  => rtrim($this->config['baseuri'], '/') . '/',

-            'userName' => $this->config['username'],

-            'password' => $this->config['password'],

-            'authType' => Client::AUTH_BASIC,

-        ));

-    }

-

-    /**

-     * Returns current instance title

-     *

-     * @return string Instance title (mount point)

-     */

-    public function title()

-    {

-        return $this->title;

-    }

-

-    /**

-     * Storage driver capabilities

-     *

-     * @return array List of capabilities

-     */

-    public function capabilities()

-    {

-        // find max filesize value

-        $max_filesize = parse_bytes(ini_get('upload_max_filesize'));

-        $max_postsize = parse_bytes(ini_get('post_max_size'));

-        if ($max_postsize && $max_postsize < $max_filesize) {

-            $max_filesize = $max_postsize;

-        }

-

-        return array(

-            file_storage::CAPS_MAX_UPLOAD => $max_filesize,

-            file_storage::CAPS_QUOTA      => true,

-            file_storage::CAPS_LOCKS      => true, //TODO: Implement WebDAV locks

-        );

-    }

-

-    /**

-     * Save configuration of external driver (mount point)

-     *

-     * @param array $driver Driver data

-     *

-     * @throws Exception

-     */

-    public function driver_create($driver)

-    {

-        throw new Exception("Not implemented", file_storage::ERROR_UNSUPPORTED);

-    }

-

-    /**

-     * Delete configuration of external driver (mount point)

-     *

-     * @param string $name Driver instance name

-     *

-     * @throws Exception

-     */

-    public function driver_delete($name)

-    {

-        throw new Exception("Not implemented", file_storage::ERROR_UNSUPPORTED);

-    }

-

-    /**

-     * Return list of registered drivers (mount points)

-     *

-     * @return array List of drivers data

-     * @throws Exception

-     */

-    public function driver_list()

-    {

-        return array();

-        //TODO: Stub. Not implemented.

-    }

-

-    /**

-     * Update configuration of external driver (mount point)

-     *

-     * @param string $title  Driver instance title

-     * @param array  $driver Driver data

-     *

-     * @throws Exception

-     */

-    public function driver_update($title, $driver)

-    {

-        throw new Exception("Not implemented", file_storage::ERROR_UNSUPPORTED);

-    }

-

-    /**

-     * Returns metadata of the driver

-     *

-     * @return array Driver meta data (image, name, form)

-     */

-    public function driver_metadata()

-    {

-        $image_content = file_get_contents(__DIR__ . '/webdav.png');

-

-        $metadata = array(

-            'image' => 'data:image/png;base64,' . base64_encode($image_content),

-            'name'  => 'WebDAV',

-            'ref'   => 'http://www.webdav.org/',

-            'description' => 'WebDAV client',

-            'form'  => array(

-                'baseuri'  => 'baseuri',

-                'username' => 'username',

-                'password' => 'password',

-            ),

-        );

-

-        // these are returned when authentication on folders list fails

-        if ($this->config['username']) {

-            $metadata['form_values'] = array(

-                'baseuri'  => $this->config['baseuri'],

-                'username' => $this->config['username'],

-            );

-        }

-

-        return $metadata;

-    }

-

-    /**

-     * Validate metadata (config) of the driver

-     *

-     * @param array $metadata Driver metadata

-     *

-     * @return array Driver meta data to be stored in configuration

-     * @throws Exception

-     */

-    public function driver_validate($metadata)

-    {

-        if (!is_string($metadata['username']) || !strlen($metadata['username'])) {

-            throw new Exception("Missing user name.", file_storage::ERROR);

-        }

-

-        if (!is_string($metadata['password']) || !strlen($metadata['password'])) {

-            throw new Exception("Missing user password.", file_storage::ERROR);

-        }

-

-        if (!is_string($metadata['baseuri']) || !strlen($metadata['baseuri'])) {

-            throw new Exception("Missing base URL.", file_storage::ERROR);

-        }

-

-        // Ensure baseUri ends with a slash

-        $base_uri = $metadata['baseuri'];

-        if (substr($base_uri, -1) != '/') {

-            $base_uri .= '/';

-        }

-

-        $this->config['baseuri'] = $base_uri;

-

-        if (!$this->authenticate($metadata['username'], $metadata['password'])) {

-            throw new Exception("Unable to authenticate user", file_storage::ERROR_NOAUTH);

-        }

-

-        return array(

-            'host'     => $base_uri,

-            'port'     => 0,

-            'username' => $metadata['username'],

-            'password' => $metadata['password'],

-        );

-    }

-

-    /**

-     * Create a file.

-     *

-     * @param string $file_name Name of a file (with folder path)

-     * @param array  $file      File data (path, type)

-     *

-     * @throws Exception

-     */

-    public function file_create($file_name, $file)