Kolab Groupware OBS

Changes of Revision 38

iRony.spec Changed

debian.changelog Changed

iRony-0.4.3.tar.gz/lib/FileAPI/api/autocomplete.php Deleted

@@ -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);
-    }
-}

iRony-0.4.3.tar.gz/lib/FileAPI/api/document.php Deleted

@@ -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();
-    }
-}

iRony-0.4.3.tar.gz/lib/FileAPI/api/folder_info.php Deleted

@@ -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);
-    }
-}

iRony-0.4.3.tar.gz/lib/FileAPI/api/folder_subscribe.php Deleted

@@ -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);
-    }
-}

iRony-0.4.3.tar.gz/lib/FileAPI/api/folder_unsubscribe.php Deleted

@@ -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);
-    }
-}

iRony-0.4.3.tar.gz/lib/FileAPI/api/sharing.php Deleted

@@ -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);
-        }
-    }
-}

iRony-0.4.3.tar.gz/lib/FileAPI/drivers/kolab/kolab_file_autocomplete.php Deleted

@@ -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;
-    }
-}

iRony-0.4.3.tar.gz/lib/FileAPI/drivers/webdav Deleted

iRony-0.4.3.tar.gz/lib/FileAPI/drivers/webdav/webdav.png Deleted

iRony-0.4.3.tar.gz/lib/FileAPI/drivers/webdav/webdav_file_storage.php Deleted

@@ -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)
-    {
-        $this->init();
-
-        if ($file['path']) {
-            $data = fopen($file['path'], 'r');
-        }
-        else {
-            // Resource or data
-            $data = $file['content'];
-        }
-
-        if (is_resource($data)) {
-            // Need to tell Curl the attachments size, so it properly
-            // sets Content-Length header, that is required in PUT
-            // request by some webdav servers (#2978)
-            $stat = fstat($data);
-            $this->client->addCurlSetting(CURLOPT_INFILESIZE, $stat['size']);
-        }
-
-        $file_name = $this->encode_path($file_name);
-        $response  = $this->client->request('PUT', $file_name, $data);
-
-        if ($file['path']) {
-            fclose($data);
-        }
-
-        if ($response['statusCode'] != 201) {
-            throw new Exception("Storage error. " . $response['body'], file_storage::ERROR);
-        }
-    }
-
-    /**
-     * Update 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_update($file_name, $file)
-    {
-        $this->init();
-
-        if ($file['path']) {
-            $data = fopen($file['path'], 'r');
-        }
-        else {
-            //Resource or data
-            $data = $file['content'];
-        }
-
-        if (is_resource($data)) {
-            // Need to tell Curl the attachment size, so it properly
-            // sets Content-Length header, that is required in PUT
-            // request by some webdav servers (#2978)
-            $stat = fstat($data);
-            $this->client->addCurlSetting(CURLOPT_INFILESIZE, $stat['size']);
-        }
-
-        $file_name = $this->encode_path($file_name);
-        $response  = $this->client->request('PUT', $file_name, $data);
-
-        if ($file['path']) {
-            fclose($data);
-        }
-
-        if ($response['statusCode'] != 204) {
-            throw new Exception("Storage error. " . $response['body'], file_storage::ERROR);
-        }
-    }
-
-    /**
-     * Delete a file.
-     *
-     * @param string $file_name Name of a file (with folder path)
-     *
-     * @throws Exception
-     */
-    public function file_delete($file_name)
-    {
-        $this->init();
-
-        $file_name = $this->encode_path($file_name);
-        $response  = $this->client->request('DELETE', $file_name);
-
-        if ($response['statusCode'] != 204) {
-            throw new Exception("Storage error: " . $response['body'], file_storage::ERROR);
-        }
-    }
-
-    /**
-     * Return file body.
-     *
-     * @param string   $file_name Name of a file (with folder path)
-     * @param array    $params    Parameters (force-download)
-     * @param resource $fp        Print to file pointer instead (send no headers)
-     *
-     * @throws Exception
-     */
-    public function file_get($file_name, $params = array(), $fp = null)
-    {
-        $this->init();
-
-        // @TODO: Write directly to $fp
-
-        $file_name = $this->encode_path($file_name);
-        $response  = $this->client->request($params['head'] ? 'HEAD' : 'GET', $file_name);
-
-        if ($response['statusCode'] != 200) {
-            throw new Exception("Storage error. File not found.", file_storage::ERROR);
-        }
-
-        // Sometimes Content-Length is an array here (T3757)
-        $size = $response['headers']['content-length'];
-        if (is_array($size)) {
-            $size = $size[0];
-        }
-
-        // write to file pointer, send no headers
-        if ($fp) {
-            if ($size) {
-                fwrite($fp, $response['body']);
-            }
-            return;
-        }
-
-        if (!empty($params['force-download'])) {
-            $disposition = 'attachment';
-            header("Content-Type: application/octet-stream");
-// @TODO
-//            if ($browser->ie)
-//                header("Content-Type: application/force-download");
-        }
-        else {
-            $mimetype = file_utils::real_mimetype($params['force-type'] ? $params['force-type'] : $response['headers']['content-type']);
-            $disposition = 'inline';
-
-            header("Content-Transfer-Encoding: binary");
-            header("Content-Type: $mimetype");
-        }
-
-        $filename = addcslashes(end(explode('/', $file_name)), '"');
-
-        // Workaround for nasty IE bug (#1488844)
-        // If Content-Disposition header contains string "attachment" e.g. in filename
-        // IE handles data as attachment not inline
-/*
-@TODO
-        if ($disposition == 'inline' && $browser->ie && $browser->ver < 9) {
-            $filename = str_ireplace('attachment', 'attach', $filename);
-        }
-*/
-        header("Content-Length: " . $size);
-        header("Content-Disposition: $disposition; filename=\"$filename\"");
-
-        if ($size && empty($params['head'])) {
-            echo $response['body'];
-        }
-    }
-
-    /**
-     * Returns file metadata.
-     *
-     * @param string $file_name Name of a file (with folder path)
-     *
-     * @throws Exception
-     */
-    public function file_info($file_name)
-    {
-        $this->init();
-
-        try {
-            $props = $this->client->propfind($this->encode_path($file_name), array(
-                    '{DAV:}resourcetype',
-                    '{DAV:}getcontentlength',
-                    '{DAV:}getcontenttype',
-                    '{DAV:}getlastmodified',
-                    '{DAV:}creationdate'
-                ), 0);
-        }
-        catch (Exception $e) {
-            throw new Exception("Storage error. File not found.", file_storage::ERROR);
-        }
-
-        $mtime = new DateTime($props['{DAV:}getlastmodified']);
-        $ctime = new DateTime($props['{DAV:}creationdate']);
-
-        return array (
-            'name'     => end(explode('/', $file_name)),
-            'size'     => (int) $props['{DAV:}getcontentlength'],
-            'type'     => (string) $props['{DAV:}getcontenttype'],
-            'mtime'    => file_utils::date_format($mtime, $this->config['date_format'], $this->config['timezone']),
-            'ctime'    => file_utils::date_format($ctime, $this->config['date_format'], $this->config['timezone']),
-            'modified' => $mtime ? $mtime->format('U') : 0,
-            'created'  => $ctime ? $ctime->format('U') : 0,
-        );
-    }
-
-    /**
-     * List files in a folder.
-     *
-     * @param string $folder_name Name of a folder with full path
-     * @param array  $params      List parameters ('sort', 'reverse', 'search', 'prefix')
-     *
-     * @return array List of files (file properties array indexed by filename)
-     * @throws Exception
-     */
-    public function file_list($folder_name, $params = array())
-    {
-        $this->init();
-
-        if (!empty($params['search'])) {
-            foreach ($params['search'] as $idx => $value) {
-                switch ($idx) {
-                case 'name':
-                    $params['search']['name'] = mb_strtoupper($value);
-                    break;
-
-                case 'class':
-                    $params['search']['class'] = file_utils::class2mimetypes($params['search']['class']);
-                    break;
-                }
-            }
-        }
-
-        try {
-            $items = $this->client->propfind($this->encode_path($folder_name), array(
-                    '{DAV:}resourcetype',
-                    '{DAV:}getcontentlength',
-                    '{DAV:}getcontenttype',
-                    '{DAV:}getlastmodified',
-                    '{DAV:}creationdate'
-                ), 1);
-        }
-        catch (Exception $e) {
-            throw new Exception("Storage error. Folder not found.", file_storage::ERROR);
-        }
-
-        $result = array();
-
-        foreach ($items as $file => $props) {
-            // Skip directories
-            $is_dir = !empty($props['{DAV:}resourcetype']) && count($props['{DAV:}resourcetype']->getValue()) > 0;
-            if ($is_dir) {
-                continue;
-            }
-
-            $mtime = new DateTime($props['{DAV:}getlastmodified']);
-            $ctime = new DateTime($props['{DAV:}creationdate']);
-            $ctype = (string) $props['{DAV:}getcontenttype'];
-
-            $path  = $this->get_full_url($file);
-            $path  = $this->decode_path($path);
-            $fname = end(explode('/', $path));
-
-            if (!empty($params['search'])) {
-                foreach ($params['search'] as $idx => $value) {
-                    switch ($idx) {
-                    case 'name':
-                        if (stripos(mb_strtoupper($fname), $value) === false) {
-                            continue 3; // skip the file
-                        }
-                        break;
-
-                    case 'class':
-                        foreach ($value as $type) {
-                            if (stripos($ctype, $type) !== false) {
-                                continue 3;
-                            }
-                        }
-                        continue 3; // skip the file
-                        break;
-                    }
-                }
-            }
-
-            $result[$path] = array(
-                'name'     => $fname,
-                'size'     => (int) $props['{DAV:}getcontentlength'],
-                'type'     => $ctype,
-                'mtime'    => file_utils::date_format($mtime, $this->config['date_format'], $this->config['timezone']),
-                'ctime'    => file_utils::date_format($ctime, $this->config['date_format'], $this->config['timezone']),
-                'modified' => $mtime ? $mtime->format('U') : 0,
-                'created'  => $ctime ? $ctime->format('U') : 0,
-            );
-        }
-
-        // @TODO: pagination
-
-        // Sorting
-        $sort  = !empty($params['sort']) ? $params['sort'] : 'name';
-        $index = array();
-
-        if ($sort == 'mtime') {
-            $sort = 'modified';
-        }
-
-        if (in_array($sort, array('name', 'size', 'modified'))) {
-            foreach ($result as $key => $val) {
-                $index[$key] = $val[$sort];
-            }
-            array_multisort($index, SORT_ASC, SORT_NUMERIC, $result);
-        }
-
-        if ($params['reverse']) {
-            $result = array_reverse($result, true);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Copy a file.
-     *
-     * @param string $file_name Name of a file (with folder path)
-     * @param string $new_name  New name of a file (with folder path)
-     *
-     * @throws Exception
-     */
-    public function file_copy($file_name, $new_name)
-    {
-        $this->init();
-
-        $request   =  array('Destination' => $this->config['baseuri'] . '/' . rawurlencode($new_name));
-        $file_name = $this->encode_path($file_name);
-        $response  = $this->client->request('COPY', $file_name, null, $request);
-
-        if ($response['statusCode'] != 201) {
-            throw new Exception("Storage error: " . $response['body'], file_storage::ERROR);
-        }
-    }
-
-    /**
-     * Move (or rename) a file.
-     *
-     * @param string $file_name Name of a file (with folder path)
-     * @param string $new_name  New name of a file (with folder path)
-     *
-     * @throws Exception
-     */
-    public function file_move($file_name, $new_name)
-    {
-        $this->init();
-
-        $request   = array('Destination' => $this->config['baseuri'] . '/' . rawurlencode($new_name));
-        $file_name = $this->encode_path($file_name);
-        $response  = $this->client->request('MOVE', $file_name, null, $request);
-
-        if ($response['statusCode'] != 201) {
-            throw new Exception("Storage error: " . $response['body'], file_storage::ERROR);
-        }
-    }
-
-    /**
-     * Create a folder.
-     *
-     * @param string $folder_name Name of a folder with full path
-     *
-     * @throws Exception on error
-     */
-    public function folder_create($folder_name)
-    {
-        $this->init();
-
-        $folder_name = $this->encode_path($folder_name);
-        $response    = $this->client->request('MKCOL', $folder_name);
-
-        if ($response['statusCode'] != 201) {
-            throw new Exception("Storage error: " . $response['body'], file_storage::ERROR);
-        }
-    }
-
-    /**
-     * Delete a folder.
-     *
-     * @param string $folder_name Name of a folder with full path
-     *
-     * @throws Exception on error
-     */
-    public function folder_delete($folder_name)
-    {
-        $this->init();
-
-        $folder_name = $this->encode_path($folder_name);
-        $response    = $this->client->request('DELETE', $folder_name);
-
-        if ($response['statusCode'] != 204) {
-            throw new Exception("Storage error: " . $response['body'], file_storage::ERROR);
-        }
-    }
-
-    /**
-     * Move/Rename a folder.
-     *
-     * @param string $folder_name Name of a folder with full path
-     * @param string $new_name    New name of a folder with full path
-     *
-     * @throws Exception on error
-     */
-    public function folder_move($folder_name, $new_name)
-    {
-        $this->init();
-
-        $request     = array('Destination' => $this->config['baseuri'] . '/' . rawurlencode($new_name));
-        $folder_name = $this->encode_path($folder_name);
-        $response    = $this->client->request('MOVE', $folder_name, null, $request);
-
-        if ($response['statusCode'] != 201) {
-            throw new Exception("Storage error: " . $response['body'], file_storage::ERROR);
-        }
-    }
-
-    /**
-     * Subscribe a folder.
-     *
-     * @param string $folder_name Name of a folder with full path
-     *
-     * @throws Exception
-     */
-    public function folder_subscribe($folder_name)
-    {
-        throw new Exception("Not implemented", file_storage::ERROR_UNSUPPORTED);
-    }
-
-    /**
-     * Unsubscribe a folder.
-     *
-     * @param string $folder_name Name of a folder with full path
-     *
-     * @throws Exception
-     */
-    public function folder_unsubscribe($folder_name)
-    {
-        throw new Exception("Not implemented", file_storage::ERROR_UNSUPPORTED);
-    }
-
-    /**
-     * Returns list of folders.
-     *
-     * @param array $params List parameters ('type', 'search', path, level)
-     *
-     * @return array List of folders
-     * @throws Exception
-     */
-    public function folder_list($params = array())
-    {
-        $this->init();
-
-        if (empty($params['level'])) {
-            $params['level'] = 100;
-        }
-
-        $result = $this->folders_tree($params);
-
-        // ensure sorted folders
-        usort($result, array('file_utils', 'sort_folder_comparator'));
-
-        // In extended format we return array of arrays
-        if (!empty($params['extended'])) {
-            foreach ($result as $idx => $folder) {
-                $item = array('folder' => $folder);
-                $result[$idx] = $item;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Check folder rights.
-     *
-     * @param string $folder_name Name of a folder with full path
-     *
-     * @return int Folder rights (sum of file_storage::ACL_*)
-     */
-    public function folder_rights($folder_name)
-    {
-        // @TODO
-        return file_storage::ACL_READ | file_storage::ACL_WRITE;
-    }
-
-    /**
-     * Returns a list of locks
-     *
-     * This method should return all the locks for a particular URI, including
-     * locks that might be set on a parent URI.
-     *
-     * If child_locks is set to true, this method should also look for
-     * any locks in the subtree of the URI for locks.
-     *
-     * @param string $path        File/folder path
-     * @param bool   $child_locks Enables subtree checks
-     *
-     * @return array List of locks
-     * @throws Exception
-     */
-    public function lock_list($path, $child_locks = false)
-    {
-        $this->init_lock_db();
-
-        // convert path into global URI
-        $uri = $this->path2uri($path);
-
-        // get locks list
-        $list = $this->lock_db->lock_list($uri, $child_locks);
-
-        // convert back global URIs into paths
-        foreach ($list as $idx => $lock) {
-            $list[$idx]['uri'] = $this->uri2path($lock['uri']);
-        }
-
-        return $list;
-    }
-
-    /**
-     * Locks a URI
-     *
-     * @param string $path File/folder path
-     * @param array  $lock Lock data
-     *                     - depth: 0/'infinite'
-     *                     - scope: 'shared'/'exclusive'
-     *                     - owner: string
-     *                     - token: string
-     *                     - timeout: int
-     *
-     * @throws Exception
-     */
-    public function lock($path, $lock)
-    {
-        $this->init_lock_db();
-
-        // convert path into global URI
-        $uri = $this->path2uri($path);
-
-        if (!$this->lock_db->lock($uri, $lock)) {
-            throw new Exception("Database error. Unable to create a lock.", file_storage::ERROR);
-        }
-    }
-
-    /**
-     * Removes a lock from a URI
-     *
-     * @param string $path File/folder path
-     * @param array  $lock Lock data
-     *
-     * @throws Exception
-     */
-    public function unlock($path, $lock)
-    {
-        $this->init_lock_db();
-
-        // convert path into global URI
-        $uri = $this->path2uri($path);
-
-        if (!$this->lock_db->unlock($uri, $lock)) {
-            throw new Exception("Database error. Unable to remove a lock.", file_storage::ERROR);
-        }
-    }
-
-    /**
-     * Return disk quota information for specified folder.
-     *
-     * @param string $folder_name Name of a folder with full path
-     *
-     * @return array Quota
-     * @throws Exception
-     */
-    public function quota($folder)
-    {
-        $this->init();
-
-        $props = $this->client->propfind($this->encode_path($folder), array(
-            '{DAV:}quota-available-bytes',
-            '{DAV:}quota-used-bytes',
-        ), 0);
-
-        $used      = $props['{DAV:}quota-used-bytes'];
-        $available = $props['{DAV:}quota-available-bytes'];
-
-        return array(
-            // expected values in kB
-            'total' => ($used + $available) / 1024,
-            'used'  => $used / 1024,
-        );
-    }
-
-    /**
-     * Sharing interface
-     *
-     * @param string $folder_name Name of a folder with full path
-     * @param int    $mode        Sharing action mode
-     * @param array  $args        POST/GET parameters
-     *
-     * @return mixed Sharing response
-     * @throws Exception
-     */
-    public function sharing($folder, $mode, $args = array())
-    {
-        // TODO
-        throw new Exception("Search not implemented", file_storage::ERROR_UNSUPPORTED);
-    }
-
-    /**
-     * User/group search (autocompletion)
-     *
-     * @param string $search Search string
-     * @param int    $mode   Search mode
-     *
-     * @return array Users/Groups list
-     * @throws Exception
-     */
-    public function autocomplete($search, $mode)
-    {
-        // TODO
-        throw new Exception("Search not implemented", file_storage::ERROR_UNSUPPORTED);
-    }
-
-    /**
-     * Convert file/folder path into a global URI.
-     *
-     * @param string $path File/folder path
-     *
-     * @return string URI
-     * @throws Exception
-     */
-    public function path2uri($path)
-    {
-        $base = preg_replace('|^[a-zA-Z]+://|', '', $this->config['baseuri']);
-
-        return 'webdav://' . rawurlencode($this->config['username']) . '@' . $base
-            . '/' . file_utils::encode_path($path);
-    }
-
-    /**
-     * Convert global URI into file/folder path.
-     *
-     * @param string $uri URI
-     *
-     * @return string File/folder path
-     * @throws Exception
-     */
-    public function uri2path($uri)
-    {
-        if (!preg_match('|^webdav://([^@]+)@(.*)$|', $uri, $matches)) {
-            throw new Exception("Internal storage error. Unexpected data format.", file_storage::ERROR);
-        }
-
-        $user = rawurldecode($matches[1]);
-        $base = preg_replace('|^[a-zA-Z]+://|', '', $this->config['baseuri']);
-        $uri  = $matches[2];
-
-        if ($user != $this->config['username'] || strpos($uri, $base) !== 0) {
-            throw new Exception("Internal storage error. Unresolvable URI.", file_storage::ERROR);
-        }
-
-        $uri = substr($matches[2], strlen($base) + 1);
-
-        return file_utils::decode_path($uri);
-    }
-
-    /**
-     * Gets the relative URL of a resource
-     *
-     * @param string $url WebDAV URL
-     * @return string Path relative to root (title/.)
-     */
-    protected function get_relative_url($url)
-    {
-        $url = $this->client->getAbsoluteUrl($url);
-
-        return trim(str_replace($this->config['baseuri'], '', $url), '/');
-    }
-
-    /**
-     * Gets the full URL of a resource
-     *
-     * @param string $url WebDAV URL
-     * @return string Path relative to chwala root
-     */
-    protected function get_full_url($url)
-    {
-        if (!empty($this->title)) {
-            return $this->title . '/' . $this->get_relative_url($url);
-        }
-
-        return $this->get_relative_url($url);
-    }
-
-    /**
-     * Encode folder/file names in the path
-     * so it can be used as URL
-     *
-     * @param string $path File/folder path
-     *
-     * @return string Encoded URL
-     */
-    protected function encode_path($path)
-    {
-        $path = explode('/', $path);
-        $path = array_map('rawurlencode', $path);
-
-        return implode('/', $path);
-    }
-
-    /**
-     * Decode folder/file URL path
-     *
-     * @param string $path File/folder path
-     *
-     * @return string Decoded path
-     */
-    protected function decode_path($path)
-    {
-        $path = explode('/', $path);
-        $path = array_map('rawurldecode', $path);
-
-        return implode('/', $path);
-    }
-
-    /**
-     * Recursive method to fetch folders tree
-     */
-    protected function folders_tree($params)
-    {
-        $folders = array();
-        $root    = '';
-
-        if (is_string($params['path']) && strlen($params['path'])) {
-            $root = trim($params['path'], '/');
-        }
-
-        try {
-            $props = array('{DAV:}resourcetype');
-            $items = $this->client->propfind($root, $props, '1,noroot');
-        }
-        catch (Exception $e) {
-            throw new Exception("User credentials not provided", file_storage::ERROR_NOAUTH);
-        }
-
-        foreach ($items as $file => $props) {
-            // Skip files
-            $is_dir = !empty($props['{DAV:}resourcetype']) && count($props['{DAV:}resourcetype']->getValue()) > 0;
-            if (!$is_dir) {
-                continue;
-            }
-
-            $path = $this->get_relative_url($file);
-            $path = $this->decode_path($path);
-
-            // 'noroot' not always works
-            if ($path === $root) {
-                continue;
-            }
-
-            $folders[] = $path;
-
-            $params['level'] -= 1;
-
-            // Many servers just do not support 'Depth: infinity' for security reasons
-            // E.g. SabreDAV has this optional and disabled by default
-
-            if ($params['level'] > 0) {
-                $params['path'] = $path;
-                $tree = $this->folders_tree($params);
-                if (!empty($tree)) {
-                    $folders = array_merge($folders, $tree);
-                }
-            }
-        }
-
-        return $folders;
-    }
-
-    /**
-     * Initializes file_locks object
-     */
-    protected function init_lock_db()
-    {
-        if (!$this->lock_db) {
-            $this->lock_db = new file_locks;
-        }
-    }
-}

iRony-0.4.3.tar.gz/lib/FileAPI/file_api_wopi.php Deleted

@@ -1,122 +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_wopi extends file_api
-{
-    public $output_type = file_api_core::OUTPUT_JSON;
-    public $path        = array();
-    public $args        = array();
-    public $method      = 'GET';
-
-
-    /**
-     * Session validation check and session start
-     */
-    protected function session_validate($new_session = false, $token = null)
-    {
-        if (empty($_GET['access_token'])) {
-            throw new Exception("Token missing", file_api_core::ERROR_UNAUTHORIZED);
-        }
-
-        return parent::session_validate($new_session = false, $_GET['access_token']);
-    }
-
-    /**
-     * Storage/System method handler
-     */
-    protected function request_handler($request)
-    {
-        // header("X-WOPI-HostEndpoint: " . $endpoint_desc);
-        // header("X-WOPI-MachineName: " .  $machine_name);
-        header("X-WOPI-ServerVersion: " . file_api_core::API_VERSION);
-
-        $request = $_GET['method']; // file_api uses strtolower(), we don't want that
-
-        // handle request
-        if ($request && preg_match('/^[a-z]+\/*[a-zA-Z0-9_\/-]*$/', $request)) {
-            $path    = explode('/', $request);
-            $request = array_shift($path);
-            $method  = $_SERVER['REQUEST_METHOD'];
-
-            if ($_method = rcube_utils::request_header('X-WOPI-Override')) {
-                $method = $_method;
-            }
-            else if ($method == 'POST' && !empty($_SERVER['HTTP_X_HTTP_METHOD'])) {
-                $method = $_SERVER['HTTP_X_HTTP_METHOD'];
-            }
-
-            $this->path   = $path;
-            $this->args   = $_GET;
-            $this->method = $method;
-
-            include_once __DIR__ . "/wopi/$request.php";
-
-            $class_name = "file_wopi_$request";
-            if (class_exists($class_name, false)) {
-                $handler = new $class_name($this);
-                return $handler->handle();
-            }
-        }
-
-        throw new Exception("Unknown method", file_api_core::ERROR_NOT_FOUND);
-    }
-
-    /**
-     * Send success response
-     *
-     * @param mixed $data Data
-     */
-    public function output_success($data)
-    {
-        $this->output_send($data);
-    }
-
-    /**
-     * Send error response
-     *
-     * @param mixed $response Response data
-     * @param int   $code     Error code
-     */
-    public function output_error($response, $code = null)
-    {
-        header(sprintf("HTTP/1.0 %d %s", $code ?: file_api_core::ERROR_CODE, $response));
-
-        $this->output_send();
-    }
-
-    /**
-     * Send response
-     *
-     * @param mixed $data Data
-     */
-    public function output_send($data = null)
-    {
-        // Remove NULL data according to WOPI spec.
-        if (is_array($data)) {
-            $data = array_filter($data, function($v) { return $v !== null; });
-        }
-
-        parent::output_send($data);
-    }
-}

iRony-0.4.3.tar.gz/lib/FileAPI/file_document.php Deleted

@@ -1,880 +0,0 @@
-<?php
-/**
- +--------------------------------------------------------------------------+
- | This file is part of the Kolab File API                                  |
- |                                                                          |
- | Copyright (C) 2012-2016, 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>                      |
- +--------------------------------------------------------------------------+
-*/
-
-/**
- * Document editing sessions handling
- */
-class file_document
-{
-    protected $api;
-    protected $rc;
-    protected $user;
-    protected $sessions_table    = 'chwala_sessions';
-    protected $invitations_table = 'chwala_invitations';
-    protected $icache            = array();
-    protected $file_meta_items   = array('type', 'name', 'size', 'modified');
-
-    const STATUS_INVITED        = 'invited';
-    const STATUS_REQUESTED      = 'requested';
-    const STATUS_ACCEPTED       = 'accepted';
-    const STATUS_DECLINED       = 'declined';
-    const STATUS_DECLINED_OWNER = 'declined-owner'; // same as 'declined' but done by the session owner
-    const STATUS_ACCEPTED_OWNER = 'accepted-owner'; // same as 'accepted' but done by the session owner
-
-    const DB_DATE_FORMAT = 'Y-m-d H:i:s';
-
-
-    /**
-     * Class constructor
-     *
-     * @param file_api $api Chwala API app instance
-     */
-    public function __construct($api)
-    {
-        $this->rc   = rcube::get_instance();
-        $this->api  = $api;
-        $this->user = $_SESSION['user'];
-
-        $db = $this->rc->get_dbh();
-        $this->sessions_table    = $db->table_name($this->sessions_table);
-        $this->invitations_table = $db->table_name($this->invitations_table);
-    }
-
-    /**
-     * Detect type of file_document class to use for specified session
-     *
-     * @param file_api $api        Chwala API app instance
-     * @param string   $session_id Document session ID
-     *
-     * @return file_document Document object
-     */
-    public static function get_handler($api, $session_id)
-    {
-        // we add "w-" prefix to wopi session identifiers,
-        // so we can distinguish it from manticore sessions
-        if (strpos($session_id, 'w-') === 0) {
-            return new file_wopi($api);
-        }
-
-        return new file_manticore($api);
-    }
-
-    /**
-     * Return viewer URI for specified file/session. This creates
-     * a new collaborative editing session when needed.
-     *
-     * @param string $file        File path
-     * @param array  &$file_info  File metadata (e.g. type)
-     * @param string &$session_id Optional session ID to join to
-     * @param string $readonly    Create readonly (one-time) session
-     *
-     * @return string An URI for specified file/session
-     * @throws Exception
-     */
-    public function session_start($file, &$file_info, &$session_id = null, $readonly = false)
-    {
-        if ($file !== null) {
-            $uri = $this->path2uri($file, $driver);
-        }
-
-        $backend = $this->api->get_backend();
-
-        if ($session_id) {
-            $session = $this->session_info($session_id);
-
-            if (empty($session)) {
-                throw new Exception("Document session not found.", file_api_core::ERROR_CODE);
-            }
-
-            // check session ownership
-            if ($session['owner'] != $this->user) {
-                // check if the user was invited
-                $invitations = $this->invitations_find(array('session_id' => $session_id, 'user' => $this->user));
-                $states      = array(self::STATUS_INVITED, self::STATUS_ACCEPTED, self::STATUS_ACCEPTED_OWNER);
-
-                if (empty($invitations) || !in_array($invitations[0]['status'], $states)) {
-                    throw new Exception("No permission to join the editing session.", file_api_core::ERROR_CODE);
-                }
-
-                // automatically accept the invitation, if not done yet
-                if ($invitations[0]['status'] == self::STATUS_INVITED) {
-                    $this->invitation_update($session_id, $this->user, self::STATUS_ACCEPTED);
-                }
-            }
-
-            $file_info['type'] = $session['type'];
-        }
-        else if (!empty($uri)) {
-            // To prevent from creating new sessions for the same file+user
-            // (e.g. when user uses F5 to refresh the page), we check first
-            // if such a session exist and continue with it
-            $db = $this->rc->get_dbh();
-
-            $res = $db->query("SELECT `id` FROM `{$this->sessions_table}`"
-                . " WHERE `owner` = ? AND `uri` = ? AND `readonly` = ?",
-                $this->user, $uri, intval($readonly));
-
-            if ($row = $db->fetch_assoc($res)) {
-                $session_id = $row['id'];
-                $res = true;
-            }
-            else if (!$db->is_error($res)) {
-                $session_id = rcube_utils::bin2ascii(md5(time() . $uri, true));
-                $owner      = $this->user;
-                $data       = array('origin' => $this->get_origin());
-
-                // store some file data, they will be used
-                // by invited users that has no access to the storage
-                foreach ($this->file_meta_items as $item) {
-                    if (isset($file_info[$item])) {
-                        $data[$item] = $file_info[$item];
-                    }
-                }
-
-                // bind the session ID with editor type (see file_document::get_handler())
-                if ($this instanceof file_wopi) {
-                    $session_id = 'w-' . $session_id;
-                }
-
-                // we'll store user credentials if the file comes from
-                // an external source that requires authentication
-                if ($backend != $driver) {
-                    $auth = $driver->auth_info();
-                    $auth['password']  = $this->rc->encrypt($auth['password']);
-                    $data['auth_info'] = $auth;
-                }
-
-                $res = $this->session_create($session_id, $uri, $owner, $data, $readonly);
-            }
-
-            if (!$res) {
-                throw new Exception("Failed creating document editing session", file_api_core::ERROR_CODE);
-            }
-        }
-        else {
-            throw new Exception("Failed creating document editing session (unknown file)", file_api_core::ERROR_CODE);
-        }
-
-        // Implementations should return real URI
-        return '';
-    }
-
-    /**
-     * Get file path (not URI) from session.
-     *
-     * @param string $id        Session ID
-     * @param bool   $join_mode Throw exception only if session does not exist
-     *
-     * @return array File info (file, type, size)
-     * @throws Exception
-     */
-    public function session_file($id, $join_mode = false)
-    {
-        $session = $this->session_info($id);
-
-        if (empty($session)) {
-            throw new Exception("Document session not found.", file_api_core::ERROR_CODE);
-        }
-
-        $path = $this->uri2path($session['uri']);
-
-        if (empty($path) && (!$join_mode || $session['owner'] == $this->user)) {
-            throw new Exception("Document session not found.", file_api_core::ERROR_CODE);
-        }
-
-        // check permissions to the session
-        if ($session['owner'] != $this->user) {
-            $invitations = $this->invitations_find(array('session_id' => $id, 'user' => $this->user));
-            $states      = array(self::STATUS_INVITED, self::STATUS_ACCEPTED, self::STATUS_ACCEPTED_OWNER);
-
-            if (empty($invitations) || !in_array($invitations[0]['status'], $states)) {
-                throw new Exception("No permission to join the editing session.", file_api_core::ERROR_CODE);
-            }
-        }
-
-        $result = array('file' => $path);
-
-        foreach ($this->file_meta_items as $item) {
-            if (isset($session[$item])) {
-                $result[$item] = $session[$item];
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Get editing session info
-     *
-     * @param string $id               Session identifier
-     * @param bool   $with_invitations Return invitations list
-     *
-     * @return array Session data
-     */
-    public function session_info($id, $with_invitations = false)
-    {
-        $session = $this->icache["session:$id"];
-
-        if (!$session) {
-            $db     = $this->rc->get_dbh();
-            $result = $db->query("SELECT * FROM `{$this->sessions_table}`"
-                . " WHERE `id` = ?", $id);
-
-            if ($row = $db->fetch_assoc($result)) {
-                $session = $this->session_info_parse($row);
-
-                $this->icache["session:$id"] = $session;
-            }
-        }
-
-        if ($session) {
-            if ($session['owner'] == $this->user) {
-                $session['is_owner'] = true;
-            }
-
-            if ($with_invitations && $session['is_owner']) {
-                $session['invitations'] = $this->invitations_find(array('session_id' => $id));
-            }
-        }
-
-        return $session;
-    }
-
-    /**
-     * Find editing sessions for specified path
-     */
-    public function session_find($path, $invitations = true)
-    {
-        // create an URI for specified path
-        $uri = trim($this->path2uri($path), '/') . '/';
-
-        // get existing sessions
-        $sessions = array();
-        $filter   = array('file', 'owner', 'owner_name', 'is_owner');
-        $db       = $this->rc->get_dbh();
-        $result   = $db->query("SELECT * FROM `{$this->sessions_table}`"
-            . " WHERE `readonly` = 0 AND `uri` LIKE '" . $db->escape($uri) . "%'");
-
-        while ($row = $db->fetch_assoc($result)) {
-            if ($path = $this->uri2path($row['uri'])) {
-                $sessions[$row['id']] = $this->session_info_parse($row, $path, $filter);
-            }
-        }
-
-        // set 'is_invited' flag
-        if ($invitations && !empty($sessions)) {
-            $invitations = $this->invitations_find(array('user' => $this->user));
-            $states      = array(self::STATUS_INVITED, self::STATUS_ACCEPTED, self::STATUS_ACCEPTED_OWNER);
-
-            foreach ($invitations as $invitation) {
-                if (!empty($sessions[$invitation['session_id']]) && in_array($invitation['status'], $states)) {
-                    $sessions[$invitation['session_id']]['is_invited'] = true;
-                }
-            }
-        }
-
-        return $sessions;
-    }
-
-    /**
-     * Delete editing session (only owner can do that)
-     *
-     * @param string $id Session identifier
-     */
-    public function session_delete($id)
-    {
-        $db     = $this->rc->get_dbh();
-        $result = $db->query("DELETE FROM `{$this->sessions_table}`"
-            . " WHERE `id` = ? AND `owner` = ?",
-            $id, $this->user);
-
-        return $db->affected_rows($result) > 0;
-    }
-
-    /**
-     * Update editing session
-     *
-     * @param string $id   Session ID
-     * @param array  $data Session metadata
-     */
-    public function session_update($id, $data)
-    {
-       $db     = $this->rc->get_dbh();
-       $result = $db->query("SELECT `data` FROM `{$this->sessions_table}`"
-           . " WHERE `id` = ?", $id);
-
-       if ($row = $db->fetch_assoc($result)) {
-            // merge only relevant information
-            $data = array_intersect_key($data, array_flip($this->file_meta_items));
-            if (empty($data)) {
-                return true;
-            }
-
-            $sess_data = json_decode($row['data'], true);
-            $sess_data = array_merge($sess_data, $data);
-
-            $result = $db->query("UPDATE `{$this->sessions_table}`"
-                . " SET `data` = ? WHERE `id` = ?",
-                json_encode($sess_data), $id);
-
-            return $db->affected_rows($result) > 0;
-        }
-
-        return false;
-    }
-
-    /**
-     * Create editing session
-     */
-    protected function session_create($id, $uri, $owner, $data, $readonly = false)
-    {
-        // get user name
-        $owner_name = $this->api->resolve_user($owner) ?: '';
-
-        $db     = $this->rc->get_dbh();
-        $result = $db->query("INSERT INTO `{$this->sessions_table}`"
-            . " (`id`, `uri`, `owner`, `owner_name`, `data`, `readonly`)"
-            . " VALUES (?, ?, ?, ?, ?, ?)",
-            $id, $uri, $owner, $owner_name, json_encode($data), intval($readonly));
-
-        return $db->affected_rows($result) > 0;
-    }
-
-    /**
-     * Find sessions, including:
-     *   1. to which the user has access (is a creator or has been invited)
-     *   2. to which the user is considered eligible to request authorization
-     *     to participate in the session by already having access to the file
-     * Note: Readonly sessions are ignored here.
-     *
-     * @param array $param List parameters
-     *
-     * @return array Sessions list
-     */
-    public function sessions_list($param = array())
-    {
-        $db       = $this->rc->get_dbh();
-        $sessions = array();
-
-        // 1. Get sessions user has access to
-        $result = $db->query("SELECT * FROM `{$this->sessions_table}` s"
-            . " WHERE s.`readonly` = 0 AND (s.`owner` = ? OR s.`id` IN ("
-                . "SELECT i.`session_id` FROM `{$this->invitations_table}` i"
-                . " WHERE i.`user` = ?"
-            . "))",
-            $this->user, $this->user);
-
-        if ($db->is_error($result)) {
-            throw new Exception("Internal error.", file_api_core::ERROR_CODE);
-        }
-
-        while ($row = $db->fetch_assoc($result)) {
-            if ($path = $this->uri2path($row['uri'], true)) {
-                $sessions[$row['id']] = $this->session_info_parse($row, $path);
-            }
-        }
-
-        // 2. Get sessions user is eligible
-        // - get list of all folder URIs and find sessions for files in these locations
-        // @FIXME: in corner cases (user has many folders) this may produce a big query,
-        // maybe fetching all sessions and then comparing with list of locations would be faster?
-        $uris = $this->all_folder_locations();
-
-        if (!empty($uris)) {
-            $where = array_map(function($uri) use ($db) {
-                    return 's.`uri` LIKE ' . $db->quote(str_replace('%', '_', $uri) . '/%');
-                }, $uris);
-
-            $result = $db->query("SELECT * FROM `{$this->sessions_table}` s"
-                . " WHERE s.`readonly` = 0 AND (" . join(' OR ', $where) . ")");
-
-            if ($db->is_error($result)) {
-                throw new Exception("Internal error.", file_api_core::ERROR_CODE);
-            }
-
-            while ($row = $db->fetch_assoc($result)) {
-                if (empty($sessions[$row['id']])) {
-                    // remove filename (and anything after it) so we have the folder URI
-                    // to check if it's on the folders list we have
-                    $uri = substr($row['uri'], 0, strrpos($row['uri'], '/'));
-                    if (in_array($uri, $uris) && ($path = $this->uri2path($row['uri'], true))) {
-                        $sessions[$row['id']] = $this->session_info_parse($row, $path);
-                    }
-                }
-            }
-        }
-
-        // set 'is_invited' flag
-        if (!empty($sessions)) {
-            $invitations = $this->invitations_find(array('user' => $this->user));
-            $states      = array(self::STATUS_INVITED, self::STATUS_ACCEPTED, self::STATUS_ACCEPTED_OWNER);
-
-            foreach ($invitations as $invitation) {
-                if (!empty($sessions[$invitation['session_id']]) && in_array($invitation['status'], $states)) {
-                    $sessions[$invitation['session_id']]['is_invited'] = true;
-                }
-            }
-        }
-
-        // Sorting
-        $sort  = !empty($params['sort']) ? $params['sort'] : 'name';
-        $index = array();
-
-        if (in_array($sort, array('name', 'file', 'owner'))) {
-            foreach ($sessions as $key => $val) {
-                if ($sort == 'name' || $sort == 'file') {
-                    $path        = explode(file_storage::SEPARATOR, $val['file']);
-                    $index[$key] = $path[count($path) - 1];
-                    continue;
-                }
-
-                $index[$key] = $val[$sort];
-            }
-            array_multisort($index, SORT_ASC, SORT_LOCALE_STRING, $sessions);
-        }
-
-        if ($params['reverse']) {
-            $sessions = array_reverse($sessions, true);
-        }
-
-        return $sessions;
-    }
-
-    /**
-     * Retern extra editor parameters to post the the viewer iframe
-     *
-     * @param array $info File info
-     *
-     * @return array POST parameters
-     */
-    public function editor_post_params($info)
-    {
-        return array();
-    }
-
-    /**
-     * Find invitations for current user. This will return all
-     * invitations related to the user including his sessions.
-     *
-     * @param array $filter Search filter (see self::invitations_find())
-     *
-     * @return array Invitations list
-     */
-    public function invitations_list($filter = array())
-    {
-        $filter['user'] = $this->user;
-
-        // list of invitations to the user or requested by him
-        $result = $this->invitations_find($filter, true);
-
-        unset($filter['user']);
-        $filter['owner'] = $this->user;
-
-        // other invitations that belong to the sessions owned by the user
-        if ($other = $this->invitations_find($filter, true)) {
-            $result = array_merge($result, $other);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Find invitations for specified filter
-     *
-     * @param array $filter Search filter (see self::invitations_find())
-     *                      - session_id: session identifier
-     *                      - timestamp: "changed > ?" filter
-     *                      - user: Invitation user identifier
-     *                      - owner: Session owner identifier
-     * @param bool $extended Return session file names
-     *
-     * @return array Invitations list
-     */
-    public function invitations_find($filter, $extended = false)
-    {
-        $db     = $this->rc->get_dbh();
-        $query  = '';
-        $select = "i.*";
-
-        foreach ($filter as $column => $value) {
-            if ($column == 'timestamp') {
-                $where[] = "i.`changed` > " . $db->quote($this->db_datetime($value));
-            }
-            else if ($column == 'owner') {
-                $join[] = "`{$this->sessions_table}` s ON (i.`session_id` = s.`id`)";
-                $where[] = "s.`owner` = " . $db->quote($value);
-            }
-            else {
-                $where[] = "i.`$column` = " . $db->quote($value);
-            }
-        }
-
-        if ($extended) {
-            $select .= ", s.`uri`, s.`owner`, s.`owner_name`";
-            $join[]  = "`{$this->sessions_table}` s ON (i.`session_id` = s.`id`)";
-        }
-
-        if (!empty($join)) {
-            $query .= ' JOIN ' . implode(' JOIN ', array_unique($join));
-        }
-
-        if (!empty($where)) {
-            $query .= ' WHERE ' . implode(' AND ', array_unique($where));
-        }
-
-        $result = $db->query("SELECT $select FROM `{$this->invitations_table}` i"
-            . "$query ORDER BY i.`changed`");
-
-        if ($db->is_error($result)) {
-            throw new Exception("Internal error.", file_api_core::ERROR_CODE);
-        }
-
-        $invitations = array();
-
-        while ($row = $db->fetch_assoc($result)) {
-            if ($extended) {
-                try {
-                    // add unix-timestamp of the `changed` date to the result
-                    $dt = new DateTime($row['changed']);
-                    $row['timestamp'] = $dt->format('U');
-                }
-                catch(Exception $e) { }
-
-                // add filename to the result
-                $filename = parse_url($row['uri'], PHP_URL_PATH);
-                $filename = pathinfo($filename, PATHINFO_BASENAME);
-                $filename = rawurldecode($filename);
-
-                $row['filename'] = $filename;
-
-                if ($path = $this->uri2path($row['uri'])) {
-                    $row['file'] = $path;
-                }
-
-                unset($row['uri']);
-            }
-
-            $invitations[] = $row;
-        }
-
-        return $invitations;
-    }
-
-    /**
-     * Create an invitation
-     *
-     * @param string $session_id Document session identifier
-     * @param string $user       User identifier (use null for current user)
-     * @param string $status     Invitation status (invited, requested)
-     * @param string $comment    Invitation description/comment
-     * @param string &$user_name Optional user name
-     *
-     * @throws Exception
-     */
-    public function invitation_create($session_id, $user, $status = 'invited', $comment = '', &$user_name = '')
-    {
-        if (empty($user)) {
-            $user = $this->user;
-        }
-
-        if ($status != self::STATUS_INVITED && $status != self::STATUS_REQUESTED) {
-            throw new Exception("Invalid invitation status.", file_api_core::ERROR_CODE);
-        }
-
-        // get session information
-        $session = $this->session_info($session_id);
-
-        if (empty($session)) {
-            throw new Exception("Document session not found.", file_api_core::ERROR_CODE);
-        }
-
-        // check session ownership, only owner can create 'new' invitations
-        if ($status == self::STATUS_INVITED && $session['owner'] != $this->user) {
-            throw new Exception("No permission to create an invitation.", file_api_core::ERROR_CODE);
-        }
-
-        if ($session['owner'] == $user) {
-            throw new Exception("Not possible to create an invitation for the session creator.", file_api_core::ERROR_CODE);
-        }
-
-        // get user name
-        if (empty($user_name)) {
-            $user_name = $this->api->resolve_user($user) ?: '';
-        }
-
-        // insert invitation
-        $db     = $this->rc->get_dbh();
-        $result = $db->query("INSERT INTO `{$this->invitations_table}`"
-            . " (`session_id`, `user`, `user_name`, `status`, `comment`, `changed`)"
-            . " VALUES (?, ?, ?, ?, ?, ?)",
-            $session_id, $user, $user_name, $status, $comment ?: '', $this->db_datetime());
-
-        if (!$db->affected_rows($result)) {
-            throw new Exception("Failed to create an invitation.", file_api_core::ERROR_CODE);
-        }
-    }
-
-    /**
-     * Delete an invitation (only session owner can do that)
-     *
-     * @param string $session_id Session identifier
-     * @param string $user       User identifier
-     * @param bool   $local      Remove invitation only from local database
-     *
-     * @throws Exception
-     */
-    public function invitation_delete($session_id, $user, $local = false)
-    {
-        $db     = $this->rc->get_dbh();
-        $result = $db->query("DELETE FROM `{$this->invitations_table}`"
-            . " WHERE `session_id` = ? AND `user` = ?"
-                . " AND EXISTS (SELECT 1 FROM `{$this->sessions_table}` WHERE `id` = ? AND `owner` = ?)",
-            $session_id, $user, $session_id, $this->user);
-
-        if (!$db->affected_rows($result)) {
-            throw new Exception("Failed to delete an invitation.", file_api_core::ERROR_CODE);
-        }
-    }
-
-    /**
-     * Update an invitation status
-     *
-     * @param string $session_id Session identifier
-     * @param string $user       User identifier (use null for current user)
-     * @param string $status     Invitation status (accepted, declined)
-     * @param string $comment    Invitation description/comment
-     *
-     * @throws Exception
-     */
-    public function invitation_update($session_id, $user, $status, $comment = '')
-    {
-        if (empty($user)) {
-            $user = $this->user;
-        }
-
-        if ($status != self::STATUS_ACCEPTED && $status != self::STATUS_DECLINED) {
-            throw new Exception("Invalid invitation status.", file_api_core::ERROR_CODE);
-        }
-
-        // get session information
-        $session = $this->session_info($session_id);
-
-        if (empty($session)) {
-            throw new Exception("Document session not found.", file_api_core::ERROR_CODE);
-        }
-
-        // check session ownership
-        if ($user != $this->user && $session['owner'] != $this->user) {
-            throw new Exception("No permission to update an invitation.", file_api_core::ERROR_CODE);
-        }
-
-        if ($session['owner'] == $this->user) {
-            $status = $status . '-owner';
-        }
-
-        $db     = $this->rc->get_dbh();
-        $result = $db->query("UPDATE `{$this->invitations_table}`"
-            . " SET `status` = ?, `comment` = ?, `changed` = ?"
-            . " WHERE `session_id` = ? AND `user` = ?",
-            $status, $comment ?: '', $this->db_datetime(), $session_id, $user);
-
-        if (!$db->affected_rows($result)) {
-            throw new Exception("Failed to update an invitation status.", file_api_core::ERROR_CODE);
-        }
-    }
-
-    /**
-     * Update a session URI (e.g. on file/folder move)
-     *
-     * @param string $from      Source file/folder path
-     * @param string $to        Destination file/folder path
-     * @param bool   $is_folder True if the path is a folder
-     */
-    public function session_uri_update($from, $to, $is_folder = false)
-    {
-        $db = $this->rc->get_dbh();
-
-        // Resolve paths
-        $from = $this->path2uri($from);
-        $to   = $this->path2uri($to);
-
-        if ($is_folder) {
-            $set = "`uri` = REPLACE(`uri`, " . $db->quote($from . '/') . ", " . $db->quote($to .'/') . ")";
-            $where = "`uri` LIKE " . $db->quote(str_replace('%', '_', $from) . '/%');
-        }
-        else {
-            $set = "`uri` = " . $db->quote($to);
-            $where = "`uri` = " . $db->quote($from);
-        }
-
-        $db->query("UPDATE `{$this->sessions_table}` SET $set WHERE $where");
-    }
-
-    /**
-     * Parse session info data
-     */
-    protected function session_info_parse($record, $path = null, $filter = array())
-    {
-        $session = array();
-        $fields  = array('id', 'uri', 'owner', 'owner_name', 'readonly');
-
-        foreach ($fields as $field) {
-            if (isset($record[$field])) {
-                $session[$field] = $record[$field];
-            }
-        }
-
-        if ($path) {
-            $session['file'] = $path;
-        }
-
-        if (!empty($record['data'])) {
-            $data   = json_decode($record['data'], true);
-            $fields = array_merge($this->file_meta_items, array('origin'));
-
-            foreach ($fields as $field) {
-                if (empty($filter) || in_array($field, $filter)) {
-                    $session[$field] = $data[$field];
-                }
-            }
-        }
-
-        // @TODO: is_invited?, last_modified?
-
-        if ($session['owner'] == $this->user) {
-            $session['is_owner'] = true;
-        }
-
-        if (!empty($filter)) {
-            $session = array_intersect_key($session, array_flip($filter));
-        }
-
-        return $session;
-    }
-
-    /**
-     * Get file URI from path
-     */
-    protected function path2uri($path, &$driver = null)
-    {
-        list($driver, $path) = $this->api->get_driver($path);
-
-        return $driver->path2uri($path);
-    }
-
-    /**
-     * Get file path from the URI
-     */
-    protected function uri2path($uri, $use_fallback = false)
-    {
-        $backend = $this->api->get_backend();
-
-        try {
-            return $backend->uri2path($uri);
-        }
-        catch (Exception $e) {
-                // do nothing
-        }
-
-        foreach ($this->api->get_drivers(true) as $driver) {
-            try {
-                $path  = $driver->uri2path($uri);
-                $title = $driver->title();
-
-                if ($title) {
-                    $path = $title . file_storage::SEPARATOR . $path;
-                }
-
-                return $path;
-            }
-            catch (Exception $e) {
-                // do nothing
-            }
-        }
-
-        // likely user has no access to the file, but has been invited,
-        // extract filename from the URI
-        if ($use_fallback && $uri) {
-            $path = parse_url($uri, PHP_URL_PATH);
-            $path = explode('/', $path);
-            $path = $path[count($path) - 1];
-
-            return $path;
-        }
-    }
-
-    /**
-     * Get URI of all user folders (with shared locations)
-     */
-    protected function all_folder_locations()
-    {
-        $locations = array();
-
-        foreach (array_merge(array($this->api->get_backend()), $this->api->get_drivers(true)) as $driver) {
-            // Performance optimization: We're interested here in shared folders,
-            // Kolab is the only driver that currently supports them, ignore others
-            if (get_class($driver) != 'kolab_file_storage') {
-                continue;
-            }
-
-            try {
-                foreach ($driver->folder_list() as $folder) {
-                    if ($uri = $driver->path2uri($folder)) {
-                        $locations[] = $uri;
-                    }
-                }
-            }
-            catch (Exception $e) {
-               // do nothing
-            }
-        }
-
-        return $locations;
-    }
-
-    /**
-     * Get request origin, use Referer header if specified
-     */
-    protected function get_origin()
-    {
-        if (!empty($_SERVER['HTTP_REFERER'])) {
-            $url = parse_url($_SERVER['HTTP_REFERER']);
-
-            return $url['scheme'] . '://' . $url['host'] . ($url['port'] ?: '');
-        }
-
-        return (rcube_utils::https_check() ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
-    }
-
-    /**
-     * Return datetime in UTC timezone in SQL format
-     */
-    protected function db_datetime($dt = null)
-    {
-        $timezone = new DateTimeZone('UTC');
-        $datetime = new DateTime($dt ? '@'.$dt : 'now', $timezone);
-
-        return $datetime->format(self::DB_DATE_FORMAT);
-    }
-}

iRony-0.4.3.tar.gz/lib/FileAPI/file_manticore.php Deleted

@@ -1,238 +0,0 @@
-<?php
-/**
- +--------------------------------------------------------------------------+
- | This file is part of the Kolab File API                                  |
- |                                                                          |
- | Copyright (C) 2012-2016, 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>                      |
- +--------------------------------------------------------------------------+
-*/
-
-/**
- * Document editing sessions handling (Manticore)
- */
-class file_manticore extends file_document
-{
-    protected $request;
-
-
-    /**
-     * Return viewer URI for specified file/session. This creates
-     * a new collaborative editing session when needed.
-     *
-     * @param string $file        File path
-     * @param array  &$file_info  File metadata (e.g. type)
-     * @param string &$session_id Optional session ID to join to
-     * @param string $readonly    Create readonly (one-time) session
-     *
-     * @return string Manticore URI
-     * @throws Exception
-     */
-    public function session_start($file, &$file_info, &$session_id = null, $readonly = false)
-    {
-        parent::session_start($file, $file_info, $session_id, $readonly);
-
-        // authenticate to Manticore, we need auth token for frame_uri
-        if (empty($_SESSION['manticore_token'])) {
-            $this->get_request();
-        }
-
-        // @TODO: make sure the session exists in Manticore?
-
-        return $this->frame_uri($session_id);
-    }
-
-    /**
-     * Delete editing session (only owner can do that)
-     *
-     * @param string $id    Session identifier
-     * @param bool   $local Remove session only from local database
-     */
-    public function session_delete($id, $local = false)
-    {
-        $success = parent::session_delete($id, $local);
-
-        // Send document delete to Manticore
-        if ($success && !$local) {
-            $req = $this->get_request();
-            $res = $req->document_delete($id);
-        }
-
-        return $success;
-    }
-
-    /**
-     * Create editing session
-     */
-    protected function session_create($id, $uri, $owner, $data, $readonly = false)
-    {
-        $success = parent::session_create($id, $uri, $owner, $data, $readonly);
-
-        // create the session in Manticore
-        if ($success) {
-            $req = $this->get_request();
-            $res = $req->document_create(array(
-                'id'     => $id,
-                'title'  => '', // @TODO: maybe set to a file path without extension?
-                'access' => array(
-                    array(
-                        'identity'   => $owner,
-                        'permission' => file_manticore_api::ACCESS_WRITE,
-                    ),
-                ),
-            ));
-
-            if (!$res) {
-                $this->session_delete($id, true);
-                return false;
-            }
-        }
-
-        return $success;
-    }
-
-    /**
-     * Create an invitation
-     *
-     * @param string $session_id Document session identifier
-     * @param string $user       User identifier (use null for current user)
-     * @param string $status     Invitation status (invited, requested)
-     * @param string $comment    Invitation description/comment
-     * @param string &$user_name Optional user name
-     *
-     * @throws Exception
-     */
-    public function invitation_create($session_id, $user, $status = 'invited', $comment = '', &$user_name = '')
-    {
-        parent::invitation_create($session_id, $user, $status, $comment, $user_name);
-
-        // Update Manticore 'access' array
-        if ($status == file_document::STATUS_INVITED) {
-            $req = $this->get_request();
-            $res = $req->editor_add($session_id, $user, file_manticore_api::ACCESS_WRITE);
-
-            if (!$res) {
-                $this->invitation_delete($session_id, $user, true);
-                throw new Exception("Failed to create an invitation.", file_api_core::ERROR_CODE);
-            }
-        }
-    }
-
-    /**
-     * Delete an invitation (only session owner can do that)
-     *
-     * @param string $session_id Session identifier
-     * @param string $user       User identifier
-     * @param bool   $local      Remove invitation only from local database
-     *
-     * @throws Exception
-     */
-    public function invitation_delete($session_id, $user, $local = false)
-    {
-        parent::invitation_delete($session_id, $user, $local);
-
-        // Update Manticore 'access' array
-        if (!$local) {
-            $req = $this->get_request();
-            $res = $req->editor_delete($session_id, $user);
-
-            if (!$res) {
-                throw new Exception("Failed to remove an invitation.", file_api_core::ERROR_CODE);
-            }
-        }
-    }
-
-    /**
-     * Update an invitation status
-     *
-     * @param string $session_id Session identifier
-     * @param string $user       User identifier (use null for current user)
-     * @param string $status     Invitation status (accepted, declined)
-     * @param string $comment    Invitation description/comment
-     *
-     * @throws Exception
-     */
-    public function invitation_update($session_id, $user, $status, $comment = '')
-    {
-        parent::invitation_update($session_id, $user, $status, $comment);
-
-        // Update Manticore 'access' array if an owner accepted an invitation request
-        if ($status == file_document::STATUS_ACCEPTED_OWNER) {
-            $req = $this->get_request();
-            $res = $req->editor_add($session_id, $user, file_manticore_api::ACCESS_WRITE);
-
-            if (!$res) {
-                throw new Exception("Failed to update an invitation status.", file_api_core::ERROR_CODE);
-            }
-        }
-    }
-
-    /**
-     * List supported mimetypes
-     *
-     * @param bool $editable Return only editable mimetypes
-     *
-     * @return array List of supported mimetypes
-     */
-    public function supported_filetypes($editable = false)
-    {
-        return array(
-            'application/vnd.oasis.opendocument.text',
-        );
-    }
-
-    /**
-     * Generate URI of Manticore editing session
-     */
-    protected function frame_uri($id)
-    {
-        $base_url = rtrim($this->rc->config->get('fileapi_manticore'), ' /');
-
-        return $base_url . '/document/' . $id . '/' . $_SESSION['manticore_token'];
-    }
-
-    /**
-     * Initialize Manticore API request handler
-     */
-    protected function get_request()
-    {
-        if (!$this->request) {
-            $uri = rcube_utils::resolve_url($this->rc->config->get('fileapi_manticore'));
-            $this->request = new file_manticore_api($uri);
-
-            // Use stored session token, check if it's still valid
-            if ($_SESSION['manticore_token']) {
-                $is_valid = $this->request->set_session_token($_SESSION['manticore_token'], true);
-
-                if ($is_valid) {
-                    return $this->request;
-                }
-            }
-
-            $backend = $this->api->get_backend();
-            $auth    = $backend->auth_info();
-
-            $_SESSION['manticore_token'] = $this->request->login($auth['username'], $auth['password']);
-
-            if (empty($_SESSION['manticore_token'])) {
-                throw new Exception("Unable to login to Manticore server.", file_api_core::ERROR_CODE);
-            }
-        }
-
-        return $this->request;
-    }
-}

iRony-0.4.3.tar.gz/lib/FileAPI/file_manticore_api.php Deleted

@@ -1,440 +0,0 @@
-<?php
-/**
- +--------------------------------------------------------------------------+
- | This file is part of the Kolab File API                                  |
- |                                                                          |
- | Copyright (C) 2011-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>                      |
- +--------------------------------------------------------------------------+
-*/
-
-/**
- * Helper class to connect to the Manticore API
- */
-class file_manticore_api
-{
-    /**
-     * @var HTTP_Request2
-     */
-    private $request;
-
-    /**
-     * @var string
-     */
-    private $base_url;
-
-    /**
-     * @var bool
-     */
-    private $debug = false;
-
-    const ERROR_INTERNAL   = 100;
-    const ERROR_CONNECTION = 500;
-
-    const ACCEPT_HEADER = "application/json,text/javascript,*/*";
-
-    const ACCESS_WRITE = 'write';
-    const ACCESS_READ  = 'read';
-    const ACCESS_DENY  = 'deny';
-
-
-    /**
-     * Class constructor.
-     *
-     * @param string $base_url Base URL of the Kolab API
-     */
-    public function __construct($base_url)
-    {
-        require_once 'HTTP/Request2.php';
-
-        $config         = rcube::get_instance()->config;
-        $this->debug    = rcube_utils::get_boolean($config->get('fileapi_manticore_debug'));
-        $this->base_url = rtrim($base_url, '/') . '/';
-        $this->request  = new HTTP_Request2();
-
-        self::configure($this->request);
-    }
-
-    /**
-     * Configure HTTP_Request2 object
-     *
-     * @param HTTP_Request2 $request Request object
-     */
-    public static function configure($request)
-    {
-        // Configure connection options
-        $config      = rcube::get_instance()->config;
-        $http_config = (array) $config->get('http_request', $config->get('kolab_http_request'));
-
-        // Deprecated config, all options are separated variables
-        if (empty($http_config)) {
-            $options = array(
-                'ssl_verify_peer',
-                'ssl_verify_host',
-                'ssl_cafile',
-                'ssl_capath',
-                'ssl_local_cert',
-                'ssl_passphrase',
-                'follow_redirects',
-            );
-
-            foreach ($options as $optname) {
-                if (($optvalue = $config->get($optname)) !== null
-                    || ($optvalue = $config->get('kolab_' . $optname)) !== null
-                ) {
-                    $http_config[$optname] = $optvalue;
-                }
-            }
-        }
-
-        if (!empty($http_config)) {
-            try {
-                $request->setConfig($http_config);
-            }
-            catch (Exception $e) {
-                rcube::log_error("HTTP: " . $e->getMessage());
-            }
-        }
-
-        // proxy User-Agent
-        $request->setHeader('user-agent', $_SERVER['HTTP_USER_AGENT']);
-
-        // some HTTP server configurations require this header
-        $request->setHeader('accept', self::ACCEPT_HEADER);
-
-        $request->setHeader('Content-Type', 'application/json; charset=UTF-8');
-    }
-
-    /**
-     * Return API's base URL
-     *
-     * @return string Base URL
-     */
-    public function base_url()
-    {
-        return $this->base_url;
-    }
-
-    /**
-     * Return HTTP_Request2 object
-     *
-     * @return HTTP_Request2 Request object
-     */
-    public function request()
-    {
-        return $this->request;
-    }
-
-    /**
-     * Logs specified user into the API
-     *
-     * @param string $username User name
-     * @param string $password User password
-     *
-     * @return string Session token (on success)
-     */
-    public function login($username, $password)
-    {
-        $query = array(
-            'email'    => $username,
-            'password' => $password,
-        );
-
-        // remove current token if any
-        $this->request->setHeader('Authorization');
-
-        // authenticate the user
-        $response = $this->post('auth/local', $query);
-
-        if ($token = $response->get('token')) {
-            $this->set_session_token($token);
-        }
-
-        return $token;
-    }
-
-    /**
-     * Sets request session token.
-     *
-     * @param string $token    Session token.
-     * @param bool   $validate Enables token validatity check
-     *
-     * @return bool Token validity status
-     */
-    public function set_session_token($token, $validate = false)
-    {
-        $this->request->setHeader('Authorization', "Bearer $token");
-
-        if ($validate) {
-            $result = $this->get('api/users/me');
-
-            return $result->get_error_code() == 200;
-        }
-
-        return true;
-    }
-
-    /**
-     * Delete document editing session
-     *
-     * @param array $id Session identifier
-     *
-     * @return bool True on success, False on failure
-     */
-    public function document_delete($id)
-    {
-        $res = $this->delete('api/documents/' . $id);
-
-        return $res->get_error_code() == 204;
-    }
-
-    /**
-     * Create document editing session
-     *
-     * @param array $params Session parameters
-     *
-     * @return bool True on success, False on failure
-     */
-    public function document_create($params)
-    {
-        $res = $this->post('api/documents', $params);
-
-        // @FIXME: 422?
-        return $res->get_error_code() == 201 || $res->get_error_code() == 422;
-    }
-
-    /**
-     * Add document editor (update 'access' array)
-     *
-     * @param array $session_id Session identifier
-     * @param array $identity   User identifier
-     *
-     * @return bool True on success, False on failure
-     */
-    public function editor_add($session_id, $identity, $permission)
-    {
-        $res = $this->get("api/documents/$session_id/access");
-
-        if ($res->get_error_code() != 200) {
-            return false;
-        }
-
-        $access = $res->get();
-
-        // sanity check, this should never be empty
-        if (empty($access)) {
-            return false;
-        }
-
-        // add editor to the 'access' array
-        foreach ($access as $entry) {
-            if ($entry['identity'] == $identity) {
-                return true;
-            }
-        }
-
-        $access[] = array('identity' => $identity, 'permission' => $permission);
-
-        $res = $this->put("api/documents/$session_id/access", $access);
-
-        return $res->get_error_code() == 200;
-    }
-
-    /**
-     * Remove document editor (update 'access' array)
-     *
-     * @param array $session_id Session identifier
-     * @param array $identity   User identifier
-     *
-     * @return bool True on success, False on failure
-     */
-    public function editor_delete($session_id, $identity)
-    {
-        $res = $this->get("api/documents/$session_id/access");
-
-        if ($res->get_error_code() != 200) {
-            return false;
-        }
-
-        $access = $res->get();
-        $found  = true;
-
-        // remove editor from the 'access' array
-        foreach ((array) $access as $idx => $entry) {
-            if ($entry['identity'] == $identity) {
-                unset($access[$idx]);
-            }
-        }
-
-        if (!$found) {
-            return false;
-        }
-
-        $res = $this->put("api/documents/$session_id/access", $access);
-
-        return $res->get_error_code() == 200;
-    }
-
-    /**
-     * API's GET request.
-     *
-     * @param string $action Action name
-     * @param array  $get    Request arguments
-     *
-     * @return file_ui_api_result Response
-     */
-    public function get($action, $get = array())
-    {
-        $url = $this->build_url($action, $get);
-
-        if ($this->debug) {
-            rcube::write_log('manticore', "GET: $url " . json_encode($get));
-        }
-
-        $this->request->setMethod(HTTP_Request2::METHOD_GET);
-        $this->request->setBody('');
-
-        return $this->get_response($url);
-    }
-
-    /**
-     * API's POST request.
-     *
-     * @param string $action Action name
-     * @param array  $post   POST arguments
-     *
-     * @return kolab_client_api_result Response
-     */
-    public function post($action, $post = array())
-    {
-        $url = $this->build_url($action);
-
-        if ($this->debug) {
-            rcube::write_log('manticore', "POST: $url " . json_encode($post));
-        }
-
-        $this->request->setMethod(HTTP_Request2::METHOD_POST);
-        $this->request->setBody(json_encode($post));
-
-        return $this->get_response($url);
-    }
-
-    /**
-     * API's PUT request.
-     *
-     * @param string $action Action name
-     * @param array  $post   POST arguments
-     *
-     * @return kolab_client_api_result Response
-     */
-    public function put($action, $post = array())
-    {
-        $url = $this->build_url($action);
-
-        if ($this->debug) {
-            rcube::write_log('manticore', "PUT: $url " . json_encode($post));
-        }
-
-        $this->request->setMethod(HTTP_Request2::METHOD_PUT);
-        $this->request->setBody(json_encode($post));
-
-        return $this->get_response($url);
-    }
-
-    /**
-     * API's DELETE request.
-     *
-     * @param string $action Action name
-     * @param array  $get    Request arguments
-     *
-     * @return file_ui_api_result Response
-     */
-    public function delete($action, $get = array())
-    {
-        $url = $this->build_url($action, $get);
-
-        if ($this->debug) {
-            rcube::write_log('manticore', "DELETE: $url " . json_encode($get));
-        }
-
-        $this->request->setMethod(HTTP_Request2::METHOD_DELETE);
-        $this->request->setBody('');
-
-        return $this->get_response($url);
-    }
-
-    /**
-     * @param string $action Action GET parameter
-     * @param array  $args   GET parameters (hash array: name => value)
-     *
-     * @return Net_URL2 URL object
-     */
-    private function build_url($action, $args = array())
-    {
-        $url = new Net_URL2($this->base_url . $action);
-
-        $url->setQueryVariables((array) $args);
-
-        return $url;
-    }
-
-    /**
-     * HTTP Response handler.
-     *
-     * @param Net_URL2 $url URL object
-     *
-     * @return kolab_client_api_result Response object
-     */
-    private function get_response($url)
-    {
-        try {
-            $this->request->setUrl($url);
-            $response = $this->request->send();
-        }
-        catch (Exception $e) {
-            return new file_ui_api_result(null,
-                self::ERROR_CONNECTION, $e->getMessage());
-        }
-
-        try {
-            $body = $response->getBody();
-        }
-        catch (Exception $e) {
-            return new file_ui_api_result(null,
-                self::ERROR_INTERNAL, $e->getMessage());
-        }
-
-        $code = $response->getStatus();
-
-        if ($this->debug) {
-            rcube::write_log('manticore', "Response [$code]: $body");
-        }
-
-        if ($code < 300) {
-            $result = $body ? json_decode($body, true) : array();
-        }
-        else {
-            if ($code != 401) {
-                rcube::raise_error("Error $code on $url", true, false);
-            }
-
-            $error = $body;
-        }
-
-        return new file_ui_api_result($result, $code, $error);
-    }
-}

iRony-0.4.3.tar.gz/lib/FileAPI/file_wopi.php Deleted

@@ -1,356 +0,0 @@
-<?php
-/**
- +--------------------------------------------------------------------------+
- | This file is part of the Kolab File API                                  |
- |                                                                          |
- | Copyright (C) 2012-2017, 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>                      |
- +--------------------------------------------------------------------------+
-*/
-
-/**
- * Document editing sessions handling (WOPI)
- */
-class file_wopi extends file_document
-{
-    protected $cache;
-
-    // Mimetypes supported by CODE, but not advertised by all possible names
-    protected $mimetype_aliases = array(
-        'application/vnd.corel-draw' => 'image/x-coreldraw',
-    );
-
-    // Mimetypes supported by other Chwala viewers or ones we don't want to be editable
-    protected $mimetype_exceptions = array(
-        'text/plain',
-        'image/bmp',
-        'image/png',
-        'image/jpeg',
-        'image/jpg',
-        'image/pjpeg',
-        'image/gif',
-        'image/tiff',
-        'image/x-tiff',
-    );
-
-    /**
-     * Return viewer URI for specified file/session. This creates
-     * a new collaborative editing session when needed.
-     *
-     * @param string $file        File path
-     * @param array  &$file_info  File metadata (e.g. type)
-     * @param string &$session_id Optional session ID to join to
-     * @param string $readonly    Create readonly (one-time) session
-     *
-     * @return string WOPI URI for specified document
-     * @throws Exception
-     */
-    public function session_start($file, &$file_info, &$session_id = null, $readonly = false)
-    {
-        parent::session_start($file, $file_info, $session_id, $readonly);
-
-        if ($session_id) {
-            // Create Chwala session for use as WOPI access_token
-            // This session will have access to this one document session only
-            $keys = array('env', 'user_id', 'user', 'username', 'password',
-                'storage_host', 'storage_port', 'storage_ssl');
-
-            $data = array_intersect_key($_SESSION, array_flip($keys));
-            $data['document_session'] = $session_id;
-
-            $this->token = $this->api->session->create($data);
-
-            $this->log_login($session_id);
-        }
-
-        return $this->frame_uri($session_id, $file_info['type']);
-    }
-
-    /**
-     * Generate URI of WOPI editing session (WOPIsrc)
-     */
-    protected function frame_uri($id, $mimetype)
-    {
-        $capabilities = $this->capabilities();
-
-        if (empty($capabilities) || empty($mimetype)) {
-            return;
-        }
-
-        $metadata = $capabilities[strtolower($mimetype)];
-
-        if (empty($metadata)) {
-            return;
-        }
-
-        $office_url  = rtrim($metadata['urlsrc'], ' /?'); // collabora
-        $service_url = $this->api->api_url() . '/wopi/files/' . $id;
-
-        // @TODO: Parsing and replacing placeholder values
-        // https://wopi.readthedocs.io/en/latest/discovery.html#action-urls
-
-        $args = array('WOPISrc' => $service_url);
-
-        // We could also set: title, closebutton, revisionhistory
-        // @TODO: do it in editor_post_params() when supported by the editor
-        if ($lang = $this->api->env['language']) {
-            $args['lang'] = str_replace('_', '-', $lang);
-        }
-
-        return $office_url . '?' . http_build_query($args, '', '&');
-    }
-
-    /**
-     * Retern extra viewer parameters to post to the viewer iframe
-     *
-     * @param array $info File info
-     *
-     * @return array POST parameters
-     */
-    public function editor_post_params($info)
-    {
-        // Access token TTL (number of milliseconds since January 1, 1970 UTC)
-        if ($ttl = $this->rc->config->get('session_lifetime', 0) * 60) {
-            $now = new DateTime('now', new DateTimeZone('UTC'));
-            $ttl = ($ttl + $now->format('U')) . '000';
-        }
-
-        $params = array(
-            'access_token'     => $this->token,
-            'access_token_ttl' => $ttl ?: 0,
-        );
-
-        return $params;
-    }
-
-    /**
-     * List supported mimetypes
-     *
-     * @param bool $editable Return only editable mimetypes
-     *
-     * @return array List of supported mimetypes
-     */
-    public function supported_filetypes($editable = false)
-    {
-        $caps = $this->capabilities();
-
-        if ($editable) {
-            $editable = array();
-            foreach ($caps as $mimetype => $c) {
-                if ($c['name'] == 'edit') {
-                    $editable[] = $mimetype;
-                }
-            }
-
-            return $editable;
-        }
-
-        return array_keys($caps);
-    }
-
-    /**
-     * Uses WOPI discovery to get Office capabilities
-     * https://wopi.readthedocs.io/en/latest/discovery.html
-     */
-    protected function capabilities()
-    {
-        $cache_key = 'wopi.capabilities';
-        if ($result = $this->get_from_cache($cache_key)) {
-            return $this->apply_aliases_and_exceptions($result);
-        }
-
-        $office_url  = rtrim($this->rc->config->get('fileapi_wopi_office'), ' /');
-        $office_url .= '/hosting/discovery';
-
-        try {
-            $request = $this->http_request();
-            $request->setMethod(HTTP_Request2::METHOD_GET);
-            $request->setBody('');
-            $request->setUrl($office_url);
-
-            $response = $request->send();
-            $body     = $response->getBody();
-            $code     = $response->getStatus();
-
-            if (empty($body) || $code != 200) {
-                throw new Exception("Unexpected WOPI discovery response");
-            }
-        }
-        catch (Exception $e) {
-            rcube::raise_error($e, true, false);
-
-            // Don't bail out here, it would make the kolab_files UI broken
-            return array();
-        }
-
-        // parse XML output
-        // <wopi-discovery>
-        //   <net-zone name="external-http">
-        //     <app name="application/vnd.lotus-wordpro">
-        //       <action ext="lwp" name="edit" urlsrc="https://office.example.org/loleaflet/1.8.3/loleaflet.html?"/>
-        //     </app>
-        // ...
-
-        $node = new DOMDocument('1.0', 'UTF-8');
-        $node->loadXML($body);
-
-        $result = array();
-
-        foreach ($node->getElementsByTagName('app') as $app) {
-            if ($mimetype = $app->getAttribute('name')) {
-                if ($action = $app->getElementsByTagName('action')->item(0)) {
-                    foreach ($action->attributes as $attr) {
-                        $result[$mimetype][$attr->name] = $attr->value;
-                    }
-                }
-            }
-        }
-
-        if (empty($result)) {
-            rcube::raise_error("Failed to parse WOPI discovery response: $body", true, false);
-
-            // Don't bail out here, it would make the kolab_files UI broken
-            return array();
-        }
-
-        $this->save_in_cache($cache_key, $result);
-
-        return $this->apply_aliases_and_exceptions($result);
-    }
-
-    /**
-     * Initializes HTTP request object
-     */
-    protected function http_request()
-    {
-        require_once 'HTTP/Request2.php';
-
-        $request = new HTTP_Request2();
-
-        // Configure connection options
-        $config      = $this->rc->config;
-        $http_config = (array) $config->get('http_request', $config->get('kolab_http_request'));
-
-        // Deprecated config, all options are separated variables
-        if (empty($http_config)) {
-            $options = array(
-                'ssl_verify_peer',
-                'ssl_verify_host',
-                'ssl_cafile',
-                'ssl_capath',
-                'ssl_local_cert',
-                'ssl_passphrase',
-                'follow_redirects',
-            );
-
-            foreach ($options as $optname) {
-                if (($optvalue = $config->get($optname)) !== null
-                    || ($optvalue = $config->get('kolab_' . $optname)) !== null
-                ) {
-                    $http_config[$optname] = $optvalue;
-                }
-            }
-        }
-
-        if (!empty($http_config)) {
-            try {
-                $request->setConfig($http_config);
-            }
-            catch (Exception $e) {
-                rcube::log_error("HTTP: " . $e->getMessage());
-            }
-        }
-
-        // proxy User-Agent
-        $request->setHeader('user-agent', $_SERVER['HTTP_USER_AGENT']);
-
-        // some HTTP server configurations require this header
-        $request->setHeader('accept', "application/json,text/javascript,*/*");
-
-        return $request;
-    }
-
-    /**
-     * Get cached data
-     */
-    protected function get_from_cache($key)
-    {
-        if ($cache = $this->get_cache()) {
-            return $cache->get($key);
-        }
-    }
-
-    /**
-     * Store data in cache
-     */
-    protected function save_in_cache($key, $value)
-    {
-        if ($cache = $this->get_cache()) {
-            $cache->set($key, $value);
-        }
-    }
-
-    /**
-     * Getter for the shared cache engine object
-     */
-    protected function get_cache()
-    {
-        if ($this->cache === null) {
-            $this->cache = $this->rc->get_cache_shared('fileapi') ?: false;
-        }
-
-        return $this->cache;
-    }
-
-    /**
-     * Support more mimetypes in CODE capabilities
-     */
-    protected function apply_aliases_and_exceptions($caps)
-    {
-        foreach ($this->mimetype_aliases as $type => $alias) {
-            if (isset($caps[$type]) && !isset($caps[$alias])) {
-                $caps[$alias] = $caps[$type];
-            }
-        }
-
-        foreach ($this->mimetype_exceptions as $type) {
-            unset($caps[$type]);
-        }
-
-        return $caps;
-    }
-
-    /**
-     * Write login data (name, ID, IP address) to the 'userlogins' log file.
-     */
-    protected function log_login($session_id)
-    {
-        if (!$this->api->config->get('log_logins')) {
-            return;
-        }
-
-        $rcube     = rcube::get_instance();
-        $user_name = $rcube->get_user_name();
-        $user_id   = $rcube->get_user_id();
-
-        $message = sprintf('CODE access for %s (ID: %d) from %s in session %s; %s',
-            $user_name, $user_id, rcube_utils::remote_ip(), session_id(), $session_id);
-
-        // log login
-        rcube::write_log('userlogins', $message);
-    }
-}

iRony-0.4.3.tar.gz/lib/FileAPI/templates Deleted

iRony-0.4.3.tar.gz/lib/FileAPI/templates/empty.odp Deleted

iRony-0.4.3.tar.gz/lib/FileAPI/templates/empty.ods Deleted

iRony-0.4.3.tar.gz/lib/FileAPI/templates/empty.odt Deleted

iRony-0.4.3.tar.gz/lib/FileAPI/viewers/doc Deleted

iRony-0.4.3.tar.gz/lib/FileAPI/viewers/doc.php Deleted

@@ -1,130 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------------+
- | This file is part of the Kolab File API                                  |
- |                                                                          |
- | Copyright (C) 2011-2016, 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 integrating Collabora Online documents viewer
- */
-class file_viewer_doc extends file_viewer
-{
-    /**
-     * Class constructor
-     *
-     * @param file_api File API object
-     */
-    public function __construct($api)
-    {
-        $this->api = $api;
-    }
-
-    /**
-     * Returns list of supported mimetype
-     *
-     * @return array List of mimetypes
-     */
-    public function supported_mimetypes()
-    {
-        $rcube = rcube::get_instance();
-
-        // Get list of supported types from Collabora
-        if ($rcube->config->get('fileapi_wopi_office')) {
-            $wopi = new file_wopi($this->api);
-            if ($types = $wopi->supported_filetypes()) {
-                return $types;
-            }
-        }
-
-        return array();
-    }
-
-    /**
-     * Check if mimetype is supported by the viewer
-     *
-     * @param string $mimetype File type
-     *
-     * @return bool True if mimetype is supported, False otherwise
-     */
-    public function supports($mimetype)
-    {
-        return in_array($mimetype, $this->supported_mimetypes());
-    }
-
-    /**
-     * Return file viewer URL
-     *
-     * @param string $file     File name
-     * @param string $mimetype File type
-     */
-    public function href($file, $mimetype = null)
-    {
-        return $this->api->file_url($file) . '&viewer=doc';
-    }
-
-    /**
-     * Print output and exit
-     *
-     * @param string $file      File name
-     * @param array  $file_info File metadata (e.g. type)
-     */
-    public function output($file, $file_info = array())
-    {
-        // Create readonly session and get WOPI request parameters
-        $wopi = new file_wopi($this->api);
-        $url  = $wopi->session_start($file, $file_info, $session, true);
-
-        if (!$url) {
-            $this->api->output_error("Failed to open file", 404);
-        }
-
-        $info = array('readonly' => true);
-        $post = $wopi->editor_post_params($info);
-        $url  = htmlentities($url);
-        $form = '';
-
-        foreach ($post as $name => $value) {
-            $form .= '<input type="hidden" name="' . $name . '" value="' . $value . '" />';
-        }
-
-        echo <<<EOT
-<html>
-  <head>
-    <script src="viewers/doc/file_editor.js" type="text/javascript" charset="utf-8"></script>
-    <style>
-      iframe, body { width: 100%; height: 100%; margin: 0; border: none; }
-      form { display: none; }
-    </style>
-  </head>
-  <body>
-    <iframe id="viewer" name="viewer" allowfullscreen></iframe>
-    <form target="viewer" method="post" action="$url">
-      $form
-    </form>
-    <script type="text/javascript">
-      var file_editor = new file_editor;
-      file_editor.init();
-    </script>
-  </body>
-</html>
-EOT;
-    }
-}

iRony-0.4.3.tar.gz/lib/FileAPI/viewers/doc/file_editor.js Deleted

iRony-0.4.3.tar.gz/lib/FileAPI/wopi Deleted

iRony-0.4.3.tar.gz/lib/FileAPI/wopi/containers.php Deleted

@@ -1,34 +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_wopi_containers
-{
-    /**
-     * Request handler
-     */
-    public function handle()
-    {
-        throw new Exception("Not implemented", file_api_core::ERROR_NOT_IMPLEMENTED);
-    }
-}

iRony-0.4.3.tar.gz/lib/FileAPI/wopi/ecosystem.php Deleted

@@ -1,34 +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_wopi_ecosystem
-{
-    /**
-     * Request handler
-     */
-    public function handle()
-    {
-        throw new Exception("Not implemented", file_api_core::ERROR_NOT_IMPLEMENTED);
-    }
-}

iRony-0.4.3.tar.gz/lib/FileAPI/wopi/files.php Deleted

@@ -1,199 +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>                      |
- +--------------------------------------------------------------------------+
-*/
-
-require_once __DIR__ . "/../api/common.php";
-require_once __DIR__ . "/../api/document.php";
-
-class file_wopi_files extends file_api_document
-{
-    /**
-     * Request handler
-     */
-    public function handle()
-    {
-        if (empty($this->api->path)) {
-            throw new Exception("File ID not specified", file_api_core::ERROR_NOT_FOUND);
-        }
-
-        $file_id = $this->api->path[0];
-        $command = $this->api->path[1];
-
-        if ($file_id != $_SESSION['document_session']) {
-            throw new Exception("File ID not specified", file_api_core::ERROR_UNAUTHORIZED);
-        }
-
-        if ($this->api->method == 'GET') {
-            if (empty($command)) {
-                return $this->document_info($file_id);
-            }
-
-            if ($command == 'contents') {
-                return $this->document_get($file_id);
-            }
-        }
-        else if ($this->api->method == 'PUT') {
-            if ($command == 'contents') {
-                return $this->document_put($file_id);
-            }
-        }
-/*
-        else if (empty($command)) {
-            switch ($api->method)
-            // TODO case 'UNLOCK':
-            // TODO case 'LOCK':
-            // TODO case 'GET_LOCK':
-            // TODO case 'REFRESH_LOCK':
-            // TODO case 'PUT_RELATIVE':
-            // TODO case 'RENAME_FILE':
-            // TODO case 'DELETE':
-            // TODO case 'PUT_USER_INFO':
-            // TODO case 'GET_SHARE_URL':
-            }
-        }
-*/
-        throw new Exception("Unknown method", file_api_core::ERROR_NOT_IMPLEMENTED);
-    }
-
-    /**
-     * Return document informations
-     *
-     * JSON Response (only required attributes listed):
-     * - BaseFileName: The string name of the file without a path. Used for
-     *   display in user interface (UI), and determining the extension
-     *   of the file.
-     * - OwnerId: A string that uniquely identifies the owner of the file.
-     * - Size: The size of the file in bytes, expressed as a long,
-     *   a 64-bit signed integer.
-     * - UserId: A string value uniquely identifying the user currently
-     *   accessing the file.
-     * - Version: The current version of the file based on the server’s file
-     *   version schema, as a string. This value must change when the file changes.
-     */
-    protected function document_info($id)
-    {
-        $info = parent::document_info($id);
-
-        // Convert file metadata to Wopi format
-        // TODO: support more properties from
-        //       https://wopirest.readthedocs.io/en/latest/files/CheckFileInfo.html
-
-        $result = array(
-            'BaseFileName'              => $info['name'],
-            'Size'                      => $info['size'],
-            'Version'                   => $info['modified'],
-            'OwnerId'                   => $info['owner'],
-            'UserId'                    => $info['user'],
-            'UserFriendlyName'          => $info['user_name'] ?: preg_replace('/@.*$/', '', $info['user']),
-            'UserCanWrite'              => empty($info['readonly']),
-            'PostMessageOrigin'         => $info['origin'],
-            // Tell the client we do not support PutRelativeFile yet
-            'UserCanNotWriteRelative'   => true,
-            // Properties specific to Collabora Online
-            'HideSaveOption'            => true,
-            'HideExportOption'          => true,
-            'HidePrintOption'           => true,
-            'EnableOwnerTermination'    => true,
-            'WatermarkText'             => '', // ??
-            'DisablePrint'              => false,
-            'DisableExport'             => false,
-            'DisableCopy'               => false,
-            'DisableInactiveMessages'   => true,
-            'DisableChangeTrackingRecord' => true,
-            'DisableChangeTrackingShow'   => true,
-            'HideChangeTrackingControls'  => true,
-            // TODO: 'UserExtraInfo' => ['avatar' => 'http://url/to/user/avatar', 'mail' => $info['user']]
-            'UserExtraInfo'             => array(),
-        );
-
-        if ($info['modified']) {
-            try {
-                $dt = new DateTime('@' . $info['modified'], new DateTimeZone('UTC'));
-                $result['LastModifiedTime'] = $dt->format('Y-m-d\TH:i:s') . '.0000000Z';
-            }
-            catch (Exception $e) {
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Update document file content
-     *
-     * Request Headers:
-     * - X-WOPI-Lock: A string provided by the WOPI client in a previous Lock request.
-     *   Note that this header will not be included during document creation.
-     * Collabora-specific Request Headers:
-     * - X-LOOL-WOPI-IsModifiedByUser: true/false indicates whether the document
-     *   was modified by the user when they saved it.
-     * - X-LOOL-WOPI-IsAutosave: true/false indicates whether the PutFile
-     *   is a result of autosave or the user pressing the Save button.
-     * Response Headers:
-     * - X-WOPI-Lock: A string value identifying the current lock on the file.
-     *   This header must always be included when responding to the request with 409.
-     *   It should not be included when responding to the request with 200 OK.
-     * - X-WOPI-LockFailureReason: An optional string value indicating the cause
-     *   of a lock failure.
-     * - X-WOPI-ItemVersion: An optional string value indicating the version of the file.
-     *   Its value should be the same as Version value in CheckFileInfo.
-     * Status Codes:
-     * - 409 Conflict: Lock mismatch/locked by another interface
-     * - 413 Request Entity Too Large: File is too large; Host limit exceeded.
-     */
-    protected function document_put($file_id)
-    {
-        // TODO: Locking
-
-        parent::document_put($file_id);
-    }
-
-    /**
-     * Return document file content
-     *
-     * Request Headers:
-     * - X-WOPI-MaxExpectedSize: An integer specifying the upper bound
-     *   of the expected size of the file being requested. Optional.
-     *   The host should use the maximum value of a 4-byte integer
-     *   if this value is not set in the request.
-     * Response Headers:
-     * - X-WOPI-ItemVersion: An optional string value indicating the version of the file.
-     *   Its value should be the same as Version value in CheckFileInfo.
-     * Status Codes:
-     * - 412 File is larger than X-WOPI-MaxExpectedSize
-     */
-    protected function document_get($id)
-    {
-        $doc_info = parent::document_info($id, false);
-        $max_size = rcube_utils::request_header('X-WOPI-MaxExpectedSize') ?: 1024 * 1024 * 1024;
-
-        // Check max file size
-        if ($doc_info['size'] > $max_size) {
-            throw new Exception("File exceeds max expected size", file_api_core::ERROR_PRECONDITION_FAILED);
-        }
-
-        header("X-WOPI-ItemVersion: " . $doc_info['modified']);
-
-        parent::document_get($id);
-    }
-}

iRony-0.4.3.tar.gz/composer.lock -> iRony-0.4.4.tar.gz/composer.lock Changed

@@ -252,20 +252,20 @@
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.3.0",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
+                "reference": "f350df0268e904597e3bd9c4685c53e0e333feea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
-                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea",
+                "reference": "f350df0268e904597e3bd9c4685c53e0e333feea",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^6.0",
@@ -304,7 +304,21 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2019-10-21T16:45:58+00:00"
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-05-29T17:27:14+00:00"
         },
         {
             "name": "kolab/net_ldap3",
@@ -455,16 +469,16 @@
         },
         {
             "name": "pear/mail_mime",
-            "version": "1.10.4",
+            "version": "1.10.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Mail_Mime.git",
-                "reference": "36ab96ff17c098f65f58adb31c089beb12868ece"
+                "reference": "1e7ae4e5258b6c0d385a8e76add567934245d38d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Mail_Mime/zipball/36ab96ff17c098f65f58adb31c089beb12868ece",
-                "reference": "36ab96ff17c098f65f58adb31c089beb12868ece",
+                "url": "https://api.github.com/repos/pear/Mail_Mime/zipball/1e7ae4e5258b6c0d385a8e76add567934245d38d",
+                "reference": "1e7ae4e5258b6c0d385a8e76add567934245d38d",
                 "shasum": ""
             },
             "require": {
@@ -497,7 +511,7 @@
             ],
             "description": "Mail_Mime provides classes to create MIME messages",
             "homepage": "http://pear.php.net/package/Mail_Mime",
-            "time": "2019-10-13T09:02:10+00:00"
+            "time": "2020-06-27T08:35:27+00:00"
         },
         {
             "name": "pear/net_idna2",
@@ -1042,6 +1056,7 @@
             "keywords": [
                 "tokenizer"
             ],
+            "abandoned": true,
             "time": "2017-12-04T08:55:13+00:00"
         },
         {
@@ -1547,16 +1562,16 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.13.1",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3"
+                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
-                "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454",
+                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454",
                 "shasum": ""
             },
             "require": {
@@ -1568,7 +1583,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.13-dev"
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -1601,7 +1620,21 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2019-11-27T13:56:44+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-07-14T12:35:20+00:00"
         },
         {
             "name": "symfony/yaml",
@@ -1664,5 +1697,6 @@
     "platform": {
         "php": ">=5.4.1"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }

iRony-0.4.3.tar.gz/config/dav.inc.php.sample -> iRony-0.4.4.tar.gz/config/dav.inc.php.sample Changed

@@ -113,6 +113,45 @@
         'changed'           => 'modifytimestamp',
     ),
 );
+
+// Expose all resources as an LDAP-based address book in the pricipals address book collection.
+// This enables Non-Kolab-Clients to add resources to an event.
+// Properties of this option are the same as for $config['kolabdav_ldap_directory'] entries.
+$config['kolabdav_ldap_resources']  = array(
+    'name'           => 'Global Resources',
+    'hosts'          => 'localhost',
+    'port'           => 389,
+    'use_tls'        => false,
+    'user_specific'  => false,
+    'search_base_dn' => 'ou=People,dc=example,dc=org',
+    'search_bind_dn' => 'uid=kolab-service,ou=Special Users,dc=example,dc=org',
+    'search_bind_pw' => 'Welcome2KolabSystems',
+    'search_filter'  => '(&(objectClass=inetOrgPerson)(mail=%fu))',
+    'base_dn'        => 'ou=Resources,dc=example,dc=org',
+    'bind_dn'        => 'uid=kolab-service,ou=Special Users,dc=example,dc=org',
+    'bind_pass'      => 'Welcome2KolabSystems',
+    'ldap_version'   => 3,
+    'filter'         => '(|(objectclass=groupofuniquenames)(objectclass=groupofurls)(objectclass=kolabsharedfolder))',
+    'search_fields'  => array('displayname', 'mail'),
+    'sort'           => array('displayname', 'sn', 'givenname', 'cn'),
+    'scope'          => 'sub',
+    'searchonly'     => false,  // Set to false to enable listing
+    'sizelimit'      => '1000',
+    'timelimit'      => '0',
+    'fieldmap'       => array(
+        // Internal         => LDAP
+        'name'              => 'cn',
+        'email'             => 'mail',
+        'owner'             => 'owner',
+        'description'       => 'description',
+        'attributes'        => 'kolabdescattribute',
+        'members'           => 'uniquemember',
+        // these mappings are required for owner display
+        'phone'             => 'telephoneNumber',
+        'mobile'            => 'mobile',
+    ),
+);
+
 */
 
 // Enable caching for LDAP directory data.

iRony-0.4.3.tar.gz/lib/FileAPI/api/common.php -> iRony-0.4.4.tar.gz/lib/FileAPI/api/common.php Changed

@@ -29,11 +29,10 @@
     protected $args = array();
 
 
-    public function __construct($api, $args = array())
+    public function __construct($api)
     {
-        $this->rc   = rcube::get_instance();
-        $this->api  = $api;
-        $this->args = (array) $args;
+        $this->rc  = rcube::get_instance();
+        $this->api = $api;
     }
 
     /**
@@ -42,11 +41,7 @@
     public function handle()
     {
         // GET arguments
-        if (!empty($_GET)) {
-            foreach (array_keys($_GET) as $key) {
-                $this->args[$key] = &$_GET[$key];
-            }
-        }
+        $this->args = &$_GET;
 
         // POST arguments (JSON)
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -56,7 +51,7 @@
         }
 
         // disable script execution time limit, so we can handle big files
-        @set_time_limit(360);
+        @set_time_limit(0);
     }
 
     /**
@@ -107,30 +102,22 @@
      */
     protected function find_viewer($mimetype)
     {
-        $dir   = RCUBE_INSTALL_PATH . 'lib/viewers';
-        $files = array();
+        $dir = RCUBE_INSTALL_PATH . 'lib/viewers';
 
-        // First get viewers and sort by name to get priority
         if ($handle = opendir($dir)) {
             while (false !== ($file = readdir($handle))) {
                 if (preg_match('/^([a-z0-9_]+)\.php$/i', $file, $matches)) {
-                    $files[$matches[1]] = $dir . '/' . $file;
+                    include_once $dir . '/' . $file;
+                    $class  = 'file_viewer_' . $matches[1];
+                    $viewer = new $class($this->api);
+
+                    if ($viewer->supports($mimetype)) {
+                        return $viewer;
+                    }
                 }
             }
             closedir($handle);
         }
-
-        ksort($files);
-
-        foreach ($files as $name => $file) {
-            include_once $file;
-            $class  = 'file_viewer_' . $name;
-            $viewer = new $class($this->api);
-
-            if ($viewer->supports($mimetype)) {
-                return $viewer;
-            }
-        }
     }
 
     /**
@@ -153,125 +140,4 @@
 
         return $metadata;
     }
-
-    /**
-     * Get folder rights
-     */
-    protected function folder_rights($folder)
-    {
-        list($driver, $path) = $this->api->get_driver($folder);
-
-        $rights = $driver->folder_rights($path);
-        $result = array();
-        $map    = array(
-            file_storage::ACL_READ  => 'read',
-            file_storage::ACL_WRITE => 'write',
-        );
-
-        foreach ($map as $key => $value) {
-            if ($rights & $key) {
-                $result[] = $value;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Collect folder list request parameters
-     */
-    protected function folder_list_params()
-    {
-        $params = array('type' => 0);
-
-        if (!empty($this->args['unsubscribed']) && rcube_utils::get_boolean((string) $this->args['unsubscribed'])) {
-            $params['type'] |= file_storage::FILTER_UNSUBSCRIBED;
-        }
-
-        if (!empty($this->args['writable']) && rcube_utils::get_boolean((string) $this->args['writable'])) {
-            $params['type'] |= file_storage::FILTER_WRITABLE;
-        }
-
-        if (isset($this->args['search']) && strlen($this->args['search'])) {
-            $params['search'] = $this->args['search'];
-        }
-
-        if (!empty($this->args['permissions']) && rcube_utils::get_boolean((string) $this->args['permissions'])) {
-            $params['extended']    = true;
-            $params['permissions'] = true;
-        }
-
-        if (!empty($this->args['level']) && ($level = intval($this->args['level']))) {
-            if ($level < 0) {
-                $level *= -1;
-                $params['auto_level'] = true;
-            }
-
-            $params['level'] = $level;
-        }
-
-        return $params;
-    }
-
-    /**
-     * Wrapper for folder_list() method on specified driver
-     */
-    protected function folder_list($driver, $params, $relative_level = false)
-    {
-        $caps = $driver->capabilities();
-
-        if ($params['type'] & file_storage::FILTER_UNSUBSCRIBED) {
-            if (empty($caps[file_storage::CAPS_SUBSCRIPTIONS])) {
-                return array();
-            }
-        }
-
-        // If the driver has fast way to get the whole folders hierarchy
-        // we'll return all folders, despite the requested level, when requested
-        if (!empty($params['auto_level']) & !empty($caps[file_storage::CAPS_FAST_FOLDER_LIST])) {
-            unset($params['level']);
-        }
-
-        $prefix = $driver->title() . file_storage::SEPARATOR;
-
-        if (strlen($prefix) > 1 && !$relative_level && $params['level'] && (!is_string($params['path']) || $params['path'] === '')) {
-            $params['level'] -= 1;
-        }
-
-        $folders = $driver->folder_list($params);
-
-        if (!empty($folders) && strlen($prefix) > 1) {
-            foreach ($folders as $idx => $folder) {
-                if (is_array($folder)) {
-                    $folders[$idx]['folder'] = $prefix . $folder['folder'];
-                }
-                else {
-                    $folders[$idx] = $prefix . $folder;
-                }
-            }
-        }
-
-        return $folders;
-    }
-
-    /**
-     * Update document session on file/folder move
-     */
-    protected function session_uri_update($from, $to, $is_folder = false)
-    {
-        // check Manticore/WOPI support. Note: we don't use config->get('fileapi_manticore')
-        // here as it may be not properly set if backend driver wasn't initialized yet
-        $capabilities = $this->api->capabilities(false);
-
-        if (!empty($capabilities['WOPI'])) {
-            $document = new file_wopi($this->api);
-        }
-        else if (!empty($capabilities['MANTICORE'])) {
-            $document = new file_manticore($this->api);
-        }
-
-        if (!empty($document)) {
-            $document->session_uri_update($from, $to, $is_folder);
-        }
-    }
 }

iRony-0.4.3.tar.gz/lib/FileAPI/api/file_create.php -> iRony-0.4.4.tar.gz/lib/FileAPI/api/file_create.php Changed

@@ -52,30 +52,14 @@
             $chunk = $this->args['content'];
         }
 
-        $ctype = $this->args['content-type'];
-        if ($ctype && !preg_match('/^[a-z_-]+\/[a-z._-]+$/', $ctype)) {
-            $ctype = '';
-        }
-
         $request = $this instanceof file_api_file_update ? 'file_update' : 'file_create';
         $file    = array(
             'content' => $this->args['content'],
             'path'    => $this->args['path'],
-            'type'    => rcube_mime::file_content_type($chunk, $this->args['file'], $ctype, !$is_file),
+            'type'    => rcube_mime::file_content_type($chunk,
+                $this->args['file'], $this->args['content-type'], !$is_file),
         );
 
-        if (strpos($file['type'], 'empty') !== false && $ctype) {
-            $file['type'] = $ctype;
-        }
-        else if (empty($file['type'])) {
-            $file['type'] = 'application/octet-stream';
-        }
-
-        // Get file content from a template
-        if ($request == 'file_create' && empty($file['path']) && empty($file['content'])) {
-            $this->use_file_template($file);
-        }
-
         list($driver, $path) = $this->api->get_driver($this->args['file']);
 
         $driver->$request($path, $file);
@@ -84,26 +68,4 @@
             return $driver->file_info($path);
         }
     }
-
-    /**
-     * Use templates when creating empty files
-     */
-    protected function use_file_template(&$file)
-    {
-        if ($ext = array_search($file['type'], file_utils::$ext_map)) {
-            // find the template
-            $ext = ".$ext";
-            if ($handle = opendir(__DIR__ . '/../templates')) {
-                while (false !== ($entry = readdir($handle))) {
-                    if (substr($entry, -strlen($ext)) == $ext) {
-                        // set path to the template file
-                        $file['path'] = __DIR__ . '/../templates/' . $entry;
-                        break;
-                    }
-                }
-
-                closedir($handle);
-            }
-        }
-    }
 }

iRony-0.4.3.tar.gz/lib/FileAPI/api/file_get.php -> iRony-0.4.4.tar.gz/lib/FileAPI/api/file_get.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/api/file_info.php -> iRony-0.4.4.tar.gz/lib/FileAPI/api/file_info.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/api/file_list.php -> iRony-0.4.4.tar.gz/lib/FileAPI/api/file_list.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/api/file_move.php -> iRony-0.4.4.tar.gz/lib/FileAPI/api/file_move.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/api/folder_auth.php -> iRony-0.4.4.tar.gz/lib/FileAPI/api/folder_auth.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/api/folder_create.php -> iRony-0.4.4.tar.gz/lib/FileAPI/api/folder_create.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/api/folder_list.php -> iRony-0.4.4.tar.gz/lib/FileAPI/api/folder_list.php Changed

@@ -31,90 +31,46 @@
     {
         parent::handle();
 
-        $params   = $this->folder_list_params();
-        $search   = isset($params['search']) ? mb_strtoupper($params['search']) : null;
-        $drivers  = $this->api->get_drivers(true, $admin_drivers);
-        $errors   = array();
-        $has_more = false;
-
-        if (isset($this->args['folder']) && strlen($this->args['folder'])) {
-            list($driver, $path) = $this->api->get_driver($this->args['folder']);
-
-            $title          = $driver->title();
-            $params['path'] = $path;
-
-            try {
-                $folders = $this->folder_list($driver, $params, true);
-            }
-            catch (Exception $e) {
-                $folders = array();
-                if ($e->getCode() == file_storage::ERROR_NOAUTH) {
-                    if (!in_array($title, $admin_drivers)) {
-                        // inform UI about to ask user for credentials
-                        $errors[$title] = $this->parse_metadata($driver->driver_metadata());
-                    }
-                    else {
-                        $errors[$title] = array('error' => file_storage::ERROR_NOAUTH);
-                    }
-                }
-            }
-
-            $drivers = array();
-        }
-        else {
-            $backend = $this->api->get_backend();
-
-            // get folders from default driver
-            if (!$this->rc->config->get('fileapi_backend_storage_disabled')) {
-                $folders = $this->folder_list($backend, $params);
-            }
-        }
+        // get folders from main driver
+        $backend = $this->api->get_backend();
+        $folders = $backend->folder_list();
 
         // old result format
         if ($this->api->client_version() < 2) {
             return $folders;
         }
 
+        $drivers  = $this->api->get_drivers(true);
+        $has_more = false;
+        $errors   = array();
+
         // get folders from external sources
         foreach ($drivers as $driver) {
             $title  = $driver->title();
             $prefix = $title . file_storage::SEPARATOR;
 
             // folder exists in main source, replace it with external one
-            foreach ($folders as $idx => $folder) {
-                if (is_array($folder)) {
-                    $folder = $folder['folder'];
-                }
-                if ($folder == $title || strpos($folder, $prefix) === 0) {
-                    unset($folders[$idx]);
+            if (($idx = array_search($title, $folders)) !== false) {
+                foreach ($folders as $idx => $folder) {
+                    if ($folder == $title || strpos($folder, $prefix) === 0) {
+                        unset($folders[$idx]);
+                    }
                 }
             }
 
-            if ($search === null || strpos(mb_strtoupper($title), $search) !== false) {
-                if ($folder = $this->driver_root_folder($driver, $params)) {
-                    $has_more  = $has_more || count($folders) > 0;
-                    $folders[] = $folder;
-                }
-            }
+            $folders[] = $title;
+            $has_more  = true;
 
-            if ($driver != $backend && $params['level'] != 1) {
+            if ($driver != $backend) {
                 try {
-                    $_folders = $this->folder_list($driver, $params);
-                    if (!empty($_folders)) {
-                        $folders  = array_merge($folders, $_folders);
-                        $has_more = true;
-                        unset($_folders);
+                    foreach ($driver->folder_list() as $folder) {
+                        $folders[] = $prefix . $folder;
                     }
                 }
                 catch (Exception $e) {
                     if ($e->getCode() == file_storage::ERROR_NOAUTH) {
-                        if (!in_array($title, $admin_drivers)) {
-                            // inform UI about to ask user for credentials
-                            $errors[$title] = $this->parse_metadata($driver->driver_metadata());
-                        }
-                        else {
-                            $errors[$title] = array('error' => file_storage::ERROR_NOAUTH);
-                        }
+                        // inform UI about to ask user for credentials
+                        $errors[$title] = $this->parse_metadata($driver->driver_metadata());
                     }
                 }
             }
@@ -122,33 +78,32 @@
 
         // re-sort the list
         if ($has_more) {
-            usort($folders, array('file_utils', 'sort_folder_comparator'));
+            usort($folders, array($this, 'sort_folder_comparator'));
         }
 
         return array(
-            'list'        => array_values($folders),
+            'list'        => $folders,
             'auth_errors' => $errors,
         );
     }
 
-    protected function driver_root_folder($driver, $params)
+    /**
+     * Callback for uasort() that implements correct
+     * locale-aware case-sensitive sorting
+     */
+    protected function sort_folder_comparator($str1, $str2)
     {
-        $title  = $driver->title();
-        $folder = $params['extended'] ? array('folder' => $title) : $title;
+        $path1 = explode(file_storage::SEPARATOR, $str1);
+        $path2 = explode(file_storage::SEPARATOR, $str2);
 
-        if ($params['permissions'] || ($params['type'] & file_storage::FILTER_WRITABLE)) {
-            if ($readonly = !($driver->folder_rights('') & file_storage::ACL_WRITE)) {
-                if ($params['permissions']) {
-                    $folder['readonly'] = true;
-                }
+        foreach ($path1 as $idx => $folder1) {
+            $folder2 = $path2[$idx];
+
+            if ($folder1 === $folder2) {
+                continue;
             }
-        }
-        else {
-            $readonly = false;
-        }
 
-        if (!$readonly || !($params['type'] & file_storage::FILTER_WRITABLE)) {
-            return $folder;
+            return strcoll($folder1, $folder2);
         }
     }
 }

iRony-0.4.3.tar.gz/lib/FileAPI/api/folder_move.php -> iRony-0.4.4.tar.gz/lib/FileAPI/api/folder_move.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/api/folder_types.php -> iRony-0.4.4.tar.gz/lib/FileAPI/api/folder_types.php Changed

@@ -32,7 +32,6 @@
         parent::handle();
 
         $drivers = $this->rc->config->get('fileapi_drivers');
-        $presets = (array) $this->rc->config->get('fileapi_presets');
         $result  = array();
 
         if (!empty($drivers)) {
@@ -40,22 +39,20 @@
                 if ($driver_name != 'kolab' && !isset($result[$driver_name])) {
                     $driver = $this->api->load_driver_object($driver_name);
                     $meta   = $driver->driver_metadata();
-                    $meta   = $this->parse_metadata($meta);
 
-                    if (!empty($presets[$driver_name]) && empty($meta['form_values'])) {
-                        $meta['form_values'] = (array) $presets[$driver_name];
-                        $user = $this->rc->get_user_name();
-
-                        foreach ($meta['form_values'] as $key => $val) {
-                            $meta['form_values'][$key] = str_replace('%u', $user, $val);
-                        }
-                    }
-
-                    $result[$driver_name] = $meta;
+                    $result[$driver_name] = $this->parse_metadata($meta);
                 }
             }
         }
+/*
+        // add local storage to the list
+        if (!empty($result)) {
+            $backend = $this->api->get_backend();
+            $meta = $backend->driver_metadata();
 
+            $result = array_merge(array('default' => $this->parse_metadata($meta, true)), $result);
+        }
+*/
         return $result;
     }
 }

iRony-0.4.3.tar.gz/lib/FileAPI/drivers/kolab/kolab_file_storage.php -> iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/kolab_file_storage.php Changed

@@ -44,10 +44,6 @@
      */
     protected $title;
 
-    /**
-     * @var array
-     */
-    protected $icache = array();
 
     /**
      * Class constructor
@@ -60,8 +56,8 @@
         // WARNING: We can use only plugins that are prepared for this
         //          e.g. are not using output or rcmail objects or
         //          doesn't throw errors when using them
-        $plugins = (array) $this->rc->config->get('fileapi_plugins', array('kolab_auth', 'kolab_folders'));
-        $plugins = array_unique(array_merge($plugins, array('libkolab')));
+        $plugins  = (array)$this->rc->config->get('fileapi_plugins', array('kolab_auth'));
+        $required = array('libkolab');
 
         // Kolab WebDAV server supports plugins, no need to overwrite object
         if (!is_a($this->rc->plugins, 'rcube_plugin_api')) {
@@ -70,11 +66,7 @@
             $this->rc->plugins->init($this, '');
         }
 
-        // this way we're compatible with Roundcube Framework 1.2
-        // we can't use load_plugins() here
-        foreach ($plugins as $plugin) {
-            $this->rc->plugins->load_plugin($plugin, true);
-        }
+        $this->rc->plugins->load_plugins($plugins, $required);
 
         $this->init();
     }
@@ -98,16 +90,10 @@
 
         // Authenticate - get Roundcube user ID
         if ($auth['valid'] && !$auth['abort']
-            && ($this->login($auth['user'], $auth['pass'], $auth['host'], $err))) {
+            && ($this->login($auth['user'], $auth['pass'], $auth['host']))) {
             return true;
         }
 
-        if ($err) {
-            $err_str = $this->rc->get_storage()->get_error_str();
-        }
-
-        kolab_auth::log_login_error($auth['user'], $err_str ?: $err);
-
         $this->rc->plugins->exec_hook('login_failed', array(
             'host' => $auth['host'],
             'user' => $auth['user'],
@@ -165,7 +151,7 @@
     /**
      * Authenticates a user in IMAP
      */
-    private function login($username, $password, $host, &$error = null)
+    private function login($username, $password, $host)
     {
         if (empty($username)) {
             return false;
@@ -217,7 +203,6 @@
         // authenticate user in IMAP
         $storage = $this->rc->get_storage();
         if (!$storage->connect($host, $username, $password, $port, $ssl)) {
-            $error = $storage->get_error_code();
             return false;
         }
 
@@ -255,16 +240,13 @@
         $this->init($user);
 
         // force reloading of mailboxes list/data
-        // Roundcube already does that (T1050)
-        //$storage->clear_cache('mailboxes', true);
+        $storage->clear_cache('mailboxes', true);
 
         return true;
     }
 
     protected function init($user = null)
     {
-        $this->rc->plugins->exec_hook('startup');
-
         if ($_SESSION['user_id'] || $user) {
             // overwrite config with user preferences
             $this->rc->user = $user ? $user : new rcube_user($_SESSION['user_id']);
@@ -317,12 +299,9 @@
         $quota   = $storage->get_capability('QUOTA');
 
         return array(
-            file_storage::CAPS_MAX_UPLOAD    => $max_filesize,
-            file_storage::CAPS_QUOTA         => $quota,
-            file_storage::CAPS_LOCKS         => true,
-            file_storage::CAPS_SUBSCRIPTIONS => true,
-            file_storage::CAPS_ACL           => true,
-            file_storage::CAPS_FAST_FOLDER_LIST => true,
+            file_storage::CAPS_MAX_UPLOAD => $max_filesize,
+            file_storage::CAPS_QUOTA      => $quota,
+            file_storage::CAPS_LOCKS      => true,
         );
     }
 
@@ -481,7 +460,7 @@
      */
     public function file_create($file_name, $file)
     {
-        $exists = $this->get_file_object_fast($file_name, $folder);
+        $exists = $this->get_file_object($file_name, $folder);
         if (!empty($exists)) {
             throw new Exception("Storage error. File exists.", file_storage::ERROR);
         }
@@ -554,7 +533,7 @@
      */
     public function file_delete($file_name)
     {
-        $file = $this->get_file_object_fast($file_name, $folder);
+        $file = $this->get_file_object($file_name, $folder);
         if (empty($file)) {
             throw new Exception("Storage error. File not found.", file_storage::ERROR);
         }
@@ -582,7 +561,7 @@
      */
     public function file_get($file_name, $params = array(), $fp = null)
     {
-        $file = $this->get_file_object_fast($file_name, $folder, true);
+        $file = $this->get_file_object($file_name, $folder);
         if (empty($file)) {
             throw new Exception("Storage error. File not found.", file_storage::ERROR);
         }
@@ -626,7 +605,7 @@
         header("Content-Length: " . $file['size']);
         header("Content-Disposition: $disposition; filename=\"$filename\"");
 
-        if ($file['size'] && empty($params['head'])) {
+        if ($file['size']) {
             $folder->get_attachment($file['_msguid'], $file['fileid'], $file['_mailbox'], true);
         }
     }
@@ -640,7 +619,7 @@
      */
     public function file_info($file_name)
     {
-        $file = $this->get_file_object_fast($file_name, $folder, true);
+        $file = $this->get_file_object($file_name, $folder);
         if (empty($file)) {
             throw new Exception("Storage error. File not found.", file_storage::ERROR);
         }
@@ -651,8 +630,8 @@
             'name'     => $file['name'],
             'size'     => (int) $file['size'],
             'type'     => (string) $file['type'],
-            'mtime'    => file_utils::date_format($file['changed'], $this->config['date_format'], $this->config['timezone']),
-            'ctime'    => file_utils::date_format($file['created'], $this->config['date_format'], $this->config['timezone']),
+            'mtime'    => $file['changed'] ? $file['changed']->format($this->config['date_format']) : '',
+            'ctime'    => $file['created'] ? $file['created']->format($this->config['date_format']) : '',
             'modified' => $file['changed'] ? $file['changed']->format('U') : 0,
             'created'  => $file['created'] ? $file['created']->format('U') : 0,
         );
@@ -688,7 +667,8 @@
         }
 
         // get files list
-        $files  = $this->get_files($folder_name, $filter);
+        $folder = $this->get_folder_object($folder_name);
+        $files  = $folder->select($filter);
         $result = array();
 
         // convert to kolab_storage files list data format
@@ -705,8 +685,8 @@
                 'name'     => $file['name'],
                 'size'     => (int) $file['size'],
                 'type'     => (string) $file['type'],
-                'mtime'    => file_utils::date_format($file['changed'], $this->config['date_format'], $this->config['timezone']),
-                'ctime'    => file_utils::date_format($file['created'], $this->config['date_format'], $this->config['timezone']),
+                'mtime'    => $file['changed'] ? $file['changed']->format($this->config['date_format']) : '',
+                'ctime'    => $file['created'] ? $file['created']->format($this->config['date_format']) : '',
                 'modified' => $file['changed'] ? $file['changed']->format('U') : 0,
                 'created'  => $file['created'] ? $file['created']->format('U') : 0,
             );
@@ -752,7 +732,7 @@
             throw new Exception("Storage error. File not found.", file_storage::ERROR);
         }
 
-        $new = $this->get_file_object_fast($new_name, $new_folder);
+        $new = $this->get_file_object($new_name, $new_folder);
         if (!empty($new)) {
             throw new Exception("Storage error. File exists.", file_storage::ERROR_FILE_EXISTS);
         }
@@ -781,7 +761,7 @@
         // Update object
         $file['_attachments'] = array(
             0 => array(
-                'name'     => $new_name,
+                'name'     => $file['name'],
                 'path'     => $file_path,
                 'mimetype' => $file['type'],
                 'size'     => $file['size'],
@@ -820,7 +800,7 @@
             throw new Exception("Storage error. File not found.", file_storage::ERROR);
         }
 
-        $new = $this->get_file_object_fast($new_name, $new_folder);
+        $new = $this->get_file_object($new_name, $new_folder);
         if (!empty($new)) {
             throw new Exception("Storage error. File exists.", file_storage::ERROR_FILE_EXISTS);
         }
@@ -872,11 +852,11 @@
      */
     public function folder_create($folder_name)
     {
-        $folder_name = $this->folder_in($folder_name);
-        $success     = kolab_storage::folder_create($folder_name, 'file', true);
+        $folder_name = rcube_charset::convert($folder_name, RCUBE_CHARSET, 'UTF7-IMAP');
+        $success     = kolab_storage::folder_create($folder_name, 'file');
 
         if (!$success) {
-            throw new Exception("Storage error. Unable to create the folder", file_storage::ERROR);
+            throw new Exception("Storage error. Unable to create folder", file_storage::ERROR);
         }
     }
 
@@ -889,11 +869,11 @@
      */
     public function folder_delete($folder_name)
     {
-        $folder_name = $this->folder_in($folder_name);
+        $folder_name = rcube_charset::convert($folder_name, RCUBE_CHARSET, 'UTF7-IMAP');
         $success     = kolab_storage::folder_delete($folder_name);
 
         if (!$success) {
-            throw new Exception("Storage error. Unable to delete the folder.", file_storage::ERROR);
+            throw new Exception("Storage error. Unable to delete folder.", file_storage::ERROR);
         }
     }
 
@@ -907,211 +887,44 @@
      */
     public function folder_move($folder_name, $new_name)
     {
-        $folder_name = $this->folder_in($folder_name);
-        $new_name    = $this->folder_in($new_name);
+        $folder_name = rcube_charset::convert($folder_name, RCUBE_CHARSET, 'UTF7-IMAP');
+        $new_name    = rcube_charset::convert($new_name, RCUBE_CHARSET, 'UTF7-IMAP');
         $success     = kolab_storage::folder_rename($folder_name, $new_name);
 
         if (!$success) {
-            throw new Exception("Storage error. Unable to rename the folder", file_storage::ERROR);
-        }
-    }
-
-    /**
-     * Subscribe a folder.
-     *
-     * @param string $folder_name Name of a folder with full path
-     *
-     * @throws Exception
-     */
-    public function folder_subscribe($folder_name)
-    {
-        $folder_name = $this->folder_in($folder_name);
-        $storage     = $this->rc->get_storage();
-
-        if (!$storage->subscribe($folder_name)) {
-            throw new Exception("Storage error. Unable to subscribe the folder", file_storage::ERROR);
-        }
-    }
-
-    /**
-     * Unsubscribe a folder.
-     *
-     * @param string $folder_name Name of a folder with full path
-     *
-     * @throws Exception
-     */
-    public function folder_unsubscribe($folder_name)
-    {
-        $folder_name = $this->folder_in($folder_name);
-        $storage     = $this->rc->get_storage();
-
-        if (!$storage->unsubscribe($folder_name)) {
-            throw new Exception("Storage error. Unable to unsubsribe the folder", file_storage::ERROR);
+            throw new Exception("Storage error. Unable to rename folder", file_storage::ERROR);
         }
     }
 
     /**
      * Returns list of folders.
      *
-     * @param array $params List parameters ('type', 'search', 'extended', 'permissions', 'level', 'path')
-     *
      * @return array List of folders
      * @throws Exception
      */
-    public function folder_list($params = array())
+    public function folder_list()
     {
-        $unsubscribed = $params['type'] & file_storage::FILTER_UNSUBSCRIBED;
-        $rights       = ($params['type'] & file_storage::FILTER_WRITABLE) ? 'w' : null;
-        $imap         = $this->rc->get_storage();
-        $separator    = $imap->get_hierarchy_delimiter();
-        $root         = isset($params['path']) && strlen($params['path']) ? $this->folder_in($params['path']) . '/' : '';
-        $folders      = $imap->list_folders_subscribed($root, '*', 'file', $rights);
+        $folders = kolab_storage::list_folders('', '*', 'file', false);
 
         if (!is_array($folders)) {
             throw new Exception("Storage error. Unable to get folders list.", file_storage::ERROR);
         }
 
-        // create/subscribe 'Files' folder in case there's no folder of type 'file'
-        if (empty($folders) && !$unsubscribed && !strlen($root)) {
-            $default = 'Files';
-
-            // the folder may exist but be unsubscribed
-            if (!$imap->folder_exists($default)) {
-                if (kolab_storage::folder_create($default, 'file', true)) {
-                    $folders[] = $default;
-                }
-            }
-            else if (kolab_storage::folder_type($default) == 'file') {
-                if ($imap->subscribe($default)) {
-                    $folders[] = $default;
-                }
+        // create 'Files' folder in case there's no folder of type 'file'
+        if (empty($folders)) {
+            if (kolab_storage::folder_create('Files', 'file')) {
+                $folders[] = 'Files';
             }
         }
         else {
-            if ($unsubscribed) {
-                $subscribed = $folders;
-                $folders    = $imap->list_folders($root, '*', 'file', $rights);
-                $folders    = array_diff($folders, $subscribed);
-            }
-
-            $folders = array_map(array($this, 'folder_out'), $folders);
-        }
-
-        // This could probably be optimized by doing a direct
-        // IMAP LIST command with prepared second argument, but
-        // it would make caching not optimal
-        if ($params['level'] > 0) {
-            $offset = isset($params['path']) && strlen($params['path']) ? strlen($params['path']) + 1 : 0;
-            foreach ($folders as $idx => $folder) {
-                if (substr_count($folder, $separator, $offset) >= $params['level']) {
-                    unset($folders[$idx]);
-                }
-            }
-        }
-
-        // searching
-        if (isset($params['search'])) {
-            $search  = mb_strtoupper($params['search']);
-            $prefix  = null;
-            $ns      = $imap->get_namespace('other');
-
-            if (!empty($ns)) {
-                $prefix = rcube_charset::convert($ns[0][0], 'UTF7-IMAP', RCUBE_CHARSET);
-            }
-
-            $folders = array_filter($folders, function($folder) use ($search, $prefix) {
-                $path = explode('/', $folder);
-
-                // search in folder name not the full path
-                if (strpos(mb_strtoupper($path[count($path)-1]), $search) !== false) {
-                    return true;
-                }
-                // if it is an other user folder, we'll match the user name
-                // and return all folders of the matching user
-                else if (strpos($folder, $prefix) === 0 && strpos(mb_strtoupper($path[1]), $search) !== false) {
-                    return true;
-                }
-
-                return false;
-            });
-        }
-
-        $folders = array_values($folders);
-
-        // In extended format we return array of arrays
-        if ($params['extended']) {
-            if (!$rights && $params['permissions']) {
-                // get list of known writable folders from cache
-                $cache_key   = 'mailboxes.permissions';
-                $permissions = (array) $imap->get_cache($cache_key);
-            }
-
-            foreach ($folders as $idx => $folder_name) {
-                $folder = array('folder' => $folder_name);
-
-                // check if folder is readonly
-                if (isset($permissions)) {
-                    if (!array_key_exists($folder_name, $permissions)) {
-                        $acl = $this->folder_rights($folder_name);
-                        $permissions[$folder_name] = $acl;
-                    }
-
-                    if (!($permissions[$folder_name] & file_storage::ACL_WRITE)) {
-                        $folder['readonly'] = true;
-                    }
-                }
-
-                $folders[$idx] = $folder;
-            }
-
-            if ($cache_key) {
-                $imap->update_cache($cache_key, $permissions);
-            }
+            $callback = function($folder) { return rcube_charset::convert($folder, 'UTF7-IMAP', RCUBE_CHARSET); };
+            $folders  = array_map($callback, $folders);
         }
 
         return $folders;
     }
 
     /**
-     * Check folder rights.
-     *
-     * @param string $folder Folder name
-     *
-     * @return int Folder rights (sum of file_storage::ACL_*)
-     */
-    public function folder_rights($folder)
-    {
-        $storage = $this->rc->get_storage();
-        $folder  = $this->folder_in($folder);
-        $rights  = file_storage::ACL_READ;
-
-        // get list of known writable folders from cache
-        $cache_key   = 'mailboxes.permissions';
-        $permissions = (array) $storage->get_cache($cache_key);
-
-        if (array_key_exists($folder, $permissions)) {
-            return $permissions[$folder];
-        }
-
-        // For better performance, assume personal folders are writeable
-        if ($storage->folder_namespace($folder) == 'personal') {
-            $rights |= file_storage::ACL_WRITE;
-        }
-        else {
-            $myrights = $storage->my_rights($folder);
-
-            if (in_array('t', (array) $myrights)) {
-                $rights |= file_storage::ACL_WRITE;
-            }
-
-            $permissions[$folder] = $rights;
-            $storage->update_cache($cache_key, $permissions);
-        }
-
-        return $rights;
-    }
-
-    /**
      * Returns a list of locks
      *
      * This method should return all the locks for a particular URI, including
@@ -1120,25 +933,25 @@
      * If child_locks is set to true, this method should also look for
      * any locks in the subtree of the URI for locks.
      *
-     * @param string $path        File/folder path
+     * @param string $uri         URI
      * @param bool   $child_locks Enables subtree checks
      *
      * @return array List of locks
      * @throws Exception
      */
-    public function lock_list($path, $child_locks = false)
+    public function lock_list($uri, $child_locks = false)
     {
         $this->init_lock_db();
 
         // convert URI to global resource string
-        $uri = $this->path2uri($path);
+        $uri = $this->uri2resource($uri);
 
         // get locks list
         $list = $this->lock_db->lock_list($uri, $child_locks);
 
         // convert back resource string into URIs
         foreach ($list as $idx => $lock) {
-            $list[$idx]['uri'] = $this->uri2path($lock['uri']);
+            $list[$idx]['uri'] = $this->resource2uri($lock['uri']);
         }
 
         return $list;
@@ -1147,7 +960,7 @@
     /**
      * Locks a URI
      *
-     * @param string $path File/folder path
+     * @param string $uri  URI
      * @param array  $lock Lock data
      *                     - depth: 0/'infinite'
      *                     - scope: 'shared'/'exclusive'
@@ -1157,12 +970,12 @@
      *
      * @throws Exception
      */
-    public function lock($path, $lock)
+    public function lock($uri, $lock)
     {
         $this->init_lock_db();
 
         // convert URI to global resource string
-        $uri = $this->path2uri($path);
+        $uri = $this->uri2resource($uri);
 
         if (!$this->lock_db->lock($uri, $lock)) {
             throw new Exception("Database error. Unable to create a lock.", file_storage::ERROR);
@@ -1172,17 +985,17 @@
     /**
      * Removes a lock from a URI
      *
-     * @param string $path File/folder path
+     * @param string $path URI
      * @param array  $lock Lock data
      *
      * @throws Exception
      */
-    public function unlock($path, $lock)
+    public function unlock($uri, $lock)
     {
         $this->init_lock_db();
 
-        // convert path to global resource string
-        $uri = $this->path2uri($path);
+        // convert URI to global resource string
+        $uri = $this->uri2resource($uri);
 
         if (!$this->lock_db->unlock($uri, $lock)) {
             throw new Exception("Database error. Unable to remove a lock.", file_storage::ERROR);
@@ -1209,295 +1022,16 @@
     }
 
     /**
-     * Sharing interface
-     *
-     * @param string $folder_name Name of a folder with full path
-     * @param int    $mode        Sharing action mode
-     * @param array  $args        POST/GET parameters
-     *
-     * @return mixed Sharing response
-     * @throws Exception
-     */
-    public function sharing($folder, $mode, $args = array())
-    {
-        $folder_name = $this->folder_in($folder);
-        $storage     = $this->rc->get_storage();
-        $folder_info = $storage->folder_info($folder_name);
-
-        if (!is_array($folder_info['rights'])) {
-            throw new Exception("Storage error. Failed to get folder permissions.", file_storage::ERROR);
-        }
-
-        if (!in_array('a', $folder_info['rights'])) {
-            throw new Exception("No permissions to administer this folder.", file_storage::ERROR_FORBIDDEN);
-        }
-
-        if ($mode == file_storage::SHARING_MODE_FORM) {
-            $form = array(
-                'shares' => array(
-                    'title' => 'share.permissions',
-                    'form'  => array(
-                        'user' => array(
-                            'title' => 'share.usergroup',
-                            'type'  => 'input',
-                            'autocomplete' => 'user,group',
-                        ),
-                        'right' => array(
-                            'title' => 'share.permission',
-                            'type'  => 'select',
-                            'options' => array(
-                                'r'  => 'share.readonly',
-                                'rw' => 'share.readwrite',
-                                'a' => 'share.admin',
-                            ),
-                        ),
-                    ),
-                    'extra_fields' => array(
-                        'type' => 'user',
-                        'id'   => '',
-                    ),
-                ),
-            );
-
-            return $form;
-        }
-
-        if ($mode == file_storage::SHARING_MODE_RIGHTS) {
-            $result   = array();
-            $acl_list = $storage->get_acl($folder_name);
-            $ac       = new kolab_file_autocomplete($this);
-
-            foreach ((array) $acl_list as $name => $acl) {
-                if ($name == $_SESSION['username']) {
-                    continue;
-                }
-
-                if (in_array('a', $acl)) {
-                    $right = 'a';
-                }
-                else if (in_array('i', $acl)) {
-                    $right = 'rw';
-                }
-                else if (in_array('r', $acl)) {
-                    $right = 'r';
-                }
-                else {
-                    continue;
-                }
-
-                $type    = strpos($name, 'group:') === 0 ? 'group' : 'user';
-                $id      = $name;
-                $display = $ac->resolve_uid($id, $title);
-
-                $result[] = array(
-                    'mode'  => 'shares',
-                    'type'  => $type,
-                    'right' => $right,
-                    'user'  => $display,
-                    'title' => $title,
-                    'id'    => $id,
-                );
-            }
-
-            return $result;
-        }
-
-        if ($mode == file_storage::SHARING_MODE_UPDATE) {
-            if ($args['mode'] == 'shares') {
-                $user = $args['id'];
-                if (!$user) {
-                    $user = ($args['type'] == 'group' ? 'group:' : '') . preg_replace('/^group:/', '', $args['user']);
-                }
-
-                switch ($args['right']) {
-                case 'r':  $acl = 'lrs'; break;
-                case 'rw': $acl = 'lrswite'; break;
-                case 'a':  $acl = 'lrswiteax'; break;
-                }
-
-                if (empty($user) || (empty($acl) && $args['action'] != 'delete')) {
-                    throw new Exception("Invalid input.", file_storage::ERROR);
-                }
-
-                switch ($args['action']) {
-                case 'submit':
-                case 'update':
-                    if ($result = $storage->set_acl($folder_name, $user, $acl)) {
-                        $ac      = new kolab_file_autocomplete($this);
-                        $display = $ac->resolve_uid($user, $title);
-                        $result  = array('display' => $display, 'title' => $title);
-                    }
-                    break;
-
-                case 'delete':
-                    $result = $storage->delete_acl($folder_name, $user);
-                    break;
-                }
-            }
-            else {
-                throw new Exception("Invalid input.", file_storage::ERROR);
-            }
-
-            if (empty($result)) {
-                throw new Exception("Storage error. Failed to update share.", file_storage::ERROR);
-            }
-
-            return $result;
-        }
-    }
-
-    /**
-     * User/group search (autocompletion)
-     *
-     * @param string $search Search string
-     * @param int    $mode   Search mode
-     *
-     * @return array Users/Groups list
-     * @throws Exception
-     */
-    public function autocomplete($search, $mode)
-    {
-        $ac = new kolab_file_autocomplete($this);
-
-        $result = $ac->search($search, $mode & file_storage::SEARCH_GROUP);
-
-        if ($result === false) {
-            throw new Exception("Failed to search users", file_storage::ERROR);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Convert file/folder path into a global URI.
-     *
-     * @param string $path File/folder path
-     *
-     * @return string URI
-     * @throws Exception
-     */
-    public function path2uri($path)
-    {
-        $storage   = $this->rc->get_storage();
-        $namespace = $storage->get_namespace();
-        $separator = $storage->get_hierarchy_delimiter();
-        $_path     = str_replace(file_storage::SEPARATOR, $separator, $path);
-        $_path     = $this->folder_in($_path);
-        $owner     = $this->rc->get_user_name();
-
-        // find the owner and remove namespace prefix
-        foreach (array_filter($namespace) as $type => $ns) {
-            foreach ($ns as $root) {
-                if (is_array($root) && $root[0] && strpos($_path, $root[0]) === 0) {
-                    $path = substr($path, strlen($root[0]));
-
-                    switch ($type) {
-                    case 'shared':
-                        // in theory there can be more than one shared root
-                        // we add it to dummy user name, so we can revert conversion
-                        $owner = "shared({$root[0]})";
-                        break;
-
-                    case 'other':
-                        list($user, $path) = explode(file_storage::SEPARATOR, $path, 2);
-
-                        if (strpos($user, '@') === false) {
-                            $domain = strstr($owner, '@');
-                            if (!empty($domain)) {
-                                $user .= $domain;
-                            }
-                        }
-
-                        $owner = $user;
-                        break;
-                    }
-
-                    break 2;
-                }
-            }
-        }
-
-        return 'imap://' . rawurlencode($owner) . '@' . $storage->options['host']
-            . '/' . file_utils::encode_path($path);
-    }
-
-    /**
-     * Convert global URI into file/folder path.
-     *
-     * @param string $uri URI
-     *
-     * @return string File/folder path
-     * @throws Exception
-     */
-    public function uri2path($uri)
-    {
-        if (!preg_match('|^imap://([^@]+)@([^/]+)/(.*)$|', $uri, $matches)) {
-            throw new Exception("Internal storage error. Unexpected data format.", file_storage::ERROR);
-        }
-
-        $storage   = $this->rc->get_storage();
-        $separator = $storage->get_hierarchy_delimiter();
-        $owner     = $this->rc->get_user_name();
-
-        $user = rawurldecode($matches[1]);
-        $path = file_utils::decode_path($matches[3]);
-
-        if (strpos($path, '&') !== false) {
-            $path = rcube_charset::convert($path, 'UTF7-IMAP', RCUBE_CHARSET);
-        }
-
-        // personal namespace
-        if ($user == $owner) {
-            // do nothing
-            // Note: that might not work if personal namespace uses e.g. INBOX/ prefix.
-        }
-        // shared namespace
-        else if (preg_match('/^shared$(.*)$$/', $user, $matches)) {
-            $path = $matches[1] . $path;
-        }
-        // other users namespace
-        else {
-            $namespace = $storage->get_namespace('other');
-
-            list($local, $domain) = explode('@', $user);
-
-            // here we assume there's only one other users namespace root
-            $path = $namespace[0][0] . $local . file_storage::SEPARATOR . $path;
-        }
-
-        return $path;
-    }
-
-    /**
-     * Get files from a folder (with performance fix)
-     */
-    protected function get_files($folder, $filter, $all = true, $fast_mode = true)
-    {
-        if (!($folder instanceof kolab_storage_folder)) {
-            $folder = $this->get_folder_object($folder);
-        }
-
-        // for better performance it's good to assume max. number of records
-        $folder->set_order_and_limit(null, $all ? 0 : 1);
-
-        return $folder->select($filter, $fast_mode);
-    }
-
-    /**
      * Get file object.
      *
      * @param string               $file_name Name of a file (with folder path)
      * @param kolab_storage_folder $folder    Reference to folder object
-     * @param bool                 $cache     Use internal cache
-     * @param bool                 $fast_mode Return limited list of file attributes
      *
      * @return array File data
      * @throws Exception
      */
-    protected function get_file_object(&$file_name, &$folder = null, $cache = false, $fast_mode = false)
+    protected function get_file_object(&$file_name, &$folder = null)
     {
-        $original_name = $file_name;
-
         // extract file path and file name
         $path        = explode(file_storage::SEPARATOR, $file_name);
         $file_name   = array_pop($path);
@@ -1507,41 +1041,14 @@
             throw new Exception("Missing folder name", file_storage::ERROR);
         }
 
-        $folder = $this->get_folder_object($this->folder_in($folder_name));
-
-        if ($cache && !empty($this->icache[$original_name])) {
-            return $this->icache[$original_name];
-        }
-
-        $filter = array(
-            // array('type', '=', 'file'),
+        // get folder object
+        $folder = $this->get_folder_object($folder_name);
+        $files  = $folder->select(array(
+            array('type', '=', 'file'),
             array('filename', '=', $file_name)
-        );
-
-        $files = $this->get_files($folder, $filter, false, $fast_mode);
-        $file  = $files[0];
-
-        if ($cache) {
-            $this->icache[$original_name] = $file;
-        }
-
-        return $file;
-    }
+        ));
 
-    /**
-     * Get file object.
-     *
-     * @param string               $file_name Name of a file (with folder path)
-     * @param kolab_storage_folder $folder    Reference to folder object
-     * @param bool                 $cache     Use internal cache
-     *
-     * @return array File data
-     * @throws Exception
-     * @see self::get_file_object()
-     */
-    protected function get_file_object_fast(&$file_name, &$folder = null, $cache = false)
-    {
-        return $this->get_file_object($file_name, $folder, $cache, true);
+        return $files[0];
     }
 
     /**
@@ -1554,7 +1061,7 @@
      */
     protected function get_folder_object($folder_name)
     {
-        if (!is_string($folder_name) || $folder_name === '') {
+        if ($folder_name === null || $folder_name === '') {
             throw new Exception("Missing folder name", file_storage::ERROR);
         }
 
@@ -1562,19 +1069,10 @@
             $storage     = $this->rc->get_storage();
             $separator   = $storage->get_hierarchy_delimiter();
             $folder_name = str_replace(file_storage::SEPARATOR, $separator, $folder_name);
-            $imap_name   = $this->folder_in($folder_name);
+            $imap_name   = rcube_charset::convert($folder_name, RCUBE_CHARSET, 'UTF7-IMAP');
             $folder      = kolab_storage::get_folder($imap_name, 'file');
 
             if (!$folder || !$folder->valid) {
-                $error = $folder->get_error();
-
-                if ($error === kolab_storage::ERROR_IMAP_CONN || $error === kolab_storage::ERROR_CACHE_DB) {
-                    throw new Exception("The storage is temporarily unavailable.", file_storage::ERROR_UNAVAILABLE);
-                }
-                else if ($error === kolab_storage::ERROR_NO_PERMISSION) {
-                    throw new Exception("Storage error. Access not permitted", file_storage::ERROR_FORBIDDEN);
-                }
-
                 throw new Exception("Storage error. Folder not found.", file_storage::ERROR);
             }
 
@@ -1589,10 +1087,6 @@
      */
     protected function from_file_object($file)
     {
-        if (isset($file['filename']) && !$file['name']) {
-            $file['name'] = $file['filename'];
-        }
-
         if (empty($file['_attachments'])) {
             return $file;
         }
@@ -1635,44 +1129,99 @@
         return $file;
     }
 
-    /**
-     * Initializes file_locks object
-     */
-    protected function init_lock_db()
+    protected function uri2resource($uri)
     {
-        if (!$this->lock_db) {
-            $this->lock_db = new file_locks;
+        $storage   = $this->rc->get_storage();
+        $namespace = $storage->get_namespace();
+        $separator = $storage->get_hierarchy_delimiter();
+        $uri       = str_replace(file_storage::SEPARATOR, $separator, $uri);
+        $owner     = $this->rc->get_user_name();
+
+        // find the owner and remove namespace prefix
+        foreach ($namespace as $type => $ns) {
+            foreach ($ns as $root) {
+                if (is_array($root) && $root[0] && strpos($uri, $root[0]) === 0) {
+                    $uri = substr($uri, strlen($root[0]));
+
+                    switch ($type) {
+                    case 'shared':
+                        // in theory there can be more than one shared root
+                        // we add it to dummy user name, so we can revert conversion
+                        $owner = "shared({$root[0]})";
+                        break;
+
+                    case 'other':
+                        list($user, $uri) = explode($separator, $uri, 2);
+
+                        if (strpos($user, '@') === false) {
+                            $domain = strstr($owner, '@');
+                            if (!empty($domain)) {
+                                $user .= $domain;
+                            }
+                        }
+
+                        $owner = $user;
+                        break;
+                    }
+
+                    break 2;
+                }
+            }
         }
+
+        // convert to imap charset (to be safe to store in DB)
+        $uri = rcube_charset::convert($uri, RCUBE_CHARSET, 'UTF7-IMAP');
+
+        return 'imap://' . urlencode($owner) . '@' . $storage->options['host'] . '/' . $uri;
     }
 
-    /**
-     * Apply any conversion on folder name input
-     */
-    protected function folder_in($folder_name)
+    protected function resource2uri($resource)
     {
-        $folder_name = rcube_charset::convert($folder_name, RCUBE_CHARSET, 'UTF7-IMAP');
+        if (!preg_match('|^imap://([^@]+)@([^/]+)/(.*)$|', $resource, $matches)) {
+            throw new Exception("Internal storage error. Unexpected data format.", file_storage::ERROR);
+        }
+
+        $storage   = $this->rc->get_storage();
+        $separator = $storage->get_hierarchy_delimiter();
+        $owner     = $this->rc->get_user_name();
+
+        $user = urldecode($matches[1]);
+        $uri  = $matches[3];
+
+        // convert from imap charset (to be safe to store in DB)
+        $uri = rcube_charset::convert($uri, 'UTF7-IMAP', RCUBE_CHARSET);
+
+        // personal namespace
+        if ($user == $owner) {
+            // do nothing
+            // Note: that might not work if personal namespace uses e.g. INBOX/ prefix.
+        }
+        // shared namespace
+        else if (preg_match('/^shared$(.*)$$/', $user, $matches)) {
+            $uri = $matches[1] . $uri;
+        }
+        // other users namespace
+        else {
+            $namespace = $storage->get_namespace('other');
 
-        $plugin = $this->rc->plugins->exec_hook('folder_mod',
-            array('folder' => $folder_name, 'dir' => 'in'));
+            list($local, $domain) = explode('@', $user);
 
-        return $plugin['folder'];
+            // here we assume there's only one other users namespace root
+            $uri = $namespace[0][0] . $local . $separator . $uri;
+        }
+
+        $uri = str_replace($separator, file_storage::SEPARATOR, $uri);
+
+        return $uri;
     }
 
     /**
-     * Apply any conversion on folder name output
-     *
-     * For example plugins can replace "/Outher Users/jane.doe/"
-     * with "/Other Users/Doe, Jane (jane.doe)/"
+     * Initializes file_locks object
      */
-    protected function folder_out($folder_name)
+    protected function init_lock_db()
     {
-        $plugin = $this->rc->plugins->exec_hook('folder_mod',
-            array('folder' => $folder_name, 'dir' => 'out'));
-
-        if (strpos($plugin['folder'], '&') !== false) {
-            $plugin['folder'] = rcube_charset::convert($plugin['folder'], 'UTF7-IMAP', RCUBE_CHARSET);
+        if (!$this->lock_db) {
+            $this->lock_db = new file_locks;
         }
-
-        return $plugin['folder'];
     }
 }

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/LICENSE Added

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/composer.json Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/config.inc.php.dist Added

@@ -0,0 +1,91 @@
+<?php
+
+// The id of the LDAP address book (which refers to the $rcmail_config['ldap_public'])
+// or complete addressbook definition array.
+// --------------------------------------------------------------------
+// Note: Multi-domain (hosted) installations can resolve domain aliases
+//   by adding following settings in kolab_auth_addressbook spec.:
+//
+//   'domain_base_dn'   => 'cn=kolab,cn=config',
+//   'domain_filter'    => '(&(objectclass=domainrelatedobject)(associateddomain=%s))',
+//   'domain_name_attr' => 'associateddomain',
+//
+//   With this %dc variable in base_dn and groups/base_dn will be
+//   replaced with DN string of resolved domain
+//---------------------------------------------------------------------
+$config['kolab_auth_addressbook'] = '';
+
+// This will overwrite defined filter
+$config['kolab_auth_filter'] = '(&(objectClass=kolabInetOrgPerson)(|(uid=%u)(mail=%fu)(alias=%fu)))';
+
+// Use this field (from fieldmap configuration) to get authentication ID. Don't use an array here!
+$config['kolab_auth_login'] = 'email';
+
+// Use these fields (from fieldmap configuration) for default identity.
+// If the value array contains more than one field, first non-empty will be used
+// Note: These aren't LDAP attributes, but field names in config
+// Note: If there's more than one email address, as many identities will be created
+$config['kolab_auth_name']         = array('name', 'cn');
+$config['kolab_auth_email']        = array('email');
+$config['kolab_auth_organization'] = array('organization');
+
+// Role field (from fieldmap configuration)
+$config['kolab_auth_role'] = 'role';
+
+// Template for user names displayed in the UI.
+// You can use all attributes from the 'fieldmap' property of the 'kolab_auth_addressbook' configuration
+$config['kolab_auth_user_displayname'] = '{name} ({ou})';
+
+// Login and password of the admin user. Enables "Login As" feature.
+$config['kolab_auth_admin_login']    = '';
+$config['kolab_auth_admin_password'] = '';
+
+// Enable audit logging for abuse of administrative privileges.
+$config['kolab_auth_auditlog'] = false;
+
+// As set of rules to define the required rights on the target entry
+// which allow an admin user to login as another user (the target).
+// The effective rights value refers to either entry level attribute level rights:
+//  * entry:[read|add|delete]
+//  * attrib:<attribute-name>:[read|write|delete]
+$config['kolab_auth_admin_rights'] = array(
+    // Roundcube task => required effective right
+    'settings'        => 'entry:read',
+    'mail'            => 'entry:delete',
+    'addressbook'     => 'entry:delete',
+    // or use a wildcard entry like this:
+    '*'               => 'entry:read',
+);
+
+// Enable plugins on a role-by-role basis. In this example, the 'acl' plugin
+// is enabled for people with a 'cn=professional-user,dc=mykolab,dc=ch' role.
+//
+// Note that this does NOT mean the 'acl' plugin is disabled for other people.
+$config['kolab_auth_role_plugins'] = Array(
+        'cn=professional-user,dc=mykolab,dc=ch' => Array(
+                'acl',
+            ),
+    );
+
+// Settings on a role-by-role basis. In this example, the 'htmleditor' setting
+// is enabled(1) for people with a 'cn=professional-user,dc=mykolab,dc=ch' role,
+// and it cannot be overridden. Sample use-case: disable htmleditor for normal people,
+// do not allow the setting to be controlled through the preferences, enable the
+// html editor for professional users and allow them to override the setting in
+// the preferences.
+$config['kolab_auth_role_settings'] = Array(
+        'cn=professional-user,dc=mykolab,dc=ch' => Array(
+                'htmleditor' => Array(
+                        'mode' => 'override',
+                        'value' => 1,
+                        'allow_override' => true
+                    ),
+            ),
+    );
+
+// List of LDAP addressbooks (keys of ldap_public configuration array)
+// for which base_dn variables (%dc, etc.) will be replaced according to authenticated user DN
+// Note: special name '*' for all LDAP addressbooks
+$config['kolab_auth_ldap_addressbooks'] = array('*');
+
+?>

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/kolab_auth.php Added

@@ -0,0 +1,788 @@
+<?php
+
+/**
+ * Kolab Authentication (based on ldap_authentication plugin)
+ *
+ * Authenticates on LDAP server, finds canonized authentication ID for IMAP
+ * and for new users creates identity based on LDAP information.
+ *
+ * Supports impersonate feature (login as another user). To use this feature
+ * imap_auth_type/smtp_auth_type must be set to DIGEST-MD5 or PLAIN.
+ *
+ * @version @package_version@
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2011-2013, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_auth extends rcube_plugin
+{
+    static $ldap;
+    private $username;
+    private $data = array();
+
+    public function init()
+    {
+        $rcmail = rcube::get_instance();
+
+        $this->load_config();
+
+        $this->add_hook('authenticate', array($this, 'authenticate'));
+        $this->add_hook('startup', array($this, 'startup'));
+        $this->add_hook('user_create', array($this, 'user_create'));
+
+        // Hook for password change
+        $this->add_hook('password_ldap_bind', array($this, 'password_ldap_bind'));
+
+        // Hooks related to "Login As" feature
+        $this->add_hook('template_object_loginform', array($this, 'login_form'));
+        $this->add_hook('storage_connect', array($this, 'imap_connect'));
+        $this->add_hook('managesieve_connect', array($this, 'imap_connect'));
+        $this->add_hook('smtp_connect', array($this, 'smtp_connect'));
+        $this->add_hook('identity_form', array($this, 'identity_form'));
+
+        // Hook to modify some configuration, e.g. ldap
+        $this->add_hook('config_get', array($this, 'config_get'));
+
+        // Hook to modify logging directory
+        $this->add_hook('write_log', array($this, 'write_log'));
+        $this->username = $_SESSION['username'];
+
+        // Enable debug logs (per-user), when logged as another user
+        if (!empty($_SESSION['kolab_auth_admin']) && $rcmail->config->get('kolab_auth_auditlog')) {
+            $rcmail->config->set('debug_level', 1);
+            $rcmail->config->set('devel_mode', true);
+            $rcmail->config->set('smtp_log', true);
+            $rcmail->config->set('log_logins', true);
+            $rcmail->config->set('log_session', true);
+            $rcmail->config->set('memcache_debug', true);
+            $rcmail->config->set('imap_debug', true);
+            $rcmail->config->set('ldap_debug', true);
+            $rcmail->config->set('smtp_debug', true);
+            $rcmail->config->set('sql_debug', true);
+
+            // SQL debug need to be set directly on DB object
+            // setting config variable will not work here because
+            // the object is already initialized/configured
+            if ($db = $rcmail->get_dbh()) {
+                $db->set_debug(true);
+            }
+        }
+    }
+
+    /**
+     * Startup hook handler
+     */
+    public function startup($args)
+    {
+        // Check access rights when logged in as another user
+        if (!empty($_SESSION['kolab_auth_admin']) && $args['task'] != 'login' && $args['task'] != 'logout') {
+            // access to specified task is forbidden,
+            // redirect to the first task on the list
+            if (!empty($_SESSION['kolab_auth_allowed_tasks'])) {
+                $tasks = (array)$_SESSION['kolab_auth_allowed_tasks'];
+                if (!in_array($args['task'], $tasks) && !in_array('*', $tasks)) {
+                    header('Location: ?_task=' . array_shift($tasks));
+                    die;
+                }
+
+                // add script that will remove disabled taskbar buttons
+                if (!in_array('*', $tasks)) {
+                    $this->add_hook('render_page', array($this, 'render_page'));
+                }
+            }
+        }
+
+        // load per-user settings
+        $this->load_user_role_plugins_and_settings();
+
+        return $args;
+    }
+
+    /**
+     * Modify some configuration according to LDAP user record
+     */
+    public function config_get($args)
+    {
+        // Replaces ldap_vars (%dc, etc) in public kolab ldap addressbooks
+        // config based on the users base_dn. (for multi domain support)
+        if ($args['name'] == 'ldap_public' && !empty($args['result'])) {
+            $rcmail      = rcube::get_instance();
+            $kolab_books = (array) $rcmail->config->get('kolab_auth_ldap_addressbooks');
+
+            foreach ($args['result'] as $name => $config) {
+                if (in_array($name, $kolab_books) || in_array('*', $kolab_books)) {
+                    $args['result'][$name] = $this->patch_ldap_config($config);
+                }
+            }
+        }
+        else if ($args['name'] == 'kolab_users_directory' && !empty($args['result'])) {
+            $args['result'] = $this->patch_ldap_config($args['result']);
+        }
+
+        return $args;
+    }
+
+    /**
+     * Helper method to patch the given LDAP directory config with user-specific values
+     */
+    protected function patch_ldap_config($config)
+    {
+        if (is_array($config)) {
+            $config['base_dn']        = self::parse_ldap_vars($config['base_dn']);
+            $config['search_base_dn'] = self::parse_ldap_vars($config['search_base_dn']);
+            $config['bind_dn']        = str_replace('%dn', $_SESSION['kolab_dn'], $config['bind_dn']);
+
+            if (!empty($config['groups'])) {
+                $config['groups']['base_dn'] = self::parse_ldap_vars($config['groups']['base_dn']);
+            }
+        }
+
+        return $config;
+    }
+
+    /**
+     * Modifies list of plugins and settings according to
+     * specified LDAP roles
+     */
+    public function load_user_role_plugins_and_settings()
+    {
+        if (empty($_SESSION['user_roledns'])) {
+            return;
+        }
+
+        $rcmail = rcube::get_instance();
+
+        // Example 'kolab_auth_role_plugins' =
+        //
+        //  Array(
+        //      '<role_dn>' => Array('plugin1', 'plugin2'),
+        //  );
+        //
+        // NOTE that <role_dn> may in fact be something like: 'cn=role,%dc'
+
+        $role_plugins = $rcmail->config->get('kolab_auth_role_plugins');
+
+        // Example $rcmail_config['kolab_auth_role_settings'] =
+        //
+        //  Array(
+        //      '<role_dn>' => Array(
+        //          '$setting' => Array(
+        //              'mode' => '(override|merge)', (default: override)
+        //              'value' => <>,
+        //              'allow_override' => (true|false) (default: false)
+        //          ),
+        //      ),
+        //  );
+        //
+        // NOTE that <role_dn> may in fact be something like: 'cn=role,%dc'
+
+        $role_settings = $rcmail->config->get('kolab_auth_role_settings');
+
+        if (!empty($role_plugins)) {
+            foreach ($role_plugins as $role_dn => $plugins) {
+                $role_dn = self::parse_ldap_vars($role_dn);
+                if (!empty($role_plugins[$role_dn])) {
+                    $role_plugins[$role_dn] = array_unique(array_merge((array)$role_plugins[$role_dn], $plugins));
+                } else {
+                    $role_plugins[$role_dn] = $plugins;
+                }
+            }
+        }
+
+        if (!empty($role_settings)) {
+            foreach ($role_settings as $role_dn => $settings) {
+                $role_dn = self::parse_ldap_vars($role_dn);
+                if (!empty($role_settings[$role_dn])) {
+                    $role_settings[$role_dn] = array_merge((array)$role_settings[$role_dn], $settings);
+                } else {
+                    $role_settings[$role_dn] = $settings;
+                }
+            }
+        }
+
+        foreach ($_SESSION['user_roledns'] as $role_dn) {
+            if (!empty($role_settings[$role_dn]) && is_array($role_settings[$role_dn])) {
+                foreach ($role_settings[$role_dn] as $setting_name => $setting) {
+                    if (!isset($setting['mode'])) {
+                        $setting['mode'] = 'override';
+                    }
+
+                    if ($setting['mode'] == "override") {
+                        $rcmail->config->set($setting_name, $setting['value']);
+                    } elseif ($setting['mode'] == "merge") {
+                        $orig_setting = $rcmail->config->get($setting_name);
+
+                        if (!empty($orig_setting)) {
+                            if (is_array($orig_setting)) {
+                                $rcmail->config->set($setting_name, array_merge($orig_setting, $setting['value']));
+                            }
+                        } else {
+                            $rcmail->config->set($setting_name, $setting['value']);
+                        }
+                    }
+
+                    $dont_override = (array) $rcmail->config->get('dont_override');
+
+                    if (empty($setting['allow_override'])) {
+                        $rcmail->config->set('dont_override', array_merge($dont_override, array($setting_name)));
+                    }
+                    else {
+                        if (in_array($setting_name, $dont_override)) {
+                            $_dont_override = array();
+                            foreach ($dont_override as $_setting) {
+                                if ($_setting != $setting_name) {
+                                    $_dont_override[] = $_setting;
+                                }
+                            }
+                            $rcmail->config->set('dont_override', $_dont_override);
+                        }
+                    }
+
+                    if ($setting_name == 'skin') {
+                        if ($rcmail->output->type == 'html') {
+                            $rcmail->output->set_skin($setting['value']);
+                            $rcmail->output->set_env('skin', $setting['value']);
+                        }
+                    }
+                }
+            }
+
+            if (!empty($role_plugins[$role_dn])) {
+                foreach ((array)$role_plugins[$role_dn] as $plugin) {
+                    $this->api->load_plugin($plugin);
+                }
+            }
+        }
+    }
+
+    /**
+     * Logging method replacement to print debug/errors into
+     * a separate (sub)folder for each user
+     */
+    public function write_log($args)
+    {
+        $rcmail = rcube::get_instance();
+
+        if ($rcmail->config->get('log_driver') == 'syslog') {
+            return $args;
+        }
+
+        // log_driver == 'file' is assumed here
+        $log_dir  = $rcmail->config->get('log_dir', RCUBE_INSTALL_PATH . 'logs');
+
+        // Append original username + target username for audit-logging
+        if ($rcmail->config->get('kolab_auth_auditlog') && !empty($_SESSION['kolab_auth_admin'])) {
+            $args['dir'] = $log_dir . '/' . strtolower($_SESSION['kolab_auth_admin']) . '/' . strtolower($this->username);
+
+            // Attempt to create the directory
+            if (!is_dir($args['dir'])) {
+                @mkdir($args['dir'], 0750, true);
+            }
+        }
+        // Define the user log directory if a username is provided
+        else if ($rcmail->config->get('per_user_logging') && !empty($this->username)) {
+            $user_log_dir = $log_dir . '/' . strtolower($this->username);
+            if (is_writable($user_log_dir)) {
+                $args['dir'] = $user_log_dir;
+            }
+            else if ($args['name'] != 'errors') {
+                $args['abort'] = true;  // don't log if unauthenticed
+            }
+        }
+
+        return $args;
+    }
+
+    /**
+     * Sets defaults for new user.
+     */
+    public function user_create($args)
+    {
+        if (!empty($this->data['user_email'])) {
+            // addresses list is supported
+            if (array_key_exists('email_list', $args)) {
+                $email_list = array_unique($this->data['user_email']);
+
+                // add organization to the list
+                if (!empty($this->data['user_organization'])) {
+                    foreach ($email_list as $idx => $email) {
+                        $email_list[$idx] = array(
+                            'organization' => $this->data['user_organization'],
+                            'email'        => $email,
+                        );
+                    }
+                }
+
+                $args['email_list'] = $email_list;
+            }
+            else {
+                $args['user_email'] = $this->data['user_email'][0];
+            }
+        }
+
+        if (!empty($this->data['user_name'])) {
+            $args['user_name'] = $this->data['user_name'];
+        }
+
+        return $args;
+    }
+
+    /**
+     * Modifies login form adding additional "Login As" field
+     */
+    public function login_form($args)
+    {
+        $this->add_texts('localization/');
+
+        $rcmail      = rcube::get_instance();
+        $admin_login = $rcmail->config->get('kolab_auth_admin_login');
+        $group       = $rcmail->config->get('kolab_auth_group');
+        $role_attr   = $rcmail->config->get('kolab_auth_role');
+
+        // Show "Login As" input
+        if (empty($admin_login) || (empty($group) && empty($role_attr))) {
+            return $args;
+        }
+
+        $input = new html_inputfield(array('name' => '_loginas', 'id' => 'rcmloginas',
+            'type' => 'text', 'autocomplete' => 'off'));
+        $row = html::tag('tr', null,
+            html::tag('td', 'title', html::label('rcmloginas', Q($this->gettext('loginas'))))
+            . html::tag('td', 'input', $input->show(trim(rcube_utils::get_input_value('_loginas', rcube_utils::INPUT_POST))))
+        );
+        $args['content'] = preg_replace('/<\/tbody>/i', $row . '</tbody>', $args['content']);
+
+        return $args;
+    }
+
+    /**
+     * Find user credentials In LDAP.
+     */
+    public function authenticate($args)
+    {
+        // get username and host
+        $host    = $args['host'];
+        $user    = $args['user'];
+        $pass    = $args['pass'];
+        $loginas = trim(rcube_utils::get_input_value('_loginas', rcube_utils::INPUT_POST));
+
+        if (empty($user) || empty($pass)) {
+            $args['abort'] = true;
+            return $args;
+        }
+
+        // temporarily set the current username to the one submitted
+        $this->username = $user;
+
+        $ldap = self::ldap();
+        if (!$ldap || !$ldap->ready) {
+            $args['abort'] = true;
+            $args['kolab_ldap_error'] = true;
+            $message = sprintf(
+                    'Login failure for user %s from %s in session %s (error %s)',
+                    $user,
+                    rcube_utils::remote_ip(),
+                    session_id(),
+                    "LDAP not ready"
+                );
+
+            rcube::write_log('userlogins', $message);
+
+            return $args;
+        }
+
+        // Find user record in LDAP
+        $record = $ldap->get_user_record($user, $host);
+
+        if (empty($record)) {
+            $args['abort'] = true;
+            $message = sprintf(
+                    'Login failure for user %s from %s in session %s (error %s)',
+                    $user,
+                    rcube_utils::remote_ip(),
+                    session_id(),
+                    "No user record found"
+                );
+
+            rcube::write_log('userlogins', $message);
+
+            return $args;
+        }
+
+        $rcmail      = rcube::get_instance();
+        $admin_login = $rcmail->config->get('kolab_auth_admin_login');
+        $admin_pass  = $rcmail->config->get('kolab_auth_admin_password');
+        $login_attr  = $rcmail->config->get('kolab_auth_login');
+        $name_attr   = $rcmail->config->get('kolab_auth_name');
+        $email_attr  = $rcmail->config->get('kolab_auth_email');
+        $org_attr    = $rcmail->config->get('kolab_auth_organization');
+        $role_attr   = $rcmail->config->get('kolab_auth_role');
+        $imap_attr   = $rcmail->config->get('kolab_auth_mailhost');
+
+        if (!empty($role_attr) && !empty($record[$role_attr])) {
+            $_SESSION['user_roledns'] = (array)($record[$role_attr]);
+        }
+
+        if (!empty($imap_attr) && !empty($record[$imap_attr])) {
+            $default_host = $rcmail->config->get('default_host');
+            if (!empty($default_host)) {
+                rcube::write_log("errors", "Both default host and kolab_auth_mailhost set. Incompatible.");
+            } else {
+                $args['host'] = "tls://" . $record[$imap_attr];
+            }
+        }
+
+        // Login As...
+        if (!empty($loginas) && $admin_login) {
+            // Authenticate to LDAP
+            $result = $ldap->bind($record['dn'], $pass);
+
+            if (!$result) {
+                $args['abort'] = true;
+                $message = sprintf(
+                        'Login failure for user %s from %s in session %s (error %s)',
+                        $user,
+                        rcube_utils::remote_ip(),
+                        session_id(),
+                        "Unable to bind with '" . $record['dn'] . "'"
+                    );
+
+                rcube::write_log('userlogins', $message);
+
+                return $args;
+            }
+
+            $isadmin = false;
+            $admin_rights = $rcmail->config->get('kolab_auth_admin_rights', array());
+
+            // @deprecated: fall-back to the old check if the original user has/belongs to administrative role/group
+            if (empty($admin_rights)) {
+                $group   = $rcmail->config->get('kolab_auth_group');
+                $role_dn = $rcmail->config->get('kolab_auth_role_value');
+
+                // check role attribute
+                if (!empty($role_attr) && !empty($role_dn) && !empty($record[$role_attr])) {
+                    $role_dn = $ldap->parse_vars($role_dn, $user, $host);
+                    if (in_array($role_dn, (array)$record[$role_attr])) {
+                        $isadmin = true;
+                    }
+                }
+
+                // check group
+                if (!$isadmin && !empty($group)) {
+                    $groups = $ldap->get_user_groups($record['dn'], $user, $host);
+                    if (in_array($group, $groups)) {
+                        $isadmin = true;
+                    }
+                }
+
+                if ($isadmin) {
+                    // user has admin privileges privilage, get "login as" user credentials
+                    $target_entry = $ldap->get_user_record($loginas, $host);
+                    $allowed_tasks = $rcmail->config->get('kolab_auth_allowed_tasks');
+                }
+            }
+            else {
+                // get "login as" user credentials
+                $target_entry = $ldap->get_user_record($loginas, $host);
+
+                if (!empty($target_entry)) {
+                    // get effective rights to determine login-as permissions
+                    $effective_rights = (array)$ldap->effective_rights($target_entry['dn']);
+
+                    if (!empty($effective_rights)) {
+                        $effective_rights['attrib'] = $effective_rights['attributeLevelRights'];
+                        $effective_rights['entry']  = $effective_rights['entryLevelRights'];
+
+                        // compare the rights with the permissions mapping
+                        $allowed_tasks = array();
+                        foreach ($admin_rights as $task => $perms) {
+                            $perms_ = explode(':', $perms);
+                            $type   = array_shift($perms_);
+                            $req    = array_pop($perms_);
+                            $attrib = array_pop($perms_);
+
+                            if (array_key_exists($type, $effective_rights)) {
+                                if ($type == 'entry' && in_array($req, $effective_rights[$type])) {
+                                    $allowed_tasks[] = $task;
+                                }
+                                else if ($type == 'attrib' && array_key_exists($attrib, $effective_rights[$type]) &&
+                                        in_array($req, $effective_rights[$type][$attrib])) {
+                                    $allowed_tasks[] = $task;
+                                }
+                            }
+                        }
+
+                        $isadmin = !empty($allowed_tasks);
+                    }
+                }
+            }
+
+            // Save original user login for log (see below)
+            if ($login_attr) {
+                $origname = is_array($record[$login_attr]) ? $record[$login_attr][0] : $record[$login_attr];
+            }
+            else {
+                $origname = $user;
+            }
+
+            if (!$isadmin || empty($target_entry)) {
+                $this->add_texts('localization/');
+
+                $args['abort'] = true;
+                $args['error'] = $this->gettext(array(
+                    'name' => 'loginasnotallowed',
+                    'vars' => array('user' => Q($loginas)),
+                ));
+
+                $message = sprintf(
+                        'Login failure for user %s (as user %s) from %s in session %s (error %s)',
+                        $user,
+                        $loginas,
+                        rcube_utils::remote_ip(),
+                        session_id(),
+                        "No privileges to login as '" . $loginas . "'"
+                    );
+
+                rcube::write_log('userlogins', $message);
+
+                return $args;
+            }
+
+            // replace $record with target entry
+            $record = $target_entry;
+
+            $args['user'] = $this->username = $loginas;
+
+            // Mark session to use SASL proxy for IMAP authentication
+            $_SESSION['kolab_auth_admin']    = strtolower($origname);
+            $_SESSION['kolab_auth_login']    = $rcmail->encrypt($admin_login);
+            $_SESSION['kolab_auth_password'] = $rcmail->encrypt($admin_pass);
+            $_SESSION['kolab_auth_allowed_tasks'] = $allowed_tasks;
+        }
+
+        // Store UID and DN of logged user in session for use by other plugins
+        $_SESSION['kolab_uid'] = is_array($record['uid']) ? $record['uid'][0] : $record['uid'];
+        $_SESSION['kolab_dn']  = $record['dn'];
+
+        // Store LDAP replacement variables used for current user
+        // This improves performance of load_user_role_plugins_and_settings()
+        // which is executed on every request (via startup hook) and where
+        // we don't like to use LDAP (connection + bind + search)
+        $_SESSION['kolab_auth_vars'] = $ldap->get_parse_vars();
+
+        // Set user login
+        if ($login_attr) {
+            $this->data['user_login'] = is_array($record[$login_attr]) ? $record[$login_attr][0] : $record[$login_attr];
+        }
+        if ($this->data['user_login']) {
+            $args['user'] = $this->username = $this->data['user_login'];
+        }
+
+        // User name for identity (first log in)
+        foreach ((array)$name_attr as $field) {
+            $name = is_array($record[$field]) ? $record[$field][0] : $record[$field];
+            if (!empty($name)) {
+                $this->data['user_name'] = $name;
+                break;
+            }
+        }
+        // User email(s) for identity (first log in)
+        foreach ((array)$email_attr as $field) {
+            $email = is_array($record[$field]) ? array_filter($record[$field]) : $record[$field];
+            if (!empty($email)) {
+                $this->data['user_email'] = array_merge((array)$this->data['user_email'], (array)$email);
+            }
+        }
+        // Organization name for identity (first log in)
+        foreach ((array)$org_attr as $field) {
+            $organization = is_array($record[$field]) ? $record[$field][0] : $record[$field];
+            if (!empty($organization)) {
+                $this->data['user_organization'] = $organization;
+                break;
+            }
+        }
+
+        // Log "Login As" usage
+        if (!empty($origname)) {
+            rcube::write_log('userlogins', sprintf('Admin login for %s by %s from %s',
+                $args['user'], $origname, rcube_utils::remote_ip()));
+        }
+
+        // load per-user settings/plugins
+        $this->load_user_role_plugins_and_settings();
+
+        return $args;
+    }
+
+    /**
+     * Set user DN for password change (password plugin with ldap_simple driver)
+     */
+    public function password_ldap_bind($args)
+    {
+        $args['user_dn'] = $_SESSION['kolab_dn'];
+
+        $rcmail = rcube::get_instance();
+
+        $rcmail->config->set('password_ldap_method', 'user');
+
+        return $args;
+    }
+
+    /**
+     * Sets SASL Proxy login/password for IMAP and Managesieve auth
+     */
+    public function imap_connect($args)
+    {
+        if (!empty($_SESSION['kolab_auth_admin'])) {
+            $rcmail      = rcube::get_instance();
+            $admin_login = $rcmail->decrypt($_SESSION['kolab_auth_login']);
+            $admin_pass  = $rcmail->decrypt($_SESSION['kolab_auth_password']);
+
+            $args['auth_cid'] = $admin_login;
+            $args['auth_pw']  = $admin_pass;
+        }
+
+        return $args;
+    }
+
+    /**
+     * Sets SASL Proxy login/password for SMTP auth
+     */
+    public function smtp_connect($args)
+    {
+        if (!empty($_SESSION['kolab_auth_admin'])) {
+            $rcmail      = rcube::get_instance();
+            $admin_login = $rcmail->decrypt($_SESSION['kolab_auth_login']);
+            $admin_pass  = $rcmail->decrypt($_SESSION['kolab_auth_password']);
+
+            $args['smtp_auth_cid'] = $admin_login;
+            $args['smtp_auth_pw']  = $admin_pass;
+        }
+
+        return $args;
+    }
+
+    /**
+     * Hook to replace the plain text input field for email address by a drop-down list
+     * with all email addresses (including aliases) from this user's LDAP record.
+     */
+    public function identity_form($args)
+    {
+        $rcmail      = rcube::get_instance();
+        $ident_level = intval($rcmail->config->get('identities_level', 0));
+
+        // do nothing if email address modification is disabled
+        if ($ident_level == 1 || $ident_level == 3) {
+            return $args;
+        }
+
+        $ldap = self::ldap();
+        if (!$ldap || !$ldap->ready || empty($_SESSION['kolab_dn'])) {
+            return $args;
+        }
+
+        $emails      = array();
+        $user_record = $ldap->get_record($_SESSION['kolab_dn']);
+
+        foreach ((array)$rcmail->config->get('kolab_auth_email', array()) as $col) {
+            $values = rcube_addressbook::get_col_values($col, $user_record, true);
+            if (!empty($values))
+                $emails = array_merge($emails, array_filter($values));
+        }
+
+        // kolab_delegation might want to modify this addresses list
+        $plugin = $rcmail->plugins->exec_hook('kolab_auth_emails', array('emails' => $emails));
+        $emails = $plugin['emails'];
+
+        if (!empty($emails)) {
+            $args['form']['addressing']['content']['email'] = array(
+                'type' => 'select',
+                'options' => array_combine($emails, $emails),
+            );
+        }
+
+        return $args;
+    }
+
+    /**
+     * Action executed before the page is rendered to add an onload script
+     * that will remove all taskbar buttons for disabled tasks
+     */
+    public function render_page($args)
+    {
+        $rcmail  = rcube::get_instance();
+        $tasks   = (array)$_SESSION['kolab_auth_allowed_tasks'];
+        $tasks[] = 'logout';
+
+        // disable buttons in taskbar
+        $script = "
+        \$('a').filter(function() {
+            var ev = \$(this).attr('onclick');
+            return ev && ev.match(/'switch-task','([a-z]+)'/)
+                && \$.inArray(RegExp.\$1, " . json_encode($tasks) . ") < 0;
+        }).remove();
+        ";
+
+        $rcmail->output->add_script($script, 'docready');
+    }
+
+    /**
+     * Initializes LDAP object and connects to LDAP server
+     */
+    public static function ldap()
+    {
+        if (self::$ldap) {
+            return self::$ldap;
+        }
+
+        $rcmail      = rcube::get_instance();
+        $addressbook = $rcmail->config->get('kolab_auth_addressbook');
+
+        if (!is_array($addressbook)) {
+            $ldap_config = (array)$rcmail->config->get('ldap_public');
+            $addressbook = $ldap_config[$addressbook];
+        }
+
+        if (empty($addressbook)) {
+            return null;
+        }
+
+        require_once __DIR__ . '/kolab_auth_ldap.php';
+
+        self::$ldap = new kolab_auth_ldap($addressbook);
+
+        return self::$ldap;
+    }
+
+    /**
+     * Parses LDAP DN string with replacing supported variables.
+     * See kolab_auth_ldap::parse_vars()
+     *
+     * @param string $str LDAP DN string
+     *
+     * @return string Parsed DN string
+     */
+    public static function parse_ldap_vars($str)
+    {
+        if (!empty($_SESSION['kolab_auth_vars'])) {
+            $str = strtr($str, $_SESSION['kolab_auth_vars']);
+        }
+
+        return $str;
+    }
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/kolab_auth_ldap.php Added

@@ -0,0 +1,548 @@
+<?php
+
+/**
+ * Kolab Authentication
+ *
+ * @version @package_version@
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2011-2013, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+/**
+ * Wrapper class for rcube_ldap_generic
+ */
+class kolab_auth_ldap extends rcube_ldap_generic
+{
+    private $icache = array();
+    private $conf = array();
+    private $fieldmap = array();
+
+
+    function __construct($p)
+    {
+        $rcmail = rcube::get_instance();
+
+        $this->conf = $p;
+        $this->conf['kolab_auth_user_displayname'] = $rcmail->config->get('kolab_auth_user_displayname', '{name}');
+
+        $this->fieldmap = $p['fieldmap'];
+        $this->fieldmap['uid'] = 'uid';
+
+        $p['attributes'] = array_values($this->fieldmap);
+        $p['debug']      = (bool) $rcmail->config->get('ldap_debug');
+
+        // Connect to the server (with bind)
+        parent::__construct($p);
+        $this->_connect();
+
+        $rcmail->add_shutdown_function(array($this, 'close'));
+    }
+
+    /**
+    * Establish a connection to the LDAP server
+    */
+    private function _connect()
+    {
+        // try to connect + bind for every host configured
+        // with OpenLDAP 2.x ldap_connect() always succeeds but ldap_bind will fail if host isn't reachable
+        // see http://www.php.net/manual/en/function.ldap-connect.php
+        foreach ((array)$this->config['hosts'] as $host) {
+            // skip host if connection failed
+            if (!$this->connect($host)) {
+                continue;
+            }
+
+            $bind_pass = $this->config['bind_pass'];
+            $bind_user = $this->config['bind_user'];
+            $bind_dn   = $this->config['bind_dn'];
+
+            if (empty($bind_pass)) {
+                $this->ready = true;
+            }
+            else {
+                if (!empty($bind_dn)) {
+                    $this->ready = $this->bind($bind_dn, $bind_pass);
+                }
+                else if (!empty($this->config['auth_cid'])) {
+                    $this->ready = $this->sasl_bind($this->config['auth_cid'], $bind_pass, $bind_user);
+                }
+                else {
+                    $this->ready = $this->sasl_bind($bind_user, $bind_pass);
+                }
+            }
+
+            // connection established, we're done here
+            if ($this->ready) {
+                break;
+            }
+
+        }  // end foreach hosts
+
+        if (!is_resource($this->conn)) {
+            rcube::raise_error(array('code' => 100, 'type' => 'ldap',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Could not connect to any LDAP server, last tried $host"), true);
+
+            $this->ready = false;
+        }
+
+        return $this->ready;
+    }
+
+    /**
+     * Fetches user data from LDAP addressbook
+     */
+    function get_user_record($user, $host)
+    {
+        $rcmail  = rcube::get_instance();
+        $filter  = $rcmail->config->get('kolab_auth_filter');
+        $filter  = $this->parse_vars($filter, $user, $host);
+        $base_dn = $this->parse_vars($this->config['base_dn'], $user, $host);
+        $scope   = $this->config['scope'];
+
+        // @TODO: print error if filter is empty
+
+        // get record
+        if ($result = parent::search($base_dn, $filter, $scope, $this->attributes)) {
+            if ($result->count() == 1) {
+                $entries = $result->entries(true);
+                $dn      = key($entries);
+                $entry   = array_pop($entries);
+                $entry   = $this->field_mapping($dn, $entry);
+
+                return $entry;
+            }
+        }
+    }
+
+    /**
+     * Fetches user data from LDAP addressbook
+     */
+    function get_user_groups($dn, $user, $host)
+    {
+        if (empty($dn) || empty($this->config['groups'])) {
+            return array();
+        }
+
+        $base_dn     = $this->parse_vars($this->config['groups']['base_dn'], $user, $host);
+        $name_attr   = $this->config['groups']['name_attr'] ? $this->config['groups']['name_attr'] : 'cn';
+        $member_attr = $this->get_group_member_attr();
+        $filter      = "(member=$dn)(uniqueMember=$dn)";
+
+        if ($member_attr != 'member' && $member_attr != 'uniqueMember')
+            $filter .= "($member_attr=$dn)";
+        $filter = strtr("(|$filter)", array("\\" => "\\\\"));
+
+        $result = parent::search($base_dn, $filter, 'sub', array('dn', $name_attr));
+
+        if (!$result) {
+            return array();
+        }
+
+        $groups = array();
+        foreach ($result as $entry) {
+            $dn    = $entry['dn'];
+            $entry = rcube_ldap_generic::normalize_entry($entry);
+
+            $groups[$dn] = $entry[$name_attr];
+        }
+
+        return $groups;
+    }
+
+    /**
+     * Get a specific LDAP record
+     *
+     * @param string DN
+     *
+     * @return array Record data
+     */
+    function get_record($dn)
+    {
+        if (!$this->ready) {
+            return;
+        }
+
+        if ($rec = $this->get_entry($dn)) {
+            $rec = rcube_ldap_generic::normalize_entry($rec);
+            $rec = $this->field_mapping($dn, $rec);
+        }
+
+        return $rec;
+    }
+
+    /**
+     * Replace LDAP record data items
+     *
+     * @param string $dn    DN
+     * @param array  $entry LDAP entry
+     *
+     * return bool True on success, False on failure
+     */
+    function replace($dn, $entry)
+    {
+        // fields mapping
+        foreach ($this->fieldmap as $field => $attr) {
+            if (array_key_exists($field, $entry)) {
+                $entry[$attr] = $entry[$field];
+                if ($attr != $field) {
+                    unset($entry[$field]);
+                }
+            }
+        }
+
+        return $this->mod_replace($dn, $entry);
+    }
+
+    /**
+     * Search records (simplified version of rcube_ldap::search)
+     *
+     * @param mixed   $fields   The field name or array of field names to search in
+     * @param mixed   $value    Search value (or array of values when $fields is array)
+     * @param int     $mode     Matching mode:
+     *                          0 - partial (*abc*),
+     *                          1 - strict (=),
+     *                          2 - prefix (abc*)
+     * @param array   $required List of fields that cannot be empty
+     * @param int     $limit    Number of records
+     * @param int     $count    Returns the number of records found
+     *
+     * @return array List or false on error
+     */
+    function dosearch($fields, $value, $mode=1, $required = array(), $limit = 0, &$count = 0)
+    {
+        if (empty($fields)) {
+            return array();
+        }
+
+        $mode = intval($mode);
+
+        // use AND operator for advanced searches
+        $filter = is_array($value) ? '(&' : '(|';
+
+        // set wildcards
+        $wp = $ws = '';
+        if (!empty($this->config['fuzzy_search']) && $mode != 1) {
+            $ws = '*';
+            if (!$mode) {
+                $wp = '*';
+            }
+        }
+
+        foreach ((array)$fields as $idx => $field) {
+            $val   = is_array($value) ? $value[$idx] : $value;
+            $attrs = (array) $this->fieldmap[$field];
+
+            if (empty($attrs)) {
+                $filter .= "($field=$wp" . rcube_ldap_generic::quote_string($val) . "$ws)";
+            }
+            else {
+                if (count($attrs) > 1)
+                    $filter .= '(|';
+                foreach ($attrs as $f)
+                    $filter .= "($f=$wp" . rcube_ldap_generic::quote_string($val) . "$ws)";
+                if (count($attrs) > 1)
+                    $filter .= ')';
+            }
+        }
+        $filter .= ')';
+
+        // add required (non empty) fields filter
+        $req_filter = '';
+
+        foreach ((array)$required as $field) {
+            if (in_array($field, (array)$fields))  // required field is already in search filter
+                continue;
+
+            $attrs = (array) $this->fieldmap[$field];
+
+            if (empty($attrs)) {
+                $req_filter .= "($field=*)";
+            }
+            else {
+                if (count($attrs) > 1)
+                    $req_filter .= '(|';
+                foreach ($attrs as $f)
+                    $req_filter .= "($f=*)";
+                if (count($attrs) > 1)
+                    $req_filter .= ')';
+            }
+        }
+
+        if (!empty($req_filter)) {
+            $filter = '(&' . $req_filter . $filter . ')';
+        }
+
+        // avoid double-wildcard if $value is empty
+        $filter = preg_replace('/\*+/', '*', $filter);
+
+        // add general filter to query
+        if (!empty($this->config['filter'])) {
+            $filter = '(&(' . preg_replace('/^$|$$/', '', $this->config['filter']) . ')' . $filter . ')';
+        }
+
+        $base_dn = $this->parse_vars($this->config['base_dn']);
+        $scope   = $this->config['scope'];
+        $attrs   = array_values($this->fieldmap);
+        $list    = array();
+
+        if ($result = $this->search($base_dn, $filter, $scope, $attrs)) {
+            $count = $result->count();
+            $i = 0;
+            foreach ($result as $entry) {
+                if ($limit && $limit <= $i) {
+                    break;
+                }
+
+                $dn        = $entry['dn'];
+                $entry     = rcube_ldap_generic::normalize_entry($entry);
+                $list[$dn] = $this->field_mapping($dn, $entry);
+                $i++;
+            }
+        }
+
+        return $list;
+    }
+
+    /**
+     * Set filter used in search()
+     */
+    function set_filter($filter)
+    {
+        $this->config['filter'] = $filter;
+    }
+
+    /**
+     * Maps LDAP attributes to defined fields
+     */
+    protected function field_mapping($dn, $entry)
+    {
+        $entry['dn'] = $dn;
+
+        // fields mapping
+        foreach ($this->fieldmap as $field => $attr) {
+            // $entry might be indexed by lower-case attribute names
+            $attr_lc = strtolower($attr);
+            if (isset($entry[$attr_lc])) {
+                $entry[$field] = $entry[$attr_lc];
+            }
+            else if (isset($entry[$attr])) {
+                $entry[$field] = $entry[$attr];
+            }
+        }
+
+        // compose display name according to config
+        if (empty($this->fieldmap['displayname'])) {
+            $entry['displayname'] = rcube_addressbook::compose_search_name(
+                $entry,
+                $entry['email'],
+                $entry['name'],
+                $this->conf['kolab_auth_user_displayname']
+            );
+        }
+
+        return $entry;
+    }
+
+    /**
+     * Detects group member attribute name
+     */
+    private function get_group_member_attr($object_classes = array())
+    {
+        if (empty($object_classes)) {
+            $object_classes = $this->config['groups']['object_classes'];
+        }
+        if (!empty($object_classes)) {
+            foreach ((array)$object_classes as $oc) {
+                switch (strtolower($oc)) {
+                    case 'group':
+                    case 'groupofnames':
+                    case 'kolabgroupofnames':
+                        $member_attr = 'member';
+                        break;
+
+                    case 'groupofuniquenames':
+                    case 'kolabgroupofuniquenames':
+                        $member_attr = 'uniqueMember';
+                        break;
+                }
+            }
+        }
+
+        if (!empty($member_attr)) {
+            return $member_attr;
+        }
+
+        if (!empty($this->config['groups']['member_attr'])) {
+            return $this->config['groups']['member_attr'];
+        }
+
+        return 'member';
+    }
+
+    /**
+     * Prepares filter query for LDAP search
+     */
+    function parse_vars($str, $user = null, $host = null)
+    {
+        // When authenticating user $user is always set
+        // if not set it means we use this LDAP object for other
+        // purposes, e.g. kolab_delegation, then username with
+        // correct domain is in a session
+        if (!$user) {
+            $user = $_SESSION['username'];
+        }
+
+        if (isset($this->icache[$user])) {
+            list($user, $dc) = $this->icache[$user];
+        }
+        else {
+            $orig_user = $user;
+            $rcmail = rcube::get_instance();
+
+            // get default domain
+            if ($username_domain = $rcmail->config->get('username_domain')) {
+                if ($host && is_array($username_domain) && isset($username_domain[$host])) {
+                    $domain = rcube_utils::parse_host($username_domain[$host], $host);
+                }
+                else if (is_string($username_domain)) {
+                    $domain = rcube_utils::parse_host($username_domain, $host);
+                }
+            }
+
+            // realmed username (with domain)
+            if (strpos($user, '@')) {
+                list($usr, $dom) = explode('@', $user);
+
+                // unrealm domain, user login can contain a domain alias
+                if ($dom != $domain && ($dc = $this->find_domain($dom))) {
+                    // @FIXME: we should replace domain in $user, I suppose
+                }
+            }
+            else if ($domain) {
+                $user .= '@' . $domain;
+            }
+
+            $this->icache[$orig_user] = array($user, $dc);
+        }
+
+        // replace variables in filter
+        list($u, $d) = explode('@', $user);
+
+        // hierarchal domain string
+        if (empty($dc)) {
+            $dc = 'dc=' . strtr($d, array('.' => ',dc='));
+        }
+
+        $replaces = array('%dc' => $dc, '%d' => $d, '%fu' => $user, '%u' => $u);
+
+        $this->parse_replaces = $replaces;
+
+        return strtr($str, $replaces);
+    }
+
+    /**
+     * Find root domain for specified domain
+     *
+     * @param string $domain Domain name
+     *
+     * @return string Domain DN string
+     */
+    function find_domain($domain)
+    {
+        if (empty($domain) || empty($this->config['domain_base_dn']) || empty($this->config['domain_filter'])) {
+            return null;
+        }
+
+        $base_dn   = $this->config['domain_base_dn'];
+        $filter    = $this->config['domain_filter'];
+        $name_attr = $this->config['domain_name_attribute'];
+
+        if (empty($name_attr)) {
+            $name_attr = 'associateddomain';
+        }
+
+        $filter = str_replace('%s', rcube_ldap_generic::quote_string($domain), $filter);
+        $result = parent::search($base_dn, $filter, 'sub', array($name_attr, 'inetdomainbasedn'));
+
+        if (!$result) {
+            return null;
+        }
+
+        $entries  = $result->entries(true);
+        $entry_dn = key($entries);
+        $entry    = $entries[$entry_dn];
+
+        if (is_array($entry)) {
+            if (!empty($entry['inetdomainbasedn'])) {
+                return $entry['inetdomainbasedn'];
+            }
+
+            $domain = is_array($entry[$name_attr]) ? $entry[$name_attr][0] : $entry[$name_attr];
+
+            return $domain ? 'dc=' . implode(',dc=', explode('.', $domain)) : null;
+        }
+    }
+
+    /**
+     * Returns variables used for replacement in (last) parse_vars() call
+     *
+     * @return array Variable-value hash array
+     */
+    public function get_parse_vars()
+    {
+        return $this->parse_replaces;
+    }
+
+    /**
+     * Register additional fields
+     */
+    public function extend_fieldmap($map)
+    {
+        foreach ((array)$map as $name => $attr) {
+            if (!in_array($attr, $this->attributes)) {
+                $this->attributes[]    = $attr;
+                $this->fieldmap[$name] = $attr;
+            }
+        }
+    }
+
+    /**
+     * HTML-safe DN string encoding
+     *
+     * @param string $str DN string
+     *
+     * @return string Encoded HTML identifier string
+     */
+    static function dn_encode($str)
+    {
+        return rtrim(strtr(base64_encode($str), '+/', '-_'), '=');
+    }
+
+    /**
+     * Decodes DN string encoded with _dn_encode()
+     *
+     * @param string $str Encoded HTML identifier string
+     *
+     * @return string DN string
+     */
+    static function dn_decode($str)
+    {
+        $str = str_pad(strtr($str, '-_', '+/'), strlen($str) % 4, '=', STR_PAD_RIGHT);
+        return base64_decode($str);
+    }
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/bg_BG.inc Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/de_CH.inc Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/de_DE.inc Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/en_US.inc Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/es_ES.inc Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/et_EE.inc Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/fr_FR.inc Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/ja_JP.inc Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/nl_NL.inc Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/pl_PL.inc Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/pt_BR.inc Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/ru_RU.inc Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/LICENSE Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/README Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql.initial.sql Added

@@ -0,0 +1,187 @@
+/**
+ * libkolab database schema
+ *
+ * @version 1.1
+ * @author Thomas Bruederli
+ * @licence GNU AGPL
+ **/
+
+
+DROP TABLE IF EXISTS `kolab_folders`;
+
+CREATE TABLE `kolab_folders` (
+  `folder_id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `resource` VARCHAR(255) NOT NULL,
+  `type` VARCHAR(32) NOT NULL,
+  `synclock` INT(10) NOT NULL DEFAULT '0',
+  `ctag` VARCHAR(40) DEFAULT NULL,
+  PRIMARY KEY(`folder_id`),
+  INDEX `resource_type` (`resource`, `type`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+DROP TABLE IF EXISTS `kolab_cache`;
+
+DROP TABLE IF EXISTS `kolab_cache_contact`;
+
+CREATE TABLE `kolab_cache_contact` (
+  `folder_id` BIGINT UNSIGNED NOT NULL,
+  `msguid` BIGINT UNSIGNED NOT NULL,
+  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `created` DATETIME DEFAULT NULL,
+  `changed` DATETIME DEFAULT NULL,
+  `data` LONGTEXT NOT NULL,
+  `xml` LONGBLOB NOT NULL,
+  `tags` TEXT NOT NULL,
+  `words` TEXT NOT NULL,
+  `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
+  `name` VARCHAR(255) NOT NULL,
+  `firstname` VARCHAR(255) NOT NULL,
+  `surname` VARCHAR(255) NOT NULL,
+  `email` VARCHAR(255) NOT NULL,
+  CONSTRAINT `fk_kolab_cache_contact_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  PRIMARY KEY(`folder_id`,`msguid`),
+  INDEX `contact_type` (`folder_id`,`type`),
+  INDEX `contact_uid2msguid` (`folder_id`,`uid`,`msguid`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+DROP TABLE IF EXISTS `kolab_cache_event`;
+
+CREATE TABLE `kolab_cache_event` (
+  `folder_id` BIGINT UNSIGNED NOT NULL,
+  `msguid` BIGINT UNSIGNED NOT NULL,
+  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `created` DATETIME DEFAULT NULL,
+  `changed` DATETIME DEFAULT NULL,
+  `data` LONGTEXT NOT NULL,
+  `xml` LONGBLOB NOT NULL,
+  `tags` TEXT NOT NULL,
+  `words` TEXT NOT NULL,
+  `dtstart` DATETIME,
+  `dtend` DATETIME,
+  CONSTRAINT `fk_kolab_cache_event_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  PRIMARY KEY(`folder_id`,`msguid`),
+  INDEX `event_uid2msguid` (`folder_id`,`uid`,`msguid`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+DROP TABLE IF EXISTS `kolab_cache_task`;
+
+CREATE TABLE `kolab_cache_task` (
+  `folder_id` BIGINT UNSIGNED NOT NULL,
+  `msguid` BIGINT UNSIGNED NOT NULL,
+  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `created` DATETIME DEFAULT NULL,
+  `changed` DATETIME DEFAULT NULL,
+  `data` LONGTEXT NOT NULL,
+  `xml` LONGBLOB NOT NULL,
+  `tags` TEXT NOT NULL,
+  `words` TEXT NOT NULL,
+  `dtstart` DATETIME,
+  `dtend` DATETIME,
+  CONSTRAINT `fk_kolab_cache_task_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  PRIMARY KEY(`folder_id`,`msguid`),
+  INDEX `task_uid2msguid` (`folder_id`,`uid`,`msguid`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+DROP TABLE IF EXISTS `kolab_cache_journal`;
+
+CREATE TABLE `kolab_cache_journal` (
+  `folder_id` BIGINT UNSIGNED NOT NULL,
+  `msguid` BIGINT UNSIGNED NOT NULL,
+  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `created` DATETIME DEFAULT NULL,
+  `changed` DATETIME DEFAULT NULL,
+  `data` LONGTEXT NOT NULL,
+  `xml` LONGBLOB NOT NULL,
+  `tags` TEXT NOT NULL,
+  `words` TEXT NOT NULL,
+  `dtstart` DATETIME,
+  `dtend` DATETIME,
+  CONSTRAINT `fk_kolab_cache_journal_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  PRIMARY KEY(`folder_id`,`msguid`),
+  INDEX `journal_uid2msguid` (`folder_id`,`uid`,`msguid`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+DROP TABLE IF EXISTS `kolab_cache_note`;
+
+CREATE TABLE `kolab_cache_note` (
+  `folder_id` BIGINT UNSIGNED NOT NULL,
+  `msguid` BIGINT UNSIGNED NOT NULL,
+  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `created` DATETIME DEFAULT NULL,
+  `changed` DATETIME DEFAULT NULL,
+  `data` LONGTEXT NOT NULL,
+  `xml` LONGBLOB NOT NULL,
+  `tags` TEXT NOT NULL,
+  `words` TEXT NOT NULL,
+  CONSTRAINT `fk_kolab_cache_note_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  PRIMARY KEY(`folder_id`,`msguid`),
+  INDEX `note_uid2msguid` (`folder_id`,`uid`,`msguid`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+DROP TABLE IF EXISTS `kolab_cache_file`;
+
+CREATE TABLE `kolab_cache_file` (
+  `folder_id` BIGINT UNSIGNED NOT NULL,
+  `msguid` BIGINT UNSIGNED NOT NULL,
+  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `created` DATETIME DEFAULT NULL,
+  `changed` DATETIME DEFAULT NULL,
+  `data` LONGTEXT NOT NULL,
+  `xml` LONGBLOB NOT NULL,
+  `tags` TEXT NOT NULL,
+  `words` TEXT NOT NULL,
+  `filename` varchar(255) DEFAULT NULL,
+  CONSTRAINT `fk_kolab_cache_file_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  PRIMARY KEY(`folder_id`,`msguid`),
+  INDEX `folder_filename` (`folder_id`, `filename`),
+  INDEX `file_uid2msguid` (`folder_id`,`uid`,`msguid`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+DROP TABLE IF EXISTS `kolab_cache_configuration`;
+
+CREATE TABLE `kolab_cache_configuration` (
+  `folder_id` BIGINT UNSIGNED NOT NULL,
+  `msguid` BIGINT UNSIGNED NOT NULL,
+  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `created` DATETIME DEFAULT NULL,
+  `changed` DATETIME DEFAULT NULL,
+  `data` LONGTEXT NOT NULL,
+  `xml` LONGBLOB NOT NULL,
+  `tags` TEXT NOT NULL,
+  `words` TEXT NOT NULL,
+  `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
+  CONSTRAINT `fk_kolab_cache_configuration_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  PRIMARY KEY(`folder_id`,`msguid`),
+  INDEX `configuration_type` (`folder_id`,`type`),
+  INDEX `configuration_uid2msguid` (`folder_id`,`uid`,`msguid`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+DROP TABLE IF EXISTS `kolab_cache_freebusy`;
+
+CREATE TABLE `kolab_cache_freebusy` (
+  `folder_id` BIGINT UNSIGNED NOT NULL,
+  `msguid` BIGINT UNSIGNED NOT NULL,
+  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `created` DATETIME DEFAULT NULL,
+  `changed` DATETIME DEFAULT NULL,
+  `data` LONGTEXT NOT NULL,
+  `xml` LONGBLOB NOT NULL,
+  `tags` TEXT NOT NULL,
+  `words` TEXT NOT NULL,
+  `dtstart` DATETIME,
+  `dtend` DATETIME,
+  CONSTRAINT `fk_kolab_cache_freebusy_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  PRIMARY KEY(`folder_id`,`msguid`),
+  INDEX `freebusy_uid2msguid` (`folder_id`,`uid`,`msguid`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+
+INSERT INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2015011600');

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2013011000.sql Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2013041900.sql Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2013100400.sql Added

@@ -0,0 +1,174 @@
+CREATE TABLE `kolab_folders` (
+  `folder_id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `resource` VARCHAR(255)  NOT NULL,
+  `type` VARCHAR(32) NOT NULL,
+  `synclock` INT(10) NOT NULL DEFAULT '0',
+  `ctag` VARCHAR(40) DEFAULT NULL,
+  PRIMARY KEY(`folder_id`),
+  INDEX `resource_type` (`resource`, `type`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+CREATE TABLE `kolab_cache_contact` (
+  `folder_id` BIGINT UNSIGNED NOT NULL,
+  `msguid` BIGINT UNSIGNED NOT NULL,
+  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `created` DATETIME DEFAULT NULL,
+  `changed` DATETIME DEFAULT NULL,
+  `data` TEXT NOT NULL,
+  `xml` TEXT NOT NULL,
+  `tags` VARCHAR(255) NOT NULL,
+  `words` TEXT NOT NULL,
+  `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
+  CONSTRAINT `fk_kolab_cache_contact_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  PRIMARY KEY(`folder_id`,`msguid`),
+  INDEX `contact_type` (`folder_id`,`type`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+CREATE TABLE `kolab_cache_event` (
+  `folder_id` BIGINT UNSIGNED NOT NULL,
+  `msguid` BIGINT UNSIGNED NOT NULL,
+  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `created` DATETIME DEFAULT NULL,
+  `changed` DATETIME DEFAULT NULL,
+  `data` TEXT NOT NULL,
+  `xml` TEXT NOT NULL,
+  `tags` VARCHAR(255) NOT NULL,
+  `words` TEXT NOT NULL,
+  `dtstart` DATETIME,
+  `dtend` DATETIME,
+  CONSTRAINT `fk_kolab_cache_event_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  PRIMARY KEY(`folder_id`,`msguid`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+CREATE TABLE `kolab_cache_task` (
+  `folder_id` BIGINT UNSIGNED NOT NULL,
+  `msguid` BIGINT UNSIGNED NOT NULL,
+  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `created` DATETIME DEFAULT NULL,
+  `changed` DATETIME DEFAULT NULL,
+  `data` TEXT NOT NULL,
+  `xml` TEXT NOT NULL,
+  `tags` VARCHAR(255) NOT NULL,
+  `words` TEXT NOT NULL,
+  `dtstart` DATETIME,
+  `dtend` DATETIME,
+  CONSTRAINT `fk_kolab_cache_task_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  PRIMARY KEY(`folder_id`,`msguid`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+CREATE TABLE `kolab_cache_journal` (
+  `folder_id` BIGINT UNSIGNED NOT NULL,
+  `msguid` BIGINT UNSIGNED NOT NULL,
+  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `created` DATETIME DEFAULT NULL,
+  `changed` DATETIME DEFAULT NULL,
+  `data` TEXT NOT NULL,
+  `xml` TEXT NOT NULL,
+  `tags` VARCHAR(255) NOT NULL,
+  `words` TEXT NOT NULL,
+  `dtstart` DATETIME,
+  `dtend` DATETIME,
+  CONSTRAINT `fk_kolab_cache_journal_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  PRIMARY KEY(`folder_id`,`msguid`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+CREATE TABLE `kolab_cache_note` (
+  `folder_id` BIGINT UNSIGNED NOT NULL,
+  `msguid` BIGINT UNSIGNED NOT NULL,
+  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `created` DATETIME DEFAULT NULL,
+  `changed` DATETIME DEFAULT NULL,
+  `data` TEXT NOT NULL,
+  `xml` TEXT NOT NULL,
+  `tags` VARCHAR(255) NOT NULL,
+  `words` TEXT NOT NULL,
+  CONSTRAINT `fk_kolab_cache_note_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  PRIMARY KEY(`folder_id`,`msguid`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+CREATE TABLE `kolab_cache_file` (
+  `folder_id` BIGINT UNSIGNED NOT NULL,
+  `msguid` BIGINT UNSIGNED NOT NULL,
+  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `created` DATETIME DEFAULT NULL,
+  `changed` DATETIME DEFAULT NULL,
+  `data` TEXT NOT NULL,
+  `xml` TEXT NOT NULL,
+  `tags` VARCHAR(255) NOT NULL,
+  `words` TEXT NOT NULL,
+  `filename` varchar(255) DEFAULT NULL,
+  CONSTRAINT `fk_kolab_cache_file_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  PRIMARY KEY(`folder_id`,`msguid`),
+  INDEX `folder_filename` (`folder_id`, `filename`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+CREATE TABLE `kolab_cache_configuration` (
+  `folder_id` BIGINT UNSIGNED NOT NULL,
+  `msguid` BIGINT UNSIGNED NOT NULL,
+  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `created` DATETIME DEFAULT NULL,
+  `changed` DATETIME DEFAULT NULL,
+  `data` TEXT NOT NULL,
+  `xml` TEXT NOT NULL,
+  `tags` VARCHAR(255) NOT NULL,
+  `words` TEXT NOT NULL,
+  `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
+  CONSTRAINT `fk_kolab_cache_configuration_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  PRIMARY KEY(`folder_id`,`msguid`),
+  INDEX `configuration_type` (`folder_id`,`type`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+CREATE TABLE `kolab_cache_freebusy` (
+  `folder_id` BIGINT UNSIGNED NOT NULL,
+  `msguid` BIGINT UNSIGNED NOT NULL,
+  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `created` DATETIME DEFAULT NULL,
+  `changed` DATETIME DEFAULT NULL,
+  `data` TEXT NOT NULL,
+  `xml` TEXT NOT NULL,
+  `tags` VARCHAR(255) NOT NULL,
+  `words` TEXT NOT NULL,
+  `dtstart` DATETIME,
+  `dtend` DATETIME,
+  CONSTRAINT `fk_kolab_cache_freebusy_folder` FOREIGN KEY (`folder_id`)
+    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  PRIMARY KEY(`folder_id`,`msguid`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+
+-- Migrate data from old kolab_cache table
+
+INSERT INTO kolab_folders (resource, type)
+  SELECT DISTINCT resource, type
+  FROM  kolab_cache WHERE type IN ('event','contact','task','file');
+
+INSERT INTO kolab_cache_event (folder_id, msguid, uid, created, changed, data, xml, tags, words, dtstart, dtend)
+  SELECT kolab_folders.folder_id, msguid, uid, created, changed, data, xml, tags, words, dtstart, dtend
+  FROM kolab_cache LEFT JOIN kolab_folders ON (kolab_folders.resource = kolab_cache.resource)
+  WHERE kolab_cache.type = 'event' AND kolab_folders.folder_id IS NOT NULL;
+
+INSERT INTO kolab_cache_task (folder_id, msguid, uid, created, changed, data, xml, tags, words, dtstart, dtend)
+  SELECT kolab_folders.folder_id, msguid, uid, created, changed, data, xml, tags, words, dtstart, dtend
+  FROM kolab_cache LEFT JOIN kolab_folders ON (kolab_folders.resource = kolab_cache.resource)
+  WHERE kolab_cache.type = 'task' AND kolab_folders.folder_id IS NOT NULL;
+
+INSERT INTO kolab_cache_contact (folder_id, msguid, uid, created, changed, data, xml, tags, words, type)
+  SELECT kolab_folders.folder_id, msguid, uid, created, changed, data, xml, tags, words, kolab_cache.type
+  FROM kolab_cache LEFT JOIN kolab_folders ON (kolab_folders.resource = kolab_cache.resource)
+  WHERE kolab_cache.type IN ('contact','distribution-list') AND kolab_folders.folder_id IS NOT NULL;
+
+INSERT INTO kolab_cache_file (folder_id, msguid, uid, created, changed, data, xml, tags, words, filename)
+  SELECT kolab_folders.folder_id, msguid, uid, created, changed, data, xml, tags, words, filename
+  FROM kolab_cache LEFT JOIN kolab_folders ON (kolab_folders.resource = kolab_cache.resource)
+  WHERE kolab_cache.type = 'file' AND kolab_folders.folder_id IS NOT NULL;
+
+
+DROP TABLE IF EXISTS `kolab_cache`;
+

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2013110400.sql Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2013121100.sql Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2014021000.sql Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2014032700.sql Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2014040900.sql Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2014112700.sql Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2015011600.sql Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/oracle Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/oracle.initial.sql Added

@@ -0,0 +1,184 @@
+/**
+ * libkolab database schema
+ *
+ * @version 1.1
+ * @author Aleksander Machniak
+ * @licence GNU AGPL
+ **/
+
+
+CREATE TABLE "kolab_folders" (
+    "folder_id" number NOT NULL PRIMARY KEY,
+    "resource" VARCHAR(255) NOT NULL,
+    "type" VARCHAR(32) NOT NULL,
+    "synclock" integer DEFAULT 0 NOT NULL,
+    "ctag" VARCHAR(40) DEFAULT NULL
+);
+
+CREATE INDEX "kolab_folders_resource_idx" ON "kolab_folders" ("resource", "type");
+
+CREATE SEQUENCE "kolab_folders_seq"
+    START WITH 1 INCREMENT BY 1 NOMAXVALUE;
+
+CREATE TRIGGER "kolab_folders_seq_trig"
+BEFORE INSERT ON "kolab_folders" FOR EACH ROW
+BEGIN
+    :NEW."folder_id" := "kolab_folders_seq".nextval;
+END;
+/
+
+CREATE TABLE "kolab_cache_contact" (
+    "folder_id" number NOT NULL
+        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
+    "msguid" number NOT NULL,
+    "uid" varchar(128) NOT NULL,
+    "created" timestamp DEFAULT NULL,
+    "changed" timestamp DEFAULT NULL,
+    "data" clob NOT NULL,
+    "xml" clob NOT NULL,
+    "tags" clob DEFAULT NULL,
+    "words" clob DEFAULT NULL,
+    "type" varchar(32) NOT NULL,
+    "name" varchar(255) DEFAULT NULL,
+    "firstname" varchar(255) DEFAULT NULL,
+    "surname" varchar(255) DEFAULT NULL,
+    "email" varchar(255) DEFAULT NULL,
+    PRIMARY KEY ("folder_id", "msguid")
+);
+
+CREATE INDEX "kolab_cache_contact_type_idx" ON "kolab_cache_contact" ("folder_id", "type");
+CREATE INDEX "kolab_cache_contact_uid2msguid" ON "kolab_cache_contact" ("folder_id", "uid", "msguid");
+
+
+CREATE TABLE "kolab_cache_event" (
+    "folder_id" number NOT NULL
+        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
+    "msguid" number NOT NULL,
+    "uid" varchar(128) NOT NULL,
+    "created" timestamp DEFAULT NULL,
+    "changed" timestamp DEFAULT NULL,
+    "data" clob NOT NULL,
+    "xml" clob NOT NULL,
+    "tags" clob DEFAULT NULL,
+    "words" clob DEFAULT NULL,
+    "dtstart" timestamp DEFAULT NULL,
+    "dtend" timestamp DEFAULT NULL,
+    PRIMARY KEY ("folder_id", "msguid")
+);
+
+CREATE INDEX "kolab_cache_event_uid2msguid" ON "kolab_cache_event" ("folder_id", "uid", "msguid");
+
+
+CREATE TABLE "kolab_cache_task" (
+    "folder_id" number NOT NULL
+        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
+    "msguid" number NOT NULL,
+    "uid" varchar(128) NOT NULL,
+    "created" timestamp DEFAULT NULL,
+    "changed" timestamp DEFAULT NULL,
+    "data" clob NOT NULL,
+    "xml" clob NOT NULL,
+    "tags" clob DEFAULT NULL,
+    "words" clob DEFAULT NULL,
+    "dtstart" timestamp DEFAULT NULL,
+    "dtend" timestamp DEFAULT NULL,
+    PRIMARY KEY ("folder_id", "msguid")
+);
+
+CREATE INDEX "kolab_cache_task_uid2msguid" ON "kolab_cache_task" ("folder_id", "uid", "msguid");
+
+
+CREATE TABLE "kolab_cache_journal" (
+    "folder_id" number NOT NULL
+        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
+    "msguid" number NOT NULL,
+    "uid" varchar(128) NOT NULL,
+    "created" timestamp DEFAULT NULL,
+    "changed" timestamp DEFAULT NULL,
+    "data" clob NOT NULL,
+    "xml" clob NOT NULL,
+    "tags" clob DEFAULT NULL,
+    "words" clob DEFAULT NULL,
+    "dtstart" timestamp DEFAULT NULL,
+    "dtend" timestamp DEFAULT NULL,
+    PRIMARY KEY ("folder_id", "msguid")
+);
+
+CREATE INDEX "kolab_cache_journal_uid2msguid" ON "kolab_cache_journal" ("folder_id", "uid", "msguid");
+
+
+CREATE TABLE "kolab_cache_note" (
+    "folder_id" number NOT NULL
+        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
+    "msguid" number NOT NULL,
+    "uid" varchar(128) NOT NULL,
+    "created" timestamp DEFAULT NULL,
+    "changed" timestamp DEFAULT NULL,
+    "data" clob NOT NULL,
+    "xml" clob NOT NULL,
+    "tags" clob DEFAULT NULL,
+    "words" clob DEFAULT NULL,
+    PRIMARY KEY ("folder_id", "msguid")
+);
+
+CREATE INDEX "kolab_cache_note_uid2msguid" ON "kolab_cache_note" ("folder_id", "uid", "msguid");
+
+
+CREATE TABLE "kolab_cache_file" (
+    "folder_id" number NOT NULL
+        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
+    "msguid" number NOT NULL,
+    "uid" varchar(128) NOT NULL,
+    "created" timestamp DEFAULT NULL,
+    "changed" timestamp DEFAULT NULL,
+    "data" clob NOT NULL,
+    "xml" clob NOT NULL,
+    "tags" clob DEFAULT NULL,
+    "words" clob DEFAULT NULL,
+    "filename" varchar(255) DEFAULT NULL,
+    PRIMARY KEY ("folder_id", "msguid")
+);
+
+CREATE INDEX "kolab_cache_file_filename" ON "kolab_cache_file" ("folder_id", "filename");
+CREATE INDEX "kolab_cache_file_uid2msguid" ON "kolab_cache_file" ("folder_id", "uid", "msguid");
+
+
+CREATE TABLE "kolab_cache_configuration" (
+    "folder_id" number NOT NULL
+        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
+    "msguid" number NOT NULL,
+    "uid" varchar(128) NOT NULL,
+    "created" timestamp DEFAULT NULL,
+    "changed" timestamp DEFAULT NULL,
+    "data" clob NOT NULL,
+    "xml" clob NOT NULL,
+    "tags" clob DEFAULT NULL,
+    "words" clob DEFAULT NULL,
+    "type" varchar(32) NOT NULL,
+    PRIMARY KEY ("folder_id", "msguid")
+);
+
+CREATE INDEX "kolab_cache_config_type" ON "kolab_cache_configuration" ("folder_id", "type");
+CREATE INDEX "kolab_cache_config_uid2msguid" ON "kolab_cache_configuration" ("folder_id", "uid", "msguid");
+
+
+CREATE TABLE "kolab_cache_freebusy" (
+    "folder_id" number NOT NULL
+        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
+    "msguid" number NOT NULL,
+    "uid" varchar(128) NOT NULL,
+    "created" timestamp DEFAULT NULL,
+    "changed" timestamp DEFAULT NULL,
+    "data" clob NOT NULL,
+    "xml" clob NOT NULL,
+    "tags" clob DEFAULT NULL,
+    "words" clob DEFAULT NULL,
+    "dtstart" timestamp DEFAULT NULL,
+    "dtend" timestamp DEFAULT NULL,
+    PRIMARY KEY("folder_id", "msguid")
+);
+
+CREATE INDEX "kolab_cache_fb_uid2msguid" ON "kolab_cache_freebusy" ("folder_id", "uid", "msguid");
+
+
+INSERT INTO "system" ("name", "value") VALUES ('libkolab-version', '2015011600');

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/oracle/2015011600.sql Added

@@ -0,0 +1,40 @@
+-- direct change from varchar to clob does not work, need temp column (#4257)
+ALTER TABLE "kolab_cache_contact" ADD "tags1" clob DEFAULT NULL;
+UPDATE "kolab_cache_contact" SET "tags1" = "tags";
+ALTER TABLE "kolab_cache_contact" DROP COLUMN "tags";
+ALTER TABLE "kolab_cache_contact" RENAME COLUMN "tags1" TO "tags";
+
+ALTER TABLE "kolab_cache_event" ADD "tags1" clob DEFAULT NULL;
+UPDATE "kolab_cache_event" SET "tags1" = "tags";
+ALTER TABLE "kolab_cache_event" DROP COLUMN "tags";
+ALTER TABLE "kolab_cache_event" RENAME COLUMN "tags1" TO "tags";
+
+ALTER TABLE "kolab_cache_task" ADD "tags1" clob DEFAULT NULL;
+UPDATE "kolab_cache_task" SET "tags1" = "tags";
+ALTER TABLE "kolab_cache_task" DROP COLUMN "tags";
+ALTER TABLE "kolab_cache_task" RENAME COLUMN "tags1" TO "tags";
+
+ALTER TABLE "kolab_cache_journal" ADD "tags1" clob DEFAULT NULL;
+UPDATE "kolab_cache_journal" SET "tags1" = "tags";
+ALTER TABLE "kolab_cache_journal" DROP COLUMN "tags";
+ALTER TABLE "kolab_cache_journal" RENAME COLUMN "tags1" TO "tags";
+
+ALTER TABLE "kolab_cache_note" ADD "tags1" clob DEFAULT NULL;
+UPDATE "kolab_cache_note" SET "tags1" = "tags";
+ALTER TABLE "kolab_cache_note" DROP COLUMN "tags";
+ALTER TABLE "kolab_cache_note" RENAME COLUMN "tags1" TO "tags";
+
+ALTER TABLE "kolab_cache_file" ADD "tags1" clob DEFAULT NULL;
+UPDATE "kolab_cache_file" SET "tags1" = "tags";
+ALTER TABLE "kolab_cache_file" DROP COLUMN "tags";
+ALTER TABLE "kolab_cache_file" RENAME COLUMN "tags1" TO "tags";
+
+ALTER TABLE "kolab_cache_configuration" ADD "tags1" clob DEFAULT NULL;
+UPDATE "kolab_cache_configuration" SET "tags1" = "tags";
+ALTER TABLE "kolab_cache_configuration" DROP COLUMN "tags";
+ALTER TABLE "kolab_cache_configuration" RENAME COLUMN "tags1" TO "tags";
+
+ALTER TABLE "kolab_cache_freebusy" ADD "tags1" clob DEFAULT NULL;
+UPDATE "kolab_cache_freebusy" SET "tags1" = "tags";
+ALTER TABLE "kolab_cache_freebusy" DROP COLUMN "tags";
+ALTER TABLE "kolab_cache_freebusy" RENAME COLUMN "tags1" TO "tags";

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/postgres.initial.sql Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/UPGRADING Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/bin Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/bin/modcache.sh Added

@@ -0,0 +1,235 @@
+#!/usr/bin/env php
+<?php
+
+/**
+ * Kolab storage cache modification script
+ *
+ * @version 3.1
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2012-2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+define('INSTALL_PATH', realpath('.') . '/' );
+ini_set('display_errors', 1);
+
+if (!file_exists(INSTALL_PATH . 'program/include/clisetup.php'))
+    die("Execute this from the Roundcube installation dir!\n\n");
+
+require_once INSTALL_PATH . 'program/include/clisetup.php';
+
+function print_usage()
+{
+	print "Usage:  modcache.sh [OPTIONS] ACTION [USERNAME ARGS ...]\n";
+	print "Possible actions are: expunge, clear, prewarm\n";
+	print "-a, --all      Clear/expunge all caches\n";
+	print "-h, --host     IMAP host name\n";
+	print "-u, --user     IMAP user name to authenticate\n";
+	print "-t, --type     Object types to clear/expunge cache\n";
+	print "-l, --limit    Limit the number of records to be expunged\n";
+}
+
+// read arguments
+$opts = get_opt(array(
+    'a' => 'all',
+    'h' => 'host',
+    'u' => 'user',
+    'p' => 'password',
+    't' => 'type',
+    'l' => 'limit',
+    'v' => 'verbose',
+));
+
+$opts['username'] = !empty($opts[1]) ? $opts[1] : $opts['user'];
+$action = $opts[0];
+
+$rcmail = rcube::get_instance(rcube::INIT_WITH_DB | rcube::INIT_WITH_PLUGINS);
+
+
+// connect to database
+$db = $rcmail->get_dbh();
+$db->db_connect('w');
+if (!$db->is_connected() || $db->is_error())
+    die("No DB connection\n");
+
+ini_set('display_errors', 1);
+
+/*
+ * Script controller
+ */
+switch (strtolower($action)) {
+
+/*
+ * Clear/expunge all cache records
+ */
+case 'expunge':
+    $folder_types = $opts['type'] ? explode(',', $opts['type']) : array('contact','configuration','event','file','journal','note','task');
+    $folder_types_db = array_map(array($db, 'quote'), $folder_types);
+    $expire = strtotime(!empty($opts[2]) ? $opts[2] : 'now - 10 days');
+    $sql_where = "type IN (" . join(',', $folder_types_db) . ")";
+
+    if ($opts['username']) {
+        $sql_where .= ' AND resource LIKE ?';
+    }
+
+    $sql_query = "DELETE FROM %s WHERE folder_id IN (SELECT folder_id FROM kolab_folders WHERE $sql_where) AND created <= " . $db->quote(date('Y-m-d 00:00:00', $expire));
+    if ($opts['limit']) {
+        $sql_query = ' LIMIT ' . intval($opts['limit']);
+    }
+    foreach ($folder_types as $type) {
+        $table_name = 'kolab_cache_' . $type;
+        $db->query(sprintf($sql_query, $table_name), resource_prefix($opts).'%');
+        echo $db->affected_rows() . " records deleted from '$table_name'\n";
+    }
+
+    $db->query("UPDATE kolab_folders SET ctag='' WHERE $sql_where", resource_prefix($opts).'%');
+    break;
+
+case 'clear':
+    $folder_types = $opts['type'] ? explode(',', $opts['type']) : array('contact','configuration','event','file','journal','note','task');
+    $folder_types_db = array_map(array($db, 'quote'), $folder_types);
+
+    if ($opts['all']) {
+        $sql_query = "DELETE FROM kolab_folders WHERE 1";
+    }
+    else if ($opts['username']) {
+        $sql_query = "DELETE FROM kolab_folders WHERE type IN (" . join(',', $folder_types_db) . ") AND resource LIKE ?";
+    }
+
+    if ($sql_query) {
+        $db->query($sql_query, resource_prefix($opts).'%');
+        echo $db->affected_rows() . " records deleted from 'kolab_folders'\n";
+    }
+    break;
+
+
+/*
+ * Prewarm cache by synchronizing objects for the given user
+ */
+case 'prewarm':
+    // make sure libkolab classes are loaded
+    $rcmail->plugins->load_plugin('libkolab');
+
+    if (authenticate($opts)) {
+        $folder_types = $opts['type'] ? explode(',', $opts['type']) : array('contact','configuration','event','file','task');
+        foreach ($folder_types as $type) {
+            // sync every folder of the given type
+            foreach (kolab_storage::get_folders($type) as $folder) {
+                echo "Synching " . $folder->name . " ($type) ... ";
+                echo $folder->count($type) . "\n";
+
+                // also sync distribution lists in contact folders
+                if ($type == 'contact') {
+                    echo "Synching " . $folder->name . " (distribution-list) ... ";
+                    echo $folder->count('distribution-list') . "\n";
+                }
+            }
+        }
+    }
+    else
+        die("Authentication failed for " . $opts['user']);
+    break;
+
+/**
+ * Update the cache meta columns from the serialized/xml data
+ * (might be run after a schema update)
+ */
+case 'update':
+    // make sure libkolab classes are loaded
+    $rcmail->plugins->load_plugin('libkolab');
+
+    $folder_types = $opts['type'] ? explode(',', $opts['type']) : array('contact','configuration','event','file','task');
+    foreach ($folder_types as $type) {
+        $class = 'kolab_storage_cache_' . $type;
+        $sql_result = $db->query("SELECT folder_id FROM kolab_folders WHERE type=? AND synclock = 0", $type);
+        while ($sql_result && ($sql_arr = $db->fetch_assoc($sql_result))) {
+            $folder = new $class;
+            $folder->select_by_id($sql_arr['folder_id']);
+            echo "Updating " . $sql_arr['folder_id'] . " ($type) ";
+            foreach ($folder->select() as $object) {
+                $object['_formatobj']->to_array();  // load data
+                $folder->save($object['_msguid'], $object, $object['_msguid']);
+                echo ".";
+            }
+            echo "done.\n";
+        }
+    }
+    break;
+
+
+/*
+ * Unknown action => show usage
+ */
+default:
+    print_usage();
+    exit;
+}
+
+
+/**
+ * Compose cache resource URI prefix for the given user credentials
+ */
+function resource_prefix($opts)
+{
+    return 'imap://' . str_replace('%', '\\%', urlencode($opts['username'])) . '@' . $opts['host'] . '/';
+}
+
+
+/**
+ * Authenticate to the IMAP server with the given user credentials
+ */
+function authenticate(&$opts)
+{
+    global $rcmail;
+
+    // prompt for password
+    if (empty($opts['password']) && ($opts['username'] || $opts['user'])) {
+        $opts['password'] = prompt_silent("Password: ");
+    }
+
+    // simulate "login as" feature
+    if ($opts['user'] && $opts['user'] != $opts['username'])
+        $_POST['_loginas'] = $opts['username'];
+    else if (empty($opts['user']))
+        $opts['user'] = $opts['username'];
+
+    // let the kolab_auth plugin do its magic
+    $auth = $rcmail->plugins->exec_hook('authenticate', array(
+        'host' => trim($opts['host']),
+        'user' => trim($opts['user']),
+        'pass' => $opts['password'],
+        'cookiecheck' => false,
+        'valid' => !empty($opts['user']) && !empty($opts['host']),
+    ));
+
+    if ($auth['valid']) {
+        $storage = $rcmail->get_storage();
+        if ($storage->connect($auth['host'], $auth['user'], $auth['pass'], 143, false)) {
+            if ($opts['verbose'])
+                echo "IMAP login succeeded.\n";
+            if (($user = rcube_user::query($opts['username'], $auth['host'])) && $user->ID)
+                $rcmail->user = $user;
+        }
+        else
+            die("Login to IMAP server failed!\n");
+    }
+    else {
+        die("Invalid login credentials!\n");
+    }
+
+    return $auth['valid'];
+}
+

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/bin/randomcontacts.sh Added

@@ -0,0 +1,181 @@
+#!/usr/bin/env php
+<?php
+
+/**
+ * Generate a number contacts with random data
+ *
+ * @version 3.1
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+define('INSTALL_PATH', realpath('.') . '/' );
+ini_set('display_errors', 1);
+
+if (!file_exists(INSTALL_PATH . 'program/include/clisetup.php'))
+    die("Execute this from the Roundcube installation dir!\n\n");
+
+require_once INSTALL_PATH . 'program/include/clisetup.php';
+
+function print_usage()
+{
+    print "Usage:  randomcontacts.sh [OPTIONS] USERNAME FOLDER\n";
+    print "Create random contact that for then given user in the specified folder.\n";
+    print "-n, --num      Number of contacts to be created, defaults to 50\n";
+    print "-h, --host     IMAP host name\n";
+    print "-p, --password IMAP user password\n";
+}
+
+// read arguments
+$opts = get_opt(array(
+    'n' => 'num',
+    'h' => 'host',
+    'u' => 'user',
+    'p' => 'pass',
+    'v' => 'verbose',
+));
+
+$opts['username'] = !empty($opts[0]) ? $opts[0] : $opts['user'];
+$opts['folder'] = $opts[1];
+
+$rcmail = rcube::get_instance(rcube::INIT_WITH_DB | rcube::INIT_WITH_PLUGINS);
+$rcmail->plugins->load_plugins(array('libkolab'));
+ini_set('display_errors', 1);
+
+
+if (empty($opts['host'])) {
+    $opts['host'] = $rcmail->config->get('default_host');
+    if (is_array($opts['host']))  // not unique
+        $opts['host'] = null;
+}
+
+if (empty($opts['username']) || empty($opts['folder']) || empty($opts['host'])) {
+    print_usage();
+    exit;
+}
+
+// prompt for password
+if (empty($opts['pass'])) {
+    $opts['pass'] = rcube_utils::prompt_silent("Password: ");
+}
+
+// parse $host URL
+$a_host = parse_url($opts['host']);
+if ($a_host['host']) {
+    $host = $a_host['host'];
+    $imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? TRUE : FALSE;
+    $imap_port = isset($a_host['port']) ? $a_host['port'] : ($imap_ssl ? 993 : 143);
+}
+else {
+    $host = $opts['host'];
+    $imap_port = 143;
+}
+
+// instantiate IMAP class
+$IMAP = $rcmail->get_storage();
+
+// try to connect to IMAP server
+if ($IMAP->connect($host, $opts['username'], $opts['pass'], $imap_port, $imap_ssl)) {
+    print "IMAP login successful.\n";
+    $user = rcube_user::query($opts['username'], $host);
+    $rcmail->user = $user ?: new rcube_user(null, array('username' => $opts['username'], 'host' => $host));
+}
+else {
+    die("IMAP login failed for user " . $opts['username'] . " @ $host\n");
+}
+
+// get contacts folder
+$folder = kolab_storage::get_folder($opts['folder']);
+if (!$folder || empty($folder->type)) {
+    die("Invalid Address Book " . $opts['folder'] . "\n");
+}
+
+$format = new kolab_format_contact;
+
+$num = $opts['num'] ? intval($opts['num']) : 50;
+echo "Creating $num contacts in " . $folder->get_resource_uri() . "\n";
+
+for ($i=0; $i < $num; $i++) {
+    // generate random names
+    $contact = array(
+        'surname' => random_string(rand(1,2)),
+        'firstname' => random_string(rand(1,2)),
+        'organization' => random_string(rand(0,2)),
+        'profession' => random_string(rand(1,2)),
+        'email' => array(),
+        'phone' => array(),
+        'address' => array(),
+        'notes' => random_string(rand(10,200)),
+    );
+
+    // randomly add email addresses
+    $em = rand(1,3);
+    for ($e=0; $e < $em; $e++) {
+        $type = array_rand($format->emailtypes);
+        $contact['email'][] = array(
+            'address' => strtolower(random_string(1) . '@' . random_string(1) . '.tld'),
+            'type' => $type,
+        );
+    }
+
+    // randomly add phone numbers
+    $ph = rand(1,4);
+    for ($p=0; $p < $ph; $p++) {
+        $type = array_rand($format->phonetypes);
+        $contact['phone'][] = array(
+            'number' => '+'.rand(2,8).rand(1,9).rand(1,9).rand(0,9).rand(0,9).rand(0,9).rand(0,9).rand(0,9).rand(0,9).rand(0,9).rand(0,9),
+            'type' => $type,
+        );
+    }
+
+    // randomly add addresses
+    $ad = rand(0,2);
+    for ($a=0; $a < $ad; $a++) {
+        $type = array_rand($format->addresstypes);
+        $contact['address'][] = array(
+            'street' => random_string(rand(1,3)),
+            'locality' => random_string(rand(1,2)),
+            'code' => rand(1000, 89999),
+            'country' => random_string(1),
+            'type' => $type,
+        );
+    }
+
+    $contact['name'] = $contact['firstname'] . ' ' . $contact['surname'];
+
+    if ($folder->save($contact, 'contact')) {
+        echo ".";
+    }
+    else {
+        echo "x";
+        break;  // abort on error
+    }
+}
+
+echo " done.\n";
+
+
+
+function random_string($len)
+{
+    $words = explode(" ", "The Hough transform is named after Paul Hough who patented the method in 1962. It is a technique which can be used to isolate features of a particular shape within an image. Because it requires that the desired features be specified in some parametric form, the classical Hough transform is most commonly used for the de- tection of regular curves such as lines, circles, ellipses, etc. A generalized Hough transform can be employed in applications where a simple analytic description of a features is not possible. Due to the computational complexity of the generalized Hough algorithm, we restrict the main focus of this discussion to the classical Hough transform. Despite its domain restrictions, the classical Hough transform hereafter referred to without the classical prefix retains many applications, as most manufac- tured parts and many anatomical parts investigated in medical imagery contain feature boundaries which can be described by regular curves. The main advantage of the Hough transform technique is that it is tolerant of gaps in feature boundary descriptions and is relatively unaffected by image noise.");
+    for ($i = 0; $i < $len; $i++) {
+        $str .= $words[rand(0,count($words)-1)] . " ";
+    }
+
+    return rtrim($str);
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/bin/readcache.sh Added

@@ -0,0 +1,150 @@
+#!/usr/bin/env php
+<?php
+
+/**
+ * Kolab storage cache testing script
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+define('INSTALL_PATH', realpath('.') . '/' );
+ini_set('display_errors', 1);
+libxml_use_internal_errors(true);
+
+if (!file_exists(INSTALL_PATH . 'program/include/clisetup.php'))
+    die("Execute this from the Roundcube installation dir!\n\n");
+
+require_once INSTALL_PATH . 'program/include/clisetup.php';
+
+function print_usage()
+{
+	print "Usage:  readcache.sh [OPTIONS] FOLDER\n";
+	print "-h, --host     IMAP host name\n";
+	print "-l, --limit    Limit the number of records to be listed\n";
+}
+
+// read arguments
+$opts = get_opt(array(
+    'h' => 'host',
+    'l' => 'limit',
+    'v' => 'verbose',
+));
+
+$folder = $opts[0];
+$imap_host = $opts['host'];
+
+$rcmail = rcube::get_instance(rcube::INIT_WITH_DB | rcube::INIT_WITH_PLUGINS);
+
+if (empty($imap_host)) {
+    $default_host = $rcmail->config->get('default_host');
+    if (is_array($default_host)) {
+        list($k,$v) = each($default_host);
+        $imap_host = is_numeric($k) ? $v : $k;
+    }
+    else {
+        $imap_host = $default_host;
+    }
+
+    // strip protocol prefix
+    $imap_host = preg_replace('!^[a-z]+://!', '', $imap_host);
+}
+
+if (empty($folder) || empty($imap_host)) {
+    print_usage();
+    exit;
+}
+
+// connect to database
+$db = $rcmail->get_dbh();
+$db->db_connect('r');
+if (!$db->is_connected() || $db->is_error())
+    die("No DB connection\n");
+
+
+// resolve folder_id
+if (!is_numeric($folder)) {
+    if (strpos($folder, '@')) {
+        list($mailbox, $domain) = explode('@', $folder);
+        list($username, $subpath) = explode('/', preg_replace('!^user/!', '', $mailbox), 2);
+        $folder_uri = 'imap://' . urlencode($username.'@'.$domain) . '@' . $imap_host . '/' . $subpath;
+    }
+    else {
+        die("Invalid mailbox identifier! Example: user/john.doe/Calendar@example.org\n");
+    }
+
+    print "Resolving folder $folder_uri...";
+    $sql_result = $db->query('SELECT * FROM `kolab_folders` WHERE `resource`=?', $folder_uri);
+    if ($sql_result && ($folder_data = $db->fetch_assoc($sql_result))) {
+        $folder_id = $folder_data['folder_id'];
+        print $folder_id;
+    }
+    print "\n";
+}
+else {
+    $folder_id = intval($folder);
+    $sql_result = $db->query('SELECT * FROM `kolab_folders` WHERE `folder_id`=?', $folder_id);
+    if ($sql_result) {
+        $folder_data = $db->fetch_assoc($sql_result);
+    }
+}
+
+if (empty($folder_data)) {
+    die("Can't find cache mailbox for '$folder'\n");
+}
+
+print "Querying cache for folder $folder_id ($folder_data[type])...\n";
+
+$extra_cols = array(
+    'event'   => array('dtstart','dtend'),
+    'contact' => array('type'),
+);
+
+$cache_table = $db->table_name('kolab_cache_' . $folder_data['type']);
+$extra_cols_ = $extra_cols[$folder_data['type']] ?: array();
+$sql_arr = $db->fetch_assoc($db->query("SELECT COUNT(*) as cnt FROM `$cache_table` WHERE `folder_id`=?", intval($folder_id)));
+
+print "CTag  = " . $folder_data['ctag'] . "\n";
+print "Lock  = " . $folder_data['synclock'] . "\n";
+print "Count = " . $sql_arr['cnt'] . "\n";
+print "----------------------------------------------------------------------------------\n";
+print "<MSG>\t<UUID>\t<CHANGED>\t<DATA>\t<XML>\t";
+print join("\t", array_map(function($c) { return '<' . strtoupper($c) . '>'; }, $extra_cols_));
+print "\n----------------------------------------------------------------------------------\n";
+
+$result = $db->limitquery("SELECT * FROM `$cache_table` WHERE `folder_id`=?", 0, $opts['limit'], intval($folder_id));
+while ($result && ($sql_arr = $db->fetch_assoc($result))) {
+    print $sql_arr['msguid'] . "\t" . $sql_arr['uid'] . "\t" . $sql_arr['changed'];
+
+    // try to unserialize data block
+    $object = @unserialize(@base64_decode($sql_arr['data']));
+    print "\t" . ($object === false ? 'FAIL!' : ($object['uid'] == $sql_arr['uid'] ? 'OK' : '!!!'));
+
+    // check XML validity
+    $xml = simplexml_load_string($sql_arr['xml']);
+    print "\t" . ($xml === false ? 'FAIL!' : 'OK');
+
+    // print extra cols
+    array_walk($extra_cols_, function($c) use ($sql_arr) {
+        print "\t" . $sql_arr[$c];
+    });
+
+    print "\n";
+}
+
+print "----------------------------------------------------------------------------------\n";
+echo "Done.\n";

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/composer.json Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/config.inc.php.dist Added

@@ -0,0 +1,62 @@
+<?php
+
+/* Configuration for libkolab */
+
+// Enable caching of Kolab objects in local database
+$config['kolab_cache'] = true;
+
+// Specify format version to write Kolab objects (must be a string value!)
+$config['kolab_format_version']  = '3.0';
+
+// Optional override of the URL to read and trigger Free/Busy information of Kolab users
+// Defaults to https://<imap-server->/freebusy
+$config['kolab_freebusy_server'] = null;
+
+// Enables listing of only subscribed folders. This e.g. will limit
+// folders in calendar view or available addressbooks
+$config['kolab_use_subscriptions'] = false;
+
+// List any of 'personal','shared','other' namespaces to be excluded from groupware folder listing
+// example: array('other');
+$config['kolab_skip_namespace'] = null;
+
+// Enables the use of displayname folder annotations as introduced in KEP:?
+// for displaying resource folder names (experimental!)
+$config['kolab_custom_display_names'] = false;
+
+// Configuration of HTTP requests.
+// See http://pear.php.net/manual/en/package.http.http-request2.config.php
+// for list of supported configuration options (array keys)
+$config['kolab_http_request'] = array();
+
+// When kolab_cache is enabled Roundcube's messages cache will be redundant
+// when working on kolab folders. Here we can:
+// 2 - bypass messages/indexes cache completely
+// 1 - bypass only messages, but use index cache
+$config['kolab_messages_cache_bypass'] = 0;
+
+// LDAP directory to find avilable users for folder sharing.
+// Either contains an array with LDAP addressbook configuration or refers to entry in $config['ldap_public'].
+// If not specified, the configuraton from 'kolab_auth_addressbook' will be used.
+// Should be provided for multi-domain setups with placeholders like %dc, %d, %u, %fu or %dn.
+$config['kolab_users_directory'] = null;
+
+// Filter to be used for resolving user folders in LDAP.
+// Defaults to the 'kolab_auth_filter' configuration option.
+$config['kolab_users_filter'] = '(&(objectclass=kolabInetOrgPerson)(|(uid=%u)(mail=%fu)))';
+
+// Which property of the LDAP user record to use for user folder mapping in IMAP.
+// Defaults to the 'kolab_auth_login' configuration option.
+$config['kolab_users_id_attrib'] = null;
+
+// Use these attributes when searching users in LDAP
+$config['kolab_users_search_attrib'] = array('cn','mail','alias');
+
+// JSON-RPC endpoint configuration of the Bonnie web service providing historic data for groupware objects
+$config['kolab_bonnie_api'] = array(
+    'uri'    => 'https://<kolab-hostname>:8080/api/rpc',
+    'user'   => 'webclient',
+    'pass'   => 'Welcome2KolabSystems',
+    'secret' => '8431f191707fffffff00000000cccc',
+    'debug'  => true,   // logs requests/responses to <log-dir>/bonnie
+);

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/js Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/js/folderlist.js Added

@@ -0,0 +1,350 @@
+/**
+ * Kolab groupware folders treelist widget
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
+ */
+
+function kolab_folderlist(node, p)
+{
+    // extends treelist.js
+    rcube_treelist_widget.call(this, node, p);
+
+    // private vars
+    var me = this;
+    var search_results;
+    var search_results_widget;
+    var search_results_container;
+    var listsearch_request;
+    var search_messagebox;
+
+    var Q = rcmail.quote_html;
+
+    // render the results for folderlist search
+    function render_search_results(results)
+    {
+        if (results.length) {
+          // create treelist widget to present the search results
+          if (!search_results_widget) {
+              var list_id = (me.container.attr('id') || p.id_prefix || '0')
+              search_results_container = $('<div class="searchresults"></div>')
+                  .html(p.search_title ? '<h2 class="boxtitle" id="st:' + list_id + '">' + p.search_title + '</h2>' : '')
+                  .insertAfter(me.container);
+
+              search_results_widget = new rcube_treelist_widget('<ul>', {
+                  id_prefix: p.id_prefix,
+                  id_encode: p.id_encode,
+                  id_decode: p.id_decode,
+                  selectable: false
+              });
+              // copy classes from main list
+              search_results_widget.container.addClass(me.container.attr('class')).attr('aria-labelledby', 'st:' + list_id);
+
+              // register click handler on search result's checkboxes to select the given item for listing
+              search_results_widget.container
+                  .appendTo(search_results_container)
+                  .on('click', 'input[type=checkbox], a.subscribed, span.subscribed', function(e) {
+                      var node, has_children, li = $(this).closest('li'),
+                          id = li.attr('id').replace(new RegExp('^'+p.id_prefix), '');
+                      if (p.id_decode)
+                          id = p.id_decode(id);
+                      node = search_results_widget.get_node(id);
+                      has_children = node.children && node.children.length;
+
+                      e.stopPropagation();
+                      e.bubbles = false;
+
+                      // activate + subscribe
+                      if ($(e.target).hasClass('subscribed')) {
+                          search_results[id].subscribed = true;
+                          $(e.target).attr('aria-checked', 'true');
+                          li.children().first()
+                              .toggleClass('subscribed')
+                              .find('input[type=checkbox]').get(0).checked = true;
+
+                          if (has_children && search_results[id].group == 'other user') {
+                              li.find('ul li > div').addClass('subscribed')
+                                  .find('a.subscribed').attr('aria-checked', 'true');;
+                          }
+                      }
+                      else if (!this.checked) {
+                          return;
+                      }
+
+                      // copy item to the main list
+                      add_result2list(id, li, true);
+
+                      if (has_children) {
+                          li.find('input[type=checkbox]').first().prop('disabled', true).prop('checked', true);
+                          li.find('a.subscribed, span.subscribed').first().hide();
+                      }
+                      else {
+                          li.remove();
+                      }
+
+                      // set partial subscription status
+                      if (search_results[id].subscribed && search_results[id].parent && search_results[id].group == 'other') {
+                          parent_subscription_status($(me.get_item(id, true)));
+                      }
+
+                      // set focus to cloned checkbox
+                      if (rcube_event.is_keyboard(e)) {
+                        $(me.get_item(id, true)).find('input[type=checkbox]').first().focus();
+                      }
+                  })
+                  .on('click', function(e) {
+                      var prop, id = String($(e.target).closest('li').attr('id')).replace(new RegExp('^'+p.id_prefix), '');
+                      if (p.id_decode)
+                          id = p.id_decode(id);
+
+                      // forward event
+                      if (prop = search_results[id]) {
+                        e.data = prop;
+                        if (me.triggerEvent('click-item', e) === false) {
+                          e.stopPropagation();
+                          return false;
+                        }
+                      }
+                  });
+          }
+
+          // add results to list
+          for (var prop, item, i=0; i < results.length; i++) {
+              prop = results[i];
+              item = $(prop.html);
+              search_results[prop.id] = prop;
+              search_results_widget.insert({
+                  id: prop.id,
+                  classes: [ prop.group || '' ],
+                  html: item,
+                  collapsed: true,
+                  virtual: prop.virtual
+              }, prop.parent);
+
+              // disable checkbox if item already exists in main list
+              if (me.get_node(prop.id) && !me.get_node(prop.id).virtual) {
+                  item.find('input[type=checkbox]').first().prop('disabled', true).prop('checked', true);
+                  item.find('a.subscribed, span.subscribed').hide();
+              }
+          }
+
+          search_results_container.show();
+        }
+    }
+
+    // helper method to (recursively) add a search result item to the main list widget
+    function add_result2list(id, li, active)
+    {
+        var node = search_results_widget.get_node(id),
+            prop = search_results[id],
+            parent_id = prop.parent || null,
+            has_children = node.children && node.children.length,
+            dom_node = has_children ? li.children().first().clone(true, true) : li.children().first(),
+            childs = [];
+
+        // find parent node and insert at the right place
+        if (parent_id && me.get_node(parent_id)) {
+            dom_node.children('span,a').first().html(Q(prop.editname || prop.listname));
+        }
+        else if (parent_id && search_results[parent_id]) {
+            // copy parent tree from search results
+            add_result2list(parent_id, $(search_results_widget.get_item(parent_id)), false);
+        }
+        else if (parent_id) {
+            // use full name for list display
+            dom_node.children('span,a').first().html(Q(prop.name));
+        }
+
+        // replace virtual node with a real one
+        if (me.get_node(id)) {
+            $(me.get_item(id, true)).children().first()
+                .replaceWith(dom_node)
+                .removeClass('virtual');
+        }
+        else {
+            // copy childs, too
+            if (has_children && prop.group == 'other user') {
+                for (var cid, j=0; j < node.children.length; j++) {
+                    if ((cid = node.children[j].id) && search_results[cid]) {
+                        childs.push(search_results_widget.get_node(cid));
+                    }
+                }
+            }
+
+            // move this result item to the main list widget
+            me.insert({
+                id: id,
+                classes: [ prop.group || '' ],
+                virtual: prop.virtual,
+                html: dom_node,
+                level: node.level,
+                collapsed: true,
+                children: childs
+            }, parent_id, prop.group);
+        }
+
+        delete prop.html;
+        prop.active = active;
+        me.triggerEvent('insert-item', { id: id, data: prop, item: li });
+
+        // register childs, too
+        if (childs.length) {
+            for (var cid, j=0; j < node.children.length; j++) {
+                if ((cid = node.children[j].id) && search_results[cid]) {
+                    prop = search_results[cid];
+                    delete prop.html;
+                    prop.active = false;
+                    me.triggerEvent('insert-item', { id: cid, data: prop });
+                }
+            }
+        }
+    }
+
+    // update the given item's parent's (partial) subscription state
+    function parent_subscription_status(li)
+    {
+        var top_li = li.closest(me.container.children('li')),
+            all_childs = $('li > div:not(.treetoggle)', top_li),
+            subscribed = all_childs.filter('.subscribed').length;
+
+        if (subscribed == 0) {
+            top_li.children('div:first').removeClass('subscribed partial');
+        }
+        else {
+            top_li.children('div:first')
+                .addClass('subscribed')[subscribed < all_childs.length ? 'addClass' : 'removeClass']('partial');
+        }
+    }
+
+    // do some magic when search is performed on the widget
+    this.addEventListener('search', function(search) {
+        // hide search results
+        if (search_results_widget) {
+            search_results_container.hide();
+            search_results_widget.reset();
+        }
+        search_results = {};
+
+        if (search_messagebox)
+            rcmail.hide_message(search_messagebox);
+
+        // send search request(s) to server
+        if (search.query && search.execute) {
+            // require a minimum length for the search string
+            if (rcmail.env.autocomplete_min_length && search.query.length < rcmail.env.autocomplete_min_length && search.query != '*') {
+                search_messagebox = rcmail.display_message(
+                    rcmail.get_label('autocompletechars').replace('$min', rcmail.env.autocomplete_min_length));
+                return;
+            }
+
+            if (listsearch_request) {
+                // ignore, let the currently running request finish
+                if (listsearch_request.query == search.query) {
+                    return;
+                }
+                else { // cancel previous search request
+                    rcmail.multi_thread_request_abort(listsearch_request.id);
+                    listsearch_request = null;
+                }
+            }
+
+            var sources = p.search_sources || [ 'folders' ];
+            var reqid = rcmail.multi_thread_http_request({
+                items: sources,
+                threads: rcmail.env.autocomplete_threads || 1,
+                action:  p.search_action || 'listsearch',
+                postdata: { action:'search', q:search.query, source:'%s' },
+                lock: rcmail.display_message(rcmail.get_label('searching'), 'loading'),
+                onresponse: render_search_results,
+                whendone: function(data){
+                  listsearch_request = null;
+                  me.triggerEvent('search-complete', data);
+                }
+            });
+
+            listsearch_request = { id:reqid, query:search.query };
+        }
+        else if (!search.query && listsearch_request) {
+            rcmail.multi_thread_request_abort(listsearch_request.id);
+            listsearch_request = null;
+        }
+    });
+
+    this.container.on('click', 'a.subscribed, span.subscribed', function(e) {
+        var li = $(this).closest('li'),
+            id = li.attr('id').replace(new RegExp('^'+p.id_prefix), ''),
+            div = li.children().first(),
+            is_subscribed;
+
+        if (me.is_search()) {
+            id = id.replace(/--xsR$/, '');
+            li = $(me.get_item(id, true));
+            div = $(div).add(li.children().first());
+        }
+
+        if (p.id_decode)
+            id = p.id_decode(id);
+
+        div.toggleClass('subscribed');
+        is_subscribed = div.hasClass('subscribed');
+        $(this).attr('aria-checked', is_subscribed ? 'true' : 'false');
+        me.triggerEvent('subscribe', { id: id, subscribed: is_subscribed, item: li });
+
+        // update subscribe state of all 'virtual user' child folders
+        if (li.hasClass('other user')) {
+            $('ul li > div', li).each(function() {
+                $(this)[is_subscribed ? 'addClass' : 'removeClass']('subscribed');
+                $('.subscribed', div).attr('aria-checked', is_subscribed ? 'true' : 'false');
+            });
+            div.removeClass('partial');
+        }
+        // propagate subscription state to parent  'virtual user' folder
+        else if (li.closest('li.other.user').length) {
+            parent_subscription_status(li);
+        }
+
+        e.stopPropagation();
+        return false;
+    });
+
+    this.container.on('click', 'a.remove', function(e) {
+      var li = $(this).closest('li'),
+          id = li.attr('id').replace(new RegExp('^'+p.id_prefix), '');
+
+      if (me.is_search()) {
+          id = id.replace(/--xsR$/, '');
+          li = $(me.get_item(id, true));
+      }
+
+      if (p.id_decode)
+          id = p.id_decode(id);
+
+      me.triggerEvent('remove', { id: id, item: li });
+
+      e.stopPropagation();
+      return false;
+    });
+}
+
+// link prototype from base class
+kolab_folderlist.prototype = rcube_treelist_widget.prototype;

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_bonnie_api.php Added

@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * Provider class for accessing historic groupware object data through the Bonnie service
+ *
+ * API Specification at https://wiki.kolabsys.com/User:Bruederli/Draft:Bonnie_Client_API
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_bonnie_api
+{
+    public $ready = false;
+
+    private $config = array();
+    private $client = null;
+
+
+    /**
+     * Default constructor
+     */
+    public function __construct($config)
+    {
+        $this->config = $config;
+
+        $this->client = new kolab_bonnie_api_client($config['uri'], $config['timeout'] ?: 5, (bool)$config['debug']);
+
+        $this->client->set_secret($config['secret']);
+        $this->client->set_authentication($config['user'], $config['pass']);
+        $this->client->set_request_user(rcube::get_instance()->get_user_name());
+
+        $this->ready = !empty($config['secret']) && !empty($config['user']) && !empty($config['pass']);
+    }
+
+    /**
+     * Wrapper function for <object>.changelog() API call
+     */
+    public function changelog($type, $uid, $mailbox=null)
+    {
+        return $this->client->execute($type.'.changelog', array('uid' => $uid, 'mailbox' => $mailbox));
+    }
+
+    /**
+     * Wrapper function for <object>.diff() API call
+     */
+    public function diff($type, $uid, $rev, $mailbox=null)
+    {
+        return $this->client->execute($type.'.diff', array('uid' => $uid, 'rev' => $rev, 'mailbox' => $mailbox));
+    }
+
+    /**
+     * Wrapper function for <object>.get() API call
+     */
+    public function get($type, $uid, $rev, $mailbox=null)
+    {
+      return $this->client->execute($type.'.get', array('uid' => $uid, 'rev' => intval($rev), 'mailbox' => $mailbox));
+    }
+
+    /**
+     * Generic wrapper for direct API calls
+     */
+    public function _execute($method, $params = array())
+    {
+        return $this->client->execute($method, $params);
+    }
+
+}
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_bonnie_api_client.php Added

@@ -0,0 +1,239 @@
+<?php
+
+/**
+ * JSON-RPC client class with some extra features for communicating with the Bonnie API service.
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_bonnie_api_client
+{
+    /**
+     * URL of the RPC endpoint
+     * @var string
+     */
+    protected $url;
+
+    /**
+     * HTTP client timeout in seconds
+     * @var integer
+     */
+    protected $timeout;
+
+    /**
+     * Debug flag
+     * @var bool
+     */
+    protected $debug;
+
+    /**
+     * Username for authentication
+     * @var string
+     */
+    protected $username;
+
+    /**
+     * Password for authentication
+     * @var string
+     */
+    protected $password;
+
+    /**
+     * Secret key for request signing
+     * @var string
+     */
+    protected $secret;
+
+    /**
+     * Default HTTP headers to send to the server
+     * @var array
+     */
+    protected $headers = array(
+        'Connection' => 'close',
+        'Content-Type' => 'application/json',
+        'Accept' => 'application/json',
+    );
+
+    /**
+     * Constructor
+     *
+     * @param  string  $url      Server URL
+     * @param  integer $timeout  Request timeout
+     * @param  bool    $debug    Enabled debug logging
+     * @param  array   $headers  Custom HTTP headers
+     */
+    public function __construct($url, $timeout = 5, $debug = false, $headers = array())
+    {
+        $this->url = $url;
+        $this->timeout = $timeout;
+        $this->debug = $debug;
+        $this->headers = array_merge($this->headers, $headers);
+    }
+
+    /**
+     * Setter for secret key for request signing
+     */
+    public function set_secret($secret)
+    {
+        $this->secret = $secret;
+    }
+
+    /**
+     * Setter for the X-Request-User header
+     */
+    public function set_request_user($username)
+    {
+        $this->headers['X-Request-User'] = $username;
+    }
+
+    /**
+     * Set authentication parameters
+     *
+     * @param  string $username  Username
+     * @param  string $password  Password
+     */
+    public function set_authentication($username, $password)
+    {
+        $this->username = $username;
+        $this->password = $password;
+    }
+
+    /**
+     * Automatic mapping of procedures
+     *
+     * @param  string $method  Procedure name
+     * @param  array  $params  Procedure arguments
+     * @return mixed
+     */
+    public function __call($method, $params)
+    {
+        return $this->execute($method, $params);
+    }
+
+    /**
+     * Execute an RPC command
+     *
+     * @param  string $method  Procedure name
+     * @param  array  $params  Procedure arguments
+     * @return mixed
+     */
+    public function execute($method, array $params = array())
+    {
+        $id = mt_rand();
+
+        $payload = array(
+            'jsonrpc' => '2.0',
+            'method' => $method,
+            'id' => $id,
+        );
+
+        if (!empty($params)) {
+            $payload['params'] = $params;
+        }
+
+        $result = $this->send_request($payload, $method != 'system.keygen');
+
+        if (isset($result['id']) && $result['id'] == $id && array_key_exists('result', $result)) {
+            return $result['result'];
+        }
+        else if (isset($result['error'])) {
+            $this->_debug('ERROR', $result);
+        }
+
+        return null;
+    }
+
+    /**
+     * Do the HTTP request
+     *
+     * @param  string  $payload  Data to send
+     */
+    protected function send_request($payload, $sign = true)
+    {
+        try {
+            $payload_ = json_encode($payload);
+
+            // add request signature
+            if ($sign && !empty($this->secret)) {
+                $this->headers['X-Request-Sign'] = $this->request_signature($payload_);
+            }
+            else if ($this->headers['X-Request-Sign']) {
+                unset($this->headers['X-Request-Sign']);
+            }
+
+            $this->_debug('REQUEST', $payload, $this->headers);
+            $request = libkolab::http_request($this->url, 'POST', array('timeout' => $this->timeout));
+            $request->setHeader($this->headers);
+            $request->setAuth($this->username, $this->password);
+            $request->setBody($payload_);
+
+            $response = $request->send();
+
+            if ($response->getStatus() == 200) {
+                $result = json_decode($response->getBody(), true);
+                $this->_debug('RESPONSE', $result);
+            }
+            else {
+                throw new Exception(sprintf("HTTP %d %s", $response->getStatus(), $response->getReasonPhrase()));
+            }
+        }
+        catch (Exception $e) {
+            rcube::raise_error(array(
+                'code' => 500,
+                'type' => 'php',
+                'message' => "Bonnie API request failed: " . $e->getMessage(),
+            ), true);
+
+            return array('id' => $payload['id'], 'error' => $e->getMessage(), 'code' => -32000);
+        }
+
+        return is_array($result) ? $result : array();
+    }
+
+    /**
+     * Compute the hmac signature for the current event payload using
+     * the secret key configured for this API client
+     *
+     * @param string $data The request payload data
+     * @return string The request signature
+     */
+    protected function request_signature($data)
+    {
+        // TODO: get the session key with a system.keygen call
+        return hash_hmac('sha256', $this->headers['X-Request-User'] . ':' . $data, $this->secret);
+    }
+
+    /**
+     * Write debug log
+     */
+    protected function _debug(/* $message, $data1, data2, ...*/)
+    {
+        if (!$this->debug)
+            return;
+
+        $args = func_get_args();
+
+        $msg = array();
+        foreach ($args as $arg) {
+            $msg[] = !is_string($arg) ? var_export($arg, true) : $arg;
+        }
+
+        rcube::write_log('bonnie', join(";\n", $msg));
+    }
+
+}
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_date_recurrence.php Added

@@ -0,0 +1,135 @@
+<?php
+
+/**
+ * Recurrence computation class for xcal-based Kolab format objects
+ *
+ * Utility class to compute instances of recurring events.
+ * It requires the libcalendaring PHP module to be installed and loaded.
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+class kolab_date_recurrence
+{
+    private /* EventCal */ $engine;
+    private /* kolab_format_xcal */ $object;
+    private /* DateTime */ $start;
+    private /* DateTime */ $next;
+    private /* cDateTime */ $cnext;
+    private /* DateInterval */ $duration;
+
+    /**
+     * Default constructor
+     *
+     * @param array The Kolab object to operate on
+     */
+    function __construct($object)
+    {
+        $data = $object->to_array();
+
+        $this->object = $object;
+        $this->engine = $object->to_libcal();
+        $this->start = $this->next = $data['start'];
+        $this->cnext = kolab_format::get_datetime($this->next);
+
+        if (is_object($data['start']) && is_object($data['end']))
+            $this->duration = $data['start']->diff($data['end']);
+        else
+            $this->duration = new DateInterval('PT' . ($data['end'] - $data['start']) . 'S');
+    }
+
+    /**
+     * Get date/time of the next occurence of this event
+     *
+     * @param boolean Return a Unix timestamp instead of a DateTime object
+     * @return mixed  DateTime object/unix timestamp or False if recurrence ended
+     */
+    public function next_start($timestamp = false)
+    {
+        $time = false;
+
+        if ($this->engine && $this->next) {
+            if (($cnext = new cDateTime($this->engine->getNextOccurence($this->cnext))) && $cnext->isValid()) {
+                $next = kolab_format::php_datetime($cnext);
+                $time = $timestamp ? $next->format('U') : $next;
+                $this->cnext = $cnext;
+                $this->next = $next;
+            }
+        }
+
+        return $time;
+    }
+
+    /**
+     * Get the next recurring instance of this event
+     *
+     * @return mixed Array with event properties or False if recurrence ended
+     */
+    public function next_instance()
+    {
+        if ($next_start = $this->next_start()) {
+            $next_end = clone $next_start;
+            $next_end->add($this->duration);
+
+            $next = $this->object->to_array();
+            $next['recurrence_id'] = $next_start->format('Y-m-d');
+            $next['start'] = $next_start;
+            $next['end'] = $next_end;
+            unset($next['_formatobj']);
+
+            return $next;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the end date of the occurence of this recurrence cycle
+     *
+     * @return DateTime|bool End datetime of the last event or False if recurrence exceeds limit
+     */
+    public function end()
+    {
+        $event = $this->object->to_array();
+
+        // recurrence end date is given
+        if ($event['recurrence']['UNTIL'] instanceof DateTime) {
+            return $event['recurrence']['UNTIL'];
+        }
+
+        // let libkolab do the work
+        if ($this->engine && ($cend = $this->engine->getLastOccurrence()) && ($end_dt = kolab_format::php_datetime(new cDateTime($cend)))) {
+            return $end_dt;
+        }
+
+        // determine a reasonable end date if none given
+        if (!$event['recurrence']['COUNT'] && $event['end'] instanceof DateTime) {
+          switch ($event['recurrence']['FREQ']) {
+            case 'YEARLY':  $intvl = 'P100Y'; break;
+            case 'MONTHLY': $intvl = 'P20Y';  break;
+            default:        $intvl = 'P10Y';  break;
+          }
+
+          $end_dt = clone $event['end'];
+          $end_dt->add(new DateInterval($intvl));
+          return $end_dt;
+        }
+
+        return false;
+    }
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format.php Added

@@ -0,0 +1,699 @@
+<?php
+
+/**
+ * Kolab format model class wrapping libkolabxml bindings
+ *
+ * Abstract base class for different Kolab groupware objects read from/written
+ * to the new Kolab 3 format using the PHP bindings of libkolabxml.
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+abstract class kolab_format
+{
+    public static $timezone;
+
+    public /*abstract*/ $CTYPE;
+    public /*abstract*/ $CTYPEv2;
+
+    protected /*abstract*/ $objclass;
+    protected /*abstract*/ $read_func;
+    protected /*abstract*/ $write_func;
+
+    protected $obj;
+    protected $data;
+    protected $xmldata;
+    protected $xmlobject;
+    protected $formaterror;
+    protected $loaded = false;
+    protected $version = '3.0';
+
+    const KTYPE_PREFIX = 'application/x-vnd.kolab.';
+    const PRODUCT_ID   = 'Roundcube-libkolab-1.1';
+
+    // mapping table for valid PHP timezones not supported by libkolabxml
+    // basically the entire list of ftp://ftp.iana.org/tz/data/backward
+    protected static $timezone_map = array(
+        'Africa/Asmera' => 'Africa/Asmara',
+        'Africa/Timbuktu' => 'Africa/Abidjan',
+        'America/Argentina/ComodRivadavia' => 'America/Argentina/Catamarca',
+        'America/Atka' => 'America/Adak',
+        'America/Buenos_Aires' => 'America/Argentina/Buenos_Aires',
+        'America/Catamarca' => 'America/Argentina/Catamarca',
+        'America/Coral_Harbour' => 'America/Atikokan',
+        'America/Cordoba' => 'America/Argentina/Cordoba',
+        'America/Ensenada' => 'America/Tijuana',
+        'America/Fort_Wayne' => 'America/Indiana/Indianapolis',
+        'America/Indianapolis' => 'America/Indiana/Indianapolis',
+        'America/Jujuy' => 'America/Argentina/Jujuy',
+        'America/Knox_IN' => 'America/Indiana/Knox',
+        'America/Louisville' => 'America/Kentucky/Louisville',
+        'America/Mendoza' => 'America/Argentina/Mendoza',
+        'America/Porto_Acre' => 'America/Rio_Branco',
+        'America/Rosario' => 'America/Argentina/Cordoba',
+        'America/Virgin' => 'America/Port_of_Spain',
+        'Asia/Ashkhabad' => 'Asia/Ashgabat',
+        'Asia/Calcutta' => 'Asia/Kolkata',
+        'Asia/Chungking' => 'Asia/Shanghai',
+        'Asia/Dacca' => 'Asia/Dhaka',
+        'Asia/Katmandu' => 'Asia/Kathmandu',
+        'Asia/Macao' => 'Asia/Macau',
+        'Asia/Saigon' => 'Asia/Ho_Chi_Minh',
+        'Asia/Tel_Aviv' => 'Asia/Jerusalem',
+        'Asia/Thimbu' => 'Asia/Thimphu',
+        'Asia/Ujung_Pandang' => 'Asia/Makassar',
+        'Asia/Ulan_Bator' => 'Asia/Ulaanbaatar',
+        'Atlantic/Faeroe' => 'Atlantic/Faroe',
+        'Atlantic/Jan_Mayen' => 'Europe/Oslo',
+        'Australia/ACT' => 'Australia/Sydney',
+        'Australia/Canberra' => 'Australia/Sydney',
+        'Australia/LHI' => 'Australia/Lord_Howe',
+        'Australia/NSW' => 'Australia/Sydney',
+        'Australia/North' => 'Australia/Darwin',
+        'Australia/Queensland' => 'Australia/Brisbane',
+        'Australia/South' => 'Australia/Adelaide',
+        'Australia/Tasmania' => 'Australia/Hobart',
+        'Australia/Victoria' => 'Australia/Melbourne',
+        'Australia/West' => 'Australia/Perth',
+        'Australia/Yancowinna' => 'Australia/Broken_Hill',
+        'Brazil/Acre' => 'America/Rio_Branco',
+        'Brazil/DeNoronha' => 'America/Noronha',
+        'Brazil/East' => 'America/Sao_Paulo',
+        'Brazil/West' => 'America/Manaus',
+        'Canada/Atlantic' => 'America/Halifax',
+        'Canada/Central' => 'America/Winnipeg',
+        'Canada/East-Saskatchewan' => 'America/Regina',
+        'Canada/Eastern' => 'America/Toronto',
+        'Canada/Mountain' => 'America/Edmonton',
+        'Canada/Newfoundland' => 'America/St_Johns',
+        'Canada/Pacific' => 'America/Vancouver',
+        'Canada/Saskatchewan' => 'America/Regina',
+        'Canada/Yukon' => 'America/Whitehorse',
+        'Chile/Continental' => 'America/Santiago',
+        'Chile/EasterIsland' => 'Pacific/Easter',
+        'Cuba' => 'America/Havana',
+        'Egypt' => 'Africa/Cairo',
+        'Eire' => 'Europe/Dublin',
+        'Europe/Belfast' => 'Europe/London',
+        'Europe/Tiraspol' => 'Europe/Chisinau',
+        'GB' => 'Europe/London',
+        'GB-Eire' => 'Europe/London',
+        'Greenwich' => 'Etc/GMT',
+        'Hongkong' => 'Asia/Hong_Kong',
+        'Iceland' => 'Atlantic/Reykjavik',
+        'Iran' => 'Asia/Tehran',
+        'Israel' => 'Asia/Jerusalem',
+        'Jamaica' => 'America/Jamaica',
+        'Japan' => 'Asia/Tokyo',
+        'Kwajalein' => 'Pacific/Kwajalein',
+        'Libya' => 'Africa/Tripoli',
+        'Mexico/BajaNorte' => 'America/Tijuana',
+        'Mexico/BajaSur' => 'America/Mazatlan',
+        'Mexico/General' => 'America/Mexico_City',
+        'NZ' => 'Pacific/Auckland',
+        'NZ-CHAT' => 'Pacific/Chatham',
+        'Navajo' => 'America/Denver',
+        'PRC' => 'Asia/Shanghai',
+        'Pacific/Ponape' => 'Pacific/Pohnpei',
+        'Pacific/Samoa' => 'Pacific/Pago_Pago',
+        'Pacific/Truk' => 'Pacific/Chuuk',
+        'Pacific/Yap' => 'Pacific/Chuuk',
+        'Poland' => 'Europe/Warsaw',
+        'Portugal' => 'Europe/Lisbon',
+        'ROC' => 'Asia/Taipei',
+        'ROK' => 'Asia/Seoul',
+        'Singapore' => 'Asia/Singapore',
+        'Turkey' => 'Europe/Istanbul',
+        'UCT' => 'Etc/UCT',
+        'US/Alaska' => 'America/Anchorage',
+        'US/Aleutian' => 'America/Adak',
+        'US/Arizona' => 'America/Phoenix',
+        'US/Central' => 'America/Chicago',
+        'US/East-Indiana' => 'America/Indiana/Indianapolis',
+        'US/Eastern' => 'America/New_York',
+        'US/Hawaii' => 'Pacific/Honolulu',
+        'US/Indiana-Starke' => 'America/Indiana/Knox',
+        'US/Michigan' => 'America/Detroit',
+        'US/Mountain' => 'America/Denver',
+        'US/Pacific' => 'America/Los_Angeles',
+        'US/Samoa' => 'Pacific/Pago_Pago',
+        'Universal' => 'Etc/UTC',
+        'W-SU' => 'Europe/Moscow',
+        'Zulu' => 'Etc/UTC',
+    );
+
+    /**
+     * Factory method to instantiate a kolab_format object of the given type and version
+     *
+     * @param string Object type to instantiate
+     * @param float  Format version
+     * @param string Cached xml data to initialize with
+     * @return object kolab_format
+     */
+    public static function factory($type, $version = '3.0', $xmldata = null)
+    {
+        if (!isset(self::$timezone))
+            self::$timezone = new DateTimeZone('UTC');
+
+        if (!self::supports($version))
+            return PEAR::raiseError("No support for Kolab format version " . $version);
+
+        $type = preg_replace('/configuration\.[a-z._]+$/', 'configuration', $type);
+        $suffix = preg_replace('/[^a-z]+/', '', $type);
+        $classname = 'kolab_format_' . $suffix;
+        if (class_exists($classname))
+            return new $classname($xmldata, $version);
+
+        return PEAR::raiseError("Failed to load Kolab Format wrapper for type " . $type);
+    }
+
+    /**
+     * Determine support for the given format version
+     *
+     * @param float Format version to check
+     * @return boolean True if supported, False otherwise
+     */
+    public static function supports($version)
+    {
+        if ($version == '2.0')
+            return class_exists('kolabobject');
+        // default is version 3
+        return class_exists('kolabformat');
+    }
+
+    /**
+     * Convert the given date/time value into a cDateTime object
+     *
+     * @param mixed         Date/Time value either as unix timestamp, date string or PHP DateTime object
+     * @param DateTimeZone  The timezone the date/time is in. Use global default if Null, local time if False
+     * @param boolean       True of the given date has no time component
+     * @return object       The libkolabxml date/time object
+     */
+    public static function get_datetime($datetime, $tz = null, $dateonly = false)
+    {
+        // use timezone information from datetime of global setting
+        if (!$tz && $tz !== false) {
+            if ($datetime instanceof DateTime)
+                $tz = $datetime->getTimezone();
+            if (!$tz)
+                $tz = self::$timezone;
+        }
+        $result = new cDateTime();
+
+        try {
+            // got a unix timestamp (in UTC)
+            if (is_numeric($datetime)) {
+                $datetime = new DateTime('@'.$datetime, new DateTimeZone('UTC'));
+                if ($tz) $datetime->setTimezone($tz);
+            }
+            else if (is_string($datetime) && strlen($datetime)) {
+                $datetime = $tz ? new DateTime($datetime, $tz) : new DateTime($datetime);
+            }
+        }
+        catch (Exception $e) {}
+
+        if ($datetime instanceof DateTime) {
+            $result->setDate($datetime->format('Y'), $datetime->format('n'), $datetime->format('j'));
+
+            if (!$dateonly)
+                $result->setTime($datetime->format('G'), $datetime->format('i'), $datetime->format('s'));
+
+            if ($tz && in_array($tz->getName(), array('UTC', 'GMT', '+00:00', 'Z'))) {
+                $result->setUTC(true);
+            }
+            else if ($tz !== false) {
+                $tzid = $tz->getName();
+                if (array_key_exists($tzid, self::$timezone_map))
+                    $tzid = self::$timezone_map[$tzid];
+                $result->setTimezone($tzid);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Convert the given cDateTime into a PHP DateTime object
+     *
+     * @param object cDateTime  The libkolabxml datetime object
+     * @return object DateTime  PHP datetime instance
+     */
+    public static function php_datetime($cdt)
+    {
+        if (!is_object($cdt) || !$cdt->isValid())
+            return null;
+
+        $d = new DateTime;
+        $d->setTimezone(self::$timezone);
+
+        try {
+            if ($tzs = $cdt->timezone()) {
+                $tz = new DateTimeZone($tzs);
+                $d->setTimezone($tz);
+            }
+            else if ($cdt->isUTC()) {
+                $d->setTimezone(new DateTimeZone('UTC'));
+            }
+        }
+        catch (Exception $e) { }
+
+        $d->setDate($cdt->year(), $cdt->month(), $cdt->day());
+
+        if ($cdt->isDateOnly()) {
+            $d->_dateonly = true;
+            $d->setTime(12, 0, 0);  // set time to noon to avoid timezone troubles
+        }
+        else {
+            $d->setTime($cdt->hour(), $cdt->minute(), $cdt->second());
+        }
+
+        return $d;
+    }
+
+    /**
+     * Convert a libkolabxml vector to a PHP array
+     *
+     * @param object vector Object
+     * @return array Indexed array containing vector elements
+     */
+    public static function vector2array($vec, $max = PHP_INT_MAX)
+    {
+        $arr = array();
+        for ($i=0; $i < $vec->size() && $i < $max; $i++)
+            $arr[] = $vec->get($i);
+        return $arr;
+    }
+
+    /**
+     * Build a libkolabxml vector (string) from a PHP array
+     *
+     * @param array Array with vector elements
+     * @return object vectors
+     */
+    public static function array2vector($arr)
+    {
+        $vec = new vectors;
+        foreach ((array)$arr as $val) {
+            if (strlen($val))
+                $vec->push($val);
+        }
+        return $vec;
+    }
+
+    /**
+     * Parse the X-Kolab-Type header from MIME messages and return the object type in short form
+     *
+     * @param string X-Kolab-Type header value
+     * @return string Kolab object type (contact,event,task,note,etc.)
+     */
+    public static function mime2object_type($x_kolab_type)
+    {
+        return preg_replace(
+            array('/dictionary.[a-z.]+$/', '/contact.distlist$/'),
+            array( 'dictionary',            'distribution-list'),
+            substr($x_kolab_type, strlen(self::KTYPE_PREFIX))
+        );
+    }
+
+
+    /**
+     * Default constructor of all kolab_format_* objects
+     */
+    public function __construct($xmldata = null, $version = null)
+    {
+        $this->obj = new $this->objclass;
+        $this->xmldata = $xmldata;
+
+        if ($version)
+            $this->version = $version;
+
+        // use libkolab module if available
+        if (class_exists('kolabobject'))
+            $this->xmlobject = new XMLObject();
+    }
+
+    /**
+     * Check for format errors after calling kolabformat::write*()
+     *
+     * @return boolean True if there were errors, False if OK
+     */
+    protected function format_errors()
+    {
+        $ret = $log = false;
+        switch (kolabformat::error()) {
+            case kolabformat::NoError:
+                $ret = false;
+                break;
+            case kolabformat::Warning:
+                $ret = false;
+                $uid = is_object($this->obj) ? $this->obj->uid() : $this->data['uid'];
+                $log = "Warning @ $uid";
+                break;
+            default:
+                $ret = true;
+                $log = "Error";
+        }
+
+        if ($log && !isset($this->formaterror)) {
+            rcube::raise_error(array(
+                'code' => 660,
+                'type' => 'php',
+                'file' => __FILE__,
+                'line' => __LINE__,
+                'message' => "kolabformat $log: " . kolabformat::errorMessage(),
+            ), true);
+
+            $this->formaterror = $ret;
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Save the last generated UID to the object properties.
+     * Should be called after kolabformat::writeXXXX();
+     */
+    protected function update_uid()
+    {
+        // get generated UID
+        if (!$this->data['uid']) {
+            if ($this->xmlobject) {
+                $this->data['uid'] = $this->xmlobject->getSerializedUID();
+            }
+            if (empty($this->data['uid'])) {
+                $this->data['uid'] = kolabformat::getSerializedUID();
+            }
+            $this->obj->setUid($this->data['uid']);
+        }
+    }
+
+    /**
+     * Initialize libkolabxml object with cached xml data
+     */
+    protected function init()
+    {
+        if (!$this->loaded) {
+            if ($this->xmldata) {
+                $this->load($this->xmldata);
+                $this->xmldata = null;
+            }
+            $this->loaded = true;
+        }
+    }
+
+    /**
+     * Get constant value for libkolab's version parameter
+     *
+     * @param float Version value to convert
+     * @return int Constant value of either kolabobject::KolabV2 or kolabobject::KolabV3 or false if kolabobject module isn't available
+     */
+    protected function libversion($v = null)
+    {
+        if (class_exists('kolabobject')) {
+            $version = $v ?: $this->version;
+            if ($version <= '2.0')
+                return kolabobject::KolabV2;
+            else
+                return kolabobject::KolabV3;
+        }
+
+        return false;
+    }
+
+    /**
+     * Determine the correct libkolab(xml) wrapper function for the given call
+     * depending on the available PHP modules
+     */
+    protected function libfunc($func)
+    {
+        if (is_array($func) || strpos($func, '::'))
+            return $func;
+        else if (class_exists('kolabobject'))
+            return array($this->xmlobject, $func);
+        else
+            return 'kolabformat::' . $func;
+    }
+
+    /**
+     * Direct getter for object properties
+     */
+    public function __get($var)
+    {
+        return $this->data[$var];
+    }
+
+    /**
+     * Load Kolab object data from the given XML block
+     *
+     * @param string XML data
+     * @return boolean True on success, False on failure
+     */
+    public function load($xml)
+    {
+        $this->formaterror = null;
+        $read_func = $this->libfunc($this->read_func);
+
+        if (is_array($read_func))
+            $r = call_user_func($read_func, $xml, $this->libversion());
+        else
+            $r = call_user_func($read_func, $xml, false);
+
+        if (is_resource($r))
+            $this->obj = new $this->objclass($r);
+        else if (is_a($r, $this->objclass))
+            $this->obj = $r;
+
+        $this->loaded = !$this->format_errors();
+    }
+
+    /**
+     * Write object data to XML format
+     *
+     * @param float Format version to write
+     * @return string XML data
+     */
+    public function write($version = null)
+    {
+        $this->formaterror = null;
+
+        $this->init();
+        $write_func = $this->libfunc($this->write_func);
+        if (is_array($write_func))
+            $this->xmldata = call_user_func($write_func, $this->obj, $this->libversion($version), self::PRODUCT_ID);
+        else
+            $this->xmldata = call_user_func($write_func, $this->obj, self::PRODUCT_ID);
+
+        if (!$this->format_errors())
+            $this->update_uid();
+        else
+            $this->xmldata = null;
+
+        return $this->xmldata;
+    }
+
+    /**
+     * Set properties to the kolabformat object
+     *
+     * @param array  Object data as hash array
+     */
+    public function set(&$object)
+    {
+        $this->init();
+
+        if (!empty($object['uid']))
+            $this->obj->setUid($object['uid']);
+
+        // set some automatic values if missing
+        if (empty($object['created']) && method_exists($this->obj, 'setCreated')) {
+            $cdt = $this->obj->created();
+            $object['created'] = $cdt && $cdt->isValid() ? self::php_datetime($cdt) : new DateTime('now', new DateTimeZone('UTC'));
+            if (!$cdt || !$cdt->isValid())
+                $this->obj->setCreated(self::get_datetime($object['created']));
+        }
+
+        $object['changed'] = new DateTime('now', new DateTimeZone('UTC'));
+        $this->obj->setLastModified(self::get_datetime($object['changed']));
+
+        // Save custom properties of the given object
+        if (isset($object['x-custom']) && method_exists($this->obj, 'setCustomProperties')) {
+            $vcustom = new vectorcs;
+            foreach ((array)$object['x-custom'] as $cp) {
+                if (is_array($cp))
+                    $vcustom->push(new CustomProperty($cp[0], $cp[1]));
+            }
+            $this->obj->setCustomProperties($vcustom);
+        }
+        // load custom properties from XML for caching (#2238) if method exists (#3125)
+        else if (method_exists($this->obj, 'customProperties')) {
+            $object['x-custom'] = array();
+            $vcustom = $this->obj->customProperties();
+            for ($i=0; $i < $vcustom->size(); $i++) {
+                $cp = $vcustom->get($i);
+                $object['x-custom'][] = array($cp->identifier, $cp->value);
+            }
+        }
+    }
+
+    /**
+     * Convert the Kolab object into a hash array data structure
+     *
+     * @param array Additional data for merge
+     *
+     * @return array  Kolab object data as hash array
+     */
+    public function to_array($data = array())
+    {
+        $this->init();
+
+        // read object properties into local data object
+        $object = array(
+            'uid'     => $this->obj->uid(),
+            'changed' => self::php_datetime($this->obj->lastModified()),
+        );
+
+        // not all container support the created property
+        if (method_exists($this->obj, 'created')) {
+            $object['created'] = self::php_datetime($this->obj->created());
+        }
+
+        // read custom properties
+        if (method_exists($this->obj, 'customProperties')) {
+            $vcustom = $this->obj->customProperties();
+            for ($i=0; $i < $vcustom->size(); $i++) {
+                $cp = $vcustom->get($i);
+                $object['x-custom'][] = array($cp->identifier, $cp->value);
+            }
+        }
+
+        // merge with additional data, e.g. attachments from the message
+        if ($data) {
+            foreach ($data as $idx => $value) {
+                if (is_array($value)) {
+                    $object[$idx] = array_merge((array)$object[$idx], $value);
+                }
+                else {
+                    $object[$idx] = $value;
+                }
+            }
+        }
+
+        return $object;
+    }
+
+    /**
+     * Object validation method to be implemented by derived classes
+     */
+    abstract public function is_valid();
+
+    /**
+     * Callback for kolab_storage_cache to get object specific tags to cache
+     *
+     * @return array List of tags to save in cache
+     */
+    public function get_tags()
+    {
+        return array();
+    }
+
+    /**
+     * Callback for kolab_storage_cache to get words to index for fulltext search
+     *
+     * @return array List of words to save in cache
+     */
+    public function get_words()
+    {
+        return array();
+    }
+
+    /**
+     * Utility function to extract object attachment data
+     *
+     * @param array Hash array reference to append attachment data into
+     */
+    public function get_attachments(&$object)
+    {
+        $this->init();
+
+        // handle attachments
+        $vattach = $this->obj->attachments();
+        for ($i=0; $i < $vattach->size(); $i++) {
+            $attach = $vattach->get($i);
+
+            // skip cid: attachments which are mime message parts handled by kolab_storage_folder
+            if (substr($attach->uri(), 0, 4) != 'cid:' && $attach->label()) {
+                $name    = $attach->label();
+                $key     = $name . (isset($object['_attachments'][$name]) ? '.'.$i : '');
+                $content = $attach->data();
+                $object['_attachments'][$key] = array(
+                    'id'       => 'i:'.$i,
+                    'name'     => $name,
+                    'mimetype' => $attach->mimetype(),
+                    'size'     => strlen($content),
+                    'content'  => $content,
+                );
+            }
+            else if (in_array(substr($attach->uri(), 0, 4), array('http','imap'))) {
+                $object['links'][] = $attach->uri();
+            }
+        }
+    }
+
+    /**
+     * Utility function to set attachment properties to the kolabformat object
+     *
+     * @param array  Object data as hash array
+     * @param boolean True to always overwrite attachment information
+     */
+    protected function set_attachments($object, $write = true)
+    {
+        // save attachments
+        $vattach = new vectorattachment;
+        foreach ((array) $object['_attachments'] as $cid => $attr) {
+            if (empty($attr))
+                continue;
+            $attach = new Attachment;
+            $attach->setLabel((string)$attr['name']);
+            $attach->setUri('cid:' . $cid, $attr['mimetype'] ?: 'application/octet-stream');
+            if ($attach->isValid()) {
+                $vattach->push($attach);
+                $write = true;
+            }
+            else {
+                rcube::raise_error(array(
+                    'code' => 660,
+                    'type' => 'php',
+                    'file' => __FILE__,
+                    'line' => __LINE__,
+                    'message' => "Invalid attributes for attachment $cid: " . var_export($attr, true),
+                ), true);
+            }
+        }
+
+        foreach ((array) $object['links'] as $link) {
+            $attach = new Attachment;
+            $attach->setUri($link, 'unknown');
+            $vattach->push($attach);
+            $write = true;
+        }
+
+        if ($write) {
+            $this->obj->setAttachments($vattach);
+        }
+    }
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_configuration.php Added

@@ -0,0 +1,284 @@
+<?php
+
+/**
+ * Kolab Configuration data model class
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_format_configuration extends kolab_format
+{
+    public $CTYPE   = 'application/vnd.kolab+xml';
+    public $CTYPEv2 = 'application/x-vnd.kolab.configuration';
+
+    protected $objclass   = 'Configuration';
+    protected $read_func  = 'readConfiguration';
+    protected $write_func = 'writeConfiguration';
+
+    private $type_map = array(
+        'category'    => Configuration::TypeCategoryColor,
+        'dictionary'  => Configuration::TypeDictionary,
+        'file_driver' => Configuration::TypeFileDriver,
+        'relation'    => Configuration::TypeRelation,
+        'snippet'     => Configuration::TypeSnippet,
+    );
+
+    private $driver_settings_fields = array('host', 'port', 'username', 'password');
+
+    /**
+     * Set properties to the kolabformat object
+     *
+     * @param array  Object data as hash array
+     */
+    public function set(&$object)
+    {
+        // read type-specific properties
+        switch ($object['type']) {
+        case 'dictionary':
+            $dict = new Dictionary($object['language']);
+            $dict->setEntries(self::array2vector($object['e']));
+            $this->obj = new Configuration($dict);
+            break;
+
+        case 'category':
+            // TODO: implement this
+            $categories = new vectorcategorycolor;
+            $this->obj = new Configuration($categories);
+            break;
+
+        case 'file_driver':
+            $driver = new FileDriver($object['driver'], $object['title']);
+
+            $driver->setEnabled((bool) $object['enabled']);
+
+            foreach ($this->driver_settings_fields as $field) {
+                $value = $object[$field];
+                if ($value !== null) {
+                    $driver->{'set' . ucfirst($field)}($value);
+                }
+            }
+
+            $this->obj = new Configuration($driver);
+            break;
+
+        case 'relation':
+            $relation = new Relation(strval($object['name']), strval($object['category']));
+
+            if ($object['color']) {
+                $relation->setColor($object['color']);
+            }
+            if ($object['parent']) {
+                $relation->setParent($object['parent']);
+            }
+            if ($object['iconName']) {
+                $relation->setIconName($object['iconName']);
+            }
+            if ($object['priority'] > 0) {
+                $relation->setPriority((int) $object['priority']);
+            }
+            if (!empty($object['members'])) {
+                $relation->setMembers(self::array2vector($object['members']));
+            }
+
+            $this->obj = new Configuration($relation);
+            break;
+
+        case 'snippet':
+            $collection = new SnippetCollection($object['name']);
+            $snippets   = new vectorsnippets;
+
+            foreach ((array) $object['snippets'] as $item) {
+                $snippet = new snippet($item['name'], $item['text']);
+                $snippet->setTextType(strtolower($item['type']) == 'html' ? Snippet::HTML : Snippet::Plain);
+                if ($item['shortcut']) {
+                    $snippet->setShortCut($item['shortcut']);
+                }
+
+                $snippets->push($snippet);
+            }
+
+            $collection->setSnippets($snippets);
+
+            $this->obj = new Configuration($collection);
+            break;
+
+        default:
+            return false;
+        }
+
+        // adjust content-type string
+        $this->CTYPEv2 = 'application/x-vnd.kolab.configuration.' . $object['type'];
+
+        // reset old object data, otherwise set() will overwrite current data (#4095)
+        $this->xmldata = null;
+        // set common object properties
+        parent::set($object);
+
+        // cache this data
+        $this->data = $object;
+        unset($this->data['_formatobj']);
+    }
+
+    /**
+     *
+     */
+    public function is_valid()
+    {
+        return $this->data || (is_object($this->obj) && $this->obj->isValid());
+    }
+
+    /**
+     * Convert the Configuration object into a hash array data structure
+     *
+     * @param array Additional data for merge
+     *
+     * @return array  Config object data as hash array
+     */
+    public function to_array($data = array())
+    {
+        // return cached result
+        if (!empty($this->data)) {
+            return $this->data;
+        }
+
+        // read common object props into local data object
+        $object = parent::to_array($data);
+
+        $type_map = array_flip($this->type_map);
+
+        $object['type'] = $type_map[$this->obj->type()];
+
+        // read type-specific properties
+        switch ($object['type']) {
+        case 'dictionary':
+            $dict = $this->obj->dictionary();
+            $object['language'] = $dict->language();
+            $object['e'] = self::vector2array($dict->entries());
+            break;
+
+        case 'category':
+            // TODO: implement this
+            break;
+
+        case 'file_driver':
+            $driver = $this->obj->fileDriver();
+
+            $object['driver']  = $driver->driver();
+            $object['title']   = $driver->title();
+            $object['enabled'] = $driver->enabled();
+
+            foreach ($this->driver_settings_fields as $field) {
+                $object[$field] = $driver->{$field}();
+            }
+
+            break;
+
+        case 'relation':
+            $relation = $this->obj->relation();
+
+            $object['name']     = $relation->name();
+            $object['category'] = $relation->type();
+            $object['color']    = $relation->color();
+            $object['parent']   = $relation->parent();
+            $object['iconName'] = $relation->iconName();
+            $object['priority'] = $relation->priority();
+            $object['members']  = self::vector2array($relation->members());
+
+            break;
+
+        case 'snippet':
+            $collection = $this->obj->snippets();
+
+            $object['name']     = $collection->name();
+            $object['snippets'] = array();
+
+            $snippets = $collection->snippets();
+            for ($i=0; $i < $snippets->size(); $i++) {
+                $snippet = $snippets->get($i);
+                $object['snippets'][] = array(
+                    'name'     => $snippet->name(),
+                    'text'     => $snippet->text(),
+                    'type'     => $snippet->textType() == Snippet::HTML ? 'html' : 'plain',
+                    'shortcut' => $snippet->shortCut(),
+                );
+            }
+
+            break;
+        }
+
+        // adjust content-type string
+        if ($object['type']) {
+            $this->CTYPEv2 = 'application/x-vnd.kolab.configuration.' . $object['type'];
+        }
+
+        $this->data = $object;
+        return $this->data;
+    }
+
+    /**
+     * Callback for kolab_storage_cache to get object specific tags to cache
+     *
+     * @return array List of tags to save in cache
+     */
+    public function get_tags()
+    {
+        $tags = array();
+
+        switch ($this->data['type']) {
+        case 'dictionary':
+            $tags = array($this->data['language']);
+            break;
+
+        case 'relation':
+            $tags = array('category:' . $this->data['category']);
+            break;
+        }
+
+        return $tags;
+    }
+
+    /**
+     * Callback for kolab_storage_cache to get words to index for fulltext search
+     *
+     * @return array List of words to save in cache
+     */
+    public function get_words()
+    {
+        $words = array();
+
+        foreach ((array)$this->data['members'] as $url) {
+            $member = kolab_storage_config::parse_member_url($url);
+
+            if (empty($member)) {
+                if (strpos($url, 'urn:uuid:') === 0) {
+                    $words[] = substr($url, 9);
+                }
+            }
+            else if (!empty($member['params']['message-id'])) {
+                $words[] = $member['params']['message-id'];
+            }
+            else {
+                // derive message identifier from URI
+                $words[] = md5($url);
+            }
+        }
+
+        return $words;
+    }
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_contact.php Added

@@ -0,0 +1,482 @@
+<?php
+
+/**
+ * Kolab Contact model class
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_format_contact extends kolab_format
+{
+    public $CTYPE = 'application/vcard+xml';
+    public $CTYPEv2 = 'application/x-vnd.kolab.contact';
+
+    protected $objclass = 'Contact';
+    protected $read_func = 'readContact';
+    protected $write_func = 'writeContact';
+
+    public static $fulltext_cols = array('name', 'firstname', 'surname', 'middlename', 'email:address');
+
+    public $phonetypes = array(
+        'home'    => Telephone::Home,
+        'work'    => Telephone::Work,
+        'text'    => Telephone::Text,
+        'main'    => Telephone::Voice,
+        'homefax' => Telephone::Fax,
+        'workfax' => Telephone::Fax,
+        'mobile'  => Telephone::Cell,
+        'video'   => Telephone::Video,
+        'pager'   => Telephone::Pager,
+        'car'     => Telephone::Car,
+        'other'   => Telephone::Textphone,
+    );
+
+    public $emailtypes = array(
+        'home' => Email::Home,
+        'work' => Email::Work,
+        'other' => Email::NoType,
+    );
+
+    public $addresstypes = array(
+        'home' => Address::Home,
+        'work' => Address::Work,
+        'office' => 0,
+    );
+
+    private $gendermap = array(
+        'female' => Contact::Female,
+        'male'   => Contact::Male,
+    );
+
+    private $relatedmap = array(
+        'manager'   => Related::Manager,
+        'assistant' => Related::Assistant,
+        'spouse'    => Related::Spouse,
+        'children'  => Related::Child,
+    );
+
+
+    /**
+     * Default constructor
+     */
+    function __construct($xmldata = null, $version = 3.0)
+    {
+        parent::__construct($xmldata, $version);
+
+        // complete phone types
+        $this->phonetypes['homefax'] |= Telephone::Home;
+        $this->phonetypes['workfax'] |= Telephone::Work;
+    }
+
+    /**
+     * Set contact properties to the kolabformat object
+     *
+     * @param array  Contact data as hash array
+     */
+    public function set(&$object)
+    {
+        // set common object properties
+        parent::set($object);
+
+        // do the hard work of setting object values
+        $nc = new NameComponents;
+        $nc->setSurnames(self::array2vector($object['surname']));
+        $nc->setGiven(self::array2vector($object['firstname']));
+        $nc->setAdditional(self::array2vector($object['middlename']));
+        $nc->setPrefixes(self::array2vector($object['prefix']));
+        $nc->setSuffixes(self::array2vector($object['suffix']));
+        $this->obj->setNameComponents($nc);
+        $this->obj->setName($object['name']);
+        $this->obj->setCategories(self::array2vector($object['categories']));
+
+        if (isset($object['nickname']))
+            $this->obj->setNickNames(self::array2vector($object['nickname']));
+        if (isset($object['jobtitle']))
+            $this->obj->setTitles(self::array2vector($object['jobtitle']));
+
+        // organisation related properties (affiliation)
+        $org = new Affiliation;
+        $offices = new vectoraddress;
+        if ($object['organization'])
+            $org->setOrganisation($object['organization']);
+        if ($object['department'])
+            $org->setOrganisationalUnits(self::array2vector($object['department']));
+        if ($object['profession'])
+            $org->setRoles(self::array2vector($object['profession']));
+
+        $rels = new vectorrelated;
+        foreach (array('manager','assistant') as $field) {
+            if (!empty($object[$field])) {
+                $reltype = $this->relatedmap[$field];
+                foreach ((array)$object[$field] as $value) {
+                    $rels->push(new Related(Related::Text, $value, $reltype));
+                }
+            }
+        }
+        $org->setRelateds($rels);
+
+        // im, email, url
+        $this->obj->setIMaddresses(self::array2vector($object['im']));
+
+        if (class_exists('vectoremail')) {
+            $vemails = new vectoremail;
+            foreach ((array)$object['email'] as $email) {
+                $type = $this->emailtypes[$email['type']];
+                $vemails->push(new Email($email['address'], intval($type)));
+            }
+        }
+        else {
+            $vemails = self::array2vector(array_map(function($v){ return $v['address']; }, $object['email']));
+        }
+        $this->obj->setEmailAddresses($vemails);
+
+        $vurls = new vectorurl;
+        foreach ((array)$object['website'] as $url) {
+            $type = $url['type'] == 'blog' ? Url::Blog : Url::NoType;
+            $vurls->push(new Url($url['url'], $type));
+        }
+        $this->obj->setUrls($vurls);
+
+        // addresses
+        $adrs = new vectoraddress;
+        foreach ((array)$object['address'] as $address) {
+            $adr = new Address;
+            $type = $this->addresstypes[$address['type']];
+            if (isset($type))
+                $adr->setTypes($type);
+            else if ($address['type'])
+                $adr->setLabel($address['type']);
+            if ($address['street'])
+                $adr->setStreet($address['street']);
+            if ($address['locality'])
+                $adr->setLocality($address['locality']);
+            if ($address['code'])
+                $adr->setCode($address['code']);
+            if ($address['region'])
+                $adr->setRegion($address['region']);
+            if ($address['country'])
+                $adr->setCountry($address['country']);
+
+            if ($address['type'] == 'office')
+                $offices->push($adr);
+            else
+                $adrs->push($adr);
+        }
+        $this->obj->setAddresses($adrs);
+        $org->setAddresses($offices);
+
+        // add org affiliation after addresses are set
+        $orgs = new vectoraffiliation;
+        $orgs->push($org);
+        $this->obj->setAffiliations($orgs);
+
+        // telephones
+        $tels = new vectortelephone;
+        foreach ((array)$object['phone'] as $phone) {
+            $tel = new Telephone;
+            if (isset($this->phonetypes[$phone['type']]))
+                $tel->setTypes($this->phonetypes[$phone['type']]);
+            $tel->setNumber($phone['number']);
+            $tels->push($tel);
+        }
+        $this->obj->setTelephones($tels);
+
+        if (isset($object['gender']))
+            $this->obj->setGender($this->gendermap[$object['gender']] ? $this->gendermap[$object['gender']] : Contact::NotSet);
+        if (isset($object['notes']))
+            $this->obj->setNote($object['notes']);
+        if (isset($object['freebusyurl']))
+            $this->obj->setFreeBusyUrl($object['freebusyurl']);
+        if (isset($object['lang']))
+            $this->obj->setLanguages(self::array2vector($object['lang']));
+        if (isset($object['birthday']))
+            $this->obj->setBDay(self::get_datetime($object['birthday'], false, true));
+        if (isset($object['anniversary']))
+            $this->obj->setAnniversary(self::get_datetime($object['anniversary'], false, true));
+
+        if (!empty($object['photo'])) {
+            if ($type = rcube_mime::image_content_type($object['photo']))
+                $this->obj->setPhoto($object['photo'], $type);
+        }
+        else if (isset($object['photo']))
+            $this->obj->setPhoto('','');
+        else if ($this->obj->photoMimetype())  // load saved photo for caching
+            $object['photo'] = $this->obj->photo();
+
+        // spouse and children are relateds
+        $rels = new vectorrelated;
+        foreach (array('spouse','children') as $field) {
+            if (!empty($object[$field])) {
+                $reltype = $this->relatedmap[$field];
+                foreach ((array)$object[$field] as $value) {
+                    $rels->push(new Related(Related::Text, $value, $reltype));
+                }
+            }
+        }
+        // add other relateds
+        if (is_array($object['related'])) {
+            foreach ($object['related'] as $value) {
+                $rels->push(new Related(Related::Text, $value));
+            }
+        }
+        $this->obj->setRelateds($rels);
+
+        // insert/replace crypto keys
+        $pgp_index = $pkcs7_index = -1;
+        $keys = $this->obj->keys();
+        for ($i=0; $i < $keys->size(); $i++) {
+            $key = $keys->get($i);
+            if ($pgp_index < 0 && $key->type() == Key::PGP)
+                $pgp_index = $i;
+            else if ($pkcs7_index < 0 && $key->type() == Key::PKCS7_MIME)
+                $pkcs7_index = $i;
+        }
+
+        $pgpkey   = $object['pgppublickey']   ? new Key($object['pgppublickey'], Key::PGP) : new Key();
+        $pkcs7key = $object['pkcs7publickey'] ? new Key($object['pkcs7publickey'], Key::PKCS7_MIME) : new Key();
+
+        if ($pgp_index >= 0)
+            $keys->set($pgp_index, $pgpkey);
+        else if (!empty($object['pgppublickey']))
+            $keys->push($pgpkey);
+        if ($pkcs7_index >= 0)
+            $keys->set($pkcs7_index, $pkcs7key);
+        else if (!empty($object['pkcs7publickey']))
+            $keys->push($pkcs7key);
+
+        $this->obj->setKeys($keys);
+
+        // TODO: handle language, gpslocation, etc.
+
+        // set type property for proper caching
+        $object['_type'] = 'contact';
+
+        // cache this data
+        $this->data = $object;
+        unset($this->data['_formatobj']);
+    }
+
+    /**
+     *
+     */
+    public function is_valid()
+    {
+        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->uid() /*$this->obj->isValid()*/));
+    }
+
+    /**
+     * Convert the Contact object into a hash array data structure
+     *
+     * @param array Additional data for merge
+     *
+     * @return array  Contact data as hash array
+     */
+    public function to_array($data = array())
+    {
+        // return cached result
+        if (!empty($this->data))
+            return $this->data;
+
+        // read common object props into local data object
+        $object = parent::to_array($data);
+
+        $object['name'] = $this->obj->name();
+
+        $nc = $this->obj->nameComponents();
+        $object['surname']    = join(' ', self::vector2array($nc->surnames()));
+        $object['firstname']  = join(' ', self::vector2array($nc->given()));
+        $object['middlename'] = join(' ', self::vector2array($nc->additional()));
+        $object['prefix']     = join(' ', self::vector2array($nc->prefixes()));
+        $object['suffix']     = join(' ', self::vector2array($nc->suffixes()));
+        $object['nickname']   = join(' ', self::vector2array($this->obj->nickNames()));
+        $object['jobtitle']   = join(' ', self::vector2array($this->obj->titles()));
+        $object['categories'] = self::vector2array($this->obj->categories());
+
+        // organisation related properties (affiliation)
+        $orgs = $this->obj->affiliations();
+        if ($orgs->size()) {
+            $org = $orgs->get(0);
+            $object['organization']   = $org->organisation();
+            $object['profession']     = join(' ', self::vector2array($org->roles()));
+            $object['department']     = join(' ', self::vector2array($org->organisationalUnits()));
+            $this->read_relateds($org->relateds(), $object);
+        }
+
+        $object['im'] = self::vector2array($this->obj->imAddresses());
+
+        $emails = $this->obj->emailAddresses();
+        if ($emails instanceof vectoremail) {
+            $emailtypes = array_flip($this->emailtypes);
+            for ($i=0; $i < $emails->size(); $i++) {
+                $email = $emails->get($i);
+                $object['email'][] = array('address' => $email->address(), 'type' => $emailtypes[$email->types()]);
+            }
+        }
+        else {
+            $object['email'] = self::vector2array($emails);
+        }
+
+        $urls = $this->obj->urls();
+        for ($i=0; $i < $urls->size(); $i++) {
+            $url = $urls->get($i);
+            $subtype = $url->type() == Url::Blog ? 'blog' : 'homepage';
+            $object['website'][] = array('url' => $url->url(), 'type' => $subtype);
+        }
+
+        // addresses
+        $this->read_addresses($this->obj->addresses(), $object);
+        if ($org && ($offices = $org->addresses()))
+            $this->read_addresses($offices, $object, 'office');
+
+        // telehones
+        $tels = $this->obj->telephones();
+        $teltypes = array_flip($this->phonetypes);
+        for ($i=0; $i < $tels->size(); $i++) {
+            $tel = $tels->get($i);
+            $object['phone'][] = array('number' => $tel->number(), 'type' => $teltypes[$tel->types()]);
+        }
+
+        $object['notes'] = $this->obj->note();
+        $object['freebusyurl'] = $this->obj->freeBusyUrl();
+        $object['lang'] = self::vector2array($this->obj->languages());
+
+        if ($bday = self::php_datetime($this->obj->bDay()))
+            $object['birthday'] = $bday;
+
+        if ($anniversary = self::php_datetime($this->obj->anniversary()))
+            $object['anniversary'] = $anniversary;
+
+        $gendermap = array_flip($this->gendermap);
+        if (($g = $this->obj->gender()) && $gendermap[$g])
+            $object['gender'] = $gendermap[$g];
+
+        if ($this->obj->photoMimetype())
+            $object['photo'] = $this->obj->photo();
+        else if ($this->xmlobject && ($photo_name = $this->xmlobject->pictureAttachmentName()))
+            $object['photo'] = $photo_name;
+
+        // relateds -> spouse, children
+        $this->read_relateds($this->obj->relateds(), $object, 'related');
+
+        // crypto settings: currently only key values are supported
+        $keys = $this->obj->keys();
+        for ($i=0; is_object($keys) && $i < $keys->size(); $i++) {
+            $key = $keys->get($i);
+            if ($key->type() == Key::PGP)
+                $object['pgppublickey'] = $key->key();
+            else if ($key->type() == Key::PKCS7_MIME)
+                $object['pkcs7publickey'] = $key->key();
+        }
+
+        $this->data = $object;
+        return $this->data;
+    }
+
+    /**
+     * Callback for kolab_storage_cache to get words to index for fulltext search
+     *
+     * @return array List of words to save in cache
+     */
+    public function get_words()
+    {
+        $data = '';
+        foreach (self::$fulltext_cols as $colname) {
+            list($col, $field) = explode(':', $colname);
+
+            if ($field) {
+                $a = array();
+                foreach ((array)$this->data[$col] as $attr)
+                    $a[] = $attr[$field];
+                $val = join(' ', $a);
+            }
+            else {
+                $val = is_array($this->data[$col]) ? join(' ', $this->data[$col]) : $this->data[$col];
+            }
+
+            if (strlen($val))
+                $data .= $val . ' ';
+        }
+
+        return array_unique(rcube_utils::normalize_string($data, true));
+    }
+
+    /**
+     * Callback for kolab_storage_cache to get object specific tags to cache
+     *
+     * @return array List of tags to save in cache
+     */
+    public function get_tags()
+    {
+        $tags = array();
+
+        if (!empty($this->data['birthday'])) {
+            $tags[] = 'x-has-birthday';
+        }
+
+        return $tags;
+    }
+
+    /**
+     * Helper method to copy contents of an Address vector to the contact data object
+     */
+    private function read_addresses($addresses, &$object, $type = null)
+    {
+        $adrtypes = array_flip($this->addresstypes);
+
+        for ($i=0; $i < $addresses->size(); $i++) {
+            $adr = $addresses->get($i);
+            $object['address'][] = array(
+                'type'     => $type ? $type : ($adrtypes[$adr->types()] ? $adrtypes[$adr->types()] : ''), /*$adr->label()),*/
+                'street'   => $adr->street(),
+                'code'     => $adr->code(),
+                'locality' => $adr->locality(),
+                'region'   => $adr->region(),
+                'country'  => $adr->country()
+            );
+        }
+    }
+
+    /**
+     * Helper method to map contents of a Related vector to the contact data object
+     */
+    private function read_relateds($rels, &$object, $catchall = null)
+    {
+        $typemap = array_flip($this->relatedmap);
+
+        for ($i=0; $i < $rels->size(); $i++) {
+            $rel = $rels->get($i);
+            if ($rel->type() != Related::Text)  // we can't handle UID relations yet
+                continue;
+
+            $known = false;
+            $types = $rel->relationTypes();
+            foreach ($typemap as $t => $field) {
+                if ($types & $t) {
+                    $object[$field][] = $rel->text();
+                    $known = true;
+                    break;
+                }
+            }
+
+            if (!$known && $catchall) {
+                $object[$catchall][] = $rel->text();
+            }
+        }
+    }
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_distributionlist.php Added

@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * Kolab Distribution List model class
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_format_distributionlist extends kolab_format
+{
+    public $CTYPE = 'application/vcard+xml';
+    public $CTYPEv2 = 'application/x-vnd.kolab.distribution-list';
+
+    protected $objclass = 'DistList';
+    protected $read_func = 'readDistlist';
+    protected $write_func = 'writeDistlist';
+
+
+    /**
+     * Set properties to the kolabformat object
+     *
+     * @param array  Object data as hash array
+     */
+    public function set(&$object)
+    {
+        // set common object properties
+        parent::set($object);
+
+        $this->obj->setName($object['name']);
+
+        $seen = array();
+        $members = new vectorcontactref;
+        foreach ((array)$object['member'] as $i => $member) {
+            if ($member['uid']) {
+                $key = 'uid:' . $member['uid'];
+                $m = new ContactReference(ContactReference::UidReference, $member['uid']);
+            }
+            else if ($member['email']) {
+                $key = 'mailto:' . $member['email'];
+                $m = new ContactReference(ContactReference::EmailReference, $member['email']);
+                $m->setName($member['name']);
+            }
+            else {
+                continue;
+            }
+
+            if (!$seen[$key]++) {
+                $members->push($m);
+            }
+            else {
+                // remove dupes for caching
+                unset($object['member'][$i]);
+            }
+        }
+
+        $this->obj->setMembers($members);
+
+        // set type property for proper caching
+        $object['_type'] = 'distribution-list';
+
+        // cache this data
+        $this->data = $object;
+        unset($this->data['_formatobj']);
+    }
+
+    public function is_valid()
+    {
+        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->isValid()));
+    }
+
+    /**
+     * Convert the Distlist object into a hash array data structure
+     *
+     * @param array Additional data for merge
+     *
+     * @return array  Distribution list data as hash array
+     */
+    public function to_array($data = array())
+    {
+        // return cached result
+        if (!empty($this->data))
+            return $this->data;
+
+        // read common object props into local data object
+        $object = parent::to_array($data);
+
+        // add object properties
+        $object += array(
+            'name'      => $this->obj->name(),
+            'member'    => array(),
+            '_type'     => 'distribution-list',
+        );
+
+        $members = $this->obj->members();
+        for ($i=0; $i < $members->size(); $i++) {
+            $member = $members->get($i);
+//            if ($member->type() == ContactReference::UidReference && ($uid = $member->uid()))
+                $object['member'][] = array(
+                    'uid'   => $member->uid(),
+                    'email' => $member->email(),
+                    'name'  => $member->name(),
+                );
+        }
+
+        $this->data = $object;
+        return $this->data;
+    }
+
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_event.php Added

@@ -0,0 +1,244 @@
+<?php
+
+/**
+ * Kolab Event model class
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_format_event extends kolab_format_xcal
+{
+    public $CTYPEv2 = 'application/x-vnd.kolab.event';
+
+    public $scheduling_properties = array('start', 'end', 'allday', 'location', 'status', 'cancelled');
+
+    protected $objclass = 'Event';
+    protected $read_func = 'readEvent';
+    protected $write_func = 'writeEvent';
+
+    /**
+     * Default constructor
+     */
+    function __construct($data = null, $version = 3.0)
+    {
+        parent::__construct(is_string($data) ? $data : null, $version);
+
+        // got an Event object as argument
+        if (is_object($data) && is_a($data, $this->objclass)) {
+            $this->obj = $data;
+            $this->loaded = true;
+        }
+    }
+
+    /**
+     * Clones into an instance of libcalendaring's extended EventCal class
+     *
+     * @return mixed EventCal object or false on failure
+     */
+    public function to_libcal()
+    {
+        static $error_logged = false;
+
+        if (class_exists('kolabcalendaring')) {
+            return new EventCal($this->obj);
+        }
+        else if (!$error_logged) {
+            $error_logged = true;
+            rcube::raise_error(array(
+                'code' => 900, 'type' => 'php',
+                'message' => "required kolabcalendaring module not found"
+            ), true);
+        }
+
+        return false;
+    }
+
+    /**
+     * Set event properties to the kolabformat object
+     *
+     * @param array  Event data as hash array
+     */
+    public function set(&$object)
+    {
+        // set common xcal properties
+        parent::set($object);
+
+        // do the hard work of setting object values
+        $this->obj->setStart(self::get_datetime($object['start'], null, $object['allday']));
+        $this->obj->setEnd(self::get_datetime($object['end'], null, $object['allday']));
+        $this->obj->setTransparency($object['free_busy'] == 'free');
+
+        $status = kolabformat::StatusUndefined;
+        if ($object['free_busy'] == 'tentative')
+            $status = kolabformat::StatusTentative;
+        if ($object['cancelled'])
+            $status = kolabformat::StatusCancelled;
+        else if ($object['status'] && array_key_exists($object['status'], $this->status_map))
+            $status = $this->status_map[$object['status']];
+        $this->obj->setStatus($status);
+
+        // save recurrence exceptions
+        if (is_array($object['recurrence']) && $object['recurrence']['EXCEPTIONS']) {
+            $vexceptions = new vectorevent;
+            foreach((array)$object['recurrence']['EXCEPTIONS'] as $i => $exception) {
+                $exevent = new kolab_format_event;
+                $exevent->set(($compacted = $this->compact_exception($exception, $object)));  // only save differing values
+                $exevent->obj->setRecurrenceID(self::get_datetime($exception['start'], null, true), (bool)$exception['thisandfuture']);
+                $vexceptions->push($exevent->obj);
+                // write cleaned-up exception data back to memory/cache
+                $object['recurrence']['EXCEPTIONS'][$i] = $this->expand_exception($compacted, $object);
+            }
+            $this->obj->setExceptions($vexceptions);
+        }
+
+        // cache this data
+        $this->data = $object;
+        unset($this->data['_formatobj']);
+    }
+
+    /**
+     *
+     */
+    public function is_valid()
+    {
+        return !$this->formaterror && (($this->data && !empty($this->data['start']) && !empty($this->data['end'])) ||
+            (is_object($this->obj) && $this->obj->isValid() && $this->obj->uid()));
+    }
+
+    /**
+     * Convert the Event object into a hash array data structure
+     *
+     * @param array Additional data for merge
+     *
+     * @return array  Event data as hash array
+     */
+    public function to_array($data = array())
+    {
+        // return cached result
+        if (!empty($this->data))
+            return $this->data;
+
+        // read common xcal props
+        $object = parent::to_array($data);
+
+        // read object properties
+        $object += array(
+            'end'         => self::php_datetime($this->obj->end()),
+            'allday'      => $this->obj->start()->isDateOnly(),
+            'free_busy'   => $this->obj->transparency() ? 'free' : 'busy',  // TODO: transparency is only boolean
+            'attendees'   => array(),
+        );
+
+        // derive event end from duration (#1916)
+        if (!$object['end'] && $object['start'] && ($duration = $this->obj->duration()) && $duration->isValid()) {
+            $interval = new DateInterval('PT0S');
+            $interval->d = $duration->weeks() * 7 + $duration->days();
+            $interval->h = $duration->hours();
+            $interval->i = $duration->minutes();
+            $interval->s = $duration->seconds();
+            $object['end'] = clone $object['start'];
+            $object['end']->add($interval);
+        }
+
+        // organizer is part of the attendees list in Roundcube
+        if ($object['organizer']) {
+            $object['organizer']['role'] = 'ORGANIZER';
+            array_unshift($object['attendees'], $object['organizer']);
+        }
+
+        // status defines different event properties...
+        $status = $this->obj->status();
+        if ($status == kolabformat::StatusTentative)
+          $object['free_busy'] = 'tentative';
+        else if ($status == kolabformat::StatusCancelled)
+          $object['cancelled'] = true;
+
+        // this is an exception object
+        if ($this->obj->recurrenceID()->isValid()) {
+            $object['thisandfuture'] = $this->obj->thisAndFuture();
+        }
+        // read exception event objects
+        else if (($exceptions = $this->obj->exceptions()) && is_object($exceptions) && $exceptions->size()) {
+            $recurrence_exceptions = array();
+            for ($i=0; $i < $exceptions->size(); $i++) {
+                if (($exobj = $exceptions->get($i))) {
+                    $exception = new kolab_format_event($exobj);
+                    if ($exception->is_valid()) {
+                        $recurrence_exceptions[] = $this->expand_exception($exception->to_array(), $object);
+                    }
+                }
+            }
+            $object['recurrence']['EXCEPTIONS'] = $recurrence_exceptions;
+        }
+
+        return $this->data = $object;
+    }
+
+    /**
+     * Callback for kolab_storage_cache to get object specific tags to cache
+     *
+     * @return array List of tags to save in cache
+     */
+    public function get_tags()
+    {
+        $tags = parent::get_tags();
+
+        foreach ((array)$this->data['categories'] as $cat) {
+            $tags[] = rcube_utils::normalize_string($cat);
+        }
+
+        return $tags;
+    }
+
+    /**
+     * Remove some attributes from the exception container
+     */
+    private function compact_exception($exception, $master)
+    {
+      $forbidden = array('recurrence','organizer','attendees','sequence');
+
+      foreach ($forbidden as $prop) {
+        if (array_key_exists($prop, $exception)) {
+          unset($exception[$prop]);
+        }
+      }
+
+      foreach ($master as $prop => $value) {
+        if (isset($exception[$prop]) && gettype($exception[$prop]) == gettype($value) && $exception[$prop] == $value) {
+          unset($exception[$prop]);
+        }
+      }
+
+      return $exception;
+    }
+
+    /**
+     * Copy attributes not specified by the exception from the master event
+     */
+    private function expand_exception($exception, $master)
+    {
+      foreach ($master as $prop => $value) {
+        if (empty($exception[$prop]) && !empty($value))
+          $exception[$prop] = $value;
+      }
+
+      return $exception;
+    }
+
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_file.php Added

@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * Kolab File model class
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_format_file extends kolab_format
+{
+    public $CTYPE = 'application/vnd.kolab+xml';
+
+    protected $objclass = 'File';
+    protected $read_func = 'kolabformat::readKolabFile';
+    protected $write_func = 'kolabformat::writeKolabFile';
+
+    protected $sensitivity_map = array(
+        'public'       => kolabformat::ClassPublic,
+        'private'      => kolabformat::ClassPrivate,
+        'confidential' => kolabformat::ClassConfidential,
+    );
+
+    /**
+     * Set properties to the kolabformat object
+     *
+     * @param array  Object data as hash array
+     */
+    public function set(&$object)
+    {
+        // set common object properties
+        parent::set($object);
+
+        $this->obj->setClassification($this->sensitivity_map[$object['sensitivity']]);
+        $this->obj->setCategories(self::array2vector($object['categories']));
+
+        if (isset($object['notes'])) {
+            $this->obj->setNote($object['notes']);
+        }
+
+        // Add file attachment
+        if (!empty($object['_attachments'])) {
+            $cid         = key($object['_attachments']);
+            $attach_attr = $object['_attachments'][$cid];
+            $attach      = new Attachment;
+
+            $attach->setLabel((string)$attach_attr['name']);
+            $attach->setUri('cid:' . $cid, $attach_attr['mimetype']);
+            $this->obj->setFile($attach);
+
+            // make sure size is set, so object saved in cache contains this info
+            if (!isset($attach_attr['size'])) {
+                $size = 0;
+
+                if (!empty($attach_attr['content'])) {
+                    if (is_resource($attach_attr['content'])) {
+                        $stat = fstat($attach_attr['content']);
+                        $size = $stat ? $stat['size'] : 0;
+                    }
+                    else {
+                        $size = strlen($attach_attr['content']);
+                    }
+                }
+                else if (isset($attach_attr['path'])) {
+                    $size = @filesize($attach_attr['path']);
+                }
+
+                $object['_attachments'][$cid]['size'] = $size;
+            }
+        }
+
+        // cache this data
+        $this->data = $object;
+        unset($this->data['_formatobj']);
+    }
+
+    /**
+     * Check if object's data validity
+     */
+    public function is_valid()
+    {
+        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->isValid()));
+    }
+
+    /**
+     * Convert the Configuration object into a hash array data structure
+     *
+     * @param array Additional data for merge
+     *
+     * @return array  Config object data as hash array
+     */
+    public function to_array($data = array())
+    {
+        // return cached result
+        if (!empty($this->data)) {
+            return $this->data;
+        }
+
+        // read common object props into local data object
+        $object = parent::to_array($data);
+
+        $sensitivity_map = array_flip($this->sensitivity_map);
+
+        // read object properties
+        $object += array(
+            'sensitivity' => $sensitivity_map[$this->obj->classification()],
+            'categories'  => self::vector2array($this->obj->categories()),
+            'notes'       => $this->obj->note(),
+        );
+
+        return $this->data = $object;
+    }
+
+    /**
+     * Callback for kolab_storage_cache to get object specific tags to cache
+     *
+     * @return array List of tags to save in cache
+     */
+    public function get_tags()
+    {
+        $tags = array();
+
+        foreach ((array)$this->data['categories'] as $cat) {
+            $tags[] = rcube_utils::normalize_string($cat);
+        }
+
+        // Add file mimetype to tags
+        if (!empty($this->data['_attachments'])) {
+            reset($this->data['_attachments']);
+            $key        = key($this->data['_attachments']);
+            $attachment = $this->data['_attachments'][$key];
+
+            if ($attachment['mimetype']) {
+                $tags[] = $attachment['mimetype'];
+            }
+        }
+
+        return $tags;
+    }
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_journal.php Added

@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * Kolab Journal model class
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_format_journal extends kolab_format
+{
+    public $CTYPE = 'application/calendar+xml';
+    public $CTYPEv2 = 'application/x-vnd.kolab.journal';
+
+    protected $objclass = 'Journal';
+    protected $read_func = 'readJournal';
+    protected $write_func = 'writeJournal';
+
+
+    /**
+     * Set properties to the kolabformat object
+     *
+     * @param array  Object data as hash array
+     */
+    public function set(&$object)
+    {
+        // set common object properties
+        parent::set($object);
+
+        // TODO: set object propeties
+
+        // cache this data
+        $this->data = $object;
+        unset($this->data['_formatobj']);
+    }
+
+    /**
+     *
+     */
+    public function is_valid()
+    {
+        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->isValid()));
+    }
+
+    /**
+     * Convert the Configuration object into a hash array data structure
+     *
+     * @param array Additional data for merge
+     *
+     * @return array  Config object data as hash array
+     */
+    public function to_array($data = array())
+    {
+        // return cached result
+        if (!empty($this->data))
+            return $this->data;
+
+        // read common object props into local data object
+        $object = parent::to_array($data);
+
+        // TODO: read object properties
+
+        $this->data = $object;
+        return $this->data;
+    }
+
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_note.php Added

@@ -0,0 +1,153 @@
+<?php
+
+/**
+ * Kolab Note model class
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_format_note extends kolab_format
+{
+    public $CTYPE = 'application/vnd.kolab+xml';
+    public $CTYPEv2 = 'application/x-vnd.kolab.note';
+
+    public static $fulltext_cols = array('title', 'description', 'categories');
+
+    protected $objclass = 'Note';
+    protected $read_func = 'readNote';
+    protected $write_func = 'writeNote';
+
+    protected $sensitivity_map = array(
+        'public'       => kolabformat::ClassPublic,
+        'private'      => kolabformat::ClassPrivate,
+        'confidential' => kolabformat::ClassConfidential,
+    );
+
+    /**
+     * Set properties to the kolabformat object
+     *
+     * @param array  Object data as hash array
+     */
+    public function set(&$object)
+    {
+        // set common object properties
+        parent::set($object);
+
+        $this->obj->setSummary($object['title']);
+        $this->obj->setDescription($object['description']);
+        $this->obj->setClassification($this->sensitivity_map[$object['sensitivity']]);
+        $this->obj->setCategories(self::array2vector($object['categories']));
+
+        $this->set_attachments($object);
+
+        // cache this data
+        $this->data = $object;
+        unset($this->data['_formatobj']);
+    }
+
+    /**
+     *
+     */
+    public function is_valid()
+    {
+        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->isValid()));
+    }
+
+    /**
+     * Convert the Configuration object into a hash array data structure
+     *
+     * @param array Additional data for merge
+     *
+     * @return array  Config object data as hash array
+     */
+    public function to_array($data = array())
+    {
+        // return cached result
+        if (!empty($this->data))
+            return $this->data;
+
+        // read common object props into local data object
+        $object = parent::to_array($data);
+
+        $sensitivity_map = array_flip($this->sensitivity_map);
+
+        // read object properties
+        $object += array(
+            'sensitivity' => $sensitivity_map[$this->obj->classification()],
+            'categories'  => self::vector2array($this->obj->categories()),
+            'title'       => $this->obj->summary(),
+            'description' => $this->obj->description(),
+        );
+
+        $this->get_attachments($object);
+
+        return $this->data = $object;
+    }
+
+    /**
+     * Callback for kolab_storage_cache to get object specific tags to cache
+     *
+     * @return array List of tags to save in cache
+     */
+    public function get_tags()
+    {
+        $tags = array();
+
+        foreach ((array)$this->data['categories'] as $cat) {
+            $tags[] = rcube_utils::normalize_string($cat);
+        }
+
+        // add tag for message references
+        foreach ((array)$this->data['links'] as $link) {
+            $url = parse_url($link);
+            if ($url['scheme'] == 'imap') {
+                parse_str($url['query'], $param);
+                $tags[] = 'ref:' . trim($param['message-id'] ?: urldecode($url['fragment']), '<> ');
+            }
+        }
+
+        return $tags;
+    }
+
+    /**
+     * Callback for kolab_storage_cache to get words to index for fulltext search
+     *
+     * @return array List of words to save in cache
+     */
+    public function get_words()
+    {
+        $data = '';
+        foreach (self::$fulltext_cols as $col) {
+            // convert HTML content to plain text
+            if ($col == 'description' && preg_match('/<(html|body)(\s[a-z]|>)/', $this->data[$col], $m) && strpos($this->data[$col], '</'.$m[1].'>')) {
+                $converter = new rcube_html2text($this->data[$col], false, false, 0);
+                $val = $converter->get_text();
+            }
+            else {
+                $val = is_array($this->data[$col]) ? join(' ', $this->data[$col]) : $this->data[$col];
+            }
+
+            if (strlen($val))
+                $data .= $val . ' ';
+        }
+
+        return array_filter(array_unique(rcube_utils::normalize_string($data, true)));
+    }
+
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_task.php Added

@@ -0,0 +1,129 @@
+<?php
+
+/**
+ * Kolab Task (ToDo) model class
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_format_task extends kolab_format_xcal
+{
+    public $CTYPEv2 = 'application/x-vnd.kolab.task';
+
+    public $scheduling_properties = array('start', 'due', 'summary', 'status');
+
+    protected $objclass = 'Todo';
+    protected $read_func = 'readTodo';
+    protected $write_func = 'writeTodo';
+
+
+    /**
+     * Set properties to the kolabformat object
+     *
+     * @param array  Object data as hash array
+     */
+    public function set(&$object)
+    {
+        // set common xcal properties
+        parent::set($object);
+
+        $this->obj->setPercentComplete(intval($object['complete']));
+
+        $status = kolabformat::StatusUndefined;
+        if ($object['complete'] == 100 && !array_key_exists('status', $object))
+            $status = kolabformat::StatusCompleted;
+        else if ($object['status'] && array_key_exists($object['status'], $this->status_map))
+            $status = $this->status_map[$object['status']];
+        $this->obj->setStatus($status);
+
+        $this->obj->setStart(self::get_datetime($object['start'], null, $object['start']->_dateonly));
+        $this->obj->setDue(self::get_datetime($object['due'], null, $object['due']->_dateonly));
+
+        $related = new vectors;
+        if (!empty($object['parent_id']))
+            $related->push($object['parent_id']);
+        $this->obj->setRelatedTo($related);
+
+        // cache this data
+        $this->data = $object;
+        unset($this->data['_formatobj']);
+    }
+
+    /**
+     *
+     */
+    public function is_valid()
+    {
+        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->isValid()));
+    }
+
+    /**
+     * Convert the Configuration object into a hash array data structure
+     *
+     * @param array Additional data for merge
+     *
+     * @return array  Config object data as hash array
+     */
+    public function to_array($data = array())
+    {
+        // return cached result
+        if (!empty($this->data))
+            return $this->data;
+
+        // read common xcal props
+        $object = parent::to_array($data);
+
+        $object['complete'] = intval($this->obj->percentComplete());
+
+        // if due date is set
+        if ($due = $this->obj->due())
+            $object['due'] = self::php_datetime($due);
+
+        // related-to points to parent task; we only support one relation
+        $related = self::vector2array($this->obj->relatedTo());
+        if (count($related))
+            $object['parent_id'] = $related[0];
+
+        // TODO: map more properties
+
+        $this->data = $object;
+        return $this->data;
+    }
+
+    /**
+     * Callback for kolab_storage_cache to get object specific tags to cache
+     *
+     * @return array List of tags to save in cache
+     */
+    public function get_tags()
+    {
+        $tags = parent::get_tags();
+
+        if ($this->data['status'] == 'COMPLETED' || ($this->data['complete'] == 100 && empty($this->data['status'])))
+            $tags[] = 'x-complete';
+
+        if ($this->data['priority'] == 1)
+            $tags[] = 'x-flagged';
+
+        if ($this->data['parent_id'])
+            $tags[] = 'x-parent:' . $this->data['parent_id'];
+
+        return $tags;
+    }
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_xcal.php Added

@@ -0,0 +1,630 @@
+<?php
+
+/**
+ * Xcal based Kolab format class wrapping libkolabxml bindings
+ *
+ * Base class for xcal-based Kolab groupware objects such as event, todo, journal
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+abstract class kolab_format_xcal extends kolab_format
+{
+    public $CTYPE = 'application/calendar+xml';
+
+    public static $fulltext_cols = array('title', 'description', 'location', 'attendees:name', 'attendees:email', 'categories');
+
+    public $scheduling_properties = array('start', 'end', 'location');
+
+    protected $sensitivity_map = array(
+        'public'       => kolabformat::ClassPublic,
+        'private'      => kolabformat::ClassPrivate,
+        'confidential' => kolabformat::ClassConfidential,
+    );
+
+    protected $role_map = array(
+        'REQ-PARTICIPANT' => kolabformat::Required,
+        'OPT-PARTICIPANT' => kolabformat::Optional,
+        'NON-PARTICIPANT' => kolabformat::NonParticipant,
+        'CHAIR' => kolabformat::Chair,
+    );
+
+    protected $cutype_map = array(
+        'INDIVIDUAL' => kolabformat::CutypeIndividual,
+        'GROUP'      => kolabformat::CutypeGroup,
+        'ROOM'       => kolabformat::CutypeRoom,
+        'RESOURCE'   => kolabformat::CutypeResource,
+        'UNKNOWN'    => kolabformat::CutypeUnknown,
+    );
+
+    protected $rrule_type_map = array(
+        'MINUTELY' => RecurrenceRule::Minutely,
+        'HOURLY' => RecurrenceRule::Hourly,
+        'DAILY' => RecurrenceRule::Daily,
+        'WEEKLY' => RecurrenceRule::Weekly,
+        'MONTHLY' => RecurrenceRule::Monthly,
+        'YEARLY' => RecurrenceRule::Yearly,
+    );
+
+    protected $weekday_map = array(
+        'MO' => kolabformat::Monday,
+        'TU' => kolabformat::Tuesday,
+        'WE' => kolabformat::Wednesday,
+        'TH' => kolabformat::Thursday,
+        'FR' => kolabformat::Friday,
+        'SA' => kolabformat::Saturday,
+        'SU' => kolabformat::Sunday,
+    );
+
+    protected $alarm_type_map = array(
+        'DISPLAY' => Alarm::DisplayAlarm,
+        'EMAIL' => Alarm::EMailAlarm,
+        'AUDIO' => Alarm::AudioAlarm,
+    );
+
+    protected $status_map = array(
+        'NEEDS-ACTION' => kolabformat::StatusNeedsAction,
+        'IN-PROCESS'   => kolabformat::StatusInProcess,
+        'COMPLETED'    => kolabformat::StatusCompleted,
+        'CANCELLED'    => kolabformat::StatusCancelled,
+        'TENTATIVE'    => kolabformat::StatusTentative,
+        'CONFIRMED'    => kolabformat::StatusConfirmed,
+        'DRAFT'        => kolabformat::StatusDraft,
+        'FINAL'        => kolabformat::StatusFinal,
+    );
+
+    protected $part_status_map = array(
+        'UNKNOWN' => kolabformat::PartNeedsAction,
+        'NEEDS-ACTION' => kolabformat::PartNeedsAction,
+        'TENTATIVE' => kolabformat::PartTentative,
+        'ACCEPTED' => kolabformat::PartAccepted,
+        'DECLINED' => kolabformat::PartDeclined,
+        'DELEGATED' => kolabformat::PartDelegated,
+      );
+
+
+    /**
+     * Convert common xcard properties into a hash array data structure
+     *
+     * @param array Additional data for merge
+     *
+     * @return array  Object data as hash array
+     */
+    public function to_array($data = array())
+    {
+        // read common object props
+        $object = parent::to_array($data);
+
+        $status_map = array_flip($this->status_map);
+        $sensitivity_map = array_flip($this->sensitivity_map);
+
+        $object += array(
+            'sequence'    => intval($this->obj->sequence()),
+            'title'       => $this->obj->summary(),
+            'location'    => $this->obj->location(),
+            'description' => $this->obj->description(),
+            'url'         => $this->obj->url(),
+            'status'      => $status_map[$this->obj->status()],
+            'sensitivity' => $sensitivity_map[$this->obj->classification()],
+            'priority'    => $this->obj->priority(),
+            'categories'  => self::vector2array($this->obj->categories()),
+            'start'       => self::php_datetime($this->obj->start()),
+        );
+
+        if (method_exists($this->obj, 'comment')) {
+            $object['comment'] = $this->obj->comment();
+        }
+
+        // read organizer and attendees
+        if (($organizer = $this->obj->organizer()) && ($organizer->email() || $organizer->name())) {
+            $object['organizer'] = array(
+                'email' => $organizer->email(),
+                'name' => $organizer->name(),
+            );
+        }
+
+        $role_map = array_flip($this->role_map);
+        $cutype_map = array_flip($this->cutype_map);
+        $part_status_map = array_flip($this->part_status_map);
+        $attvec = $this->obj->attendees();
+        for ($i=0; $i < $attvec->size(); $i++) {
+            $attendee = $attvec->get($i);
+            $cr = $attendee->contact();
+            if ($cr->email() != $object['organizer']['email']) {
+                $delegators = $delegatees = array();
+                $vdelegators = $attendee->delegatedFrom();
+                for ($j=0; $j < $vdelegators->size(); $j++) {
+                    $delegators[] = $vdelegators->get($j)->email();
+                }
+                $vdelegatees = $attendee->delegatedTo();
+                for ($j=0; $j < $vdelegatees->size(); $j++) {
+                    $delegatees[] = $vdelegatees->get($j)->email();
+                }
+
+                $object['attendees'][] = array(
+                    'role' => $role_map[$attendee->role()],
+                    'cutype' => $cutype_map[$attendee->cutype()],
+                    'status' => $part_status_map[$attendee->partStat()],
+                    'rsvp' => $attendee->rsvp(),
+                    'email' => $cr->email(),
+                    'name' => $cr->name(),
+                    'delegated-from' => $delegators,
+                    'delegated-to' => $delegatees,
+                );
+            }
+        }
+
+        // read recurrence rule
+        if (($rr = $this->obj->recurrenceRule()) && $rr->isValid()) {
+            $rrule_type_map = array_flip($this->rrule_type_map);
+            $object['recurrence'] = array('FREQ' => $rrule_type_map[$rr->frequency()]);
+
+            if ($intvl = $rr->interval())
+                $object['recurrence']['INTERVAL'] = $intvl;
+
+            if (($count = $rr->count()) && $count > 0) {
+                $object['recurrence']['COUNT'] = $count;
+            }
+            else if ($until = self::php_datetime($rr->end())) {
+                $until->setTime($object['start']->format('G'), $object['start']->format('i'), 0);
+                $object['recurrence']['UNTIL'] = $until;
+            }
+
+            if (($byday = $rr->byday()) && $byday->size()) {
+                $weekday_map = array_flip($this->weekday_map);
+                $weekdays = array();
+                for ($i=0; $i < $byday->size(); $i++) {
+                    $daypos = $byday->get($i);
+                    $prefix = $daypos->occurence();
+                    $weekdays[] = ($prefix ? $prefix : '') . $weekday_map[$daypos->weekday()];
+                }
+                $object['recurrence']['BYDAY'] = join(',', $weekdays);
+            }
+
+            if (($bymday = $rr->bymonthday()) && $bymday->size()) {
+                $object['recurrence']['BYMONTHDAY'] = join(',', self::vector2array($bymday));
+            }
+
+            if (($bymonth = $rr->bymonth()) && $bymonth->size()) {
+                $object['recurrence']['BYMONTH'] = join(',', self::vector2array($bymonth));
+            }
+
+            if ($exdates = $this->obj->exceptionDates()) {
+                for ($i=0; $i < $exdates->size(); $i++) {
+                    if ($exdate = self::php_datetime($exdates->get($i)))
+                        $object['recurrence']['EXDATE'][] = $exdate;
+                }
+            }
+        }
+
+        if ($rdates = $this->obj->recurrenceDates()) {
+            for ($i=0; $i < $rdates->size(); $i++) {
+                if ($rdate = self::php_datetime($rdates->get($i)))
+                    $object['recurrence']['RDATE'][] = $rdate;
+            }
+        }
+
+        // read alarm
+        $valarms = $this->obj->alarms();
+        $alarm_types = array_flip($this->alarm_type_map);
+        $object['valarms'] = array();
+        for ($i=0; $i < $valarms->size(); $i++) {
+            $alarm = $valarms->get($i);
+            $type = $alarm_types[$alarm->type()];
+
+            if ($type == 'DISPLAY' || $type == 'EMAIL' || $type == 'AUDIO') {  // only some alarms are supported
+                $valarm = array(
+                    'action' => $type,
+                    'summary' => $alarm->summary(),
+                    'description' => $alarm->description(),
+                );
+
+                if ($type == 'EMAIL') {
+                    $valarm['attendees'] = array();
+                    $attvec = $alarm->attendees();
+                    for ($j=0; $j < $attvec->size(); $j++) {
+                        $cr = $attvec->get($j);
+                        $valarm['attendees'][] = $cr->email();
+                    }
+                }
+                else if ($type == 'AUDIO') {
+                    $attach = $alarm->audioFile();
+                    $valarm['uri'] = $attach->uri();
+                }
+
+                if ($start = self::php_datetime($alarm->start())) {
+                    $object['alarms'] = '@' . $start->format('U');
+                    $valarm['trigger'] = $start;
+                }
+                else if ($offset = $alarm->relativeStart()) {
+                    $prefix = $alarm->relativeTo() == kolabformat::End ? '+' : '-';
+                    $value = $time = '';
+                    if      ($w = $offset->weeks())     $value .= $w . 'W';
+                    else if ($d = $offset->days())      $value .= $d . 'D';
+                    else if ($h = $offset->hours())     $time  .= $h . 'H';
+                    else if ($m = $offset->minutes())   $time  .= $m . 'M';
+                    else if ($s = $offset->seconds())   $time  .= $s . 'S';
+
+                    // assume 'at event time'
+                    if (empty($value) && empty($time)) {
+                        $prefix = '';
+                        $time = '0S';
+                    }
+
+                    $object['alarms'] = $prefix . $value . $time;
+                    $valarm['trigger'] = $prefix . 'P' . $value . ($time ? 'T' . $time : '');
+                }
+
+                // read alarm duration and repeat properties
+                if (($duration = $alarm->duration()) && $duration->isValid()) {
+                    $value = $time = '';
+                    if      ($w = $duration->weeks())     $value .= $w . 'W';
+                    else if ($d = $duration->days())      $value .= $d . 'D';
+                    else if ($h = $duration->hours())     $time  .= $h . 'H';
+                    else if ($m = $duration->minutes())   $time  .= $m . 'M';
+                    else if ($s = $duration->seconds())   $time  .= $s . 'S';
+                    $valarm['duration'] = 'P' . $value . ($time ? 'T' . $time : '');
+                    $valarm['repeat'] = $alarm->numrepeat();
+                }
+
+                $object['alarms']  .= ':' . $type;  // legacy property
+                $object['valarms'][] = array_filter($valarm);
+            }
+        }
+
+        $this->get_attachments($object);
+
+        return $object;
+    }
+
+
+    /**
+     * Set common xcal properties to the kolabformat object
+     *
+     * @param array  Event data as hash array
+     */
+    public function set(&$object)
+    {
+        $this->init();
+
+        $is_new = !$this->obj->uid();
+        $old_sequence = $this->obj->sequence();
+        $reschedule = $is_new;
+
+        // set common object properties
+        parent::set($object);
+
+        // set sequence value
+        if (!isset($object['sequence'])) {
+            if ($is_new) {
+                $object['sequence'] = 0;
+            }
+            else {
+                $object['sequence'] = $old_sequence;
+                $old = $this->data['uid'] ? $this->data : $this->to_array();
+
+                // increment sequence when updating properties relevant for scheduling.
+                // RFC 5545: "It is incremented [...] each time the Organizer makes a significant revision to the calendar component."
+                // TODO: make the list of properties considered 'significant' for scheduling configurable
+                foreach ($this->scheduling_properties as $prop) {
+                    $a = $old[$prop];
+                    $b = $object[$prop];
+                    if ($object['allday'] && ($prop == 'start' || $prop == 'end') && $a instanceof DateTime && $b instanceof DateTime) {
+                        $a = $a->format('Y-m-d');
+                        $b = $b->format('Y-m-d');
+                    }
+                    if ($a != $b) {
+                        $object['sequence']++;
+                        break;
+                    }
+                }
+            }
+        }
+        $this->obj->setSequence(intval($object['sequence']));
+
+        if ($object['sequence'] > $old_sequence) {
+            $reschedule = true;
+        }
+
+        $this->obj->setSummary($object['title']);
+        $this->obj->setLocation($object['location']);
+        $this->obj->setDescription($object['description']);
+        $this->obj->setPriority($object['priority']);
+        $this->obj->setClassification($this->sensitivity_map[$object['sensitivity']]);
+        $this->obj->setCategories(self::array2vector($object['categories']));
+        $this->obj->setUrl(strval($object['url']));
+
+        if (method_exists($this->obj, 'setComment')) {
+            $this->obj->setComment($object['comment']);
+        }
+
+        // process event attendees
+        $attendees = new vectorattendee;
+        foreach ((array)$object['attendees'] as $i => $attendee) {
+            if ($attendee['role'] == 'ORGANIZER') {
+                $object['organizer'] = $attendee;
+            }
+            else if ($attendee['email'] != $object['organizer']['email']) {
+                $cr = new ContactReference(ContactReference::EmailReference, $attendee['email']);
+                $cr->setName($attendee['name']);
+
+                // set attendee RSVP if missing
+                if (!isset($attendee['rsvp'])) {
+                    $object['attendees'][$i]['rsvp'] = $attendee['rsvp'] = true;
+                }
+
+                $att = new Attendee;
+                $att->setContact($cr);
+                $att->setPartStat($this->part_status_map[$attendee['status']]);
+                $att->setRole($this->role_map[$attendee['role']] ? $this->role_map[$attendee['role']] : kolabformat::Required);
+                $att->setCutype($this->cutype_map[$attendee['cutype']] ? $this->cutype_map[$attendee['cutype']] : kolabformat::CutypeIndividual);
+                $att->setRSVP((bool)$attendee['rsvp']);
+
+                if (!empty($attendee['delegated-from'])) {
+                    $vdelegators = new vectorcontactref;
+                    foreach ((array)$attendee['delegated-from'] as $delegator) {
+                        $vdelegators->push(new ContactReference(ContactReference::EmailReference, $delegator));
+                    }
+                    $att->setDelegatedFrom($vdelegators);
+                }
+                if (!empty($attendee['delegated-to'])) {
+                    $vdelegatees = new vectorcontactref;
+                    foreach ((array)$attendee['delegated-to'] as $delegatee) {
+                        $vdelegatees->push(new ContactReference(ContactReference::EmailReference, $delegatee));
+                    }
+                    $att->setDelegatedTo($vdelegatees);
+                }
+
+                if ($att->isValid()) {
+                    $attendees->push($att);
+                }
+                else {
+                    rcube::raise_error(array(
+                        'code' => 600, 'type' => 'php',
+                        'file' => __FILE__, 'line' => __LINE__,
+                        'message' => "Invalid event attendee: " . json_encode($attendee),
+                    ), true);
+                }
+            }
+        }
+        $this->obj->setAttendees($attendees);
+
+        if ($object['organizer']) {
+            $organizer = new ContactReference(ContactReference::EmailReference, $object['organizer']['email']);
+            $organizer->setName($object['organizer']['name']);
+            $this->obj->setOrganizer($organizer);
+        }
+
+        // save recurrence rule
+        $rr = new RecurrenceRule;
+        $rr->setFrequency(RecurrenceRule::FreqNone);
+
+        if ($object['recurrence'] && !empty($object['recurrence']['FREQ'])) {
+            $rr->setFrequency($this->rrule_type_map[$object['recurrence']['FREQ']]);
+
+            if ($object['recurrence']['INTERVAL'])
+                $rr->setInterval(intval($object['recurrence']['INTERVAL']));
+
+            if ($object['recurrence']['BYDAY']) {
+                $byday = new vectordaypos;
+                foreach (explode(',', $object['recurrence']['BYDAY']) as $day) {
+                    $occurrence = 0;
+                    if (preg_match('/^([\d-]+)([A-Z]+)$/', $day, $m)) {
+                        $occurrence = intval($m[1]);
+                        $day = $m[2];
+                    }
+                    if (isset($this->weekday_map[$day]))
+                        $byday->push(new DayPos($occurrence, $this->weekday_map[$day]));
+                }
+                $rr->setByday($byday);
+            }
+
+            if ($object['recurrence']['BYMONTHDAY']) {
+                $bymday = new vectori;
+                foreach (explode(',', $object['recurrence']['BYMONTHDAY']) as $day)
+                    $bymday->push(intval($day));
+                $rr->setBymonthday($bymday);
+            }
+
+            if ($object['recurrence']['BYMONTH']) {
+                $bymonth = new vectori;
+                foreach (explode(',', $object['recurrence']['BYMONTH']) as $month)
+                    $bymonth->push(intval($month));
+                $rr->setBymonth($bymonth);
+            }
+
+            if ($object['recurrence']['COUNT'])
+                $rr->setCount(intval($object['recurrence']['COUNT']));
+            else if ($object['recurrence']['UNTIL'])
+                $rr->setEnd(self::get_datetime($object['recurrence']['UNTIL'], null, true));
+
+            if ($rr->isValid()) {
+                // add exception dates (only if recurrence rule is valid)
+                $exdates = new vectordatetime;
+                foreach ((array)$object['recurrence']['EXDATE'] as $exdate)
+                    $exdates->push(self::get_datetime($exdate, null, true));
+                $this->obj->setExceptionDates($exdates);
+            }
+            else {
+                rcube::raise_error(array(
+                    'code' => 600, 'type' => 'php',
+                    'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Invalid event recurrence rule: " . json_encode($object['recurrence']),
+                ), true);
+            }
+        }
+
+        $this->obj->setRecurrenceRule($rr);
+
+        // save recurrence dates (aka RDATE)
+        if (!empty($object['recurrence']['RDATE'])) {
+            $rdates = new vectordatetime;
+            foreach ((array)$object['recurrence']['RDATE'] as $rdate)
+                $rdates->push(self::get_datetime($rdate, null, true));
+            $this->obj->setRecurrenceDates($rdates);
+        }
+
+        // save alarm
+        $valarms = new vectoralarm;
+        if ($object['valarms']) {
+            foreach ($object['valarms'] as $valarm) {
+                if (!array_key_exists($valarm['action'], $this->alarm_type_map)) {
+                    continue;  // skip unknown alarm types
+                }
+
+                if ($valarm['action'] == 'EMAIL') {
+                    $recipients = new vectorcontactref;
+                    foreach (($valarm['attendees'] ?: array($object['_owner'])) as $email) {
+                        $recipients->push(new ContactReference(ContactReference::EmailReference, $email));
+                    }
+                    $alarm = new Alarm(
+                        strval($valarm['summary'] ?: $object['title']),
+                        strval($valarm['description'] ?: $object['description']),
+                        $recipients
+                    );
+                }
+                else if ($valarm['action'] == 'AUDIO') {
+                    $attach = new Attachment;
+                    $attach->setUri($valarm['uri'] ?: 'null', 'unknown');
+                    $alarm = new Alarm($attach);
+                }
+                else {
+                    // action == DISPLAY
+                    $alarm = new Alarm(strval($valarm['summary'] ?: $object['title']));
+                }
+
+                if (is_object($valarm['trigger']) && $valarm['trigger'] instanceof DateTime) {
+                    $alarm->setStart(self::get_datetime($valarm['trigger'], new DateTimeZone('UTC')));
+                }
+                else {
+                    try {
+                        $prefix = $valarm['trigger'][0];
+                        $period = new DateInterval(preg_replace('/[^0-9PTWDHMS]/', '', $valarm['trigger']));
+                        $duration = new Duration($period->d, $period->h, $period->i, $period->s, $prefix == '-');
+                    }
+                    catch (Exception $e) {
+                        // skip alarm with invalid trigger values
+                        rcube::raise_error($e, true);
+                        continue;
+                    }
+
+                    $alarm->setRelativeStart($duration, $prefix == '-' ? kolabformat::Start : kolabformat::End);
+                }
+
+                if ($valarm['duration']) {
+                    try {
+                        $d = new DateInterval($valarm['duration']);
+                        $duration = new Duration($d->d, $d->h, $d->i, $d->s);
+                        $alarm->setDuration($duration, intval($valarm['repeat']));
+                    }
+                    catch (Exception $e) {
+                        // ignore
+                    }
+                }
+
+                $valarms->push($alarm);
+            }
+        }
+        // legacy support
+        else if ($object['alarms']) {
+            list($offset, $type) = explode(":", $object['alarms']);
+
+            if ($type == 'EMAIL' && !empty($object['_owner'])) {  // email alarms implicitly go to event owner
+                $recipients = new vectorcontactref;
+                $recipients->push(new ContactReference(ContactReference::EmailReference, $object['_owner']));
+                $alarm = new Alarm($object['title'], strval($object['description']), $recipients);
+            }
+            else {  // default: display alarm
+                $alarm = new Alarm($object['title']);
+            }
+
+            if (preg_match('/^@(\d+)/', $offset, $d)) {
+                $alarm->setStart(self::get_datetime($d[1], new DateTimeZone('UTC')));
+            }
+            else if (preg_match('/^([-+]?)P?T?(\d+)([SMHDW])/', $offset, $d)) {
+                $days = $hours = $minutes = $seconds = 0;
+                switch ($d[3]) {
+                    case 'W': $days  = 7*intval($d[2]); break;
+                    case 'D': $days    = intval($d[2]); break;
+                    case 'H': $hours   = intval($d[2]); break;
+                    case 'M': $minutes = intval($d[2]); break;
+                    case 'S': $seconds = intval($d[2]); break;
+                }
+                $alarm->setRelativeStart(new Duration($days, $hours, $minutes, $seconds, $d[1] == '-'), $d[1] == '-' ? kolabformat::Start : kolabformat::End);
+            }
+
+            $valarms->push($alarm);
+        }
+        $this->obj->setAlarms($valarms);
+
+        $this->set_attachments($object);
+    }
+
+    /**
+     * Callback for kolab_storage_cache to get words to index for fulltext search
+     *
+     * @return array List of words to save in cache
+     */
+    public function get_words()
+    {
+        $data = '';
+        foreach (self::$fulltext_cols as $colname) {
+            list($col, $field) = explode(':', $colname);
+
+            if ($field) {
+                $a = array();
+                foreach ((array)$this->data[$col] as $attr)
+                    $a[] = $attr[$field];
+                $val = join(' ', $a);
+            }
+            else {
+                $val = is_array($this->data[$col]) ? join(' ', $this->data[$col]) : $this->data[$col];
+            }
+
+            if (strlen($val))
+                $data .= $val . ' ';
+        }
+
+        return array_unique(rcube_utils::normalize_string($data, true));
+    }
+
+    /**
+     * Callback for kolab_storage_cache to get object specific tags to cache
+     *
+     * @return array List of tags to save in cache
+     */
+    public function get_tags()
+    {
+        $tags = array();
+
+        if (!empty($this->data['valarms'])) {
+            $tags[] = 'x-has-alarms';
+        }
+
+        // create tags reflecting participant status
+        if (is_array($this->data['attendees'])) {
+            foreach ($this->data['attendees'] as $attendee) {
+                if (!empty($attendee['email']) && !empty($attendee['status']))
+                    $tags[] = 'x-partstat:' . $attendee['email'] . ':' . strtolower($attendee['status']);
+            }
+        }
+
+        return $tags;
+    }
+}
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage.php Added

@@ -0,0 +1,1571 @@
+<?php
+
+/**
+ * Kolab storage class providing static methods to access groupware objects on a Kolab server.
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_storage
+{
+    const CTYPE_KEY = '/shared/vendor/kolab/folder-type';
+    const CTYPE_KEY_PRIVATE = '/private/vendor/kolab/folder-type';
+    const COLOR_KEY_SHARED  = '/shared/vendor/kolab/color';
+    const COLOR_KEY_PRIVATE = '/private/vendor/kolab/color';
+    const NAME_KEY_SHARED   = '/shared/vendor/kolab/displayname';
+    const NAME_KEY_PRIVATE  = '/private/vendor/kolab/displayname';
+    const UID_KEY_SHARED    = '/shared/vendor/kolab/uniqueid';
+    const UID_KEY_PRIVATE   = '/private/vendor/kolab/uniqueid';
+    const UID_KEY_CYRUS     = '/shared/vendor/cmu/cyrus-imapd/uniqueid';
+
+    const ERROR_IMAP_CONN      = 1;
+    const ERROR_CACHE_DB       = 2;
+    const ERROR_NO_PERMISSION  = 3;
+    const ERROR_INVALID_FOLDER = 4;
+
+    public static $version = '3.0';
+    public static $last_error;
+    public static $encode_ids = false;
+
+    private static $ready = false;
+    private static $with_tempsubs = true;
+    private static $subscriptions;
+    private static $typedata = array();
+    private static $states;
+    private static $config;
+    private static $imap;
+    private static $ldap;
+
+    // Default folder names
+    private static $default_folders = array(
+        'event'         => 'Calendar',
+        'contact'       => 'Contacts',
+        'task'          => 'Tasks',
+        'note'          => 'Notes',
+        'file'          => 'Files',
+        'configuration' => 'Configuration',
+        'journal'       => 'Journal',
+        'mail.inbox'       => 'INBOX',
+        'mail.drafts'      => 'Drafts',
+        'mail.sentitems'   => 'Sent',
+        'mail.wastebasket' => 'Trash',
+        'mail.outbox'      => 'Outbox',
+        'mail.junkemail'   => 'Junk',
+    );
+
+
+    /**
+     * Setup the environment needed by the libs
+     */
+    public static function setup()
+    {
+        if (self::$ready)
+            return true;
+
+        $rcmail = rcube::get_instance();
+        self::$config = $rcmail->config;
+        self::$version = strval($rcmail->config->get('kolab_format_version', self::$version));
+        self::$imap = $rcmail->get_storage();
+        self::$ready = class_exists('kolabformat') &&
+            (self::$imap->get_capability('METADATA') || self::$imap->get_capability('ANNOTATEMORE') || self::$imap->get_capability('ANNOTATEMORE2'));
+
+        if (self::$ready) {
+            // set imap options
+            self::$imap->set_options(array(
+                'skip_deleted' => true,
+                'threading' => false,
+            ));
+        }
+        else if (!class_exists('kolabformat')) {
+            rcube::raise_error(array(
+                'code' => 900, 'type' => 'php',
+                'message' => "required kolabformat module not found"
+            ), true);
+        }
+        else {
+            rcube::raise_error(array(
+                'code' => 900, 'type' => 'php',
+                'message' => "IMAP server doesn't support METADATA or ANNOTATEMORE"
+            ), true);
+        }
+
+        return self::$ready;
+    }
+
+    /**
+     * Initializes LDAP object to resolve Kolab users
+     */
+    public static function ldap()
+    {
+        if (self::$ldap) {
+            return self::$ldap;
+        }
+
+        self::setup();
+
+        $config = self::$config->get('kolab_users_directory', self::$config->get('kolab_auth_addressbook'));
+
+        if (!is_array($config)) {
+            $ldap_config = (array)self::$config->get('ldap_public');
+            $config = $ldap_config[$config];
+        }
+
+        if (empty($config)) {
+            return null;
+        }
+
+        // overwrite filter option
+        if ($filter = self::$config->get('kolab_users_filter')) {
+            self::$config->set('kolab_auth_filter', $filter);
+        }
+
+        // re-use the LDAP wrapper class from kolab_auth plugin
+        require_once rtrim(RCUBE_PLUGINS_DIR, '/') . '/kolab_auth/kolab_auth_ldap.php';
+
+        self::$ldap = new kolab_auth_ldap($config);
+
+        return self::$ldap;
+    }
+
+    /**
+     * Get a list of storage folders for the given data type
+     *
+     * @param string Data type to list folders for (contact,distribution-list,event,task,note)
+     * @param boolean Enable to return subscribed folders only (null to use configured subscription mode)
+     *
+     * @return array List of Kolab_Folder objects (folder names in UTF7-IMAP)
+     */
+    public static function get_folders($type, $subscribed = null)
+    {
+        $folders = $folderdata = array();
+
+        if (self::setup()) {
+            foreach ((array)self::list_folders('', '*', $type, $subscribed, $folderdata) as $foldername) {
+                $folders[$foldername] = new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
+            }
+        }
+
+        return $folders;
+    }
+
+    /**
+     * Getter for the storage folder for the given type
+     *
+     * @param string Data type to list folders for (contact,distribution-list,event,task,note)
+     * @return object kolab_storage_folder  The folder object
+     */
+    public static function get_default_folder($type)
+    {
+        if (self::setup()) {
+            foreach ((array)self::list_folders('', '*', $type . '.default', false, $folderdata) as $foldername) {
+                return new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Getter for a specific storage folder
+     *
+     * @param string IMAP folder to access (UTF7-IMAP)
+     * @param string Expected folder type
+     *
+     * @return object kolab_storage_folder  The folder object
+     */
+    public static function get_folder($folder, $type = null)
+    {
+        return self::setup() ? new kolab_storage_folder($folder, $type) : null;
+    }
+
+    /**
+     * Getter for a single Kolab object, identified by its UID.
+     * This will search all folders storing objects of the given type.
+     *
+     * @param string Object UID
+     * @param string Object type (contact,event,task,journal,file,note,configuration)
+     * @return array The Kolab object represented as hash array or false if not found
+     */
+    public static function get_object($uid, $type)
+    {
+        self::setup();
+        $folder = null;
+        foreach ((array)self::list_folders('', '*', $type, null, $folderdata) as $foldername) {
+            if (!$folder)
+                $folder = new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
+            else
+                $folder->set_folder($foldername, $type, $folderdata[$foldername]);
+
+            if ($object = $folder->get_object($uid, '*'))
+                return $object;
+        }
+
+        return false;
+    }
+
+    /**
+     * Execute cross-folder searches with the given query.
+     *
+     * @param array  Pseudo-SQL query as list of filter parameter triplets
+     * @param string Object type (contact,event,task,journal,file,note,configuration)
+     * @return array List of Kolab data objects (each represented as hash array)
+     * @see kolab_storage_format::select()
+     */
+    public static function select($query, $type)
+    {
+        self::setup();
+        $folder = null;
+        $result = array();
+
+        foreach ((array)self::list_folders('', '*', $type, null, $folderdata) as $foldername) {
+            if (!$folder)
+                $folder = new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
+            else
+                $folder->set_folder($foldername, $type, $folderdata[$foldername]);
+
+            foreach ($folder->select($query, '*') as $object) {
+                $result[] = $object;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns Free-busy server URL
+     */
+    public static function get_freebusy_server()
+    {
+        $url = 'https://' . $_SESSION['imap_host'] . '/freebusy';
+        $url = self::$config->get('kolab_freebusy_server', $url);
+        $url = rcube_utils::resolve_url($url);
+
+        return unslashify($url);
+    }
+
+    /**
+     * Compose an URL to query the free/busy status for the given user
+     */
+    public static function get_freebusy_url($email)
+    {
+        return self::get_freebusy_server() . '/' . $email . '.ifb';
+    }
+
+    /**
+     * Creates folder ID from folder name
+     *
+     * @param string  $folder Folder name (UTF7-IMAP)
+     * @param boolean $enc    Use lossless encoding
+     * @return string Folder ID string
+     */
+    public static function folder_id($folder, $enc = null)
+    {
+        return $enc == true || ($enc === null && self::$encode_ids) ?
+            self::id_encode($folder) :
+            asciiwords(strtr($folder, '/.-', '___'));
+    }
+
+    /**
+     * Encode the given ID to a safe ascii representation
+     *
+     * @param string $id Arbitrary identifier string
+     *
+     * @return string Ascii representation
+     */
+    public static function id_encode($id)
+    {
+        return rtrim(strtr(base64_encode($id), '+/', '-_'), '=');
+    }
+
+    /**
+     * Convert the given identifier back to it's raw value
+     *
+     * @param string $id Ascii identifier
+     * @return string Raw identifier string
+     */
+    public static function id_decode($id)
+    {
+      return base64_decode(str_pad(strtr($id, '-_', '+/'), strlen($id) % 4, '=', STR_PAD_RIGHT));
+    }
+
+    /**
+     * Return the (first) path of the requested IMAP namespace
+     *
+     * @param string  Namespace name (personal, shared, other)
+     * @return string IMAP root path for that namespace
+     */
+    public static function namespace_root($name)
+    {
+        foreach ((array)self::$imap->get_namespace($name) as $paths) {
+            if (strlen($paths[0]) > 1) {
+                return $paths[0];
+            }
+        }
+
+        return '';
+    }
+
+
+    /**
+     * Deletes IMAP folder
+     *
+     * @param string $name Folder name (UTF7-IMAP)
+     *
+     * @return bool True on success, false on failure
+     */
+    public static function folder_delete($name)
+    {
+        // clear cached entries first
+        if ($folder = self::get_folder($name))
+            $folder->cache->purge();
+
+        $rcmail = rcube::get_instance();
+        $plugin = $rcmail->plugins->exec_hook('folder_delete', array('name' => $name));
+
+        $success = self::$imap->delete_folder($name);
+        self::$last_error = self::$imap->get_error_str();
+
+        return $success;
+    }
+
+    /**
+     * Creates IMAP folder
+     *
+     * @param string $name       Folder name (UTF7-IMAP)
+     * @param string $type       Folder type
+     * @param bool   $subscribed Sets folder subscription
+     * @param bool   $active     Sets folder state (client-side subscription)
+     *
+     * @return bool True on success, false on failure
+     */
+    public static function folder_create($name, $type = null, $subscribed = false, $active = false)
+    {
+        self::setup();
+
+        $rcmail = rcube::get_instance();
+        $plugin = $rcmail->plugins->exec_hook('folder_create', array('record' => array(
+            'name' => $name,
+            'subscribe' => $subscribed,
+        )));
+
+        if ($saved = self::$imap->create_folder($name, $subscribed)) {
+            // set metadata for folder type
+            if ($type) {
+                $saved = self::set_folder_type($name, $type);
+
+                // revert if metadata could not be set
+                if (!$saved) {
+                    self::$imap->delete_folder($name);
+                }
+                // activate folder
+                else if ($active) {
+                    self::set_state($name, true);
+                }
+            }
+        }
+
+        if ($saved) {
+            return true;
+        }
+
+        self::$last_error = self::$imap->get_error_str();
+        return false;
+    }
+
+
+    /**
+     * Renames IMAP folder
+     *
+     * @param string $oldname Old folder name (UTF7-IMAP)
+     * @param string $newname New folder name (UTF7-IMAP)
+     *
+     * @return bool True on success, false on failure
+     */
+    public static function folder_rename($oldname, $newname)
+    {
+        self::setup();
+
+        $rcmail = rcube::get_instance();
+        $plugin = $rcmail->plugins->exec_hook('folder_rename', array(
+            'oldname' => $oldname, 'newname' => $newname));
+
+        $oldfolder = self::get_folder($oldname);
+        $active    = self::folder_is_active($oldname);
+        $success   = self::$imap->rename_folder($oldname, $newname);
+        self::$last_error = self::$imap->get_error_str();
+
+        // pass active state to new folder name
+        if ($success && $active) {
+            self::set_state($oldname, false);
+            self::set_state($newname, true);
+        }
+
+        // assign existing cache entries to new resource uri
+        if ($success && $oldfolder) {
+            $oldfolder->cache->rename($newname);
+        }
+
+        return $success;
+    }
+
+
+    /**
+     * Rename or Create a new IMAP folder.
+     *
+     * Does additional checks for permissions and folder name restrictions
+     *
+     * @param array Hash array with folder properties and metadata
+     *  - name:       Folder name
+     *  - oldname:    Old folder name when changed
+     *  - parent:     Parent folder to create the new one in
+     *  - type:       Folder type to create
+     *  - subscribed: Subscribed flag (IMAP subscription)
+     *  - active:     Activation flag (client-side subscription)
+     * @return mixed New folder name or False on failure
+     */
+    public static function folder_update(&$prop)
+    {
+        self::setup();
+
+        $folder    = rcube_charset::convert($prop['name'], RCUBE_CHARSET, 'UTF7-IMAP');
+        $oldfolder = $prop['oldname']; // UTF7
+        $parent    = $prop['parent']; // UTF7
+        $delimiter = self::$imap->get_hierarchy_delimiter();
+
+        if (strlen($oldfolder)) {
+            $options = self::$imap->folder_info($oldfolder);
+        }
+
+        if (!empty($options) && ($options['norename'] || $options['protected'])) {
+        }
+        // sanity checks (from steps/settings/save_folder.inc)
+        else if (!strlen($folder)) {
+            self::$last_error = 'cannotbeempty';
+            return false;
+        }
+        else if (strlen($folder) > 128) {
+            self::$last_error = 'nametoolong';
+            return false;
+        }
+        else {
+            // these characters are problematic e.g. when used in LIST/LSUB
+            foreach (array($delimiter, '%', '*') as $char) {
+                if (strpos($folder, $char) !== false) {
+                    self::$last_error = 'forbiddencharacter';
+                    return false;
+                }
+            }
+        }
+
+        if (!empty($options) && ($options['protected'] || $options['norename'])) {
+            $folder = $oldfolder;
+        }
+        else if (strlen($parent)) {
+            $folder = $parent . $delimiter . $folder;
+        }
+        else {
+            // add namespace prefix (when needed)
+            $folder = self::$imap->mod_folder($folder, 'in');
+        }
+
+        // Check access rights to the parent folder
+        if (strlen($parent) && (!strlen($oldfolder) || $oldfolder != $folder)) {
+            $parent_opts = self::$imap->folder_info($parent);
+            if ($parent_opts['namespace'] != 'personal'
+                && (empty($parent_opts['rights']) || !preg_match('/[ck]/', implode($parent_opts['rights'])))
+            ) {
+                self::$last_error = 'No permission to create folder';
+                return false;
+          }
+        }
+
+        // update the folder name
+        if (strlen($oldfolder)) {
+            if ($oldfolder != $folder) {
+                $result = self::folder_rename($oldfolder, $folder);
+          }
+          else
+              $result = true;
+        }
+        // create new folder
+        else {
+            $result = self::folder_create($folder, $prop['type'], $prop['subscribed'], $prop['active']);
+        }
+
+        if ($result) {
+            self::set_folder_props($folder, $prop);
+        }
+
+        return $result ? $folder : false;
+    }
+
+
+    /**
+     * Getter for human-readable name of Kolab object (folder)
+     * See http://wiki.kolab.org/UI-Concepts/Folder-Listing for reference
+     *
+     * @param string $folder    IMAP folder name (UTF7-IMAP)
+     * @param string $folder_ns Will be set to namespace name of the folder
+     *
+     * @return string Name of the folder-object
+     */
+    public static function object_name($folder, &$folder_ns=null)
+    {
+        self::setup();
+
+        // find custom display name in folder METADATA
+        if ($name = self::custom_displayname($folder)) {
+            return $name;
+        }
+
+        $found     = false;
+        $namespace = self::$imap->get_namespace();
+
+        if (!empty($namespace['shared'])) {
+            foreach ($namespace['shared'] as $ns) {
+                if (strlen($ns[0]) && strpos($folder, $ns[0]) === 0) {
+                    $prefix = '';
+                    $folder = substr($folder, strlen($ns[0]));
+                    $delim  = $ns[1];
+                    $found  = true;
+                    $folder_ns = 'shared';
+                    break;
+                }
+            }
+        }
+        if (!$found && !empty($namespace['other'])) {
+            foreach ($namespace['other'] as $ns) {
+                if (strlen($ns[0]) && strpos($folder, $ns[0]) === 0) {
+                    // remove namespace prefix
+                    $folder = substr($folder, strlen($ns[0]));
+                    $delim  = $ns[1];
+                    // get username
+                    $pos    = strpos($folder, $delim);
+                    if ($pos) {
+                        $prefix = '('.substr($folder, 0, $pos).')';
+                        $folder = substr($folder, $pos+1);
+                    }
+                    else {
+                        $prefix = '('.$folder.')';
+                        $folder = '';
+                    }
+
+                    $found  = true;
+                    $folder_ns = 'other';
+                    break;
+                }
+            }
+        }
+        if (!$found && !empty($namespace['personal'])) {
+            foreach ($namespace['personal'] as $ns) {
+                if (strlen($ns[0]) && strpos($folder, $ns[0]) === 0) {
+                    // remove namespace prefix
+                    $folder = substr($folder, strlen($ns[0]));
+                    $prefix = '';
+                    $delim  = $ns[1];
+                    $found  = true;
+                    break;
+                }
+            }
+        }
+
+        if (empty($delim))
+            $delim = self::$imap->get_hierarchy_delimiter();
+
+        $folder = rcube_charset::convert($folder, 'UTF7-IMAP');
+        $folder = html::quote($folder);
+        $folder = str_replace(html::quote($delim), ' &raquo; ', $folder);
+
+        if ($prefix)
+            $folder = html::quote($prefix) . ($folder !== '' ? ' ' . $folder : '');
+
+        if (!$folder_ns)
+            $folder_ns = 'personal';
+
+        return $folder;
+    }
+
+    /**
+     * Get custom display name (saved in metadata) for the given folder
+     */
+    public static function custom_displayname($folder)
+    {
+      // find custom display name in folder METADATA
+      if (self::$config->get('kolab_custom_display_names', true)) {
+          $metadata = self::$imap->get_metadata($folder, array(self::NAME_KEY_PRIVATE, self::NAME_KEY_SHARED));
+          if (($name = $metadata[$folder][self::NAME_KEY_PRIVATE]) || ($name = $metadata[$folder][self::NAME_KEY_SHARED])) {
+              return $name;
+          }
+      }
+
+      return false;
+    }
+
+    /**
+     * Helper method to generate a truncated folder name to display.
+     * Note: $origname is a string returned by self::object_name()
+     */
+    public static function folder_displayname($origname, &$names)
+    {
+        $name = $origname;
+
+        // find folder prefix to truncate
+        for ($i = count($names)-1; $i >= 0; $i--) {
+            if (strpos($name, $names[$i] . ' &raquo; ') === 0) {
+                $length = strlen($names[$i] . ' &raquo; ');
+                $prefix = substr($name, 0, $length);
+                $count  = count(explode(' &raquo; ', $prefix));
+                $diff   = 1;
+
+                // check if prefix folder is in other users namespace
+                for ($n = count($names)-1; $n >= 0; $n--) {
+                    if (strpos($prefix, '(' . $names[$n] . ') ') === 0) {
+                        $diff = 0;
+                        break;
+                    }
+                }
+
+                $name = str_repeat('&nbsp;&nbsp;&nbsp;', $count - $diff) . '&raquo; ' . substr($name, $length);
+                break;
+            }
+            // other users namespace and parent folder exists
+            else if (strpos($name, '(' . $names[$i] . ') ') === 0) {
+                $length = strlen('(' . $names[$i] . ') ');
+                $prefix = substr($name, 0, $length);
+                $count  = count(explode(' &raquo; ', $prefix));
+                $name   = str_repeat('&nbsp;&nbsp;&nbsp;', $count) . '&raquo; ' . substr($name, $length);
+                break;
+            }
+        }
+
+        $names[] = $origname;
+
+        return $name;
+    }
+
+
+    /**
+     * Creates a SELECT field with folders list
+     *
+     * @param string $type    Folder type
+     * @param array  $attrs   SELECT field attributes (e.g. name)
+     * @param string $current The name of current folder (to skip it)
+     *
+     * @return html_select SELECT object
+     */
+    public static function folder_selector($type, $attrs, $current = '')
+    {
+        // get all folders of specified type (sorted)
+        $folders = self::get_folders($type, true);
+
+        $delim = self::$imap->get_hierarchy_delimiter();
+        $names = array();
+        $len   = strlen($current);
+
+        if ($len && ($rpos = strrpos($current, $delim))) {
+            $parent = substr($current, 0, $rpos);
+            $p_len  = strlen($parent);
+        }
+
+        // Filter folders list
+        foreach ($folders as $c_folder) {
+            $name = $c_folder->name;
+
+            // skip current folder and it's subfolders
+            if ($len) {
+                if ($name == $current) {
+                    // Make sure parent folder is listed (might be skipped e.g. if it's namespace root)
+                    if ($p_len && !isset($names[$parent])) {
+                        $names[$parent] = self::object_name($parent);
+                    }
+                    continue;
+                }
+                if (strpos($name, $current.$delim) === 0) {
+                    continue;
+                }
+            }
+
+            // always show the parent of current folder
+            if ($p_len && $name == $parent) {
+            }
+            // skip folders where user have no rights to create subfolders
+            else if ($c_folder->get_owner() != $_SESSION['username']) {
+                $rights = $c_folder->get_myrights();
+                if (!preg_match('/[ck]/', $rights)) {
+                    continue;
+                }
+            }
+
+            $names[$name] = self::object_name($name);
+        }
+
+        // Build SELECT field of parent folder
+        $attrs['is_escaped'] = true;
+        $select = new html_select($attrs);
+        $select->add('---', '');
+
+        $listnames = array();
+        foreach (array_keys($names) as $imap_name) {
+            $name = $origname = $names[$imap_name];
+
+            // find folder prefix to truncate
+            for ($i = count($listnames)-1; $i >= 0; $i--) {
+                if (strpos($name, $listnames[$i].' &raquo; ') === 0) {
+                    $length = strlen($listnames[$i].' &raquo; ');
+                    $prefix = substr($name, 0, $length);
+                    $count  = count(explode(' &raquo; ', $prefix));
+                    $name   = str_repeat('&nbsp;&nbsp;', $count-1) . '&raquo; ' . substr($name, $length);
+                    break;
+                }
+            }
+
+            $listnames[] = $origname;
+            $select->add($name, $imap_name);
+        }
+
+        return $select;
+    }
+
+
+    /**
+     * Returns a list of folder names
+     *
+     * @param string  Optional root folder
+     * @param string  Optional name pattern
+     * @param string  Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
+     * @param boolean Enable to return subscribed folders only (null to use configured subscription mode)
+     * @param array   Will be filled with folder-types data
+     *
+     * @return array List of folders
+     */
+    public static function list_folders($root = '', $mbox = '*', $filter = null, $subscribed = null, &$folderdata = array())
+    {
+        if (!self::setup()) {
+            return null;
+        }
+
+        // use IMAP subscriptions
+        if ($subscribed === null && self::$config->get('kolab_use_subscriptions')) {
+            $subscribed = true;
+        }
+
+        if (!$filter) {
+            // Get ALL folders list, standard way
+            if ($subscribed) {
+                $folders = self::$imap->list_folders_subscribed($root, $mbox);
+                // add temporarily subscribed folders
+                if (self::$with_tempsubs && is_array($_SESSION['kolab_subscribed_folders'])) {
+                    $folders = array_unique(array_merge($folders, $_SESSION['kolab_subscribed_folders']));
+                }
+            }
+            else {
+                $folders = self::_imap_list_folders($root, $mbox);
+            }
+
+            return $folders;
+        }
+        $prefix = $root . $mbox;
+        $regexp = '/^' . preg_quote($filter, '/') . '(\..+)?$/';
+
+        // get folders types for all folders
+        if (!$subscribed || $prefix == '*' || !self::$config->get('kolab_skip_namespace')) {
+            $folderdata = self::folders_typedata($prefix);
+        }
+        else {
+            // fetch folder types for the effective list of (subscribed) folders when post-filtering
+            $folderdata = array();
+        }
+
+        if (!is_array($folderdata)) {
+            return array();
+        }
+
+        // In some conditions we can skip LIST command (?)
+        if (!$subscribed && $filter != 'mail' && $prefix == '*') {
+            foreach ($folderdata as $folder => $type) {
+                if (!preg_match($regexp, $type)) {
+                    unset($folderdata[$folder]);
+                }
+            }
+
+            return self::$imap->sort_folder_list(array_keys($folderdata), true);
+        }
+
+        // Get folders list
+        if ($subscribed) {
+            $folders = self::$imap->list_folders_subscribed($root, $mbox);
+
+            // add temporarily subscribed folders
+            if (self::$with_tempsubs && is_array($_SESSION['kolab_subscribed_folders'])) {
+                $folders = array_unique(array_merge($folders, $_SESSION['kolab_subscribed_folders']));
+            }
+        }
+        else {
+            $folders = self::_imap_list_folders($root, $mbox);
+        }
+
+        // In case of an error, return empty list (?)
+        if (!is_array($folders)) {
+            return array();
+        }
+
+        // Filter folders list
+        foreach ($folders as $idx => $folder) {
+            // lookup folder type
+            if (!array_key_exists($folder, $folderdata)) {
+                $folderdata[$folder] = self::folder_type($folder);
+            }
+
+            $type = $folderdata[$folder];
+
+            if ($filter == 'mail' && empty($type)) {
+                continue;
+            }
+            if (empty($type) || !preg_match($regexp, $type)) {
+                unset($folders[$idx]);
+            }
+        }
+
+        return $folders;
+    }
+
+    /**
+     * Wrapper for rcube_imap::list_folders() with optional post-filtering
+     */
+    protected static function _imap_list_folders($root, $mbox)
+    {
+        $postfilter = null;
+
+        // compose a post-filter expression for the excluded namespaces
+        if ($root . $mbox == '*' && ($skip_ns = self::$config->get('kolab_skip_namespace'))) {
+            $excludes = array();
+            foreach ((array)$skip_ns as $ns) {
+                if ($ns_root = self::namespace_root($ns)) {
+                    $excludes[] = $ns_root;
+                }
+            }
+
+            if (count($excludes)) {
+                $postfilter = '!^(' . join(')|(', array_map('preg_quote', $excludes)) . ')!';
+            }
+        }
+
+        // use normal LIST command to return all folders, it's fast enough
+        $folders = self::$imap->list_folders($root, $mbox, null, null, !empty($postfilter));
+
+        if (!empty($postfilter)) {
+            $folders = array_filter($folders, function($folder) use ($postfilter) { return !preg_match($postfilter, $folder); });
+            $folders = self::$imap->sort_folder_list($folders);
+        }
+
+        return $folders;
+    }
+
+
+    /**
+     * Search for shared or otherwise not listed groupware folders the user has access
+     *
+     * @param string Folder type of folders to search for
+     * @param string Search string
+     * @param array  Namespace(s) to exclude results from
+     *
+     * @return array List of matching kolab_storage_folder objects
+     */
+    public static function search_folders($type, $query, $exclude_ns = array())
+    {
+        if (!self::setup()) {
+            return array();
+        }
+
+        $folders = array();
+        $query = str_replace('*', '', $query);
+
+        // find unsubscribed IMAP folders of the given type
+        foreach ((array)self::list_folders('', '*', $type, false, $folderdata) as $foldername) {
+            // FIXME: only consider the last part of the folder path for searching?
+            $realname = strtolower(rcube_charset::convert($foldername, 'UTF7-IMAP'));
+            if (($query == '' || strpos($realname, $query) !== false) &&
+                !self::folder_is_subscribed($foldername, true) &&
+                !in_array(self::$imap->folder_namespace($foldername), (array)$exclude_ns)
+              ) {
+                $folders[] = new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
+            }
+        }
+
+        return $folders;
+    }
+
+
+    /**
+     * Sort the given list of kolab folders by namespace/name
+     *
+     * @param array List of kolab_storage_folder objects
+     * @return array Sorted list of folders
+     */
+    public static function sort_folders($folders)
+    {
+        $pad     = '  ';
+        $out     = array();
+        $nsnames = array('personal' => array(), 'shared' => array(), 'other' => array());
+
+        foreach ($folders as $folder) {
+            $folders[$folder->name] = $folder;
+            $ns = $folder->get_namespace();
+            $nsnames[$ns][$folder->name] = strtolower(html_entity_decode(self::object_name($folder->name, $ns), ENT_COMPAT, RCUBE_CHARSET)) . $pad;  // decode &raquo;
+        }
+
+        // $folders is a result of get_folders() we can assume folders were already sorted
+        foreach (array_keys($nsnames) as $ns) {
+            asort($nsnames[$ns], SORT_LOCALE_STRING);
+            foreach (array_keys($nsnames[$ns]) as $utf7name) {
+                $out[] = $folders[$utf7name];
+            }
+        }
+
+        return $out;
+    }
+
+
+    /**
+     * Check the folder tree and add the missing parents as virtual folders
+     *
+     * @param array $folders Folders list
+     * @param object $tree   Reference to the root node of the folder tree
+     *
+     * @return array Flat folders list
+     */
+    public static function folder_hierarchy($folders, &$tree = null)
+    {
+        $_folders = array();
+        $delim    = self::$imap->get_hierarchy_delimiter();
+        $other_ns = rtrim(self::namespace_root('other'), $delim);
+        $tree     = new kolab_storage_folder_virtual('', '<root>', '');  // create tree root
+        $refs     = array('' => $tree);
+
+        foreach ($folders as $idx => $folder) {
+            $path = explode($delim, $folder->name);
+            array_pop($path);
+            $folder->parent = join($delim, $path);
+            $folder->children = array();  // reset list
+
+            // skip top folders or ones with a custom displayname
+            if (count($path) < 1 || kolab_storage::custom_displayname($folder->name)) {
+                $tree->children[] = $folder;
+            }
+            else {
+                $parents = array();
+                $depth = $folder->get_namespace() == 'personal' ? 1 : 2;
+
+                while (count($path) >= $depth && ($parent = join($delim, $path))) {
+                    array_pop($path);
+                    $parent_parent = join($delim, $path);
+                    if (!$refs[$parent]) {
+                        if ($folder->type && self::folder_type($parent) == $folder->type) {
+                            $refs[$parent] = new kolab_storage_folder($parent, $folder->type, $folder->type);
+                            $refs[$parent]->parent = $parent_parent;
+                        }
+                        else if ($parent_parent == $other_ns) {
+                            $refs[$parent] = new kolab_storage_folder_user($parent, $parent_parent);
+                        }
+                        else {
+                            $name = kolab_storage::object_name($parent, $folder->get_namespace());
+                            $refs[$parent] = new kolab_storage_folder_virtual($parent, $name, $folder->get_namespace(), $parent_parent);
+                        }
+                        $parents[] = $refs[$parent];
+                    }
+                }
+
+                if (!empty($parents)) {
+                    $parents = array_reverse($parents);
+                    foreach ($parents as $parent) {
+                        $parent_node = $refs[$parent->parent] ?: $tree;
+                        $parent_node->children[] = $parent;
+                        $_folders[] = $parent;
+                    }
+                }
+
+                $parent_node = $refs[$folder->parent] ?: $tree;
+                $parent_node->children[] = $folder;
+            }
+
+            $refs[$folder->name] = $folder;
+            $_folders[] = $folder;
+            unset($folders[$idx]);
+        }
+
+        return $_folders;
+    }
+
+
+    /**
+     * Returns folder types indexed by folder name
+     *
+     * @param string $prefix Folder prefix (Default '*' for all folders)
+     *
+     * @return array|bool List of folders, False on failure
+     */
+    public static function folders_typedata($prefix = '*')
+    {
+        if (!self::setup()) {
+            return false;
+        }
+
+        // return cached result
+        if (is_array(self::$typedata[$prefix])) {
+            return self::$typedata[$prefix];
+        }
+
+        $type_keys = array(self::CTYPE_KEY, self::CTYPE_KEY_PRIVATE);
+
+        // fetch metadata from *some* folders only
+        if (($prefix == '*' || $prefix == '') && ($skip_ns = self::$config->get('kolab_skip_namespace'))) {
+            $delimiter = self::$imap->get_hierarchy_delimiter();
+            $folderdata = $blacklist = array();
+            foreach ((array)$skip_ns as $ns) {
+                if ($ns_root = rtrim(self::namespace_root($ns), $delimiter)) {
+                    $blacklist[] = $ns_root;
+                }
+            }
+            foreach (array('personal','other','shared') as $ns) {
+                if (!in_array($ns, (array)$skip_ns)) {
+                    $ns_root = rtrim(self::namespace_root($ns), $delimiter);
+
+                    // list top-level folders and their childs one by one
+                    // GETMETADATA "%" doesn't list shared or other namespace folders but "*" would
+                    if ($ns_root == '') {
+                        foreach ((array)self::$imap->get_metadata('%', $type_keys) as $folder => $metadata) {
+                            if (!in_array($folder, $blacklist)) {
+                                $folderdata[$folder] = $metadata;
+                                $opts = self::$imap->folder_attributes($folder);
+                                if (!in_array('\\HasNoChildren', $opts) && ($data = self::$imap->get_metadata($folder.$delimiter.'*', $type_keys))) {
+                                    $folderdata += $data;
+                                }
+                            }
+                        }
+                    }
+                    else if ($data = self::$imap->get_metadata($ns_root.$delimiter.'*', $type_keys)) {
+                        $folderdata += $data;
+                    }
+                }
+            }
+        }
+        else {
+            $folderdata = self::$imap->get_metadata($prefix, $type_keys);
+        }
+
+        if (!is_array($folderdata)) {
+            return false;
+        }
+
+        // keep list in memory
+        self::$typedata[$prefix] = array_map(array('kolab_storage', 'folder_select_metadata'), $folderdata);
+
+        return self::$typedata[$prefix];
+    }
+
+
+    /**
+     * Callback for array_map to select the correct annotation value
+     */
+    public static function folder_select_metadata($types)
+    {
+        if (!empty($types[self::CTYPE_KEY_PRIVATE])) {
+            return $types[self::CTYPE_KEY_PRIVATE];
+        }
+        else if (!empty($types[self::CTYPE_KEY])) {
+            list($ctype, ) = explode('.', $types[self::CTYPE_KEY]);
+            return $ctype;
+        }
+        return null;
+    }
+
+
+    /**
+     * Returns type of IMAP folder
+     *
+     * @param string $folder Folder name (UTF7-IMAP)
+     *
+     * @return string Folder type
+     */
+    public static function folder_type($folder)
+    {
+        self::setup();
+
+        // return in-memory cached result
+        foreach (self::$typedata as $typedata) {
+            if (array_key_exists($folder, $typedata)) {
+                return $typedata[$folder];
+            }
+        }
+
+        $metadata = self::$imap->get_metadata($folder, array(self::CTYPE_KEY, self::CTYPE_KEY_PRIVATE));
+
+        if (!is_array($metadata)) {
+            return null;
+        }
+
+        if (!empty($metadata[$folder])) {
+            return self::folder_select_metadata($metadata[$folder]);
+        }
+
+        return 'mail';
+    }
+
+
+    /**
+     * Sets folder content-type.
+     *
+     * @param string $folder Folder name
+     * @param string $type   Content type
+     *
+     * @return boolean True on success
+     */
+    public static function set_folder_type($folder, $type='mail')
+    {
+        self::setup();
+
+        list($ctype, $subtype) = explode('.', $type);
+
+        $success = self::$imap->set_metadata($folder, array(self::CTYPE_KEY => $ctype, self::CTYPE_KEY_PRIVATE => $subtype ? $type : null));
+
+        if (!$success)  // fallback: only set private annotation
+            $success |= self::$imap->set_metadata($folder, array(self::CTYPE_KEY_PRIVATE => $type));
+
+        return $success;
+    }
+
+
+    /**
+     * Check subscription status of this folder
+     *
+     * @param string $folder Folder name
+     * @param boolean $temp  Include temporary/session subscriptions
+     *
+     * @return boolean True if subscribed, false if not
+     */
+    public static function folder_is_subscribed($folder, $temp = false)
+    {
+        if (self::$subscriptions === null) {
+            self::setup();
+            self::$with_tempsubs = false;
+            self::$subscriptions = self::$imap->list_folders_subscribed();
+            self::$with_tempsubs = true;
+        }
+
+        return in_array($folder, self::$subscriptions) ||
+            ($temp && in_array($folder, (array)$_SESSION['kolab_subscribed_folders']));
+    }
+
+
+    /**
+     * Change subscription status of this folder
+     *
+     * @param string $folder Folder name
+     * @param boolean $temp  Only subscribe temporarily for the current session
+     *
+     * @return True on success, false on error
+     */
+    public static function folder_subscribe($folder, $temp = false)
+    {
+        self::setup();
+
+        // temporary/session subscription
+        if ($temp) {
+            if (self::folder_is_subscribed($folder)) {
+                return true;
+            }
+            else if (!is_array($_SESSION['kolab_subscribed_folders']) || !in_array($folder, $_SESSION['kolab_subscribed_folders'])) {
+                $_SESSION['kolab_subscribed_folders'][] = $folder;
+                return true;
+            }
+        }
+        else if (self::$imap->subscribe($folder)) {
+            self::$subscriptions = null;
+            return true;
+        }
+
+        return false;
+    }
+
+
+    /**
+     * Change subscription status of this folder
+     *
+     * @param string $folder Folder name
+     * @param boolean $temp  Only remove temporary subscription
+     *
+     * @return True on success, false on error
+     */
+    public static function folder_unsubscribe($folder, $temp = false)
+    {
+        self::setup();
+
+        // temporary/session subscription
+        if ($temp) {
+            if (is_array($_SESSION['kolab_subscribed_folders']) && ($i = array_search($folder, $_SESSION['kolab_subscribed_folders'])) !== false) {
+                unset($_SESSION['kolab_subscribed_folders'][$i]);
+            }
+            return true;
+        }
+        else if (self::$imap->unsubscribe($folder)) {
+            self::$subscriptions = null;
+            return true;
+        }
+
+        return false;
+    }
+
+
+    /**
+     * Check activation status of this folder
+     *
+     * @param string $folder Folder name
+     *
+     * @return boolean True if active, false if not
+     */
+    public static function folder_is_active($folder)
+    {
+        $active_folders = self::get_states();
+
+        return in_array($folder, $active_folders);
+    }
+
+
+    /**
+     * Change activation status of this folder
+     *
+     * @param string $folder Folder name
+     *
+     * @return True on success, false on error
+     */
+    public static function folder_activate($folder)
+    {
+        // activation implies temporary subscription
+        self::folder_subscribe($folder, true);
+        return self::set_state($folder, true);
+    }
+
+
+    /**
+     * Change activation status of this folder
+     *
+     * @param string $folder Folder name
+     *
+     * @return True on success, false on error
+     */
+    public static function folder_deactivate($folder)
+    {
+        // remove from temp subscriptions, really?
+        self::folder_unsubscribe($folder, true);
+
+        return self::set_state($folder, false);
+    }
+
+
+    /**
+     * Return list of active folders
+     */
+    private static function get_states()
+    {
+        if (self::$states !== null) {
+            return self::$states;
+        }
+
+        $rcube   = rcube::get_instance();
+        $folders = $rcube->config->get('kolab_active_folders');
+
+        if ($folders !== null) {
+            self::$states = !empty($folders) ? explode('**', $folders) : array();
+        }
+        // for backward-compatibility copy server-side subscriptions to activation states
+        else {
+            self::setup();
+            if (self::$subscriptions === null) {
+                self::$with_tempsubs = false;
+                self::$subscriptions = self::$imap->list_folders_subscribed();
+                self::$with_tempsubs = true;
+            }
+            self::$states = self::$subscriptions;
+            $folders = implode(self::$states, '**');
+            $rcube->user->save_prefs(array('kolab_active_folders' => $folders));
+        }
+
+        return self::$states;
+    }
+
+
+    /**
+     * Update list of active folders
+     */
+    private static function set_state($folder, $state)
+    {
+        self::get_states();
+
+        // update in-memory list
+        $idx = array_search($folder, self::$states);
+        if ($state && $idx === false) {
+            self::$states[] = $folder;
+        }
+        else if (!$state && $idx !== false) {
+            unset(self::$states[$idx]);
+        }
+
+        // update user preferences
+        $folders = implode(self::$states, '**');
+        $rcube   = rcube::get_instance();
+        return $rcube->user->save_prefs(array('kolab_active_folders' => $folders));
+    }
+
+    /**
+     * Creates default folder of specified type
+     * To be run when none of subscribed folders (of specified type) is found
+     *
+     * @param string $type  Folder type
+     * @param string $props Folder properties (color, etc)
+     *
+     * @return string Folder name
+     */
+    public static function create_default_folder($type, $props = array())
+    {
+        if (!self::setup()) {
+            return;
+        }
+
+        $folders = self::$imap->get_metadata('*', array(kolab_storage::CTYPE_KEY_PRIVATE));
+
+        // from kolab_folders config
+        $folder_type  = strpos($type, '.') ? str_replace('.', '_', $type) : $type . '_default';
+        $default_name = self::$config->get('kolab_folders_' . $folder_type);
+        $folder_type  = str_replace('_', '.', $folder_type);
+
+        // check if we have any folder in personal namespace
+        // folder(s) may exist but not subscribed
+        foreach ((array)$folders as $f => $data) {
+            if (strpos($data[self::CTYPE_KEY_PRIVATE], $type) === 0) {
+                $folder = $f;
+                break;
+            }
+        }
+
+        if (!$folder) {
+            if (!$default_name) {
+                $default_name = self::$default_folders[$type];
+            }
+
+            if (!$default_name) {
+                return;
+            }
+
+            $folder = rcube_charset::convert($default_name, RCUBE_CHARSET, 'UTF7-IMAP');
+            $prefix = self::$imap->get_namespace('prefix');
+
+            // add personal namespace prefix if needed
+            if ($prefix && strpos($folder, $prefix) !== 0 && $folder != 'INBOX') {
+                $folder = $prefix . $folder;
+            }
+
+            if (!self::$imap->folder_exists($folder)) {
+                if (!self::$imap->create_folder($folder)) {
+                    return;
+                }
+            }
+
+            self::set_folder_type($folder, $folder_type);
+        }
+
+        self::folder_subscribe($folder);
+
+        if ($props['active']) {
+            self::set_state($folder, true);
+        }
+
+        if (!empty($props)) {
+            self::set_folder_props($folder, $props);
+        }
+
+        return $folder;
+    }
+
+    /**
+     * Sets folder metadata properties
+     *
+     * @param string $folder Folder name
+     * @param array  $prop   Folder properties
+     */
+    public static function set_folder_props($folder, &$prop)
+    {
+        if (!self::setup()) {
+            return;
+        }
+
+        // TODO: also save 'showalarams' and other properties here
+        $ns        = self::$imap->folder_namespace($folder);
+        $supported = array(
+            'color'       => array(self::COLOR_KEY_SHARED, self::COLOR_KEY_PRIVATE),
+            'displayname' => array(self::NAME_KEY_SHARED, self::NAME_KEY_PRIVATE),
+        );
+
+        foreach ($supported as $key => $metakeys) {
+            if (array_key_exists($key, $prop)) {
+                $meta_saved = false;
+                if ($ns == 'personal')  // save in shared namespace for personal folders
+                    $meta_saved = self::$imap->set_metadata($folder, array($metakeys[0] => $prop[$key]));
+                if (!$meta_saved)    // try in private namespace
+                    $meta_saved = self::$imap->set_metadata($folder, array($metakeys[1] => $prop[$key]));
+                if ($meta_saved)
+                    unset($prop[$key]);  // unsetting will prevent fallback to local user prefs
+            }
+        }
+    }
+
+
+    /**
+     *
+     * @param mixed   $query    Search value (or array of field => value pairs)
+     * @param int     $mode     Matching mode: 0 - partial (*abc*), 1 - strict (=), 2 - prefix (abc*)
+     * @param array   $required List of fields that shall ot be empty
+     * @param int     $limit    Maximum number of records
+     * @param int     $count    Returns the number of records found
+     *
+     * @return array List or false on error
+     */
+    public static function search_users($query, $mode = 1, $required = array(), $limit = 0, &$count = 0)
+    {
+        $query = str_replace('*', '', $query);
+
+        // requires a working LDAP setup
+        if (!self::ldap() || strlen($query) == 0) {
+            return array();
+        }
+
+        // search users using the configured attributes
+        $results = self::$ldap->dosearch(self::$config->get('kolab_users_search_attrib', array('cn','mail','alias')), $query, $mode, $required, $limit, $count);
+
+        // exclude myself
+        if ($_SESSION['kolab_dn']) {
+            unset($results[$_SESSION['kolab_dn']]);
+        }
+
+        // resolve to IMAP folder name
+        $root = self::namespace_root('other');
+        $user_attrib = self::$config->get('kolab_users_id_attrib', self::$config->get('kolab_auth_login', 'mail'));
+
+        array_walk($results, function(&$user, $dn) use ($root, $user_attrib) {
+            list($localpart, ) = explode('@', $user[$user_attrib]);
+            $user['kolabtargetfolder'] = $root . $localpart;
+        });
+
+        return $results;
+    }
+
+
+    /**
+     * Returns a list of IMAP folders shared by the given user
+     *
+     * @param array   User entry from LDAP
+     * @param string  Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
+     * @param boolean Return subscribed folders only (null to use configured subscription mode)
+     * @param array   Will be filled with folder-types data
+     *
+     * @return array List of folders
+     */
+    public static function list_user_folders($user, $type, $subscribed = null, &$folderdata = array())
+    {
+        self::setup();
+
+        $folders = array();
+
+        // use localpart of user attribute as root for folder listing
+        $user_attrib = self::$config->get('kolab_users_id_attrib', self::$config->get('kolab_auth_login', 'mail'));
+        if (!empty($user[$user_attrib])) {
+            list($mbox) = explode('@', $user[$user_attrib]);
+
+            $delimiter = self::$imap->get_hierarchy_delimiter();
+            $other_ns = self::namespace_root('other');
+            $folders = self::list_folders($other_ns . $mbox . $delimiter, '*', $type, $subscribed, $folderdata);
+        }
+
+        return $folders;
+    }
+
+
+    /**
+     * Get a list of (virtual) top-level folders from the other users namespace
+     *
+     * @param string  Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
+     * @param boolean Enable to return subscribed folders only (null to use configured subscription mode)
+     *
+     * @return array List of kolab_storage_folder_user objects
+     */
+    public static function get_user_folders($type, $subscribed)
+    {
+        $folders = $folderdata = array();
+
+        if (self::setup()) {
+            $delimiter = self::$imap->get_hierarchy_delimiter();
+            $other_ns = rtrim(self::namespace_root('other'), $delimiter);
+            $path_len = count(explode($delimiter, $other_ns));
+
+            foreach ((array)self::list_folders($other_ns . $delimiter, '*', '', $subscribed) as $foldername) {
+                if ($foldername == 'INBOX')  // skip INBOX which is added by default
+                    continue;
+
+                $path = explode($delimiter, $foldername);
+
+                // compare folder type if a subfolder is listed
+                if ($type && count($path) > $path_len + 1 && $type != self::folder_type($foldername)) {
+                    continue;
+                }
+
+                // truncate folder path to top-level folders of the 'other' namespace
+                $foldername = join($delimiter, array_slice($path, 0, $path_len + 1));
+
+                if (!$folders[$foldername]) {
+                    $folders[$foldername] = new kolab_storage_folder_user($foldername, $other_ns);
+                }
+            }
+
+            // for every (subscribed) user folder, list all (unsubscribed) subfolders
+            foreach ($folders as $userfolder) {
+                foreach ((array)self::list_folders($userfolder->name . $delimiter, '*', $type, false, $folderdata) as $foldername) {
+                    if (!$folders[$foldername]) {
+                        $folders[$foldername] = new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
+                        $userfolder->children[] = $folders[$foldername];
+                    }
+                }
+            }
+        }
+
+        return $folders;
+    }
+
+
+    /**
+     * Handler for user_delete plugin hooks
+     *
+     * Remove all cache data from the local database related to the given user.
+     */
+    public static function delete_user_folders($args)
+    {
+        $db = rcmail::get_instance()->get_dbh();
+        $prefix = 'imap://' . urlencode($args['username']) . '@' . $args['host'] . '/%';
+        $db->query("DELETE FROM " . $db->table_name('kolab_folders', true) . " WHERE `resource` LIKE ?", $prefix);
+    }
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache.php Added

@@ -0,0 +1,1135 @@
+<?php
+
+/**
+ * Kolab storage cache class providing a local caching layer for Kolab groupware objects.
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2012-2013, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_storage_cache
+{
+    const DB_DATE_FORMAT = 'Y-m-d H:i:s';
+
+    public $sync_complete = false;
+
+    protected $db;
+    protected $imap;
+    protected $folder;
+    protected $uid2msg;
+    protected $objects;
+    protected $metadata = array();
+    protected $folder_id;
+    protected $resource_uri;
+    protected $enabled = true;
+    protected $synched = false;
+    protected $synclock = false;
+    protected $ready = false;
+    protected $cache_table;
+    protected $folders_table;
+    protected $max_sql_packet;
+    protected $max_sync_lock_time = 600;
+    protected $binary_items = array();
+    protected $extra_cols = array();
+    protected $order_by = null;
+    protected $limit = null;
+    protected $error = 0;
+
+
+    /**
+     * Factory constructor
+     */
+    public static function factory(kolab_storage_folder $storage_folder)
+    {
+        $subclass = 'kolab_storage_cache_' . $storage_folder->type;
+        if (class_exists($subclass)) {
+            return new $subclass($storage_folder);
+        }
+        else {
+            rcube::raise_error(array(
+                'code' => 900,
+                'type' => 'php',
+                'message' => "No kolab_storage_cache class found for folder '$storage_folder->name' of type '$storage_folder->type'"
+            ), true);
+
+            return new kolab_storage_cache($storage_folder);
+        }
+    }
+
+
+    /**
+     * Default constructor
+     */
+    public function __construct(kolab_storage_folder $storage_folder = null)
+    {
+        $rcmail = rcube::get_instance();
+        $this->db = $rcmail->get_dbh();
+        $this->imap = $rcmail->get_storage();
+        $this->enabled = $rcmail->config->get('kolab_cache', false);
+        $this->folders_table = $this->db->table_name('kolab_folders');
+
+        if ($this->enabled) {
+            // always read folder cache and lock state from DB master
+            $this->db->set_table_dsn('kolab_folders', 'w');
+            // remove sync-lock on script termination
+            $rcmail->add_shutdown_function(array($this, '_sync_unlock'));
+        }
+
+        if ($storage_folder)
+            $this->set_folder($storage_folder);
+    }
+
+    /**
+     * Direct access to cache by folder_id
+     * (only for internal use)
+     */
+    public function select_by_id($folder_id)
+    {
+        $sql_arr = $this->db->fetch_assoc($this->db->query("SELECT * FROM `{$this->folders_table}` WHERE `folder_id` = ?", $folder_id));
+        if ($sql_arr) {
+            $this->metadata = $sql_arr;
+            $this->folder_id = $sql_arr['folder_id'];
+            $this->folder = new StdClass;
+            $this->folder->type = $sql_arr['type'];
+            $this->resource_uri = $sql_arr['resource'];
+            $this->cache_table = $this->db->table_name('kolab_cache_' . $sql_arr['type']);
+            $this->ready = true;
+        }
+    }
+
+    /**
+     * Connect cache with a storage folder
+     *
+     * @param kolab_storage_folder The storage folder instance to connect with
+     */
+    public function set_folder(kolab_storage_folder $storage_folder)
+    {
+        $this->folder = $storage_folder;
+
+        if (empty($this->folder->name) || !$this->folder->valid) {
+            $this->ready = false;
+            return;
+        }
+
+        // compose fully qualified ressource uri for this instance
+        $this->resource_uri = $this->folder->get_resource_uri();
+        $this->cache_table = $this->db->table_name('kolab_cache_' . $this->folder->type);
+        $this->ready = $this->enabled && !empty($this->folder->type);
+        $this->folder_id = null;
+    }
+
+    /**
+     * Returns true if this cache supports query by type
+     */
+    public function has_type_col()
+    {
+        return in_array('type', $this->extra_cols);
+    }
+
+    /**
+     * Getter for the numeric ID used in cache tables
+     */
+    public function get_folder_id()
+    {
+        $this->_read_folder_data();
+        return $this->folder_id;
+    }
+
+    /**
+     * Returns code of last error
+     *
+     * @return int Error code
+     */
+    public function get_error()
+    {
+        return $this->error;
+    }
+
+    /**
+     * Synchronize local cache data with remote
+     */
+    public function synchronize()
+    {
+        // only sync once per request cycle
+        if ($this->synched)
+            return;
+
+        // increase time limit
+        @set_time_limit($this->max_sync_lock_time - 60);
+
+        // get effective time limit we have for synchronization (~70% of the execution time)
+        $time_limit = ini_get('max_execution_time') * 0.7;
+        $sync_start = time();
+
+        // assume sync will be completed
+        $this->sync_complete = true;
+
+        if (!$this->ready) {
+            // kolab cache is disabled, synchronize IMAP mailbox cache only
+            $this->imap->folder_sync($this->folder->name);
+        }
+        else {
+            // read cached folder metadata
+            $this->_read_folder_data();
+
+            // check cache status hash first ($this->metadata is set in _read_folder_data())
+            if ($this->metadata['ctag'] != $this->folder->get_ctag()) {
+                // lock synchronization for this folder or wait if locked
+                $this->_sync_lock();
+
+                // disable messages cache if configured to do so
+                $this->bypass(true);
+
+                // synchronize IMAP mailbox cache
+                $this->imap->folder_sync($this->folder->name);
+
+                // compare IMAP index with object cache index
+                $imap_index = $this->imap->index($this->folder->name, null, null, true, true);
+
+                // determine objects to fetch or to invalidate
+                if (!$imap_index->is_error()) {
+                    $imap_index = $imap_index->get();
+
+                    // read cache index
+                    $sql_result = $this->db->query(
+                        "SELECT `msguid`, `uid` FROM `{$this->cache_table}` WHERE `folder_id` = ?",
+                        $this->folder_id
+                    );
+
+                    $old_index = array();
+                    while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
+                        $old_index[] = $sql_arr['msguid'];
+                    }
+
+                    // fetch new objects from imap
+                    $i = 0;
+                    foreach (array_diff($imap_index, $old_index) as $msguid) {
+                        if ($object = $this->folder->read_object($msguid, '*')) {
+                            $this->_extended_insert($msguid, $object);
+
+                            // check time limit and abort sync if running too long
+                            if (++$i % 50 == 0 && time() - $sync_start > $time_limit) {
+                                $this->sync_complete = false;
+                                break;
+                            }
+                        }
+                    }
+                    $this->_extended_insert(0, null);
+
+                    // delete invalid entries from local DB
+                    $del_index = array_diff($old_index, $imap_index);
+                    if (!empty($del_index)) {
+                        $quoted_ids = join(',', array_map(array($this->db, 'quote'), $del_index));
+                        $this->db->query(
+                            "DELETE FROM `{$this->cache_table}` WHERE `folder_id` = ? AND `msguid` IN ($quoted_ids)",
+                            $this->folder_id
+                        );
+                    }
+
+                    // update ctag value (will be written to database in _sync_unlock())
+                    if ($this->sync_complete) {
+                        $this->metadata['ctag'] = $this->folder->get_ctag();
+                    }
+                }
+
+                $this->bypass(false);
+
+                // remove lock
+                $this->_sync_unlock();
+            }
+        }
+
+        $this->check_error();
+        $this->synched = time();
+    }
+
+
+    /**
+     * Read a single entry from cache or from IMAP directly
+     *
+     * @param string Related IMAP message UID
+     * @param string Object type to read
+     * @param string IMAP folder name the entry relates to
+     * @param array  Hash array with object properties or null if not found
+     */
+    public function get($msguid, $type = null, $foldername = null)
+    {
+        // delegate to another cache instance
+        if ($foldername && $foldername != $this->folder->name) {
+            $success = false;
+            if ($targetfolder = kolab_storage::get_folder($foldername)) {
+                $success = $targetfolder->cache->get($msguid, $type);
+                $this->error = $targetfolder->cache->get_error();
+            }
+            return $success;
+        }
+
+        // load object if not in memory
+        if (!isset($this->objects[$msguid])) {
+            if ($this->ready) {
+                $this->_read_folder_data();
+
+                $sql_result = $this->db->query(
+                    "SELECT * FROM `{$this->cache_table}` ".
+                    "WHERE `folder_id` = ? AND `msguid` = ?",
+                    $this->folder_id,
+                    $msguid
+                );
+
+                if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
+                    $this->objects = array($msguid => $this->_unserialize($sql_arr));  // store only this object in memory (#2827)
+                }
+            }
+
+            // fetch from IMAP if not present in cache
+            if (empty($this->objects[$msguid])) {
+                if ($object = $this->folder->read_object($msguid, $type ?: '*', $foldername)) {
+                    $this->objects = array($msguid => $object);
+                    $this->set($msguid, $object);
+                }
+            }
+        }
+
+        $this->check_error();
+        return $this->objects[$msguid];
+    }
+
+
+    /**
+     * Insert/Update a cache entry
+     *
+     * @param string Related IMAP message UID
+     * @param mixed  Hash array with object properties to save or false to delete the cache entry
+     * @param string IMAP folder name the entry relates to
+     */
+    public function set($msguid, $object, $foldername = null)
+    {
+        if (!$msguid) {
+            return;
+        }
+
+        // delegate to another cache instance
+        if ($foldername && $foldername != $this->folder->name) {
+          if ($targetfolder = kolab_storage::get_folder($foldername)) {
+              $targetfolder->cache->set($msguid, $object);
+              $this->error = $targetfolder->cache->get_error();
+          }
+          return;
+        }
+
+        // remove old entry
+        if ($this->ready) {
+            $this->_read_folder_data();
+            $this->db->query("DELETE FROM `{$this->cache_table}` WHERE `folder_id` = ? AND `msguid` = ?",
+                $this->folder_id, $msguid);
+        }
+
+        if ($object) {
+            // insert new object data...
+            $this->save($msguid, $object);
+        }
+        else {
+            // ...or set in-memory cache to false
+            $this->objects[$msguid] = $object;
+        }
+
+        $this->check_error();
+    }
+
+
+    /**
+     * Insert (or update) a cache entry
+     *
+     * @param int    Related IMAP message UID
+     * @param mixed  Hash array with object properties to save or false to delete the cache entry
+     * @param int    Optional old message UID (for update)
+     */
+    public function save($msguid, $object, $olduid = null)
+    {
+        // write to cache
+        if ($this->ready) {
+            $this->_read_folder_data();
+
+            $sql_data = $this->_serialize($object);
+            $sql_data['folder_id'] = $this->folder_id;
+            $sql_data['msguid']    = $msguid;
+            $sql_data['uid']       = $object['uid'];
+
+            $args = array();
+            $cols = array('folder_id', 'msguid', 'uid', 'changed', 'data', 'xml', 'tags', 'words');
+            $cols = array_merge($cols, $this->extra_cols);
+
+            foreach ($cols as $idx => $col) {
+                $cols[$idx] = $this->db->quote_identifier($col);
+                $args[]     = $sql_data[$col];
+            }
+
+            if ($olduid) {
+                foreach ($cols as $idx => $col) {
+                    $cols[$idx] = "$col = ?";
+                }
+
+                $query = "UPDATE `{$this->cache_table}` SET " . implode(', ', $cols)
+                    . " WHERE `folder_id` = ? AND `msguid` = ?";
+                $args[] = $this->folder_id;
+                $args[] = $olduid;
+            }
+            else {
+                $query = "INSERT INTO `{$this->cache_table}` (`created`, " . implode(', ', $cols)
+                    . ") VALUES (" . $this->db->now() . str_repeat(', ?', count($cols)) . ")";
+            }
+
+            $result = $this->db->query($query, $args);
+
+            if (!$this->db->affected_rows($result)) {
+                rcube::raise_error(array(
+                    'code' => 900, 'type' => 'php',
+                    'message' => "Failed to write to kolab cache"
+                ), true);
+            }
+        }
+
+        // keep a copy in memory for fast access
+        $this->objects = array($msguid => $object);
+        $this->uid2msg = array($object['uid'] => $msguid);
+
+        $this->check_error();
+    }
+
+
+    /**
+     * Move an existing cache entry to a new resource
+     *
+     * @param string Entry's IMAP message UID
+     * @param string Entry's Object UID
+     * @param object kolab_storage_folder Target storage folder instance
+     */
+    public function move($msguid, $uid, $target)
+    {
+        if ($this->ready) {
+            // clear cached uid mapping and force new lookup
+            unset($target->cache->uid2msg[$uid]);
+
+            // resolve new message UID in target folder
+            if ($new_msguid = $target->cache->uid2msguid($uid)) {
+                $this->_read_folder_data();
+
+                $this->db->query(
+                    "UPDATE `{$this->cache_table}` SET `folder_id` = ?, `msguid` = ? ".
+                    "WHERE `folder_id` = ? AND `msguid` = ?",
+                    $target->cache->get_folder_id(),
+                    $new_msguid,
+                    $this->folder_id,
+                    $msguid
+                );
+
+                $result = $this->db->affected_rows();
+            }
+        }
+
+        if (empty($result)) {
+            // just clear cache entry
+            $this->set($msguid, false);
+        }
+
+        unset($this->uid2msg[$uid]);
+        $this->check_error();
+    }
+
+
+    /**
+     * Remove all objects from local cache
+     */
+    public function purge()
+    {
+        if (!$this->ready) {
+            return true;
+        }
+
+        $this->_read_folder_data();
+
+        $result = $this->db->query(
+            "DELETE FROM `{$this->cache_table}` WHERE `folder_id` = ?",
+            $this->folder_id
+        );
+
+        return $this->db->affected_rows($result);
+    }
+
+    /**
+     * Update resource URI for existing cache entries
+     *
+     * @param string Target IMAP folder to move it to
+     */
+    public function rename($new_folder)
+    {
+        if (!$this->ready) {
+            return;
+        }
+
+        if ($target = kolab_storage::get_folder($new_folder)) {
+            // resolve new message UID in target folder
+            $this->db->query(
+                "UPDATE `{$this->folders_table}` SET `resource` = ? ".
+                "WHERE `resource` = ?",
+                $target->get_resource_uri(),
+                $this->resource_uri
+            );
+
+            $this->check_error();
+        }
+        else {
+            $this->error = kolab_storage::ERROR_IMAP_CONN;
+        }
+    }
+
+    /**
+     * Select Kolab objects filtered by the given query
+     *
+     * @param array Pseudo-SQL query as list of filter parameter triplets
+     *   triplet: array('<colname>', '<comparator>', '<value>')
+     * @param boolean Set true to only return UIDs instead of complete objects
+     * @return array List of Kolab data objects (each represented as hash array) or UIDs
+     */
+    public function select($query = array(), $uids = false)
+    {
+        $result = $uids ? array() : new kolab_storage_dataset($this);
+
+        // read from local cache DB (assume it to be synchronized)
+        if ($this->ready) {
+            $this->_read_folder_data();
+
+            // fetch full object data on one query if a small result set is expected
+            $fetchall = !$uids && ($this->limit ? $this->limit[0] : $this->count($query)) < 500;
+            $sql_query = "SELECT " . ($fetchall ? '*' : '`msguid` AS `_msguid`, `uid`') . " FROM `{$this->cache_table}` ".
+                         "WHERE `folder_id` = ? " . $this->_sql_where($query);
+            if (!empty($this->order_by)) {
+                $sql_query .= ' ORDER BY ' . $this->order_by;
+            }
+            $sql_result = $this->limit ?
+                $this->db->limitquery($sql_query, $this->limit[1], $this->limit[0], $this->folder_id) :
+                $this->db->query($sql_query, $this->folder_id);
+
+            if ($this->db->is_error($sql_result)) {
+                if ($uids) {
+                    return null;
+                }
+                $result->set_error(true);
+                return $result;
+            }
+
+            while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
+                if ($uids) {
+                    $this->uid2msg[$sql_arr['uid']] = $sql_arr['_msguid'];
+                    $result[] = $sql_arr['uid'];
+                }
+                else if ($fetchall && ($object = $this->_unserialize($sql_arr))) {
+                    $result[] = $object;
+                }
+                else if (!$fetchall) {
+                    // only add msguid to dataset index
+                    $result[] = $sql_arr;
+                }
+            }
+        }
+        // use IMAP
+        else {
+            $filter = $this->_query2assoc($query);
+
+            if ($filter['type']) {
+                $search = 'UNDELETED HEADER X-Kolab-Type ' . kolab_format::KTYPE_PREFIX . $filter['type'];
+                $index  = $this->imap->search_once($this->folder->name, $search);
+            }
+            else {
+                $index = $this->imap->index($this->folder->name, null, null, true, true);
+            }
+
+            if ($index->is_error()) {
+                $this->check_error();
+                if ($uids) {
+                    return null;
+                }
+                $result->set_error(true);
+                return $result;
+            }
+
+            $index  = $index->get();
+            $result = $uids ? $index : $this->_fetch($index, $filter['type']);
+
+            // TODO: post-filter result according to query
+        }
+
+        // We don't want to cache big results in-memory, however
+        // if we select only one object here, there's a big chance we will need it later
+        if (!$uids && count($result) == 1) {
+            if ($msguid = $result[0]['_msguid']) {
+                $this->uid2msg[$result[0]['uid']] = $msguid;
+                $this->objects = array($msguid => $result[0]);
+            }
+        }
+
+        $this->check_error();
+
+        return $result;
+    }
+
+
+    /**
+     * Get number of objects mathing the given query
+     *
+     * @param array  $query Pseudo-SQL query as list of filter parameter triplets
+     * @return integer The number of objects of the given type
+     */
+    public function count($query = array())
+    {
+        // read from local cache DB (assume it to be synchronized)
+        if ($this->ready) {
+            $this->_read_folder_data();
+
+            $sql_result = $this->db->query(
+                "SELECT COUNT(*) AS `numrows` FROM `{$this->cache_table}` ".
+                "WHERE `folder_id` = ?" . $this->_sql_where($query),
+                $this->folder_id
+            );
+
+            if ($this->db->is_error($sql_result)) {
+                return null;
+            }
+
+            $sql_arr = $this->db->fetch_assoc($sql_result);
+            $count   = intval($sql_arr['numrows']);
+        }
+        // use IMAP
+        else {
+            $filter = $this->_query2assoc($query);
+
+            if ($filter['type']) {
+                $search = 'UNDELETED HEADER X-Kolab-Type ' . kolab_format::KTYPE_PREFIX . $filter['type'];
+                $index  = $this->imap->search_once($this->folder->name, $search);
+            }
+            else {
+                $index = $this->imap->index($this->folder->name, null, null, true, true);
+            }
+
+            if ($index->is_error()) {
+                $this->check_error();
+                return null;
+            }
+
+            // TODO: post-filter result according to query
+
+            $count = $index->count();
+        }
+
+        $this->check_error();
+        return $count;
+    }
+
+    /**
+     * Define ORDER BY clause for cache queries
+     */
+    public function set_order_by($sortcols)
+    {
+        if (!empty($sortcols)) {
+            $this->order_by = '`' . join('`, `', (array)$sortcols) . '`';
+        }
+        else {
+            $this->order_by = null;
+        }
+    }
+
+    /**
+     * Define LIMIT clause for cache queries
+     */
+    public function set_limit($length, $offset = 0)
+    {
+        $this->limit = array($length, $offset);
+    }
+
+    /**
+     * Helper method to compose a valid SQL query from pseudo filter triplets
+     */
+    protected function _sql_where($query)
+    {
+        $sql_where = '';
+        foreach ((array) $query as $param) {
+            if (is_array($param[0])) {
+                $subq = array();
+                foreach ($param[0] as $q) {
+                    $subq[] = preg_replace('/^\s*AND\s+/i', '', $this->_sql_where(array($q)));
+                }
+                if (!empty($subq)) {
+                    $sql_where .= ' AND (' . implode($param[1] == 'OR' ? ' OR ' : ' AND ', $subq) . ')';
+                }
+                continue;
+            }
+            else if ($param[1] == '=' && is_array($param[2])) {
+                $qvalue = '(' . join(',', array_map(array($this->db, 'quote'), $param[2])) . ')';
+                $param[1] = 'IN';
+            }
+            else if ($param[1] == '~' || $param[1] == 'LIKE' || $param[1] == '!~' || $param[1] == '!LIKE') {
+                $not = ($param[1] == '!~' || $param[1] == '!LIKE') ? 'NOT ' : '';
+                $param[1] = $not . 'LIKE';
+                $qvalue = $this->db->quote('%'.preg_replace('/(^\^|\$$)/', ' ', $param[2]).'%');
+            }
+            else if ($param[0] == 'tags') {
+                $param[1] = ($param[1] == '!=' ? 'NOT ' : '' ) . 'LIKE';
+                $qvalue = $this->db->quote('% '.$param[2].' %');
+            }
+            else {
+                $qvalue = $this->db->quote($param[2]);
+            }
+
+            $sql_where .= sprintf(' AND %s %s %s',
+                $this->db->quote_identifier($param[0]),
+                $param[1],
+                $qvalue
+            );
+        }
+
+        return $sql_where;
+    }
+
+    /**
+     * Helper method to convert the given pseudo-query triplets into
+     * an associative filter array with 'equals' values only
+     */
+    protected function _query2assoc($query)
+    {
+        // extract object type from query parameter
+        $filter = array();
+        foreach ($query as $param) {
+            if ($param[1] == '=')
+                $filter[$param[0]] = $param[2];
+        }
+        return $filter;
+    }
+
+    /**
+     * Fetch messages from IMAP
+     *
+     * @param array  List of message UIDs to fetch
+     * @param string Requested object type or * for all
+     * @param string IMAP folder to read from
+     * @return array List of parsed Kolab objects
+     */
+    protected function _fetch($index, $type = null, $folder = null)
+    {
+        $results = new kolab_storage_dataset($this);
+        foreach ((array)$index as $msguid) {
+            if ($object = $this->folder->read_object($msguid, $type, $folder)) {
+                $results[] = $object;
+                $this->set($msguid, $object);
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * Helper method to convert the given Kolab object into a dataset to be written to cache
+     */
+    protected function _serialize($object)
+    {
+        $sql_data = array('changed' => null, 'xml' => '', 'tags' => '', 'words' => '');
+
+        if ($object['changed']) {
+            $sql_data['changed'] = date('Y-m-d H:i:s', is_object($object['changed']) ? $object['changed']->format('U') : $object['changed']);
+        }
+
+        if ($object['_formatobj']) {
+            $sql_data['xml']   = preg_replace('!(</?[a-z0-9:-]+>)[\n\r\t\s]+!ms', '$1', (string)$object['_formatobj']->write(3.0));
+            $sql_data['tags']  = ' ' . join(' ', $object['_formatobj']->get_tags()) . ' ';  // pad with spaces for strict/prefix search
+            $sql_data['words'] = ' ' . join(' ', $object['_formatobj']->get_words()) . ' ';
+        }
+
+        // extract object data
+        $data = array();
+        foreach ($object as $key => $val) {
+            // skip empty properties
+            if ($val === "" || $val === null) {
+                continue;
+            }
+            // mark binary data to be extracted from xml on unserialize()
+            if (isset($this->binary_items[$key])) {
+                $data[$key] = true;
+            }
+            else if ($key[0] != '_') {
+                $data[$key] = $val;
+            }
+            else if ($key == '_attachments') {
+                foreach ($val as $k => $att) {
+                    unset($att['content'], $att['path']);
+                    if ($att['id'])
+                        $data[$key][$k] = $att;
+                }
+            }
+        }
+
+        // use base64 encoding (Bug #1912, #2662)
+        $sql_data['data'] = base64_encode(serialize($data));
+
+        return $sql_data;
+    }
+
+    /**
+     * Helper method to turn stored cache data into a valid storage object
+     */
+    protected function _unserialize($sql_arr)
+    {
+        // check if data is a base64-encoded string, for backward compat.
+        if (strpos(substr($sql_arr['data'], 0, 64), ':') === false) {
+            $sql_arr['data'] = base64_decode($sql_arr['data']);
+        }
+
+        $object = unserialize($sql_arr['data']);
+
+        // de-serialization failed
+        if ($object === false) {
+            rcube::raise_error(array(
+                'code' => 900, 'type' => 'php',
+                'message' => "Malformed data for {$this->resource_uri}/{$sql_arr['msguid']} object."
+            ), true);
+
+            return null;
+        }
+
+        // decode binary properties
+        foreach ($this->binary_items as $key => $regexp) {
+            if (!empty($object[$key]) && preg_match($regexp, $sql_arr['xml'], $m)) {
+                $object[$key] = base64_decode($m[1]);
+            }
+        }
+
+        $object_type = $sql_arr['type'] ?: $this->folder->type;
+        $format_type = $this->folder->type == 'configuration' ? 'configuration' : $object_type;
+
+        // add meta data
+        $object['_type']      = $object_type;
+        $object['_msguid']    = $sql_arr['msguid'];
+        $object['_mailbox']   = $this->folder->name;
+        $object['_size']      = strlen($sql_arr['xml']);
+        $object['_formatobj'] = kolab_format::factory($format_type, 3.0, $sql_arr['xml']);
+
+        return $object;
+    }
+
+    /**
+     * Write records into cache using extended inserts to reduce the number of queries to be executed
+     *
+     * @param int  Message UID. Set 0 to commit buffered inserts
+     * @param array Kolab object to cache
+     */
+    protected function _extended_insert($msguid, $object)
+    {
+        static $buffer = '';
+
+        $line = '';
+        if ($object) {
+            $sql_data = $this->_serialize($object);
+
+            // Skip multifolder insert for Oracle, we can't put long data inline
+            if ($this->db->db_provider == 'oracle') {
+                $extra_cols = '';
+                if ($this->extra_cols) {
+                    $extra_cols = array_map(function($n) { return "`{$n}`"; }, $this->extra_cols);
+                    $extra_cols = ', ' . join(', ', $extra_cols);
+                    $extra_args = str_repeat(', ?', count($this->extra_cols));
+                }
+
+                $params = array($this->folder_id, $msguid, $object['uid'], $sql_data['changed'],
+                    $sql_data['data'], $sql_data['xml'], $sql_data['tags'], $sql_data['words']);
+
+                foreach ($this->extra_cols as $col) {
+                    $params[] = $sql_data[$col];
+                }
+
+                $result = $this->db->query(
+                    "INSERT INTO `{$this->cache_table}` "
+                    . " (`folder_id`, `msguid`, `uid`, `created`, `changed`, `data`, `xml`, `tags`, `words` $extra_cols)"
+                    . " VALUES (?, ?, ?, " . $this->db->now() . ", ?, ?, ?, ?, ? $extra_args)",
+                    $params
+                );
+
+                if (!$this->db->affected_rows($result)) {
+                    rcube::raise_error(array(
+                        'code' => 900, 'type' => 'php',
+                        'message' => "Failed to write to kolab cache"
+                    ), true);
+                }
+
+                return;
+            }
+
+            $values = array(
+                $this->db->quote($this->folder_id),
+                $this->db->quote($msguid),
+                $this->db->quote($object['uid']),
+                $this->db->now(),
+                $this->db->quote($sql_data['changed']),
+                $this->db->quote($sql_data['data']),
+                $this->db->quote($sql_data['xml']),
+                $this->db->quote($sql_data['tags']),
+                $this->db->quote($sql_data['words']),
+            );
+            foreach ($this->extra_cols as $col) {
+                $values[] = $this->db->quote($sql_data[$col]);
+            }
+            $line = '(' . join(',', $values) . ')';
+        }
+
+        if ($buffer && (!$msguid || (strlen($buffer) + strlen($line) > $this->max_sql_packet()))) {
+            $extra_cols = '';
+            if ($this->extra_cols) {
+                $extra_cols = array_map(function($n) { return "`{$n}`"; }, $this->extra_cols);
+                $extra_cols = ', ' . join(', ', $extra_cols);
+            }
+
+            $result = $this->db->query(
+                "INSERT INTO `{$this->cache_table}` ".
+                " (`folder_id`, `msguid`, `uid`, `created`, `changed`, `data`, `xml`, `tags`, `words` $extra_cols)".
+                " VALUES $buffer"
+            );
+
+            if (!$this->db->affected_rows($result)) {
+                rcube::raise_error(array(
+                    'code' => 900, 'type' => 'php',
+                    'message' => "Failed to write to kolab cache"
+                ), true);
+            }
+
+            $buffer = '';
+        }
+
+        $buffer .= ($buffer ? ',' : '') . $line;
+    }
+
+    /**
+     * Returns max_allowed_packet from mysql config
+     */
+    protected function max_sql_packet()
+    {
+        if (!$this->max_sql_packet) {
+            // mysql limit or max 4 MB
+            $value = $this->db->get_variable('max_allowed_packet', 1048500);
+            $this->max_sql_packet = min($value, 4*1024*1024) - 2000;
+        }
+
+        return $this->max_sql_packet;
+    }
+
+    /**
+     * Read this folder's ID and cache metadata
+     */
+    protected function _read_folder_data()
+    {
+        // already done
+        if (!empty($this->folder_id) || !$this->ready)
+            return;
+
+        $sql_arr = $this->db->fetch_assoc($this->db->query(
+                "SELECT `folder_id`, `synclock`, `ctag`"
+                . " FROM `{$this->folders_table}` WHERE `resource` = ?",
+                $this->resource_uri
+        ));
+
+        if ($sql_arr) {
+            $this->metadata = $sql_arr;
+            $this->folder_id = $sql_arr['folder_id'];
+        }
+        else {
+            $this->db->query("INSERT INTO `{$this->folders_table}` (`resource`, `type`)"
+                . " VALUES (?, ?)", $this->resource_uri, $this->folder->type);
+
+            $this->folder_id = $this->db->insert_id('kolab_folders');
+            $this->metadata = array();
+        }
+    }
+
+    /**
+     * Check lock record for this folder and wait if locked or set lock
+     */
+    protected function _sync_lock()
+    {
+        if (!$this->ready)
+            return;
+
+        $this->_read_folder_data();
+
+        // abort if database is not set-up
+        if ($this->db->is_error()) {
+            $this->check_error();
+            $this->ready = false;
+            return;
+        }
+
+        $read_query  = "SELECT `synclock`, `ctag` FROM `{$this->folders_table}` WHERE `folder_id` = ?";
+        $write_query = "UPDATE `{$this->folders_table}` SET `synclock` = ? WHERE `folder_id` = ? AND `synclock` = ?";
+
+        // wait if locked (expire locks after 10 minutes) ...
+        // ... or if setting lock fails (another process meanwhile set it)
+        while (
+            (intval($this->metadata['synclock']) + $this->max_sync_lock_time > time()) ||
+            (($res = $this->db->query($write_query, time(), $this->folder_id, intval($this->metadata['synclock']))) &&
+                !($affected = $this->db->affected_rows($res)))
+        ) {
+            usleep(500000);
+            $this->metadata = $this->db->fetch_assoc($this->db->query($read_query, $this->folder_id));
+        }
+
+        $this->synclock = $affected > 0;
+    }
+
+    /**
+     * Remove lock for this folder
+     */
+    public function _sync_unlock()
+    {
+        if (!$this->ready || !$this->synclock)
+            return;
+
+        $this->db->query(
+            "UPDATE `{$this->folders_table}` SET `synclock` = 0, `ctag` = ? WHERE `folder_id` = ?",
+            $this->metadata['ctag'],
+            $this->folder_id
+        );
+
+        $this->synclock = false;
+    }
+
+    /**
+     * Check IMAP connection error state
+     */
+    protected function check_error()
+    {
+        if (($err_code = $this->imap->get_error_code()) < 0) {
+            $this->error = kolab_storage::ERROR_IMAP_CONN;
+            if (($res_code = $this->imap->get_response_code()) !== 0 && in_array($res_code, array(rcube_storage::NOPERM, rcube_storage::READONLY))) {
+                $this->error = kolab_storage::ERROR_NO_PERMISSION;
+            }
+        }
+        else if ($this->db->is_error()) {
+            $this->error = kolab_storage::ERROR_CACHE_DB;
+        }
+    }
+
+    /**
+     * Resolve an object UID into an IMAP message UID
+     *
+     * @param string  Kolab object UID
+     * @param boolean Include deleted objects
+     * @return int The resolved IMAP message UID
+     */
+    public function uid2msguid($uid, $deleted = false)
+    {
+        // query local database if available
+        if (!isset($this->uid2msg[$uid]) && $this->ready) {
+            $this->_read_folder_data();
+
+            $sql_result = $this->db->query(
+                "SELECT `msguid` FROM `{$this->cache_table}` ".
+                "WHERE `folder_id` = ? AND `uid` = ? ORDER BY `msguid` DESC",
+                $this->folder_id,
+                $uid
+            );
+
+            if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
+                $this->uid2msg[$uid] = $sql_arr['msguid'];
+            }
+        }
+
+        if (!isset($this->uid2msg[$uid])) {
+            // use IMAP SEARCH to get the right message
+            $index = $this->imap->search_once($this->folder->name, ($deleted ? '' : 'UNDELETED ') .
+                'HEADER SUBJECT ' . rcube_imap_generic::escape($uid));
+            $results = $index->get();
+            $this->uid2msg[$uid] = end($results);
+        }
+
+        return $this->uid2msg[$uid];
+    }
+
+    /**
+     * Getter for protected member variables
+     */
+    public function __get($name)
+    {
+        if ($name == 'folder_id') {
+            $this->_read_folder_data();
+        }
+
+        return $this->$name;
+    }
+
+    /**
+     * Bypass Roundcube messages cache.
+     * Roundcube cache duplicates information already stored in kolab_cache.
+     *
+     * @param bool $disable True disables, False enables messages cache
+     */
+    public function bypass($disable = false)
+    {
+        // if kolab cache is disabled do nothing
+        if (!$this->enabled) {
+            return;
+        }
+
+        static $messages_cache, $cache_bypass;
+
+        if ($messages_cache === null) {
+            $rcmail = rcube::get_instance();
+            $messages_cache = (bool) $rcmail->config->get('messages_cache');
+            $cache_bypass   = (int) $rcmail->config->get('kolab_messages_cache_bypass');
+        }
+
+        if ($messages_cache) {
+            // handle recurrent (multilevel) bypass() calls
+            if ($disable) {
+                $this->cache_bypassed += 1;
+                if ($this->cache_bypassed > 1) {
+                    return;
+                }
+            }
+            else {
+                $this->cache_bypassed -= 1;
+                if ($this->cache_bypassed > 0) {
+                    return;
+                }
+            }
+
+            switch ($cache_bypass) {
+                case 2:
+                    // Disable messages cache completely
+                    $this->imap->set_messages_caching(!$disable);
+                    break;
+
+                case 1:
+                    // We'll disable messages cache, but keep index cache.
+                    // Default mode is both (MODE_INDEX | MODE_MESSAGE)
+                    $mode = rcube_imap_cache::MODE_INDEX;
+
+                    if (!$disable) {
+                        $mode |= rcube_imap_cache::MODE_MESSAGE;
+                    }
+
+                    $this->imap->set_messages_caching(true, $mode);
+            }
+        }
+    }
+
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_configuration.php Added

@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * Kolab storage cache class for configuration objects
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_storage_cache_configuration extends kolab_storage_cache
+{
+    protected $extra_cols = array('type');
+
+    /**
+     * Helper method to convert the given Kolab object into a dataset to be written to cache
+     *
+     * @override
+     */
+    protected function _serialize($object)
+    {
+        $sql_data = parent::_serialize($object);
+        $sql_data['type'] = $object['type'];
+
+        return $sql_data;
+    }
+
+    /**
+     * Select Kolab objects filtered by the given query
+     *
+     * @param array Pseudo-SQL query as list of filter parameter triplets
+     * @param boolean Set true to only return UIDs instead of complete objects
+     * @return array List of Kolab data objects (each represented as hash array) or UIDs
+     */
+    public function select($query = array(), $uids = false)
+    {
+        // modify query for IMAP search: query param 'type' is actually a subtype
+        if (!$this->ready) {
+            foreach ($query as $i => $tuple) {
+                if ($tuple[0] == 'type') {
+                    $tuple[2] = 'configuration.' . $tuple[2];
+                    $query[$i] = $tuple;
+                }
+            }
+        }
+
+        return parent::select($query, $uids);
+    }
+
+    /**
+     * Helper method to compose a valid SQL query from pseudo filter triplets
+     */
+    protected function _sql_where($query)
+    {
+        if (is_array($query)) {
+            foreach ($query as $idx => $param) {
+                // convert category filter
+                if ($param[0] == 'category') {
+                    $param[2] = array_map(function($n) { return 'category:' . $n; }, (array) $param[2]);
+
+                    $query[$idx][0] = 'tags';
+                    $query[$idx][2] = count($param[2]) > 1 ? $param[2] : $param[2][0];
+                }
+                // convert member filter (we support only = operator with single value)
+                else if ($param[0] == 'member') {
+                    $query[$idx][0] = 'words';
+                    $query[$idx][1] = '~';
+                    $query[$idx][2] = '^' . $param[2] . '$';
+                }
+            }
+        }
+
+        return parent::_sql_where($query);
+    }
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_contact.php Added

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Kolab storage cache class for contact objects
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_storage_cache_contact extends kolab_storage_cache
+{
+    protected $extra_cols = array('type','name','firstname','surname','email');
+    protected $binary_items = array(
+        'photo'          => '|<photo><uri>[^;]+;base64,([^<]+)</uri></photo>|i',
+        'pgppublickey'   => '|<key><uri>date:application/pgp-keys;base64,([^<]+)</uri></key>|i',
+        'pkcs7publickey' => '|<key><uri>date:application/pkcs7-mime;base64,([^<]+)</uri></key>|i',
+    );
+
+    /**
+     * Helper method to convert the given Kolab object into a dataset to be written to cache
+     *
+     * @override
+     */
+    protected function _serialize($object)
+    {
+        $sql_data = parent::_serialize($object);
+        $sql_data['type'] = $object['_type'];
+
+        // columns for sorting
+        $sql_data['name']      = rcube_charset::clean($object['name'] . $object['prefix']);
+        $sql_data['firstname'] = rcube_charset::clean($object['firstname'] . $object['middlename'] . $object['surname']);
+        $sql_data['surname']   = rcube_charset::clean($object['surname']   . $object['firstname']  . $object['middlename']);
+        $sql_data['email']     = rcube_charset::clean(is_array($object['email']) ? $object['email'][0] : $object['email']);
+
+        if (is_array($sql_data['email'])) {
+            $sql_data['email'] = $sql_data['email']['address'];
+        }
+        // avoid value being null
+        if (empty($sql_data['email'])) {
+            $sql_data['email'] = '';
+        }
+
+        return $sql_data;
+    }
+}
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_event.php Added

@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Kolab storage cache class for calendar event objects
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_storage_cache_event extends kolab_storage_cache
+{
+    protected $extra_cols = array('dtstart','dtend');
+
+    /**
+     * Helper method to convert the given Kolab object into a dataset to be written to cache
+     *
+     * @override
+     */
+    protected function _serialize($object)
+    {
+        $sql_data = parent::_serialize($object);
+
+        $sql_data['dtstart'] = is_object($object['start']) ? $object['start']->format(self::DB_DATE_FORMAT) : date(self::DB_DATE_FORMAT, $object['start']);
+        $sql_data['dtend']   = is_object($object['end'])   ? $object['end']->format(self::DB_DATE_FORMAT)   : date(self::DB_DATE_FORMAT, $object['end']);
+
+        // extend date range for recurring events
+        if ($object['recurrence'] && $object['_formatobj']) {
+            $recurrence = new kolab_date_recurrence($object['_formatobj']);
+            $dtend = $recurrence->end() ?: new DateTime('now +10 years');
+            $sql_data['dtend'] = $dtend->format(self::DB_DATE_FORMAT);
+        }
+
+        return $sql_data;
+    }
+}
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_file.php Added

@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Kolab storage cache class for file objects
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_storage_cache_file extends kolab_storage_cache
+{
+    protected $extra_cols = array('filename');
+
+    /**
+     * Helper method to convert the given Kolab object into a dataset to be written to cache
+     *
+     * @override
+     */
+    protected function _serialize($object)
+    {
+        $sql_data = parent::_serialize($object);
+
+        if (!empty($object['_attachments'])) {
+            reset($object['_attachments']);
+            $sql_data['filename'] = $object['_attachments'][key($object['_attachments'])]['name'];
+        }
+
+        return $sql_data;
+    }
+}
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_freebusy.php Added

@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Kolab storage cache class for freebusy objects
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_storage_cache_freebusy extends kolab_storage_cache
+{
+        protected $extra_cols = array('dtstart','dtend');
+}
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_journal.php Added

@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Kolab storage cache class for journal objects
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_storage_cache_journal extends kolab_storage_cache
+{
+    protected $extra_cols = array('dtstart','dtend');
+    
+}
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_mongodb.php Added

@@ -0,0 +1,561 @@
+<?php
+
+/**
+ * Kolab storage cache class providing a local caching layer for Kolab groupware objects.
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_storage_cache_mongodb
+{
+    private $db;
+    private $imap;
+    private $folder;
+    private $uid2msg;
+    private $objects;
+    private $index = array();
+    private $resource_uri;
+    private $enabled = true;
+    private $synched = false;
+    private $synclock = false;
+    private $ready = false;
+    private $max_sql_packet = 1046576;  // 1 MB - 2000 bytes
+    private $binary_cols = array('photo','pgppublickey','pkcs7publickey');
+
+
+    /**
+     * Default constructor
+     */
+    public function __construct(kolab_storage_folder $storage_folder = null)
+    {
+        $rcmail = rcube::get_instance();
+        $mongo = new Mongo();
+        $this->db = $mongo->kolab_cache;
+        $this->imap = $rcmail->get_storage();
+        $this->enabled = $rcmail->config->get('kolab_cache', false);
+
+        if ($this->enabled) {
+            // remove sync-lock on script termination
+            $rcmail->add_shutdown_function(array($this, '_sync_unlock'));
+        }
+
+        if ($storage_folder)
+            $this->set_folder($storage_folder);
+    }
+
+
+    /**
+     * Connect cache with a storage folder
+     *
+     * @param kolab_storage_folder The storage folder instance to connect with
+     */
+    public function set_folder(kolab_storage_folder $storage_folder)
+    {
+        $this->folder = $storage_folder;
+
+        if (empty($this->folder->name)) {
+            $this->ready = false;
+            return;
+        }
+
+        // compose fully qualified ressource uri for this instance
+        $this->resource_uri = $this->folder->get_resource_uri();
+        $this->ready = $this->enabled;
+    }
+
+
+    /**
+     * Synchronize local cache data with remote
+     */
+    public function synchronize()
+    {
+        // only sync once per request cycle
+        if ($this->synched)
+            return;
+
+        // increase time limit
+        @set_time_limit(500);
+
+        // lock synchronization for this folder or wait if locked
+        $this->_sync_lock();
+
+        // synchronize IMAP mailbox cache
+        $this->imap->folder_sync($this->folder->name);
+
+        // compare IMAP index with object cache index
+        $imap_index = $this->imap->index($this->folder->name);
+        $this->index = $imap_index->get();
+
+        // determine objects to fetch or to invalidate
+        if ($this->ready) {
+            // read cache index
+            $old_index = array();
+            $cursor = $this->db->cache->find(array('resource' => $this->resource_uri), array('msguid' => 1, 'uid' => 1));
+            foreach ($cursor as $doc) {
+                $old_index[] = $doc['msguid'];
+                $this->uid2msg[$doc['uid']] = $doc['msguid'];
+            }
+
+            // fetch new objects from imap
+            foreach (array_diff($this->index, $old_index) as $msguid) {
+                if ($object = $this->folder->read_object($msguid, '*')) {
+                    try {
+                        $this->db->cache->insert($this->_serialize($object, $msguid));
+                    }
+                    catch (Exception $e) {
+                        rcmail::raise_error(array(
+                            'code' => 900, 'type' => 'php',
+                            'message' => "Failed to write to mongodb cache: " . $e->getMessage(),
+                        ), true);
+                    }
+                }
+            }
+
+            // delete invalid entries from local DB
+            $del_index = array_diff($old_index, $this->index);
+            if (!empty($del_index)) {
+                $this->db->cache->remove(array('resource' => $this->resource_uri, 'msguid' => array('$in' => $del_index)));
+            }
+        }
+
+        // remove lock
+        $this->_sync_unlock();
+
+        $this->synched = time();
+    }
+
+
+    /**
+     * Read a single entry from cache or from IMAP directly
+     *
+     * @param string Related IMAP message UID
+     * @param string Object type to read
+     * @param string IMAP folder name the entry relates to
+     * @param array  Hash array with object properties or null if not found
+     */
+    public function get($msguid, $type = null, $foldername = null)
+    {
+        // delegate to another cache instance
+        if ($foldername && $foldername != $this->folder->name) {
+            return kolab_storage::get_folder($foldername)->cache->get($msguid, $object);
+        }
+
+        // load object if not in memory
+        if (!isset($this->objects[$msguid])) {
+            if ($this->ready && ($doc = $this->db->cache->findOne(array('resource' => $this->resource_uri, 'msguid' => $msguid))))
+                $this->objects[$msguid] = $this->_unserialize($doc);
+
+            // fetch from IMAP if not present in cache
+            if (empty($this->objects[$msguid])) {
+                $result = $this->_fetch(array($msguid), $type, $foldername);
+                $this->objects[$msguid] = $result[0];
+            }
+        }
+
+        return $this->objects[$msguid];
+    }
+
+
+    /**
+     * Insert/Update a cache entry
+     *
+     * @param string Related IMAP message UID
+     * @param mixed  Hash array with object properties to save or false to delete the cache entry
+     * @param string IMAP folder name the entry relates to
+     */
+    public function set($msguid, $object, $foldername = null)
+    {
+        // delegate to another cache instance
+        if ($foldername && $foldername != $this->folder->name) {
+            kolab_storage::get_folder($foldername)->cache->set($msguid, $object);
+            return;
+        }
+
+        // write to cache
+        if ($this->ready) {
+            // remove old entry
+            $this->db->cache->remove(array('resource' => $this->resource_uri, 'msguid' => $msguid));
+
+            // write new object data if not false (wich means deleted)
+            if ($object) {
+                try {
+                    $this->db->cache->insert($this->_serialize($object, $msguid));
+                }
+                catch (Exception $e) {
+                    rcmail::raise_error(array(
+                        'code' => 900, 'type' => 'php',
+                        'message' => "Failed to write to mongodb cache: " . $e->getMessage(),
+                    ), true);
+                }
+            }
+        }
+
+        // keep a copy in memory for fast access
+        $this->objects[$msguid] = $object;
+
+        if ($object)
+            $this->uid2msg[$object['uid']] = $msguid;
+    }
+
+    /**
+     * Move an existing cache entry to a new resource
+     *
+     * @param string Entry's IMAP message UID
+     * @param string Entry's Object UID
+     * @param string Target IMAP folder to move it to
+     */
+    public function move($msguid, $objuid, $target_folder)
+    {
+        $target = kolab_storage::get_folder($target_folder);
+
+        // resolve new message UID in target folder
+        if ($new_msguid = $target->cache->uid2msguid($objuid)) {
+/*
+            $this->db->query(
+                "UPDATE kolab_cache SET resource=?, msguid=? ".
+                "WHERE resource=? AND msguid=? AND type<>?",
+                $target->get_resource_uri(),
+                $new_msguid,
+                $this->resource_uri,
+                $msguid,
+                'lock'
+            );
+*/
+        }
+        else {
+            // just clear cache entry
+            $this->set($msguid, false);
+        }
+
+        unset($this->uid2msg[$uid]);
+    }
+
+
+    /**
+     * Remove all objects from local cache
+     */
+    public function purge($type = null)
+    {
+        return $this->db->cache->remove(array(), array('safe' => true));
+    }
+
+
+    /**
+     * Select Kolab objects filtered by the given query
+     *
+     * @param array Pseudo-SQL query as list of filter parameter triplets
+     *   triplet: array('<colname>', '<comparator>', '<value>')
+     * @return array List of Kolab data objects (each represented as hash array)
+     */
+    public function select($query = array())
+    {
+        $result = array();
+
+        // read from local cache DB (assume it to be synchronized)
+        if ($this->ready) {
+            $cursor = $this->db->cache->find(array('resource' => $this->resource_uri) + $this->_mongo_filter($query));
+            foreach ($cursor as $doc) {
+                if ($object = $this->_unserialize($doc))
+                    $result[] = $object;
+            }
+        }
+        else {
+            // extract object type from query parameter
+            $filter = $this->_query2assoc($query);
+
+            // use 'list' for folder's default objects
+            if ($filter['type'] == $this->type) {
+                $index = $this->index;
+            }
+            else {  // search by object type
+                $search = 'UNDELETED HEADER X-Kolab-Type ' . kolab_storage_folder::KTYPE_PREFIX . $filter['type'];
+                $index = $this->imap->search_once($this->folder->name, $search)->get();
+            }
+
+            // fetch all messages in $index from IMAP
+            $result = $this->_fetch($index, $filter['type']);
+
+            // TODO: post-filter result according to query
+        }
+
+        return $result;
+    }
+
+
+    /**
+     * Get number of objects mathing the given query
+     *
+     * @param array  $query Pseudo-SQL query as list of filter parameter triplets
+     * @return integer The number of objects of the given type
+     */
+    public function count($query = array())
+    {
+        $count = 0;
+
+        // cache is in sync, we can count records in local DB
+        if ($this->synched) {
+            $cursor = $this->db->cache->find(array('resource' => $this->resource_uri) + $this->_mongo_filter($query));
+            $count = $cursor->valid() ? $cursor->count() : 0;
+        }
+        else {
+            // search IMAP by object type
+            $filter = $this->_query2assoc($query);
+            $ctype  = kolab_storage_folder::KTYPE_PREFIX . $filter['type'];
+            $index = $this->imap->search_once($this->folder->name, 'UNDELETED HEADER X-Kolab-Type ' . $ctype);
+            $count = $index->count();
+        }
+
+        return $count;
+    }
+
+    /**
+     * Helper method to convert the pseudo-SQL query into a valid mongodb filter
+     */
+    private function _mongo_filter($query)
+    {
+        $filters = array();
+        foreach ($query as $param) {
+            $filter = array();
+            if ($param[1] == '=' && is_array($param[2])) {
+                $filter[$param[0]] = array('$in' => $param[2]);
+                $filters[] = $filter;
+            }
+            else if ($param[1] == '=') {
+                $filters[] = array($param[0] => $param[2]);
+            }
+            else if ($param[1] == 'LIKE' || $param[1] == '~') {
+                $filter[$param[0]] = array('$regex' => preg_quote($param[2]), '$options' => 'i');
+                $filters[] = $filter;
+            }
+            else if ($param[1] == '!~' || $param[1] == '!LIKE') {
+                $filter[$param[0]] = array('$not' => '/' . preg_quote($param[2]) . '/i');
+                $filters[] = $filter;
+            }
+            else {
+                $op = '';
+                switch ($param[1]) {
+                    case '>':  $op = '$gt';  break;
+                    case '>=': $op = '$gte'; break;
+                    case '<':  $op = '$lt';  break;
+                    case '<=': $op = '$lte'; break;
+                    case '!=':
+                    case '<>': $op = '$gte'; break;
+                }
+                if ($op) {
+                    $filter[$param[0]] = array($op => $param[2]);
+                    $filters[] = $filter;
+                }
+            }
+        }
+
+        return array('$and' => $filters);
+    }
+
+    /**
+     * Helper method to convert the given pseudo-query triplets into
+     * an associative filter array with 'equals' values only
+     */
+    private function _query2assoc($query)
+    {
+        // extract object type from query parameter
+        $filter = array();
+        foreach ($query as $param) {
+            if ($param[1] == '=')
+                $filter[$param[0]] = $param[2];
+        }
+        return $filter;
+    }
+
+    /**
+     * Fetch messages from IMAP
+     *
+     * @param array List of message UIDs to fetch
+     * @return array List of parsed Kolab objects
+     */
+    private function _fetch($index, $type = null, $folder = null)
+    {
+        $results = array();
+        foreach ((array)$index as $msguid) {
+            if ($object = $this->folder->read_object($msguid, $type, $folder)) {
+                $results[] = $object;
+                $this->set($msguid, $object);
+            }
+        }
+
+        return $results;
+    }
+
+
+    /**
+     * Helper method to convert the given Kolab object into a dataset to be written to cache
+     */
+    private function _serialize($object, $msguid)
+    {
+        $bincols = array_flip($this->binary_cols);
+        $doc = array(
+            'resource' => $this->resource_uri,
+            'type'     => $object['_type'] ? $object['_type'] : $this->folder->type,
+            'msguid'   => $msguid,
+            'uid'      => $object['uid'],
+            'xml'      => '',
+            'tags'     => array(),
+            'words'    => array(),
+            'objcols'  => array(),
+        );
+
+        // set type specific values
+        if ($this->folder->type == 'event') {
+            // database runs in server's timezone so using date() is what we want
+            $doc['dtstart'] = date('Y-m-d H:i:s', is_object($object['start']) ? $object['start']->format('U') : $object['start']);
+            $doc['dtend']   = date('Y-m-d H:i:s', is_object($object['end'])   ? $object['end']->format('U')   : $object['end']);
+
+            // extend date range for recurring events
+            if ($object['recurrence']) {
+                $doc['dtend'] = date('Y-m-d H:i:s', $object['recurrence']['UNTIL'] ?: strtotime('now + 2 years'));
+            }
+        }
+
+        if ($object['_formatobj']) {
+            $doc['xml'] = preg_replace('!(</?[a-z0-9:-]+>)[\n\r\t\s]+!ms', '$1', (string)$object['_formatobj']->write());
+            $doc['tags'] = $object['_formatobj']->get_tags();
+            $doc['words'] = $object['_formatobj']->get_words();
+        }
+
+        // extract object data
+        $data = array();
+        foreach ($object as $key => $val) {
+            if ($val === "" || $val === null) {
+                // skip empty properties
+                continue;
+            }
+            if (isset($bincols[$key])) {
+                $data[$key] = base64_encode($val);
+            }
+            else if (is_object($val)) {
+                if (is_a($val, 'DateTime')) {
+                    $data[$key] = array('_class' => 'DateTime', 'date' => $val->format('Y-m-d H:i:s'), 'timezone' => $val->getTimezone()->getName());
+                    $doc['objcols'][] = $key;
+                }
+            }
+            else if ($key[0] != '_') {
+                $data[$key] = $val;
+            }
+            else if ($key == '_attachments') {
+                foreach ($val as $k => $att) {
+                    unset($att['content'], $att['path']);
+                    if ($att['id'])
+                        $data[$key][$k] = $att;
+                }
+            }
+        }
+
+        $doc['data'] = $data;
+        return $doc;
+    }
+
+    /**
+     * Helper method to turn stored cache data into a valid storage object
+     */
+    private function _unserialize($doc)
+    {
+        $object = $doc['data'];
+
+        // decode binary properties
+        foreach ($this->binary_cols as $key) {
+            if (!empty($object[$key]))
+                $object[$key] = base64_decode($object[$key]);
+        }
+
+        // restore serialized objects
+        foreach ((array)$doc['objcols'] as $key) {
+            switch ($object[$key]['_class']) {
+                case 'DateTime':
+                    $val = new DateTime($object[$key]['date'], new DateTimeZone($object[$key]['timezone']));
+                    $object[$key] = $val;
+                    break;
+            }
+        }
+
+        // add meta data
+        $object['_type'] = $doc['type'];
+        $object['_msguid'] = $doc['msguid'];
+        $object['_mailbox'] = $this->folder->name;
+        $object['_formatobj'] = kolab_format::factory($doc['type'], $doc['xml']);
+
+        return $object;
+    }
+
+    /**
+     * Check lock record for this folder and wait if locked or set lock
+     */
+    private function _sync_lock()
+    {
+        if (!$this->ready)
+            return;
+
+        $this->synclock = true;
+        $lock = $this->db->locks->findOne(array('resource' => $this->resource_uri));
+
+        // create lock record if not exists
+        if (!$lock) {
+            $this->db->locks->insert(array('resource' => $this->resource_uri, 'created' => time()));
+        }
+        // wait if locked (expire locks after 10 minutes)
+        else if ((time() - $lock['created']) < 600) {
+            usleep(500000);
+            return $this->_sync_lock();
+        }
+        // set lock
+        else {
+            $lock['created'] = time();
+            $this->db->locks->update(array('_id' => $lock['_id']), $lock, array('safe' => true));
+        }
+    }
+
+    /**
+     * Remove lock for this folder
+     */
+    public function _sync_unlock()
+    {
+        if (!$this->ready || !$this->synclock)
+            return;
+
+        $this->db->locks->remove(array('resource' => $this->resource_uri));
+    }
+
+    /**
+     * Resolve an object UID into an IMAP message UID
+     *
+     * @param string  Kolab object UID
+     * @param boolean Include deleted objects
+     * @return int The resolved IMAP message UID
+     */
+    public function uid2msguid($uid, $deleted = false)
+    {
+        if (!isset($this->uid2msg[$uid])) {
+            // use IMAP SEARCH to get the right message
+            $index = $this->imap->search_once($this->folder->name, ($deleted ? '' : 'UNDELETED ') . 'HEADER SUBJECT ' . $uid);
+            $results = $index->get();
+            $this->uid2msg[$uid] = $results[0];
+        }
+
+        return $this->uid2msg[$uid];
+    }
+
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_note.php Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_task.php Added

@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Kolab storage cache class for task objects
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_storage_cache_task extends kolab_storage_cache
+{
+    protected $extra_cols = array('dtstart','dtend');
+
+    /**
+     * Helper method to convert the given Kolab object into a dataset to be written to cache
+     *
+     * @override
+     */
+    protected function _serialize($object)
+    {
+        $sql_data = parent::_serialize($object) + array('dtstart' => null, 'dtend' => null);
+
+        if ($object['start'])
+            $sql_data['dtstart'] = is_object($object['start']) ? $object['start']->format(self::DB_DATE_FORMAT) : date(self::DB_DATE_FORMAT, $object['start']);
+        if ($object['due'])
+            $sql_data['dtend']   = is_object($object['due'])   ? $object['due']->format(self::DB_DATE_FORMAT)   : date(self::DB_DATE_FORMAT, $object['due']);
+
+        return $sql_data;
+    }
+}
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_config.php Added

@@ -0,0 +1,866 @@
+<?php
+
+/**
+ * Kolab storage class providing access to configuration objects on a Kolab server.
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_storage_config
+{
+    const FOLDER_TYPE = 'configuration';
+
+
+    /**
+     * Singleton instace of kolab_storage_config
+     *
+     * @var kolab_storage_config
+     */
+    static protected $instance;
+
+    private $folders;
+    private $default;
+    private $enabled;
+
+
+    /**
+     * This implements the 'singleton' design pattern
+     *
+     * @return kolab_storage_config The one and only instance
+     */
+    static function get_instance()
+    {
+        if (!self::$instance) {
+            self::$instance = new kolab_storage_config();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Private constructor (finds default configuration folder as a config source)
+     */
+    private function __construct()
+    {
+        // get all configuration folders
+        $this->folders = kolab_storage::get_folders(self::FOLDER_TYPE, false);
+
+        foreach ($this->folders as $folder) {
+            if ($folder->default) {
+                $this->default = $folder;
+                break;
+            }
+        }
+
+        // if no folder is set as default, choose the first one
+        if (!$this->default) {
+            $this->default = reset($this->folders);
+        }
+
+        // attempt to create a default folder if it does not exist
+        if (!$this->default) {
+            $folder_name = 'Configuration';
+            $folder_type = self::FOLDER_TYPE . '.default';
+
+            if (kolab_storage::folder_create($folder_name, $folder_type, true)) {
+                $this->default = new kolab_storage_folder($folder_name, $folder_type);
+            }
+        }
+
+        // check if configuration folder exist
+        if ($this->default && $this->default->name) {
+            $this->enabled = true;
+        }
+    }
+
+    /**
+     * Check wether any configuration storage (folder) exists
+     *
+     * @return bool
+     */
+    public function is_enabled()
+    {
+        return $this->enabled;
+    }
+
+    /**
+     * Get configuration objects
+     *
+     * @param array $filter  Search filter
+     * @param bool  $default Enable to get objects only from default folder
+     * @param int   $limit   Max. number of records (per-folder)
+     *
+     * @return array List of objects
+     */
+    public function get_objects($filter = array(), $default = false, $limit = 0)
+    {
+        $list = array();
+
+        foreach ($this->folders as $folder) {
+            // we only want to read from default folder
+            if ($default && !$folder->default) {
+                continue;
+            }
+
+            // for better performance it's good to assume max. number of records
+            if ($limit) {
+                $folder->set_order_and_limit(null, $limit);
+            }
+
+            foreach ($folder->select($filter) as $object) {
+                unset($object['_formatobj']);
+                $list[] = $object;
+            }
+        }
+
+        return $list;
+    }
+
+    /**
+     * Get configuration object
+     *
+     * @param string $uid     Object UID
+     * @param bool   $default Enable to get objects only from default folder
+     *
+     * @return array Object data
+     */
+    public function get_object($uid, $default = false)
+    {
+        foreach ($this->folders as $folder) {
+            // we only want to read from default folder
+            if ($default && !$folder->default) {
+                continue;
+            }
+
+            if ($object = $folder->get_object($uid)) {
+                return $object;
+            }
+        }
+    }
+
+    /**
+     * Create/update configuration object
+     *
+     * @param array  $object Object data
+     * @param string $type   Object type
+     *
+     * @return bool True on success, False on failure
+     */
+    public function save(&$object, $type)
+    {
+        if (!$this->enabled) {
+            return false;
+        }
+
+        $folder = $this->find_folder($object);
+
+        if ($type) {
+            $object['type'] = $type;
+        }
+
+        return $folder->save($object, self::FOLDER_TYPE . '.' . $object['type'], $object['uid']);
+    }
+
+    /**
+     * Remove configuration object
+     *
+     * @param string $uid Object UID
+     *
+     * @return bool True on success, False on failure
+     */
+    public function delete($uid)
+    {
+        if (!$this->enabled) {
+            return false;
+        }
+
+        // fetch the object to find folder
+        $object = $this->get_object($uid);
+
+        if (!$object) {
+            return false;
+        }
+
+        $folder = $this->find_folder($object);
+
+        return $folder->delete($uid);
+    }
+
+    /**
+     * Find folder
+     */
+    public function find_folder($object = array())
+    {
+        // find folder object
+        if ($object['_mailbox']) {
+            foreach ($this->folders as $folder) {
+                if ($folder->name == $object['_mailbox']) {
+                    break;
+                }
+            }
+        }
+        else {
+            $folder = $this->default;
+        }
+
+        return $folder;
+    }
+
+    /**
+     * Builds relation member URI
+     *
+     * @param string|array Object UUID or Message folder, UID, Search headers (Message-Id, Date)
+     *
+     * @return string $url Member URI
+     */
+    public static function build_member_url($params)
+    {
+        // param is object UUID
+        if (is_string($params) && !empty($params)) {
+            return 'urn:uuid:' . $params;
+        }
+
+        if (empty($params) || !strlen($params['folder'])) {
+            return null;
+        }
+
+        $rcube   = rcube::get_instance();
+        $storage = $rcube->get_storage();
+
+        // modify folder spec. according to namespace
+        $folder = $params['folder'];
+        $ns     = $storage->folder_namespace($folder);
+
+        if ($ns == 'shared') {
+            // Note: this assumes there's only one shared namespace root
+            if ($ns = $storage->get_namespace('shared')) {
+                if ($prefix = $ns[0][0]) {
+                    $folder = 'shared' . substr($folder, strlen($prefix));
+                }
+            }
+        }
+        else {
+            if ($ns == 'other') {
+                // Note: this assumes there's only one other users namespace root
+                if ($ns = $storage->get_namespace('shared')) {
+                    if ($prefix = $ns[0][0]) {
+                        $folder = 'user' . substr($folder, strlen($prefix));
+                    }
+                }
+            }
+            else {
+                $folder = 'user' . '/' . $rcube->get_user_name() . '/' . $folder;
+            }
+        }
+
+        $folder = implode('/', array_map('rawurlencode', explode('/', $folder)));
+
+        // build URI
+        $url = 'imap:///' . $folder;
+
+        // UID is optional here because sometimes we want
+        // to build just a member uri prefix
+        if ($params['uid']) {
+            $url .= '/' . $params['uid'];
+        }
+
+        unset($params['folder']);
+        unset($params['uid']);
+
+        if (!empty($params)) {
+            $url .= '?' . http_build_query($params, '', '&');
+        }
+
+        return $url;
+    }
+
+    /**
+     * Parses relation member string
+     *
+     * @param string $url Member URI
+     *
+     * @return array Message folder, UID, Search headers (Message-Id, Date)
+     */
+    public static function parse_member_url($url)
+    {
+        // Look for IMAP URI:
+        // imap:///(user/username@domain|shared)/<folder>/<UID>?<search_params>
+        if (strpos($url, 'imap:///') === 0) {
+            $rcube   = rcube::get_instance();
+            $storage = $rcube->get_storage();
+
+            // parse_url does not work with imap:/// prefix
+            $url   = parse_url(substr($url, 8));
+            $path  = explode('/', $url['path']);
+            parse_str($url['query'], $params);
+
+            $uid  = array_pop($path);
+            $ns   = array_shift($path);
+            $path = array_map('rawurldecode', $path);
+
+            // resolve folder name
+            if ($ns == 'shared') {
+                $folder = implode('/', $path);
+                // Note: this assumes there's only one shared namespace root
+                if ($ns = $storage->get_namespace('shared')) {
+                    if ($prefix = $ns[0][0]) {
+                        $folder = $prefix . '/' . $folder;
+                    }
+                }
+            }
+            else if ($ns == 'user') {
+                $username = array_shift($path);
+                $folder   = implode('/', $path);
+
+                if ($username != $rcube->get_user_name()) {
+                    // Note: this assumes there's only one other users namespace root
+                    if ($ns = $storage->get_namespace('other')) {
+                        if ($prefix = $ns[0][0]) {
+                            $folder = $prefix . '/' . $username . '/' . $folder;
+                        }
+                    }
+                }
+                else if (!strlen($folder)) {
+                    $folder = 'INBOX';
+                }
+            }
+            else {
+                return;
+            }
+
+            return array(
+                'folder' => $folder,
+                'uid'    => $uid,
+                'params' => $params,
+            );
+        }
+
+        return false;
+    }
+
+    /**
+     * Build array of member URIs from set of messages
+     *
+     * @param string $folder   Folder name
+     * @param array  $messages Array of rcube_message objects
+     *
+     * @return array List of members (IMAP URIs)
+     */
+    public static function build_members($folder, $messages)
+    {
+        $members = array();
+
+        foreach ((array) $messages as $msg) {
+            $params = array(
+                'folder' => $folder,
+                'uid'    => $msg->uid,
+            );
+
+            // add search parameters:
+            // we don't want to build "invalid" searches e.g. that
+            // will return false positives (more or wrong messages)
+            if (($messageid = $msg->get('message-id', false)) && ($date = $msg->get('date', false))) {
+                $params['message-id'] = $messageid;
+                $params['date']       = $date;
+
+                if ($subject = $msg->get('subject', false)) {
+                    $params['subject'] = substr($subject, 0, 256);
+                }
+            }
+
+            $members[] = self::build_member_url($params);
+        }
+
+        return $members;
+    }
+
+    /**
+     * Resolve/validate/update members (which are IMAP URIs) of relation object.
+     *
+     * @param array $tag   Tag object
+     * @param bool  $force Force members list update
+     *
+     * @return array Folder/UIDs list
+     */
+    public static function resolve_members(&$tag, $force = true)
+    {
+        $result = array();
+
+        foreach ((array) $tag['members'] as $member) {
+            // IMAP URI members
+            if ($url = self::parse_member_url($member)) {
+                $folder = $url['folder'];
+
+                if (!$force) {
+                    $result[$folder][] = $url['uid'];
+                }
+                else {
+                    $result[$folder]['uid'][]    = $url['uid'];
+                    $result[$folder]['params'][] = $url['params'];
+                    $result[$folder]['member'][] = $member;
+                }
+            }
+        }
+
+        if (empty($result) || !$force) {
+            return $result;
+        }
+
+        $rcube   = rcube::get_instance();
+        $storage = $rcube->get_storage();
+        $search  = array();
+        $missing = array();
+
+        // first we search messages by Folder+UID
+        foreach ($result as $folder => $data) {
+            // @FIXME: maybe better use index() which is cached?
+            // @TODO: consider skip_deleted option
+            $index = $storage->search_once($folder, 'UID ' . rcube_imap_generic::compressMessageSet($data['uid']));
+            $uids  = $index->get();
+
+            // messages that were not found need to be searched by search parameters
+            $not_found = array_diff($data['uid'], $uids);
+            if (!empty($not_found)) {
+                foreach ($not_found as $uid) {
+                    $idx = array_search($uid, $data['uid']);
+
+                    if ($p = $data['params'][$idx]) {
+                        $search[] = $p;
+                    }
+
+                    $missing[] = $result[$folder]['member'][$idx];
+
+                    unset($result[$folder]['uid'][$idx]);
+                    unset($result[$folder]['params'][$idx]);
+                    unset($result[$folder]['member'][$idx]);
+                }
+            }
+
+            $result[$folder] = $uids;
+        }
+
+        // search in all subscribed mail folders using search parameters
+        if (!empty($search)) {
+            // remove not found members from the members list
+            $tag['members'] = array_diff($tag['members'], $missing);
+
+            // get subscribed folders
+            $folders = $storage->list_folders_subscribed('', '*', 'mail', null, true);
+
+            // @TODO: do this search in chunks (for e.g. 10 messages)?
+            $search_str = '';
+
+            foreach ($search as $p) {
+                $search_params = array();
+                foreach ($p as $key => $val) {
+                    $key = strtoupper($key);
+                    // don't search by subject, we don't want false-positives
+                    if ($key != 'SUBJECT') {
+                        $search_params[] = 'HEADER ' . $key . ' ' . rcube_imap_generic::escape($val);
+                    }
+                }
+
+                $search_str .= ' (' . implode(' ', $search_params) . ')';
+            }
+
+            $search_str = trim(str_repeat(' OR', count($search)-1) . $search_str);
+
+            // search
+            $search = $storage->search_once($folders, $search_str);
+
+            // handle search result
+            $folders = (array) $search->get_parameters('MAILBOX');
+
+            foreach ($folders as $folder) {
+                $set  = $search->get_set($folder);
+                $uids = $set->get();
+
+                if (!empty($uids)) {
+                    $msgs    = $storage->fetch_headers($folder, $uids, false);
+                    $members = self::build_members($folder, $msgs);
+
+                    // merge new members into the tag members list
+                    $tag['members'] = array_merge($tag['members'], $members);
+
+                    // add UIDs into the result
+                    $result[$folder] = array_unique(array_merge((array)$result[$folder], $uids));
+                }
+            }
+
+            // update tag object with new members list
+            $tag['members'] = array_unique($tag['members']);
+            kolab_storage_config::get_instance()->save($tag, 'relation', false);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Assign tags to kolab objects
+     *
+     * @param array $records List of kolab objects
+     *
+     * @return array List of tags
+     */
+    public function apply_tags(&$records)
+    {
+        // first convert categories into tags
+        foreach ($records as $i => $rec) {
+            if (!empty($rec['categories'])) {
+                $folder = new kolab_storage_folder($rec['_mailbox']);
+                if ($object = $folder->get_object($rec['uid'])) {
+                    $tags = $rec['categories'];
+
+                    unset($object['categories']);
+                    unset($records[$i]['categories']);
+
+                    $this->save_tags($rec['uid'], $tags);
+                    $folder->save($object, $rec['_type'], $rec['uid']);
+                }
+            }
+        }
+
+        $tags = array();
+
+        // assign tags to objects
+        foreach ($this->get_tags() as $tag) {
+            foreach ($records as $idx => $rec) {
+                $uid = self::build_member_url($rec['uid']);
+                if (in_array($uid, (array) $tag['members'])) {
+                    $records[$idx]['tags'][] = $tag['name'];
+                }
+            }
+
+            $tags[] = $tag['name'];
+        }
+
+        $tags = array_unique($tags);
+
+        return $tags;
+    }
+
+    /**
+     * Update object tags
+     *
+     * @param string $uid  Kolab object UID
+     * @param array  $tags List of tag names
+     */
+    public function save_tags($uid, $tags)
+    {
+        $url       = self::build_member_url($uid);
+        $relations = $this->get_tags();
+
+        foreach ($relations as $idx => $relation) {
+            $selected = !empty($tags) && in_array($relation['name'], $tags);
+            $found    = !empty($relation['members']) && in_array($url, $relation['members']);
+            $update   = false;
+
+            // remove member from the relation
+            if ($found && !$selected) {
+                $relation['members'] = array_diff($relation['members'], (array) $url);
+                $update = true;
+            }
+            // add member to the relation
+            else if (!$found && $selected) {
+                $relation['members'][] = $url;
+                $update = true;
+            }
+
+            if ($update) {
+                if ($this->save($relation, 'relation')) {
+                    $this->tags[$idx] = $relation; // update in-memory cache
+                }
+            }
+
+            if ($selected) {
+                $tags = array_diff($tags, (array)$relation['name']);
+            }
+        }
+
+        // create new relations
+        if (!empty($tags)) {
+            foreach ($tags as $tag) {
+                $relation = array(
+                    'name'     => $tag,
+                    'members'  => (array) $url,
+                    'category' => 'tag',
+                );
+
+                if ($this->save($relation, 'relation')) {
+                    $this->tags[] = $relation; // update in-memory cache
+                }
+            }
+        }
+    }
+
+    /**
+     * Get tags (all or referring to specified object)
+     *
+     * @param string $uid Optional object UID
+     *
+     * @return array List of Relation objects
+     */
+    public function get_tags($uid = '*')
+    {
+        if (!isset($this->tags)) {
+            $default = true;
+            $filter  = array(
+                array('type', '=', 'relation'),
+                array('category', '=', 'tag')
+            );
+
+            // use faster method
+            if ($uid && $uid != '*') {
+                $filter[] = array('member', '=', $uid);
+                $tags = $this->get_objects($filter, $default);
+            }
+            else {
+                $this->tags = $tags = $this->get_objects($filter, $default);
+            }
+        }
+        else {
+            $tags = $this->tags;
+        }
+
+        if ($uid === '*') {
+            return $tags;
+        }
+
+        $result = array();
+        $search = self::build_member_url($uid);
+
+        foreach ($tags as $tag) {
+            if (in_array($search, (array) $tag['members'])) {
+                $result[] = $tag;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Find objects linked with the given groupware object through a relation
+     *
+     * @param string Object UUID
+     * @param array List of related URIs
+     */
+    public function get_object_links($uid)
+    {
+        $links = array();
+        $object_uri = self::build_member_url($uid);
+
+        foreach ($this->get_relations_for_member($uid) as $relation) {
+            if (in_array($object_uri, (array) $relation['members'])) {
+                // make relation members up-to-date
+                kolab_storage_config::resolve_members($relation);
+
+                foreach ($relation['members'] as $member) {
+                    if ($member != $object_uri) {
+                        $links[] = $member;
+                    }
+                }
+            }
+        }
+
+        return array_unique($links);
+    }
+
+    /**
+     *
+     */
+    public function save_object_links($uid, $links, $remove = array())
+    {
+        $object_uri = self::build_member_url($uid);
+        $relations = $this->get_relations_for_member($uid);
+        $done = false;
+
+        foreach ($relations as $relation) {
+            // make relation members up-to-date
+            kolab_storage_config::resolve_members($relation);
+
+            // remove and add links
+            $members = array_diff($relation['members'], (array)$remove);
+            $members = array_unique(array_merge($members, $links));
+
+            // make sure the object_uri is still a member
+            if (!in_array($object_uri, $members)) {
+                $members[$object_uri];
+            }
+
+            // remove relation if no other members remain
+            if (count($members) <= 1) {
+                $done = $this->delete($relation['uid']);
+            }
+            // update relation object if members changed
+            else if (count(array_diff($members, $relation['members'])) || count(array_diff($relation['members'], $members))) {
+                $relation['members'] = $members;
+                $done = $this->save($relation, 'relation');
+                $links = array();
+            }
+            // no changes, we're happy
+            else {
+                $done = true;
+                $links = array();
+            }
+        }
+
+        // create a new relation
+        if (!$done && !empty($links)) {
+            $relation = array(
+                'members'  => array_merge($links, array($object_uri)),
+                'category' => 'generic',
+            );
+
+            $ret = $this->save($relation, 'relation');
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Find relation objects referring to specified note
+     */
+    public function get_relations_for_member($uid, $reltype = 'generic')
+    {
+        $default = true;
+        $filter  = array(
+            array('type', '=', 'relation'),
+            array('category', '=', $reltype),
+            array('member', '=', $uid),
+        );
+
+        return $this->get_objects($filter, $default, 100);
+    }
+
+    /**
+     * Find kolab objects assigned to specified e-mail message
+     *
+     * @param rcube_message $message E-mail message
+     * @param string        $folder  Folder name
+     * @param string        $type    Result objects type
+     *
+     * @return array List of kolab objects
+     */
+    public function get_message_relations($message, $folder, $type)
+    {
+        static $_cache = array();
+
+        $result  = array();
+        $uids    = array();
+        $default = true;
+        $uri     = self::get_message_uri($message, $folder);
+        $filter  = array(
+            array('type', '=', 'relation'),
+            array('category', '=', 'generic'),
+        );
+
+        // query by message-id
+        $member_id = $message->get('message-id', false);
+        if (empty($member_id)) {
+            // derive message identifier from URI
+            $member_id = md5($uri);
+        }
+        $filter[] = array('member', '=', $member_id);
+
+        if (!isset($_cache[$uri])) {
+            // get UIDs of related groupware objects
+            foreach ($this->get_objects($filter, $default) as $relation) {
+                // we don't need to update members if the URI is found
+                if (!in_array($uri, $relation['members'])) {
+                    // update members...
+                    $messages = kolab_storage_config::resolve_members($relation);
+                    // ...and check again
+                    if (empty($messages[$folder]) || !in_array($message->uid, $messages[$folder])) {
+                        continue;
+                    }
+                }
+
+                // find groupware object UID(s)
+                foreach ($relation['members'] as $member) {
+                    if (strpos($member, 'urn:uuid:') === 0) {
+                        $uids[] = substr($member, 9);
+                    }
+                }
+            }
+
+            // remember this lookup
+            $_cache[$uri] = $uids;
+        }
+        else {
+            $uids = $_cache[$uri];
+        }
+
+        // get kolab objects of specified type
+        if (!empty($uids)) {
+            $query  = array(array('uid', '=', array_unique($uids)));
+            $result = kolab_storage::select($query, $type);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Build a URI representing the given message reference
+     */
+    public static function get_message_uri($headers, $folder)
+    {
+        $params = array(
+            'folder' => $headers->folder ?: $folder,
+            'uid'    => $headers->uid,
+        );
+
+        if (($messageid = $headers->get('message-id', false)) && ($date = $headers->get('date', false))) {
+            $params['message-id'] = $messageid;
+            $params['date']       = $date;
+
+            if ($subject = $headers->get('subject')) {
+                $params['subject'] = $subject;
+            }
+        }
+
+        return self::build_member_url($params);
+    }
+
+    /**
+     * Resolve the email message reference from the given URI
+     */
+    public function get_message_reference($uri, $rel = null)
+    {
+        if ($linkref = self::parse_member_url($uri)) {
+            $linkref['subject'] = $linkref['params']['subject'];
+            $linkref['uri']     = $uri;
+
+            $rcmail = rcube::get_instance();
+            if (method_exists($rcmail, 'url')) {
+                $linkref['mailurl'] = $rcmail->url(array(
+                    'task'   => 'mail',
+                    'action' => 'show',
+                    'mbox'   => $linkref['folder'],
+                    'uid'    => $linkref['uid'],
+                    'rel'    => $rel,
+                ));
+            }
+
+            unset($linkref['params']);
+        }
+
+        return $linkref;
+    }
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_dataset.php Added

@@ -0,0 +1,154 @@
+<?php
+
+/**
+ * Dataset class providing the results of a select operation on a kolab_storage_folder.
+ *
+ * Can be used as a normal array as well as an iterator in foreach() loops.
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_storage_dataset implements Iterator, ArrayAccess, Countable
+{
+    private $cache;  // kolab_storage_cache instance to use for fetching data
+    private $memlimit = 0;
+    private $buffer = false;
+    private $index = array();
+    private $data = array();
+    private $iteratorkey = 0;
+    private $error = null;
+
+    /**
+     * Default constructor
+     *
+     * @param object kolab_storage_cache instance to be used for fetching objects upon access
+     */
+    public function __construct($cache)
+    {
+        $this->cache = $cache;
+
+        // enable in-memory buffering up until 1/5 of the available memory
+        if (function_exists('memory_get_usage')) {
+            $this->memlimit = parse_bytes(ini_get('memory_limit')) / 5;
+            $this->buffer = true;
+        }
+    }
+
+    /**
+     * Return error state
+     */
+    public function is_error()
+    {
+        return !empty($this->error);
+    }
+
+    /**
+     * Set error state
+     */
+    public function set_error($err)
+    {
+        $this->error = $err;
+    }
+
+
+    /*** Implement PHP Countable interface ***/
+
+    public function count()
+    {
+        return count($this->index);
+    }
+
+
+    /*** Implement PHP ArrayAccess interface ***/
+
+    public function offsetSet($offset, $value)
+    {
+        $uid = $value['_msguid'];
+
+        if (is_null($offset)) {
+            $offset = count($this->index);
+            $this->index[] = $uid;
+        }
+        else {
+            $this->index[$offset] = $uid;
+        }
+
+        // keep full payload data in memory if possible
+        if ($this->memlimit && $this->buffer && isset($value['_mailbox'])) {
+            $this->data[$offset] = $value;
+
+            // check memory usage and stop buffering
+            if ($offset % 10 == 0) {
+                $this->buffer = memory_get_usage() < $this->memlimit;
+            }
+        }
+    }
+
+    public function offsetExists($offset)
+    {
+        return isset($this->index[$offset]);
+    }
+
+    public function offsetUnset($offset)
+    {
+        unset($this->index[$offset]);
+    }
+
+    public function offsetGet($offset)
+    {
+        if (isset($this->data[$offset])) {
+            return $this->data[$offset];
+        }
+        else if ($msguid = $this->index[$offset]) {
+            return $this->cache->get($msguid);
+        }
+
+        return null;
+    }
+
+
+    /*** Implement PHP Iterator interface ***/
+
+    public function current()
+    {
+        return $this->offsetGet($this->iteratorkey);
+    }
+
+    public function key()
+    {
+        return $this->iteratorkey;
+    }
+
+    public function next()
+    {
+        $this->iteratorkey++;
+        return $this->valid();
+    }
+
+    public function rewind()
+    {
+        $this->iteratorkey = 0;
+    }
+
+    public function valid()
+    {
+        return !empty($this->index[$this->iteratorkey]);
+    }
+
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder.php Added

@@ -0,0 +1,1166 @@
+<?php
+
+/**
+ * The kolab_storage_folder class represents an IMAP folder on the Kolab server.
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2013, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+class kolab_storage_folder extends kolab_storage_folder_api
+{
+    /**
+     * The kolab_storage_cache instance for caching operations
+     * @var object
+     */
+    public $cache;
+
+    /**
+     * Indicate validity status
+     * @var boolean
+     */
+    public $valid = false;
+
+    protected $error = 0;
+
+    protected $resource_uri;
+
+
+    /**
+     * Default constructor
+     *
+     * @param string The folder name/path
+     * @param string Expected folder type
+     */
+    function __construct($name, $type = null, $type_annotation = null)
+    {
+        parent::__construct($name);
+        $this->imap->set_options(array('skip_deleted' => true));
+        $this->set_folder($name, $type, $type_annotation);
+    }
+
+
+    /**
+     * Set the IMAP folder this instance connects to
+     *
+     * @param string The folder name/path
+     * @param string Expected folder type
+     * @param string Optional folder type if known
+     */
+    public function set_folder($name, $type = null, $type_annotation = null)
+    {
+        if (empty($type_annotation)) {
+            $type_annotation = kolab_storage::folder_type($name);
+        }
+
+        $oldtype = $this->type;
+        list($this->type, $suffix) = explode('.', $type_annotation);
+        $this->default      = $suffix == 'default';
+        $this->subtype      = $this->default ? '' : $suffix;
+        $this->name         = $name;
+        $this->id           = kolab_storage::folder_id($name);
+        $this->valid        = !empty($this->type) && $this->type != 'mail' && (!$type || $this->type == $type);
+
+        if (!$this->valid) {
+            $this->error = $this->imap->get_error_code() < 0 ? kolab_storage::ERROR_IMAP_CONN : kolab_storage::ERROR_INVALID_FOLDER;
+        }
+
+        // reset cached object properties
+        $this->owner = $this->namespace = $this->resource_uri = $this->info = $this->idata = null;
+
+        // get a new cache instance if folder type changed
+        if (!$this->cache || $this->type != $oldtype)
+            $this->cache = kolab_storage_cache::factory($this);
+        else
+            $this->cache->set_folder($this);
+
+        $this->imap->set_folder($this->name);
+    }
+
+    /**
+     * Returns code of last error
+     *
+     * @return int Error code
+     */
+    public function get_error()
+    {
+        return $this->error ?: $this->cache->get_error();
+    }
+
+    /**
+     * Check IMAP connection error state
+     */
+    public function check_error()
+    {
+        if (($err_code = $this->imap->get_error_code()) < 0) {
+            $this->error = kolab_storage::ERROR_IMAP_CONN;
+            if (($res_code = $this->imap->get_response_code()) !== 0 && in_array($res_code, array(rcube_storage::NOPERM, rcube_storage::READONLY))) {
+                $this->error = kolab_storage::ERROR_NO_PERMISSION;
+            }
+        }
+
+        return $this->error;
+    }
+
+    /**
+     * Compose a unique resource URI for this IMAP folder
+     */
+    public function get_resource_uri()
+    {
+        if (!empty($this->resource_uri))
+            return $this->resource_uri;
+
+        // strip namespace prefix from folder name
+        $ns = $this->get_namespace();
+        $nsdata = $this->imap->get_namespace($ns);
+        if (is_array($nsdata[0]) && strlen($nsdata[0][0]) && strpos($this->name, $nsdata[0][0]) === 0) {
+            $subpath = substr($this->name, strlen($nsdata[0][0]));
+            if ($ns == 'other') {
+                list($user, $suffix) = explode($nsdata[0][1], $subpath, 2);
+                $subpath = $suffix;
+            }
+        }
+        else {
+            $subpath = $this->name;
+        }
+
+        // compose fully qualified ressource uri for this instance
+        $this->resource_uri = 'imap://' . urlencode($this->get_owner(true)) . '@' . $this->imap->options['host'] . '/' . $subpath;
+        return $this->resource_uri;
+    }
+
+    /**
+     * Helper method to extract folder UID metadata
+     *
+     * @return string Folder's UID
+     */
+    public function get_uid()
+    {
+        // UID is defined in folder METADATA
+        $metakeys = array(kolab_storage::UID_KEY_SHARED, kolab_storage::UID_KEY_PRIVATE, kolab_storage::UID_KEY_CYRUS);
+        $metadata = $this->get_metadata($metakeys);
+        foreach ($metakeys as $key) {
+            if (($uid = $metadata[$key])) {
+                return $uid;
+            }
+        }
+
+        // generate a folder UID and set it to IMAP
+        $uid = rtrim(chunk_split(md5($this->name . $this->get_owner() . uniqid('-', true)), 12, '-'), '-');
+        if ($this->set_uid($uid)) {
+            return $uid;
+        }
+
+        // create hash from folder name if we can't write the UID metadata
+        return md5($this->name . $this->get_owner());
+    }
+
+    /**
+     * Helper method to set an UID value to the given IMAP folder instance
+     *
+     * @param string Folder's UID
+     * @return boolean True on succes, False on failure
+     */
+    public function set_uid($uid)
+    {
+        if (!($success = $this->set_metadata(array(kolab_storage::UID_KEY_SHARED => $uid)))) {
+            $success = $this->set_metadata(array(kolab_storage::UID_KEY_PRIVATE => $uid));
+        }
+
+        $this->check_error();
+        return $success;
+    }
+
+    /**
+     * Compose a folder Etag identifier
+     */
+    public function get_ctag()
+    {
+        $fdata = $this->get_imap_data();
+        $this->check_error();
+        return sprintf('%d-%d-%d', $fdata['UIDVALIDITY'], $fdata['HIGHESTMODSEQ'], $fdata['UIDNEXT']);
+    }
+
+    /**
+     * Check activation status of this folder
+     *
+     * @return boolean True if enabled, false if not
+     */
+    public function is_active()
+    {
+        return kolab_storage::folder_is_active($this->name);
+    }
+
+    /**
+     * Change activation status of this folder
+     *
+     * @param boolean The desired subscription status: true = active, false = not active
+     *
+     * @return True on success, false on error
+     */
+    public function activate($active)
+    {
+        return $active ? kolab_storage::folder_activate($this->name) : kolab_storage::folder_deactivate($this->name);
+    }
+
+    /**
+     * Check subscription status of this folder
+     *
+     * @return boolean True if subscribed, false if not
+     */
+    public function is_subscribed()
+    {
+        return kolab_storage::folder_is_subscribed($this->name);
+    }
+
+    /**
+     * Change subscription status of this folder
+     *
+     * @param boolean The desired subscription status: true = subscribed, false = not subscribed
+     *
+     * @return True on success, false on error
+     */
+    public function subscribe($subscribed)
+    {
+        return $subscribed ? kolab_storage::folder_subscribe($this->name) : kolab_storage::folder_unsubscribe($this->name);
+    }
+
+    /**
+     * Get number of objects stored in this folder
+     *
+     * @param mixed  Pseudo-SQL query as list of filter parameter triplets
+     *    or string with object type (e.g. contact, event, todo, journal, note, configuration)
+     * @return integer The number of objects of the given type
+     * @see self::select()
+     */
+    public function count($query = null)
+    {
+        if (!$this->valid) {
+            return 0;
+        }
+
+        // synchronize cache first
+        $this->cache->synchronize();
+
+        return $this->cache->count($this->_prepare_query($query));
+    }
+
+
+    /**
+     * List all Kolab objects of the given type
+     *
+     * @param string  $type Object type (e.g. contact, event, todo, journal, note, configuration)
+     * @return array  List of Kolab data objects (each represented as hash array)
+     */
+    public function get_objects($type = null)
+    {
+        if (!$type) $type = $this->type;
+
+        if (!$this->valid) {
+            return array();
+        }
+
+        // synchronize caches
+        $this->cache->synchronize();
+
+        // fetch objects from cache
+        return $this->cache->select($this->_prepare_query($type));
+    }
+
+
+    /**
+     * Select *some* Kolab objects matching the given query
+     *
+     * @param array Pseudo-SQL query as list of filter parameter triplets
+     *   triplet: array('<colname>', '<comparator>', '<value>')
+     * @return array List of Kolab data objects (each represented as hash array)
+     */
+    public function select($query = array())
+    {
+        if (!$this->valid) {
+            return array();
+        }
+
+        // check query argument
+        if (empty($query)) {
+            return $this->get_objects();
+        }
+
+        // synchronize caches
+        $this->cache->synchronize();
+
+        // fetch objects from cache
+        return $this->cache->select($this->_prepare_query($query));
+    }
+
+
+    /**
+     * Getter for object UIDs only
+     *
+     * @param array Pseudo-SQL query as list of filter parameter triplets
+     * @return array List of Kolab object UIDs
+     */
+    public function get_uids($query = array())
+    {
+        if (!$this->valid) {
+            return array();
+        }
+
+        // synchronize caches
+        $this->cache->synchronize();
+
+        // fetch UIDs from cache
+        return $this->cache->select($this->_prepare_query($query), true);
+    }
+
+    /**
+     * Setter for ORDER BY and LIMIT parameters for cache queries
+     *
+     * @param array   List of columns to order by
+     * @param integer Limit result set to this length
+     * @param integer Offset row
+     */
+    public function set_order_and_limit($sortcols, $length = null, $offset = 0)
+    {
+        $this->cache->set_order_by($sortcols);
+
+        if ($length !== null) {
+            $this->cache->set_limit($length, $offset);
+        }
+    }
+
+    /**
+     * Helper method to sanitize query arguments
+     */
+    private function _prepare_query($query)
+    {
+        // string equals type query
+        // FIXME: should not be called this way!
+        if (is_string($query)) {
+            return $this->cache->has_type_col() && !empty($query) ? array(array('type','=',$query)) : array();
+        }
+
+        foreach ((array)$query as $i => $param) {
+            if ($param[0] == 'type' && !$this->cache->has_type_col()) {
+                unset($query[$i]);
+            }
+            else if (($param[0] == 'dtstart' || $param[0] == 'dtend' || $param[0] == 'changed')) {
+                if (is_object($param[2]) && is_a($param[2], 'DateTime'))
+                    $param[2] = $param[2]->format('U');
+                if (is_numeric($param[2]))
+                    $query[$i][2] = date('Y-m-d H:i:s', $param[2]);
+            }
+        }
+
+        return $query;
+    }
+
+
+    /**
+     * Getter for a single Kolab object, identified by its UID
+     *
+     * @param string $uid  Object UID
+     * @param string $type Object type (e.g. contact, event, todo, journal, note, configuration)
+     *                     Defaults to folder type
+     *
+     * @return array The Kolab object represented as hash array
+     */
+    public function get_object($uid, $type = null)
+    {
+        if (!$this->valid) {
+            return false;
+        }
+
+        // synchronize caches
+        $this->cache->synchronize();
+
+        $msguid = $this->cache->uid2msguid($uid);
+
+        if ($msguid && ($object = $this->cache->get($msguid, $type))) {
+            return $object;
+        }
+
+        return false;
+    }
+
+
+    /**
+     * Fetch a Kolab object attachment which is stored in a separate part
+     * of the mail MIME message that represents the Kolab record.
+     *
+     * @param string   Object's UID
+     * @param string   The attachment's mime number
+     * @param string   IMAP folder where message is stored;
+     *                 If set, that also implies that the given UID is an IMAP UID
+     * @param bool     True to print the part content
+     * @param resource File pointer to save the message part
+     * @param boolean  Disables charset conversion
+     *
+     * @return mixed  The attachment content as binary string
+     */
+    public function get_attachment($uid, $part, $mailbox = null, $print = false, $fp = null, $skip_charset_conv = false)
+    {
+        if ($this->valid && ($msguid = ($mailbox ? $uid : $this->cache->uid2msguid($uid)))) {
+            $this->imap->set_folder($mailbox ? $mailbox : $this->name);
+
+            if (substr($part, 0, 2) == 'i:') {
+                // attachment data is stored in XML
+                if ($object = $this->cache->get($msguid)) {
+                    // load data from XML (attachment content is not stored in cache)
+                    if ($object['_formatobj'] && isset($object['_size'])) {
+                        $object['_attachments'] = array();
+                        $object['_formatobj']->get_attachments($object);
+                    }
+
+                    foreach ($object['_attachments'] as $attach) {
+                        if ($attach['id'] == $part) {
+                            if ($print)   echo $attach['content'];
+                            else if ($fp) fwrite($fp, $attach['content']);
+                            else          return $attach['content'];
+                            return true;
+                        }
+                    }
+                }
+            }
+            else {
+                // return message part from IMAP directly
+                return $this->imap->get_message_part($msguid, $part, null, $print, $fp, $skip_charset_conv);
+            }
+        }
+
+        return null;
+    }
+
+
+    /**
+     * Fetch the mime message from the storage server and extract
+     * the Kolab groupware object from it
+     *
+     * @param string The IMAP message UID to fetch
+     * @param string The object type expected (use wildcard '*' to accept all types)
+     * @param string The folder name where the message is stored
+     *
+     * @return mixed Hash array representing the Kolab object, a kolab_format instance or false if not found
+     */
+    public function read_object($msguid, $type = null, $folder = null)
+    {
+        if (!$this->valid) {
+            return false;
+        }
+
+        if (!$type) $type = $this->type;
+        if (!$folder) $folder = $this->name;
+
+        $this->imap->set_folder($folder);
+
+        $this->cache->bypass(true);
+        $message = new rcube_message($msguid);
+        $this->cache->bypass(false);
+
+        // Message doesn't exist?
+        if (empty($message->headers)) {
+            return false;
+        }
+
+        // extract the X-Kolab-Type header from the XML attachment part if missing
+        if (empty($message->headers->others['x-kolab-type'])) {
+            foreach ((array)$message->attachments as $part) {
+                if (strpos($part->mimetype, kolab_format::KTYPE_PREFIX) === 0) {
+                    $message->headers->others['x-kolab-type'] = $part->mimetype;
+                    break;
+                }
+            }
+        }
+        // fix buggy messages stating the X-Kolab-Type header twice
+        else if (is_array($message->headers->others['x-kolab-type'])) {
+            $message->headers->others['x-kolab-type'] = reset($message->headers->others['x-kolab-type']);
+        }
+
+        // no object type header found: abort
+        if (empty($message->headers->others['x-kolab-type'])) {
+            rcube::raise_error(array(
+                'code' => 600,
+                'type' => 'php',
+                'file' => __FILE__,
+                'line' => __LINE__,
+                'message' => "No X-Kolab-Type information found in message $msguid ($this->name).",
+            ), true);
+            return false;
+        }
+
+        $object_type  = kolab_format::mime2object_type($message->headers->others['x-kolab-type']);
+        $content_type = kolab_format::KTYPE_PREFIX . $object_type;
+
+        // check object type header and abort on mismatch
+        if ($type != '*' && $object_type != $type)
+            return false;
+
+        $attachments = array();
+
+        // get XML part
+        foreach ((array)$message->attachments as $part) {
+            if (!$xml && ($part->mimetype == $content_type || preg_match('!application/([a-z.]+\+)?xml!', $part->mimetype))) {
+                $xml = $message->get_part_body($part->mime_id, true);
+            }
+            else if ($part->filename || $part->content_id) {
+                $key  = $part->content_id ? trim($part->content_id, '<>') : $part->filename;
+                $size = null;
+
+                // Use Content-Disposition 'size' as for the Kolab Format spec.
+                if (isset($part->d_parameters['size'])) {
+                    $size = $part->d_parameters['size'];
+                }
+                // we can trust part size only if it's not encoded
+                else if ($part->encoding == 'binary' || $part->encoding == '7bit' || $part->encoding == '8bit') {
+                    $size = $part->size;
+                }
+
+                $attachments[$key] = array(
+                    'id'       => $part->mime_id,
+                    'name'     => $part->filename,
+                    'mimetype' => $part->mimetype,
+                    'size'     => $size,
+                );
+            }
+        }
+
+        if (!$xml) {
+            rcube::raise_error(array(
+                'code' => 600,
+                'type' => 'php',
+                'file' => __FILE__,
+                'line' => __LINE__,
+                'message' => "Could not find Kolab data part in message $msguid ($this->name).",
+            ), true);
+            return false;
+        }
+
+        // check kolab format version
+        $format_version = $message->headers->others['x-kolab-mime-version'];
+        if (empty($format_version)) {
+            list($xmltype, $subtype) = explode('.', $object_type);
+            $xmlhead = substr($xml, 0, 512);
+
+            // detect old Kolab 2.0 format
+            if (strpos($xmlhead, '<' . $xmltype) !== false && strpos($xmlhead, 'xmlns=') === false)
+                $format_version = '2.0';
+            else
+                $format_version = '3.0'; // assume 3.0
+        }
+
+        // get Kolab format handler for the given type
+        $format = kolab_format::factory($object_type, $format_version);
+
+        if (is_a($format, 'PEAR_Error'))
+            return false;
+
+        // load Kolab object from XML part
+        $format->load($xml);
+
+        if ($format->is_valid()) {
+            $object = $format->to_array(array('_attachments' => $attachments));
+            $object['_type']      = $object_type;
+            $object['_msguid']    = $msguid;
+            $object['_mailbox']   = $this->name;
+            $object['_formatobj'] = $format;
+
+            return $object;
+        }
+        else {
+            // try to extract object UID from XML block
+            if (preg_match('!<uid>(.+)</uid>!Uims', $xml, $m))
+                $msgadd = " UID = " . trim(strip_tags($m[1]));
+
+            rcube::raise_error(array(
+                'code' => 600,
+                'type' => 'php',
+                'file' => __FILE__,
+                'line' => __LINE__,
+                'message' => "Could not parse Kolab object data in message $msguid ($this->name)." . $msgadd,
+            ), true);
+        }
+
+        return false;
+    }
+
+    /**
+     * Save an object in this folder.
+     *
+     * @param array  $object    The array that holds the data of the object.
+     * @param string $type      The type of the kolab object.
+     * @param string $uid       The UID of the old object if it existed before
+     * @return boolean          True on success, false on error
+     */
+    public function save(&$object, $type = null, $uid = null)
+    {
+        if (!$this->valid) {
+            return false;
+        }
+
+        if (!$type)
+            $type = $this->type;
+
+        // copy attachments from old message
+        if (!empty($object['_msguid']) && ($old = $this->cache->get($object['_msguid'], $type, $object['_mailbox']))) {
+            foreach ((array)$old['_attachments'] as $key => $att) {
+                if (!isset($object['_attachments'][$key])) {
+                    $object['_attachments'][$key] = $old['_attachments'][$key];
+                }
+                // unset deleted attachment entries
+                if ($object['_attachments'][$key] == false) {
+                    unset($object['_attachments'][$key]);
+                }
+                // load photo.attachment from old Kolab2 format to be directly embedded in xcard block
+                else if ($type == 'contact' && ($key == 'photo.attachment' || $key == 'kolab-picture.png') && $att['id']) {
+                    if (!isset($object['photo']))
+                        $object['photo'] = $this->get_attachment($object['_msguid'], $att['id'], $object['_mailbox']);
+                    unset($object['_attachments'][$key]);
+                }
+            }
+        }
+
+        // save contact photo to attachment for Kolab2 format
+        if (kolab_storage::$version == '2.0' && $object['photo']) {
+            $attkey = 'kolab-picture.png';  // this file name is hard-coded in libkolab/kolabformatV2/contact.cpp
+            $object['_attachments'][$attkey] = array(
+                'mimetype'=> rcube_mime::image_content_type($object['photo']),
+                'content' => preg_match('![^a-z0-9/=+-]!i', $object['photo']) ? $object['photo'] : base64_decode($object['photo']),
+            );
+        }
+
+        // process attachments
+        if (is_array($object['_attachments'])) {
+            $numatt = count($object['_attachments']);
+            foreach ($object['_attachments'] as $key => $attachment) {
+                // FIXME: kolab_storage and Roundcube attachment hooks use different fields!
+                if (empty($attachment['content']) && !empty($attachment['data'])) {
+                    $attachment['content'] = $attachment['data'];
+                    unset($attachment['data'], $object['_attachments'][$key]['data']);
+                }
+
+                // make sure size is set, so object saved in cache contains this info
+                if (!isset($attachment['size'])) {
+                    if (!empty($attachment['content'])) {
+                        if (is_resource($attachment['content'])) {
+                            // this need to be a seekable resource, otherwise
+                            // fstat() failes and we're unable to determine size
+                            // here nor in rcube_imap_generic before IMAP APPEND
+                            $stat = fstat($attachment['content']);
+                            $attachment['size'] = $stat ? $stat['size'] : 0;
+                        }
+                        else {
+                            $attachment['size'] = strlen($attachment['content']);
+                        }
+                    }
+                    else if (!empty($attachment['path'])) {
+                        $attachment['size'] = filesize($attachment['path']);
+                    }
+                    $object['_attachments'][$key] = $attachment;
+                }
+
+                // generate unique keys (used as content-id) for attachments
+                if (is_numeric($key) && $key < $numatt) {
+                    // derrive content-id from attachment file name
+                    $ext = preg_match('/(\.[a-z0-9]{1,6})$/i', $attachment['name'], $m) ? $m[1] : null;
+                    $basename = preg_replace('/[^a-z0-9_.-]/i', '', basename($attachment['name'], $ext));  // to 7bit ascii
+                    if (!$basename) $basename = 'noname';
+                    $cid = $basename . '.' . microtime(true) . $ext;
+
+                    $object['_attachments'][$cid] = $attachment;
+                    unset($object['_attachments'][$key]);
+                }
+            }
+        }
+
+        // save recurrence exceptions as individual objects due to lack of support in Kolab v2 format
+        if (kolab_storage::$version == '2.0' && $object['recurrence']['EXCEPTIONS']) {
+            $this->save_recurrence_exceptions($object, $type);
+        }
+
+        // check IMAP BINARY extension support for 'file' objects
+        // allow configuration to workaround bug in Cyrus < 2.4.17
+        $rcmail = rcube::get_instance();
+        $binary = $type == 'file' && !$rcmail->config->get('kolab_binary_disable') && $this->imap->get_capability('BINARY');
+
+        // generate and save object message
+        if ($raw_msg = $this->build_message($object, $type, $binary, $body_file)) {
+            // resolve old msguid before saving
+            if ($uid && empty($object['_msguid']) && ($msguid = $this->cache->uid2msguid($uid))) {
+                $object['_msguid'] = $msguid;
+                $object['_mailbox'] = $this->name;
+            }
+
+            $result = $this->imap->save_message($this->name, $raw_msg, null, false, null, null, $binary);
+
+            // update cache with new UID
+            if ($result) {
+                $old_uid = $object['_msguid'];
+
+                $object['_msguid'] = $result;
+                $object['_mailbox'] = $this->name;
+
+                if ($old_uid) {
+                    // delete old message
+                    $this->cache->bypass(true);
+                    $this->imap->delete_message($old_uid, $object['_mailbox']);
+                    $this->cache->bypass(false);
+                }
+
+                // insert/update message in cache
+                $this->cache->save($result, $object, $old_uid);
+            }
+
+            // remove temp file
+            if ($body_file) {
+                @unlink($body_file);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Save recurrence exceptions as individual objects.
+     * The Kolab v2 format doesn't allow us to save fully embedded exception objects.
+     *
+     * @param array Hash array with event properties
+     * @param string Object type
+     */
+    private function save_recurrence_exceptions(&$object, $type = null)
+    {
+        if ($object['recurrence']['EXCEPTIONS']) {
+            $exdates = array();
+            foreach ((array)$object['recurrence']['EXDATE'] as $exdate) {
+                $key = is_a($exdate, 'DateTime') ? $exdate->format('Y-m-d') : strval($exdate);
+                $exdates[$key] = 1;
+            }
+
+            // save every exception as individual object
+            foreach((array)$object['recurrence']['EXCEPTIONS'] as $exception) {
+                $exception['uid'] = self::recurrence_exception_uid($object['uid'], $exception['start']->format('Ymd'));
+                $exception['sequence'] = $object['sequence'] + 1;
+
+                if ($exception['thisandfuture']) {
+                    $exception['recurrence'] = $object['recurrence'];
+
+                    // adjust the recurrence duration of the exception
+                    if ($object['recurrence']['COUNT']) {
+                        $recurrence = new kolab_date_recurrence($object['_formatobj']);
+                        if ($end = $recurrence->end()) {
+                            unset($exception['recurrence']['COUNT']);
+                            $exception['recurrence']['UNTIL'] = $end;
+                        }
+                    }
+
+                    // set UNTIL date if we have a thisandfuture exception
+                    $untildate = clone $exception['start'];
+                    $untildate->sub(new DateInterval('P1D'));
+                    $object['recurrence']['UNTIL'] = $untildate;
+                    unset($object['recurrence']['COUNT']);
+                }
+                else {
+                    if (!$exdates[$exception['start']->format('Y-m-d')])
+                        $object['recurrence']['EXDATE'][] = clone $exception['start'];
+                    unset($exception['recurrence']);
+                }
+
+                unset($exception['recurrence']['EXCEPTIONS'], $exception['_formatobj'], $exception['_msguid']);
+                $this->save($exception, $type, $exception['uid']);
+            }
+
+            unset($object['recurrence']['EXCEPTIONS']);
+        }
+    }
+
+    /**
+     * Generate an object UID with the given recurrence-ID in a way that it is
+     * unique (the original UID is not a substring) but still recoverable.
+     */
+    private static function recurrence_exception_uid($uid, $recurrence_id)
+    {
+        $offset = -2;
+        return substr($uid, 0, $offset) . '-' . $recurrence_id . '-' . substr($uid, $offset);
+    }
+
+    /**
+     * Delete the specified object from this folder.
+     *
+     * @param  mixed   $object  The Kolab object to delete or object UID
+     * @param  boolean $expunge Should the folder be expunged?
+     *
+     * @return boolean True if successful, false on error
+     */
+    public function delete($object, $expunge = true)
+    {
+        if (!$this->valid) {
+            return false;
+        }
+
+        $msguid = is_array($object) ? $object['_msguid'] : $this->cache->uid2msguid($object);
+        $success = false;
+
+        $this->cache->bypass(true);
+
+        if ($msguid && $expunge) {
+            $success = $this->imap->delete_message($msguid, $this->name);
+        }
+        else if ($msguid) {
+            $success = $this->imap->set_flag($msguid, 'DELETED', $this->name);
+        }
+
+        $this->cache->bypass(false);
+
+        if ($success) {
+            $this->cache->set($msguid, false);
+        }
+
+        return $success;
+    }
+
+
+    /**
+     *
+     */
+    public function delete_all()
+    {
+        if (!$this->valid) {
+            return false;
+        }
+
+        $this->cache->purge();
+        $this->cache->bypass(true);
+        $result = $this->imap->clear_folder($this->name);
+        $this->cache->bypass(false);
+
+        return $result;
+    }
+
+
+    /**
+     * Restore a previously deleted object
+     *
+     * @param string Object UID
+     * @return mixed Message UID on success, false on error
+     */
+    public function undelete($uid)
+    {
+        if (!$this->valid) {
+            return false;
+        }
+
+        if ($msguid = $this->cache->uid2msguid($uid, true)) {
+            $this->cache->bypass(true);
+            $result = $this->imap->set_flag($msguid, 'UNDELETED', $this->name);
+            $this->cache->bypass(false);
+
+            if ($result) {
+                return $msguid;
+            }
+        }
+
+        return false;
+    }
+
+
+    /**
+     * Move a Kolab object message to another IMAP folder
+     *
+     * @param string Object UID
+     * @param string IMAP folder to move object to
+     * @return boolean True on success, false on failure
+     */
+    public function move($uid, $target_folder)
+    {
+        if (!$this->valid) {
+            return false;
+        }
+
+        if (is_string($target_folder))
+            $target_folder = kolab_storage::get_folder($target_folder);
+
+        if ($msguid = $this->cache->uid2msguid($uid)) {
+            $this->cache->bypass(true);
+            $result = $this->imap->move_message($msguid, $target_folder->name, $this->name);
+            $this->cache->bypass(false);
+
+            if ($result) {
+                $this->cache->move($msguid, $uid, $target_folder);
+                return true;
+            }
+            else {
+                rcube::raise_error(array(
+                    'code' => 600, 'type' => 'php',
+                    'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Failed to move message $msguid to $target_folder: " . $this->imap->get_error_str(),
+                ), true);
+            }
+        }
+
+        return false;
+    }
+
+
+    /**
+     * Creates source of the configuration object message
+     *
+     * @param array  $object    The array that holds the data of the object.
+     * @param string $type      The type of the kolab object.
+     * @param bool   $binary    Enables use of binary encoding of attachment(s)
+     * @param string $body_file Reference to filename of message body
+     *
+     * @return mixed Message as string or array with two elements
+     *               (one for message file path, second for message headers)
+     */
+    private function build_message(&$object, $type, $binary, &$body_file)
+    {
+        // load old object to preserve data we don't understand/process
+        if (is_object($object['_formatobj']))
+            $format = $object['_formatobj'];
+        else if ($object['_msguid'] && ($old = $this->cache->get($object['_msguid'], $type, $object['_mailbox'])))
+            $format = $old['_formatobj'];
+
+        // create new kolab_format instance
+        if (!$format)
+            $format = kolab_format::factory($type, kolab_storage::$version);
+
+        if (PEAR::isError($format))
+            return false;
+
+        $format->set($object);
+        $xml = $format->write(kolab_storage::$version);
+        $object['uid'] = $format->uid;  // read UID from format
+        $object['_formatobj'] = $format;
+
+        if (empty($xml) || !$format->is_valid() || empty($object['uid'])) {
+            return false;
+        }
+
+        $mime     = new Mail_mime("\r\n");
+        $rcmail   = rcube::get_instance();
+        $headers  = array();
+        $files    = array();
+        $part_id  = 1;
+        $encoding = $binary ? 'binary' : 'base64';
+
+        if ($user_email = $rcmail->get_user_email()) {
+            $headers['From'] = $user_email;
+            $headers['To'] = $user_email;
+        }
+        $headers['Date'] = date('r');
+        $headers['X-Kolab-Type'] = kolab_format::KTYPE_PREFIX . $type;
+        $headers['X-Kolab-Mime-Version'] = kolab_storage::$version;
+        $headers['Subject'] = $object['uid'];
+//        $headers['Message-ID'] = $rcmail->gen_message_id();
+        $headers['User-Agent'] = $rcmail->config->get('useragent');
+
+        // Check if we have enough memory to handle the message in it
+        // It's faster than using files, so we'll do this if we only can
+        if (!empty($object['_attachments']) && ($mem_limit = parse_bytes(ini_get('memory_limit'))) > 0) {
+            $memory = function_exists('memory_get_usage') ? memory_get_usage() : 16*1024*1024; // safe value: 16MB
+
+            foreach ($object['_attachments'] as $attachment) {
+                $memory += $attachment['size'];
+            }
+
+            // 1.33 is for base64, we need at least 4x more memory than the message size
+            if ($memory * ($binary ? 1 : 1.33) * 4 > $mem_limit) {
+                $marker   = '%%%~~~' . md5(microtime(true) . $memory) . '~~~%%%';
+                $is_file  = true;
+                $temp_dir = unslashify($rcmail->config->get('temp_dir'));
+                $mime->setParam('delay_file_io', true);
+            }
+        }
+
+        $mime->headers($headers);
+        $mime->setTXTBody("This is a Kolab Groupware object. "
+            . "To view this object you will need an email client that understands the Kolab Groupware format. "
+            . "For a list of such email clients please visit http://www.kolab.org/\n\n");
+
+        $ctype = kolab_storage::$version == '2.0' ? $format->CTYPEv2 : $format->CTYPE;
+        // Convert new lines to \r\n, to wrokaround "NO Message contains bare newlines"
+        // when APPENDing from temp file
+        $xml = preg_replace('/\r?\n/', "\r\n", $xml);
+
+        $mime->addAttachment($xml,  // file
+            $ctype,                 // content-type
+            'kolab.xml',            // filename
+            false,                  // is_file
+            '8bit',                 // encoding
+            'attachment',           // disposition
+            RCUBE_CHARSET           // charset
+        );
+        $part_id++;
+
+        // save object attachments as separate parts
+        foreach ((array)$object['_attachments'] as $key => $att) {
+            if (empty($att['content']) && !empty($att['id'])) {
+                // @TODO: use IMAP CATENATE to skip attachment fetch+push operation
+                $msguid = !empty($object['_msguid']) ? $object['_msguid'] : $object['uid'];
+                if ($is_file) {
+                    $att['path'] = tempnam($temp_dir, 'rcmAttmnt');
+                    if (($fp = fopen($att['path'], 'w')) && $this->get_attachment($msguid, $att['id'], $object['_mailbox'], false, $fp, true)) {
+                        fclose($fp);
+                    }
+                    else {
+                        return false;
+                    }
+                }
+                else {
+                    $att['content'] = $this->get_attachment($msguid, $att['id'], $object['_mailbox'], false, null, true);
+                }
+            }
+
+            $headers = array('Content-ID' => Mail_mimePart::encodeHeader('Content-ID', '<' . $key . '>', RCUBE_CHARSET, 'quoted-printable'));
+            $name = !empty($att['name']) ? $att['name'] : $key;
+
+            // To store binary files we can use faster method
+            // without writting full message content to a temporary file but
+            // directly to IMAP, see rcube_imap_generic::append().
+            // I.e. use file handles where possible
+            if (!empty($att['path'])) {
+                if ($is_file && $binary) {
+                    $files[] = fopen($att['path'], 'r');
+                    $mime->addAttachment($marker, $att['mimetype'], $name, false, $encoding, 'attachment', '', '', '', null, null, '', RCUBE_CHARSET, $headers);
+                }
+                else {
+                    $mime->addAttachment($att['path'], $att['mimetype'], $name, true, $encoding, 'attachment', '', '', '', null, null, '', RCUBE_CHARSET, $headers);
+                }
+            }
+            else {
+                if (is_resource($att['content']) && $is_file && $binary) {
+                    $files[] = $att['content'];
+                    $mime->addAttachment($marker, $att['mimetype'], $name, false, $encoding, 'attachment', '', '', '', null, null, '', RCUBE_CHARSET, $headers);
+                }
+                else {
+                    if (is_resource($att['content'])) {
+                        @rewind($att['content']);
+                        $att['content'] = stream_get_contents($att['content']);
+                    }
+                    $mime->addAttachment($att['content'], $att['mimetype'], $name, false, $encoding, 'attachment', '', '', '', null, null, '', RCUBE_CHARSET, $headers);
+                }
+            }
+
+            $object['_attachments'][$key]['id'] = ++$part_id;
+        }
+
+        if (!$is_file || !empty($files)) {
+            $message = $mime->getMessage();
+        }
+
+        // parse message and build message array with
+        // attachment file pointers in place of file markers
+        if (!empty($files)) {
+            $message = explode($marker, $message);
+            $tmp     = array();
+
+            foreach ($message as $msg_part) {
+                $tmp[] = $msg_part;
+                if ($file = array_shift($files)) {
+                    $tmp[] = $file;
+                }
+            }
+            $message = $tmp;
+        }
+        // write complete message body into temp file
+        else if ($is_file) {
+            // use common temp dir
+            $body_file = tempnam($temp_dir, 'rcmMsg');
+
+            if (PEAR::isError($mime_result = $mime->saveMessageBody($body_file))) {
+                self::raise_error(array('code' => 650, 'type' => 'php',
+                    'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Could not create message: ".$mime_result->getMessage()),
+                    true, false);
+                return false;
+            }
+
+            $message = array(trim($mime->txtHeaders()) . "\r\n\r\n", fopen($body_file, 'r'));
+        }
+
+        return $message;
+    }
+
+
+    /**
+     * Triggers any required updates after changes within the
+     * folder. This is currently only required for handling free/busy
+     * information with Kolab.
+     *
+     * @return boolean|PEAR_Error True if successfull.
+     */
+    public function trigger()
+    {
+        $owner = $this->get_owner();
+        $result = false;
+
+        switch($this->type) {
+        case 'event':
+            if ($this->get_namespace() == 'personal') {
+                $result = $this->trigger_url(
+                    sprintf('%s/trigger/%s/%s.pfb',
+                        kolab_storage::get_freebusy_server(),
+                        urlencode($owner),
+                        urlencode($this->imap->mod_folder($this->name))
+                    ),
+                    $this->imap->options['user'],
+                    $this->imap->options['password']
+                );
+            }
+            break;
+
+        default:
+            return true;
+        }
+
+        if ($result && is_object($result) && is_a($result, 'PEAR_Error')) {
+            return PEAR::raiseError(sprintf("Failed triggering folder %s. Error was: %s",
+                                            $this->name, $result->getMessage()));
+        }
+
+        return $result;
+    }
+
+    /**
+     * Triggers a URL.
+     *
+     * @param string $url          The URL to be triggered.
+     * @param string $auth_user    Username to authenticate with
+     * @param string $auth_passwd  Password for basic auth
+     * @return boolean|PEAR_Error  True if successfull.
+     */
+    private function trigger_url($url, $auth_user = null, $auth_passwd = null)
+    {
+        try {
+            $request = libkolab::http_request($url);
+
+            // set authentication credentials
+            if ($auth_user && $auth_passwd)
+                $request->setAuth($auth_user, $auth_passwd);
+
+            $result = $request->send();
+            // rcube::write_log('trigger', $result->getBody());
+        }
+        catch (Exception $e) {
+            return PEAR::raiseError($e->getMessage());
+        }
+
+        return true;
+    }
+
+}
+

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_api.php Added

@@ -0,0 +1,351 @@
+<?php
+
+/**
+ * Abstract interface class for Kolab storage IMAP folder objects
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+abstract class kolab_storage_folder_api
+{
+    /**
+     * Folder identifier
+     * @var string
+     */
+    public $id;
+
+    /**
+     * The folder name.
+     * @var string
+     */
+    public $name;
+
+    /**
+     * The type of this folder.
+     * @var string
+     */
+    public $type;
+
+    /**
+     * The subtype of this folder.
+     * @var string
+     */
+    public $subtype;
+
+    /**
+     * Is this folder set to be the default for its type
+     * @var boolean
+     */
+    public $default = false;
+
+    /**
+     * List of direct child folders
+     * @var array
+     */
+    public $children = array();
+    
+    /**
+     * Name of the parent folder
+     * @var string
+     */
+    public $parent = '';
+
+    protected $imap;
+    protected $owner;
+    protected $info;
+    protected $idata;
+    protected $namespace;
+
+
+    /**
+     * Private constructor
+     */
+    protected function __construct($name)
+    {
+      $this->name = $name;
+      $this->id   = kolab_storage::folder_id($name);
+      $this->imap = rcube::get_instance()->get_storage();
+    }
+
+
+    /**
+     * Returns the owner of the folder.
+     *
+     * @param boolean  Return a fully qualified owner name (i.e. including domain for shared folders)
+     * @return string  The owner of this folder.
+     */
+    public function get_owner($fully_qualified = false)
+    {
+        // return cached value
+        if (isset($this->owner))
+            return $this->owner;
+
+        $info = $this->get_folder_info();
+        $rcmail = rcube::get_instance();
+
+        switch ($info['namespace']) {
+        case 'personal':
+            $this->owner = $rcmail->get_user_name();
+            break;
+
+        case 'shared':
+            $this->owner = 'anonymous';
+            break;
+
+        default:
+            list($prefix, $this->owner) = explode($this->imap->get_hierarchy_delimiter(), $info['name']);
+            $fully_qualified = true;  // enforce email addresses (backwards compatibility)
+            break;
+        }
+
+        if ($fully_qualified && strpos($this->owner, '@') === false) {
+            // extract domain from current user name
+            $domain = strstr($rcmail->get_user_name(), '@');
+            // fall back to mail_domain config option
+            if (empty($domain) && ($mdomain = $rcmail->config->mail_domain($this->imap->options['host']))) {
+                $domain = '@' . $mdomain;
+            }
+            $this->owner .= $domain;
+        }
+
+        return $this->owner;
+    }
+
+
+    /**
+     * Getter for the name of the namespace to which the IMAP folder belongs
+     *
+     * @return string Name of the namespace (personal, other, shared)
+     */
+    public function get_namespace()
+    {
+        if (!isset($this->namespace))
+            $this->namespace = $this->imap->folder_namespace($this->name);
+        return $this->namespace;
+    }
+
+
+    /**
+     * Get the display name value of this folder
+     *
+     * @return string Folder name
+     */
+    public function get_name()
+    {
+        return kolab_storage::object_name($this->name, $this->get_namespace());
+    }
+
+
+    /**
+     * Getter for the top-end folder name (not the entire path)
+     *
+     * @return string Name of this folder
+     */
+    public function get_foldername()
+    {
+        $parts = explode('/', $this->name);
+        return rcube_charset::convert(end($parts), 'UTF7-IMAP');
+    }
+
+    /**
+     * Getter for parent folder path
+     *
+     * @return string Full path to parent folder
+     */
+    public function get_parent()
+    {
+        $path = explode('/', $this->name);
+        array_pop($path);
+
+        // don't list top-level namespace folder
+        if (count($path) == 1 && in_array($this->get_namespace(), array('other', 'shared'))) {
+            $path = array();
+        }
+
+        return join('/', $path);
+    }
+
+    /**
+     * Getter for the Cyrus mailbox identifier corresponding to this folder
+     * (e.g. user/john.doe/Calendar/Personal@example.org)
+     *
+     * @return string Mailbox ID
+     */
+    public function get_mailbox_id()
+    {
+        $info = $this->get_folder_info();
+        $owner = $this->get_owner();
+        list($user, $domain) = explode('@', $owner);
+
+        switch ($info['namespace']) {
+        case 'personal':
+            return sprintf('user/%s/%s@%s', $user, $this->name, $domain);
+
+        case 'shared':
+            $ns = $this->imap->get_namespace('shared');
+            $prefix = is_array($ns) ? $ns[0][0] : '';
+            list(, $domain) = explode('@', rcube::get_instance()->get_user_name());
+            return substr($this->name, strlen($prefix)) . '@' . $domain;
+
+        default:
+            $ns = $this->imap->get_namespace('other');
+            $prefix = is_array($ns) ? $ns[0][0] : '';
+            list($user, $folder) = explode($this->imap->get_hierarchy_delimiter(), substr($info['name'], strlen($prefix)), 2);
+            if (strpos($user, '@')) {
+                list($user, $domain) = explode('@', $user);
+            }
+            return sprintf('user/%s/%s@%s', $user, $folder, $domain);
+        }
+    }
+
+    /**
+     * Get the color value stored in metadata
+     *
+     * @param string Default color value to return if not set
+     * @return mixed Color value from IMAP metadata or $default is not set
+     */
+    public function get_color($default = null)
+    {
+        // color is defined in folder METADATA
+        $metadata = $this->get_metadata(array(kolab_storage::COLOR_KEY_PRIVATE, kolab_storage::COLOR_KEY_SHARED));
+        if (($color = $metadata[kolab_storage::COLOR_KEY_PRIVATE]) || ($color = $metadata[kolab_storage::COLOR_KEY_SHARED])) {
+            return $color;
+        }
+
+        return $default;
+    }
+
+
+    /**
+     * Returns IMAP metadata/annotations (GETMETADATA/GETANNOTATION)
+     *
+     * @param array List of metadata keys to read
+     * @return array Metadata entry-value hash array on success, NULL on error
+     */
+    public function get_metadata($keys)
+    {
+        $metadata = rcube::get_instance()->get_storage()->get_metadata($this->name, (array)$keys);
+        return $metadata[$this->name];
+    }
+
+
+    /**
+     * Sets IMAP metadata/annotations (SETMETADATA/SETANNOTATION)
+     *
+     * @param array  $entries Entry-value array (use NULL value as NIL)
+     * @return boolean True on success, False on failure
+     */
+    public function set_metadata($entries)
+    {
+        return $this->imap->set_metadata($this->name, $entries);
+    }
+
+
+    /**
+     *
+     */
+    public function get_folder_info()
+    {
+        if (!isset($this->info))
+            $this->info = $this->imap->folder_info($this->name);
+
+        return $this->info;
+    }
+
+    /**
+     * Make IMAP folder data available for this folder
+     */
+    public function get_imap_data()
+    {
+        if (!isset($this->idata))
+            $this->idata = $this->imap->folder_data($this->name);
+
+        return $this->idata;
+    }
+
+
+    /**
+     * Get IMAP ACL information for this folder
+     *
+     * @return string  Permissions as string
+     */
+    public function get_myrights()
+    {
+        $rights = $this->info['rights'];
+
+        if (!is_array($rights))
+            $rights = $this->imap->my_rights($this->name);
+
+        return join('', (array)$rights);
+    }
+
+
+    /**
+     * Check activation status of this folder
+     *
+     * @return boolean True if enabled, false if not
+     */
+    public function is_active()
+    {
+        return kolab_storage::folder_is_active($this->name);
+    }
+
+    /**
+     * Change activation status of this folder
+     *
+     * @param boolean The desired subscription status: true = active, false = not active
+     *
+     * @return True on success, false on error
+     */
+    public function activate($active)
+    {
+        return $active ? kolab_storage::folder_activate($this->name) : kolab_storage::folder_deactivate($this->name);
+    }
+
+    /**
+     * Check subscription status of this folder
+     *
+     * @return boolean True if subscribed, false if not
+     */
+    public function is_subscribed()
+    {
+        return kolab_storage::folder_is_subscribed($this->name);
+    }
+
+    /**
+     * Change subscription status of this folder
+     *
+     * @param boolean The desired subscription status: true = subscribed, false = not subscribed
+     *
+     * @return True on success, false on error
+     */
+    public function subscribe($subscribed)
+    {
+        return $subscribed ? kolab_storage::folder_subscribe($this->name) : kolab_storage::folder_unsubscribe($this->name);
+    }
+
+    /**
+     * Return folder name as string representation of this object
+     *
+     * @return string Full IMAP folder name
+     */
+    public function __toString()
+    {
+        return $this->name;
+    }
+}
+

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_user.php Added

@@ -0,0 +1,135 @@
+<?php
+
+/**
+ * Class that represents a (virtual) folder in the 'other' namespace
+ * implementing a subset of the kolab_storage_folder API.
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+class kolab_storage_folder_user extends kolab_storage_folder_virtual
+{
+    protected static $ldapcache = array();
+
+    public $ldaprec;
+    public $type;
+
+    /**
+     * Default constructor
+     */
+    public function __construct($name, $parent = '', $ldaprec = null)
+    {
+        parent::__construct($name, $name, 'other', $parent);
+
+        if (!empty($ldaprec)) {
+            self::$ldapcache[$name] = $this->ldaprec = $ldaprec;
+        }
+        // use value cached in memory for repeated lookups
+        else if (array_key_exists($name, self::$ldapcache)) {
+            $this->ldaprec = self::$ldapcache[$name];
+        }
+        // lookup user in LDAP and set $this->ldaprec
+        else if ($ldap = kolab_storage::ldap()) {
+            // get domain from current user
+            list(,$domain) = explode('@', rcube::get_instance()->get_user_name());
+            $this->ldaprec = $ldap->get_user_record(parent::get_foldername($this->name) . '@' . $domain, $_SESSION['imap_host']);
+            if (!empty($this->ldaprec)) {
+                $this->ldaprec['kolabtargetfolder'] = $name;
+            }
+            self::$ldapcache[$name] = $this->ldaprec;
+        }
+    }
+
+    /**
+     * Getter for the top-end folder name to be displayed
+     *
+     * @return string Name of this folder
+     */
+    public function get_foldername()
+    {
+        return $this->ldaprec ? ($this->ldaprec['displayname'] ?: $this->ldaprec['name']) :
+            parent::get_foldername();
+    }
+
+    /**
+     * Getter for a more informative title of this user folder
+     *
+     * @return string Title for the given user record
+     */
+    public function get_title()
+    {
+      return trim($this->ldaprec['displayname'] . '; ' . $this->ldaprec['mail'], '; ');
+    }
+
+    /**
+     * Returns the owner of the folder.
+     *
+     * @return string  The owner of this folder.
+     */
+    public function get_owner()
+    {
+        return $this->ldaprec['mail'];
+    }
+
+    /**
+     * Check subscription status of this folder.
+     * Subscription of a virtual user folder depends on the subscriptions of subfolders.
+     *
+     * @return boolean True if subscribed, false if not
+     */
+    public function is_subscribed()
+    {
+        if (!empty($this->type)) {
+            $children = $subscribed = 0;
+            $delimiter = $this->imap->get_hierarchy_delimiter();
+            foreach ((array)kolab_storage::list_folders($this->name . $delimiter, '*', $this->type, false) as $subfolder) {
+                if (kolab_storage::folder_is_subscribed($subfolder)) {
+                    $subscribed++;
+                }
+                $children++;
+            }
+            if ($subscribed > 0) {
+                return $subscribed == $children ? true : 2;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Change subscription status of this folder
+     *
+     * @param boolean The desired subscription status: true = subscribed, false = not subscribed
+     *
+     * @return True on success, false on error
+     */
+    public function subscribe($subscribed)
+    {
+        $success = false;
+
+        // (un)subscribe all subfolders of a given type
+        if (!empty($this->type)) {
+            $delimiter = $this->imap->get_hierarchy_delimiter();
+            foreach ((array)kolab_storage::list_folders($this->name . $delimiter, '*', $this->type, false) as $subfolder) {
+                $success |= ($subscribed ? kolab_storage::folder_subscribe($subfolder) : kolab_storage::folder_unsubscribe($subfolder));
+            }
+        }
+
+        return $success;
+    }
+
+}
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_virtual.php Added

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Helper class that represents a virtual IMAP folder
+ * with a subset of the kolab_storage_folder API.
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+class kolab_storage_folder_virtual extends kolab_storage_folder_api
+{
+    public $virtual = true;
+
+    protected $displayname;
+
+    public function __construct($name, $dispname, $ns, $parent = '')
+    {
+        parent::__construct($name);
+
+        $this->namespace = $ns;
+        $this->parent    = $parent;
+        $this->displayname = $dispname;
+    }
+
+    /**
+     * Get the display name value of this folder
+     *
+     * @return string Folder name
+     */
+    public function get_name()
+    {
+        return $this->displayname ?: parent::get_name();
+    }
+
+    /**
+     * Get the color value stored in metadata
+     *
+     * @param string Default color value to return if not set
+     * @return mixed Color value from IMAP metadata or $default is not set
+     */
+    public function get_color($default = null)
+    {
+        return $default;
+    }
+}
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/libkolab.php Added

@@ -0,0 +1,138 @@
+<?php
+
+/**
+ * Kolab core library
+ *
+ * Plugin to setup a basic environment for the interaction with a Kolab server.
+ * Other Kolab-related plugins will depend on it and can use the library classes
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class libkolab extends rcube_plugin
+{
+    static $http_requests = array();
+
+    /**
+     * Required startup method of a Roundcube plugin
+     */
+    public function init()
+    {
+        // load local config
+        $this->load_config();
+
+        // extend include path to load bundled lib classes
+        $include_path = $this->home . '/lib' . PATH_SEPARATOR . ini_get('include_path');
+        set_include_path($include_path);
+
+        $this->add_hook('storage_init', array($this, 'storage_init'));
+        $this->add_hook('user_delete', array('kolab_storage', 'delete_user_folders'));
+
+        $rcmail = rcube::get_instance();
+        try {
+            kolab_format::$timezone = new DateTimeZone($rcmail->config->get('timezone', 'GMT'));
+        }
+        catch (Exception $e) {
+            rcube::raise_error($e, true);
+            kolab_format::$timezone = new DateTimeZone('GMT');
+        }
+    }
+
+    /**
+     * Hook into IMAP FETCH HEADER.FIELDS command and request Kolab-specific headers
+     */
+    function storage_init($p)
+    {
+        $p['fetch_headers'] = trim($p['fetch_headers'] .' X-KOLAB-TYPE X-KOLAB-MIME-VERSION');
+        return $p;
+    }
+
+    /**
+     * Wrapper function to load and initalize the HTTP_Request2 Object
+     *
+     * @param string|Net_Url2 Request URL
+     * @param string          Request method ('OPTIONS','GET','HEAD','POST','PUT','DELETE','TRACE','CONNECT')
+     * @param array           Configuration for this Request instance, that will be merged
+     *                        with default configuration
+     *
+     * @return HTTP_Request2 Request object
+     */
+    public static function http_request($url = '', $method = 'GET', $config = array())
+    {
+        $rcube       = rcube::get_instance();
+        $http_config = (array) $rcube->config->get('kolab_http_request');
+
+        // deprecated configuration options
+        if (empty($http_config)) {
+            foreach (array('ssl_verify_peer', 'ssl_verify_host') as $option) {
+                $value = $rcube->config->get('kolab_' . $option, true);
+                if (is_bool($value)) {
+                    $http_config[$option] = $value;
+                }
+            }
+        }
+
+        if (!empty($config)) {
+            $http_config = array_merge($http_config, $config);
+        }
+
+        $key = md5(serialize($http_config));
+
+        if (!($request = self::$http_requests[$key])) {
+            // load HTTP_Request2
+            require_once 'HTTP/Request2.php';
+
+            try {
+                $request = new HTTP_Request2();
+                $request->setConfig($http_config);
+            }
+            catch (Exception $e) {
+                rcube::raise_error($e, true, true);
+            }
+
+            // proxy User-Agent string
+            $request->setHeader('user-agent', $_SERVER['HTTP_USER_AGENT']);
+
+            self::$http_requests[$key] = $request;
+        }
+
+        // cleanup
+        try {
+            $request->setBody('');
+            $request->setUrl($url);
+            $request->setMethod($method);
+        }
+        catch (Exception $e) {
+            rcube::raise_error($e, true, true);
+        }
+
+        return $request;
+    }
+
+    /**
+     * Wrapper function for generating a html diff using the FineDiff class by Raymond Hill
+     */
+    public static function html_diff($from, $to)
+    {
+      include_once __dir__ . '/vendor/finediff.php';
+
+      $diff = new FineDiff($from, $to, FineDiff::$wordGranularity);
+      return $diff->renderDiffToHTML();
+    }
+}

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/vendor Added

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/vendor/finediff.php Added

@@ -0,0 +1,688 @@
+<?php
+/**
+* FINE granularity DIFF
+*
+* Computes a set of instructions to convert the content of
+* one string into another.
+*
+* Copyright (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
+*
+* Licensed under The MIT License
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*
+* @copyright Copyright 2011 (c) Raymond Hill (http://raymondhill.net/blog/?p=441)
+* @link http://www.raymondhill.net/finediff/
+* @version 0.6
+* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+*/
+
+/**
+* Usage (simplest):
+*
+*   include 'finediff.php';
+*
+*   // for the stock stack, granularity values are:
+*   // FineDiff::$paragraphGranularity = paragraph/line level
+*   // FineDiff::$sentenceGranularity = sentence level
+*   // FineDiff::$wordGranularity = word level
+*   // FineDiff::$characterGranularity = character level [default]
+*
+*   $opcodes = FineDiff::getDiffOpcodes($from_text, $to_text [, $granularityStack = null] );
+*   // store opcodes for later use...
+*
+*   ...
+*
+*   // restore $to_text from $from_text + $opcodes
+*   include 'finediff.php';
+*   $to_text = FineDiff::renderToTextFromOpcodes($from_text, $opcodes);
+*
+*   ...
+*/
+
+/**
+* Persisted opcodes (string) are a sequence of atomic opcode.
+* A single opcode can be one of the following:
+*   c | c{n} | d | d{n} | i:{c} | i{length}:{s}
+*   'c'        = copy one character from source
+*   'c{n}'     = copy n characters from source
+*   'd'        = skip one character from source
+*   'd{n}'     = skip n characters from source
+*   'i:{c}     = insert character 'c'
+*   'i{n}:{s}' = insert string s, which is of length n
+*
+* Do not exist as of now, under consideration:
+*   'm{n}:{o}  = move n characters from source o characters ahead.
+*   It would be essentially a shortcut for a delete->copy->insert
+*   command (swap) for when the inserted segment is exactly the same
+*   as the deleted one, and with only a copy operation in between.
+*   TODO: How often this case occurs? Is it worth it? Can only
+*   be done as a postprocessing method (->optimize()?)
+*/
+abstract class FineDiffOp {
+	abstract public function getFromLen();
+	abstract public function getToLen();
+	abstract public function getOpcode();
+	}
+
+class FineDiffDeleteOp extends FineDiffOp {
+	public function __construct($len) {
+		$this->fromLen = $len;
+		}
+	public function getFromLen() {
+		return $this->fromLen;
+		}
+	public function getToLen() {
+		return 0;
+		}
+	public function getOpcode() {
+		if ( $this->fromLen === 1 ) {
+			return 'd';
+			}
+		return "d{$this->fromLen}";
+		}
+	}
+
+class FineDiffInsertOp extends FineDiffOp {
+	public function __construct($text) {
+		$this->text = $text;
+		}
+	public function getFromLen() {
+		return 0;
+		}
+	public function getToLen() {
+		return strlen($this->text);
+		}
+	public function getText() {
+		return $this->text;
+		}
+	public function getOpcode() {
+		$to_len = strlen($this->text);
+		if ( $to_len === 1 ) {
+			return "i:{$this->text}";
+			}
+		return "i{$to_len}:{$this->text}";
+		}
+	}
+
+class FineDiffReplaceOp extends FineDiffOp {
+	public function __construct($fromLen, $text) {
+		$this->fromLen = $fromLen;
+		$this->text = $text;
+		}
+	public function getFromLen() {
+		return $this->fromLen;
+		}
+	public function getToLen() {
+		return strlen($this->text);
+		}
+	public function getText() {
+		return $this->text;
+		}
+	public function getOpcode() {
+		if ( $this->fromLen === 1 ) {
+			$del_opcode = 'd';
+			}
+		else {
+			$del_opcode = "d{$this->fromLen}";
+			}
+		$to_len = strlen($this->text);
+		if ( $to_len === 1 ) {
+			return "{$del_opcode}i:{$this->text}";
+			}
+		return "{$del_opcode}i{$to_len}:{$this->text}";
+		}
+	}
+
+class FineDiffCopyOp extends FineDiffOp {
+	public function __construct($len) {
+		$this->len = $len;
+		}
+	public function getFromLen() {
+		return $this->len;
+		}
+	public function getToLen() {
+		return $this->len;
+		}
+	public function getOpcode() {
+		if ( $this->len === 1 ) {
+			return 'c';
+			}
+		return "c{$this->len}";
+		}
+	public function increase($size) {
+		return $this->len += $size;
+		}
+	}
+
+/**
+* FineDiff ops
+*
+* Collection of ops
+*/
+class FineDiffOps {
+	public function appendOpcode($opcode, $from, $from_offset, $from_len) {
+		if ( $opcode === 'c' ) {
+			$edits[] = new FineDiffCopyOp($from_len);
+			}
+		else if ( $opcode === 'd' ) {
+			$edits[] = new FineDiffDeleteOp($from_len);
+			}
+		else /* if ( $opcode === 'i' ) */ {
+			$edits[] = new FineDiffInsertOp(substr($from, $from_offset, $from_len));
+			}
+		}
+	public $edits = array();
+	}
+
+/**
+* FineDiff class
+*
+* TODO: Document
+*
+*/
+class FineDiff {
+
+	/**------------------------------------------------------------------------
+	*
+	* Public section
+	*
+	*/
+
+	/**
+	* Constructor
+	* ...
+	* The $granularityStack allows FineDiff to be configurable so that
+	* a particular stack tailored to the specific content of a document can
+	* be passed.
+	*/
+	public function __construct($from_text = '', $to_text = '', $granularityStack = null) {
+		// setup stack for generic text documents by default
+		$this->granularityStack = $granularityStack ? $granularityStack : FineDiff::$characterGranularity;
+		$this->edits = array();
+		$this->from_text = $from_text;
+		$this->doDiff($from_text, $to_text);
+		}
+
+	public function getOps() {
+		return $this->edits;
+		}
+
+	public function getOpcodes() {
+		$opcodes = array();
+		foreach ( $this->edits as $edit ) {
+			$opcodes[] = $edit->getOpcode();
+			}
+		return implode('', $opcodes);
+		}
+
+	public function renderDiffToHTML() {
+		$in_offset = 0;
+		$html = '';
+		foreach ( $this->edits as $edit ) {
+			$n = $edit->getFromLen();
+			if ( $edit instanceof FineDiffCopyOp ) {
+				$html .= FineDiff::renderDiffToHTMLFromOpcode('c', $this->from_text, $in_offset, $n);
+				}
+			else if ( $edit instanceof FineDiffDeleteOp ) {
+				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
+				}
+			else if ( $edit instanceof FineDiffInsertOp ) {
+				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
+				}
+			else /* if ( $edit instanceof FineDiffReplaceOp ) */ {
+				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
+				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
+				}
+			$in_offset += $n;
+			}
+		return $html;
+		}
+
+	/**------------------------------------------------------------------------
+	* Return an opcodes string describing the diff between a "From" and a
+	* "To" string
+	*/
+	public static function getDiffOpcodes($from, $to, $granularities = null) {
+		$diff = new FineDiff($from, $to, $granularities);
+		return $diff->getOpcodes();
+		}
+
+	/**------------------------------------------------------------------------
+	* Return an iterable collection of diff ops from an opcodes string
+	*/
+	public static function getDiffOpsFromOpcodes($opcodes) {
+		$diffops = new FineDiffOps();
+		FineDiff::renderFromOpcodes(null, $opcodes, array($diffops,'appendOpcode'));
+		return $diffops->edits;
+		}
+
+	/**------------------------------------------------------------------------
+	* Re-create the "To" string from the "From" string and an "Opcodes" string
+	*/
+	public static function renderToTextFromOpcodes($from, $opcodes) {
+		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderToTextFromOpcode'));
+		}
+
+	/**------------------------------------------------------------------------
+	* Render the diff to an HTML string
+	*/
+	public static function renderDiffToHTMLFromOpcodes($from, $opcodes) {
+		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderDiffToHTMLFromOpcode'));
+		}
+
+	/**------------------------------------------------------------------------
+	* Generic opcodes parser, user must supply callback for handling
+	* single opcode
+	*/
+	public static function renderFromOpcodes($from, $opcodes, $callback) {
+		if ( !is_callable($callback) ) {
+			return '';
+			}
+		$out = '';
+		$opcodes_len = strlen($opcodes);
+		$from_offset = $opcodes_offset = 0;
+		while ( $opcodes_offset <  $opcodes_len ) {
+			$opcode = substr($opcodes, $opcodes_offset, 1);
+			$opcodes_offset++;
+			$n = intval(substr($opcodes, $opcodes_offset));
+			if ( $n ) {
+				$opcodes_offset += strlen(strval($n));
+				}
+			else {
+				$n = 1;
+				}
+			if ( $opcode === 'c' ) { // copy n characters from source
+				$out .= call_user_func($callback, 'c', $from, $from_offset, $n, '');
+				$from_offset += $n;
+				}
+			else if ( $opcode === 'd' ) { // delete n characters from source
+				$out .= call_user_func($callback, 'd', $from, $from_offset, $n, '');
+				$from_offset += $n;
+				}
+			else /* if ( $opcode === 'i' ) */ { // insert n characters from opcodes
+				$out .= call_user_func($callback, 'i', $opcodes, $opcodes_offset + 1, $n);
+				$opcodes_offset += 1 + $n;
+				}
+			}
+		return $out;
+		}
+
+	/**
+	* Stock granularity stacks and delimiters
+	*/
+
+	const paragraphDelimiters = "\n\r";
+	public static $paragraphGranularity = array(
+		FineDiff::paragraphDelimiters
+		);
+	const sentenceDelimiters = ".\n\r";
+	public static $sentenceGranularity = array(
+		FineDiff::paragraphDelimiters,
+		FineDiff::sentenceDelimiters
+		);
+	const wordDelimiters = " \t.\n\r";
+	public static $wordGranularity = array(
+		FineDiff::paragraphDelimiters,
+		FineDiff::sentenceDelimiters,
+		FineDiff::wordDelimiters
+		);
+	const characterDelimiters = "";
+	public static $characterGranularity = array(
+		FineDiff::paragraphDelimiters,
+		FineDiff::sentenceDelimiters,
+		FineDiff::wordDelimiters,
+		FineDiff::characterDelimiters
+		);
+
+	public static $textStack = array(
+		".",
+		" \t.\n\r",
+		""
+		);
+
+	/**------------------------------------------------------------------------
+	*
+	* Private section
+	*
+	*/
+
+	/**
+	* Entry point to compute the diff.
+	*/
+	private function doDiff($from_text, $to_text) {
+		$this->last_edit = false;
+		$this->stackpointer = 0;
+		$this->from_text = $from_text;
+		$this->from_offset = 0;
+		// can't diff without at least one granularity specifier
+		if ( empty($this->granularityStack) ) {
+			return;
+			}
+		$this->_processGranularity($from_text, $to_text);
+		}
+
+	/**
+	* This is the recursive function which is responsible for
+	* handling/increasing granularity.
+	*
+	* Incrementally increasing the granularity is key to compute the
+	* overall diff in a very efficient way.
+	*/
+	private function _processGranularity($from_segment, $to_segment) {
+		$delimiters = $this->granularityStack[$this->stackpointer++];
+		$has_next_stage = $this->stackpointer < count($this->granularityStack);
+		foreach ( FineDiff::doFragmentDiff($from_segment, $to_segment, $delimiters) as $fragment_edit ) {
+			// increase granularity
+			if ( $fragment_edit instanceof FineDiffReplaceOp && $has_next_stage ) {
+				$this->_processGranularity(
+					substr($this->from_text, $this->from_offset, $fragment_edit->getFromLen()),
+					$fragment_edit->getText()
+					);
+				}
+			// fuse copy ops whenever possible
+			else if ( $fragment_edit instanceof FineDiffCopyOp && $this->last_edit instanceof FineDiffCopyOp ) {
+				$this->edits[count($this->edits)-1]->increase($fragment_edit->getFromLen());
+				$this->from_offset += $fragment_edit->getFromLen();
+				}
+			else {
+				/* $fragment_edit instanceof FineDiffCopyOp */
+				/* $fragment_edit instanceof FineDiffDeleteOp */
+				/* $fragment_edit instanceof FineDiffInsertOp */
+				$this->edits[] = $this->last_edit = $fragment_edit;
+				$this->from_offset += $fragment_edit->getFromLen();
+				}
+			}
+		$this->stackpointer--;
+		}
+
+	/**
+	* This is the core algorithm which actually perform the diff itself,
+	* fragmenting the strings as per specified delimiters.
+	*
+	* This function is naturally recursive, however for performance purpose
+	* a local job queue is used instead of outright recursivity.
+	*/
+	private static function doFragmentDiff($from_text, $to_text, $delimiters) {
+		// Empty delimiter means character-level diffing.
+		// In such case, use code path optimized for character-level
+		// diffing.
+		if ( empty($delimiters) ) {
+			return FineDiff::doCharDiff($from_text, $to_text);
+			}
+
+		$result = array();
+
+		// fragment-level diffing
+		$from_text_len = strlen($from_text);
+		$to_text_len = strlen($to_text);
+		$from_fragments = FineDiff::extractFragments($from_text, $delimiters);
+		$to_fragments = FineDiff::extractFragments($to_text, $delimiters);
+
+		$jobs = array(array(0, $from_text_len, 0, $to_text_len));
+
+		$cached_array_keys = array();
+
+		while ( $job = array_pop($jobs) ) {
+
+			// get the segments which must be diff'ed
+			list($from_segment_start, $from_segment_end, $to_segment_start, $to_segment_end) = $job;
+
+			// catch easy cases first
+			$from_segment_length = $from_segment_end - $from_segment_start;
+			$to_segment_length = $to_segment_end - $to_segment_start;
+			if ( !$from_segment_length || !$to_segment_length ) {
+				if ( $from_segment_length ) {
+					$result[$from_segment_start * 4] = new FineDiffDeleteOp($from_segment_length);
+					}
+				else if ( $to_segment_length ) {
+					$result[$from_segment_start * 4 + 1] = new FineDiffInsertOp(substr($to_text, $to_segment_start, $to_segment_length));
+					}
+				continue;
+				}
+
+			// find longest copy operation for the current segments
+			$best_copy_length = 0;
+
+			$from_base_fragment_index = $from_segment_start;
+
+			$cached_array_keys_for_current_segment = array();
+
+			while ( $from_base_fragment_index < $from_segment_end ) {
+				$from_base_fragment = $from_fragments[$from_base_fragment_index];
+				$from_base_fragment_length = strlen($from_base_fragment);
+				// performance boost: cache array keys
+				if ( !isset($cached_array_keys_for_current_segment[$from_base_fragment]) ) {
+					if ( !isset($cached_array_keys[$from_base_fragment]) ) {
+						$to_all_fragment_indices = $cached_array_keys[$from_base_fragment] = array_keys($to_fragments, $from_base_fragment, true);
+						}
+					else {
+						$to_all_fragment_indices = $cached_array_keys[$from_base_fragment];
+						}
+					// get only indices which falls within current segment
+					if ( $to_segment_start > 0 || $to_segment_end < $to_text_len ) {
+						$to_fragment_indices = array();
+						foreach ( $to_all_fragment_indices as $to_fragment_index ) {
+							if ( $to_fragment_index < $to_segment_start ) { continue; }
+							if ( $to_fragment_index >= $to_segment_end ) { break; }
+							$to_fragment_indices[] = $to_fragment_index;
+							}
+						$cached_array_keys_for_current_segment[$from_base_fragment] = $to_fragment_indices;
+						}
+					else {
+						$to_fragment_indices = $to_all_fragment_indices;
+						}
+					}
+				else {
+					$to_fragment_indices = $cached_array_keys_for_current_segment[$from_base_fragment];
+					}
+				// iterate through collected indices
+				foreach ( $to_fragment_indices as $to_base_fragment_index ) {
+					$fragment_index_offset = $from_base_fragment_length;
+					// iterate until no more match
+					for (;;) {
+						$fragment_from_index = $from_base_fragment_index + $fragment_index_offset;
+						if ( $fragment_from_index >= $from_segment_end ) {
+							break;
+							}
+						$fragment_to_index = $to_base_fragment_index + $fragment_index_offset;
+						if ( $fragment_to_index >= $to_segment_end ) {
+							break;
+							}
+						if ( $from_fragments[$fragment_from_index] !== $to_fragments[$fragment_to_index] ) {
+							break;
+							}
+						$fragment_length = strlen($from_fragments[$fragment_from_index]);
+						$fragment_index_offset += $fragment_length;
+						}
+					if ( $fragment_index_offset > $best_copy_length ) {
+						$best_copy_length = $fragment_index_offset;
+						$best_from_start = $from_base_fragment_index;
+						$best_to_start = $to_base_fragment_index;
+						}
+					}
+				$from_base_fragment_index += strlen($from_base_fragment);
+				// If match is larger than half segment size, no point trying to find better
+				// TODO: Really?
+				if ( $best_copy_length >= $from_segment_length / 2) {
+					break;
+					}
+				// no point to keep looking if what is left is less than
+				// current best match
+				if ( $from_base_fragment_index + $best_copy_length >= $from_segment_end ) {
+					break;
+					}
+				}
+
+			if ( $best_copy_length ) {
+				$jobs[] = array($from_segment_start, $best_from_start, $to_segment_start, $best_to_start);
+				$result[$best_from_start * 4 + 2] = new FineDiffCopyOp($best_copy_length);
+				$jobs[] = array($best_from_start + $best_copy_length, $from_segment_end, $best_to_start + $best_copy_length, $to_segment_end);
+				}
+			else {
+				$result[$from_segment_start * 4 ] = new FineDiffReplaceOp($from_segment_length, substr($to_text, $to_segment_start, $to_segment_length));
+				}
+			}
+
+		ksort($result, SORT_NUMERIC);
+		return array_values($result);
+		}
+
+	/**
+	* Perform a character-level diff.
+	*
+	* The algorithm is quite similar to doFragmentDiff(), except that
+	* the code path is optimized for character-level diff -- strpos() is
+	* used to find out the longest common subequence of characters.
+	*
+	* We try to find a match using the longest possible subsequence, which
+	* is at most the length of the shortest of the two strings, then incrementally
+	* reduce the size until a match is found.
+	*
+	* I still need to study more the performance of this function. It
+	* appears that for long strings, the generic doFragmentDiff() is more
+	* performant. For word-sized strings, doCharDiff() is somewhat more
+	* performant.
+	*/
+	private static function doCharDiff($from_text, $to_text) {
+		$result = array();
+		$jobs = array(array(0, strlen($from_text), 0, strlen($to_text)));
+		while ( $job = array_pop($jobs) ) {
+			// get the segments which must be diff'ed
+			list($from_segment_start, $from_segment_end, $to_segment_start, $to_segment_end) = $job;
+			$from_segment_len = $from_segment_end - $from_segment_start;
+			$to_segment_len = $to_segment_end - $to_segment_start;
+
+			// catch easy cases first
+			if ( !$from_segment_len || !$to_segment_len ) {
+				if ( $from_segment_len ) {
+					$result[$from_segment_start * 4 + 0] = new FineDiffDeleteOp($from_segment_len);
+					}
+				else if ( $to_segment_len ) {
+					$result[$from_segment_start * 4 + 1] = new FineDiffInsertOp(substr($to_text, $to_segment_start, $to_segment_len));
+					}
+				continue;
+				}
+			if ( $from_segment_len >= $to_segment_len ) {
+				$copy_len = $to_segment_len;
+				while ( $copy_len ) {
+					$to_copy_start = $to_segment_start;
+					$to_copy_start_max = $to_segment_end - $copy_len;
+					while ( $to_copy_start <= $to_copy_start_max ) {
+						$from_copy_start = strpos(substr($from_text, $from_segment_start, $from_segment_len), substr($to_text, $to_copy_start, $copy_len));
+						if ( $from_copy_start !== false ) {
+							$from_copy_start += $from_segment_start;
+							break 2;
+							}
+						$to_copy_start++;
+						}
+					$copy_len--;
+					}
+				}
+			else {
+				$copy_len = $from_segment_len;
+				while ( $copy_len ) {
+					$from_copy_start = $from_segment_start;
+					$from_copy_start_max = $from_segment_end - $copy_len;
+					while ( $from_copy_start <= $from_copy_start_max ) {
+						$to_copy_start = strpos(substr($to_text, $to_segment_start, $to_segment_len), substr($from_text, $from_copy_start, $copy_len));
+						if ( $to_copy_start !== false ) {
+							$to_copy_start += $to_segment_start;
+							break 2;
+							}
+						$from_copy_start++;
+						}
+					$copy_len--;
+					}
+				}
+			// match found
+			if ( $copy_len ) {
+				$jobs[] = array($from_segment_start, $from_copy_start, $to_segment_start, $to_copy_start);
+				$result[$from_copy_start * 4 + 2] = new FineDiffCopyOp($copy_len);
+				$jobs[] = array($from_copy_start + $copy_len, $from_segment_end, $to_copy_start + $copy_len, $to_segment_end);
+				}
+			// no match,  so delete all, insert all
+			else {
+				$result[$from_segment_start * 4] = new FineDiffReplaceOp($from_segment_len, substr($to_text, $to_segment_start, $to_segment_len));
+				}
+			}
+		ksort($result, SORT_NUMERIC);
+		return array_values($result);
+		}
+
+	/**
+	* Efficiently fragment the text into an array according to
+	* specified delimiters.
+	* No delimiters means fragment into single character.
+	* The array indices are the offset of the fragments into
+	* the input string.
+	* A sentinel empty fragment is always added at the end.
+	* Careful: No check is performed as to the validity of the
+	* delimiters.
+	*/
+	private static function extractFragments($text, $delimiters) {
+		// special case: split into characters
+		if ( empty($delimiters) ) {
+			$chars = str_split($text, 1);
+			$chars[strlen($text)] = '';
+			return $chars;
+			}
+		$fragments = array();
+		$start = $end = 0;
+		for (;;) {
+			$end += strcspn($text, $delimiters, $end);
+			$end += strspn($text, $delimiters, $end);
+			if ( $end === $start ) {
+				break;
+				}
+			$fragments[$start] = substr($text, $start, $end - $start);
+			$start = $end;
+			}
+		$fragments[$start] = '';
+		return $fragments;
+		}
+
+	/**
+	* Stock opcode renderers
+	*/
+	private static function renderToTextFromOpcode($opcode, $from, $from_offset, $from_len) {
+		if ( $opcode === 'c' || $opcode === 'i' ) {
+			return substr($from, $from_offset, $from_len);
+			}
+		return '';
+		}
+
+	private static function renderDiffToHTMLFromOpcode($opcode, $from, $from_offset, $from_len) {
+		if ( $opcode === 'c' ) {
+			return htmlentities(substr($from, $from_offset, $from_len));
+			}
+		else if ( $opcode === 'd' ) {
+			$deletion = substr($from, $from_offset, $from_len);
+			if ( strcspn($deletion, " \n\r") === 0 ) {
+				$deletion = str_replace(array("\n","\r"), array('\n','\r'), $deletion);
+				}
+			return '<del>' . htmlentities($deletion) . '</del>';
+			}
+		else /* if ( $opcode === 'i' ) */ {
+ 			return '<ins>' . htmlentities(substr($from, $from_offset, $from_len)) . '</ins>';
+			}
+		return '';
+		}
+	}
+

iRony-0.4.4.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/vendor/finediff_modifications.diff Added

@@ -0,0 +1,121 @@
+--- finediff.php.orig	2014-07-29 14:24:10.000000000 +0200
++++ finediff.php	2014-07-29 14:30:38.000000000 +0200
+@@ -234,25 +234,25 @@
+ 
+ 	public function renderDiffToHTML() {
+ 		$in_offset = 0;
+-		ob_start();
++		$html = '';
+ 		foreach ( $this->edits as $edit ) {
+ 			$n = $edit->getFromLen();
+ 			if ( $edit instanceof FineDiffCopyOp ) {
+-				FineDiff::renderDiffToHTMLFromOpcode('c', $this->from_text, $in_offset, $n);
++				$html .= FineDiff::renderDiffToHTMLFromOpcode('c', $this->from_text, $in_offset, $n);
+ 				}
+ 			else if ( $edit instanceof FineDiffDeleteOp ) {
+-				FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
++				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
+ 				}
+ 			else if ( $edit instanceof FineDiffInsertOp ) {
+-				FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
++				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
+ 				}
+ 			else /* if ( $edit instanceof FineDiffReplaceOp ) */ {
+-				FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
+-				FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
++				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
++				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
+ 				}
+ 			$in_offset += $n;
+ 			}
+-		return ob_get_clean();
++		return $html;
+ 		}
+ 
+ 	/**------------------------------------------------------------------------
+@@ -277,18 +277,14 @@
+ 	* Re-create the "To" string from the "From" string and an "Opcodes" string
+ 	*/
+ 	public static function renderToTextFromOpcodes($from, $opcodes) {
+-		ob_start();
+-		FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderToTextFromOpcode'));
+-		return ob_get_clean();
++		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderToTextFromOpcode'));
+ 		}
+ 
+ 	/**------------------------------------------------------------------------
+ 	* Render the diff to an HTML string
+ 	*/
+ 	public static function renderDiffToHTMLFromOpcodes($from, $opcodes) {
+-		ob_start();
+-		FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderDiffToHTMLFromOpcode'));
+-		return ob_get_clean();
++		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderDiffToHTMLFromOpcode'));
+ 		}
+ 
+ 	/**------------------------------------------------------------------------
+@@ -297,8 +293,9 @@
+ 	*/
+ 	public static function renderFromOpcodes($from, $opcodes, $callback) {
+ 		if ( !is_callable($callback) ) {
+-			return;
++			return '';
+ 			}
++		$out = '';
+ 		$opcodes_len = strlen($opcodes);
+ 		$from_offset = $opcodes_offset = 0;
+ 		while ( $opcodes_offset <  $opcodes_len ) {
+@@ -312,18 +309,19 @@
+ 				$n = 1;
+ 				}
+ 			if ( $opcode === 'c' ) { // copy n characters from source
+-				call_user_func($callback, 'c', $from, $from_offset, $n, '');
++				$out .= call_user_func($callback, 'c', $from, $from_offset, $n, '');
+ 				$from_offset += $n;
+ 				}
+ 			else if ( $opcode === 'd' ) { // delete n characters from source
+-				call_user_func($callback, 'd', $from, $from_offset, $n, '');
++				$out .= call_user_func($callback, 'd', $from, $from_offset, $n, '');
+ 				$from_offset += $n;
+ 				}
+ 			else /* if ( $opcode === 'i' ) */ { // insert n characters from opcodes
+-				call_user_func($callback, 'i', $opcodes, $opcodes_offset + 1, $n);
++				$out .= call_user_func($callback, 'i', $opcodes, $opcodes_offset + 1, $n);
+ 				$opcodes_offset += 1 + $n;
+ 				}
+ 			}
++		return $out;
+ 		}
+ 
+ 	/**
+@@ -665,24 +663,26 @@
+ 	*/
+ 	private static function renderToTextFromOpcode($opcode, $from, $from_offset, $from_len) {
+ 		if ( $opcode === 'c' || $opcode === 'i' ) {
+-			echo substr($from, $from_offset, $from_len);
++			return substr($from, $from_offset, $from_len);
+ 			}
++		return '';
+ 		}
+ 
+ 	private static function renderDiffToHTMLFromOpcode($opcode, $from, $from_offset, $from_len) {
+ 		if ( $opcode === 'c' ) {
+-			echo htmlentities(substr($from, $from_offset, $from_len));
++			return htmlentities(substr($from, $from_offset, $from_len));
+ 			}
+ 		else if ( $opcode === 'd' ) {
+ 			$deletion = substr($from, $from_offset, $from_len);
+ 			if ( strcspn($deletion, " \n\r") === 0 ) {
+ 				$deletion = str_replace(array("\n","\r"), array('\n','\r'), $deletion);
+ 				}
+-			echo '<del>', htmlentities($deletion), '</del>';
++			return '<del>' . htmlentities($deletion) . '</del>';
+ 			}
+ 		else /* if ( $opcode === 'i' ) */ {
+- 			echo '<ins>', htmlentities(substr($from, $from_offset, $from_len)), '</ins>';
++ 			return '<ins>' . htmlentities(substr($from, $from_offset, $from_len)) . '</ins>';
+ 			}
++		return '';
+ 		}
+ 	}
+

iRony-0.4.3.tar.gz/lib/FileAPI/drivers/seafile/seafile_api.php -> iRony-0.4.4.tar.gz/lib/FileAPI/drivers/seafile/seafile_api.php Changed

@@ -77,31 +77,16 @@
      */
     protected $token;
 
-    /**
-     * API URL prefix (schema and host[:port])
-     *
-     * @var string
-     */
-    protected $url_prefix;
-
 
     public function __construct($config = array())
     {
         $this->config = $config;
-        $this->token  = $config['token'];
 
         // set Web API URI
-        $this->url = rtrim(trim($config['host']), '/') ?: 'localhost';
-
-        if (!preg_match('|^https?://|i', $this->url)) {
-            $this->url = 'https://' . $this->url;
-        }
-
+        $this->url = rtrim('https://' . ($config['host'] ?: 'localhost'), '/');
         if (!preg_match('|/api2$|', $this->url)) {
             $this->url .= '/api2/';
         }
-
-        $this->url_prefix = preg_replace('|^(https?://[^/]+).*$|i', '\\1', $this->url);
     }
 
     /**
@@ -124,10 +109,6 @@
             'ssl_cafile', 'ssl_capath', 'ssl_local_cert', 'ssl_passphrase'
         )));
 
-        // force CURL adapter, this allows to handle correctly
-        // compressed responses with simple SplObserver registered
-        $config['adapter'] = 'HTTP_Request2_Adapter_Curl';
-
         try {
             $request = new HTTP_Request2();
             $request->setConfig($config);
@@ -143,29 +124,21 @@
     /**
      * Send HTTP request
      *
-     * @param string $method  Request method ('OPTIONS','GET','HEAD','POST','PUT','DELETE','TRACE','CONNECT')
-     * @param string $url     Request API URL
-     * @param array  $get     GET parameters
-     * @param array  $post    POST parameters
-     * @param array  $upload  Uploaded files data
-     * @param string $version API version (to replace "api2" with "api/v$version" in the URL
+     * @param string $method Request method ('OPTIONS','GET','HEAD','POST','PUT','DELETE','TRACE','CONNECT')
+     * @param string $url    Request API URL
+     * @param array  $get    GET parameters
+     * @param array  $post   POST parameters
+     * @param array  $upload Uploaded files data
      *
      * @return string|array Server response
      */
-    protected function request($method, $url, $get = null, $post = null, $upload = null, $version = null)
+    protected function request($method, $url, $get = null, $post = null, $upload = null)
     {
         if (!preg_match('/^https?:\/\//', $url)) {
             $url = $this->url . $url;
             // Note: It didn't work for me without the last backslash
             $url = rtrim($url, '/') . '/';
         }
-        else {
-            $url = $this->mod_url($url);
-        }
-
-        if ($version && $version != 2) {
-            $url = str_replace('/api2/', "/api/v$version/", $url);
-        }
 
         if (!$this->request) {
             $this->config['store_body']       = true;
@@ -219,16 +192,6 @@
             $this->request->setUrl($_url);
         }
 
-        // HTTP_Request2 does not support POST params on PUT requests
-        if (!empty($post) && $method == 'PUT') {
-            $body = http_build_query($post, '', '&');
-            $body = str_replace('%7E', '~', $body); // support RFC 3986 by not encoding '~' symbol
-            $post = null;
-
-            $this->request->setBody($body);
-            $this->request->setHeader('content-type', 'application/x-www-form-urlencoded');
-        }
-
         if (!empty($post)) {
             $this->request->addPostParameter($post);
         }
@@ -272,22 +235,8 @@
             }
         }
 
-        if ($this->status < 400) {
-            $body = @json_decode($body, true);
-        }
-
-        // Sometimes we can get an error with response code 200
-        if ($this->status == 200
-            && ($method == 'PUT' || $method == 'POST')
-            && !empty($body) && is_array($body) && !empty($body['failed']) && empty($body['success'])
-        ) {
-            // Note: $body['failed'] is an array where each element is an array with 'error_msg' item
-            // TODO: Support partial success/error result
-            $this->status = 520;
-        }
-
         // decode response
-        return $this->status >= 400 ? false : $body;
+        return $this->status >= 400 ? false : @json_decode($body, true);
     }
 
     /**
@@ -426,14 +375,12 @@
     /**
      * List directory entries (files and directories)
      *
-     * @param string $repo_id   Library identifier
-     * @param string $dir       Directory name (with path)
-     * @param string $type      Entry type ('dir' or 'file') (requires Seafile 4.4.1)
-     * @param bool   $recursive Enable recursive call for 'dir' listing (requires Seafile 4.4.1)
+     * @param string $repo_id Library identifier
+     * @param string $dir     Directory name (with path)
      *
      * @return bool|array List of directories/files on success, False on failure
      */
-    public function directory_entries($repo_id, $dir, $type = null, $recursive = false)
+    public function directory_entries($repo_id, $dir)
     {
         // sanity checks
         if (!is_string($dir)) {
@@ -463,43 +410,7 @@
         //    "name": "test_dir"
         // }]
 
-        $params = array('p' => $dir);
-
-        if ($type) {
-            $params['t'] = $type == 'dir' ? 'd' : 'f';
-        }
-
-        if ($recursive && $type == 'dir') {
-            $params['recursive'] = 1;
-        }
-
-        return $this->request('GET', "repos/$repo_id/dir", $params);
-    }
-
-    /**
-     * Get directory information.
-     *
-     * @param string $repo_id Library identifier
-     * @param string $dir     Directory name (with path)
-     *
-     * @return bool|array Directory properties on success, False on failure
-     */
-    public function directory_info($repo_id, $dir)
-    {
-        // sanity checks
-        if (!is_string($dir)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($repo_id === '' || !is_string($repo_id)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        $params = array('path' => $dir);
-
-        return $this->request('GET', "repos/$repo_id/dir/detail", $params, null, null, '2.1');
+        return $this->request('GET', "repos/$repo_id/dir", array('p' => $dir));
     }
 
     /**
@@ -935,471 +846,4 @@
 
         return $this->is_error() === false;
     }
-
-    /**
-     * Share a directory (or library)
-     *
-     * @param string $repo_id Library identifier
-     * @param string $dir     Directory name (with path)
-     * @param string $right   Permission ('r' or 'rw' or 'admin')
-     * @param string $mode    Mode ('user' or 'group')
-     * @param string $who     Username or Group ID
-     * @param bool   $update  Update an existing entry
-     *
-     * @return bool True on success, False on failure
-     */
-    public function shared_item_add($repo_id, $dir, $right, $mode, $who, $update = false)
-    {
-        // sanity checks
-        if (!is_string($dir)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($repo_id === '' || !is_string($repo_id)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($mode != 'user' && $mode != 'group') {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($right != 'r' && $right != 'rw' && $right != 'admin') {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($dir === '') {
-            $dir = '/';
-        }
-
-        $post = array(
-            'permission' => $right,
-            'share_type' => $mode,
-        );
-
-        $post[$mode == 'group' ? 'group_id' : 'username'] = $who;
-
-        $this->request($update ? 'POST' : 'PUT', "repos/$repo_id/dir/shared_items", array('p' => $dir), $post);
-
-        return $this->is_error() === false;
-    }
-
-    /**
-     * Update shared item permissions
-     *
-     * @param string $repo_id Library identifier
-     * @param string $dir     Directory name (with path)
-     * @param string $right   Permission ('r' or 'rw' or 'admin')
-     * @param string $mode    Mode ('user' or 'group')
-     * @param string $who     Username or Group ID
-     *
-     * @return bool True on success, False on failure
-     */
-    public function shared_item_update($repo_id, $dir, $right, $mode, $who)
-    {
-        return $this->shared_item_add($repo_id, $dir, $right, $mode, $who, true);
-    }
-
-    /**
-     * Un-Share a directory (or library)
-     *
-     * @param string $repo_id Library identifier
-     * @param string $dir     Directory name (with path)
-     * @param string $mode    Mode ('user' or 'group')
-     * @param string $who     Username or Group ID
-     *
-     * @return bool True on success, False on failure
-     */
-    public function shared_item_delete($repo_id, $dir, $mode, $who)
-    {
-        // sanity checks
-        if (!is_string($dir)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($repo_id === '' || !is_string($repo_id)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($mode != 'user' && $mode != 'group') {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($dir === '') {
-            $dir = '/';
-        }
-
-        $get = array(
-            'share_type' => $mode,
-            'p'          => $dir
-        );
-
-        $get[$mode == 'group' ? 'group_id' : 'username'] = $who;
-
-        $this->request('DELETE', "repos/$repo_id/dir/shared_items", $get);
-
-        return $this->is_error() === false;
-    }
-
-    /**
-     * List directory permissions (shares)
-     *
-     * @param string $repo_id   Library identifier
-     * @param string $dir       Directory name (with path)
-     *
-     * @return bool|array List of user/group info on success, False on failure
-     */
-    public function shared_item_list($repo_id, $dir)
-    {
-        // sanity checks
-        if (!is_string($dir)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($repo_id === '' || !is_string($repo_id)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($dir === '') {
-            $dir = '/';
-        }
-
-        // Example result:
-        // [
-        //   {
-        //     "group_info": { "id": 17, "name": "Group Name" },
-        //     "is_admin": false,
-        //     "share_type": "group",
-        //     "permission": "rw"
-        //   },
-        //   {
-        //     "user_info": { "nickname": "user", "name": "user@domain.com" },
-        //     "share_type": "user",
-        //     "permission": "r"
-        //   }
-        // ]
-
-        return $this->request('GET', "repos/$repo_id/dir/shared_items", array('p' => $dir));
-    }
-
-    /**
-     * List share (download) links
-     *
-     * @param string $repo_id   Library identifier
-     * @param string $dir       Directory name (with path)
-     *
-     * @return bool|array List of shared links on success, False on failure
-     */
-    public function share_link_list($repo_id, $dir)
-    {
-        // sanity checks
-        if (!is_string($dir)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($repo_id === '' || !is_string($repo_id)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($dir === '') {
-            $dir = '/';
-        }
-
-        // Example result:
-        // [
-        //   {
-        //     "username": "lian@lian.com",
-        //     "repo_id": "104f6537-b3a5-4d42-b8b5-8e47e494e4cf",
-        //     "ctime": "2017-04-01T02:35:29+00:00",
-        //     "expire_date": "",
-        //     "token": "0c4eb0cb104a43caaeef",
-        //     "view_cnt": 0,
-        //     "link": "https://cloud.seafile.com/d/0c4eb0cb104a43caaeef/",
-        //     "obj_name": "folder",
-        //     "path": "/folder/",
-        //     "is_dir": true,
-        //     "is_expired": false,
-        //     "repo_name": "for-test-web-api"
-        //   }
-        // ]
-
-        return $this->request('GET', "share-links", array('repo_id' => $repo_id, 'path' => $dir), null, null, '2.1');
-    }
-
-    /**
-     * Create a shared (download) link
-     *
-     * @param string $repo_id  Library identifier
-     * @param string $dir      Directory name (with path)
-     * @param string $password Password
-     * @param string $expire   Days to expire
-     *
-     * @return bool Link info on success, False on failure
-     */
-    public function share_link_add($repo_id, $dir, $password = '', $expire = 0)
-    {
-        // sanity checks
-        if (!is_string($dir)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($repo_id === '' || !is_string($repo_id)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if (!empty($expire) && !is_numeric($expire)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($dir === '') {
-            $dir = '/';
-        }
-
-        $post = array(
-            'repo_id'     => $repo_id,
-            'path'        => $dir,
-        );
-
-        if (strlen($password)) {
-            $post['password'] = $password;
-        }
-        if ($expire > 0) {
-            $post['expire_days'] = $expire;
-        }
-
-        $result = $this->request('POST', "share-links", array(), $post, null, '2.1');
-
-        // Sample response:
-        // {
-        //   "token": "0c4eb0cb104a43caaeef",
-        //   "link": "https://cloud.seafile.com/d/db1a50e686/",
-        //   ...
-        // }
-
-        if (is_array($result) && !empty($result['link'])) {
-            return $result;
-        }
-
-        return false;
-    }
-
-    /**
-     * Delete a share (download) link
-     *
-     * @param string $token Link identifier (token)
-     *
-     * @return bool True on success, False on failure
-     */
-    public function share_link_delete($token)
-    {
-        // sanity checks
-        if ($token === '' || !is_string($token)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        $this->request('DELETE', "share-links/{$token}", null, null, null, '2.1');
-
-        return $this->is_error() === false;
-    }
-
-    /**
-     * List upload links
-     *
-     * @param string $repo_id Library identifier
-     * @param string $dir     Directory name (with path)
-     *
-     * @return bool|array List of upload links on success, False on failure
-     */
-    public function upload_link_list($repo_id, $dir)
-    {
-        // sanity checks
-        if (!is_string($dir)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($repo_id === '' || !is_string($repo_id)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($dir === '') {
-            $dir = '/';
-        }
-
-        // Example result:
-        // [
-        //   {
-        //     "username": "lian@lian.com",
-        //     "repo_id": "104f6537-b3a5-4d42-b8b5-8e47e494e4cf",
-        //     "ctime": "2017-04-01T02:35:29+00:00",
-        //     "expire_date": "",
-        //     "token": "0c4eb0cb104a43caaeef",
-        //     "view_cnt": 0,
-        //     "link": "https://cloud.seafile.com/d/0c4eb0cb104a43caaeef/",
-        //     "obj_name": "folder",
-        //     "path": "/folder/",
-        //     "is_dir": true,
-        //     "is_expired": false,
-        //     "repo_name": "for-test-web-api"
-        //   }
-        // ]
-
-        return $this->request('GET', "upload-links", array('repo_id' => $repo_id, 'path' => $dir), null, null, '2.1');
-    }
-
-    /**
-     * Create an upload link
-     *
-     * @param string $repo_id  Library identifier
-     * @param string $dir      Directory name (with path)
-     * @param string $password Password
-     *
-     * @return bool Link info on success, False on failure
-     */
-    public function upload_link_add($repo_id, $dir, $password = '')
-    {
-        // sanity checks
-        if (!is_string($dir)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($repo_id === '' || !is_string($repo_id)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        if ($dir === '') {
-            $dir = '/';
-        }
-
-        $post = array(
-            'repo_id'     => $repo_id,
-            'path'        => $dir,
-        );
-
-        if (strlen($password)) {
-            $post['password'] = $password;
-        }
-
-        $result = $this->request('POST', "upload-links", array(), $post, null, '2.1');
-
-        // Sample response:
-        // {
-        //   "token": "0c4eb0cb104a43caaeef",
-        //   "link": "https://cloud.seafile.com/d/db1a50e686/",
-        //   ...
-        // }
-
-        if (is_array($result) && !empty($result['link'])) {
-            return $result;
-        }
-
-        return false;
-    }
-
-    /**
-     * Delete an upload link
-     *
-     * @param string $token Link identifier (token)
-     *
-     * @return bool True on success, False on failure
-     */
-    public function upload_link_delete($token)
-    {
-        // sanity checks
-        if ($token === '' || !is_string($token)) {
-            $this->status = self::BAD_REQUEST;
-            return false;
-        }
-
-        $this->request('DELETE', "upload-links/{$token}", null, null, null, '2.1');
-
-        return $this->is_error() === false;
-    }
-
-    /**
-     * List user groups
-     *
-     * @return bool|array List of groups on success, False on failure
-     */
-    public function group_list()
-    {
-        // Sample result:
-        // [
-        //   {
-        //     "ctime": 1398134171327948,
-        //     "creator": "user@example.com",
-        //     "msgnum": 0,
-        //     "mtime": 1398231100,
-        //     "id": 1,
-        //     "name": "lian"
-        //   }
-        // ]                                                                                    },
-
-        $result = $this->request('GET', "groups");
-
-        if (is_array($result)) {
-            $result = (array) $result['groups'];
-        }
-
-        return $result;
-    }
-
-    /**
-     * List users
-     *
-     * @param string $search Search keyword
-     *
-     * @return bool|array List of users on success, False on failure
-     */
-    public function user_search($search = null)
-    {
-        // Sample response:
-        // [
-        //   {
-        //     'avatar_url': 'https://cloud.seafile.com/media/avatars/default.png',
-        //      'contact_email': 'foo@foo.com',
-        //      'email': 'foo@foo.com',
-        //      'name': 'foo'
-        //   }
-        // ]
-
-        $result = $this->request('GET', "search-user", array('q' => $search));
-
-        if (is_array($result)) {
-            $result = (array) $result['users'];
-        }
-
-        return $result;
-    }
-
-    /**
-     * Parse and fix API request URLs
-     */
-    public function mod_url($url)
-    {
-        // If Seafile is behind a proxy and different port, it will return
-        // wrong URL for file uploads/downloads. We force the original URL prefix here
-        if (stripos($url, $this->url_prefix) !== 0) {
-            $url = $this->url_prefix . preg_replace('|^(https?://[^/]+)|i', '', $url);
-        }
-
-        return $url;
-    }
 }

iRony-0.4.3.tar.gz/lib/FileAPI/drivers/seafile/seafile_file_storage.php -> iRony-0.4.4.tar.gz/lib/FileAPI/drivers/seafile/seafile_file_storage.php Changed

@@ -117,10 +117,8 @@
             'ssl_verify_peer' => $this->rc->config->get('fileapi_seafile_ssl_verify_peer', true),
             'ssl_verify_host' => $this->rc->config->get('fileapi_seafile_ssl_verify_host', true),
             'cache'           => $this->rc->config->get('fileapi_seafile_cache'),
-            'cache_ttl'       => $this->rc->config->get('fileapi_seafile_cache_ttl', '14d'),
+            'cache_ttl'       => $this->rc->config->get('fileapi_seafile_cache', '14d'),
             'debug'           => $this->rc->config->get('fileapi_seafile_debug', false),
-            'token'           => $_SESSION[$this->title . 'seafile_token'] ? $this->rc->decrypt($_SESSION[$this->title . 'seafile_token']) : null,
-
         );
 
         $this->config = array_merge($config, $this->config);
@@ -132,26 +130,11 @@
             return true;
         }
 
-        if ($this->config['cache']) {
-            $cache = $this->rc->get_cache('seafile_' . $this->title,
-                $this->config['cache'], $this->config['cache_ttl'], true);
-        }
-
         // try session token
-        if ($config['token']) {
-            // With caching we know the last successful token use, so we can
-            // skip ping call, which is a big win for case of parallel folders listing
-            if ($cache) {
-                $valid = ($ping = $cache->get('ping')) && $ping + 15 >= time();
-            }
-
-            if (empty($valid)) {
-                $valid = $this->api->ping($config['token']);
-
-                if ($cache && $valid) {
-                    $cache->write('ping', time());
-                }
-            }
+        if ($_SESSION[$this->title . 'seafile_token']
+            && ($token = $this->rc->decrypt($_SESSION[$this->title . 'seafile_token']))
+        ) {
+            $valid = $this->api->ping($token);
         }
 
         if (!$valid) {
@@ -168,10 +151,6 @@
 
             if ($user) {
                 $valid = $this->authenticate($user, $pass);
-
-                if ($cache) {
-                    $cache->remove('ping');
-                }
             }
         }
 
@@ -179,9 +158,6 @@
         if (!$valid && empty($_SESSION[$this->title . 'seafile_user'])) {
             throw new Exception("User credentials not provided", file_storage::ERROR_NOAUTH);
         }
-        else if (!$valid && !$this->api) {
-            throw new Exception("SeaFile storage unavailable", file_storage::ERROR);
-        }
         else if (!$valid && $this->api->is_error() == seafile_api::TOO_MANY_REQUESTS) {
             throw new Exception("SeaFile storage temporarily unavailable (too many requests)", file_storage::ERROR);
         }
@@ -229,7 +205,6 @@
             file_storage::CAPS_MAX_UPLOAD => $max_filesize,
             file_storage::CAPS_QUOTA      => true,
             file_storage::CAPS_LOCKS      => true,
-            file_storage::CAPS_ACL        => true,
         );
     }
 
@@ -470,7 +445,7 @@
      * Return file body.
      *
      * @param string   $file_name Name of a file (with folder path)
-     * @param array    $params    Parameters (force-download, force-type, head)
+     * @param array    $params    Parameters (force-download)
      * @param resource $fp        Print to file pointer instead (send no headers)
      *
      * @throws Exception
@@ -488,7 +463,7 @@
         $file = $this->from_file_object($file);
 
         // get file location on SeaFile server for download
-        if ($file['size'] && empty($params['head'])) {
+        if ($file['size']) {
             $link = $this->api->file_get($repo_id, $fn);
         }
 
@@ -531,20 +506,10 @@
         header("Content-Disposition: $disposition; filename=\"$filename\"");
 
         // just send redirect to SeaFile server
-        if ($file['size'] && empty($params['head'])) {
-            $allow_redirects = $this->rc->config->get('fileapi_seafile_allow_redirects');
-            // In view-mode we can't redirect to SeaFile server because:
-            // - it responds with Content-Disposition: attachment, which causes that
-            //   e.g. previewing images is not possible
-            // - pdf/odf viewers can't follow redirects for some reason (#4590)
-            if ($allow_redirects && !empty($params['force-download'])) {
-                header("Location: $link");
-            }
-            else if ($fp = fopen('php://output', 'wb')) {
-                $this->save_file_content($link, $fp);
-                fclose($fp);
-            }
+        if ($file['size']) {
+            header("Location: $link");
         }
+        die;
     }
 
     /**
@@ -570,8 +535,8 @@
             'name'     => $file['name'],
             'size'     => (int) $file['size'],
             'type'     => (string) $file['type'],
-            'mtime'    => file_utils::date_format($file['changed'], $this->config['date_format'], $this->config['timezone']),
-            'ctime'    => file_utils::date_format($file['created'], $this->config['date_format'], $this->config['timezone']),
+            'mtime'    => $file['changed'] ? $file['changed']->format($this->config['date_format']) : '',
+            'ctime'    => $file['created'] ? $file['created']->format($this->config['date_format']) : '',
             'modified' => $file['changed'] ? $file['changed']->format('U') : 0,
             'created'  => $file['created'] ? $file['created']->format('U') : 0,
         );
@@ -588,11 +553,6 @@
      */
     public function file_list($folder_name, $params = array())
     {
-        // mount point contains only folders
-        if (!is_string($folder_name) || $folder_name === '') {
-            return array();
-        }
-
         list($folder, $repo_id) = $this->find_library($folder_name);
 
         // prepare search filter
@@ -608,7 +568,7 @@
         }
 
         // get directory entries
-        $entries = $this->api->directory_entries($repo_id, $folder, 'file');
+        $entries = $this->api->directory_entries($repo_id, $folder);
         $result  = array();
 
         foreach ((array) $entries as $idx => $file) {
@@ -628,8 +588,8 @@
                     }
                     else if ($idx == 'class') {
                         foreach ($value as $v) {
-                            if (stripos($file['type'], $v) !== false) {
-                                continue 2;
+                            if (stripos($file['type'], $v) === 0) {
+                                break 2;
                             }
                         }
 
@@ -644,8 +604,8 @@
                 'name'     => $file['name'],
                 'size'     => (int) $file['size'],
                 'type'     => (string) $file['type'],
-                'mtime'    => file_utils::date_format($file['changed'], $this->config['date_format'], $this->config['timezone']),
-                'ctime'    => file_utils::date_format($file['created'], $this->config['date_format'], $this->config['timezone']),
+                'mtime'    => $file['changed'] ? $file['changed']->format($this->config['date_format']) : '',
+                'ctime'    => $file['created'] ? $file['created']->format($this->config['date_format']) : '',
                 'modified' => $file['changed'] ? $file['changed']->format('U') : 0,
                 'created'  => $file['created'] ? $file['created']->format('U') : 0,
             );
@@ -854,49 +814,23 @@
     }
 
     /**
-     * Subscribe a folder.
-     *
-     * @param string $folder_name Name of a folder with full path
-     *
-     * @throws Exception
-     */
-    public function folder_subscribe($folder_name)
-    {
-        throw new Exception("Not implemented", file_storage::ERROR_UNSUPPORTED);
-    }
-
-    /**
-     * Unsubscribe a folder.
-     *
-     * @param string $folder_name Name of a folder with full path
-     *
-     * @throws Exception
-     */
-    public function folder_unsubscribe($folder_name)
-    {
-        throw new Exception("Not implemented", file_storage::ERROR_UNSUPPORTED);
-    }
-
-    /**
      * Returns list of folders.
      *
-     * @param array $params List parameters ('type', 'search', 'path', 'level')
-     *
      * @return array List of folders
      * @throws Exception
      */
-    public function folder_list($params = array())
+    public function folder_list()
     {
-        $libraries  = $this->libraries();
-        $writable   = ($params['type'] & file_storage::FILTER_WRITABLE) ? true : false;
-        $prefix     = (string) $params['path'];
-        $prefix_len = strlen($prefix);
-        $folders    = array();
+        $libraries = $this->libraries();
+        $folders   = array();
+
+        if ($this->config['cache']) {
+            $cache = $this->rc->get_cache('seafile_' . $this->title,
+                $this->config['cache'], $this->config['cache_ttl'], true);
 
-        if ($prefix_len) {
-            $path           = explode('/', $prefix);
-            $lib_search     = array_shift($path);
-            $params['path'] = implode('/', $path);
+            if ($cache) {
+                $cached = $cache->get('folders');
+            }
         }
 
         foreach ($libraries as $library) {
@@ -904,110 +838,29 @@
                 continue;
             }
 
-            if ($prefix_len && $lib_search !== $library['name']) {
-                continue;
-            }
-
-            if (!strlen($params['path'])) {
-                $folders[$library['name']] = array(
-                    'mtime'      => $library['mtime'],
-                    'permission' => $library['permission'],
-                );
-            }
+            $folders[$library['name']] = $library['mtime'];
 
-            if ($params['level'] == 1 && !$prefix_len) {
-                // Only list of libraries has been requested
-                continue;
-            }
-
-            foreach ($this->folders_tree($library, $params) as $folder_name => $folder) {
-                $folders[$library['name'] . '/' . $folder_name] = $folder;
+            if ($folder_tree = $this->folders_tree($library, '', $library, $cached)) {
+                $folders = array_merge($folders, $folder_tree);
             }
         }
 
-        if (empty($libraries)) {
+        if (empty($folders)) {
             throw new Exception("Storage error. Unable to get folders list.", file_storage::ERROR);
         }
 
-        // remove read-only folders when requested
-        if ($writable) {
-            foreach ($folders as $folder_name => $folder) {
-                if (strpos($folder['permission'], 'w') === false) {
-                    unset($folders[$folder_name]);
-                }
-            }
-        }
-
-        // In extended format we return array of arrays
-        if (!empty($params['extended'])) {
-            foreach ($folders as $folder_name => $folder) {
-                $item = array('folder' => $folder_name);
-
-                // check if folder is readonly
-                if (!$writable && $params['permissions']) {
-                    if (strpos($folder['permission'], 'w') === false) {
-                        $item['readonly'] = true;
-                    }
-                }
-
-                $folders[$folder_name] = $item;
-            }
-        }
-        else {
-            $folders = array_keys($folders);
+        if ($cache) {
+            $cache->set('folders', $folders);
         }
 
         // sort folders
-        usort($folders, array('file_utils', 'sort_folder_comparator'));
+        $folders = array_keys($folders);
+        usort($folders, array($this, 'sort_folder_comparator'));
 
         return $folders;
     }
 
     /**
-     * Check folder rights.
-     *
-     * @param string $folder_name Name of a folder with full path
-     *
-     * @return int Folder rights (sum of file_storage::ACL_*)
-     */
-    public function folder_rights($folder_name)
-    {
-        // It is not possible (yet) to assign a specified library/folder
-        // to the mount point. So, it is a "virtual" folder.
-        if (!strlen($folder_name)) {
-            return 0;
-        }
-
-        list($folder, $repo_id, $library) = $this->find_library($folder_name);
-
-        // @TODO: we should check directory permission not library
-        // However, there's no API for this, we'd need to get a list
-        // of directories of a parent folder/library
-/*
-        if (strpos($folder, '/')) {
-            // @TODO
-        }
-        else {
-            $acl = $library['permission'];
-        }
-*/
-        $acl    = $library['permission'];
-        $rights = 0;
-        $map    = array(
-            'r' => file_storage::ACL_READ,
-            'w' => file_storage::ACL_WRITE,
-        );
-
-        foreach ($map as $key => $value) {
-            if (strpos($acl, $key) !== false) {
-                $rights |= $value;
-            }
-        }
-
-        return $rights;
-    }
-
-    /**
      * Returns a list of locks
      *
      * This method should return all the locks for a particular URI, including
@@ -1016,25 +869,25 @@
      * If child_locks is set to true, this method should also look for
      * any locks in the subtree of the URI for locks.
      *
-     * @param string $path        File/folder path
+     * @param string $uri         URI
      * @param bool   $child_locks Enables subtree checks
      *
      * @return array List of locks
      * @throws Exception
      */
-    public function lock_list($path, $child_locks = false)
+    public function lock_list($uri, $child_locks = false)
     {
         $this->init_lock_db();
 
         // convert URI to global resource string
-        $uri = $this->path2uri($path);
+        $uri = $this->uri2resource($uri);
 
         // get locks list
         $list = $this->lock_db->lock_list($uri, $child_locks);
 
         // convert back resource string into URIs
         foreach ($list as $idx => $lock) {
-            $list[$idx]['uri'] = $this->uri2path($lock['uri']);
+            $list[$idx]['uri'] = $this->resource2uri($lock['uri']);
         }
 
         return $list;
@@ -1043,7 +896,7 @@
     /**
      * Locks a URI
      *
-     * @param string $path File/folder path
+     * @param string $uri  URI
      * @param array  $lock Lock data
      *                     - depth: 0/'infinite'
      *                     - scope: 'shared'/'exclusive'
@@ -1053,12 +906,12 @@
      *
      * @throws Exception
      */
-    public function lock($path, $lock)
+    public function lock($uri, $lock)
     {
         $this->init_lock_db();
 
         // convert URI to global resource string
-        $uri = $this->uri2resource($path);
+        $uri = $this->uri2resource($uri);
 
         if (!$this->lock_db->lock($uri, $lock)) {
             throw new Exception("Database error. Unable to create a lock.", file_storage::ERROR);
@@ -1068,17 +921,17 @@
     /**
      * Removes a lock from a URI
      *
-     * @param string $path File/folder path
+     * @param string $path URI
      * @param array  $lock Lock data
      *
      * @throws Exception
      */
-    public function unlock($path, $lock)
+    public function unlock($uri, $lock)
     {
         $this->init_lock_db();
 
         // convert URI to global resource string
-        $uri = $this->path2uri($path);
+        $uri = $this->uri2resource($uri);
 
         if (!$this->lock_db->unlock($uri, $lock)) {
             throw new Exception("Database error. Unable to remove a lock.", file_storage::ERROR);
@@ -1115,416 +968,63 @@
     }
 
     /**
-     * Sharing interface
-     *
-     * @param string $folder_name Name of a folder with full path
-     * @param int    $mode        Sharing action mode
-     * @param array  $args        POST/GET parameters
-     *
-     * @return mixed Sharing response
-     * @throws Exception
+     * Recursively builds folders list
      */
-    public function sharing($folder, $mode, $args = array())
+    protected function folders_tree($library, $path, $folder, $cached)
     {
-        if ($mode == file_storage::SHARING_MODE_FORM) {
-            $form = array(
-                'shares' => array(
-                    'title' => 'share.permissions',
-                    'form'  => array(
-                        'user' => array(
-                            'title' => 'share.usergroup',
-                            'type'  => 'input',
-                            'autocomplete' => 'user,group',
-                        ),
-                        'right' => array(
-                            'title' => 'share.permission',
-                            'type'  => 'select',
-                            'options' => array(
-                                'r'  => 'share.readonly',
-                                'rw' => 'share.readwrite',
-                            ),
-                        ),
-                    ),
-                    'extra_fields' => array(
-                        'type' => 'user',
-                        'id'   => '',
-                    ),
-                ),
-                'download-link' => array(
-                    'title'             => 'share.download-link',
-                    'label'             => 'share.generate',
-                    'single'            => true,
-                    'list_column'       => 'link',
-                    'list_column_label' => 'share.link',
-                    'form'              => array(
-                        'password' => array(
-                            'title'       => 'share.password',
-                            'type'        => 'password',
-                        ),
-                        'expire' => array(
-                            'title'       => 'share.expire',
-                            'placeholder' => 'share.expiredays',
-                            'type'        => 'input',
-                        ),
-                    ),
-                    'extra_fields' => array(
-                        'id' => '',
-                    ),
-                ),
-                'upload-link' => array(
-                    'title'             => 'share.upload-link',
-                    'label'             => 'share.generate',
-                    'single'            => true,
-                    'list_column'       => 'link',
-                    'list_column_label' => 'share.link',
-                    'form'              => array(
-                        'password' => array(
-                            'title' => 'share.password',
-                            'type'  => 'password',
-                        ),
-                    ),
-                    'extra_fields' => array(
-                        'id' => '',
-                    ),
-                ),
-            );
-
-            return $form;
-        }
-
-        if ($mode == file_storage::SHARING_MODE_RIGHTS) {
-            if (!$this->init()) {
-                throw new Exception("Storage error. Unable to get shares of SeaFile folder/lib.", file_storage::ERROR);
-            }
-
-            list($path, $repo_id) = $this->find_library($folder);
-
-            $result = array();
-
-            if ($shares = $this->api->shared_item_list($repo_id, $path)) {
-                foreach ($shares as $share) {
-                    if (!empty($share['group_info'])) {
-                        $name = $share['group_info']['name'];
-                        $name = $share['group_info']['id'];
-                    }
-                    else {
-                        $name = $this->user_label($share['user_info']['nickname'], $share['user_info']['name']);
-                        $id   = $share['user_info']['name'];
-                    }
-
-                    $result[] = array(
-                        'mode'  => 'shares',
-                        'type'  => $share['share_type'],
-                        'right' => $share['permission'],
-                        'user'  => $name,
-                        'id'    => $id,
-                    );
-                }
-            }
-
-            if ($links = $this->api->share_link_list($repo_id, $path)) {
-                foreach ($links as $link) {
-                    $result[] = array(
-                        'mode' => 'download-link',
-                        'id'   => $link['token'],
-                        'link' => $link['link'],
-                    );
-                }
-            }
-
-            if ($links = $this->api->upload_link_list($repo_id, $path)) {
-                foreach ($links as $link) {
-                    $result[] = array(
-                        'mode' => 'upload-link',
-                        'id'   => $link['token'],
-                        'link' => $link['link'],
-                    );
+        $folders = array();
+        $fname  = strlen($path) ? $path . $folder['name'] : '/';
+        $root   = $library['name'] . ($fname != '/' ? $fname : '');
+
+        // nothing changed, use cached folders tree of this folder
+        if ($cached && $cached[$root] && $cached[$root] == $folder['mtime']) {
+            foreach ($cached as $folder_name => $mtime) {
+                if (strpos($folder_name, $root . '/') === 0) {
+                    $folders[$folder_name] = $mtime;
                 }
             }
-
-            return $result;
         }
-
-        if ($mode == file_storage::SHARING_MODE_UPDATE) {
-            if (!$this->init()) {
-                throw new Exception("Storage error. Unable to update shares of SeaFile folder/lib.", file_storage::ERROR);
+        // get folder content (files and sub-folders)
+        // there's no API method to get only folders
+        else if ($content = $this->api->directory_entries($library['id'], $fname)) {
+            if ($fname != '/') {
+                $fname .= '/';
             }
 
-            list($path, $repo_id) = $this->find_library($folder);
-
-            if ($args['mode'] == 'shares') {
-                $share_id = $args['id'] ?: $args['user'];
-
-                switch ($args['action']) {
-                case 'submit':
-                    $result = $this->api->shared_item_add($repo_id, $path, $args['right'], $args['type'], $share_id);
-                    break;
-
-                case 'update':
-                    $result = $this->api->shared_item_update($repo_id, $path, $args['right'], $args['type'], $share_id);
-                    break;
-
-                case 'delete':
-                    $result = $this->api->shared_item_delete($repo_id, $path, $args['type'], $share_id);
-                    break;
-                }
-            }
-            else if ($args['mode'] == 'download-link') {
-                switch ($args['action']) {
-                case 'submit':
-                    $result = $this->api->share_link_add($repo_id, $path, $args['password'], $args['expire']);
-
-                    if ($result) {
-                        $result['id']   = $result['token'];
-                        $result['mode'] = 'download-link';
-                    }
-                    break;
-
-                case 'delete':
-                    $result = $this->api->share_link_delete($args['id']);
-                    break;
-                }
-            }
-            else if ($args['mode'] == 'upload-link') {
-                switch ($args['action']) {
-                case 'submit':
-                    $result = $this->api->upload_link_add($repo_id, $path, $args['password']);
-
-                    if ($result) {
-                        $result['id']   = $result['token'];
-                        $result['mode'] = 'upload-link';
-                    }
-                    break;
-
-                case 'delete':
-                    $result = $this->api->upload_link_delete($args['id']);
-                    break;
-                }
-            }
-            else {
-                throw new Exception("Invalid input.", file_storage::ERROR);
-            }
-
-            if (empty($result)) {
-                throw new Exception("Storage error. Failed to update share.", file_storage::ERROR);
-            }
-
-            return $result;
-        }
-    }
-
-    /**
-     * User/group search (autocompletion)
-     *
-     * @param string $search Search string
-     * @param int    $mode   Search mode
-     *
-     * @return array Users/Groups list
-     * @throws Exception
-     */
-    public function autocomplete($search, $mode)
-    {
-        if (!$this->init()) {
-            throw new Exception("Storage error. Failed to init Seafile storage connection.", file_storage::ERROR);
-        }
-
-        $limit  = (int) $this->rc->config->get('autocomplete_max', 15);
-        $result = array();
-        $index  = array();
-
-        if ($mode & file_storage::SEARCH_USER) {
-            $users = $this->api->user_search($search);
-
-            if (!is_array($users)) {
-                throw new Exception("Storage error. Failed to search users.", file_storage::ERROR);
-            }
-
-            foreach ($users as $user) {
-                $index[] = $user['name'];
-                $result[] = array(
-                    'name' => $this->user_label($user['name'], $user['email']),
-                    'id'   => $user['email'],
-                    'type' => 'user',
-                );
-            }
-        }
+            foreach ($content as $item) {
+                if ($item['type'] == 'dir' && strlen($item['name'])) {
+                    $folders[$root . '/' . $item['name']] = $item['mtime'];
 
-        if (count($result) < $limit && ($mode & file_storage::SEARCH_GROUP)) {
-            if ($groups = $this->api->group_list()) {
-                $search = mb_strtoupper($search);
-                foreach ($groups as $group) {
-                    if (strpos(mb_strtoupper($group['name']), $search) !== false) {
-                        $index[] = $group['name'];
-                        $result[] = array(
-                            'name' => $group['name'],
-                            'id'   => $group['id'],
-                            'type' => 'group',
-                        );
+                    // get subfolders recursively
+                    $folders_tree = $this->folders_tree($library, $fname, $item, $cached);
+                    if (!empty($folders_tree)) {
+                        $folders = array_merge($folders, $folders_tree);
                     }
                 }
             }
         }
 
-        if (count($result)) {
-            array_multisort($index, SORT_ASC, SORT_LOCALE_STRING, $result);
-        }
-
-        if (count($result) > $limit) {
-            $result = array_slice($result, 0, $limit);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Convert file/folder path into a global URI.
-     *
-     * @param string $path File/folder path
-     *
-     * @return string URI
-     * @throws Exception
-     */
-    public function path2uri($path)
-    {
-        // Remove protocol prefix and path, we work with host only
-        $host = preg_replace('#(^https?://|/.*$)#i', '', $this->config['host']);
-
-        if (!is_string($path) || !strlen($path)) {
-            $user = $_SESSION[$this->title . 'seafile_user'];
-            return 'seafile://' . rawurlencode($user) . '@' . $host . '/';
-        }
-
-        list($file, $repo_id, $library) = $this->find_library($path);
-
-        return 'seafile://' . rawurlencode($library['owner']) . '@' . $host . '/' . file_utils::encode_path($path);
-    }
-
-    /**
-     * Convert global URI into file/folder path.
-     *
-     * @param string $uri URI
-     *
-     * @return string File/folder path
-     * @throws Exception
-     */
-    public function uri2path($uri)
-    {
-        if (!preg_match('|^seafile://([^@]+)@([^/]+)/(.*)$|', $uri, $matches)) {
-            throw new Exception("Internal storage error. Unexpected data format.", file_storage::ERROR);
-        }
-
-        $user   = rawurldecode($matches[1]);
-        $host   = $matches[2];
-        $path   = file_utils::decode_path($matches[3]);
-        $c_host = preg_replace('#(^https?://|/.*$)#i', '', $this->config['host']);
-
-        if (strlen($path)) {
-            list($file, $repo_id, $library) = $this->find_library($path, true);
-
-            if (empty($library) || $host != $c_host || $user != $library['owner']) {
-                throw new Exception("Internal storage error. Unresolvable URI.", file_storage::ERROR);
-            }
-        }
-
-        return $path;
+        return $folders;
     }
 
     /**
-     * Get folders tree in the Seafile library
+     * Callback for uasort() that implements correct
+     * locale-aware case-sensitive sorting
      */
-    protected function folders_tree($library, $params = array())
+    protected function sort_folder_comparator($str1, $str2)
     {
-        $root = '';
-        if (is_string($params['path']) && strlen($params['path'])) {
-            $root = trim($params['path'], '/');
-        }
+        $path1 = explode('/', $str1);
+        $path2 = explode('/', $str2);
 
-        if ($this->config['cache'] && empty($params['recursive'])) {
-            $cache = $this->rc->get_cache('seafile_' . $this->title,
-                $this->config['cache'], $this->config['cache_ttl'], true);
+        foreach ($path1 as $idx => $folder1) {
+            $folder2 = $path2[$idx];
 
-            if ($cache) {
-                $cache_key = 'folders.' . md5(sprintf('%s:%d:%s', $library['id'], $params['level'], $root));
-                $folders   = $cache->get($cache_key);
-
-                if (is_string($folders) && preg_match('/^([0-9]+):[\{\[]/', $folders, $m)) {
-                    $cache_mtime = $m[1];
-                    $folders     = json_decode(substr($folders, strlen($cache_mtime)+1), true);
-                }
-                else {
-                    $folders = null;
-                }
-
-                if (strlen($root)) {
-                    $info = $this->api->directory_info($library['id'], $root);
-                    if ($info && $info['mtime']) {
-                        try {
-                            $dt    = new DateTime($info['mtime']);
-                            $mtime = $dt->format('U');
-                        }
-                        catch (Exception $e) {
-                            // ignore
-                            rcube::raise_error($e, true, false);
-                        }
-                    }
-                }
-                else {
-                    $mtime = $library['mtime'];
-                }
-
-                if (is_array($folders) && $mtime && $cache_mtime && intval($mtime) === intval($cache_mtime)) {
-                    return $folders;
-                }
-            }
-        }
-
-        $folders    = array();
-        $add_folder = function($item, &$result, $parent) {
-            if ($item['type'] == 'dir' && strlen($item['name'])) {
-                $name = (strlen($parent) > 0 ? "$parent/" : '') . $item['name'];
-
-                $result[$name] = array(
-                    'mtime'      => $item['mtime'],
-                    'permission' => $item['permission'],
-                );
-
-                return $name;
-            }
-        };
-
-        // Full folder hierarchy requested, we can get all in one request...
-        if (empty($params['recursive']) && empty($params['level'])) {
-            if ($content = $this->api->directory_entries($library['id'], $root, 'dir', true)) {
-                foreach ($content as $item) {
-                    $add_folder($item, $folders, trim($item['parent_dir'], '/'));
-                }
-            }
-        }
-        // Only part of the folder tree has been requested...
-        else if ($content = $this->api->directory_entries($library['id'], $root, 'dir', false)) {
-            $params['recursive'] = true;
-            $params['level']    -= 1;
-
-            // Recursively add sub-folders tree
-            foreach ($content as $item) {
-                $folder = $add_folder($item, $folders, $root);
-
-                // FIXME: id="0000000000000000000000000000000000000000" means the folder is empty?
-                if ($folder !== null && $params['level'] > 1 && $item['id'] !== "0000000000000000000000000000000000000000") {
-                    $params['path'] = $folder;
-                    $tree = $this->folders_tree($library, $params);
-                    if (!empty($tree)) {
-                        $folders = array_merge($folders, $tree);
-                    }
-                }
+            if ($folder1 === $folder2) {
+                continue;
             }
-        }
 
-        if ($cache_key && is_array($content) && $mtime && ($_folders = json_encode($folders))) {
-            $cache->set($cache_key, intval($mtime) . ':' . $_folders);
+            return strcoll($folder1, $folder2);
         }
-
-        return $folders;
     }
 
     /**
@@ -1532,7 +1032,7 @@
      */
     protected function libraries()
     {
-        // get from memory
+        // get from memory, @TODO: cache in rcube_cache?
         if ($this->libraries !== null) {
             return $this->libraries;
         }
@@ -1541,33 +1041,8 @@
             throw new Exception("Storage error. Unable to get list of SeaFile libraries.", file_storage::ERROR);
         }
 
-        if ($this->config['cache']) {
-            $cache = $this->rc->get_cache('seafile_' . $this->title,
-                $this->config['cache'], $this->config['cache_ttl'], true);
-
-            if ($cache) {
-                $repos = $cache->get('repos');
-
-                if (is_string($repos) && preg_match('/^([0-9]+):[\{\[]/', $repos, $m)) {
-                    $mtime = $m[1];
-                    $repos = json_decode(substr($repos, strlen($mtime)+1), true);
-                    // We use the cached value for up to 15 seconds
-                    // It should be enough to improve parallel folders listing requests
-                    if (is_array($repos) && $mtime + 15 >= time()) {
-                        return $repos;
-                    }
-                }
-            }
-        }
-
-        $mtime = time();
-
         if ($list = $this->api->library_list()) {
             $this->libraries = $list;
-
-            if ($cache) {
-                $cache->write('repos', $mtime . ':' . json_encode($list));
-            }
         }
         else {
             $this->libraries = array();
@@ -1685,7 +1160,7 @@
         $observer->set_fp($fp);
 
         try {
-            $request->setUrl($this->api->mod_url($location));
+            $request->setUrl($location);
             $request->attach($observer);
 
             $response = $request->send();
@@ -1706,28 +1181,38 @@
         return true;
     }
 
-    /**
-     * Initializes file_locks object
-     */
-    protected function init_lock_db()
+    protected function uri2resource($uri)
     {
-        if (!$this->lock_db) {
-            $this->lock_db = new file_locks;
+        list($file, $repo_id, $library) = $this->find_library($uri);
+
+        // convert to imap charset (to be safe to store in DB)
+        $uri = rcube_charset::convert($uri, RCUBE_CHARSET, 'UTF7-IMAP');
+
+        return 'seafile://' . urlencode($library['owner']) . '@' . $this->config['host'] . '/' . $uri;
+    }
+
+    protected function resource2uri($resource)
+    {
+        if (!preg_match('|^seafile://([^@]+)@([^/]+)/(.*)$|', $resource, $matches)) {
+            throw new Exception("Internal storage error. Unexpected data format.", file_storage::ERROR);
         }
+
+        $user = urldecode($matches[1]);
+        $uri  = $matches[3];
+
+        // convert from imap charset (to be safe to store in DB)
+        $uri = rcube_charset::convert($uri, 'UTF7-IMAP', RCUBE_CHARSET);
+
+        return $uri;
     }
 
     /**
-     * Create display-username-with-email string
+     * Initializes file_locks object
      */
-    protected function user_label($name, $email)
+    protected function init_lock_db()
     {
-        if ($name && $name != $email) {
-            $label = "{$name} ({$email})";
-        }
-        else {
-            $label = $email;
+        if (!$this->lock_db) {
+            $this->lock_db = new file_locks;
         }
-
-        return $label;
     }
 }

iRony-0.4.3.tar.gz/lib/FileAPI/drivers/seafile/seafile_request_observer.php -> iRony-0.4.4.tar.gz/lib/FileAPI/drivers/seafile/seafile_request_observer.php Changed

iRony-0.4.4.tar.gz/lib/FileAPI/ext Added

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Auth Added

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Auth/SASL Added

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Auth/SASL.php Added

@@ -0,0 +1,104 @@
+<?php
+// +-----------------------------------------------------------------------+ 
+// | Copyright (c) 2002-2003 Richard Heyes                                 | 
+// | All rights reserved.                                                  | 
+// |                                                                       | 
+// | Redistribution and use in source and binary forms, with or without    | 
+// | modification, are permitted provided that the following conditions    | 
+// | are met:                                                              | 
+// |                                                                       | 
+// | o Redistributions of source code must retain the above copyright      | 
+// |   notice, this list of conditions and the following disclaimer.       | 
+// | o Redistributions in binary form must reproduce the above copyright   | 
+// |   notice, this list of conditions and the following disclaimer in the | 
+// |   documentation and/or other materials provided with the distribution.| 
+// | o The names of the authors may not be used to endorse or promote      | 
+// |   products derived from this software without specific prior written  | 
+// |   permission.                                                         | 
+// |                                                                       | 
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
+// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
+// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
+// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
+// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
+// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
+// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
+// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
+// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
+// |                                                                       | 
+// +-----------------------------------------------------------------------+ 
+// | Author: Richard Heyes <richard@php.net>                               | 
+// +-----------------------------------------------------------------------+ 
+// 
+// $Id$
+
+/**
+* Client implementation of various SASL mechanisms 
+*
+* @author  Richard Heyes <richard@php.net>
+* @access  public
+* @version 1.0
+* @package Auth_SASL
+*/
+
+require_once('PEAR.php');
+
+class Auth_SASL
+{
+    /**
+    * Factory class. Returns an object of the request
+    * type.
+    *
+    * @param string $type One of: Anonymous
+    *                             Plain
+    *                             CramMD5
+    *                             DigestMD5
+    *                     Types are not case sensitive
+    */
+    function &factory($type)
+    {
+        switch (strtolower($type)) {
+            case 'anonymous':
+                $filename  = 'Auth/SASL/Anonymous.php';
+                $classname = 'Auth_SASL_Anonymous';
+                break;
+
+            case 'login':
+                $filename  = 'Auth/SASL/Login.php';
+                $classname = 'Auth_SASL_Login';
+                break;
+
+            case 'plain':
+                $filename  = 'Auth/SASL/Plain.php';
+                $classname = 'Auth_SASL_Plain';
+                break;
+
+            case 'external':
+                $filename  = 'Auth/SASL/External.php';
+                $classname = 'Auth_SASL_External';
+                break;
+
+            case 'crammd5':
+                $filename  = 'Auth/SASL/CramMD5.php';
+                $classname = 'Auth_SASL_CramMD5';
+                break;
+
+            case 'digestmd5':
+                $filename  = 'Auth/SASL/DigestMD5.php';
+                $classname = 'Auth_SASL_DigestMD5';
+                break;
+
+            default:
+                return PEAR::raiseError('Invalid SASL mechanism type');
+                break;
+        }
+
+        require_once($filename);
+        $obj = new $classname();
+        return $obj;
+    }
+}
+
+?>

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Auth/SASL/Anonymous.php Added

@@ -0,0 +1,71 @@
+<?php
+// +-----------------------------------------------------------------------+ 
+// | Copyright (c) 2002-2003 Richard Heyes                                 | 
+// | All rights reserved.                                                  | 
+// |                                                                       | 
+// | Redistribution and use in source and binary forms, with or without    | 
+// | modification, are permitted provided that the following conditions    | 
+// | are met:                                                              | 
+// |                                                                       | 
+// | o Redistributions of source code must retain the above copyright      | 
+// |   notice, this list of conditions and the following disclaimer.       | 
+// | o Redistributions in binary form must reproduce the above copyright   | 
+// |   notice, this list of conditions and the following disclaimer in the | 
+// |   documentation and/or other materials provided with the distribution.| 
+// | o The names of the authors may not be used to endorse or promote      | 
+// |   products derived from this software without specific prior written  | 
+// |   permission.                                                         | 
+// |                                                                       | 
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
+// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
+// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
+// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
+// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
+// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
+// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
+// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
+// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
+// |                                                                       | 
+// +-----------------------------------------------------------------------+ 
+// | Author: Richard Heyes <richard@php.net>                               | 
+// +-----------------------------------------------------------------------+ 
+// 
+// $Id$
+
+/**
+* Implmentation of ANONYMOUS SASL mechanism
+*
+* @author  Richard Heyes <richard@php.net>
+* @access  public
+* @version 1.0
+* @package Auth_SASL
+*/
+
+require_once('Auth/SASL/Common.php');
+
+class Auth_SASL_Anonymous extends Auth_SASL_Common
+{
+    /**
+    * Not much to do here except return the token supplied.
+    * No encoding, hashing or encryption takes place for this
+    * mechanism, simply one of:
+    *  o An email address
+    *  o An opaque string not containing "@" that can be interpreted
+    *    by the sysadmin
+    *  o Nothing
+    *
+    * We could have some logic here for the second option, but this
+    * would by no means create something interpretable.
+    *
+    * @param  string $token Optional email address or string to provide
+    *                       as trace information.
+    * @return string        The unaltered input token
+    */
+    function getResponse($token = '')
+    {
+        return $token;
+    }
+}
+?>
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Auth/SASL/Common.php Added

@@ -0,0 +1,74 @@
+<?php
+// +-----------------------------------------------------------------------+ 
+// | Copyright (c) 2002-2003 Richard Heyes                                 | 
+// | All rights reserved.                                                  | 
+// |                                                                       | 
+// | Redistribution and use in source and binary forms, with or without    | 
+// | modification, are permitted provided that the following conditions    | 
+// | are met:                                                              | 
+// |                                                                       | 
+// | o Redistributions of source code must retain the above copyright      | 
+// |   notice, this list of conditions and the following disclaimer.       | 
+// | o Redistributions in binary form must reproduce the above copyright   | 
+// |   notice, this list of conditions and the following disclaimer in the | 
+// |   documentation and/or other materials provided with the distribution.| 
+// | o The names of the authors may not be used to endorse or promote      | 
+// |   products derived from this software without specific prior written  | 
+// |   permission.                                                         | 
+// |                                                                       | 
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
+// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
+// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
+// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
+// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
+// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
+// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
+// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
+// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
+// |                                                                       | 
+// +-----------------------------------------------------------------------+ 
+// | Author: Richard Heyes <richard@php.net>                               | 
+// +-----------------------------------------------------------------------+ 
+// 
+// $Id$
+
+/**
+* Common functionality to SASL mechanisms
+*
+* @author  Richard Heyes <richard@php.net>
+* @access  public
+* @version 1.0
+* @package Auth_SASL
+*/
+
+class Auth_SASL_Common
+{
+    /**
+    * Function which implements HMAC MD5 digest
+    *
+    * @param  string $key  The secret key
+    * @param  string $data The data to protect
+    * @return string       The HMAC MD5 digest
+    */
+    function _HMAC_MD5($key, $data)
+    {
+        if (strlen($key) > 64) {
+            $key = pack('H32', md5($key));
+        }
+
+        if (strlen($key) < 64) {
+            $key = str_pad($key, 64, chr(0));
+        }
+
+        $k_ipad = substr($key, 0, 64) ^ str_repeat(chr(0x36), 64);
+        $k_opad = substr($key, 0, 64) ^ str_repeat(chr(0x5C), 64);
+
+        $inner  = pack('H32', md5($k_ipad . $data));
+        $digest = md5($k_opad . $inner);
+
+        return $digest;
+    }
+}
+?>

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Auth/SASL/CramMD5.php Added

@@ -0,0 +1,68 @@
+<?php
+// +-----------------------------------------------------------------------+ 
+// | Copyright (c) 2002-2003 Richard Heyes                                 | 
+// | All rights reserved.                                                  | 
+// |                                                                       | 
+// | Redistribution and use in source and binary forms, with or without    | 
+// | modification, are permitted provided that the following conditions    | 
+// | are met:                                                              | 
+// |                                                                       | 
+// | o Redistributions of source code must retain the above copyright      | 
+// |   notice, this list of conditions and the following disclaimer.       | 
+// | o Redistributions in binary form must reproduce the above copyright   | 
+// |   notice, this list of conditions and the following disclaimer in the | 
+// |   documentation and/or other materials provided with the distribution.| 
+// | o The names of the authors may not be used to endorse or promote      | 
+// |   products derived from this software without specific prior written  | 
+// |   permission.                                                         | 
+// |                                                                       | 
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
+// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
+// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
+// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
+// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
+// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
+// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
+// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
+// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
+// |                                                                       | 
+// +-----------------------------------------------------------------------+ 
+// | Author: Richard Heyes <richard@php.net>                               | 
+// +-----------------------------------------------------------------------+ 
+// 
+// $Id$
+
+/**
+* Implmentation of CRAM-MD5 SASL mechanism
+*
+* @author  Richard Heyes <richard@php.net>
+* @access  public
+* @version 1.0
+* @package Auth_SASL
+*/
+
+require_once('Auth/SASL/Common.php');
+
+class Auth_SASL_CramMD5 extends Auth_SASL_Common
+{
+    /**
+    * Implements the CRAM-MD5 SASL mechanism
+    * This DOES NOT base64 encode the return value,
+    * you will need to do that yourself.
+    *
+    * @param string $user      Username
+    * @param string $pass      Password
+    * @param string $challenge The challenge supplied by the server.
+    *                          this should be already base64_decoded.
+    *
+    * @return string The string to pass back to the server, of the form
+    *                "<user> <digest>". This is NOT base64_encoded.
+    */
+    function getResponse($user, $pass, $challenge)
+    {
+        return $user . ' ' . $this->_HMAC_MD5($pass, $challenge);
+    }
+}
+?>
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Auth/SASL/DigestMD5.php Added

@@ -0,0 +1,197 @@
+<?php
+// +-----------------------------------------------------------------------+ 
+// | Copyright (c) 2002-2003 Richard Heyes                                 | 
+// | All rights reserved.                                                  | 
+// |                                                                       | 
+// | Redistribution and use in source and binary forms, with or without    | 
+// | modification, are permitted provided that the following conditions    | 
+// | are met:                                                              | 
+// |                                                                       | 
+// | o Redistributions of source code must retain the above copyright      | 
+// |   notice, this list of conditions and the following disclaimer.       | 
+// | o Redistributions in binary form must reproduce the above copyright   | 
+// |   notice, this list of conditions and the following disclaimer in the | 
+// |   documentation and/or other materials provided with the distribution.| 
+// | o The names of the authors may not be used to endorse or promote      | 
+// |   products derived from this software without specific prior written  | 
+// |   permission.                                                         | 
+// |                                                                       | 
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
+// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
+// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
+// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
+// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
+// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
+// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
+// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
+// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
+// |                                                                       | 
+// +-----------------------------------------------------------------------+ 
+// | Author: Richard Heyes <richard@php.net>                               | 
+// +-----------------------------------------------------------------------+ 
+// 
+// $Id$
+
+/**
+* Implmentation of DIGEST-MD5 SASL mechanism
+*
+* @author  Richard Heyes <richard@php.net>
+* @access  public
+* @version 1.0
+* @package Auth_SASL
+*/
+
+require_once('Auth/SASL/Common.php');
+
+class Auth_SASL_DigestMD5 extends Auth_SASL_Common
+{
+    /**
+    * Provides the (main) client response for DIGEST-MD5
+    * requires a few extra parameters than the other
+    * mechanisms, which are unavoidable.
+    * 
+    * @param  string $authcid   Authentication id (username)
+    * @param  string $pass      Password
+    * @param  string $challenge The digest challenge sent by the server
+    * @param  string $hostname  The hostname of the machine you're connecting to
+    * @param  string $service   The servicename (eg. imap, pop, acap etc)
+    * @param  string $authzid   Authorization id (username to proxy as)
+    * @return string            The digest response (NOT base64 encoded)
+    * @access public
+    */
+    function getResponse($authcid, $pass, $challenge, $hostname, $service, $authzid = '')
+    {
+        $challenge = $this->_parseChallenge($challenge);
+        $authzid_string = '';
+        if ($authzid != '') {
+            $authzid_string = ',authzid="' . $authzid . '"'; 
+        }
+
+        if (!empty($challenge)) {
+            $cnonce         = $this->_getCnonce();
+            $digest_uri     = sprintf('%s/%s', $service, $hostname);
+            $response_value = $this->_getResponseValue($authcid, $pass, $challenge['realm'], $challenge['nonce'], $cnonce, $digest_uri, $authzid);
+
+            if ($challenge['realm']) {
+                return sprintf('username="%s",realm="%s"' . $authzid_string  .
+',nonce="%s",cnonce="%s",nc=00000001,qop=auth,digest-uri="%s",response=%s,maxbuf=%d', $authcid, $challenge['realm'], $challenge['nonce'], $cnonce, $digest_uri, $response_value, $challenge['maxbuf']);
+            } else {
+                return sprintf('username="%s"' . $authzid_string  . ',nonce="%s",cnonce="%s",nc=00000001,qop=auth,digest-uri="%s",response=%s,maxbuf=%d', $authcid, $challenge['nonce'], $cnonce, $digest_uri, $response_value, $challenge['maxbuf']);
+            }
+        } else {
+            return PEAR::raiseError('Invalid digest challenge');
+        }
+    }
+    
+    /**
+    * Parses and verifies the digest challenge*
+    *
+    * @param  string $challenge The digest challenge
+    * @return array             The parsed challenge as an assoc
+    *                           array in the form "directive => value".
+    * @access private
+    */
+    function _parseChallenge($challenge)
+    {
+        $tokens = array();
+        while (preg_match('/^([a-z-]+)=("[^"]+(?<!\\\)"|[^,]+)/i', $challenge, $matches)) {
+
+            // Ignore these as per rfc2831
+            if ($matches[1] == 'opaque' OR $matches[1] == 'domain') {
+                $challenge = substr($challenge, strlen($matches[0]) + 1);
+                continue;
+            }
+
+            // Allowed multiple "realm" and "auth-param"
+            if (!empty($tokens[$matches[1]]) AND ($matches[1] == 'realm' OR $matches[1] == 'auth-param')) {
+                if (is_array($tokens[$matches[1]])) {
+                    $tokens[$matches[1]][] = preg_replace('/^"(.*)"$/', '\\1', $matches[2]);
+                } else {
+                    $tokens[$matches[1]] = array($tokens[$matches[1]], preg_replace('/^"(.*)"$/', '\\1', $matches[2]));
+                }
+
+            // Any other multiple instance = failure
+            } elseif (!empty($tokens[$matches[1]])) {
+                $tokens = array();
+                break;
+
+            } else {
+                $tokens[$matches[1]] = preg_replace('/^"(.*)"$/', '\\1', $matches[2]);
+            }
+
+            // Remove the just parsed directive from the challenge
+            $challenge = substr($challenge, strlen($matches[0]) + 1);
+        }
+
+        /**
+        * Defaults and required directives
+        */
+        // Realm
+        if (empty($tokens['realm'])) {
+            $tokens['realm'] = "";
+        }
+
+        // Maxbuf
+        if (empty($tokens['maxbuf'])) {
+            $tokens['maxbuf'] = 65536;
+        }
+
+        // Required: nonce, algorithm
+        if (empty($tokens['nonce']) OR empty($tokens['algorithm'])) {
+            return array();
+        }
+
+        return $tokens;
+    }
+
+    /**
+    * Creates the response= part of the digest response
+    *
+    * @param  string $authcid    Authentication id (username)
+    * @param  string $pass       Password
+    * @param  string $realm      Realm as provided by the server
+    * @param  string $nonce      Nonce as provided by the server
+    * @param  string $cnonce     Client nonce
+    * @param  string $digest_uri The digest-uri= value part of the response
+    * @param  string $authzid    Authorization id
+    * @return string             The response= part of the digest response
+    * @access private
+    */    
+    function _getResponseValue($authcid, $pass, $realm, $nonce, $cnonce, $digest_uri, $authzid = '')
+    {
+        if ($authzid == '') {
+            $A1 = sprintf('%s:%s:%s', pack('H32', md5(sprintf('%s:%s:%s', $authcid, $realm, $pass))), $nonce, $cnonce);
+        } else {
+            $A1 = sprintf('%s:%s:%s:%s', pack('H32', md5(sprintf('%s:%s:%s', $authcid, $realm, $pass))), $nonce, $cnonce, $authzid);
+        }
+        $A2 = 'AUTHENTICATE:' . $digest_uri;
+        return md5(sprintf('%s:%s:00000001:%s:auth:%s', md5($A1), $nonce, $cnonce, md5($A2)));
+    }
+
+    /**
+    * Creates the client nonce for the response
+    *
+    * @return string  The cnonce value
+    * @access private
+    */
+    function _getCnonce()
+    {
+        if (@file_exists('/dev/urandom') && $fd = @fopen('/dev/urandom', 'r')) {
+            return base64_encode(fread($fd, 32));
+
+        } elseif (@file_exists('/dev/random') && $fd = @fopen('/dev/random', 'r')) {
+            return base64_encode(fread($fd, 32));
+
+        } else {
+            $str = '';
+            for ($i=0; $i<32; $i++) {
+                $str .= chr(mt_rand(0, 255));
+            }
+            
+            return base64_encode($str);
+        }
+    }
+}
+?>

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Auth/SASL/External.php Added

@@ -0,0 +1,63 @@
+<?php
+// +-----------------------------------------------------------------------+ 
+// | Copyright (c) 2008 Christoph Schulz                                   | 
+// | All rights reserved.                                                  | 
+// |                                                                       | 
+// | Redistribution and use in source and binary forms, with or without    | 
+// | modification, are permitted provided that the following conditions    | 
+// | are met:                                                              | 
+// |                                                                       | 
+// | o Redistributions of source code must retain the above copyright      | 
+// |   notice, this list of conditions and the following disclaimer.       | 
+// | o Redistributions in binary form must reproduce the above copyright   | 
+// |   notice, this list of conditions and the following disclaimer in the | 
+// |   documentation and/or other materials provided with the distribution.| 
+// | o The names of the authors may not be used to endorse or promote      | 
+// |   products derived from this software without specific prior written  | 
+// |   permission.                                                         | 
+// |                                                                       | 
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
+// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
+// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
+// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
+// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
+// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
+// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
+// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
+// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
+// |                                                                       | 
+// +-----------------------------------------------------------------------+ 
+// | Author: Christoph Schulz <develop@kristov.de>                         | 
+// +-----------------------------------------------------------------------+ 
+// 
+// $Id: External.php 286825 2009-08-05 06:23:42Z cweiske $
+
+/**
+* Implmentation of EXTERNAL SASL mechanism
+*
+* @author  Christoph Schulz <develop@kristov.de>
+* @access  public
+* @version 1.0.3
+* @package Auth_SASL
+*/
+
+require_once('Auth/SASL/Common.php');
+
+class Auth_SASL_External extends Auth_SASL_Common
+{
+    /**
+    * Returns EXTERNAL response
+    *
+    * @param  string $authcid   Authentication id (username)
+    * @param  string $pass      Password
+    * @param  string $authzid   Autorization id
+    * @return string            EXTERNAL Response
+    */
+    function getResponse($authcid, $pass, $authzid = '')
+    {
+        return $authzid;
+    }
+}
+?>

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Auth/SASL/Login.php Added

@@ -0,0 +1,65 @@
+<?php
+// +-----------------------------------------------------------------------+ 
+// | Copyright (c) 2002-2003 Richard Heyes                                 | 
+// | All rights reserved.                                                  | 
+// |                                                                       | 
+// | Redistribution and use in source and binary forms, with or without    | 
+// | modification, are permitted provided that the following conditions    | 
+// | are met:                                                              | 
+// |                                                                       | 
+// | o Redistributions of source code must retain the above copyright      | 
+// |   notice, this list of conditions and the following disclaimer.       | 
+// | o Redistributions in binary form must reproduce the above copyright   | 
+// |   notice, this list of conditions and the following disclaimer in the | 
+// |   documentation and/or other materials provided with the distribution.| 
+// | o The names of the authors may not be used to endorse or promote      | 
+// |   products derived from this software without specific prior written  | 
+// |   permission.                                                         | 
+// |                                                                       | 
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
+// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
+// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
+// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
+// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
+// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
+// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
+// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
+// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
+// |                                                                       | 
+// +-----------------------------------------------------------------------+ 
+// | Author: Richard Heyes <richard@php.net>                               | 
+// +-----------------------------------------------------------------------+ 
+// 
+// $Id$
+
+/**
+* This is technically not a SASL mechanism, however
+* it's used by Net_Sieve, Net_Cyrus and potentially
+* other protocols , so here is a good place to abstract
+* it.
+*
+* @author  Richard Heyes <richard@php.net>
+* @access  public
+* @version 1.0
+* @package Auth_SASL
+*/
+
+require_once('Auth/SASL/Common.php');
+
+class Auth_SASL_Login extends Auth_SASL_Common
+{
+    /**
+    * Pseudo SASL LOGIN mechanism
+    *
+    * @param  string $user Username
+    * @param  string $pass Password
+    * @return string       LOGIN string
+    */
+    function getResponse($user, $pass)
+    {
+        return sprintf('LOGIN %s %s', $user, $pass);
+    }
+}
+?>
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Auth/SASL/Plain.php Added

@@ -0,0 +1,63 @@
+<?php
+// +-----------------------------------------------------------------------+ 
+// | Copyright (c) 2002-2003 Richard Heyes                                 | 
+// | All rights reserved.                                                  | 
+// |                                                                       | 
+// | Redistribution and use in source and binary forms, with or without    | 
+// | modification, are permitted provided that the following conditions    | 
+// | are met:                                                              | 
+// |                                                                       | 
+// | o Redistributions of source code must retain the above copyright      | 
+// |   notice, this list of conditions and the following disclaimer.       | 
+// | o Redistributions in binary form must reproduce the above copyright   | 
+// |   notice, this list of conditions and the following disclaimer in the | 
+// |   documentation and/or other materials provided with the distribution.| 
+// | o The names of the authors may not be used to endorse or promote      | 
+// |   products derived from this software without specific prior written  | 
+// |   permission.                                                         | 
+// |                                                                       | 
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
+// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
+// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
+// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
+// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
+// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
+// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
+// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
+// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
+// |                                                                       | 
+// +-----------------------------------------------------------------------+ 
+// | Author: Richard Heyes <richard@php.net>                               | 
+// +-----------------------------------------------------------------------+ 
+// 
+// $Id$
+
+/**
+* Implmentation of PLAIN SASL mechanism
+*
+* @author  Richard Heyes <richard@php.net>
+* @access  public
+* @version 1.0
+* @package Auth_SASL
+*/
+
+require_once('Auth/SASL/Common.php');
+
+class Auth_SASL_Plain extends Auth_SASL_Common
+{
+    /**
+    * Returns PLAIN response
+    *
+    * @param  string $authcid   Authentication id (username)
+    * @param  string $pass      Password
+    * @param  string $authzid   Autorization id
+    * @return string            PLAIN Response
+    */
+    function getResponse($authcid, $pass, $authzid = '')
+    {
+        return $authzid . chr(0) . $authcid . chr(0) . $pass;
+    }
+}
+?>

iRony-0.4.4.tar.gz/lib/FileAPI/ext/HTTP Added

iRony-0.4.4.tar.gz/lib/FileAPI/ext/HTTP/Request2 Added

iRony-0.4.4.tar.gz/lib/FileAPI/ext/HTTP/Request2.php Added

@@ -0,0 +1,1015 @@
+<?php
+/**
+ * Class representing a HTTP request message
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: Request2.php 315409 2011-08-24 07:29:23Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * A class representing an URL as per RFC 3986.
+ */
+require_once 'Net/URL2.php';
+
+/**
+ * Exception class for HTTP_Request2 package
+ */
+require_once 'HTTP/Request2/Exception.php';
+
+/**
+ * Class representing a HTTP request message
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @version    Release: 2.0.0
+ * @link       http://tools.ietf.org/html/rfc2616#section-5
+ */
+class HTTP_Request2 implements SplSubject
+{
+   /**#@+
+    * Constants for HTTP request methods
+    *
+    * @link http://tools.ietf.org/html/rfc2616#section-5.1.1
+    */
+    const METHOD_OPTIONS = 'OPTIONS';
+    const METHOD_GET     = 'GET';
+    const METHOD_HEAD    = 'HEAD';
+    const METHOD_POST    = 'POST';
+    const METHOD_PUT     = 'PUT';
+    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
+    */
+    const REGEXP_INVALID_COOKIE = '/[\s,;]/';
+
+   /**
+    * Fileinfo magic database resource
+    * @var  resource
+    * @see  detectMimeType()
+    */
+    private static $_fileinfoDb;
+
+   /**
+    * Observers attached to the request (instances of SplObserver)
+    * @var  array
+    */
+    protected $observers = array();
+
+   /**
+    * Request URL
+    * @var  Net_URL2
+    */
+    protected $url;
+
+   /**
+    * Request method
+    * @var  string
+    */
+    protected $method = self::METHOD_GET;
+
+   /**
+    * Authentication data
+    * @var  array
+    * @see  getAuth()
+    */
+    protected $auth;
+
+   /**
+    * Request headers
+    * @var  array
+    */
+    protected $headers = array();
+
+   /**
+    * Configuration parameters
+    * @var  array
+    * @see  setConfig()
+    */
+    protected $config = array(
+        'adapter'           => 'HTTP_Request2_Adapter_Socket',
+        'connect_timeout'   => 10,
+        'timeout'           => 0,
+        'use_brackets'      => true,
+        'protocol_version'  => '1.1',
+        'buffer_size'       => 16384,
+        'store_body'        => true,
+
+        'proxy_host'        => '',
+        'proxy_port'        => '',
+        'proxy_user'        => '',
+        'proxy_password'    => '',
+        'proxy_auth_scheme' => self::AUTH_BASIC,
+
+        'ssl_verify_peer'   => true,
+        'ssl_verify_host'   => true,
+        'ssl_cafile'        => null,
+        'ssl_capath'        => null,
+        'ssl_local_cert'    => null,
+        'ssl_passphrase'    => null,
+
+        'digest_compat_ie'  => false,
+
+        'follow_redirects'  => false,
+        'max_redirects'     => 5,
+        'strict_redirects'  => false
+    );
+
+   /**
+    * Last event in request / response handling, intended for observers
+    * @var  array
+    * @see  getLastEvent()
+    */
+    protected $lastEvent = array(
+        'name' => 'start',
+        'data' => null
+    );
+
+   /**
+    * Request body
+    * @var  string|resource
+    * @see  setBody()
+    */
+    protected $body = '';
+
+   /**
+    * Array of POST parameters
+    * @var  array
+    */
+    protected $postParams = array();
+
+   /**
+    * Array of file uploads (for multipart/form-data POST requests)
+    * @var  array
+    */
+    protected $uploads = array();
+
+   /**
+    * Adapter used to perform actual HTTP request
+    * @var  HTTP_Request2_Adapter
+    */
+    protected $adapter;
+
+   /**
+    * Cookie jar to persist cookies between requests
+    * @var HTTP_Request2_CookieJar
+    */
+    protected $cookieJar = null;
+
+   /**
+    * Constructor. Can set request URL, method and configuration array.
+    *
+    * Also sets a default value for User-Agent header.
+    *
+    * @param    string|Net_Url2     Request URL
+    * @param    string              Request method
+    * @param    array               Configuration for this Request instance
+    */
+    public function __construct($url = null, $method = self::METHOD_GET, array $config = array())
+    {
+        $this->setConfig($config);
+        if (!empty($url)) {
+            $this->setUrl($url);
+        }
+        if (!empty($method)) {
+            $this->setMethod($method);
+        }
+        $this->setHeader('user-agent', 'HTTP_Request2/2.0.0 ' .
+                         '(http://pear.php.net/package/http_request2) ' .
+                         'PHP/' . phpversion());
+    }
+
+   /**
+    * Sets the URL for this request
+    *
+    * If the URL has userinfo part (username & password) these will be removed
+    * and converted to auth data. If the URL does not have a path component,
+    * that will be set to '/'.
+    *
+    * @param    string|Net_URL2 Request URL
+    * @return   HTTP_Request2
+    * @throws   HTTP_Request2_LogicException
+    */
+    public function setUrl($url)
+    {
+        if (is_string($url)) {
+            $url = new Net_URL2(
+                $url, array(Net_URL2::OPTION_USE_BRACKETS => $this->config['use_brackets'])
+            );
+        }
+        if (!$url instanceof Net_URL2) {
+            throw new HTTP_Request2_LogicException(
+                'Parameter is not a valid HTTP URL',
+                HTTP_Request2_Exception::INVALID_ARGUMENT
+            );
+        }
+        // URL contains username / password?
+        if ($url->getUserinfo()) {
+            $username = $url->getUser();
+            $password = $url->getPassword();
+            $this->setAuth(rawurldecode($username), $password? rawurldecode($password): '');
+            $url->setUserinfo('');
+        }
+        if ('' == $url->getPath()) {
+            $url->setPath('/');
+        }
+        $this->url = $url;
+
+        return $this;
+    }
+
+   /**
+    * Returns the request URL
+    *
+    * @return   Net_URL2
+    */
+    public function getUrl()
+    {
+        return $this->url;
+    }
+
+   /**
+    * Sets the request method
+    *
+    * @param    string
+    * @return   HTTP_Request2
+    * @throws   HTTP_Request2_LogicException if the method name is invalid
+    */
+    public function setMethod($method)
+    {
+        // Method name should be a token: http://tools.ietf.org/html/rfc2616#section-5.1.1
+        if (preg_match(self::REGEXP_INVALID_TOKEN, $method)) {
+            throw new HTTP_Request2_LogicException(
+                "Invalid request method '{$method}'",
+                HTTP_Request2_Exception::INVALID_ARGUMENT
+            );
+        }
+        $this->method = $method;
+
+        return $this;
+    }
+
+   /**
+    * Returns the request method
+    *
+    * @return   string
+    */
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+   /**
+    * Sets the configuration parameter(s)
+    *
+    * The following parameters are available:
+    * <ul>
+    *   <li> 'adapter'           - adapter to use (string)</li>
+    *   <li> 'connect_timeout'   - Connection timeout in seconds (integer)</li>
+    *   <li> 'timeout'           - Total number of seconds a request can take.
+    *                              Use 0 for no limit, should be greater than
+    *                              'connect_timeout' if set (integer)</li>
+    *   <li> 'use_brackets'      - Whether to append [] to array variable names (bool)</li>
+    *   <li> 'protocol_version'  - HTTP Version to use, '1.0' or '1.1' (string)</li>
+    *   <li> 'buffer_size'       - Buffer size to use for reading and writing (int)</li>
+    *   <li> 'store_body'        - Whether to store response body in response object.
+    *                              Set to false if receiving a huge response and
+    *                              using an Observer to save it (boolean)</li>
+    *   <li> 'proxy_host'        - Proxy server host (string)</li>
+    *   <li> 'proxy_port'        - Proxy server port (integer)</li>
+    *   <li> 'proxy_user'        - Proxy auth username (string)</li>
+    *   <li> 'proxy_password'    - Proxy auth password (string)</li>
+    *   <li> 'proxy_auth_scheme' - Proxy auth scheme, one of HTTP_Request2::AUTH_* constants (string)</li>
+    *   <li> 'ssl_verify_peer'   - Whether to verify peer's SSL certificate (bool)</li>
+    *   <li> 'ssl_verify_host'   - Whether to check that Common Name in SSL
+    *                              certificate matches host name (bool)</li>
+    *   <li> 'ssl_cafile'        - Cerificate Authority file to verify the peer
+    *                              with (use with 'ssl_verify_peer') (string)</li>
+    *   <li> 'ssl_capath'        - Directory holding multiple Certificate
+    *                              Authority files (string)</li>
+    *   <li> 'ssl_local_cert'    - Name of a file containing local cerificate (string)</li>
+    *   <li> 'ssl_passphrase'    - Passphrase with which local certificate
+    *                              was encoded (string)</li>
+    *   <li> 'digest_compat_ie'  - Whether to imitate behaviour of MSIE 5 and 6
+    *                              in using URL without query string in digest
+    *                              authentication (boolean)</li>
+    *   <li> 'follow_redirects'  - Whether to automatically follow HTTP Redirects (boolean)</li>
+    *   <li> 'max_redirects'     - Maximum number of redirects to follow (integer)</li>
+    *   <li> 'strict_redirects'  - Whether to keep request method on redirects via status 301 and
+    *                              302 (true, needed for compatibility with RFC 2616)
+    *                              or switch to GET (false, needed for compatibility with most
+    *                              browsers) (boolean)</li>
+    * </ul>
+    *
+    * @param    string|array    configuration parameter name or array
+    *                           ('parameter name' => 'parameter value')
+    * @param    mixed           parameter value if $nameOrConfig is not an array
+    * @return   HTTP_Request2
+    * @throws   HTTP_Request2_LogicException If the parameter is unknown
+    */
+    public function setConfig($nameOrConfig, $value = null)
+    {
+        if (is_array($nameOrConfig)) {
+            foreach ($nameOrConfig as $name => $value) {
+                $this->setConfig($name, $value);
+            }
+
+        } else {
+            if (!array_key_exists($nameOrConfig, $this->config)) {
+                throw new HTTP_Request2_LogicException(
+                    "Unknown configuration parameter '{$nameOrConfig}'",
+                    HTTP_Request2_Exception::INVALID_ARGUMENT
+                );
+            }
+            $this->config[$nameOrConfig] = $value;
+        }
+
+        return $this;
+    }
+
+   /**
+    * Returns the value(s) of the configuration parameter(s)
+    *
+    * @param    string  parameter name
+    * @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
+    */
+    public function getConfig($name = null)
+    {
+        if (null === $name) {
+            return $this->config;
+        } elseif (!array_key_exists($name, $this->config)) {
+            throw new HTTP_Request2_LogicException(
+                "Unknown configuration parameter '{$name}'",
+                HTTP_Request2_Exception::INVALID_ARGUMENT
+            );
+        }
+        return $this->config[$name];
+    }
+
+   /**
+    * Sets the autentification data
+    *
+    * @param    string  user name
+    * @param    string  password
+    * @param    string  authentication scheme
+    * @return   HTTP_Request2
+    */
+    public function setAuth($user, $password = '', $scheme = self::AUTH_BASIC)
+    {
+        if (empty($user)) {
+            $this->auth = null;
+        } else {
+            $this->auth = array(
+                'user'     => (string)$user,
+                'password' => (string)$password,
+                'scheme'   => $scheme
+            );
+        }
+
+        return $this;
+    }
+
+   /**
+    * Returns the authentication data
+    *
+    * The array has the keys 'user', 'password' and 'scheme', where 'scheme'
+    * is one of the HTTP_Request2::AUTH_* constants.
+    *
+    * @return   array
+    */
+    public function getAuth()
+    {
+        return $this->auth;
+    }
+
+   /**
+    * Sets request header(s)
+    *
+    * The first parameter may be either a full header string 'header: value' or
+    * header name. In the former case $value parameter is ignored, in the latter
+    * the header's value will either be set to $value or the header will be
+    * removed if $value is null. The first parameter can also be an array of
+    * headers, in that case method will be called recursively.
+    *
+    * Note that headers are treated case insensitively as per RFC 2616.
+    *
+    * <code>
+    * $req->setHeader('Foo: Bar'); // sets the value of 'Foo' header to 'Bar'
+    * $req->setHeader('FoO', 'Baz'); // sets the value of 'Foo' header to 'Baz'
+    * $req->setHeader(array('foo' => 'Quux')); // sets the value of 'Foo' header to 'Quux'
+    * $req->setHeader('FOO'); // removes 'Foo' header from request
+    * </code>
+    *
+    * @param    string|array    header name, header string ('Header: value')
+    *                           or an array of headers
+    * @param    string|array|null header value if $name is not an array,
+    *                           header will be removed if value is null
+    * @param    bool            whether to replace previous header with the
+    *                           same name or append to its value
+    * @return   HTTP_Request2
+    * @throws   HTTP_Request2_LogicException
+    */
+    public function setHeader($name, $value = null, $replace = true)
+    {
+        if (is_array($name)) {
+            foreach ($name as $k => $v) {
+                if (is_string($k)) {
+                    $this->setHeader($k, $v, $replace);
+                } else {
+                    $this->setHeader($v, null, $replace);
+                }
+            }
+        } else {
+            if (null === $value && strpos($name, ':')) {
+                list($name, $value) = array_map('trim', explode(':', $name, 2));
+            }
+            // Header name should be a token: http://tools.ietf.org/html/rfc2616#section-4.2
+            if (preg_match(self::REGEXP_INVALID_TOKEN, $name)) {
+                throw new HTTP_Request2_LogicException(
+                    "Invalid header name '{$name}'",
+                    HTTP_Request2_Exception::INVALID_ARGUMENT
+                );
+            }
+            // Header names are case insensitive anyway
+            $name = strtolower($name);
+            if (null === $value) {
+                unset($this->headers[$name]);
+
+            } else {
+                if (is_array($value)) {
+                    $value = implode(', ', array_map('trim', $value));
+                } elseif (is_string($value)) {
+                    $value = trim($value);
+                }
+                if (!isset($this->headers[$name]) || $replace) {
+                    $this->headers[$name] = $value;
+                } else {
+                    $this->headers[$name] .= ', ' . $value;
+                }
+            }
+        }
+
+        return $this;
+    }
+
+   /**
+    * Returns the request headers
+    *
+    * The array is of the form ('header name' => 'header value'), header names
+    * are lowercased
+    *
+    * @return   array
+    */
+    public function getHeaders()
+    {
+        return $this->headers;
+    }
+
+   /**
+    * Adds a cookie to the request
+    *
+    * If the request does not have a CookieJar object set, this method simply
+    * appends a cookie to "Cookie:" header.
+    *
+    * If a CookieJar object is available, the cookie is stored in that object.
+    * Data from request URL will be used for setting its 'domain' and 'path'
+    * parameters, 'expires' and 'secure' will be set to null and false,
+    * respectively. If you need further control, use CookieJar's methods.
+    *
+    * @param    string  cookie name
+    * @param    string  cookie value
+    * @return   HTTP_Request2
+    * @throws   HTTP_Request2_LogicException
+    * @see      setCookieJar()
+    */
+    public function addCookie($name, $value)
+    {
+        if (!empty($this->cookieJar)) {
+            $this->cookieJar->store(array('name' => $name, 'value' => $value),
+                                    $this->url);
+
+        } else {
+            $cookie = $name . '=' . $value;
+            if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {
+                throw new HTTP_Request2_LogicException(
+                    "Invalid cookie: '{$cookie}'",
+                    HTTP_Request2_Exception::INVALID_ARGUMENT
+                );
+            }
+            $cookies = empty($this->headers['cookie'])? '': $this->headers['cookie'] . '; ';
+            $this->setHeader('cookie', $cookies . $cookie);
+        }
+
+        return $this;
+    }
+
+   /**
+    * Sets the request body
+    *
+    * If you provide file pointer rather than file name, it should support
+    * fstat() and rewind() operations.
+    *
+    * @param    string|resource|HTTP_Request2_MultipartBody  Either a string
+    *               with the body or filename containing body or pointer to
+    *               an open file or object with multipart body data
+    * @param    bool    Whether first parameter is a filename
+    * @return   HTTP_Request2
+    * @throws   HTTP_Request2_LogicException
+    */
+    public function setBody($body, $isFilename = false)
+    {
+        if (!$isFilename && !is_resource($body)) {
+            if (!$body instanceof HTTP_Request2_MultipartBody) {
+                $this->body = (string)$body;
+            } else {
+                $this->body = $body;
+            }
+        } else {
+            $fileData = $this->fopenWrapper($body, empty($this->headers['content-type']));
+            $this->body = $fileData['fp'];
+            if (empty($this->headers['content-type'])) {
+                $this->setHeader('content-type', $fileData['type']);
+            }
+        }
+        $this->postParams = $this->uploads = array();
+
+        return $this;
+    }
+
+   /**
+    * Returns the request body
+    *
+    * @return   string|resource|HTTP_Request2_MultipartBody
+    */
+    public function getBody()
+    {
+        if (self::METHOD_POST == $this->method &&
+            (!empty($this->postParams) || !empty($this->uploads))
+        ) {
+            if (0 === strpos($this->headers['content-type'], 'application/x-www-form-urlencoded')) {
+                $body = http_build_query($this->postParams, '', '&');
+                if (!$this->getConfig('use_brackets')) {
+                    $body = preg_replace('/%5B\d+%5D=/', '=', $body);
+                }
+                // support RFC 3986 by not encoding '~' symbol (request #15368)
+                return str_replace('%7E', '~', $body);
+
+            } elseif (0 === strpos($this->headers['content-type'], 'multipart/form-data')) {
+                require_once 'HTTP/Request2/MultipartBody.php';
+                return new HTTP_Request2_MultipartBody(
+                    $this->postParams, $this->uploads, $this->getConfig('use_brackets')
+                );
+            }
+        }
+        return $this->body;
+    }
+
+   /**
+    * Adds a file to form-based file upload
+    *
+    * Used to emulate file upload via a HTML form. The method also sets
+    * Content-Type of HTTP request to 'multipart/form-data'.
+    *
+    * If you just want to send the contents of a file as the body of HTTP
+    * request you should use setBody() method.
+    *
+    * If you provide file pointers rather than file names, they should support
+    * fstat() and rewind() operations.
+    *
+    * @param    string  name of file-upload field
+    * @param    string|resource|array   full name of local file, pointer to
+    *               open file or an array of files
+    * @param    string  filename to send in the request
+    * @param    string  content-type of file being uploaded
+    * @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] = 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 = array();
+            foreach ($filename as $f) {
+                if (!is_array($f)) {
+                    $f = array($f);
+                }
+                $fileData = $this->fopenWrapper($f[0], empty($f[2]));
+                $fps[]   = $fileData['fp'];
+                $names[] = !empty($f[1])? $f[1]
+                            :(is_string($f[0])? basename($f[0]): 'anonymous.blob');
+                $sizes[] = $fileData['size'];
+                $types[] = empty($f[2])? $fileData['type']: $f[2];
+            }
+            $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']
+        ) {
+            $this->setHeader('content-type', 'multipart/form-data');
+        }
+
+        return $this;
+    }
+
+   /**
+    * Adds POST parameter(s) to the request.
+    *
+    * @param    string|array    parameter name or array ('name' => 'value')
+    * @param    mixed           parameter value (can be an array)
+    * @return   HTTP_Request2
+    */
+    public function addPostParameter($name, $value = null)
+    {
+        if (!is_array($name)) {
+            $this->postParams[$name] = $value;
+        } else {
+            foreach ($name as $k => $v) {
+                $this->addPostParameter($k, $v);
+            }
+        }
+        if (empty($this->headers['content-type'])) {
+            $this->setHeader('content-type', 'application/x-www-form-urlencoded');
+        }
+
+        return $this;
+    }
+
+   /**
+    * Attaches a new observer
+    *
+    * @param    SplObserver
+    */
+    public function attach(SplObserver $observer)
+    {
+        foreach ($this->observers as $attached) {
+            if ($attached === $observer) {
+                return;
+            }
+        }
+        $this->observers[] = $observer;
+    }
+
+   /**
+    * Detaches an existing observer
+    *
+    * @param    SplObserver
+    */
+    public function detach(SplObserver $observer)
+    {
+        foreach ($this->observers as $key => $attached) {
+            if ($attached === $observer) {
+                unset($this->observers[$key]);
+                return;
+            }
+        }
+    }
+
+   /**
+    * Notifies all observers
+    */
+    public function notify()
+    {
+        foreach ($this->observers as $observer) {
+            $observer->update($this);
+        }
+    }
+
+   /**
+    * Sets the last event
+    *
+    * Adapters should use this method to set the current state of the request
+    * and notify the observers.
+    *
+    * @param    string  event name
+    * @param    mixed   event data
+    */
+    public function setLastEvent($name, $data = null)
+    {
+        $this->lastEvent = array(
+            'name' => $name,
+            'data' => $data
+        );
+        $this->notify();
+    }
+
+   /**
+    * Returns the last event
+    *
+    * Observers should use this method to access the last change in request.
+    * The following event names are possible:
+    * <ul>
+    *   <li>'connect'                 - after connection to remote server,
+    *                                   data is the destination (string)</li>
+    *   <li>'disconnect'              - after disconnection from server</li>
+    *   <li>'sentHeaders'             - after sending the request headers,
+    *                                   data is the headers sent (string)</li>
+    *   <li>'sentBodyPart'            - after sending a part of the request body,
+    *                                   data is the length of that part (int)</li>
+    *   <li>'sentBody'                - after sending the whole request body,
+    *                                   data is request body length (int)</li>
+    *   <li>'receivedHeaders'         - after receiving the response headers,
+    *                                   data is HTTP_Request2_Response object</li>
+    *   <li>'receivedBodyPart'        - after receiving a part of the response
+    *                                   body, data is that part (string)</li>
+    *   <li>'receivedEncodedBodyPart' - as 'receivedBodyPart', but data is still
+    *                                   encoded by Content-Encoding</li>
+    *   <li>'receivedBody'            - after receiving the complete response
+    *                                   body, data is HTTP_Request2_Response object</li>
+    * </ul>
+    * 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'
+    */
+    public function getLastEvent()
+    {
+        return $this->lastEvent;
+    }
+
+   /**
+    * Sets the adapter used to actually perform the request
+    *
+    * You can pass either an instance of a class implementing HTTP_Request2_Adapter
+    * or a class name. The method will only try to include a file if the class
+    * name starts with HTTP_Request2_Adapter_, it will also try to prepend this
+    * prefix to the class name if it doesn't contain any underscores, so that
+    * <code>
+    * $request->setAdapter('curl');
+    * </code>
+    * will work.
+    *
+    * @param    string|HTTP_Request2_Adapter
+    * @return   HTTP_Request2
+    * @throws   HTTP_Request2_LogicException
+    */
+    public function setAdapter($adapter)
+    {
+        if (is_string($adapter)) {
+            if (!class_exists($adapter, false)) {
+                if (false === strpos($adapter, '_')) {
+                    $adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);
+                }
+                if (preg_match('/^HTTP_Request2_Adapter_([a-zA-Z0-9]+)$/', $adapter)) {
+                    include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';
+                }
+                if (!class_exists($adapter, false)) {
+                    throw new HTTP_Request2_LogicException(
+                        "Class {$adapter} not found",
+                        HTTP_Request2_Exception::MISSING_VALUE
+                    );
+                }
+            }
+            $adapter = new $adapter;
+        }
+        if (!$adapter instanceof HTTP_Request2_Adapter) {
+            throw new HTTP_Request2_LogicException(
+                'Parameter is not a HTTP request adapter',
+                HTTP_Request2_Exception::INVALID_ARGUMENT
+            );
+        }
+        $this->adapter = $adapter;
+
+        return $this;
+    }
+
+   /**
+    * Sets the cookie jar
+    *
+    * A cookie jar is used to maintain cookies across HTTP requests and
+    * responses. Cookies from jar will be automatically added to the request
+    * headers based on request URL.
+    *
+    * @param HTTP_Request2_CookieJar|bool   Existing CookieJar object, true to
+    *                                       create a new one, false to remove
+    */
+    public function setCookieJar($jar = true)
+    {
+        if (!class_exists('HTTP_Request2_CookieJar', false)) {
+            require_once 'HTTP/Request2/CookieJar.php';
+        }
+
+        if ($jar instanceof HTTP_Request2_CookieJar) {
+            $this->cookieJar = $jar;
+        } elseif (true === $jar) {
+            $this->cookieJar = new HTTP_Request2_CookieJar();
+        } elseif (!$jar) {
+            $this->cookieJar = null;
+        } else {
+            throw new HTTP_Request2_LogicException(
+                'Invalid parameter passed to setCookieJar()',
+                HTTP_Request2_Exception::INVALID_ARGUMENT
+            );
+        }
+
+        return $this;
+    }
+
+   /**
+    * Returns current CookieJar object or null if none
+    *
+    * @return HTTP_Request2_CookieJar|null
+    */
+    public function getCookieJar()
+    {
+        return $this->cookieJar;
+    }
+
+   /**
+    * Sends the request and returns the 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()), array('https', 'http'))
+        ) {
+            throw new HTTP_Request2_LogicException(
+                'HTTP_Request2 needs an absolute HTTP(S) request URL, '
+                . ($this->url instanceof Net_URL2
+                   ? "'" . $this->url->__toString() . "'" : 'none')
+                . ' given',
+                HTTP_Request2_Exception::INVALID_ARGUMENT
+            );
+        }
+        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'))) {
+            $oldEncoding = mb_internal_encoding();
+            mb_internal_encoding('iso-8859-1');
+        }
+
+        try {
+            $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;
+    }
+
+   /**
+    * Wrapper around fopen()/fstat() used by setBody() and addUpload()
+    *
+    * @param  string|resource file name or pointer to open file
+    * @param  bool            whether to try autodetecting MIME 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
+    */
+    protected function fopenWrapper($file, $detectType = false)
+    {
+        if (!is_string($file) && !is_resource($file)) {
+            throw new HTTP_Request2_LogicException(
+                "Filename or file pointer resource expected",
+                HTTP_Request2_Exception::INVALID_ARGUMENT
+            );
+        }
+        $fileData = array(
+            'fp'   => is_string($file)? null: $file,
+            'type' => 'application/octet-stream',
+            'size' => 0
+        );
+        if (is_string($file)) {
+            $track = @ini_set('track_errors', 1);
+            if (!($fileData['fp'] = @fopen($file, 'rb'))) {
+                $e = new HTTP_Request2_LogicException(
+                    $php_errormsg, HTTP_Request2_Exception::READ_ERROR
+                );
+            }
+            @ini_set('track_errors', $track);
+            if (isset($e)) {
+                throw $e;
+            }
+            if ($detectType) {
+                $fileData['type'] = self::detectMimeType($file);
+            }
+        }
+        if (!($stat = fstat($fileData['fp']))) {
+            throw new HTTP_Request2_LogicException(
+                "fstat() call failed", HTTP_Request2_Exception::READ_ERROR
+            );
+        }
+        $fileData['size'] = $stat['size'];
+
+        return $fileData;
+    }
+
+   /**
+    * Tries to detect MIME type of a file
+    *
+    * The method will try to use fileinfo extension if it is available,
+    * deprecated mime_content_type() function in the other case. If neither
+    * works, default 'application/octet-stream' MIME type is returned
+    *
+    * @param    string  filename
+    * @return   string  file MIME type
+    */
+    protected static function detectMimeType($filename)
+    {
+        // finfo extension from PECL available
+        if (function_exists('finfo_open')) {
+            if (!isset(self::$_fileinfoDb)) {
+                self::$_fileinfoDb = @finfo_open(FILEINFO_MIME);
+            }
+            if (self::$_fileinfoDb) {
+                $info = finfo_file(self::$_fileinfoDb, $filename);
+            }
+        }
+        // (deprecated) mime_content_type function available
+        if (empty($info) && function_exists('mime_content_type')) {
+            return mime_content_type($filename);
+        }
+        return empty($info)? 'application/octet-stream': $info;
+    }
+}
+?>

iRony-0.4.4.tar.gz/lib/FileAPI/ext/HTTP/Request2/Adapter Added

iRony-0.4.4.tar.gz/lib/FileAPI/ext/HTTP/Request2/Adapter.php Added

@@ -0,0 +1,154 @@
+<?php
+/**
+ * Base class for HTTP_Request2 adapters
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: Adapter.php 308322 2011-02-14 13:58:03Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Class representing a HTTP response
+ */
+require_once 'HTTP/Request2/Response.php';
+
+/**
+ * Base class for HTTP_Request2 adapters
+ *
+ * HTTP_Request2 class itself only defines methods for aggregating the request
+ * data, all actual work of sending the request to the remote server and
+ * receiving its response is performed by adapters.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @version    Release: 2.0.0
+ */
+abstract class HTTP_Request2_Adapter
+{
+   /**
+    * A list of methods that MUST NOT have a request body, per RFC 2616
+    * @var  array
+    */
+    protected static $bodyDisallowed = array('TRACE');
+
+   /**
+    * Methods having defined semantics for request body
+    *
+    * Content-Length header (indicating that the body follows, section 4.3 of
+    * RFC 2616) will be sent for these methods even if no body was added
+    *
+    * @var  array
+    * @link http://pear.php.net/bugs/bug.php?id=12900
+    * @link http://pear.php.net/bugs/bug.php?id=14740
+    */
+    protected static $bodyRequired = array('POST', 'PUT');
+
+   /**
+    * Request being sent
+    * @var  HTTP_Request2
+    */
+    protected $request;
+
+   /**
+    * Request body
+    * @var  string|resource|HTTP_Request2_MultipartBody
+    * @see  HTTP_Request2::getBody()
+    */
+    protected $requestBody;
+
+   /**
+    * Length of the request body
+    * @var  integer
+    */
+    protected $contentLength;
+
+   /**
+    * Sends request to the remote server and returns its response
+    *
+    * @param    HTTP_Request2
+    * @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   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)
+    {
+        $this->requestBody = $this->request->getBody();
+
+        if (is_string($this->requestBody)) {
+            $this->contentLength = strlen($this->requestBody);
+        } elseif (is_resource($this->requestBody)) {
+            $stat = fstat($this->requestBody);
+            $this->contentLength = $stat['size'];
+            rewind($this->requestBody);
+        } else {
+            $this->contentLength = $this->requestBody->getLength();
+            $headers['content-type'] = 'multipart/form-data; boundary=' .
+                                       $this->requestBody->getBoundary();
+            $this->requestBody->rewind();
+        }
+
+        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
+            0 == $this->contentLength
+        ) {
+            // No body: send a Content-Length header nonetheless (request #12900),
+            // but do that only for methods that require a body (bug #14740)
+            if (in_array($this->request->getMethod(), self::$bodyRequired)) {
+                $headers['content-length'] = 0;
+            } else {
+                unset($headers['content-length']);
+                // if the method doesn't require a body and doesn't have a
+                // body, don't send a Content-Type header. (request #16799)
+                unset($headers['content-type']);
+            }
+        } else {
+            if (empty($headers['content-type'])) {
+                $headers['content-type'] = 'application/x-www-form-urlencoded';
+            }
+            $headers['content-length'] = $this->contentLength;
+        }
+    }
+}
+?>

iRony-0.4.4.tar.gz/lib/FileAPI/ext/HTTP/Request2/Adapter/Curl.php Added

@@ -0,0 +1,560 @@
+<?php
+/**
+ * Adapter for HTTP_Request2 wrapping around cURL extension
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: Curl.php 310800 2011-05-06 07:29:56Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Base class for HTTP_Request2 adapters
+ */
+require_once 'HTTP/Request2/Adapter.php';
+
+/**
+ * Adapter for HTTP_Request2 wrapping around cURL extension
+ *
+ * @category    HTTP
+ * @package     HTTP_Request2
+ * @author      Alexey Borzov <avb@php.net>
+ * @version     Release: 2.0.0
+ */
+class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
+{
+   /**
+    * Mapping of header names to cURL options
+    * @var  array
+    */
+    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
+    */
+    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
+    */
+    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           => 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
+    */
+    protected $response;
+
+   /**
+    * Whether 'sentHeaders' event was sent to observers
+    * @var  boolean
+    */
+    protected $eventSentHeaders = false;
+
+   /**
+    * Whether 'receivedHeaders' event was sent to observers
+    * @var boolean
+    */
+    protected $eventReceivedHeaders = false;
+
+   /**
+    * Position within request body
+    * @var  integer
+    * @see  callbackReadBody()
+    */
+    protected $position = 0;
+
+   /**
+    * Information about last transfer, as returned by curl_getinfo()
+    * @var  array
+    */
+    protected $lastInfo;
+
+   /**
+    * Creates a subclass of HTTP_Request2_Exception from curl error data
+    *
+    * @param resource curl handle
+    * @return HTTP_Request2_Exception
+    */
+    protected static function wrapCurlError($ch)
+    {
+        $nativeCode = curl_errno($ch);
+        $message    = 'Curl error: ' . curl_error($ch);
+        if (!isset(self::$errorMap[$nativeCode])) {
+            return new HTTP_Request2_Exception($message, 0, $nativeCode);
+        } else {
+            $class = self::$errorMap[$nativeCode][0];
+            $code  = empty(self::$errorMap[$nativeCode][1])
+                     ? 0 : self::$errorMap[$nativeCode][1];
+            return new $class($message, $code, $nativeCode);
+        }
+    }
+
+   /**
+    * Sends request to the remote server and returns its response
+    *
+    * @param    HTTP_Request2
+    * @return   HTTP_Request2_Response
+    * @throws   HTTP_Request2_Exception
+    */
+    public function sendRequest(HTTP_Request2 $request)
+    {
+        if (!extension_loaded('curl')) {
+            throw new HTTP_Request2_LogicException(
+                'cURL extension not available', HTTP_Request2_Exception::MISCONFIGURATION
+            );
+        }
+
+        $this->request              = $request;
+        $this->response             = null;
+        $this->position             = 0;
+        $this->eventSentHeaders     = false;
+        $this->eventReceivedHeaders = false;
+
+        try {
+            if (false === curl_exec($ch = $this->createCurlHandle())) {
+                $e = self::wrapCurlError($ch);
+            }
+        } catch (Exception $e) {
+        }
+        if (isset($ch)) {
+            $this->lastInfo = curl_getinfo($ch);
+            curl_close($ch);
+        }
+
+        $response = $this->response;
+        unset($this->request, $this->requestBody, $this->response);
+
+        if (!empty($e)) {
+            throw $e;
+        }
+
+        if ($jar = $request->getCookieJar()) {
+            $jar->addCookiesFromResponse($response, $request->getUrl());
+        }
+
+        if (0 < $this->lastInfo['size_download']) {
+            $request->setLastEvent('receivedBody', $response);
+        }
+        return $response;
+    }
+
+   /**
+    * Returns information about last transfer
+    *
+    * @return   array   associative array as returned by curl_getinfo()
+    */
+    public function getInfo()
+    {
+        return $this->lastInfo;
+    }
+
+   /**
+    * 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
+    */
+    protected function createCurlHandle()
+    {
+        $ch = curl_init();
+
+        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')) {
+            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);
+        } else {
+            if (!@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true)) {
+                throw new HTTP_Request2_LogicException(
+                    'Redirect support in curl is unavailable due to open_basedir or safe_mode setting',
+                    HTTP_Request2_Exception::MISCONFIGURATION
+                );
+            }
+            curl_setopt($ch, CURLOPT_MAXREDIRS, $this->request->getConfig('max_redirects'));
+            // limit redirects to http(s), works in 5.2.10+
+            if (defined('CURLOPT_REDIR_PROTOCOLS')) {
+                curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+            }
+            // works in 5.3.2+, http://bugs.php.net/bug.php?id=49571
+            if ($this->request->getConfig('strict_redirects') && defined('CURLOPT_POSTREDIR')) {
+                curl_setopt($ch, CURLOPT_POSTREDIR, 3);
+            }
+        }
+
+        // request timeout
+        if ($timeout = $this->request->getConfig('timeout')) {
+            curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+        }
+
+        // set HTTP version
+        switch ($this->request->getConfig('protocol_version')) {
+            case '1.0':
+                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+                break;
+            case '1.1':
+                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+        }
+
+        // set request method
+        switch ($this->request->getMethod()) {
+            case HTTP_Request2::METHOD_GET:
+                curl_setopt($ch, CURLOPT_HTTPGET, true);
+                break;
+            case HTTP_Request2::METHOD_POST:
+                curl_setopt($ch, CURLOPT_POST, true);
+                break;
+            case HTTP_Request2::METHOD_HEAD:
+                curl_setopt($ch, CURLOPT_NOBODY, true);
+                break;
+            case HTTP_Request2::METHOD_PUT:
+                curl_setopt($ch, CURLOPT_UPLOAD, true);
+                break;
+            default:
+                curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());
+        }
+
+        // set proxy, if needed
+        if ($host = $this->request->getConfig('proxy_host')) {
+            if (!($port = $this->request->getConfig('proxy_port'))) {
+                throw new HTTP_Request2_LogicException(
+                    'Proxy port not provided', HTTP_Request2_Exception::MISSING_VALUE
+                );
+            }
+            curl_setopt($ch, CURLOPT_PROXY, $host . ':' . $port);
+            if ($user = $this->request->getConfig('proxy_user')) {
+                curl_setopt($ch, CURLOPT_PROXYUSERPWD, $user . ':' .
+                            $this->request->getConfig('proxy_password'));
+                switch ($this->request->getConfig('proxy_auth_scheme')) {
+                    case HTTP_Request2::AUTH_BASIC:
+                        curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);
+                        break;
+                    case HTTP_Request2::AUTH_DIGEST:
+                        curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);
+                }
+            }
+        }
+
+        // set authentication data
+        if ($auth = $this->request->getAuth()) {
+            curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);
+            switch ($auth['scheme']) {
+                case HTTP_Request2::AUTH_BASIC:
+                    curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
+                    break;
+                case HTTP_Request2::AUTH_DIGEST:
+                    curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
+            }
+        }
+
+        // set SSL options
+        foreach ($this->request->getConfig() as $name => $value) {
+            if ('ssl_verify_host' == $name && null !== $value) {
+                curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);
+            } elseif (isset(self::$sslContextMap[$name]) && null !== $value) {
+                curl_setopt($ch, self::$sslContextMap[$name], $value);
+            }
+        }
+
+        $headers = $this->request->getHeaders();
+        // make cURL automagically send proper header
+        if (!isset($headers['accept-encoding'])) {
+            $headers['accept-encoding'] = '';
+        }
+
+        if (($jar = $this->request->getCookieJar())
+            && ($cookies = $jar->getMatching($this->request->getUrl(), true))
+        ) {
+            $headers['cookie'] = (empty($headers['cookie'])? '': $headers['cookie'] . '; ') . $cookies;
+        }
+
+        // set headers having special cURL keys
+        foreach (self::$headerMap as $name => $option) {
+            if (isset($headers[$name])) {
+                curl_setopt($ch, $option, $headers[$name]);
+                unset($headers[$name]);
+            }
+        }
+
+        $this->calculateRequestLength($headers);
+        if (isset($headers['content-length'])) {
+            $this->workaroundPhpBug47204($ch, $headers);
+        }
+
+        // set headers not having special keys
+        $headersFmt = array();
+        foreach ($headers as $name => $value) {
+            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
+            $headersFmt[]  = $canonicalName . ': ' . $value;
+        }
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $headersFmt);
+
+        return $ch;
+    }
+
+   /**
+    * Workaround for PHP bug #47204 that prevents rewinding request body
+    *
+    * The workaround consists of reading the entire request body into memory
+    * and setting it as CURLOPT_POSTFIELDS, so it isn't recommended for large
+    * file uploads, use Socket adapter instead.
+    *
+    * @param    resource    cURL handle
+    * @param    array       Request headers
+    */
+    protected function workaroundPhpBug47204($ch, &$headers)
+    {
+        // no redirects, no digest auth -> probably no rewind needed
+        if (!$this->request->getConfig('follow_redirects')
+            && (!($auth = $this->request->getAuth())
+                || HTTP_Request2::AUTH_DIGEST != $auth['scheme'])
+        ) {
+            curl_setopt($ch, CURLOPT_READFUNCTION, array($this, 'callbackReadBody'));
+
+        // rewind may be needed, read the whole body into memory
+        } else {
+            if ($this->requestBody instanceof HTTP_Request2_MultipartBody) {
+                $this->requestBody = $this->requestBody->__toString();
+
+            } elseif (is_resource($this->requestBody)) {
+                $fp = $this->requestBody;
+                $this->requestBody = '';
+                while (!feof($fp)) {
+                    $this->requestBody .= fread($fp, 16384);
+                }
+            }
+            // curl hangs up if content-length is present
+            unset($headers['content-length']);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $this->requestBody);
+        }
+    }
+
+   /**
+    * Callback function called by cURL for reading the request body
+    *
+    * @param    resource    cURL handle
+    * @param    resource    file descriptor (not used)
+    * @param    integer     maximum length of data to return
+    * @return   string      part of the request body, up to $length bytes
+    */
+    protected function callbackReadBody($ch, $fd, $length)
+    {
+        if (!$this->eventSentHeaders) {
+            $this->request->setLastEvent(
+                'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)
+            );
+            $this->eventSentHeaders = true;
+        }
+        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
+            0 == $this->contentLength || $this->position >= $this->contentLength
+        ) {
+            return '';
+        }
+        if (is_string($this->requestBody)) {
+            $string = substr($this->requestBody, $this->position, $length);
+        } elseif (is_resource($this->requestBody)) {
+            $string = fread($this->requestBody, $length);
+        } else {
+            $string = $this->requestBody->read($length);
+        }
+        $this->request->setLastEvent('sentBodyPart', strlen($string));
+        $this->position += strlen($string);
+        return $string;
+    }
+
+   /**
+    * Callback function called by cURL for saving the response headers
+    *
+    * @param    resource    cURL handle
+    * @param    string      response header (with trailing CRLF)
+    * @return   integer     number of bytes saved
+    * @see      HTTP_Request2_Response::parseHeaderLine()
+    */
+    protected function callbackWriteHeader($ch, $string)
+    {
+        // we may receive a second set of headers if doing e.g. digest auth
+        if ($this->eventReceivedHeaders || !$this->eventSentHeaders) {
+            // don't bother with 100-Continue responses (bug #15785)
+            if (!$this->eventSentHeaders ||
+                $this->response->getStatus() >= 200
+            ) {
+                $this->request->setLastEvent(
+                    'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)
+                );
+            }
+            $upload = curl_getinfo($ch, CURLINFO_SIZE_UPLOAD);
+            // if body wasn't read by a callback, send event with total body size
+            if ($upload > $this->position) {
+                $this->request->setLastEvent(
+                    'sentBodyPart', $upload - $this->position
+                );
+                $this->position = $upload;
+            }
+            if ($upload && (!$this->eventSentHeaders
+                            || $this->response->getStatus() >= 200)
+            ) {
+                $this->request->setLastEvent('sentBody', $upload);
+            }
+            $this->eventSentHeaders = true;
+            // we'll need a new response object
+            if ($this->eventReceivedHeaders) {
+                $this->eventReceivedHeaders = false;
+                $this->response             = null;
+            }
+        }
+        if (empty($this->response)) {
+            $this->response = new HTTP_Request2_Response(
+                $string, false, curl_getinfo($ch, CURLINFO_EFFECTIVE_URL)
+            );
+        } else {
+            $this->response->parseHeaderLine($string);
+            if ('' == trim($string)) {
+                // don't bother with 100-Continue responses (bug #15785)
+                if (200 <= $this->response->getStatus()) {
+                    $this->request->setLastEvent('receivedHeaders', $this->response);
+                }
+
+                if ($this->request->getConfig('follow_redirects') && $this->response->isRedirect()) {
+                    $redirectUrl = new Net_URL2($this->response->getHeader('location'));
+
+                    // for versions lower than 5.2.10, check the redirection URL protocol
+                    if (!defined('CURLOPT_REDIR_PROTOCOLS') && $redirectUrl->isAbsolute()
+                        && !in_array($redirectUrl->getScheme(), array('http', 'https'))
+                    ) {
+                        return -1;
+                    }
+
+                    if ($jar = $this->request->getCookieJar()) {
+                        $jar->addCookiesFromResponse($this->response, $this->request->getUrl());
+                        if (!$redirectUrl->isAbsolute()) {
+                            $redirectUrl = $this->request->getUrl()->resolve($redirectUrl);
+                        }
+                        if ($cookies = $jar->getMatching($redirectUrl, true)) {
+                            curl_setopt($ch, CURLOPT_COOKIE, $cookies);
+                        }
+                    }
+                }
+                $this->eventReceivedHeaders = true;
+            }
+        }
+        return strlen($string);
+    }
+
+   /**
+    * Callback function called by cURL for saving the response body
+    *
+    * @param    resource    cURL handle (not used)
+    * @param    string      part of the response body
+    * @return   integer     number of bytes saved
+    * @see      HTTP_Request2_Response::appendBody()
+    */
+    protected function callbackWriteBody($ch, $string)
+    {
+        // cURL calls WRITEFUNCTION callback without calling HEADERFUNCTION if
+        // response doesn't start with proper HTTP status line (see bug #15716)
+        if (empty($this->response)) {
+            throw new HTTP_Request2_MessageException(
+                "Malformed response: {$string}",
+                HTTP_Request2_Exception::MALFORMED_RESPONSE
+            );
+        }
+        if ($this->request->getConfig('store_body')) {
+            $this->response->appendBody($string);
+        }
+        $this->request->setLastEvent('receivedBodyPart', $string);
+        return strlen($string);
+    }
+}
+?>

iRony-0.4.4.tar.gz/lib/FileAPI/ext/HTTP/Request2/Adapter/Mock.php Added

@@ -0,0 +1,171 @@
+<?php
+/**
+ * Mock adapter intended for testing
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: Mock.php 308322 2011-02-14 13:58:03Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Base class for HTTP_Request2 adapters
+ */
+require_once 'HTTP/Request2/Adapter.php';
+
+/**
+ * Mock adapter intended for testing
+ *
+ * Can be used to test applications depending on HTTP_Request2 package without
+ * actually performing any HTTP requests. This adapter will return responses
+ * previously added via addResponse()
+ * <code>
+ * $mock = new HTTP_Request2_Adapter_Mock();
+ * $mock->addResponse("HTTP/1.1 ... ");
+ *
+ * $request = new HTTP_Request2();
+ * $request->setAdapter($mock);
+ *
+ * // This will return the response set above
+ * $response = $req->send();
+ * </code>
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @version    Release: 2.0.0
+ */
+class HTTP_Request2_Adapter_Mock extends HTTP_Request2_Adapter
+{
+   /**
+    * A queue of responses to be returned by sendRequest()
+    * @var  array
+    */
+    protected $responses = array();
+
+   /**
+    * Returns the next response from the queue built by addResponse()
+    *
+    * If the queue is empty it will return default empty response with status 400,
+    * if an Exception object was added to the queue it will be thrown.
+    *
+    * @param    HTTP_Request2
+    * @return   HTTP_Request2_Response
+    * @throws   Exception
+    */
+    public function sendRequest(HTTP_Request2 $request)
+    {
+        if (count($this->responses) > 0) {
+            $response = array_shift($this->responses);
+            if ($response instanceof HTTP_Request2_Response) {
+                return $response;
+            } else {
+                // rethrow the exception
+                $class   = get_class($response);
+                $message = $response->getMessage();
+                $code    = $response->getCode();
+                throw new $class($message, $code);
+            }
+        } else {
+            return self::createResponseFromString("HTTP/1.1 400 Bad Request\r\n\r\n");
+        }
+    }
+
+   /**
+    * Adds response to the queue
+    *
+    * @param    mixed   either a string, a pointer to an open file,
+    *                   an instance of HTTP_Request2_Response or Exception
+    * @throws   HTTP_Request2_Exception
+    */
+    public function addResponse($response)
+    {
+        if (is_string($response)) {
+            $response = self::createResponseFromString($response);
+        } elseif (is_resource($response)) {
+            $response = self::createResponseFromFile($response);
+        } elseif (!$response instanceof HTTP_Request2_Response &&
+                  !$response instanceof Exception
+        ) {
+            throw new HTTP_Request2_Exception('Parameter is not a valid response');
+        }
+        $this->responses[] = $response;
+    }
+
+   /**
+    * Creates a new HTTP_Request2_Response object from a string
+    *
+    * @param    string
+    * @return   HTTP_Request2_Response
+    * @throws   HTTP_Request2_Exception
+    */
+    public static function createResponseFromString($str)
+    {
+        $parts       = preg_split('!(\r?\n){2}!m', $str, 2);
+        $headerLines = explode("\n", $parts[0]);
+        $response    = new HTTP_Request2_Response(array_shift($headerLines));
+        foreach ($headerLines as $headerLine) {
+            $response->parseHeaderLine($headerLine);
+        }
+        $response->parseHeaderLine('');
+        if (isset($parts[1])) {
+            $response->appendBody($parts[1]);
+        }
+        return $response;
+    }
+
+   /**
+    * Creates a new HTTP_Request2_Response object from a file
+    *
+    * @param    resource    file pointer returned by fopen()
+    * @return   HTTP_Request2_Response
+    * @throws   HTTP_Request2_Exception
+    */
+    public static function createResponseFromFile($fp)
+    {
+        $response = new HTTP_Request2_Response(fgets($fp));
+        do {
+            $headerLine = fgets($fp);
+            $response->parseHeaderLine($headerLine);
+        } while ('' != trim($headerLine));
+
+        while (!feof($fp)) {
+            $response->appendBody(fread($fp, 8192));
+        }
+        return $response;
+    }
+}
+?>
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/ext/HTTP/Request2/Adapter/Socket.php Added

@@ -0,0 +1,1084 @@
+<?php
+/**
+ * Socket-based adapter for HTTP_Request2
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: Socket.php 309921 2011-04-03 16:43:02Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Base class for HTTP_Request2 adapters
+ */
+require_once 'HTTP/Request2/Adapter.php';
+
+/**
+ * Socket-based adapter for HTTP_Request2
+ *
+ * This adapter uses only PHP sockets and will work on almost any PHP
+ * environment. Code is based on original HTTP_Request PEAR package.
+ *
+ * @category    HTTP
+ * @package     HTTP_Request2
+ * @author      Alexey Borzov <avb@php.net>
+ * @version     Release: 2.0.0
+ */
+class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
+{
+   /**
+    * Regular expression for 'token' rule from RFC 2616
+    */
+    const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';
+
+   /**
+    * Regular expression for 'quoted-string' rule from RFC 2616
+    */
+    const REGEXP_QUOTED_STRING = '"(?:\\\\.|[^\\\\"])*"';
+
+   /**
+    * Connected sockets, needed for Keep-Alive support
+    * @var  array
+    * @see  connect()
+    */
+    protected static $sockets = array();
+
+   /**
+    * Data for digest authentication scheme
+    *
+    * The keys for the array are URL prefixes.
+    *
+    * The values are associative arrays with data (realm, nonce, nonce-count,
+    * opaque...) needed for digest authentication. Stored here to prevent making
+    * duplicate requests to digest-protected resources after we have already
+    * received the challenge.
+    *
+    * @var  array
+    */
+    protected static $challenges = array();
+
+   /**
+    * Connected socket
+    * @var  resource
+    * @see  connect()
+    */
+    protected $socket;
+
+   /**
+    * Challenge used for server digest authentication
+    * @var  array
+    */
+    protected $serverChallenge;
+
+   /**
+    * Challenge used for proxy digest authentication
+    * @var  array
+    */
+    protected $proxyChallenge;
+
+   /**
+    * Sum of start time and global timeout, exception will be thrown if request continues past this time
+    * @var  integer
+    */
+    protected $deadline = null;
+
+   /**
+    * Remaining length of the current chunk, when reading chunked response
+    * @var  integer
+    * @see  readChunked()
+    */
+    protected $chunkLength = 0;
+
+   /**
+    * Remaining amount of redirections to follow
+    *
+    * Starts at 'max_redirects' configuration parameter and is reduced on each
+    * subsequent redirect. An Exception will be thrown once it reaches zero.
+    *
+    * @var  integer
+    */
+    protected $redirectCountdown = null;
+
+   /**
+    * Sends request to the remote server and returns its response
+    *
+    * @param    HTTP_Request2
+    * @return   HTTP_Request2_Response
+    * @throws   HTTP_Request2_Exception
+    */
+    public function sendRequest(HTTP_Request2 $request)
+    {
+        $this->request = $request;
+
+        // Use global request timeout if given, see feature requests #5735, #8964
+        if ($timeout = $request->getConfig('timeout')) {
+            $this->deadline = time() + $timeout;
+        } else {
+            $this->deadline = null;
+        }
+
+        try {
+            $keepAlive = $this->connect();
+            $headers   = $this->prepareHeaders();
+            if (false === @fwrite($this->socket, $headers, strlen($headers))) {
+                throw new HTTP_Request2_MessageException('Error writing request');
+            }
+            // provide request headers to the observer, see request #7633
+            $this->request->setLastEvent('sentHeaders', $headers);
+            $this->writeBody();
+
+            if ($this->deadline && time() > $this->deadline) {
+                throw new HTTP_Request2_MessageException(
+                    'Request timed out after ' .
+                    $request->getConfig('timeout') . ' second(s)',
+                    HTTP_Request2_Exception::TIMEOUT
+                );
+            }
+
+            $response = $this->readResponse();
+
+            if ($jar = $request->getCookieJar()) {
+                $jar->addCookiesFromResponse($response, $request->getUrl());
+            }
+
+            if (!$this->canKeepAlive($keepAlive, $response)) {
+                $this->disconnect();
+            }
+
+            if ($this->shouldUseProxyDigestAuth($response)) {
+                return $this->sendRequest($request);
+            }
+            if ($this->shouldUseServerDigestAuth($response)) {
+                return $this->sendRequest($request);
+            }
+            if ($authInfo = $response->getHeader('authentication-info')) {
+                $this->updateChallenge($this->serverChallenge, $authInfo);
+            }
+            if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {
+                $this->updateChallenge($this->proxyChallenge, $proxyInfo);
+            }
+
+        } catch (Exception $e) {
+            $this->disconnect();
+        }
+
+        unset($this->request, $this->requestBody);
+
+        if (!empty($e)) {
+            $this->redirectCountdown = null;
+            throw $e;
+        }
+
+        if (!$request->getConfig('follow_redirects') || !$response->isRedirect()) {
+            $this->redirectCountdown = null;
+            return $response;
+        } else {
+            return $this->handleRedirect($request, $response);
+        }
+    }
+
+   /**
+    * Connects to the remote server
+    *
+    * @return   bool    whether the connection can be persistent
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function connect()
+    {
+        $secure  = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');
+        $tunnel  = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
+        $headers = $this->request->getHeaders();
+        $reqHost = $this->request->getUrl()->getHost();
+        if (!($reqPort = $this->request->getUrl()->getPort())) {
+            $reqPort = $secure? 443: 80;
+        }
+
+        if ($host = $this->request->getConfig('proxy_host')) {
+            if (!($port = $this->request->getConfig('proxy_port'))) {
+                throw new HTTP_Request2_LogicException(
+                    'Proxy port not provided',
+                    HTTP_Request2_Exception::MISSING_VALUE
+                );
+            }
+            $proxy = true;
+        } else {
+            $host  = $reqHost;
+            $port  = $reqPort;
+            $proxy = false;
+        }
+
+        if ($tunnel && !$proxy) {
+            throw new HTTP_Request2_LogicException(
+                "Trying to perform CONNECT request without proxy",
+                HTTP_Request2_Exception::MISSING_VALUE
+            );
+        }
+        if ($secure && !in_array('ssl', stream_get_transports())) {
+            throw new HTTP_Request2_LogicException(
+                'Need OpenSSL support for https:// requests',
+                HTTP_Request2_Exception::MISCONFIGURATION
+            );
+        }
+
+        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive
+        // connection token to a proxy server...
+        if ($proxy && !$secure &&
+            !empty($headers['connection']) && 'Keep-Alive' == $headers['connection']
+        ) {
+            $this->request->setHeader('connection');
+        }
+
+        $keepAlive = ('1.1' == $this->request->getConfig('protocol_version') &&
+                      empty($headers['connection'])) ||
+                     (!empty($headers['connection']) &&
+                      'Keep-Alive' == $headers['connection']);
+        $host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;
+
+        $options = array();
+        if ($secure || $tunnel) {
+            foreach ($this->request->getConfig() as $name => $value) {
+                if ('ssl_' == substr($name, 0, 4) && null !== $value) {
+                    if ('ssl_verify_host' == $name) {
+                        if ($value) {
+                            $options['CN_match'] = $reqHost;
+                        }
+                    } else {
+                        $options[substr($name, 4)] = $value;
+                    }
+                }
+            }
+            ksort($options);
+        }
+
+        // Changing SSL context options after connection is established does *not*
+        // work, we need a new connection if options change
+        $remote    = $host . ':' . $port;
+        $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .
+                     (empty($options)? '': ':' . serialize($options));
+        unset($this->socket);
+
+        // We use persistent connections and have a connected socket?
+        // Ensure that the socket is still connected, see bug #16149
+        if ($keepAlive && !empty(self::$sockets[$socketKey]) &&
+            !feof(self::$sockets[$socketKey])
+        ) {
+            $this->socket =& self::$sockets[$socketKey];
+
+        } elseif ($secure && $proxy && !$tunnel) {
+            $this->establishTunnel();
+            $this->request->setLastEvent(
+                'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"
+            );
+            self::$sockets[$socketKey] =& $this->socket;
+
+        } else {
+            // Set SSL context options if doing HTTPS request or creating a tunnel
+            $context = stream_context_create();
+            foreach ($options as $name => $value) {
+                if (!stream_context_set_option($context, 'ssl', $name, $value)) {
+                    throw new HTTP_Request2_LogicException(
+                        "Error setting SSL context option '{$name}'"
+                    );
+                }
+            }
+            $track = @ini_set('track_errors', 1);
+            $this->socket = @stream_socket_client(
+                $remote, $errno, $errstr,
+                $this->request->getConfig('connect_timeout'),
+                STREAM_CLIENT_CONNECT, $context
+            );
+            if (!$this->socket) {
+                $e = new HTTP_Request2_ConnectionException(
+                    "Unable to connect to {$remote}. Error: "
+                     . (empty($errstr)? $php_errormsg: $errstr), 0, $errno
+                );
+            }
+            @ini_set('track_errors', $track);
+            if (isset($e)) {
+                throw $e;
+            }
+            $this->request->setLastEvent('connect', $remote);
+            self::$sockets[$socketKey] =& $this->socket;
+        }
+        return $keepAlive;
+    }
+
+   /**
+    * Establishes a tunnel to a secure remote server via HTTP CONNECT request
+    *
+    * This method will fail if 'ssl_verify_peer' is enabled. Probably because PHP
+    * 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
+    * @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(),
+                        array('adapter' => $donor))
+        );
+        $response = $connect->send();
+        // Need any successful (2XX) response
+        if (200 > $response->getStatus() || 300 <= $response->getStatus()) {
+            throw new HTTP_Request2_ConnectionException(
+                'Failed to connect via HTTPS proxy. Proxy response: ' .
+                $response->getStatus() . ' ' . $response->getReasonPhrase()
+            );
+        }
+        $this->socket = $donor->socket;
+
+        $modes = array(
+            STREAM_CRYPTO_METHOD_TLS_CLIENT,
+            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
+            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
+            STREAM_CRYPTO_METHOD_SSLv2_CLIENT
+        );
+
+        foreach ($modes as $mode) {
+            if (stream_socket_enable_crypto($this->socket, true, $mode)) {
+                return;
+            }
+        }
+        throw new HTTP_Request2_ConnectionException(
+            'Failed to enable secure connection when connecting through proxy'
+        );
+    }
+
+   /**
+    * Checks whether current connection may be reused or should be closed
+    *
+    * @param    boolean                 whether connection could be persistent
+    *                                   in the first place
+    * @param    HTTP_Request2_Response  response object to check
+    * @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() &&
+            200 <= $response->getStatus() && 300 > $response->getStatus()
+        ) {
+            return true;
+        }
+
+        $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(), array(204, 304));
+        $persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||
+                       (null === $response->getHeader('connection') &&
+                        '1.1' == $response->getVersion());
+        return $requestKeepAlive && $lengthKnown && $persistent;
+    }
+
+   /**
+    * Disconnects from the remote server
+    */
+    protected function disconnect()
+    {
+        if (is_resource($this->socket)) {
+            fclose($this->socket);
+            $this->socket = null;
+            $this->request->setLastEvent('disconnect');
+        }
+    }
+
+   /**
+    * Handles HTTP redirection
+    *
+    * This method will throw an Exception if redirect to a non-HTTP(S) location
+    * is attempted, also if number of redirects performed already is equal to
+    * 'max_redirects' configuration parameter.
+    *
+    * @param    HTTP_Request2               Original request
+    * @param    HTTP_Request2_Response      Response containing redirect
+    * @return   HTTP_Request2_Response      Response from a new location
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function handleRedirect(HTTP_Request2 $request,
+                                      HTTP_Request2_Response $response)
+    {
+        if (is_null($this->redirectCountdown)) {
+            $this->redirectCountdown = $request->getConfig('max_redirects');
+        }
+        if (0 == $this->redirectCountdown) {
+            $this->redirectCountdown = null;
+            // Copying cURL behaviour
+            throw new HTTP_Request2_MessageException (
+                'Maximum (' . $request->getConfig('max_redirects') . ') redirects followed',
+                HTTP_Request2_Exception::TOO_MANY_REDIRECTS
+            );
+        }
+        $redirectUrl = new Net_URL2(
+            $response->getHeader('location'),
+            array(Net_URL2::OPTION_USE_BRACKETS => $request->getConfig('use_brackets'))
+        );
+        // refuse non-HTTP redirect
+        if ($redirectUrl->isAbsolute()
+            && !in_array($redirectUrl->getScheme(), array('http', 'https'))
+        ) {
+            $this->redirectCountdown = null;
+            throw new HTTP_Request2_MessageException(
+                'Refusing to redirect to a non-HTTP URL ' . $redirectUrl->__toString(),
+                HTTP_Request2_Exception::NON_HTTP_REDIRECT
+            );
+        }
+        // Theoretically URL should be absolute (see http://tools.ietf.org/html/rfc2616#section-14.30),
+        // but in practice it is often not
+        if (!$redirectUrl->isAbsolute()) {
+            $redirectUrl = $request->getUrl()->resolve($redirectUrl);
+        }
+        $redirect = clone $request;
+        $redirect->setUrl($redirectUrl);
+        if (303 == $response->getStatus() || (!$request->getConfig('strict_redirects')
+             && in_array($response->getStatus(), array(301, 302)))
+        ) {
+            $redirect->setMethod(HTTP_Request2::METHOD_GET);
+            $redirect->setBody('');
+        }
+
+        if (0 < $this->redirectCountdown) {
+            $this->redirectCountdown--;
+        }
+        return $this->sendRequest($redirect);
+    }
+
+   /**
+    * Checks whether another request should be performed with server digest auth
+    *
+    * Several conditions should be satisfied for it to return true:
+    *   - response status should be 401
+    *   - auth credentials should be set in the request object
+    *   - response should contain WWW-Authenticate header with digest challenge
+    *   - there is either no challenge stored for this URL or new challenge
+    *     contains stale=true parameter (in other case we probably just failed
+    *     due to invalid username / password)
+    *
+    * The method stores challenge values in $challenges static property
+    *
+    * @param    HTTP_Request2_Response  response to check
+    * @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)
+    {
+        // no sense repeating a request if we don't have credentials
+        if (401 != $response->getStatus() || !$this->request->getAuth()) {
+            return false;
+        }
+        if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {
+            return false;
+        }
+
+        $url    = $this->request->getUrl();
+        $scheme = $url->getScheme();
+        $host   = $scheme . '://' . $url->getHost();
+        if ($port = $url->getPort()) {
+            if ((0 == strcasecmp($scheme, 'http') && 80 != $port) ||
+                (0 == strcasecmp($scheme, 'https') && 443 != $port)
+            ) {
+                $host .= ':' . $port;
+            }
+        }
+
+        if (!empty($challenge['domain'])) {
+            $prefixes = array();
+            foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {
+                // don't bother with different servers
+                if ('/' == substr($prefix, 0, 1)) {
+                    $prefixes[] = $host . $prefix;
+                }
+            }
+        }
+        if (empty($prefixes)) {
+            $prefixes = array($host . '/');
+        }
+
+        $ret = true;
+        foreach ($prefixes as $prefix) {
+            if (!empty(self::$challenges[$prefix]) &&
+                (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
+            ) {
+                // probably credentials are invalid
+                $ret = false;
+            }
+            self::$challenges[$prefix] =& $challenge;
+        }
+        return $ret;
+    }
+
+   /**
+    * Checks whether another request should be performed with proxy digest auth
+    *
+    * Several conditions should be satisfied for it to return true:
+    *   - response status should be 407
+    *   - proxy auth credentials should be set in the request object
+    *   - response should contain Proxy-Authenticate header with digest challenge
+    *   - there is either no challenge stored for this proxy or new challenge
+    *     contains stale=true parameter (in other case we probably just failed
+    *     due to invalid username / password)
+    *
+    * The method stores challenge values in $challenges static property
+    *
+    * @param    HTTP_Request2_Response  response to check
+    * @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)
+    {
+        if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {
+            return false;
+        }
+        if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {
+            return false;
+        }
+
+        $key = 'proxy://' . $this->request->getConfig('proxy_host') .
+               ':' . $this->request->getConfig('proxy_port');
+
+        if (!empty(self::$challenges[$key]) &&
+            (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
+        ) {
+            $ret = false;
+        } else {
+            $ret = true;
+        }
+        self::$challenges[$key] = $challenge;
+        return $ret;
+    }
+
+   /**
+    * Extracts digest method challenge from (WWW|Proxy)-Authenticate header value
+    *
+    * There is a problem with implementation of RFC 2617: several of the parameters
+    * are defined as quoted-string there and thus may contain backslash escaped
+    * double quotes (RFC 2616, section 2.2). However, RFC 2617 defines unq(X) as
+    * just value of quoted-string X without surrounding quotes, it doesn't speak
+    * about removing backslash escaping.
+    *
+    * Now realm parameter is user-defined and human-readable, strange things
+    * happen when it contains quotes:
+    *   - Apache allows quotes in realm, but apparently uses realm value without
+    *     backslashes for digest computation
+    *   - Squid allows (manually escaped) quotes there, but it is impossible to
+    *     authorize with either escaped or unescaped quotes used in digest,
+    *     probably it can't parse the response (?)
+    *   - Both IE and Firefox display realm value with backslashes in
+    *     the password popup and apparently use the same value for digest
+    *
+    * HTTP_Request2 follows IE and Firefox (and hopefully RFC 2617) in
+    * quoted-string handling, unfortunately that means failure to authorize
+    * sometimes
+    *
+    * @param    string  value of WWW-Authenticate or Proxy-Authenticate header
+    * @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
+    */
+    protected function parseDigestChallenge($headerValue)
+    {
+        $authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
+                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';
+        $challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";
+        if (!preg_match($challenge, $headerValue, $matches)) {
+            return false;
+        }
+
+        preg_match_all('!' . $authParam . '!', $matches[0], $params);
+        $paramsAry   = array();
+        $knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',
+                             'algorithm', 'qop');
+        for ($i = 0; $i < count($params[0]); $i++) {
+            // section 3.2.1: Any unrecognized directive MUST be ignored.
+            if (in_array($params[1][$i], $knownParams)) {
+                if ('"' == substr($params[2][$i], 0, 1)) {
+                    $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
+                } else {
+                    $paramsAry[$params[1][$i]] = $params[2][$i];
+                }
+            }
+        }
+        // we only support qop=auth
+        if (!empty($paramsAry['qop']) &&
+            !in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))
+        ) {
+            throw new HTTP_Request2_NotImplementedException(
+                "Only 'auth' qop is currently supported in digest authentication, " .
+                "server requested '{$paramsAry['qop']}'"
+            );
+        }
+        // we only support algorithm=MD5
+        if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {
+            throw new HTTP_Request2_NotImplementedException(
+                "Only 'MD5' algorithm is currently supported in digest authentication, " .
+                "server requested '{$paramsAry['algorithm']}'"
+            );
+        }
+
+        return $paramsAry;
+    }
+
+   /**
+    * Parses [Proxy-]Authentication-Info header value and updates challenge
+    *
+    * @param    array   challenge to update
+    * @param    string  value of [Proxy-]Authentication-Info header
+    * @todo     validate server rspauth response
+    */
+    protected function updateChallenge(&$challenge, $headerValue)
+    {
+        $authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
+                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';
+        $paramsAry   = array();
+
+        preg_match_all($authParam, $headerValue, $params);
+        for ($i = 0; $i < count($params[0]); $i++) {
+            if ('"' == substr($params[2][$i], 0, 1)) {
+                $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
+            } else {
+                $paramsAry[$params[1][$i]] = $params[2][$i];
+            }
+        }
+        // for now, just update the nonce value
+        if (!empty($paramsAry['nextnonce'])) {
+            $challenge['nonce'] = $paramsAry['nextnonce'];
+            $challenge['nc']    = 1;
+        }
+    }
+
+   /**
+    * Creates a value for [Proxy-]Authorization header when using digest authentication
+    *
+    * @param    string  user name
+    * @param    string  password
+    * @param    string  request URL
+    * @param    array   digest challenge parameters
+    * @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)
+    {
+        if (false !== ($q = strpos($url, '?')) &&
+            $this->request->getConfig('digest_compat_ie')
+        ) {
+            $url = substr($url, 0, $q);
+        }
+
+        $a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);
+        $a2 = md5($this->request->getMethod() . ':' . $url);
+
+        if (empty($challenge['qop'])) {
+            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);
+        } else {
+            $challenge['cnonce'] = 'Req2.' . rand();
+            if (empty($challenge['nc'])) {
+                $challenge['nc'] = 1;
+            }
+            $nc     = sprintf('%08x', $challenge['nc']++);
+            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .
+                          $challenge['cnonce'] . ':auth:' . $a2);
+        }
+        return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .
+               'realm="' . $challenge['realm'] . '", ' .
+               'nonce="' . $challenge['nonce'] . '", ' .
+               'uri="' . $url . '", ' .
+               'response="' . $digest . '"' .
+               (!empty($challenge['opaque'])?
+                ', opaque="' . $challenge['opaque'] . '"':
+                '') .
+               (!empty($challenge['qop'])?
+                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':
+                '');
+    }
+
+   /**
+    * Adds 'Authorization' header (if needed) to request headers array
+    *
+    * @param    array   request headers
+    * @param    string  request host (needed for digest authentication)
+    * @param    string  request URL (needed for digest authentication)
+    * @throws   HTTP_Request2_NotImplementedException
+    */
+    protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)
+    {
+        if (!($auth = $this->request->getAuth())) {
+            return;
+        }
+        switch ($auth['scheme']) {
+            case HTTP_Request2::AUTH_BASIC:
+                $headers['authorization'] =
+                    'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);
+                break;
+
+            case HTTP_Request2::AUTH_DIGEST:
+                unset($this->serverChallenge);
+                $fullUrl = ('/' == $requestUrl[0])?
+                           $this->request->getUrl()->getScheme() . '://' .
+                            $requestHost . $requestUrl:
+                           $requestUrl;
+                foreach (array_keys(self::$challenges) as $key) {
+                    if ($key == substr($fullUrl, 0, strlen($key))) {
+                        $headers['authorization'] = $this->createDigestResponse(
+                            $auth['user'], $auth['password'],
+                            $requestUrl, self::$challenges[$key]
+                        );
+                        $this->serverChallenge =& self::$challenges[$key];
+                        break;
+                    }
+                }
+                break;
+
+            default:
+                throw new HTTP_Request2_NotImplementedException(
+                    "Unknown HTTP authentication scheme '{$auth['scheme']}'"
+                );
+        }
+    }
+
+   /**
+    * Adds 'Proxy-Authorization' header (if needed) to request headers array
+    *
+    * @param    array   request headers
+    * @param    string  request URL (needed for digest authentication)
+    * @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())
+        ) {
+            return;
+        }
+
+        $password = $this->request->getConfig('proxy_password');
+        switch ($this->request->getConfig('proxy_auth_scheme')) {
+            case HTTP_Request2::AUTH_BASIC:
+                $headers['proxy-authorization'] =
+                    'Basic ' . base64_encode($user . ':' . $password);
+                break;
+
+            case HTTP_Request2::AUTH_DIGEST:
+                unset($this->proxyChallenge);
+                $proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .
+                            ':' . $this->request->getConfig('proxy_port');
+                if (!empty(self::$challenges[$proxyUrl])) {
+                    $headers['proxy-authorization'] = $this->createDigestResponse(
+                        $user, $password,
+                        $requestUrl, self::$challenges[$proxyUrl]
+                    );
+                    $this->proxyChallenge =& self::$challenges[$proxyUrl];
+                }
+                break;
+
+            default:
+                throw new HTTP_Request2_NotImplementedException(
+                    "Unknown HTTP authentication scheme '" .
+                    $this->request->getConfig('proxy_auth_scheme') . "'"
+                );
+        }
+    }
+
+
+   /**
+    * Creates the string with the Request-Line and request headers
+    *
+    * @return   string
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function prepareHeaders()
+    {
+        $headers = $this->request->getHeaders();
+        $url     = $this->request->getUrl();
+        $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
+        $host    = $url->getHost();
+
+        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;
+        if (($port = $url->getPort()) && $port != $defaultPort || $connect) {
+            $host .= ':' . (empty($port)? $defaultPort: $port);
+        }
+        // Do not overwrite explicitly set 'Host' header, see bug #16146
+        if (!isset($headers['host'])) {
+            $headers['host'] = $host;
+        }
+
+        if ($connect) {
+            $requestUrl = $host;
+
+        } else {
+            if (!$this->request->getConfig('proxy_host') ||
+                0 == strcasecmp($url->getScheme(), 'https')
+            ) {
+                $requestUrl = '';
+            } else {
+                $requestUrl = $url->getScheme() . '://' . $host;
+            }
+            $path        = $url->getPath();
+            $query       = $url->getQuery();
+            $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);
+        }
+
+        if ('1.1' == $this->request->getConfig('protocol_version') &&
+            extension_loaded('zlib') && !isset($headers['accept-encoding'])
+        ) {
+            $headers['accept-encoding'] = 'gzip, deflate';
+        }
+        if (($jar = $this->request->getCookieJar())
+            && ($cookies = $jar->getMatching($this->request->getUrl(), true))
+        ) {
+            $headers['cookie'] = (empty($headers['cookie'])? '': $headers['cookie'] . '; ') . $cookies;
+        }
+
+        $this->addAuthorizationHeader($headers, $host, $requestUrl);
+        $this->addProxyAuthorizationHeader($headers, $requestUrl);
+        $this->calculateRequestLength($headers);
+
+        $headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .
+                      $this->request->getConfig('protocol_version') . "\r\n";
+        foreach ($headers as $name => $value) {
+            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
+            $headersStr   .= $canonicalName . ': ' . $value . "\r\n";
+        }
+        return $headersStr . "\r\n";
+    }
+
+   /**
+    * Sends the request body
+    *
+    * @throws   HTTP_Request2_MessageException
+    */
+    protected function writeBody()
+    {
+        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
+            0 == $this->contentLength
+        ) {
+            return;
+        }
+
+        $position   = 0;
+        $bufferSize = $this->request->getConfig('buffer_size');
+        while ($position < $this->contentLength) {
+            if (is_string($this->requestBody)) {
+                $str = substr($this->requestBody, $position, $bufferSize);
+            } elseif (is_resource($this->requestBody)) {
+                $str = fread($this->requestBody, $bufferSize);
+            } else {
+                $str = $this->requestBody->read($bufferSize);
+            }
+            if (false === @fwrite($this->socket, $str, strlen($str))) {
+                throw new HTTP_Request2_MessageException('Error writing request');
+            }
+            // Provide the length of written string to the observer, request #7630
+            $this->request->setLastEvent('sentBodyPart', strlen($str));
+            $position += strlen($str);
+        }
+        $this->request->setLastEvent('sentBody', $this->contentLength);
+    }
+
+   /**
+    * Reads the remote server's response
+    *
+    * @return   HTTP_Request2_Response
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function readResponse()
+    {
+        $bufferSize = $this->request->getConfig('buffer_size');
+
+        do {
+            $response = new HTTP_Request2_Response(
+                $this->readLine($bufferSize), true, $this->request->getUrl()
+            );
+            do {
+                $headerLine = $this->readLine($bufferSize);
+                $response->parseHeaderLine($headerLine);
+            } while ('' != $headerLine);
+        } 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(), array(204, 304))
+        ) {
+            return $response;
+        }
+
+        $chunked = 'chunked' == $response->getHeader('transfer-encoding');
+        $length  = $response->getHeader('content-length');
+        $hasBody = false;
+        if ($chunked || null === $length || 0 < intval($length)) {
+            // RFC 2616, section 4.4:
+            // 3. ... If a message is received with both a
+            // Transfer-Encoding header field and a Content-Length header field,
+            // the latter MUST be ignored.
+            $toRead = ($chunked || null === $length)? null: $length;
+            $this->chunkLength = 0;
+
+            while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {
+                if ($chunked) {
+                    $data = $this->readChunked($bufferSize);
+                } elseif (is_null($toRead)) {
+                    $data = $this->fread($bufferSize);
+                } else {
+                    $data    = $this->fread(min($toRead, $bufferSize));
+                    $toRead -= strlen($data);
+                }
+                if ('' == $data && (!$this->chunkLength || feof($this->socket))) {
+                    break;
+                }
+
+                $hasBody = true;
+                if ($this->request->getConfig('store_body')) {
+                    $response->appendBody($data);
+                }
+                if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {
+                    $this->request->setLastEvent('receivedEncodedBodyPart', $data);
+                } else {
+                    $this->request->setLastEvent('receivedBodyPart', $data);
+                }
+            }
+        }
+
+        if ($hasBody) {
+            $this->request->setLastEvent('receivedBody', $response);
+        }
+        return $response;
+    }
+
+   /**
+    * Reads until either the end of the socket or a newline, whichever comes first
+    *
+    * Strips the trailing newline from the returned data, handles global
+    * request timeout. Method idea borrowed from Net_Socket PEAR package.
+    *
+    * @param    int     buffer size to use for reading
+    * @return   Available data up to the newline (not including newline)
+    * @throws   HTTP_Request2_MessageException     In case of timeout
+    */
+    protected function readLine($bufferSize)
+    {
+        $line = '';
+        while (!feof($this->socket)) {
+            if ($this->deadline) {
+                stream_set_timeout($this->socket, max($this->deadline - time(), 1));
+            }
+            $line .= @fgets($this->socket, $bufferSize);
+            $info  = stream_get_meta_data($this->socket);
+            if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
+                $reason = $this->deadline
+                          ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
+                          : 'due to default_socket_timeout php.ini setting';
+                throw new HTTP_Request2_MessageException(
+                    "Request timed out {$reason}", HTTP_Request2_Exception::TIMEOUT
+                );
+            }
+            if (substr($line, -1) == "\n") {
+                return rtrim($line, "\r\n");
+            }
+        }
+        return $line;
+    }
+
+   /**
+    * Wrapper around fread(), handles global request timeout
+    *
+    * @param    int     Reads up to this number of bytes
+    * @return   Data read from socket
+    * @throws   HTTP_Request2_MessageException     In case of timeout
+    */
+    protected function fread($length)
+    {
+        if ($this->deadline) {
+            stream_set_timeout($this->socket, max($this->deadline - time(), 1));
+        }
+        $data = fread($this->socket, $length);
+        $info = stream_get_meta_data($this->socket);
+        if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
+            $reason = $this->deadline
+                      ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
+                      : 'due to default_socket_timeout php.ini setting';
+            throw new HTTP_Request2_MessageException(
+                "Request timed out {$reason}", HTTP_Request2_Exception::TIMEOUT
+            );
+        }
+        return $data;
+    }
+
+   /**
+    * Reads a part of response body encoded with chunked Transfer-Encoding
+    *
+    * @param    int     buffer size to use for reading
+    * @return   string
+    * @throws   HTTP_Request2_MessageException
+    */
+    protected function readChunked($bufferSize)
+    {
+        // at start of the next chunk?
+        if (0 == $this->chunkLength) {
+            $line = $this->readLine($bufferSize);
+            if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
+                throw new HTTP_Request2_MessageException(
+                    "Cannot decode chunked response, invalid chunk length '{$line}'",
+                    HTTP_Request2_Exception::DECODE_ERROR
+                );
+            } else {
+                $this->chunkLength = hexdec($matches[1]);
+                // Chunk with zero length indicates the end
+                if (0 == $this->chunkLength) {
+                    $this->readLine($bufferSize);
+                    return '';
+                }
+            }
+        }
+        $data = $this->fread(min($this->chunkLength, $bufferSize));
+        $this->chunkLength -= strlen($data);
+        if (0 == $this->chunkLength) {
+            $this->readLine($bufferSize); // Trailing CRLF
+        }
+        return $data;
+    }
+}
+
+?>
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/ext/HTTP/Request2/CookieJar.php Added

@@ -0,0 +1,499 @@
+<?php
+/**
+ * Stores cookies and passes them between HTTP requests
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: CookieJar.php 308629 2011-02-24 17:34:24Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/** Class representing a HTTP request message */
+require_once 'HTTP/Request2.php';
+
+/**
+ * Stores cookies and passes them between HTTP requests
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @version    Release: @package_version@
+ */
+class HTTP_Request2_CookieJar implements Serializable
+{
+   /**
+    * Array of stored cookies
+    *
+    * The array is indexed by domain, path and cookie name
+    *   .example.com
+    *     /
+    *       some_cookie => cookie data
+    *     /subdir
+    *       other_cookie => cookie data
+    *   .example.org
+    *     ...
+    *
+    * @var array
+    */
+    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;
+
+   /**
+    * Array with Public Suffix List data
+    * @var  array
+    * @link http://publicsuffix.org/
+    */
+    protected static $psl = array();
+
+   /**
+    * Class constructor, sets various options
+    *
+    * @param bool Controls serializing session cookies, see {@link serializeSessionCookies()}
+    * @param bool Controls using Public Suffix List, see {@link usePublicSuffixList()}
+    */
+    public function __construct($serializeSessionCookies = false, $usePublicSuffixList = true)
+    {
+        $this->serializeSessionCookies($serializeSessionCookies);
+        $this->usePublicSuffixList($usePublicSuffixList);
+    }
+
+   /**
+    * Returns current time formatted in ISO-8601 at UTC timezone
+    *
+    * @return string
+    */
+    protected function now()
+    {
+        $dt = new DateTime();
+        $dt->setTimezone(new DateTimeZone('UTC'));
+        return $dt->format(DateTime::ISO8601);
+    }
+
+   /**
+    * Checks cookie array for correctness, possibly updating its 'domain', 'path' and 'expires' fields
+    *
+    * The checks are as follows:
+    *   - cookie array should contain 'name' and 'value' fields;
+    *   - name and value should not contain disallowed symbols;
+    *   - 'expires' should be either empty parseable by DateTime;
+    *   - 'domain' and 'path' should be either not empty or an URL where
+    *     cookie was set should be provided.
+    *   - if $setter is provided, then document at that URL should be allowed
+    *     to set a cookie for that 'domain'. If $setter is not provided,
+    *     then no domain checks will be made.
+    *
+    * 'expires' field will be converted to ISO8601 format from COOKIE format,
+    * 'domain' and 'path' will be set from setter URL if empty.
+    *
+    * @param    array    cookie data, as returned by {@link HTTP_Request2_Response::getCookies()}
+    * @param    Net_URL2 URL of the document that sent Set-Cookie header
+    * @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(array('name', 'value'), array_keys($cookie))) {
+            throw new HTTP_Request2_LogicException(
+                "Cookie array should contain 'name' and 'value' fields",
+                HTTP_Request2_Exception::MISSING_VALUE
+            );
+        }
+        if (preg_match(HTTP_Request2::REGEXP_INVALID_COOKIE, $cookie['name'])) {
+            throw new HTTP_Request2_LogicException(
+                "Invalid cookie name: '{$cookie['name']}'",
+                HTTP_Request2_Exception::INVALID_ARGUMENT
+            );
+        }
+        if (preg_match(HTTP_Request2::REGEXP_INVALID_COOKIE, $cookie['value'])) {
+            throw new HTTP_Request2_LogicException(
+                "Invalid cookie value: '{$cookie['value']}'",
+                HTTP_Request2_Exception::INVALID_ARGUMENT
+            );
+        }
+        $cookie += array('domain' => '', 'path' => '', 'expires' => null, 'secure' => false);
+
+        // Need ISO-8601 date @ UTC timezone
+        if (!empty($cookie['expires'])
+            && !preg_match('/^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\+0000$/', $cookie['expires'])
+        ) {
+            try {
+                $dt = new DateTime($cookie['expires']);
+                $dt->setTimezone(new DateTimeZone('UTC'));
+                $cookie['expires'] = $dt->format(DateTime::ISO8601);
+            } catch (Exception $e) {
+                throw new HTTP_Request2_LogicException($e->getMessage());
+            }
+        }
+
+        if (empty($cookie['domain']) || empty($cookie['path'])) {
+            if (!$setter) {
+                throw new HTTP_Request2_LogicException(
+                    'Cookie misses domain and/or path component, cookie setter URL needed',
+                    HTTP_Request2_Exception::MISSING_VALUE
+                );
+            }
+            if (empty($cookie['domain'])) {
+                if ($host = $setter->getHost()) {
+                    $cookie['domain'] = $host;
+                } else {
+                    throw new HTTP_Request2_LogicException(
+                        'Setter URL does not contain host part, can\'t set cookie domain',
+                        HTTP_Request2_Exception::MISSING_VALUE
+                    );
+                }
+            }
+            if (empty($cookie['path'])) {
+                $path = $setter->getPath();
+                $cookie['path'] = empty($path)? '/': substr($path, 0, strrpos($path, '/') + 1);
+            }
+        }
+
+        if ($setter && !$this->domainMatch($setter->getHost(), $cookie['domain'])) {
+            throw new HTTP_Request2_MessageException(
+                "Domain " . $setter->getHost() . " cannot set cookies for "
+                . $cookie['domain']
+            );
+        }
+
+        return $cookie;
+    }
+
+   /**
+    * Stores a cookie in the jar
+    *
+    * @param    array    cookie data, as returned by {@link HTTP_Request2_Response::getCookies()}
+    * @param    Net_URL2 URL of the document that sent Set-Cookie header
+    * @throws   HTTP_Request2_Exception
+    */
+    public function store(array $cookie, Net_URL2 $setter = null)
+    {
+        $cookie = $this->checkAndUpdateFields($cookie, $setter);
+
+        if (strlen($cookie['value'])
+            && (is_null($cookie['expires']) || $cookie['expires'] > $this->now())
+        ) {
+            if (!isset($this->cookies[$cookie['domain']])) {
+                $this->cookies[$cookie['domain']] = array();
+            }
+            if (!isset($this->cookies[$cookie['domain']][$cookie['path']])) {
+                $this->cookies[$cookie['domain']][$cookie['path']] = array();
+            }
+            $this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']] = $cookie;
+
+        } elseif (isset($this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']])) {
+            unset($this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']]);
+        }
+    }
+
+   /**
+    * Adds cookies set in HTTP response to the jar
+    *
+    * @param HTTP_Request2_Response response
+    * @param Net_URL2               original request URL, needed for setting
+    *                               default domain/path
+    */
+    public function addCookiesFromResponse(HTTP_Request2_Response $response, Net_URL2 $setter)
+    {
+        foreach ($response->getCookies() as $cookie) {
+            $this->store($cookie, $setter);
+        }
+    }
+
+   /**
+    * Returns all cookies matching a given request URL
+    *
+    * The following checks are made:
+    *   - cookie domain should match request host
+    *   - cookie path should be a prefix for request path
+    *   - 'secure' cookies will only be sent for HTTPS requests
+    *
+    * @param  Net_URL2
+    * @param  bool      Whether to return cookies as string for "Cookie: " header
+    * @return array
+    */
+    public function getMatching(Net_URL2 $url, $asString = false)
+    {
+        $host   = $url->getHost();
+        $path   = $url->getPath();
+        $secure = 0 == strcasecmp($url->getScheme(), 'https');
+
+        $matched = $ret = array();
+        foreach (array_keys($this->cookies) as $domain) {
+            if ($this->domainMatch($host, $domain)) {
+                foreach (array_keys($this->cookies[$domain]) as $cPath) {
+                    if (0 === strpos($path, $cPath)) {
+                        foreach ($this->cookies[$domain][$cPath] as $name => $cookie) {
+                            if (!$cookie['secure'] || $secure) {
+                                $matched[$name][strlen($cookie['path'])] = $cookie;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        foreach ($matched as $cookies) {
+            krsort($cookies);
+            $ret = array_merge($ret, $cookies);
+        }
+        if (!$asString) {
+            return $ret;
+        } else {
+            $str = '';
+            foreach ($ret as $c) {
+                $str .= (empty($str)? '': '; ') . $c['name'] . '=' . $c['value'];
+            }
+            return $str;
+        }
+    }
+
+   /**
+    * Returns all cookies stored in a jar
+    *
+    * @return array
+    */
+    public function getAll()
+    {
+        $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) {
+                    $cookies[] = $cookie;
+                }
+            }
+        }
+        return $cookies;
+    }
+
+   /**
+    * Sets whether session cookies should be serialized when serializing the jar
+    *
+    * @param    boolean
+    */
+    public function serializeSessionCookies($serialize)
+    {
+        $this->serializeSession = (bool)$serialize;
+    }
+
+   /**
+    * Sets whether Public Suffix List should be used for restricting cookie-setting
+    *
+    * Without PSL {@link domainMatch()} will only prevent setting cookies for
+    * top-level domains like '.com' or '.org'. However, it will not prevent
+    * setting a cookie for '.co.uk' even though only third-level registrations
+    * are possible in .uk domain.
+    *
+    * With the List it is possible to find the highest level at which a domain
+    * may be registered for a particular top-level domain and consequently
+    * prevent cookies set for '.co.uk' or '.msk.ru'. The same list is used by
+    * Firefox, Chrome and Opera browsers to restrict cookie setting.
+    *
+    * Note that PSL is licensed differently to HTTP_Request2 package (refer to
+    * the license information in public-suffix-list.php), so you can disable
+    * its use if this is an issue for you.
+    *
+    * @param    boolean
+    * @link     http://publicsuffix.org/learn/
+    */
+    public function usePublicSuffixList($useList)
+    {
+        $this->useList = (bool)$useList;
+    }
+
+   /**
+    * Returns string representation of object
+    *
+    * @return string
+    * @see    Serializable::serialize()
+    */
+    public function serialize()
+    {
+        $cookies = $this->getAll();
+        if (!$this->serializeSession) {
+            for ($i = count($cookies) - 1; $i >= 0; $i--) {
+                if (empty($cookies[$i]['expires'])) {
+                    unset($cookies[$i]);
+                }
+            }
+        }
+        return serialize(array(
+            'cookies'          => $cookies,
+            'serializeSession' => $this->serializeSession,
+            'useList'          => $this->useList
+        ));
+    }
+
+   /**
+    * Constructs the object from serialized string
+    *
+    * @param string  string representation
+    * @see   Serializable::unserialize()
+    */
+    public function unserialize($serialized)
+    {
+        $data = unserialize($serialized);
+        $now  = $this->now();
+        $this->serializeSessionCookies($data['serializeSession']);
+        $this->usePublicSuffixList($data['useList']);
+        foreach ($data['cookies'] as $cookie) {
+            if (!empty($cookie['expires']) && $cookie['expires'] <= $now) {
+                continue;
+            }
+            if (!isset($this->cookies[$cookie['domain']])) {
+                $this->cookies[$cookie['domain']] = array();
+            }
+            if (!isset($this->cookies[$cookie['domain']][$cookie['path']])) {
+                $this->cookies[$cookie['domain']][$cookie['path']] = array();
+            }
+            $this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']] = $cookie;
+        }
+    }
+
+   /**
+    * Checks whether a cookie domain matches a request host.
+    *
+    * The method is used by {@link store()} to check for whether a document
+    * at given URL can set a cookie with a given domain attribute and by
+    * {@link getMatching()} to find cookies matching the request URL.
+    *
+    * @param    string  request host
+    * @param    string  cookie domain
+    * @return   bool    match success
+    */
+    public function domainMatch($requestHost, $cookieDomain)
+    {
+        if ($requestHost == $cookieDomain) {
+            return true;
+        }
+        // IP address, we require exact match
+        if (preg_match('/^(?:\d{1,3}\.){3}\d{1,3}$/', $requestHost)) {
+            return false;
+        }
+        if ('.' != $cookieDomain[0]) {
+            $cookieDomain = '.' . $cookieDomain;
+        }
+        // prevents setting cookies for '.com' and similar domains
+        if (!$this->useList && substr_count($cookieDomain, '.') < 2
+            || $this->useList && !self::getRegisteredDomain($cookieDomain)
+        ) {
+            return false;
+        }
+        return substr('.' . $requestHost, -strlen($cookieDomain)) == $cookieDomain;
+    }
+
+   /**
+    * Removes subdomains to get the registered domain (the first after top-level)
+    *
+    * The method will check Public Suffix List to find out where top-level
+    * domain ends and registered domain starts. It will remove domain parts
+    * to the left of registered one.
+    *
+    * @param  string        domain name
+    * @return string|bool   registered domain, will return false if $domain is
+    *                       either invalid or a TLD itself
+    */
+    public static function getRegisteredDomain($domain)
+    {
+        $domainParts = explode('.', ltrim($domain, '.'));
+
+        // load the list if needed
+        if (empty(self::$psl)) {
+            $path = '@data_dir@' . DIRECTORY_SEPARATOR . 'HTTP_Request2';
+            if (0 === strpos($path, '@' . 'data_dir@')) {
+                $path = realpath(dirname(__FILE__) . DIRECTORY_SEPARATOR . '..'
+                                 . DIRECTORY_SEPARATOR . 'data');
+            }
+            self::$psl = include_once $path . DIRECTORY_SEPARATOR . 'public-suffix-list.php';
+        }
+
+        if (!($result = self::checkDomainsList($domainParts, self::$psl))) {
+            // known TLD, invalid domain name
+            return false;
+        }
+
+        // unknown TLD
+        if (!strpos($result, '.')) {
+            // fallback to checking that domain "has at least two dots"
+            if (2 > ($count = count($domainParts))) {
+                return false;
+            }
+            return $domainParts[$count - 2] . '.' . $domainParts[$count - 1];
+        }
+        return $result;
+    }
+
+   /**
+    * Recursive helper method for {@link getRegisteredDomain()}
+    *
+    * @param  array         remaining domain parts
+    * @param  mixed         node in {@link HTTP_Request2_CookieJar::$psl} to check
+    * @return string|null   concatenated domain parts, null in case of error
+    */
+    protected static function checkDomainsList(array $domainParts, $listNode)
+    {
+        $sub    = array_pop($domainParts);
+        $result = null;
+
+        if (!is_array($listNode) || is_null($sub)
+            || array_key_exists('!' . $sub, $listNode)
+         ) {
+            return $sub;
+
+        } elseif (array_key_exists($sub, $listNode)) {
+            $result = self::checkDomainsList($domainParts, $listNode[$sub]);
+
+        } elseif (array_key_exists('*', $listNode)) {
+            $result = self::checkDomainsList($domainParts, $listNode['*']);
+
+        } else {
+            return $sub;
+        }
+
+        return (strlen($result) > 0) ? ($result . '.' . $sub) : null;
+    }
+}
+?>
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/ext/HTTP/Request2/Exception.php Added

@@ -0,0 +1,160 @@
+<?php
+/**
+ * Exception classes for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: Exception.php 308629 2011-02-24 17:34:24Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Base class for exceptions in PEAR
+ */
+require_once 'PEAR/Exception.php';
+
+/**
+ * Base exception class for HTTP_Request2 package
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @version    Release: 2.0.0
+ * @link       http://pear.php.net/pepr/pepr-proposal-show.php?id=132
+ */
+class HTTP_Request2_Exception extends PEAR_Exception
+{
+    /** An invalid argument was passed to a method */
+    const INVALID_ARGUMENT   = 1;
+    /** Some required value was not available */
+    const MISSING_VALUE      = 2;
+    /** Request cannot be processed due to errors in PHP configuration */
+    const MISCONFIGURATION   = 3;
+    /** Error reading the local file */
+    const READ_ERROR         = 4;
+
+    /** Server returned a response that does not conform to HTTP protocol */
+    const MALFORMED_RESPONSE = 10;
+    /** Failure decoding Content-Encoding or Transfer-Encoding of response */
+    const DECODE_ERROR       = 20;
+    /** Operation timed out */
+    const TIMEOUT            = 30;
+    /** Number of redirects exceeded 'max_redirects' configuration parameter */
+    const TOO_MANY_REDIRECTS = 40;
+    /** Redirect to a protocol other than http(s):// */
+    const NON_HTTP_REDIRECT  = 50;
+
+   /**
+    * Native error code
+    * @var int
+    */
+    private $_nativeCode;
+
+   /**
+    * Constructor, can set package error code and native error code
+    *
+    * @param string exception message
+    * @param int    package error code, one of class constants
+    * @param int    error code from underlying PHP extension
+    */
+    public function __construct($message = null, $code = null, $nativeCode = null)
+    {
+        parent::__construct($message, $code);
+        $this->_nativeCode = $nativeCode;
+    }
+
+   /**
+    * Returns error code produced by underlying PHP extension
+    *
+    * For Socket Adapter this may contain error number returned by
+    * stream_socket_client(), for Curl Adapter this will contain error number
+    * returned by curl_errno()
+    *
+    * @return integer
+    */
+    public function getNativeCode()
+    {
+        return $this->_nativeCode;
+    }
+}
+
+/**
+ * Exception thrown in case of missing features
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @version    Release: 2.0.0
+ */
+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
+ * @version    Release: 2.0.0
+ */
+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
+ * @version    Release: 2.0.0
+ */
+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
+ * @version    Release: 2.0.0
+ */
+class HTTP_Request2_MessageException extends HTTP_Request2_Exception {}
+?>
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/ext/HTTP/Request2/MultipartBody.php Added

@@ -0,0 +1,274 @@
+<?php
+/**
+ * Helper class for building multipart/form-data request body
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: MultipartBody.php 308322 2011-02-14 13:58:03Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Class for building multipart/form-data request body
+ *
+ * The class helps to reduce memory consumption by streaming large file uploads
+ * from disk, it also allows monitoring of upload progress (see request #7630)
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @version    Release: 2.0.0
+ * @link       http://tools.ietf.org/html/rfc1867
+ */
+class HTTP_Request2_MultipartBody
+{
+   /**
+    * MIME boundary
+    * @var  string
+    */
+    private $_boundary;
+
+   /**
+    * Form parameters added via {@link HTTP_Request2::addPostParameter()}
+    * @var  array
+    */
+    private $_params = array();
+
+   /**
+    * File uploads added via {@link HTTP_Request2::addUpload()}
+    * @var  array
+    */
+    private $_uploads = array();
+
+   /**
+    * Header for parts with parameters
+    * @var  string
+    */
+    private $_headerParam = "--%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n";
+
+   /**
+    * Header for parts with uploads
+    * @var  string
+    */
+    private $_headerUpload = "--%s\r\nContent-Disposition: form-data; name=\"%s\"; filename=\"%s\"\r\nContent-Type: %s\r\n\r\n";
+
+   /**
+    * Current position in parameter and upload arrays
+    *
+    * First number is index of "current" part, second number is position within
+    * "current" part
+    *
+    * @var  array
+    */
+    private $_pos = array(0, 0);
+
+
+   /**
+    * Constructor. Sets the arrays with POST data.
+    *
+    * @param    array   values of form fields set via {@link HTTP_Request2::addPostParameter()}
+    * @param    array   file uploads set via {@link HTTP_Request2::addUpload()}
+    * @param    bool    whether to append brackets to array variable names
+    */
+    public function __construct(array $params, array $uploads, $useBrackets = true)
+    {
+        $this->_params = self::_flattenArray('', $params, $useBrackets);
+        foreach ($uploads as $fieldName => $f) {
+            if (!is_array($f['fp'])) {
+                $this->_uploads[] = $f + array('name' => $fieldName);
+            } else {
+                for ($i = 0; $i < count($f['fp']); $i++) {
+                    $upload = array(
+                        'name' => ($useBrackets? $fieldName . '[' . $i . ']': $fieldName)
+                    );
+                    foreach (array('fp', 'filename', 'size', 'type') as $key) {
+                        $upload[$key] = $f[$key][$i];
+                    }
+                    $this->_uploads[] = $upload;
+                }
+            }
+        }
+    }
+
+   /**
+    * Returns the length of the body to use in Content-Length header
+    *
+    * @return   integer
+    */
+    public function getLength()
+    {
+        $boundaryLength     = strlen($this->getBoundary());
+        $headerParamLength  = strlen($this->_headerParam) - 4 + $boundaryLength;
+        $headerUploadLength = strlen($this->_headerUpload) - 8 + $boundaryLength;
+        $length             = $boundaryLength + 6;
+        foreach ($this->_params as $p) {
+            $length += $headerParamLength + strlen($p[0]) + strlen($p[1]) + 2;
+        }
+        foreach ($this->_uploads as $u) {
+            $length += $headerUploadLength + strlen($u['name']) + strlen($u['type']) +
+                       strlen($u['filename']) + $u['size'] + 2;
+        }
+        return $length;
+    }
+
+   /**
+    * Returns the boundary to use in Content-Type header
+    *
+    * @return   string
+    */
+    public function getBoundary()
+    {
+        if (empty($this->_boundary)) {
+            $this->_boundary = '--' . md5('PEAR-HTTP_Request2-' . microtime());
+        }
+        return $this->_boundary;
+    }
+
+   /**
+    * Returns next chunk of request body
+    *
+    * @param    integer Amount of bytes to read
+    * @return   string  Up to $length bytes of data, empty string if at end
+    */
+    public function read($length)
+    {
+        $ret         = '';
+        $boundary    = $this->getBoundary();
+        $paramCount  = count($this->_params);
+        $uploadCount = count($this->_uploads);
+        while ($length > 0 && $this->_pos[0] <= $paramCount + $uploadCount) {
+            $oldLength = $length;
+            if ($this->_pos[0] < $paramCount) {
+                $param = sprintf($this->_headerParam, $boundary,
+                                 $this->_params[$this->_pos[0]][0]) .
+                         $this->_params[$this->_pos[0]][1] . "\r\n";
+                $ret    .= substr($param, $this->_pos[1], $length);
+                $length -= min(strlen($param) - $this->_pos[1], $length);
+
+            } elseif ($this->_pos[0] < $paramCount + $uploadCount) {
+                $pos    = $this->_pos[0] - $paramCount;
+                $header = sprintf($this->_headerUpload, $boundary,
+                                  $this->_uploads[$pos]['name'],
+                                  $this->_uploads[$pos]['filename'],
+                                  $this->_uploads[$pos]['type']);
+                if ($this->_pos[1] < strlen($header)) {
+                    $ret    .= substr($header, $this->_pos[1], $length);
+                    $length -= min(strlen($header) - $this->_pos[1], $length);
+                }
+                $filePos  = max(0, $this->_pos[1] - strlen($header));
+                if ($length > 0 && $filePos < $this->_uploads[$pos]['size']) {
+                    $ret     .= fread($this->_uploads[$pos]['fp'], $length);
+                    $length  -= min($length, $this->_uploads[$pos]['size'] - $filePos);
+                }
+                if ($length > 0) {
+                    $start   = $this->_pos[1] + ($oldLength - $length) -
+                               strlen($header) - $this->_uploads[$pos]['size'];
+                    $ret    .= substr("\r\n", $start, $length);
+                    $length -= min(2 - $start, $length);
+                }
+
+            } else {
+                $closing  = '--' . $boundary . "--\r\n";
+                $ret     .= substr($closing, $this->_pos[1], $length);
+                $length  -= min(strlen($closing) - $this->_pos[1], $length);
+            }
+            if ($length > 0) {
+                $this->_pos     = array($this->_pos[0] + 1, 0);
+            } else {
+                $this->_pos[1] += $oldLength;
+            }
+        }
+        return $ret;
+    }
+
+   /**
+    * Sets the current position to the start of the body
+    *
+    * This allows reusing the same body in another request
+    */
+    public function rewind()
+    {
+        $this->_pos = array(0, 0);
+        foreach ($this->_uploads as $u) {
+            rewind($u['fp']);
+        }
+    }
+
+   /**
+    * Returns the body as string
+    *
+    * 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
+    */
+    public function __toString()
+    {
+        $this->rewind();
+        return $this->read($this->getLength());
+    }
+
+
+   /**
+    * Helper function to change the (probably multidimensional) associative array
+    * into the simple one.
+    *
+    * @param    string  name for item
+    * @param    mixed   item's values
+    * @param    bool    whether to append [] to array variables' names
+    * @return   array   array with the following items: array('item name', 'item value');
+    */
+    private static function _flattenArray($name, $values, $useBrackets)
+    {
+        if (!is_array($values)) {
+            return array(array($name, $values));
+        } else {
+            $ret = array();
+            foreach ($values as $k => $v) {
+                if (empty($name)) {
+                    $newName = $k;
+                } elseif ($useBrackets) {
+                    $newName = $name . '[' . $k . ']';
+                } else {
+                    $newName = $name;
+                }
+                $ret = array_merge($ret, self::_flattenArray($newName, $v, $useBrackets));
+            }
+            return $ret;
+        }
+    }
+}
+?>

iRony-0.4.4.tar.gz/lib/FileAPI/ext/HTTP/Request2/Observer Added

iRony-0.4.4.tar.gz/lib/FileAPI/ext/HTTP/Request2/Observer/Log.php Added

@@ -0,0 +1,215 @@
+<?php
+/**
+ * An observer useful for debugging / testing.
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category HTTP
+ * @package  HTTP_Request2
+ * @author   David Jean Louis <izi@php.net>
+ * @author   Alexey Borzov <avb@php.net>
+ * @license  http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version  SVN: $Id: Log.php 308680 2011-02-25 17:40:17Z avb $
+ * @link     http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Exception class for HTTP_Request2 package
+ */
+require_once 'HTTP/Request2/Exception.php';
+
+/**
+ * A debug observer useful for debugging / testing.
+ *
+ * This observer logs to a log target data corresponding to the various request
+ * and response events, it logs by default to php://output but can be configured
+ * to log to a file or via the PEAR Log package.
+ *
+ * A simple example:
+ * <code>
+ * require_once 'HTTP/Request2.php';
+ * require_once 'HTTP/Request2/Observer/Log.php';
+ *
+ * $request  = new HTTP_Request2('http://www.example.com');
+ * $observer = new HTTP_Request2_Observer_Log();
+ * $request->attach($observer);
+ * $request->send();
+ * </code>
+ *
+ * A more complex example with PEAR Log:
+ * <code>
+ * require_once 'HTTP/Request2.php';
+ * require_once 'HTTP/Request2/Observer/Log.php';
+ * require_once 'Log.php';
+ *
+ * $request  = new HTTP_Request2('http://www.example.com');
+ * // we want to log with PEAR log
+ * $observer = new HTTP_Request2_Observer_Log(Log::factory('console'));
+ *
+ * // we only want to log received headers
+ * $observer->events = array('receivedHeaders');
+ *
+ * $request->attach($observer);
+ * $request->send();
+ * </code>
+ *
+ * @category HTTP
+ * @package  HTTP_Request2
+ * @author   David Jean Louis <izi@php.net>
+ * @author   Alexey Borzov <avb@php.net>
+ * @license  http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version  Release: 2.0.0
+ * @link     http://pear.php.net/package/HTTP_Request2
+ */
+class HTTP_Request2_Observer_Log implements SplObserver
+{
+    // properties {{{
+
+    /**
+     * The log target, it can be a a resource or a PEAR Log instance.
+     *
+     * @var resource|Log $target
+     */
+    protected $target = null;
+
+    /**
+     * The events to log.
+     *
+     * @var array $events
+     */
+    public $events = array(
+        'connect',
+        'sentHeaders',
+        'sentBody',
+        'receivedHeaders',
+        'receivedBody',
+        'disconnect',
+    );
+
+    // }}}
+    // __construct() {{{
+
+    /**
+     * Constructor.
+     *
+     * @param mixed $target Can be a file path (default: php://output), a resource,
+     *                      or an instance of the PEAR Log class.
+     * @param array $events Array of events to listen to (default: all events)
+     *
+     * @return void
+     */
+    public function __construct($target = 'php://output', array $events = array())
+    {
+        if (!empty($events)) {
+            $this->events = $events;
+        }
+        if (is_resource($target) || $target instanceof Log) {
+            $this->target = $target;
+        } elseif (false === ($this->target = @fopen($target, 'ab'))) {
+            throw new HTTP_Request2_Exception("Unable to open '{$target}'");
+        }
+    }
+
+    // }}}
+    // update() {{{
+
+    /**
+     * Called when the request notifies us of an event.
+     *
+     * @param HTTP_Request2 $subject The HTTP_Request2 instance
+     *
+     * @return void
+     */
+    public function update(SplSubject $subject)
+    {
+        $event = $subject->getLastEvent();
+        if (!in_array($event['name'], $this->events)) {
+            return;
+        }
+
+        switch ($event['name']) {
+        case 'connect':
+            $this->log('* Connected to ' . $event['data']);
+            break;
+        case 'sentHeaders':
+            $headers = explode("\r\n", $event['data']);
+            array_pop($headers);
+            foreach ($headers as $header) {
+                $this->log('> ' . $header);
+            }
+            break;
+        case 'sentBody':
+            $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()));
+            $headers = $event['data']->getHeader();
+            foreach ($headers as $key => $val) {
+                $this->log('< ' . $key . ': ' . $val);
+            }
+            $this->log('< ');
+            break;
+        case 'receivedBody':
+            $this->log($event['data']->getBody());
+            break;
+        case 'disconnect':
+            $this->log('* Disconnected');
+            break;
+        }
+    }
+
+    // }}}
+    // log() {{{
+
+    /**
+     * Logs the given message to the configured target.
+     *
+     * @param string $message Message to display
+     *
+     * @return void
+     */
+    protected function log($message)
+    {
+        if ($this->target instanceof Log) {
+            $this->target->debug($message);
+        } elseif (is_resource($this->target)) {
+            fwrite($this->target, $message . "\r\n");
+        }
+    }
+
+    // }}}
+}
+
+?>
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/ext/HTTP/Request2/Response.php Added

@@ -0,0 +1,643 @@
+<?php
+/**
+ * Class representing a HTTP response
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: Response.php 317591 2011-10-01 08:37:49Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Exception class for HTTP_Request2 package
+ */
+require_once 'HTTP/Request2/Exception.php';
+
+/**
+ * Class representing a HTTP response
+ *
+ * The class is designed to be used in "streaming" scenario, building the
+ * response as it is being received:
+ * <code>
+ * $statusLine = read_status_line();
+ * $response = new HTTP_Request2_Response($statusLine);
+ * do {
+ *     $headerLine = read_header_line();
+ *     $response->parseHeaderLine($headerLine);
+ * } while ($headerLine != '');
+ *
+ * while ($chunk = read_body()) {
+ *     $response->appendBody($chunk);
+ * }
+ *
+ * var_dump($response->getHeader(), $response->getCookies(), $response->getBody());
+ * </code>
+ *
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @version    Release: 2.0.0
+ * @link       http://tools.ietf.org/html/rfc2616#section-6
+ */
+class HTTP_Request2_Response
+{
+   /**
+    * HTTP protocol version (e.g. 1.0, 1.1)
+    * @var  string
+    */
+    protected $version;
+
+   /**
+    * Status code
+    * @var  integer
+    * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
+    */
+    protected $code;
+
+   /**
+    * Reason phrase
+    * @var  string
+    * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
+    */
+    protected $reasonPhrase;
+
+   /**
+    * Effective URL (may be different from original request URL in case of redirects)
+    * @var  string
+    */
+    protected $effectiveUrl;
+
+   /**
+    * Associative array of response headers
+    * @var  array
+    */
+    protected $headers = array();
+
+   /**
+    * Cookies set in the response
+    * @var  array
+    */
+    protected $cookies = array();
+
+   /**
+    * Name of last header processed by parseHederLine()
+    *
+    * Used to handle the headers that span multiple lines
+    *
+    * @var  string
+    */
+    protected $lastHeader = null;
+
+   /**
+    * Response body
+    * @var  string
+    */
+    protected $body = '';
+
+   /**
+    * Whether the body is still encoded by Content-Encoding
+    *
+    * cURL provides the decoded body to the callback; if we are reading from
+    * socket the body is still gzipped / deflated
+    *
+    * @var  bool
+    */
+    protected $bodyEncoded;
+
+   /**
+    * Associative array of HTTP status code / reason phrase.
+    *
+    * @var  array
+    * @link http://tools.ietf.org/html/rfc2616#section-10
+    */
+    protected static $phrases = array(
+
+        // 1xx: Informational - Request received, continuing process
+        100 => 'Continue',
+        101 => 'Switching Protocols',
+
+        // 2xx: Success - The action was successfully received, understood and
+        // accepted
+        200 => 'OK',
+        201 => 'Created',
+        202 => 'Accepted',
+        203 => 'Non-Authoritative Information',
+        204 => 'No Content',
+        205 => 'Reset Content',
+        206 => 'Partial Content',
+
+        // 3xx: Redirection - Further action must be taken in order to complete
+        // the request
+        300 => 'Multiple Choices',
+        301 => 'Moved Permanently',
+        302 => 'Found',  // 1.1
+        303 => 'See Other',
+        304 => 'Not Modified',
+        305 => 'Use Proxy',
+        307 => 'Temporary Redirect',
+
+        // 4xx: Client Error - The request contains bad syntax or cannot be
+        // fulfilled
+        400 => 'Bad Request',
+        401 => 'Unauthorized',
+        402 => 'Payment Required',
+        403 => 'Forbidden',
+        404 => 'Not Found',
+        405 => 'Method Not Allowed',
+        406 => 'Not Acceptable',
+        407 => 'Proxy Authentication Required',
+        408 => 'Request Timeout',
+        409 => 'Conflict',
+        410 => 'Gone',
+        411 => 'Length Required',
+        412 => 'Precondition Failed',
+        413 => 'Request Entity Too Large',
+        414 => 'Request-URI Too Long',
+        415 => 'Unsupported Media Type',
+        416 => 'Requested Range Not Satisfiable',
+        417 => 'Expectation Failed',
+
+        // 5xx: Server Error - The server failed to fulfill an apparently
+        // valid request
+        500 => 'Internal Server Error',
+        501 => 'Not Implemented',
+        502 => 'Bad Gateway',
+        503 => 'Service Unavailable',
+        504 => 'Gateway Timeout',
+        505 => 'HTTP Version Not Supported',
+        509 => 'Bandwidth Limit Exceeded',
+
+    );
+
+   /**
+    * Returns the default reason phrase for the given code or all reason phrases
+    *
+    * @param  int $code         Response code
+    * @return string|array|null Default reason phrase for $code if $code is given
+    *                           (null if no phrase is available), array of all
+    *                           reason phrases if $code is null
+    * @link   http://pear.php.net/bugs/18716
+    */
+    public static function getDefaultReasonPhrase($code = null)
+    {
+        if (null === $code) {
+            return self::$phrases;
+        } else {
+            return isset(self::$phrases[$code]) ? self::$phrases[$code] : null;
+        }
+    }
+
+   /**
+    * Constructor, parses the response status line
+    *
+    * @param    string Response status line (e.g. "HTTP/1.1 200 OK")
+    * @param    bool   Whether body is still encoded by Content-Encoding
+    * @param    string Effective URL of the response
+    * @throws   HTTP_Request2_MessageException if status line is invalid according to spec
+    */
+    public function __construct($statusLine, $bodyEncoded = true, $effectiveUrl = null)
+    {
+        if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', $statusLine, $m)) {
+            throw new HTTP_Request2_MessageException(
+                "Malformed response: {$statusLine}",
+                HTTP_Request2_Exception::MALFORMED_RESPONSE
+            );
+        }
+        $this->version      = $m[1];
+        $this->code         = intval($m[2]);
+        $this->reasonPhrase = !empty($m[3]) ? trim($m[3]) : self::getDefaultReasonPhrase($this->code);
+        $this->bodyEncoded  = (bool)$bodyEncoded;
+        $this->effectiveUrl = (string)$effectiveUrl;
+    }
+
+   /**
+    * Parses the line from HTTP response filling $headers array
+    *
+    * The method should be called after reading the line from socket or receiving
+    * it into cURL callback. Passing an empty string here indicates the end of
+    * response headers and triggers additional processing, so be sure to pass an
+    * empty string in the end.
+    *
+    * @param    string  Line from HTTP response
+    */
+    public function parseHeaderLine($headerLine)
+    {
+        $headerLine = trim($headerLine, "\r\n");
+
+        // empty string signals the end of headers, process the received ones
+        if ('' == $headerLine) {
+            if (!empty($this->headers['set-cookie'])) {
+                $cookies = is_array($this->headers['set-cookie'])?
+                           $this->headers['set-cookie']:
+                           array($this->headers['set-cookie']);
+                foreach ($cookies as $cookieString) {
+                    $this->parseCookie($cookieString);
+                }
+                unset($this->headers['set-cookie']);
+            }
+            foreach (array_keys($this->headers) as $k) {
+                if (is_array($this->headers[$k])) {
+                    $this->headers[$k] = implode(', ', $this->headers[$k]);
+                }
+            }
+
+        // string of the form header-name: header value
+        } elseif (preg_match('!^([^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+):(.+)$!', $headerLine, $m)) {
+            $name  = strtolower($m[1]);
+            $value = trim($m[2]);
+            if (empty($this->headers[$name])) {
+                $this->headers[$name] = $value;
+            } else {
+                if (!is_array($this->headers[$name])) {
+                    $this->headers[$name] = array($this->headers[$name]);
+                }
+                $this->headers[$name][] = $value;
+            }
+            $this->lastHeader = $name;
+
+        // continuation of a previous header
+        } elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {
+            if (!is_array($this->headers[$this->lastHeader])) {
+                $this->headers[$this->lastHeader] .= ' ' . trim($m[1]);
+            } else {
+                $key = count($this->headers[$this->lastHeader]) - 1;
+                $this->headers[$this->lastHeader][$key] .= ' ' . trim($m[1]);
+            }
+        }
+    }
+
+   /**
+    * Parses a Set-Cookie header to fill $cookies array
+    *
+    * @param    string    value of Set-Cookie header
+    * @link     http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
+    */
+    protected function parseCookie($cookieString)
+    {
+        $cookie = array(
+            'expires' => null,
+            'domain'  => null,
+            'path'    => null,
+            'secure'  => false
+        );
+
+        // Only a name=value pair
+        if (!strpos($cookieString, ';')) {
+            $pos = strpos($cookieString, '=');
+            $cookie['name']  = trim(substr($cookieString, 0, $pos));
+            $cookie['value'] = trim(substr($cookieString, $pos + 1));
+
+        // Some optional parameters are supplied
+        } else {
+            $elements = explode(';', $cookieString);
+            $pos = strpos($elements[0], '=');
+            $cookie['name']  = trim(substr($elements[0], 0, $pos));
+            $cookie['value'] = trim(substr($elements[0], $pos + 1));
+
+            for ($i = 1; $i < count($elements); $i++) {
+                if (false === strpos($elements[$i], '=')) {
+                    $elName  = trim($elements[$i]);
+                    $elValue = null;
+                } else {
+                    list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));
+                }
+                $elName = strtolower($elName);
+                if ('secure' == $elName) {
+                    $cookie['secure'] = true;
+                } elseif ('expires' == $elName) {
+                    $cookie['expires'] = str_replace('"', '', $elValue);
+                } elseif ('path' == $elName || 'domain' == $elName) {
+                    $cookie[$elName] = urldecode($elValue);
+                } else {
+                    $cookie[$elName] = $elValue;
+                }
+            }
+        }
+        $this->cookies[] = $cookie;
+    }
+
+   /**
+    * Appends a string to the response body
+    * @param    string
+    */
+    public function appendBody($bodyChunk)
+    {
+        $this->body .= $bodyChunk;
+    }
+
+   /**
+    * Returns the effective URL of the response
+    *
+    * This may be different from the request URL if redirects were followed.
+    *
+    * @return string
+    * @link   http://pear.php.net/bugs/bug.php?id=18412
+    */
+    public function getEffectiveUrl()
+    {
+        return $this->effectiveUrl;
+    }
+
+   /**
+    * Returns the status code
+    * @return   integer
+    */
+    public function getStatus()
+    {
+        return $this->code;
+    }
+
+   /**
+    * Returns the reason phrase
+    * @return   string
+    */
+    public function getReasonPhrase()
+    {
+        return $this->reasonPhrase;
+    }
+
+   /**
+    * Whether response is a redirect that can be automatically handled by HTTP_Request2
+    * @return   bool
+    */
+    public function isRedirect()
+    {
+        return in_array($this->code, array(300, 301, 302, 303, 307))
+               && isset($this->headers['location']);
+    }
+
+   /**
+    * Returns either the named header or all response headers
+    *
+    * @param    string          Name of header to return
+    * @return   string|array    Value of $headerName header (null if header is
+    *                           not present), array of all response headers if
+    *                           $headerName is null
+    */
+    public function getHeader($headerName = null)
+    {
+        if (null === $headerName) {
+            return $this->headers;
+        } else {
+            $headerName = strtolower($headerName);
+            return isset($this->headers[$headerName])? $this->headers[$headerName]: null;
+        }
+    }
+
+   /**
+    * Returns cookies set in response
+    *
+    * @return   array
+    */
+    public function getCookies()
+    {
+        return $this->cookies;
+    }
+
+   /**
+    * Returns the body of the response
+    *
+    * @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')), array('gzip', 'deflate'))
+        ) {
+            return $this->body;
+
+        } else {
+            if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
+                $oldEncoding = mb_internal_encoding();
+                mb_internal_encoding('iso-8859-1');
+            }
+
+            try {
+                switch (strtolower($this->getHeader('content-encoding'))) {
+                    case 'gzip':
+                        $decoded = self::decodeGzip($this->body);
+                        break;
+                    case 'deflate':
+                        $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
+    */
+    public function getVersion()
+    {
+        return $this->version;
+    }
+
+   /**
+    * Decodes the message-body encoded by gzip
+    *
+    * The real decoding work is done by gzinflate() built-in function, this
+    * method only parses the header and checks data for compliance with
+    * RFC 1952
+    *
+    * @param    string  gzip-encoded data
+    * @return   string  decoded data
+    * @throws   HTTP_Request2_LogicException
+    * @throws   HTTP_Request2_MessageException
+    * @link     http://tools.ietf.org/html/rfc1952
+    */
+    public static function decodeGzip($data)
+    {
+        $length = strlen($data);
+        // If it doesn't look like gzip-encoded data, don't bother
+        if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
+            return $data;
+        }
+        if (!function_exists('gzinflate')) {
+            throw new HTTP_Request2_LogicException(
+                'Unable to decode body: gzip extension not available',
+                HTTP_Request2_Exception::MISCONFIGURATION
+            );
+        }
+        $method = ord(substr($data, 2, 1));
+        if (8 != $method) {
+            throw new HTTP_Request2_MessageException(
+                'Error parsing gzip header: unknown compression method',
+                HTTP_Request2_Exception::DECODE_ERROR
+            );
+        }
+        $flags = ord(substr($data, 3, 1));
+        if ($flags & 224) {
+            throw new HTTP_Request2_MessageException(
+                'Error parsing gzip header: reserved bits are set',
+                HTTP_Request2_Exception::DECODE_ERROR
+            );
+        }
+
+        // header is 10 bytes minimum. may be longer, though.
+        $headerLength = 10;
+        // extra fields, need to skip 'em
+        if ($flags & 4) {
+            if ($length - $headerLength - 2 < 8) {
+                throw new HTTP_Request2_MessageException(
+                    'Error parsing gzip header: data too short',
+                    HTTP_Request2_Exception::DECODE_ERROR
+                );
+            }
+            $extraLength = unpack('v', substr($data, 10, 2));
+            if ($length - $headerLength - 2 - $extraLength[1] < 8) {
+                throw new HTTP_Request2_MessageException(
+                    'Error parsing gzip header: data too short',
+                    HTTP_Request2_Exception::DECODE_ERROR
+                );
+            }
+            $headerLength += $extraLength[1] + 2;
+        }
+        // file name, need to skip that
+        if ($flags & 8) {
+            if ($length - $headerLength - 1 < 8) {
+                throw new HTTP_Request2_MessageException(
+                    'Error parsing gzip header: data too short',
+                    HTTP_Request2_Exception::DECODE_ERROR
+                );
+            }
+            $filenameLength = strpos(substr($data, $headerLength), chr(0));
+            if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
+                throw new HTTP_Request2_MessageException(
+                    'Error parsing gzip header: data too short',
+                    HTTP_Request2_Exception::DECODE_ERROR
+                );
+            }
+            $headerLength += $filenameLength + 1;
+        }
+        // comment, need to skip that also
+        if ($flags & 16) {
+            if ($length - $headerLength - 1 < 8) {
+                throw new HTTP_Request2_MessageException(
+                    'Error parsing gzip header: data too short',
+                    HTTP_Request2_Exception::DECODE_ERROR
+                );
+            }
+            $commentLength = strpos(substr($data, $headerLength), chr(0));
+            if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
+                throw new HTTP_Request2_MessageException(
+                    'Error parsing gzip header: data too short',
+                    HTTP_Request2_Exception::DECODE_ERROR
+                );
+            }
+            $headerLength += $commentLength + 1;
+        }
+        // have a CRC for header. let's check
+        if ($flags & 2) {
+            if ($length - $headerLength - 2 < 8) {
+                throw new HTTP_Request2_MessageException(
+                    'Error parsing gzip header: data too short',
+                    HTTP_Request2_Exception::DECODE_ERROR
+                );
+            }
+            $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
+            $crcStored = unpack('v', substr($data, $headerLength, 2));
+            if ($crcReal != $crcStored[1]) {
+                throw new HTTP_Request2_MessageException(
+                    'Header CRC check failed',
+                    HTTP_Request2_Exception::DECODE_ERROR
+                );
+            }
+            $headerLength += 2;
+        }
+        // unpacked data CRC and size at the end of encoded data
+        $tmp = unpack('V2', substr($data, -8));
+        $dataCrc  = $tmp[1];
+        $dataSize = $tmp[2];
+
+        // finally, call the gzinflate() function
+        // don't pass $dataSize to gzinflate, see bugs #13135, #14370
+        $unpacked = gzinflate(substr($data, $headerLength, -8));
+        if (false === $unpacked) {
+            throw new HTTP_Request2_MessageException(
+                'gzinflate() call failed',
+                HTTP_Request2_Exception::DECODE_ERROR
+            );
+        } elseif ($dataSize != strlen($unpacked)) {
+            throw new HTTP_Request2_MessageException(
+                'Data size check failed',
+                HTTP_Request2_Exception::DECODE_ERROR
+            );
+        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
+            throw new HTTP_Request2_Exception(
+                'Data CRC check failed',
+                HTTP_Request2_Exception::DECODE_ERROR
+            );
+        }
+        return $unpacked;
+    }
+
+   /**
+    * Decodes the message-body encoded by deflate
+    *
+    * @param    string  deflate-encoded data
+    * @return   string  decoded data
+    * @throws   HTTP_Request2_LogicException
+    */
+    public static function decodeDeflate($data)
+    {
+        if (!function_exists('gzuncompress')) {
+            throw new HTTP_Request2_LogicException(
+                'Unable to decode body: gzip extension not available',
+                HTTP_Request2_Exception::MISCONFIGURATION
+            );
+        }
+        // RFC 2616 defines 'deflate' encoding as zlib format from RFC 1950,
+        // while many applications send raw deflate stream from RFC 1951.
+        // We should check for presence of zlib header and use gzuncompress() or
+        // gzinflate() as needed. See bug #15305
+        $header = unpack('n', substr($data, 0, 2));
+        return (0 == $header[1] % 31)? gzuncompress($data): gzinflate($data);
+    }
+}
+?>
\ No newline at end of file

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Mail Added

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Mail/mime.php Added

@@ -0,0 +1,1476 @@
+<?php
+/**
+ * The Mail_Mime class is used to create MIME E-mail messages
+ *
+ * The Mail_Mime class provides an OO interface to create MIME
+ * enabled email messages. This way you can create emails that
+ * contain plain-text bodies, HTML bodies, attachments, inline
+ * images and specific headers.
+ *
+ * Compatible with PHP versions 4 and 5
+ *
+ * LICENSE: This LICENSE is in the BSD license style.
+ * Copyright (c) 2002-2003, Richard Heyes <richard@phpguru.org>
+ * Copyright (c) 2003-2006, PEAR <pear-group@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - Neither the name of the authors, nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this 
+ *   software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category  Mail
+ * @package   Mail_Mime
+ * @author    Richard Heyes  <richard@phpguru.org>
+ * @author    Tomas V.V. Cox <cox@idecnet.com>
+ * @author    Cipriano Groenendal <cipri@php.net>
+ * @author    Sean Coates <sean@php.net>
+ * @author    Aleksander Machniak <alec@php.net>
+ * @copyright 2003-2006 PEAR <pear-group@php.net>
+ * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version   1.8.5
+ * @link      http://pear.php.net/package/Mail_mime
+ *
+ *            This class is based on HTML Mime Mail class from
+ *            Richard Heyes <richard@phpguru.org> which was based also
+ *            in the mime_mail.class by Tobias Ratschiller <tobias@dnet.it>
+ *            and Sascha Schumann <sascha@schumann.cx>
+ */
+
+
+/**
+ * require PEAR
+ *
+ * This package depends on PEAR to raise errors.
+ */
+require_once 'PEAR.php';
+
+/**
+ * require Mail_mimePart
+ *
+ * Mail_mimePart contains the code required to
+ * create all the different parts a mail can
+ * consist of.
+ */
+require_once 'Mail/mimePart.php';
+
+
+/**
+ * The Mail_Mime class provides an OO interface to create MIME
+ * enabled email messages. This way you can create emails that
+ * contain plain-text bodies, HTML bodies, attachments, inline
+ * images and specific headers.
+ *
+ * @category  Mail
+ * @package   Mail_Mime
+ * @author    Richard Heyes  <richard@phpguru.org>
+ * @author    Tomas V.V. Cox <cox@idecnet.com>
+ * @author    Cipriano Groenendal <cipri@php.net>
+ * @author    Sean Coates <sean@php.net>
+ * @copyright 2003-2006 PEAR <pear-group@php.net>
+ * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version   Release: 1.8.5
+ * @link      http://pear.php.net/package/Mail_mime
+ */
+class Mail_mime
+{
+    /**
+     * Contains the plain text part of the email
+     *
+     * @var string
+     * @access private
+     */
+    var $_txtbody;
+
+    /**
+     * Contains the html part of the email
+     *
+     * @var string
+     * @access private
+     */
+    var $_htmlbody;
+
+    /**
+     * list of the attached images
+     *
+     * @var array
+     * @access private
+     */
+    var $_html_images = array();
+
+    /**
+     * list of the attachements
+     *
+     * @var array
+     * @access private
+     */
+    var $_parts = array();
+
+    /**
+     * Headers for the mail
+     *
+     * @var array
+     * @access private
+     */
+    var $_headers = array();
+
+    /**
+     * Build parameters
+     *
+     * @var array
+     * @access private
+     */
+    var $_build_params = array(
+        // What encoding to use for the headers
+        // Options: quoted-printable or base64
+        'head_encoding' => 'quoted-printable',
+        // What encoding to use for plain text
+        // Options: 7bit, 8bit, base64, or quoted-printable
+        'text_encoding' => 'quoted-printable',
+        // What encoding to use for html
+        // Options: 7bit, 8bit, base64, or quoted-printable
+        'html_encoding' => 'quoted-printable',
+        // The character set to use for html
+        'html_charset'  => 'ISO-8859-1',
+        // The character set to use for text
+        'text_charset'  => 'ISO-8859-1',
+        // The character set to use for headers
+        'head_charset'  => 'ISO-8859-1',
+        // End-of-line sequence
+        'eol'           => "\r\n",
+        // Delay attachment files IO until building the message
+        'delay_file_io' => false
+    );
+
+    /**
+     * Constructor function
+     *
+     * @param mixed $params Build parameters that change the way the email
+     *                      is built. Should be an associative array.
+     *                      See $_build_params.
+     *
+     * @return void
+     * @access public
+     */
+    function Mail_mime($params = array())
+    {
+        // Backward-compatible EOL setting
+        if (is_string($params)) {
+            $this->_build_params['eol'] = $params;
+        } else if (defined('MAIL_MIME_CRLF') && !isset($params['eol'])) {
+            $this->_build_params['eol'] = MAIL_MIME_CRLF;
+        }
+
+        // Update build parameters
+        if (!empty($params) && is_array($params)) {
+            while (list($key, $value) = each($params)) {
+                $this->_build_params[$key] = $value;
+            }
+        }
+    }
+
+    /**
+     * Set build parameter value
+     *
+     * @param string $name  Parameter name
+     * @param string $value Parameter value
+     *
+     * @return void
+     * @access public
+     * @since 1.6.0
+     */
+    function setParam($name, $value)
+    {
+        $this->_build_params[$name] = $value;
+    }
+
+    /**
+     * Get build parameter value
+     *
+     * @param string $name Parameter name
+     *
+     * @return mixed Parameter value
+     * @access public
+     * @since 1.6.0
+     */
+    function getParam($name)
+    {
+        return isset($this->_build_params[$name]) ? $this->_build_params[$name] : null;
+    }
+
+    /**
+     * Accessor function to set the body text. Body text is used if
+     * it's not an html mail being sent or else is used to fill the
+     * text/plain part that emails clients who don't support
+     * html should show.
+     *
+     * @param string $data   Either a string or
+     *                       the file name with the contents
+     * @param bool   $isfile If true the first param should be treated
+     *                       as a file name, else as a string (default)
+     * @param bool   $append If true the text or file is appended to
+     *                       the existing body, else the old body is
+     *                       overwritten
+     *
+     * @return mixed         True on success or PEAR_Error object
+     * @access public
+     */
+    function setTXTBody($data, $isfile = false, $append = false)
+    {
+        if (!$isfile) {
+            if (!$append) {
+                $this->_txtbody = $data;
+            } else {
+                $this->_txtbody .= $data;
+            }
+        } else {
+            $cont = $this->_file2str($data);
+            if (PEAR::isError($cont)) {
+                return $cont;
+            }
+            if (!$append) {
+                $this->_txtbody = $cont;
+            } else {
+                $this->_txtbody .= $cont;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Get message text body
+     *
+     * @return string Text body
+     * @access public
+     * @since 1.6.0
+     */
+    function getTXTBody()
+    {
+        return $this->_txtbody;
+    }
+
+    /**
+     * Adds a html part to the mail.
+     *
+     * @param string $data   Either a string or the file name with the
+     *                       contents
+     * @param bool   $isfile A flag that determines whether $data is a
+     *                       filename, or a string(false, default)
+     *
+     * @return bool          True on success
+     * @access public
+     */
+    function setHTMLBody($data, $isfile = false)
+    {
+        if (!$isfile) {
+            $this->_htmlbody = $data;
+        } else {
+            $cont = $this->_file2str($data);
+            if (PEAR::isError($cont)) {
+                return $cont;
+            }
+            $this->_htmlbody = $cont;
+        }
+
+        return true;
+    }
+
+    /**
+     * Get message HTML body
+     *
+     * @return string HTML body
+     * @access public
+     * @since 1.6.0
+     */
+    function getHTMLBody()
+    {
+        return $this->_htmlbody;
+    }
+
+    /**
+     * Adds an image to the list of embedded images.
+     *
+     * @param string $file       The image file name OR image data itself
+     * @param string $c_type     The content type
+     * @param string $name       The filename of the image.
+     *                           Only used if $file is the image data.
+     * @param bool   $isfile     Whether $file is a filename or not.
+     *                           Defaults to true
+     * @param string $content_id Desired Content-ID of MIME part
+     *                           Defaults to generated unique ID
+     *
+     * @return bool          True on success
+     * @access public
+     */
+    function addHTMLImage($file,
+        $c_type='application/octet-stream',
+        $name = '',
+        $isfile = true,
+        $content_id = null
+    ) {
+        $bodyfile = null;
+
+        if ($isfile) {
+            // Don't load file into memory
+            if ($this->_build_params['delay_file_io']) {
+                $filedata = null;
+                $bodyfile = $file;
+            } else {
+                if (PEAR::isError($filedata = $this->_file2str($file))) {
+                    return $filedata;
+                }
+            }
+            $filename = ($name ? $name : $file);
+        } else {
+            $filedata = $file;
+            $filename = $name;
+        }
+
+        if (!$content_id) {
+            $content_id = md5(uniqid(time()));
+        }
+
+        $this->_html_images[] = array(
+            'body'      => $filedata,
+            'body_file' => $bodyfile,
+            'name'      => $filename,
+            'c_type'    => $c_type,
+            'cid'       => $content_id
+        );
+
+        return true;
+    }
+
+    /**
+     * Adds a file to the list of attachments.
+     *
+     * @param string $file        The file name of the file to attach
+     *                            or the file contents itself
+     * @param string $c_type      The content type
+     * @param string $name        The filename of the attachment
+     *                            Only use if $file is the contents
+     * @param bool   $isfile      Whether $file is a filename or not. Defaults to true
+     * @param string $encoding    The type of encoding to use. Defaults to base64.
+     *                            Possible values: 7bit, 8bit, base64 or quoted-printable.
+     * @param string $disposition The content-disposition of this file
+     *                            Defaults to attachment.
+     *                            Possible values: attachment, inline.
+     * @param string $charset     The character set of attachment's content.
+     * @param string $language    The language of the attachment
+     * @param string $location    The RFC 2557.4 location of the attachment
+     * @param string $n_encoding  Encoding of the attachment's name in Content-Type
+     *                            By default filenames are encoded using RFC2231 method
+     *                            Here you can set RFC2047 encoding (quoted-printable
+     *                            or base64) instead
+     * @param string $f_encoding  Encoding of the attachment's filename
+     *                            in Content-Disposition header.
+     * @param string $description Content-Description header
+     * @param string $h_charset   The character set of the headers e.g. filename
+     *                            If not specified, $charset will be used
+     * @param array  $add_headers Additional part headers. Array keys can be in form
+     *                            of <header_name>:<parameter_name>
+     *
+     * @return mixed              True on success or PEAR_Error object
+     * @access public
+     */
+    function addAttachment($file,
+        $c_type      = 'application/octet-stream',
+        $name        = '',
+        $isfile      = true,
+        $encoding    = 'base64',
+        $disposition = 'attachment',
+        $charset     = '',
+        $language    = '',
+        $location    = '',
+        $n_encoding  = null,
+        $f_encoding  = null,
+        $description = '',
+        $h_charset   = null,
+        $add_headers = array()
+    ) {
+        $bodyfile = null;
+
+        if ($isfile) {
+            // Don't load file into memory
+            if ($this->_build_params['delay_file_io']) {
+                $filedata = null;
+                $bodyfile = $file;
+            } else {
+                if (PEAR::isError($filedata = $this->_file2str($file))) {
+                    return $filedata;
+                }
+            }
+            // Force the name the user supplied, otherwise use $file
+            $filename = ($name ? $name : $file);
+        } else {
+            $filedata = $file;
+            $filename = $name;
+        }
+
+        if (!strlen($filename)) {
+            $msg = "The supplied filename for the attachment can't be empty";
+            $err = PEAR::raiseError($msg);
+            return $err;
+        }
+        $filename = $this->_basename($filename);
+
+        $this->_parts[] = array(
+            'body'        => $filedata,
+            'body_file'   => $bodyfile,
+            'name'        => $filename,
+            'c_type'      => $c_type,
+            'charset'     => $charset,
+            'encoding'    => $encoding,
+            'language'    => $language,
+            'location'    => $location,
+            'disposition' => $disposition,
+            'description' => $description,
+            'add_headers' => $add_headers,
+            'name_encoding'     => $n_encoding,
+            'filename_encoding' => $f_encoding,
+            'headers_charset'   => $h_charset,
+        );
+
+        return true;
+    }
+
+    /**
+     * Get the contents of the given file name as string
+     *
+     * @param string $file_name Path of file to process
+     *
+     * @return string           Contents of $file_name
+     * @access private
+     */
+    function &_file2str($file_name)
+    {
+        // Check state of file and raise an error properly
+        if (!file_exists($file_name)) {
+            $err = PEAR::raiseError('File not found: ' . $file_name);
+            return $err;
+        }
+        if (!is_file($file_name)) {
+            $err = PEAR::raiseError('Not a regular file: ' . $file_name);
+            return $err;
+        }
+        if (!is_readable($file_name)) {
+            $err = PEAR::raiseError('File is not readable: ' . $file_name);
+            return $err;
+        }
+
+        // Temporarily reset magic_quotes_runtime and read file contents
+        if ($magic_quote_setting = get_magic_quotes_runtime()) {
+            @ini_set('magic_quotes_runtime', 0);
+        }
+        $cont = file_get_contents($file_name);
+        if ($magic_quote_setting) {
+            @ini_set('magic_quotes_runtime', $magic_quote_setting);
+        }
+
+        return $cont;
+    }
+
+    /**
+     * Adds a text subpart to the mimePart object and
+     * returns it during the build process.
+     *
+     * @param mixed  &$obj The object to add the part to, or
+     *                     null if a new object is to be created.
+     * @param string $text The text to add.
+     *
+     * @return object      The text mimePart object
+     * @access private
+     */
+    function &_addTextPart(&$obj, $text)
+    {
+        $params['content_type'] = 'text/plain';
+        $params['encoding']     = $this->_build_params['text_encoding'];
+        $params['charset']      = $this->_build_params['text_charset'];
+        $params['eol']          = $this->_build_params['eol'];
+
+        if (is_object($obj)) {
+            $ret = $obj->addSubpart($text, $params);
+            return $ret;
+        } else {
+            $ret = new Mail_mimePart($text, $params);
+            return $ret;
+        }
+    }
+
+    /**
+     * Adds a html subpart to the mimePart object and
+     * returns it during the build process.
+     *
+     * @param mixed &$obj The object to add the part to, or
+     *                    null if a new object is to be created.
+     *
+     * @return object     The html mimePart object
+     * @access private
+     */
+    function &_addHtmlPart(&$obj)
+    {
+        $params['content_type'] = 'text/html';
+        $params['encoding']     = $this->_build_params['html_encoding'];
+        $params['charset']      = $this->_build_params['html_charset'];
+        $params['eol']          = $this->_build_params['eol'];
+
+        if (is_object($obj)) {
+            $ret = $obj->addSubpart($this->_htmlbody, $params);
+            return $ret;
+        } else {
+            $ret = new Mail_mimePart($this->_htmlbody, $params);
+            return $ret;
+        }
+    }
+
+    /**
+     * Creates a new mimePart object, using multipart/mixed as
+     * the initial content-type and returns it during the
+     * build process.
+     *
+     * @return object The multipart/mixed mimePart object
+     * @access private
+     */
+    function &_addMixedPart()
+    {
+        $params                 = array();
+        $params['content_type'] = 'multipart/mixed';
+        $params['eol']          = $this->_build_params['eol'];
+
+        // Create empty multipart/mixed Mail_mimePart object to return
+        $ret = new Mail_mimePart('', $params);
+        return $ret;
+    }
+
+    /**
+     * Adds a multipart/alternative part to a mimePart
+     * object (or creates one), and returns it during
+     * the build process.
+     *
+     * @param mixed &$obj The object to add the part to, or
+     *                    null if a new object is to be created.
+     *
+     * @return object     The multipart/mixed mimePart object
+     * @access private
+     */
+    function &_addAlternativePart(&$obj)
+    {
+        $params['content_type'] = 'multipart/alternative';
+        $params['eol']          = $this->_build_params['eol'];
+
+        if (is_object($obj)) {
+            return $obj->addSubpart('', $params);
+        } else {
+            $ret = new Mail_mimePart('', $params);
+            return $ret;
+        }
+    }
+
+    /**
+     * Adds a multipart/related part to a mimePart
+     * object (or creates one), and returns it during
+     * the build process.
+     *
+     * @param mixed &$obj The object to add the part to, or
+     *                    null if a new object is to be created
+     *
+     * @return object     The multipart/mixed mimePart object
+     * @access private
+     */
+    function &_addRelatedPart(&$obj)
+    {
+        $params['content_type'] = 'multipart/related';
+        $params['eol']          = $this->_build_params['eol'];
+
+        if (is_object($obj)) {
+            return $obj->addSubpart('', $params);
+        } else {
+            $ret = new Mail_mimePart('', $params);
+            return $ret;
+        }
+    }
+
+    /**
+     * Adds an html image subpart to a mimePart object
+     * and returns it during the build process.
+     *
+     * @param object &$obj  The mimePart to add the image to
+     * @param array  $value The image information
+     *
+     * @return object       The image mimePart object
+     * @access private
+     */
+    function &_addHtmlImagePart(&$obj, $value)
+    {
+        $params['content_type'] = $value['c_type'];
+        $params['encoding']     = 'base64';
+        $params['disposition']  = 'inline';
+        $params['filename']     = $value['name'];
+        $params['cid']          = $value['cid'];
+        $params['body_file']    = $value['body_file'];
+        $params['eol']          = $this->_build_params['eol'];
+
+        if (!empty($value['name_encoding'])) {
+            $params['name_encoding'] = $value['name_encoding'];
+        }
+        if (!empty($value['filename_encoding'])) {
+            $params['filename_encoding'] = $value['filename_encoding'];
+        }
+
+        $ret = $obj->addSubpart($value['body'], $params);
+        return $ret;
+    }
+
+    /**
+     * Adds an attachment subpart to a mimePart object
+     * and returns it during the build process.
+     *
+     * @param object &$obj  The mimePart to add the image to
+     * @param array  $value The attachment information
+     *
+     * @return object       The image mimePart object
+     * @access private
+     */
+    function &_addAttachmentPart(&$obj, $value)
+    {
+        $params['eol']          = $this->_build_params['eol'];
+        $params['filename']     = $value['name'];
+        $params['encoding']     = $value['encoding'];
+        $params['content_type'] = $value['c_type'];
+        $params['body_file']    = $value['body_file'];
+        $params['disposition']  = isset($value['disposition']) ? 
+                                  $value['disposition'] : 'attachment';
+
+        // content charset
+        if (!empty($value['charset'])) {
+            $params['charset'] = $value['charset'];
+        }
+        // headers charset (filename, description)
+        if (!empty($value['headers_charset'])) {
+            $params['headers_charset'] = $value['headers_charset'];
+        }
+        if (!empty($value['language'])) {
+            $params['language'] = $value['language'];
+        }
+        if (!empty($value['location'])) {
+            $params['location'] = $value['location'];
+        }
+        if (!empty($value['name_encoding'])) {
+            $params['name_encoding'] = $value['name_encoding'];
+        }
+        if (!empty($value['filename_encoding'])) {
+            $params['filename_encoding'] = $value['filename_encoding'];
+        }
+        if (!empty($value['description'])) {
+            $params['description'] = $value['description'];
+        }
+        if (is_array($value['add_headers'])) {
+            $params['headers'] = $value['add_headers'];
+        }
+
+        $ret = $obj->addSubpart($value['body'], $params);
+        return $ret;
+    }
+
+    /**
+     * Returns the complete e-mail, ready to send using an alternative
+     * mail delivery method. Note that only the mailpart that is made
+     * with Mail_Mime is created. This means that,
+     * YOU WILL HAVE NO TO: HEADERS UNLESS YOU SET IT YOURSELF 
+     * using the $headers parameter!
+     * 
+     * @param string $separation The separation between these two parts.
+     * @param array  $params     The Build parameters passed to the
+     *                           &get() function. See &get for more info.
+     * @param array  $headers    The extra headers that should be passed
+     *                           to the &headers() function.
+     *                           See that function for more info.
+     * @param bool   $overwrite  Overwrite the existing headers with new.
+     *
+     * @return mixed The complete e-mail or PEAR error object
+     * @access public
+     */
+    function getMessage($separation = null, $params = null, $headers = null,
+        $overwrite = false
+    ) {
+        if ($separation === null) {
+            $separation = $this->_build_params['eol'];
+        }
+
+        $body = $this->get($params);
+
+        if (PEAR::isError($body)) {
+            return $body;
+        }
+
+        $head = $this->txtHeaders($headers, $overwrite);
+        $mail = $head . $separation . $body;
+        return $mail;
+    }
+
+    /**
+     * Returns the complete e-mail body, ready to send using an alternative
+     * mail delivery method.
+     * 
+     * @param array $params The Build parameters passed to the
+     *                      &get() function. See &get for more info.
+     *
+     * @return mixed The e-mail body or PEAR error object
+     * @access public
+     * @since 1.6.0
+     */
+    function getMessageBody($params = null)
+    {
+        return $this->get($params, null, true);
+    }
+
+    /**
+     * Writes (appends) the complete e-mail into file.
+     * 
+     * @param string $filename  Output file location
+     * @param array  $params    The Build parameters passed to the
+     *                          &get() function. See &get for more info.
+     * @param array  $headers   The extra headers that should be passed
+     *                          to the &headers() function.
+     *                          See that function for more info.
+     * @param bool   $overwrite Overwrite the existing headers with new.
+     *
+     * @return mixed True or PEAR error object
+     * @access public
+     * @since 1.6.0
+     */
+    function saveMessage($filename, $params = null, $headers = null, $overwrite = false)
+    {
+        // Check state of file and raise an error properly
+        if (file_exists($filename) && !is_writable($filename)) {
+            $err = PEAR::raiseError('File is not writable: ' . $filename);
+            return $err;
+        }
+
+        // Temporarily reset magic_quotes_runtime and read file contents
+        if ($magic_quote_setting = get_magic_quotes_runtime()) {
+            @ini_set('magic_quotes_runtime', 0);
+        }
+
+        if (!($fh = fopen($filename, 'ab'))) {
+            $err = PEAR::raiseError('Unable to open file: ' . $filename);
+            return $err;
+        }
+
+        // Write message headers into file (skipping Content-* headers)
+        $head = $this->txtHeaders($headers, $overwrite, true);
+        if (fwrite($fh, $head) === false) {
+            $err = PEAR::raiseError('Error writing to file: ' . $filename);
+            return $err;
+        }
+
+        fclose($fh);
+
+        if ($magic_quote_setting) {
+            @ini_set('magic_quotes_runtime', $magic_quote_setting);
+        }
+
+        // Write the rest of the message into file
+        $res = $this->get($params, $filename);
+
+        return $res ? $res : true;
+    }
+
+    /**
+     * Writes (appends) the complete e-mail body into file.
+     * 
+     * @param string $filename Output file location
+     * @param array  $params   The Build parameters passed to the
+     *                         &get() function. See &get for more info.
+     *
+     * @return mixed True or PEAR error object
+     * @access public
+     * @since 1.6.0
+     */
+    function saveMessageBody($filename, $params = null)
+    {
+        // Check state of file and raise an error properly
+        if (file_exists($filename) && !is_writable($filename)) {
+            $err = PEAR::raiseError('File is not writable: ' . $filename);
+            return $err;
+        }
+
+        // Temporarily reset magic_quotes_runtime and read file contents
+        if ($magic_quote_setting = get_magic_quotes_runtime()) {
+            @ini_set('magic_quotes_runtime', 0);
+        }
+
+        if (!($fh = fopen($filename, 'ab'))) {
+            $err = PEAR::raiseError('Unable to open file: ' . $filename);
+            return $err;
+        }
+
+        // Write the rest of the message into file
+        $res = $this->get($params, $filename, true);
+
+        return $res ? $res : true;
+    }
+
+    /**
+     * Builds the multipart message from the list ($this->_parts) and
+     * returns the mime content.
+     *
+     * @param array    $params    Build parameters that change the way the email
+     *                            is built. Should be associative. See $_build_params.
+     * @param resource $filename  Output file where to save the message instead of
+     *                            returning it
+     * @param boolean  $skip_head True if you want to return/save only the message
+     *                            without headers
+     *
+     * @return mixed The MIME message content string, null or PEAR error object
+     * @access public
+     */
+    function &get($params = null, $filename = null, $skip_head = false)
+    {
+        if (isset($params)) {
+            while (list($key, $value) = each($params)) {
+                $this->_build_params[$key] = $value;
+            }
+        }
+
+        if (isset($this->_headers['From'])) {
+            // Bug #11381: Illegal characters in domain ID
+            if (preg_match('#(@[0-9a-zA-Z\-\.]+)#', $this->_headers['From'], $matches)) {
+                $domainID = $matches[1];
+            } else {
+                $domainID = '@localhost';
+            }
+            foreach ($this->_html_images as $i => $img) {
+                $cid = $this->_html_images[$i]['cid']; 
+                if (!preg_match('#'.preg_quote($domainID).'$#', $cid)) {
+                    $this->_html_images[$i]['cid'] = $cid . $domainID;
+                }
+            }
+        }
+
+        if (count($this->_html_images) && isset($this->_htmlbody)) {
+            foreach ($this->_html_images as $key => $value) {
+                $regex   = array();
+                $regex[] = '#(\s)((?i)src|background|href(?-i))\s*=\s*(["\']?)' .
+                            preg_quote($value['name'], '#') . '\3#';
+                $regex[] = '#(?i)url(?-i)$\s*(["\']?)' .
+                            preg_quote($value['name'], '#') . '\1\s*$#';
+
+                $rep   = array();
+                $rep[] = '\1\2=\3cid:' . $value['cid'] .'\3';
+                $rep[] = 'url(\1cid:' . $value['cid'] . '\1)';
+
+                $this->_htmlbody = preg_replace($regex, $rep, $this->_htmlbody);
+                $this->_html_images[$key]['name']
+                    = $this->_basename($this->_html_images[$key]['name']);
+            }
+        }
+
+        $this->_checkParams();
+
+        $null        = null;
+        $attachments = count($this->_parts)                 ? true : false;
+        $html_images = count($this->_html_images)           ? true : false;
+        $html        = strlen($this->_htmlbody)             ? true : false;
+        $text        = (!$html && strlen($this->_txtbody))  ? true : false;
+
+        switch (true) {
+        case $text && !$attachments:
+            $message =& $this->_addTextPart($null, $this->_txtbody);
+            break;
+
+        case !$text && !$html && $attachments:
+            $message =& $this->_addMixedPart();
+            for ($i = 0; $i < count($this->_parts); $i++) {
+                $this->_addAttachmentPart($message, $this->_parts[$i]);
+            }
+            break;
+
+        case $text && $attachments:
+            $message =& $this->_addMixedPart();
+            $this->_addTextPart($message, $this->_txtbody);
+            for ($i = 0; $i < count($this->_parts); $i++) {
+                $this->_addAttachmentPart($message, $this->_parts[$i]);
+            }
+            break;
+
+        case $html && !$attachments && !$html_images:
+            if (isset($this->_txtbody)) {
+                $message =& $this->_addAlternativePart($null);
+                $this->_addTextPart($message, $this->_txtbody);
+                $this->_addHtmlPart($message);
+            } else {
+                $message =& $this->_addHtmlPart($null);
+            }
+            break;
+
+        case $html && !$attachments && $html_images:
+            // * Content-Type: multipart/alternative;
+            //    * text
+            //    * Content-Type: multipart/related;
+            //       * html
+            //       * image...
+            if (isset($this->_txtbody)) {
+                $message =& $this->_addAlternativePart($null);
+                $this->_addTextPart($message, $this->_txtbody);
+
+                $ht =& $this->_addRelatedPart($message);
+                $this->_addHtmlPart($ht);
+                for ($i = 0; $i < count($this->_html_images); $i++) {
+                    $this->_addHtmlImagePart($ht, $this->_html_images[$i]);
+                }
+            } else {
+                // * Content-Type: multipart/related;
+                //    * html
+                //    * image...
+                $message =& $this->_addRelatedPart($null);
+                $this->_addHtmlPart($message);
+                for ($i = 0; $i < count($this->_html_images); $i++) {
+                    $this->_addHtmlImagePart($message, $this->_html_images[$i]);
+                }
+            }
+            /*
+            // #13444, #9725: the code below was a non-RFC compliant hack
+            // * Content-Type: multipart/related;
+            //    * Content-Type: multipart/alternative;
+            //        * text
+            //        * html
+            //    * image...
+            $message =& $this->_addRelatedPart($null);
+            if (isset($this->_txtbody)) {
+                $alt =& $this->_addAlternativePart($message);
+                $this->_addTextPart($alt, $this->_txtbody);
+                $this->_addHtmlPart($alt);
+            } else {
+                $this->_addHtmlPart($message);
+            }
+            for ($i = 0; $i < count($this->_html_images); $i++) {
+                $this->_addHtmlImagePart($message, $this->_html_images[$i]);
+            }
+            */
+            break;
+
+        case $html && $attachments && !$html_images:
+            $message =& $this->_addMixedPart();
+            if (isset($this->_txtbody)) {
+                $alt =& $this->_addAlternativePart($message);
+                $this->_addTextPart($alt, $this->_txtbody);
+                $this->_addHtmlPart($alt);
+            } else {
+                $this->_addHtmlPart($message);
+            }
+            for ($i = 0; $i < count($this->_parts); $i++) {
+                $this->_addAttachmentPart($message, $this->_parts[$i]);
+            }
+            break;
+
+        case $html && $attachments && $html_images:
+            $message =& $this->_addMixedPart();
+            if (isset($this->_txtbody)) {
+                $alt =& $this->_addAlternativePart($message);
+                $this->_addTextPart($alt, $this->_txtbody);
+                $rel =& $this->_addRelatedPart($alt);
+            } else {
+                $rel =& $this->_addRelatedPart($message);
+            }
+            $this->_addHtmlPart($rel);
+            for ($i = 0; $i < count($this->_html_images); $i++) {
+                $this->_addHtmlImagePart($rel, $this->_html_images[$i]);
+            }
+            for ($i = 0; $i < count($this->_parts); $i++) {
+                $this->_addAttachmentPart($message, $this->_parts[$i]);
+            }
+            break;
+
+        }
+
+        if (!isset($message)) {
+            $ret = null;
+            return $ret;
+        }
+
+        // Use saved boundary
+        if (!empty($this->_build_params['boundary'])) {
+            $boundary = $this->_build_params['boundary'];
+        } else {
+            $boundary = null;
+        }
+
+        // Write output to file
+        if ($filename) {
+            // Append mimePart message headers and body into file
+            $headers = $message->encodeToFile($filename, $boundary, $skip_head);
+            if (PEAR::isError($headers)) {
+                return $headers;
+            }
+            $this->_headers = array_merge($this->_headers, $headers);
+            $ret = null;
+            return $ret;
+        } else {
+            $output = $message->encode($boundary, $skip_head);
+            if (PEAR::isError($output)) {
+                return $output;
+            }
+            $this->_headers = array_merge($this->_headers, $output['headers']);
+            $body = $output['body'];
+            return $body;
+        }
+    }
+
+    /**
+     * Returns an array with the headers needed to prepend to the email
+     * (MIME-Version and Content-Type). Format of argument is:
+     * $array['header-name'] = 'header-value';
+     *
+     * @param array $xtra_headers Assoc array with any extra headers (optional)
+     *                            (Don't set Content-Type for multipart messages here!)
+     * @param bool  $overwrite    Overwrite already existing headers.
+     * @param bool  $skip_content Don't return content headers: Content-Type,
+     *                            Content-Disposition and Content-Transfer-Encoding
+     * 
+     * @return array              Assoc array with the mime headers
+     * @access public
+     */
+    function &headers($xtra_headers = null, $overwrite = false, $skip_content = false)
+    {
+        // Add mime version header
+        $headers['MIME-Version'] = '1.0';
+
+        // Content-Type and Content-Transfer-Encoding headers should already
+        // be present if get() was called, but we'll re-set them to make sure
+        // we got them when called before get() or something in the message
+        // has been changed after get() [#14780]
+        if (!$skip_content) {
+            $headers += $this->_contentHeaders();
+        }
+
+        if (!empty($xtra_headers)) {
+            $headers = array_merge($headers, $xtra_headers);
+        }
+
+        if ($overwrite) {
+            $this->_headers = array_merge($this->_headers, $headers);
+        } else {
+            $this->_headers = array_merge($headers, $this->_headers);
+        }
+
+        $headers = $this->_headers;
+
+        if ($skip_content) {
+            unset($headers['Content-Type']);
+            unset($headers['Content-Transfer-Encoding']);
+            unset($headers['Content-Disposition']);
+        } else if (!empty($this->_build_params['ctype'])) {
+            $headers['Content-Type'] = $this->_build_params['ctype'];
+        }
+
+        $encodedHeaders = $this->_encodeHeaders($headers);
+        return $encodedHeaders;
+    }
+
+    /**
+     * Get the text version of the headers
+     * (useful if you want to use the PHP mail() function)
+     *
+     * @param array $xtra_headers Assoc array with any extra headers (optional)
+     *                            (Don't set Content-Type for multipart messages here!)
+     * @param bool  $overwrite    Overwrite the existing headers with new.
+     * @param bool  $skip_content Don't return content headers: Content-Type,
+     *                            Content-Disposition and Content-Transfer-Encoding
+     *
+     * @return string             Plain text headers
+     * @access public
+     */
+    function txtHeaders($xtra_headers = null, $overwrite = false, $skip_content = false)
+    {
+        $headers = $this->headers($xtra_headers, $overwrite, $skip_content);
+
+        // Place Received: headers at the beginning of the message
+        // Spam detectors often flag messages with it after the Subject: as spam
+        if (isset($headers['Received'])) {
+            $received = $headers['Received'];
+            unset($headers['Received']);
+            $headers = array('Received' => $received) + $headers;
+        }
+
+        $ret = '';
+        $eol = $this->_build_params['eol'];
+
+        foreach ($headers as $key => $val) {
+            if (is_array($val)) {
+                foreach ($val as $value) {
+                    $ret .= "$key: $value" . $eol;
+                }
+            } else {
+                $ret .= "$key: $val" . $eol;
+            }
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Sets message Content-Type header.
+     * Use it to build messages with various content-types e.g. miltipart/raport
+     * not supported by _contentHeaders() function.
+     *
+     * @param string $type   Type name
+     * @param array  $params Hash array of header parameters
+     *
+     * @return void
+     * @access public
+     * @since 1.7.0
+     */
+    function setContentType($type, $params = array())
+    {
+        $header = $type;
+
+        $eol = !empty($this->_build_params['eol'])
+            ? $this->_build_params['eol'] : "\r\n";
+
+        // add parameters
+        $token_regexp = '#([^\x21\x23-\x27\x2A\x2B\x2D'
+            . '\x2E\x30-\x39\x41-\x5A\x5E-\x7E])#';
+        if (is_array($params)) {
+            foreach ($params as $name => $value) {
+                if ($name == 'boundary') {
+                    $this->_build_params['boundary'] = $value;
+                }
+                if (!preg_match($token_regexp, $value)) {
+                    $header .= ";$eol $name=$value";
+                } else {
+                    $value = addcslashes($value, '\\"');
+                    $header .= ";$eol $name=\"$value\"";
+                }
+            }
+        }
+
+        // add required boundary parameter if not defined
+        if (preg_match('/^multipart\//i', $type)) {
+            if (empty($this->_build_params['boundary'])) {
+                $this->_build_params['boundary'] = '=_' . md5(rand() . microtime());
+            }
+
+            $header .= ";$eol boundary=\"".$this->_build_params['boundary']."\"";
+        }
+
+        $this->_build_params['ctype'] = $header;
+    }
+
+    /**
+     * Sets the Subject header
+     *
+     * @param string $subject String to set the subject to.
+     *
+     * @return void
+     * @access public
+     */
+    function setSubject($subject)
+    {
+        $this->_headers['Subject'] = $subject;
+    }
+
+    /**
+     * Set an email to the From (the sender) header
+     *
+     * @param string $email The email address to use
+     *
+     * @return void
+     * @access public
+     */
+    function setFrom($email)
+    {
+        $this->_headers['From'] = $email;
+    }
+
+    /**
+     * Add an email to the To header
+     * (multiple calls to this method are allowed)
+     *
+     * @param string $email The email direction to add
+     *
+     * @return void
+     * @access public
+     */
+    function addTo($email)
+    {
+        if (isset($this->_headers['To'])) {
+            $this->_headers['To'] .= ", $email";
+        } else {
+            $this->_headers['To'] = $email;
+        }
+    }
+
+    /**
+     * Add an email to the Cc (carbon copy) header
+     * (multiple calls to this method are allowed)
+     *
+     * @param string $email The email direction to add
+     *
+     * @return void
+     * @access public
+     */
+    function addCc($email)
+    {
+        if (isset($this->_headers['Cc'])) {
+            $this->_headers['Cc'] .= ", $email";
+        } else {
+            $this->_headers['Cc'] = $email;
+        }
+    }
+
+    /**
+     * Add an email to the Bcc (blank carbon copy) header
+     * (multiple calls to this method are allowed)
+     *
+     * @param string $email The email direction to add
+     *
+     * @return void
+     * @access public
+     */
+    function addBcc($email)
+    {
+        if (isset($this->_headers['Bcc'])) {
+            $this->_headers['Bcc'] .= ", $email";
+        } else {
+            $this->_headers['Bcc'] = $email;
+        }
+    }
+
+    /**
+     * Since the PHP send function requires you to specify
+     * recipients (To: header) separately from the other
+     * headers, the To: header is not properly encoded.
+     * To fix this, you can use this public method to 
+     * encode your recipients before sending to the send
+     * function
+     *
+     * @param string $recipients A comma-delimited list of recipients
+     *
+     * @return string            Encoded data
+     * @access public
+     */
+    function encodeRecipients($recipients)
+    {
+        $input = array("To" => $recipients);
+        $retval = $this->_encodeHeaders($input);
+        return $retval["To"] ;
+    }
+
+    /**
+     * Encodes headers as per RFC2047
+     *
+     * @param array $input  The header data to encode
+     * @param array $params Extra build parameters
+     *
+     * @return array        Encoded data
+     * @access private
+     */
+    function _encodeHeaders($input, $params = array())
+    {
+        $build_params = $this->_build_params;
+        while (list($key, $value) = each($params)) {
+            $build_params[$key] = $value;
+        }
+
+        foreach ($input as $hdr_name => $hdr_value) {
+            if (is_array($hdr_value)) {
+                foreach ($hdr_value as $idx => $value) {
+                    $input[$hdr_name][$idx] = $this->encodeHeader(
+                        $hdr_name, $value,
+                        $build_params['head_charset'], $build_params['head_encoding']
+                    );
+                }
+            } else {
+                $input[$hdr_name] = $this->encodeHeader(
+                    $hdr_name, $hdr_value,
+                    $build_params['head_charset'], $build_params['head_encoding']
+                );
+            }
+        }
+
+        return $input;
+    }
+
+    /**
+     * Encodes a header as per RFC2047
+     *
+     * @param string $name     The header name
+     * @param string $value    The header data to encode
+     * @param string $charset  Character set name
+     * @param string $encoding Encoding name (base64 or quoted-printable)
+     *
+     * @return string          Encoded header data (without a name)
+     * @access public
+     * @since 1.5.3
+     */
+    function encodeHeader($name, $value, $charset, $encoding)
+    {
+        $mime_part = new Mail_mimePart;
+        return $mime_part->encodeHeader(
+            $name, $value, $charset, $encoding, $this->_build_params['eol']
+        );
+    }
+
+    /**
+     * Get file's basename (locale independent) 
+     *
+     * @param string $filename Filename
+     *
+     * @return string          Basename
+     * @access private
+     */
+    function _basename($filename)
+    {
+        // basename() is not unicode safe and locale dependent
+        if (stristr(PHP_OS, 'win') || stristr(PHP_OS, 'netware')) {
+            return preg_replace('/^.*[\\\\\\/]/', '', $filename);
+        } else {
+            return preg_replace('/^.*[\/]/', '', $filename);
+        }
+    }
+
+    /**
+     * Get Content-Type and Content-Transfer-Encoding headers of the message
+     *
+     * @return array Headers array
+     * @access private
+     */
+    function _contentHeaders()
+    {
+        $attachments = count($this->_parts)                 ? true : false;
+        $html_images = count($this->_html_images)           ? true : false;
+        $html        = strlen($this->_htmlbody)             ? true : false;
+        $text        = (!$html && strlen($this->_txtbody))  ? true : false;
+        $headers     = array();
+
+        // See get()
+        switch (true) {
+        case $text && !$attachments:
+            $headers['Content-Type'] = 'text/plain';
+            break;
+
+        case !$text && !$html && $attachments:
+        case $text && $attachments:
+        case $html && $attachments && !$html_images:
+        case $html && $attachments && $html_images:
+            $headers['Content-Type'] = 'multipart/mixed';
+            break;
+
+        case $html && !$attachments && !$html_images && isset($this->_txtbody):
+        case $html && !$attachments && $html_images && isset($this->_txtbody):
+            $headers['Content-Type'] = 'multipart/alternative';
+            break;
+
+        case $html && !$attachments && !$html_images && !isset($this->_txtbody):
+            $headers['Content-Type'] = 'text/html';
+            break;
+
+        case $html && !$attachments && $html_images && !isset($this->_txtbody):
+            $headers['Content-Type'] = 'multipart/related';
+            break;
+
+        default:
+            return $headers;
+        }
+
+        $this->_checkParams();
+
+        $eol = !empty($this->_build_params['eol'])
+            ? $this->_build_params['eol'] : "\r\n";
+
+        if ($headers['Content-Type'] == 'text/plain') {
+            // single-part message: add charset and encoding
+            $charset = 'charset=' . $this->_build_params['text_charset'];
+            // place charset parameter in the same line, if possible
+            // 26 = strlen("Content-Type: text/plain; ")
+            $headers['Content-Type']
+                .= (strlen($charset) + 26 <= 76) ? "; $charset" : ";$eol $charset";
+            $headers['Content-Transfer-Encoding']
+                = $this->_build_params['text_encoding'];
+        } else if ($headers['Content-Type'] == 'text/html') {
+            // single-part message: add charset and encoding
+            $charset = 'charset=' . $this->_build_params['html_charset'];
+            // place charset parameter in the same line, if possible
+            $headers['Content-Type']
+                .= (strlen($charset) + 25 <= 76) ? "; $charset" : ";$eol $charset";
+            $headers['Content-Transfer-Encoding']
+                = $this->_build_params['html_encoding'];
+        } else {
+            // multipart message: and boundary
+            if (!empty($this->_build_params['boundary'])) {
+                $boundary = $this->_build_params['boundary'];
+            } else if (!empty($this->_headers['Content-Type'])
+                && preg_match('/boundary="([^"]+)"/', $this->_headers['Content-Type'], $m)
+            ) {
+                $boundary = $m[1];
+            } else {
+                $boundary = '=_' . md5(rand() . microtime());
+            }
+
+            $this->_build_params['boundary'] = $boundary;
+            $headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
+        }
+
+        return $headers;
+    }
+
+    /**
+     * Validate and set build parameters
+     *
+     * @return void
+     * @access private
+     */
+    function _checkParams()
+    {
+        $encodings = array('7bit', '8bit', 'base64', 'quoted-printable');
+
+        $this->_build_params['text_encoding']
+            = strtolower($this->_build_params['text_encoding']);
+        $this->_build_params['html_encoding']
+            = strtolower($this->_build_params['html_encoding']);
+
+        if (!in_array($this->_build_params['text_encoding'], $encodings)) {
+            $this->_build_params['text_encoding'] = '7bit';
+        }
+        if (!in_array($this->_build_params['html_encoding'], $encodings)) {
+            $this->_build_params['html_encoding'] = '7bit';
+        }
+
+        // text body
+        if ($this->_build_params['text_encoding'] == '7bit'
+            && !preg_match('/ascii/i', $this->_build_params['text_charset'])
+            && preg_match('/[^\x00-\x7F]/', $this->_txtbody)
+        ) {
+            $this->_build_params['text_encoding'] = 'quoted-printable';
+        }
+        // html body
+        if ($this->_build_params['html_encoding'] == '7bit'
+            && !preg_match('/ascii/i', $this->_build_params['html_charset'])
+            && preg_match('/[^\x00-\x7F]/', $this->_htmlbody)
+        ) {
+            $this->_build_params['html_encoding'] = 'quoted-printable';
+        }
+    }
+
+} // End of class

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Mail/mimeDecode.php Added

@@ -0,0 +1,1003 @@
+<?php
+/**
+ * The Mail_mimeDecode class is used to decode mail/mime messages
+ *
+ * This class will parse a raw mime email and return
+ * the structure. Returned structure is similar to
+ * that returned by imap_fetchstructure().
+ *
+ *  +----------------------------- IMPORTANT ------------------------------+
+ *  | Usage of this class compared to native php extensions such as        |
+ *  | mailparse or imap, is slow and may be feature deficient. If available|
+ *  | you are STRONGLY recommended to use the php extensions.              |
+ *  +----------------------------------------------------------------------+
+ *
+ * Compatible with PHP versions 4 and 5
+ *
+ * LICENSE: This LICENSE is in the BSD license style.
+ * Copyright (c) 2002-2003, Richard Heyes <richard@phpguru.org>
+ * Copyright (c) 2003-2006, PEAR <pear-group@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - Neither the name of the authors, nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this 
+ *   software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   Mail
+ * @package    Mail_Mime
+ * @author     Richard Heyes  <richard@phpguru.org>
+ * @author     George Schlossnagle <george@omniti.com>
+ * @author     Cipriano Groenendal <cipri@php.net>
+ * @author     Sean Coates <sean@php.net>
+ * @copyright  2003-2006 PEAR <pear-group@php.net>
+ * @license    http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/Mail_mime
+ */
+
+
+/**
+ * require PEAR
+ *
+ * This package depends on PEAR to raise errors.
+ */
+require_once 'PEAR.php';
+
+
+/**
+ * The Mail_mimeDecode class is used to decode mail/mime messages
+ *
+ * This class will parse a raw mime email and return the structure.
+ * Returned structure is similar to that returned by imap_fetchstructure().
+ *
+ *  +----------------------------- IMPORTANT ------------------------------+
+ *  | Usage of this class compared to native php extensions such as        |
+ *  | mailparse or imap, is slow and may be feature deficient. If available|
+ *  | you are STRONGLY recommended to use the php extensions.              |
+ *  +----------------------------------------------------------------------+
+ *
+ * @category   Mail
+ * @package    Mail_Mime
+ * @author     Richard Heyes  <richard@phpguru.org>
+ * @author     George Schlossnagle <george@omniti.com>
+ * @author     Cipriano Groenendal <cipri@php.net>
+ * @author     Sean Coates <sean@php.net>
+ * @copyright  2003-2006 PEAR <pear-group@php.net>
+ * @license    http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Mail_mime
+ */
+class Mail_mimeDecode extends PEAR
+{
+    /**
+     * The raw email to decode
+     *
+     * @var    string
+     * @access private
+     */
+    var $_input;
+
+    /**
+     * The header part of the input
+     *
+     * @var    string
+     * @access private
+     */
+    var $_header;
+
+    /**
+     * The body part of the input
+     *
+     * @var    string
+     * @access private
+     */
+    var $_body;
+
+    /**
+     * If an error occurs, this is used to store the message
+     *
+     * @var    string
+     * @access private
+     */
+    var $_error;
+
+    /**
+     * Flag to determine whether to include bodies in the
+     * returned object.
+     *
+     * @var    boolean
+     * @access private
+     */
+    var $_include_bodies;
+
+    /**
+     * Flag to determine whether to decode bodies
+     *
+     * @var    boolean
+     * @access private
+     */
+    var $_decode_bodies;
+
+    /**
+     * Flag to determine whether to decode headers
+     *
+     * @var    boolean
+     * @access private
+     */
+    var $_decode_headers;
+
+    /**
+     * Flag to determine whether to include attached messages
+     * as body in the returned object. Depends on $_include_bodies
+     *
+     * @var    boolean
+     * @access private
+     */
+    var $_rfc822_bodies;
+
+    /**
+     * Constructor.
+     *
+     * Sets up the object, initialise the variables, and splits and
+     * stores the header and body of the input.
+     *
+     * @param string The input to decode
+     * @access public
+     */
+    function Mail_mimeDecode($input)
+    {
+        list($header, $body)   = $this->_splitBodyHeader($input);
+
+        $this->_input          = $input;
+        $this->_header         = $header;
+        $this->_body           = $body;
+        $this->_decode_bodies  = false;
+        $this->_include_bodies = true;
+        $this->_rfc822_bodies  = false;
+    }
+
+    /**
+     * Begins the decoding process. If called statically
+     * it will create an object and call the decode() method
+     * of it.
+     *
+     * @param array An array of various parameters that determine
+     *              various things:
+     *              include_bodies - Whether to include the body in the returned
+     *                               object.
+     *              decode_bodies  - Whether to decode the bodies
+     *                               of the parts. (Transfer encoding)
+     *              decode_headers - Whether to decode headers
+     *              input          - If called statically, this will be treated
+     *                               as the input
+     * @return object Decoded results
+     * @access public
+     */
+    function decode($params = null)
+    {
+        // determine if this method has been called statically
+        $isStatic = empty($this) || !is_a($this, __CLASS__);
+
+        // Have we been called statically?
+	// If so, create an object and pass details to that.
+        if ($isStatic AND isset($params['input'])) {
+
+            $obj = new Mail_mimeDecode($params['input']);
+            $structure = $obj->decode($params);
+
+        // Called statically but no input
+        } elseif ($isStatic) {
+            return PEAR::raiseError('Called statically and no input given');
+
+        // Called via an object
+        } else {
+            $this->_include_bodies = isset($params['include_bodies']) ?
+	                             $params['include_bodies'] : false;
+            $this->_decode_bodies  = isset($params['decode_bodies']) ?
+	                             $params['decode_bodies']  : false;
+            $this->_decode_headers = isset($params['decode_headers']) ?
+	                             $params['decode_headers'] : false;
+            $this->_rfc822_bodies  = isset($params['rfc_822bodies']) ?
+	                             $params['rfc_822bodies']  : false;
+
+            $structure = $this->_decode($this->_header, $this->_body);
+            if ($structure === false) {
+                $structure = $this->raiseError($this->_error);
+            }
+        }
+
+        return $structure;
+    }
+
+    /**
+     * Performs the decoding. Decodes the body string passed to it
+     * If it finds certain content-types it will call itself in a
+     * recursive fashion
+     *
+     * @param string Header section
+     * @param string Body section
+     * @return object Results of decoding process
+     * @access private
+     */
+    function _decode($headers, $body, $default_ctype = 'text/plain')
+    {
+        $return = new stdClass;
+        $return->headers = array();
+        $headers = $this->_parseHeaders($headers);
+
+        foreach ($headers as $value) {
+            $value['value'] = $this->_decode_headers ? $this->_decodeHeader($value['value']) : $value['value'];
+            if (isset($return->headers[strtolower($value['name'])]) AND !is_array($return->headers[strtolower($value['name'])])) {
+                $return->headers[strtolower($value['name'])]   = array($return->headers[strtolower($value['name'])]);
+                $return->headers[strtolower($value['name'])][] = $value['value'];
+
+            } elseif (isset($return->headers[strtolower($value['name'])])) {
+                $return->headers[strtolower($value['name'])][] = $value['value'];
+
+            } else {
+                $return->headers[strtolower($value['name'])] = $value['value'];
+            }
+        }
+
+
+        foreach ($headers as $key => $value) {
+            $headers[$key]['name'] = strtolower($headers[$key]['name']);
+            switch ($headers[$key]['name']) {
+
+                case 'content-type':
+                    $content_type = $this->_parseHeaderValue($headers[$key]['value']);
+
+                    if (preg_match('/([0-9a-z+.-]+)\/([0-9a-z+.-]+)/i', $content_type['value'], $regs)) {
+                        $return->ctype_primary   = $regs[1];
+                        $return->ctype_secondary = $regs[2];
+                    }
+
+                    if (isset($content_type['other'])) {
+                        foreach($content_type['other'] as $p_name => $p_value) {
+                            $return->ctype_parameters[$p_name] = $p_value;
+                        }
+                    }
+                    break;
+
+                case 'content-disposition':
+                    $content_disposition = $this->_parseHeaderValue($headers[$key]['value']);
+                    $return->disposition   = $content_disposition['value'];
+                    if (isset($content_disposition['other'])) {
+                        foreach($content_disposition['other'] as $p_name => $p_value) {
+                            $return->d_parameters[$p_name] = $p_value;
+                        }
+                    }
+                    break;
+
+                case 'content-transfer-encoding':
+                    $content_transfer_encoding = $this->_parseHeaderValue($headers[$key]['value']);
+                    break;
+            }
+        }
+
+        if (isset($content_type)) {
+            switch (strtolower($content_type['value'])) {
+                case 'text/plain':
+                    $encoding = isset($content_transfer_encoding) ? $content_transfer_encoding['value'] : '7bit';
+                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $encoding) : $body) : null;
+                    break;
+
+                case 'text/html':
+                    $encoding = isset($content_transfer_encoding) ? $content_transfer_encoding['value'] : '7bit';
+                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $encoding) : $body) : null;
+                    break;
+
+                case 'multipart/parallel':
+                case 'multipart/appledouble': // Appledouble mail
+                case 'multipart/report': // RFC1892
+                case 'multipart/signed': // PGP
+                case 'multipart/digest':
+                case 'multipart/alternative':
+                case 'multipart/related':
+                case 'multipart/mixed':
+                case 'application/vnd.wap.multipart.related':
+                    if(!isset($content_type['other']['boundary'])){
+                        $this->_error = 'No boundary found for ' . $content_type['value'] . ' part';
+                        return false;
+                    }
+
+                    $default_ctype = (strtolower($content_type['value']) === 'multipart/digest') ? 'message/rfc822' : 'text/plain';
+
+                    $parts = $this->_boundarySplit($body, $content_type['other']['boundary']);
+                    for ($i = 0; $i < count($parts); $i++) {
+                        list($part_header, $part_body) = $this->_splitBodyHeader($parts[$i]);
+                        $part = $this->_decode($part_header, $part_body, $default_ctype);
+                        if($part === false)
+                            $part = $this->raiseError($this->_error);
+                        $return->parts[] = $part;
+                    }
+                    break;
+
+                case 'message/rfc822':
+					if ($this->_rfc822_bodies) {
+						$encoding = isset($content_transfer_encoding) ? $content_transfer_encoding['value'] : '7bit';
+						$return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $encoding) : $body);
+					}
+                    $obj = new Mail_mimeDecode($body);
+                    $return->parts[] = $obj->decode(array('include_bodies' => $this->_include_bodies,
+					                                      'decode_bodies'  => $this->_decode_bodies,
+														  'decode_headers' => $this->_decode_headers));
+                    unset($obj);
+                    break;
+
+                default:
+                    if(!isset($content_transfer_encoding['value']))
+                        $content_transfer_encoding['value'] = '7bit';
+                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $content_transfer_encoding['value']) : $body) : null;
+                    break;
+            }
+
+        } else {
+            $ctype = explode('/', $default_ctype);
+            $return->ctype_primary   = $ctype[0];
+            $return->ctype_secondary = $ctype[1];
+            $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body) : $body) : null;
+        }
+
+        return $return;
+    }
+
+    /**
+     * Given the output of the above function, this will return an
+     * array of references to the parts, indexed by mime number.
+     *
+     * @param  object $structure   The structure to go through
+     * @param  string $mime_number Internal use only.
+     * @return array               Mime numbers
+     */
+    function &getMimeNumbers(&$structure, $no_refs = false, $mime_number = '', $prepend = '')
+    {
+        $return = array();
+        if (!empty($structure->parts)) {
+            if ($mime_number != '') {
+                $structure->mime_id = $prepend . $mime_number;
+                $return[$prepend . $mime_number] = &$structure;
+            }
+            for ($i = 0; $i < count($structure->parts); $i++) {
+
+            
+                if (!empty($structure->headers['content-type']) AND substr(strtolower($structure->headers['content-type']), 0, 8) == 'message/') {
+                    $prepend      = $prepend . $mime_number . '.';
+                    $_mime_number = '';
+                } else {
+                    $_mime_number = ($mime_number == '' ? $i + 1 : sprintf('%s.%s', $mime_number, $i + 1));
+                }
+
+                $arr = &Mail_mimeDecode::getMimeNumbers($structure->parts[$i], $no_refs, $_mime_number, $prepend);
+                foreach ($arr as $key => $val) {
+                    $no_refs ? $return[$key] = '' : $return[$key] = &$arr[$key];
+                }
+            }
+        } else {
+            if ($mime_number == '') {
+                $mime_number = '1';
+            }
+            $structure->mime_id = $prepend . $mime_number;
+            $no_refs ? $return[$prepend . $mime_number] = '' : $return[$prepend . $mime_number] = &$structure;
+        }
+        
+        return $return;
+    }
+
+    /**
+     * Given a string containing a header and body
+     * section, this function will split them (at the first
+     * blank line) and return them.
+     *
+     * @param string Input to split apart
+     * @return array Contains header and body section
+     * @access private
+     */
+    function _splitBodyHeader($input)
+    {
+        if (preg_match("/^(.*?)\r?\n\r?\n(.*)/s", $input, $match)) {
+            return array($match[1], $match[2]);
+        }
+        // bug #17325 - empty bodies are allowed. - we just check that at least one line 
+        // of headers exist..
+        if (count(explode("\n",$input))) {
+            return array($input, '');
+        }
+        $this->_error = 'Could not split header and body';
+        return false;
+    }
+
+    /**
+     * Parse headers given in $input and return
+     * as assoc array.
+     *
+     * @param string Headers to parse
+     * @return array Contains parsed headers
+     * @access private
+     */
+    function _parseHeaders($input)
+    {
+
+        if ($input !== '') {
+            // Unfold the input
+            $input   = preg_replace("/\r?\n/", "\r\n", $input);
+            //#7065 - wrapping.. with encoded stuff.. - probably not needed,
+            // wrapping space should only get removed if the trailing item on previous line is a 
+            // encoded character
+            $input   = preg_replace("/=\r\n(\t| )+/", '=', $input);
+            $input   = preg_replace("/\r\n(\t| )+/", ' ', $input);
+            
+            $headers = explode("\r\n", trim($input));
+
+            foreach ($headers as $value) {
+                $hdr_name = substr($value, 0, $pos = strpos($value, ':'));
+                $hdr_value = substr($value, $pos+1);
+                if($hdr_value[0] == ' ')
+                    $hdr_value = substr($hdr_value, 1);
+
+                $return[] = array(
+                                  'name'  => $hdr_name,
+                                  'value' =>  $hdr_value
+                                 );
+            }
+        } else {
+            $return = array();
+        }
+
+        return $return;
+    }
+
+    /**
+     * Function to parse a header value,
+     * extract first part, and any secondary
+     * parts (after ;) This function is not as
+     * robust as it could be. Eg. header comments
+     * in the wrong place will probably break it.
+     *
+     * @param string Header value to parse
+     * @return array Contains parsed result
+     * @access private
+     */
+    function _parseHeaderValue($input)
+    {
+
+        if (($pos = strpos($input, ';')) === false) {
+            $input = $this->_decode_headers ? $this->_decodeHeader($input) : $input;
+            $return['value'] = trim($input);
+            return $return;
+        }
+
+
+
+        $value = substr($input, 0, $pos);
+        $value = $this->_decode_headers ? $this->_decodeHeader($value) : $value;
+        $return['value'] = trim($value);
+        $input = trim(substr($input, $pos+1));
+
+        if (!strlen($input) > 0) {
+            return $return;
+        }
+        // at this point input contains xxxx=".....";zzzz="...."
+        // since we are dealing with quoted strings, we need to handle this properly..
+        $i = 0;
+        $l = strlen($input);
+        $key = '';
+        $val = false; // our string - including quotes..
+        $q = false; // in quote..
+        $lq = ''; // last quote..
+
+        while ($i < $l) {
+            
+            $c = $input[$i];
+            //var_dump(array('i'=>$i,'c'=>$c,'q'=>$q, 'lq'=>$lq, 'key'=>$key, 'val' =>$val));
+
+            $escaped = false;
+            if ($c == '\\') {
+                $i++;
+                if ($i == $l-1) { // end of string.
+                    break;
+                }
+                $escaped = true;
+                $c = $input[$i];
+            }            
+
+
+            // state - in key..
+            if ($val === false) {
+                if (!$escaped && $c == '=') {
+                    $val = '';
+                    $key = trim($key);
+                    $i++;
+                    continue;
+                }
+                if (!$escaped && $c == ';') {
+                    if ($key) { // a key without a value..
+                        $key= trim($key);
+                        $return['other'][$key] = '';
+                        $return['other'][strtolower($key)] = '';
+                    }
+                    $key = '';
+                }
+                $key .= $c;
+                $i++;
+                continue;
+            }
+                     
+            // state - in value.. (as $val is set..)
+
+            if ($q === false) {
+                // not in quote yet.
+                if ((!strlen($val) || $lq !== false) && $c == ' ' ||  $c == "\t") {
+                    $i++;
+                    continue; // skip leading spaces after '=' or after '"'
+                }
+                if (!$escaped && ($c == '"' || $c == "'")) {
+                    // start quoted area..
+                    $q = $c;
+                    // in theory should not happen raw text in value part..
+                    // but we will handle it as a merged part of the string..
+                    $val = !strlen(trim($val)) ? '' : trim($val);
+                    $i++;
+                    continue;
+                }
+                // got end....
+                if (!$escaped && $c == ';') {
+
+                    $val = trim($val);
+                    $added = false;
+                    if (preg_match('/\*[0-9]+$/', $key)) {
+                        // this is the extended aaa*0=...;aaa*1=.... code
+                        // it assumes the pieces arrive in order, and are valid...
+                        $key = preg_replace('/\*[0-9]+$/', '', $key);
+                        if (isset($return['other'][$key])) {
+                            $return['other'][$key] .= $val;
+                            if (strtolower($key) != $key) {
+                                $return['other'][strtolower($key)] .= $val;
+                            }
+                            $added = true;
+                        }
+                        // continue and use standard setters..
+                    }
+                    if (!$added) {
+                        $return['other'][$key] = $val;
+                        $return['other'][strtolower($key)] = $val;
+                    }
+                    $val = false;
+                    $key = '';
+                    $lq = false;
+                    $i++;
+                    continue;
+                }
+
+                $val .= $c;
+                $i++;
+                continue;
+            }
+            
+            // state - in quote..
+            if (!$escaped && $c == $q) {  // potential exit state..
+
+                // end of quoted string..
+                $lq = $q;
+                $q = false;
+                $i++;
+                continue;
+            }
+                
+            // normal char inside of quoted string..
+            $val.= $c;
+            $i++;
+        }
+        
+        // do we have anything left..
+        if (strlen(trim($key)) || $val !== false) {
+           
+            $val = trim($val);
+            $added = false;
+            if ($val !== false && preg_match('/\*[0-9]+$/', $key)) {
+                // no dupes due to our crazy regexp.
+                $key = preg_replace('/\*[0-9]+$/', '', $key);
+                if (isset($return['other'][$key])) {
+                    $return['other'][$key] .= $val;
+                    if (strtolower($key) != $key) {
+                        $return['other'][strtolower($key)] .= $val;
+                    }
+                    $added = true;
+                }
+                // continue and use standard setters..
+            }
+            if (!$added) {
+                $return['other'][$key] = $val;
+                $return['other'][strtolower($key)] = $val;
+            }
+        }
+        // decode values.
+        foreach($return['other'] as $key =>$val) {
+            $return['other'][$key] = $this->_decode_headers ? $this->_decodeHeader($val) : $val;
+        }
+       //print_r($return);
+        return $return;
+    }
+
+    /**
+     * This function splits the input based
+     * on the given boundary
+     *
+     * @param string Input to parse
+     * @return array Contains array of resulting mime parts
+     * @access private
+     */
+    function _boundarySplit($input, $boundary)
+    {
+        $parts = array();
+
+        $bs_possible = substr($boundary, 2, -2);
+        $bs_check = '\"' . $bs_possible . '\"';
+
+        if ($boundary == $bs_check) {
+            $boundary = $bs_possible;
+        }
+        $tmp = preg_split("/--".preg_quote($boundary, '/')."((?=\s)|--)/", $input);
+
+        $len = count($tmp) -1;
+        for ($i = 1; $i < $len; $i++) {
+            if (strlen(trim($tmp[$i]))) {
+                $parts[] = $tmp[$i];
+            }
+        }
+        
+        // add the last part on if it does not end with the 'closing indicator'
+        if (!empty($tmp[$len]) && strlen(trim($tmp[$len])) && $tmp[$len][0] != '-') {
+            $parts[] = $tmp[$len];
+        }
+        return $parts;
+    }
+
+    /**
+     * Given a header, this function will decode it
+     * according to RFC2047. Probably not *exactly*
+     * conformant, but it does pass all the given
+     * examples (in RFC2047).
+     *
+     * @param string Input header value to decode
+     * @return string Decoded header value
+     * @access private
+     */
+    function _decodeHeader($input)
+    {
+        // Remove white space between encoded-words
+        $input = preg_replace('/(=\?[^?]+\?(q|b)\?[^?]*\?=)(\s)+=\?/i', '\1=?', $input);
+
+        // For each encoded-word...
+        while (preg_match('/(=\?([^?]+)\?(q|b)\?([^?]*)\?=)/i', $input, $matches)) {
+
+            $encoded  = $matches[1];
+            $charset  = $matches[2];
+            $encoding = $matches[3];
+            $text     = $matches[4];
+
+            switch (strtolower($encoding)) {
+                case 'b':
+                    $text = base64_decode($text);
+                    break;
+
+                case 'q':
+                    $text = str_replace('_', ' ', $text);
+                    preg_match_all('/=([a-f0-9]{2})/i', $text, $matches);
+                    foreach($matches[1] as $value)
+                        $text = str_replace('='.$value, chr(hexdec($value)), $text);
+                    break;
+            }
+
+            $input = str_replace($encoded, $text, $input);
+        }
+
+        return $input;
+    }
+
+    /**
+     * Given a body string and an encoding type,
+     * this function will decode and return it.
+     *
+     * @param  string Input body to decode
+     * @param  string Encoding type to use.
+     * @return string Decoded body
+     * @access private
+     */
+    function _decodeBody($input, $encoding = '7bit')
+    {
+        switch (strtolower($encoding)) {
+            case '7bit':
+                return $input;
+                break;
+
+            case 'quoted-printable':
+                return $this->_quotedPrintableDecode($input);
+                break;
+
+            case 'base64':
+                return base64_decode($input);
+                break;
+
+            default:
+                return $input;
+        }
+    }
+
+    /**
+     * Given a quoted-printable string, this
+     * function will decode and return it.
+     *
+     * @param  string Input body to decode
+     * @return string Decoded body
+     * @access private
+     */
+    function _quotedPrintableDecode($input)
+    {
+        // Remove soft line breaks
+        $input = preg_replace("/=\r?\n/", '', $input);
+
+        // Replace encoded characters
+		$input = preg_replace('/=([a-f0-9]{2})/ie', "chr(hexdec('\\1'))", $input);
+
+        return $input;
+    }
+
+    /**
+     * Checks the input for uuencoded files and returns
+     * an array of them. Can be called statically, eg:
+     *
+     * $files =& Mail_mimeDecode::uudecode($some_text);
+     *
+     * It will check for the begin 666 ... end syntax
+     * however and won't just blindly decode whatever you
+     * pass it.
+     *
+     * @param  string Input body to look for attahcments in
+     * @return array  Decoded bodies, filenames and permissions
+     * @access public
+     * @author Unknown
+     */
+    function &uudecode($input)
+    {
+        // Find all uuencoded sections
+        preg_match_all("/begin ([0-7]{3}) (.+)\r?\n(.+)\r?\nend/Us", $input, $matches);
+
+        for ($j = 0; $j < count($matches[3]); $j++) {
+
+            $str      = $matches[3][$j];
+            $filename = $matches[2][$j];
+            $fileperm = $matches[1][$j];
+
+            $file = '';
+            $str = preg_split("/\r?\n/", trim($str));
+            $strlen = count($str);
+
+            for ($i = 0; $i < $strlen; $i++) {
+                $pos = 1;
+                $d = 0;
+                $len=(int)(((ord(substr($str[$i],0,1)) -32) - ' ') & 077);
+
+                while (($d + 3 <= $len) AND ($pos + 4 <= strlen($str[$i]))) {
+                    $c0 = (ord(substr($str[$i],$pos,1)) ^ 0x20);
+                    $c1 = (ord(substr($str[$i],$pos+1,1)) ^ 0x20);
+                    $c2 = (ord(substr($str[$i],$pos+2,1)) ^ 0x20);
+                    $c3 = (ord(substr($str[$i],$pos+3,1)) ^ 0x20);
+                    $file .= chr(((($c0 - ' ') & 077) << 2) | ((($c1 - ' ') & 077) >> 4));
+
+                    $file .= chr(((($c1 - ' ') & 077) << 4) | ((($c2 - ' ') & 077) >> 2));
+
+                    $file .= chr(((($c2 - ' ') & 077) << 6) |  (($c3 - ' ') & 077));
+
+                    $pos += 4;
+                    $d += 3;
+                }
+
+                if (($d + 2 <= $len) && ($pos + 3 <= strlen($str[$i]))) {
+                    $c0 = (ord(substr($str[$i],$pos,1)) ^ 0x20);
+                    $c1 = (ord(substr($str[$i],$pos+1,1)) ^ 0x20);
+                    $c2 = (ord(substr($str[$i],$pos+2,1)) ^ 0x20);
+                    $file .= chr(((($c0 - ' ') & 077) << 2) | ((($c1 - ' ') & 077) >> 4));
+
+                    $file .= chr(((($c1 - ' ') & 077) << 4) | ((($c2 - ' ') & 077) >> 2));
+
+                    $pos += 3;
+                    $d += 2;
+                }
+
+                if (($d + 1 <= $len) && ($pos + 2 <= strlen($str[$i]))) {
+                    $c0 = (ord(substr($str[$i],$pos,1)) ^ 0x20);
+                    $c1 = (ord(substr($str[$i],$pos+1,1)) ^ 0x20);
+                    $file .= chr(((($c0 - ' ') & 077) << 2) | ((($c1 - ' ') & 077) >> 4));
+
+                }
+            }
+            $files[] = array('filename' => $filename, 'fileperm' => $fileperm, 'filedata' => $file);
+        }
+
+        return $files;
+    }
+
+    /**
+     * getSendArray() returns the arguments required for Mail::send()
+     * used to build the arguments for a mail::send() call 
+     *
+     * Usage:
+     * $mailtext = Full email (for example generated by a template)
+     * $decoder = new Mail_mimeDecode($mailtext);
+     * $parts =  $decoder->getSendArray();
+     * if (!PEAR::isError($parts) {
+     *     list($recipents,$headers,$body) = $parts;
+     *     $mail = Mail::factory('smtp');
+     *     $mail->send($recipents,$headers,$body);
+     * } else {
+     *     echo $parts->message;
+     * }
+     * @return mixed   array of recipeint, headers,body or Pear_Error
+     * @access public
+     * @author Alan Knowles <alan@akbkhome.com>
+     */
+    function getSendArray()
+    {
+        // prevent warning if this is not set
+        $this->_decode_headers = FALSE;
+        $headerlist =$this->_parseHeaders($this->_header);
+        $to = "";
+        if (!$headerlist) {
+            return $this->raiseError("Message did not contain headers");
+        }
+        foreach($headerlist as $item) {
+            $header[$item['name']] = $item['value'];
+            switch (strtolower($item['name'])) {
+                case "to":
+                case "cc":
+                case "bcc":
+                    $to .= ",".$item['value'];
+                default:
+                   break;
+            }
+        }
+        if ($to == "") {
+            return $this->raiseError("Message did not contain any recipents");
+        }
+        $to = substr($to,1);
+        return array($to,$header,$this->_body);
+    } 
+
+    /**
+     * Returns a xml copy of the output of
+     * Mail_mimeDecode::decode. Pass the output in as the
+     * argument. This function can be called statically. Eg:
+     *
+     * $output = $obj->decode();
+     * $xml    = Mail_mimeDecode::getXML($output);
+     *
+     * The DTD used for this should have been in the package. Or
+     * alternatively you can get it from cvs, or here:
+     * http://www.phpguru.org/xmail/xmail.dtd.
+     *
+     * @param  object Input to convert to xml. This should be the
+     *                output of the Mail_mimeDecode::decode function
+     * @return string XML version of input
+     * @access public
+     */
+    function getXML($input)
+    {
+        $crlf    =  "\r\n";
+        $output  = '<?xml version=\'1.0\'?>' . $crlf .
+                   '<!DOCTYPE email SYSTEM "http://www.phpguru.org/xmail/xmail.dtd">' . $crlf .
+                   '<email>' . $crlf .
+                   Mail_mimeDecode::_getXML($input) .
+                   '</email>';
+
+        return $output;
+    }
+
+    /**
+     * Function that does the actual conversion to xml. Does a single
+     * mimepart at a time.
+     *
+     * @param  object  Input to convert to xml. This is a mimepart object.
+     *                 It may or may not contain subparts.
+     * @param  integer Number of tabs to indent
+     * @return string  XML version of input
+     * @access private
+     */
+    function _getXML($input, $indent = 1)
+    {
+        $htab    =  "\t";
+        $crlf    =  "\r\n";
+        $output  =  '';
+        $headers = @(array)$input->headers;
+
+        foreach ($headers as $hdr_name => $hdr_value) {
+
+            // Multiple headers with this name
+            if (is_array($headers[$hdr_name])) {
+                for ($i = 0; $i < count($hdr_value); $i++) {
+                    $output .= Mail_mimeDecode::_getXML_helper($hdr_name, $hdr_value[$i], $indent);
+                }
+
+            // Only one header of this sort
+            } else {
+                $output .= Mail_mimeDecode::_getXML_helper($hdr_name, $hdr_value, $indent);
+            }
+        }
+
+        if (!empty($input->parts)) {
+            for ($i = 0; $i < count($input->parts); $i++) {
+                $output .= $crlf . str_repeat($htab, $indent) . '<mimepart>' . $crlf .
+                           Mail_mimeDecode::_getXML($input->parts[$i], $indent+1) .
+                           str_repeat($htab, $indent) . '</mimepart>' . $crlf;
+            }
+        } elseif (isset($input->body)) {
+            $output .= $crlf . str_repeat($htab, $indent) . '<body><![CDATA[' .
+                       $input->body . ']]></body>' . $crlf;
+        }
+
+        return $output;
+    }
+
+    /**
+     * Helper function to _getXML(). Returns xml of a header.
+     *
+     * @param  string  Name of header
+     * @param  string  Value of header
+     * @param  integer Number of tabs to indent
+     * @return string  XML version of input
+     * @access private
+     */
+    function _getXML_helper($hdr_name, $hdr_value, $indent)
+    {
+        $htab   = "\t";
+        $crlf   = "\r\n";
+        $return = '';
+
+        $new_hdr_value = ($hdr_name != 'received') ? Mail_mimeDecode::_parseHeaderValue($hdr_value) : array('value' => $hdr_value);
+        $new_hdr_name  = str_replace(' ', '-', ucwords(str_replace('-', ' ', $hdr_name)));
+
+        // Sort out any parameters
+        if (!empty($new_hdr_value['other'])) {
+            foreach ($new_hdr_value['other'] as $paramname => $paramvalue) {
+                $params[] = str_repeat($htab, $indent) . $htab . '<parameter>' . $crlf .
+                            str_repeat($htab, $indent) . $htab . $htab . '<paramname>' . htmlspecialchars($paramname) . '</paramname>' . $crlf .
+                            str_repeat($htab, $indent) . $htab . $htab . '<paramvalue>' . htmlspecialchars($paramvalue) . '</paramvalue>' . $crlf .
+                            str_repeat($htab, $indent) . $htab . '</parameter>' . $crlf;
+            }
+
+            $params = implode('', $params);
+        } else {
+            $params = '';
+        }
+
+        $return = str_repeat($htab, $indent) . '<header>' . $crlf .
+                  str_repeat($htab, $indent) . $htab . '<headername>' . htmlspecialchars($new_hdr_name) . '</headername>' . $crlf .
+                  str_repeat($htab, $indent) . $htab . '<headervalue>' . htmlspecialchars($new_hdr_value['value']) . '</headervalue>' . $crlf .
+                  $params .
+                  str_repeat($htab, $indent) . '</header>' . $crlf;
+
+        return $return;
+    }
+
+} // End of class

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Mail/mimePart.php Added

@@ -0,0 +1,1228 @@
+<?php
+/**
+ * The Mail_mimePart class is used to create MIME E-mail messages
+ *
+ * This class enables you to manipulate and build a mime email
+ * from the ground up. The Mail_Mime class is a userfriendly api
+ * to this class for people who aren't interested in the internals
+ * of mime mail.
+ * This class however allows full control over the email.
+ *
+ * Compatible with PHP versions 4 and 5
+ *
+ * LICENSE: This LICENSE is in the BSD license style.
+ * Copyright (c) 2002-2003, Richard Heyes <richard@phpguru.org>
+ * Copyright (c) 2003-2006, PEAR <pear-group@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - Neither the name of the authors, nor the names of its contributors 
+ *   may be used to endorse or promote products derived from this 
+ *   software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category  Mail
+ * @package   Mail_Mime
+ * @author    Richard Heyes  <richard@phpguru.org>
+ * @author    Cipriano Groenendal <cipri@php.net>
+ * @author    Sean Coates <sean@php.net>
+ * @author    Aleksander Machniak <alec@php.net>
+ * @copyright 2003-2006 PEAR <pear-group@php.net>
+ * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version   1.8.5
+ * @link      http://pear.php.net/package/Mail_mime
+ */
+
+
+/**
+ * The Mail_mimePart class is used to create MIME E-mail messages
+ *
+ * This class enables you to manipulate and build a mime email
+ * from the ground up. The Mail_Mime class is a userfriendly api
+ * to this class for people who aren't interested in the internals
+ * of mime mail.
+ * This class however allows full control over the email.
+ *
+ * @category  Mail
+ * @package   Mail_Mime
+ * @author    Richard Heyes  <richard@phpguru.org>
+ * @author    Cipriano Groenendal <cipri@php.net>
+ * @author    Sean Coates <sean@php.net>
+ * @author    Aleksander Machniak <alec@php.net>
+ * @copyright 2003-2006 PEAR <pear-group@php.net>
+ * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version   Release: 1.8.5
+ * @link      http://pear.php.net/package/Mail_mime
+ */
+class Mail_mimePart
+{
+    /**
+    * The encoding type of this part
+    *
+    * @var string
+    * @access private
+    */
+    var $_encoding;
+
+    /**
+    * An array of subparts
+    *
+    * @var array
+    * @access private
+    */
+    var $_subparts;
+
+    /**
+    * The output of this part after being built
+    *
+    * @var string
+    * @access private
+    */
+    var $_encoded;
+
+    /**
+    * Headers for this part
+    *
+    * @var array
+    * @access private
+    */
+    var $_headers;
+
+    /**
+    * The body of this part (not encoded)
+    *
+    * @var string
+    * @access private
+    */
+    var $_body;
+
+    /**
+    * The location of file with body of this part (not encoded)
+    *
+    * @var string
+    * @access private
+    */
+    var $_body_file;
+
+    /**
+    * The end-of-line sequence
+    *
+    * @var string
+    * @access private
+    */
+    var $_eol = "\r\n";
+
+
+    /**
+    * Constructor.
+    *
+    * Sets up the object.
+    *
+    * @param string $body   The body of the mime part if any.
+    * @param array  $params An associative array of optional parameters:
+    *     content_type      - The content type for this part eg multipart/mixed
+    *     encoding          - The encoding to use, 7bit, 8bit,
+    *                         base64, or quoted-printable
+    *     charset           - Content character set
+    *     cid               - Content ID to apply
+    *     disposition       - Content disposition, inline or attachment
+    *     filename          - Filename parameter for content disposition
+    *     description       - Content description
+    *     name_encoding     - Encoding of the attachment name (Content-Type)
+    *                         By default filenames are encoded using RFC2231
+    *                         Here you can set RFC2047 encoding (quoted-printable
+    *                         or base64) instead
+    *     filename_encoding - Encoding of the attachment filename (Content-Disposition)
+    *                         See 'name_encoding'
+    *     headers_charset   - Charset of the headers e.g. filename, description.
+    *                         If not set, 'charset' will be used
+    *     eol               - End of line sequence. Default: "\r\n"
+    *     headers           - Hash array with additional part headers. Array keys can be
+    *                         in form of <header_name>:<parameter_name>
+    *     body_file         - Location of file with part's body (instead of $body)
+    *
+    * @access public
+    */
+    function Mail_mimePart($body = '', $params = array())
+    {
+        if (!empty($params['eol'])) {
+            $this->_eol = $params['eol'];
+        } else if (defined('MAIL_MIMEPART_CRLF')) { // backward-copat.
+            $this->_eol = MAIL_MIMEPART_CRLF;
+        }
+
+        // Additional part headers
+        if (!empty($params['headers']) && is_array($params['headers'])) {
+            $headers = $params['headers'];
+        }
+
+        foreach ($params as $key => $value) {
+            switch ($key) {
+            case 'encoding':
+                $this->_encoding = $value;
+                $headers['Content-Transfer-Encoding'] = $value;
+                break;
+
+            case 'cid':
+                $headers['Content-ID'] = '<' . $value . '>';
+                break;
+
+            case 'location':
+                $headers['Content-Location'] = $value;
+                break;
+
+            case 'body_file':
+                $this->_body_file = $value;
+                break;
+
+            // for backward compatibility
+            case 'dfilename':
+                $params['filename'] = $value;
+                break;
+            }
+        }
+
+        // Default content-type
+        if (empty($params['content_type'])) {
+            $params['content_type'] = 'text/plain';
+        }
+
+        // Content-Type
+        $headers['Content-Type'] = $params['content_type'];
+        if (!empty($params['charset'])) {
+            $charset = "charset={$params['charset']}";
+            // place charset parameter in the same line, if possible
+            if ((strlen($headers['Content-Type']) + strlen($charset) + 16) <= 76) {
+                $headers['Content-Type'] .= '; ';
+            } else {
+                $headers['Content-Type'] .= ';' . $this->_eol . ' ';
+            }
+            $headers['Content-Type'] .= $charset;
+
+            // Default headers charset
+            if (!isset($params['headers_charset'])) {
+                $params['headers_charset'] = $params['charset'];
+            }
+        }
+
+        // header values encoding parameters
+        $h_charset  = !empty($params['headers_charset']) ? $params['headers_charset'] : 'US-ASCII';
+        $h_language = !empty($params['language']) ? $params['language'] : null;
+        $h_encoding = !empty($params['name_encoding']) ? $params['name_encoding'] : null;
+
+
+        if (!empty($params['filename'])) {
+            $headers['Content-Type'] .= ';' . $this->_eol;
+            $headers['Content-Type'] .= $this->_buildHeaderParam(
+                'name', $params['filename'], $h_charset, $h_language, $h_encoding
+            );
+        }
+
+        // Content-Disposition
+        if (!empty($params['disposition'])) {
+            $headers['Content-Disposition'] = $params['disposition'];
+            if (!empty($params['filename'])) {
+                $headers['Content-Disposition'] .= ';' . $this->_eol;
+                $headers['Content-Disposition'] .= $this->_buildHeaderParam(
+                    'filename', $params['filename'], $h_charset, $h_language,
+                    !empty($params['filename_encoding']) ? $params['filename_encoding'] : null
+                );
+            }
+
+            // add attachment size
+            $size = $this->_body_file ? filesize($this->_body_file) : strlen($body);
+            if ($size) {
+                $headers['Content-Disposition'] .= ';' . $this->_eol . ' size=' . $size;
+            }
+        }
+
+        if (!empty($params['description'])) {
+            $headers['Content-Description'] = $this->encodeHeader(
+                'Content-Description', $params['description'], $h_charset, $h_encoding,
+                $this->_eol
+            );
+        }
+
+        // Search and add existing headers' parameters
+        foreach ($headers as $key => $value) {
+            $items = explode(':', $key);
+            if (count($items) == 2) {
+                $header = $items[0];
+                $param  = $items[1];
+                if (isset($headers[$header])) {
+                    $headers[$header] .= ';' . $this->_eol;
+                }
+                $headers[$header] .= $this->_buildHeaderParam(
+                    $param, $value, $h_charset, $h_language, $h_encoding
+                );
+                unset($headers[$key]);
+            }
+        }
+
+        // Default encoding
+        if (!isset($this->_encoding)) {
+            $this->_encoding = '7bit';
+        }
+
+        // Assign stuff to member variables
+        $this->_encoded  = array();
+        $this->_headers  = $headers;
+        $this->_body     = $body;
+    }
+
+    /**
+     * Encodes and returns the email. Also stores
+     * it in the encoded member variable
+     *
+     * @param string $boundary Pre-defined boundary string
+     *
+     * @return An associative array containing two elements,
+     *         body and headers. The headers element is itself
+     *         an indexed array. On error returns PEAR error object.
+     * @access public
+     */
+    function encode($boundary=null)
+    {
+        $encoded =& $this->_encoded;
+
+        if (count($this->_subparts)) {
+            $boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
+            $eol = $this->_eol;
+
+            $this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
+
+            $encoded['body'] = ''; 
+
+            for ($i = 0; $i < count($this->_subparts); $i++) {
+                $encoded['body'] .= '--' . $boundary . $eol;
+                $tmp = $this->_subparts[$i]->encode();
+                if (PEAR::isError($tmp)) {
+                    return $tmp;
+                }
+                foreach ($tmp['headers'] as $key => $value) {
+                    $encoded['body'] .= $key . ': ' . $value . $eol;
+                }
+                $encoded['body'] .= $eol . $tmp['body'] . $eol;
+            }
+
+            $encoded['body'] .= '--' . $boundary . '--' . $eol;
+
+        } else if ($this->_body) {
+            $encoded['body'] = $this->_getEncodedData($this->_body, $this->_encoding);
+        } else if ($this->_body_file) {
+            // Temporarily reset magic_quotes_runtime for file reads and writes
+            if ($magic_quote_setting = get_magic_quotes_runtime()) {
+                @ini_set('magic_quotes_runtime', 0);
+            }
+            $body = $this->_getEncodedDataFromFile($this->_body_file, $this->_encoding);
+            if ($magic_quote_setting) {
+                @ini_set('magic_quotes_runtime', $magic_quote_setting);
+            }
+
+            if (PEAR::isError($body)) {
+                return $body;
+            }
+            $encoded['body'] = $body;
+        } else {
+            $encoded['body'] = '';
+        }
+
+        // Add headers to $encoded
+        $encoded['headers'] =& $this->_headers;
+
+        return $encoded;
+    }
+
+    /**
+     * Encodes and saves the email into file. File must exist.
+     * Data will be appended to the file.
+     *
+     * @param string  $filename  Output file location
+     * @param string  $boundary  Pre-defined boundary string
+     * @param boolean $skip_head True if you don't want to save headers
+     *
+     * @return array An associative array containing message headers
+     *               or PEAR error object
+     * @access public
+     * @since 1.6.0
+     */
+    function encodeToFile($filename, $boundary=null, $skip_head=false)
+    {
+        if (file_exists($filename) && !is_writable($filename)) {
+            $err = PEAR::raiseError('File is not writeable: ' . $filename);
+            return $err;
+        }
+
+        if (!($fh = fopen($filename, 'ab'))) {
+            $err = PEAR::raiseError('Unable to open file: ' . $filename);
+            return $err;
+        }
+
+        // Temporarily reset magic_quotes_runtime for file reads and writes
+        if ($magic_quote_setting = get_magic_quotes_runtime()) {
+            @ini_set('magic_quotes_runtime', 0);
+        }
+
+        $res = $this->_encodePartToFile($fh, $boundary, $skip_head);
+
+        fclose($fh);
+
+        if ($magic_quote_setting) {
+            @ini_set('magic_quotes_runtime', $magic_quote_setting);
+        }
+
+        return PEAR::isError($res) ? $res : $this->_headers;
+    }
+
+    /**
+     * Encodes given email part into file
+     *
+     * @param string  $fh        Output file handle
+     * @param string  $boundary  Pre-defined boundary string
+     * @param boolean $skip_head True if you don't want to save headers
+     *
+     * @return array True on sucess or PEAR error object
+     * @access private
+     */
+    function _encodePartToFile($fh, $boundary=null, $skip_head=false)
+    {
+        $eol = $this->_eol;
+
+        if (count($this->_subparts)) {
+            $boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
+            $this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
+        }
+
+        if (!$skip_head) {
+            foreach ($this->_headers as $key => $value) {
+                fwrite($fh, $key . ': ' . $value . $eol);
+            }
+            $f_eol = $eol;
+        } else {
+            $f_eol = '';
+        }
+
+        if (count($this->_subparts)) {
+            for ($i = 0; $i < count($this->_subparts); $i++) {
+                fwrite($fh, $f_eol . '--' . $boundary . $eol);
+                $res = $this->_subparts[$i]->_encodePartToFile($fh);
+                if (PEAR::isError($res)) {
+                    return $res;
+                }
+                $f_eol = $eol;
+            }
+
+            fwrite($fh, $eol . '--' . $boundary . '--' . $eol);
+
+        } else if ($this->_body) {
+            fwrite($fh, $f_eol . $this->_getEncodedData($this->_body, $this->_encoding));
+        } else if ($this->_body_file) {
+            fwrite($fh, $f_eol);
+            $res = $this->_getEncodedDataFromFile(
+                $this->_body_file, $this->_encoding, $fh
+            );
+            if (PEAR::isError($res)) {
+                return $res;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Adds a subpart to current mime part and returns
+     * a reference to it
+     *
+     * @param string $body   The body of the subpart, if any.
+     * @param array  $params The parameters for the subpart, same
+     *                       as the $params argument for constructor.
+     *
+     * @return Mail_mimePart A reference to the part you just added. It is
+     *                       crucial if using multipart/* in your subparts that
+     *                       you use =& in your script when calling this function,
+     *                       otherwise you will not be able to add further subparts.
+     * @access public
+     */
+    function &addSubpart($body, $params)
+    {
+        $this->_subparts[] = new Mail_mimePart($body, $params);
+        return $this->_subparts[count($this->_subparts) - 1];
+    }
+
+    /**
+     * Returns encoded data based upon encoding passed to it
+     *
+     * @param string $data     The data to encode.
+     * @param string $encoding The encoding type to use, 7bit, base64,
+     *                         or quoted-printable.
+     *
+     * @return string
+     * @access private
+     */
+    function _getEncodedData($data, $encoding)
+    {
+        switch ($encoding) {
+        case 'quoted-printable':
+            return $this->_quotedPrintableEncode($data);
+            break;
+
+        case 'base64':
+            return rtrim(chunk_split(base64_encode($data), 76, $this->_eol));
+            break;
+
+        case '8bit':
+        case '7bit':
+        default:
+            return $data;
+        }
+    }
+
+    /**
+     * Returns encoded data based upon encoding passed to it
+     *
+     * @param string   $filename Data file location
+     * @param string   $encoding The encoding type to use, 7bit, base64,
+     *                           or quoted-printable.
+     * @param resource $fh       Output file handle. If set, data will be
+     *                           stored into it instead of returning it
+     *
+     * @return string Encoded data or PEAR error object
+     * @access private
+     */
+    function _getEncodedDataFromFile($filename, $encoding, $fh=null)
+    {
+        if (!is_readable($filename)) {
+            $err = PEAR::raiseError('Unable to read file: ' . $filename);
+            return $err;
+        }
+
+        if (!($fd = fopen($filename, 'rb'))) {
+            $err = PEAR::raiseError('Could not open file: ' . $filename);
+            return $err;
+        }
+
+        $data = '';
+
+        switch ($encoding) {
+        case 'quoted-printable':
+            while (!feof($fd)) {
+                $buffer = $this->_quotedPrintableEncode(fgets($fd));
+                if ($fh) {
+                    fwrite($fh, $buffer);
+                } else {
+                    $data .= $buffer;
+                }
+            }
+            break;
+
+        case 'base64':
+            while (!feof($fd)) {
+                // Should read in a multiple of 57 bytes so that
+                // the output is 76 bytes per line. Don't use big chunks
+                // because base64 encoding is memory expensive
+                $buffer = fread($fd, 57 * 9198); // ca. 0.5 MB
+                $buffer = base64_encode($buffer);
+                $buffer = chunk_split($buffer, 76, $this->_eol);
+                if (feof($fd)) {
+                    $buffer = rtrim($buffer);
+                }
+
+                if ($fh) {
+                    fwrite($fh, $buffer);
+                } else {
+                    $data .= $buffer;
+                }
+            }
+            break;
+
+        case '8bit':
+        case '7bit':
+        default:
+            while (!feof($fd)) {
+                $buffer = fread($fd, 1048576); // 1 MB
+                if ($fh) {
+                    fwrite($fh, $buffer);
+                } else {
+                    $data .= $buffer;
+                }
+            }
+        }
+
+        fclose($fd);
+
+        if (!$fh) {
+            return $data;
+        }
+    }
+
+    /**
+     * Encodes data to quoted-printable standard.
+     *
+     * @param string $input    The data to encode
+     * @param int    $line_max Optional max line length. Should
+     *                         not be more than 76 chars
+     *
+     * @return string Encoded data
+     *
+     * @access private
+     */
+    function _quotedPrintableEncode($input , $line_max = 76)
+    {
+        $eol = $this->_eol;
+        /*
+        // imap_8bit() is extremely fast, but doesn't handle properly some characters
+        if (function_exists('imap_8bit') && $line_max == 76) {
+            $input = preg_replace('/\r?\n/', "\r\n", $input);
+            $input = imap_8bit($input);
+            if ($eol != "\r\n") {
+                $input = str_replace("\r\n", $eol, $input);
+            }
+            return $input;
+        }
+        */
+        $lines  = preg_split("/\r?\n/", $input);
+        $escape = '=';
+        $output = '';
+
+        while (list($idx, $line) = each($lines)) {
+            $newline = '';
+            $i = 0;
+
+            while (isset($line[$i])) {
+                $char = $line[$i];
+                $dec  = ord($char);
+                $i++;
+
+                if (($dec == 32) && (!isset($line[$i]))) {
+                    // convert space at eol only
+                    $char = '=20';
+                } elseif ($dec == 9 && isset($line[$i])) {
+                    ; // Do nothing if a TAB is not on eol
+                } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) {
+                    $char = $escape . sprintf('%02X', $dec);
+                } elseif (($dec == 46) && (($newline == '')
+                    || ((strlen($newline) + strlen("=2E")) >= $line_max))
+                ) {
+                    // Bug #9722: convert full-stop at bol,
+                    // some Windows servers need this, won't break anything (cipri)
+                    // Bug #11731: full-stop at bol also needs to be encoded
+                    // if this line would push us over the line_max limit.
+                    $char = '=2E';
+                }
+
+                // Note, when changing this line, also change the ($dec == 46)
+                // check line, as it mimics this line due to Bug #11731
+                // EOL is not counted
+                if ((strlen($newline) + strlen($char)) >= $line_max) {
+                    // soft line break; " =\r\n" is okay
+                    $output  .= $newline . $escape . $eol;
+                    $newline  = '';
+                }
+                $newline .= $char;
+            } // end of for
+            $output .= $newline . $eol;
+            unset($lines[$idx]);
+        }
+        // Don't want last crlf
+        $output = substr($output, 0, -1 * strlen($eol));
+        return $output;
+    }
+
+    /**
+     * Encodes the parameter of a header.
+     *
+     * @param string $name      The name of the header-parameter
+     * @param string $value     The value of the paramter
+     * @param string $charset   The characterset of $value
+     * @param string $language  The language used in $value
+     * @param string $encoding  Parameter encoding. If not set, parameter value
+     *                          is encoded according to RFC2231
+     * @param int    $maxLength The maximum length of a line. Defauls to 75
+     *
+     * @return string
+     *
+     * @access private
+     */
+    function _buildHeaderParam($name, $value, $charset=null, $language=null,
+        $encoding=null, $maxLength=75
+    ) {
+        // RFC 2045:
+        // value needs encoding if contains non-ASCII chars or is longer than 78 chars
+        if (!preg_match('#[^\x20-\x7E]#', $value)) {
+            $token_regexp = '#([^\x21\x23-\x27\x2A\x2B\x2D'
+                . '\x2E\x30-\x39\x41-\x5A\x5E-\x7E])#';
+            if (!preg_match($token_regexp, $value)) {
+                // token
+                if (strlen($name) + strlen($value) + 3 <= $maxLength) {
+                    return " {$name}={$value}";
+                }
+            } else {
+                // quoted-string
+                $quoted = addcslashes($value, '\\"');
+                if (strlen($name) + strlen($quoted) + 5 <= $maxLength) {
+                    return " {$name}=\"{$quoted}\"";
+                }
+            }
+        }
+
+        // RFC2047: use quoted-printable/base64 encoding
+        if ($encoding == 'quoted-printable' || $encoding == 'base64') {
+            return $this->_buildRFC2047Param($name, $value, $charset, $encoding);
+        }
+
+        // RFC2231:
+        $encValue = preg_replace_callback(
+            '/([^\x21\x23\x24\x26\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E])/',
+            array($this, '_encodeReplaceCallback'), $value
+        );
+        $value = "$charset'$language'$encValue";
+
+        $header = " {$name}*={$value}";
+        if (strlen($header) <= $maxLength) {
+            return $header;
+        }
+
+        $preLength = strlen(" {$name}*0*=");
+        $maxLength = max(16, $maxLength - $preLength - 3);
+        $maxLengthReg = "|(.{0,$maxLength}[^\%][^\%])|";
+
+        $headers = array();
+        $headCount = 0;
+        while ($value) {
+            $matches = array();
+            $found = preg_match($maxLengthReg, $value, $matches);
+            if ($found) {
+                $headers[] = " {$name}*{$headCount}*={$matches[0]}";
+                $value = substr($value, strlen($matches[0]));
+            } else {
+                $headers[] = " {$name}*{$headCount}*={$value}";
+                $value = '';
+            }
+            $headCount++;
+        }
+
+        $headers = implode(';' . $this->_eol, $headers);
+        return $headers;
+    }
+
+    /**
+     * Encodes header parameter as per RFC2047 if needed
+     *
+     * @param string $name      The parameter name
+     * @param string $value     The parameter value
+     * @param string $charset   The parameter charset
+     * @param string $encoding  Encoding type (quoted-printable or base64)
+     * @param int    $maxLength Encoded parameter max length. Default: 76
+     *
+     * @return string Parameter line
+     * @access private
+     */
+    function _buildRFC2047Param($name, $value, $charset,
+        $encoding='quoted-printable', $maxLength=76
+    ) {
+        // WARNING: RFC 2047 says: "An 'encoded-word' MUST NOT be used in
+        // parameter of a MIME Content-Type or Content-Disposition field",
+        // but... it's supported by many clients/servers
+        $quoted = '';
+
+        if ($encoding == 'base64') {
+            $value = base64_encode($value);
+            $prefix = '=?' . $charset . '?B?';
+            $suffix = '?=';
+
+            // 2 x SPACE, 2 x '"', '=', ';'
+            $add_len = strlen($prefix . $suffix) + strlen($name) + 6;
+            $len = $add_len + strlen($value);
+
+            while ($len > $maxLength) { 
+                // We can cut base64-encoded string every 4 characters
+                $real_len = floor(($maxLength - $add_len) / 4) * 4;
+                $_quote = substr($value, 0, $real_len);
+                $value = substr($value, $real_len);
+
+                $quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
+                $add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
+                $len = strlen($value) + $add_len;
+            }
+            $quoted .= $prefix . $value . $suffix;
+
+        } else {
+            // quoted-printable
+            $value = $this->encodeQP($value);
+            $prefix = '=?' . $charset . '?Q?';
+            $suffix = '?=';
+
+            // 2 x SPACE, 2 x '"', '=', ';'
+            $add_len = strlen($prefix . $suffix) + strlen($name) + 6;
+            $len = $add_len + strlen($value);
+
+            while ($len > $maxLength) {
+                $length = $maxLength - $add_len;
+                // don't break any encoded letters
+                if (preg_match("/^(.{0,$length}[^\=][^\=])/", $value, $matches)) {
+                    $_quote = $matches[1];
+                }
+
+                $quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
+                $value = substr($value, strlen($_quote));
+                $add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
+                $len = strlen($value) + $add_len;
+            }
+
+            $quoted .= $prefix . $value . $suffix;
+        }
+
+        return " {$name}=\"{$quoted}\"";
+    }
+
+    /**
+     * Encodes a header as per RFC2047
+     *
+     * @param string $name     The header name
+     * @param string $value    The header data to encode
+     * @param string $charset  Character set name
+     * @param string $encoding Encoding name (base64 or quoted-printable)
+     * @param string $eol      End-of-line sequence. Default: "\r\n"
+     *
+     * @return string          Encoded header data (without a name)
+     * @access public
+     * @since 1.6.1
+     */
+    function encodeHeader($name, $value, $charset='ISO-8859-1',
+        $encoding='quoted-printable', $eol="\r\n"
+    ) {
+        // Structured headers
+        $comma_headers = array(
+            'from', 'to', 'cc', 'bcc', 'sender', 'reply-to',
+            'resent-from', 'resent-to', 'resent-cc', 'resent-bcc',
+            'resent-sender', 'resent-reply-to',
+            'return-receipt-to', 'disposition-notification-to',
+        );
+        $other_headers = array(
+            'references', 'in-reply-to', 'message-id', 'resent-message-id',
+        );
+
+        $name = strtolower($name);
+
+        if (in_array($name, $comma_headers)) {
+            $separator = ',';
+        } else if (in_array($name, $other_headers)) {
+            $separator = ' ';
+        }
+
+        if (!$charset) {
+            $charset = 'ISO-8859-1';
+        }
+
+        // Structured header (make sure addr-spec inside is not encoded)
+        if (!empty($separator)) {
+            // Simple e-mail address regexp
+            $email_regexp = '([^\s<]+|("[^\r\n"]+"))@\S+';
+
+            $parts = Mail_mimePart::_explodeQuotedString($separator, $value);
+            $value = '';
+
+            foreach ($parts as $part) {
+                $part = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $part);
+                $part = trim($part);
+
+                if (!$part) {
+                    continue;
+                }
+                if ($value) {
+                    $value .= $separator==',' ? $separator.' ' : ' ';
+                } else {
+                    $value = $name . ': ';
+                }
+
+                // let's find phrase (name) and/or addr-spec
+                if (preg_match('/^<' . $email_regexp . '>$/', $part)) {
+                    $value .= $part;
+                } else if (preg_match('/^' . $email_regexp . '$/', $part)) {
+                    // address without brackets and without name
+                    $value .= $part;
+                } else if (preg_match('/<*' . $email_regexp . '>*$/', $part, $matches)) {
+                    // address with name (handle name)
+                    $address = $matches[0];
+                    $word = str_replace($address, '', $part);
+                    $word = trim($word);
+                    // check if phrase requires quoting
+                    if ($word) {
+                        // non-ASCII: require encoding
+                        if (preg_match('#([\x80-\xFF]){1}#', $word)) {
+                            if ($word[0] == '"' && $word[strlen($word)-1] == '"') {
+                                // de-quote quoted-string, encoding changes
+                                // string to atom
+                                $search = array("\\\"", "\\\\");
+                                $replace = array("\"", "\\");
+                                $word = str_replace($search, $replace, $word);
+                                $word = substr($word, 1, -1);
+                            }
+                            // find length of last line
+                            if (($pos = strrpos($value, $eol)) !== false) {
+                                $last_len = strlen($value) - $pos;
+                            } else {
+                                $last_len = strlen($value);
+                            }
+                            $word = Mail_mimePart::encodeHeaderValue(
+                                $word, $charset, $encoding, $last_len, $eol
+                            );
+                        } else if (($word[0] != '"' || $word[strlen($word)-1] != '"')
+                            && preg_match('/[\<\>\\\.\[\]@,;:"]/', $word)
+                        ) {
+                            // ASCII: quote string if needed
+                            $word = '"'.addcslashes($word, '\\"').'"';
+                        }
+                    }
+                    $value .= $word.' '.$address;
+                } else {
+                    // addr-spec not found, don't encode (?)
+                    $value .= $part;
+                }
+
+                // RFC2822 recommends 78 characters limit, use 76 from RFC2047
+                $value = wordwrap($value, 76, $eol . ' ');
+            }
+
+            // remove header name prefix (there could be EOL too)
+            $value = preg_replace(
+                '/^'.$name.':('.preg_quote($eol, '/').')* /', '', $value
+            );
+
+        } else {
+            // Unstructured header
+            // non-ASCII: require encoding
+            if (preg_match('#([\x80-\xFF]){1}#', $value)) {
+                if ($value[0] == '"' && $value[strlen($value)-1] == '"') {
+                    // de-quote quoted-string, encoding changes
+                    // string to atom
+                    $search = array("\\\"", "\\\\");
+                    $replace = array("\"", "\\");
+                    $value = str_replace($search, $replace, $value);
+                    $value = substr($value, 1, -1);
+                }
+                $value = Mail_mimePart::encodeHeaderValue(
+                    $value, $charset, $encoding, strlen($name) + 2, $eol
+                );
+            } else if (strlen($name.': '.$value) > 78) {
+                // ASCII: check if header line isn't too long and use folding
+                $value = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $value);
+                $tmp = wordwrap($name.': '.$value, 78, $eol . ' ');
+                $value = preg_replace('/^'.$name.':\s*/', '', $tmp);
+                // hard limit 998 (RFC2822)
+                $value = wordwrap($value, 998, $eol . ' ', true);
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Explode quoted string
+     *
+     * @param string $delimiter Delimiter expression string for preg_match()
+     * @param string $string    Input string
+     *
+     * @return array            String tokens array
+     * @access private
+     */
+    function _explodeQuotedString($delimiter, $string)
+    {
+        $result = array();
+        $strlen = strlen($string);
+
+        for ($q=$p=$i=0; $i < $strlen; $i++) {
+            if ($string[$i] == "\""
+                && (empty($string[$i-1]) || $string[$i-1] != "\\")
+            ) {
+                $q = $q ? false : true;
+            } else if (!$q && preg_match("/$delimiter/", $string[$i])) {
+                $result[] = substr($string, $p, $i - $p);
+                $p = $i + 1;
+            }
+        }
+
+        $result[] = substr($string, $p);
+        return $result;
+    }
+
+    /**
+     * Encodes a header value as per RFC2047
+     *
+     * @param string $value      The header data to encode
+     * @param string $charset    Character set name
+     * @param string $encoding   Encoding name (base64 or quoted-printable)
+     * @param int    $prefix_len Prefix length. Default: 0
+     * @param string $eol        End-of-line sequence. Default: "\r\n"
+     *
+     * @return string            Encoded header data
+     * @access public
+     * @since 1.6.1
+     */
+    function encodeHeaderValue($value, $charset, $encoding, $prefix_len=0, $eol="\r\n")
+    {
+        // #17311: Use multibyte aware method (requires mbstring extension)
+        if ($result = Mail_mimePart::encodeMB($value, $charset, $encoding, $prefix_len, $eol)) {
+            return $result;
+        }
+
+        // Generate the header using the specified params and dynamicly
+        // determine the maximum length of such strings.
+        // 75 is the value specified in the RFC.
+        $encoding = $encoding == 'base64' ? 'B' : 'Q';
+        $prefix = '=?' . $charset . '?' . $encoding .'?';
+        $suffix = '?=';
+        $maxLength = 75 - strlen($prefix . $suffix);
+        $maxLength1stLine = $maxLength - $prefix_len;
+
+        if ($encoding == 'B') {
+            // Base64 encode the entire string
+            $value = base64_encode($value);
+
+            // We can cut base64 every 4 characters, so the real max
+            // we can get must be rounded down.
+            $maxLength = $maxLength - ($maxLength % 4);
+            $maxLength1stLine = $maxLength1stLine - ($maxLength1stLine % 4);
+
+            $cutpoint = $maxLength1stLine;
+            $output = '';
+
+            while ($value) {
+                // Split translated string at every $maxLength
+                $part = substr($value, 0, $cutpoint);
+                $value = substr($value, $cutpoint);
+                $cutpoint = $maxLength;
+                // RFC 2047 specifies that any split header should
+                // be seperated by a CRLF SPACE.
+                if ($output) {
+                    $output .= $eol . ' ';
+                }
+                $output .= $prefix . $part . $suffix;
+            }
+            $value = $output;
+        } else {
+            // quoted-printable encoding has been selected
+            $value = Mail_mimePart::encodeQP($value);
+
+            // This regexp will break QP-encoded text at every $maxLength
+            // but will not break any encoded letters.
+            $reg1st = "|(.{0,$maxLength1stLine}[^\=][^\=])|";
+            $reg2nd = "|(.{0,$maxLength}[^\=][^\=])|";
+
+            if (strlen($value) > $maxLength1stLine) {
+                // Begin with the regexp for the first line.
+                $reg = $reg1st;
+                $output = '';
+                while ($value) {
+                    // Split translated string at every $maxLength
+                    // But make sure not to break any translated chars.
+                    $found = preg_match($reg, $value, $matches);
+
+                    // After this first line, we need to use a different
+                    // regexp for the first line.
+                    $reg = $reg2nd;
+
+                    // Save the found part and encapsulate it in the
+                    // prefix & suffix. Then remove the part from the
+                    // $value_out variable.
+                    if ($found) {
+                        $part = $matches[0];
+                        $len = strlen($matches[0]);
+                        $value = substr($value, $len);
+                    } else {
+                        $part = $value;
+                        $value = '';
+                    }
+
+                    // RFC 2047 specifies that any split header should
+                    // be seperated by a CRLF SPACE
+                    if ($output) {
+                        $output .= $eol . ' ';
+                    }
+                    $output .= $prefix . $part . $suffix;
+                }
+                $value = $output;
+            } else {
+                $value = $prefix . $value . $suffix;
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Encodes the given string using quoted-printable
+     *
+     * @param string $str String to encode
+     *
+     * @return string     Encoded string
+     * @access public
+     * @since 1.6.0
+     */
+    function encodeQP($str)
+    {
+        // Bug #17226 RFC 2047 restricts some characters
+        // if the word is inside a phrase, permitted chars are only:
+        // ASCII letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"
+
+        // "=",  "_",  "?" must be encoded
+        $regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';
+        $str = preg_replace_callback(
+            $regexp, array('Mail_mimePart', '_qpReplaceCallback'), $str
+        );
+
+        return str_replace(' ', '_', $str);
+    }
+
+    /**
+     * Encodes the given string using base64 or quoted-printable.
+     * This method makes sure that encoded-word represents an integral
+     * number of characters as per RFC2047.
+     *
+     * @param string $str        String to encode
+     * @param string $charset    Character set name
+     * @param string $encoding   Encoding name (base64 or quoted-printable)
+     * @param int    $prefix_len Prefix length. Default: 0
+     * @param string $eol        End-of-line sequence. Default: "\r\n"
+     *
+     * @return string     Encoded string
+     * @access public
+     * @since 1.8.0
+     */
+    function encodeMB($str, $charset, $encoding, $prefix_len=0, $eol="\r\n")
+    {
+        if (!function_exists('mb_substr') || !function_exists('mb_strlen')) {
+            return;
+        }
+
+        $encoding = $encoding == 'base64' ? 'B' : 'Q';
+        // 75 is the value specified in the RFC
+        $prefix = '=?' . $charset . '?'.$encoding.'?';
+        $suffix = '?=';
+        $maxLength = 75 - strlen($prefix . $suffix);
+
+        // A multi-octet character may not be split across adjacent encoded-words
+        // So, we'll loop over each character
+        // mb_stlen() with wrong charset will generate a warning here and return null
+        $length      = mb_strlen($str, $charset);
+        $result      = '';
+        $line_length = $prefix_len;
+
+        if ($encoding == 'B') {
+            // base64
+            $start = 0;
+            $prev  = '';
+
+            for ($i=1; $i<=$length; $i++) {
+                // See #17311
+                $chunk = mb_substr($str, $start, $i-$start, $charset);
+                $chunk = base64_encode($chunk);
+                $chunk_len = strlen($chunk);
+
+                if ($line_length + $chunk_len == $maxLength || $i == $length) {
+                    if ($result) {
+                        $result .= "\n";
+                    }
+                    $result .= $chunk;
+                    $line_length = 0;
+                    $start = $i;
+                } else if ($line_length + $chunk_len > $maxLength) {
+                    if ($result) {
+                        $result .= "\n";
+                    }
+                    if ($prev) {
+                        $result .= $prev;
+                    }
+                    $line_length = 0;
+                    $start = $i - 1;
+                } else {
+                    $prev = $chunk;
+                }
+            }
+        } else {
+            // quoted-printable
+            // see encodeQP()
+            $regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';
+
+            for ($i=0; $i<=$length; $i++) {
+                $char = mb_substr($str, $i, 1, $charset);
+                // RFC recommends underline (instead of =20) in place of the space
+                // that's one of the reasons why we're not using iconv_mime_encode()
+                if ($char == ' ') {
+                    $char = '_';
+                    $char_len = 1;
+                } else {
+                    $char = preg_replace_callback(
+                        $regexp, array('Mail_mimePart', '_qpReplaceCallback'), $char
+                    );
+                    $char_len = strlen($char);
+                }
+
+                if ($line_length + $char_len > $maxLength) {
+                    if ($result) {
+                        $result .= "\n";
+                    }
+                    $line_length = 0;
+                }
+
+                $result      .= $char;
+                $line_length += $char_len;
+            }
+        }
+
+        if ($result) {
+            $result = $prefix
+                .str_replace("\n", $suffix.$eol.' '.$prefix, $result).$suffix;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Callback function to replace extended characters (\x80-xFF) with their
+     * ASCII values (RFC2047: quoted-printable)
+     *
+     * @param array $matches Preg_replace's matches array
+     *
+     * @return string        Encoded character string
+     * @access private
+     */
+    function _qpReplaceCallback($matches)
+    {
+        return sprintf('=%02X', ord($matches[1]));
+    }
+
+    /**
+     * Callback function to replace extended characters (\x80-xFF) with their
+     * ASCII values (RFC2231)
+     *
+     * @param array $matches Preg_replace's matches array
+     *
+     * @return string        Encoded character string
+     * @access private
+     */
+    function _encodeReplaceCallback($matches)
+    {
+        return sprintf('%%%02X', ord($matches[1]));
+    }
+
+} // End of class

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Net Added

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Net/IDNA2 Added

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Net/IDNA2.php Added

@@ -0,0 +1,3402 @@
+<?php
+
+// {{{ license
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 foldmethod=marker: */
+//
+// +----------------------------------------------------------------------+
+// | This library is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU Lesser General Public License as       |
+// | published by the Free Software Foundation; either version 2.1 of the |
+// | License, or (at your option) any later version.                      |
+// |                                                                      |
+// | This library 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    |
+// | Lesser General Public License for more details.                      |
+// |                                                                      |
+// | You should have received a copy of the GNU Lesser General Public     |
+// | License along with this library; if not, write to the Free Software  |
+// | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 |
+// | USA.                                                                 |
+// +----------------------------------------------------------------------+
+//
+
+// }}}
+require_once 'Net/IDNA2/Exception.php';
+require_once 'Net/IDNA2/Exception/Nameprep.php';
+
+/**
+ * Encode/decode Internationalized Domain Names.
+ *
+ * The class allows to convert internationalized domain names
+ * (see RFC 3490 for details) as they can be used with various registries worldwide
+ * to be translated between their original (localized) form and their encoded form
+ * as it will be used in the DNS (Domain Name System).
+ *
+ * The class provides two public methods, encode() and decode(), which do exactly
+ * what you would expect them to do. You are allowed to use complete domain names,
+ * simple strings and complete email addresses as well. That means, that you might
+ * use any of the following notations:
+ *
+ * - www.n�rgler.com
+ * - xn--nrgler-wxa
+ * - xn--brse-5qa.xn--knrz-1ra.info
+ *
+ * Unicode input might be given as either UTF-8 string, UCS-4 string or UCS-4
+ * array. Unicode output is available in the same formats.
+ * You can select your preferred format via {@link set_paramter()}.
+ *
+ * ACE input and output is always expected to be ASCII.
+ *
+ * @package Net
+ * @author  Markus Nix <mnix@docuverse.de>
+ * @author  Matthias Sommerfeld <mso@phlylabs.de>
+ * @author  Stefan Neufeind <pear.neufeind@speedpartner.de>
+ * @version $Id: IDNA2.php 305344 2010-11-14 23:52:42Z neufeind $
+ */
+class Net_IDNA2
+{
+    // {{{ npdata
+    /**
+     * These Unicode codepoints are
+     * mapped to nothing, See RFC3454 for details
+     *
+     * @static
+     * @var array
+     * @access private
+     */
+    private static $_np_map_nothing = array(
+        0xAD,
+        0x34F,
+        0x1806,
+        0x180B,
+        0x180C,
+        0x180D,
+        0x200B,
+        0x200C,
+        0x200D,
+        0x2060,
+        0xFE00,
+        0xFE01,
+        0xFE02,
+        0xFE03,
+        0xFE04,
+        0xFE05,
+        0xFE06,
+        0xFE07,
+        0xFE08,
+        0xFE09,
+        0xFE0A,
+        0xFE0B,
+        0xFE0C,
+        0xFE0D,
+        0xFE0E,
+        0xFE0F,
+        0xFEFF
+    );
+
+    /**
+     * Prohibited codepints
+     *
+     * @static
+     * @var array
+     * @access private
+     */
+    private static $_general_prohibited = array(
+        0,
+        1,
+        2,
+        3,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        0xA,
+        0xB,
+        0xC,
+        0xD,
+        0xE,
+        0xF,
+        0x10,
+        0x11,
+        0x12,
+        0x13,
+        0x14,
+        0x15,
+        0x16,
+        0x17,
+        0x18,
+        0x19,
+        0x1A,
+        0x1B,
+        0x1C,
+        0x1D,
+        0x1E,
+        0x1F,
+        0x20,
+        0x21,
+        0x22,
+        0x23,
+        0x24,
+        0x25,
+        0x26,
+        0x27,
+        0x28,
+        0x29,
+        0x2A,
+        0x2B,
+        0x2C,
+        0x2F,
+        0x3B,
+        0x3C,
+        0x3D,
+        0x3E,
+        0x3F,
+        0x40,
+        0x5B,
+        0x5C,
+        0x5D,
+        0x5E,
+        0x5F,
+        0x60,
+        0x7B,
+        0x7C,
+        0x7D,
+        0x7E,
+        0x7F,
+        0x3002
+    );
+
+    /**
+     * Codepints prohibited by Nameprep
+     * @static
+     * @var array
+     * @access private
+     */
+    private static $_np_prohibit = array(
+        0xA0,
+        0x1680,
+        0x2000,
+        0x2001,
+        0x2002,
+        0x2003,
+        0x2004,
+        0x2005,
+        0x2006,
+        0x2007,
+        0x2008,
+        0x2009,
+        0x200A,
+        0x200B,
+        0x202F,
+        0x205F,
+        0x3000,
+        0x6DD,
+        0x70F,
+        0x180E,
+        0x200C,
+        0x200D,
+        0x2028,
+        0x2029,
+        0xFEFF,
+        0xFFF9,
+        0xFFFA,
+        0xFFFB,
+        0xFFFC,
+        0xFFFE,
+        0xFFFF,
+        0x1FFFE,
+        0x1FFFF,
+        0x2FFFE,
+        0x2FFFF,
+        0x3FFFE,
+        0x3FFFF,
+        0x4FFFE,
+        0x4FFFF,
+        0x5FFFE,
+        0x5FFFF,
+        0x6FFFE,
+        0x6FFFF,
+        0x7FFFE,
+        0x7FFFF,
+        0x8FFFE,
+        0x8FFFF,
+        0x9FFFE,
+        0x9FFFF,
+        0xAFFFE,
+        0xAFFFF,
+        0xBFFFE,
+        0xBFFFF,
+        0xCFFFE,
+        0xCFFFF,
+        0xDFFFE,
+        0xDFFFF,
+        0xEFFFE,
+        0xEFFFF,
+        0xFFFFE,
+        0xFFFFF,
+        0x10FFFE,
+        0x10FFFF,
+        0xFFF9,
+        0xFFFA,
+        0xFFFB,
+        0xFFFC,
+        0xFFFD,
+        0x340,
+        0x341,
+        0x200E,
+        0x200F,
+        0x202A,
+        0x202B,
+        0x202C,
+        0x202D,
+        0x202E,
+        0x206A,
+        0x206B,
+        0x206C,
+        0x206D,
+        0x206E,
+        0x206F,
+        0xE0001
+    );
+
+    /**
+     * Codepoint ranges prohibited by nameprep
+     *
+     * @static
+     * @var array
+     * @access private
+     */
+    private static $_np_prohibit_ranges = array(
+        array(0x80,     0x9F    ),
+        array(0x2060,   0x206F  ),
+        array(0x1D173,  0x1D17A ),
+        array(0xE000,   0xF8FF  ),
+        array(0xF0000,  0xFFFFD ),
+        array(0x100000, 0x10FFFD),
+        array(0xFDD0,   0xFDEF  ),
+        array(0xD800,   0xDFFF  ),
+        array(0x2FF0,   0x2FFB  ),
+        array(0xE0020,  0xE007F )
+    );
+
+    /**
+     * Replacement mappings (casemapping, replacement sequences, ...)
+     *
+     * @static
+     * @var array
+     * @access private
+     */
+    private static $_np_replacemaps = array(
+        0x41    => array(0x61),
+        0x42    => array(0x62),
+        0x43    => array(0x63),
+        0x44    => array(0x64),
+        0x45    => array(0x65),
+        0x46    => array(0x66),
+        0x47    => array(0x67),
+        0x48    => array(0x68),
+        0x49    => array(0x69),
+        0x4A    => array(0x6A),
+        0x4B    => array(0x6B),
+        0x4C    => array(0x6C),
+        0x4D    => array(0x6D),
+        0x4E    => array(0x6E),
+        0x4F    => array(0x6F),
+        0x50    => array(0x70),
+        0x51    => array(0x71),
+        0x52    => array(0x72),
+        0x53    => array(0x73),
+        0x54    => array(0x74),
+        0x55    => array(0x75),
+        0x56    => array(0x76),
+        0x57    => array(0x77),
+        0x58    => array(0x78),
+        0x59    => array(0x79),
+        0x5A    => array(0x7A),
+        0xB5    => array(0x3BC),
+        0xC0    => array(0xE0),
+        0xC1    => array(0xE1),
+        0xC2    => array(0xE2),
+        0xC3    => array(0xE3),
+        0xC4    => array(0xE4),
+        0xC5    => array(0xE5),
+        0xC6    => array(0xE6),
+        0xC7    => array(0xE7),
+        0xC8    => array(0xE8),
+        0xC9    => array(0xE9),
+        0xCA    => array(0xEA),
+        0xCB    => array(0xEB),
+        0xCC    => array(0xEC),
+        0xCD    => array(0xED),
+        0xCE    => array(0xEE),
+        0xCF    => array(0xEF),
+        0xD0    => array(0xF0),
+        0xD1    => array(0xF1),
+        0xD2    => array(0xF2),
+        0xD3    => array(0xF3),
+        0xD4    => array(0xF4),
+        0xD5    => array(0xF5),
+        0xD6    => array(0xF6),
+        0xD8    => array(0xF8),
+        0xD9    => array(0xF9),
+        0xDA    => array(0xFA),
+        0xDB    => array(0xFB),
+        0xDC    => array(0xFC),
+        0xDD    => array(0xFD),
+        0xDE    => array(0xFE),
+        0xDF    => array(0x73, 0x73),
+        0x100   => array(0x101),
+        0x102   => array(0x103),
+        0x104   => array(0x105),
+        0x106   => array(0x107),
+        0x108   => array(0x109),
+        0x10A   => array(0x10B),
+        0x10C   => array(0x10D),
+        0x10E   => array(0x10F),
+        0x110   => array(0x111),
+        0x112   => array(0x113),
+        0x114   => array(0x115),
+        0x116   => array(0x117),
+        0x118   => array(0x119),
+        0x11A   => array(0x11B),
+        0x11C   => array(0x11D),
+        0x11E   => array(0x11F),
+        0x120   => array(0x121),
+        0x122   => array(0x123),
+        0x124   => array(0x125),
+        0x126   => array(0x127),
+        0x128   => array(0x129),
+        0x12A   => array(0x12B),
+        0x12C   => array(0x12D),
+        0x12E   => array(0x12F),
+        0x130   => array(0x69, 0x307),
+        0x132   => array(0x133),
+        0x134   => array(0x135),
+        0x136   => array(0x137),
+        0x139   => array(0x13A),
+        0x13B   => array(0x13C),
+        0x13D   => array(0x13E),
+        0x13F   => array(0x140),
+        0x141   => array(0x142),
+        0x143   => array(0x144),
+        0x145   => array(0x146),
+        0x147   => array(0x148),
+        0x149   => array(0x2BC, 0x6E),
+        0x14A   => array(0x14B),
+        0x14C   => array(0x14D),
+        0x14E   => array(0x14F),
+        0x150   => array(0x151),
+        0x152   => array(0x153),
+        0x154   => array(0x155),
+        0x156   => array(0x157),
+        0x158   => array(0x159),
+        0x15A   => array(0x15B),
+        0x15C   => array(0x15D),
+        0x15E   => array(0x15F),
+        0x160   => array(0x161),
+        0x162   => array(0x163),
+        0x164   => array(0x165),
+        0x166   => array(0x167),
+        0x168   => array(0x169),
+        0x16A   => array(0x16B),
+        0x16C   => array(0x16D),
+        0x16E   => array(0x16F),
+        0x170   => array(0x171),
+        0x172   => array(0x173),
+        0x174   => array(0x175),
+        0x176   => array(0x177),
+        0x178   => array(0xFF),
+        0x179   => array(0x17A),
+        0x17B   => array(0x17C),
+        0x17D   => array(0x17E),
+        0x17F   => array(0x73),
+        0x181   => array(0x253),
+        0x182   => array(0x183),
+        0x184   => array(0x185),
+        0x186   => array(0x254),
+        0x187   => array(0x188),
+        0x189   => array(0x256),
+        0x18A   => array(0x257),
+        0x18B   => array(0x18C),
+        0x18E   => array(0x1DD),
+        0x18F   => array(0x259),
+        0x190   => array(0x25B),
+        0x191   => array(0x192),
+        0x193   => array(0x260),
+        0x194   => array(0x263),
+        0x196   => array(0x269),
+        0x197   => array(0x268),
+        0x198   => array(0x199),
+        0x19C   => array(0x26F),
+        0x19D   => array(0x272),
+        0x19F   => array(0x275),
+        0x1A0   => array(0x1A1),
+        0x1A2   => array(0x1A3),
+        0x1A4   => array(0x1A5),
+        0x1A6   => array(0x280),
+        0x1A7   => array(0x1A8),
+        0x1A9   => array(0x283),
+        0x1AC   => array(0x1AD),
+        0x1AE   => array(0x288),
+        0x1AF   => array(0x1B0),
+        0x1B1   => array(0x28A),
+        0x1B2   => array(0x28B),
+        0x1B3   => array(0x1B4),
+        0x1B5   => array(0x1B6),
+        0x1B7   => array(0x292),
+        0x1B8   => array(0x1B9),
+        0x1BC   => array(0x1BD),
+        0x1C4   => array(0x1C6),
+        0x1C5   => array(0x1C6),
+        0x1C7   => array(0x1C9),
+        0x1C8   => array(0x1C9),
+        0x1CA   => array(0x1CC),
+        0x1CB   => array(0x1CC),
+        0x1CD   => array(0x1CE),
+        0x1CF   => array(0x1D0),
+        0x1D1   => array(0x1D2),
+        0x1D3   => array(0x1D4),
+        0x1D5   => array(0x1D6),
+        0x1D7   => array(0x1D8),
+        0x1D9   => array(0x1DA),
+        0x1DB   => array(0x1DC),
+        0x1DE   => array(0x1DF),
+        0x1E0   => array(0x1E1),
+        0x1E2   => array(0x1E3),
+        0x1E4   => array(0x1E5),
+        0x1E6   => array(0x1E7),
+        0x1E8   => array(0x1E9),
+        0x1EA   => array(0x1EB),
+        0x1EC   => array(0x1ED),
+        0x1EE   => array(0x1EF),
+        0x1F0   => array(0x6A, 0x30C),
+        0x1F1   => array(0x1F3),
+        0x1F2   => array(0x1F3),
+        0x1F4   => array(0x1F5),
+        0x1F6   => array(0x195),
+        0x1F7   => array(0x1BF),
+        0x1F8   => array(0x1F9),
+        0x1FA   => array(0x1FB),
+        0x1FC   => array(0x1FD),
+        0x1FE   => array(0x1FF),
+        0x200   => array(0x201),
+        0x202   => array(0x203),
+        0x204   => array(0x205),
+        0x206   => array(0x207),
+        0x208   => array(0x209),
+        0x20A   => array(0x20B),
+        0x20C   => array(0x20D),
+        0x20E   => array(0x20F),
+        0x210   => array(0x211),
+        0x212   => array(0x213),
+        0x214   => array(0x215),
+        0x216   => array(0x217),
+        0x218   => array(0x219),
+        0x21A   => array(0x21B),
+        0x21C   => array(0x21D),
+        0x21E   => array(0x21F),
+        0x220   => array(0x19E),
+        0x222   => array(0x223),
+        0x224   => array(0x225),
+        0x226   => array(0x227),
+        0x228   => array(0x229),
+        0x22A   => array(0x22B),
+        0x22C   => array(0x22D),
+        0x22E   => array(0x22F),
+        0x230   => array(0x231),
+        0x232   => array(0x233),
+        0x345   => array(0x3B9),
+        0x37A   => array(0x20, 0x3B9),
+        0x386   => array(0x3AC),
+        0x388   => array(0x3AD),
+        0x389   => array(0x3AE),
+        0x38A   => array(0x3AF),
+        0x38C   => array(0x3CC),
+        0x38E   => array(0x3CD),
+        0x38F   => array(0x3CE),
+        0x390   => array(0x3B9, 0x308, 0x301),
+        0x391   => array(0x3B1),
+        0x392   => array(0x3B2),
+        0x393   => array(0x3B3),
+        0x394   => array(0x3B4),
+        0x395   => array(0x3B5),
+        0x396   => array(0x3B6),
+        0x397   => array(0x3B7),
+        0x398   => array(0x3B8),
+        0x399   => array(0x3B9),
+        0x39A   => array(0x3BA),
+        0x39B   => array(0x3BB),
+        0x39C   => array(0x3BC),
+        0x39D   => array(0x3BD),
+        0x39E   => array(0x3BE),
+        0x39F   => array(0x3BF),
+        0x3A0   => array(0x3C0),
+        0x3A1   => array(0x3C1),
+        0x3A3   => array(0x3C3),
+        0x3A4   => array(0x3C4),
+        0x3A5   => array(0x3C5),
+        0x3A6   => array(0x3C6),
+        0x3A7   => array(0x3C7),
+        0x3A8   => array(0x3C8),
+        0x3A9   => array(0x3C9),
+        0x3AA   => array(0x3CA),
+        0x3AB   => array(0x3CB),
+        0x3B0   => array(0x3C5, 0x308, 0x301),
+        0x3C2   => array(0x3C3),
+        0x3D0   => array(0x3B2),
+        0x3D1   => array(0x3B8),
+        0x3D2   => array(0x3C5),
+        0x3D3   => array(0x3CD),
+        0x3D4   => array(0x3CB),
+        0x3D5   => array(0x3C6),
+        0x3D6   => array(0x3C0),
+        0x3D8   => array(0x3D9),
+        0x3DA   => array(0x3DB),
+        0x3DC   => array(0x3DD),
+        0x3DE   => array(0x3DF),
+        0x3E0   => array(0x3E1),
+        0x3E2   => array(0x3E3),
+        0x3E4   => array(0x3E5),
+        0x3E6   => array(0x3E7),
+        0x3E8   => array(0x3E9),
+        0x3EA   => array(0x3EB),
+        0x3EC   => array(0x3ED),
+        0x3EE   => array(0x3EF),
+        0x3F0   => array(0x3BA),
+        0x3F1   => array(0x3C1),
+        0x3F2   => array(0x3C3),
+        0x3F4   => array(0x3B8),
+        0x3F5   => array(0x3B5),
+        0x400   => array(0x450),
+        0x401   => array(0x451),
+        0x402   => array(0x452),
+        0x403   => array(0x453),
+        0x404   => array(0x454),
+        0x405   => array(0x455),
+        0x406   => array(0x456),
+        0x407   => array(0x457),
+        0x408   => array(0x458),
+        0x409   => array(0x459),
+        0x40A   => array(0x45A),
+        0x40B   => array(0x45B),
+        0x40C   => array(0x45C),
+        0x40D   => array(0x45D),
+        0x40E   => array(0x45E),
+        0x40F   => array(0x45F),
+        0x410   => array(0x430),
+        0x411   => array(0x431),
+        0x412   => array(0x432),
+        0x413   => array(0x433),
+        0x414   => array(0x434),
+        0x415   => array(0x435),
+        0x416   => array(0x436),
+        0x417   => array(0x437),
+        0x418   => array(0x438),
+        0x419   => array(0x439),
+        0x41A   => array(0x43A),
+        0x41B   => array(0x43B),
+        0x41C   => array(0x43C),
+        0x41D   => array(0x43D),
+        0x41E   => array(0x43E),
+        0x41F   => array(0x43F),
+        0x420   => array(0x440),
+        0x421   => array(0x441),
+        0x422   => array(0x442),
+        0x423   => array(0x443),
+        0x424   => array(0x444),
+        0x425   => array(0x445),
+        0x426   => array(0x446),
+        0x427   => array(0x447),
+        0x428   => array(0x448),
+        0x429   => array(0x449),
+        0x42A   => array(0x44A),
+        0x42B   => array(0x44B),
+        0x42C   => array(0x44C),
+        0x42D   => array(0x44D),
+        0x42E   => array(0x44E),
+        0x42F   => array(0x44F),
+        0x460   => array(0x461),
+        0x462   => array(0x463),
+        0x464   => array(0x465),
+        0x466   => array(0x467),
+        0x468   => array(0x469),
+        0x46A   => array(0x46B),
+        0x46C   => array(0x46D),
+        0x46E   => array(0x46F),
+        0x470   => array(0x471),
+        0x472   => array(0x473),
+        0x474   => array(0x475),
+        0x476   => array(0x477),
+        0x478   => array(0x479),
+        0x47A   => array(0x47B),
+        0x47C   => array(0x47D),
+        0x47E   => array(0x47F),
+        0x480   => array(0x481),
+        0x48A   => array(0x48B),
+        0x48C   => array(0x48D),
+        0x48E   => array(0x48F),
+        0x490   => array(0x491),
+        0x492   => array(0x493),
+        0x494   => array(0x495),
+        0x496   => array(0x497),
+        0x498   => array(0x499),
+        0x49A   => array(0x49B),
+        0x49C   => array(0x49D),
+        0x49E   => array(0x49F),
+        0x4A0   => array(0x4A1),
+        0x4A2   => array(0x4A3),
+        0x4A4   => array(0x4A5),
+        0x4A6   => array(0x4A7),
+        0x4A8   => array(0x4A9),
+        0x4AA   => array(0x4AB),
+        0x4AC   => array(0x4AD),
+        0x4AE   => array(0x4AF),
+        0x4B0   => array(0x4B1),
+        0x4B2   => array(0x4B3),
+        0x4B4   => array(0x4B5),
+        0x4B6   => array(0x4B7),
+        0x4B8   => array(0x4B9),
+        0x4BA   => array(0x4BB),
+        0x4BC   => array(0x4BD),
+        0x4BE   => array(0x4BF),
+        0x4C1   => array(0x4C2),
+        0x4C3   => array(0x4C4),
+        0x4C5   => array(0x4C6),
+        0x4C7   => array(0x4C8),
+        0x4C9   => array(0x4CA),
+        0x4CB   => array(0x4CC),
+        0x4CD   => array(0x4CE),
+        0x4D0   => array(0x4D1),
+        0x4D2   => array(0x4D3),
+        0x4D4   => array(0x4D5),
+        0x4D6   => array(0x4D7),
+        0x4D8   => array(0x4D9),
+        0x4DA   => array(0x4DB),
+        0x4DC   => array(0x4DD),
+        0x4DE   => array(0x4DF),
+        0x4E0   => array(0x4E1),
+        0x4E2   => array(0x4E3),
+        0x4E4   => array(0x4E5),
+        0x4E6   => array(0x4E7),
+        0x4E8   => array(0x4E9),
+        0x4EA   => array(0x4EB),
+        0x4EC   => array(0x4ED),
+        0x4EE   => array(0x4EF),
+        0x4F0   => array(0x4F1),
+        0x4F2   => array(0x4F3),
+        0x4F4   => array(0x4F5),
+        0x4F8   => array(0x4F9),
+        0x500   => array(0x501),
+        0x502   => array(0x503),
+        0x504   => array(0x505),
+        0x506   => array(0x507),
+        0x508   => array(0x509),
+        0x50A   => array(0x50B),
+        0x50C   => array(0x50D),
+        0x50E   => array(0x50F),
+        0x531   => array(0x561),
+        0x532   => array(0x562),
+        0x533   => array(0x563),
+        0x534   => array(0x564),
+        0x535   => array(0x565),
+        0x536   => array(0x566),
+        0x537   => array(0x567),
+        0x538   => array(0x568),
+        0x539   => array(0x569),
+        0x53A   => array(0x56A),
+        0x53B   => array(0x56B),
+        0x53C   => array(0x56C),
+        0x53D   => array(0x56D),
+        0x53E   => array(0x56E),
+        0x53F   => array(0x56F),
+        0x540   => array(0x570),
+        0x541   => array(0x571),
+        0x542   => array(0x572),
+        0x543   => array(0x573),
+        0x544   => array(0x574),
+        0x545   => array(0x575),
+        0x546   => array(0x576),
+        0x547   => array(0x577),
+        0x548   => array(0x578),
+        0x549   => array(0x579),
+        0x54A   => array(0x57A),
+        0x54B   => array(0x57B),
+        0x54C   => array(0x57C),
+        0x54D   => array(0x57D),
+        0x54E   => array(0x57E),
+        0x54F   => array(0x57F),
+        0x550   => array(0x580),
+        0x551   => array(0x581),
+        0x552   => array(0x582),
+        0x553   => array(0x583),
+        0x554   => array(0x584),
+        0x555   => array(0x585),
+        0x556   => array(0x586),
+        0x587   => array(0x565, 0x582),
+        0x1E00  => array(0x1E01),
+        0x1E02  => array(0x1E03),
+        0x1E04  => array(0x1E05),
+        0x1E06  => array(0x1E07),
+        0x1E08  => array(0x1E09),
+        0x1E0A  => array(0x1E0B),
+        0x1E0C  => array(0x1E0D),
+        0x1E0E  => array(0x1E0F),
+        0x1E10  => array(0x1E11),
+        0x1E12  => array(0x1E13),
+        0x1E14  => array(0x1E15),
+        0x1E16  => array(0x1E17),
+        0x1E18  => array(0x1E19),
+        0x1E1A  => array(0x1E1B),
+        0x1E1C  => array(0x1E1D),
+        0x1E1E  => array(0x1E1F),
+        0x1E20  => array(0x1E21),
+        0x1E22  => array(0x1E23),
+        0x1E24  => array(0x1E25),
+        0x1E26  => array(0x1E27),
+        0x1E28  => array(0x1E29),
+        0x1E2A  => array(0x1E2B),
+        0x1E2C  => array(0x1E2D),
+        0x1E2E  => array(0x1E2F),
+        0x1E30  => array(0x1E31),
+        0x1E32  => array(0x1E33),
+        0x1E34  => array(0x1E35),
+        0x1E36  => array(0x1E37),
+        0x1E38  => array(0x1E39),
+        0x1E3A  => array(0x1E3B),
+        0x1E3C  => array(0x1E3D),
+        0x1E3E  => array(0x1E3F),
+        0x1E40  => array(0x1E41),
+        0x1E42  => array(0x1E43),
+        0x1E44  => array(0x1E45),
+        0x1E46  => array(0x1E47),
+        0x1E48  => array(0x1E49),
+        0x1E4A  => array(0x1E4B),
+        0x1E4C  => array(0x1E4D),
+        0x1E4E  => array(0x1E4F),
+        0x1E50  => array(0x1E51),
+        0x1E52  => array(0x1E53),
+        0x1E54  => array(0x1E55),
+        0x1E56  => array(0x1E57),
+        0x1E58  => array(0x1E59),
+        0x1E5A  => array(0x1E5B),
+        0x1E5C  => array(0x1E5D),
+        0x1E5E  => array(0x1E5F),
+        0x1E60  => array(0x1E61),
+        0x1E62  => array(0x1E63),
+        0x1E64  => array(0x1E65),
+        0x1E66  => array(0x1E67),
+        0x1E68  => array(0x1E69),
+        0x1E6A  => array(0x1E6B),
+        0x1E6C  => array(0x1E6D),
+        0x1E6E  => array(0x1E6F),
+        0x1E70  => array(0x1E71),
+        0x1E72  => array(0x1E73),
+        0x1E74  => array(0x1E75),
+        0x1E76  => array(0x1E77),
+        0x1E78  => array(0x1E79),
+        0x1E7A  => array(0x1E7B),
+        0x1E7C  => array(0x1E7D),
+        0x1E7E  => array(0x1E7F),
+        0x1E80  => array(0x1E81),
+        0x1E82  => array(0x1E83),
+        0x1E84  => array(0x1E85),
+        0x1E86  => array(0x1E87),
+        0x1E88  => array(0x1E89),
+        0x1E8A  => array(0x1E8B),
+        0x1E8C  => array(0x1E8D),
+        0x1E8E  => array(0x1E8F),
+        0x1E90  => array(0x1E91),
+        0x1E92  => array(0x1E93),
+        0x1E94  => array(0x1E95),
+        0x1E96  => array(0x68, 0x331),
+        0x1E97  => array(0x74, 0x308),
+        0x1E98  => array(0x77, 0x30A),
+        0x1E99  => array(0x79, 0x30A),
+        0x1E9A  => array(0x61, 0x2BE),
+        0x1E9B  => array(0x1E61),
+        0x1EA0  => array(0x1EA1),
+        0x1EA2  => array(0x1EA3),
+        0x1EA4  => array(0x1EA5),
+        0x1EA6  => array(0x1EA7),
+        0x1EA8  => array(0x1EA9),
+        0x1EAA  => array(0x1EAB),
+        0x1EAC  => array(0x1EAD),
+        0x1EAE  => array(0x1EAF),
+        0x1EB0  => array(0x1EB1),
+        0x1EB2  => array(0x1EB3),
+        0x1EB4  => array(0x1EB5),
+        0x1EB6  => array(0x1EB7),
+        0x1EB8  => array(0x1EB9),
+        0x1EBA  => array(0x1EBB),
+        0x1EBC  => array(0x1EBD),
+        0x1EBE  => array(0x1EBF),
+        0x1EC0  => array(0x1EC1),
+        0x1EC2  => array(0x1EC3),
+        0x1EC4  => array(0x1EC5),
+        0x1EC6  => array(0x1EC7),
+        0x1EC8  => array(0x1EC9),
+        0x1ECA  => array(0x1ECB),
+        0x1ECC  => array(0x1ECD),
+        0x1ECE  => array(0x1ECF),
+        0x1ED0  => array(0x1ED1),
+        0x1ED2  => array(0x1ED3),
+        0x1ED4  => array(0x1ED5),
+        0x1ED6  => array(0x1ED7),
+        0x1ED8  => array(0x1ED9),
+        0x1EDA  => array(0x1EDB),
+        0x1EDC  => array(0x1EDD),
+        0x1EDE  => array(0x1EDF),
+        0x1EE0  => array(0x1EE1),
+        0x1EE2  => array(0x1EE3),
+        0x1EE4  => array(0x1EE5),
+        0x1EE6  => array(0x1EE7),
+        0x1EE8  => array(0x1EE9),
+        0x1EEA  => array(0x1EEB),
+        0x1EEC  => array(0x1EED),
+        0x1EEE  => array(0x1EEF),
+        0x1EF0  => array(0x1EF1),
+        0x1EF2  => array(0x1EF3),
+        0x1EF4  => array(0x1EF5),
+        0x1EF6  => array(0x1EF7),
+        0x1EF8  => array(0x1EF9),
+        0x1F08  => array(0x1F00),
+        0x1F09  => array(0x1F01),
+        0x1F0A  => array(0x1F02),
+        0x1F0B  => array(0x1F03),
+        0x1F0C  => array(0x1F04),
+        0x1F0D  => array(0x1F05),
+        0x1F0E  => array(0x1F06),
+        0x1F0F  => array(0x1F07),
+        0x1F18  => array(0x1F10),
+        0x1F19  => array(0x1F11),
+        0x1F1A  => array(0x1F12),
+        0x1F1B  => array(0x1F13),
+        0x1F1C  => array(0x1F14),
+        0x1F1D  => array(0x1F15),
+        0x1F28  => array(0x1F20),
+        0x1F29  => array(0x1F21),
+        0x1F2A  => array(0x1F22),
+        0x1F2B  => array(0x1F23),
+        0x1F2C  => array(0x1F24),
+        0x1F2D  => array(0x1F25),
+        0x1F2E  => array(0x1F26),
+        0x1F2F  => array(0x1F27),
+        0x1F38  => array(0x1F30),
+        0x1F39  => array(0x1F31),
+        0x1F3A  => array(0x1F32),
+        0x1F3B  => array(0x1F33),
+        0x1F3C  => array(0x1F34),
+        0x1F3D  => array(0x1F35),
+        0x1F3E  => array(0x1F36),
+        0x1F3F  => array(0x1F37),
+        0x1F48  => array(0x1F40),
+        0x1F49  => array(0x1F41),
+        0x1F4A  => array(0x1F42),
+        0x1F4B  => array(0x1F43),
+        0x1F4C  => array(0x1F44),
+        0x1F4D  => array(0x1F45),
+        0x1F50  => array(0x3C5, 0x313),
+        0x1F52  => array(0x3C5, 0x313, 0x300),
+        0x1F54  => array(0x3C5, 0x313, 0x301),
+        0x1F56  => array(0x3C5, 0x313, 0x342),
+        0x1F59  => array(0x1F51),
+        0x1F5B  => array(0x1F53),
+        0x1F5D  => array(0x1F55),
+        0x1F5F  => array(0x1F57),
+        0x1F68  => array(0x1F60),
+        0x1F69  => array(0x1F61),
+        0x1F6A  => array(0x1F62),
+        0x1F6B  => array(0x1F63),
+        0x1F6C  => array(0x1F64),
+        0x1F6D  => array(0x1F65),
+        0x1F6E  => array(0x1F66),
+        0x1F6F  => array(0x1F67),
+        0x1F80  => array(0x1F00, 0x3B9),
+        0x1F81  => array(0x1F01, 0x3B9),
+        0x1F82  => array(0x1F02, 0x3B9),
+        0x1F83  => array(0x1F03, 0x3B9),
+        0x1F84  => array(0x1F04, 0x3B9),
+        0x1F85  => array(0x1F05, 0x3B9),
+        0x1F86  => array(0x1F06, 0x3B9),
+        0x1F87  => array(0x1F07, 0x3B9),
+        0x1F88  => array(0x1F00, 0x3B9),
+        0x1F89  => array(0x1F01, 0x3B9),
+        0x1F8A  => array(0x1F02, 0x3B9),
+        0x1F8B  => array(0x1F03, 0x3B9),
+        0x1F8C  => array(0x1F04, 0x3B9),
+        0x1F8D  => array(0x1F05, 0x3B9),
+        0x1F8E  => array(0x1F06, 0x3B9),
+        0x1F8F  => array(0x1F07, 0x3B9),
+        0x1F90  => array(0x1F20, 0x3B9),
+        0x1F91  => array(0x1F21, 0x3B9),
+        0x1F92  => array(0x1F22, 0x3B9),
+        0x1F93  => array(0x1F23, 0x3B9),
+        0x1F94  => array(0x1F24, 0x3B9),
+        0x1F95  => array(0x1F25, 0x3B9),
+        0x1F96  => array(0x1F26, 0x3B9),
+        0x1F97  => array(0x1F27, 0x3B9),
+        0x1F98  => array(0x1F20, 0x3B9),
+        0x1F99  => array(0x1F21, 0x3B9),
+        0x1F9A  => array(0x1F22, 0x3B9),
+        0x1F9B  => array(0x1F23, 0x3B9),
+        0x1F9C  => array(0x1F24, 0x3B9),
+        0x1F9D  => array(0x1F25, 0x3B9),
+        0x1F9E  => array(0x1F26, 0x3B9),
+        0x1F9F  => array(0x1F27, 0x3B9),
+        0x1FA0  => array(0x1F60, 0x3B9),
+        0x1FA1  => array(0x1F61, 0x3B9),
+        0x1FA2  => array(0x1F62, 0x3B9),
+        0x1FA3  => array(0x1F63, 0x3B9),
+        0x1FA4  => array(0x1F64, 0x3B9),
+        0x1FA5  => array(0x1F65, 0x3B9),
+        0x1FA6  => array(0x1F66, 0x3B9),
+        0x1FA7  => array(0x1F67, 0x3B9),
+        0x1FA8  => array(0x1F60, 0x3B9),
+        0x1FA9  => array(0x1F61, 0x3B9),
+        0x1FAA  => array(0x1F62, 0x3B9),
+        0x1FAB  => array(0x1F63, 0x3B9),
+        0x1FAC  => array(0x1F64, 0x3B9),
+        0x1FAD  => array(0x1F65, 0x3B9),
+        0x1FAE  => array(0x1F66, 0x3B9),
+        0x1FAF  => array(0x1F67, 0x3B9),
+        0x1FB2  => array(0x1F70, 0x3B9),
+        0x1FB3  => array(0x3B1, 0x3B9),
+        0x1FB4  => array(0x3AC, 0x3B9),
+        0x1FB6  => array(0x3B1, 0x342),
+        0x1FB7  => array(0x3B1, 0x342, 0x3B9),
+        0x1FB8  => array(0x1FB0),
+        0x1FB9  => array(0x1FB1),
+        0x1FBA  => array(0x1F70),
+        0x1FBB  => array(0x1F71),
+        0x1FBC  => array(0x3B1, 0x3B9),
+        0x1FBE  => array(0x3B9),
+        0x1FC2  => array(0x1F74, 0x3B9),
+        0x1FC3  => array(0x3B7, 0x3B9),
+        0x1FC4  => array(0x3AE, 0x3B9),
+        0x1FC6  => array(0x3B7, 0x342),
+        0x1FC7  => array(0x3B7, 0x342, 0x3B9),
+        0x1FC8  => array(0x1F72),
+        0x1FC9  => array(0x1F73),
+        0x1FCA  => array(0x1F74),
+        0x1FCB  => array(0x1F75),
+        0x1FCC  => array(0x3B7, 0x3B9),
+        0x1FD2  => array(0x3B9, 0x308, 0x300),
+        0x1FD3  => array(0x3B9, 0x308, 0x301),
+        0x1FD6  => array(0x3B9, 0x342),
+        0x1FD7  => array(0x3B9, 0x308, 0x342),
+        0x1FD8  => array(0x1FD0),
+        0x1FD9  => array(0x1FD1),
+        0x1FDA  => array(0x1F76),
+        0x1FDB  => array(0x1F77),
+        0x1FE2  => array(0x3C5, 0x308, 0x300),
+        0x1FE3  => array(0x3C5, 0x308, 0x301),
+        0x1FE4  => array(0x3C1, 0x313),
+        0x1FE6  => array(0x3C5, 0x342),
+        0x1FE7  => array(0x3C5, 0x308, 0x342),
+        0x1FE8  => array(0x1FE0),
+        0x1FE9  => array(0x1FE1),
+        0x1FEA  => array(0x1F7A),
+        0x1FEB  => array(0x1F7B),
+        0x1FEC  => array(0x1FE5),
+        0x1FF2  => array(0x1F7C, 0x3B9),
+        0x1FF3  => array(0x3C9, 0x3B9),
+        0x1FF4  => array(0x3CE, 0x3B9),
+        0x1FF6  => array(0x3C9, 0x342),
+        0x1FF7  => array(0x3C9, 0x342, 0x3B9),
+        0x1FF8  => array(0x1F78),
+        0x1FF9  => array(0x1F79),
+        0x1FFA  => array(0x1F7C),
+        0x1FFB  => array(0x1F7D),
+        0x1FFC  => array(0x3C9, 0x3B9),
+        0x20A8  => array(0x72, 0x73),
+        0x2102  => array(0x63),
+        0x2103  => array(0xB0, 0x63),
+        0x2107  => array(0x25B),
+        0x2109  => array(0xB0, 0x66),
+        0x210B  => array(0x68),
+        0x210C  => array(0x68),
+        0x210D  => array(0x68),
+        0x2110  => array(0x69),
+        0x2111  => array(0x69),
+        0x2112  => array(0x6C),
+        0x2115  => array(0x6E),
+        0x2116  => array(0x6E, 0x6F),
+        0x2119  => array(0x70),
+        0x211A  => array(0x71),
+        0x211B  => array(0x72),
+        0x211C  => array(0x72),
+        0x211D  => array(0x72),
+        0x2120  => array(0x73, 0x6D),
+        0x2121  => array(0x74, 0x65, 0x6C),
+        0x2122  => array(0x74, 0x6D),
+        0x2124  => array(0x7A),
+        0x2126  => array(0x3C9),
+        0x2128  => array(0x7A),
+        0x212A  => array(0x6B),
+        0x212B  => array(0xE5),
+        0x212C  => array(0x62),
+        0x212D  => array(0x63),
+        0x2130  => array(0x65),
+        0x2131  => array(0x66),
+        0x2133  => array(0x6D),
+        0x213E  => array(0x3B3),
+        0x213F  => array(0x3C0),
+        0x2145  => array(0x64),
+        0x2160  => array(0x2170),
+        0x2161  => array(0x2171),
+        0x2162  => array(0x2172),
+        0x2163  => array(0x2173),
+        0x2164  => array(0x2174),
+        0x2165  => array(0x2175),
+        0x2166  => array(0x2176),
+        0x2167  => array(0x2177),
+        0x2168  => array(0x2178),
+        0x2169  => array(0x2179),
+        0x216A  => array(0x217A),
+        0x216B  => array(0x217B),
+        0x216C  => array(0x217C),
+        0x216D  => array(0x217D),
+        0x216E  => array(0x217E),
+        0x216F  => array(0x217F),
+        0x24B6  => array(0x24D0),
+        0x24B7  => array(0x24D1),
+        0x24B8  => array(0x24D2),
+        0x24B9  => array(0x24D3),
+        0x24BA  => array(0x24D4),
+        0x24BB  => array(0x24D5),
+        0x24BC  => array(0x24D6),
+        0x24BD  => array(0x24D7),
+        0x24BE  => array(0x24D8),
+        0x24BF  => array(0x24D9),
+        0x24C0  => array(0x24DA),
+        0x24C1  => array(0x24DB),
+        0x24C2  => array(0x24DC),
+        0x24C3  => array(0x24DD),
+        0x24C4  => array(0x24DE),
+        0x24C5  => array(0x24DF),
+        0x24C6  => array(0x24E0),
+        0x24C7  => array(0x24E1),
+        0x24C8  => array(0x24E2),
+        0x24C9  => array(0x24E3),
+        0x24CA  => array(0x24E4),
+        0x24CB  => array(0x24E5),
+        0x24CC  => array(0x24E6),
+        0x24CD  => array(0x24E7),
+        0x24CE  => array(0x24E8),
+        0x24CF  => array(0x24E9),
+        0x3371  => array(0x68, 0x70, 0x61),
+        0x3373  => array(0x61, 0x75),
+        0x3375  => array(0x6F, 0x76),
+        0x3380  => array(0x70, 0x61),
+        0x3381  => array(0x6E, 0x61),
+        0x3382  => array(0x3BC, 0x61),
+        0x3383  => array(0x6D, 0x61),
+        0x3384  => array(0x6B, 0x61),
+        0x3385  => array(0x6B, 0x62),
+        0x3386  => array(0x6D, 0x62),
+        0x3387  => array(0x67, 0x62),
+        0x338A  => array(0x70, 0x66),
+        0x338B  => array(0x6E, 0x66),
+        0x338C  => array(0x3BC, 0x66),
+        0x3390  => array(0x68, 0x7A),
+        0x3391  => array(0x6B, 0x68, 0x7A),
+        0x3392  => array(0x6D, 0x68, 0x7A),
+        0x3393  => array(0x67, 0x68, 0x7A),
+        0x3394  => array(0x74, 0x68, 0x7A),
+        0x33A9  => array(0x70, 0x61),
+        0x33AA  => array(0x6B, 0x70, 0x61),
+        0x33AB  => array(0x6D, 0x70, 0x61),
+        0x33AC  => array(0x67, 0x70, 0x61),
+        0x33B4  => array(0x70, 0x76),
+        0x33B5  => array(0x6E, 0x76),
+        0x33B6  => array(0x3BC, 0x76),
+        0x33B7  => array(0x6D, 0x76),
+        0x33B8  => array(0x6B, 0x76),
+        0x33B9  => array(0x6D, 0x76),
+        0x33BA  => array(0x70, 0x77),
+        0x33BB  => array(0x6E, 0x77),
+        0x33BC  => array(0x3BC, 0x77),
+        0x33BD  => array(0x6D, 0x77),
+        0x33BE  => array(0x6B, 0x77),
+        0x33BF  => array(0x6D, 0x77),
+        0x33C0  => array(0x6B, 0x3C9),
+        0x33C1  => array(0x6D, 0x3C9),
+        /* 0x33C2  => array(0x61, 0x2E, 0x6D, 0x2E), */
+        0x33C3  => array(0x62, 0x71),
+        0x33C6  => array(0x63, 0x2215, 0x6B, 0x67),
+        0x33C7  => array(0x63, 0x6F, 0x2E),
+        0x33C8  => array(0x64, 0x62),
+        0x33C9  => array(0x67, 0x79),
+        0x33CB  => array(0x68, 0x70),
+        0x33CD  => array(0x6B, 0x6B),
+        0x33CE  => array(0x6B, 0x6D),
+        0x33D7  => array(0x70, 0x68),
+        0x33D9  => array(0x70, 0x70, 0x6D),
+        0x33DA  => array(0x70, 0x72),
+        0x33DC  => array(0x73, 0x76),
+        0x33DD  => array(0x77, 0x62),
+        0xFB00  => array(0x66, 0x66),
+        0xFB01  => array(0x66, 0x69),
+        0xFB02  => array(0x66, 0x6C),
+        0xFB03  => array(0x66, 0x66, 0x69),
+        0xFB04  => array(0x66, 0x66, 0x6C),
+        0xFB05  => array(0x73, 0x74),
+        0xFB06  => array(0x73, 0x74),
+        0xFB13  => array(0x574, 0x576),
+        0xFB14  => array(0x574, 0x565),
+        0xFB15  => array(0x574, 0x56B),
+        0xFB16  => array(0x57E, 0x576),
+        0xFB17  => array(0x574, 0x56D),
+        0xFF21  => array(0xFF41),
+        0xFF22  => array(0xFF42),
+        0xFF23  => array(0xFF43),
+        0xFF24  => array(0xFF44),
+        0xFF25  => array(0xFF45),
+        0xFF26  => array(0xFF46),
+        0xFF27  => array(0xFF47),
+        0xFF28  => array(0xFF48),
+        0xFF29  => array(0xFF49),
+        0xFF2A  => array(0xFF4A),
+        0xFF2B  => array(0xFF4B),
+        0xFF2C  => array(0xFF4C),
+        0xFF2D  => array(0xFF4D),
+        0xFF2E  => array(0xFF4E),
+        0xFF2F  => array(0xFF4F),
+        0xFF30  => array(0xFF50),
+        0xFF31  => array(0xFF51),
+        0xFF32  => array(0xFF52),
+        0xFF33  => array(0xFF53),
+        0xFF34  => array(0xFF54),
+        0xFF35  => array(0xFF55),
+        0xFF36  => array(0xFF56),
+        0xFF37  => array(0xFF57),
+        0xFF38  => array(0xFF58),
+        0xFF39  => array(0xFF59),
+        0xFF3A  => array(0xFF5A),
+        0x10400 => array(0x10428),
+        0x10401 => array(0x10429),
+        0x10402 => array(0x1042A),
+        0x10403 => array(0x1042B),
+        0x10404 => array(0x1042C),
+        0x10405 => array(0x1042D),
+        0x10406 => array(0x1042E),
+        0x10407 => array(0x1042F),
+        0x10408 => array(0x10430),
+        0x10409 => array(0x10431),
+        0x1040A => array(0x10432),
+        0x1040B => array(0x10433),
+        0x1040C => array(0x10434),
+        0x1040D => array(0x10435),
+        0x1040E => array(0x10436),
+        0x1040F => array(0x10437),
+        0x10410 => array(0x10438),
+        0x10411 => array(0x10439),
+        0x10412 => array(0x1043A),
+        0x10413 => array(0x1043B),
+        0x10414 => array(0x1043C),
+        0x10415 => array(0x1043D),
+        0x10416 => array(0x1043E),
+        0x10417 => array(0x1043F),
+        0x10418 => array(0x10440),
+        0x10419 => array(0x10441),
+        0x1041A => array(0x10442),
+        0x1041B => array(0x10443),
+        0x1041C => array(0x10444),
+        0x1041D => array(0x10445),
+        0x1041E => array(0x10446),
+        0x1041F => array(0x10447),
+        0x10420 => array(0x10448),
+        0x10421 => array(0x10449),
+        0x10422 => array(0x1044A),
+        0x10423 => array(0x1044B),
+        0x10424 => array(0x1044C),
+        0x10425 => array(0x1044D),
+        0x1D400 => array(0x61),
+        0x1D401 => array(0x62),
+        0x1D402 => array(0x63),
+        0x1D403 => array(0x64),
+        0x1D404 => array(0x65),
+        0x1D405 => array(0x66),
+        0x1D406 => array(0x67),
+        0x1D407 => array(0x68),
+        0x1D408 => array(0x69),
+        0x1D409 => array(0x6A),
+        0x1D40A => array(0x6B),
+        0x1D40B => array(0x6C),
+        0x1D40C => array(0x6D),
+        0x1D40D => array(0x6E),
+        0x1D40E => array(0x6F),
+        0x1D40F => array(0x70),
+        0x1D410 => array(0x71),
+        0x1D411 => array(0x72),
+        0x1D412 => array(0x73),
+        0x1D413 => array(0x74),
+        0x1D414 => array(0x75),
+        0x1D415 => array(0x76),
+        0x1D416 => array(0x77),
+        0x1D417 => array(0x78),
+        0x1D418 => array(0x79),
+        0x1D419 => array(0x7A),
+        0x1D434 => array(0x61),
+        0x1D435 => array(0x62),
+        0x1D436 => array(0x63),
+        0x1D437 => array(0x64),
+        0x1D438 => array(0x65),
+        0x1D439 => array(0x66),
+        0x1D43A => array(0x67),
+        0x1D43B => array(0x68),
+        0x1D43C => array(0x69),
+        0x1D43D => array(0x6A),
+        0x1D43E => array(0x6B),
+        0x1D43F => array(0x6C),
+        0x1D440 => array(0x6D),
+        0x1D441 => array(0x6E),
+        0x1D442 => array(0x6F),
+        0x1D443 => array(0x70),
+        0x1D444 => array(0x71),
+        0x1D445 => array(0x72),
+        0x1D446 => array(0x73),
+        0x1D447 => array(0x74),
+        0x1D448 => array(0x75),
+        0x1D449 => array(0x76),
+        0x1D44A => array(0x77),
+        0x1D44B => array(0x78),
+        0x1D44C => array(0x79),
+        0x1D44D => array(0x7A),
+        0x1D468 => array(0x61),
+        0x1D469 => array(0x62),
+        0x1D46A => array(0x63),
+        0x1D46B => array(0x64),
+        0x1D46C => array(0x65),
+        0x1D46D => array(0x66),
+        0x1D46E => array(0x67),
+        0x1D46F => array(0x68),
+        0x1D470 => array(0x69),
+        0x1D471 => array(0x6A),
+        0x1D472 => array(0x6B),
+        0x1D473 => array(0x6C),
+        0x1D474 => array(0x6D),
+        0x1D475 => array(0x6E),
+        0x1D476 => array(0x6F),
+        0x1D477 => array(0x70),
+        0x1D478 => array(0x71),
+        0x1D479 => array(0x72),
+        0x1D47A => array(0x73),
+        0x1D47B => array(0x74),
+        0x1D47C => array(0x75),
+        0x1D47D => array(0x76),
+        0x1D47E => array(0x77),
+        0x1D47F => array(0x78),
+        0x1D480 => array(0x79),
+        0x1D481 => array(0x7A),
+        0x1D49C => array(0x61),
+        0x1D49E => array(0x63),
+        0x1D49F => array(0x64),
+        0x1D4A2 => array(0x67),
+        0x1D4A5 => array(0x6A),
+        0x1D4A6 => array(0x6B),
+        0x1D4A9 => array(0x6E),
+        0x1D4AA => array(0x6F),
+        0x1D4AB => array(0x70),
+        0x1D4AC => array(0x71),
+        0x1D4AE => array(0x73),
+        0x1D4AF => array(0x74),
+        0x1D4B0 => array(0x75),
+        0x1D4B1 => array(0x76),
+        0x1D4B2 => array(0x77),
+        0x1D4B3 => array(0x78),
+        0x1D4B4 => array(0x79),
+        0x1D4B5 => array(0x7A),
+        0x1D4D0 => array(0x61),
+        0x1D4D1 => array(0x62),
+        0x1D4D2 => array(0x63),
+        0x1D4D3 => array(0x64),
+        0x1D4D4 => array(0x65),
+        0x1D4D5 => array(0x66),
+        0x1D4D6 => array(0x67),
+        0x1D4D7 => array(0x68),
+        0x1D4D8 => array(0x69),
+        0x1D4D9 => array(0x6A),
+        0x1D4DA => array(0x6B),
+        0x1D4DB => array(0x6C),
+        0x1D4DC => array(0x6D),
+        0x1D4DD => array(0x6E),
+        0x1D4DE => array(0x6F),
+        0x1D4DF => array(0x70),
+        0x1D4E0 => array(0x71),
+        0x1D4E1 => array(0x72),
+        0x1D4E2 => array(0x73),
+        0x1D4E3 => array(0x74),
+        0x1D4E4 => array(0x75),
+        0x1D4E5 => array(0x76),
+        0x1D4E6 => array(0x77),
+        0x1D4E7 => array(0x78),
+        0x1D4E8 => array(0x79),
+        0x1D4E9 => array(0x7A),
+        0x1D504 => array(0x61),
+        0x1D505 => array(0x62),
+        0x1D507 => array(0x64),
+        0x1D508 => array(0x65),
+        0x1D509 => array(0x66),
+        0x1D50A => array(0x67),
+        0x1D50D => array(0x6A),
+        0x1D50E => array(0x6B),
+        0x1D50F => array(0x6C),
+        0x1D510 => array(0x6D),
+        0x1D511 => array(0x6E),
+        0x1D512 => array(0x6F),
+        0x1D513 => array(0x70),
+        0x1D514 => array(0x71),
+        0x1D516 => array(0x73),
+        0x1D517 => array(0x74),
+        0x1D518 => array(0x75),
+        0x1D519 => array(0x76),
+        0x1D51A => array(0x77),
+        0x1D51B => array(0x78),
+        0x1D51C => array(0x79),
+        0x1D538 => array(0x61),
+        0x1D539 => array(0x62),
+        0x1D53B => array(0x64),
+        0x1D53C => array(0x65),
+        0x1D53D => array(0x66),
+        0x1D53E => array(0x67),
+        0x1D540 => array(0x69),
+        0x1D541 => array(0x6A),
+        0x1D542 => array(0x6B),
+        0x1D543 => array(0x6C),
+        0x1D544 => array(0x6D),
+        0x1D546 => array(0x6F),
+        0x1D54A => array(0x73),
+        0x1D54B => array(0x74),
+        0x1D54C => array(0x75),
+        0x1D54D => array(0x76),
+        0x1D54E => array(0x77),
+        0x1D54F => array(0x78),
+        0x1D550 => array(0x79),
+        0x1D56C => array(0x61),
+        0x1D56D => array(0x62),
+        0x1D56E => array(0x63),
+        0x1D56F => array(0x64),
+        0x1D570 => array(0x65),
+        0x1D571 => array(0x66),
+        0x1D572 => array(0x67),
+        0x1D573 => array(0x68),
+        0x1D574 => array(0x69),
+        0x1D575 => array(0x6A),
+        0x1D576 => array(0x6B),
+        0x1D577 => array(0x6C),
+        0x1D578 => array(0x6D),
+        0x1D579 => array(0x6E),
+        0x1D57A => array(0x6F),
+        0x1D57B => array(0x70),
+        0x1D57C => array(0x71),
+        0x1D57D => array(0x72),
+        0x1D57E => array(0x73),
+        0x1D57F => array(0x74),
+        0x1D580 => array(0x75),
+        0x1D581 => array(0x76),
+        0x1D582 => array(0x77),
+        0x1D583 => array(0x78),
+        0x1D584 => array(0x79),
+        0x1D585 => array(0x7A),
+        0x1D5A0 => array(0x61),
+        0x1D5A1 => array(0x62),
+        0x1D5A2 => array(0x63),
+        0x1D5A3 => array(0x64),
+        0x1D5A4 => array(0x65),
+        0x1D5A5 => array(0x66),
+        0x1D5A6 => array(0x67),
+        0x1D5A7 => array(0x68),
+        0x1D5A8 => array(0x69),
+        0x1D5A9 => array(0x6A),
+        0x1D5AA => array(0x6B),
+        0x1D5AB => array(0x6C),
+        0x1D5AC => array(0x6D),
+        0x1D5AD => array(0x6E),
+        0x1D5AE => array(0x6F),
+        0x1D5AF => array(0x70),
+        0x1D5B0 => array(0x71),
+        0x1D5B1 => array(0x72),
+        0x1D5B2 => array(0x73),
+        0x1D5B3 => array(0x74),
+        0x1D5B4 => array(0x75),
+        0x1D5B5 => array(0x76),
+        0x1D5B6 => array(0x77),
+        0x1D5B7 => array(0x78),
+        0x1D5B8 => array(0x79),
+        0x1D5B9 => array(0x7A),
+        0x1D5D4 => array(0x61),
+        0x1D5D5 => array(0x62),
+        0x1D5D6 => array(0x63),
+        0x1D5D7 => array(0x64),
+        0x1D5D8 => array(0x65),
+        0x1D5D9 => array(0x66),
+        0x1D5DA => array(0x67),
+        0x1D5DB => array(0x68),
+        0x1D5DC => array(0x69),
+        0x1D5DD => array(0x6A),
+        0x1D5DE => array(0x6B),
+        0x1D5DF => array(0x6C),
+        0x1D5E0 => array(0x6D),
+        0x1D5E1 => array(0x6E),
+        0x1D5E2 => array(0x6F),
+        0x1D5E3 => array(0x70),
+        0x1D5E4 => array(0x71),
+        0x1D5E5 => array(0x72),
+        0x1D5E6 => array(0x73),
+        0x1D5E7 => array(0x74),
+        0x1D5E8 => array(0x75),
+        0x1D5E9 => array(0x76),
+        0x1D5EA => array(0x77),
+        0x1D5EB => array(0x78),
+        0x1D5EC => array(0x79),
+        0x1D5ED => array(0x7A),
+        0x1D608 => array(0x61),
+        0x1D609 => array(0x62),
+        0x1D60A => array(0x63),
+        0x1D60B => array(0x64),
+        0x1D60C => array(0x65),
+        0x1D60D => array(0x66),
+        0x1D60E => array(0x67),
+        0x1D60F => array(0x68),
+        0x1D610 => array(0x69),
+        0x1D611 => array(0x6A),
+        0x1D612 => array(0x6B),
+        0x1D613 => array(0x6C),
+        0x1D614 => array(0x6D),
+        0x1D615 => array(0x6E),
+        0x1D616 => array(0x6F),
+        0x1D617 => array(0x70),
+        0x1D618 => array(0x71),
+        0x1D619 => array(0x72),
+        0x1D61A => array(0x73),
+        0x1D61B => array(0x74),
+        0x1D61C => array(0x75),
+        0x1D61D => array(0x76),
+        0x1D61E => array(0x77),
+        0x1D61F => array(0x78),
+        0x1D620 => array(0x79),
+        0x1D621 => array(0x7A),
+        0x1D63C => array(0x61),
+        0x1D63D => array(0x62),
+        0x1D63E => array(0x63),
+        0x1D63F => array(0x64),
+        0x1D640 => array(0x65),
+        0x1D641 => array(0x66),
+        0x1D642 => array(0x67),
+        0x1D643 => array(0x68),
+        0x1D644 => array(0x69),
+        0x1D645 => array(0x6A),
+        0x1D646 => array(0x6B),
+        0x1D647 => array(0x6C),
+        0x1D648 => array(0x6D),
+        0x1D649 => array(0x6E),
+        0x1D64A => array(0x6F),
+        0x1D64B => array(0x70),
+        0x1D64C => array(0x71),
+        0x1D64D => array(0x72),
+        0x1D64E => array(0x73),
+        0x1D64F => array(0x74),
+        0x1D650 => array(0x75),
+        0x1D651 => array(0x76),
+        0x1D652 => array(0x77),
+        0x1D653 => array(0x78),
+        0x1D654 => array(0x79),
+        0x1D655 => array(0x7A),
+        0x1D670 => array(0x61),
+        0x1D671 => array(0x62),
+        0x1D672 => array(0x63),
+        0x1D673 => array(0x64),
+        0x1D674 => array(0x65),
+        0x1D675 => array(0x66),
+        0x1D676 => array(0x67),
+        0x1D677 => array(0x68),
+        0x1D678 => array(0x69),
+        0x1D679 => array(0x6A),
+        0x1D67A => array(0x6B),
+        0x1D67B => array(0x6C),
+        0x1D67C => array(0x6D),
+        0x1D67D => array(0x6E),
+        0x1D67E => array(0x6F),
+        0x1D67F => array(0x70),
+        0x1D680 => array(0x71),
+        0x1D681 => array(0x72),
+        0x1D682 => array(0x73),
+        0x1D683 => array(0x74),
+        0x1D684 => array(0x75),
+        0x1D685 => array(0x76),
+        0x1D686 => array(0x77),
+        0x1D687 => array(0x78),
+        0x1D688 => array(0x79),
+        0x1D689 => array(0x7A),
+        0x1D6A8 => array(0x3B1),
+        0x1D6A9 => array(0x3B2),
+        0x1D6AA => array(0x3B3),
+        0x1D6AB => array(0x3B4),
+        0x1D6AC => array(0x3B5),
+        0x1D6AD => array(0x3B6),
+        0x1D6AE => array(0x3B7),
+        0x1D6AF => array(0x3B8),
+        0x1D6B0 => array(0x3B9),
+        0x1D6B1 => array(0x3BA),
+        0x1D6B2 => array(0x3BB),
+        0x1D6B3 => array(0x3BC),
+        0x1D6B4 => array(0x3BD),
+        0x1D6B5 => array(0x3BE),
+        0x1D6B6 => array(0x3BF),
+        0x1D6B7 => array(0x3C0),
+        0x1D6B8 => array(0x3C1),
+        0x1D6B9 => array(0x3B8),
+        0x1D6BA => array(0x3C3),
+        0x1D6BB => array(0x3C4),
+        0x1D6BC => array(0x3C5),
+        0x1D6BD => array(0x3C6),
+        0x1D6BE => array(0x3C7),
+        0x1D6BF => array(0x3C8),
+        0x1D6C0 => array(0x3C9),
+        0x1D6D3 => array(0x3C3),
+        0x1D6E2 => array(0x3B1),
+        0x1D6E3 => array(0x3B2),
+        0x1D6E4 => array(0x3B3),
+        0x1D6E5 => array(0x3B4),
+        0x1D6E6 => array(0x3B5),
+        0x1D6E7 => array(0x3B6),
+        0x1D6E8 => array(0x3B7),
+        0x1D6E9 => array(0x3B8),
+        0x1D6EA => array(0x3B9),
+        0x1D6EB => array(0x3BA),
+        0x1D6EC => array(0x3BB),
+        0x1D6ED => array(0x3BC),
+        0x1D6EE => array(0x3BD),
+        0x1D6EF => array(0x3BE),
+        0x1D6F0 => array(0x3BF),
+        0x1D6F1 => array(0x3C0),
+        0x1D6F2 => array(0x3C1),
+        0x1D6F3 => array(0x3B8),
+        0x1D6F4 => array(0x3C3),
+        0x1D6F5 => array(0x3C4),
+        0x1D6F6 => array(0x3C5),
+        0x1D6F7 => array(0x3C6),
+        0x1D6F8 => array(0x3C7),
+        0x1D6F9 => array(0x3C8),
+        0x1D6FA => array(0x3C9),
+        0x1D70D => array(0x3C3),
+        0x1D71C => array(0x3B1),
+        0x1D71D => array(0x3B2),
+        0x1D71E => array(0x3B3),
+        0x1D71F => array(0x3B4),
+        0x1D720 => array(0x3B5),
+        0x1D721 => array(0x3B6),
+        0x1D722 => array(0x3B7),
+        0x1D723 => array(0x3B8),
+        0x1D724 => array(0x3B9),
+        0x1D725 => array(0x3BA),
+        0x1D726 => array(0x3BB),
+        0x1D727 => array(0x3BC),
+        0x1D728 => array(0x3BD),
+        0x1D729 => array(0x3BE),
+        0x1D72A => array(0x3BF),
+        0x1D72B => array(0x3C0),
+        0x1D72C => array(0x3C1),
+        0x1D72D => array(0x3B8),
+        0x1D72E => array(0x3C3),
+        0x1D72F => array(0x3C4),
+        0x1D730 => array(0x3C5),
+        0x1D731 => array(0x3C6),
+        0x1D732 => array(0x3C7),
+        0x1D733 => array(0x3C8),
+        0x1D734 => array(0x3C9),
+        0x1D747 => array(0x3C3),
+        0x1D756 => array(0x3B1),
+        0x1D757 => array(0x3B2),
+        0x1D758 => array(0x3B3),
+        0x1D759 => array(0x3B4),
+        0x1D75A => array(0x3B5),
+        0x1D75B => array(0x3B6),
+        0x1D75C => array(0x3B7),
+        0x1D75D => array(0x3B8),
+        0x1D75E => array(0x3B9),
+        0x1D75F => array(0x3BA),
+        0x1D760 => array(0x3BB),
+        0x1D761 => array(0x3BC),
+        0x1D762 => array(0x3BD),
+        0x1D763 => array(0x3BE),
+        0x1D764 => array(0x3BF),
+        0x1D765 => array(0x3C0),
+        0x1D766 => array(0x3C1),
+        0x1D767 => array(0x3B8),
+        0x1D768 => array(0x3C3),
+        0x1D769 => array(0x3C4),
+        0x1D76A => array(0x3C5),
+        0x1D76B => array(0x3C6),
+        0x1D76C => array(0x3C7),
+        0x1D76D => array(0x3C8),
+        0x1D76E => array(0x3C9),
+        0x1D781 => array(0x3C3),
+        0x1D790 => array(0x3B1),
+        0x1D791 => array(0x3B2),
+        0x1D792 => array(0x3B3),
+        0x1D793 => array(0x3B4),
+        0x1D794 => array(0x3B5),
+        0x1D795 => array(0x3B6),
+        0x1D796 => array(0x3B7),
+        0x1D797 => array(0x3B8),
+        0x1D798 => array(0x3B9),
+        0x1D799 => array(0x3BA),
+        0x1D79A => array(0x3BB),
+        0x1D79B => array(0x3BC),
+        0x1D79C => array(0x3BD),
+        0x1D79D => array(0x3BE),
+        0x1D79E => array(0x3BF),
+        0x1D79F => array(0x3C0),
+        0x1D7A0 => array(0x3C1),
+        0x1D7A1 => array(0x3B8),
+        0x1D7A2 => array(0x3C3),
+        0x1D7A3 => array(0x3C4),
+        0x1D7A4 => array(0x3C5),
+        0x1D7A5 => array(0x3C6),
+        0x1D7A6 => array(0x3C7),
+        0x1D7A7 => array(0x3C8),
+        0x1D7A8 => array(0x3C9),
+        0x1D7BB => array(0x3C3),
+        0x3F9   => array(0x3C3),
+        0x1D2C  => array(0x61),
+        0x1D2D  => array(0xE6),
+        0x1D2E  => array(0x62),
+        0x1D30  => array(0x64),
+        0x1D31  => array(0x65),
+        0x1D32  => array(0x1DD),
+        0x1D33  => array(0x67),
+        0x1D34  => array(0x68),
+        0x1D35  => array(0x69),
+        0x1D36  => array(0x6A),
+        0x1D37  => array(0x6B),
+        0x1D38  => array(0x6C),
+        0x1D39  => array(0x6D),
+        0x1D3A  => array(0x6E),
+        0x1D3C  => array(0x6F),
+        0x1D3D  => array(0x223),
+        0x1D3E  => array(0x70),
+        0x1D3F  => array(0x72),
+        0x1D40  => array(0x74),
+        0x1D41  => array(0x75),
+        0x1D42  => array(0x77),
+        0x213B  => array(0x66, 0x61, 0x78),
+        0x3250  => array(0x70, 0x74, 0x65),
+        0x32CC  => array(0x68, 0x67),
+        0x32CE  => array(0x65, 0x76),
+        0x32CF  => array(0x6C, 0x74, 0x64),
+        0x337A  => array(0x69, 0x75),
+        0x33DE  => array(0x76, 0x2215, 0x6D),
+        0x33DF  => array(0x61, 0x2215, 0x6D)
+    );
+
+    /**
+     * Normalization Combining Classes; Code Points not listed
+     * got Combining Class 0.
+     *
+     * @static
+     * @var array
+     * @access private
+     */
+    private static $_np_norm_combcls = array(
+        0x334   => 1,
+        0x335   => 1,
+        0x336   => 1,
+        0x337   => 1,
+        0x338   => 1,
+        0x93C   => 7,
+        0x9BC   => 7,
+        0xA3C   => 7,
+        0xABC   => 7,
+        0xB3C   => 7,
+        0xCBC   => 7,
+        0x1037  => 7,
+        0x3099  => 8,
+        0x309A  => 8,
+        0x94D   => 9,
+        0x9CD   => 9,
+        0xA4D   => 9,
+        0xACD   => 9,
+        0xB4D   => 9,
+        0xBCD   => 9,
+        0xC4D   => 9,
+        0xCCD   => 9,
+        0xD4D   => 9,
+        0xDCA   => 9,
+        0xE3A   => 9,
+        0xF84   => 9,
+        0x1039  => 9,
+        0x1714  => 9,
+        0x1734  => 9,
+        0x17D2  => 9,
+        0x5B0   => 10,
+        0x5B1   => 11,
+        0x5B2   => 12,
+        0x5B3   => 13,
+        0x5B4   => 14,
+        0x5B5   => 15,
+        0x5B6   => 16,
+        0x5B7   => 17,
+        0x5B8   => 18,
+        0x5B9   => 19,
+        0x5BB   => 20,
+        0x5Bc   => 21,
+        0x5BD   => 22,
+        0x5BF   => 23,
+        0x5C1   => 24,
+        0x5C2   => 25,
+        0xFB1E  => 26,
+        0x64B   => 27,
+        0x64C   => 28,
+        0x64D   => 29,
+        0x64E   => 30,
+        0x64F   => 31,
+        0x650   => 32,
+        0x651   => 33,
+        0x652   => 34,
+        0x670   => 35,
+        0x711   => 36,
+        0xC55   => 84,
+        0xC56   => 91,
+        0xE38   => 103,
+        0xE39   => 103,
+        0xE48   => 107,
+        0xE49   => 107,
+        0xE4A   => 107,
+        0xE4B   => 107,
+        0xEB8   => 118,
+        0xEB9   => 118,
+        0xEC8   => 122,
+        0xEC9   => 122,
+        0xECA   => 122,
+        0xECB   => 122,
+        0xF71   => 129,
+        0xF72   => 130,
+        0xF7A   => 130,
+        0xF7B   => 130,
+        0xF7C   => 130,
+        0xF7D   => 130,
+        0xF80   => 130,
+        0xF74   => 132,
+        0x321   => 202,
+        0x322   => 202,
+        0x327   => 202,
+        0x328   => 202,
+        0x31B   => 216,
+        0xF39   => 216,
+        0x1D165 => 216,
+        0x1D166 => 216,
+        0x1D16E => 216,
+        0x1D16F => 216,
+        0x1D170 => 216,
+        0x1D171 => 216,
+        0x1D172 => 216,
+        0x302A  => 218,
+        0x316   => 220,
+        0x317   => 220,
+        0x318   => 220,
+        0x319   => 220,
+        0x31C   => 220,
+        0x31D   => 220,
+        0x31E   => 220,
+        0x31F   => 220,
+        0x320   => 220,
+        0x323   => 220,
+        0x324   => 220,
+        0x325   => 220,
+        0x326   => 220,
+        0x329   => 220,
+        0x32A   => 220,
+        0x32B   => 220,
+        0x32C   => 220,
+        0x32D   => 220,
+        0x32E   => 220,
+        0x32F   => 220,
+        0x330   => 220,
+        0x331   => 220,
+        0x332   => 220,
+        0x333   => 220,
+        0x339   => 220,
+        0x33A   => 220,
+        0x33B   => 220,
+        0x33C   => 220,
+        0x347   => 220,
+        0x348   => 220,
+        0x349   => 220,
+        0x34D   => 220,
+        0x34E   => 220,
+        0x353   => 220,
+        0x354   => 220,
+        0x355   => 220,
+        0x356   => 220,
+        0x591   => 220,
+        0x596   => 220,
+        0x59B   => 220,
+        0x5A3   => 220,
+        0x5A4   => 220,
+        0x5A5   => 220,
+        0x5A6   => 220,
+        0x5A7   => 220,
+        0x5AA   => 220,
+        0x655   => 220,
+        0x656   => 220,
+        0x6E3   => 220,
+        0x6EA   => 220,
+        0x6ED   => 220,
+        0x731   => 220,
+        0x734   => 220,
+        0x737   => 220,
+        0x738   => 220,
+        0x739   => 220,
+        0x73B   => 220,
+        0x73C   => 220,
+        0x73E   => 220,
+        0x742   => 220,
+        0x744   => 220,
+        0x746   => 220,
+        0x748   => 220,
+        0x952   => 220,
+        0xF18   => 220,
+        0xF19   => 220,
+        0xF35   => 220,
+        0xF37   => 220,
+        0xFC6   => 220,
+        0x193B  => 220,
+        0x20E8  => 220,
+        0x1D17B => 220,
+        0x1D17C => 220,
+        0x1D17D => 220,
+        0x1D17E => 220,
+        0x1D17F => 220,
+        0x1D180 => 220,
+        0x1D181 => 220,
+        0x1D182 => 220,
+        0x1D18A => 220,
+        0x1D18B => 220,
+        0x59A   => 222,
+        0x5AD   => 222,
+        0x1929  => 222,
+        0x302D  => 222,
+        0x302E  => 224,
+        0x302F  => 224,
+        0x1D16D => 226,
+        0x5AE   => 228,
+        0x18A9  => 228,
+        0x302B  => 228,
+        0x300   => 230,
+        0x301   => 230,
+        0x302   => 230,
+        0x303   => 230,
+        0x304   => 230,
+        0x305   => 230,
+        0x306   => 230,
+        0x307   => 230,
+        0x308   => 230,
+        0x309   => 230,
+        0x30A   => 230,
+        0x30B   => 230,
+        0x30C   => 230,
+        0x30D   => 230,
+        0x30E   => 230,
+        0x30F   => 230,
+        0x310   => 230,
+        0x311   => 230,
+        0x312   => 230,
+        0x313   => 230,
+        0x314   => 230,
+        0x33D   => 230,
+        0x33E   => 230,
+        0x33F   => 230,
+        0x340   => 230,
+        0x341   => 230,
+        0x342   => 230,
+        0x343   => 230,
+        0x344   => 230,
+        0x346   => 230,
+        0x34A   => 230,
+        0x34B   => 230,
+        0x34C   => 230,
+        0x350   => 230,
+        0x351   => 230,
+        0x352   => 230,
+        0x357   => 230,
+        0x363   => 230,
+        0x364   => 230,
+        0x365   => 230,
+        0x366   => 230,
+        0x367   => 230,
+        0x368   => 230,
+        0x369   => 230,
+        0x36A   => 230,
+        0x36B   => 230,
+        0x36C   => 230,
+        0x36D   => 230,
+        0x36E   => 230,
+        0x36F   => 230,
+        0x483   => 230,
+        0x484   => 230,
+        0x485   => 230,
+        0x486   => 230,
+        0x592   => 230,
+        0x593   => 230,
+        0x594   => 230,
+        0x595   => 230,
+        0x597   => 230,
+        0x598   => 230,
+        0x599   => 230,
+        0x59C   => 230,
+        0x59D   => 230,
+        0x59E   => 230,
+        0x59F   => 230,
+        0x5A0   => 230,
+        0x5A1   => 230,
+        0x5A8   => 230,
+        0x5A9   => 230,
+        0x5AB   => 230,
+        0x5AC   => 230,
+        0x5AF   => 230,
+        0x5C4   => 230,
+        0x610   => 230,
+        0x611   => 230,
+        0x612   => 230,
+        0x613   => 230,
+        0x614   => 230,
+        0x615   => 230,
+        0x653   => 230,
+        0x654   => 230,
+        0x657   => 230,
+        0x658   => 230,
+        0x6D6   => 230,
+        0x6D7   => 230,
+        0x6D8   => 230,
+        0x6D9   => 230,
+        0x6DA   => 230,
+        0x6DB   => 230,
+        0x6DC   => 230,
+        0x6DF   => 230,
+        0x6E0   => 230,
+        0x6E1   => 230,
+        0x6E2   => 230,
+        0x6E4   => 230,
+        0x6E7   => 230,
+        0x6E8   => 230,
+        0x6EB   => 230,
+        0x6EC   => 230,
+        0x730   => 230,
+        0x732   => 230,
+        0x733   => 230,
+        0x735   => 230,
+        0x736   => 230,
+        0x73A   => 230,
+        0x73D   => 230,
+        0x73F   => 230,
+        0x740   => 230,
+        0x741   => 230,
+        0x743   => 230,
+        0x745   => 230,
+        0x747   => 230,
+        0x749   => 230,
+        0x74A   => 230,
+        0x951   => 230,
+        0x953   => 230,
+        0x954   => 230,
+        0xF82   => 230,
+        0xF83   => 230,
+        0xF86   => 230,
+        0xF87   => 230,
+        0x170D  => 230,
+        0x193A  => 230,
+        0x20D0  => 230,
+        0x20D1  => 230,
+        0x20D4  => 230,
+        0x20D5  => 230,
+        0x20D6  => 230,
+        0x20D7  => 230,
+        0x20DB  => 230,
+        0x20DC  => 230,
+        0x20E1  => 230,
+        0x20E7  => 230,
+        0x20E9  => 230,
+        0xFE20  => 230,
+        0xFE21  => 230,
+        0xFE22  => 230,
+        0xFE23  => 230,
+        0x1D185 => 230,
+        0x1D186 => 230,
+        0x1D187 => 230,
+        0x1D189 => 230,
+        0x1D188 => 230,
+        0x1D1AA => 230,
+        0x1D1AB => 230,
+        0x1D1AC => 230,
+        0x1D1AD => 230,
+        0x315   => 232,
+        0x31A   => 232,
+        0x302C  => 232,
+        0x35F   => 233,
+        0x362   => 233,
+        0x35D   => 234,
+        0x35E   => 234,
+        0x360   => 234,
+        0x361   => 234,
+        0x345   => 240
+    );
+    // }}}
+
+    // {{{ properties
+    /**
+     * @var string
+     * @access private
+     */
+    private $_punycode_prefix = 'xn--';
+
+    /**
+     * @access private
+     */
+    private $_invalid_ucs = 0x80000000;
+
+    /**
+     * @access private
+     */
+    private $_max_ucs = 0x10FFFF;
+
+    /**
+     * @var int
+     * @access private
+     */
+    private $_base = 36;
+
+    /**
+     * @var int
+     * @access private
+     */
+    private $_tmin = 1;
+
+    /**
+     * @var int
+     * @access private
+     */
+    private $_tmax = 26;
+
+    /**
+     * @var int
+     * @access private
+     */
+    private $_skew = 38;
+
+    /**
+     * @var int
+     * @access private
+     */
+    private $_damp = 700;
+
+    /**
+     * @var int
+     * @access private
+     */
+    private $_initial_bias = 72;
+
+    /**
+     * @var int
+     * @access private
+     */
+    private $_initial_n = 0x80;
+
+    /**
+     * @var int
+     * @access private
+     */
+    private $_slast;
+
+    /**
+     * @access private
+     */
+    private $_sbase = 0xAC00;
+
+    /**
+     * @access private
+     */
+    private $_lbase = 0x1100;
+
+    /**
+     * @access private
+     */
+    private $_vbase = 0x1161;
+
+    /**
+     * @access private
+     */
+    private $_tbase = 0x11a7;
+
+    /**
+     * @var int
+     * @access private
+     */
+    private $_lcount = 19;
+
+    /**
+     * @var int
+     * @access private
+     */
+    private $_vcount = 21;
+
+    /**
+     * @var int
+     * @access private
+     */
+    private $_tcount = 28;
+
+    /**
+     * vcount * tcount
+     *
+     * @var int
+     * @access private
+     */
+    private $_ncount = 588;
+
+    /**
+     * lcount * tcount * vcount
+     *
+     * @var int
+     * @access private
+     */
+    private $_scount = 11172;
+
+    /**
+     * Default encoding for encode()'s input and decode()'s output is UTF-8;
+     * Other possible encodings are ucs4_string and ucs4_array
+     * See {@link setParams()} for how to select these
+     *
+     * @var bool
+     * @access private
+     */
+    private $_api_encoding = 'utf8';
+
+    /**
+     * Overlong UTF-8 encodings are forbidden
+     *
+     * @var bool
+     * @access private
+     */
+    private $_allow_overlong = false;
+
+    /**
+     * Behave strict or not
+     *
+     * @var bool
+     * @access private
+     */
+    private $_strict_mode = false;
+
+    /**
+     * IDNA-version to use
+     *
+     * Values are "2003" and "2008".
+     * Defaults to "2003", since that was the original version and for
+     * compatibility with previous versions of this library.
+     * If you need to encode "new" characters like the German "Eszett",
+     * please switch to 2008 first before encoding.
+     *
+     * @var bool
+     * @access private
+     */
+    private $_version = '2003';
+
+    /**
+     * Cached value indicating whether or not mbstring function overloading is
+     * on for strlen
+     *
+     * This is cached for optimal performance.
+     *
+     * @var boolean
+     * @see Net_IDNA2::_byteLength()
+     */
+    private static $_mb_string_overload = null;
+    // }}}
+
+
+    // {{{ constructor
+    /**
+     * Constructor
+     *
+     * @param array $options Options to initialise the object with
+     *
+     * @access public
+     * @see    setParams()
+     */
+    public function __construct($options = null)
+    {
+        $this->_slast = $this->_sbase + $this->_lcount * $this->_vcount * $this->_tcount;
+
+        if (is_array($options)) {
+            $this->setParams($options);
+        }
+
+        // populate mbstring overloading cache if not set
+        if (self::$_mb_string_overload === null) {
+            self::$_mb_string_overload = (extension_loaded('mbstring')
+                && (ini_get('mbstring.func_overload') & 0x02) === 0x02);
+        }
+    }
+    // }}}
+
+
+    /**
+     * Sets a new option value. Available options and values:
+     *
+     * [utf8 -     Use either UTF-8 or ISO-8859-1 as input (true for UTF-8, false
+     *             otherwise); The output is always UTF-8]
+     * [overlong - Unicode does not allow unnecessarily long encodings of chars,
+     *             to allow this, set this parameter to true, else to false;
+     *             default is false.]
+     * [strict -   true: strict mode, good for registration purposes - Causes errors
+     *             on failures; false: loose mode, ideal for "wildlife" applications
+     *             by silently ignoring errors and returning the original input instead]
+     *
+     * @param mixed  $option Parameter to set (string: single parameter; array of Parameter => Value pairs)
+     * @param string $value  Value to use (if parameter 1 is a string)
+     *
+     * @return boolean       true on success, false otherwise
+     * @access public
+     */
+    public function setParams($option, $value = false)
+    {
+        if (!is_array($option)) {
+            $option = array($option => $value);
+        }
+
+        foreach ($option as $k => $v) {
+            switch ($k) {
+            case 'encoding':
+                switch ($v) {
+                case 'utf8':
+                case 'ucs4_string':
+                case 'ucs4_array':
+                    $this->_api_encoding = $v;
+                    break;
+
+                default:
+                    throw new InvalidArgumentException('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                }
+
+                break;
+
+            case 'overlong':
+                $this->_allow_overlong = ($v) ? true : false;
+                break;
+
+            case 'strict':
+                $this->_strict_mode = ($v) ? true : false;
+                break;
+
+            case 'version':
+                if (in_array($v, array('2003', '2008'))) {
+                    $this->_version = $v;
+                } else {
+                    throw new InvalidArgumentException('Set Parameter: Invalid parameter '.$v.' for option '.$k);
+                }
+                break;
+
+            default:
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Encode a given UTF-8 domain name.
+     *
+     * @param string $decoded           Domain name (UTF-8 or UCS-4)
+     * @param string $one_time_encoding Desired input encoding, see {@link set_parameter}
+     *                                  If not given will use default-encoding
+     *
+     * @return string Encoded Domain name (ACE string)
+     * @return mixed  processed string
+     * @throws Exception
+     * @access public
+     */
+    public function encode($decoded, $one_time_encoding = false)
+    {
+        // Forcing conversion of input to UCS4 array
+        // If one time encoding is given, use this, else the objects property
+        switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
+        case 'utf8':
+            $decoded = $this->_utf8_to_ucs4($decoded);
+            break;
+        case 'ucs4_string':
+            $decoded = $this->_ucs4_string_to_ucs4($decoded);
+        case 'ucs4_array': // No break; before this line. Catch case, but do nothing
+            break;
+        default:
+            throw new InvalidArgumentException('Unsupported input format');
+        }
+
+        // No input, no output, what else did you expect?
+        if (empty($decoded)) return '';
+
+        // Anchors for iteration
+        $last_begin = 0;
+        // Output string
+        $output = '';
+
+        foreach ($decoded as $k => $v) {
+            // Make sure to use just the plain dot
+            switch($v) {
+            case 0x3002:
+            case 0xFF0E:
+            case 0xFF61:
+                $decoded[$k] = 0x2E;
+                // It's right, no break here
+                // The codepoints above have to be converted to dots anyway
+
+            // Stumbling across an anchoring character
+            case 0x2E:
+            case 0x2F:
+            case 0x3A:
+            case 0x3F:
+            case 0x40:
+                // Neither email addresses nor URLs allowed in strict mode
+                if ($this->_strict_mode) {
+                    throw new InvalidArgumentException('Neither email addresses nor URLs are allowed in strict mode.');
+                }
+                // Skip first char
+                if ($k) {
+                    $encoded = '';
+                    $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                    if ($encoded) {
+                        $output .= $encoded;
+                    } else {
+                        $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                    }
+                    $output .= chr($decoded[$k]);
+                }
+                $last_begin = $k + 1;
+            }
+        }
+        // Catch the rest of the string
+        if ($last_begin) {
+            $inp_len = sizeof($decoded);
+            $encoded = '';
+            $encoded = $this->_encode(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
+            if ($encoded) {
+                $output .= $encoded;
+            } else {
+                $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
+            }
+            return $output;
+        }
+
+        if ($output = $this->_encode($decoded)) {
+            return $output;
+        }
+
+        return $this->_ucs4_to_utf8($decoded);
+    }
+
+    /**
+     * Decode a given ACE domain name.
+     *
+     * @param string $input             Domain name (ACE string)
+     * @param string $one_time_encoding Desired output encoding, see {@link set_parameter}
+     *
+     * @return string                   Decoded Domain name (UTF-8 or UCS-4)
+     * @throws Exception
+     * @access public
+     */
+    public function decode($input, $one_time_encoding = false)
+    {
+        // Optionally set
+        if ($one_time_encoding) {
+            switch ($one_time_encoding) {
+            case 'utf8':
+            case 'ucs4_string':
+            case 'ucs4_array':
+                break;
+            default:
+                throw new InvalidArgumentException('Unknown encoding '.$one_time_encoding);
+            }
+        }
+        // Make sure to drop any newline characters around
+        $input = trim($input);
+
+        // Negotiate input and try to determine, wether it is a plain string,
+        // an email address or something like a complete URL
+        if (strpos($input, '@')) { // Maybe it is an email address
+            // No no in strict mode
+            if ($this->_strict_mode) {
+                throw new InvalidArgumentException('Only simple domain name parts can be handled in strict mode');
+            }
+            list($email_pref, $input) = explode('@', $input, 2);
+            $arr = explode('.', $input);
+            foreach ($arr as $k => $v) {
+                $conv = $this->_decode($v);
+                if ($conv) $arr[$k] = $conv;
+            }
+            $return = $email_pref . '@' . join('.', $arr);
+        } elseif (preg_match('![:\./]!', $input)) { // Or a complete domain name (with or without paths / parameters)
+            // No no in strict mode
+            if ($this->_strict_mode) {
+                throw new InvalidArgumentException('Only simple domain name parts can be handled in strict mode');
+            }
+
+            $parsed = parse_url($input);
+            if (isset($parsed['host'])) {
+                $arr = explode('.', $parsed['host']);
+                foreach ($arr as $k => $v) {
+                    $conv = $this->_decode($v);
+                    if ($conv) $arr[$k] = $conv;
+                }
+                $parsed['host'] = join('.', $arr);
+                if (isset($parsed['scheme'])) {
+                    $parsed['scheme'] .= (strtolower($parsed['scheme']) == 'mailto') ? ':' : '://';
+                }
+                $return = $this->_unparse_url($parsed);
+            } else { // parse_url seems to have failed, try without it
+                $arr = explode('.', $input);
+                foreach ($arr as $k => $v) {
+                    $conv = $this->_decode($v);
+                    if ($conv) $arr[$k] = $conv;
+                }
+                $return = join('.', $arr);
+            }
+        } else { // Otherwise we consider it being a pure domain name string
+            $return = $this->_decode($input);
+        }
+        // The output is UTF-8 by default, other output formats need conversion here
+        // If one time encoding is given, use this, else the objects property
+        switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
+        case 'utf8':
+            return $return;
+            break;
+        case 'ucs4_string':
+            return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
+            break;
+        case 'ucs4_array':
+            return $this->_utf8_to_ucs4($return);
+            break;
+        default:
+            throw new InvalidArgumentException('Unsupported output format');
+        }
+    }
+
+
+    // {{{ private
+    /**
+     * Opposite function to parse_url()
+     *
+     * Inspired by code from comments of php.net-documentation for parse_url()
+     *
+     * @param array $parts_arr parts (strings) as returned by parse_url()
+     *
+     * @return string
+     * @access private
+     */
+    private function _unparse_url($parts_arr)
+    {
+        if (!empty($parts_arr['scheme'])) {
+            $ret_url = $parts_arr['scheme'];
+        }
+        if (!empty($parts_arr['user'])) {
+            $ret_url .= $parts_arr['user'];
+            if (!empty($parts_arr['pass'])) {
+                $ret_url .= ':' . $parts_arr['pass'];
+            }
+            $ret_url .= '@';
+        }
+        $ret_url .= $parts_arr['host'];
+        if (!empty($parts_arr['port'])) {
+            $ret_url .= ':' . $parts_arr['port'];
+        }
+        $ret_url .= $parts_arr['path'];
+        if (!empty($parts_arr['query'])) {
+            $ret_url .= '?' . $parts_arr['query'];
+        }
+        if (!empty($parts_arr['fragment'])) {
+            $ret_url .= '#' . $parts_arr['fragment'];
+        }
+        return $ret_url;
+    }
+
+    /**
+     * The actual encoding algorithm.
+     *
+     * @param string $decoded Decoded string which should be encoded
+     *
+     * @return string         Encoded string
+     * @throws Exception
+     * @access private
+     */
+    private function _encode($decoded)
+    {
+        // We cannot encode a domain name containing the Punycode prefix
+        $extract = self::_byteLength($this->_punycode_prefix);
+        $check_pref = $this->_utf8_to_ucs4($this->_punycode_prefix);
+        $check_deco = array_slice($decoded, 0, $extract);
+
+        if ($check_pref == $check_deco) {
+            throw new InvalidArgumentException('This is already a punycode string');
+        }
+
+        // We will not try to encode strings consisting of basic code points only
+        $encodable = false;
+        foreach ($decoded as $k => $v) {
+            if ($v > 0x7a) {
+                $encodable = true;
+                break;
+            }
+        }
+        if (!$encodable) {
+            if ($this->_strict_mode) {
+                throw new InvalidArgumentException('The given string does not contain encodable chars');
+            }
+
+            return false;
+        }
+
+        // Do NAMEPREP
+        $decoded = $this->_nameprep($decoded);
+
+        $deco_len = count($decoded);
+
+        // Empty array
+        if (!$deco_len) {
+            return false;
+        }
+
+        // How many chars have been consumed
+        $codecount = 0;
+
+        // Start with the prefix; copy it to output
+        $encoded = $this->_punycode_prefix;
+
+        $encoded = '';
+        // Copy all basic code points to output
+        for ($i = 0; $i < $deco_len; ++$i) {
+            $test = $decoded[$i];
+            // Will match [0-9a-zA-Z-]
+            if ((0x2F < $test && $test < 0x40)
+                || (0x40 < $test && $test < 0x5B)
+                || (0x60 < $test && $test <= 0x7B)
+                || (0x2D == $test)
+            ) {
+                $encoded .= chr($decoded[$i]);
+                $codecount++;
+            }
+        }
+
+        // All codepoints were basic ones
+        if ($codecount == $deco_len) {
+            return $encoded;
+        }
+
+        // Start with the prefix; copy it to output
+        $encoded = $this->_punycode_prefix . $encoded;
+
+        // If we have basic code points in output, add an hyphen to the end
+        if ($codecount) {
+            $encoded .= '-';
+        }
+
+        // Now find and encode all non-basic code points
+        $is_first  = true;
+        $cur_code  = $this->_initial_n;
+        $bias      = $this->_initial_bias;
+        $delta     = 0;
+
+        while ($codecount < $deco_len) {
+            // Find the smallest code point >= the current code point and
+            // remember the last ouccrence of it in the input
+            for ($i = 0, $next_code = $this->_max_ucs; $i < $deco_len; $i++) {
+                if ($decoded[$i] >= $cur_code && $decoded[$i] <= $next_code) {
+                    $next_code = $decoded[$i];
+                }
+            }
+
+            $delta += ($next_code - $cur_code) * ($codecount + 1);
+            $cur_code = $next_code;
+
+            // Scan input again and encode all characters whose code point is $cur_code
+            for ($i = 0; $i < $deco_len; $i++) {
+                if ($decoded[$i] < $cur_code) {
+                    $delta++;
+                } else if ($decoded[$i] == $cur_code) {
+                    for ($q = $delta, $k = $this->_base; 1; $k += $this->_base) {
+                        $t = ($k <= $bias)?
+                            $this->_tmin :
+                            (($k >= $bias + $this->_tmax)? $this->_tmax : $k - $bias);
+
+                        if ($q < $t) {
+                            break;
+                        }
+
+                        $encoded .= $this->_encodeDigit(ceil($t + (($q - $t) % ($this->_base - $t))));
+                        $q = ($q - $t) / ($this->_base - $t);
+                    }
+
+                    $encoded .= $this->_encodeDigit($q);
+                    $bias = $this->_adapt($delta, $codecount + 1, $is_first);
+                    $codecount++;
+                    $delta = 0;
+                    $is_first = false;
+                }
+            }
+
+            $delta++;
+            $cur_code++;
+        }
+
+        return $encoded;
+    }
+
+    /**
+     * The actual decoding algorithm.
+     *
+     * @param string $encoded Encoded string which should be decoded
+     *
+     * @return string         Decoded string
+     * @throws Exception
+     * @access private
+     */
+    private function _decode($encoded)
+    {
+        // We do need to find the Punycode prefix
+        if (!preg_match('!^' . preg_quote($this->_punycode_prefix, '!') . '!', $encoded)) {
+            return false;
+        }
+
+        $encode_test = preg_replace('!^' . preg_quote($this->_punycode_prefix, '!') . '!', '', $encoded);
+
+        // If nothing left after removing the prefix, it is hopeless
+        if (!$encode_test) {
+            return false;
+        }
+
+        // Find last occurence of the delimiter
+        $delim_pos = strrpos($encoded, '-');
+
+        if ($delim_pos > self::_byteLength($this->_punycode_prefix)) {
+            for ($k = self::_byteLength($this->_punycode_prefix); $k < $delim_pos; ++$k) {
+                $decoded[] = ord($encoded{$k});
+            }
+        } else {
+            $decoded = array();
+        }
+
+        $deco_len = count($decoded);
+        $enco_len = self::_byteLength($encoded);
+
+        // Wandering through the strings; init
+        $is_first = true;
+        $bias     = $this->_initial_bias;
+        $idx      = 0;
+        $char     = $this->_initial_n;
+
+        for ($enco_idx = ($delim_pos)? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
+            for ($old_idx = $idx, $w = 1, $k = $this->_base; 1 ; $k += $this->_base) {
+                $digit = $this->_decodeDigit($encoded{$enco_idx++});
+                $idx += $digit * $w;
+
+                $t = ($k <= $bias) ?
+                    $this->_tmin :
+                    (($k >= $bias + $this->_tmax)? $this->_tmax : ($k - $bias));
+
+                if ($digit < $t) {
+                    break;
+                }
+
+                $w = (int)($w * ($this->_base - $t));
+            }
+
+            $bias      = $this->_adapt($idx - $old_idx, $deco_len + 1, $is_first);
+            $is_first  = false;
+            $char     += (int) ($idx / ($deco_len + 1));
+            $idx      %= ($deco_len + 1);
+
+            if ($deco_len > 0) {
+                // Make room for the decoded char
+                for ($i = $deco_len; $i > $idx; $i--) {
+                    $decoded[$i] = $decoded[($i - 1)];
+                }
+            }
+
+            $decoded[$idx++] = $char;
+        }
+
+        return $this->_ucs4_to_utf8($decoded);
+    }
+
+    /**
+     * Adapt the bias according to the current code point and position.
+     *
+     * @param int     $delta    ...
+     * @param int     $npoints  ...
+     * @param boolean $is_first ...
+     *
+     * @return int
+     * @access private
+     */
+    private function _adapt($delta, $npoints, $is_first)
+    {
+        $delta = (int) ($is_first ? ($delta / $this->_damp) : ($delta / 2));
+        $delta += (int) ($delta / $npoints);
+
+        for ($k = 0; $delta > (($this->_base - $this->_tmin) * $this->_tmax) / 2; $k += $this->_base) {
+            $delta = (int) ($delta / ($this->_base - $this->_tmin));
+        }
+
+        return (int) ($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
+    }
+
+    /**
+     * Encoding a certain digit.
+     *
+     * @param int $d One digit to encode
+     *
+     * @return char  Encoded digit
+     * @access private
+     */
+    private function _encodeDigit($d)
+    {
+        return chr($d + 22 + 75 * ($d < 26));
+    }
+
+    /**
+     * Decode a certain digit.
+     *
+     * @param char $cp One digit (character) to decode
+     *
+     * @return int     Decoded digit
+     * @access private
+     */
+    private function _decodeDigit($cp)
+    {
+        $cp = ord($cp);
+        return ($cp - 48 < 10)? $cp - 22 : (($cp - 65 < 26)? $cp - 65 : (($cp - 97 < 26)? $cp - 97 : $this->_base));
+    }
+
+    /**
+     * Do Nameprep according to RFC3491 and RFC3454.
+     *
+     * @param array $input Unicode Characters
+     *
+     * @return string      Unicode Characters, Nameprep'd
+     * @throws Exception
+     * @access private
+     */
+    private function _nameprep($input)
+    {
+        $output = array();
+
+        // Walking through the input array, performing the required steps on each of
+        // the input chars and putting the result into the output array
+        // While mapping required chars we apply the cannonical ordering
+
+        foreach ($input as $v) {
+            // Map to nothing == skip that code point
+            if (in_array($v, self::$_np_map_nothing)) {
+                continue;
+            }
+
+            // Try to find prohibited input
+            if (in_array($v, self::$_np_prohibit) || in_array($v, self::$_general_prohibited)) {
+                throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+' . sprintf('%08X', $v));
+            }
+
+            foreach (self::$_np_prohibit_ranges as $range) {
+                if ($range[0] <= $v && $v <= $range[1]) {
+                    throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+' . sprintf('%08X', $v));
+                }
+            }
+
+            // Hangul syllable decomposition
+            if (0xAC00 <= $v && $v <= 0xD7AF) {
+                foreach ($this->_hangulDecompose($v) as $out) {
+                    $output[] = $out;
+                }
+            } else if (($this->_version == '2003') && isset(self::$_np_replacemaps[$v])) {
+                // There's a decomposition mapping for that code point
+                // Decompositions only in version 2003 (original) of IDNA
+                foreach ($this->_applyCannonicalOrdering(self::$_np_replacemaps[$v]) as $out) {
+                    $output[] = $out;
+                }
+            } else {
+                $output[] = $v;
+            }
+        }
+
+        // Combine code points
+
+        $last_class   = 0;
+        $last_starter = 0;
+        $out_len      = count($output);
+
+        for ($i = 0; $i < $out_len; ++$i) {
+            $class = $this->_getCombiningClass($output[$i]);
+
+            if ((!$last_class || $last_class != $class) && $class) {
+                // Try to match
+                $seq_len = $i - $last_starter;
+                $out = $this->_combine(array_slice($output, $last_starter, $seq_len));
+
+                // On match: Replace the last starter with the composed character and remove
+                // the now redundant non-starter(s)
+                if ($out) {
+                    $output[$last_starter] = $out;
+
+                    if (count($out) != $seq_len) {
+                        for ($j = $i + 1; $j < $out_len; ++$j) {
+                            $output[$j - 1] = $output[$j];
+                        }
+
+                        unset($output[$out_len]);
+                    }
+
+                    // Rewind the for loop by one, since there can be more possible compositions
+                    $i--;
+                    $out_len--;
+                    $last_class = ($i == $last_starter)? 0 : $this->_getCombiningClass($output[$i - 1]);
+
+                    continue;
+                }
+            }
+
+            // The current class is 0
+            if (!$class) {
+                $last_starter = $i;
+            }
+
+            $last_class = $class;
+        }
+
+        return $output;
+    }
+
+    /**
+     * Decomposes a Hangul syllable
+     * (see http://www.unicode.org/unicode/reports/tr15/#Hangul).
+     *
+     * @param integer $char 32bit UCS4 code point
+     *
+     * @return array        Either Hangul Syllable decomposed or original 32bit
+     *                      value as one value array
+     * @access private
+     */
+    private function _hangulDecompose($char)
+    {
+        $sindex = $char - $this->_sbase;
+
+        if ($sindex < 0 || $sindex >= $this->_scount) {
+            return array($char);
+        }
+
+        $result   = array();
+        $T        = $this->_tbase + $sindex % $this->_tcount;
+        $result[] = (int)($this->_lbase +  $sindex / $this->_ncount);
+        $result[] = (int)($this->_vbase + ($sindex % $this->_ncount) / $this->_tcount);
+
+        if ($T != $this->_tbase) {
+            $result[] = $T;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Ccomposes a Hangul syllable
+     * (see http://www.unicode.org/unicode/reports/tr15/#Hangul).
+     *
+     * @param array $input Decomposed UCS4 sequence
+     *
+     * @return array       UCS4 sequence with syllables composed
+     * @access private
+     */
+    private function _hangulCompose($input)
+    {
+        $inp_len = count($input);
+
+        if (!$inp_len) {
+            return array();
+        }
+
+        $result   = array();
+        $last     = $input[0];
+        $result[] = $last; // copy first char from input to output
+
+        for ($i = 1; $i < $inp_len; ++$i) {
+            $char = $input[$i];
+
+            // Find out, wether two current characters from L and V
+            $lindex = $last - $this->_lbase;
+
+            if (0 <= $lindex && $lindex < $this->_lcount) {
+                $vindex = $char - $this->_vbase;
+
+                if (0 <= $vindex && $vindex < $this->_vcount) {
+                    // create syllable of form LV
+                    $last    = ($this->_sbase + ($lindex * $this->_vcount + $vindex) * $this->_tcount);
+                    $out_off = count($result) - 1;
+                    $result[$out_off] = $last; // reset last
+
+                    // discard char
+                    continue;
+                }
+            }
+
+            // Find out, wether two current characters are LV and T
+            $sindex = $last - $this->_sbase;
+
+            if (0 <= $sindex && $sindex < $this->_scount && ($sindex % $this->_tcount) == 0) {
+                $tindex = $char - $this->_tbase;
+
+                if (0 <= $tindex && $tindex <= $this->_tcount) {
+                    // create syllable of form LVT
+                    $last += $tindex;
+                    $out_off = count($result) - 1;
+                    $result[$out_off] = $last; // reset last
+
+                    // discard char
+                    continue;
+                }
+            }
+
+            // if neither case was true, just add the character
+            $last = $char;
+            $result[] = $char;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the combining class of a certain wide char.
+     *
+     * @param integer $char Wide char to check (32bit integer)
+     *
+     * @return integer      Combining class if found, else 0
+     * @access private
+     */
+    private function _getCombiningClass($char)
+    {
+        return isset(self::$_np_norm_combcls[$char])? self::$_np_norm_combcls[$char] : 0;
+    }
+
+    /**
+     * Apllies the cannonical ordering of a decomposed UCS4 sequence.
+     *
+     * @param array $input Decomposed UCS4 sequence
+     *
+     * @return array       Ordered USC4 sequence
+     * @access private
+     */
+    private function _applyCannonicalOrdering($input)
+    {
+        $swap = true;
+        $size = count($input);
+
+        while ($swap) {
+            $swap = false;
+            $last = $this->_getCombiningClass($input[0]);
+
+            for ($i = 0; $i < $size - 1; ++$i) {
+                $next = $this->_getCombiningClass($input[$i + 1]);
+
+                if ($next != 0 && $last > $next) {
+                    // Move item leftward until it fits
+                    for ($j = $i + 1; $j > 0; --$j) {
+                        if ($this->_getCombiningClass($input[$j - 1]) <= $next) {
+                            break;
+                        }
+
+                        $t = $input[$j];
+                        $input[$j] = $input[$j - 1];
+                        $input[$j - 1] = $t;
+                        $swap = 1;
+                    }
+
+                    // Reentering the loop looking at the old character again
+                    $next = $last;
+                }
+
+                $last = $next;
+            }
+        }
+
+        return $input;
+    }
+
+    /**
+     * Do composition of a sequence of starter and non-starter.
+     *
+     * @param array $input UCS4 Decomposed sequence
+     *
+     * @return array       Ordered USC4 sequence
+     * @access private
+     */
+    private function _combine($input)
+    {
+        $inp_len = count($input);
+
+        // Is it a Hangul syllable?
+        if (1 != $inp_len) {
+            $hangul = $this->_hangulCompose($input);
+
+            // This place is probably wrong
+            if (count($hangul) != $inp_len) {
+                return $hangul;
+            }
+        }
+
+        foreach (self::$_np_replacemaps as $np_src => $np_target) {
+            if ($np_target[0] != $input[0]) {
+                continue;
+            }
+
+            if (count($np_target) != $inp_len) {
+                continue;
+            }
+
+            $hit = false;
+
+            foreach ($input as $k2 => $v2) {
+                if ($v2 == $np_target[$k2]) {
+                    $hit = true;
+                } else {
+                    $hit = false;
+                    break;
+                }
+            }
+
+            if ($hit) {
+                return $np_src;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * This converts an UTF-8 encoded string to its UCS-4 (array) representation
+     * By talking about UCS-4 we mean arrays of 32bit integers representing
+     * each of the "chars". This is due to PHP not being able to handle strings with
+     * bit depth different from 8. This applies to the reverse method _ucs4_to_utf8(), too.
+     * The following UTF-8 encodings are supported:
+     *
+     * bytes bits  representation
+     * 1        7  0xxxxxxx
+     * 2       11  110xxxxx 10xxxxxx
+     * 3       16  1110xxxx 10xxxxxx 10xxxxxx
+     * 4       21  11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+     * 5       26  111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+     * 6       31  1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+     *
+     * Each x represents a bit that can be used to store character data.
+     *
+     * @param string $input utf8-encoded string
+     *
+     * @return array        ucs4-encoded array
+     * @throws Exception
+     * @access private
+     */
+    private function _utf8_to_ucs4($input)
+    {
+        $output = array();
+        $out_len = 0;
+        $inp_len = self::_byteLength($input, '8bit');
+        $mode = 'next';
+        $test = 'none';
+        for ($k = 0; $k < $inp_len; ++$k) {
+            $v = ord($input{$k}); // Extract byte from input string
+
+            if ($v < 128) { // We found an ASCII char - put into stirng as is
+                $output[$out_len] = $v;
+                ++$out_len;
+                if ('add' == $mode) {
+                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                }
+                continue;
+            }
+            if ('next' == $mode) { // Try to find the next start byte; determine the width of the Unicode char
+                $start_byte = $v;
+                $mode = 'add';
+                $test = 'range';
+                if ($v >> 5 == 6) { // &110xxxxx 10xxxxx
+                    $next_byte = 0; // Tells, how many times subsequent bitmasks must rotate 6bits to the left
+                    $v = ($v - 192) << 6;
+                } elseif ($v >> 4 == 14) { // &1110xxxx 10xxxxxx 10xxxxxx
+                    $next_byte = 1;
+                    $v = ($v - 224) << 12;
+                } elseif ($v >> 3 == 30) { // &11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                    $next_byte = 2;
+                    $v = ($v - 240) << 18;
+                } elseif ($v >> 2 == 62) { // &111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+                    $next_byte = 3;
+                    $v = ($v - 248) << 24;
+                } elseif ($v >> 1 == 126) { // &1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+                    $next_byte = 4;
+                    $v = ($v - 252) << 30;
+                } else {
+                    throw new UnexpectedValueException('This might be UTF-8, but I don\'t understand it at byte '.$k);
+                }
+                if ('add' == $mode) {
+                    $output[$out_len] = (int) $v;
+                    ++$out_len;
+                    continue;
+                }
+            }
+            if ('add' == $mode) {
+                if (!$this->_allow_overlong && $test == 'range') {
+                    $test = 'none';
+                    if (($v < 0xA0 && $start_byte == 0xE0) || ($v < 0x90 && $start_byte == 0xF0) || ($v > 0x8F && $start_byte == 0xF4)) {
+                        throw new OutOfRangeException('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
+                    }
+                }
+                if ($v >> 6 == 2) { // Bit mask must be 10xxxxxx
+                    $v = ($v - 128) << ($next_byte * 6);
+                    $output[($out_len - 1)] += $v;
+                    --$next_byte;
+                } else {
+                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                }
+                if ($next_byte < 0) {
+                    $mode = 'next';
+                }
+            }
+        } // for
+        return $output;
+    }
+
+    /**
+     * Convert UCS-4 array into UTF-8 string
+     *
+     * @param array $input ucs4-encoded array
+     *
+     * @return string      utf8-encoded string
+     * @throws Exception
+     * @access private
+     */
+    private function _ucs4_to_utf8($input)
+    {
+        $output = '';
+
+        foreach ($input as $v) {
+            // $v = ord($v);
+
+            if ($v < 128) {
+                // 7bit are transferred literally
+                $output .= chr($v);
+            } else if ($v < 1 << 11) {
+                // 2 bytes
+                $output .= chr(192 + ($v >> 6))
+                    . chr(128 + ($v & 63));
+            } else if ($v < 1 << 16) {
+                // 3 bytes
+                $output .= chr(224 + ($v >> 12))
+                    . chr(128 + (($v >> 6) & 63))
+                    . chr(128 + ($v & 63));
+            } else if ($v < 1 << 21) {
+                // 4 bytes
+                $output .= chr(240 + ($v >> 18))
+                    . chr(128 + (($v >> 12) & 63))
+                    . chr(128 + (($v >>  6) & 63))
+                    . chr(128 + ($v & 63));
+            } else if ($v < 1 << 26) {
+                // 5 bytes
+                $output .= chr(248 + ($v >> 24))
+                    . chr(128 + (($v >> 18) & 63))
+                    . chr(128 + (($v >> 12) & 63))
+                    . chr(128 + (($v >>  6) & 63))
+                    . chr(128 + ($v & 63));
+            } else if ($v < 1 << 31) {
+                // 6 bytes
+                $output .= chr(252 + ($v >> 30))
+                    . chr(128 + (($v >> 24) & 63))
+                    . chr(128 + (($v >> 18) & 63))
+                    . chr(128 + (($v >> 12) & 63))
+                    . chr(128 + (($v >>  6) & 63))
+                    . chr(128 + ($v & 63));
+            } else {
+                throw new UnexpectedValueException('Conversion from UCS-4 to UTF-8 failed: malformed input');
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Convert UCS-4 array into UCS-4 string
+     *
+     * @param array $input ucs4-encoded array
+     *
+     * @return string      ucs4-encoded string
+     * @throws Exception
+     * @access private
+     */
+    private function _ucs4_to_ucs4_string($input)
+    {
+        $output = '';
+        // Take array values and split output to 4 bytes per value
+        // The bit mask is 255, which reads &11111111
+        foreach ($input as $v) {
+            $output .= ($v & (255 << 24) >> 24) . ($v & (255 << 16) >> 16) . ($v & (255 << 8) >> 8) . ($v & 255);
+        }
+        return $output;
+    }
+
+    /**
+     * Convert UCS-4 string into UCS-4 array
+     *
+     * @param string $input ucs4-encoded string
+     *
+     * @return array        ucs4-encoded array
+     * @throws InvalidArgumentException
+     * @access private
+     */
+    private function _ucs4_string_to_ucs4($input)
+    {
+        $output = array();
+
+        $inp_len = self::_byteLength($input);
+        // Input length must be dividable by 4
+        if ($inp_len % 4) {
+            throw new InvalidArgumentException('Input UCS4 string is broken');
+        }
+
+        // Empty input - return empty output
+        if (!$inp_len) {
+            return $output;
+        }
+
+        for ($i = 0, $out_len = -1; $i < $inp_len; ++$i) {
+            // Increment output position every 4 input bytes
+            if (!$i % 4) {
+                $out_len++;
+                $output[$out_len] = 0;
+            }
+            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
+        }
+        return $output;
+    }
+
+    /**
+     * Echo hex representation of UCS4 sequence.
+     *
+     * @param array   $input       UCS4 sequence
+     * @param boolean $include_bit Include bitmask in output
+     *
+     * @return void
+     * @static
+     * @access private
+     */
+    private static function _showHex($input, $include_bit = false)
+    {
+        foreach ($input as $k => $v) {
+            echo '[', $k, '] => ', sprintf('%X', $v);
+
+            if ($include_bit) {
+                echo ' (', Net_IDNA2::_showBitmask($v), ')';
+            }
+
+            echo "\n";
+        }
+    }
+
+    /**
+     * Gives you a bit representation of given Byte (8 bits), Word (16 bits) or DWord (32 bits)
+     * Output width is automagically determined
+     *
+     * @param int $octet ...
+     *
+     * @return string    Bitmask-representation
+     * @static
+     * @access private
+     */
+    private static function _showBitmask($octet)
+    {
+        if ($octet >= (1 << 16)) {
+            $w = 31;
+        } else if ($octet >= (1 << 8)) {
+            $w = 15;
+        } else {
+            $w = 7;
+        }
+
+        $return = '';
+
+        for ($i = $w; $i > -1; $i--) {
+            $return .= ($octet & (1 << $i))? '1' : '0';
+        }
+
+        return $return;
+    }
+
+    /**
+     * Gets the length of a string in bytes even if mbstring function
+     * overloading is turned on
+     *
+     * @param string $string the string for which to get the length.
+     *
+     * @return integer the length of the string in bytes.
+     *
+     * @see Net_IDNA2::$_mb_string_overload
+     */
+    private static function _byteLength($string)
+    {
+        if (self::$_mb_string_overload) {
+            return mb_strlen($string, '8bit');
+        }
+        return strlen((binary)$string);
+    }
+
+    // }}}}
+
+    // {{{ factory
+    /**
+     * Attempts to return a concrete IDNA instance for either php4 or php5.
+     *
+     * @param array $params Set of paramaters
+     *
+     * @return Net_IDNA2
+     * @access public
+     */
+    function getInstance($params = array())
+    {
+        return new Net_IDNA2($params);
+    }
+    // }}}
+
+    // {{{ singleton
+    /**
+     * Attempts to return a concrete IDNA instance for either php4 or php5,
+     * only creating a new instance if no IDNA instance with the same
+     * parameters currently exists.
+     *
+     * @param array $params Set of paramaters
+     *
+     * @return object Net_IDNA2
+     * @access public
+     */
+    function singleton($params = array())
+    {
+        static $instances;
+        if (!isset($instances)) {
+            $instances = array();
+        }
+
+        $signature = serialize($params);
+        if (!isset($instances[$signature])) {
+            $instances[$signature] = Net_IDNA2::getInstance($params);
+        }
+
+        return $instances[$signature];
+    }
+    // }}}
+}
+
+?>

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Net/IDNA2/Exception Added

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Net/IDNA2/Exception.php Added

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Net/IDNA2/Exception/Nameprep.php Added

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Net/SMTP.php Added

@@ -0,0 +1,1342 @@
+<?php
+/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
+// +----------------------------------------------------------------------+
+// | PHP Version 4                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license,      |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/2_02.txt.                                 |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Chuck Hagenbuch <chuck@horde.org>                           |
+// |          Jon Parise <jon@php.net>                                    |
+// |          Damian Alejandro Fernandez Sosa <damlists@cnba.uba.ar>      |
+// +----------------------------------------------------------------------+
+//
+// $Id$
+
+require_once 'PEAR.php';
+require_once 'Net/Socket.php';
+
+/**
+ * Provides an implementation of the SMTP protocol using PEAR's
+ * Net_Socket:: class.
+ *
+ * @package Net_SMTP
+ * @author  Chuck Hagenbuch <chuck@horde.org>
+ * @author  Jon Parise <jon@php.net>
+ * @author  Damian Alejandro Fernandez Sosa <damlists@cnba.uba.ar>
+ *
+ * @example basic.php   A basic implementation of the Net_SMTP package.
+ */
+class Net_SMTP
+{
+    /**
+     * The server to connect to.
+     * @var string
+     * @access public
+     */
+    var $host = 'localhost';
+
+    /**
+     * The port to connect to.
+     * @var int
+     * @access public
+     */
+    var $port = 25;
+
+    /**
+     * The value to give when sending EHLO or HELO.
+     * @var string
+     * @access public
+     */
+    var $localhost = 'localhost';
+
+    /**
+     * List of supported authentication methods, in preferential order.
+     * @var array
+     * @access public
+     */
+    var $auth_methods = array();
+
+    /**
+     * Use SMTP command pipelining (specified in RFC 2920) if the SMTP
+     * server supports it.
+     *
+     * When pipeling is enabled, rcptTo(), mailFrom(), sendFrom(),
+     * somlFrom() and samlFrom() do not wait for a response from the
+     * SMTP server but return immediately.
+     *
+     * @var bool
+     * @access public
+     */
+    var $pipelining = false;
+
+    /**
+     * Number of pipelined commands.
+     * @var int
+     * @access private
+     */
+    var $_pipelined_commands = 0;
+
+    /**
+     * Should debugging output be enabled?
+     * @var boolean
+     * @access private
+     */
+    var $_debug = false;
+
+    /**
+     * Debug output handler.
+     * @var callback
+     * @access private
+     */
+    var $_debug_handler = null;
+
+    /**
+     * The socket resource being used to connect to the SMTP server.
+     * @var resource
+     * @access private
+     */
+    var $_socket = null;
+
+    /**
+     * Array of socket options that will be passed to Net_Socket::connect().
+     * @see stream_context_create()
+     * @var array
+     * @access private
+     */
+    var $_socket_options = null;
+
+    /**
+     * The socket I/O timeout value in seconds.
+     * @var int
+     * @access private
+     */
+    var $_timeout = 0;
+
+    /**
+     * The most recent server response code.
+     * @var int
+     * @access private
+     */
+    var $_code = -1;
+
+    /**
+     * The most recent server response arguments.
+     * @var array
+     * @access private
+     */
+    var $_arguments = array();
+
+    /**
+     * Stores the SMTP server's greeting string.
+     * @var string
+     * @access private
+     */
+    var $_greeting = null;
+
+    /**
+     * Stores detected features of the SMTP server.
+     * @var array
+     * @access private
+     */
+    var $_esmtp = array();
+
+    /**
+     * Instantiates a new Net_SMTP object, overriding any defaults
+     * with parameters that are passed in.
+     *
+     * If you have SSL support in PHP, you can connect to a server
+     * over SSL using an 'ssl://' prefix:
+     *
+     *   // 465 is a common smtps port.
+     *   $smtp = new Net_SMTP('ssl://mail.host.com', 465);
+     *   $smtp->connect();
+     *
+     * @param string  $host       The server to connect to.
+     * @param integer $port       The port to connect to.
+     * @param string  $localhost  The value to give when sending EHLO or HELO.
+     * @param boolean $pipeling   Use SMTP command pipelining
+     * @param integer $timeout    Socket I/O timeout in seconds.
+     * @param array   $socket_options Socket stream_context_create() options.
+     *
+     * @access  public
+     * @since   1.0
+     */
+    function Net_SMTP($host = null, $port = null, $localhost = null,
+        $pipelining = false, $timeout = 0, $socket_options = null)
+    {
+        if (isset($host)) {
+            $this->host = $host;
+        }
+        if (isset($port)) {
+            $this->port = $port;
+        }
+        if (isset($localhost)) {
+            $this->localhost = $localhost;
+        }
+        $this->pipelining = $pipelining;
+
+        $this->_socket = new Net_Socket();
+        $this->_socket_options = $socket_options;
+        $this->_timeout = $timeout;
+
+        /* Include the Auth_SASL package.  If the package is available, we 
+         * enable the authentication methods that depend upon it. */
+        if ((@include_once 'Auth/SASL.php') === true) {
+            $this->setAuthMethod('CRAM-MD5', array($this, '_authCram_MD5'));
+            $this->setAuthMethod('DIGEST-MD5', array($this, '_authDigest_MD5'));
+        }
+
+        /* These standard authentication methods are always available. */
+        $this->setAuthMethod('LOGIN', array($this, '_authLogin'), false);
+        $this->setAuthMethod('PLAIN', array($this, '_authPlain'), false);
+    }
+
+    /**
+     * Set the socket I/O timeout value in seconds plus microseconds.
+     *
+     * @param   integer $seconds        Timeout value in seconds.
+     * @param   integer $microseconds   Additional value in microseconds.
+     *
+     * @access  public
+     * @since   1.5.0
+     */
+    function setTimeout($seconds, $microseconds = 0) {
+        return $this->_socket->setTimeout($seconds, $microseconds);
+    }
+
+    /**
+     * Set the value of the debugging flag.
+     *
+     * @param   boolean $debug      New value for the debugging flag.
+     *
+     * @access  public
+     * @since   1.1.0
+     */
+    function setDebug($debug, $handler = null)
+    {
+        $this->_debug = $debug;
+        $this->_debug_handler = $handler;
+    }
+
+    /**
+     * Write the given debug text to the current debug output handler.
+     *
+     * @param   string  $message    Debug mesage text.
+     *
+     * @access  private
+     * @since   1.3.3
+     */
+    function _debug($message)
+    {
+        if ($this->_debug) {
+            if ($this->_debug_handler) {
+                call_user_func_array($this->_debug_handler,
+                                     array(&$this, $message));
+            } else {
+                echo "DEBUG: $message\n";
+            }
+        }
+    }
+
+    /**
+     * Send the given string of data to the server.
+     *
+     * @param   string  $data       The string of data to send.
+     *
+     * @return  mixed   The number of bytes that were actually written,
+     *                  or a PEAR_Error object on failure.
+     *
+     * @access  private
+     * @since   1.1.0
+     */
+    function _send($data)
+    {
+        $this->_debug("Send: $data");
+
+        $result = $this->_socket->write($data);
+        if (!$result || PEAR::isError($result)) {
+            $msg = ($result) ? $result->getMessage() : "unknown error";
+            return PEAR::raiseError("Failed to write to socket: $msg",
+                                    null, PEAR_ERROR_RETURN);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Send a command to the server with an optional string of
+     * arguments.  A carriage return / linefeed (CRLF) sequence will
+     * be appended to each command string before it is sent to the
+     * SMTP server - an error will be thrown if the command string
+     * already contains any newline characters. Use _send() for
+     * commands that must contain newlines.
+     *
+     * @param   string  $command    The SMTP command to send to the server.
+     * @param   string  $args       A string of optional arguments to append
+     *                              to the command.
+     *
+     * @return  mixed   The result of the _send() call.
+     *
+     * @access  private
+     * @since   1.1.0
+     */
+    function _put($command, $args = '')
+    {
+        if (!empty($args)) {
+            $command .= ' ' . $args;
+        }
+
+        if (strcspn($command, "\r\n") !== strlen($command)) {
+            return PEAR::raiseError('Commands cannot contain newlines',
+                                    null, PEAR_ERROR_RETURN);
+        }
+
+        return $this->_send($command . "\r\n");
+    }
+
+    /**
+     * Read a reply from the SMTP server.  The reply consists of a response
+     * code and a response message.
+     *
+     * @param   mixed   $valid      The set of valid response codes.  These
+     *                              may be specified as an array of integer
+     *                              values or as a single integer value.
+     * @param   bool    $later      Do not parse the response now, but wait
+     *                              until the last command in the pipelined
+     *                              command group
+     *
+     * @return  mixed   True if the server returned a valid response code or
+     *                  a PEAR_Error object is an error condition is reached.
+     *
+     * @access  private
+     * @since   1.1.0
+     *
+     * @see     getResponse
+     */
+    function _parseResponse($valid, $later = false)
+    {
+        $this->_code = -1;
+        $this->_arguments = array();
+
+        if ($later) {
+            $this->_pipelined_commands++;
+            return true;
+        }
+
+        for ($i = 0; $i <= $this->_pipelined_commands; $i++) {
+            while ($line = $this->_socket->readLine()) {
+                $this->_debug("Recv: $line");
+
+                /* If we receive an empty line, the connection was closed. */
+                if (empty($line)) {
+                    $this->disconnect();
+                    return PEAR::raiseError('Connection was closed',
+                                            null, PEAR_ERROR_RETURN);
+                }
+
+                /* Read the code and store the rest in the arguments array. */
+                $code = substr($line, 0, 3);
+                $this->_arguments[] = trim(substr($line, 4));
+
+                /* Check the syntax of the response code. */
+                if (is_numeric($code)) {
+                    $this->_code = (int)$code;
+                } else {
+                    $this->_code = -1;
+                    break;
+                }
+
+                /* If this is not a multiline response, we're done. */
+                if (substr($line, 3, 1) != '-') {
+                    break;
+                }
+            }
+        }
+
+        $this->_pipelined_commands = 0;
+
+        /* Compare the server's response code with the valid code/codes. */
+        if (is_int($valid) && ($this->_code === $valid)) {
+            return true;
+        } elseif (is_array($valid) && in_array($this->_code, $valid, true)) {
+            return true;
+        }
+
+        return PEAR::raiseError('Invalid response code received from server',
+                                $this->_code, PEAR_ERROR_RETURN);
+    }
+
+    /**
+     * Issue an SMTP command and verify its response.
+     *
+     * @param   string  $command    The SMTP command string or data.
+     * @param   mixed   $valid      The set of valid response codes.  These
+     *                              may be specified as an array of integer
+     *                              values or as a single integer value.
+     *
+     * @return  mixed   True on success or a PEAR_Error object on failure.
+     *
+     * @access  public
+     * @since   1.6.0
+     */
+    function command($command, $valid)
+    {
+        if (PEAR::isError($error = $this->_put($command))) {
+            return $error;
+        }
+        if (PEAR::isError($error = $this->_parseResponse($valid))) {
+            return $error;
+        }
+
+        return true;
+    }
+
+    /**
+     * Return a 2-tuple containing the last response from the SMTP server.
+     *
+     * @return  array   A two-element array: the first element contains the
+     *                  response code as an integer and the second element
+     *                  contains the response's arguments as a string.
+     *
+     * @access  public
+     * @since   1.1.0
+     */
+    function getResponse()
+    {
+        return array($this->_code, join("\n", $this->_arguments));
+    }
+
+    /**
+     * Return the SMTP server's greeting string.
+     *
+     * @return  string  A string containing the greeting string, or null if a 
+     *                  greeting has not been received.
+     *
+     * @access  public
+     * @since   1.3.3
+     */
+    function getGreeting()
+    {
+        return $this->_greeting;
+    }
+
+    /**
+     * Attempt to connect to the SMTP server.
+     *
+     * @param   int     $timeout    The timeout value (in seconds) for the
+     *                              socket connection attempt.
+     * @param   bool    $persistent Should a persistent socket connection
+     *                              be used?
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @access public
+     * @since  1.0
+     */
+    function connect($timeout = null, $persistent = false)
+    {
+        $this->_greeting = null;
+        $result = $this->_socket->connect($this->host, $this->port,
+                                          $persistent, $timeout,
+                                          $this->_socket_options);
+        if (PEAR::isError($result)) {
+            return PEAR::raiseError('Failed to connect socket: ' .
+                                    $result->getMessage());
+        }
+
+        /*
+         * Now that we're connected, reset the socket's timeout value for 
+         * future I/O operations.  This allows us to have different socket 
+         * timeout values for the initial connection (our $timeout parameter) 
+         * and all other socket operations.
+         */
+        if ($this->_timeout > 0) {
+            if (PEAR::isError($error = $this->setTimeout($this->_timeout))) {
+                return $error;
+            }
+        }
+
+        if (PEAR::isError($error = $this->_parseResponse(220))) {
+            return $error;
+        }
+
+        /* Extract and store a copy of the server's greeting string. */
+        list(, $this->_greeting) = $this->getResponse();
+
+        if (PEAR::isError($error = $this->_negotiate())) {
+            return $error;
+        }
+
+        return true;
+    }
+
+    /**
+     * Attempt to disconnect from the SMTP server.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @access public
+     * @since  1.0
+     */
+    function disconnect()
+    {
+        if (PEAR::isError($error = $this->_put('QUIT'))) {
+            return $error;
+        }
+        if (PEAR::isError($error = $this->_parseResponse(221))) {
+            return $error;
+        }
+        if (PEAR::isError($error = $this->_socket->disconnect())) {
+            return PEAR::raiseError('Failed to disconnect socket: ' .
+                                    $error->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * Attempt to send the EHLO command and obtain a list of ESMTP
+     * extensions available, and failing that just send HELO.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     *
+     * @access private
+     * @since  1.1.0
+     */
+    function _negotiate()
+    {
+        if (PEAR::isError($error = $this->_put('EHLO', $this->localhost))) {
+            return $error;
+        }
+
+        if (PEAR::isError($this->_parseResponse(250))) {
+            /* If we receive a 503 response, we're already authenticated. */
+            if ($this->_code === 503) {
+                return true;
+            }
+
+            /* If the EHLO failed, try the simpler HELO command. */
+            if (PEAR::isError($error = $this->_put('HELO', $this->localhost))) {
+                return $error;
+            }
+            if (PEAR::isError($this->_parseResponse(250))) {
+                return PEAR::raiseError('HELO was not accepted: ', $this->_code,
+                                        PEAR_ERROR_RETURN);
+            }
+
+            return true;
+        }
+
+        foreach ($this->_arguments as $argument) {
+            $verb = strtok($argument, ' ');
+            $arguments = substr($argument, strlen($verb) + 1,
+                                strlen($argument) - strlen($verb) - 1);
+            $this->_esmtp[$verb] = $arguments;
+        }
+
+        if (!isset($this->_esmtp['PIPELINING'])) {
+            $this->pipelining = false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns the name of the best authentication method that the server
+     * has advertised.
+     *
+     * @return mixed    Returns a string containing the name of the best
+     *                  supported authentication method or a PEAR_Error object
+     *                  if a failure condition is encountered.
+     * @access private
+     * @since  1.1.0
+     */
+    function _getBestAuthMethod()
+    {
+        $available_methods = explode(' ', $this->_esmtp['AUTH']);
+
+        foreach ($this->auth_methods as $method => $callback) {
+            if (in_array($method, $available_methods)) {
+                return $method;
+            }
+        }
+
+        return PEAR::raiseError('No supported authentication methods',
+                                null, PEAR_ERROR_RETURN);
+    }
+
+    /**
+     * Attempt to do SMTP authentication.
+     *
+     * @param string The userid to authenticate as.
+     * @param string The password to authenticate with.
+     * @param string The requested authentication method.  If none is
+     *               specified, the best supported method will be used.
+     * @param bool   Flag indicating whether or not TLS should be attempted.
+     * @param string An optional authorization identifier.  If specified, this
+     *               identifier will be used as the authorization proxy.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @access public
+     * @since  1.0
+     */
+    function auth($uid, $pwd , $method = '', $tls = true, $authz = '')
+    {
+        /* We can only attempt a TLS connection if one has been requested,
+         * we're running PHP 5.1.0 or later, have access to the OpenSSL 
+         * extension, are connected to an SMTP server which supports the 
+         * STARTTLS extension, and aren't already connected over a secure 
+         * (SSL) socket connection. */
+        if ($tls && version_compare(PHP_VERSION, '5.1.0', '>=') &&
+            extension_loaded('openssl') && isset($this->_esmtp['STARTTLS']) &&
+            strncasecmp($this->host, 'ssl://', 6) !== 0) {
+            /* Start the TLS connection attempt. */
+            if (PEAR::isError($result = $this->_put('STARTTLS'))) {
+                return $result;
+            }
+            if (PEAR::isError($result = $this->_parseResponse(220))) {
+                return $result;
+            }
+            if (PEAR::isError($result = $this->_socket->enableCrypto(true, STREAM_CRYPTO_METHOD_TLS_CLIENT))) {
+                return $result;
+            } elseif ($result !== true) {
+                return PEAR::raiseError('STARTTLS failed');
+            }
+
+            /* Send EHLO again to recieve the AUTH string from the
+             * SMTP server. */
+            $this->_negotiate();
+        }
+
+        if (empty($this->_esmtp['AUTH'])) {
+            return PEAR::raiseError('SMTP server does not support authentication');
+        }
+
+        /* If no method has been specified, get the name of the best
+         * supported method advertised by the SMTP server. */
+        if (empty($method)) {
+            if (PEAR::isError($method = $this->_getBestAuthMethod())) {
+                /* Return the PEAR_Error object from _getBestAuthMethod(). */
+                return $method;
+            }
+        } else {
+            $method = strtoupper($method);
+            if (!array_key_exists($method, $this->auth_methods)) {
+                return PEAR::raiseError("$method is not a supported authentication method");
+            }
+        }
+
+        if (!isset($this->auth_methods[$method])) {
+            return PEAR::raiseError("$method is not a supported authentication method");
+        }
+
+        if (!is_callable($this->auth_methods[$method], false)) {
+            return PEAR::raiseError("$method authentication method cannot be called");
+        }
+
+        if (is_array($this->auth_methods[$method])) {
+            list($object, $method) = $this->auth_methods[$method];
+            $result = $object->{$method}($uid, $pwd, $authz, $this);
+        } else {
+            $func =  $this->auth_methods[$method];
+            $result = $func($uid, $pwd, $authz, $this);
+         }
+
+        /* If an error was encountered, return the PEAR_Error object. */
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        return true;
+    }
+
+    /**
+     * Add a new authentication method.
+     *
+     * @param string    The authentication method name (e.g. 'PLAIN')
+     * @param mixed     The authentication callback (given as the name of a 
+     *                  function or as an (object, method name) array).
+     * @param bool      Should the new method be prepended to the list of 
+     *                  available methods?  This is the default behavior, 
+     *                  giving the new method the highest priority.
+     *
+     * @return  mixed   True on success or a PEAR_Error object on failure.
+     *
+     * @access public
+     * @since  1.6.0
+     */
+    function setAuthMethod($name, $callback, $prepend = true)
+    {
+        if (!is_string($name)) {
+            return PEAR::raiseError('Method name is not a string');
+        }
+
+        if (!is_string($callback) && !is_array($callback)) {
+            return PEAR::raiseError('Method callback must be string or array');
+        }
+
+        if (is_array($callback)) {
+            if (!is_object($callback[0]) || !is_string($callback[1]))
+                return PEAR::raiseError('Bad mMethod callback array');
+        }
+
+        if ($prepend) {
+            $this->auth_methods = array_merge(array($name => $callback),
+                                              $this->auth_methods);
+        } else {
+            $this->auth_methods[$name] = $callback;
+        }
+
+        return true;
+    }
+
+    /**
+     * Authenticates the user using the DIGEST-MD5 method.
+     *
+     * @param string The userid to authenticate as.
+     * @param string The password to authenticate with.
+     * @param string The optional authorization proxy identifier.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @access private
+     * @since  1.1.0
+     */
+    function _authDigest_MD5($uid, $pwd, $authz = '')
+    {
+        if (PEAR::isError($error = $this->_put('AUTH', 'DIGEST-MD5'))) {
+            return $error;
+        }
+        /* 334: Continue authentication request */
+        if (PEAR::isError($error = $this->_parseResponse(334))) {
+            /* 503: Error: already authenticated */
+            if ($this->_code === 503) {
+                return true;
+            }
+            return $error;
+        }
+
+        $challenge = base64_decode($this->_arguments[0]);
+        $digest = &Auth_SASL::factory('digestmd5');
+        $auth_str = base64_encode($digest->getResponse($uid, $pwd, $challenge,
+                                                       $this->host, "smtp",
+                                                       $authz));
+
+        if (PEAR::isError($error = $this->_put($auth_str))) {
+            return $error;
+        }
+        /* 334: Continue authentication request */
+        if (PEAR::isError($error = $this->_parseResponse(334))) {
+            return $error;
+        }
+
+        /* We don't use the protocol's third step because SMTP doesn't
+         * allow subsequent authentication, so we just silently ignore
+         * it. */
+        if (PEAR::isError($error = $this->_put(''))) {
+            return $error;
+        }
+        /* 235: Authentication successful */
+        if (PEAR::isError($error = $this->_parseResponse(235))) {
+            return $error;
+        }
+    }
+
+    /**
+     * Authenticates the user using the CRAM-MD5 method.
+     *
+     * @param string The userid to authenticate as.
+     * @param string The password to authenticate with.
+     * @param string The optional authorization proxy identifier.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @access private
+     * @since  1.1.0
+     */
+    function _authCRAM_MD5($uid, $pwd, $authz = '')
+    {
+        if (PEAR::isError($error = $this->_put('AUTH', 'CRAM-MD5'))) {
+            return $error;
+        }
+        /* 334: Continue authentication request */
+        if (PEAR::isError($error = $this->_parseResponse(334))) {
+            /* 503: Error: already authenticated */
+            if ($this->_code === 503) {
+                return true;
+            }
+            return $error;
+        }
+
+        $challenge = base64_decode($this->_arguments[0]);
+        $cram = &Auth_SASL::factory('crammd5');
+        $auth_str = base64_encode($cram->getResponse($uid, $pwd, $challenge));
+
+        if (PEAR::isError($error = $this->_put($auth_str))) {
+            return $error;
+        }
+
+        /* 235: Authentication successful */
+        if (PEAR::isError($error = $this->_parseResponse(235))) {
+            return $error;
+        }
+    }
+
+    /**
+     * Authenticates the user using the LOGIN method.
+     *
+     * @param string The userid to authenticate as.
+     * @param string The password to authenticate with.
+     * @param string The optional authorization proxy identifier.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @access private
+     * @since  1.1.0
+     */
+    function _authLogin($uid, $pwd, $authz = '')
+    {
+        if (PEAR::isError($error = $this->_put('AUTH', 'LOGIN'))) {
+            return $error;
+        }
+        /* 334: Continue authentication request */
+        if (PEAR::isError($error = $this->_parseResponse(334))) {
+            /* 503: Error: already authenticated */
+            if ($this->_code === 503) {
+                return true;
+            }
+            return $error;
+        }
+
+        if (PEAR::isError($error = $this->_put(base64_encode($uid)))) {
+            return $error;
+        }
+        /* 334: Continue authentication request */
+        if (PEAR::isError($error = $this->_parseResponse(334))) {
+            return $error;
+        }
+
+        if (PEAR::isError($error = $this->_put(base64_encode($pwd)))) {
+            return $error;
+        }
+
+        /* 235: Authentication successful */
+        if (PEAR::isError($error = $this->_parseResponse(235))) {
+            return $error;
+        }
+
+        return true;
+    }
+
+    /**
+     * Authenticates the user using the PLAIN method.
+     *
+     * @param string The userid to authenticate as.
+     * @param string The password to authenticate with.
+     * @param string The optional authorization proxy identifier.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @access private
+     * @since  1.1.0
+     */
+    function _authPlain($uid, $pwd, $authz = '')
+    {
+        if (PEAR::isError($error = $this->_put('AUTH', 'PLAIN'))) {
+            return $error;
+        }
+        /* 334: Continue authentication request */
+        if (PEAR::isError($error = $this->_parseResponse(334))) {
+            /* 503: Error: already authenticated */
+            if ($this->_code === 503) {
+                return true;
+            }
+            return $error;
+        }
+
+        $auth_str = base64_encode($authz . chr(0) . $uid . chr(0) . $pwd);
+
+        if (PEAR::isError($error = $this->_put($auth_str))) {
+            return $error;
+        }
+
+        /* 235: Authentication successful */
+        if (PEAR::isError($error = $this->_parseResponse(235))) {
+            return $error;
+        }
+
+        return true;
+    }
+
+    /**
+     * Send the HELO command.
+     *
+     * @param string The domain name to say we are.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @access public
+     * @since  1.0
+     */
+    function helo($domain)
+    {
+        if (PEAR::isError($error = $this->_put('HELO', $domain))) {
+            return $error;
+        }
+        if (PEAR::isError($error = $this->_parseResponse(250))) {
+            return $error;
+        }
+
+        return true;
+    }
+
+    /**
+     * Return the list of SMTP service extensions advertised by the server.
+     *
+     * @return array The list of SMTP service extensions.
+     * @access public
+     * @since 1.3
+     */
+    function getServiceExtensions()
+    {
+        return $this->_esmtp;
+    }
+
+    /**
+     * Send the MAIL FROM: command.
+     *
+     * @param string $sender    The sender (reverse path) to set.
+     * @param string $params    String containing additional MAIL parameters,
+     *                          such as the NOTIFY flags defined by RFC 1891
+     *                          or the VERP protocol.
+     *
+     *                          If $params is an array, only the 'verp' option
+     *                          is supported.  If 'verp' is true, the XVERP
+     *                          parameter is appended to the MAIL command.  If
+     *                          the 'verp' value is a string, the full
+     *                          XVERP=value parameter is appended.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @access public
+     * @since  1.0
+     */
+    function mailFrom($sender, $params = null)
+    {
+        $args = "FROM:<$sender>";
+
+        /* Support the deprecated array form of $params. */
+        if (is_array($params) && isset($params['verp'])) {
+            /* XVERP */
+            if ($params['verp'] === true) {
+                $args .= ' XVERP';
+
+            /* XVERP=something */
+            } elseif (trim($params['verp'])) {
+                $args .= ' XVERP=' . $params['verp'];
+            }
+        } elseif (is_string($params) && !empty($params)) {
+            $args .= ' ' . $params;
+        }
+
+        if (PEAR::isError($error = $this->_put('MAIL', $args))) {
+            return $error;
+        }
+        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
+            return $error;
+        }
+
+        return true;
+    }
+
+    /**
+     * Send the RCPT TO: command.
+     *
+     * @param string $recipient The recipient (forward path) to add.
+     * @param string $params    String containing additional RCPT parameters,
+     *                          such as the NOTIFY flags defined by RFC 1891.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     *
+     * @access public
+     * @since  1.0
+     */
+    function rcptTo($recipient, $params = null)
+    {
+        $args = "TO:<$recipient>";
+        if (is_string($params)) {
+            $args .= ' ' . $params;
+        }
+
+        if (PEAR::isError($error = $this->_put('RCPT', $args))) {
+            return $error;
+        }
+        if (PEAR::isError($error = $this->_parseResponse(array(250, 251), $this->pipelining))) {
+            return $error;
+        }
+
+        return true;
+    }
+
+    /**
+     * Quote the data so that it meets SMTP standards.
+     *
+     * This is provided as a separate public function to facilitate
+     * easier overloading for the cases where it is desirable to
+     * customize the quoting behavior.
+     *
+     * @param string $data  The message text to quote. The string must be passed
+     *                      by reference, and the text will be modified in place.
+     *
+     * @access public
+     * @since  1.2
+     */
+    function quotedata(&$data)
+    {
+        /* Change Unix (\n) and Mac (\r) linefeeds into
+         * Internet-standard CRLF (\r\n) linefeeds. */
+        $data = preg_replace(array('/(?<!\r)\n/','/\r(?!\n)/'), "\r\n", $data);
+
+        /* Because a single leading period (.) signifies an end to the
+         * data, legitimate leading periods need to be "doubled"
+         * (e.g. '..'). */
+        $data = str_replace("\n.", "\n..", $data);
+    }
+
+    /**
+     * Send the DATA command.
+     *
+     * @param mixed $data     The message data, either as a string or an open
+     *                        file resource.
+     * @param string $headers The message headers.  If $headers is provided,
+     *                        $data is assumed to contain only body data.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @access public
+     * @since  1.0
+     */
+    function data($data, $headers = null)
+    {
+        /* Verify that $data is a supported type. */
+        if (!is_string($data) && !is_resource($data)) {
+            return PEAR::raiseError('Expected a string or file resource');
+        }
+
+        /* Start by considering the size of the optional headers string.  We
+         * also account for the addition 4 character "\r\n\r\n" separator
+         * sequence. */
+        $size = (is_null($headers)) ? 0 : strlen($headers) + 4;
+
+        if (is_resource($data)) {
+            $stat = fstat($data);
+            if ($stat === false) {
+                return PEAR::raiseError('Failed to get file size');
+            }
+            $size += $stat['size'];
+        } else {
+            $size += strlen($data);
+        }
+
+        /* RFC 1870, section 3, subsection 3 states "a value of zero indicates
+         * that no fixed maximum message size is in force".  Furthermore, it
+         * says that if "the parameter is omitted no information is conveyed
+         * about the server's fixed maximum message size". */
+        $limit = (isset($this->_esmtp['SIZE'])) ? $this->_esmtp['SIZE'] : 0;
+        if ($limit > 0 && $size >= $limit) {
+            $this->disconnect();
+            return PEAR::raiseError('Message size exceeds server limit');
+        }
+
+        /* Initiate the DATA command. */
+        if (PEAR::isError($error = $this->_put('DATA'))) {
+            return $error;
+        }
+        if (PEAR::isError($error = $this->_parseResponse(354))) {
+            return $error;
+        }
+
+        /* If we have a separate headers string, send it first. */
+        if (!is_null($headers)) {
+            $this->quotedata($headers);
+            if (PEAR::isError($result = $this->_send($headers . "\r\n\r\n"))) {
+                return $result;
+            }
+        }
+
+        /* Now we can send the message body data. */
+        if (is_resource($data)) {
+            /* Stream the contents of the file resource out over our socket 
+             * connection, line by line.  Each line must be run through the 
+             * quoting routine. */
+            while (strlen($line = fread($data, 8192)) > 0) {
+                /* If the last character is an newline, we need to grab the
+                 * next character to check to see if it is a period. */
+                while (!feof($data)) {
+                    $char = fread($data, 1);
+                    $line .= $char;
+                    if ($char != "\n") {
+                        break;
+                    }
+                }
+                $this->quotedata($line);
+                if (PEAR::isError($result = $this->_send($line))) {
+                    return $result;
+                }
+            }
+        } else {
+            /*
+             * Break up the data by sending one chunk (up to 512k) at a time.  
+             * This approach reduces our peak memory usage.
+             */
+            for ($offset = 0; $offset < $size;) {
+                $end = $offset + 512000;
+
+                /*
+                 * Ensure we don't read beyond our data size or span multiple 
+                 * lines.  quotedata() can't properly handle character data 
+                 * that's split across two line break boundaries.
+                 */
+                if ($end >= $size) {
+                    $end = $size;
+                } else {
+                    for (; $end < $size; $end++) {
+                        if ($data[$end] != "\n") {
+                            break;
+                        }
+                    }
+                }
+
+                /* Extract our chunk and run it through the quoting routine. */
+                $chunk = substr($data, $offset, $end - $offset);
+                $this->quotedata($chunk);
+
+                /* If we run into a problem along the way, abort. */
+                if (PEAR::isError($result = $this->_send($chunk))) {
+                    return $result;
+                }
+
+                /* Advance the offset to the end of this chunk. */
+                $offset = $end;
+            }
+        }
+
+        /* Finally, send the DATA terminator sequence. */
+        if (PEAR::isError($result = $this->_send("\r\n.\r\n"))) {
+            return $result;
+        }
+
+        /* Verify that the data was successfully received by the server. */
+        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
+            return $error;
+        }
+
+        return true;
+    }
+
+    /**
+     * Send the SEND FROM: command.
+     *
+     * @param string The reverse path to send.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @access public
+     * @since  1.2.6
+     */
+    function sendFrom($path)
+    {
+        if (PEAR::isError($error = $this->_put('SEND', "FROM:<$path>"))) {
+            return $error;
+        }
+        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
+            return $error;
+        }
+
+        return true;
+    }
+
+    /**
+     * Backwards-compatibility wrapper for sendFrom().
+     *
+     * @param string The reverse path to send.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     *
+     * @access      public
+     * @since       1.0
+     * @deprecated  1.2.6
+     */
+    function send_from($path)
+    {
+        return sendFrom($path);
+    }
+
+    /**
+     * Send the SOML FROM: command.
+     *
+     * @param string The reverse path to send.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @access public
+     * @since  1.2.6
+     */
+    function somlFrom($path)
+    {
+        if (PEAR::isError($error = $this->_put('SOML', "FROM:<$path>"))) {
+            return $error;
+        }
+        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
+            return $error;
+        }
+
+        return true;
+    }
+
+    /**
+     * Backwards-compatibility wrapper for somlFrom().
+     *
+     * @param string The reverse path to send.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     *
+     * @access      public
+     * @since       1.0
+     * @deprecated  1.2.6
+     */
+    function soml_from($path)
+    {
+        return somlFrom($path);
+    }
+
+    /**
+     * Send the SAML FROM: command.
+     *
+     * @param string The reverse path to send.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @access public
+     * @since  1.2.6
+     */
+    function samlFrom($path)
+    {
+        if (PEAR::isError($error = $this->_put('SAML', "FROM:<$path>"))) {
+            return $error;
+        }
+        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
+            return $error;
+        }
+
+        return true;
+    }
+
+    /**
+     * Backwards-compatibility wrapper for samlFrom().
+     *
+     * @param string The reverse path to send.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     *
+     * @access      public
+     * @since       1.0
+     * @deprecated  1.2.6
+     */
+    function saml_from($path)
+    {
+        return samlFrom($path);
+    }
+
+    /**
+     * Send the RSET command.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @access public
+     * @since  1.0
+     */
+    function rset()
+    {
+        if (PEAR::isError($error = $this->_put('RSET'))) {
+            return $error;
+        }
+        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
+            return $error;
+        }
+
+        return true;
+    }
+
+    /**
+     * Send the VRFY command.
+     *
+     * @param string The string to verify
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @access public
+     * @since  1.0
+     */
+    function vrfy($string)
+    {
+        /* Note: 251 is also a valid response code */
+        if (PEAR::isError($error = $this->_put('VRFY', $string))) {
+            return $error;
+        }
+        if (PEAR::isError($error = $this->_parseResponse(array(250, 252)))) {
+            return $error;
+        }
+
+        return true;
+    }
+
+    /**
+     * Send the NOOP command.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @access public
+     * @since  1.0
+     */
+    function noop()
+    {
+        if (PEAR::isError($error = $this->_put('NOOP'))) {
+            return $error;
+        }
+        if (PEAR::isError($error = $this->_parseResponse(250))) {
+            return $error;
+        }
+
+        return true;
+    }
+
+    /**
+     * Backwards-compatibility method.  identifySender()'s functionality is
+     * now handled internally.
+     *
+     * @return  boolean     This method always return true.
+     *
+     * @access  public
+     * @since   1.0
+     */
+    function identifySender()
+    {
+        return true;
+    }
+
+}

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Net/Socket.php Added

@@ -0,0 +1,653 @@
+<?php
+/**
+ * Net_Socket
+ *
+ * PHP Version 4
+ *
+ * Copyright (c) 1997-2003 The PHP Group
+ *
+ * This source file is subject to version 2.0 of the PHP license,
+ * that is bundled with this package in the file LICENSE, and is
+ * available at through the world-wide-web at
+ * http://www.php.net/license/2_02.txt.
+ * If you did not receive a copy of the PHP license and are unable to
+ * obtain it through the world-wide-web, please send a note to
+ * license@php.net so we can mail you a copy immediately.
+ *
+ * Authors: Stig Bakken <ssb@php.net>
+ *          Chuck Hagenbuch <chuck@horde.org>
+ *
+ * @category  Net
+ * @package   Net_Socket
+ * @author    Stig Bakken <ssb@php.net>
+ * @author    Chuck Hagenbuch <chuck@horde.org>
+ * @copyright 1997-2003 The PHP Group
+ * @license   http://www.php.net/license/2_02.txt PHP 2.02
+ * @version   CVS: $Id$
+ * @link      http://pear.php.net/packages/Net_Socket
+ */
+
+require_once 'PEAR.php';
+
+define('NET_SOCKET_READ', 1);
+define('NET_SOCKET_WRITE', 2);
+define('NET_SOCKET_ERROR', 4);
+
+/**
+ * Generalized Socket class.
+ *
+ * @category  Net
+ * @package   Net_Socket
+ * @author    Stig Bakken <ssb@php.net>
+ * @author    Chuck Hagenbuch <chuck@horde.org>
+ * @copyright 1997-2003 The PHP Group
+ * @license   http://www.php.net/license/2_02.txt PHP 2.02
+ * @link      http://pear.php.net/packages/Net_Socket
+ */
+class Net_Socket extends PEAR
+{
+    /**
+     * Socket file pointer.
+     * @var resource $fp
+     */
+    var $fp = null;
+
+    /**
+     * Whether the socket is blocking. Defaults to true.
+     * @var boolean $blocking
+     */
+    var $blocking = true;
+
+    /**
+     * Whether the socket is persistent. Defaults to false.
+     * @var boolean $persistent
+     */
+    var $persistent = false;
+
+    /**
+     * The IP address to connect to.
+     * @var string $addr
+     */
+    var $addr = '';
+
+    /**
+     * The port number to connect to.
+     * @var integer $port
+     */
+    var $port = 0;
+
+    /**
+     * Number of seconds to wait on socket connections before assuming
+     * there's no more data. Defaults to no timeout.
+     * @var integer $timeout
+     */
+    var $timeout = false;
+
+    /**
+     * Number of bytes to read at a time in readLine() and
+     * readAll(). Defaults to 2048.
+     * @var integer $lineLength
+     */
+    var $lineLength = 2048;
+
+    /**
+     * The string to use as a newline terminator. Usually "\r\n" or "\n".
+     * @var string $newline
+     */
+    var $newline = "\r\n";
+
+    /**
+     * Connect to the specified port. If called when the socket is
+     * already connected, it disconnects and connects again.
+     *
+     * @param string  $addr       IP address or host name.
+     * @param integer $port       TCP port number.
+     * @param boolean $persistent (optional) Whether the connection is
+     *                            persistent (kept open between requests
+     *                            by the web server).
+     * @param integer $timeout    (optional) How long to wait for data.
+     * @param array   $options    See options for stream_context_create.
+     *
+     * @access public
+     *
+     * @return boolean | PEAR_Error  True on success or a PEAR_Error on failure.
+     */
+    function connect($addr, $port = 0, $persistent = null,
+                     $timeout = null, $options = null)
+    {
+        if (is_resource($this->fp)) {
+            @fclose($this->fp);
+            $this->fp = null;
+        }
+
+        if (!$addr) {
+            return $this->raiseError('$addr cannot be empty');
+        } elseif (strspn($addr, '.0123456789') == strlen($addr) ||
+                  strstr($addr, '/') !== false) {
+            $this->addr = $addr;
+        } else {
+            $this->addr = @gethostbyname($addr);
+        }
+
+        $this->port = $port % 65536;
+
+        if ($persistent !== null) {
+            $this->persistent = $persistent;
+        }
+
+        if ($timeout !== null) {
+            $this->timeout = $timeout;
+        }
+
+        $openfunc = $this->persistent ? 'pfsockopen' : 'fsockopen';
+        $errno    = 0;
+        $errstr   = '';
+
+        $old_track_errors = @ini_set('track_errors', 1);
+
+        if ($options && function_exists('stream_context_create')) {
+            if ($this->timeout) {
+                $timeout = $this->timeout;
+            } else {
+                $timeout = 0;
+            }
+            $context = stream_context_create($options);
+
+            // Since PHP 5 fsockopen doesn't allow context specification
+            if (function_exists('stream_socket_client')) {
+                $flags = STREAM_CLIENT_CONNECT;
+
+                if ($this->persistent) {
+                    $flags = STREAM_CLIENT_PERSISTENT;
+                }
+
+                $addr = $this->addr . ':' . $this->port;
+                $fp   = stream_socket_client($addr, $errno, $errstr,
+                                             $timeout, $flags, $context);
+            } else {
+                $fp = @$openfunc($this->addr, $this->port, $errno,
+                                 $errstr, $timeout, $context);
+            }
+        } else {
+            if ($this->timeout) {
+                $fp = @$openfunc($this->addr, $this->port, $errno,
+                                 $errstr, $this->timeout);
+            } else {
+                $fp = @$openfunc($this->addr, $this->port, $errno, $errstr);
+            }
+        }
+
+        if (!$fp) {
+            if ($errno == 0 && !strlen($errstr) && isset($php_errormsg)) {
+                $errstr = $php_errormsg;
+            }
+            @ini_set('track_errors', $old_track_errors);
+            return $this->raiseError($errstr, $errno);
+        }
+
+        @ini_set('track_errors', $old_track_errors);
+        $this->fp = $fp;
+
+        return $this->setBlocking($this->blocking);
+    }
+
+    /**
+     * Disconnects from the peer, closes the socket.
+     *
+     * @access public
+     * @return mixed true on success or a PEAR_Error instance otherwise
+     */
+    function disconnect()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        @fclose($this->fp);
+        $this->fp = null;
+        return true;
+    }
+
+    /**
+     * Set the newline character/sequence to use.
+     *
+     * @param string $newline  Newline character(s)
+     * @return boolean True
+     */
+    function setNewline($newline)
+    {
+        $this->newline = $newline;
+        return true;
+    }
+
+    /**
+     * Find out if the socket is in blocking mode.
+     *
+     * @access public
+     * @return boolean  The current blocking mode.
+     */
+    function isBlocking()
+    {
+        return $this->blocking;
+    }
+
+    /**
+     * Sets whether the socket connection should be blocking or
+     * not. A read call to a non-blocking socket will return immediately
+     * if there is no data available, whereas it will block until there
+     * is data for blocking sockets.
+     *
+     * @param boolean $mode True for blocking sockets, false for nonblocking.
+     *
+     * @access public
+     * @return mixed true on success or a PEAR_Error instance otherwise
+     */
+    function setBlocking($mode)
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        $this->blocking = $mode;
+        stream_set_blocking($this->fp, (int)$this->blocking);
+        return true;
+    }
+
+    /**
+     * Sets the timeout value on socket descriptor,
+     * expressed in the sum of seconds and microseconds
+     *
+     * @param integer $seconds      Seconds.
+     * @param integer $microseconds Microseconds.
+     *
+     * @access public
+     * @return mixed true on success or a PEAR_Error instance otherwise
+     */
+    function setTimeout($seconds, $microseconds)
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        return socket_set_timeout($this->fp, $seconds, $microseconds);
+    }
+
+    /**
+     * Sets the file buffering size on the stream.
+     * See php's stream_set_write_buffer for more information.
+     *
+     * @param integer $size Write buffer size.
+     *
+     * @access public
+     * @return mixed on success or an PEAR_Error object otherwise
+     */
+    function setWriteBuffer($size)
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        $returned = stream_set_write_buffer($this->fp, $size);
+        if ($returned == 0) {
+            return true;
+        }
+        return $this->raiseError('Cannot set write buffer.');
+    }
+
+    /**
+     * Returns information about an existing socket resource.
+     * Currently returns four entries in the result array:
+     *
+     * <p>
+     * timed_out (bool) - The socket timed out waiting for data<br>
+     * blocked (bool) - The socket was blocked<br>
+     * eof (bool) - Indicates EOF event<br>
+     * unread_bytes (int) - Number of bytes left in the socket buffer<br>
+     * </p>
+     *
+     * @access public
+     * @return mixed Array containing information about existing socket
+     *               resource or a PEAR_Error instance otherwise
+     */
+    function getStatus()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        return socket_get_status($this->fp);
+    }
+
+    /**
+     * Get a specified line of data
+     *
+     * @param int $size ??
+     *
+     * @access public
+     * @return $size bytes of data from the socket, or a PEAR_Error if
+     *         not connected.
+     */
+    function gets($size = null)
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        if (is_null($size)) {
+            return @fgets($this->fp);
+        } else {
+            return @fgets($this->fp, $size);
+        }
+    }
+
+    /**
+     * Read a specified amount of data. This is guaranteed to return,
+     * and has the added benefit of getting everything in one fread()
+     * chunk; if you know the size of the data you're getting
+     * beforehand, this is definitely the way to go.
+     *
+     * @param integer $size The number of bytes to read from the socket.
+     *
+     * @access public
+     * @return $size bytes of data from the socket, or a PEAR_Error if
+     *         not connected.
+     */
+    function read($size)
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        return @fread($this->fp, $size);
+    }
+
+    /**
+     * Write a specified amount of data.
+     *
+     * @param string  $data      Data to write.
+     * @param integer $blocksize Amount of data to write at once.
+     *                           NULL means all at once.
+     *
+     * @access public
+     * @return mixed If the socket is not connected, returns an instance of
+     *               PEAR_Error
+     *               If the write succeeds, returns the number of bytes written
+     *               If the write fails, returns false.
+     */
+    function write($data, $blocksize = null)
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        if (is_null($blocksize) && !OS_WINDOWS) {
+            return @fwrite($this->fp, $data);
+        } else {
+            if (is_null($blocksize)) {
+                $blocksize = 1024;
+            }
+
+            $pos  = 0;
+            $size = strlen($data);
+            while ($pos < $size) {
+                $written = @fwrite($this->fp, substr($data, $pos, $blocksize));
+                if (!$written) {
+                    return $written;
+                }
+                $pos += $written;
+            }
+
+            return $pos;
+        }
+    }
+
+    /**
+     * Write a line of data to the socket, followed by a trailing newline.
+     *
+     * @param string $data Data to write
+     *
+     * @access public
+     * @return mixed fputs result, or an error
+     */
+    function writeLine($data)
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        return fwrite($this->fp, $data . $this->newline);
+    }
+
+    /**
+     * Tests for end-of-file on a socket descriptor.
+     *
+     * Also returns true if the socket is disconnected.
+     *
+     * @access public
+     * @return bool
+     */
+    function eof()
+    {
+        return (!is_resource($this->fp) || feof($this->fp));
+    }
+
+    /**
+     * Reads a byte of data
+     *
+     * @access public
+     * @return 1 byte of data from the socket, or a PEAR_Error if
+     *         not connected.
+     */
+    function readByte()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        return ord(@fread($this->fp, 1));
+    }
+
+    /**
+     * Reads a word of data
+     *
+     * @access public
+     * @return 1 word of data from the socket, or a PEAR_Error if
+     *         not connected.
+     */
+    function readWord()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        $buf = @fread($this->fp, 2);
+        return (ord($buf[0]) + (ord($buf[1]) << 8));
+    }
+
+    /**
+     * Reads an int of data
+     *
+     * @access public
+     * @return integer  1 int of data from the socket, or a PEAR_Error if
+     *                  not connected.
+     */
+    function readInt()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        $buf = @fread($this->fp, 4);
+        return (ord($buf[0]) + (ord($buf[1]) << 8) +
+                (ord($buf[2]) << 16) + (ord($buf[3]) << 24));
+    }
+
+    /**
+     * Reads a zero-terminated string of data
+     *
+     * @access public
+     * @return string, or a PEAR_Error if
+     *         not connected.
+     */
+    function readString()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        $string = '';
+        while (($char = @fread($this->fp, 1)) != "\x00") {
+            $string .= $char;
+        }
+        return $string;
+    }
+
+    /**
+     * Reads an IP Address and returns it in a dot formatted string
+     *
+     * @access public
+     * @return Dot formatted string, or a PEAR_Error if
+     *         not connected.
+     */
+    function readIPAddress()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        $buf = @fread($this->fp, 4);
+        return sprintf('%d.%d.%d.%d', ord($buf[0]), ord($buf[1]),
+                       ord($buf[2]), ord($buf[3]));
+    }
+
+    /**
+     * Read until either the end of the socket or a newline, whichever
+     * comes first. Strips the trailing newline from the returned data.
+     *
+     * @access public
+     * @return All available data up to a newline, without that
+     *         newline, or until the end of the socket, or a PEAR_Error if
+     *         not connected.
+     */
+    function readLine()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        $line = '';
+
+        $timeout = time() + $this->timeout;
+
+        while (!feof($this->fp) && (!$this->timeout || time() < $timeout)) {
+            $line .= @fgets($this->fp, $this->lineLength);
+            if (substr($line, -1) == "\n") {
+                return rtrim($line, $this->newline);
+            }
+        }
+        return $line;
+    }
+
+    /**
+     * Read until the socket closes, or until there is no more data in
+     * the inner PHP buffer. If the inner buffer is empty, in blocking
+     * mode we wait for at least 1 byte of data. Therefore, in
+     * blocking mode, if there is no data at all to be read, this
+     * function will never exit (unless the socket is closed on the
+     * remote end).
+     *
+     * @access public
+     *
+     * @return string  All data until the socket closes, or a PEAR_Error if
+     *                 not connected.
+     */
+    function readAll()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        $data = '';
+        while (!feof($this->fp)) {
+            $data .= @fread($this->fp, $this->lineLength);
+        }
+        return $data;
+    }
+
+    /**
+     * Runs the equivalent of the select() system call on the socket
+     * with a timeout specified by tv_sec and tv_usec.
+     *
+     * @param integer $state   Which of read/write/error to check for.
+     * @param integer $tv_sec  Number of seconds for timeout.
+     * @param integer $tv_usec Number of microseconds for timeout.
+     *
+     * @access public
+     * @return False if select fails, integer describing which of read/write/error
+     *         are ready, or PEAR_Error if not connected.
+     */
+    function select($state, $tv_sec, $tv_usec = 0)
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        $read   = null;
+        $write  = null;
+        $except = null;
+        if ($state & NET_SOCKET_READ) {
+            $read[] = $this->fp;
+        }
+        if ($state & NET_SOCKET_WRITE) {
+            $write[] = $this->fp;
+        }
+        if ($state & NET_SOCKET_ERROR) {
+            $except[] = $this->fp;
+        }
+        if (false === ($sr = stream_select($read, $write, $except,
+                                          $tv_sec, $tv_usec))) {
+            return false;
+        }
+
+        $result = 0;
+        if (count($read)) {
+            $result |= NET_SOCKET_READ;
+        }
+        if (count($write)) {
+            $result |= NET_SOCKET_WRITE;
+        }
+        if (count($except)) {
+            $result |= NET_SOCKET_ERROR;
+        }
+        return $result;
+    }
+
+    /**
+     * Turns encryption on/off on a connected socket.
+     *
+     * @param bool    $enabled Set this parameter to true to enable encryption
+     *                         and false to disable encryption.
+     * @param integer $type    Type of encryption. See stream_socket_enable_crypto()
+     *                         for values.
+     *
+     * @see    http://se.php.net/manual/en/function.stream-socket-enable-crypto.php
+     * @access public
+     * @return false on error, true on success and 0 if there isn't enough data
+     *         and the user should try again (non-blocking sockets only).
+     *         A PEAR_Error object is returned if the socket is not
+     *         connected
+     */
+    function enableCrypto($enabled, $type)
+    {
+        if (version_compare(phpversion(), "5.1.0", ">=")) {
+            if (!is_resource($this->fp)) {
+                return $this->raiseError('not connected');
+            }
+            return @stream_socket_enable_crypto($this->fp, $enabled, $type);
+        } else {
+            $msg = 'Net_Socket::enableCrypto() requires php version >= 5.1.0';
+            return $this->raiseError($msg);
+        }
+    }
+
+}

iRony-0.4.4.tar.gz/lib/FileAPI/ext/Net/URL2.php Added

@@ -0,0 +1,942 @@
+<?php
+/**
+ * Net_URL2, a class representing a URL as per RFC 3986.
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2007-2009, Peytz & Co. A/S
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the distribution.
+ *   * Neither the name of the Net_URL2 nor the names of its contributors may
+ *     be used to endorse or promote products derived from this software
+ *     without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category  Networking
+ * @package   Net_URL2
+ * @author    Christian Schmidt <schmidt@php.net>
+ * @copyright 2007-2009 Peytz & Co. A/S
+ * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
+ * @version   CVS: $Id: URL2.php 309223 2011-03-14 14:26:32Z till $
+ * @link      http://www.rfc-editor.org/rfc/rfc3986.txt
+ */
+
+/**
+ * Represents a URL as per RFC 3986.
+ *
+ * @category  Networking
+ * @package   Net_URL2
+ * @author    Christian Schmidt <schmidt@php.net>
+ * @copyright 2007-2009 Peytz & Co. A/S
+ * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
+ * @version   Release: @package_version@
+ * @link      http://pear.php.net/package/Net_URL2
+ */
+class Net_URL2
+{
+    /**
+     * Do strict parsing in resolve() (see RFC 3986, section 5.2.2). Default
+     * is true.
+     */
+    const OPTION_STRICT = 'strict';
+
+    /**
+     * Represent arrays in query using PHP's [] notation. Default is true.
+     */
+    const OPTION_USE_BRACKETS = 'use_brackets';
+
+    /**
+     * URL-encode query variable keys. Default is true.
+     */
+    const OPTION_ENCODE_KEYS = 'encode_keys';
+
+    /**
+     * Query variable separators when parsing the query string. Every character
+     * is considered a separator. Default is "&".
+     */
+    const OPTION_SEPARATOR_INPUT = 'input_separator';
+
+    /**
+     * Query variable separator used when generating the query string. Default
+     * is "&".
+     */
+    const OPTION_SEPARATOR_OUTPUT = 'output_separator';
+
+    /**
+     * Default options corresponds to how PHP handles $_GET.
+     */
+    private $_options = array(
+        self::OPTION_STRICT           => true,
+        self::OPTION_USE_BRACKETS     => true,
+        self::OPTION_ENCODE_KEYS      => true,
+        self::OPTION_SEPARATOR_INPUT  => '&',
+        self::OPTION_SEPARATOR_OUTPUT => '&',
+        );
+
+    /**
+     * @var  string|bool
+     */
+    private $_scheme = false;
+
+    /**
+     * @var  string|bool
+     */
+    private $_userinfo = false;
+
+    /**
+     * @var  string|bool
+     */
+    private $_host = false;
+
+    /**
+     * @var  string|bool
+     */
+    private $_port = false;
+
+    /**
+     * @var  string
+     */
+    private $_path = '';
+
+    /**
+     * @var  string|bool
+     */
+    private $_query = false;
+
+    /**
+     * @var  string|bool
+     */
+    private $_fragment = false;
+
+    /**
+     * Constructor.
+     *
+     * @param string $url     an absolute or relative URL
+     * @param array  $options an array of OPTION_xxx constants
+     *
+     * @return $this
+     * @uses   self::parseUrl()
+     */
+    public function __construct($url, array $options = array())
+    {
+        foreach ($options as $optionName => $value) {
+            if (array_key_exists($optionName, $this->_options)) {
+                $this->_options[$optionName] = $value;
+            }
+        }
+
+        $this->parseUrl($url);
+    }
+
+    /**
+     * Magic Setter.
+     *
+     * This method will magically set the value of a private variable ($var)
+     * with the value passed as the args
+     *
+     * @param  string $var      The private variable to set.
+     * @param  mixed  $arg      An argument of any type.
+     * @return void
+     */
+    public function __set($var, $arg)
+    {
+        $method = 'set' . $var;
+        if (method_exists($this, $method)) {
+            $this->$method($arg);
+        }
+    }
+
+    /**
+     * Magic Getter.
+     *
+     * This is the magic get method to retrieve the private variable
+     * that was set by either __set() or it's setter...
+     *
+     * @param  string $var         The property name to retrieve.
+     * @return mixed  $this->$var  Either a boolean false if the
+     *                             property is not set or the value
+     *                             of the private property.
+     */
+    public function __get($var)
+    {
+        $method = 'get' . $var;
+        if (method_exists($this, $method)) {
+            return $this->$method();
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the scheme, e.g. "http" or "urn", or false if there is no
+     * scheme specified, i.e. if this is a relative URL.
+     *
+     * @return  string|bool
+     */
+    public function getScheme()
+    {
+        return $this->_scheme;
+    }
+
+    /**
+     * Sets the scheme, e.g. "http" or "urn". Specify false if there is no
+     * scheme specified, i.e. if this is a relative URL.
+     *
+     * @param string|bool $scheme e.g. "http" or "urn", or false if there is no
+     *                            scheme specified, i.e. if this is a relative
+     *                            URL
+     *
+     * @return $this
+     * @see    getScheme()
+     */
+    public function setScheme($scheme)
+    {
+        $this->_scheme = $scheme;
+        return $this;
+    }
+
+    /**
+     * Returns the user part of the userinfo part (the part preceding the first
+     *  ":"), or false if there is no userinfo part.
+     *
+     * @return  string|bool
+     */
+    public function getUser()
+    {
+        return $this->_userinfo !== false
+            ? preg_replace('@:.*$@', '', $this->_userinfo)
+            : false;
+    }
+
+    /**
+     * Returns the password part of the userinfo part (the part after the first
+     *  ":"), or false if there is no userinfo part (i.e. the URL does not
+     * contain "@" in front of the hostname) or the userinfo part does not
+     * contain ":".
+     *
+     * @return  string|bool
+     */
+    public function getPassword()
+    {
+        return $this->_userinfo !== false
+            ? substr(strstr($this->_userinfo, ':'), 1)
+            : false;
+    }
+
+    /**
+     * Returns the userinfo part, or false if there is none, i.e. if the
+     * authority part does not contain "@".
+     *
+     * @return  string|bool
+     */
+    public function getUserinfo()
+    {
+        return $this->_userinfo;
+    }
+
+    /**
+     * Sets the userinfo part. If two arguments are passed, they are combined
+     * in the userinfo part as username ":" password.
+     *
+     * @param string|bool $userinfo userinfo or username
+     * @param string|bool $password optional password, or false
+     *
+     * @return $this
+     */
+    public function setUserinfo($userinfo, $password = false)
+    {
+        $this->_userinfo = $userinfo;
+        if ($password !== false) {
+            $this->_userinfo .= ':' . $password;
+        }
+        return $this;
+    }
+
+    /**
+     * Returns the host part, or false if there is no authority part, e.g.
+     * relative URLs.
+     *
+     * @return  string|bool a hostname, an IP address, or false
+     */
+    public function getHost()
+    {
+        return $this->_host;
+    }
+
+    /**
+     * Sets the host part. Specify false if there is no authority part, e.g.
+     * relative URLs.
+     *
+     * @param string|bool $host a hostname, an IP address, or false
+     *
+     * @return $this
+     */
+    public function setHost($host)
+    {
+        $this->_host = $host;
+        return $this;
+    }
+
+    /**
+     * Returns the port number, or false if there is no port number specified,
+     * i.e. if the default port is to be used.
+     *
+     * @return  string|bool
+     */
+    public function getPort()
+    {
+        return $this->_port;
+    }
+
+    /**
+     * Sets the port number. Specify false if there is no port number specified,
+     * i.e. if the default port is to be used.
+     *
+     * @param string|bool $port a port number, or false
+     *
+     * @return $this
+     */
+    public function setPort($port)
+    {
+        $this->_port = $port;
+        return $this;
+    }
+
+    /**
+     * Returns the authority part, i.e. [ userinfo "@" ] host [ ":" port ], or
+     * false if there is no authority.
+     *
+     * @return string|bool
+     */
+    public function getAuthority()
+    {
+        if (!$this->_host) {
+            return false;
+        }
+
+        $authority = '';
+
+        if ($this->_userinfo !== false) {
+            $authority .= $this->_userinfo . '@';
+        }
+
+        $authority .= $this->_host;
+
+        if ($this->_port !== false) {
+            $authority .= ':' . $this->_port;
+        }
+
+        return $authority;
+    }
+
+    /**
+     * Sets the authority part, i.e. [ userinfo "@" ] host [ ":" port ]. Specify
+     * false if there is no authority.
+     *
+     * @param string|false $authority a hostname or an IP addresse, possibly
+     *                                with userinfo prefixed and port number
+     *                                appended, e.g. "foo:bar@example.org:81".
+     *
+     * @return $this
+     */
+    public function setAuthority($authority)
+    {
+        $this->_userinfo = false;
+        $this->_host     = false;
+        $this->_port     = false;
+        if (preg_match('@^(([^\@]*)\@)?([^:]+)(:(\d*))?$@', $authority, $reg)) {
+            if ($reg[1]) {
+                $this->_userinfo = $reg[2];
+            }
+
+            $this->_host = $reg[3];
+            if (isset($reg[5])) {
+                $this->_port = $reg[5];
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Returns the path part (possibly an empty string).
+     *
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->_path;
+    }
+
+    /**
+     * Sets the path part (possibly an empty string).
+     *
+     * @param string $path a path
+     *
+     * @return $this
+     */
+    public function setPath($path)
+    {
+        $this->_path = $path;
+        return $this;
+    }
+
+    /**
+     * Returns the query string (excluding the leading "?"), or false if "?"
+     * is not present in the URL.
+     *
+     * @return  string|bool
+     * @see     self::getQueryVariables()
+     */
+    public function getQuery()
+    {
+        return $this->_query;
+    }
+
+    /**
+     * Sets the query string (excluding the leading "?"). Specify false if "?"
+     * is not present in the URL.
+     *
+     * @param string|bool $query a query string, e.g. "foo=1&bar=2"
+     *
+     * @return $this
+     * @see    self::setQueryVariables()
+     */
+    public function setQuery($query)
+    {
+        $this->_query = $query;
+        return $this;
+    }
+
+    /**
+     * Returns the fragment name, or false if "#" is not present in the URL.
+     *
+     * @return  string|bool
+     */
+    public function getFragment()
+    {
+        return $this->_fragment;
+    }
+
+    /**
+     * Sets the fragment name. Specify false if "#" is not present in the URL.
+     *
+     * @param string|bool $fragment a fragment excluding the leading "#", or
+     *                              false
+     *
+     * @return $this
+     */
+    public function setFragment($fragment)
+    {
+        $this->_fragment = $fragment;
+        return $this;
+    }
+
+    /**
+     * Returns the query string like an array as the variables would appear in
+     * $_GET in a PHP script. If the URL does not contain a "?", an empty array
+     * is returned.
+     *
+     * @return  array
+     */
+    public function getQueryVariables()
+    {
+        $pattern = '/[' .
+                   preg_quote($this->getOption(self::OPTION_SEPARATOR_INPUT), '/') .
+                   ']/';
+        $parts   = preg_split($pattern, $this->_query, -1, PREG_SPLIT_NO_EMPTY);
+        $return  = array();
+
+        foreach ($parts as $part) {
+            if (strpos($part, '=') !== false) {
+                list($key, $value) = explode('=', $part, 2);
+            } else {
+                $key   = $part;
+                $value = null;
+            }
+
+            if ($this->getOption(self::OPTION_ENCODE_KEYS)) {
+                $key = rawurldecode($key);
+            }
+            $value = rawurldecode($value);
+
+            if ($this->getOption(self::OPTION_USE_BRACKETS) &&
+                preg_match('#^(.*)\[([0-9a-z_-]*)\]#i', $key, $matches)) {
+
+                $key = $matches[1];
+                $idx = $matches[2];
+
+                // Ensure is an array
+                if (empty($return[$key]) || !is_array($return[$key])) {
+                    $return[$key] = array();
+                }
+
+                // Add data
+                if ($idx === '') {
+                    $return[$key][] = $value;
+                } else {
+                    $return[$key][$idx] = $value;
+                }
+            } elseif (!$this->getOption(self::OPTION_USE_BRACKETS)
+                      && !empty($return[$key])
+            ) {
+                $return[$key]   = (array) $return[$key];
+                $return[$key][] = $value;
+            } else {
+                $return[$key] = $value;
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * Sets the query string to the specified variable in the query string.
+     *
+     * @param array $array (name => value) array
+     *
+     * @return $this
+     */
+    public function setQueryVariables(array $array)
+    {
+        if (!$array) {
+            $this->_query = false;
+        } else {
+            $this->_query = $this->buildQuery(
+                $array,
+                $this->getOption(self::OPTION_SEPARATOR_OUTPUT)
+            );
+        }
+        return $this;
+    }
+
+    /**
+     * Sets the specified variable in the query string.
+     *
+     * @param string $name  variable name
+     * @param mixed  $value variable value
+     *
+     * @return $this
+     */
+    public function setQueryVariable($name, $value)
+    {
+        $array = $this->getQueryVariables();
+        $array[$name] = $value;
+        $this->setQueryVariables($array);
+        return $this;
+    }
+
+    /**
+     * Removes the specifed variable from the query string.
+     *
+     * @param string $name a query string variable, e.g. "foo" in "?foo=1"
+     *
+     * @return void
+     */
+    public function unsetQueryVariable($name)
+    {
+        $array = $this->getQueryVariables();
+        unset($array[$name]);
+        $this->setQueryVariables($array);
+    }
+
+    /**
+     * Returns a string representation of this URL.
+     *
+     * @return  string
+     */
+    public function getURL()
+    {
+        // See RFC 3986, section 5.3
+        $url = "";
+
+        if ($this->_scheme !== false) {
+            $url .= $this->_scheme . ':';
+        }
+
+        $authority = $this->getAuthority();
+        if ($authority !== false) {
+            $url .= '//' . $authority;
+        }
+        $url .= $this->_path;
+
+        if ($this->_query !== false) {
+            $url .= '?' . $this->_query;
+        }
+
+        if ($this->_fragment !== false) {
+            $url .= '#' . $this->_fragment;
+        }
+    
+        return $url;
+    }
+
+    /**
+     * Returns a string representation of this URL.
+     *
+     * @return  string
+     * @see toString()
+     */
+    public function __toString()
+    {
+        return $this->getURL();
+    }
+
+    /** 
+     * Returns a normalized string representation of this URL. This is useful
+     * for comparison of URLs.
+     *
+     * @return  string
+     */
+    public function getNormalizedURL()
+    {
+        $url = clone $this;
+        $url->normalize();
+        return $url->getUrl();
+    }
+
+    /** 
+     * Returns a normalized Net_URL2 instance.
+     *
+     * @return  Net_URL2
+     */
+    public function normalize()
+    {
+        // See RFC 3886, section 6
+
+        // Schemes are case-insensitive
+        if ($this->_scheme) {
+            $this->_scheme = strtolower($this->_scheme);
+        }
+
+        // Hostnames are case-insensitive
+        if ($this->_host) {
+            $this->_host = strtolower($this->_host);
+        }
+
+        // Remove default port number for known schemes (RFC 3986, section 6.2.3)
+        if ($this->_port &&
+            $this->_scheme &&
+            $this->_port == getservbyname($this->_scheme, 'tcp')) {
+
+            $this->_port = false;
+        }
+
+        // Normalize case of %XX percentage-encodings (RFC 3986, section 6.2.2.1)
+        foreach (array('_userinfo', '_host', '_path') as $part) {
+            if ($this->$part) {
+                $this->$part = preg_replace('/%[0-9a-f]{2}/ie',
+                                            'strtoupper("\0")',
+                                            $this->$part);
+            }
+        }
+
+        // Path segment normalization (RFC 3986, section 6.2.2.3)
+        $this->_path = self::removeDotSegments($this->_path);
+
+        // Scheme based normalization (RFC 3986, section 6.2.3)
+        if ($this->_host && !$this->_path) {
+            $this->_path = '/';
+        }
+    }
+
+    /**
+     * Returns whether this instance represents an absolute URL.
+     *
+     * @return  bool
+     */
+    public function isAbsolute()
+    {
+        return (bool) $this->_scheme;
+    }
+
+    /**
+     * Returns an Net_URL2 instance representing an absolute URL relative to
+     * this URL.
+     *
+     * @param Net_URL2|string $reference relative URL
+     *
+     * @return Net_URL2
+     */
+    public function resolve($reference)
+    {
+        if (!$reference instanceof Net_URL2) {
+            $reference = new self($reference);
+        }
+        if (!$this->isAbsolute()) {
+            throw new Exception('Base-URL must be absolute');
+        }
+
+        // A non-strict parser may ignore a scheme in the reference if it is
+        // identical to the base URI's scheme.
+        if (!$this->getOption(self::OPTION_STRICT) && $reference->_scheme == $this->_scheme) {
+            $reference->_scheme = false;
+        }
+
+        $target = new self('');
+        if ($reference->_scheme !== false) {
+            $target->_scheme = $reference->_scheme;
+            $target->setAuthority($reference->getAuthority());
+            $target->_path  = self::removeDotSegments($reference->_path);
+            $target->_query = $reference->_query;
+        } else {
+            $authority = $reference->getAuthority();
+            if ($authority !== false) {
+                $target->setAuthority($authority);
+                $target->_path  = self::removeDotSegments($reference->_path);
+                $target->_query = $reference->_query;
+            } else {
+                if ($reference->_path == '') {
+                    $target->_path = $this->_path;
+                    if ($reference->_query !== false) {
+                        $target->_query = $reference->_query;
+                    } else {
+                        $target->_query = $this->_query;
+                    }
+                } else {
+                    if (substr($reference->_path, 0, 1) == '/') {
+                        $target->_path = self::removeDotSegments($reference->_path);
+                    } else {
+                        // Merge paths (RFC 3986, section 5.2.3)
+                        if ($this->_host !== false && $this->_path == '') {
+                            $target->_path = '/' . $this->_path;
+                        } else {
+                            $i = strrpos($this->_path, '/');
+                            if ($i !== false) {
+                                $target->_path = substr($this->_path, 0, $i + 1);
+                            }
+                            $target->_path .= $reference->_path;
+                        }
+                        $target->_path = self::removeDotSegments($target->_path);
+                    }
+                    $target->_query = $reference->_query;
+                }
+                $target->setAuthority($this->getAuthority());
+            }
+            $target->_scheme = $this->_scheme;
+        }
+
+        $target->_fragment = $reference->_fragment;
+
+        return $target;
+    }
+
+    /**
+     * Removes dots as described in RFC 3986, section 5.2.4, e.g.
+     * "/foo/../bar/baz" => "/bar/baz"
+     *
+     * @param string $path a path
+     *
+     * @return string a path
+     */
+    public static function removeDotSegments($path)
+    {
+        $output = '';
+
+        // Make sure not to be trapped in an infinite loop due to a bug in this
+        // method
+        $j = 0;
+        while ($path && $j++ < 100) {
+            if (substr($path, 0, 2) == './') {
+                // Step 2.A
+                $path = substr($path, 2);
+            } elseif (substr($path, 0, 3) == '../') {
+                // Step 2.A
+                $path = substr($path, 3);
+            } elseif (substr($path, 0, 3) == '/./' || $path == '/.') {
+                // Step 2.B
+                $path = '/' . substr($path, 3);
+            } elseif (substr($path, 0, 4) == '/../' || $path == '/..') {
+                // Step 2.C
+                $path   = '/' . substr($path, 4);
+                $i      = strrpos($output, '/');
+                $output = $i === false ? '' : substr($output, 0, $i);
+            } elseif ($path == '.' || $path == '..') {
+                // Step 2.D
+                $path = '';
+            } else {
+                // Step 2.E
+                $i = strpos($path, '/');
+                if ($i === 0) {
+                    $i = strpos($path, '/', 1);
+                }
+                if ($i === false) {
+                    $i = strlen($path);
+                }
+                $output .= substr($path, 0, $i);
+                $path = substr($path, $i);
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Percent-encodes all non-alphanumeric characters except these: _ . - ~
+     * Similar to PHP's rawurlencode(), except that it also encodes ~ in PHP
+     * 5.2.x and earlier.
+     *
+     * @param  $raw the string to encode
+     * @return string
+     */
+    public static function urlencode($string)
+    {
+    	$encoded = rawurlencode($string);
+
+        // This is only necessary in PHP < 5.3.
+        $encoded = str_replace('%7E', '~', $encoded);
+        return $encoded;
+    }
+
+    /**
+     * Returns a Net_URL2 instance representing the canonical URL of the
+     * currently executing PHP script.
+     *
+     * @return  string
+     */
+    public static function getCanonical()
+    {
+        if (!isset($_SERVER['REQUEST_METHOD'])) {
+            // ALERT - no current URL
+            throw new Exception('Script was not called through a webserver');
+        }
+
+        // Begin with a relative URL
+        $url = new self($_SERVER['PHP_SELF']);
+        $url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
+        $url->_host   = $_SERVER['SERVER_NAME'];
+        $port = $_SERVER['SERVER_PORT'];
+        if ($url->_scheme == 'http' && $port != 80 ||
+            $url->_scheme == 'https' && $port != 443) {
+
+            $url->_port = $port;
+        }
+        return $url;
+    }
+
+    /**
+     * Returns the URL used to retrieve the current request.
+     *
+     * @return  string
+     */
+    public static function getRequestedURL()
+    {
+        return self::getRequested()->getUrl();
+    }
+
+    /**
+     * Returns a Net_URL2 instance representing the URL used to retrieve the
+     * current request.
+     *
+     * @return  Net_URL2
+     */
+    public static function getRequested()
+    {
+        if (!isset($_SERVER['REQUEST_METHOD'])) {
+            // ALERT - no current URL
+            throw new Exception('Script was not called through a webserver');
+        }
+
+        // Begin with a relative URL
+        $url = new self($_SERVER['REQUEST_URI']);
+        $url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
+        // Set host and possibly port
+        $url->setAuthority($_SERVER['HTTP_HOST']);
+        return $url;
+    }
+
+    /**
+     * Returns the value of the specified option.
+     *
+     * @param string $optionName The name of the option to retrieve
+     *
+     * @return  mixed
+     */
+    public function getOption($optionName)
+    {
+        return isset($this->_options[$optionName])
+            ? $this->_options[$optionName] : false;
+    }
+
+    /**
+     * A simple version of http_build_query in userland. The encoded string is
+     * percentage encoded according to RFC 3986.
+     *
+     * @param array  $data      An array, which has to be converted into
+     *                          QUERY_STRING. Anything is possible.
+     * @param string $seperator See {@link self::OPTION_SEPARATOR_OUTPUT}
+     * @param string $key       For stacked values (arrays in an array).
+     *
+     * @return string
+     */
+    protected function buildQuery(array $data, $separator, $key = null)
+    {
+        $query = array();
+        foreach ($data as $name => $value) {
+            if ($this->getOption(self::OPTION_ENCODE_KEYS) === true) {
+                $name = rawurlencode($name);
+            }
+            if ($key !== null) {
+                if ($this->getOption(self::OPTION_USE_BRACKETS) === true) {
+                    $name = $key . '[' . $name . ']';
+                } else {
+                    $name = $key;
+                }
+            }
+            if (is_array($value)) {
+                $query[] = $this->buildQuery($value, $separator, $name);
+            } else {
+                $query[] = $name . '=' . rawurlencode($value);
+            }
+        }
+        return implode($separator, $query);
+    }
+
+    /**
+     * This method uses a funky regex to parse the url into the designated parts.
+     *
+     * @param string $url
+     *
+     * @return void
+     * @uses   self::$_scheme, self::setAuthority(), self::$_path, self::$_query,
+     *         self::$_fragment
+     * @see    self::__construct()
+     */
+    protected function parseUrl($url)
+    {
+        // The regular expression is copied verbatim from RFC 3986, appendix B.
+        // The expression does not validate the URL but matches any string.
+        preg_match('!^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?!',
+                   $url,
+                   $matches);
+
+        // "path" is always present (possibly as an empty string); the rest
+        // are optional.
+        $this->_scheme   = !empty($matches[1]) ? $matches[2] : false;
+        $this->setAuthority(!empty($matches[3]) ? $matches[4] : false);
+        $this->_path     = $matches[5];
+        $this->_query    = !empty($matches[6]) ? $matches[7] : false;
+        $this->_fragment = !empty($matches[8]) ? $matches[9] : false;
+    }
+}

iRony-0.4.4.tar.gz/lib/FileAPI/ext/PEAR.php Added

@@ -0,0 +1,1137 @@
+<?php
+/**
+ * PEAR, the PHP Extension and Application Repository
+ *
+ * PEAR class and PEAR_Error class
+ *
+ * PHP versions 4 and 5
+ *
+ * @category   pear
+ * @package    PEAR
+ * @author     Sterling Hughes <sterling@php.net>
+ * @author     Stig Bakken <ssb@php.net>
+ * @author     Tomas V.V.Cox <cox@idecnet.com>
+ * @author     Greg Beaver <cellog@php.net>
+ * @copyright  1997-2009 The Authors
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/PEAR
+ * @since      File available since Release 0.1
+ */
+
+/**#@+
+ * ERROR constants
+ */
+define('PEAR_ERROR_RETURN',     1);
+define('PEAR_ERROR_PRINT',      2);
+define('PEAR_ERROR_TRIGGER',    4);
+define('PEAR_ERROR_DIE',        8);
+define('PEAR_ERROR_CALLBACK',  16);
+/**
+ * WARNING: obsolete
+ * @deprecated
+ */
+define('PEAR_ERROR_EXCEPTION', 32);
+/**#@-*/
+define('PEAR_ZE2', (function_exists('version_compare') &&
+                    version_compare(zend_version(), "2-dev", "ge")));
+
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    define('OS_WINDOWS', true);
+    define('OS_UNIX',    false);
+    define('PEAR_OS',    'Windows');
+} else {
+    define('OS_WINDOWS', false);
+    define('OS_UNIX',    true);
+    define('PEAR_OS',    'Unix'); // blatant assumption
+}
+
+$GLOBALS['_PEAR_default_error_mode']     = PEAR_ERROR_RETURN;
+$GLOBALS['_PEAR_default_error_options']  = E_USER_NOTICE;
+$GLOBALS['_PEAR_destructor_object_list'] = array();
+$GLOBALS['_PEAR_shutdown_funcs']         = array();
+$GLOBALS['_PEAR_error_handler_stack']    = array();
+
+@ini_set('track_errors', true);
+
+/**
+ * Base class for other PEAR classes.  Provides rudimentary
+ * emulation of destructors.
+ *
+ * If you want a destructor in your class, inherit PEAR and make a
+ * destructor method called _yourclassname (same name as the
+ * constructor, but with a "_" prefix).  Also, in your constructor you
+ * have to call the PEAR constructor: $this->PEAR();.
+ * The destructor method will be called without parameters.  Note that
+ * at in some SAPI implementations (such as Apache), any output during
+ * the request shutdown (in which destructors are called) seems to be
+ * discarded.  If you need to get any debug information from your
+ * destructor, use error_log(), syslog() or something similar.
+ *
+ * IMPORTANT! To use the emulated destructors you need to create the
+ * objects by reference: $obj =& new PEAR_child;
+ *
+ * @category   pear
+ * @package    PEAR
+ * @author     Stig Bakken <ssb@php.net>
+ * @author     Tomas V.V. Cox <cox@idecnet.com>
+ * @author     Greg Beaver <cellog@php.net>
+ * @copyright  1997-2006 The PHP Group
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    Release: 1.9.0
+ * @link       http://pear.php.net/package/PEAR
+ * @see        PEAR_Error
+ * @since      Class available since PHP 4.0.2
+ * @link        http://pear.php.net/manual/en/core.pear.php#core.pear.pear
+ */
+class PEAR
+{
+    // {{{ properties
+
+    /**
+     * Whether to enable internal debug messages.
+     *
+     * @var     bool
+     * @access  private
+     */
+    var $_debug = false;
+
+    /**
+     * Default error mode for this object.
+     *
+     * @var     int
+     * @access  private
+     */
+    var $_default_error_mode = null;
+
+    /**
+     * Default error options used for this object when error mode
+     * is PEAR_ERROR_TRIGGER.
+     *
+     * @var     int
+     * @access  private
+     */
+    var $_default_error_options = null;
+
+    /**
+     * Default error handler (callback) for this object, if error mode is
+     * PEAR_ERROR_CALLBACK.
+     *
+     * @var     string
+     * @access  private
+     */
+    var $_default_error_handler = '';
+
+    /**
+     * Which class to use for error objects.
+     *
+     * @var     string
+     * @access  private
+     */
+    var $_error_class = 'PEAR_Error';
+
+    /**
+     * An array of expected errors.
+     *
+     * @var     array
+     * @access  private
+     */
+    var $_expected_errors = array();
+
+    // }}}
+
+    // {{{ constructor
+
+    /**
+     * Constructor.  Registers this object in
+     * $_PEAR_destructor_object_list for destructor emulation if a
+     * destructor object exists.
+     *
+     * @param string $error_class  (optional) which class to use for
+     *        error objects, defaults to PEAR_Error.
+     * @access public
+     * @return void
+     */
+    function PEAR($error_class = null)
+    {
+        $classname = strtolower(get_class($this));
+        if ($this->_debug) {
+            print "PEAR constructor called, class=$classname\n";
+        }
+        if ($error_class !== null) {
+            $this->_error_class = $error_class;
+        }
+        while ($classname && strcasecmp($classname, "pear")) {
+            $destructor = "_$classname";
+            if (method_exists($this, $destructor)) {
+                global $_PEAR_destructor_object_list;
+                $_PEAR_destructor_object_list[] = &$this;
+                if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
+                    register_shutdown_function("_PEAR_call_destructors");
+                    $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
+                }
+                break;
+            } else {
+                $classname = get_parent_class($classname);
+            }
+        }
+    }
+
+    // }}}
+    // {{{ destructor
+
+    /**
+     * Destructor (the emulated type of...).  Does nothing right now,
+     * but is included for forward compatibility, so subclass
+     * destructors should always call it.
+     *
+     * See the note in the class desciption about output from
+     * destructors.
+     *
+     * @access public
+     * @return void
+     */
+    function _PEAR() {
+        if ($this->_debug) {
+            printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
+        }
+    }
+
+    // }}}
+    // {{{ getStaticProperty()
+
+    /**
+    * If you have a class that's mostly/entirely static, and you need static
+    * properties, you can use this method to simulate them. Eg. in your method(s)
+    * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
+    * You MUST use a reference, or they will not persist!
+    *
+    * @access public
+    * @param  string $class  The calling classname, to prevent clashes
+    * @param  string $var    The variable to retrieve.
+    * @return mixed   A reference to the variable. If not set it will be
+    *                 auto initialised to NULL.
+    */
+    function &getStaticProperty($class, $var)
+    {
+        static $properties;
+        if (!isset($properties[$class])) {
+            $properties[$class] = array();
+        }
+
+        if (!array_key_exists($var, $properties[$class])) {
+            $properties[$class][$var] = null;
+        }
+
+        return $properties[$class][$var];
+    }
+
+    // }}}
+    // {{{ registerShutdownFunc()
+
+    /**
+    * Use this function to register a shutdown method for static
+    * classes.
+    *
+    * @access public
+    * @param  mixed $func  The function name (or array of class/method) to call
+    * @param  mixed $args  The arguments to pass to the function
+    * @return void
+    */
+    function registerShutdownFunc($func, $args = array())
+    {
+        // if we are called statically, there is a potential
+        // that no shutdown func is registered.  Bug #6445
+        if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
+            register_shutdown_function("_PEAR_call_destructors");
+            $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
+        }
+        $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
+    }
+
+    // }}}
+    // {{{ isError()
+
+    /**
+     * Tell whether a value is a PEAR error.
+     *
+     * @param   mixed $data   the value to test
+     * @param   int   $code   if $data is an error object, return true
+     *                        only if $code is a string and
+     *                        $obj->getMessage() == $code or
+     *                        $code is an integer and $obj->getCode() == $code
+     * @access  public
+     * @return  bool    true if parameter is an error
+     */
+    static function isError($data, $code = null)
+    {
+        if (!is_object($data) || !is_a($data, 'PEAR_Error')) {
+            return false;
+        }
+
+        if (is_null($code)) {
+            return true;
+        } elseif (is_string($code)) {
+            return $data->getMessage() == $code;
+        }
+
+        return $data->getCode() == $code;
+    }
+
+    // }}}
+    // {{{ setErrorHandling()
+
+    /**
+     * Sets how errors generated by this object should be handled.
+     * Can be invoked both in objects and statically.  If called
+     * statically, setErrorHandling sets the default behaviour for all
+     * PEAR objects.  If called in an object, setErrorHandling sets
+     * the default behaviour for that object.
+     *
+     * @param int $mode
+     *        One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
+     *        PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
+     *        PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
+     *
+     * @param mixed $options
+     *        When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
+     *        of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
+     *
+     *        When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
+     *        to be the callback function or method.  A callback
+     *        function is a string with the name of the function, a
+     *        callback method is an array of two elements: the element
+     *        at index 0 is the object, and the element at index 1 is
+     *        the name of the method to call in the object.
+     *
+     *        When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
+     *        a printf format string used when printing the error
+     *        message.
+     *
+     * @access public
+     * @return void
+     * @see PEAR_ERROR_RETURN
+     * @see PEAR_ERROR_PRINT
+     * @see PEAR_ERROR_TRIGGER
+     * @see PEAR_ERROR_DIE
+     * @see PEAR_ERROR_CALLBACK
+     * @see PEAR_ERROR_EXCEPTION
+     *
+     * @since PHP 4.0.5
+     */
+
+    function setErrorHandling($mode = null, $options = null)
+    {
+        if (isset($this) && is_a($this, 'PEAR')) {
+            $setmode     = &$this->_default_error_mode;
+            $setoptions  = &$this->_default_error_options;
+        } else {
+            $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
+            $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
+        }
+
+        switch ($mode) {
+            case PEAR_ERROR_EXCEPTION:
+            case PEAR_ERROR_RETURN:
+            case PEAR_ERROR_PRINT:
+            case PEAR_ERROR_TRIGGER:
+            case PEAR_ERROR_DIE:
+            case null:
+                $setmode = $mode;
+                $setoptions = $options;
+                break;
+
+            case PEAR_ERROR_CALLBACK:
+                $setmode = $mode;
+                // class/object method callback
+                if (is_callable($options)) {
+                    $setoptions = $options;
+                } else {
+                    trigger_error("invalid error callback", E_USER_WARNING);
+                }
+                break;
+
+            default:
+                trigger_error("invalid error mode", E_USER_WARNING);
+                break;
+        }
+    }
+
+    // }}}
+    // {{{ expectError()
+
+    /**
+     * This method is used to tell which errors you expect to get.
+     * Expected errors are always returned with error mode
+     * PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
+     * and this method pushes a new element onto it.  The list of
+     * expected errors are in effect until they are popped off the
+     * stack with the popExpect() method.
+     *
+     * Note that this method can not be called statically
+     *
+     * @param mixed $code a single error code or an array of error codes to expect
+     *
+     * @return int     the new depth of the "expected errors" stack
+     * @access public
+     */
+    function expectError($code = '*')
+    {
+        if (is_array($code)) {
+            array_push($this->_expected_errors, $code);
+        } else {
+            array_push($this->_expected_errors, array($code));
+        }
+        return sizeof($this->_expected_errors);
+    }
+
+    // }}}
+    // {{{ popExpect()
+
+    /**
+     * This method pops one element off the expected error codes
+     * stack.
+     *
+     * @return array   the list of error codes that were popped
+     */
+    function popExpect()
+    {
+        return array_pop($this->_expected_errors);
+    }
+
+    // }}}
+    // {{{ _checkDelExpect()
+
+    /**
+     * This method checks unsets an error code if available
+     *
+     * @param mixed error code
+     * @return bool true if the error code was unset, false otherwise
+     * @access private
+     * @since PHP 4.3.0
+     */
+    function _checkDelExpect($error_code)
+    {
+        $deleted = false;
+
+        foreach ($this->_expected_errors AS $key => $error_array) {
+            if (in_array($error_code, $error_array)) {
+                unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
+                $deleted = true;
+            }
+
+            // clean up empty arrays
+            if (0 == count($this->_expected_errors[$key])) {
+                unset($this->_expected_errors[$key]);
+            }
+        }
+        return $deleted;
+    }
+
+    // }}}
+    // {{{ delExpect()
+
+    /**
+     * This method deletes all occurences of the specified element from
+     * the expected error codes stack.
+     *
+     * @param  mixed $error_code error code that should be deleted
+     * @return mixed list of error codes that were deleted or error
+     * @access public
+     * @since PHP 4.3.0
+     */
+    function delExpect($error_code)
+    {
+        $deleted = false;
+        if ((is_array($error_code) && (0 != count($error_code)))) {
+            // $error_code is a non-empty array here;
+            // we walk through it trying to unset all
+            // values
+            foreach($error_code as $key => $error) {
+                if ($this->_checkDelExpect($error)) {
+                    $deleted =  true;
+                } else {
+                    $deleted = false;
+                }
+            }
+            return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
+        } elseif (!empty($error_code)) {
+            // $error_code comes alone, trying to unset it
+            if ($this->_checkDelExpect($error_code)) {
+                return true;
+            } else {
+                return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
+            }
+        }
+
+        // $error_code is empty
+        return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
+    }
+
+    // }}}
+    // {{{ raiseError()
+
+    /**
+     * This method is a wrapper that returns an instance of the
+     * configured error class with this object's default error
+     * handling applied.  If the $mode and $options parameters are not
+     * specified, the object's defaults are used.
+     *
+     * @param mixed $message a text error message or a PEAR error object
+     *
+     * @param int $code      a numeric error code (it is up to your class
+     *                  to define these if you want to use codes)
+     *
+     * @param int $mode      One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
+     *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
+     *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
+     *
+     * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
+     *                  specifies the PHP-internal error level (one of
+     *                  E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
+     *                  If $mode is PEAR_ERROR_CALLBACK, this
+     *                  parameter specifies the callback function or
+     *                  method.  In other error modes this parameter
+     *                  is ignored.
+     *
+     * @param string $userinfo If you need to pass along for example debug
+     *                  information, this parameter is meant for that.
+     *
+     * @param string $error_class The returned error object will be
+     *                  instantiated from this class, if specified.
+     *
+     * @param bool $skipmsg If true, raiseError will only pass error codes,
+     *                  the error message parameter will be dropped.
+     *
+     * @access public
+     * @return object   a PEAR error object
+     * @see PEAR::setErrorHandling
+     * @since PHP 4.0.5
+     */
+    function &raiseError($message = null,
+                         $code = null,
+                         $mode = null,
+                         $options = null,
+                         $userinfo = null,
+                         $error_class = null,
+                         $skipmsg = false)
+    {
+        // The error is yet a PEAR error object
+        if (is_object($message)) {
+            $code        = $message->getCode();
+            $userinfo    = $message->getUserInfo();
+            $error_class = $message->getType();
+            $message->error_message_prefix = '';
+            $message     = $message->getMessage();
+        }
+
+        if (isset($this) && isset($this->_expected_errors) && sizeof($this->_expected_errors) > 0 && sizeof($exp = end($this->_expected_errors))) {
+            if ($exp[0] == "*" ||
+                (is_int(reset($exp)) && in_array($code, $exp)) ||
+                (is_string(reset($exp)) && in_array($message, $exp))) {
+                $mode = PEAR_ERROR_RETURN;
+            }
+        }
+
+        // No mode given, try global ones
+        if ($mode === null) {
+            // Class error handler
+            if (isset($this) && isset($this->_default_error_mode)) {
+                $mode    = $this->_default_error_mode;
+                $options = $this->_default_error_options;
+            // Global error handler
+            } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
+                $mode    = $GLOBALS['_PEAR_default_error_mode'];
+                $options = $GLOBALS['_PEAR_default_error_options'];
+            }
+        }
+
+        if ($error_class !== null) {
+            $ec = $error_class;
+        } elseif (isset($this) && isset($this->_error_class)) {
+            $ec = $this->_error_class;
+        } else {
+            $ec = 'PEAR_Error';
+        }
+
+        if (intval(PHP_VERSION) < 5) {
+            // little non-eval hack to fix bug #12147
+            include 'PEAR/FixPHP5PEARWarnings.php';
+            return $a;
+        }
+
+        if ($skipmsg) {
+            $a = new $ec($code, $mode, $options, $userinfo);
+        } else {
+            $a = new $ec($message, $code, $mode, $options, $userinfo);
+        }
+
+        return $a;
+    }
+
+    // }}}
+    // {{{ throwError()
+
+    /**
+     * Simpler form of raiseError with fewer options.  In most cases
+     * message, code and userinfo are enough.
+     *
+     * @param string $message
+     *
+     */
+    function &throwError($message = null,
+                         $code = null,
+                         $userinfo = null)
+    {
+        if (isset($this) && is_a($this, 'PEAR')) {
+            $a = &$this->raiseError($message, $code, null, null, $userinfo);
+            return $a;
+        }
+
+        $a = &PEAR::raiseError($message, $code, null, null, $userinfo);
+        return $a;
+    }
+
+    // }}}
+    function staticPushErrorHandling($mode, $options = null)
+    {
+        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+        $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
+        $def_options = &$GLOBALS['_PEAR_default_error_options'];
+        $stack[] = array($def_mode, $def_options);
+        switch ($mode) {
+            case PEAR_ERROR_EXCEPTION:
+            case PEAR_ERROR_RETURN:
+            case PEAR_ERROR_PRINT:
+            case PEAR_ERROR_TRIGGER:
+            case PEAR_ERROR_DIE:
+            case null:
+                $def_mode = $mode;
+                $def_options = $options;
+                break;
+
+            case PEAR_ERROR_CALLBACK:
+                $def_mode = $mode;
+                // class/object method callback
+                if (is_callable($options)) {
+                    $def_options = $options;
+                } else {
+                    trigger_error("invalid error callback", E_USER_WARNING);
+                }
+                break;
+
+            default:
+                trigger_error("invalid error mode", E_USER_WARNING);
+                break;
+        }
+        $stack[] = array($mode, $options);
+        return true;
+    }
+
+    function staticPopErrorHandling()
+    {
+        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+        $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
+        $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
+        array_pop($stack);
+        list($mode, $options) = $stack[sizeof($stack) - 1];
+        array_pop($stack);
+        switch ($mode) {
+            case PEAR_ERROR_EXCEPTION:
+            case PEAR_ERROR_RETURN:
+            case PEAR_ERROR_PRINT:
+            case PEAR_ERROR_TRIGGER:
+            case PEAR_ERROR_DIE:
+            case null:
+                $setmode = $mode;
+                $setoptions = $options;
+                break;
+
+            case PEAR_ERROR_CALLBACK:
+                $setmode = $mode;
+                // class/object method callback
+                if (is_callable($options)) {
+                    $setoptions = $options;
+                } else {
+                    trigger_error("invalid error callback", E_USER_WARNING);
+                }
+                break;
+
+            default:
+                trigger_error("invalid error mode", E_USER_WARNING);
+                break;
+        }
+        return true;
+    }
+
+    // {{{ pushErrorHandling()
+
+    /**
+     * Push a new error handler on top of the error handler options stack. With this
+     * you can easily override the actual error handler for some code and restore
+     * it later with popErrorHandling.
+     *
+     * @param mixed $mode (same as setErrorHandling)
+     * @param mixed $options (same as setErrorHandling)
+     *
+     * @return bool Always true
+     *
+     * @see PEAR::setErrorHandling
+     */
+    function pushErrorHandling($mode, $options = null)
+    {
+        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+        if (isset($this) && is_a($this, 'PEAR')) {
+            $def_mode    = &$this->_default_error_mode;
+            $def_options = &$this->_default_error_options;
+        } else {
+            $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
+            $def_options = &$GLOBALS['_PEAR_default_error_options'];
+        }
+        $stack[] = array($def_mode, $def_options);
+
+        if (isset($this) && is_a($this, 'PEAR')) {
+            $this->setErrorHandling($mode, $options);
+        } else {
+            PEAR::setErrorHandling($mode, $options);
+        }
+        $stack[] = array($mode, $options);
+        return true;
+    }
+
+    // }}}
+    // {{{ popErrorHandling()
+
+    /**
+    * Pop the last error handler used
+    *
+    * @return bool Always true
+    *
+    * @see PEAR::pushErrorHandling
+    */
+    function popErrorHandling()
+    {
+        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+        array_pop($stack);
+        list($mode, $options) = $stack[sizeof($stack) - 1];
+        array_pop($stack);
+        if (isset($this) && is_a($this, 'PEAR')) {
+            $this->setErrorHandling($mode, $options);
+        } else {
+            PEAR::setErrorHandling($mode, $options);
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ loadExtension()
+
+    /**
+    * OS independant PHP extension load. Remember to take care
+    * on the correct extension name for case sensitive OSes.
+    *
+    * @param string $ext The extension name
+    * @return bool Success or not on the dl() call
+    */
+    function loadExtension($ext)
+    {
+        if (!extension_loaded($ext)) {
+            // if either returns true dl() will produce a FATAL error, stop that
+            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
+                return false;
+            }
+
+            if (OS_WINDOWS) {
+                $suffix = '.dll';
+            } elseif (PHP_OS == 'HP-UX') {
+                $suffix = '.sl';
+            } elseif (PHP_OS == 'AIX') {
+                $suffix = '.a';
+            } elseif (PHP_OS == 'OSX') {
+                $suffix = '.bundle';
+            } else {
+                $suffix = '.so';
+            }
+
+            return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
+        }
+
+        return true;
+    }
+
+    // }}}
+}
+
+if (PEAR_ZE2) {
+    include_once 'PEAR5.php';
+}
+
+// {{{ _PEAR_call_destructors()
+
+function _PEAR_call_destructors()
+{
+    global $_PEAR_destructor_object_list;
+    if (is_array($_PEAR_destructor_object_list) &&
+        sizeof($_PEAR_destructor_object_list))
+    {
+        reset($_PEAR_destructor_object_list);
+        if (PEAR_ZE2) {
+            $destructLifoExists = PEAR5::getStaticProperty('PEAR', 'destructlifo');
+        } else {
+            $destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo');
+        }
+
+        if ($destructLifoExists) {
+            $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
+        }
+
+        while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
+            $classname = get_class($objref);
+            while ($classname) {
+                $destructor = "_$classname";
+                if (method_exists($objref, $destructor)) {
+                    $objref->$destructor();
+                    break;
+                } else {
+                    $classname = get_parent_class($classname);
+                }
+            }
+        }
+        // Empty the object list to ensure that destructors are
+        // not called more than once.
+        $_PEAR_destructor_object_list = array();
+    }
+
+    // Now call the shutdown functions
+    if (isset($GLOBALS['_PEAR_shutdown_funcs']) AND is_array($GLOBALS['_PEAR_shutdown_funcs']) AND !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
+        foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
+            call_user_func_array($value[0], $value[1]);
+        }
+    }
+}
+
+// }}}
+/**
+ * Standard PEAR error class for PHP 4
+ *
+ * This class is supserseded by {@link PEAR_Exception} in PHP 5
+ *
+ * @category   pear
+ * @package    PEAR
+ * @author     Stig Bakken <ssb@php.net>
+ * @author     Tomas V.V. Cox <cox@idecnet.com>
+ * @author     Gregory Beaver <cellog@php.net>
+ * @copyright  1997-2006 The PHP Group
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    Release: 1.9.0
+ * @link       http://pear.php.net/manual/en/core.pear.pear-error.php
+ * @see        PEAR::raiseError(), PEAR::throwError()
+ * @since      Class available since PHP 4.0.2
+ */
+class PEAR_Error
+{
+    // {{{ properties
+
+    var $error_message_prefix = '';
+    var $mode                 = PEAR_ERROR_RETURN;
+    var $level                = E_USER_NOTICE;
+    var $code                 = -1;
+    var $message              = '';
+    var $userinfo             = '';
+    var $backtrace            = null;
+
+    // }}}
+    // {{{ constructor
+
+    /**
+     * PEAR_Error constructor
+     *
+     * @param string $message  message
+     *
+     * @param int $code     (optional) error code
+     *
+     * @param int $mode     (optional) error mode, one of: PEAR_ERROR_RETURN,
+     * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
+     * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
+     *
+     * @param mixed $options   (optional) error level, _OR_ in the case of
+     * PEAR_ERROR_CALLBACK, the callback function or object/method
+     * tuple.
+     *
+     * @param string $userinfo (optional) additional user/debug info
+     *
+     * @access public
+     *
+     */
+    function PEAR_Error($message = 'unknown error', $code = null,
+                        $mode = null, $options = null, $userinfo = null)
+    {
+        if ($mode === null) {
+            $mode = PEAR_ERROR_RETURN;
+        }
+        $this->message   = $message;
+        $this->code      = $code;
+        $this->mode      = $mode;
+        $this->userinfo  = $userinfo;
+
+        if (PEAR_ZE2) {
+            $skiptrace = PEAR5::getStaticProperty('PEAR_Error', 'skiptrace');
+        } else {
+            $skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
+        }
+
+        if (!$skiptrace) {
+            $this->backtrace = debug_backtrace();
+            if (isset($this->backtrace[0]) && isset($this->backtrace[0]['object'])) {
+                unset($this->backtrace[0]['object']);
+            }
+        }
+
+        if ($mode & PEAR_ERROR_CALLBACK) {
+            $this->level = E_USER_NOTICE;
+            $this->callback = $options;
+        } else {
+            if ($options === null) {
+                $options = E_USER_NOTICE;
+            }
+
+            $this->level = $options;
+            $this->callback = null;
+        }
+
+        if ($this->mode & PEAR_ERROR_PRINT) {
+            if (is_null($options) || is_int($options)) {
+                $format = "%s";
+            } else {
+                $format = $options;
+            }
+
+            printf($format, $this->getMessage());
+        }
+
+        if ($this->mode & PEAR_ERROR_TRIGGER) {
+            trigger_error($this->getMessage(), $this->level);
+        }
+
+        if ($this->mode & PEAR_ERROR_DIE) {
+            $msg = $this->getMessage();
+            if (is_null($options) || is_int($options)) {
+                $format = "%s";
+                if (substr($msg, -1) != "\n") {
+                    $msg .= "\n";
+                }
+            } else {
+                $format = $options;
+            }
+            die(sprintf($format, $msg));
+        }
+
+        if ($this->mode & PEAR_ERROR_CALLBACK) {
+            if (is_callable($this->callback)) {
+                call_user_func($this->callback, $this);
+            }
+        }
+
+        if ($this->mode & PEAR_ERROR_EXCEPTION) {
+            trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions", E_USER_WARNING);
+            eval('$e = new Exception($this->message, $this->code);throw($e);');
+        }
+    }
+
+    // }}}
+    // {{{ getMode()
+
+    /**
+     * Get the error mode from an error object.
+     *
+     * @return int error mode
+     * @access public
+     */
+    function getMode() {
+        return $this->mode;
+    }
+
+    // }}}
+    // {{{ getCallback()
+
+    /**
+     * Get the callback function/method from an error object.
+     *
+     * @return mixed callback function or object/method array
+     * @access public
+     */
+    function getCallback() {
+        return $this->callback;
+    }
+
+    // }}}
+    // {{{ getMessage()
+
+
+    /**
+     * Get the error message from an error object.
+     *
+     * @return  string  full error message
+     * @access public
+     */
+    function getMessage()
+    {
+        return ($this->error_message_prefix . $this->message);
+    }
+
+
+    // }}}
+    // {{{ getCode()
+
+    /**
+     * Get error code from an error object
+     *
+     * @return int error code
+     * @access public
+     */
+     function getCode()
+     {
+        return $this->code;
+     }
+
+    // }}}
+    // {{{ getType()
+
+    /**
+     * Get the name of this error/exception.
+     *
+     * @return string error/exception name (type)
+     * @access public
+     */
+    function getType()
+    {
+        return get_class($this);
+    }
+
+    // }}}
+    // {{{ getUserInfo()
+
+    /**
+     * Get additional user-supplied information.
+     *
+     * @return string user-supplied information
+     * @access public
+     */
+    function getUserInfo()
+    {
+        return $this->userinfo;
+    }
+
+    // }}}
+    // {{{ getDebugInfo()
+
+    /**
+     * Get additional debug information supplied by the application.
+     *
+     * @return string debug information
+     * @access public
+     */
+    function getDebugInfo()
+    {
+        return $this->getUserInfo();
+    }
+
+    // }}}
+    // {{{ getBacktrace()
+
+    /**
+     * Get the call backtrace from where the error was generated.
+     * Supported with PHP 4.3.0 or newer.
+     *
+     * @param int $frame (optional) what frame to fetch
+     * @return array Backtrace, or NULL if not available.
+     * @access public
+     */
+    function getBacktrace($frame = null)
+    {
+        if (defined('PEAR_IGNORE_BACKTRACE')) {
+            return null;
+        }
+        if ($frame === null) {
+            return $this->backtrace;
+        }
+        return $this->backtrace[$frame];
+    }
+
+    // }}}
+    // {{{ addUserInfo()
+
+    function addUserInfo($info)
+    {
+        if (empty($this->userinfo)) {
+            $this->userinfo = $info;
+        } else {
+            $this->userinfo .= " ** $info";
+        }
+    }
+
+    // }}}
+    // {{{ toString()
+    function __toString()
+    {
+        return $this->getMessage();
+    }
+    // }}}
+    // {{{ toString()
+
+    /**
+     * Make a string representation of this object.
+     *
+     * @return string a string with an object summary
+     * @access public
+     */
+    function toString() {
+        $modes = array();
+        $levels = array(E_USER_NOTICE  => 'notice',
+                        E_USER_WARNING => 'warning',
+                        E_USER_ERROR   => 'error');
+        if ($this->mode & PEAR_ERROR_CALLBACK) {
+            if (is_array($this->callback)) {
+                $callback = (is_object($this->callback[0]) ?
+                    strtolower(get_class($this->callback[0])) :
+                    $this->callback[0]) . '::' .
+                    $this->callback[1];
+            } else {
+                $callback = $this->callback;
+            }
+            return sprintf('[%s: message="%s" code=%d mode=callback '.
+                           'callback=%s prefix="%s" info="%s"]',
+                           strtolower(get_class($this)), $this->message, $this->code,
+                           $callback, $this->error_message_prefix,
+                           $this->userinfo);
+        }
+        if ($this->mode & PEAR_ERROR_PRINT) {
+            $modes[] = 'print';
+        }
+        if ($this->mode & PEAR_ERROR_TRIGGER) {
+            $modes[] = 'trigger';
+        }
+        if ($this->mode & PEAR_ERROR_DIE) {
+            $modes[] = 'die';
+        }
+        if ($this->mode & PEAR_ERROR_RETURN) {
+            $modes[] = 'return';
+        }
+        return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
+                       'prefix="%s" info="%s"]',
+                       strtolower(get_class($this)), $this->message, $this->code,
+                       implode("|", $modes), $levels[$this->level],
+                       $this->error_message_prefix,
+                       $this->userinfo);
+    }
+
+    // }}}
+}
+
+/*
+ * Local Variables:
+ * mode: php
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */

iRony-0.4.4.tar.gz/lib/FileAPI/ext/PEAR5.php Added

@@ -0,0 +1,33 @@
+<?php
+/**
+ * This is only meant for PHP 5 to get rid of certain strict warning
+ * that doesn't get hidden since it's in the shutdown function
+ */
+class PEAR5
+{
+    /**
+    * If you have a class that's mostly/entirely static, and you need static
+    * properties, you can use this method to simulate them. Eg. in your method(s)
+    * do this: $myVar = &PEAR5::getStaticProperty('myclass', 'myVar');
+    * You MUST use a reference, or they will not persist!
+    *
+    * @access public
+    * @param  string $class  The calling classname, to prevent clashes
+    * @param  string $var    The variable to retrieve.
+    * @return mixed   A reference to the variable. If not set it will be
+    *                 auto initialised to NULL.
+    */
+    static function &getStaticProperty($class, $var)
+    {
+        static $properties;
+        if (!isset($properties[$class])) {
+            $properties[$class] = array();
+        }
+
+        if (!array_key_exists($var, $properties[$class])) {
+            $properties[$class][$var] = null;
+        }
+
+        return $properties[$class][$var];
+    }
+}
\ No newline at end of file

iRony-0.4.3.tar.gz/lib/FileAPI/file_api.php -> iRony-0.4.4.tar.gz/lib/FileAPI/file_api.php Changed

@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------------+
  | This file is part of the Kolab File API                                  |
  |                                                                          |
- | Copyright (C) 2012-2015, Kolab Systems AG                                |
+ | Copyright (C) 2012-2013, 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 |
@@ -25,31 +25,25 @@
 class file_api extends file_api_core
 {
     public $session;
-    public $config;
-    public $browser;
     public $output_type = file_api_core::OUTPUT_JSON;
 
+    private $conf;
+    private $browser;
 
-    /**
-     * Class factory.
-     */
-    public static function factory()
-    {
-        $class = 'file_api' . (!empty($_GET['wopi']) ? '_wopi' : '');
-
-        return new $class;
-    }
 
-    /**
-     * Class constructor.
-     */
     public function __construct()
     {
         $rcube = rcube::get_instance();
-        register_shutdown_function(array($this, 'shutdown'));
+        $rcube->add_shutdown_function(array($this, 'shutdown'));
 
-        $this->config = $rcube->config;
+        $this->conf = $rcube->config;
         $this->session_init();
+
+        if ($_SESSION['config']) {
+            $this->config = $_SESSION['config'];
+        }
+
+        $this->locale_init();
     }
 
     /**
@@ -60,37 +54,30 @@
         $this->request = strtolower($_GET['method']);
 
         // Check the session, authenticate the user
-        if (!$this->session_validate($this->request == 'authenticate', $_REQUEST['token'])) {
+        if (!$this->session_validate()) {
             $this->session->destroy(session_id());
-            $this->session->regenerate_id(false);
 
-            if ($username = $this->authenticate()) {
-                // Init locale after the session started
-                $this->locale_init();
-                $this->env['language'] = $this->language;
+            if ($this->request == 'authenticate') {
+                $this->session->regenerate_id(false);
 
-                $_SESSION['user'] = $username;
-                $_SESSION['env']  = $this->env;
+                if ($username = $this->authenticate()) {
+                    $_SESSION['user']   = $username;
+                    $_SESSION['time']   = time();
+                    $_SESSION['config'] = $this->config;
 
-                // remember client API version
-                if (is_numeric($_GET['version'])) {
-                    $_SESSION['version'] = $_GET['version'];
-                }
+                    // remember client API version
+                    if (is_numeric($_GET['version'])) {
+                        $_SESSION['version'] = $_GET['version'];
+                    }
 
-                if ($this->request == 'authenticate') {
                     $this->output_success(array(
                         'token'        => session_id(),
                         'capabilities' => $this->capabilities(),
                     ));
                 }
             }
-            else {
-                throw new Exception("Invalid session", file_api_core::ERROR_UNAUTHORIZED);
-            }
-        }
-        else {
-            // Init locale after the session started
-            $this->locale_init();
+
+            throw new Exception("Invalid session", 403);
         }
 
         // Call service method
@@ -104,35 +91,28 @@
     /**
      * Session validation check and session start
      */
-    protected function session_validate($new_session = false, $token = null)
+    private function session_validate()
     {
-        if (!$new_session) {
-            $sess_id = rcube_utils::request_header('X-Session-Token') ?: $token;
-        }
+        $sess_id = rcube_utils::request_header('X-Session-Token') ?: $_REQUEST['token'];
 
         if (empty($sess_id)) {
-            $this->session->start();
+            session_start();
             return false;
         }
 
         session_id($sess_id);
-        $this->session->start();
+        session_start();
 
         if (empty($_SESSION['user'])) {
             return false;
         }
 
-        // Single-document session?
-        if (!($this instanceof file_api_wopi)
-            && ($doc_id = $_SESSION['document_session'])
-            && (strpos($this->request, 'document') !== 0 || $doc_id != $_GET['id'])
-        ) {
-            throw new Exception("Access denied", file_api_core::ERROR_UNAUTHORIZED);
-        }
-
-        if ($_SESSION['env']) {
-            $this->env = $_SESSION['env'];
+        $timeout = $this->conf->get('session_lifetime', 0) * 60;
+        if ($timeout && $_SESSION['time'] && $_SESSION['time'] < time() - $timeout) {
+            return false;
         }
+        // update session time
+        $_SESSION['time'] = time();
 
         return true;
     }
@@ -140,11 +120,11 @@
     /**
      * Initializes session
      */
-    protected function session_init()
+    private function session_init()
     {
         $rcube     = rcube::get_instance();
-        $sess_name = $this->config->get('session_name');
-        $lifetime  = $this->config->get('session_lifetime', 0) * 60;
+        $sess_name = $this->conf->get('session_name');
+        $lifetime  = $this->conf->get('session_lifetime', 0) * 60;
 
         if ($lifetime) {
             ini_set('session.gc_maxlifetime', $lifetime * 2);
@@ -154,19 +134,14 @@
         ini_set('session.use_cookies', 0);
         ini_set('session.serialize_handler', 'php');
 
-        // Roundcube Framework >= 1.2
-        if (in_array('factory', get_class_methods('rcube_session'))) {
-            $this->session = rcube_session::factory($this->config);
-        }
-        // Rouncube Framework < 1.2
-        else {
-            $this->session = new rcube_session($rcube->get_dbh(), $this->config);
-            $this->session->set_secret($this->config->get('des_key') . dirname($_SERVER['SCRIPT_NAME']));
-            $this->session->set_ip_check($this->config->get('ip_check'));
-        }
+        // use database for storing session data
+        $this->session = new rcube_session($rcube->get_dbh(), $this->conf);
 
         $this->session->register_gc_handler(array($rcube, 'gc'));
 
+        $this->session->set_secret($this->conf->get('des_key') . dirname($_SERVER['SCRIPT_NAME']));
+        $this->session->set_ip_check($this->conf->get('ip_check'));
+
         // this is needed to correctly close session in shutdown function
         $rcube->session = $this->session;
     }
@@ -177,29 +152,13 @@
     public function shutdown()
     {
         // write performance stats to logs/console
-        if ($this->config->get('devel_mode') || $this->config->get('performance_stats')) {
-            // we have to disable per_user_logging to make sure stats end up in the main console log
-            $this->config->set('per_user_logging', false);
-
-            // make sure logged numbers use unified format
-            setlocale(LC_NUMERIC, 'en_US.utf8', 'en_US.UTF-8', 'en_US', 'C');
-
-            if (function_exists('memory_get_usage')) {
-                $mem = round(memory_get_usage() / 1024 /1024, 1);
-            }
-            if (function_exists('memory_get_peak_usage')) {
-                $mem .= '/'. round(memory_get_peak_usage() / 1024 / 1024, 1);
-            }
-
-            $path    = !empty($this->path) ? '/' . implode($this->path, '/') : '';
-            $request = ($this instanceof file_api_wopi ? 'wopi/' : '') . $this->request;
-
-            if ($path !== '' && substr_compare($this->request, $path, -1 * strlen($path), strlen($path), true) != 0) {
-                $request .= $path;
-            }
-
-            $log = sprintf('%s: %s [%s]', $this->method ?: $_SERVER['REQUEST_METHOD'], trim($request) ?: '/', $mem);
+        if ($this->conf->get('devel_mode')) {
+            if (function_exists('memory_get_peak_usage'))
+                $mem = memory_get_peak_usage();
+            else if (function_exists('memory_get_usage'))
+                $mem = memory_get_usage();
 
+            $log = trim($this->request . ($mem ? sprintf(' [%.1f MB]', $mem/1024/1024) : ''));
             if (defined('FILE_API_START')) {
                 rcube::print_timer(FILE_API_START, $log);
             }
@@ -212,7 +171,7 @@
     /**
      * Authentication request handler (HTTP Auth)
      */
-    protected function authenticate()
+    private function authenticate()
     {
         if (isset($_POST['username'])) {
             $username = $_POST['username'];
@@ -224,44 +183,37 @@
         }
         // when used with (f)cgi no PHP_AUTH* variables are available without defining a special rewrite rule
         else if (!isset($_SERVER['PHP_AUTH_USER'])) {
-            $tokens = array(
-                $_SERVER['REMOTE_USER'],
-                $_SERVER['REDIRECT_REMOTE_USER'],
-                $_SERVER['HTTP_AUTHORIZATION'],
-                rcube_utils::request_header('Authorization'),
-            );
+            // "Basic didhfiefdhfu4fjfjdsa34drsdfterrde..."
+            if (isset($_SERVER["REMOTE_USER"])) {
+                $basicAuthData = base64_decode(substr($_SERVER["REMOTE_USER"], 6));
+            }
+            else if (isset($_SERVER["REDIRECT_REMOTE_USER"])) {
+                $basicAuthData = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6));
+            }
+            else if (isset($_SERVER["Authorization"])) {
+                $basicAuthData = base64_decode(substr($_SERVER["Authorization"], 6));
+            }
+            else if (isset($_SERVER["HTTP_AUTHORIZATION"])) {
+                $basicAuthData = base64_decode(substr($_SERVER["HTTP_AUTHORIZATION"], 6));
+            }
 
-            foreach ($tokens as $token) {
-                if (!empty($token)) {
-                    if (stripos($token, 'Basic ') === 0) {
-                        $basicAuthData = base64_decode(substr($token, 6));
-                        list($username, $password) = explode(':', $basicAuthData, 2);
-                        if ($username) {
-                            break;
-                        }
-                    }
-                    else if (stripos($token, 'Bearer ') === 0) {
-                        $username = base64_decode(substr($token, 7));
-                        if ($username) {
-                            break;
-                        }
-                    }
-                }
+            if (isset($basicAuthData) && !empty($basicAuthData)) {
+                list($username, $password) = explode(":", $basicAuthData);
             }
         }
 
         if (!empty($username)) {
             $backend = $this->get_backend();
             $result  = $backend->authenticate($username, $password);
+        }
 
-            if (empty($result)) {
+        if (empty($result)) {
 /*
-                header('WWW-Authenticate: Basic realm="' . $this->app_name .'"');
-                header('HTTP/1.1 401 Unauthorized');
-                exit;
+            header('WWW-Authenticate: Basic realm="' . $this->app_name .'"');
+            header('HTTP/1.1 401 Unauthorized');
+            exit;
 */
-                throw new Exception("Invalid password or username", file_api_core::ERROR_UNAUTHORIZED);
-            }
+            throw new Exception("Invalid password or username", file_api_core::ERROR_CODE);
         }
 
         return $username;
@@ -270,7 +222,7 @@
     /**
      * Storage/System method handler
      */
-    protected function request_handler($request)
+    private function request_handler($request)
     {
         // handle "global" requests that don't require api driver
         switch ($request) {
@@ -282,14 +234,14 @@
                 return array();
 
             case 'configure':
-                foreach (array_keys($this->env) as $name) {
+                foreach (array_keys($this->config) as $name) {
                     if (isset($_GET[$name])) {
-                        $this->env[$name] = $_GET[$name];
+                        $this->config[$name] = $_GET[$name];
                     }
                 }
-                $_SESSION['env'] = $this->env;
+                $_SESSION['config'] = $this->config;
 
-                return $this->env;
+                return $this->config;
 
             case 'upload_progress':
                 return $this->upload_progress();
@@ -303,18 +255,13 @@
 
         // handle request
         if ($request && preg_match('/^[a-z0-9_-]+$/', $request)) {
+            // request name aliases for backward compatibility
             $aliases = array(
-                // request name aliases for backward compatibility
                 'lock'          => 'lock_create',
                 'unlock'        => 'lock_delete',
                 'folder_rename' => 'folder_move',
             );
 
-            // Redirect all document_* actions into 'document' action
-            if (preg_match('/^(sessions|invitations|document_[a-z]+)$/', $request)) {
-                $request = 'document';
-            }
-
             $request = $aliases[$request] ?: $request;
 
             require_once __DIR__ . "/api/common.php";
@@ -343,7 +290,7 @@
             if (!empty($status)) {
                 $status['percent'] = round($status['current']/$status['total']*100);
                 if ($status['percent'] < 100) {
-                    $diff = max(1, time() - intval($status['start_time']));
+                    $diff = time() - intval($status['start_time']);
                     // calculate time to end of uploading (in seconds)
                     $status['eta'] = intval($diff * (100 - $status['percent']) / $status['percent']);
                     // average speed (bytes per second)
@@ -368,44 +315,12 @@
      */
     public function file_url($file)
     {
-        return $this->api_url() . '?method=file_get'
+        return file_utils::script_uri(). '?method=file_get'
             . '&file=' . urlencode($file)
             . '&token=' . urlencode(session_id());
     }
 
     /**
-     * Returns API URL
-     *
-     * @return string API URL
-     */
-    public function api_url()
-    {
-        $api_url = $this->config->get('file_api_url', '');
-
-        if (!preg_match('|^https?://|', $api_url)) {
-            $schema = rcube_utils::https_check() ? 'https' : 'http';
-            $port   = $schema == 'http' ? 80 : 443;
-            $url    = $schema . '://' . preg_replace('/:\d+$/', '', $_SERVER['HTTP_HOST']);
-
-            if ($_SERVER['SERVER_PORT'] != $port && $_SERVER['SERVER_PORT'] != 80) {
-                $url .= ':' . $_SERVER['SERVER_PORT'];
-            }
-
-            if ($api_url) {
-                $api_url = $url . '/' . trim($api_url, '/ ');
-            }
-            else {
-                $url .= preg_replace('/\/?\?.*$/', '', $_SERVER['REQUEST_URI']);
-                $url = preg_replace('/\/api$/', '', $url);
-
-                $api_url = $url . '/api';
-            }
-        }
-
-        return rtrim($api_url, '/ ');
-    }
-
-    /**
      * Returns web browser object
      *
      * @return rcube_browser Web browser object
@@ -459,22 +374,12 @@
 
         if (!empty($_REQUEST['req_id'])) {
             $response['req_id'] = $_REQUEST['req_id'];
-            header("X-Chwala-Request-ID: " . $_REQUEST['req_id']);
         }
 
         if (empty($response['code'])) {
             $response['code'] = file_api_core::ERROR_CODE;
         }
 
-        header("X-Chwala-Error: " . $response['code']);
-
-        // When binary response is expected return real
-        // HTTP error instaead of JSON response with code 200
-        if ($this->is_binary_request()) {
-            header(sprintf("HTTP/1.0 %d %s", $response['code'], $response ?: "Server error"));
-            exit;
-        }
-
         $this->output_send($response);
     }
 
@@ -483,27 +388,15 @@
      *
      * @param mixed $data Data
      */
-    public function output_send($data = null)
+    protected function output_send($data)
     {
         // Send response
-        if ($data !== null) {
-            header("Content-Type: {$this->output_type}; charset=utf-8");
-            echo rcube_output::json_serialize($data);
-        }
-
+        header("Content-Type: {$this->output_type}; charset=utf-8");
+        echo json_encode($data);
         exit;
     }
 
     /**
-     * Find out if current request expects binary output
-     */
-    protected function is_binary_request()
-    {
-        return $_SERVER['REQUEST_METHOD'] == 'GET' &&
-            ($this->request == 'file_get' || $this->request == 'document');
-    }
-
-    /**
      * Returns API version supported by the client
      */
     public function client_version()

iRony-0.4.3.tar.gz/lib/FileAPI/file_api_core.php -> iRony-0.4.4.tar.gz/lib/FileAPI/file_api_core.php Changed

@@ -24,27 +24,21 @@
 
 class file_api_core extends file_locale
 {
-    const API_VERSION = 5;
+    const API_VERSION = 2;
 
-    const ERROR_UNAUTHORIZED        = 401;
-    const ERROR_NOT_FOUND           = 404;
-    const ERROR_PRECONDITION_FAILED = 412;
-    const ERROR_CODE                = 500;
-    const ERROR_INVALID             = 501;
-    const ERROR_NOT_IMPLEMENTED     = 501;
+    const ERROR_CODE    = 500;
+    const ERROR_INVALID = 501;
 
     const OUTPUT_JSON = 'application/json';
     const OUTPUT_HTML = 'text/html';
 
-    public $env = array(
+    public $config = array(
         'date_format' => 'Y-m-d H:i',
         'language'    => 'en_US',
-        'timezone'    => 'UTC',
     );
 
     protected $app_name = 'Kolab File API';
     protected $drivers  = array();
-    protected $icache   = array();
     protected $backend;
 
     /**
@@ -72,7 +66,7 @@
         $this->backend = $this->load_driver_object($driver);
 
         // configure api
-        $this->backend->configure($this->env);
+        $this->backend->configure($this->config);
 
         return $this->backend;
     }
@@ -80,44 +74,22 @@
     /**
      * Return supported/enabled external storage instances
      *
-     * @param bool  $as_objects     Return drivers as objects not config data
-     * @param array &$admin_drivers List of admin-configured drivers
+     * @param bool $as_objects Return drivers as objects not config data
      *
      * @return array List of storage drivers
      */
-    public function get_drivers($as_objects = false, &$admin_drivers = null)
+    public function get_drivers($as_objects = false)
     {
         $rcube   = rcube::get_instance();
-        $backend = $this->get_backend();
         $enabled = $rcube->config->get('fileapi_drivers');
         $preconf = $rcube->config->get('fileapi_sources');
         $result  = array();
         $all     = array();
-        $iRony   = defined('KOLAB_DAV_ROOT');
-
-        // Disable webdav sources/drivers in iRony that point to the
-        // same host to prevent infinite recursion
-        $is_valid_source = function($source) {
-            if ($source['driver'] == 'webdav') {
-                $self_url = parse_url($_SERVER['SCRIPT_URI']);
-                $item_url = parse_url($source['baseuri'] ?: $source['host']);
-                $hosts    = array($self_url['host'], $_SERVER['SERVER_NAME'], $_SERVER['SERVER_ADDR']);
-
-                if (in_array($item_url['host'], $hosts)) {
-                    return false;
-                }
-            }
-
-            return true;
-        };
 
         if (!empty($enabled)) {
+            $backend = $this->get_backend();
             $drivers = $backend->driver_list();
 
-            if ($iRony) {
-                $drivers = array_filter($drivers, $is_valid_source);
-            }
-
             foreach ($drivers as $item) {
                 $all[] = $item['title'];
 
@@ -127,21 +99,13 @@
             }
         }
 
-        $admin_drivers = array();
-
-        if (!empty($preconf)) {
-            if ($iRony) {
-                $preconf = array_filter($preconf, $is_valid_source);
-            }
-
-            foreach ($preconf as $title => $item) {
+        if (empty($result) && !empty($preconf)) {
+            foreach ((array) $preconf as $title => $item) {
                 if (!in_array($title, $all)) {
                     $item['title'] = $title;
                     $item['admin'] = true;
 
                     $result[] = $as_objects ? $this->get_driver_object($item) : $item;
-
-                    $admin_drivers[] = $title;
                 }
             }
         }
@@ -170,11 +134,6 @@
         }
 
         if (empty($selected)) {
-            $rcube = rcube::get_instance();
-            if ($rcube->config->get('fileapi_backend_storage_disabled')) {
-                throw new Exception("Failed to find a driver for specified folder/file.", self::ERROR_NOT_FOUND);
-            }
-
             return array($this->get_backend(), $path);
         }
 
@@ -208,7 +167,7 @@
             }
 
             // configure api
-            $driver->configure(array_merge($config, $this->env), $key);
+            $driver->configure(array_merge($config, $this->config), $key);
         }
 
         return $this->drivers[$key];
@@ -233,15 +192,13 @@
     /**
      * Returns storage(s) capabilities
      *
-     * @param bool $full Return all drivers' capabilities
-     *
      * @return array Capabilities
      */
-    public function capabilities($full = true)
+    public function capabilities()
     {
         $rcube   = rcube::get_instance();
         $backend = $this->get_backend();
-        $caps    = array('VERSION' => self::API_VERSION);
+        $caps    = array();
 
         // check support for upload progress
         if (($progress_sec = $rcube->config->get('upload_progress'))
@@ -259,34 +216,6 @@
             }
         }
 
-        // Manticore support
-        if ($rcube->config->get('fileapi_manticore')) {
-            $caps['MANTICORE'] = true;
-        }
-
-        // WOPI support
-        if ($rcube->config->get('fileapi_wopi_office')) {
-            $caps['WOPI'] = true;
-        }
-
-        if ($rcube->config->get('fileapi_backend_storage_disabled')) {
-            $caps['NOROOT'] = true;
-        }
-
-        if (!$full) {
-            return $caps;
-        }
-
-        if ($caps['MANTICORE']) {
-            $manticore = new file_manticore($this);
-            $caps['MANTICORE_EDITABLE'] = $manticore->supported_filetypes(true);
-        }
-
-        if ($caps['WOPI']) {
-            $wopi = new file_wopi($this);
-            $caps['WOPI_EDITABLE'] = $wopi->supported_filetypes(true);
-        }
-
         // get capabilities of other drivers
         $drivers = $this->get_drivers(true);
 
@@ -296,7 +225,7 @@
                 foreach ($driver->capabilities() as $name => $value) {
                     // skip disabled capabilities
                     if ($value !== false) {
-                        $caps['MOUNTPOINTS'][$title][$name] = $value;
+                        $caps['roots'][$title][$name] = $value;
                     }
                 }
             }
@@ -306,48 +235,14 @@
     }
 
     /**
-     * Get user name from user identifier (email address) using LDAP lookup
-     *
-     * @param string $email User identifier
-     *
-     * @return string User name
-     */
-    public function resolve_user($email)
-    {
-        $key = "user:$email";
-
-        // make sure Kolab backend is initialized so kolab_storage can be found
-        $this->get_backend();
-
-        // @todo: Move this into drivers
-        if ($this->icache[$key] === null
-            && class_exists('kolab_storage')
-            && ($ldap = kolab_storage::ldap())
-        ) {
-            $user = $ldap->get_user_record($email, $_SESSION['imap_host']);
-
-            $this->icache[$key] = $user ?: false;
-        }
-
-        if ($this->icache[$key]) {
-            return $this->icache[$key]['displayname'] ?: $this->icache[$key]['name'];
-        }
-    }
-
-    /**
      * Return mimetypes list supported by built-in viewers
      *
      * @return array List of mimetypes
      */
     protected function supported_mimetypes()
     {
-        $rcube       = rcube::get_instance();
-        $mimetypes   = array();
-        $mimetypes_c = array();
-        $dir         = __DIR__ . '/viewers';
-
-        // make sure Kolab backend is initialized so kolab_auth can modify config
-        $backend = $this->get_backend();
+        $mimetypes = array();
+        $dir       = __DIR__ . '/viewers';
 
         if ($handle = opendir($dir)) {
             while (false !== ($file = readdir($handle))) {
@@ -356,38 +251,13 @@
                     $class  = 'file_viewer_' . $matches[1];
                     $viewer = new $class($this);
 
-                    if ($supported = $viewer->supported_mimetypes()) {
-                        $mimetypes = array_merge($mimetypes, $supported);
-                    }
+                    $mimetypes = array_merge($mimetypes, $viewer->supported_mimetypes());
                 }
             }
             closedir($handle);
         }
 
-        // Here we return mimetypes supported for editing and creation of files
-        // @TODO: maybe move this to viewers
-        if ($rcube->config->get('fileapi_wopi_office')) {
-            $mimetypes_c['application/vnd.oasis.opendocument.text']         = array('ext' => 'odt');
-            $mimetypes_c['application/vnd.oasis.opendocument.presentation'] = array('ext' => 'odp');
-            $mimetypes_c['application/vnd.oasis.opendocument.spreadsheet']  = array('ext' => 'ods');
-        }
-        else if ($rcube->config->get('fileapi_manticore')) {
-            $mimetypes_c['application/vnd.oasis.opendocument.text'] = array('ext' => 'odt');
-        }
-
-        $mimetypes_c['text/plain'] = array('ext' => 'txt');
-        $mimetypes_c['text/html']  = array('ext' => 'html');
-
-        foreach (array_keys($mimetypes_c) as $type) {
-            list ($app, $label) = explode('/', $type);
-            $label = preg_replace('/[^a-z]/', '', $label);
-            $mimetypes_c[$type]['label'] = $this->translate('type.' . $label);
-        }
-
-        return array(
-            'view' => $mimetypes,
-            'edit' => $mimetypes_c,
-        );
+        return $mimetypes;
     }
 
     /**

iRony-0.4.3.tar.gz/lib/FileAPI/file_api_lib.php -> iRony-0.4.4.tar.gz/lib/FileAPI/file_api_lib.php Changed

@@ -36,12 +36,12 @@
 
         switch ($name) {
             case 'configure':
-                foreach (array_keys($this->env) as $name) {
+                foreach (array_keys($this->config) as $name) {
                     if (isset($arguments[0][$name])) {
-                        $this->env[$name] = $arguments[0][$name];
+                        $this->config[$name] = $arguments[0][$name];
                     }
                 }
-                return $this->env;
+                return $this->config;
 
             case 'mimetypes':
                 return $this->supported_mimetypes();
@@ -84,29 +84,17 @@
                 return;
 
             case 'folder_list':
-                $args = array(
-                    'folder' => $arguments[0],
-                    'level'  => $arguments[1],
-                );
+                // no arguments
+                $args = array();
                 break;
 
             case 'folder_create':
-            case 'folder_subscribe':
-            case 'folder_unsubscribe':
             case 'folder_delete':
                 $args = array(
                     'folder' => $arguments[0],
                 );
                 break;
 
-            case 'folder_info':
-                $args = array(
-                    'folder'   => $arguments[0],
-                    'rights'   => 1,
-                    'sessions' => 1,
-                );
-                break;
-
             case 'folder_move':
                 $args = array(
                     'folder' => $arguments[0],
@@ -131,7 +119,6 @@
                 throw new Exception("Invalid method name", \file_storage::ERROR_UNSUPPORTED);
         }
 
-        require_once __DIR__ . "/api/common.php";
         require_once __DIR__ . "/api/$name.php";
 
         $class   = "file_api_$name";
@@ -147,3 +134,52 @@
     {
     }
 }
+
+
+/**
+ * Common handler class, from which action handler classes inherit
+ */
+class file_api_common
+{
+    protected $api;
+    protected $rc;
+    protected $args;
+
+
+    public function __construct($api, $args)
+    {
+        $this->rc   = rcube::get_instance();
+        $this->api  = $api;
+        $this->args = $args;
+    }
+
+    /**
+     * Request handler
+     */
+    public function handle()
+    {
+        // disable script execution time limit, so we can handle big files
+        @set_time_limit(0);
+    }
+
+    /**
+     * Parse driver metadata information
+     */
+    protected function parse_metadata($metadata, $default = false)
+    {
+        if ($default) {
+            unset($metadata['form']);
+            $metadata['name'] .= ' (' . $this->api->translate('localstorage') . ')';
+        }
+
+        // localize form labels
+        foreach ($metadata['form'] as $key => $val) {
+            $label = $this->api->translate('form.' . $val);
+            if (strpos($label, 'form.') !== 0) {
+                $metadata['form'][$key] = $label;
+            }
+        }
+
+        return $metadata;
+    }
+}

iRony-0.4.3.tar.gz/lib/FileAPI/file_locale.php -> iRony-0.4.4.tar.gz/lib/FileAPI/file_locale.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/file_locks.php -> iRony-0.4.4.tar.gz/lib/FileAPI/file_locks.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/file_storage.php -> iRony-0.4.4.tar.gz/lib/FileAPI/file_storage.php Changed

@@ -31,17 +31,13 @@
     const CAPS_PROGRESS_TIME = 'PROGRESS_TIME';
     const CAPS_QUOTA         = 'QUOTA';
     const CAPS_LOCKS         = 'LOCKS';
-    const CAPS_SUBSCRIPTIONS = 'SUBSCRIPTIONS';
-    const CAPS_FAST_FOLDER_LIST = 'FAST_FOLDER_LIST';
 
     // config
     const SEPARATOR = '/';
 
     // error codes
-    const ERROR_LOCKED      = 423;
     const ERROR             = 500;
-    const ERROR_UNAVAILABLE = 503;
-    const ERROR_FORBIDDEN   = 530;
+    const ERROR_LOCKED      = 423;
     const ERROR_FILE_EXISTS = 550;
     const ERROR_UNSUPPORTED = 570;
     const ERROR_NOAUTH      = 580;
@@ -51,23 +47,6 @@
     const LOCK_EXCLUSIVE = 'exclusive';
     const LOCK_INFINITE  = 'infinite';
 
-    // list filters
-    const FILTER_UNSUBSCRIBED = 1;
-    const FILTER_WRITABLE     = 2;
-
-    // folder permissions
-    const ACL_READ = 1;
-    const ACL_WRITE = 2;
-
-    // sharing interface modes
-    const SHARING_MODE_FORM   = 1;
-    const SHARING_MODE_RIGHTS = 2;
-    const SHARING_MODE_UPDATE = 3;
-
-    // search modes
-    const SEARCH_USER   = 1;
-    const SEARCH_GROUP  = 2;
-
 
     /**
      * Authenticates a user
@@ -271,41 +250,12 @@
     public function folder_move($folder_name, $new_name);
 
     /**
-     * Subscribe a folder.
-     *
-     * @param string $folder_name Name of a folder with full path
-     *
-     * @throws Exception
-     */
-    public function folder_subscribe($folder_name);
-
-    /**
-     * Unsubscribe a folder.
-     *
-     * @param string $folder_name Name of a folder with full path
-     *
-     * @throws Exception
-     */
-    public function folder_unsubscribe($folder_name);
-
-    /**
      * Returns list of folders.
      *
-     * @param array $params List parameters ('type', 'search', 'extended', 'permissions')
-     *
      * @return array List of folders
      * @throws Exception
      */
-    public function folder_list($params = array());
-
-    /**
-     * Check folder rights.
-     *
-     * @param string $folder_name Name of a folder with full path
-     *
-     * @return int Folder rights (sum of file_storage::ACL_*)
-     */
-    public function folder_rights($folder_name);
+    public function folder_list();
 
     /**
      * Returns a list of locks
@@ -358,49 +308,4 @@
      * @throws Exception
      */
     public function quota($folder);
-
-    /**
-     * Sharing interface
-     *
-     * @param string $folder_name Name of a folder with full path
-     * @param int    $mode        Sharing action mode
-     * @param array  $args        POST/GET parameters
-     *
-     * @return mixed Sharing response
-     * @throws Exception
-     */
-    public function sharing($folder, $mode, $args = array());
-
-    /**
-     * User/group search (autocompletion)
-     *
-     * @param string $search Search string
-     * @param int    $mode   Search mode
-     *
-     * @return array Users/Groups list
-     * @throws Exception
-     */
-    public function autocomplete($search, $mode);
-
-    /**
-     * Convert file/folder path into a global URI.
-     * Note: We're using self::SEPARATOR as a hierarchy delimiter
-     *
-     * @param string $path File/folder path
-     *
-     * @return string URI
-     * @throws Exception
-     */
-    public function path2uri($path);
-
-    /**
-     * Convert global URI into file/folder path.
-     * Note: We're using self::SEPARATOR as a hierarchy delimiter
-     *
-     * @param string $uri URI
-     *
-     * @return string File/folder path
-     * @throws Exception
-     */
-    public function uri2path($uri);
 }

iRony-0.4.3.tar.gz/lib/FileAPI/file_ui.php -> iRony-0.4.4.tar.gz/lib/FileAPI/file_ui.php Changed

@@ -40,11 +40,11 @@
      */
     protected $config;
 
-    protected $ajax_only    = false;
-    protected $page_title   = 'Kolab File API';
-    protected $menu         = array();
-    protected $cache        = array();
-    protected $devel_mode   = false;
+    protected $ajax_only = false;
+    protected $page_title = 'Kolab File API';
+    protected $menu = array();
+    protected $cache = array();
+    protected $devel_mode = false;
     protected $object_types = array();
 
     const API_VERSION = 2;
@@ -58,7 +58,7 @@
     public function __construct($output = null)
     {
         $rcube = rcube::get_instance();
-        register_shutdown_function(array($this, 'shutdown'));
+        $rcube->add_shutdown_function(array($this, 'shutdown'));
 
         $this->config_init();
 
@@ -355,21 +355,14 @@
     public function shutdown()
     {
         // write performance stats to logs/console
-        if ($this->config->get('devel_mode') || $this->config->get('performance_stats')) {
-            // we have to disable per_user_logging to make sure stats end up in the main console log
-            $this->config->set('per_user_logging', false);
-
-            // make sure logged numbers use unified format
-            setlocale(LC_NUMERIC, 'en_US.utf8', 'en_US.UTF-8', 'en_US', 'C');
-
-            if (function_exists('memory_get_usage')) {
-                $mem = round(memory_get_usage() / 1024 /1024, 1);
-            }
-            if (function_exists('memory_get_peak_usage')) {
-                $mem .= '/'. round(memory_get_peak_usage() / 1024 / 1024, 1);
-            }
-
-            $log = 'ui:' . $this->get_task() . ($this->action ? '/' . $this->action : '') . " [$mem]";
+        if ($this->devel_mode) {
+            if (function_exists('memory_get_peak_usage'))
+                $mem = memory_get_peak_usage();
+            else if (function_exists('memory_get_usage'))
+                $mem = memory_get_usage();
+
+            $log = 'ui:' . $this->get_task() . ($this->action ? '/' . $this->action : '');
+            $log .= ($mem ? sprintf(' [%.1f MB]', $mem/1024/1024) : '');
 
             if (defined('FILE_API_START')) {
                 rcube::print_timer(FILE_API_START, $log);

iRony-0.4.3.tar.gz/lib/FileAPI/file_ui_api.php -> iRony-0.4.4.tar.gz/lib/FileAPI/file_ui_api.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/file_ui_api_result.php -> iRony-0.4.4.tar.gz/lib/FileAPI/file_ui_api_result.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/file_utils.php -> iRony-0.4.4.tar.gz/lib/FileAPI/file_utils.php Changed

@@ -170,79 +170,20 @@
     }
 
     /**
-     * Callback for uasort() that implements correct
-     * locale-aware case-sensitive sorting
-     */
-    public static function sort_folder_comparator($p1, $p2)
-    {
-        $ext   = is_array($p1); // folder can be a string or an array with 'folder' key
-        $path1 = explode(file_storage::SEPARATOR, $ext ? $p1['folder'] : $p1);
-        $path2 = explode(file_storage::SEPARATOR, $ext ? $p2['folder'] : $p2);
-
-        foreach ($path1 as $idx => $folder1) {
-            $folder2 = $path2[$idx];
-
-            if ($folder1 === $folder2) {
-                continue;
-            }
-
-            return strcoll($folder1, $folder2);
-        }
-
-        return 0;
-    }
-
-    /**
-     * Encode folder path for use in an URI
-     *
-     * @param string $path Folder path
-     *
-     * @return string Encoded path
-     */
-    public static function encode_path($path)
-    {
-        $items = explode(file_storage::SEPARATOR, $path);
-        $items = array_map('rawurlencode', $items);
-
-        return implode(file_storage::SEPARATOR, $items);
-    }
-
-    /**
-     * Decode an URI into folder path
+     * Returns script URI
      *
-     * @param string $path Encoded folder path
-     *
-     * @return string Decoded path
+     * @return string Script URI
      */
-    public static function decode_path($path)
+    static function script_uri()
     {
-        $items = explode(file_storage::SEPARATOR, $path);
-        $items = array_map('rawurldecode', $items);
-
-        return implode(file_storage::SEPARATOR, $items);
-    }
-
-    /**
-     *
-     * @return string Date time string in specified format and timezone
-     */
-    public static function date_format($datetime, $format = 'Y-m-d H:i', $timezone = null)
-    {
-        if (!$datetime instanceof DateTime) {
-            return '';
+        if (!empty($_SERVER['SCRIPT_URI'])) {
+            return $_SERVER['SCRIPT_URI'];
         }
 
-        if ($timezone && $timezone != $datetime->getTimezone()) {
-            try {
-                $dt = clone $datetime;
-                $dt->setTimezone(new DateTimeZone($timezone));
-                $datetime = $dt;
-            }
-            catch (Exception $e) {
-                // ignore, return original timezone
-            }
-        }
+        $uri = $_SERVER['SERVER_PORT'] == 443 ? 'https://' : 'http://';
+        $uri .= $_SERVER['HTTP_HOST'];
+        $uri .= preg_replace('/\?.*$/', '', $_SERVER['REQUEST_URI']);
 
-        return $datetime->format($format);
+        return $uri;
     }
 }

iRony-0.4.3.tar.gz/lib/FileAPI/file_viewer.php -> iRony-0.4.4.tar.gz/lib/FileAPI/file_viewer.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/init.php -> iRony-0.4.4.tar.gz/lib/FileAPI/init.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/locale/en_US.php -> iRony-0.4.4.tar.gz/lib/FileAPI/locale/en_US.php Changed

@@ -41,14 +41,12 @@
 $LANG['folder.driverwithpassdesc'] = 'Stored passwords will be encrypted. Enable this if you do not want to be asked for the password on every login or you want this storage to be available via WebDAV.';
 $LANG['folder.name'] = 'Name:';
 $LANG['folder.authenticate'] = 'Logon to $title';
-$LANG['folder.parent'] = 'Subfolder of:';
 
 $LANG['form.submit'] = 'Submit';
 $LANG['form.cancel'] = 'Cancel';
 $LANG['form.hostname'] = 'Hostname:';
 $LANG['form.username'] = 'Username:';
 $LANG['form.password'] = 'Password:';
-$LANG['form.baseuri'] = 'Base URI:';
 
 $LANG['login.username'] = 'Username';
 $LANG['login.password'] = 'Password';
@@ -75,31 +73,11 @@
 $LANG['search.in_all_folders'] = 'in all folders';
 $LANG['search.in_current_folder'] = 'in current folder';
 
-$LANG['share.permissions'] = 'Permissions';
-$LANG['share.readonly'] = 'read-only';
-$LANG['share.readwrite'] = 'read-write';
-$LANG['share.admin'] = 'administrator';
-$LANG['share.usergroup'] = 'User or Group';
-$LANG['share.permission'] = 'Permission';
-$LANG['share.upload-link'] = 'Upload Link';
-$LANG['share.download-link'] = 'Download Link';
-$LANG['share.password'] = 'Password';
-$LANG['share.expire'] = 'Expiration';
-$LANG['share.expiredays'] = 'Expiration time in days';
-$LANG['share.generate'] = 'Generate';
-$LANG['share.link'] = 'Link';
-
 $LANG['size.B'] = 'B';
 $LANG['size.KB'] = 'KB';
 $LANG['size.MB'] = 'MB';
 $LANG['size.GB'] = 'GB';
 
-$LANG['type.vndoasisopendocumenttext'] = 'OpenDocument Document (.odt)';
-$LANG['type.vndoasisopendocumentpresentation'] = 'OpenDocument Presentation (.odp)';
-$LANG['type.vndoasisopendocumentspreadsheet'] = 'OpenDocument Spreadsheet (.ods)';
-$LANG['type.plain'] = 'Plain Text Document (.txt)';
-$LANG['type.html'] = 'HTML Document (.html)';
-
 $LANG['upload.size'] = 'Size:';
 $LANG['upload.size.error'] = 'Maximum upload size ($size) exceeded!';
 $LANG['upload.progress'] = 'Progress:';

iRony-0.4.3.tar.gz/lib/FileAPI/viewers/image.php -> iRony-0.4.4.tar.gz/lib/FileAPI/viewers/image.php Changed

@@ -60,7 +60,9 @@
      */
     public function href($file, $mimetype = null)
     {
-        $href = $this->api->file_url($file);
+        $href = file_utils::script_uri() . '?method=file_get'
+            . '&file=' . urlencode($file)
+            . '&token=' . urlencode(session_id());
 
         // we redirect to self only images with types unsupported
         // by browser
@@ -74,14 +76,14 @@
     /**
      * Print output and exit
      *
-     * @param string $file      File name
-     * @param array  $file_info File metadata (e.g. type)
+     * @param string $file     File name
+     * @param string $mimetype File type
      */
-    public function output($file, $file_info = array())
+    public function output($file, $mimetype = null)
     {
 /*
         // conversion not needed
-        if (preg_match('/^image/p?jpe?g$/i', $file_info['type'])) {
+        if (preg_match('/^image/p?jpe?g$/i', $mimetype)) {
             $this->api->api->file_get($file);
             return;
         }

iRony-0.4.3.tar.gz/lib/FileAPI/viewers/media.php -> iRony-0.4.4.tar.gz/lib/FileAPI/viewers/media.php Changed

@@ -67,7 +67,7 @@
      */
     public function frame($file, $mimetype = null)
     {
-        $path     = $this->api->api_url();
+        $path     = file_utils::script_uri();
         $file_uri = htmlentities($this->api->file_url($file));
         $mimetype = htmlentities($mimetype);
         $source   = "<source src=\"$file_uri\" type=\"$mimetype\"></source>";
@@ -80,21 +80,26 @@
         }
 
         return <<<EOT
-    <link rel="stylesheet" type="text/css" href="$path/viewers/media/mediaelementplayer.css" />
-    <script type="text/javascript" src="$path/viewers/media/mediaelement-and-player.js"></script>
+    <link rel="stylesheet" type="text/css" href="{$path}viewers/media/mediaelementplayer.css" />
+    <script type="text/javascript" src="{$path}viewers/media/mediaelement-and-player.js"></script>
     <$tag id="media-player" controls preload="auto">$source</$tag>
     <style>
       .mejs-container { text-align: center; }
     </style>
     <script>
-      var height = '100%';
-        width = '100%';
+      var content_frame = $('#media-player').parent(),
+        height = content_frame.height(),
+        width = content_frame.width(),
         player = new MediaElementPlayer('#media-player', {
           videoHeight: height, audioHeight: height, videoWidth: width, audioWidth: width
         });
 
       player.pause();
       player.play();
+      // add player resize handler
+      $(window).resize(function() {
+        player.setPlayerSize(content_frame.width(), content_frame.height());
+      });
     </script>
 EOT;
     }

iRony-0.4.3.tar.gz/lib/FileAPI/viewers/odf.php -> iRony-0.4.4.tar.gz/lib/FileAPI/viewers/odf.php Changed

@@ -90,6 +90,17 @@
     }
 
     /**
+     * Return output of file content area
+     *
+     * @param string $file     File name
+     * @param string $mimetype File type
+     */
+    public function frame($file, $mimetype = null)
+    {
+        // we use iframe method, see output()
+    }
+
+    /**
      * Return file viewer URL
      *
      * @param string $file     File name
@@ -97,16 +108,19 @@
      */
     public function href($file, $mimetype = null)
     {
-        return $this->api->file_url($file) . '&viewer=odf';
+        return file_utils::script_uri() . '?method=file_get'
+            . '&viewer=odf'
+            . '&file=' . urlencode($file)
+            . '&token=' . urlencode(session_id());
     }
 
     /**
      * Print output and exit
      *
-     * @param string $file      File name
-     * @param array  $file_info File metadata (e.g. type)
+     * @param string $file     File name
+     * @param string $mimetype File type
      */
-    public function output($file, $file_info = array())
+    public function output($file, $mimetype = null)
     {
         $file_uri = $this->api->file_url($file);

iRony-0.4.3.tar.gz/lib/FileAPI/viewers/pdf.php -> iRony-0.4.4.tar.gz/lib/FileAPI/viewers/pdf.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/viewers/text.php -> iRony-0.4.4.tar.gz/lib/FileAPI/viewers/text.php Changed

iRony-0.4.3.tar.gz/lib/Kolab/CalDAV/Plugin.php -> iRony-0.4.4.tar.gz/lib/Kolab/CalDAV/Plugin.php Changed

iRony-0.4.3.tar.gz/lib/Kolab/CardDAV/ContactsBackend.php -> iRony-0.4.4.tar.gz/lib/Kolab/CardDAV/ContactsBackend.php Changed

iRony-0.4.3.tar.gz/lib/Kolab/CardDAV/LDAPDirectory.php -> iRony-0.4.4.tar.gz/lib/Kolab/CardDAV/LDAPDirectory.php Changed

@@ -42,14 +42,14 @@
 {
     const DIRECTORY_NAME = 'ldap-directory';
 
-    private $config;
-    private $ldap;
-    private $carddavBackend;
-    private $principalUri;
-    private $addressBookInfo = array();
-    private $cache;
-    private $query;
-    private $filter;
+    protected $config;
+    protected $ldap;
+    protected $carddavBackend;
+    protected $principalUri;
+    protected $addressBookInfo = array();
+    protected $cache;
+    protected $query;
+    protected $filter;
 
     /**
      * Default constructor
@@ -417,6 +417,8 @@
         }
         else if (!empty($contact['changed'])) {
             try {
+                //                                      2018   05     14     06     22     31    .0Z     2018-05-14T06:22:31
+                $contact['changed'] = preg_replace('/^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})\.0Z$/', '$1-$2-$3T$4:$5:$6', $contact['changed']);
                 $contact['changed'] = new \DateTime($contact['changed']);
                 $contact['_timestamp'] = intval($contact['changed']->format('U'));
             }

iRony-0.4.3.tar.gz/lib/Kolab/CardDAV/Plugin.php -> iRony-0.4.4.tar.gz/lib/Kolab/CardDAV/Plugin.php Changed

@@ -68,16 +68,19 @@
      */
     public function propFindEarly(DAV\PropFind $propFind, DAV\INode $node)
     {
-        // publish global ldap address book for this principal
-        if ($node instanceof DAVACL\IPrincipal && empty($this->directories) && \rcube::get_instance()->config->get('kolabdav_ldap_directory')) {
-            $this->directories[] = self::ADDRESSBOOK_ROOT . '/' . $node->getName() . '/' . LDAPDirectory::DIRECTORY_NAME;
+        // publish global ldap address book and resources list for this principal
+        if ($node instanceof DAVACL\IPrincipal && empty($this->directories)) {
+            if (\rcube::get_instance()->config->get('kolabdav_ldap_directory')) {
+                $this->directories[] = self::ADDRESSBOOK_ROOT . '/' . $node->getName() . '/' . LDAPDirectory::DIRECTORY_NAME;
+            }
+            if (\rcube::get_instance()->config->get('kolabdav_ldap_resources')) {
+                $this->directories[] = self::ADDRESSBOOK_ROOT . '/' . $node->getName() . '/' . LDAPResources::DIRECTORY_NAME;
+            }
         }
 
-        if ($node instanceof DAV\SimpleCollection) {
-            $propFind->handle('{' . self::NS_CARDDAV . '}addressbook-home-set', function() {
-                return new DAV\Property\Href($this->getAddressBookHomeForPrincipal(HTTPBasic::$current_user) . '/');
-            });
-        }
+        $propFind->handle('{' . self::NS_CARDDAV . '}addressbook-home-set', function() {
+            return new DAV\Property\Href($this->getAddressBookHomeForPrincipal(HTTPBasic::$current_user) . '/');
+        });
 
         parent::propFindEarly($propFind, $node);
     }
@@ -243,7 +246,7 @@
         }
 
         // query on LDAP node: pass along filter query
-        if ($node instanceof LDAPDirectory) {
+        if ($node instanceof LDAPDirectory || $node instanceof LDAPResources) {
             $query = new CardDAV\AddressBookQueryParser($dom);
             $query->parse();

iRony-0.4.3.tar.gz/lib/Kolab/CardDAV/UserAddressBooks.php -> iRony-0.4.4.tar.gz/lib/Kolab/CardDAV/UserAddressBooks.php Changed

@@ -37,6 +37,7 @@
 {
     // pseudo-singleton instance
     private $ldap_directory;
+    private $ldap_resources;
 
     /**
      * Returns a list of addressbooks
@@ -55,6 +56,10 @@
             $objs[] = $this->getLDAPDirectory();
         }
 
+        if (rcube::get_instance()->config->get('kolabdav_ldap_resources')) {
+            $objs[] = $this->getLDAPResources();
+        }
+
         return $objs;
     }
 
@@ -69,6 +74,9 @@
         if ($name == LDAPDirectory::DIRECTORY_NAME) {
             return $this->getLDAPDirectory();
         }
+        if ($name == LDAPResources::DIRECTORY_NAME) {
+            return $this->getLDAPResources();
+        }
 
         if ($addressbook = $this->carddavBackend->getAddressBookByName($name)) {
             $addressbook['principaluri'] = $this->principalUri;
@@ -93,6 +101,21 @@
         return $this->ldap_directory;
     }
 
+    /**
+     * Getter for the singleton instance of the LDAP resources
+     */
+    private function getLDAPResources()
+    {
+        if (!$this->ldap_resources) {
+            $rcube = rcube::get_instance();
+            $config = $rcube->config->get('kolabdav_ldap_resources');
+            $config['debug'] = $rcube->config->get('ldap_debug');
+            $this->ldap_resources = new LDAPResources($config, $this->principalUri, $this->carddavBackend);
+        }
+
+        return $this->ldap_resources;
+    }
+
 
     /**
      * Returns the list of properties

iRony-0.4.3.tar.gz/lib/Roundcube/bootstrap.php -> iRony-0.4.4.tar.gz/lib/Roundcube/bootstrap.php Changed

iRony-0.4.3.tar.gz/lib/Roundcube/cache/memcached.php -> iRony-0.4.4.tar.gz/lib/Roundcube/cache/memcached.php Changed

iRony-0.4.3.tar.gz/lib/Roundcube/db/sqlsrv.php -> iRony-0.4.4.tar.gz/lib/Roundcube/db/sqlsrv.php Changed

@@ -27,6 +27,49 @@
  */
 class rcube_db_sqlsrv extends rcube_db_mssql
 {
+
+    /**
+     * Get last inserted record ID
+     *
+     * @param string $table Table name (to find the incremented sequence)
+     *
+     * @return string|false The ID or False on failure
+     */
+    public function insert_id($table = '')
+    {
+        if (!$this->db_connected || $this->db_mode == 'r') {
+            return false;
+        }
+
+        if ($table) {
+            // For some unknown reason the constant described in the driver docs
+            // might not exist, we'll fallback to PDO::ATTR_CLIENT_VERSION (#7564)
+            if (defined('PDO::ATTR_DRIVER_VERSION')) {
+                $driver_version = $this->dbh->getAttribute(PDO::ATTR_DRIVER_VERSION);
+            }
+            else if (defined('PDO::ATTR_CLIENT_VERSION')) {
+                $client_version = $this->dbh->getAttribute(PDO::ATTR_CLIENT_VERSION);
+                $driver_version = $client_version['ExtensionVer'];
+            }
+            else {
+                $driver_version = 5;
+            }
+
+            // Starting from version 5 of the driver lastInsertId() method expects
+            // a sequence name instead of a table name. We'll unset the argument
+            // to get the last insert sequence (#7564)
+            if (version_compare($driver_version, '5', '>=')) {
+                $table = null;
+            }
+            else {
+                // resolve table name
+                $table = $this->table_name($table);
+            }
+        }
+
+        return $this->dbh->lastInsertId($table);
+    }
+
     /**
      * Returns PDO DSN string from DSN array
      */

iRony-0.4.3.tar.gz/lib/Roundcube/rcube.php -> iRony-0.4.4.tar.gz/lib/Roundcube/rcube.php Changed

@@ -1124,6 +1124,19 @@
     }
 
     /**
+     * Quote a given string, remove new-line characters, use strict mode.
+     * Shortcut function for rcube_utils::rep_specialchars_output()
+     *
+     * @param string $str A string to quote
+     *
+     * @return string HTML-quoted string
+     */
+    public static function SQ($str)
+    {
+        return rcube_utils::rep_specialchars_output($str, 'html', 'strict', false);
+    }
+
+    /**
      * Construct shell command, execute it and return output as string.
      * Keywords {keyword} are replaced with arguments
      *
@@ -1253,7 +1266,7 @@
         // write message with file name when configured to log to STDOUT
         if ($log_driver == 'stdout') {
             $stdout = "php://stdout";
-            $line = "$name: $line";
+            $line = "$name: $line\n";
             return file_put_contents($stdout, $line, FILE_APPEND) !== false;
         }
 
@@ -1607,8 +1620,8 @@
      * @param string       $from        Sender address string
      * @param array|string $mailto      Either a comma-separated list of recipients (RFC822 compliant),
      *                                  or an array of recipients, each RFC822 valid
-     * @param array        &$error      SMTP error array (reference)
-     * @param string       &$body_file  Location of file with saved message body (reference),
+     * @param array|string &$error      SMTP error array or (deprecated) string
+     * @param string       &$body_file  Location of file with saved message body,
      *                                  used when delay_file_io is enabled
      * @param array        $options     SMTP options (e.g. DSN request)
      * @param bool         $disconnect  Close SMTP connection ASAP

iRony-0.4.3.tar.gz/lib/Roundcube/rcube_config.php -> iRony-0.4.4.tar.gz/lib/Roundcube/rcube_config.php Changed

@@ -27,6 +27,8 @@
 {
     const DEFAULT_SKIN = 'elastic';
 
+    public $system_skin = 'elastic';
+
     private $env       = '';
     private $paths     = array();
     private $prop      = array();
@@ -231,6 +233,8 @@
             $this->prop['skin'] = self::DEFAULT_SKIN;
         }
 
+        $this->system_skin = $this->prop['skin'];
+
         // fix paths
         foreach (array('log_dir' => 'logs', 'temp_dir' => 'temp') as $key => $dir) {
             foreach (array($this->prop[$key], '../' . $this->prop[$key], RCUBE_INSTALL_PATH . $dir) as $path) {
@@ -391,7 +395,7 @@
         }
         else if ($name == 'client_mimetypes') {
             if (!$result && !$def) {
-                $result = 'text/plain,text/html,text/xml'
+                $result = 'text/plain,text/html'
                     . ',image/jpeg,image/gif,image/png,image/bmp,image/tiff,image/webp'
                     . ',application/x-javascript,application/pdf,application/x-shockwave-flash';
             }
@@ -452,7 +456,7 @@
         }
 
         if ($prefs['skin'] == 'default') {
-            $prefs['skin'] = self::DEFAULT_SKIN;
+            $prefs['skin'] = $this->system_skin;
         }
 
         $skins_allowed = $this->get('skins_allowed');
@@ -592,7 +596,7 @@
         $list = (array) $this->prop['keyservers'];
 
         foreach ($list as $idx => $host) {
-            if (!preg_match('|^[a-z]://|', $host)) {
+            if (!preg_match('|^[a-z]+://|', $host)) {
                 $host = "https://$host";
             }

iRony-0.4.3.tar.gz/lib/Roundcube/rcube_db.php -> iRony-0.4.4.tar.gz/lib/Roundcube/rcube_db.php Changed

iRony-0.4.3.tar.gz/lib/Roundcube/rcube_image.php -> iRony-0.4.4.tar.gz/lib/Roundcube/rcube_image.php Changed

@@ -99,7 +99,7 @@
     {
         $result  = false;
         $rcube   = rcube::get_instance();
-        $convert = $rcube->config->get('im_convert_path', false);
+        $convert = self::getCommand('im_convert_path');
         $props   = $this->props();
 
         if (empty($props)) {
@@ -158,7 +158,8 @@
                             'size'    => $width . 'x' . $height,
                         );
 
-                        $result = rcube::exec($convert . ' 2>&1 -flatten -auto-orient -colorspace sRGB -strip'
+                        $result = rcube::exec($convert
+                            . ' 2>&1 -flatten -auto-orient -colorspace sRGB -strip'
                             . ' -quality {quality} -resize {size} {intype}:{in} {type}:{out}', $p);
                     }
                     // use PHP's Imagick class
@@ -306,7 +307,7 @@
     public function convert($type, $filename = null)
     {
         $rcube   = rcube::get_instance();
-        $convert = $rcube->config->get('im_convert_path', false);
+        $convert = self::getCommand('im_convert_path');
 
         if (!$filename) {
             $filename = $this->image_file;
@@ -406,7 +407,7 @@
         $rcube = rcube::get_instance();
 
         // @TODO: check if specified mimetype is really supported
-        return class_exists('Imagick', false) || $rcube->config->get('im_convert_path');
+        return class_exists('Imagick', false) || self::getCommand('im_convert_path');
     }
 
     /**
@@ -417,9 +418,9 @@
         $rcube = rcube::get_instance();
 
         // use ImageMagick in command line
-        if ($cmd = $rcube->config->get('im_identify_path')) {
+        if ($cmd = self::getCommand('im_identify_path')) {
             $args = array('in' => $this->image_file, 'format' => "%m %[fx:w] %[fx:h]");
-            $id   = rcube::exec($cmd. ' 2>/dev/null -format {format} {in}', $args);
+            $id   = rcube::exec($cmd . ' 2>/dev/null -format {format} {in}', $args);
 
             if ($id) {
                 return explode(' ', strtolower($id));
@@ -462,4 +463,39 @@
         $size = $props['width'] * $props['height'] * $multip;
         return rcube_utils::mem_check($size);
     }
+
+    /**
+     * Get the configured command and make sure it is safe to use.
+     * We cannot trust configuration, and escapeshellcmd() is useless.
+     *
+     * @param string $opt_name Configuration option name
+     *
+     * @return bool|string The command or False if not set or invalid
+     */
+    private static function getCommand($opt_name)
+    {
+        static $error = [];
+
+        $cmd = rcube::get_instance()->config->get($opt_name);
+
+        if (empty($cmd)) {
+            return false;
+        }
+
+        if (preg_match('/^(convert|identify)(\.exe)?$/i', $cmd)) {
+            return $cmd;
+        }
+
+        // Executable must exist, also disallow network shares on Windows
+        if ($cmd[0] != "\\" && file_exists($cmd)) {
+            return $cmd;
+        }
+
+        if (empty($error[$opt_name])) {
+            rcube::raise_error("Invalid $opt_name: $cmd", true, false);
+            $error[$opt_name] = true;
+        }
+
+        return false;
+    }
 }

iRony-0.4.3.tar.gz/lib/Roundcube/rcube_imap.php -> iRony-0.4.4.tar.gz/lib/Roundcube/rcube_imap.php Changed

@@ -1040,32 +1040,28 @@
     }
 
     /**
-     * protected method for listing a set of message headers (search results)
+     * A protected method for listing a set of message headers (search results)
      *
-     * @param   string   $folder   Folder name
-     * @param   int      $page     Current page to list
-     * @param   int      $slice    Number of slice items to extract from result array
+     * @param string $folder Folder name
+     * @param int    $page   Current page to list
+     * @param int    $slice  Number of slice items to extract from the result array
      *
      * @return array Indexed array with message header objects
      */
-    protected function list_search_messages($folder, $page, $slice=0)
+    protected function list_search_messages($folder, $page, $slice = 0)
     {
         if (!strlen($folder) || empty($this->search_set) || $this->search_set->is_empty()) {
             return array();
         }
 
+        $from = ($page-1) * $this->page_size;
+
         // gather messages from a multi-folder search
         if ($this->search_set->multi) {
             $page_size  = $this->page_size;
             $sort_field = $this->sort_field;
             $search_set = $this->search_set;
 
-            // prepare paging
-            $cnt   = $search_set->count();
-            $from  = ($page-1) * $page_size;
-            $to    = $from + $page_size;
-            $slice_length = min($page_size, $cnt - $from);
-
             // fetch resultset headers, sort and slice them
             if (!empty($sort_field) && $search_set->get_parameters('SORT') != $sort_field) {
                 $this->sort_field = null;
@@ -1093,7 +1089,7 @@
                 $search_set->set_message_index($a_msg_headers, $sort_field, $this->sort_order);
 
                 // only return the requested part of the set
-                $a_msg_headers = array_slice(array_values($a_msg_headers), $from, $slice_length);
+                $a_msg_headers = array_slice(array_values($a_msg_headers), $from, $page_size);
             }
             else {
                 if ($this->sort_order != $search_set->get_parameters('ORDER')) {
@@ -1101,7 +1097,7 @@
                 }
 
                 // slice resultset first...
-                $index = array_slice($search_set->get(), $from, $slice_length);
+                $index = array_slice($search_set->get(), $from, $page_size);
                 $fetch = array();
 
                 foreach ($index as $msg_id) {
@@ -1144,8 +1140,6 @@
         }
 
         $index = clone $this->search_set;
-        $from  = ($page-1) * $this->page_size;
-        $to    = $from + $this->page_size;
 
         // return empty array if no messages found
         if ($index->is_empty()) {
@@ -1178,7 +1172,7 @@
             }
 
             // get messages uids for one page
-            $index->slice($from, $to-$from);
+            $index->slice($from, $this->page_size);
 
             if ($slice) {
                 $index->slice(-$slice, $slice);
@@ -1199,7 +1193,7 @@
             // use memory less expensive (and quick) method for big result set
             $index = clone $this->index('', $this->sort_field, $this->sort_order);
             // get messages uids for one page...
-            $index->slice($from, min($cnt-$from, $this->page_size));
+            $index->slice($from, $this->page_size);
 
             if ($slice) {
                 $index->slice(-$slice, $slice);
@@ -1225,9 +1219,7 @@
             $a_msg_headers = rcube_imap_generic::sortHeaders(
                 $a_msg_headers, $this->sort_field, $this->sort_order);
 
-            // only return the requested part of the set
-            $slice_length  = min($this->page_size, $cnt - ($to > $cnt ? $from : $to));
-            $a_msg_headers = array_slice(array_values($a_msg_headers), $from, $slice_length);
+            $a_msg_headers = array_slice(array_values($a_msg_headers), $from, $this->page_size);
 
             if ($slice) {
                 $a_msg_headers = array_slice($a_msg_headers, -$slice, $slice);
@@ -1900,8 +1892,11 @@
         }
 
         // Check internal cache
-        if (!empty($this->icache['message'])) {
-            if (($headers = $this->icache['message']) && $headers->uid == $uid) {
+        if (!empty($this->icache['message']) && ($headers = $this->icache['message'])) {
+            // Make sure the folder and UID is what we expect.
+            // In case when the same process works with folders that are personal
+            // and shared two folders can contain the same UIDs.
+            if ($headers->uid == $uid && $headers->folder == $folder) {
                 return $headers;
             }
         }
@@ -3293,6 +3288,12 @@
 
         $result = $this->conn->createFolder($folder, $type ? array("\\" . ucfirst($type)) : null);
 
+        // Folder creation may fail when specific special-use flag is not supported.
+        // Try to create it anyway with no flag specified (#7147)
+        if (!$result && $type) {
+            $result = $this->conn->createFolder($folder);
+        }
+
         // try to subscribe it
         if ($result) {
             // clear cache
@@ -3443,7 +3444,10 @@
         $folders = $this->conn->listMailboxes('', '*', array('SUBSCRIBED'), array('SPECIAL-USE'));
 
         if (!empty($folders)) {
-            foreach ($folders as $folder) {
+            foreach ($folders as $idx => $folder) {
+                if (is_array($folder)) {
+                    $folder = $idx;
+                }
                 if ($flags = $this->conn->data['LIST'][$folder]) {
                     foreach ($types as $type) {
                         if (in_array($type, $flags)) {
@@ -4381,10 +4385,17 @@
      */
     protected function sort_folder_specials($folder, &$list, &$specials, &$out)
     {
-        foreach ($list as $key => $name) {
+        $count = count($list);
+
+        for ($i = 0; $i < $count; $i++) {
+            $name = $list[$i];
+            if ($name === null) {
+                continue;
+            }
+
             if ($folder === null || strpos($name, $folder.$this->delimiter) === 0) {
                 $out[] = $name;
-                unset($list[$key]);
+                $list[$i] = null;
 
                 if (!empty($specials) && ($found = array_search($name, $specials)) !== false) {
                     unset($specials[$found]);
@@ -4392,8 +4403,6 @@
                 }
             }
         }
-
-        reset($list);
     }
 
     /**

iRony-0.4.3.tar.gz/lib/Roundcube/rcube_imap_generic.php -> iRony-0.4.4.tar.gz/lib/Roundcube/rcube_imap_generic.php Changed

@@ -221,6 +221,38 @@
     }
 
     /**
+     * Reads a line of data from the connection stream inluding all
+     * string continuation literals.
+     *
+     * @param int $size Buffer size
+     *
+     * @return string Line of text response
+     */
+    protected function readFullLine($size = 1024)
+    {
+        $line = $this->readLine($size);
+
+        // include all string literels untile the real end of "line"
+        while (preg_match('/\{([0-9]+)\}\r\n$/', $line, $m)) {
+            $bytes = $m[1];
+            $out   = '';
+
+            while (strlen($out) < $bytes) {
+                $out = $this->readBytes($bytes);
+                if ($out === null) {
+                    break;
+                }
+
+                $line .= $out;
+            }
+
+            $line .= $this->readLine($size);
+        }
+
+        return $line;
+    }
+
+    /**
      * Reads more data from the connection stream when provided
      * data contain string literal
      *
@@ -1459,7 +1491,7 @@
      * @param array  $return_opts (see self::_listMailboxes)
      * @param array  $select_opts (see self::_listMailboxes)
      *
-     * @return array|bool List of mailboxes or hash of options if STATUS/MYROGHTS response
+     * @return array|bool List of mailboxes or hash of options if STATUS/MYRIGHTS response
      *                    is requested, False on error.
      */
     public function listMailboxes($ref, $mailbox, $return_opts = array(), $select_opts = array())
@@ -1474,7 +1506,7 @@
      * @param string $mailbox     Mailbox name
      * @param array  $return_opts (see self::_listMailboxes)
      *
-     * @return array|bool List of mailboxes or hash of options if STATUS/MYROGHTS response
+     * @return array|bool List of mailboxes or hash of options if STATUS/MYRIGHTS response
      *                    is requested, False on error.
      */
     public function listSubscribed($ref, $mailbox, $return_opts = array())
@@ -1495,11 +1527,11 @@
      *                            Possible: SUBSCRIBED, RECURSIVEMATCH, REMOTE,
      *                                      SPECIAL-USE (RFC6154)
      *
-     * @return array|bool List of mailboxes or hash of options if STATUS/MYROGHTS response
+     * @return array|bool List of mailboxes or hash of options if STATUS/MYRIGHTS response
      *                    is requested, False on error.
      */
-    protected function _listMailboxes($ref, $mailbox, $subscribed=false,
-        $return_opts=array(), $select_opts=array())
+    protected function _listMailboxes($ref, $mailbox, $subscribed = false,
+        $return_opts = array(), $select_opts = array())
     {
         if (!strlen($mailbox)) {
             $mailbox = '*';
@@ -1710,7 +1742,7 @@
      *
      * @param array $items Client identification information key/value hash
      *
-     * @return array Server identification information key/value hash
+     * @return array|false Server identification information key/value hash, False on error
      * @since 0.6
      */
     public function id($items = array())
@@ -1729,10 +1761,12 @@
         if ($code == self::ERROR_OK && $response) {
             $response = substr($response, 5); // remove prefix "* ID "
             $items    = $this->tokenizeResponse($response, 1);
-            $result   = null;
+            $result   = array();
 
-            for ($i=0, $len=count($items); $i<$len; $i += 2) {
-                $result[$items[$i]] = $items[$i+1];
+            if (is_array($items)) {
+                for ($i=0, $len=count($items); $i<$len; $i += 2) {
+                    $result[$items[$i]] = $items[$i+1];
+                }
             }
 
             return $result;
@@ -2397,7 +2431,7 @@
         }
 
         do {
-            $line = $this->readLine(4096);
+            $line = $this->readFullLine(4096);
 
             if (!$line) {
                 break;
@@ -2421,27 +2455,6 @@
                 $line    = substr($line, strlen($m[0]) + 2);
                 $ln      = 0;
 
-                // get complete entry
-                while (preg_match('/\{([0-9]+)\}\r\n$/', $line, $m)) {
-                    $bytes = $m[1];
-                    $out   = '';
-
-                    while (strlen($out) < $bytes) {
-                        $out = $this->readBytes($bytes);
-                        if ($out === null) {
-                            break;
-                        }
-                        $line .= $out;
-                    }
-
-                    $str = $this->readLine(4096);
-                    if ($str === false) {
-                        break;
-                    }
-
-                    $line .= $str;
-                }
-
                 // Tokenize response and assign to object properties
                 while (list($name, $value) = $this->tokenizeResponse($line, 2)) {
                     if ($name == 'UID') {
@@ -3721,10 +3734,9 @@
 
         // Parse response
         do {
-            $line = $this->readLine(4096);
+            $line = $this->readFullLine(4096);
 
             if ($response !== null) {
-                // TODO: Better string literals handling with filter
                 if (!$filter || preg_match($filter, $line)) {
                     $response .= $line;
                 }

iRony-0.4.3.tar.gz/lib/Roundcube/rcube_message.php -> iRony-0.4.4.tar.gz/lib/Roundcube/rcube_message.php Changed

@@ -124,7 +124,7 @@
         }
 
         $this->mime    = new rcube_mime($this->headers->charset);
-        $this->subject = $this->headers->get('subject');
+        $this->subject = str_replace("\n", '', $this->headers->get('subject'));
         $from          = $this->mime->decode_address_list($this->headers->from, 1);
         $this->sender  = current($from);
 
@@ -525,7 +525,7 @@
     public function is_attachment($part)
     {
         foreach ($this->attachments as $att_part) {
-            if ($att_part->mime_id == $part->mime_id) {
+            if ($att_part->mime_id === $part->mime_id) {
                 return true;
             }
 
@@ -580,7 +580,7 @@
                 list($headers, ) = explode("\r\n\r\n", $this->get_part_body($structure->mime_id, false, 32768));
                 $structure->headers = rcube_mime::parse_headers($headers);
 
-                if ($this->context == $structure->mime_id) {
+                if ($this->context === $structure->mime_id) {
                     $this->headers = rcube_message_header::from_array($structure->headers);
                 }
             }
@@ -878,6 +878,13 @@
 
                     $this->add_part($mail_part, 'attachment');
                 }
+                // Last resort, non-inline and non-text part of multipart/mixed message (#7117)
+                else if ($mimetype == 'multipart/mixed'
+                    && $mail_part->disposition != 'inline'
+                    && $primary_type && $primary_type != 'text' && $primary_type != 'multipart'
+                ) {
+                    $this->add_part($mail_part, 'attachment');
+                }
             }
 
             // if this is a related part try to resolve references

iRony-0.4.3.tar.gz/lib/Roundcube/rcube_plugin_api.php -> iRony-0.4.4.tar.gz/lib/Roundcube/rcube_plugin_api.php Changed

@@ -164,6 +164,14 @@
             $plugins_dir = unslashify($dir->path);
         }
 
+        // Validate the plugin name to prevent from path traversal
+        if (preg_match('/[^a-zA-Z0-9_-]/', $plugin_name)) {
+            rcube::raise_error(array('code' => 520,
+                    'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Invalid plugin name: $plugin_name"), true, false);
+            return false;
+        }
+
         // plugin already loaded?
         if (!$this->plugins[$plugin_name]) {
             $fn = "$plugins_dir/$plugin_name/$plugin_name.php";
@@ -237,7 +245,7 @@
 
     /**
      * Get information about a specific plugin.
-     * This is either provided my a plugin's info() method or extracted from a package.xml or a composer.json file
+     * This is either provided by a plugin's info() method or extracted from a package.xml or a composer.json file
      *
      * @param string Plugin name
      * @return array Meta information about a plugin or False if plugin was not found
@@ -283,6 +291,14 @@
         $fn   = unslashify($dir->path) . "/$plugin_name/$plugin_name.php";
         $info = false;
 
+        // Validate the plugin name to prevent from path traversal
+        if (preg_match('/[^a-zA-Z0-9_-]/', $plugin_name)) {
+            rcube::raise_error(array('code' => 520,
+                    'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Invalid plugin name: $plugin_name"), true, false);
+            return false;
+        }
+
         if (!class_exists($plugin_name, false)) {
             if (is_readable($fn)) {
                 include($fn);
@@ -300,17 +316,29 @@
         if (!$info) {
             $composer = INSTALL_PATH . "/plugins/$plugin_name/composer.json";
             if (is_readable($composer) && ($json = @json_decode(file_get_contents($composer), true))) {
+                // Build list of plugins required
+                $require = array();
+                foreach (array_keys((array) $json['require']) as $dname) {
+                    if (!preg_match('|^([^/]+)/([a-zA-Z0-9_-]+)$|', $dname, $m)) {
+                        continue;
+                    }
+
+                    $vendor = $m[1];
+                    $name = $m[2];
+
+                    if ($name != 'plugin-installer' && $vendor != 'pear' && $vendor != 'pear-pear') {
+                        $dpath = unslashify($dir->path) . "/$name/$name.php";
+                        if (is_readable($dpath)) {
+                            $require[] = $name;
+                        }
+                    }
+                }
+
                 list($info['vendor'], $info['name']) = explode('/', $json['name']);
                 $info['version'] = $json['version'];
                 $info['license'] = $json['license'];
                 $info['uri']     = $json['homepage'];
-                $info['require'] = array_filter(array_keys((array)$json['require']), function($pname) {
-                    if (strpos($pname, '/') == false) {
-                        return false;
-                    }
-                    list($vendor, $name) = explode('/', $pname);
-                    return !($name == 'plugin-installer' || $vendor == 'pear-pear');
-                });
+                $info['require'] = $require;
             }
 
             // read local composer.lock file (once)

iRony-0.4.3.tar.gz/lib/Roundcube/rcube_string_replacer.php -> iRony-0.4.4.tar.gz/lib/Roundcube/rcube_string_replacer.php Changed

iRony-0.4.3.tar.gz/lib/Roundcube/rcube_utils.php -> iRony-0.4.4.tar.gz/lib/Roundcube/rcube_utils.php Changed

iRony-0.4.3.tar.gz/lib/Roundcube/rcube_vcard.php -> iRony-0.4.4.tar.gz/lib/Roundcube/rcube_vcard.php Changed

iRony-0.4.3.tar.gz/lib/Roundcube/rcube_washtml.php -> iRony-0.4.4.tar.gz/lib/Roundcube/rcube_washtml.php Changed

@@ -330,11 +330,7 @@
                     $out = $this->wash_uri($value, true);
                 }
                 else if ($this->is_link_attribute($node->nodeName, $key)) {
-                    if (!preg_match('!^(javascript|vbscript|data:)!i', $value)
-                        && preg_match('!^([a-z][a-z0-9.+-]+:|//|#).+!i', $value)
-                    ) {
-                        $out = $value;
-                    }
+                    $out = $this->wash_link($value);
                 }
                 else if ($this->is_funciri_attribute($node->nodeName, $key)) {
                     if (preg_match('/^[a-z:]*url\(/i', $val)) {
@@ -399,6 +395,10 @@
 
         // allow url(#id) used in SVG
         if ($uri[0] == '#') {
+            if ($this->_css_prefix !== null) {
+                $uri = '#' . $this->_css_prefix . substr($uri, 1);
+            }
+
             return $uri;
         }
 
@@ -412,12 +412,59 @@
                 return $this->config['blocked_src'];
             }
         }
-        else if ($is_image && preg_match('/^data:image.+/i', $uri)) { // RFC2397
+        else if ($is_image && preg_match('/^data:image\/([^,]+),(.+)$/i', $uri, $matches)) { // RFC2397
+            // svg images can be insecure, we'll sanitize them
+            if (stripos($matches[1], 'svg') !== false) {
+                $svg = $matches[2];
+
+                if (stripos($matches[1], ';base64') !== false) {
+                    $svg  = base64_decode($svg);
+                    $type = $matches[1];
+                }
+                else {
+                    $type = $matches[1] . ';base64';
+                }
+
+                $washer = new self($this->config);
+                $svg    = $washer->wash($svg);
+
+                // Invalid svg content
+                if (empty($svg)) {
+                    return null;
+                }
+
+                return 'data:image/' . $type . ',' . base64_encode($svg);
+            }
+
             return $uri;
         }
     }
 
     /**
+     * Wash Href value
+     *
+     * @param string $href Href attribute value (link)
+     *
+     * @return string Washed href
+     */
+    private function wash_link($href)
+    {
+        if (strlen($href) && !preg_match('!^(javascript|vbscript|data:)!i', $href)) {
+            if ($href[0] == '#' && $this->_css_prefix !== null) {
+                return '#' . $this->_css_prefix . substr($href, 1);
+            }
+
+            if (preg_match('!^[a-zA-Z._-]+$!', $href)) {
+                return 'http://' . $href;
+            }
+
+            if (preg_match('!^([a-z][a-z0-9.+-]+:|//|#).+!i', $href)) {
+                return $href;
+            }
+        }
+    }
+
+    /**
      * Check it the tag/attribute may contain an URI
      *
      * @param string $tag  Element name
@@ -427,7 +474,7 @@
      */
     private function is_link_attribute($tag, $attr)
     {
-        return ($tag == 'a' || $tag == 'area') && $attr == 'href';
+        return $attr === 'href';
     }
 
     /**
@@ -444,6 +491,7 @@
             || $attr == 'color-profile' // SVG
             || ($attr == 'poster' && $tag == 'video')
             || ($attr == 'src' && preg_match('/^(img|image|source|input|video|audio)$/i', $tag))
+            || ($tag == 'use' && $attr == 'href') // SVG
             || ($tag == 'image' && $attr == 'href'); // SVG
     }
 
@@ -462,6 +510,31 @@
     }
 
     /**
+     * Check if a specified element has an attribute with specified value.
+     * Do it in case-insensitive manner.
+     *
+     * @param DOMElement $node       The element
+     * @param string     $attr_name  The attribute name
+     * @param string     $attr_value The attribute value to find
+     *
+     * @return bool True if the specified attribute exists and has the expected value
+     */
+    private static function attribute_value($node, $attr_name, $attr_value)
+    {
+        $attr_name = strtolower($attr_name);
+
+        foreach ($node->attributes as $name => $attr) {
+            if (strtolower($name) === $attr_name) {
+                if (strtolower($attr_value) === strtolower($attr->nodeValue)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
      * The main loop that recurse on a node tree.
      * It output only allowed tags with allowed attributes and allowed inline styles
      *
@@ -508,6 +581,13 @@
 
                     $node->setAttribute('href', (string) $uri);
                 }
+                else if (in_array($tagName, array('animate', 'animatecolor', 'set', 'animatetransform'))
+                    && self::attribute_value($node, 'attributename', 'href')
+                ) {
+                    // Insecure svg tags
+                    $dump .= "";
+                    break;
+                }
 
                 if ($callback = $this->handlers[$tagName]) {
                     $dump .= call_user_func($callback, $tagName,
@@ -521,7 +601,10 @@
                         $xpath = new DOMXPath($node->ownerDocument);
                         foreach ($xpath->query('namespace::*') as $ns) {
                             if ($ns->nodeName != 'xmlns:xml') {
-                                $dump .= ' ' . $ns->nodeName . '="' . $ns->nodeValue . '"';
+                                $dump .= sprintf(' %s="%s"',
+                                    $ns->nodeName,
+                                    htmlspecialchars($ns->nodeValue, ENT_QUOTES, $this->config['charset'])
+                                );
                             }
                         }
                     }
@@ -548,9 +631,6 @@
                 break;
 
             case XML_CDATA_SECTION_NODE:
-                $dump .= $node->nodeValue;
-                break;
-
             case XML_TEXT_NODE:
                 $dump .= htmlspecialchars($node->nodeValue, ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE, $this->config['charset']);
                 break;
@@ -591,11 +671,15 @@
         $this->max_nesting_level = (int) @ini_get('xdebug.max_nesting_level');
 
         // SVG need to be parsed as XML
-        $this->is_xml = stripos($html, '<html') === false && stripos($html, '<svg') !== false;
+        $this->is_xml = !preg_match('/<(html|head|body)/i', $html) && stripos($html, '<svg') !== false;
         $method       = $this->is_xml ? 'loadXML' : 'loadHTML';
 
         // DOMDocument does not support HTML5, try Masterminds parser if available
-        if (!$this->is_xml && class_exists('Masterminds\HTML5')) {
+        if (!$this->is_xml && class_exists('Masterminds\HTML5')
+            // HTML5 parser is slow with content that contains a lot of tags
+            // disable it for such cases (https://github.com/Masterminds/html5-php/issues/181)
+            && substr_count($html, '<') < 10000
+        ) {
             try {
                 $html5 = new Masterminds\HTML5();
                 $node  = $html5->loadHTML($this->fix_html5($html));
@@ -650,7 +734,8 @@
             // washtml/DOMDocument cannot handle xml namespaces
             '/<html\s[^>]+>/i',
             // washtml/DOMDocument cannot handle xml namespaces
-            '/<\?xml:namespace\s[^>]+>/i',
+            // HTML5 parser cannot handler <?xml
+            '/<\?xml[^>]*>/i',
         );
 
         $html_replace = array(

iRony-0.4.3.tar.gz/lib/plugins/calendar/calendar.php -> iRony-0.4.4.tar.gz/lib/plugins/calendar/calendar.php Changed

@@ -1313,20 +1313,11 @@
    */
   function load_events()
   {
-    $start  = rcube_utils::get_input_value('start', rcube_utils::INPUT_GET);
-    $end    = rcube_utils::get_input_value('end', rcube_utils::INPUT_GET);
+    $start  = $this->input_timestamp('start', rcube_utils::INPUT_GET);
+    $end    = $this->input_timestamp('end', rcube_utils::INPUT_GET);
     $query  = rcube_utils::get_input_value('q', rcube_utils::INPUT_GET);
     $source = rcube_utils::get_input_value('source', rcube_utils::INPUT_GET);
 
-    if (!is_numeric($start) || strpos($start, 'T')) {
-      $start = new DateTime($start, $this->timezone);
-      $start = $start->getTimestamp();
-    }
-    if (!is_numeric($end) || strpos($end, 'T')) {
-      $end = new DateTime($end, $this->timezone);
-      $end = $end->getTimestamp();
-    }
-
     $events = $this->driver->load_events($start, $end, $query, $source);
     echo $this->encode($events, !empty($query));
     exit;
@@ -2282,31 +2273,21 @@
   public function freebusy_status()
   {
     $email = rcube_utils::get_input_value('email', rcube_utils::INPUT_GPC);
-    $start = rcube_utils::get_input_value('start', rcube_utils::INPUT_GPC);
-    $end   = rcube_utils::get_input_value('end', rcube_utils::INPUT_GPC);
+    $start = $this->input_timestamp('start', rcube_utils::INPUT_GPC);
+    $end   = $this->input_timestamp('end', rcube_utils::INPUT_GPC);
 
-    // convert dates into unix timestamps
-    if (!empty($start) && !is_numeric($start)) {
-      $dts = new DateTime($start, $this->timezone);
-      $start = $dts->format('U');
-    }
-    if (!empty($end) && !is_numeric($end)) {
-      $dte = new DateTime($end, $this->timezone);
-      $end = $dte->format('U');
-    }
-    
     if (!$start) $start = time();
     if (!$end) $end = $start + 3600;
-    
+
     $fbtypemap = array(calendar::FREEBUSY_UNKNOWN => 'UNKNOWN', calendar::FREEBUSY_FREE => 'FREE', calendar::FREEBUSY_BUSY => 'BUSY', calendar::FREEBUSY_TENTATIVE => 'TENTATIVE', calendar::FREEBUSY_OOF => 'OUT-OF-OFFICE');
     $status = 'UNKNOWN';
-    
+
     // if the backend has free-busy information
     $fblist = $this->driver->get_freebusy_list($email, $start, $end);
 
     if (is_array($fblist)) {
       $status = 'FREE';
-      
+
       foreach ($fblist as $slot) {
         list($from, $to, $type) = $slot;
         if ($from < $end && $to > $start) {
@@ -2315,14 +2296,14 @@
         }
       }
     }
-    
+
     // let this information be cached for 5min
     $this->rc->output->future_expire_header(300);
-    
+
     echo $status;
     exit;
   }
-  
+
   /**
    * Return a list of free/busy time slots within the given period
    * Echo data in JSON encoding
@@ -2330,25 +2311,15 @@
   public function freebusy_times()
   {
     $email = rcube_utils::get_input_value('email', rcube_utils::INPUT_GPC);
-    $start = rcube_utils::get_input_value('start', rcube_utils::INPUT_GPC);
-    $end   = rcube_utils::get_input_value('end', rcube_utils::INPUT_GPC);
+    $start = $this->input_timestamp('start', rcube_utils::INPUT_GPC);
+    $end   = $this->input_timestamp('end', rcube_utils::INPUT_GPC);
     $interval  = intval(rcube_utils::get_input_value('interval', rcube_utils::INPUT_GPC));
     $strformat = $interval > 60 ? 'Ymd' : 'YmdHis';
 
-    // convert dates into unix timestamps
-    if (!empty($start) && !is_numeric($start)) {
-      $dts = rcube_utils::anytodatetime($start, $this->timezone);
-      $start = $dts ? $dts->format('U') : null;
-    }
-    if (!empty($end) && !is_numeric($end)) {
-      $dte = rcube_utils::anytodatetime($end, $this->timezone);
-      $end = $dte ? $dte->format('U') : null;
-    }
-
     if (!$start) $start = time();
     if (!$end)   $end = $start + 86400 * 30;
     if (!$interval) $interval = 60;  // 1 hour
-    
+
     if (!$dte) {
       $dts = new DateTime('@'.$start);
       $dts->setTimezone($this->timezone);
@@ -2399,13 +2370,13 @@
       $slots .= $status;
       $t = $t_end;
     }
-    
+
     $dte = new DateTime('@'.$t_end);
     $dte->setTimezone($this->timezone);
-    
+
     // let this information be cached for 5min
     $this->rc->output->future_expire_header(300);
-    
+
     echo rcube_output::json_serialize(array(
       'email' => $email,
       'start' => $dts->format('c'),
@@ -2599,10 +2570,11 @@
     $events = array();
 
     if ($directory = $this->resources_directory()) {
-      $events = $directory->get_resource_calendar(
-        rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC),
-        rcube_utils::get_input_value('start', rcube_utils::INPUT_GET),
-        rcube_utils::get_input_value('end', rcube_utils::INPUT_GET));
+      $id    = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
+      $start = $this->input_timestamp('start', rcube_utils::INPUT_GET);
+      $end   = $this->input_timestamp('end', rcube_utils::INPUT_GET);
+
+      $events = $directory->get_resource_calendar($id, $start, $end);
     }
 
     echo $this->encode($events);
@@ -3588,6 +3560,21 @@
   }
 
   /**
+   * Get date-time input from UI and convert to unix timestamp
+   */
+  protected function input_timestamp($name, $type)
+  {
+    $ts = rcube_utils::get_input_value($name, $type);
+
+    if ($ts && (!is_numeric($ts) || strpos($ts, 'T'))) {
+      $ts = new DateTime($ts, $this->timezone);
+      $ts = $ts->getTimestamp();
+    }
+
+    return $ts;
+  }
+
+  /**
    * Magic getter for public access to protected members
    */
   public function __get($name)

iRony-0.4.3.tar.gz/lib/plugins/calendar/calendar_ui.js -> iRony-0.4.4.tar.gz/lib/plugins/calendar/calendar_ui.js Changed

@@ -563,6 +563,11 @@
         }
       });
 
+      var close_func = function(e) {
+          rcmail.command('menu-close', 'eventoptionsmenu', null, e);
+          $('.libcal-rsvp-replymode').hide();
+        };
+
       // open jquery UI dialog
       $dialog.dialog({
         modal: true,
@@ -575,21 +580,12 @@
             $dialog.parent().find('button:not(.ui-dialog-titlebar-close,.delete)').first().focus();
           }, 5);
         },
-        beforeClose: function(e) {
-          rcmail.command('menu-close', 'eventoptionsmenu', null, e);
-        },
         close: function(e) {
-          $dialog.dialog('destroy').attr('aria-hidden', 'true').hide();
-          $('.libcal-rsvp-replymode').hide();
-        },
-        dragStart: function(e) {
-          rcmail.command('menu-close', 'eventoptionsmenu', null, e);
-          $('.libcal-rsvp-replymode').hide();
-        },
-        resizeStart: function(e) {
-          rcmail.command('menu-close', 'eventoptionsmenu', null, e);
-          $('.libcal-rsvp-replymode').hide();
+          close_func(e);
+          $dialog.dialog('close');
         },
+        dragStart: close_func,
+        resizeStart: close_func,
         buttons: buttons,
         minWidth: 320,
         width: 420
@@ -611,12 +607,12 @@
           .attr({href: '#', 'class': 'dropdown-link btn btn-link options', 'data-popup-pos': 'top'})
           .text(rcmail.gettext('eventoptions','calendar'))
           .click(function(e) {
-            return rcmail.command('menu-open','eventoptionsmenu', this, e)
+            return rcmail.command('menu-open','eventoptionsmenu', this, e);
           })
           .appendTo($dialog.parent().find('.ui-dialog-buttonset'));
       }
 
-      rcmail.enable_command('event-history', calendar.history)
+      rcmail.enable_command('event-history', calendar.history);
 
       rcmail.triggerEvent('calendar-event-dialog', {dialog: $dialog});
     };
@@ -626,12 +622,14 @@
     {
       var cutype = $(this).attr('data-cutype'),
         mailto = this.href.substr(7);
+
       if (rcmail.env.calendar_resources && cutype == 'RESOURCE') {
         event_resources_dialog(mailto);
       }
       else {
         rcmail.command('compose', mailto, e ? e.target : null, e);
       }
+
       return false;
     };
 
@@ -3179,9 +3177,9 @@
           if (v.role != 'ORGANIZER') {
             v.status = 'NEEDS-ACTION';
           }
-        })
+        });
 
-        event_edit_dialog('new', copy);
+        setTimeout(function() { event_edit_dialog('new', copy); }, 50);
       }
     };

iRony-0.4.3.tar.gz/lib/plugins/calendar/composer.json -> iRony-0.4.4.tar.gz/lib/plugins/calendar/composer.json Changed

iRony-0.4.3.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_driver.php -> iRony-0.4.4.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_driver.php Changed

iRony-0.4.3.tar.gz/lib/plugins/calendar/lib/js/fullcalendar.js -> iRony-0.4.4.tar.gz/lib/plugins/calendar/lib/js/fullcalendar.js Changed

@@ -1,7 +1,7 @@
 /*!
- * FullCalendar v3.9.0
+ * FullCalendar v3.10.2
  * Docs & License: https://fullcalendar.io/
- * (c) 2018 Adam Shaw
+ * (c) 2019 Adam Shaw
  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
@@ -75,7 +75,7 @@
 /******/ 	__webpack_require__.p = "";
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 236);
+/******/ 	return __webpack_require__(__webpack_require__.s = 256);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -200,7 +200,7 @@
         var naturalOffset = flexOffsets[i];
         var naturalHeight = flexHeights[i];
         var newHeight = minOffset - (naturalOffset - naturalHeight); // subtract the margin/padding
-        if (naturalOffset < minOffset) {
+        if (naturalOffset < minOffset) { // we check this again because redistribution might have changed things
             $(el).height(newHeight);
         }
     });
@@ -314,7 +314,7 @@
     leftRightWidth = sanitizeScrollbarWidth(leftRightWidth);
     bottomWidth = sanitizeScrollbarWidth(bottomWidth);
     widths = { left: 0, right: 0, top: 0, bottom: bottomWidth };
-    if (getIsLeftRtlScrollbars() && el.css('direction') === 'rtl') {
+    if (getIsLeftRtlScrollbars() && el.css('direction') === 'rtl') { // is the scrollbar on the left side?
         widths.left = leftRightWidth;
     }
     else {
@@ -339,7 +339,7 @@
     return _isLeftRtlScrollbars;
 }
 function computeIsLeftRtlScrollbars() {
-    var el = $('<div><div/></div>')
+    var el = $('<div><div></div></div>')
         .css({
         position: 'absolute',
         top: -1000,
@@ -577,13 +577,13 @@
 // Results are based on Moment's .as() and .diff() methods, so results can depend on internal handling
 // of month-diffing logic (which tends to vary from version to version).
 function computeRangeAs(unit, start, end) {
-    if (end != null) {
+    if (end != null) { // given start, end
         return end.diff(start, unit, true);
     }
-    else if (moment.isDuration(start)) {
+    else if (moment.isDuration(start)) { // given duration
         return start.as(unit);
     }
-    else {
+    else { // given { start, end } range object
         return start.end.diff(start.start, unit, true);
     }
 }
@@ -709,7 +709,7 @@
     for (i = propObjs.length - 1; i >= 0; i--) {
         props = propObjs[i];
         for (name in props) {
-            if (!(name in dest)) {
+            if (!(name in dest)) { // if already assigned by previous props or complex props, don't reassign
                 dest[name] = props[name];
             }
         }
@@ -747,7 +747,7 @@
     var removeCnt = 0;
     var i = 0;
     while (i < array.length) {
-        if (testFunc(array[i])) {
+        if (testFunc(array[i])) { // truthy value means *remove*
             array.splice(i, 1);
             removeCnt++;
         }
@@ -776,7 +776,7 @@
 function isArraysEqual(a0, a1) {
     var len = a0.length;
     var i;
-    if (len == null || len !== a1.length) {
+    if (len == null || len !== a1.length) { // not array? or not same length?
         return false;
     }
     for (i = 0; i < len; i++) {
@@ -805,7 +805,7 @@
         .replace(/>/g, '&gt;')
         .replace(/'/g, '&#039;')
         .replace(/"/g, '&quot;')
-        .replace(/\n/g, '<br />');
+        .replace(/\n/g, '<br>');
 }
 exports.htmlEscape = htmlEscape;
 function stripHtmlEntities(text) {
@@ -907,7 +907,7 @@
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var moment = __webpack_require__(0);
-var moment_ext_1 = __webpack_require__(10);
+var moment_ext_1 = __webpack_require__(11);
 var UnzonedRange = /** @class */ (function () {
     function UnzonedRange(startInput, endInput) {
         // TODO: move these into footprint.
@@ -942,7 +942,7 @@
         for (i = 0; i < ranges.length; i++) {
             dateRange = ranges[i];
             // add the span of time before the event (if there is any)
-            if (dateRange.startMs > startMs) {
+            if (dateRange.startMs > startMs) { // compare millisecond time (skip any ambig logic)
                 invertedRanges.push(new UnzonedRange(startMs, dateRange.startMs));
             }
             if (dateRange.endMs > startMs) {
@@ -950,7 +950,7 @@
             }
         }
         // add the span of time after the last event (if there is any)
-        if (startMs < constraintRange.endMs) {
+        if (startMs < constraintRange.endMs) { // compare millisecond time (skip any ambig logic)
             invertedRanges.push(new UnzonedRange(startMs, constraintRange.endMs));
         }
         return invertedRanges;
@@ -1058,9 +1058,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
 var $ = __webpack_require__(3);
-var ParsableModelMixin_1 = __webpack_require__(208);
-var Class_1 = __webpack_require__(33);
-var EventDefParser_1 = __webpack_require__(49);
+var ParsableModelMixin_1 = __webpack_require__(52);
+var Class_1 = __webpack_require__(35);
+var EventDefParser_1 = __webpack_require__(36);
 var EventSource = /** @class */ (function (_super) {
     tslib_1.__extends(EventSource, _super);
     // can we do away with calendar? at least for the abstract?
@@ -1189,7 +1189,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
 var $ = __webpack_require__(3);
-var Mixin_1 = __webpack_require__(14);
+var Mixin_1 = __webpack_require__(15);
 var guid = 0;
 var ListenerMixin = /** @class */ (function (_super) {
     tslib_1.__extends(ListenerMixin, _super);
@@ -1208,7 +1208,7 @@
       })
     */
     ListenerMixin.prototype.listenTo = function (other, arg, callback) {
-        if (typeof arg === 'object') {
+        if (typeof arg === 'object') { // given dictionary of callbacks
             for (var eventName in arg) {
                 if (arg.hasOwnProperty(eventName)) {
                     this.listenTo(other, eventName, arg[eventName]);
@@ -1246,8 +1246,76 @@
 
 /***/ }),
 /* 8 */,
-/* 9 */,
-/* 10 */
+/* 9 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var EventDef_1 = __webpack_require__(37);
+var EventInstance_1 = __webpack_require__(53);
+var EventDateProfile_1 = __webpack_require__(16);
+var SingleEventDef = /** @class */ (function (_super) {
+    tslib_1.__extends(SingleEventDef, _super);
+    function SingleEventDef() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    /*
+    Will receive start/end params, but will be ignored.
+    */
+    SingleEventDef.prototype.buildInstances = function () {
+        return [this.buildInstance()];
+    };
+    SingleEventDef.prototype.buildInstance = function () {
+        return new EventInstance_1.default(this, // definition
+        this.dateProfile);
+    };
+    SingleEventDef.prototype.isAllDay = function () {
+        return this.dateProfile.isAllDay();
+    };
+    SingleEventDef.prototype.clone = function () {
+        var def = _super.prototype.clone.call(this);
+        def.dateProfile = this.dateProfile;
+        return def;
+    };
+    SingleEventDef.prototype.rezone = function () {
+        var calendar = this.source.calendar;
+        var dateProfile = this.dateProfile;
+        this.dateProfile = new EventDateProfile_1.default(calendar.moment(dateProfile.start), dateProfile.end ? calendar.moment(dateProfile.end) : null, calendar);
+    };
+    /*
+    NOTE: if super-method fails, should still attempt to apply
+    */
+    SingleEventDef.prototype.applyManualStandardProps = function (rawProps) {
+        var superSuccess = _super.prototype.applyManualStandardProps.call(this, rawProps);
+        var dateProfile = EventDateProfile_1.default.parse(rawProps, this.source); // returns null on failure
+        if (dateProfile) {
+            this.dateProfile = dateProfile;
+            // make sure `date` shows up in the legacy event objects as-is
+            if (rawProps.date != null) {
+                this.miscProps.date = rawProps.date;
+            }
+            return superSuccess;
+        }
+        else {
+            return false;
+        }
+    };
+    return SingleEventDef;
+}(EventDef_1.default));
+exports.default = SingleEventDef;
+// Parsing
+// ---------------------------------------------------------------------------------------------------------------------
+SingleEventDef.defineStandardProps({
+    start: false,
+    date: false,
+    end: false,
+    allDay: false
+});
+
+
+/***/ }),
+/* 10 */,
+/* 11 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1287,7 +1355,7 @@
     var mom = makeMoment(arguments, true);
     // Force it into UTC because makeMoment doesn't guarantee it
     // (if given a pre-existing moment for example)
-    if (mom.hasTime()) {
+    if (mom.hasTime()) { // don't give ambiguously-timed moments a UTC zone
         mom.utc();
     }
     return mom;
@@ -1314,7 +1382,7 @@
     if (moment.isMoment(input) || util_1.isNativeDate(input) || input === undefined) {
         mom = moment.apply(null, args);
     }
-    else {
+    else { // "parsing" is required
         isAmbigTime = false;
         isAmbigZone = false;
         if (isSingleString) {
@@ -1345,7 +1413,7 @@
             mom._ambigTime = true;
             mom._ambigZone = true; // ambiguous time always means ambiguous zone
         }
-        else if (parseZone) {
+        else if (parseZone) { // let's record the inputted zone somehow
             if (isAmbigZone) {
                 mom._ambigZone = true;
             }
@@ -1363,7 +1431,7 @@
 // `weeks` is an alias for `week`
 newMomentProto.week = newMomentProto.weeks = function (input) {
     var weekCalc = this._locale._fullCalendar_weekCalc;
-    if (input == null && typeof weekCalc === 'function') {
+    if (input == null && typeof weekCalc === 'function') { // custom function only works for getter
         return weekCalc(this);
     }
     else if (weekCalc === 'ISO') {
@@ -1386,7 +1454,7 @@
     if (!this._fullCalendar) {
         return oldMomentProto.time.apply(this, arguments);
     }
-    if (time == null) {
+    if (time == null) { // getter
         return moment.duration({
             hours: this.hours(),
             minutes: this.minutes(),
@@ -1394,7 +1462,7 @@
             milliseconds: this.milliseconds()
         });
     }
-    else {
+    else { // setter
         this._ambigTime = false; // mark that the moment now has a time
         if (!moment.isDuration(time) && !moment.isMoment(time)) {
             time = moment.duration(time);
@@ -1481,7 +1549,7 @@
 };
 // implicitly marks a zone (will probably get called upon .utc() and .local())
 newMomentProto.utcOffset = function (tzo) {
-    if (tzo != null) {
+    if (tzo != null) { // setter
         // these assignments needs to happen before the original zone method is called.
         // I forget why, something to do with a browser crash.
         this._ambigTime = false;
@@ -1492,7 +1560,35 @@
 
 
 /***/ }),
-/* 11 */
+/* 12 */
+/***/ (function(module, exports) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+/*
+Meant to be immutable
+*/
+var ComponentFootprint = /** @class */ (function () {
+    function ComponentFootprint(unzonedRange, isAllDay) {
+        this.isAllDay = false; // component can choose to ignore this
+        this.unzonedRange = unzonedRange;
+        this.isAllDay = isAllDay;
+    }
+    /*
+    Only works for non-open-ended ranges.
+    */
+    ComponentFootprint.prototype.toLegacy = function (calendar) {
+        return {
+            start: calendar.msToMoment(this.unzonedRange.startMs, this.isAllDay),
+            end: calendar.msToMoment(this.unzonedRange.endMs, this.isAllDay)
+        };
+    };
+    return ComponentFootprint;
+}());
+exports.default = ComponentFootprint;
+
+
+/***/ }),
+/* 13 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*
@@ -1511,7 +1607,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
 var $ = __webpack_require__(3);
-var Mixin_1 = __webpack_require__(14);
+var Mixin_1 = __webpack_require__(15);
 var EmitterMixin = /** @class */ (function (_super) {
     tslib_1.__extends(EmitterMixin, _super);
     function EmitterMixin() {
@@ -1573,103 +1669,28 @@
 
 
 /***/ }),
-/* 12 */
+/* 14 */
 /***/ (function(module, exports) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-/*
-Meant to be immutable
-*/
-var ComponentFootprint = /** @class */ (function () {
-    function ComponentFootprint(unzonedRange, isAllDay) {
-        this.isAllDay = false; // component can choose to ignore this
-        this.unzonedRange = unzonedRange;
-        this.isAllDay = isAllDay;
-    }
-    /*
-    Only works for non-open-ended ranges.
-    */
-    ComponentFootprint.prototype.toLegacy = function (calendar) {
-        return {
-            start: calendar.msToMoment(this.unzonedRange.startMs, this.isAllDay),
-            end: calendar.msToMoment(this.unzonedRange.endMs, this.isAllDay)
-        };
-    };
-    return ComponentFootprint;
-}());
-exports.default = ComponentFootprint;
-
-
-/***/ }),
-/* 13 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var EventDef_1 = __webpack_require__(34);
-var EventInstance_1 = __webpack_require__(209);
-var EventDateProfile_1 = __webpack_require__(17);
-var SingleEventDef = /** @class */ (function (_super) {
-    tslib_1.__extends(SingleEventDef, _super);
-    function SingleEventDef() {
-        return _super !== null && _super.apply(this, arguments) || this;
+var Interaction = /** @class */ (function () {
+    function Interaction(component) {
+        this.view = component._getView();
+        this.component = component;
     }
-    /*
-    Will receive start/end params, but will be ignored.
-    */
-    SingleEventDef.prototype.buildInstances = function () {
-        return [this.buildInstance()];
-    };
-    SingleEventDef.prototype.buildInstance = function () {
-        return new EventInstance_1.default(this, // definition
-        this.dateProfile);
-    };
-    SingleEventDef.prototype.isAllDay = function () {
-        return this.dateProfile.isAllDay();
-    };
-    SingleEventDef.prototype.clone = function () {
-        var def = _super.prototype.clone.call(this);
-        def.dateProfile = this.dateProfile;
-        return def;
-    };
-    SingleEventDef.prototype.rezone = function () {
-        var calendar = this.source.calendar;
-        var dateProfile = this.dateProfile;
-        this.dateProfile = new EventDateProfile_1.default(calendar.moment(dateProfile.start), dateProfile.end ? calendar.moment(dateProfile.end) : null, calendar);
+    Interaction.prototype.opt = function (name) {
+        return this.view.opt(name);
     };
-    /*
-    NOTE: if super-method fails, should still attempt to apply
-    */
-    SingleEventDef.prototype.applyManualStandardProps = function (rawProps) {
-        var superSuccess = _super.prototype.applyManualStandardProps.call(this, rawProps);
-        var dateProfile = EventDateProfile_1.default.parse(rawProps, this.source); // returns null on failure
-        if (dateProfile) {
-            this.dateProfile = dateProfile;
-            // make sure `date` shows up in the legacy event objects as-is
-            if (rawProps.date != null) {
-                this.miscProps.date = rawProps.date;
-            }
-            return superSuccess;
-        }
-        else {
-            return false;
-        }
+    Interaction.prototype.end = function () {
+        // subclasses can implement
     };
-    return SingleEventDef;
-}(EventDef_1.default));
-exports.default = SingleEventDef;
-// Parsing
-// ---------------------------------------------------------------------------------------------------------------------
-SingleEventDef.defineStandardProps({
-    start: false,
-    date: false,
-    end: false,
-    allDay: false
-});
+    return Interaction;
+}());
+exports.default = Interaction;
 
 
 /***/ }),
-/* 14 */
+/* 15 */
 /***/ (function(module, exports) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -1679,7 +1700,7 @@
     Mixin.mixInto = function (destClass) {
         var _this = this;
         Object.getOwnPropertyNames(this.prototype).forEach(function (name) {
-            if (!destClass.prototype[name]) {
+            if (!destClass.prototype[name]) { // if destination class doesn't already define it
                 destClass.prototype[name] = _this.prototype[name];
             }
         });
@@ -1700,175 +1721,10 @@
 
 
 /***/ }),
-/* 15 */
-/***/ (function(module, exports) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var Interaction = /** @class */ (function () {
-    function Interaction(component) {
-        this.view = component._getView();
-        this.component = component;
-    }
-    Interaction.prototype.opt = function (name) {
-        return this.view.opt(name);
-    };
-    Interaction.prototype.end = function () {
-        // subclasses can implement
-    };
-    return Interaction;
-}());
-exports.default = Interaction;
-
-
-/***/ }),
 /* 16 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.version = '3.9.0';
-// When introducing internal API incompatibilities (where fullcalendar plugins would break),
-// the minor version of the calendar should be upped (ex: 2.7.2 -> 2.8.0)
-// and the below integer should be incremented.
-exports.internalApiVersion = 12;
-var util_1 = __webpack_require__(4);
-exports.applyAll = util_1.applyAll;
-exports.debounce = util_1.debounce;
-exports.isInt = util_1.isInt;
-exports.htmlEscape = util_1.htmlEscape;
-exports.cssToStr = util_1.cssToStr;
-exports.proxy = util_1.proxy;
-exports.capitaliseFirstLetter = util_1.capitaliseFirstLetter;
-exports.getOuterRect = util_1.getOuterRect;
-exports.getClientRect = util_1.getClientRect;
-exports.getContentRect = util_1.getContentRect;
-exports.getScrollbarWidths = util_1.getScrollbarWidths;
-exports.preventDefault = util_1.preventDefault;
-exports.parseFieldSpecs = util_1.parseFieldSpecs;
-exports.compareByFieldSpecs = util_1.compareByFieldSpecs;
-exports.compareByFieldSpec = util_1.compareByFieldSpec;
-exports.flexibleCompare = util_1.flexibleCompare;
-exports.computeGreatestUnit = util_1.computeGreatestUnit;
-exports.divideRangeByDuration = util_1.divideRangeByDuration;
-exports.divideDurationByDuration = util_1.divideDurationByDuration;
-exports.multiplyDuration = util_1.multiplyDuration;
-exports.durationHasTime = util_1.durationHasTime;
-exports.log = util_1.log;
-exports.warn = util_1.warn;
-exports.removeExact = util_1.removeExact;
-exports.intersectRects = util_1.intersectRects;
-var date_formatting_1 = __webpack_require__(47);
-exports.formatDate = date_formatting_1.formatDate;
-exports.formatRange = date_formatting_1.formatRange;
-exports.queryMostGranularFormatUnit = date_formatting_1.queryMostGranularFormatUnit;
-var locale_1 = __webpack_require__(31);
-exports.datepickerLocale = locale_1.datepickerLocale;
-exports.locale = locale_1.locale;
-var moment_ext_1 = __webpack_require__(10);
-exports.moment = moment_ext_1.default;
-var EmitterMixin_1 = __webpack_require__(11);
-exports.EmitterMixin = EmitterMixin_1.default;
-var ListenerMixin_1 = __webpack_require__(7);
-exports.ListenerMixin = ListenerMixin_1.default;
-var Model_1 = __webpack_require__(48);
-exports.Model = Model_1.default;
-var Constraints_1 = __webpack_require__(207);
-exports.Constraints = Constraints_1.default;
-var UnzonedRange_1 = __webpack_require__(5);
-exports.UnzonedRange = UnzonedRange_1.default;
-var ComponentFootprint_1 = __webpack_require__(12);
-exports.ComponentFootprint = ComponentFootprint_1.default;
-var BusinessHourGenerator_1 = __webpack_require__(212);
-exports.BusinessHourGenerator = BusinessHourGenerator_1.default;
-var EventDef_1 = __webpack_require__(34);
-exports.EventDef = EventDef_1.default;
-var EventDefMutation_1 = __webpack_require__(37);
-exports.EventDefMutation = EventDefMutation_1.default;
-var EventSourceParser_1 = __webpack_require__(38);
-exports.EventSourceParser = EventSourceParser_1.default;
-var EventSource_1 = __webpack_require__(6);
-exports.EventSource = EventSource_1.default;
-var ThemeRegistry_1 = __webpack_require__(51);
-exports.defineThemeSystem = ThemeRegistry_1.defineThemeSystem;
-var EventInstanceGroup_1 = __webpack_require__(18);
-exports.EventInstanceGroup = EventInstanceGroup_1.default;
-var ArrayEventSource_1 = __webpack_require__(52);
-exports.ArrayEventSource = ArrayEventSource_1.default;
-var FuncEventSource_1 = __webpack_require__(215);
-exports.FuncEventSource = FuncEventSource_1.default;
-var JsonFeedEventSource_1 = __webpack_require__(216);
-exports.JsonFeedEventSource = JsonFeedEventSource_1.default;
-var EventFootprint_1 = __webpack_require__(36);
-exports.EventFootprint = EventFootprint_1.default;
-var Class_1 = __webpack_require__(33);
-exports.Class = Class_1.default;
-var Mixin_1 = __webpack_require__(14);
-exports.Mixin = Mixin_1.default;
-var CoordCache_1 = __webpack_require__(53);
-exports.CoordCache = CoordCache_1.default;
-var DragListener_1 = __webpack_require__(54);
-exports.DragListener = DragListener_1.default;
-var Promise_1 = __webpack_require__(20);
-exports.Promise = Promise_1.default;
-var TaskQueue_1 = __webpack_require__(217);
-exports.TaskQueue = TaskQueue_1.default;
-var RenderQueue_1 = __webpack_require__(218);
-exports.RenderQueue = RenderQueue_1.default;
-var Scroller_1 = __webpack_require__(39);
-exports.Scroller = Scroller_1.default;
-var Theme_1 = __webpack_require__(19);
-exports.Theme = Theme_1.default;
-var DateComponent_1 = __webpack_require__(219);
-exports.DateComponent = DateComponent_1.default;
-var InteractiveDateComponent_1 = __webpack_require__(40);
-exports.InteractiveDateComponent = InteractiveDateComponent_1.default;
-var Calendar_1 = __webpack_require__(220);
-exports.Calendar = Calendar_1.default;
-var View_1 = __webpack_require__(41);
-exports.View = View_1.default;
-var ViewRegistry_1 = __webpack_require__(22);
-exports.defineView = ViewRegistry_1.defineView;
-exports.getViewConfig = ViewRegistry_1.getViewConfig;
-var DayTableMixin_1 = __webpack_require__(55);
-exports.DayTableMixin = DayTableMixin_1.default;
-var BusinessHourRenderer_1 = __webpack_require__(56);
-exports.BusinessHourRenderer = BusinessHourRenderer_1.default;
-var EventRenderer_1 = __webpack_require__(42);
-exports.EventRenderer = EventRenderer_1.default;
-var FillRenderer_1 = __webpack_require__(57);
-exports.FillRenderer = FillRenderer_1.default;
-var HelperRenderer_1 = __webpack_require__(58);
-exports.HelperRenderer = HelperRenderer_1.default;
-var ExternalDropping_1 = __webpack_require__(222);
-exports.ExternalDropping = ExternalDropping_1.default;
-var EventResizing_1 = __webpack_require__(223);
-exports.EventResizing = EventResizing_1.default;
-var EventPointing_1 = __webpack_require__(59);
-exports.EventPointing = EventPointing_1.default;
-var EventDragging_1 = __webpack_require__(224);
-exports.EventDragging = EventDragging_1.default;
-var DateSelecting_1 = __webpack_require__(225);
-exports.DateSelecting = DateSelecting_1.default;
-var StandardInteractionsMixin_1 = __webpack_require__(60);
-exports.StandardInteractionsMixin = StandardInteractionsMixin_1.default;
-var AgendaView_1 = __webpack_require__(226);
-exports.AgendaView = AgendaView_1.default;
-var TimeGrid_1 = __webpack_require__(227);
-exports.TimeGrid = TimeGrid_1.default;
-var DayGrid_1 = __webpack_require__(61);
-exports.DayGrid = DayGrid_1.default;
-var BasicView_1 = __webpack_require__(62);
-exports.BasicView = BasicView_1.default;
-var MonthView_1 = __webpack_require__(229);
-exports.MonthView = MonthView_1.default;
-var ListView_1 = __webpack_require__(230);
-exports.ListView = ListView_1.default;
-
-
-/***/ }),
-/* 17 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
 var UnzonedRange_1 = __webpack_require__(5);
 /*
 Meant to be immutable
@@ -1896,9 +1752,6 @@
         if (!start.isValid()) {
             return false;
         }
-        if (end && (!end.isValid() || !end.isAfter(start))) {
-            end = null;
-        }
         if (forcedAllDay == null) {
             forcedAllDay = source.allDayDefault;
             if (forcedAllDay == null) {
@@ -1919,6 +1772,9 @@
                 end.time(0);
             }
         }
+        if (end && (!end.isValid() || !end.isAfter(start))) {
+            end = null;
+        }
         if (!end && forceEventDuration) {
             end = calendar.getDefaultEventEnd(!start.hasTime(), start);
         }
@@ -1953,139 +1809,517 @@
 
 
 /***/ }),
-/* 18 */
+/* 17 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var UnzonedRange_1 = __webpack_require__(5);
-var util_1 = __webpack_require__(35);
-var EventRange_1 = __webpack_require__(211);
-/*
-It's expected that there will be at least one EventInstance,
-OR that an explicitEventDef is assigned.
+var tslib_1 = __webpack_require__(2);
+var util_1 = __webpack_require__(4);
+var DragListener_1 = __webpack_require__(59);
+/* Tracks mouse movements over a component and raises events about which hit the mouse is over.
+------------------------------------------------------------------------------------------------------------------------
+options:
+- subjectEl
+- subjectCenter
 */
-var EventInstanceGroup = /** @class */ (function () {
-    function EventInstanceGroup(eventInstances) {
-        this.eventInstances = eventInstances || [];
+var HitDragListener = /** @class */ (function (_super) {
+    tslib_1.__extends(HitDragListener, _super);
+    function HitDragListener(component, options) {
+        var _this = _super.call(this, options) || this;
+        _this.component = component;
+        return _this;
     }
-    EventInstanceGroup.prototype.getAllEventRanges = function (constraintRange) {
-        if (constraintRange) {
-            return this.sliceNormalRenderRanges(constraintRange);
+    // Called when drag listening starts (but a real drag has not necessarily began).
+    // ev might be undefined if dragging was started manually.
+    HitDragListener.prototype.handleInteractionStart = function (ev) {
+        var subjectEl = this.subjectEl;
+        var subjectRect;
+        var origPoint;
+        var point;
+        this.component.hitsNeeded();
+        this.computeScrollBounds(); // for autoscroll
+        if (ev) {
+            origPoint = { left: util_1.getEvX(ev), top: util_1.getEvY(ev) };
+            point = origPoint;
+            // constrain the point to bounds of the element being dragged
+            if (subjectEl) {
+                subjectRect = util_1.getOuterRect(subjectEl); // used for centering as well
+                point = util_1.constrainPoint(point, subjectRect);
+            }
+            this.origHit = this.queryHit(point.left, point.top);
+            // treat the center of the subject as the collision point?
+            if (subjectEl && this.options.subjectCenter) {
+                // only consider the area the subject overlaps the hit. best for large subjects.
+                // TODO: skip this if hit didn't supply left/right/top/bottom
+                if (this.origHit) {
+                    subjectRect = util_1.intersectRects(this.origHit, subjectRect) ||
+                        subjectRect; // in case there is no intersection
+                }
+                point = util_1.getRectCenter(subjectRect);
+            }
+            this.coordAdjust = util_1.diffPoints(point, origPoint); // point - origPoint
         }
         else {
-            return this.eventInstances.map(util_1.eventInstanceToEventRange);
+            this.origHit = null;
+            this.coordAdjust = null;
         }
+        // call the super-method. do it after origHit has been computed
+        _super.prototype.handleInteractionStart.call(this, ev);
     };
-    EventInstanceGroup.prototype.sliceRenderRanges = function (constraintRange) {
-        if (this.isInverse()) {
-            return this.sliceInverseRenderRanges(constraintRange);
-        }
-        else {
-            return this.sliceNormalRenderRanges(constraintRange);
+    // Called when the actual drag has started
+    HitDragListener.prototype.handleDragStart = function (ev) {
+        var hit;
+        _super.prototype.handleDragStart.call(this, ev);
+        // might be different from this.origHit if the min-distance is large
+        hit = this.queryHit(util_1.getEvX(ev), util_1.getEvY(ev));
+        // report the initial hit the mouse is over
+        // especially important if no min-distance and drag starts immediately
+        if (hit) {
+            this.handleHitOver(hit);
         }
     };
-    EventInstanceGroup.prototype.sliceNormalRenderRanges = function (constraintRange) {
-        var eventInstances = this.eventInstances;
-        var i;
-        var eventInstance;
-        var slicedRange;
-        var slicedEventRanges = [];
-        for (i = 0; i < eventInstances.length; i++) {
-            eventInstance = eventInstances[i];
-            slicedRange = eventInstance.dateProfile.unzonedRange.intersect(constraintRange);
-            if (slicedRange) {
-                slicedEventRanges.push(new EventRange_1.default(slicedRange, eventInstance.def, eventInstance));
+    // Called when the drag moves
+    HitDragListener.prototype.handleDrag = function (dx, dy, ev) {
+        var hit;
+        _super.prototype.handleDrag.call(this, dx, dy, ev);
+        hit = this.queryHit(util_1.getEvX(ev), util_1.getEvY(ev));
+        if (!isHitsEqual(hit, this.hit)) { // a different hit than before?
+            if (this.hit) {
+                this.handleHitOut();
+            }
+            if (hit) {
+                this.handleHitOver(hit);
             }
         }
-        return slicedEventRanges;
-    };
-    EventInstanceGroup.prototype.sliceInverseRenderRanges = function (constraintRange) {
-        var unzonedRanges = this.eventInstances.map(util_1.eventInstanceToUnzonedRange);
-        var ownerDef = this.getEventDef();
-        unzonedRanges = UnzonedRange_1.default.invertRanges(unzonedRanges, constraintRange);
-        return unzonedRanges.map(function (unzonedRange) {
-            return new EventRange_1.default(unzonedRange, ownerDef); // don't give an EventInstance
-        });
-    };
-    EventInstanceGroup.prototype.isInverse = function () {
-        return this.getEventDef().hasInverseRendering();
     };
-    EventInstanceGroup.prototype.getEventDef = function () {
-        return this.explicitEventDef || this.eventInstances[0].def;
+    // Called when dragging has been stopped
+    HitDragListener.prototype.handleDragEnd = function (ev) {
+        this.handleHitDone();
+        _super.prototype.handleDragEnd.call(this, ev);
     };
-    return EventInstanceGroup;
-}());
-exports.default = EventInstanceGroup;
-
-
-/***/ }),
-/* 19 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var $ = __webpack_require__(3);
-var Theme = /** @class */ (function () {
-    function Theme(optionsManager) {
-        this.optionsManager = optionsManager;
-        this.processIconOverride();
-    }
-    Theme.prototype.processIconOverride = function () {
-        if (this.iconOverrideOption) {
-            this.setIconOverride(this.optionsManager.get(this.iconOverrideOption));
-        }
+    // Called when a the mouse has just moved over a new hit
+    HitDragListener.prototype.handleHitOver = function (hit) {
+        var isOrig = isHitsEqual(hit, this.origHit);
+        this.hit = hit;
+        this.trigger('hitOver', this.hit, isOrig, this.origHit);
     };
-    Theme.prototype.setIconOverride = function (iconOverrideHash) {
-        var iconClassesCopy;
-        var buttonName;
-        if ($.isPlainObject(iconOverrideHash)) {
-            iconClassesCopy = $.extend({}, this.iconClasses);
-            for (buttonName in iconOverrideHash) {
-                iconClassesCopy[buttonName] = this.applyIconOverridePrefix(iconOverrideHash[buttonName]);
-            }
-            this.iconClasses = iconClassesCopy;
-        }
-        else if (iconOverrideHash === false) {
-            this.iconClasses = {};
+    // Called when the mouse has just moved out of a hit
+    HitDragListener.prototype.handleHitOut = function () {
+        if (this.hit) {
+            this.trigger('hitOut', this.hit);
+            this.handleHitDone();
+            this.hit = null;
         }
     };
-    Theme.prototype.applyIconOverridePrefix = function (className) {
-        var prefix = this.iconOverridePrefix;
-        if (prefix && className.indexOf(prefix) !== 0) {
-            className = prefix + className;
+    // Called after a hitOut. Also called before a dragStop
+    HitDragListener.prototype.handleHitDone = function () {
+        if (this.hit) {
+            this.trigger('hitDone', this.hit);
         }
-        return className;
     };
-    Theme.prototype.getClass = function (key) {
-        return this.classes[key] || '';
+    // Called when the interaction ends, whether there was a real drag or not
+    HitDragListener.prototype.handleInteractionEnd = function (ev, isCancelled) {
+        _super.prototype.handleInteractionEnd.call(this, ev, isCancelled);
+        this.origHit = null;
+        this.hit = null;
+        this.component.hitsNotNeeded();
     };
-    Theme.prototype.getIconClass = function (buttonName) {
-        var className = this.iconClasses[buttonName];
-        if (className) {
-            return this.baseIconClass + ' ' + className;
+    // Called when scrolling has stopped, whether through auto scroll, or the user scrolling
+    HitDragListener.prototype.handleScrollEnd = function () {
+        _super.prototype.handleScrollEnd.call(this);
+        // hits' absolute positions will be in new places after a user's scroll.
+        // HACK for recomputing.
+        if (this.isDragging) {
+            this.component.releaseHits();
+            this.component.prepareHits();
         }
-        return '';
     };
-    Theme.prototype.getCustomButtonIconClass = function (customButtonProps) {
-        var className;
-        if (this.iconOverrideCustomButtonOption) {
-            className = customButtonProps[this.iconOverrideCustomButtonOption];
-            if (className) {
-                return this.baseIconClass + ' ' + this.applyIconOverridePrefix(className);
+    // Gets the hit underneath the coordinates for the given mouse event
+    HitDragListener.prototype.queryHit = function (left, top) {
+        if (this.coordAdjust) {
+            left += this.coordAdjust.left;
+            top += this.coordAdjust.top;
+        }
+        return this.component.queryHit(left, top);
+    };
+    return HitDragListener;
+}(DragListener_1.default));
+exports.default = HitDragListener;
+// Returns `true` if the hits are identically equal. `false` otherwise. Must be from the same component.
+// Two null values will be considered equal, as two "out of the component" states are the same.
+function isHitsEqual(hit0, hit1) {
+    if (!hit0 && !hit1) {
+        return true;
+    }
+    if (hit0 && hit1) {
+        return hit0.component === hit1.component &&
+            isHitPropsWithin(hit0, hit1) &&
+            isHitPropsWithin(hit1, hit0); // ensures all props are identical
+    }
+    return false;
+}
+// Returns true if all of subHit's non-standard properties are within superHit
+function isHitPropsWithin(subHit, superHit) {
+    for (var propName in subHit) {
+        if (!/^(component|left|right|top|bottom)$/.test(propName)) {
+            if (subHit[propName] !== superHit[propName]) {
+                return false;
             }
         }
-        return '';
+    }
+    return true;
+}
+
+
+/***/ }),
+/* 18 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.version = '3.10.2';
+// When introducing internal API incompatibilities (where fullcalendar plugins would break),
+// the minor version of the calendar should be upped (ex: 2.7.2 -> 2.8.0)
+// and the below integer should be incremented.
+exports.internalApiVersion = 12;
+var util_1 = __webpack_require__(4);
+exports.applyAll = util_1.applyAll;
+exports.debounce = util_1.debounce;
+exports.isInt = util_1.isInt;
+exports.htmlEscape = util_1.htmlEscape;
+exports.cssToStr = util_1.cssToStr;
+exports.proxy = util_1.proxy;
+exports.capitaliseFirstLetter = util_1.capitaliseFirstLetter;
+exports.getOuterRect = util_1.getOuterRect;
+exports.getClientRect = util_1.getClientRect;
+exports.getContentRect = util_1.getContentRect;
+exports.getScrollbarWidths = util_1.getScrollbarWidths;
+exports.preventDefault = util_1.preventDefault;
+exports.parseFieldSpecs = util_1.parseFieldSpecs;
+exports.compareByFieldSpecs = util_1.compareByFieldSpecs;
+exports.compareByFieldSpec = util_1.compareByFieldSpec;
+exports.flexibleCompare = util_1.flexibleCompare;
+exports.computeGreatestUnit = util_1.computeGreatestUnit;
+exports.divideRangeByDuration = util_1.divideRangeByDuration;
+exports.divideDurationByDuration = util_1.divideDurationByDuration;
+exports.multiplyDuration = util_1.multiplyDuration;
+exports.durationHasTime = util_1.durationHasTime;
+exports.log = util_1.log;
+exports.warn = util_1.warn;
+exports.removeExact = util_1.removeExact;
+exports.intersectRects = util_1.intersectRects;
+exports.allowSelection = util_1.allowSelection;
+exports.attrsToStr = util_1.attrsToStr;
+exports.compareNumbers = util_1.compareNumbers;
+exports.compensateScroll = util_1.compensateScroll;
+exports.computeDurationGreatestUnit = util_1.computeDurationGreatestUnit;
+exports.constrainPoint = util_1.constrainPoint;
+exports.copyOwnProps = util_1.copyOwnProps;
+exports.diffByUnit = util_1.diffByUnit;
+exports.diffDay = util_1.diffDay;
+exports.diffDayTime = util_1.diffDayTime;
+exports.diffPoints = util_1.diffPoints;
+exports.disableCursor = util_1.disableCursor;
+exports.distributeHeight = util_1.distributeHeight;
+exports.enableCursor = util_1.enableCursor;
+exports.firstDefined = util_1.firstDefined;
+exports.getEvIsTouch = util_1.getEvIsTouch;
+exports.getEvX = util_1.getEvX;
+exports.getEvY = util_1.getEvY;
+exports.getRectCenter = util_1.getRectCenter;
+exports.getScrollParent = util_1.getScrollParent;
+exports.hasOwnProp = util_1.hasOwnProp;
+exports.isArraysEqual = util_1.isArraysEqual;
+exports.isNativeDate = util_1.isNativeDate;
+exports.isPrimaryMouseButton = util_1.isPrimaryMouseButton;
+exports.isTimeString = util_1.isTimeString;
+exports.matchCellWidths = util_1.matchCellWidths;
+exports.mergeProps = util_1.mergeProps;
+exports.preventSelection = util_1.preventSelection;
+exports.removeMatching = util_1.removeMatching;
+exports.stripHtmlEntities = util_1.stripHtmlEntities;
+exports.subtractInnerElHeight = util_1.subtractInnerElHeight;
+exports.uncompensateScroll = util_1.uncompensateScroll;
+exports.undistributeHeight = util_1.undistributeHeight;
+exports.dayIDs = util_1.dayIDs;
+exports.unitsDesc = util_1.unitsDesc;
+var date_formatting_1 = __webpack_require__(49);
+exports.formatDate = date_formatting_1.formatDate;
+exports.formatRange = date_formatting_1.formatRange;
+exports.queryMostGranularFormatUnit = date_formatting_1.queryMostGranularFormatUnit;
+var locale_1 = __webpack_require__(32);
+exports.datepickerLocale = locale_1.datepickerLocale;
+exports.locale = locale_1.locale;
+exports.getMomentLocaleData = locale_1.getMomentLocaleData;
+exports.populateInstanceComputableOptions = locale_1.populateInstanceComputableOptions;
+var util_2 = __webpack_require__(19);
+exports.eventDefsToEventInstances = util_2.eventDefsToEventInstances;
+exports.eventFootprintToComponentFootprint = util_2.eventFootprintToComponentFootprint;
+exports.eventInstanceToEventRange = util_2.eventInstanceToEventRange;
+exports.eventInstanceToUnzonedRange = util_2.eventInstanceToUnzonedRange;
+exports.eventRangeToEventFootprint = util_2.eventRangeToEventFootprint;
+var moment_ext_1 = __webpack_require__(11);
+exports.moment = moment_ext_1.default;
+var EmitterMixin_1 = __webpack_require__(13);
+exports.EmitterMixin = EmitterMixin_1.default;
+var ListenerMixin_1 = __webpack_require__(7);
+exports.ListenerMixin = ListenerMixin_1.default;
+var Model_1 = __webpack_require__(51);
+exports.Model = Model_1.default;
+var Constraints_1 = __webpack_require__(217);
+exports.Constraints = Constraints_1.default;
+var DateProfileGenerator_1 = __webpack_require__(55);
+exports.DateProfileGenerator = DateProfileGenerator_1.default;
+var UnzonedRange_1 = __webpack_require__(5);
+exports.UnzonedRange = UnzonedRange_1.default;
+var ComponentFootprint_1 = __webpack_require__(12);
+exports.ComponentFootprint = ComponentFootprint_1.default;
+var BusinessHourGenerator_1 = __webpack_require__(218);
+exports.BusinessHourGenerator = BusinessHourGenerator_1.default;
+var EventPeriod_1 = __webpack_require__(219);
+exports.EventPeriod = EventPeriod_1.default;
+var EventManager_1 = __webpack_require__(220);
+exports.EventManager = EventManager_1.default;
+var EventDef_1 = __webpack_require__(37);
+exports.EventDef = EventDef_1.default;
+var EventDefMutation_1 = __webpack_require__(39);
+exports.EventDefMutation = EventDefMutation_1.default;
+var EventDefParser_1 = __webpack_require__(36);
+exports.EventDefParser = EventDefParser_1.default;
+var EventInstance_1 = __webpack_require__(53);
+exports.EventInstance = EventInstance_1.default;
+var EventRange_1 = __webpack_require__(50);
+exports.EventRange = EventRange_1.default;
+var RecurringEventDef_1 = __webpack_require__(54);
+exports.RecurringEventDef = RecurringEventDef_1.default;
+var SingleEventDef_1 = __webpack_require__(9);
+exports.SingleEventDef = SingleEventDef_1.default;
+var EventDefDateMutation_1 = __webpack_require__(40);
+exports.EventDefDateMutation = EventDefDateMutation_1.default;
+var EventDateProfile_1 = __webpack_require__(16);
+exports.EventDateProfile = EventDateProfile_1.default;
+var EventSourceParser_1 = __webpack_require__(38);
+exports.EventSourceParser = EventSourceParser_1.default;
+var EventSource_1 = __webpack_require__(6);
+exports.EventSource = EventSource_1.default;
+var ThemeRegistry_1 = __webpack_require__(57);
+exports.defineThemeSystem = ThemeRegistry_1.defineThemeSystem;
+exports.getThemeSystemClass = ThemeRegistry_1.getThemeSystemClass;
+var EventInstanceGroup_1 = __webpack_require__(20);
+exports.EventInstanceGroup = EventInstanceGroup_1.default;
+var ArrayEventSource_1 = __webpack_require__(56);
+exports.ArrayEventSource = ArrayEventSource_1.default;
+var FuncEventSource_1 = __webpack_require__(223);
+exports.FuncEventSource = FuncEventSource_1.default;
+var JsonFeedEventSource_1 = __webpack_require__(224);
+exports.JsonFeedEventSource = JsonFeedEventSource_1.default;
+var EventFootprint_1 = __webpack_require__(34);
+exports.EventFootprint = EventFootprint_1.default;
+var Class_1 = __webpack_require__(35);
+exports.Class = Class_1.default;
+var Mixin_1 = __webpack_require__(15);
+exports.Mixin = Mixin_1.default;
+var CoordCache_1 = __webpack_require__(58);
+exports.CoordCache = CoordCache_1.default;
+var Iterator_1 = __webpack_require__(225);
+exports.Iterator = Iterator_1.default;
+var DragListener_1 = __webpack_require__(59);
+exports.DragListener = DragListener_1.default;
+var HitDragListener_1 = __webpack_require__(17);
+exports.HitDragListener = HitDragListener_1.default;
+var MouseFollower_1 = __webpack_require__(226);
+exports.MouseFollower = MouseFollower_1.default;
+var ParsableModelMixin_1 = __webpack_require__(52);
+exports.ParsableModelMixin = ParsableModelMixin_1.default;
+var Popover_1 = __webpack_require__(227);
+exports.Popover = Popover_1.default;
+var Promise_1 = __webpack_require__(21);
+exports.Promise = Promise_1.default;
+var TaskQueue_1 = __webpack_require__(228);
+exports.TaskQueue = TaskQueue_1.default;
+var RenderQueue_1 = __webpack_require__(229);
+exports.RenderQueue = RenderQueue_1.default;
+var Scroller_1 = __webpack_require__(41);
+exports.Scroller = Scroller_1.default;
+var Theme_1 = __webpack_require__(22);
+exports.Theme = Theme_1.default;
+var Component_1 = __webpack_require__(230);
+exports.Component = Component_1.default;
+var DateComponent_1 = __webpack_require__(231);
+exports.DateComponent = DateComponent_1.default;
+var InteractiveDateComponent_1 = __webpack_require__(42);
+exports.InteractiveDateComponent = InteractiveDateComponent_1.default;
+var Calendar_1 = __webpack_require__(232);
+exports.Calendar = Calendar_1.default;
+var View_1 = __webpack_require__(43);
+exports.View = View_1.default;
+var ViewRegistry_1 = __webpack_require__(24);
+exports.defineView = ViewRegistry_1.defineView;
+exports.getViewConfig = ViewRegistry_1.getViewConfig;
+var DayTableMixin_1 = __webpack_require__(60);
+exports.DayTableMixin = DayTableMixin_1.default;
+var BusinessHourRenderer_1 = __webpack_require__(61);
+exports.BusinessHourRenderer = BusinessHourRenderer_1.default;
+var EventRenderer_1 = __webpack_require__(44);
+exports.EventRenderer = EventRenderer_1.default;
+var FillRenderer_1 = __webpack_require__(62);
+exports.FillRenderer = FillRenderer_1.default;
+var HelperRenderer_1 = __webpack_require__(63);
+exports.HelperRenderer = HelperRenderer_1.default;
+var ExternalDropping_1 = __webpack_require__(233);
+exports.ExternalDropping = ExternalDropping_1.default;
+var EventResizing_1 = __webpack_require__(234);
+exports.EventResizing = EventResizing_1.default;
+var EventPointing_1 = __webpack_require__(64);
+exports.EventPointing = EventPointing_1.default;
+var EventDragging_1 = __webpack_require__(235);
+exports.EventDragging = EventDragging_1.default;
+var DateSelecting_1 = __webpack_require__(236);
+exports.DateSelecting = DateSelecting_1.default;
+var DateClicking_1 = __webpack_require__(237);
+exports.DateClicking = DateClicking_1.default;
+var Interaction_1 = __webpack_require__(14);
+exports.Interaction = Interaction_1.default;
+var StandardInteractionsMixin_1 = __webpack_require__(65);
+exports.StandardInteractionsMixin = StandardInteractionsMixin_1.default;
+var AgendaView_1 = __webpack_require__(238);
+exports.AgendaView = AgendaView_1.default;
+var TimeGrid_1 = __webpack_require__(239);
+exports.TimeGrid = TimeGrid_1.default;
+var TimeGridEventRenderer_1 = __webpack_require__(240);
+exports.TimeGridEventRenderer = TimeGridEventRenderer_1.default;
+var TimeGridFillRenderer_1 = __webpack_require__(242);
+exports.TimeGridFillRenderer = TimeGridFillRenderer_1.default;
+var TimeGridHelperRenderer_1 = __webpack_require__(241);
+exports.TimeGridHelperRenderer = TimeGridHelperRenderer_1.default;
+var DayGrid_1 = __webpack_require__(66);
+exports.DayGrid = DayGrid_1.default;
+var DayGridEventRenderer_1 = __webpack_require__(243);
+exports.DayGridEventRenderer = DayGridEventRenderer_1.default;
+var DayGridFillRenderer_1 = __webpack_require__(245);
+exports.DayGridFillRenderer = DayGridFillRenderer_1.default;
+var DayGridHelperRenderer_1 = __webpack_require__(244);
+exports.DayGridHelperRenderer = DayGridHelperRenderer_1.default;
+var BasicView_1 = __webpack_require__(67);
+exports.BasicView = BasicView_1.default;
+var BasicViewDateProfileGenerator_1 = __webpack_require__(68);
+exports.BasicViewDateProfileGenerator = BasicViewDateProfileGenerator_1.default;
+var MonthView_1 = __webpack_require__(246);
+exports.MonthView = MonthView_1.default;
+var MonthViewDateProfileGenerator_1 = __webpack_require__(247);
+exports.MonthViewDateProfileGenerator = MonthViewDateProfileGenerator_1.default;
+var ListView_1 = __webpack_require__(248);
+exports.ListView = ListView_1.default;
+var ListEventPointing_1 = __webpack_require__(250);
+exports.ListEventPointing = ListEventPointing_1.default;
+var ListEventRenderer_1 = __webpack_require__(249);
+exports.ListEventRenderer = ListEventRenderer_1.default;
+
+
+/***/ }),
+/* 19 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var EventRange_1 = __webpack_require__(50);
+var EventFootprint_1 = __webpack_require__(34);
+var ComponentFootprint_1 = __webpack_require__(12);
+function eventDefsToEventInstances(eventDefs, unzonedRange) {
+    var eventInstances = [];
+    var i;
+    for (i = 0; i < eventDefs.length; i++) {
+        eventInstances.push.apply(eventInstances, // append
+        eventDefs[i].buildInstances(unzonedRange));
+    }
+    return eventInstances;
+}
+exports.eventDefsToEventInstances = eventDefsToEventInstances;
+function eventInstanceToEventRange(eventInstance) {
+    return new EventRange_1.default(eventInstance.dateProfile.unzonedRange, eventInstance.def, eventInstance);
+}
+exports.eventInstanceToEventRange = eventInstanceToEventRange;
+function eventRangeToEventFootprint(eventRange) {
+    return new EventFootprint_1.default(new ComponentFootprint_1.default(eventRange.unzonedRange, eventRange.eventDef.isAllDay()), eventRange.eventDef, eventRange.eventInstance // might not exist
+    );
+}
+exports.eventRangeToEventFootprint = eventRangeToEventFootprint;
+function eventInstanceToUnzonedRange(eventInstance) {
+    return eventInstance.dateProfile.unzonedRange;
+}
+exports.eventInstanceToUnzonedRange = eventInstanceToUnzonedRange;
+function eventFootprintToComponentFootprint(eventFootprint) {
+    return eventFootprint.componentFootprint;
+}
+exports.eventFootprintToComponentFootprint = eventFootprintToComponentFootprint;
+
+
+/***/ }),
+/* 20 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var UnzonedRange_1 = __webpack_require__(5);
+var util_1 = __webpack_require__(19);
+var EventRange_1 = __webpack_require__(50);
+/*
+It's expected that there will be at least one EventInstance,
+OR that an explicitEventDef is assigned.
+*/
+var EventInstanceGroup = /** @class */ (function () {
+    function EventInstanceGroup(eventInstances) {
+        this.eventInstances = eventInstances || [];
+    }
+    EventInstanceGroup.prototype.getAllEventRanges = function (constraintRange) {
+        if (constraintRange) {
+            return this.sliceNormalRenderRanges(constraintRange);
+        }
+        else {
+            return this.eventInstances.map(util_1.eventInstanceToEventRange);
+        }
     };
-    return Theme;
+    EventInstanceGroup.prototype.sliceRenderRanges = function (constraintRange) {
+        if (this.isInverse()) {
+            return this.sliceInverseRenderRanges(constraintRange);
+        }
+        else {
+            return this.sliceNormalRenderRanges(constraintRange);
+        }
+    };
+    EventInstanceGroup.prototype.sliceNormalRenderRanges = function (constraintRange) {
+        var eventInstances = this.eventInstances;
+        var i;
+        var eventInstance;
+        var slicedRange;
+        var slicedEventRanges = [];
+        for (i = 0; i < eventInstances.length; i++) {
+            eventInstance = eventInstances[i];
+            slicedRange = eventInstance.dateProfile.unzonedRange.intersect(constraintRange);
+            if (slicedRange) {
+                slicedEventRanges.push(new EventRange_1.default(slicedRange, eventInstance.def, eventInstance));
+            }
+        }
+        return slicedEventRanges;
+    };
+    EventInstanceGroup.prototype.sliceInverseRenderRanges = function (constraintRange) {
+        var unzonedRanges = this.eventInstances.map(util_1.eventInstanceToUnzonedRange);
+        var ownerDef = this.getEventDef();
+        unzonedRanges = UnzonedRange_1.default.invertRanges(unzonedRanges, constraintRange);
+        return unzonedRanges.map(function (unzonedRange) {
+            return new EventRange_1.default(unzonedRange, ownerDef); // don't give an EventInstance
+        });
+    };
+    EventInstanceGroup.prototype.isInverse = function () {
+        return this.getEventDef().hasInverseRendering();
+    };
+    EventInstanceGroup.prototype.getEventDef = function () {
+        return this.explicitEventDef || this.eventInstances[0].def;
+    };
+    return EventInstanceGroup;
 }());
-exports.default = Theme;
-Theme.prototype.classes = {};
-Theme.prototype.iconClasses = {};
-Theme.prototype.baseIconClass = '';
-Theme.prototype.iconOverridePrefix = '';
+exports.default = EventInstanceGroup;
 
 
 /***/ }),
-/* 20 */
+/* 21 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -2138,30 +2372,96 @@
 
 
 /***/ }),
-/* 21 */
+/* 22 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var $ = __webpack_require__(3);
-var exportHooks = __webpack_require__(16);
-var EmitterMixin_1 = __webpack_require__(11);
-var ListenerMixin_1 = __webpack_require__(7);
-exportHooks.touchMouseIgnoreWait = 500;
-var globalEmitter = null;
-var neededCount = 0;
-/*
-Listens to document and window-level user-interaction events, like touch events and mouse events,
-and fires these events as-is to whoever is observing a GlobalEmitter.
-Best when used as a singleton via GlobalEmitter.get()
-
-Normalizes mouse/touch events. For examples:
-- ignores the the simulated mouse events that happen after a quick tap: mousemove+mousedown+mouseup+click
-- compensates for various buggy scenarios where a touchend does not fire
-*/
-var GlobalEmitter = /** @class */ (function () {
-    function GlobalEmitter() {
-        this.isTouching = false;
-        this.mouseIgnoreDepth = 0;
+var Theme = /** @class */ (function () {
+    function Theme(optionsManager) {
+        this.optionsManager = optionsManager;
+        this.processIconOverride();
+    }
+    Theme.prototype.processIconOverride = function () {
+        if (this.iconOverrideOption) {
+            this.setIconOverride(this.optionsManager.get(this.iconOverrideOption));
+        }
+    };
+    Theme.prototype.setIconOverride = function (iconOverrideHash) {
+        var iconClassesCopy;
+        var buttonName;
+        if ($.isPlainObject(iconOverrideHash)) {
+            iconClassesCopy = $.extend({}, this.iconClasses);
+            for (buttonName in iconOverrideHash) {
+                iconClassesCopy[buttonName] = this.applyIconOverridePrefix(iconOverrideHash[buttonName]);
+            }
+            this.iconClasses = iconClassesCopy;
+        }
+        else if (iconOverrideHash === false) {
+            this.iconClasses = {};
+        }
+    };
+    Theme.prototype.applyIconOverridePrefix = function (className) {
+        var prefix = this.iconOverridePrefix;
+        if (prefix && className.indexOf(prefix) !== 0) { // if not already present
+            className = prefix + className;
+        }
+        return className;
+    };
+    Theme.prototype.getClass = function (key) {
+        return this.classes[key] || '';
+    };
+    Theme.prototype.getIconClass = function (buttonName) {
+        var className = this.iconClasses[buttonName];
+        if (className) {
+            return this.baseIconClass + ' ' + className;
+        }
+        return '';
+    };
+    Theme.prototype.getCustomButtonIconClass = function (customButtonProps) {
+        var className;
+        if (this.iconOverrideCustomButtonOption) {
+            className = customButtonProps[this.iconOverrideCustomButtonOption];
+            if (className) {
+                return this.baseIconClass + ' ' + this.applyIconOverridePrefix(className);
+            }
+        }
+        return '';
+    };
+    return Theme;
+}());
+exports.default = Theme;
+Theme.prototype.classes = {};
+Theme.prototype.iconClasses = {};
+Theme.prototype.baseIconClass = '';
+Theme.prototype.iconOverridePrefix = '';
+
+
+/***/ }),
+/* 23 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var $ = __webpack_require__(3);
+var exportHooks = __webpack_require__(18);
+var EmitterMixin_1 = __webpack_require__(13);
+var ListenerMixin_1 = __webpack_require__(7);
+exportHooks.touchMouseIgnoreWait = 500;
+var globalEmitter = null;
+var neededCount = 0;
+/*
+Listens to document and window-level user-interaction events, like touch events and mouse events,
+and fires these events as-is to whoever is observing a GlobalEmitter.
+Best when used as a singleton via GlobalEmitter.get()
+
+Normalizes mouse/touch events. For examples:
+- ignores the the simulated mouse events that happen after a quick tap: mousemove+mousedown+mouseup+click
+- compensates for various buggy scenarios where a touchend does not fire
+*/
+var GlobalEmitter = /** @class */ (function () {
+    function GlobalEmitter() {
+        this.isTouching = false;
+        this.mouseIgnoreDepth = 0;
     }
     // gets the singleton
     GlobalEmitter.get = function () {
@@ -2179,7 +2479,7 @@
     // called when the object that originally called needed() doesn't need a GlobalEmitter anymore.
     GlobalEmitter.unneeded = function () {
         neededCount--;
-        if (!neededCount) {
+        if (!neededCount) { // nobody else needs it
             globalEmitter.unbind();
             globalEmitter = null;
         }
@@ -2214,7 +2514,8 @@
     };
     GlobalEmitter.prototype.unbind = function () {
         this.stopListeningTo($(document));
-        window.removeEventListener('touchmove', this.handleTouchMoveProxy);
+        window.removeEventListener('touchmove', this.handleTouchMoveProxy, { passive: false } // use same options as addEventListener
+        );
         window.removeEventListener('scroll', this.handleScrollProxy, true // useCapture
         );
     };
@@ -2309,11 +2610,11 @@
 
 
 /***/ }),
-/* 22 */
+/* 24 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var exportHooks = __webpack_require__(16);
+var exportHooks = __webpack_require__(18);
 exports.viewHash = {};
 exportHooks.views = exports.viewHash;
 function defineView(viewName, viewConfig) {
@@ -2327,184 +2628,21 @@
 
 
 /***/ }),
-/* 23 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var util_1 = __webpack_require__(4);
-var DragListener_1 = __webpack_require__(54);
-/* Tracks mouse movements over a component and raises events about which hit the mouse is over.
-------------------------------------------------------------------------------------------------------------------------
-options:
-- subjectEl
-- subjectCenter
-*/
-var HitDragListener = /** @class */ (function (_super) {
-    tslib_1.__extends(HitDragListener, _super);
-    function HitDragListener(component, options) {
-        var _this = _super.call(this, options) || this;
-        _this.component = component;
-        return _this;
-    }
-    // Called when drag listening starts (but a real drag has not necessarily began).
-    // ev might be undefined if dragging was started manually.
-    HitDragListener.prototype.handleInteractionStart = function (ev) {
-        var subjectEl = this.subjectEl;
-        var subjectRect;
-        var origPoint;
-        var point;
-        this.component.hitsNeeded();
-        this.computeScrollBounds(); // for autoscroll
-        if (ev) {
-            origPoint = { left: util_1.getEvX(ev), top: util_1.getEvY(ev) };
-            point = origPoint;
-            // constrain the point to bounds of the element being dragged
-            if (subjectEl) {
-                subjectRect = util_1.getOuterRect(subjectEl); // used for centering as well
-                point = util_1.constrainPoint(point, subjectRect);
-            }
-            this.origHit = this.queryHit(point.left, point.top);
-            // treat the center of the subject as the collision point?
-            if (subjectEl && this.options.subjectCenter) {
-                // only consider the area the subject overlaps the hit. best for large subjects.
-                // TODO: skip this if hit didn't supply left/right/top/bottom
-                if (this.origHit) {
-                    subjectRect = util_1.intersectRects(this.origHit, subjectRect) ||
-                        subjectRect; // in case there is no intersection
-                }
-                point = util_1.getRectCenter(subjectRect);
-            }
-            this.coordAdjust = util_1.diffPoints(point, origPoint); // point - origPoint
-        }
-        else {
-            this.origHit = null;
-            this.coordAdjust = null;
-        }
-        // call the super-method. do it after origHit has been computed
-        _super.prototype.handleInteractionStart.call(this, ev);
-    };
-    // Called when the actual drag has started
-    HitDragListener.prototype.handleDragStart = function (ev) {
-        var hit;
-        _super.prototype.handleDragStart.call(this, ev);
-        // might be different from this.origHit if the min-distance is large
-        hit = this.queryHit(util_1.getEvX(ev), util_1.getEvY(ev));
-        // report the initial hit the mouse is over
-        // especially important if no min-distance and drag starts immediately
-        if (hit) {
-            this.handleHitOver(hit);
-        }
-    };
-    // Called when the drag moves
-    HitDragListener.prototype.handleDrag = function (dx, dy, ev) {
-        var hit;
-        _super.prototype.handleDrag.call(this, dx, dy, ev);
-        hit = this.queryHit(util_1.getEvX(ev), util_1.getEvY(ev));
-        if (!isHitsEqual(hit, this.hit)) {
-            if (this.hit) {
-                this.handleHitOut();
-            }
-            if (hit) {
-                this.handleHitOver(hit);
-            }
-        }
-    };
-    // Called when dragging has been stopped
-    HitDragListener.prototype.handleDragEnd = function (ev) {
-        this.handleHitDone();
-        _super.prototype.handleDragEnd.call(this, ev);
-    };
-    // Called when a the mouse has just moved over a new hit
-    HitDragListener.prototype.handleHitOver = function (hit) {
-        var isOrig = isHitsEqual(hit, this.origHit);
-        this.hit = hit;
-        this.trigger('hitOver', this.hit, isOrig, this.origHit);
-    };
-    // Called when the mouse has just moved out of a hit
-    HitDragListener.prototype.handleHitOut = function () {
-        if (this.hit) {
-            this.trigger('hitOut', this.hit);
-            this.handleHitDone();
-            this.hit = null;
-        }
-    };
-    // Called after a hitOut. Also called before a dragStop
-    HitDragListener.prototype.handleHitDone = function () {
-        if (this.hit) {
-            this.trigger('hitDone', this.hit);
-        }
-    };
-    // Called when the interaction ends, whether there was a real drag or not
-    HitDragListener.prototype.handleInteractionEnd = function (ev, isCancelled) {
-        _super.prototype.handleInteractionEnd.call(this, ev, isCancelled);
-        this.origHit = null;
-        this.hit = null;
-        this.component.hitsNotNeeded();
-    };
-    // Called when scrolling has stopped, whether through auto scroll, or the user scrolling
-    HitDragListener.prototype.handleScrollEnd = function () {
-        _super.prototype.handleScrollEnd.call(this);
-        // hits' absolute positions will be in new places after a user's scroll.
-        // HACK for recomputing.
-        if (this.isDragging) {
-            this.component.releaseHits();
-            this.component.prepareHits();
-        }
-    };
-    // Gets the hit underneath the coordinates for the given mouse event
-    HitDragListener.prototype.queryHit = function (left, top) {
-        if (this.coordAdjust) {
-            left += this.coordAdjust.left;
-            top += this.coordAdjust.top;
-        }
-        return this.component.queryHit(left, top);
-    };
-    return HitDragListener;
-}(DragListener_1.default));
-exports.default = HitDragListener;
-// Returns `true` if the hits are identically equal. `false` otherwise. Must be from the same component.
-// Two null values will be considered equal, as two "out of the component" states are the same.
-function isHitsEqual(hit0, hit1) {
-    if (!hit0 && !hit1) {
-        return true;
-    }
-    if (hit0 && hit1) {
-        return hit0.component === hit1.component &&
-            isHitPropsWithin(hit0, hit1) &&
-            isHitPropsWithin(hit1, hit0); // ensures all props are identical
-    }
-    return false;
-}
-// Returns true if all of subHit's non-standard properties are within superHit
-function isHitPropsWithin(subHit, superHit) {
-    for (var propName in subHit) {
-        if (!/^(component|left|right|top|bottom)$/.test(propName)) {
-            if (subHit[propName] !== superHit[propName]) {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
-
-/***/ }),
-/* 24 */,
 /* 25 */,
 /* 26 */,
 /* 27 */,
 /* 28 */,
 /* 29 */,
 /* 30 */,
-/* 31 */
+/* 31 */,
+/* 32 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var $ = __webpack_require__(3);
 var moment = __webpack_require__(0);
-var exportHooks = __webpack_require__(16);
-var options_1 = __webpack_require__(32);
+var exportHooks = __webpack_require__(18);
+var options_1 = __webpack_require__(33);
 var util_1 = __webpack_require__(4);
 exports.localeOptionHash = {};
 exportHooks.locales = exports.localeOptionHash;
@@ -2667,7 +2805,7 @@
 
 
 /***/ }),
-/* 32 */
+/* 33 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -2781,14 +2919,35 @@
 
 
 /***/ }),
-/* 33 */
-/***/ (function(module, exports, __webpack_require__) {
+/* 34 */
+/***/ (function(module, exports) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var util_1 = __webpack_require__(4);
-// Class that all other classes will inherit from
-var Class = /** @class */ (function () {
+var EventFootprint = /** @class */ (function () {
+    function EventFootprint(componentFootprint, eventDef, eventInstance) {
+        this.componentFootprint = componentFootprint;
+        this.eventDef = eventDef;
+        if (eventInstance) {
+            this.eventInstance = eventInstance;
+        }
+    }
+    EventFootprint.prototype.getEventLegacy = function () {
+        return (this.eventInstance || this.eventDef).toLegacy();
+    };
+    return EventFootprint;
+}());
+exports.default = EventFootprint;
+
+
+/***/ }),
+/* 35 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var util_1 = __webpack_require__(4);
+// Class that all other classes will inherit from
+var Class = /** @class */ (function () {
     function Class() {
     }
     // Called on a class to create a subclass.
@@ -2815,12 +2974,34 @@
 
 
 /***/ }),
-/* 34 */
+/* 36 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var moment = __webpack_require__(0);
+var util_1 = __webpack_require__(4);
+var SingleEventDef_1 = __webpack_require__(9);
+var RecurringEventDef_1 = __webpack_require__(54);
+exports.default = {
+    parse: function (eventInput, source) {
+        if (util_1.isTimeString(eventInput.start) || moment.isDuration(eventInput.start) ||
+            util_1.isTimeString(eventInput.end) || moment.isDuration(eventInput.end)) {
+            return RecurringEventDef_1.default.parse(eventInput, source);
+        }
+        else {
+            return SingleEventDef_1.default.parse(eventInput, source);
+        }
+    }
+};
+
+
+/***/ }),
+/* 37 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var $ = __webpack_require__(3);
-var ParsableModelMixin_1 = __webpack_require__(208);
+var ParsableModelMixin_1 = __webpack_require__(52);
 var EventDef = /** @class */ (function () {
     function EventDef(source) {
         this.source = source;
@@ -2918,7 +3099,7 @@
         else {
             this.id = EventDef.generateId();
         }
-        if (rawProps._id != null) {
+        if (rawProps._id != null) { // accept this prop, even tho somewhat internal
             this.uid = String(rawProps._id);
         }
         else {
@@ -2966,73 +3147,39 @@
 
 
 /***/ }),
-/* 35 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var EventRange_1 = __webpack_require__(211);
-var EventFootprint_1 = __webpack_require__(36);
-var ComponentFootprint_1 = __webpack_require__(12);
-function eventDefsToEventInstances(eventDefs, unzonedRange) {
-    var eventInstances = [];
-    var i;
-    for (i = 0; i < eventDefs.length; i++) {
-        eventInstances.push.apply(eventInstances, // append
-        eventDefs[i].buildInstances(unzonedRange));
-    }
-    return eventInstances;
-}
-exports.eventDefsToEventInstances = eventDefsToEventInstances;
-function eventInstanceToEventRange(eventInstance) {
-    return new EventRange_1.default(eventInstance.dateProfile.unzonedRange, eventInstance.def, eventInstance);
-}
-exports.eventInstanceToEventRange = eventInstanceToEventRange;
-function eventRangeToEventFootprint(eventRange) {
-    return new EventFootprint_1.default(new ComponentFootprint_1.default(eventRange.unzonedRange, eventRange.eventDef.isAllDay()), eventRange.eventDef, eventRange.eventInstance // might not exist
-    );
-}
-exports.eventRangeToEventFootprint = eventRangeToEventFootprint;
-function eventInstanceToUnzonedRange(eventInstance) {
-    return eventInstance.dateProfile.unzonedRange;
-}
-exports.eventInstanceToUnzonedRange = eventInstanceToUnzonedRange;
-function eventFootprintToComponentFootprint(eventFootprint) {
-    return eventFootprint.componentFootprint;
-}
-exports.eventFootprintToComponentFootprint = eventFootprintToComponentFootprint;
-
-
-/***/ }),
-/* 36 */
+/* 38 */
 /***/ (function(module, exports) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var EventFootprint = /** @class */ (function () {
-    function EventFootprint(componentFootprint, eventDef, eventInstance) {
-        this.componentFootprint = componentFootprint;
-        this.eventDef = eventDef;
-        if (eventInstance) {
-            this.eventInstance = eventInstance;
+exports.default = {
+    sourceClasses: [],
+    registerClass: function (EventSourceClass) {
+        this.sourceClasses.unshift(EventSourceClass); // give highest priority
+    },
+    parse: function (rawInput, calendar) {
+        var sourceClasses = this.sourceClasses;
+        var i;
+        var eventSource;
+        for (i = 0; i < sourceClasses.length; i++) {
+            eventSource = sourceClasses[i].parse(rawInput, calendar);
+            if (eventSource) {
+                return eventSource;
+            }
         }
     }
-    EventFootprint.prototype.getEventLegacy = function () {
-        return (this.eventInstance || this.eventDef).toLegacy();
-    };
-    return EventFootprint;
-}());
-exports.default = EventFootprint;
+};
 
 
 /***/ }),
-/* 37 */
+/* 39 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var util_1 = __webpack_require__(4);
-var EventDateProfile_1 = __webpack_require__(17);
-var EventDef_1 = __webpack_require__(34);
-var EventDefDateMutation_1 = __webpack_require__(50);
-var SingleEventDef_1 = __webpack_require__(13);
+var EventDateProfile_1 = __webpack_require__(16);
+var EventDef_1 = __webpack_require__(37);
+var EventDefDateMutation_1 = __webpack_require__(40);
+var SingleEventDef_1 = __webpack_require__(9);
 var EventDefMutation = /** @class */ (function () {
     function EventDefMutation() {
     }
@@ -3055,12 +3202,12 @@
             else if (eventDef.isStandardProp(propName)) {
                 standardProps[propName] = rawProps[propName];
             }
-            else if (eventDef.miscProps[propName] !== rawProps[propName]) {
+            else if (eventDef.miscProps[propName] !== rawProps[propName]) { // only if changed
                 miscProps[propName] = rawProps[propName];
             }
         }
         dateProfile = EventDateProfile_1.default.parse(dateProps, eventDef.source);
-        if (dateProfile) {
+        if (dateProfile) { // no failure?
             dateMutation = EventDefDateMutation_1.default.createFromDiff(eventInstance.dateProfile, dateProfile, largeUnit);
         }
         if (standardProps.id !== eventDef.id) {
@@ -3138,127 +3285,245 @@
 
 
 /***/ }),
-/* 38 */
-/***/ (function(module, exports) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    sourceClasses: [],
-    registerClass: function (EventSourceClass) {
-        this.sourceClasses.unshift(EventSourceClass); // give highest priority
-    },
-    parse: function (rawInput, calendar) {
-        var sourceClasses = this.sourceClasses;
-        var i;
-        var eventSource;
-        for (i = 0; i < sourceClasses.length; i++) {
-            eventSource = sourceClasses[i].parse(rawInput, calendar);
-            if (eventSource) {
-                return eventSource;
-            }
-        }
-    }
-};
-
-
-/***/ }),
-/* 39 */
+/* 40 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var $ = __webpack_require__(3);
 var util_1 = __webpack_require__(4);
-var Class_1 = __webpack_require__(33);
-/*
-Embodies a div that has potential scrollbars
-*/
-var Scroller = /** @class */ (function (_super) {
-    tslib_1.__extends(Scroller, _super);
-    function Scroller(options) {
-        var _this = _super.call(this) || this;
-        options = options || {};
-        _this.overflowX = options.overflowX || options.overflow || 'auto';
-        _this.overflowY = options.overflowY || options.overflow || 'auto';
-        return _this;
+var EventDateProfile_1 = __webpack_require__(16);
+var EventDefDateMutation = /** @class */ (function () {
+    function EventDefDateMutation() {
+        this.clearEnd = false;
+        this.forceTimed = false;
+        this.forceAllDay = false;
     }
-    Scroller.prototype.render = function () {
-        this.el = this.renderEl();
-        this.applyOverflow();
-    };
-    Scroller.prototype.renderEl = function () {
-        return (this.scrollEl = $('<div class="fc-scroller"></div>'));
-    };
-    // sets to natural height, unlocks overflow
-    Scroller.prototype.clear = function () {
-        this.setHeight('auto');
-        this.applyOverflow();
-    };
-    Scroller.prototype.destroy = function () {
-        this.el.remove();
-    };
-    // Overflow
-    // -----------------------------------------------------------------------------------------------------------------
-    Scroller.prototype.applyOverflow = function () {
-        this.scrollEl.css({
-            'overflow-x': this.overflowX,
-            'overflow-y': this.overflowY
-        });
-    };
-    // Causes any 'auto' overflow values to resolves to 'scroll' or 'hidden'.
-    // Useful for preserving scrollbar widths regardless of future resizes.
-    // Can pass in scrollbarWidths for optimization.
-    Scroller.prototype.lockOverflow = function (scrollbarWidths) {
-        var overflowX = this.overflowX;
-        var overflowY = this.overflowY;
-        scrollbarWidths = scrollbarWidths || this.getScrollbarWidths();
-        if (overflowX === 'auto') {
-            overflowX = (scrollbarWidths.top || scrollbarWidths.bottom || // horizontal scrollbars?
-                // OR scrolling pane with massless scrollbars?
-                this.scrollEl[0].scrollWidth - 1 > this.scrollEl[0].clientWidth) ? 'scroll' : 'hidden';
+    EventDefDateMutation.createFromDiff = function (dateProfile0, dateProfile1, largeUnit) {
+        var clearEnd = dateProfile0.end && !dateProfile1.end;
+        var forceTimed = dateProfile0.isAllDay() && !dateProfile1.isAllDay();
+        var forceAllDay = !dateProfile0.isAllDay() && dateProfile1.isAllDay();
+        var dateDelta;
+        var endDiff;
+        var endDelta;
+        var mutation;
+        // subtracts the dates in the appropriate way, returning a duration
+        function subtractDates(date1, date0) {
+            if (largeUnit) {
+                return util_1.diffByUnit(date1, date0, largeUnit); // poorly named
+            }
+            else if (dateProfile1.isAllDay()) {
+                return util_1.diffDay(date1, date0); // poorly named
+            }
+            else {
+                return util_1.diffDayTime(date1, date0); // poorly named
+            }
         }
-        if (overflowY === 'auto') {
-            overflowY = (scrollbarWidths.left || scrollbarWidths.right || // vertical scrollbars?
-                // OR scrolling pane with massless scrollbars?
-                this.scrollEl[0].scrollHeight - 1 > this.scrollEl[0].clientHeight) ? 'scroll' : 'hidden';
+        dateDelta = subtractDates(dateProfile1.start, dateProfile0.start);
+        if (dateProfile1.end) {
+            // use unzonedRanges because dateProfile0.end might be null
+            endDiff = subtractDates(dateProfile1.unzonedRange.getEnd(), dateProfile0.unzonedRange.getEnd());
+            endDelta = endDiff.subtract(dateDelta);
         }
-        this.scrollEl.css({ 'overflow-x': overflowX, 'overflow-y': overflowY });
-    };
-    // Getters / Setters
-    // -----------------------------------------------------------------------------------------------------------------
-    Scroller.prototype.setHeight = function (height) {
-        this.scrollEl.height(height);
-    };
-    Scroller.prototype.getScrollTop = function () {
-        return this.scrollEl.scrollTop();
-    };
-    Scroller.prototype.setScrollTop = function (top) {
-        this.scrollEl.scrollTop(top);
-    };
-    Scroller.prototype.getClientWidth = function () {
-        return this.scrollEl[0].clientWidth;
-    };
-    Scroller.prototype.getClientHeight = function () {
-        return this.scrollEl[0].clientHeight;
-    };
-    Scroller.prototype.getScrollbarWidths = function () {
-        return util_1.getScrollbarWidths(this.scrollEl);
+        mutation = new EventDefDateMutation();
+        mutation.clearEnd = clearEnd;
+        mutation.forceTimed = forceTimed;
+        mutation.forceAllDay = forceAllDay;
+        mutation.setDateDelta(dateDelta);
+        mutation.setEndDelta(endDelta);
+        return mutation;
     };
-    return Scroller;
-}(Class_1.default));
-exports.default = Scroller;
-
-
-/***/ }),
-/* 40 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
+    /*
+    returns an undo function.
+    */
+    EventDefDateMutation.prototype.buildNewDateProfile = function (eventDateProfile, calendar) {
+        var start = eventDateProfile.start.clone();
+        var end = null;
+        var shouldRezone = false;
+        if (eventDateProfile.end && !this.clearEnd) {
+            end = eventDateProfile.end.clone();
+        }
+        else if (this.endDelta && !end) {
+            end = calendar.getDefaultEventEnd(eventDateProfile.isAllDay(), start);
+        }
+        if (this.forceTimed) {
+            shouldRezone = true;
+            if (!start.hasTime()) {
+                start.time(0);
+            }
+            if (end && !end.hasTime()) {
+                end.time(0);
+            }
+        }
+        else if (this.forceAllDay) {
+            if (start.hasTime()) {
+                start.stripTime();
+            }
+            if (end && end.hasTime()) {
+                end.stripTime();
+            }
+        }
+        if (this.dateDelta) {
+            shouldRezone = true;
+            start.add(this.dateDelta);
+            if (end) {
+                end.add(this.dateDelta);
+            }
+        }
+        // do this before adding startDelta to start, so we can work off of start
+        if (this.endDelta) {
+            shouldRezone = true;
+            end.add(this.endDelta);
+        }
+        if (this.startDelta) {
+            shouldRezone = true;
+            start.add(this.startDelta);
+        }
+        if (shouldRezone) {
+            start = calendar.applyTimezone(start);
+            if (end) {
+                end = calendar.applyTimezone(end);
+            }
+        }
+        // TODO: okay to access calendar option?
+        if (!end && calendar.opt('forceEventDuration')) {
+            end = calendar.getDefaultEventEnd(eventDateProfile.isAllDay(), start);
+        }
+        return new EventDateProfile_1.default(start, end, calendar);
+    };
+    EventDefDateMutation.prototype.setDateDelta = function (dateDelta) {
+        if (dateDelta && dateDelta.valueOf()) {
+            this.dateDelta = dateDelta;
+        }
+        else {
+            this.dateDelta = null;
+        }
+    };
+    EventDefDateMutation.prototype.setStartDelta = function (startDelta) {
+        if (startDelta && startDelta.valueOf()) {
+            this.startDelta = startDelta;
+        }
+        else {
+            this.startDelta = null;
+        }
+    };
+    EventDefDateMutation.prototype.setEndDelta = function (endDelta) {
+        if (endDelta && endDelta.valueOf()) {
+            this.endDelta = endDelta;
+        }
+        else {
+            this.endDelta = null;
+        }
+    };
+    EventDefDateMutation.prototype.isEmpty = function () {
+        return !this.clearEnd && !this.forceTimed && !this.forceAllDay &&
+            !this.dateDelta && !this.startDelta && !this.endDelta;
+    };
+    return EventDefDateMutation;
+}());
+exports.default = EventDefDateMutation;
+
+
+/***/ }),
+/* 41 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var $ = __webpack_require__(3);
+var util_1 = __webpack_require__(4);
+var Class_1 = __webpack_require__(35);
+/*
+Embodies a div that has potential scrollbars
+*/
+var Scroller = /** @class */ (function (_super) {
+    tslib_1.__extends(Scroller, _super);
+    function Scroller(options) {
+        var _this = _super.call(this) || this;
+        options = options || {};
+        _this.overflowX = options.overflowX || options.overflow || 'auto';
+        _this.overflowY = options.overflowY || options.overflow || 'auto';
+        return _this;
+    }
+    Scroller.prototype.render = function () {
+        this.el = this.renderEl();
+        this.applyOverflow();
+    };
+    Scroller.prototype.renderEl = function () {
+        return (this.scrollEl = $('<div class="fc-scroller"></div>'));
+    };
+    // sets to natural height, unlocks overflow
+    Scroller.prototype.clear = function () {
+        this.setHeight('auto');
+        this.applyOverflow();
+    };
+    Scroller.prototype.destroy = function () {
+        this.el.remove();
+    };
+    // Overflow
+    // -----------------------------------------------------------------------------------------------------------------
+    Scroller.prototype.applyOverflow = function () {
+        this.scrollEl.css({
+            'overflow-x': this.overflowX,
+            'overflow-y': this.overflowY
+        });
+    };
+    // Causes any 'auto' overflow values to resolves to 'scroll' or 'hidden'.
+    // Useful for preserving scrollbar widths regardless of future resizes.
+    // Can pass in scrollbarWidths for optimization.
+    Scroller.prototype.lockOverflow = function (scrollbarWidths) {
+        var overflowX = this.overflowX;
+        var overflowY = this.overflowY;
+        scrollbarWidths = scrollbarWidths || this.getScrollbarWidths();
+        if (overflowX === 'auto') {
+            overflowX = (scrollbarWidths.top || scrollbarWidths.bottom || // horizontal scrollbars?
+                // OR scrolling pane with massless scrollbars?
+                this.scrollEl[0].scrollWidth - 1 > this.scrollEl[0].clientWidth
+            // subtract 1 because of IE off-by-one issue
+            ) ? 'scroll' : 'hidden';
+        }
+        if (overflowY === 'auto') {
+            overflowY = (scrollbarWidths.left || scrollbarWidths.right || // vertical scrollbars?
+                // OR scrolling pane with massless scrollbars?
+                this.scrollEl[0].scrollHeight - 1 > this.scrollEl[0].clientHeight
+            // subtract 1 because of IE off-by-one issue
+            ) ? 'scroll' : 'hidden';
+        }
+        this.scrollEl.css({ 'overflow-x': overflowX, 'overflow-y': overflowY });
+    };
+    // Getters / Setters
+    // -----------------------------------------------------------------------------------------------------------------
+    Scroller.prototype.setHeight = function (height) {
+        this.scrollEl.height(height);
+    };
+    Scroller.prototype.getScrollTop = function () {
+        return this.scrollEl.scrollTop();
+    };
+    Scroller.prototype.setScrollTop = function (top) {
+        this.scrollEl.scrollTop(top);
+    };
+    Scroller.prototype.getClientWidth = function () {
+        return this.scrollEl[0].clientWidth;
+    };
+    Scroller.prototype.getClientHeight = function () {
+        return this.scrollEl[0].clientHeight;
+    };
+    Scroller.prototype.getScrollbarWidths = function () {
+        return util_1.getScrollbarWidths(this.scrollEl);
+    };
+    return Scroller;
+}(Class_1.default));
+exports.default = Scroller;
+
+
+/***/ }),
+/* 42 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
 var $ = __webpack_require__(3);
 var util_1 = __webpack_require__(4);
-var DateComponent_1 = __webpack_require__(219);
-var GlobalEmitter_1 = __webpack_require__(21);
+var DateComponent_1 = __webpack_require__(231);
+var GlobalEmitter_1 = __webpack_require__(23);
 var InteractiveDateComponent = /** @class */ (function (_super) {
     tslib_1.__extends(InteractiveDateComponent, _super);
     function InteractiveDateComponent(_view, _options) {
@@ -3505,7 +3770,7 @@
 
 
 /***/ }),
-/* 41 */
+/* 43 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -3513,10 +3778,10 @@
 var $ = __webpack_require__(3);
 var moment = __webpack_require__(0);
 var util_1 = __webpack_require__(4);
-var RenderQueue_1 = __webpack_require__(218);
-var DateProfileGenerator_1 = __webpack_require__(221);
-var InteractiveDateComponent_1 = __webpack_require__(40);
-var GlobalEmitter_1 = __webpack_require__(21);
+var RenderQueue_1 = __webpack_require__(229);
+var DateProfileGenerator_1 = __webpack_require__(55);
+var InteractiveDateComponent_1 = __webpack_require__(42);
+var GlobalEmitter_1 = __webpack_require__(23);
 var UnzonedRange_1 = __webpack_require__(5);
 /* An abstract class from which other views inherit from
 ----------------------------------------------------------------------------------------------------------------------*/
@@ -3566,7 +3831,7 @@
         this.addScroll(this.queryScroll());
     };
     View.prototype.onRenderQueueStop = function () {
-        if (this.calendar.updateViewSize()) {
+        if (this.calendar.updateViewSize()) { // success?
             this.popScroll();
         }
         this.calendar.thawContentHeight();
@@ -3602,7 +3867,7 @@
         if (/^(year|month)$/.test(dateProfile.currentRangeUnit)) {
             unzonedRange = dateProfile.currentUnzonedRange;
         }
-        else {
+        else { // for day units or smaller, use the actual day range
             unzonedRange = dateProfile.activeUnzonedRange;
         }
         return this.formatRange({
@@ -3828,7 +4093,7 @@
     /* Dimensions
     ------------------------------------------------------------------------------------------------------------------*/
     View.prototype.updateSize = function (totalHeight, isAuto, isResize) {
-        if (this['setHeight']) {
+        if (this['setHeight']) { // for legacy API
             this['setHeight'](totalHeight, isAuto);
         }
         else {
@@ -3945,15 +4210,16 @@
         var undoFunc = eventManager.mutateEventsWithId(eventInstance.def.id, eventMutation);
         // update the EventInstance, for handlers
         eventInstance.dateProfile = eventMutation.dateMutation.buildNewDateProfile(eventInstance.dateProfile, this.calendar);
-        this.triggerEventResize(eventInstance, eventMutation.dateMutation.endDelta, undoFunc, el, ev);
+        var resizeDelta = eventMutation.dateMutation.endDelta || eventMutation.dateMutation.startDelta;
+        this.triggerEventResize(eventInstance, resizeDelta, undoFunc, el, ev);
     };
     // Triggers event-resize handlers that have subscribed via the API
-    View.prototype.triggerEventResize = function (eventInstance, durationDelta, undoFunc, el, ev) {
+    View.prototype.triggerEventResize = function (eventInstance, resizeDelta, undoFunc, el, ev) {
         this.publiclyTrigger('eventResize', {
             context: el[0],
             args: [
                 eventInstance.toLegacy(),
-                durationDelta,
+                resizeDelta,
                 undoFunc,
                 ev,
                 {},
@@ -3971,7 +4237,7 @@
         this.reportSelection(footprint, ev);
     };
     View.prototype.renderSelectionFootprint = function (footprint) {
-        if (this['renderSelection']) {
+        if (this['renderSelection']) { // legacy method in custom view classes
             this['renderSelection'](footprint.toLegacy(this.calendar));
         }
         else {
@@ -4030,7 +4296,7 @@
     View.prototype.unselectEventInstance = function () {
         if (this.selectedEventInstance) {
             this.getEventSegs().forEach(function (seg) {
-                if (seg.el) {
+                if (seg.el) { // necessary?
                     seg.el.removeClass('fc-selected');
                 }
             });
@@ -4218,7 +4484,7 @@
 
 
 /***/ }),
-/* 42 */
+/* 44 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -4282,7 +4548,7 @@
         // render an `.el` on each seg
         // returns a subset of the segs. segs that were actually rendered
         segs = this.renderFgSegEls(segs);
-        if (this.renderFgSegs(segs) !== false) {
+        if (this.renderFgSegs(segs) !== false) { // no failure?
             this.fgSegs = segs;
         }
     };
@@ -4293,7 +4559,7 @@
     EventRenderer.prototype.renderBgRanges = function (eventRanges) {
         var eventFootprints = this.component.eventRangesToEventFootprints(eventRanges);
         var segs = this.component.eventFootprintsToSegs(eventFootprints);
-        if (this.renderBgSegs(segs) !== false) {
+        if (this.renderBgSegs(segs) !== false) { // no failure?
             this.bgSegs = segs;
         }
     };
@@ -4349,7 +4615,7 @@
         var html = '';
         var renderedSegs = [];
         var i;
-        if (segs.length) {
+        if (segs.length) { // don't build an empty html string
             // build a large concatenation of event segment HTML
             for (i = 0; i < segs.length; i++) {
                 this.beforeFgSegHtml(segs[i]);
@@ -4360,7 +4626,7 @@
             $(html).each(function (i, node) {
                 var seg = segs[i];
                 var el = $(node);
-                if (hasEventRenderHandlers) {
+                if (hasEventRenderHandlers) { // optimization
                     el = _this.filterEventRenderEl(seg.footprint, el);
                 }
                 if (el) {
@@ -4405,7 +4671,7 @@
             context: legacy,
             args: [legacy, el, this.view]
         });
-        if (custom === false) {
+        if (custom === false) { // means don't render at all
             el = null;
         }
         else if (custom && custom !== true) {
@@ -4543,19 +4809,19 @@
 
 
 /***/ }),
-/* 43 */,
-/* 44 */,
 /* 45 */,
 /* 46 */,
-/* 47 */
+/* 47 */,
+/* 48 */,
+/* 49 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var moment_ext_1 = __webpack_require__(10);
+var moment_ext_1 = __webpack_require__(11);
 // Plugin
 // -------------------------------------------------------------------------------------------------
 moment_ext_1.newMomentProto.format = function () {
-    if (this._fullCalendar && arguments[0]) {
+    if (this._fullCalendar && arguments[0]) { // an enhanced moment? and a format string provided?
         return formatDate(this, arguments[0]); // our extended formatting
     }
     if (this._ambigTime) {
@@ -4564,7 +4830,7 @@
     if (this._ambigZone) {
         return moment_ext_1.oldMomentFormat(englishMoment(this), 'YYYY-MM-DD[T]HH:mm:ss');
     }
-    if (this._fullCalendar) {
+    if (this._fullCalendar) { // enhanced non-ambig moment?
         // moment.format() doesn't ensure english, but we want to.
         return moment_ext_1.oldMomentFormat(englishMoment(this));
     }
@@ -4577,7 +4843,7 @@
     if (this._ambigZone) {
         return moment_ext_1.oldMomentFormat(englishMoment(this), 'YYYY-MM-DD[T]HH:mm:ss');
     }
-    if (this._fullCalendar) {
+    if (this._fullCalendar) { // enhanced non-ambig moment?
         // depending on browser, moment might not output english. ensure english.
         // https://github.com/moment/moment/blob/2.18.1/src/lib/moment/format.js#L22
         return moment_ext_1.oldMomentProto.toISOString.apply(englishMoment(this), arguments);
@@ -4747,17 +5013,17 @@
     // \4 is a backreference to the first character of a multi-character set.
     var chunker = /\[([^\]]*)\]|$([^$]*)\)|(LTS|LT|(\w)\4*o?)|([^\w\[\(]+)/g;
     while ((match = chunker.exec(formatStr))) {
-        if (match[1]) {
+        if (match[1]) { // a literal string inside [ ... ]
             chunks.push.apply(chunks, // append
             splitStringLiteral(match[1]));
         }
-        else if (match[2]) {
+        else if (match[2]) { // non-zero formatting inside ( ... )
             chunks.push({ maybe: chunkFormatString(match[2]) });
         }
-        else if (match[3]) {
+        else if (match[3]) { // a formatting token
             chunks.push({ token: match[3] });
         }
-        else if (match[5]) {
+        else if (match[5]) { // an unenclosed literal string
             chunks.push.apply(chunks, // append
             splitStringLiteral(match[5]));
         }
@@ -4868,7 +5134,7 @@
 */
 function processMaybeMarkers(s) {
     return s.replace(MAYBE_REGEXP, function (m0, m1) {
-        if (m1.match(/[1-9]/)) {
+        if (m1.match(/[1-9]/)) { // any non-zero numeric characters?
             return m1;
         }
         else {
@@ -4907,13 +5173,31 @@
 
 
 /***/ }),
-/* 48 */
+/* 50 */
+/***/ (function(module, exports) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var EventRange = /** @class */ (function () {
+    function EventRange(unzonedRange, eventDef, eventInstance) {
+        this.unzonedRange = unzonedRange;
+        this.eventDef = eventDef;
+        if (eventInstance) {
+            this.eventInstance = eventInstance;
+        }
+    }
+    return EventRange;
+}());
+exports.default = EventRange;
+
+
+/***/ }),
+/* 51 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
-var Class_1 = __webpack_require__(33);
-var EmitterMixin_1 = __webpack_require__(11);
+var Class_1 = __webpack_require__(35);
+var EmitterMixin_1 = __webpack_require__(13);
 var ListenerMixin_1 = __webpack_require__(7);
 var Model = /** @class */ (function (_super) {
     tslib_1.__extends(Model, _super);
@@ -5069,8 +5353,8 @@
         var isCallingStop = false;
         var onBeforeDepChange = function (depName, val, isOptional) {
             queuedChangeCnt++;
-            if (queuedChangeCnt === 1) {
-                if (satisfyCnt === depCnt) {
+            if (queuedChangeCnt === 1) { // first change to cause a "stop" ?
+                if (satisfyCnt === depCnt) { // all deps previously satisfied?
                     isCallingStop = true;
                     stopFunc(values);
                     isCallingStop = false;
@@ -5078,14 +5362,14 @@
             }
         };
         var onDepChange = function (depName, val, isOptional) {
-            if (val === undefined) {
+            if (val === undefined) { // unsetting a value?
                 // required dependency that was previously set?
                 if (!isOptional && values[depName] !== undefined) {
                     satisfyCnt--;
                 }
                 delete values[depName];
             }
-            else {
+            else { // setting a value?
                 // required dependency that was previously unset?
                 if (!isOptional && values[depName] === undefined) {
                     satisfyCnt++;
@@ -5093,7 +5377,7 @@
                 values[depName] = val;
             }
             queuedChangeCnt--;
-            if (!queuedChangeCnt) {
+            if (!queuedChangeCnt) { // last change to cause a "start"?
                 // now finally satisfied or satisfied all along?
                 if (satisfyCnt === depCnt) {
                     // if the stopFunc initiated another value change, ignore it.
@@ -5112,7 +5396,7 @@
         // listen to dependency changes
         depList.forEach(function (depName) {
             var isOptional = false;
-            if (depName.charAt(0) === '?') {
+            if (depName.charAt(0) === '?') { // TODO: more DRY
                 depName = depName.substring(1);
                 isOptional = true;
             }
@@ -5126,7 +5410,7 @@
         // process current dependency values
         depList.forEach(function (depName) {
             var isOptional = false;
-            if (depName.charAt(0) === '?') {
+            if (depName.charAt(0) === '?') { // TODO: more DRY
                 depName = depName.substring(1);
                 isOptional = true;
             }
@@ -5177,8637 +5461,8408 @@
 
 
 /***/ }),
-/* 49 */
+/* 52 */
 /***/ (function(module, exports, __webpack_require__) {
 
+/*
+USAGE:
+  import { default as ParsableModelMixin, ParsableModelInterface } from './ParsableModelMixin'
+in class:
+  applyProps: ParsableModelInterface['applyProps']
+  applyManualStandardProps: ParsableModelInterface['applyManualStandardProps']
+  applyMiscProps: ParsableModelInterface['applyMiscProps']
+  isStandardProp: ParsableModelInterface['isStandardProp']
+  static defineStandardProps = ParsableModelMixin.defineStandardProps
+  static copyVerbatimStandardProps = ParsableModelMixin.copyVerbatimStandardProps
+after class:
+  ParsableModelMixin.mixInto(TheClass)
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
-var moment = __webpack_require__(0);
+var tslib_1 = __webpack_require__(2);
 var util_1 = __webpack_require__(4);
-var SingleEventDef_1 = __webpack_require__(13);
-var RecurringEventDef_1 = __webpack_require__(210);
-exports.default = {
-    parse: function (eventInput, source) {
-        if (util_1.isTimeString(eventInput.start) || moment.isDuration(eventInput.start) ||
-            util_1.isTimeString(eventInput.end) || moment.isDuration(eventInput.end)) {
-            return RecurringEventDef_1.default.parse(eventInput, source);
+var Mixin_1 = __webpack_require__(15);
+var ParsableModelMixin = /** @class */ (function (_super) {
+    tslib_1.__extends(ParsableModelMixin, _super);
+    function ParsableModelMixin() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    ParsableModelMixin.defineStandardProps = function (propDefs) {
+        var proto = this.prototype;
+        if (!proto.hasOwnProperty('standardPropMap')) {
+            proto.standardPropMap = Object.create(proto.standardPropMap);
         }
-        else {
-            return SingleEventDef_1.default.parse(eventInput, source);
+        util_1.copyOwnProps(propDefs, proto.standardPropMap);
+    };
+    ParsableModelMixin.copyVerbatimStandardProps = function (src, dest) {
+        var map = this.prototype.standardPropMap;
+        var propName;
+        for (propName in map) {
+            if (src[propName] != null && // in the src object?
+                map[propName] === true // false means "copy verbatim"
+            ) {
+                dest[propName] = src[propName];
+            }
         }
-    }
-};
-
-
-/***/ }),
-/* 50 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var util_1 = __webpack_require__(4);
-var EventDateProfile_1 = __webpack_require__(17);
-var EventDefDateMutation = /** @class */ (function () {
-    function EventDefDateMutation() {
-        this.clearEnd = false;
-        this.forceTimed = false;
-        this.forceAllDay = false;
-    }
-    EventDefDateMutation.createFromDiff = function (dateProfile0, dateProfile1, largeUnit) {
-        var clearEnd = dateProfile0.end && !dateProfile1.end;
-        var forceTimed = dateProfile0.isAllDay() && !dateProfile1.isAllDay();
-        var forceAllDay = !dateProfile0.isAllDay() && dateProfile1.isAllDay();
-        var dateDelta;
-        var endDiff;
-        var endDelta;
-        var mutation;
-        // subtracts the dates in the appropriate way, returning a duration
-        function subtractDates(date1, date0) {
-            if (largeUnit) {
-                return util_1.diffByUnit(date1, date0, largeUnit); // poorly named
-            }
-            else if (dateProfile1.isAllDay()) {
-                return util_1.diffDay(date1, date0); // poorly named
-            }
-            else {
-                return util_1.diffDayTime(date1, date0); // poorly named
-            }
-        }
-        dateDelta = subtractDates(dateProfile1.start, dateProfile0.start);
-        if (dateProfile1.end) {
-            // use unzonedRanges because dateProfile0.end might be null
-            endDiff = subtractDates(dateProfile1.unzonedRange.getEnd(), dateProfile0.unzonedRange.getEnd());
-            endDelta = endDiff.subtract(dateDelta);
-        }
-        mutation = new EventDefDateMutation();
-        mutation.clearEnd = clearEnd;
-        mutation.forceTimed = forceTimed;
-        mutation.forceAllDay = forceAllDay;
-        mutation.setDateDelta(dateDelta);
-        mutation.setEndDelta(endDelta);
-        return mutation;
     };
     /*
-    returns an undo function.
+    Returns true/false for success.
+    Meant to be only called ONCE, at object creation.
     */
-    EventDefDateMutation.prototype.buildNewDateProfile = function (eventDateProfile, calendar) {
-        var start = eventDateProfile.start.clone();
-        var end = null;
-        var shouldRezone = false;
-        if (eventDateProfile.end && !this.clearEnd) {
-            end = eventDateProfile.end.clone();
-        }
-        else if (this.endDelta && !end) {
-            end = calendar.getDefaultEventEnd(eventDateProfile.isAllDay(), start);
-        }
-        if (this.forceTimed) {
-            shouldRezone = true;
-            if (!start.hasTime()) {
-                start.time(0);
-            }
-            if (end && !end.hasTime()) {
-                end.time(0);
-            }
-        }
-        else if (this.forceAllDay) {
-            if (start.hasTime()) {
-                start.stripTime();
-            }
-            if (end && end.hasTime()) {
-                end.stripTime();
+    ParsableModelMixin.prototype.applyProps = function (rawProps) {
+        var standardPropMap = this.standardPropMap;
+        var manualProps = {};
+        var miscProps = {};
+        var propName;
+        for (propName in rawProps) {
+            if (standardPropMap[propName] === true) { // copy verbatim
+                this[propName] = rawProps[propName];
             }
-        }
-        if (this.dateDelta) {
-            shouldRezone = true;
-            start.add(this.dateDelta);
-            if (end) {
-                end.add(this.dateDelta);
+            else if (standardPropMap[propName] === false) {
+                manualProps[propName] = rawProps[propName];
             }
-        }
-        // do this before adding startDelta to start, so we can work off of start
-        if (this.endDelta) {
-            shouldRezone = true;
-            end.add(this.endDelta);
-        }
-        if (this.startDelta) {
-            shouldRezone = true;
-            start.add(this.startDelta);
-        }
-        if (shouldRezone) {
-            start = calendar.applyTimezone(start);
-            if (end) {
-                end = calendar.applyTimezone(end);
+            else {
+                miscProps[propName] = rawProps[propName];
             }
         }
-        // TODO: okay to access calendar option?
-        if (!end && calendar.opt('forceEventDuration')) {
-            end = calendar.getDefaultEventEnd(eventDateProfile.isAllDay(), start);
-        }
-        return new EventDateProfile_1.default(start, end, calendar);
-    };
-    EventDefDateMutation.prototype.setDateDelta = function (dateDelta) {
-        if (dateDelta && dateDelta.valueOf()) {
-            this.dateDelta = dateDelta;
-        }
-        else {
-            this.dateDelta = null;
-        }
+        this.applyMiscProps(miscProps);
+        return this.applyManualStandardProps(manualProps);
     };
-    EventDefDateMutation.prototype.setStartDelta = function (startDelta) {
-        if (startDelta && startDelta.valueOf()) {
-            this.startDelta = startDelta;
-        }
-        else {
-            this.startDelta = null;
-        }
+    /*
+    If subclasses override, they must call this supermethod and return the boolean response.
+    Meant to be only called ONCE, at object creation.
+    */
+    ParsableModelMixin.prototype.applyManualStandardProps = function (rawProps) {
+        return true;
     };
-    EventDefDateMutation.prototype.setEndDelta = function (endDelta) {
-        if (endDelta && endDelta.valueOf()) {
-            this.endDelta = endDelta;
-        }
-        else {
-            this.endDelta = null;
-        }
+    /*
+    Can be called even after initial object creation.
+    */
+    ParsableModelMixin.prototype.applyMiscProps = function (rawProps) {
+        // subclasses can implement
     };
-    EventDefDateMutation.prototype.isEmpty = function () {
-        return !this.clearEnd && !this.forceTimed && !this.forceAllDay &&
-            !this.dateDelta && !this.startDelta && !this.endDelta;
+    /*
+    TODO: why is this a method when defineStandardProps is static
+    */
+    ParsableModelMixin.prototype.isStandardProp = function (propName) {
+        return propName in this.standardPropMap;
     };
-    return EventDefDateMutation;
-}());
-exports.default = EventDefDateMutation;
+    return ParsableModelMixin;
+}(Mixin_1.default));
+exports.default = ParsableModelMixin;
+ParsableModelMixin.prototype.standardPropMap = {}; // will be cloned by defineStandardProps
 
 
 /***/ }),
-/* 51 */
-/***/ (function(module, exports, __webpack_require__) {
+/* 53 */
+/***/ (function(module, exports) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var StandardTheme_1 = __webpack_require__(213);
-var JqueryUiTheme_1 = __webpack_require__(214);
-var themeClassHash = {};
-function defineThemeSystem(themeName, themeClass) {
-    themeClassHash[themeName] = themeClass;
-}
-exports.defineThemeSystem = defineThemeSystem;
-function getThemeSystemClass(themeSetting) {
-    if (!themeSetting) {
-        return StandardTheme_1.default;
-    }
-    else if (themeSetting === true) {
-        return JqueryUiTheme_1.default;
-    }
-    else {
-        return themeClassHash[themeSetting];
+var EventInstance = /** @class */ (function () {
+    function EventInstance(def, dateProfile) {
+        this.def = def;
+        this.dateProfile = dateProfile;
     }
-}
-exports.getThemeSystemClass = getThemeSystemClass;
+    EventInstance.prototype.toLegacy = function () {
+        var dateProfile = this.dateProfile;
+        var obj = this.def.toLegacy();
+        obj.start = dateProfile.start.clone();
+        obj.end = dateProfile.end ? dateProfile.end.clone() : null;
+        return obj;
+    };
+    return EventInstance;
+}());
+exports.default = EventInstance;
 
 
 /***/ }),
-/* 52 */
+/* 54 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
 var $ = __webpack_require__(3);
-var util_1 = __webpack_require__(4);
-var Promise_1 = __webpack_require__(20);
-var EventSource_1 = __webpack_require__(6);
-var SingleEventDef_1 = __webpack_require__(13);
-var ArrayEventSource = /** @class */ (function (_super) {
-    tslib_1.__extends(ArrayEventSource, _super);
-    function ArrayEventSource(calendar) {
-        var _this = _super.call(this, calendar) || this;
-        _this.eventDefs = []; // for if setRawEventDefs is never called
-        return _this;
+var moment = __webpack_require__(0);
+var EventDef_1 = __webpack_require__(37);
+var EventInstance_1 = __webpack_require__(53);
+var EventDateProfile_1 = __webpack_require__(16);
+var RecurringEventDef = /** @class */ (function (_super) {
+    tslib_1.__extends(RecurringEventDef, _super);
+    function RecurringEventDef() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
-    ArrayEventSource.parse = function (rawInput, calendar) {
-        var rawProps;
-        // normalize raw input
-        if ($.isArray(rawInput.events)) {
-            rawProps = rawInput;
+    RecurringEventDef.prototype.isAllDay = function () {
+        return !this.startTime && !this.endTime;
+    };
+    RecurringEventDef.prototype.buildInstances = function (unzonedRange) {
+        var calendar = this.source.calendar;
+        var unzonedDate = unzonedRange.getStart();
+        var unzonedEnd = unzonedRange.getEnd();
+        var zonedDayStart;
+        var instanceStart;
+        var instanceEnd;
+        var instances = [];
+        while (unzonedDate.isBefore(unzonedEnd)) {
+            // if everyday, or this particular day-of-week
+            if (!this.dowHash || this.dowHash[unzonedDate.day()]) {
+                zonedDayStart = calendar.applyTimezone(unzonedDate);
+                instanceStart = zonedDayStart.clone();
+                instanceEnd = null;
+                if (this.startTime) {
+                    instanceStart.time(this.startTime);
+                }
+                else {
+                    instanceStart.stripTime();
+                }
+                if (this.endTime) {
+                    instanceEnd = zonedDayStart.clone().time(this.endTime);
+                }
+                instances.push(new EventInstance_1.default(this, // definition
+                new EventDateProfile_1.default(instanceStart, instanceEnd, calendar)));
+            }
+            unzonedDate.add(1, 'days');
         }
-        else if ($.isArray(rawInput)) {
-            rawProps = { events: rawInput };
+        return instances;
+    };
+    RecurringEventDef.prototype.setDow = function (dowNumbers) {
+        if (!this.dowHash) {
+            this.dowHash = {};
         }
-        if (rawProps) {
-            return EventSource_1.default.parse.call(this, rawProps, calendar);
+        for (var i = 0; i < dowNumbers.length; i++) {
+            this.dowHash[dowNumbers[i]] = true;
         }
-        return false;
-    };
-    ArrayEventSource.prototype.setRawEventDefs = function (rawEventDefs) {
-        this.rawEventDefs = rawEventDefs;
-        this.eventDefs = this.parseEventDefs(rawEventDefs);
     };
-    ArrayEventSource.prototype.fetch = function (start, end, timezone) {
-        var eventDefs = this.eventDefs;
-        var i;
-        if (this.currentTimezone != null &&
-            this.currentTimezone !== timezone) {
-            for (i = 0; i < eventDefs.length; i++) {
-                if (eventDefs[i] instanceof SingleEventDef_1.default) {
-                    eventDefs[i].rezone();
-                }
-            }
+    RecurringEventDef.prototype.clone = function () {
+        var def = _super.prototype.clone.call(this);
+        if (def.startTime) {
+            def.startTime = moment.duration(this.startTime);
         }
-        this.currentTimezone = timezone;
-        return Promise_1.default.resolve(eventDefs);
-    };
-    ArrayEventSource.prototype.addEventDef = function (eventDef) {
-        this.eventDefs.push(eventDef);
-    };
-    /*
-    eventDefId already normalized to a string
-    */
-    ArrayEventSource.prototype.removeEventDefsById = function (eventDefId) {
-        return util_1.removeMatching(this.eventDefs, function (eventDef) {
-            return eventDef.id === eventDefId;
-        });
-    };
-    ArrayEventSource.prototype.removeAllEventDefs = function () {
-        this.eventDefs = [];
-    };
-    ArrayEventSource.prototype.getPrimitive = function () {
-        return this.rawEventDefs;
-    };
-    ArrayEventSource.prototype.applyManualStandardProps = function (rawProps) {
-        var superSuccess = _super.prototype.applyManualStandardProps.call(this, rawProps);
-        this.setRawEventDefs(rawProps.events);
-        return superSuccess;
+        if (def.endTime) {
+            def.endTime = moment.duration(this.endTime);
+        }
+        if (this.dowHash) {
+            def.dowHash = $.extend({}, this.dowHash);
+        }
+        return def;
     };
-    return ArrayEventSource;
-}(EventSource_1.default));
-exports.default = ArrayEventSource;
-ArrayEventSource.defineStandardProps({
-    events: false // don't automatically transfer
+    return RecurringEventDef;
+}(EventDef_1.default));
+exports.default = RecurringEventDef;
+/*
+HACK to work with TypeScript mixins
+NOTE: if super-method fails, should still attempt to apply
+*/
+RecurringEventDef.prototype.applyProps = function (rawProps) {
+    var superSuccess = EventDef_1.default.prototype.applyProps.call(this, rawProps);
+    if (rawProps.start) {
+        this.startTime = moment.duration(rawProps.start);
+    }
+    if (rawProps.end) {
+        this.endTime = moment.duration(rawProps.end);
+    }
+    if (rawProps.dow) {
+        this.setDow(rawProps.dow);
+    }
+    return superSuccess;
+};
+// Parsing
+// ---------------------------------------------------------------------------------------------------------------------
+RecurringEventDef.defineStandardProps({
+    start: false,
+    end: false,
+    dow: false
 });
 
 
 /***/ }),
-/* 53 */
+/* 55 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var $ = __webpack_require__(3);
+var moment = __webpack_require__(0);
 var util_1 = __webpack_require__(4);
-/*
-A cache for the left/right/top/bottom/width/height values for one or more elements.
-Works with both offset (from topleft document) and position (from offsetParent).
-
-options:
-- els
-- isHorizontal
-- isVertical
-*/
-var CoordCache = /** @class */ (function () {
-    function CoordCache(options) {
-        this.isHorizontal = false; // whether to query for left/right/width
-        this.isVertical = false; // whether to query for top/bottom/height
-        this.els = $(options.els);
-        this.isHorizontal = options.isHorizontal;
-        this.isVertical = options.isVertical;
-        this.forcedOffsetParentEl = options.offsetParent ? $(options.offsetParent) : null;
+var UnzonedRange_1 = __webpack_require__(5);
+var DateProfileGenerator = /** @class */ (function () {
+    function DateProfileGenerator(_view) {
+        this._view = _view;
     }
-    // Queries the els for coordinates and stores them.
-    // Call this method before using and of the get* methods below.
-    CoordCache.prototype.build = function () {
-        var offsetParentEl = this.forcedOffsetParentEl;
-        if (!offsetParentEl && this.els.length > 0) {
-            offsetParentEl = this.els.eq(0).offsetParent();
-        }
-        this.origin = offsetParentEl ?
-            offsetParentEl.offset() :
-            null;
-        this.boundingRect = this.queryBoundingRect();
-        if (this.isHorizontal) {
-            this.buildElHorizontals();
-        }
-        if (this.isVertical) {
-            this.buildElVerticals();
-        }
+    DateProfileGenerator.prototype.opt = function (name) {
+        return this._view.opt(name);
     };
-    // Destroys all internal data about coordinates, freeing memory
-    CoordCache.prototype.clear = function () {
-        this.origin = null;
-        this.boundingRect = null;
-        this.lefts = null;
-        this.rights = null;
-        this.tops = null;
-        this.bottoms = null;
+    DateProfileGenerator.prototype.trimHiddenDays = function (unzonedRange) {
+        return this._view.trimHiddenDays(unzonedRange);
     };
-    // When called, if coord caches aren't built, builds them
-    CoordCache.prototype.ensureBuilt = function () {
-        if (!this.origin) {
-            this.build();
-        }
+    DateProfileGenerator.prototype.msToUtcMoment = function (ms, forceAllDay) {
+        return this._view.calendar.msToUtcMoment(ms, forceAllDay);
     };
-    // Populates the left/right internal coordinate arrays
-    CoordCache.prototype.buildElHorizontals = function () {
-        var lefts = [];
-        var rights = [];
-        this.els.each(function (i, node) {
-            var el = $(node);
-            var left = el.offset().left;
-            var width = el.outerWidth();
-            lefts.push(left);
-            rights.push(left + width);
-        });
-        this.lefts = lefts;
-        this.rights = rights;
+    /* Date Range Computation
+    ------------------------------------------------------------------------------------------------------------------*/
+    // Builds a structure with info about what the dates/ranges will be for the "prev" view.
+    DateProfileGenerator.prototype.buildPrev = function (currentDateProfile) {
+        var prevDate = currentDateProfile.date.clone()
+            .startOf(currentDateProfile.currentRangeUnit)
+            .subtract(currentDateProfile.dateIncrement);
+        return this.build(prevDate, -1);
     };
-    // Populates the top/bottom internal coordinate arrays
-    CoordCache.prototype.buildElVerticals = function () {
-        var tops = [];
-        var bottoms = [];
-        this.els.each(function (i, node) {
-            var el = $(node);
-            var top = el.offset().top;
-            var height = el.outerHeight();
-            tops.push(top);
-            bottoms.push(top + height);
-        });
-        this.tops = tops;
-        this.bottoms = bottoms;
+    // Builds a structure with info about what the dates/ranges will be for the "next" view.
+    DateProfileGenerator.prototype.buildNext = function (currentDateProfile) {
+        var nextDate = currentDateProfile.date.clone()
+            .startOf(currentDateProfile.currentRangeUnit)
+            .add(currentDateProfile.dateIncrement);
+        return this.build(nextDate, 1);
     };
-    // Given a left offset (from document left), returns the index of the el that it horizontally intersects.
-    // If no intersection is made, returns undefined.
-    CoordCache.prototype.getHorizontalIndex = function (leftOffset) {
-        this.ensureBuilt();
-        var lefts = this.lefts;
-        var rights = this.rights;
-        var len = lefts.length;
-        var i;
-        for (i = 0; i < len; i++) {
-            if (leftOffset >= lefts[i] && leftOffset < rights[i]) {
-                return i;
-            }
+    // Builds a structure holding dates/ranges for rendering around the given date.
+    // Optional direction param indicates whether the date is being incremented/decremented
+    // from its previous value. decremented = -1, incremented = 1 (default).
+    DateProfileGenerator.prototype.build = function (date, direction, forceToValid) {
+        if (forceToValid === void 0) { forceToValid = false; }
+        var isDateAllDay = !date.hasTime();
+        var validUnzonedRange;
+        var minTime = null;
+        var maxTime = null;
+        var currentInfo;
+        var isRangeAllDay;
+        var renderUnzonedRange;
+        var activeUnzonedRange;
+        var isValid;
+        validUnzonedRange = this.buildValidRange();
+        validUnzonedRange = this.trimHiddenDays(validUnzonedRange);
+        if (forceToValid) {
+            date = this.msToUtcMoment(validUnzonedRange.constrainDate(date), // returns MS
+            isDateAllDay);
         }
-    };
-    // Given a top offset (from document top), returns the index of the el that it vertically intersects.
-    // If no intersection is made, returns undefined.
-    CoordCache.prototype.getVerticalIndex = function (topOffset) {
-        this.ensureBuilt();
-        var tops = this.tops;
-        var bottoms = this.bottoms;
-        var len = tops.length;
-        var i;
-        for (i = 0; i < len; i++) {
-            if (topOffset >= tops[i] && topOffset < bottoms[i]) {
-                return i;
-            }
+        currentInfo = this.buildCurrentRangeInfo(date, direction);
+        isRangeAllDay = /^(year|month|week|day)$/.test(currentInfo.unit);
+        renderUnzonedRange = this.buildRenderRange(this.trimHiddenDays(currentInfo.unzonedRange), currentInfo.unit, isRangeAllDay);
+        renderUnzonedRange = this.trimHiddenDays(renderUnzonedRange);
+        activeUnzonedRange = renderUnzonedRange.clone();
+        if (!this.opt('showNonCurrentDates')) {
+            activeUnzonedRange = activeUnzonedRange.intersect(currentInfo.unzonedRange);
         }
+        minTime = moment.duration(this.opt('minTime'));
+        maxTime = moment.duration(this.opt('maxTime'));
+        activeUnzonedRange = this.adjustActiveRange(activeUnzonedRange, minTime, maxTime);
+        activeUnzonedRange = activeUnzonedRange.intersect(validUnzonedRange); // might return null
+        if (activeUnzonedRange) {
+            date = this.msToUtcMoment(activeUnzonedRange.constrainDate(date), // returns MS
+            isDateAllDay);
+        }
+        // it's invalid if the originally requested date is not contained,
+        // or if the range is completely outside of the valid range.
+        isValid = currentInfo.unzonedRange.intersectsWith(validUnzonedRange);
+        return {
+            // constraint for where prev/next operations can go and where events can be dragged/resized to.
+            // an object with optional start and end properties.
+            validUnzonedRange: validUnzonedRange,
+            // range the view is formally responsible for.
+            // for example, a month view might have 1st-31st, excluding padded dates
+            currentUnzonedRange: currentInfo.unzonedRange,
+            // name of largest unit being displayed, like "month" or "week"
+            currentRangeUnit: currentInfo.unit,
+            isRangeAllDay: isRangeAllDay,
+            // dates that display events and accept drag-n-drop
+            // will be `null` if no dates accept events
+            activeUnzonedRange: activeUnzonedRange,
+            // date range with a rendered skeleton
+            // includes not-active days that need some sort of DOM
+            renderUnzonedRange: renderUnzonedRange,
+            // Duration object that denotes the first visible time of any given day
+            minTime: minTime,
+            // Duration object that denotes the exclusive visible end time of any given day
+            maxTime: maxTime,
+            isValid: isValid,
+            date: date,
+            // how far the current date will move for a prev/next operation
+            dateIncrement: this.buildDateIncrement(currentInfo.duration)
+            // pass a fallback (might be null) ^
+        };
     };
-    // Gets the left offset (from document left) of the element at the given index
-    CoordCache.prototype.getLeftOffset = function (leftIndex) {
-        this.ensureBuilt();
-        return this.lefts[leftIndex];
-    };
-    // Gets the left position (from offsetParent left) of the element at the given index
-    CoordCache.prototype.getLeftPosition = function (leftIndex) {
-        this.ensureBuilt();
-        return this.lefts[leftIndex] - this.origin.left;
-    };
-    // Gets the right offset (from document left) of the element at the given index.
-    // This value is NOT relative to the document's right edge, like the CSS concept of "right" would be.
-    CoordCache.prototype.getRightOffset = function (leftIndex) {
-        this.ensureBuilt();
-        return this.rights[leftIndex];
-    };
-    // Gets the right position (from offsetParent left) of the element at the given index.
-    // This value is NOT relative to the offsetParent's right edge, like the CSS concept of "right" would be.
-    CoordCache.prototype.getRightPosition = function (leftIndex) {
-        this.ensureBuilt();
-        return this.rights[leftIndex] - this.origin.left;
-    };
-    // Gets the width of the element at the given index
-    CoordCache.prototype.getWidth = function (leftIndex) {
-        this.ensureBuilt();
-        return this.rights[leftIndex] - this.lefts[leftIndex];
-    };
-    // Gets the top offset (from document top) of the element at the given index
-    CoordCache.prototype.getTopOffset = function (topIndex) {
-        this.ensureBuilt();
-        return this.tops[topIndex];
-    };
-    // Gets the top position (from offsetParent top) of the element at the given position
-    CoordCache.prototype.getTopPosition = function (topIndex) {
-        this.ensureBuilt();
-        return this.tops[topIndex] - this.origin.top;
+    // Builds an object with optional start/end properties.
+    // Indicates the minimum/maximum dates to display.
+    // not responsible for trimming hidden days.
+    DateProfileGenerator.prototype.buildValidRange = function () {
+        return this._view.getUnzonedRangeOption('validRange', this._view.calendar.getNow()) ||
+            new UnzonedRange_1.default(); // completely open-ended
     };
-    // Gets the bottom offset (from the document top) of the element at the given index.
-    // This value is NOT relative to the offsetParent's bottom edge, like the CSS concept of "bottom" would be.
-    CoordCache.prototype.getBottomOffset = function (topIndex) {
-        this.ensureBuilt();
-        return this.bottoms[topIndex];
+    // Builds a structure with info about the "current" range, the range that is
+    // highlighted as being the current month for example.
+    // See build() for a description of `direction`.
+    // Guaranteed to have `range` and `unit` properties. `duration` is optional.
+    // TODO: accept a MS-time instead of a moment `date`?
+    DateProfileGenerator.prototype.buildCurrentRangeInfo = function (date, direction) {
+        var viewSpec = this._view.viewSpec;
+        var duration = null;
+        var unit = null;
+        var unzonedRange = null;
+        var dayCount;
+        if (viewSpec.duration) {
+            duration = viewSpec.duration;
+            unit = viewSpec.durationUnit;
+            unzonedRange = this.buildRangeFromDuration(date, direction, duration, unit);
+        }
+        else if ((dayCount = this.opt('dayCount'))) {
+            unit = 'day';
+            unzonedRange = this.buildRangeFromDayCount(date, direction, dayCount);
+        }
+        else if ((unzonedRange = this.buildCustomVisibleRange(date))) {
+            unit = util_1.computeGreatestUnit(unzonedRange.getStart(), unzonedRange.getEnd());
+        }
+        else {
+            duration = this.getFallbackDuration();
+            unit = util_1.computeGreatestUnit(duration);
+            unzonedRange = this.buildRangeFromDuration(date, direction, duration, unit);
+        }
+        return { duration: duration, unit: unit, unzonedRange: unzonedRange };
     };
-    // Gets the bottom position (from the offsetParent top) of the element at the given index.
-    // This value is NOT relative to the offsetParent's bottom edge, like the CSS concept of "bottom" would be.
-    CoordCache.prototype.getBottomPosition = function (topIndex) {
-        this.ensureBuilt();
-        return this.bottoms[topIndex] - this.origin.top;
+    DateProfileGenerator.prototype.getFallbackDuration = function () {
+        return moment.duration({ days: 1 });
     };
-    // Gets the height of the element at the given index
-    CoordCache.prototype.getHeight = function (topIndex) {
-        this.ensureBuilt();
-        return this.bottoms[topIndex] - this.tops[topIndex];
+    // Returns a new activeUnzonedRange to have time values (un-ambiguate)
+    // minTime or maxTime causes the range to expand.
+    DateProfileGenerator.prototype.adjustActiveRange = function (unzonedRange, minTime, maxTime) {
+        var start = unzonedRange.getStart();
+        var end = unzonedRange.getEnd();
+        if (this._view.usesMinMaxTime) {
+            if (minTime < 0) {
+                start.time(0).add(minTime);
+            }
+            if (maxTime > 24 * 60 * 60 * 1000) { // beyond 24 hours?
+                end.time(maxTime - (24 * 60 * 60 * 1000));
+            }
+        }
+        return new UnzonedRange_1.default(start, end);
     };
-    // Bounding Rect
-    // TODO: decouple this from CoordCache
-    // Compute and return what the elements' bounding rectangle is, from the user's perspective.
-    // Right now, only returns a rectangle if constrained by an overflow:scroll element.
-    // Returns null if there are no elements
-    CoordCache.prototype.queryBoundingRect = function () {
-        var scrollParentEl;
-        if (this.els.length > 0) {
-            scrollParentEl = util_1.getScrollParent(this.els.eq(0));
-            if (!scrollParentEl.is(document)) {
-                return util_1.getClientRect(scrollParentEl);
+    // Builds the "current" range when it is specified as an explicit duration.
+    // `unit` is the already-computed computeGreatestUnit value of duration.
+    // TODO: accept a MS-time instead of a moment `date`?
+    DateProfileGenerator.prototype.buildRangeFromDuration = function (date, direction, duration, unit) {
+        var alignment = this.opt('dateAlignment');
+        var dateIncrementInput;
+        var dateIncrementDuration;
+        var start;
+        var end;
+        var res;
+        // compute what the alignment should be
+        if (!alignment) {
+            dateIncrementInput = this.opt('dateIncrement');
+            if (dateIncrementInput) {
+                dateIncrementDuration = moment.duration(dateIncrementInput);
+                // use the smaller of the two units
+                if (dateIncrementDuration < duration) {
+                    alignment = util_1.computeDurationGreatestUnit(dateIncrementDuration, dateIncrementInput);
+                }
+                else {
+                    alignment = unit;
+                }
+            }
+            else {
+                alignment = unit;
             }
         }
-        return null;
+        // if the view displays a single day or smaller
+        if (duration.as('days') <= 1) {
+            if (this._view.isHiddenDay(start)) {
+                start = this._view.skipHiddenDays(start, direction);
+                start.startOf('day');
+            }
+        }
+        function computeRes() {
+            start = date.clone().startOf(alignment);
+            end = start.clone().add(duration);
+            res = new UnzonedRange_1.default(start, end);
+        }
+        computeRes();
+        // if range is completely enveloped by hidden days, go past the hidden days
+        if (!this.trimHiddenDays(res)) {
+            date = this._view.skipHiddenDays(date, direction);
+            computeRes();
+        }
+        return res;
     };
-    CoordCache.prototype.isPointInBounds = function (leftOffset, topOffset) {
-        return this.isLeftInBounds(leftOffset) && this.isTopInBounds(topOffset);
+    // Builds the "current" range when a dayCount is specified.
+    // TODO: accept a MS-time instead of a moment `date`?
+    DateProfileGenerator.prototype.buildRangeFromDayCount = function (date, direction, dayCount) {
+        var customAlignment = this.opt('dateAlignment');
+        var runningCount = 0;
+        var start;
+        var end;
+        if (customAlignment || direction !== -1) {
+            start = date.clone();
+            if (customAlignment) {
+                start.startOf(customAlignment);
+            }
+            start.startOf('day');
+            start = this._view.skipHiddenDays(start);
+            end = start.clone();
+            do {
+                end.add(1, 'day');
+                if (!this._view.isHiddenDay(end)) {
+                    runningCount++;
+                }
+            } while (runningCount < dayCount);
+        }
+        else {
+            end = date.clone().startOf('day').add(1, 'day');
+            end = this._view.skipHiddenDays(end, -1, true);
+            start = end.clone();
+            do {
+                start.add(-1, 'day');
+                if (!this._view.isHiddenDay(start)) {
+                    runningCount++;
+                }
+            } while (runningCount < dayCount);
+        }
+        return new UnzonedRange_1.default(start, end);
     };
-    CoordCache.prototype.isLeftInBounds = function (leftOffset) {
-        return !this.boundingRect || (leftOffset >= this.boundingRect.left && leftOffset < this.boundingRect.right);
+    // Builds a normalized range object for the "visible" range,
+    // which is a way to define the currentUnzonedRange and activeUnzonedRange at the same time.
+    // TODO: accept a MS-time instead of a moment `date`?
+    DateProfileGenerator.prototype.buildCustomVisibleRange = function (date) {
+        var visibleUnzonedRange = this._view.getUnzonedRangeOption('visibleRange', this._view.calendar.applyTimezone(date) // correct zone. also generates new obj that avoids mutations
+        );
+        if (visibleUnzonedRange && (visibleUnzonedRange.startMs == null || visibleUnzonedRange.endMs == null)) {
+            return null;
+        }
+        return visibleUnzonedRange;
     };
-    CoordCache.prototype.isTopInBounds = function (topOffset) {
-        return !this.boundingRect || (topOffset >= this.boundingRect.top && topOffset < this.boundingRect.bottom);
+    // Computes the range that will represent the element/cells for *rendering*,
+    // but which may have voided days/times.
+    // not responsible for trimming hidden days.
+    DateProfileGenerator.prototype.buildRenderRange = function (currentUnzonedRange, currentRangeUnit, isRangeAllDay) {
+        return currentUnzonedRange.clone();
     };
-    return CoordCache;
+    // Compute the duration value that should be added/substracted to the current date
+    // when a prev/next operation happens.
+    DateProfileGenerator.prototype.buildDateIncrement = function (fallback) {
+        var dateIncrementInput = this.opt('dateIncrement');
+        var customAlignment;
+        if (dateIncrementInput) {
+            return moment.duration(dateIncrementInput);
+        }
+        else if ((customAlignment = this.opt('dateAlignment'))) {
+            return moment.duration(1, customAlignment);
+        }
+        else if (fallback) {
+            return fallback;
+        }
+        else {
+            return moment.duration({ days: 1 });
+        }
+    };
+    return DateProfileGenerator;
 }());
-exports.default = CoordCache;
+exports.default = DateProfileGenerator;
 
 
 /***/ }),
-/* 54 */
+/* 56 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
 var $ = __webpack_require__(3);
 var util_1 = __webpack_require__(4);
-var ListenerMixin_1 = __webpack_require__(7);
-var GlobalEmitter_1 = __webpack_require__(21);
-/* Tracks a drag's mouse movement, firing various handlers
-----------------------------------------------------------------------------------------------------------------------*/
-// TODO: use Emitter
-var DragListener = /** @class */ (function () {
-    function DragListener(options) {
-        this.isInteracting = false;
-        this.isDistanceSurpassed = false;
-        this.isDelayEnded = false;
-        this.isDragging = false;
-        this.isTouch = false;
-        this.isGeneric = false; // initiated by 'dragstart' (jqui)
-        this.shouldCancelTouchScroll = true;
-        this.scrollAlwaysKills = false;
-        this.isAutoScroll = false;
-        // defaults
-        this.scrollSensitivity = 30; // pixels from edge for scrolling to start
-        this.scrollSpeed = 200; // pixels per second, at maximum speed
-        this.scrollIntervalMs = 50; // millisecond wait between scroll increment
-        this.options = options || {};
+var Promise_1 = __webpack_require__(21);
+var EventSource_1 = __webpack_require__(6);
+var SingleEventDef_1 = __webpack_require__(9);
+var ArrayEventSource = /** @class */ (function (_super) {
+    tslib_1.__extends(ArrayEventSource, _super);
+    function ArrayEventSource(calendar) {
+        var _this = _super.call(this, calendar) || this;
+        _this.eventDefs = []; // for if setRawEventDefs is never called
+        return _this;
     }
-    // Interaction (high-level)
-    // -----------------------------------------------------------------------------------------------------------------
-    DragListener.prototype.startInteraction = function (ev, extraOptions) {
-        if (extraOptions === void 0) { extraOptions = {}; }
-        if (ev.type === 'mousedown') {
-            if (GlobalEmitter_1.default.get().shouldIgnoreMouse()) {
-                return;
-            }
-            else if (!util_1.isPrimaryMouseButton(ev)) {
-                return;
-            }
-            else {
-                ev.preventDefault(); // prevents native selection in most browsers
-            }
+    ArrayEventSource.parse = function (rawInput, calendar) {
+        var rawProps;
+        // normalize raw input
+        if ($.isArray(rawInput.events)) { // extended form
+            rawProps = rawInput;
         }
-        if (!this.isInteracting) {
-            // process options
-            this.delay = util_1.firstDefined(extraOptions.delay, this.options.delay, 0);
-            this.minDistance = util_1.firstDefined(extraOptions.distance, this.options.distance, 0);
-            this.subjectEl = this.options.subjectEl;
-            util_1.preventSelection($('body'));
-            this.isInteracting = true;
-            this.isTouch = util_1.getEvIsTouch(ev);
-            this.isGeneric = ev.type === 'dragstart';
-            this.isDelayEnded = false;
-            this.isDistanceSurpassed = false;
-            this.originX = util_1.getEvX(ev);
-            this.originY = util_1.getEvY(ev);
-            this.scrollEl = util_1.getScrollParent($(ev.target));
-            this.bindHandlers();
-            this.initAutoScroll();
-            this.handleInteractionStart(ev);
-            this.startDelay(ev);
-            if (!this.minDistance) {
-                this.handleDistanceSurpassed(ev);
-            }
+        else if ($.isArray(rawInput)) { // short form
+            rawProps = { events: rawInput };
+        }
+        if (rawProps) {
+            return EventSource_1.default.parse.call(this, rawProps, calendar);
         }
+        return false;
     };
-    DragListener.prototype.handleInteractionStart = function (ev) {
-        this.trigger('interactionStart', ev);
+    ArrayEventSource.prototype.setRawEventDefs = function (rawEventDefs) {
+        this.rawEventDefs = rawEventDefs;
+        this.eventDefs = this.parseEventDefs(rawEventDefs);
     };
-    DragListener.prototype.endInteraction = function (ev, isCancelled) {
-        if (this.isInteracting) {
-            this.endDrag(ev);
-            if (this.delayTimeoutId) {
-                clearTimeout(this.delayTimeoutId);
-                this.delayTimeoutId = null;
+    ArrayEventSource.prototype.fetch = function (start, end, timezone) {
+        var eventDefs = this.eventDefs;
+        var i;
+        if (this.currentTimezone != null &&
+            this.currentTimezone !== timezone) {
+            for (i = 0; i < eventDefs.length; i++) {
+                if (eventDefs[i] instanceof SingleEventDef_1.default) {
+                    eventDefs[i].rezone();
+                }
             }
-            this.destroyAutoScroll();
-            this.unbindHandlers();
-            this.isInteracting = false;
-            this.handleInteractionEnd(ev, isCancelled);
-            util_1.allowSelection($('body'));
         }
+        this.currentTimezone = timezone;
+        return Promise_1.default.resolve(eventDefs);
     };
-    DragListener.prototype.handleInteractionEnd = function (ev, isCancelled) {
-        this.trigger('interactionEnd', ev, isCancelled || false);
+    ArrayEventSource.prototype.addEventDef = function (eventDef) {
+        this.eventDefs.push(eventDef);
     };
-    // Binding To DOM
-    // -----------------------------------------------------------------------------------------------------------------
-    DragListener.prototype.bindHandlers = function () {
-        // some browsers (Safari in iOS 10) don't allow preventDefault on touch events that are bound after touchstart,
-        // so listen to the GlobalEmitter singleton, which is always bound, instead of the document directly.
-        var globalEmitter = GlobalEmitter_1.default.get();
-        if (this.isGeneric) {
-            this.listenTo($(document), {
-                drag: this.handleMove,
-                dragstop: this.endInteraction
-            });
-        }
-        else if (this.isTouch) {
-            this.listenTo(globalEmitter, {
-                touchmove: this.handleTouchMove,
-                touchend: this.endInteraction,
-                scroll: this.handleTouchScroll
-            });
-        }
-        else {
-            this.listenTo(globalEmitter, {
-                mousemove: this.handleMouseMove,
-                mouseup: this.endInteraction
-            });
-        }
-        this.listenTo(globalEmitter, {
-            selectstart: util_1.preventDefault,
-            contextmenu: util_1.preventDefault // long taps would open menu on Chrome dev tools
+    /*
+    eventDefId already normalized to a string
+    */
+    ArrayEventSource.prototype.removeEventDefsById = function (eventDefId) {
+        return util_1.removeMatching(this.eventDefs, function (eventDef) {
+            return eventDef.id === eventDefId;
         });
     };
-    DragListener.prototype.unbindHandlers = function () {
-        this.stopListeningTo(GlobalEmitter_1.default.get());
-        this.stopListeningTo($(document)); // for isGeneric
-    };
-    // Drag (high-level)
-    // -----------------------------------------------------------------------------------------------------------------
-    // extraOptions ignored if drag already started
-    DragListener.prototype.startDrag = function (ev, extraOptions) {
-        this.startInteraction(ev, extraOptions); // ensure interaction began
-        if (!this.isDragging) {
-            this.isDragging = true;
-            this.handleDragStart(ev);
-        }
-    };
-    DragListener.prototype.handleDragStart = function (ev) {
-        this.trigger('dragStart', ev);
+    ArrayEventSource.prototype.removeAllEventDefs = function () {
+        this.eventDefs = [];
     };
-    DragListener.prototype.handleMove = function (ev) {
-        var dx = util_1.getEvX(ev) - this.originX;
-        var dy = util_1.getEvY(ev) - this.originY;
-        var minDistance = this.minDistance;
-        var distanceSq; // current distance from the origin, squared
-        if (!this.isDistanceSurpassed) {
-            distanceSq = dx * dx + dy * dy;
-            if (distanceSq >= minDistance * minDistance) {
-                this.handleDistanceSurpassed(ev);
-            }
-        }
-        if (this.isDragging) {
-            this.handleDrag(dx, dy, ev);
-        }
+    ArrayEventSource.prototype.getPrimitive = function () {
+        return this.rawEventDefs;
     };
-    // Called while the mouse is being moved and when we know a legitimate drag is taking place
-    DragListener.prototype.handleDrag = function (dx, dy, ev) {
-        this.trigger('drag', dx, dy, ev);
-        this.updateAutoScroll(ev); // will possibly cause scrolling
+    ArrayEventSource.prototype.applyManualStandardProps = function (rawProps) {
+        var superSuccess = _super.prototype.applyManualStandardProps.call(this, rawProps);
+        this.setRawEventDefs(rawProps.events);
+        return superSuccess;
     };
-    DragListener.prototype.endDrag = function (ev) {
-        if (this.isDragging) {
-            this.isDragging = false;
-            this.handleDragEnd(ev);
+    return ArrayEventSource;
+}(EventSource_1.default));
+exports.default = ArrayEventSource;
+ArrayEventSource.defineStandardProps({
+    events: false // don't automatically transfer
+});
+
+
+/***/ }),
+/* 57 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var StandardTheme_1 = __webpack_require__(221);
+var JqueryUiTheme_1 = __webpack_require__(222);
+var themeClassHash = {};
+function defineThemeSystem(themeName, themeClass) {
+    themeClassHash[themeName] = themeClass;
+}
+exports.defineThemeSystem = defineThemeSystem;
+function getThemeSystemClass(themeSetting) {
+    if (!themeSetting) {
+        return StandardTheme_1.default;
+    }
+    else if (themeSetting === true) {
+        return JqueryUiTheme_1.default;
+    }
+    else {
+        return themeClassHash[themeSetting];
+    }
+}
+exports.getThemeSystemClass = getThemeSystemClass;
+
+
+/***/ }),
+/* 58 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var $ = __webpack_require__(3);
+var util_1 = __webpack_require__(4);
+/*
+A cache for the left/right/top/bottom/width/height values for one or more elements.
+Works with both offset (from topleft document) and position (from offsetParent).
+
+options:
+- els
+- isHorizontal
+- isVertical
+*/
+var CoordCache = /** @class */ (function () {
+    function CoordCache(options) {
+        this.isHorizontal = false; // whether to query for left/right/width
+        this.isVertical = false; // whether to query for top/bottom/height
+        this.els = $(options.els);
+        this.isHorizontal = options.isHorizontal;
+        this.isVertical = options.isVertical;
+        this.forcedOffsetParentEl = options.offsetParent ? $(options.offsetParent) : null;
+    }
+    // Queries the els for coordinates and stores them.
+    // Call this method before using and of the get* methods below.
+    CoordCache.prototype.build = function () {
+        var offsetParentEl = this.forcedOffsetParentEl;
+        if (!offsetParentEl && this.els.length > 0) {
+            offsetParentEl = this.els.eq(0).offsetParent();
         }
-    };
-    DragListener.prototype.handleDragEnd = function (ev) {
-        this.trigger('dragEnd', ev);
-    };
-    // Delay
-    // -----------------------------------------------------------------------------------------------------------------
-    DragListener.prototype.startDelay = function (initialEv) {
-        var _this = this;
-        if (this.delay) {
-            this.delayTimeoutId = setTimeout(function () {
-                _this.handleDelayEnd(initialEv);
-            }, this.delay);
+        this.origin = offsetParentEl ?
+            offsetParentEl.offset() :
+            null;
+        this.boundingRect = this.queryBoundingRect();
+        if (this.isHorizontal) {
+            this.buildElHorizontals();
         }
-        else {
-            this.handleDelayEnd(initialEv);
+        if (this.isVertical) {
+            this.buildElVerticals();
         }
     };
-    DragListener.prototype.handleDelayEnd = function (initialEv) {
-        this.isDelayEnded = true;
-        if (this.isDistanceSurpassed) {
-            this.startDrag(initialEv);
-        }
+    // Destroys all internal data about coordinates, freeing memory
+    CoordCache.prototype.clear = function () {
+        this.origin = null;
+        this.boundingRect = null;
+        this.lefts = null;
+        this.rights = null;
+        this.tops = null;
+        this.bottoms = null;
     };
-    // Distance
-    // -----------------------------------------------------------------------------------------------------------------
-    DragListener.prototype.handleDistanceSurpassed = function (ev) {
-        this.isDistanceSurpassed = true;
-        if (this.isDelayEnded) {
-            this.startDrag(ev);
+    // When called, if coord caches aren't built, builds them
+    CoordCache.prototype.ensureBuilt = function () {
+        if (!this.origin) {
+            this.build();
         }
     };
-    // Mouse / Touch
-    // -----------------------------------------------------------------------------------------------------------------
-    DragListener.prototype.handleTouchMove = function (ev) {
-        // prevent inertia and touchmove-scrolling while dragging
-        if (this.isDragging && this.shouldCancelTouchScroll) {
-            ev.preventDefault();
-        }
-        this.handleMove(ev);
+    // Populates the left/right internal coordinate arrays
+    CoordCache.prototype.buildElHorizontals = function () {
+        var lefts = [];
+        var rights = [];
+        this.els.each(function (i, node) {
+            var el = $(node);
+            var left = el.offset().left;
+            var width = el.outerWidth();
+            lefts.push(left);
+            rights.push(left + width);
+        });
+        this.lefts = lefts;
+        this.rights = rights;
     };
-    DragListener.prototype.handleMouseMove = function (ev) {
-        this.handleMove(ev);
+    // Populates the top/bottom internal coordinate arrays
+    CoordCache.prototype.buildElVerticals = function () {
+        var tops = [];
+        var bottoms = [];
+        this.els.each(function (i, node) {
+            var el = $(node);
+            var top = el.offset().top;
+            var height = el.outerHeight();
+            tops.push(top);
+            bottoms.push(top + height);
+        });
+        this.tops = tops;
+        this.bottoms = bottoms;
     };
-    // Scrolling (unrelated to auto-scroll)
-    // -----------------------------------------------------------------------------------------------------------------
-    DragListener.prototype.handleTouchScroll = function (ev) {
-        // if the drag is being initiated by touch, but a scroll happens before
-        // the drag-initiating delay is over, cancel the drag
-        if (!this.isDragging || this.scrollAlwaysKills) {
-            this.endInteraction(ev, true); // isCancelled=true
+    // Given a left offset (from document left), returns the index of the el that it horizontally intersects.
+    // If no intersection is made, returns undefined.
+    CoordCache.prototype.getHorizontalIndex = function (leftOffset) {
+        this.ensureBuilt();
+        var lefts = this.lefts;
+        var rights = this.rights;
+        var len = lefts.length;
+        var i;
+        for (i = 0; i < len; i++) {
+            if (leftOffset >= lefts[i] && leftOffset < rights[i]) {
+                return i;
+            }
         }
     };
-    // Utils
-    // -----------------------------------------------------------------------------------------------------------------
-    // Triggers a callback. Calls a function in the option hash of the same name.
-    // Arguments beyond the first `name` are forwarded on.
-    DragListener.prototype.trigger = function (name) {
-        var args = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            args[_i - 1] = arguments[_i];
-        }
-        if (this.options[name]) {
-            this.options[name].apply(this, args);
-        }
-        // makes _methods callable by event name. TODO: kill this
-        if (this['_' + name]) {
-            this['_' + name].apply(this, args);
+    // Given a top offset (from document top), returns the index of the el that it vertically intersects.
+    // If no intersection is made, returns undefined.
+    CoordCache.prototype.getVerticalIndex = function (topOffset) {
+        this.ensureBuilt();
+        var tops = this.tops;
+        var bottoms = this.bottoms;
+        var len = tops.length;
+        var i;
+        for (i = 0; i < len; i++) {
+            if (topOffset >= tops[i] && topOffset < bottoms[i]) {
+                return i;
+            }
         }
     };
-    // Auto-scroll
-    // -----------------------------------------------------------------------------------------------------------------
-    DragListener.prototype.initAutoScroll = function () {
-        var scrollEl = this.scrollEl;
-        this.isAutoScroll =
-            this.options.scroll &&
-                scrollEl &&
-                !scrollEl.is(window) &&
-                !scrollEl.is(document);
-        if (this.isAutoScroll) {
-            // debounce makes sure rapid calls don't happen
-            this.listenTo(scrollEl, 'scroll', util_1.debounce(this.handleDebouncedScroll, 100));
-        }
+    // Gets the left offset (from document left) of the element at the given index
+    CoordCache.prototype.getLeftOffset = function (leftIndex) {
+        this.ensureBuilt();
+        return this.lefts[leftIndex];
     };
-    DragListener.prototype.destroyAutoScroll = function () {
-        this.endAutoScroll(); // kill any animation loop
-        // remove the scroll handler if there is a scrollEl
-        if (this.isAutoScroll) {
-            this.stopListeningTo(this.scrollEl, 'scroll'); // will probably get removed by unbindHandlers too :(
-        }
+    // Gets the left position (from offsetParent left) of the element at the given index
+    CoordCache.prototype.getLeftPosition = function (leftIndex) {
+        this.ensureBuilt();
+        return this.lefts[leftIndex] - this.origin.left;
     };
-    // Computes and stores the bounding rectangle of scrollEl
-    DragListener.prototype.computeScrollBounds = function () {
-        if (this.isAutoScroll) {
-            this.scrollBounds = util_1.getOuterRect(this.scrollEl);
-            // TODO: use getClientRect in future. but prevents auto scrolling when on top of scrollbars
-        }
+    // Gets the right offset (from document left) of the element at the given index.
+    // This value is NOT relative to the document's right edge, like the CSS concept of "right" would be.
+    CoordCache.prototype.getRightOffset = function (leftIndex) {
+        this.ensureBuilt();
+        return this.rights[leftIndex];
     };
-    // Called when the dragging is in progress and scrolling should be updated
-    DragListener.prototype.updateAutoScroll = function (ev) {
-        var sensitivity = this.scrollSensitivity;
-        var bounds = this.scrollBounds;
-        var topCloseness;
-        var bottomCloseness;
-        var leftCloseness;
-        var rightCloseness;
-        var topVel = 0;
-        var leftVel = 0;
-        if (bounds) {
-            // compute closeness to edges. valid range is from 0.0 - 1.0
-            topCloseness = (sensitivity - (util_1.getEvY(ev) - bounds.top)) / sensitivity;
-            bottomCloseness = (sensitivity - (bounds.bottom - util_1.getEvY(ev))) / sensitivity;
-            leftCloseness = (sensitivity - (util_1.getEvX(ev) - bounds.left)) / sensitivity;
-            rightCloseness = (sensitivity - (bounds.right - util_1.getEvX(ev))) / sensitivity;
-            // translate vertical closeness into velocity.
-            // mouse must be completely in bounds for velocity to happen.
-            if (topCloseness >= 0 && topCloseness <= 1) {
-                topVel = topCloseness * this.scrollSpeed * -1; // negative. for scrolling up
-            }
-            else if (bottomCloseness >= 0 && bottomCloseness <= 1) {
-                topVel = bottomCloseness * this.scrollSpeed;
-            }
-            // translate horizontal closeness into velocity
-            if (leftCloseness >= 0 && leftCloseness <= 1) {
-                leftVel = leftCloseness * this.scrollSpeed * -1; // negative. for scrolling left
-            }
-            else if (rightCloseness >= 0 && rightCloseness <= 1) {
-                leftVel = rightCloseness * this.scrollSpeed;
-            }
-        }
-        this.setScrollVel(topVel, leftVel);
+    // Gets the right position (from offsetParent left) of the element at the given index.
+    // This value is NOT relative to the offsetParent's right edge, like the CSS concept of "right" would be.
+    CoordCache.prototype.getRightPosition = function (leftIndex) {
+        this.ensureBuilt();
+        return this.rights[leftIndex] - this.origin.left;
     };
-    // Sets the speed-of-scrolling for the scrollEl
-    DragListener.prototype.setScrollVel = function (topVel, leftVel) {
-        this.scrollTopVel = topVel;
-        this.scrollLeftVel = leftVel;
-        this.constrainScrollVel(); // massages into realistic values
-        // if there is non-zero velocity, and an animation loop hasn't already started, then START
-        if ((this.scrollTopVel || this.scrollLeftVel) && !this.scrollIntervalId) {
-            this.scrollIntervalId = setInterval(util_1.proxy(this, 'scrollIntervalFunc'), // scope to `this`
-            this.scrollIntervalMs);
-        }
+    // Gets the width of the element at the given index
+    CoordCache.prototype.getWidth = function (leftIndex) {
+        this.ensureBuilt();
+        return this.rights[leftIndex] - this.lefts[leftIndex];
     };
-    // Forces scrollTopVel and scrollLeftVel to be zero if scrolling has already gone all the way
-    DragListener.prototype.constrainScrollVel = function () {
-        var el = this.scrollEl;
-        if (this.scrollTopVel < 0) {
-            if (el.scrollTop() <= 0) {
-                this.scrollTopVel = 0;
-            }
-        }
-        else if (this.scrollTopVel > 0) {
-            if (el.scrollTop() + el[0].clientHeight >= el[0].scrollHeight) {
-                this.scrollTopVel = 0;
-            }
-        }
-        if (this.scrollLeftVel < 0) {
-            if (el.scrollLeft() <= 0) {
-                this.scrollLeftVel = 0;
-            }
-        }
-        else if (this.scrollLeftVel > 0) {
-            if (el.scrollLeft() + el[0].clientWidth >= el[0].scrollWidth) {
-                this.scrollLeftVel = 0;
-            }
-        }
+    // Gets the top offset (from document top) of the element at the given index
+    CoordCache.prototype.getTopOffset = function (topIndex) {
+        this.ensureBuilt();
+        return this.tops[topIndex];
     };
-    // This function gets called during every iteration of the scrolling animation loop
-    DragListener.prototype.scrollIntervalFunc = function () {
-        var el = this.scrollEl;
-        var frac = this.scrollIntervalMs / 1000; // considering animation frequency, what the vel should be mult'd by
-        // change the value of scrollEl's scroll
-        if (this.scrollTopVel) {
-            el.scrollTop(el.scrollTop() + this.scrollTopVel * frac);
-        }
-        if (this.scrollLeftVel) {
-            el.scrollLeft(el.scrollLeft() + this.scrollLeftVel * frac);
-        }
-        this.constrainScrollVel(); // since the scroll values changed, recompute the velocities
-        // if scrolled all the way, which causes the vels to be zero, stop the animation loop
-        if (!this.scrollTopVel && !this.scrollLeftVel) {
-            this.endAutoScroll();
-        }
+    // Gets the top position (from offsetParent top) of the element at the given position
+    CoordCache.prototype.getTopPosition = function (topIndex) {
+        this.ensureBuilt();
+        return this.tops[topIndex] - this.origin.top;
     };
-    // Kills any existing scrolling animation loop
-    DragListener.prototype.endAutoScroll = function () {
-        if (this.scrollIntervalId) {
-            clearInterval(this.scrollIntervalId);
-            this.scrollIntervalId = null;
-            this.handleScrollEnd();
-        }
+    // Gets the bottom offset (from the document top) of the element at the given index.
+    // This value is NOT relative to the offsetParent's bottom edge, like the CSS concept of "bottom" would be.
+    CoordCache.prototype.getBottomOffset = function (topIndex) {
+        this.ensureBuilt();
+        return this.bottoms[topIndex];
     };
-    // Get called when the scrollEl is scrolled (NOTE: this is delayed via debounce)
-    DragListener.prototype.handleDebouncedScroll = function () {
-        // recompute all coordinates, but *only* if this is *not* part of our scrolling animation
-        if (!this.scrollIntervalId) {
-            this.handleScrollEnd();
+    // Gets the bottom position (from the offsetParent top) of the element at the given index.
+    // This value is NOT relative to the offsetParent's bottom edge, like the CSS concept of "bottom" would be.
+    CoordCache.prototype.getBottomPosition = function (topIndex) {
+        this.ensureBuilt();
+        return this.bottoms[topIndex] - this.origin.top;
+    };
+    // Gets the height of the element at the given index
+    CoordCache.prototype.getHeight = function (topIndex) {
+        this.ensureBuilt();
+        return this.bottoms[topIndex] - this.tops[topIndex];
+    };
+    // Bounding Rect
+    // TODO: decouple this from CoordCache
+    // Compute and return what the elements' bounding rectangle is, from the user's perspective.
+    // Right now, only returns a rectangle if constrained by an overflow:scroll element.
+    // Returns null if there are no elements
+    CoordCache.prototype.queryBoundingRect = function () {
+        var scrollParentEl;
+        if (this.els.length > 0) {
+            scrollParentEl = util_1.getScrollParent(this.els.eq(0));
+            if (!scrollParentEl.is(document) &&
+                !scrollParentEl.is('html,body') // don't consider these bounding rects. solves issue 3615
+            ) {
+                return util_1.getClientRect(scrollParentEl);
+            }
         }
+        return null;
     };
-    DragListener.prototype.handleScrollEnd = function () {
-        // Called when scrolling has stopped, whether through auto scroll, or the user scrolling
+    CoordCache.prototype.isPointInBounds = function (leftOffset, topOffset) {
+        return this.isLeftInBounds(leftOffset) && this.isTopInBounds(topOffset);
     };
-    return DragListener;
-}());
-exports.default = DragListener;
-ListenerMixin_1.default.mixInto(DragListener);
+    CoordCache.prototype.isLeftInBounds = function (leftOffset) {
+        return !this.boundingRect || (leftOffset >= this.boundingRect.left && leftOffset < this.boundingRect.right);
+    };
+    CoordCache.prototype.isTopInBounds = function (topOffset) {
+        return !this.boundingRect || (topOffset >= this.boundingRect.top && topOffset < this.boundingRect.bottom);
+    };
+    return CoordCache;
+}());
+exports.default = CoordCache;
 
 
 /***/ }),
-/* 55 */
+/* 59 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
+var $ = __webpack_require__(3);
 var util_1 = __webpack_require__(4);
-var Mixin_1 = __webpack_require__(14);
-/*
-A set of rendering and date-related methods for a visual component comprised of one or more rows of day columns.
-Prerequisite: the object being mixed into needs to be a *Grid*
-*/
-var DayTableMixin = /** @class */ (function (_super) {
-    tslib_1.__extends(DayTableMixin, _super);
-    function DayTableMixin() {
-        return _super !== null && _super.apply(this, arguments) || this;
+var ListenerMixin_1 = __webpack_require__(7);
+var GlobalEmitter_1 = __webpack_require__(23);
+/* Tracks a drag's mouse movement, firing various handlers
+----------------------------------------------------------------------------------------------------------------------*/
+// TODO: use Emitter
+var DragListener = /** @class */ (function () {
+    function DragListener(options) {
+        this.isInteracting = false;
+        this.isDistanceSurpassed = false;
+        this.isDelayEnded = false;
+        this.isDragging = false;
+        this.isTouch = false;
+        this.isGeneric = false; // initiated by 'dragstart' (jqui)
+        this.shouldCancelTouchScroll = true;
+        this.scrollAlwaysKills = false;
+        this.isAutoScroll = false;
+        // defaults
+        this.scrollSensitivity = 30; // pixels from edge for scrolling to start
+        this.scrollSpeed = 200; // pixels per second, at maximum speed
+        this.scrollIntervalMs = 50; // millisecond wait between scroll increment
+        this.options = options || {};
     }
-    // Populates internal variables used for date calculation and rendering
-    DayTableMixin.prototype.updateDayTable = function () {
-        var t = this;
-        var view = t.view;
-        var calendar = view.calendar;
-        var date = calendar.msToUtcMoment(t.dateProfile.renderUnzonedRange.startMs, true);
-        var end = calendar.msToUtcMoment(t.dateProfile.renderUnzonedRange.endMs, true);
-        var dayIndex = -1;
-        var dayIndices = [];
-        var dayDates = [];
-        var daysPerRow;
-        var firstDay;
-        var rowCnt;
-        while (date.isBefore(end)) {
-            if (view.isHiddenDay(date)) {
-                dayIndices.push(dayIndex + 0.5); // mark that it's between indices
+    // Interaction (high-level)
+    // -----------------------------------------------------------------------------------------------------------------
+    DragListener.prototype.startInteraction = function (ev, extraOptions) {
+        if (extraOptions === void 0) { extraOptions = {}; }
+        if (ev.type === 'mousedown') {
+            if (GlobalEmitter_1.default.get().shouldIgnoreMouse()) {
+                return;
+            }
+            else if (!util_1.isPrimaryMouseButton(ev)) {
+                return;
             }
             else {
-                dayIndex++;
-                dayIndices.push(dayIndex);
-                dayDates.push(date.clone());
+                ev.preventDefault(); // prevents native selection in most browsers
             }
-            date.add(1, 'days');
         }
-        if (this.breakOnWeeks) {
-            // count columns until the day-of-week repeats
-            firstDay = dayDates[0].day();
-            for (daysPerRow = 1; daysPerRow < dayDates.length; daysPerRow++) {
-                if (dayDates[daysPerRow].day() === firstDay) {
-                    break;
-                }
+        if (!this.isInteracting) {
+            // process options
+            this.delay = util_1.firstDefined(extraOptions.delay, this.options.delay, 0);
+            this.minDistance = util_1.firstDefined(extraOptions.distance, this.options.distance, 0);
+            this.subjectEl = this.options.subjectEl;
+            util_1.preventSelection($('body'));
+            this.isInteracting = true;
+            this.isTouch = util_1.getEvIsTouch(ev);
+            this.isGeneric = ev.type === 'dragstart';
+            this.isDelayEnded = false;
+            this.isDistanceSurpassed = false;
+            this.originX = util_1.getEvX(ev);
+            this.originY = util_1.getEvY(ev);
+            this.scrollEl = util_1.getScrollParent($(ev.target));
+            this.bindHandlers();
+            this.initAutoScroll();
+            this.handleInteractionStart(ev);
+            this.startDelay(ev);
+            if (!this.minDistance) {
+                this.handleDistanceSurpassed(ev);
             }
-            rowCnt = Math.ceil(dayDates.length / daysPerRow);
-        }
-        else {
-            rowCnt = 1;
-            daysPerRow = dayDates.length;
         }
-        this.dayDates = dayDates;
-        this.dayIndices = dayIndices;
-        this.daysPerRow = daysPerRow;
-        this.rowCnt = rowCnt;
-        this.updateDayTableCols();
-    };
-    // Computes and assigned the colCnt property and updates any options that may be computed from it
-    DayTableMixin.prototype.updateDayTableCols = function () {
-        this.colCnt = this.computeColCnt();
-        this.colHeadFormat =
-            this.opt('columnHeaderFormat') ||
-                this.opt('columnFormat') || // deprecated
-                this.computeColHeadFormat();
-    };
-    // Determines how many columns there should be in the table
-    DayTableMixin.prototype.computeColCnt = function () {
-        return this.daysPerRow;
     };
-    // Computes the ambiguously-timed moment for the given cell
-    DayTableMixin.prototype.getCellDate = function (row, col) {
-        return this.dayDates[this.getCellDayIndex(row, col)].clone();
+    DragListener.prototype.handleInteractionStart = function (ev) {
+        this.trigger('interactionStart', ev);
     };
-    // Computes the ambiguously-timed date range for the given cell
-    DayTableMixin.prototype.getCellRange = function (row, col) {
-        var start = this.getCellDate(row, col);
-        var end = start.clone().add(1, 'days');
-        return { start: start, end: end };
+    DragListener.prototype.endInteraction = function (ev, isCancelled) {
+        if (this.isInteracting) {
+            this.endDrag(ev);
+            if (this.delayTimeoutId) {
+                clearTimeout(this.delayTimeoutId);
+                this.delayTimeoutId = null;
+            }
+            this.destroyAutoScroll();
+            this.unbindHandlers();
+            this.isInteracting = false;
+            this.handleInteractionEnd(ev, isCancelled);
+            util_1.allowSelection($('body'));
+        }
     };
-    // Returns the number of day cells, chronologically, from the first of the grid (0-based)
-    DayTableMixin.prototype.getCellDayIndex = function (row, col) {
-        return row * this.daysPerRow + this.getColDayIndex(col);
+    DragListener.prototype.handleInteractionEnd = function (ev, isCancelled) {
+        this.trigger('interactionEnd', ev, isCancelled || false);
     };
-    // Returns the numner of day cells, chronologically, from the first cell in *any given row*
-    DayTableMixin.prototype.getColDayIndex = function (col) {
-        if (this.isRTL) {
-            return this.colCnt - 1 - col;
+    // Binding To DOM
+    // -----------------------------------------------------------------------------------------------------------------
+    DragListener.prototype.bindHandlers = function () {
+        // some browsers (Safari in iOS 10) don't allow preventDefault on touch events that are bound after touchstart,
+        // so listen to the GlobalEmitter singleton, which is always bound, instead of the document directly.
+        var globalEmitter = GlobalEmitter_1.default.get();
+        if (this.isGeneric) {
+            this.listenTo($(document), {
+                drag: this.handleMove,
+                dragstop: this.endInteraction
+            });
+        }
+        else if (this.isTouch) {
+            this.listenTo(globalEmitter, {
+                touchmove: this.handleTouchMove,
+                touchend: this.endInteraction,
+                scroll: this.handleTouchScroll
+            });
         }
         else {
-            return col;
+            this.listenTo(globalEmitter, {
+                mousemove: this.handleMouseMove,
+                mouseup: this.endInteraction
+            });
         }
+        this.listenTo(globalEmitter, {
+            selectstart: util_1.preventDefault,
+            contextmenu: util_1.preventDefault // long taps would open menu on Chrome dev tools
+        });
     };
-    // Given a date, returns its chronolocial cell-index from the first cell of the grid.
-    // If the date lies between cells (because of hiddenDays), returns a floating-point value between offsets.
-    // If before the first offset, returns a negative number.
-    // If after the last offset, returns an offset past the last cell offset.
-    // Only works for *start* dates of cells. Will not work for exclusive end dates for cells.
-    DayTableMixin.prototype.getDateDayIndex = function (date) {
-        var dayIndices = this.dayIndices;
-        var dayOffset = date.diff(this.dayDates[0], 'days');
-        if (dayOffset < 0) {
-            return dayIndices[0] - 1;
+    DragListener.prototype.unbindHandlers = function () {
+        this.stopListeningTo(GlobalEmitter_1.default.get());
+        this.stopListeningTo($(document)); // for isGeneric
+    };
+    // Drag (high-level)
+    // -----------------------------------------------------------------------------------------------------------------
+    // extraOptions ignored if drag already started
+    DragListener.prototype.startDrag = function (ev, extraOptions) {
+        this.startInteraction(ev, extraOptions); // ensure interaction began
+        if (!this.isDragging) {
+            this.isDragging = true;
+            this.handleDragStart(ev);
         }
-        else if (dayOffset >= dayIndices.length) {
-            return dayIndices[dayIndices.length - 1] + 1;
+    };
+    DragListener.prototype.handleDragStart = function (ev) {
+        this.trigger('dragStart', ev);
+    };
+    DragListener.prototype.handleMove = function (ev) {
+        var dx = util_1.getEvX(ev) - this.originX;
+        var dy = util_1.getEvY(ev) - this.originY;
+        var minDistance = this.minDistance;
+        var distanceSq; // current distance from the origin, squared
+        if (!this.isDistanceSurpassed) {
+            distanceSq = dx * dx + dy * dy;
+            if (distanceSq >= minDistance * minDistance) { // use pythagorean theorem
+                this.handleDistanceSurpassed(ev);
+            }
         }
-        else {
-            return dayIndices[dayOffset];
+        if (this.isDragging) {
+            this.handleDrag(dx, dy, ev);
         }
     };
-    /* Options
-    ------------------------------------------------------------------------------------------------------------------*/
-    // Computes a default column header formatting string if `colFormat` is not explicitly defined
-    DayTableMixin.prototype.computeColHeadFormat = function () {
-        // if more than one week row, or if there are a lot of columns with not much space,
-        // put just the day numbers will be in each cell
-        if (this.rowCnt > 1 || this.colCnt > 10) {
-            return 'ddd'; // "Sat"
+    // Called while the mouse is being moved and when we know a legitimate drag is taking place
+    DragListener.prototype.handleDrag = function (dx, dy, ev) {
+        this.trigger('drag', dx, dy, ev);
+        this.updateAutoScroll(ev); // will possibly cause scrolling
+    };
+    DragListener.prototype.endDrag = function (ev) {
+        if (this.isDragging) {
+            this.isDragging = false;
+            this.handleDragEnd(ev);
         }
-        else if (this.colCnt > 1) {
-            return this.opt('dayOfMonthFormat'); // "Sat 12/10"
+    };
+    DragListener.prototype.handleDragEnd = function (ev) {
+        this.trigger('dragEnd', ev);
+    };
+    // Delay
+    // -----------------------------------------------------------------------------------------------------------------
+    DragListener.prototype.startDelay = function (initialEv) {
+        var _this = this;
+        if (this.delay) {
+            this.delayTimeoutId = setTimeout(function () {
+                _this.handleDelayEnd(initialEv);
+            }, this.delay);
         }
         else {
-            return 'dddd'; // "Saturday"
+            this.handleDelayEnd(initialEv);
         }
     };
-    /* Slicing
-    ------------------------------------------------------------------------------------------------------------------*/
-    // Slices up a date range into a segment for every week-row it intersects with
-    DayTableMixin.prototype.sliceRangeByRow = function (unzonedRange) {
-        var daysPerRow = this.daysPerRow;
-        var normalRange = this.view.computeDayRange(unzonedRange); // make whole-day range, considering nextDayThreshold
-        var rangeFirst = this.getDateDayIndex(normalRange.start); // inclusive first index
-        var rangeLast = this.getDateDayIndex(normalRange.end.clone().subtract(1, 'days')); // inclusive last index
-        var segs = [];
-        var row;
-        var rowFirst;
-        var rowLast; // inclusive day-index range for current row
-        var segFirst;
-        var segLast; // inclusive day-index range for segment
-        for (row = 0; row < this.rowCnt; row++) {
-            rowFirst = row * daysPerRow;
-            rowLast = rowFirst + daysPerRow - 1;
-            // intersect segment's offset range with the row's
-            segFirst = Math.max(rangeFirst, rowFirst);
-            segLast = Math.min(rangeLast, rowLast);
-            // deal with in-between indices
-            segFirst = Math.ceil(segFirst); // in-between starts round to next cell
-            segLast = Math.floor(segLast); // in-between ends round to prev cell
-            if (segFirst <= segLast) {
-                segs.push({
-                    row: row,
-                    // normalize to start of row
-                    firstRowDayIndex: segFirst - rowFirst,
-                    lastRowDayIndex: segLast - rowFirst,
-                    // must be matching integers to be the segment's start/end
-                    isStart: segFirst === rangeFirst,
-                    isEnd: segLast === rangeLast
-                });
-            }
+    DragListener.prototype.handleDelayEnd = function (initialEv) {
+        this.isDelayEnded = true;
+        if (this.isDistanceSurpassed) {
+            this.startDrag(initialEv);
         }
-        return segs;
     };
-    // Slices up a date range into a segment for every day-cell it intersects with.
-    // TODO: make more DRY with sliceRangeByRow somehow.
-    DayTableMixin.prototype.sliceRangeByDay = function (unzonedRange) {
-        var daysPerRow = this.daysPerRow;
-        var normalRange = this.view.computeDayRange(unzonedRange); // make whole-day range, considering nextDayThreshold
-        var rangeFirst = this.getDateDayIndex(normalRange.start); // inclusive first index
-        var rangeLast = this.getDateDayIndex(normalRange.end.clone().subtract(1, 'days')); // inclusive last index
-        var segs = [];
-        var row;
-        var rowFirst;
-        var rowLast; // inclusive day-index range for current row
-        var i;
-        var segFirst;
-        var segLast; // inclusive day-index range for segment
-        for (row = 0; row < this.rowCnt; row++) {
-            rowFirst = row * daysPerRow;
-            rowLast = rowFirst + daysPerRow - 1;
-            for (i = rowFirst; i <= rowLast; i++) {
-                // intersect segment's offset range with the row's
-                segFirst = Math.max(rangeFirst, i);
-                segLast = Math.min(rangeLast, i);
-                // deal with in-between indices
-                segFirst = Math.ceil(segFirst); // in-between starts round to next cell
-                segLast = Math.floor(segLast); // in-between ends round to prev cell
-                if (segFirst <= segLast) {
-                    segs.push({
-                        row: row,
-                        // normalize to start of row
-                        firstRowDayIndex: segFirst - rowFirst,
-                        lastRowDayIndex: segLast - rowFirst,
-                        // must be matching integers to be the segment's start/end
-                        isStart: segFirst === rangeFirst,
-                        isEnd: segLast === rangeLast
-                    });
-                }
-            }
+    // Distance
+    // -----------------------------------------------------------------------------------------------------------------
+    DragListener.prototype.handleDistanceSurpassed = function (ev) {
+        this.isDistanceSurpassed = true;
+        if (this.isDelayEnded) {
+            this.startDrag(ev);
         }
-        return segs;
-    };
-    /* Header Rendering
-    ------------------------------------------------------------------------------------------------------------------*/
-    DayTableMixin.prototype.renderHeadHtml = function () {
-        var theme = this.view.calendar.theme;
-        return '' +
-            '<div class="fc-row ' + theme.getClass('headerRow') + '">' +
-            '<table class="' + theme.getClass('tableGrid') + '">' +
-            '<thead>' +
-            this.renderHeadTrHtml() +
-            '</thead>' +
-            '</table>' +
-            '</div>';
     };
-    DayTableMixin.prototype.renderHeadIntroHtml = function () {
-        return this.renderIntroHtml(); // fall back to generic
+    // Mouse / Touch
+    // -----------------------------------------------------------------------------------------------------------------
+    DragListener.prototype.handleTouchMove = function (ev) {
+        // prevent inertia and touchmove-scrolling while dragging
+        if (this.isDragging && this.shouldCancelTouchScroll) {
+            ev.preventDefault();
+        }
+        this.handleMove(ev);
     };
-    DayTableMixin.prototype.renderHeadTrHtml = function () {
-        return '' +
-            '<tr>' +
-            (this.isRTL ? '' : this.renderHeadIntroHtml()) +
-            this.renderHeadDateCellsHtml() +
-            (this.isRTL ? this.renderHeadIntroHtml() : '') +
-            '</tr>';
+    DragListener.prototype.handleMouseMove = function (ev) {
+        this.handleMove(ev);
     };
-    DayTableMixin.prototype.renderHeadDateCellsHtml = function () {
-        var htmls = [];
-        var col;
-        var date;
-        for (col = 0; col < this.colCnt; col++) {
-            date = this.getCellDate(0, col);
-            htmls.push(this.renderHeadDateCellHtml(date));
+    // Scrolling (unrelated to auto-scroll)
+    // -----------------------------------------------------------------------------------------------------------------
+    DragListener.prototype.handleTouchScroll = function (ev) {
+        // if the drag is being initiated by touch, but a scroll happens before
+        // the drag-initiating delay is over, cancel the drag
+        if (!this.isDragging || this.scrollAlwaysKills) {
+            this.endInteraction(ev, true); // isCancelled=true
         }
-        return htmls.join('');
     };
-    // TODO: when internalApiVersion, accept an object for HTML attributes
-    // (colspan should be no different)
-    DayTableMixin.prototype.renderHeadDateCellHtml = function (date, colspan, otherAttrs) {
-        var t = this;
-        var view = t.view;
-        var isDateValid = t.dateProfile.activeUnzonedRange.containsDate(date); // TODO: called too frequently. cache somehow.
-        var classNames = [
-            'fc-day-header',
-            view.calendar.theme.getClass('widgetHeader')
-        ];
-        var innerHtml;
-        if (typeof t.opt('columnHeaderHtml') === 'function') {
-            innerHtml = t.opt('columnHeaderHtml')(date);
-        }
-        else if (typeof t.opt('columnHeaderText') === 'function') {
-            innerHtml = util_1.htmlEscape(t.opt('columnHeaderText')(date));
+    // Utils
+    // -----------------------------------------------------------------------------------------------------------------
+    // Triggers a callback. Calls a function in the option hash of the same name.
+    // Arguments beyond the first `name` are forwarded on.
+    DragListener.prototype.trigger = function (name) {
+        var args = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            args[_i - 1] = arguments[_i];
         }
-        else {
-            innerHtml = util_1.htmlEscape(date.format(t.colHeadFormat));
+        if (this.options[name]) {
+            this.options[name].apply(this, args);
         }
-        // if only one row of days, the classNames on the header can represent the specific days beneath
-        if (t.rowCnt === 1) {
-            classNames = classNames.concat(
-            // includes the day-of-week class
-            // noThemeHighlight=true (don't highlight the header)
-            t.getDayClasses(date, true));
+        // makes _methods callable by event name. TODO: kill this
+        if (this['_' + name]) {
+            this['_' + name].apply(this, args);
         }
-        else {
-            classNames.push('fc-' + util_1.dayIDs[date.day()]); // only add the day-of-week class
+    };
+    // Auto-scroll
+    // -----------------------------------------------------------------------------------------------------------------
+    DragListener.prototype.initAutoScroll = function () {
+        var scrollEl = this.scrollEl;
+        this.isAutoScroll =
+            this.options.scroll &&
+                scrollEl &&
+                !scrollEl.is(window) &&
+                !scrollEl.is(document);
+        if (this.isAutoScroll) {
+            // debounce makes sure rapid calls don't happen
+            this.listenTo(scrollEl, 'scroll', util_1.debounce(this.handleDebouncedScroll, 100));
         }
-        return '' +
-            '<th class="' + classNames.join(' ') + '"' +
-            ((isDateValid && t.rowCnt) === 1 ?
-                ' data-date="' + date.format('YYYY-MM-DD') + '"' :
-                '') +
-            (colspan > 1 ?
-                ' colspan="' + colspan + '"' :
-                '') +
-            (otherAttrs ?
-                ' ' + otherAttrs :
-                '') +
-            '>' +
-            (isDateValid ?
-                // don't make a link if the heading could represent multiple days, or if there's only one day (forceOff)
-                view.buildGotoAnchorHtml({ date: date, forceOff: t.rowCnt > 1 || t.colCnt === 1 }, innerHtml) :
-                // if not valid, display text, but no link
-                innerHtml) +
-            '</th>';
     };
-    /* Background Rendering
-    ------------------------------------------------------------------------------------------------------------------*/
-    DayTableMixin.prototype.renderBgTrHtml = function (row) {
-        return '' +
-            '<tr>' +
-            (this.isRTL ? '' : this.renderBgIntroHtml(row)) +
-            this.renderBgCellsHtml(row) +
-            (this.isRTL ? this.renderBgIntroHtml(row) : '') +
-            '</tr>';
+    DragListener.prototype.destroyAutoScroll = function () {
+        this.endAutoScroll(); // kill any animation loop
+        // remove the scroll handler if there is a scrollEl
+        if (this.isAutoScroll) {
+            this.stopListeningTo(this.scrollEl, 'scroll'); // will probably get removed by unbindHandlers too :(
+        }
     };
-    DayTableMixin.prototype.renderBgIntroHtml = function (row) {
-        return this.renderIntroHtml(); // fall back to generic
+    // Computes and stores the bounding rectangle of scrollEl
+    DragListener.prototype.computeScrollBounds = function () {
+        if (this.isAutoScroll) {
+            this.scrollBounds = util_1.getOuterRect(this.scrollEl);
+            // TODO: use getClientRect in future. but prevents auto scrolling when on top of scrollbars
+        }
     };
-    DayTableMixin.prototype.renderBgCellsHtml = function (row) {
-        var htmls = [];
-        var col;
-        var date;
-        for (col = 0; col < this.colCnt; col++) {
-            date = this.getCellDate(row, col);
-            htmls.push(this.renderBgCellHtml(date));
+    // Called when the dragging is in progress and scrolling should be updated
+    DragListener.prototype.updateAutoScroll = function (ev) {
+        var sensitivity = this.scrollSensitivity;
+        var bounds = this.scrollBounds;
+        var topCloseness;
+        var bottomCloseness;
+        var leftCloseness;
+        var rightCloseness;
+        var topVel = 0;
+        var leftVel = 0;
+        if (bounds) { // only scroll if scrollEl exists
+            // compute closeness to edges. valid range is from 0.0 - 1.0
+            topCloseness = (sensitivity - (util_1.getEvY(ev) - bounds.top)) / sensitivity;
+            bottomCloseness = (sensitivity - (bounds.bottom - util_1.getEvY(ev))) / sensitivity;
+            leftCloseness = (sensitivity - (util_1.getEvX(ev) - bounds.left)) / sensitivity;
+            rightCloseness = (sensitivity - (bounds.right - util_1.getEvX(ev))) / sensitivity;
+            // translate vertical closeness into velocity.
+            // mouse must be completely in bounds for velocity to happen.
+            if (topCloseness >= 0 && topCloseness <= 1) {
+                topVel = topCloseness * this.scrollSpeed * -1; // negative. for scrolling up
+            }
+            else if (bottomCloseness >= 0 && bottomCloseness <= 1) {
+                topVel = bottomCloseness * this.scrollSpeed;
+            }
+            // translate horizontal closeness into velocity
+            if (leftCloseness >= 0 && leftCloseness <= 1) {
+                leftVel = leftCloseness * this.scrollSpeed * -1; // negative. for scrolling left
+            }
+            else if (rightCloseness >= 0 && rightCloseness <= 1) {
+                leftVel = rightCloseness * this.scrollSpeed;
+            }
         }
-        return htmls.join('');
+        this.setScrollVel(topVel, leftVel);
     };
-    DayTableMixin.prototype.renderBgCellHtml = function (date, otherAttrs) {
-        var t = this;
-        var view = t.view;
-        var isDateValid = t.dateProfile.activeUnzonedRange.containsDate(date); // TODO: called too frequently. cache somehow.
-        var classes = t.getDayClasses(date);
-        classes.unshift('fc-day', view.calendar.theme.getClass('widgetContent'));
-        return '<td class="' + classes.join(' ') + '"' +
-            (isDateValid ?
-                ' data-date="' + date.format('YYYY-MM-DD') + '"' : // if date has a time, won't format it
-                '') +
-            (otherAttrs ?
-                ' ' + otherAttrs :
-                '') +
-            '></td>';
-    };
-    /* Generic
-    ------------------------------------------------------------------------------------------------------------------*/
-    DayTableMixin.prototype.renderIntroHtml = function () {
-        // Generates the default HTML intro for any row. User classes should override
+    // Sets the speed-of-scrolling for the scrollEl
+    DragListener.prototype.setScrollVel = function (topVel, leftVel) {
+        this.scrollTopVel = topVel;
+        this.scrollLeftVel = leftVel;
+        this.constrainScrollVel(); // massages into realistic values
+        // if there is non-zero velocity, and an animation loop hasn't already started, then START
+        if ((this.scrollTopVel || this.scrollLeftVel) && !this.scrollIntervalId) {
+            this.scrollIntervalId = setInterval(util_1.proxy(this, 'scrollIntervalFunc'), // scope to `this`
+            this.scrollIntervalMs);
+        }
     };
-    // TODO: a generic method for dealing with <tr>, RTL, intro
-    // when increment internalApiVersion
-    // wrapTr (scheduler)
-    /* Utils
-    ------------------------------------------------------------------------------------------------------------------*/
-    // Applies the generic "intro" and "outro" HTML to the given cells.
-    // Intro means the leftmost cell when the calendar is LTR and the rightmost cell when RTL. Vice-versa for outro.
-    DayTableMixin.prototype.bookendCells = function (trEl) {
-        var introHtml = this.renderIntroHtml();
-        if (introHtml) {
-            if (this.isRTL) {
-                trEl.append(introHtml);
+    // Forces scrollTopVel and scrollLeftVel to be zero if scrolling has already gone all the way
+    DragListener.prototype.constrainScrollVel = function () {
+        var el = this.scrollEl;
+        if (this.scrollTopVel < 0) { // scrolling up?
+            if (el.scrollTop() <= 0) { // already scrolled all the way up?
+                this.scrollTopVel = 0;
             }
-            else {
-                trEl.prepend(introHtml);
+        }
+        else if (this.scrollTopVel > 0) { // scrolling down?
+            if (el.scrollTop() + el[0].clientHeight >= el[0].scrollHeight) { // already scrolled all the way down?
+                this.scrollTopVel = 0;
+            }
+        }
+        if (this.scrollLeftVel < 0) { // scrolling left?
+            if (el.scrollLeft() <= 0) { // already scrolled all the left?
+                this.scrollLeftVel = 0;
+            }
+        }
+        else if (this.scrollLeftVel > 0) { // scrolling right?
+            if (el.scrollLeft() + el[0].clientWidth >= el[0].scrollWidth) { // already scrolled all the way right?
+                this.scrollLeftVel = 0;
             }
         }
     };
-    return DayTableMixin;
-}(Mixin_1.default));
-exports.default = DayTableMixin;
-
-
-/***/ }),
-/* 56 */
-/***/ (function(module, exports) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var BusinessHourRenderer = /** @class */ (function () {
-    /*
-    component implements:
-      - eventRangesToEventFootprints
-      - eventFootprintsToSegs
-    */
-    function BusinessHourRenderer(component, fillRenderer) {
-        this.component = component;
-        this.fillRenderer = fillRenderer;
-    }
-    BusinessHourRenderer.prototype.render = function (businessHourGenerator) {
-        var component = this.component;
-        var unzonedRange = component._getDateProfile().activeUnzonedRange;
-        var eventInstanceGroup = businessHourGenerator.buildEventInstanceGroup(component.hasAllDayBusinessHours, unzonedRange);
-        var eventFootprints = eventInstanceGroup ?
-            component.eventRangesToEventFootprints(eventInstanceGroup.sliceRenderRanges(unzonedRange)) :
-            [];
-        this.renderEventFootprints(eventFootprints);
-    };
-    BusinessHourRenderer.prototype.renderEventFootprints = function (eventFootprints) {
-        var segs = this.component.eventFootprintsToSegs(eventFootprints);
-        this.renderSegs(segs);
-        this.segs = segs;
+    // This function gets called during every iteration of the scrolling animation loop
+    DragListener.prototype.scrollIntervalFunc = function () {
+        var el = this.scrollEl;
+        var frac = this.scrollIntervalMs / 1000; // considering animation frequency, what the vel should be mult'd by
+        // change the value of scrollEl's scroll
+        if (this.scrollTopVel) {
+            el.scrollTop(el.scrollTop() + this.scrollTopVel * frac);
+        }
+        if (this.scrollLeftVel) {
+            el.scrollLeft(el.scrollLeft() + this.scrollLeftVel * frac);
+        }
+        this.constrainScrollVel(); // since the scroll values changed, recompute the velocities
+        // if scrolled all the way, which causes the vels to be zero, stop the animation loop
+        if (!this.scrollTopVel && !this.scrollLeftVel) {
+            this.endAutoScroll();
+        }
     };
-    BusinessHourRenderer.prototype.renderSegs = function (segs) {
-        if (this.fillRenderer) {
-            this.fillRenderer.renderSegs('businessHours', segs, {
-                getClasses: function (seg) {
-                    return ['fc-nonbusiness', 'fc-bgevent'];
-                }
-            });
+    // Kills any existing scrolling animation loop
+    DragListener.prototype.endAutoScroll = function () {
+        if (this.scrollIntervalId) {
+            clearInterval(this.scrollIntervalId);
+            this.scrollIntervalId = null;
+            this.handleScrollEnd();
         }
     };
-    BusinessHourRenderer.prototype.unrender = function () {
-        if (this.fillRenderer) {
-            this.fillRenderer.unrender('businessHours');
+    // Get called when the scrollEl is scrolled (NOTE: this is delayed via debounce)
+    DragListener.prototype.handleDebouncedScroll = function () {
+        // recompute all coordinates, but *only* if this is *not* part of our scrolling animation
+        if (!this.scrollIntervalId) {
+            this.handleScrollEnd();
         }
-        this.segs = null;
     };
-    BusinessHourRenderer.prototype.getSegs = function () {
-        return this.segs || [];
+    DragListener.prototype.handleScrollEnd = function () {
+        // Called when scrolling has stopped, whether through auto scroll, or the user scrolling
     };
-    return BusinessHourRenderer;
+    return DragListener;
 }());
-exports.default = BusinessHourRenderer;
+exports.default = DragListener;
+ListenerMixin_1.default.mixInto(DragListener);
 
 
 /***/ }),
-/* 57 */
+/* 60 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var $ = __webpack_require__(3);
+var tslib_1 = __webpack_require__(2);
 var util_1 = __webpack_require__(4);
-var FillRenderer = /** @class */ (function () {
-    function FillRenderer(component) {
-        this.fillSegTag = 'div';
-        this.component = component;
-        this.elsByFill = {};
+var Mixin_1 = __webpack_require__(15);
+/*
+A set of rendering and date-related methods for a visual component comprised of one or more rows of day columns.
+Prerequisite: the object being mixed into needs to be a *Grid*
+*/
+var DayTableMixin = /** @class */ (function (_super) {
+    tslib_1.__extends(DayTableMixin, _super);
+    function DayTableMixin() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
-    FillRenderer.prototype.renderFootprint = function (type, componentFootprint, props) {
-        this.renderSegs(type, this.component.componentFootprintToSegs(componentFootprint), props);
-    };
-    FillRenderer.prototype.renderSegs = function (type, segs, props) {
-        var els;
-        segs = this.buildSegEls(type, segs, props); // assignes `.el` to each seg. returns successfully rendered segs
-        els = this.attachSegEls(type, segs);
-        if (els) {
-            this.reportEls(type, els);
-        }
-        return segs;
-    };
-    // Unrenders a specific type of fill that is currently rendered on the grid
-    FillRenderer.prototype.unrender = function (type) {
-        var el = this.elsByFill[type];
-        if (el) {
-            el.remove();
-            delete this.elsByFill[type];
-        }
-    };
-    // Renders and assigns an `el` property for each fill segment. Generic enough to work with different types.
-    // Only returns segments that successfully rendered.
-    FillRenderer.prototype.buildSegEls = function (type, segs, props) {
-        var _this = this;
-        var html = '';
-        var renderedSegs = [];
-        var i;
-        if (segs.length) {
-            // build a large concatenation of segment HTML
-            for (i = 0; i < segs.length; i++) {
-                html += this.buildSegHtml(type, segs[i], props);
+    // Populates internal variables used for date calculation and rendering
+    DayTableMixin.prototype.updateDayTable = function () {
+        var t = this;
+        var view = t.view;
+        var calendar = view.calendar;
+        var date = calendar.msToUtcMoment(t.dateProfile.renderUnzonedRange.startMs, true);
+        var end = calendar.msToUtcMoment(t.dateProfile.renderUnzonedRange.endMs, true);
+        var dayIndex = -1;
+        var dayIndices = [];
+        var dayDates = [];
+        var daysPerRow;
+        var firstDay;
+        var rowCnt;
+        while (date.isBefore(end)) { // loop each day from start to end
+            if (view.isHiddenDay(date)) {
+                dayIndices.push(dayIndex + 0.5); // mark that it's between indices
             }
-            // Grab individual elements from the combined HTML string. Use each as the default rendering.
-            // Then, compute the 'el' for each segment.
-            $(html).each(function (i, node) {
-                var seg = segs[i];
-                var el = $(node);
-                // allow custom filter methods per-type
-                if (props.filterEl) {
-                    el = props.filterEl(seg, el);
-                }
-                if (el) {
-                    el = $(el); // allow custom filter to return raw DOM node
-                    // correct element type? (would be bad if a non-TD were inserted into a table for example)
-                    if (el.is(_this.fillSegTag)) {
-                        seg.el = el;
-                        renderedSegs.push(seg);
-                    }
-                }
-            });
+            else {
+                dayIndex++;
+                dayIndices.push(dayIndex);
+                dayDates.push(date.clone());
+            }
+            date.add(1, 'days');
         }
-        return renderedSegs;
-    };
-    // Builds the HTML needed for one fill segment. Generic enough to work with different types.
-    FillRenderer.prototype.buildSegHtml = function (type, seg, props) {
-        // custom hooks per-type
-        var classes = props.getClasses ? props.getClasses(seg) : [];
-        var css = util_1.cssToStr(props.getCss ? props.getCss(seg) : {});
-        return '<' + this.fillSegTag +
-            (classes.length ? ' class="' + classes.join(' ') + '"' : '') +
-            (css ? ' style="' + css + '"' : '') +
-            ' />';
-    };
-    // Should return wrapping DOM structure
-    FillRenderer.prototype.attachSegEls = function (type, segs) {
-        // subclasses must implement
-    };
-    FillRenderer.prototype.reportEls = function (type, nodes) {
-        if (this.elsByFill[type]) {
-            this.elsByFill[type] = this.elsByFill[type].add(nodes);
+        if (this.breakOnWeeks) {
+            // count columns until the day-of-week repeats
+            firstDay = dayDates[0].day();
+            for (daysPerRow = 1; daysPerRow < dayDates.length; daysPerRow++) {
+                if (dayDates[daysPerRow].day() === firstDay) {
+                    break;
+                }
+            }
+            rowCnt = Math.ceil(dayDates.length / daysPerRow);
         }
         else {
-            this.elsByFill[type] = $(nodes);
+            rowCnt = 1;
+            daysPerRow = dayDates.length;
         }
+        this.dayDates = dayDates;
+        this.dayIndices = dayIndices;
+        this.daysPerRow = daysPerRow;
+        this.rowCnt = rowCnt;
+        this.updateDayTableCols();
     };
-    return FillRenderer;
-}());
-exports.default = FillRenderer;
-
-
-/***/ }),
-/* 58 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var SingleEventDef_1 = __webpack_require__(13);
-var EventFootprint_1 = __webpack_require__(36);
-var EventSource_1 = __webpack_require__(6);
-var HelperRenderer = /** @class */ (function () {
-    function HelperRenderer(component, eventRenderer) {
-        this.view = component._getView();
-        this.component = component;
-        this.eventRenderer = eventRenderer;
-    }
-    HelperRenderer.prototype.renderComponentFootprint = function (componentFootprint) {
-        this.renderEventFootprints([
-            this.fabricateEventFootprint(componentFootprint)
-        ]);
-    };
-    HelperRenderer.prototype.renderEventDraggingFootprints = function (eventFootprints, sourceSeg, isTouch) {
-        this.renderEventFootprints(eventFootprints, sourceSeg, 'fc-dragging', isTouch ? null : this.view.opt('dragOpacity'));
-    };
-    HelperRenderer.prototype.renderEventResizingFootprints = function (eventFootprints, sourceSeg, isTouch) {
-        this.renderEventFootprints(eventFootprints, sourceSeg, 'fc-resizing');
+    // Computes and assigned the colCnt property and updates any options that may be computed from it
+    DayTableMixin.prototype.updateDayTableCols = function () {
+        this.colCnt = this.computeColCnt();
+        this.colHeadFormat =
+            this.opt('columnHeaderFormat') ||
+                this.opt('columnFormat') || // deprecated
+                this.computeColHeadFormat();
     };
-    HelperRenderer.prototype.renderEventFootprints = function (eventFootprints, sourceSeg, extraClassNames, opacity) {
-        var segs = this.component.eventFootprintsToSegs(eventFootprints);
-        var classNames = 'fc-helper ' + (extraClassNames || '');
-        var i;
-        // assigns each seg's el and returns a subset of segs that were rendered
-        segs = this.eventRenderer.renderFgSegEls(segs);
-        for (i = 0; i < segs.length; i++) {
-            segs[i].el.addClass(classNames);
-        }
-        if (opacity != null) {
-            for (i = 0; i < segs.length; i++) {
-                segs[i].el.css('opacity', opacity);
-            }
-        }
-        this.helperEls = this.renderSegs(segs, sourceSeg);
+    // Determines how many columns there should be in the table
+    DayTableMixin.prototype.computeColCnt = function () {
+        return this.daysPerRow;
     };
-    /*
-    Must return all mock event elements
-    */
-    HelperRenderer.prototype.renderSegs = function (segs, sourceSeg) {
-        // Subclasses must implement
+    // Computes the ambiguously-timed moment for the given cell
+    DayTableMixin.prototype.getCellDate = function (row, col) {
+        return this.dayDates[this.getCellDayIndex(row, col)].clone();
     };
-    HelperRenderer.prototype.unrender = function () {
-        if (this.helperEls) {
-            this.helperEls.remove();
-            this.helperEls = null;
-        }
+    // Computes the ambiguously-timed date range for the given cell
+    DayTableMixin.prototype.getCellRange = function (row, col) {
+        var start = this.getCellDate(row, col);
+        var end = start.clone().add(1, 'days');
+        return { start: start, end: end };
     };
-    HelperRenderer.prototype.fabricateEventFootprint = function (componentFootprint) {
-        var calendar = this.view.calendar;
-        var eventDateProfile = calendar.footprintToDateProfile(componentFootprint);
-        var dummyEvent = new SingleEventDef_1.default(new EventSource_1.default(calendar));
-        var dummyInstance;
-        dummyEvent.dateProfile = eventDateProfile;
-        dummyInstance = dummyEvent.buildInstance();
-        return new EventFootprint_1.default(componentFootprint, dummyEvent, dummyInstance);
+    // Returns the number of day cells, chronologically, from the first of the grid (0-based)
+    DayTableMixin.prototype.getCellDayIndex = function (row, col) {
+        return row * this.daysPerRow + this.getColDayIndex(col);
     };
-    return HelperRenderer;
-}());
-exports.default = HelperRenderer;
-
-
-/***/ }),
-/* 59 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var GlobalEmitter_1 = __webpack_require__(21);
-var Interaction_1 = __webpack_require__(15);
-var EventPointing = /** @class */ (function (_super) {
-    tslib_1.__extends(EventPointing, _super);
-    function EventPointing() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    /*
-    component must implement:
-      - publiclyTrigger
-    */
-    EventPointing.prototype.bindToEl = function (el) {
-        var component = this.component;
-        component.bindSegHandlerToEl(el, 'click', this.handleClick.bind(this));
-        component.bindSegHandlerToEl(el, 'mouseenter', this.handleMouseover.bind(this));
-        component.bindSegHandlerToEl(el, 'mouseleave', this.handleMouseout.bind(this));
+    // Returns the numner of day cells, chronologically, from the first cell in *any given row*
+    DayTableMixin.prototype.getColDayIndex = function (col) {
+        if (this.isRTL) {
+            return this.colCnt - 1 - col;
+        }
+        else {
+            return col;
+        }
     };
-    EventPointing.prototype.handleClick = function (seg, ev) {
-        var res = this.component.publiclyTrigger('eventClick', {
-            context: seg.el[0],
-            args: [seg.footprint.getEventLegacy(), ev, this.view]
-        });
-        if (res === false) {
-            ev.preventDefault();
+    // Given a date, returns its chronolocial cell-index from the first cell of the grid.
+    // If the date lies between cells (because of hiddenDays), returns a floating-point value between offsets.
+    // If before the first offset, returns a negative number.
+    // If after the last offset, returns an offset past the last cell offset.
+    // Only works for *start* dates of cells. Will not work for exclusive end dates for cells.
+    DayTableMixin.prototype.getDateDayIndex = function (date) {
+        var dayIndices = this.dayIndices;
+        var dayOffset = date.diff(this.dayDates[0], 'days');
+        if (dayOffset < 0) {
+            return dayIndices[0] - 1;
+        }
+        else if (dayOffset >= dayIndices.length) {
+            return dayIndices[dayIndices.length - 1] + 1;
+        }
+        else {
+            return dayIndices[dayOffset];
         }
     };
-    // Updates internal state and triggers handlers for when an event element is moused over
-    EventPointing.prototype.handleMouseover = function (seg, ev) {
-        if (!GlobalEmitter_1.default.get().shouldIgnoreMouse() &&
-            !this.mousedOverSeg) {
-            this.mousedOverSeg = seg;
-            // TODO: move to EventSelecting's responsibility
-            if (this.view.isEventDefResizable(seg.footprint.eventDef)) {
-                seg.el.addClass('fc-allow-mouse-resize');
-            }
-            this.component.publiclyTrigger('eventMouseover', {
-                context: seg.el[0],
-                args: [seg.footprint.getEventLegacy(), ev, this.view]
-            });
+    /* Options
+    ------------------------------------------------------------------------------------------------------------------*/
+    // Computes a default column header formatting string if `colFormat` is not explicitly defined
+    DayTableMixin.prototype.computeColHeadFormat = function () {
+        // if more than one week row, or if there are a lot of columns with not much space,
+        // put just the day numbers will be in each cell
+        if (this.rowCnt > 1 || this.colCnt > 10) {
+            return 'ddd'; // "Sat"
+        }
+        else if (this.colCnt > 1) {
+            return this.opt('dayOfMonthFormat'); // "Sat 12/10"
+        }
+        else {
+            return 'dddd'; // "Saturday"
         }
     };
-    // Updates internal state and triggers handlers for when an event element is moused out.
-    // Can be given no arguments, in which case it will mouseout the segment that was previously moused over.
-    EventPointing.prototype.handleMouseout = function (seg, ev) {
-        if (this.mousedOverSeg) {
-            this.mousedOverSeg = null;
-            // TODO: move to EventSelecting's responsibility
-            if (this.view.isEventDefResizable(seg.footprint.eventDef)) {
-                seg.el.removeClass('fc-allow-mouse-resize');
+    /* Slicing
+    ------------------------------------------------------------------------------------------------------------------*/
+    // Slices up a date range into a segment for every week-row it intersects with
+    DayTableMixin.prototype.sliceRangeByRow = function (unzonedRange) {
+        var daysPerRow = this.daysPerRow;
+        var normalRange = this.view.computeDayRange(unzonedRange); // make whole-day range, considering nextDayThreshold
+        var rangeFirst = this.getDateDayIndex(normalRange.start); // inclusive first index
+        var rangeLast = this.getDateDayIndex(normalRange.end.clone().subtract(1, 'days')); // inclusive last index
+        var segs = [];
+        var row;
+        var rowFirst;
+        var rowLast; // inclusive day-index range for current row
+        var segFirst;
+        var segLast; // inclusive day-index range for segment
+        for (row = 0; row < this.rowCnt; row++) {
+            rowFirst = row * daysPerRow;
+            rowLast = rowFirst + daysPerRow - 1;
+            // intersect segment's offset range with the row's
+            segFirst = Math.max(rangeFirst, rowFirst);
+            segLast = Math.min(rangeLast, rowLast);
+            // deal with in-between indices
+            segFirst = Math.ceil(segFirst); // in-between starts round to next cell
+            segLast = Math.floor(segLast); // in-between ends round to prev cell
+            if (segFirst <= segLast) { // was there any intersection with the current row?
+                segs.push({
+                    row: row,
+                    // normalize to start of row
+                    firstRowDayIndex: segFirst - rowFirst,
+                    lastRowDayIndex: segLast - rowFirst,
+                    // must be matching integers to be the segment's start/end
+                    isStart: segFirst === rangeFirst,
+                    isEnd: segLast === rangeLast
+                });
             }
-            this.component.publiclyTrigger('eventMouseout', {
-                context: seg.el[0],
-                args: [
-                    seg.footprint.getEventLegacy(),
-                    ev || {},
-                    this.view
-                ]
-            });
         }
+        return segs;
     };
-    EventPointing.prototype.end = function () {
-        if (this.mousedOverSeg) {
-            this.handleMouseout(this.mousedOverSeg);
+    // Slices up a date range into a segment for every day-cell it intersects with.
+    // TODO: make more DRY with sliceRangeByRow somehow.
+    DayTableMixin.prototype.sliceRangeByDay = function (unzonedRange) {
+        var daysPerRow = this.daysPerRow;
+        var normalRange = this.view.computeDayRange(unzonedRange); // make whole-day range, considering nextDayThreshold
+        var rangeFirst = this.getDateDayIndex(normalRange.start); // inclusive first index
+        var rangeLast = this.getDateDayIndex(normalRange.end.clone().subtract(1, 'days')); // inclusive last index
+        var segs = [];
+        var row;
+        var rowFirst;
+        var rowLast; // inclusive day-index range for current row
+        var i;
+        var segFirst;
+        var segLast; // inclusive day-index range for segment
+        for (row = 0; row < this.rowCnt; row++) {
+            rowFirst = row * daysPerRow;
+            rowLast = rowFirst + daysPerRow - 1;
+            for (i = rowFirst; i <= rowLast; i++) {
+                // intersect segment's offset range with the row's
+                segFirst = Math.max(rangeFirst, i);
+                segLast = Math.min(rangeLast, i);
+                // deal with in-between indices
+                segFirst = Math.ceil(segFirst); // in-between starts round to next cell
+                segLast = Math.floor(segLast); // in-between ends round to prev cell
+                if (segFirst <= segLast) { // was there any intersection with the current row?
+                    segs.push({
+                        row: row,
+                        // normalize to start of row
+                        firstRowDayIndex: segFirst - rowFirst,
+                        lastRowDayIndex: segLast - rowFirst,
+                        // must be matching integers to be the segment's start/end
+                        isStart: segFirst === rangeFirst,
+                        isEnd: segLast === rangeLast
+                    });
+                }
+            }
         }
+        return segs;
     };
-    return EventPointing;
-}(Interaction_1.default));
-exports.default = EventPointing;
-
-
-/***/ }),
-/* 60 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var Mixin_1 = __webpack_require__(14);
-var DateClicking_1 = __webpack_require__(245);
-var DateSelecting_1 = __webpack_require__(225);
-var EventPointing_1 = __webpack_require__(59);
-var EventDragging_1 = __webpack_require__(224);
-var EventResizing_1 = __webpack_require__(223);
-var ExternalDropping_1 = __webpack_require__(222);
-var StandardInteractionsMixin = /** @class */ (function (_super) {
-    tslib_1.__extends(StandardInteractionsMixin, _super);
-    function StandardInteractionsMixin() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    return StandardInteractionsMixin;
-}(Mixin_1.default));
-exports.default = StandardInteractionsMixin;
-StandardInteractionsMixin.prototype.dateClickingClass = DateClicking_1.default;
-StandardInteractionsMixin.prototype.dateSelectingClass = DateSelecting_1.default;
-StandardInteractionsMixin.prototype.eventPointingClass = EventPointing_1.default;
-StandardInteractionsMixin.prototype.eventDraggingClass = EventDragging_1.default;
-StandardInteractionsMixin.prototype.eventResizingClass = EventResizing_1.default;
-StandardInteractionsMixin.prototype.externalDroppingClass = ExternalDropping_1.default;
-
-
-/***/ }),
-/* 61 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var $ = __webpack_require__(3);
-var util_1 = __webpack_require__(4);
-var CoordCache_1 = __webpack_require__(53);
-var Popover_1 = __webpack_require__(249);
-var UnzonedRange_1 = __webpack_require__(5);
-var ComponentFootprint_1 = __webpack_require__(12);
-var EventFootprint_1 = __webpack_require__(36);
-var BusinessHourRenderer_1 = __webpack_require__(56);
-var StandardInteractionsMixin_1 = __webpack_require__(60);
-var InteractiveDateComponent_1 = __webpack_require__(40);
-var DayTableMixin_1 = __webpack_require__(55);
-var DayGridEventRenderer_1 = __webpack_require__(250);
-var DayGridHelperRenderer_1 = __webpack_require__(251);
-var DayGridFillRenderer_1 = __webpack_require__(252);
-/* A component that renders a grid of whole-days that runs horizontally. There can be multiple rows, one per week.
-----------------------------------------------------------------------------------------------------------------------*/
-var DayGrid = /** @class */ (function (_super) {
-    tslib_1.__extends(DayGrid, _super);
-    function DayGrid(view) {
-        var _this = _super.call(this, view) || this;
-        _this.cellWeekNumbersVisible = false; // display week numbers in day cell?
-        _this.bottomCoordPadding = 0; // hack for extending the hit area for the last row of the coordinate grid
-        // isRigid determines whether the individual rows should ignore the contents and be a constant height.
-        // Relies on the view's colCnt and rowCnt. In the future, this component should probably be self-sufficient.
-        _this.isRigid = false;
-        _this.hasAllDayBusinessHours = true;
-        return _this;
-    }
-    // Slices up the given span (unzoned start/end with other misc data) into an array of segments
-    DayGrid.prototype.componentFootprintToSegs = function (componentFootprint) {
-        var segs = this.sliceRangeByRow(componentFootprint.unzonedRange);
-        var i;
-        var seg;
-        for (i = 0; i < segs.length; i++) {
-            seg = segs[i];
-            if (this.isRTL) {
-                seg.leftCol = this.daysPerRow - 1 - seg.lastRowDayIndex;
-                seg.rightCol = this.daysPerRow - 1 - seg.firstRowDayIndex;
-            }
-            else {
-                seg.leftCol = seg.firstRowDayIndex;
-                seg.rightCol = seg.lastRowDayIndex;
-            }
-        }
-        return segs;
-    };
-    /* Date Rendering
+    /* Header Rendering
     ------------------------------------------------------------------------------------------------------------------*/
-    DayGrid.prototype.renderDates = function (dateProfile) {
-        this.dateProfile = dateProfile;
-        this.updateDayTable();
-        this.renderGrid();
-    };
-    DayGrid.prototype.unrenderDates = function () {
-        this.removeSegPopover();
-    };
-    // Renders the rows and columns into the component's `this.el`, which should already be assigned.
-    DayGrid.prototype.renderGrid = function () {
-        var view = this.view;
-        var rowCnt = this.rowCnt;
-        var colCnt = this.colCnt;
-        var html = '';
-        var row;
-        var col;
-        if (this.headContainerEl) {
-            this.headContainerEl.html(this.renderHeadHtml());
-        }
-        for (row = 0; row < rowCnt; row++) {
-            html += this.renderDayRowHtml(row, this.isRigid);
-        }
-        this.el.html(html);
-        this.rowEls = this.el.find('.fc-row');
-        this.cellEls = this.el.find('.fc-day, .fc-disabled-day');
-        this.rowCoordCache = new CoordCache_1.default({
-            els: this.rowEls,
-            isVertical: true
-        });
-        this.colCoordCache = new CoordCache_1.default({
-            els: this.cellEls.slice(0, this.colCnt),
-            isHorizontal: true
-        });
-        // trigger dayRender with each cell's element
-        for (row = 0; row < rowCnt; row++) {
-            for (col = 0; col < colCnt; col++) {
-                this.publiclyTrigger('dayRender', {
-                    context: view,
-                    args: [
-                        this.getCellDate(row, col),
-                        this.getCellEl(row, col),
-                        view
-                    ]
-                });
-            }
-        }
-    };
-    // Generates the HTML for a single row, which is a div that wraps a table.
-    // `row` is the row number.
-    DayGrid.prototype.renderDayRowHtml = function (row, isRigid) {
+    DayTableMixin.prototype.renderHeadHtml = function () {
         var theme = this.view.calendar.theme;
-        var classes = ['fc-row', 'fc-week', theme.getClass('dayRow')];
-        if (isRigid) {
-            classes.push('fc-rigid');
-        }
         return '' +
-            '<div class="' + classes.join(' ') + '">' +
-            '<div class="fc-bg">' +
+            '<div class="fc-row ' + theme.getClass('headerRow') + '">' +
             '<table class="' + theme.getClass('tableGrid') + '">' +
-            this.renderBgTrHtml(row) +
-            '</table>' +
-            '</div>' +
-            '<div class="fc-content-skeleton">' +
-            '<table>' +
-            (this.getIsNumbersVisible() ?
-                '<thead>' +
-                    this.renderNumberTrHtml(row) +
-                    '</thead>' :
-                '') +
+            '<thead>' +
+            this.renderHeadTrHtml() +
+            '</thead>' +
             '</table>' +
-            '</div>' +
             '</div>';
     };
-    DayGrid.prototype.getIsNumbersVisible = function () {
-        return this.getIsDayNumbersVisible() || this.cellWeekNumbersVisible;
-    };
-    DayGrid.prototype.getIsDayNumbersVisible = function () {
-        return this.rowCnt > 1;
+    DayTableMixin.prototype.renderHeadIntroHtml = function () {
+        return this.renderIntroHtml(); // fall back to generic
     };
-    /* Grid Number Rendering
-    ------------------------------------------------------------------------------------------------------------------*/
-    DayGrid.prototype.renderNumberTrHtml = function (row) {
+    DayTableMixin.prototype.renderHeadTrHtml = function () {
         return '' +
             '<tr>' +
-            (this.isRTL ? '' : this.renderNumberIntroHtml(row)) +
-            this.renderNumberCellsHtml(row) +
-            (this.isRTL ? this.renderNumberIntroHtml(row) : '') +
+            (this.isRTL ? '' : this.renderHeadIntroHtml()) +
+            this.renderHeadDateCellsHtml() +
+            (this.isRTL ? this.renderHeadIntroHtml() : '') +
             '</tr>';
     };
-    DayGrid.prototype.renderNumberIntroHtml = function (row) {
-        return this.renderIntroHtml();
-    };
-    DayGrid.prototype.renderNumberCellsHtml = function (row) {
+    DayTableMixin.prototype.renderHeadDateCellsHtml = function () {
         var htmls = [];
         var col;
         var date;
         for (col = 0; col < this.colCnt; col++) {
-            date = this.getCellDate(row, col);
-            htmls.push(this.renderNumberCellHtml(date));
+            date = this.getCellDate(0, col);
+            htmls.push(this.renderHeadDateCellHtml(date));
         }
         return htmls.join('');
     };
-    // Generates the HTML for the <td>s of the "number" row in the DayGrid's content skeleton.
-    // The number row will only exist if either day numbers or week numbers are turned on.
-    DayGrid.prototype.renderNumberCellHtml = function (date) {
-        var view = this.view;
-        var html = '';
-        var isDateValid = this.dateProfile.activeUnzonedRange.containsDate(date); // TODO: called too frequently. cache somehow.
-        var isDayNumberVisible = this.getIsDayNumbersVisible() && isDateValid;
-        var classes;
-        var weekCalcFirstDoW;
-        if (!isDayNumberVisible && !this.cellWeekNumbersVisible) {
-            // no numbers in day cell (week number must be along the side)
-            return '<td/>'; //  will create an empty space above events :(
+    // TODO: when internalApiVersion, accept an object for HTML attributes
+    // (colspan should be no different)
+    DayTableMixin.prototype.renderHeadDateCellHtml = function (date, colspan, otherAttrs) {
+        var t = this;
+        var view = t.view;
+        var isDateValid = t.dateProfile.activeUnzonedRange.containsDate(date); // TODO: called too frequently. cache somehow.
+        var classNames = [
+            'fc-day-header',
+            view.calendar.theme.getClass('widgetHeader')
+        ];
+        var innerHtml;
+        if (typeof t.opt('columnHeaderHtml') === 'function') {
+            innerHtml = t.opt('columnHeaderHtml')(date);
         }
-        classes = this.getDayClasses(date);
-        classes.unshift('fc-day-top');
-        if (this.cellWeekNumbersVisible) {
-            // To determine the day of week number change under ISO, we cannot
-            // rely on moment.js methods such as firstDayOfWeek() or weekday(),
-            // because they rely on the locale's dow (possibly overridden by
-            // our firstDay option), which may not be Monday. We cannot change
-            // dow, because that would affect the calendar start day as well.
-            if (date._locale._fullCalendar_weekCalc === 'ISO') {
-                weekCalcFirstDoW = 1; // Monday by ISO 8601 definition
-            }
-            else {
-                weekCalcFirstDoW = date._locale.firstDayOfWeek();
-            }
+        else if (typeof t.opt('columnHeaderText') === 'function') {
+            innerHtml = util_1.htmlEscape(t.opt('columnHeaderText')(date));
         }
-        html += '<td class="' + classes.join(' ') + '"' +
-            (isDateValid ?
-                ' data-date="' + date.format() + '"' :
-                '') +
-            '>';
-        if (this.cellWeekNumbersVisible && (date.day() === weekCalcFirstDoW)) {
-            html += view.buildGotoAnchorHtml({ date: date, type: 'week' }, { 'class': 'fc-week-number' }, date.format('w') // inner HTML
-            );
+        else {
+            innerHtml = util_1.htmlEscape(date.format(t.colHeadFormat));
         }
-        if (isDayNumberVisible) {
-            html += view.buildGotoAnchorHtml(date, { 'class': 'fc-day-number' }, date.format('D') // inner HTML
-            );
+        // if only one row of days, the classNames on the header can represent the specific days beneath
+        if (t.rowCnt === 1) {
+            classNames = classNames.concat(
+            // includes the day-of-week class
+            // noThemeHighlight=true (don't highlight the header)
+            t.getDayClasses(date, true));
         }
-        html += '</td>';
-        return html;
+        else {
+            classNames.push('fc-' + util_1.dayIDs[date.day()]); // only add the day-of-week class
+        }
+        return '' +
+            '<th class="' + classNames.join(' ') + '"' +
+            ((isDateValid && t.rowCnt) === 1 ?
+                ' data-date="' + date.format('YYYY-MM-DD') + '"' :
+                '') +
+            (colspan > 1 ?
+                ' colspan="' + colspan + '"' :
+                '') +
+            (otherAttrs ?
+                ' ' + otherAttrs :
+                '') +
+            '>' +
+            (isDateValid ?
+                // don't make a link if the heading could represent multiple days, or if there's only one day (forceOff)
+                view.buildGotoAnchorHtml({ date: date, forceOff: t.rowCnt > 1 || t.colCnt === 1 }, innerHtml) :
+                // if not valid, display text, but no link
+                innerHtml) +
+            '</th>';
     };
-    /* Hit System
+    /* Background Rendering
     ------------------------------------------------------------------------------------------------------------------*/
-    DayGrid.prototype.prepareHits = function () {
-        this.colCoordCache.build();
-        this.rowCoordCache.build();
-        this.rowCoordCache.bottoms[this.rowCnt - 1] += this.bottomCoordPadding; // hack
-    };
-    DayGrid.prototype.releaseHits = function () {
-        this.colCoordCache.clear();
-        this.rowCoordCache.clear();
+    DayTableMixin.prototype.renderBgTrHtml = function (row) {
+        return '' +
+            '<tr>' +
+            (this.isRTL ? '' : this.renderBgIntroHtml(row)) +
+            this.renderBgCellsHtml(row) +
+            (this.isRTL ? this.renderBgIntroHtml(row) : '') +
+            '</tr>';
     };
-    DayGrid.prototype.queryHit = function (leftOffset, topOffset) {
-        if (this.colCoordCache.isLeftInBounds(leftOffset) && this.rowCoordCache.isTopInBounds(topOffset)) {
-            var col = this.colCoordCache.getHorizontalIndex(leftOffset);
-            var row = this.rowCoordCache.getVerticalIndex(topOffset);
-            if (row != null && col != null) {
-                return this.getCellHit(row, col);
-            }
-        }
+    DayTableMixin.prototype.renderBgIntroHtml = function (row) {
+        return this.renderIntroHtml(); // fall back to generic
     };
-    DayGrid.prototype.getHitFootprint = function (hit) {
-        var range = this.getCellRange(hit.row, hit.col);
-        return new ComponentFootprint_1.default(new UnzonedRange_1.default(range.start, range.end), true // all-day?
-        );
+    DayTableMixin.prototype.renderBgCellsHtml = function (row) {
+        var htmls = [];
+        var col;
+        var date;
+        for (col = 0; col < this.colCnt; col++) {
+            date = this.getCellDate(row, col);
+            htmls.push(this.renderBgCellHtml(date));
+        }
+        return htmls.join('');
     };
-    DayGrid.prototype.getHitEl = function (hit) {
-        return this.getCellEl(hit.row, hit.col);
+    DayTableMixin.prototype.renderBgCellHtml = function (date, otherAttrs) {
+        var t = this;
+        var view = t.view;
+        var isDateValid = t.dateProfile.activeUnzonedRange.containsDate(date); // TODO: called too frequently. cache somehow.
+        var classes = t.getDayClasses(date);
+        classes.unshift('fc-day', view.calendar.theme.getClass('widgetContent'));
+        return '<td class="' + classes.join(' ') + '"' +
+            (isDateValid ?
+                ' data-date="' + date.format('YYYY-MM-DD') + '"' : // if date has a time, won't format it
+                '') +
+            (otherAttrs ?
+                ' ' + otherAttrs :
+                '') +
+            '></td>';
     };
-    /* Cell System
+    /* Generic
     ------------------------------------------------------------------------------------------------------------------*/
-    // FYI: the first column is the leftmost column, regardless of date
-    DayGrid.prototype.getCellHit = function (row, col) {
-        return {
-            row: row,
-            col: col,
-            component: this,
-            left: this.colCoordCache.getLeftOffset(col),
-            right: this.colCoordCache.getRightOffset(col),
-            top: this.rowCoordCache.getTopOffset(row),
-            bottom: this.rowCoordCache.getBottomOffset(row)
-        };
-    };
-    DayGrid.prototype.getCellEl = function (row, col) {
-        return this.cellEls.eq(row * this.colCnt + col);
+    DayTableMixin.prototype.renderIntroHtml = function () {
+        // Generates the default HTML intro for any row. User classes should override
     };
-    /* Event Rendering
+    // TODO: a generic method for dealing with <tr>, RTL, intro
+    // when increment internalApiVersion
+    // wrapTr (scheduler)
+    /* Utils
     ------------------------------------------------------------------------------------------------------------------*/
-    // Unrenders all events currently rendered on the grid
-    DayGrid.prototype.executeEventUnrender = function () {
-        this.removeSegPopover(); // removes the "more.." events popover
-        _super.prototype.executeEventUnrender.call(this);
+    // Applies the generic "intro" and "outro" HTML to the given cells.
+    // Intro means the leftmost cell when the calendar is LTR and the rightmost cell when RTL. Vice-versa for outro.
+    DayTableMixin.prototype.bookendCells = function (trEl) {
+        var introHtml = this.renderIntroHtml();
+        if (introHtml) {
+            if (this.isRTL) {
+                trEl.append(introHtml);
+            }
+            else {
+                trEl.prepend(introHtml);
+            }
+        }
     };
-    // Retrieves all rendered segment objects currently rendered on the grid
-    DayGrid.prototype.getOwnEventSegs = function () {
-        // append the segments from the "more..." popover
-        return _super.prototype.getOwnEventSegs.call(this).concat(this.popoverSegs || []);
+    return DayTableMixin;
+}(Mixin_1.default));
+exports.default = DayTableMixin;
+
+
+/***/ }),
+/* 61 */
+/***/ (function(module, exports) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var BusinessHourRenderer = /** @class */ (function () {
+    /*
+    component implements:
+      - eventRangesToEventFootprints
+      - eventFootprintsToSegs
+    */
+    function BusinessHourRenderer(component, fillRenderer) {
+        this.component = component;
+        this.fillRenderer = fillRenderer;
+    }
+    BusinessHourRenderer.prototype.render = function (businessHourGenerator) {
+        var component = this.component;
+        var unzonedRange = component._getDateProfile().activeUnzonedRange;
+        var eventInstanceGroup = businessHourGenerator.buildEventInstanceGroup(component.hasAllDayBusinessHours, unzonedRange);
+        var eventFootprints = eventInstanceGroup ?
+            component.eventRangesToEventFootprints(eventInstanceGroup.sliceRenderRanges(unzonedRange)) :
+            [];
+        this.renderEventFootprints(eventFootprints);
     };
-    /* Event Drag Visualization
-    ------------------------------------------------------------------------------------------------------------------*/
-    // Renders a visual indication of an event or external element being dragged.
-    // `eventLocation` has zoned start and end (optional)
-    DayGrid.prototype.renderDrag = function (eventFootprints, seg, isTouch) {
-        var i;
-        for (i = 0; i < eventFootprints.length; i++) {
-            this.renderHighlight(eventFootprints[i].componentFootprint);
+    BusinessHourRenderer.prototype.renderEventFootprints = function (eventFootprints) {
+        var segs = this.component.eventFootprintsToSegs(eventFootprints);
+        this.renderSegs(segs);
+        this.segs = segs;
+    };
+    BusinessHourRenderer.prototype.renderSegs = function (segs) {
+        if (this.fillRenderer) {
+            this.fillRenderer.renderSegs('businessHours', segs, {
+                getClasses: function (seg) {
+                    return ['fc-nonbusiness', 'fc-bgevent'];
+                }
+            });
         }
-        // render drags from OTHER components as helpers
-        if (eventFootprints.length && seg && seg.component !== this) {
-            this.helperRenderer.renderEventDraggingFootprints(eventFootprints, seg, isTouch);
-            return true; // signal helpers rendered
+    };
+    BusinessHourRenderer.prototype.unrender = function () {
+        if (this.fillRenderer) {
+            this.fillRenderer.unrender('businessHours');
         }
+        this.segs = null;
     };
-    // Unrenders any visual indication of a hovering event
-    DayGrid.prototype.unrenderDrag = function () {
-        this.unrenderHighlight();
-        this.helperRenderer.unrender();
+    BusinessHourRenderer.prototype.getSegs = function () {
+        return this.segs || [];
     };
-    /* Event Resize Visualization
-    ------------------------------------------------------------------------------------------------------------------*/
-    // Renders a visual indication of an event being resized
-    DayGrid.prototype.renderEventResize = function (eventFootprints, seg, isTouch) {
-        var i;
-        for (i = 0; i < eventFootprints.length; i++) {
-            this.renderHighlight(eventFootprints[i].componentFootprint);
-        }
-        this.helperRenderer.renderEventResizingFootprints(eventFootprints, seg, isTouch);
+    return BusinessHourRenderer;
+}());
+exports.default = BusinessHourRenderer;
+
+
+/***/ }),
+/* 62 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var $ = __webpack_require__(3);
+var util_1 = __webpack_require__(4);
+var FillRenderer = /** @class */ (function () {
+    function FillRenderer(component) {
+        this.fillSegTag = 'div';
+        this.component = component;
+        this.elsByFill = {};
+    }
+    FillRenderer.prototype.renderFootprint = function (type, componentFootprint, props) {
+        this.renderSegs(type, this.component.componentFootprintToSegs(componentFootprint), props);
     };
-    // Unrenders a visual indication of an event being resized
-    DayGrid.prototype.unrenderEventResize = function () {
-        this.unrenderHighlight();
-        this.helperRenderer.unrender();
+    FillRenderer.prototype.renderSegs = function (type, segs, props) {
+        var els;
+        segs = this.buildSegEls(type, segs, props); // assignes `.el` to each seg. returns successfully rendered segs
+        els = this.attachSegEls(type, segs);
+        if (els) {
+            this.reportEls(type, els);
+        }
+        return segs;
     };
-    /* More+ Link Popover
-    ------------------------------------------------------------------------------------------------------------------*/
-    DayGrid.prototype.removeSegPopover = function () {
-        if (this.segPopover) {
-            this.segPopover.hide(); // in handler, will call segPopover's removeElement
+    // Unrenders a specific type of fill that is currently rendered on the grid
+    FillRenderer.prototype.unrender = function (type) {
+        var el = this.elsByFill[type];
+        if (el) {
+            el.remove();
+            delete this.elsByFill[type];
         }
     };
-    // Limits the number of "levels" (vertically stacking layers of events) for each row of the grid.
-    // `levelLimit` can be false (don't limit), a number, or true (should be computed).
-    DayGrid.prototype.limitRows = function (levelLimit) {
-        var rowStructs = this.eventRenderer.rowStructs || [];
-        var row; // row #
-        var rowLevelLimit;
-        for (row = 0; row < rowStructs.length; row++) {
-            this.unlimitRow(row);
-            if (!levelLimit) {
-                rowLevelLimit = false;
-            }
-            else if (typeof levelLimit === 'number') {
-                rowLevelLimit = levelLimit;
-            }
-            else {
-                rowLevelLimit = this.computeRowLevelLimit(row);
-            }
-            if (rowLevelLimit !== false) {
-                this.limitRow(row, rowLevelLimit);
+    // Renders and assigns an `el` property for each fill segment. Generic enough to work with different types.
+    // Only returns segments that successfully rendered.
+    FillRenderer.prototype.buildSegEls = function (type, segs, props) {
+        var _this = this;
+        var html = '';
+        var renderedSegs = [];
+        var i;
+        if (segs.length) {
+            // build a large concatenation of segment HTML
+            for (i = 0; i < segs.length; i++) {
+                html += this.buildSegHtml(type, segs[i], props);
             }
+            // Grab individual elements from the combined HTML string. Use each as the default rendering.
+            // Then, compute the 'el' for each segment.
+            $(html).each(function (i, node) {
+                var seg = segs[i];
+                var el = $(node);
+                // allow custom filter methods per-type
+                if (props.filterEl) {
+                    el = props.filterEl(seg, el);
+                }
+                if (el) { // custom filters did not cancel the render
+                    el = $(el); // allow custom filter to return raw DOM node
+                    // correct element type? (would be bad if a non-TD were inserted into a table for example)
+                    if (el.is(_this.fillSegTag)) {
+                        seg.el = el;
+                        renderedSegs.push(seg);
+                    }
+                }
+            });
         }
+        return renderedSegs;
     };
-    // Computes the number of levels a row will accomodate without going outside its bounds.
-    // Assumes the row is "rigid" (maintains a constant height regardless of what is inside).
-    // `row` is the row number.
-    DayGrid.prototype.computeRowLevelLimit = function (row) {
-        var rowEl = this.rowEls.eq(row); // the containing "fake" row div
-        var rowHeight = rowEl.height(); // TODO: cache somehow?
-        var trEls = this.eventRenderer.rowStructs[row].tbodyEl.children();
-        var i;
-        var trEl;
-        var trHeight;
-        function iterInnerHeights(i, childNode) {
-            trHeight = Math.max(trHeight, $(childNode).outerHeight());
-        }
-        // Reveal one level <tr> at a time and stop when we find one out of bounds
-        for (i = 0; i < trEls.length; i++) {
-            trEl = trEls.eq(i).removeClass('fc-limited'); // reset to original state (reveal)
-            // with rowspans>1 and IE8, trEl.outerHeight() would return the height of the largest cell,
-            // so instead, find the tallest inner content element.
-            trHeight = 0;
-            trEl.find('> td > :first-child').each(iterInnerHeights);
-            if (trEl.position().top + trHeight > rowHeight) {
-                return i;
-            }
-        }
-        return false; // should not limit at all
+    // Builds the HTML needed for one fill segment. Generic enough to work with different types.
+    FillRenderer.prototype.buildSegHtml = function (type, seg, props) {
+        // custom hooks per-type
+        var classes = props.getClasses ? props.getClasses(seg) : [];
+        var css = util_1.cssToStr(props.getCss ? props.getCss(seg) : {});
+        return '<' + this.fillSegTag +
+            (classes.length ? ' class="' + classes.join(' ') + '"' : '') +
+            (css ? ' style="' + css + '"' : '') +
+            '></' + this.fillSegTag + '>';
     };
-    // Limits the given grid row to the maximum number of levels and injects "more" links if necessary.
-    // `row` is the row number.
-    // `levelLimit` is a number for the maximum (inclusive) number of levels allowed.
-    DayGrid.prototype.limitRow = function (row, levelLimit) {
-        var _this = this;
-        var rowStruct = this.eventRenderer.rowStructs[row];
-        var moreNodes = []; // array of "more" <a> links and <td> DOM nodes
-        var col = 0; // col #, left-to-right (not chronologically)
-        var levelSegs; // array of segment objects in the last allowable level, ordered left-to-right
-        var cellMatrix; // a matrix (by level, then column) of all <td> jQuery elements in the row
-        var limitedNodes; // array of temporarily hidden level <tr> and segment <td> DOM nodes
-        var i;
-        var seg;
-        var segsBelow; // array of segment objects below `seg` in the current `col`
-        var totalSegsBelow; // total number of segments below `seg` in any of the columns `seg` occupies
-        var colSegsBelow; // array of segment arrays, below seg, one for each column (offset from segs's first column)
-        var td;
-        var rowspan;
-        var segMoreNodes; // array of "more" <td> cells that will stand-in for the current seg's cell
-        var j;
-        var moreTd;
-        var moreWrap;
-        var moreLink;
-        // Iterates through empty level cells and places "more" links inside if need be
-        var emptyCellsUntil = function (endCol) {
-            while (col < endCol) {
-                segsBelow = _this.getCellSegs(row, col, levelLimit);
-                if (segsBelow.length) {
-                    td = cellMatrix[levelLimit - 1][col];
-                    moreLink = _this.renderMoreLink(row, col, segsBelow);
-                    moreWrap = $('<div/>').append(moreLink);
-                    td.append(moreWrap);
-                    moreNodes.push(moreWrap[0]);
-                }
-                col++;
-            }
-        };
-        if (levelLimit && levelLimit < rowStruct.segLevels.length) {
-            levelSegs = rowStruct.segLevels[levelLimit - 1];
-            cellMatrix = rowStruct.cellMatrix;
-            limitedNodes = rowStruct.tbodyEl.children().slice(levelLimit) // get level <tr> elements past the limit
-                .addClass('fc-limited').get(); // hide elements and get a simple DOM-nodes array
-            // iterate though segments in the last allowable level
-            for (i = 0; i < levelSegs.length; i++) {
-                seg = levelSegs[i];
-                emptyCellsUntil(seg.leftCol); // process empty cells before the segment
-                // determine *all* segments below `seg` that occupy the same columns
-                colSegsBelow = [];
-                totalSegsBelow = 0;
-                while (col <= seg.rightCol) {
-                    segsBelow = this.getCellSegs(row, col, levelLimit);
-                    colSegsBelow.push(segsBelow);
-                    totalSegsBelow += segsBelow.length;
-                    col++;
-                }
-                if (totalSegsBelow) {
-                    td = cellMatrix[levelLimit - 1][seg.leftCol]; // the segment's parent cell
-                    rowspan = td.attr('rowspan') || 1;
-                    segMoreNodes = [];
-                    // make a replacement <td> for each column the segment occupies. will be one for each colspan
-                    for (j = 0; j < colSegsBelow.length; j++) {
-                        moreTd = $('<td class="fc-more-cell"/>').attr('rowspan', rowspan);
-                        segsBelow = colSegsBelow[j];
-                        moreLink = this.renderMoreLink(row, seg.leftCol + j, [seg].concat(segsBelow) // count seg as hidden too
-                        );
-                        moreWrap = $('<div/>').append(moreLink);
-                        moreTd.append(moreWrap);
-                        segMoreNodes.push(moreTd[0]);
-                        moreNodes.push(moreTd[0]);
-                    }
-                    td.addClass('fc-limited').after($(segMoreNodes)); // hide original <td> and inject replacements
-                    limitedNodes.push(td[0]);
-                }
-            }
-            emptyCellsUntil(this.colCnt); // finish off the level
-            rowStruct.moreEls = $(moreNodes); // for easy undoing later
-            rowStruct.limitedEls = $(limitedNodes); // for easy undoing later
-        }
+    // Should return wrapping DOM structure
+    FillRenderer.prototype.attachSegEls = function (type, segs) {
+        // subclasses must implement
     };
-    // Reveals all levels and removes all "more"-related elements for a grid's row.
-    // `row` is a row number.
-    DayGrid.prototype.unlimitRow = function (row) {
-        var rowStruct = this.eventRenderer.rowStructs[row];
-        if (rowStruct.moreEls) {
-            rowStruct.moreEls.remove();
-            rowStruct.moreEls = null;
+    FillRenderer.prototype.reportEls = function (type, nodes) {
+        if (this.elsByFill[type]) {
+            this.elsByFill[type] = this.elsByFill[type].add(nodes);
         }
-        if (rowStruct.limitedEls) {
-            rowStruct.limitedEls.removeClass('fc-limited');
-            rowStruct.limitedEls = null;
+        else {
+            this.elsByFill[type] = $(nodes);
         }
     };
-    // Renders an <a> element that represents hidden event element for a cell.
-    // Responsible for attaching click handler as well.
-    DayGrid.prototype.renderMoreLink = function (row, col, hiddenSegs) {
-        var _this = this;
-        var view = this.view;
-        return $('<a class="fc-more"/>')
-            .text(this.getMoreLinkText(hiddenSegs.length))
-            .on('click', function (ev) {
-            var clickOption = _this.opt('eventLimitClick');
-            var date = _this.getCellDate(row, col);
-            var moreEl = $(ev.currentTarget);
-            var dayEl = _this.getCellEl(row, col);
-            var allSegs = _this.getCellSegs(row, col);
-            // rescope the segments to be within the cell's date
-            var reslicedAllSegs = _this.resliceDaySegs(allSegs, date);
-            var reslicedHiddenSegs = _this.resliceDaySegs(hiddenSegs, date);
-            if (typeof clickOption === 'function') {
-                // the returned value can be an atomic option
-                clickOption = _this.publiclyTrigger('eventLimitClick', {
-                    context: view,
-                    args: [
-                        {
-                            date: date.clone(),
-                            dayEl: dayEl,
-                            moreEl: moreEl,
-                            segs: reslicedAllSegs,
-                            hiddenSegs: reslicedHiddenSegs
-                        },
-                        ev,
-                        view
-                    ]
-                });
-            }
-            if (clickOption === 'popover') {
-                _this.showSegPopover(row, col, moreEl, reslicedAllSegs);
-            }
-            else if (typeof clickOption === 'string') {
-                view.calendar.zoomTo(date, clickOption);
-            }
-        });
+    return FillRenderer;
+}());
+exports.default = FillRenderer;
+
+
+/***/ }),
+/* 63 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var SingleEventDef_1 = __webpack_require__(9);
+var EventFootprint_1 = __webpack_require__(34);
+var EventSource_1 = __webpack_require__(6);
+var HelperRenderer = /** @class */ (function () {
+    function HelperRenderer(component, eventRenderer) {
+        this.view = component._getView();
+        this.component = component;
+        this.eventRenderer = eventRenderer;
+    }
+    HelperRenderer.prototype.renderComponentFootprint = function (componentFootprint) {
+        this.renderEventFootprints([
+            this.fabricateEventFootprint(componentFootprint)
+        ]);
     };
-    // Reveals the popover that displays all events within a cell
-    DayGrid.prototype.showSegPopover = function (row, col, moreLink, segs) {
-        var _this = this;
-        var view = this.view;
-        var moreWrap = moreLink.parent(); // the <div> wrapper around the <a>
-        var topEl; // the element we want to match the top coordinate of
-        var options;
-        if (this.rowCnt === 1) {
-            topEl = view.el; // will cause the popover to cover any sort of header
-        }
-        else {
-            topEl = this.rowEls.eq(row); // will align with top of row
+    HelperRenderer.prototype.renderEventDraggingFootprints = function (eventFootprints, sourceSeg, isTouch) {
+        this.renderEventFootprints(eventFootprints, sourceSeg, 'fc-dragging', isTouch ? null : this.view.opt('dragOpacity'));
+    };
+    HelperRenderer.prototype.renderEventResizingFootprints = function (eventFootprints, sourceSeg, isTouch) {
+        this.renderEventFootprints(eventFootprints, sourceSeg, 'fc-resizing');
+    };
+    HelperRenderer.prototype.renderEventFootprints = function (eventFootprints, sourceSeg, extraClassNames, opacity) {
+        var segs = this.component.eventFootprintsToSegs(eventFootprints);
+        var classNames = 'fc-helper ' + (extraClassNames || '');
+        var i;
+        // assigns each seg's el and returns a subset of segs that were rendered
+        segs = this.eventRenderer.renderFgSegEls(segs);
+        for (i = 0; i < segs.length; i++) {
+            segs[i].el.addClass(classNames);
         }
-        options = {
-            className: 'fc-more-popover ' + view.calendar.theme.getClass('popover'),
-            content: this.renderSegPopoverContent(row, col, segs),
-            parentEl: view.el,
-            top: topEl.offset().top,
-            autoHide: true,
-            viewportConstrain: this.opt('popoverViewportConstrain'),
-            hide: function () {
-                // kill everything when the popover is hidden
-                // notify events to be removed
-                if (_this.popoverSegs) {
-                    _this.triggerBeforeEventSegsDestroyed(_this.popoverSegs);
-                }
-                _this.segPopover.removeElement();
-                _this.segPopover = null;
-                _this.popoverSegs = null;
+        if (opacity != null) {
+            for (i = 0; i < segs.length; i++) {
+                segs[i].el.css('opacity', opacity);
             }
-        };
-        // Determine horizontal coordinate.
-        // We use the moreWrap instead of the <td> to avoid border confusion.
-        if (this.isRTL) {
-            options.right = moreWrap.offset().left + moreWrap.outerWidth() + 1; // +1 to be over cell border
         }
-        else {
-            options.left = moreWrap.offset().left - 1; // -1 to be over cell border
+        this.helperEls = this.renderSegs(segs, sourceSeg);
+    };
+    /*
+    Must return all mock event elements
+    */
+    HelperRenderer.prototype.renderSegs = function (segs, sourceSeg) {
+        // Subclasses must implement
+    };
+    HelperRenderer.prototype.unrender = function () {
+        if (this.helperEls) {
+            this.helperEls.remove();
+            this.helperEls = null;
         }
-        this.segPopover = new Popover_1.default(options);
-        this.segPopover.show();
-        // the popover doesn't live within the grid's container element, and thus won't get the event
-        // delegated-handlers for free. attach event-related handlers to the popover.
-        this.bindAllSegHandlersToEl(this.segPopover.el);
-        this.triggerAfterEventSegsRendered(segs);
     };
-    // Builds the inner DOM contents of the segment popover
-    DayGrid.prototype.renderSegPopoverContent = function (row, col, segs) {
-        var view = this.view;
-        var theme = view.calendar.theme;
-        var title = this.getCellDate(row, col).format(this.opt('dayPopoverFormat'));
-        var content = $('<div class="fc-header ' + theme.getClass('popoverHeader') + '">' +
-            '<span class="fc-close ' + theme.getIconClass('close') + '"></span>' +
-            '<span class="fc-title">' +
-            util_1.htmlEscape(title) +
-            '</span>' +
-            '<div class="fc-clear"/>' +
-            '</div>' +
-            '<div class="fc-body ' + theme.getClass('popoverContent') + '">' +
-            '<div class="fc-event-container"></div>' +
-            '</div>');
-        var segContainer = content.find('.fc-event-container');
-        var i;
-        // render each seg's `el` and only return the visible segs
-        segs = this.eventRenderer.renderFgSegEls(segs, true); // disableResizing=true
-        this.popoverSegs = segs;
-        for (i = 0; i < segs.length; i++) {
-            // because segments in the popover are not part of a grid coordinate system, provide a hint to any
-            // grids that want to do drag-n-drop about which cell it came from
-            this.hitsNeeded();
-            segs[i].hit = this.getCellHit(row, col);
-            this.hitsNotNeeded();
-            segContainer.append(segs[i].el);
+    HelperRenderer.prototype.fabricateEventFootprint = function (componentFootprint) {
+        var calendar = this.view.calendar;
+        var eventDateProfile = calendar.footprintToDateProfile(componentFootprint);
+        var dummyEvent = new SingleEventDef_1.default(new EventSource_1.default(calendar));
+        var dummyInstance;
+        dummyEvent.dateProfile = eventDateProfile;
+        dummyInstance = dummyEvent.buildInstance();
+        return new EventFootprint_1.default(componentFootprint, dummyEvent, dummyInstance);
+    };
+    return HelperRenderer;
+}());
+exports.default = HelperRenderer;
+
+
+/***/ }),
+/* 64 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var GlobalEmitter_1 = __webpack_require__(23);
+var Interaction_1 = __webpack_require__(14);
+var EventPointing = /** @class */ (function (_super) {
+    tslib_1.__extends(EventPointing, _super);
+    function EventPointing() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    /*
+    component must implement:
+      - publiclyTrigger
+    */
+    EventPointing.prototype.bindToEl = function (el) {
+        var component = this.component;
+        component.bindSegHandlerToEl(el, 'click', this.handleClick.bind(this));
+        component.bindSegHandlerToEl(el, 'mouseenter', this.handleMouseover.bind(this));
+        component.bindSegHandlerToEl(el, 'mouseleave', this.handleMouseout.bind(this));
+    };
+    EventPointing.prototype.handleClick = function (seg, ev) {
+        var res = this.component.publiclyTrigger('eventClick', {
+            context: seg.el[0],
+            args: [seg.footprint.getEventLegacy(), ev, this.view]
+        });
+        if (res === false) {
+            ev.preventDefault();
         }
-        return content;
     };
-    // Given the events within an array of segment objects, reslice them to be in a single day
-    DayGrid.prototype.resliceDaySegs = function (segs, dayDate) {
-        var dayStart = dayDate.clone();
-        var dayEnd = dayStart.clone().add(1, 'days');
-        var dayRange = new UnzonedRange_1.default(dayStart, dayEnd);
-        var newSegs = [];
-        var i;
-        var seg;
-        var slicedRange;
-        for (i = 0; i < segs.length; i++) {
-            seg = segs[i];
-            slicedRange = seg.footprint.componentFootprint.unzonedRange.intersect(dayRange);
-            if (slicedRange) {
-                newSegs.push($.extend({}, seg, {
-                    footprint: new EventFootprint_1.default(new ComponentFootprint_1.default(slicedRange, seg.footprint.componentFootprint.isAllDay), seg.footprint.eventDef, seg.footprint.eventInstance),
-                    isStart: seg.isStart && slicedRange.isStart,
-                    isEnd: seg.isEnd && slicedRange.isEnd
-                }));
+    // Updates internal state and triggers handlers for when an event element is moused over
+    EventPointing.prototype.handleMouseover = function (seg, ev) {
+        if (!GlobalEmitter_1.default.get().shouldIgnoreMouse() &&
+            !this.mousedOverSeg) {
+            this.mousedOverSeg = seg;
+            // TODO: move to EventSelecting's responsibility
+            if (this.view.isEventDefResizable(seg.footprint.eventDef)) {
+                seg.el.addClass('fc-allow-mouse-resize');
             }
+            this.component.publiclyTrigger('eventMouseover', {
+                context: seg.el[0],
+                args: [seg.footprint.getEventLegacy(), ev, this.view]
+            });
         }
-        // force an order because eventsToSegs doesn't guarantee one
-        // TODO: research if still needed
-        this.eventRenderer.sortEventSegs(newSegs);
-        return newSegs;
     };
-    // Generates the text that should be inside a "more" link, given the number of events it represents
-    DayGrid.prototype.getMoreLinkText = function (num) {
-        var opt = this.opt('eventLimitText');
-        if (typeof opt === 'function') {
-            return opt(num);
-        }
-        else {
-            return '+' + num + ' ' + opt;
+    // Updates internal state and triggers handlers for when an event element is moused out.
+    // Can be given no arguments, in which case it will mouseout the segment that was previously moused over.
+    EventPointing.prototype.handleMouseout = function (seg, ev) {
+        if (this.mousedOverSeg) {
+            this.mousedOverSeg = null;
+            // TODO: move to EventSelecting's responsibility
+            if (this.view.isEventDefResizable(seg.footprint.eventDef)) {
+                seg.el.removeClass('fc-allow-mouse-resize');
+            }
+            this.component.publiclyTrigger('eventMouseout', {
+                context: seg.el[0],
+                args: [
+                    seg.footprint.getEventLegacy(),
+                    ev || {},
+                    this.view
+                ]
+            });
         }
     };
-    // Returns segments within a given cell.
-    // If `startLevel` is specified, returns only events including and below that level. Otherwise returns all segs.
-    DayGrid.prototype.getCellSegs = function (row, col, startLevel) {
-        var segMatrix = this.eventRenderer.rowStructs[row].segMatrix;
-        var level = startLevel || 0;
-        var segs = [];
-        var seg;
-        while (level < segMatrix.length) {
-            seg = segMatrix[level][col];
-            if (seg) {
-                segs.push(seg);
-            }
-            level++;
+    EventPointing.prototype.end = function () {
+        if (this.mousedOverSeg) {
+            this.handleMouseout(this.mousedOverSeg);
         }
-        return segs;
     };
-    return DayGrid;
-}(InteractiveDateComponent_1.default));
-exports.default = DayGrid;
-DayGrid.prototype.eventRendererClass = DayGridEventRenderer_1.default;
-DayGrid.prototype.businessHourRendererClass = BusinessHourRenderer_1.default;
-DayGrid.prototype.helperRendererClass = DayGridHelperRenderer_1.default;
-DayGrid.prototype.fillRendererClass = DayGridFillRenderer_1.default;
-StandardInteractionsMixin_1.default.mixInto(DayGrid);
-DayTableMixin_1.default.mixInto(DayGrid);
+    return EventPointing;
+}(Interaction_1.default));
+exports.default = EventPointing;
 
 
 /***/ }),
-/* 62 */
+/* 65 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var Mixin_1 = __webpack_require__(15);
+var DateClicking_1 = __webpack_require__(237);
+var DateSelecting_1 = __webpack_require__(236);
+var EventPointing_1 = __webpack_require__(64);
+var EventDragging_1 = __webpack_require__(235);
+var EventResizing_1 = __webpack_require__(234);
+var ExternalDropping_1 = __webpack_require__(233);
+var StandardInteractionsMixin = /** @class */ (function (_super) {
+    tslib_1.__extends(StandardInteractionsMixin, _super);
+    function StandardInteractionsMixin() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return StandardInteractionsMixin;
+}(Mixin_1.default));
+exports.default = StandardInteractionsMixin;
+StandardInteractionsMixin.prototype.dateClickingClass = DateClicking_1.default;
+StandardInteractionsMixin.prototype.dateSelectingClass = DateSelecting_1.default;
+StandardInteractionsMixin.prototype.eventPointingClass = EventPointing_1.default;
+StandardInteractionsMixin.prototype.eventDraggingClass = EventDragging_1.default;
+StandardInteractionsMixin.prototype.eventResizingClass = EventResizing_1.default;
+StandardInteractionsMixin.prototype.externalDroppingClass = ExternalDropping_1.default;
+
+
+/***/ }),
+/* 66 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
 var $ = __webpack_require__(3);
 var util_1 = __webpack_require__(4);
-var Scroller_1 = __webpack_require__(39);
-var View_1 = __webpack_require__(41);
-var BasicViewDateProfileGenerator_1 = __webpack_require__(228);
-var DayGrid_1 = __webpack_require__(61);
-/* An abstract class for the "basic" views, as well as month view. Renders one or more rows of day cells.
+var CoordCache_1 = __webpack_require__(58);
+var Popover_1 = __webpack_require__(227);
+var UnzonedRange_1 = __webpack_require__(5);
+var ComponentFootprint_1 = __webpack_require__(12);
+var EventFootprint_1 = __webpack_require__(34);
+var BusinessHourRenderer_1 = __webpack_require__(61);
+var StandardInteractionsMixin_1 = __webpack_require__(65);
+var InteractiveDateComponent_1 = __webpack_require__(42);
+var DayTableMixin_1 = __webpack_require__(60);
+var DayGridEventRenderer_1 = __webpack_require__(243);
+var DayGridHelperRenderer_1 = __webpack_require__(244);
+var DayGridFillRenderer_1 = __webpack_require__(245);
+/* A component that renders a grid of whole-days that runs horizontally. There can be multiple rows, one per week.
 ----------------------------------------------------------------------------------------------------------------------*/
-// It is a manager for a DayGrid subcomponent, which does most of the heavy lifting.
-// It is responsible for managing width/height.
-var BasicView = /** @class */ (function (_super) {
-    tslib_1.__extends(BasicView, _super);
-    function BasicView(calendar, viewSpec) {
-        var _this = _super.call(this, calendar, viewSpec) || this;
-        _this.dayGrid = _this.instantiateDayGrid();
-        _this.dayGrid.isRigid = _this.hasRigidRows();
-        if (_this.opt('weekNumbers')) {
-            if (_this.opt('weekNumbersWithinDays')) {
-                _this.dayGrid.cellWeekNumbersVisible = true;
-                _this.dayGrid.colWeekNumbersVisible = false;
+var DayGrid = /** @class */ (function (_super) {
+    tslib_1.__extends(DayGrid, _super);
+    function DayGrid(view) {
+        var _this = _super.call(this, view) || this;
+        _this.cellWeekNumbersVisible = false; // display week numbers in day cell?
+        _this.bottomCoordPadding = 0; // hack for extending the hit area for the last row of the coordinate grid
+        // isRigid determines whether the individual rows should ignore the contents and be a constant height.
+        // Relies on the view's colCnt and rowCnt. In the future, this component should probably be self-sufficient.
+        _this.isRigid = false;
+        _this.hasAllDayBusinessHours = true;
+        return _this;
+    }
+    // Slices up the given span (unzoned start/end with other misc data) into an array of segments
+    DayGrid.prototype.componentFootprintToSegs = function (componentFootprint) {
+        var segs = this.sliceRangeByRow(componentFootprint.unzonedRange);
+        var i;
+        var seg;
+        for (i = 0; i < segs.length; i++) {
+            seg = segs[i];
+            if (this.isRTL) {
+                seg.leftCol = this.daysPerRow - 1 - seg.lastRowDayIndex;
+                seg.rightCol = this.daysPerRow - 1 - seg.firstRowDayIndex;
             }
             else {
-                _this.dayGrid.cellWeekNumbersVisible = false;
-                _this.dayGrid.colWeekNumbersVisible = true;
+                seg.leftCol = seg.firstRowDayIndex;
+                seg.rightCol = seg.lastRowDayIndex;
             }
         }
-        _this.addChild(_this.dayGrid);
-        _this.scroller = new Scroller_1.default({
-            overflowX: 'hidden',
-            overflowY: 'auto'
-        });
-        return _this;
-    }
-    // Generates the DayGrid object this view needs. Draws from this.dayGridClass
-    BasicView.prototype.instantiateDayGrid = function () {
-        // generate a subclass on the fly with BasicView-specific behavior
-        // TODO: cache this subclass
-        var subclass = makeDayGridSubclass(this.dayGridClass);
-        return new subclass(this);
-    };
-    BasicView.prototype.executeDateRender = function (dateProfile) {
-        this.dayGrid.breakOnWeeks = /year|month|week/.test(dateProfile.currentRangeUnit);
-        _super.prototype.executeDateRender.call(this, dateProfile);
+        return segs;
     };
-    BasicView.prototype.renderSkeleton = function () {
-        var dayGridContainerEl;
-        var dayGridEl;
-        this.el.addClass('fc-basic-view').html(this.renderSkeletonHtml());
-        this.scroller.render();
-        dayGridContainerEl = this.scroller.el.addClass('fc-day-grid-container');
-        dayGridEl = $('<div class="fc-day-grid" />').appendTo(dayGridContainerEl);
-        this.el.find('.fc-body > tr > td').append(dayGridContainerEl);
-        this.dayGrid.headContainerEl = this.el.find('.fc-head-container');
-        this.dayGrid.setElement(dayGridEl);
+    /* Date Rendering
+    ------------------------------------------------------------------------------------------------------------------*/
+    DayGrid.prototype.renderDates = function (dateProfile) {
+        this.dateProfile = dateProfile;
+        this.updateDayTable();
+        this.renderGrid();
     };
-    BasicView.prototype.unrenderSkeleton = function () {
-        this.dayGrid.removeElement();
-        this.scroller.destroy();
+    DayGrid.prototype.unrenderDates = function () {
+        this.removeSegPopover();
     };
-    // Builds the HTML skeleton for the view.
-    // The day-grid component will render inside of a container defined by this HTML.
-    BasicView.prototype.renderSkeletonHtml = function () {
-        var theme = this.calendar.theme;
+    // Renders the rows and columns into the component's `this.el`, which should already be assigned.
+    DayGrid.prototype.renderGrid = function () {
+        var view = this.view;
+        var rowCnt = this.rowCnt;
+        var colCnt = this.colCnt;
+        var html = '';
+        var row;
+        var col;
+        if (this.headContainerEl) {
+            this.headContainerEl.html(this.renderHeadHtml());
+        }
+        for (row = 0; row < rowCnt; row++) {
+            html += this.renderDayRowHtml(row, this.isRigid);
+        }
+        this.el.html(html);
+        this.rowEls = this.el.find('.fc-row');
+        this.cellEls = this.el.find('.fc-day, .fc-disabled-day');
+        this.rowCoordCache = new CoordCache_1.default({
+            els: this.rowEls,
+            isVertical: true
+        });
+        this.colCoordCache = new CoordCache_1.default({
+            els: this.cellEls.slice(0, this.colCnt),
+            isHorizontal: true
+        });
+        // trigger dayRender with each cell's element
+        for (row = 0; row < rowCnt; row++) {
+            for (col = 0; col < colCnt; col++) {
+                this.publiclyTrigger('dayRender', {
+                    context: view,
+                    args: [
+                        this.getCellDate(row, col),
+                        this.getCellEl(row, col),
+                        view
+                    ]
+                });
+            }
+        }
+    };
+    // Generates the HTML for a single row, which is a div that wraps a table.
+    // `row` is the row number.
+    DayGrid.prototype.renderDayRowHtml = function (row, isRigid) {
+        var theme = this.view.calendar.theme;
+        var classes = ['fc-row', 'fc-week', theme.getClass('dayRow')];
+        if (isRigid) {
+            classes.push('fc-rigid');
+        }
         return '' +
+            '<div class="' + classes.join(' ') + '">' +
+            '<div class="fc-bg">' +
             '<table class="' + theme.getClass('tableGrid') + '">' +
-            (this.opt('columnHeader') ?
-                '<thead class="fc-head">' +
-                    '<tr>' +
-                    '<td class="fc-head-container ' + theme.getClass('widgetHeader') + '">&nbsp;</td>' +
-                    '</tr>' +
+            this.renderBgTrHtml(row) +
+            '</table>' +
+            '</div>' +
+            '<div class="fc-content-skeleton">' +
+            '<table>' +
+            (this.getIsNumbersVisible() ?
+                '<thead>' +
+                    this.renderNumberTrHtml(row) +
                     '</thead>' :
                 '') +
-            '<tbody class="fc-body">' +
-            '<tr>' +
-            '<td class="' + theme.getClass('widgetContent') + '"></td>' +
-            '</tr>' +
-            '</tbody>' +
-            '</table>';
+            '</table>' +
+            '</div>' +
+            '</div>';
     };
-    // Generates an HTML attribute string for setting the width of the week number column, if it is known
-    BasicView.prototype.weekNumberStyleAttr = function () {
-        if (this.weekNumberWidth != null) {
-            return 'style="width:' + this.weekNumberWidth + 'px"';
-        }
-        return '';
+    DayGrid.prototype.getIsNumbersVisible = function () {
+        return this.getIsDayNumbersVisible() || this.cellWeekNumbersVisible;
     };
-    // Determines whether each row should have a constant height
-    BasicView.prototype.hasRigidRows = function () {
-        var eventLimit = this.opt('eventLimit');
-        return eventLimit && typeof eventLimit !== 'number';
+    DayGrid.prototype.getIsDayNumbersVisible = function () {
+        return this.rowCnt > 1;
     };
-    /* Dimensions
+    /* Grid Number Rendering
     ------------------------------------------------------------------------------------------------------------------*/
-    // Refreshes the horizontal dimensions of the view
-    BasicView.prototype.updateSize = function (totalHeight, isAuto, isResize) {
-        var eventLimit = this.opt('eventLimit');
-        var headRowEl = this.dayGrid.headContainerEl.find('.fc-row');
-        var scrollerHeight;
-        var scrollbarWidths;
-        // hack to give the view some height prior to dayGrid's columns being rendered
-        // TODO: separate setting height from scroller VS dayGrid.
-        if (!this.dayGrid.rowEls) {
-            if (!isAuto) {
-                scrollerHeight = this.computeScrollerHeight(totalHeight);
-                this.scroller.setHeight(scrollerHeight);
-            }
-            return;
+    DayGrid.prototype.renderNumberTrHtml = function (row) {
+        return '' +
+            '<tr>' +
+            (this.isRTL ? '' : this.renderNumberIntroHtml(row)) +
+            this.renderNumberCellsHtml(row) +
+            (this.isRTL ? this.renderNumberIntroHtml(row) : '') +
+            '</tr>';
+    };
+    DayGrid.prototype.renderNumberIntroHtml = function (row) {
+        return this.renderIntroHtml();
+    };
+    DayGrid.prototype.renderNumberCellsHtml = function (row) {
+        var htmls = [];
+        var col;
+        var date;
+        for (col = 0; col < this.colCnt; col++) {
+            date = this.getCellDate(row, col);
+            htmls.push(this.renderNumberCellHtml(date));
         }
-        _super.prototype.updateSize.call(this, totalHeight, isAuto, isResize);
-        if (this.dayGrid.colWeekNumbersVisible) {
-            // Make sure all week number cells running down the side have the same width.
-            // Record the width for cells created later.
-            this.weekNumberWidth = util_1.matchCellWidths(this.el.find('.fc-week-number'));
+        return htmls.join('');
+    };
+    // Generates the HTML for the <td>s of the "number" row in the DayGrid's content skeleton.
+    // The number row will only exist if either day numbers or week numbers are turned on.
+    DayGrid.prototype.renderNumberCellHtml = function (date) {
+        var view = this.view;
+        var html = '';
+        var isDateValid = this.dateProfile.activeUnzonedRange.containsDate(date); // TODO: called too frequently. cache somehow.
+        var isDayNumberVisible = this.getIsDayNumbersVisible() && isDateValid;
+        var classes;
+        var weekCalcFirstDoW;
+        if (!isDayNumberVisible && !this.cellWeekNumbersVisible) {
+            // no numbers in day cell (week number must be along the side)
+            return '<td></td>'; //  will create an empty space above events :(
         }
-        // reset all heights to be natural
-        this.scroller.clear();
-        util_1.uncompensateScroll(headRowEl);
-        this.dayGrid.removeSegPopover(); // kill the "more" popover if displayed
-        // is the event limit a constant level number?
-        if (eventLimit && typeof eventLimit === 'number') {
-            this.dayGrid.limitRows(eventLimit); // limit the levels first so the height can redistribute after
+        classes = this.getDayClasses(date);
+        classes.unshift('fc-day-top');
+        if (this.cellWeekNumbersVisible) {
+            // To determine the day of week number change under ISO, we cannot
+            // rely on moment.js methods such as firstDayOfWeek() or weekday(),
+            // because they rely on the locale's dow (possibly overridden by
+            // our firstDay option), which may not be Monday. We cannot change
+            // dow, because that would affect the calendar start day as well.
+            if (date._locale._fullCalendar_weekCalc === 'ISO') {
+                weekCalcFirstDoW = 1; // Monday by ISO 8601 definition
+            }
+            else {
+                weekCalcFirstDoW = date._locale.firstDayOfWeek();
+            }
         }
-        // distribute the height to the rows
-        // (totalHeight is a "recommended" value if isAuto)
-        scrollerHeight = this.computeScrollerHeight(totalHeight);
-        this.setGridHeight(scrollerHeight, isAuto);
-        // is the event limit dynamically calculated?
-        if (eventLimit && typeof eventLimit !== 'number') {
-            this.dayGrid.limitRows(eventLimit); // limit the levels after the grid's row heights have been set
+        html += '<td class="' + classes.join(' ') + '"' +
+            (isDateValid ?
+                ' data-date="' + date.format() + '"' :
+                '') +
+            '>';
+        if (this.cellWeekNumbersVisible && (date.day() === weekCalcFirstDoW)) {
+            html += view.buildGotoAnchorHtml({ date: date, type: 'week' }, { 'class': 'fc-week-number' }, date.format('w') // inner HTML
+            );
         }
-        if (!isAuto) {
-            this.scroller.setHeight(scrollerHeight);
-            scrollbarWidths = this.scroller.getScrollbarWidths();
-            if (scrollbarWidths.left || scrollbarWidths.right) {
-                util_1.compensateScroll(headRowEl, scrollbarWidths);
-                // doing the scrollbar compensation might have created text overflow which created more height. redo
-                scrollerHeight = this.computeScrollerHeight(totalHeight);
-                this.scroller.setHeight(scrollerHeight);
-            }
-            // guarantees the same scrollbar widths
-            this.scroller.lockOverflow(scrollbarWidths);
+        if (isDayNumberVisible) {
+            html += view.buildGotoAnchorHtml(date, { 'class': 'fc-day-number' }, date.format('D') // inner HTML
+            );
         }
+        html += '</td>';
+        return html;
     };
-    // given a desired total height of the view, returns what the height of the scroller should be
-    BasicView.prototype.computeScrollerHeight = function (totalHeight) {
-        return totalHeight -
-            util_1.subtractInnerElHeight(this.el, this.scroller.el); // everything that's NOT the scroller
+    /* Hit System
+    ------------------------------------------------------------------------------------------------------------------*/
+    DayGrid.prototype.prepareHits = function () {
+        this.colCoordCache.build();
+        this.rowCoordCache.build();
+        this.rowCoordCache.bottoms[this.rowCnt - 1] += this.bottomCoordPadding; // hack
     };
-    // Sets the height of just the DayGrid component in this view
-    BasicView.prototype.setGridHeight = function (height, isAuto) {
-        if (isAuto) {
-            util_1.undistributeHeight(this.dayGrid.rowEls); // let the rows be their natural height with no expanding
-        }
-        else {
-            util_1.distributeHeight(this.dayGrid.rowEls, height, true); // true = compensate for height-hogging rows
+    DayGrid.prototype.releaseHits = function () {
+        this.colCoordCache.clear();
+        this.rowCoordCache.clear();
+    };
+    DayGrid.prototype.queryHit = function (leftOffset, topOffset) {
+        if (this.colCoordCache.isLeftInBounds(leftOffset) && this.rowCoordCache.isTopInBounds(topOffset)) {
+            var col = this.colCoordCache.getHorizontalIndex(leftOffset);
+            var row = this.rowCoordCache.getVerticalIndex(topOffset);
+            if (row != null && col != null) {
+                return this.getCellHit(row, col);
+            }
         }
     };
-    /* Scroll
+    DayGrid.prototype.getHitFootprint = function (hit) {
+        var range = this.getCellRange(hit.row, hit.col);
+        return new ComponentFootprint_1.default(new UnzonedRange_1.default(range.start, range.end), true // all-day?
+        );
+    };
+    DayGrid.prototype.getHitEl = function (hit) {
+        return this.getCellEl(hit.row, hit.col);
+    };
+    /* Cell System
     ------------------------------------------------------------------------------------------------------------------*/
-    BasicView.prototype.computeInitialDateScroll = function () {
-        return { top: 0 };
+    // FYI: the first column is the leftmost column, regardless of date
+    DayGrid.prototype.getCellHit = function (row, col) {
+        return {
+            row: row,
+            col: col,
+            component: this,
+            left: this.colCoordCache.getLeftOffset(col),
+            right: this.colCoordCache.getRightOffset(col),
+            top: this.rowCoordCache.getTopOffset(row),
+            bottom: this.rowCoordCache.getBottomOffset(row)
+        };
     };
-    BasicView.prototype.queryDateScroll = function () {
-        return { top: this.scroller.getScrollTop() };
+    DayGrid.prototype.getCellEl = function (row, col) {
+        return this.cellEls.eq(row * this.colCnt + col);
     };
-    BasicView.prototype.applyDateScroll = function (scroll) {
-        if (scroll.top !== undefined) {
-            this.scroller.setScrollTop(scroll.top);
-        }
+    /* Event Rendering
+    ------------------------------------------------------------------------------------------------------------------*/
+    // Unrenders all events currently rendered on the grid
+    DayGrid.prototype.executeEventUnrender = function () {
+        this.removeSegPopover(); // removes the "more.." events popover
+        _super.prototype.executeEventUnrender.call(this);
     };
-    return BasicView;
-}(View_1.default));
-exports.default = BasicView;
-BasicView.prototype.dateProfileGeneratorClass = BasicViewDateProfileGenerator_1.default;
-BasicView.prototype.dayGridClass = DayGrid_1.default;
-// customize the rendering behavior of BasicView's dayGrid
-function makeDayGridSubclass(SuperClass) {
-    return /** @class */ (function (_super) {
-        tslib_1.__extends(SubClass, _super);
-        function SubClass() {
-            var _this = _super !== null && _super.apply(this, arguments) || this;
-            _this.colWeekNumbersVisible = false; // display week numbers along the side?
-            return _this;
-        }
-        // Generates the HTML that will go before the day-of week header cells
-        SubClass.prototype.renderHeadIntroHtml = function () {
-            var view = this.view;
-            if (this.colWeekNumbersVisible) {
-                return '' +
-                    '<th class="fc-week-number ' + view.calendar.theme.getClass('widgetHeader') + '" ' + view.weekNumberStyleAttr() + '>' +
-                    '<span>' + // needed for matchCellWidths
-                    util_1.htmlEscape(this.opt('weekNumberTitle')) +
-                    '</span>' +
-                    '</th>';
-            }
-            return '';
-        };
-        // Generates the HTML that will go before content-skeleton cells that display the day/week numbers
-        SubClass.prototype.renderNumberIntroHtml = function (row) {
-            var view = this.view;
-            var weekStart = this.getCellDate(row, 0);
-            if (this.colWeekNumbersVisible) {
-                return '' +
-                    '<td class="fc-week-number" ' + view.weekNumberStyleAttr() + '>' +
-                    view.buildGotoAnchorHtml(// aside from link, important for matchCellWidths
-                    { date: weekStart, type: 'week', forceOff: this.colCnt === 1 }, weekStart.format('w') // inner HTML
-                    ) +
-                    '</td>';
-            }
-            return '';
-        };
-        // Generates the HTML that goes before the day bg cells for each day-row
-        SubClass.prototype.renderBgIntroHtml = function () {
-            var view = this.view;
-            if (this.colWeekNumbersVisible) {
-                return '<td class="fc-week-number ' + view.calendar.theme.getClass('widgetContent') + '" ' +
-                    view.weekNumberStyleAttr() + '></td>';
-            }
-            return '';
-        };
-        // Generates the HTML that goes before every other type of row generated by DayGrid.
-        // Affects helper-skeleton and highlight-skeleton rows.
-        SubClass.prototype.renderIntroHtml = function () {
-            var view = this.view;
-            if (this.colWeekNumbersVisible) {
-                return '<td class="fc-week-number" ' + view.weekNumberStyleAttr() + '></td>';
-            }
-            return '';
-        };
-        SubClass.prototype.getIsNumbersVisible = function () {
-            return DayGrid_1.default.prototype.getIsNumbersVisible.apply(this, arguments) || this.colWeekNumbersVisible;
-        };
-        return SubClass;
-    }(SuperClass));
-}
-
-
-/***/ }),
-/* 63 */,
-/* 64 */,
-/* 65 */,
-/* 66 */,
-/* 67 */,
-/* 68 */,
-/* 69 */,
-/* 70 */,
-/* 71 */,
-/* 72 */,
-/* 73 */,
-/* 74 */,
-/* 75 */,
-/* 76 */,
-/* 77 */,
-/* 78 */,
-/* 79 */,
-/* 80 */,
-/* 81 */,
-/* 82 */,
-/* 83 */,
-/* 84 */,
-/* 85 */,
-/* 86 */,
-/* 87 */,
-/* 88 */,
-/* 89 */,
-/* 90 */,
-/* 91 */,
-/* 92 */,
-/* 93 */,
-/* 94 */,
-/* 95 */,
-/* 96 */,
-/* 97 */,
-/* 98 */,
-/* 99 */,
-/* 100 */,
-/* 101 */,
-/* 102 */,
-/* 103 */,
-/* 104 */,
-/* 105 */,
-/* 106 */,
-/* 107 */,
-/* 108 */,
-/* 109 */,
-/* 110 */,
-/* 111 */,
-/* 112 */,
-/* 113 */,
-/* 114 */,
-/* 115 */,
-/* 116 */,
-/* 117 */,
-/* 118 */,
-/* 119 */,
-/* 120 */,
-/* 121 */,
-/* 122 */,
-/* 123 */,
-/* 124 */,
-/* 125 */,
-/* 126 */,
-/* 127 */,
-/* 128 */,
-/* 129 */,
-/* 130 */,
-/* 131 */,
-/* 132 */,
-/* 133 */,
-/* 134 */,
-/* 135 */,
-/* 136 */,
-/* 137 */,
-/* 138 */,
-/* 139 */,
-/* 140 */,
-/* 141 */,
-/* 142 */,
-/* 143 */,
-/* 144 */,
-/* 145 */,
-/* 146 */,
-/* 147 */,
-/* 148 */,
-/* 149 */,
-/* 150 */,
-/* 151 */,
-/* 152 */,
-/* 153 */,
-/* 154 */,
-/* 155 */,
-/* 156 */,
-/* 157 */,
-/* 158 */,
-/* 159 */,
-/* 160 */,
-/* 161 */,
-/* 162 */,
-/* 163 */,
-/* 164 */,
-/* 165 */,
-/* 166 */,
-/* 167 */,
-/* 168 */,
-/* 169 */,
-/* 170 */,
-/* 171 */,
-/* 172 */,
-/* 173 */,
-/* 174 */,
-/* 175 */,
-/* 176 */,
-/* 177 */,
-/* 178 */,
-/* 179 */,
-/* 180 */,
-/* 181 */,
-/* 182 */,
-/* 183 */,
-/* 184 */,
-/* 185 */,
-/* 186 */,
-/* 187 */,
-/* 188 */,
-/* 189 */,
-/* 190 */,
-/* 191 */,
-/* 192 */,
-/* 193 */,
-/* 194 */,
-/* 195 */,
-/* 196 */,
-/* 197 */,
-/* 198 */,
-/* 199 */,
-/* 200 */,
-/* 201 */,
-/* 202 */,
-/* 203 */,
-/* 204 */,
-/* 205 */,
-/* 206 */,
-/* 207 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var UnzonedRange_1 = __webpack_require__(5);
-var ComponentFootprint_1 = __webpack_require__(12);
-var EventDefParser_1 = __webpack_require__(49);
-var EventSource_1 = __webpack_require__(6);
-var util_1 = __webpack_require__(35);
-var Constraints = /** @class */ (function () {
-    function Constraints(eventManager, _calendar) {
-        this.eventManager = eventManager;
-        this._calendar = _calendar;
-    }
-    Constraints.prototype.opt = function (name) {
-        return this._calendar.opt(name);
-    };
-    /*
-    determines if eventInstanceGroup is allowed,
-    in relation to other EVENTS and business hours.
-    */
-    Constraints.prototype.isEventInstanceGroupAllowed = function (eventInstanceGroup) {
-        var eventDef = eventInstanceGroup.getEventDef();
-        var eventFootprints = this.eventRangesToEventFootprints(eventInstanceGroup.getAllEventRanges());
-        var i;
-        var peerEventInstances = this.getPeerEventInstances(eventDef);
-        var peerEventRanges = peerEventInstances.map(util_1.eventInstanceToEventRange);
-        var peerEventFootprints = this.eventRangesToEventFootprints(peerEventRanges);
-        var constraintVal = eventDef.getConstraint();
-        var overlapVal = eventDef.getOverlap();
-        var eventAllowFunc = this.opt('eventAllow');
-        for (i = 0; i < eventFootprints.length; i++) {
-            if (!this.isFootprintAllowed(eventFootprints[i].componentFootprint, peerEventFootprints, constraintVal, overlapVal, eventFootprints[i].eventInstance)) {
-                return false;
-            }
-        }
-        if (eventAllowFunc) {
-            for (i = 0; i < eventFootprints.length; i++) {
-                if (eventAllowFunc(eventFootprints[i].componentFootprint.toLegacy(this._calendar), eventFootprints[i].getEventLegacy()) === false) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    };
-    Constraints.prototype.getPeerEventInstances = function (eventDef) {
-        return this.eventManager.getEventInstancesWithoutId(eventDef.id);
-    };
-    Constraints.prototype.isSelectionFootprintAllowed = function (componentFootprint) {
-        var peerEventInstances = this.eventManager.getEventInstances();
-        var peerEventRanges = peerEventInstances.map(util_1.eventInstanceToEventRange);
-        var peerEventFootprints = this.eventRangesToEventFootprints(peerEventRanges);
-        var selectAllowFunc;
-        if (this.isFootprintAllowed(componentFootprint, peerEventFootprints, this.opt('selectConstraint'), this.opt('selectOverlap'))) {
-            selectAllowFunc = this.opt('selectAllow');
-            if (selectAllowFunc) {
-                return selectAllowFunc(componentFootprint.toLegacy(this._calendar)) !== false;
-            }
-            else {
-                return true;
-            }
-        }
-        return false;
-    };
-    Constraints.prototype.isFootprintAllowed = function (componentFootprint, peerEventFootprints, constraintVal, overlapVal, subjectEventInstance // optional
-    ) {
-        var constraintFootprints; // ComponentFootprint[]
-        var overlapEventFootprints; // EventFootprint[]
-        if (constraintVal != null) {
-            constraintFootprints = this.constraintValToFootprints(constraintVal, componentFootprint.isAllDay);
-            if (!this.isFootprintWithinConstraints(componentFootprint, constraintFootprints)) {
-                return false;
-            }
-        }
-        overlapEventFootprints = this.collectOverlapEventFootprints(peerEventFootprints, componentFootprint);
-        if (overlapVal === false) {
-            if (overlapEventFootprints.length) {
-                return false;
-            }
-        }
-        else if (typeof overlapVal === 'function') {
-            if (!isOverlapsAllowedByFunc(overlapEventFootprints, overlapVal, subjectEventInstance)) {
-                return false;
-            }
-        }
-        if (subjectEventInstance) {
-            if (!isOverlapEventInstancesAllowed(overlapEventFootprints, subjectEventInstance)) {
-                return false;
-            }
-        }
-        return true;
-    };
-    // Constraint
-    // ------------------------------------------------------------------------------------------------
-    Constraints.prototype.isFootprintWithinConstraints = function (componentFootprint, constraintFootprints) {
-        var i;
-        for (i = 0; i < constraintFootprints.length; i++) {
-            if (this.footprintContainsFootprint(constraintFootprints[i], componentFootprint)) {
-                return true;
-            }
-        }
-        return false;
-    };
-    Constraints.prototype.constraintValToFootprints = function (constraintVal, isAllDay) {
-        var eventInstances;
-        if (constraintVal === 'businessHours') {
-            return this.buildCurrentBusinessFootprints(isAllDay);
-        }
-        else if (typeof constraintVal === 'object') {
-            eventInstances = this.parseEventDefToInstances(constraintVal); // handles recurring events
-            if (!eventInstances) {
-                return this.parseFootprints(constraintVal);
-            }
-            else {
-                return this.eventInstancesToFootprints(eventInstances);
-            }
-        }
-        else if (constraintVal != null) {
-            eventInstances = this.eventManager.getEventInstancesWithId(constraintVal);
-            return this.eventInstancesToFootprints(eventInstances);
-        }
-    };
-    // returns ComponentFootprint[]
-    // uses current view's range
-    Constraints.prototype.buildCurrentBusinessFootprints = function (isAllDay) {
-        var view = this._calendar.view;
-        var businessHourGenerator = view.get('businessHourGenerator');
-        var unzonedRange = view.dateProfile.activeUnzonedRange;
-        var eventInstanceGroup = businessHourGenerator.buildEventInstanceGroup(isAllDay, unzonedRange);
-        if (eventInstanceGroup) {
-            return this.eventInstancesToFootprints(eventInstanceGroup.eventInstances);
-        }
-        else {
-            return [];
-        }
-    };
-    // conversion util
-    Constraints.prototype.eventInstancesToFootprints = function (eventInstances) {
-        var eventRanges = eventInstances.map(util_1.eventInstanceToEventRange);
-        var eventFootprints = this.eventRangesToEventFootprints(eventRanges);
-        return eventFootprints.map(util_1.eventFootprintToComponentFootprint);
-    };
-    // Overlap
-    // ------------------------------------------------------------------------------------------------
-    Constraints.prototype.collectOverlapEventFootprints = function (peerEventFootprints, targetFootprint) {
-        var overlapEventFootprints = [];
-        var i;
-        for (i = 0; i < peerEventFootprints.length; i++) {
-            if (this.footprintsIntersect(targetFootprint, peerEventFootprints[i].componentFootprint)) {
-                overlapEventFootprints.push(peerEventFootprints[i]);
-            }
-        }
-        return overlapEventFootprints;
-    };
-    // Conversion: eventDefs -> eventInstances -> eventRanges -> eventFootprints -> componentFootprints
-    // ------------------------------------------------------------------------------------------------
-    // NOTE: this might seem like repetitive code with the Grid class, however, this code is related to
-    // constraints whereas the Grid code is related to rendering. Each approach might want to convert
-    // eventRanges -> eventFootprints in a different way. Regardless, there are opportunities to make
-    // this more DRY.
-    /*
-    Returns false on invalid input.
-    */
-    Constraints.prototype.parseEventDefToInstances = function (eventInput) {
-        var eventManager = this.eventManager;
-        var eventDef = EventDefParser_1.default.parse(eventInput, new EventSource_1.default(this._calendar));
-        if (!eventDef) {
-            return false;
-        }
-        return eventDef.buildInstances(eventManager.currentPeriod.unzonedRange);
-    };
-    Constraints.prototype.eventRangesToEventFootprints = function (eventRanges) {
-        var i;
-        var eventFootprints = [];
-        for (i = 0; i < eventRanges.length; i++) {
-            eventFootprints.push.apply(// footprints
-            eventFootprints, this.eventRangeToEventFootprints(eventRanges[i]));
-        }
-        return eventFootprints;
-    };
-    Constraints.prototype.eventRangeToEventFootprints = function (eventRange) {
-        return [util_1.eventRangeToEventFootprint(eventRange)];
-    };
-    /*
-    Parses footprints directly.
-    Very similar to EventDateProfile::parse :(
-    */
-    Constraints.prototype.parseFootprints = function (rawInput) {
-        var start;
-        var end;
-        if (rawInput.start) {
-            start = this._calendar.moment(rawInput.start);
-            if (!start.isValid()) {
-                start = null;
-            }
-        }
-        if (rawInput.end) {
-            end = this._calendar.moment(rawInput.end);
-            if (!end.isValid()) {
-                end = null;
-            }
-        }
-        return [
-            new ComponentFootprint_1.default(new UnzonedRange_1.default(start, end), (start && !start.hasTime()) || (end && !end.hasTime()) // isAllDay
-            )
-        ];
-    };
-    // Footprint Utils
-    // ----------------------------------------------------------------------------------------
-    Constraints.prototype.footprintContainsFootprint = function (outerFootprint, innerFootprint) {
-        return outerFootprint.unzonedRange.containsRange(innerFootprint.unzonedRange);
-    };
-    Constraints.prototype.footprintsIntersect = function (footprint0, footprint1) {
-        return footprint0.unzonedRange.intersectsWith(footprint1.unzonedRange);
-    };
-    return Constraints;
-}());
-exports.default = Constraints;
-// optional subjectEventInstance
-function isOverlapsAllowedByFunc(overlapEventFootprints, overlapFunc, subjectEventInstance) {
-    var i;
-    for (i = 0; i < overlapEventFootprints.length; i++) {
-        if (!overlapFunc(overlapEventFootprints[i].eventInstance.toLegacy(), subjectEventInstance ? subjectEventInstance.toLegacy() : null)) {
-            return false;
-        }
-    }
-    return true;
-}
-function isOverlapEventInstancesAllowed(overlapEventFootprints, subjectEventInstance) {
-    var subjectLegacyInstance = subjectEventInstance.toLegacy();
-    var i;
-    var overlapEventInstance;
-    var overlapEventDef;
-    var overlapVal;
-    for (i = 0; i < overlapEventFootprints.length; i++) {
-        overlapEventInstance = overlapEventFootprints[i].eventInstance;
-        overlapEventDef = overlapEventInstance.def;
-        // don't need to pass in calendar, because don't want to consider global eventOverlap property,
-        // because we already considered that earlier in the process.
-        overlapVal = overlapEventDef.getOverlap();
-        if (overlapVal === false) {
-            return false;
-        }
-        else if (typeof overlapVal === 'function') {
-            if (!overlapVal(overlapEventInstance.toLegacy(), subjectLegacyInstance)) {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
-
-/***/ }),
-/* 208 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*
-USAGE:
-  import { default as ParsableModelMixin, ParsableModelInterface } from './ParsableModelMixin'
-in class:
-  applyProps: ParsableModelInterface['applyProps']
-  applyManualStandardProps: ParsableModelInterface['applyManualStandardProps']
-  applyMiscProps: ParsableModelInterface['applyMiscProps']
-  isStandardProp: ParsableModelInterface['isStandardProp']
-  static defineStandardProps = ParsableModelMixin.defineStandardProps
-  static copyVerbatimStandardProps = ParsableModelMixin.copyVerbatimStandardProps
-after class:
-  ParsableModelMixin.mixInto(TheClass)
-*/
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var util_1 = __webpack_require__(4);
-var Mixin_1 = __webpack_require__(14);
-var ParsableModelMixin = /** @class */ (function (_super) {
-    tslib_1.__extends(ParsableModelMixin, _super);
-    function ParsableModelMixin() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    ParsableModelMixin.defineStandardProps = function (propDefs) {
-        var proto = this.prototype;
-        if (!proto.hasOwnProperty('standardPropMap')) {
-            proto.standardPropMap = Object.create(proto.standardPropMap);
-        }
-        util_1.copyOwnProps(propDefs, proto.standardPropMap);
-    };
-    ParsableModelMixin.copyVerbatimStandardProps = function (src, dest) {
-        var map = this.prototype.standardPropMap;
-        var propName;
-        for (propName in map) {
-            if (src[propName] != null && // in the src object?
-                map[propName] === true // false means "copy verbatim"
-            ) {
-                dest[propName] = src[propName];
-            }
-        }
-    };
-    /*
-    Returns true/false for success.
-    Meant to be only called ONCE, at object creation.
-    */
-    ParsableModelMixin.prototype.applyProps = function (rawProps) {
-        var standardPropMap = this.standardPropMap;
-        var manualProps = {};
-        var miscProps = {};
-        var propName;
-        for (propName in rawProps) {
-            if (standardPropMap[propName] === true) {
-                this[propName] = rawProps[propName];
-            }
-            else if (standardPropMap[propName] === false) {
-                manualProps[propName] = rawProps[propName];
-            }
-            else {
-                miscProps[propName] = rawProps[propName];
-            }
-        }
-        this.applyMiscProps(miscProps);
-        return this.applyManualStandardProps(manualProps);
-    };
-    /*
-    If subclasses override, they must call this supermethod and return the boolean response.
-    Meant to be only called ONCE, at object creation.
-    */
-    ParsableModelMixin.prototype.applyManualStandardProps = function (rawProps) {
-        return true;
-    };
-    /*
-    Can be called even after initial object creation.
-    */
-    ParsableModelMixin.prototype.applyMiscProps = function (rawProps) {
-        // subclasses can implement
-    };
-    /*
-    TODO: why is this a method when defineStandardProps is static
-    */
-    ParsableModelMixin.prototype.isStandardProp = function (propName) {
-        return propName in this.standardPropMap;
-    };
-    return ParsableModelMixin;
-}(Mixin_1.default));
-exports.default = ParsableModelMixin;
-ParsableModelMixin.prototype.standardPropMap = {}; // will be cloned by defineStandardProps
-
-
-/***/ }),
-/* 209 */
-/***/ (function(module, exports) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var EventInstance = /** @class */ (function () {
-    function EventInstance(def, dateProfile) {
-        this.def = def;
-        this.dateProfile = dateProfile;
-    }
-    EventInstance.prototype.toLegacy = function () {
-        var dateProfile = this.dateProfile;
-        var obj = this.def.toLegacy();
-        obj.start = dateProfile.start.clone();
-        obj.end = dateProfile.end ? dateProfile.end.clone() : null;
-        return obj;
-    };
-    return EventInstance;
-}());
-exports.default = EventInstance;
-
-
-/***/ }),
-/* 210 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var $ = __webpack_require__(3);
-var moment = __webpack_require__(0);
-var EventDef_1 = __webpack_require__(34);
-var EventInstance_1 = __webpack_require__(209);
-var EventDateProfile_1 = __webpack_require__(17);
-var RecurringEventDef = /** @class */ (function (_super) {
-    tslib_1.__extends(RecurringEventDef, _super);
-    function RecurringEventDef() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    RecurringEventDef.prototype.isAllDay = function () {
-        return !this.startTime && !this.endTime;
-    };
-    RecurringEventDef.prototype.buildInstances = function (unzonedRange) {
-        var calendar = this.source.calendar;
-        var unzonedDate = unzonedRange.getStart();
-        var unzonedEnd = unzonedRange.getEnd();
-        var zonedDayStart;
-        var instanceStart;
-        var instanceEnd;
-        var instances = [];
-        while (unzonedDate.isBefore(unzonedEnd)) {
-            // if everyday, or this particular day-of-week
-            if (!this.dowHash || this.dowHash[unzonedDate.day()]) {
-                zonedDayStart = calendar.applyTimezone(unzonedDate);
-                instanceStart = zonedDayStart.clone();
-                instanceEnd = null;
-                if (this.startTime) {
-                    instanceStart.time(this.startTime);
-                }
-                else {
-                    instanceStart.stripTime();
-                }
-                if (this.endTime) {
-                    instanceEnd = zonedDayStart.clone().time(this.endTime);
-                }
-                instances.push(new EventInstance_1.default(this, // definition
-                new EventDateProfile_1.default(instanceStart, instanceEnd, calendar)));
-            }
-            unzonedDate.add(1, 'days');
-        }
-        return instances;
-    };
-    RecurringEventDef.prototype.setDow = function (dowNumbers) {
-        if (!this.dowHash) {
-            this.dowHash = {};
-        }
-        for (var i = 0; i < dowNumbers.length; i++) {
-            this.dowHash[dowNumbers[i]] = true;
-        }
-    };
-    RecurringEventDef.prototype.clone = function () {
-        var def = _super.prototype.clone.call(this);
-        if (def.startTime) {
-            def.startTime = moment.duration(this.startTime);
-        }
-        if (def.endTime) {
-            def.endTime = moment.duration(this.endTime);
-        }
-        if (this.dowHash) {
-            def.dowHash = $.extend({}, this.dowHash);
-        }
-        return def;
-    };
-    return RecurringEventDef;
-}(EventDef_1.default));
-exports.default = RecurringEventDef;
-/*
-HACK to work with TypeScript mixins
-NOTE: if super-method fails, should still attempt to apply
-*/
-RecurringEventDef.prototype.applyProps = function (rawProps) {
-    var superSuccess = EventDef_1.default.prototype.applyProps.call(this, rawProps);
-    if (rawProps.start) {
-        this.startTime = moment.duration(rawProps.start);
-    }
-    if (rawProps.end) {
-        this.endTime = moment.duration(rawProps.end);
-    }
-    if (rawProps.dow) {
-        this.setDow(rawProps.dow);
-    }
-    return superSuccess;
-};
-// Parsing
-// ---------------------------------------------------------------------------------------------------------------------
-RecurringEventDef.defineStandardProps({
-    start: false,
-    end: false,
-    dow: false
-});
-
-
-/***/ }),
-/* 211 */
-/***/ (function(module, exports) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var EventRange = /** @class */ (function () {
-    function EventRange(unzonedRange, eventDef, eventInstance) {
-        this.unzonedRange = unzonedRange;
-        this.eventDef = eventDef;
-        if (eventInstance) {
-            this.eventInstance = eventInstance;
-        }
-    }
-    return EventRange;
-}());
-exports.default = EventRange;
-
-
-/***/ }),
-/* 212 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var $ = __webpack_require__(3);
-var util_1 = __webpack_require__(35);
-var EventInstanceGroup_1 = __webpack_require__(18);
-var RecurringEventDef_1 = __webpack_require__(210);
-var EventSource_1 = __webpack_require__(6);
-var BUSINESS_HOUR_EVENT_DEFAULTS = {
-    start: '09:00',
-    end: '17:00',
-    dow: [1, 2, 3, 4, 5],
-    rendering: 'inverse-background'
-    // classNames are defined in businessHoursSegClasses
-};
-var BusinessHourGenerator = /** @class */ (function () {
-    function BusinessHourGenerator(rawComplexDef, calendar) {
-        this.rawComplexDef = rawComplexDef;
-        this.calendar = calendar;
-    }
-    BusinessHourGenerator.prototype.buildEventInstanceGroup = function (isAllDay, unzonedRange) {
-        var eventDefs = this.buildEventDefs(isAllDay);
-        var eventInstanceGroup;
-        if (eventDefs.length) {
-            eventInstanceGroup = new EventInstanceGroup_1.default(util_1.eventDefsToEventInstances(eventDefs, unzonedRange));
-            // so that inverse-background rendering can happen even when no eventRanges in view
-            eventInstanceGroup.explicitEventDef = eventDefs[0];
-            return eventInstanceGroup;
-        }
-    };
-    BusinessHourGenerator.prototype.buildEventDefs = function (isAllDay) {
-        var rawComplexDef = this.rawComplexDef;
-        var rawDefs = [];
-        var requireDow = false;
-        var i;
-        var defs = [];
-        if (rawComplexDef === true) {
-            rawDefs = [{}]; // will get BUSINESS_HOUR_EVENT_DEFAULTS verbatim
-        }
-        else if ($.isPlainObject(rawComplexDef)) {
-            rawDefs = [rawComplexDef];
-        }
-        else if ($.isArray(rawComplexDef)) {
-            rawDefs = rawComplexDef;
-            requireDow = true; // every sub-definition NEEDS a day-of-week
-        }
-        for (i = 0; i < rawDefs.length; i++) {
-            if (!requireDow || rawDefs[i].dow) {
-                defs.push(this.buildEventDef(isAllDay, rawDefs[i]));
-            }
-        }
-        return defs;
-    };
-    BusinessHourGenerator.prototype.buildEventDef = function (isAllDay, rawDef) {
-        var fullRawDef = $.extend({}, BUSINESS_HOUR_EVENT_DEFAULTS, rawDef);
-        if (isAllDay) {
-            fullRawDef.start = null;
-            fullRawDef.end = null;
-        }
-        return RecurringEventDef_1.default.parse(fullRawDef, new EventSource_1.default(this.calendar) // dummy source
-        );
-    };
-    return BusinessHourGenerator;
-}());
-exports.default = BusinessHourGenerator;
-
-
-/***/ }),
-/* 213 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var Theme_1 = __webpack_require__(19);
-var StandardTheme = /** @class */ (function (_super) {
-    tslib_1.__extends(StandardTheme, _super);
-    function StandardTheme() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    return StandardTheme;
-}(Theme_1.default));
-exports.default = StandardTheme;
-StandardTheme.prototype.classes = {
-    widget: 'fc-unthemed',
-    widgetHeader: 'fc-widget-header',
-    widgetContent: 'fc-widget-content',
-    buttonGroup: 'fc-button-group',
-    button: 'fc-button',
-    cornerLeft: 'fc-corner-left',
-    cornerRight: 'fc-corner-right',
-    stateDefault: 'fc-state-default',
-    stateActive: 'fc-state-active',
-    stateDisabled: 'fc-state-disabled',
-    stateHover: 'fc-state-hover',
-    stateDown: 'fc-state-down',
-    popoverHeader: 'fc-widget-header',
-    popoverContent: 'fc-widget-content',
-    // day grid
-    headerRow: 'fc-widget-header',
-    dayRow: 'fc-widget-content',
-    // list view
-    listView: 'fc-widget-content'
-};
-StandardTheme.prototype.baseIconClass = 'fc-icon';
-StandardTheme.prototype.iconClasses = {
-    close: 'fc-icon-x',
-    prev: 'fc-icon-left-single-arrow',
-    next: 'fc-icon-right-single-arrow',
-    prevYear: 'fc-icon-left-double-arrow',
-    nextYear: 'fc-icon-right-double-arrow'
-};
-StandardTheme.prototype.iconOverrideOption = 'buttonIcons';
-StandardTheme.prototype.iconOverrideCustomButtonOption = 'icon';
-StandardTheme.prototype.iconOverridePrefix = 'fc-icon-';
-
-
-/***/ }),
-/* 214 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var Theme_1 = __webpack_require__(19);
-var JqueryUiTheme = /** @class */ (function (_super) {
-    tslib_1.__extends(JqueryUiTheme, _super);
-    function JqueryUiTheme() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    return JqueryUiTheme;
-}(Theme_1.default));
-exports.default = JqueryUiTheme;
-JqueryUiTheme.prototype.classes = {
-    widget: 'ui-widget',
-    widgetHeader: 'ui-widget-header',
-    widgetContent: 'ui-widget-content',
-    buttonGroup: 'fc-button-group',
-    button: 'ui-button',
-    cornerLeft: 'ui-corner-left',
-    cornerRight: 'ui-corner-right',
-    stateDefault: 'ui-state-default',
-    stateActive: 'ui-state-active',
-    stateDisabled: 'ui-state-disabled',
-    stateHover: 'ui-state-hover',
-    stateDown: 'ui-state-down',
-    today: 'ui-state-highlight',
-    popoverHeader: 'ui-widget-header',
-    popoverContent: 'ui-widget-content',
-    // day grid
-    headerRow: 'ui-widget-header',
-    dayRow: 'ui-widget-content',
-    // list view
-    listView: 'ui-widget-content'
-};
-JqueryUiTheme.prototype.baseIconClass = 'ui-icon';
-JqueryUiTheme.prototype.iconClasses = {
-    close: 'ui-icon-closethick',
-    prev: 'ui-icon-circle-triangle-w',
-    next: 'ui-icon-circle-triangle-e',
-    prevYear: 'ui-icon-seek-prev',
-    nextYear: 'ui-icon-seek-next'
-};
-JqueryUiTheme.prototype.iconOverrideOption = 'themeButtonIcons';
-JqueryUiTheme.prototype.iconOverrideCustomButtonOption = 'themeIcon';
-JqueryUiTheme.prototype.iconOverridePrefix = 'ui-icon-';
-
-
-/***/ }),
-/* 215 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var $ = __webpack_require__(3);
-var Promise_1 = __webpack_require__(20);
-var EventSource_1 = __webpack_require__(6);
-var FuncEventSource = /** @class */ (function (_super) {
-    tslib_1.__extends(FuncEventSource, _super);
-    function FuncEventSource() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    FuncEventSource.parse = function (rawInput, calendar) {
-        var rawProps;
-        // normalize raw input
-        if ($.isFunction(rawInput.events)) {
-            rawProps = rawInput;
-        }
-        else if ($.isFunction(rawInput)) {
-            rawProps = { events: rawInput };
-        }
-        if (rawProps) {
-            return EventSource_1.default.parse.call(this, rawProps, calendar);
-        }
-        return false;
-    };
-    FuncEventSource.prototype.fetch = function (start, end, timezone) {
-        var _this = this;
-        this.calendar.pushLoading();
-        return Promise_1.default.construct(function (onResolve) {
-            _this.func.call(_this.calendar, start.clone(), end.clone(), timezone, function (rawEventDefs) {
-                _this.calendar.popLoading();
-                onResolve(_this.parseEventDefs(rawEventDefs));
-            });
-        });
-    };
-    FuncEventSource.prototype.getPrimitive = function () {
-        return this.func;
-    };
-    FuncEventSource.prototype.applyManualStandardProps = function (rawProps) {
-        var superSuccess = _super.prototype.applyManualStandardProps.call(this, rawProps);
-        this.func = rawProps.events;
-        return superSuccess;
-    };
-    return FuncEventSource;
-}(EventSource_1.default));
-exports.default = FuncEventSource;
-FuncEventSource.defineStandardProps({
-    events: false // don't automatically transfer
-});
-
-
-/***/ }),
-/* 216 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var $ = __webpack_require__(3);
-var util_1 = __webpack_require__(4);
-var Promise_1 = __webpack_require__(20);
-var EventSource_1 = __webpack_require__(6);
-var JsonFeedEventSource = /** @class */ (function (_super) {
-    tslib_1.__extends(JsonFeedEventSource, _super);
-    function JsonFeedEventSource() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    JsonFeedEventSource.parse = function (rawInput, calendar) {
-        var rawProps;
-        // normalize raw input
-        if (typeof rawInput.url === 'string') {
-            rawProps = rawInput;
-        }
-        else if (typeof rawInput === 'string') {
-            rawProps = { url: rawInput };
-        }
-        if (rawProps) {
-            return EventSource_1.default.parse.call(this, rawProps, calendar);
-        }
-        return false;
-    };
-    JsonFeedEventSource.prototype.fetch = function (start, end, timezone) {
-        var _this = this;
-        var ajaxSettings = this.ajaxSettings;
-        var onSuccess = ajaxSettings.success;
-        var onError = ajaxSettings.error;
-        var requestParams = this.buildRequestParams(start, end, timezone);
-        // todo: eventually handle the promise's then,
-        // don't intercept success/error
-        // tho will be a breaking API change
-        this.calendar.pushLoading();
-        return Promise_1.default.construct(function (onResolve, onReject) {
-            $.ajax($.extend({}, // destination
-            JsonFeedEventSource.AJAX_DEFAULTS, ajaxSettings, {
-                url: _this.url,
-                data: requestParams,
-                success: function (rawEventDefs, status, xhr) {
-                    var callbackRes;
-                    _this.calendar.popLoading();
-                    if (rawEventDefs) {
-                        callbackRes = util_1.applyAll(onSuccess, _this, [rawEventDefs, status, xhr]); // redirect `this`
-                        if ($.isArray(callbackRes)) {
-                            rawEventDefs = callbackRes;
-                        }
-                        onResolve(_this.parseEventDefs(rawEventDefs));
-                    }
-                    else {
-                        onReject();
-                    }
-                },
-                error: function (xhr, statusText, errorThrown) {
-                    _this.calendar.popLoading();
-                    util_1.applyAll(onError, _this, [xhr, statusText, errorThrown]); // redirect `this`
-                    onReject();
-                }
-            }));
-        });
-    };
-    JsonFeedEventSource.prototype.buildRequestParams = function (start, end, timezone) {
-        var calendar = this.calendar;
-        var ajaxSettings = this.ajaxSettings;
-        var startParam;
-        var endParam;
-        var timezoneParam;
-        var customRequestParams;
-        var params = {};
-        startParam = this.startParam;
-        if (startParam == null) {
-            startParam = calendar.opt('startParam');
-        }
-        endParam = this.endParam;
-        if (endParam == null) {
-            endParam = calendar.opt('endParam');
-        }
-        timezoneParam = this.timezoneParam;
-        if (timezoneParam == null) {
-            timezoneParam = calendar.opt('timezoneParam');
-        }
-        // retrieve any outbound GET/POST $.ajax data from the options
-        if ($.isFunction(ajaxSettings.data)) {
-            // supplied as a function that returns a key/value object
-            customRequestParams = ajaxSettings.data();
-        }
-        else {
-            // probably supplied as a straight key/value object
-            customRequestParams = ajaxSettings.data || {};
-        }
-        $.extend(params, customRequestParams);
-        params[startParam] = start.format();
-        params[endParam] = end.format();
-        if (timezone && timezone !== 'local') {
-            params[timezoneParam] = timezone;
-        }
-        return params;
-    };
-    JsonFeedEventSource.prototype.getPrimitive = function () {
-        return this.url;
-    };
-    JsonFeedEventSource.prototype.applyMiscProps = function (rawProps) {
-        this.ajaxSettings = rawProps;
-    };
-    JsonFeedEventSource.AJAX_DEFAULTS = {
-        dataType: 'json',
-        cache: false
-    };
-    return JsonFeedEventSource;
-}(EventSource_1.default));
-exports.default = JsonFeedEventSource;
-JsonFeedEventSource.defineStandardProps({
-    // automatically transfer (true)...
-    url: true,
-    startParam: true,
-    endParam: true,
-    timezoneParam: true
-});
-
-
-/***/ }),
-/* 217 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var EmitterMixin_1 = __webpack_require__(11);
-var TaskQueue = /** @class */ (function () {
-    function TaskQueue() {
-        this.q = [];
-        this.isPaused = false;
-        this.isRunning = false;
-    }
-    TaskQueue.prototype.queue = function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        this.q.push.apply(this.q, args); // append
-        this.tryStart();
-    };
-    TaskQueue.prototype.pause = function () {
-        this.isPaused = true;
-    };
-    TaskQueue.prototype.resume = function () {
-        this.isPaused = false;
-        this.tryStart();
-    };
-    TaskQueue.prototype.getIsIdle = function () {
-        return !this.isRunning && !this.isPaused;
-    };
-    TaskQueue.prototype.tryStart = function () {
-        if (!this.isRunning && this.canRunNext()) {
-            this.isRunning = true;
-            this.trigger('start');
-            this.runRemaining();
-        }
-    };
-    TaskQueue.prototype.canRunNext = function () {
-        return !this.isPaused && this.q.length;
-    };
-    TaskQueue.prototype.runRemaining = function () {
-        var _this = this;
-        var task;
-        var res;
-        do {
-            task = this.q.shift(); // always freshly reference q. might have been reassigned.
-            res = this.runTask(task);
-            if (res && res.then) {
-                res.then(function () {
-                    if (_this.canRunNext()) {
-                        _this.runRemaining();
-                    }
-                });
-                return; // prevent marking as stopped
-            }
-        } while (this.canRunNext());
-        this.trigger('stop'); // not really a 'stop' ... more of a 'drained'
-        this.isRunning = false;
-        // if 'stop' handler added more tasks.... TODO: write test for this
-        this.tryStart();
-    };
-    TaskQueue.prototype.runTask = function (task) {
-        return task(); // task *is* the function, but subclasses can change the format of a task
-    };
-    return TaskQueue;
-}());
-exports.default = TaskQueue;
-EmitterMixin_1.default.mixInto(TaskQueue);
-
-
-/***/ }),
-/* 218 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var TaskQueue_1 = __webpack_require__(217);
-var RenderQueue = /** @class */ (function (_super) {
-    tslib_1.__extends(RenderQueue, _super);
-    function RenderQueue(waitsByNamespace) {
-        var _this = _super.call(this) || this;
-        _this.waitsByNamespace = waitsByNamespace || {};
-        return _this;
-    }
-    RenderQueue.prototype.queue = function (taskFunc, namespace, type) {
-        var task = {
-            func: taskFunc,
-            namespace: namespace,
-            type: type
-        };
-        var waitMs;
-        if (namespace) {
-            waitMs = this.waitsByNamespace[namespace];
-        }
-        if (this.waitNamespace) {
-            if (namespace === this.waitNamespace && waitMs != null) {
-                this.delayWait(waitMs);
-            }
-            else {
-                this.clearWait();
-                this.tryStart();
-            }
-        }
-        if (this.compoundTask(task)) {
-            if (!this.waitNamespace && waitMs != null) {
-                this.startWait(namespace, waitMs);
-            }
-            else {
-                this.tryStart();
-            }
-        }
-    };
-    RenderQueue.prototype.startWait = function (namespace, waitMs) {
-        this.waitNamespace = namespace;
-        this.spawnWait(waitMs);
-    };
-    RenderQueue.prototype.delayWait = function (waitMs) {
-        clearTimeout(this.waitId);
-        this.spawnWait(waitMs);
-    };
-    RenderQueue.prototype.spawnWait = function (waitMs) {
-        var _this = this;
-        this.waitId = setTimeout(function () {
-            _this.waitNamespace = null;
-            _this.tryStart();
-        }, waitMs);
-    };
-    RenderQueue.prototype.clearWait = function () {
-        if (this.waitNamespace) {
-            clearTimeout(this.waitId);
-            this.waitId = null;
-            this.waitNamespace = null;
-        }
-    };
-    RenderQueue.prototype.canRunNext = function () {
-        if (!_super.prototype.canRunNext.call(this)) {
-            return false;
-        }
-        // waiting for a certain namespace to stop receiving tasks?
-        if (this.waitNamespace) {
-            var q = this.q;
-            // if there was a different namespace task in the meantime,
-            // that forces all previously-waiting tasks to suddenly execute.
-            // TODO: find a way to do this in constant time.
-            for (var i = 0; i < q.length; i++) {
-                if (q[i].namespace !== this.waitNamespace) {
-                    return true; // allow execution
-                }
-            }
-            return false;
-        }
-        return true;
-    };
-    RenderQueue.prototype.runTask = function (task) {
-        task.func();
-    };
-    RenderQueue.prototype.compoundTask = function (newTask) {
-        var q = this.q;
-        var shouldAppend = true;
-        var i;
-        var task;
-        if (newTask.namespace && newTask.type === 'destroy') {
-            // remove all init/add/remove ops with same namespace, regardless of order
-            for (i = q.length - 1; i >= 0; i--) {
-                task = q[i];
-                switch (task.type) {
-                    case 'init':
-                        shouldAppend = false;
-                    // the latest destroy is cancelled out by not doing the init
-                    /* falls through */
-                    case 'add':
-                    /* falls through */
-                    case 'remove':
-                        q.splice(i, 1); // remove task
-                }
-            }
-        }
-        if (shouldAppend) {
-            q.push(newTask);
-        }
-        return shouldAppend;
-    };
-    return RenderQueue;
-}(TaskQueue_1.default));
-exports.default = RenderQueue;
-
-
-/***/ }),
-/* 219 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var $ = __webpack_require__(3);
-var moment = __webpack_require__(0);
-var util_1 = __webpack_require__(4);
-var moment_ext_1 = __webpack_require__(10);
-var date_formatting_1 = __webpack_require__(47);
-var Component_1 = __webpack_require__(237);
-var util_2 = __webpack_require__(35);
-var DateComponent = /** @class */ (function (_super) {
-    tslib_1.__extends(DateComponent, _super);
-    function DateComponent(_view, _options) {
-        var _this = _super.call(this) || this;
-        _this.isRTL = false; // frequently accessed options
-        _this.hitsNeededDepth = 0; // necessary because multiple callers might need the same hits
-        _this.hasAllDayBusinessHours = false; // TODO: unify with largeUnit and isTimeScale?
-        _this.isDatesRendered = false;
-        // hack to set options prior to the this.opt calls
-        if (_view) {
-            _this['view'] = _view;
-        }
-        if (_options) {
-            _this['options'] = _options;
-        }
-        _this.uid = String(DateComponent.guid++);
-        _this.childrenByUid = {};
-        _this.nextDayThreshold = moment.duration(_this.opt('nextDayThreshold'));
-        _this.isRTL = _this.opt('isRTL');
-        if (_this.fillRendererClass) {
-            _this.fillRenderer = new _this.fillRendererClass(_this);
-        }
-        if (_this.eventRendererClass) {
-            _this.eventRenderer = new _this.eventRendererClass(_this, _this.fillRenderer);
-        }
-        if (_this.helperRendererClass && _this.eventRenderer) {
-            _this.helperRenderer = new _this.helperRendererClass(_this, _this.eventRenderer);
-        }
-        if (_this.businessHourRendererClass && _this.fillRenderer) {
-            _this.businessHourRenderer = new _this.businessHourRendererClass(_this, _this.fillRenderer);
-        }
-        return _this;
-    }
-    DateComponent.prototype.addChild = function (child) {
-        if (!this.childrenByUid[child.uid]) {
-            this.childrenByUid[child.uid] = child;
-            return true;
-        }
-        return false;
-    };
-    DateComponent.prototype.removeChild = function (child) {
-        if (this.childrenByUid[child.uid]) {
-            delete this.childrenByUid[child.uid];
-            return true;
-        }
-        return false;
-    };
-    // TODO: only do if isInDom?
-    // TODO: make part of Component, along with children/batch-render system?
-    DateComponent.prototype.updateSize = function (totalHeight, isAuto, isResize) {
-        this.callChildren('updateSize', arguments);
-    };
-    // Options
-    // -----------------------------------------------------------------------------------------------------------------
-    DateComponent.prototype.opt = function (name) {
-        return this._getView().opt(name); // default implementation
+    // Retrieves all rendered segment objects currently rendered on the grid
+    DayGrid.prototype.getOwnEventSegs = function () {
+        // append the segments from the "more..." popover
+        return _super.prototype.getOwnEventSegs.call(this).concat(this.popoverSegs || []);
     };
-    DateComponent.prototype.publiclyTrigger = function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
+    /* Event Drag Visualization
+    ------------------------------------------------------------------------------------------------------------------*/
+    // Renders a visual indication of an event or external element being dragged.
+    // `eventLocation` has zoned start and end (optional)
+    DayGrid.prototype.renderDrag = function (eventFootprints, seg, isTouch) {
+        var i;
+        for (i = 0; i < eventFootprints.length; i++) {
+            this.renderHighlight(eventFootprints[i].componentFootprint);
         }
-        var calendar = this._getCalendar();
-        return calendar.publiclyTrigger.apply(calendar, args);
-    };
-    DateComponent.prototype.hasPublicHandlers = function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
+        // render drags from OTHER components as helpers
+        if (eventFootprints.length && seg && seg.component !== this) {
+            this.helperRenderer.renderEventDraggingFootprints(eventFootprints, seg, isTouch);
+            return true; // signal helpers rendered
         }
-        var calendar = this._getCalendar();
-        return calendar.hasPublicHandlers.apply(calendar, args);
-    };
-    // Date
-    // -----------------------------------------------------------------------------------------------------------------
-    DateComponent.prototype.executeDateRender = function (dateProfile) {
-        this.dateProfile = dateProfile; // for rendering
-        this.renderDates(dateProfile);
-        this.isDatesRendered = true;
-        this.callChildren('executeDateRender', arguments);
-    };
-    DateComponent.prototype.executeDateUnrender = function () {
-        this.callChildren('executeDateUnrender', arguments);
-        this.dateProfile = null;
-        this.unrenderDates();
-        this.isDatesRendered = false;
-    };
-    // date-cell content only
-    DateComponent.prototype.renderDates = function (dateProfile) {
-        // subclasses should implement
-    };
-    // date-cell content only
-    DateComponent.prototype.unrenderDates = function () {
-        // subclasses should override
-    };
-    // Now-Indicator
-    // -----------------------------------------------------------------------------------------------------------------
-    // Returns a string unit, like 'second' or 'minute' that defined how often the current time indicator
-    // should be refreshed. If something falsy is returned, no time indicator is rendered at all.
-    DateComponent.prototype.getNowIndicatorUnit = function () {
-        // subclasses should implement
-    };
-    // Renders a current time indicator at the given datetime
-    DateComponent.prototype.renderNowIndicator = function (date) {
-        this.callChildren('renderNowIndicator', arguments);
     };
-    // Undoes the rendering actions from renderNowIndicator
-    DateComponent.prototype.unrenderNowIndicator = function () {
-        this.callChildren('unrenderNowIndicator', arguments);
+    // Unrenders any visual indication of a hovering event
+    DayGrid.prototype.unrenderDrag = function () {
+        this.unrenderHighlight();
+        this.helperRenderer.unrender();
     };
-    // Business Hours
-    // ---------------------------------------------------------------------------------------------------------------
-    DateComponent.prototype.renderBusinessHours = function (businessHourGenerator) {
-        if (this.businessHourRenderer) {
-            this.businessHourRenderer.render(businessHourGenerator);
+    /* Event Resize Visualization
+    ------------------------------------------------------------------------------------------------------------------*/
+    // Renders a visual indication of an event being resized
+    DayGrid.prototype.renderEventResize = function (eventFootprints, seg, isTouch) {
+        var i;
+        for (i = 0; i < eventFootprints.length; i++) {
+            this.renderHighlight(eventFootprints[i].componentFootprint);
         }
-        this.callChildren('renderBusinessHours', arguments);
+        this.helperRenderer.renderEventResizingFootprints(eventFootprints, seg, isTouch);
     };
-    // Unrenders previously-rendered business-hours
-    DateComponent.prototype.unrenderBusinessHours = function () {
-        this.callChildren('unrenderBusinessHours', arguments);
-        if (this.businessHourRenderer) {
-            this.businessHourRenderer.unrender();
-        }
+    // Unrenders a visual indication of an event being resized
+    DayGrid.prototype.unrenderEventResize = function () {
+        this.unrenderHighlight();
+        this.helperRenderer.unrender();
     };
-    // Event Displaying
-    // -----------------------------------------------------------------------------------------------------------------
-    DateComponent.prototype.executeEventRender = function (eventsPayload) {
-        if (this.eventRenderer) {
-            this.eventRenderer.rangeUpdated(); // poorly named now
-            this.eventRenderer.render(eventsPayload);
+    /* More+ Link Popover
+    ------------------------------------------------------------------------------------------------------------------*/
+    DayGrid.prototype.removeSegPopover = function () {
+        if (this.segPopover) {
+            this.segPopover.hide(); // in handler, will call segPopover's removeElement
         }
-        else if (this['renderEvents']) {
-            this['renderEvents'](convertEventsPayloadToLegacyArray(eventsPayload));
+    };
+    // Limits the number of "levels" (vertically stacking layers of events) for each row of the grid.
+    // `levelLimit` can be false (don't limit), a number, or true (should be computed).
+    DayGrid.prototype.limitRows = function (levelLimit) {
+        var rowStructs = this.eventRenderer.rowStructs || [];
+        var row; // row #
+        var rowLevelLimit;
+        for (row = 0; row < rowStructs.length; row++) {
+            this.unlimitRow(row);
+            if (!levelLimit) {
+                rowLevelLimit = false;
+            }
+            else if (typeof levelLimit === 'number') {
+                rowLevelLimit = levelLimit;
+            }
+            else {
+                rowLevelLimit = this.computeRowLevelLimit(row);
+            }
+            if (rowLevelLimit !== false) {
+                this.limitRow(row, rowLevelLimit);
+            }
         }
-        this.callChildren('executeEventRender', arguments);
     };
-    DateComponent.prototype.executeEventUnrender = function () {
-        this.callChildren('executeEventUnrender', arguments);
-        if (this.eventRenderer) {
-            this.eventRenderer.unrender();
+    // Computes the number of levels a row will accomodate without going outside its bounds.
+    // Assumes the row is "rigid" (maintains a constant height regardless of what is inside).
+    // `row` is the row number.
+    DayGrid.prototype.computeRowLevelLimit = function (row) {
+        var rowEl = this.rowEls.eq(row); // the containing "fake" row div
+        var rowHeight = rowEl.height(); // TODO: cache somehow?
+        var trEls = this.eventRenderer.rowStructs[row].tbodyEl.children();
+        var i;
+        var trEl;
+        var trHeight;
+        function iterInnerHeights(i, childNode) {
+            trHeight = Math.max(trHeight, $(childNode).outerHeight());
         }
-        else if (this['destroyEvents']) {
-            this['destroyEvents']();
+        // Reveal one level <tr> at a time and stop when we find one out of bounds
+        for (i = 0; i < trEls.length; i++) {
+            trEl = trEls.eq(i).removeClass('fc-limited'); // reset to original state (reveal)
+            // with rowspans>1 and IE8, trEl.outerHeight() would return the height of the largest cell,
+            // so instead, find the tallest inner content element.
+            trHeight = 0;
+            trEl.find('> td > :first-child').each(iterInnerHeights);
+            if (trEl.position().top + trHeight > rowHeight) {
+                return i;
+            }
         }
+        return false; // should not limit at all
     };
-    DateComponent.prototype.getBusinessHourSegs = function () {
-        var segs = this.getOwnBusinessHourSegs();
-        this.iterChildren(function (child) {
-            segs.push.apply(segs, child.getBusinessHourSegs());
-        });
-        return segs;
-    };
-    DateComponent.prototype.getOwnBusinessHourSegs = function () {
-        if (this.businessHourRenderer) {
-            return this.businessHourRenderer.getSegs();
+    // Limits the given grid row to the maximum number of levels and injects "more" links if necessary.
+    // `row` is the row number.
+    // `levelLimit` is a number for the maximum (inclusive) number of levels allowed.
+    DayGrid.prototype.limitRow = function (row, levelLimit) {
+        var _this = this;
+        var rowStruct = this.eventRenderer.rowStructs[row];
+        var moreNodes = []; // array of "more" <a> links and <td> DOM nodes
+        var col = 0; // col #, left-to-right (not chronologically)
+        var levelSegs; // array of segment objects in the last allowable level, ordered left-to-right
+        var cellMatrix; // a matrix (by level, then column) of all <td> jQuery elements in the row
+        var limitedNodes; // array of temporarily hidden level <tr> and segment <td> DOM nodes
+        var i;
+        var seg;
+        var segsBelow; // array of segment objects below `seg` in the current `col`
+        var totalSegsBelow; // total number of segments below `seg` in any of the columns `seg` occupies
+        var colSegsBelow; // array of segment arrays, below seg, one for each column (offset from segs's first column)
+        var td;
+        var rowspan;
+        var segMoreNodes; // array of "more" <td> cells that will stand-in for the current seg's cell
+        var j;
+        var moreTd;
+        var moreWrap;
+        var moreLink;
+        // Iterates through empty level cells and places "more" links inside if need be
+        var emptyCellsUntil = function (endCol) {
+            while (col < endCol) {
+                segsBelow = _this.getCellSegs(row, col, levelLimit);
+                if (segsBelow.length) {
+                    td = cellMatrix[levelLimit - 1][col];
+                    moreLink = _this.renderMoreLink(row, col, segsBelow);
+                    moreWrap = $('<div>').append(moreLink);
+                    td.append(moreWrap);
+                    moreNodes.push(moreWrap[0]);
+                }
+                col++;
+            }
+        };
+        if (levelLimit && levelLimit < rowStruct.segLevels.length) { // is it actually over the limit?
+            levelSegs = rowStruct.segLevels[levelLimit - 1];
+            cellMatrix = rowStruct.cellMatrix;
+            limitedNodes = rowStruct.tbodyEl.children().slice(levelLimit) // get level <tr> elements past the limit
+                .addClass('fc-limited').get(); // hide elements and get a simple DOM-nodes array
+            // iterate though segments in the last allowable level
+            for (i = 0; i < levelSegs.length; i++) {
+                seg = levelSegs[i];
+                emptyCellsUntil(seg.leftCol); // process empty cells before the segment
+                // determine *all* segments below `seg` that occupy the same columns
+                colSegsBelow = [];
+                totalSegsBelow = 0;
+                while (col <= seg.rightCol) {
+                    segsBelow = this.getCellSegs(row, col, levelLimit);
+                    colSegsBelow.push(segsBelow);
+                    totalSegsBelow += segsBelow.length;
+                    col++;
+                }
+                if (totalSegsBelow) { // do we need to replace this segment with one or many "more" links?
+                    td = cellMatrix[levelLimit - 1][seg.leftCol]; // the segment's parent cell
+                    rowspan = td.attr('rowspan') || 1;
+                    segMoreNodes = [];
+                    // make a replacement <td> for each column the segment occupies. will be one for each colspan
+                    for (j = 0; j < colSegsBelow.length; j++) {
+                        moreTd = $('<td class="fc-more-cell">').attr('rowspan', rowspan);
+                        segsBelow = colSegsBelow[j];
+                        moreLink = this.renderMoreLink(row, seg.leftCol + j, [seg].concat(segsBelow) // count seg as hidden too
+                        );
+                        moreWrap = $('<div>').append(moreLink);
+                        moreTd.append(moreWrap);
+                        segMoreNodes.push(moreTd[0]);
+                        moreNodes.push(moreTd[0]);
+                    }
+                    td.addClass('fc-limited').after($(segMoreNodes)); // hide original <td> and inject replacements
+                    limitedNodes.push(td[0]);
+                }
+            }
+            emptyCellsUntil(this.colCnt); // finish off the level
+            rowStruct.moreEls = $(moreNodes); // for easy undoing later
+            rowStruct.limitedEls = $(limitedNodes); // for easy undoing later
         }
-        return [];
-    };
-    DateComponent.prototype.getEventSegs = function () {
-        var segs = this.getOwnEventSegs();
-        this.iterChildren(function (child) {
-            segs.push.apply(segs, child.getEventSegs());
-        });
-        return segs;
     };
-    DateComponent.prototype.getOwnEventSegs = function () {
-        if (this.eventRenderer) {
-            return this.eventRenderer.getSegs();
+    // Reveals all levels and removes all "more"-related elements for a grid's row.
+    // `row` is a row number.
+    DayGrid.prototype.unlimitRow = function (row) {
+        var rowStruct = this.eventRenderer.rowStructs[row];
+        if (rowStruct.moreEls) {
+            rowStruct.moreEls.remove();
+            rowStruct.moreEls = null;
         }
-        return [];
-    };
-    // Event Rendering Triggering
-    // -----------------------------------------------------------------------------------------------------------------
-    DateComponent.prototype.triggerAfterEventsRendered = function () {
-        this.triggerAfterEventSegsRendered(this.getEventSegs());
-        this.publiclyTrigger('eventAfterAllRender', {
-            context: this,
-            args: [this]
-        });
-    };
-    DateComponent.prototype.triggerAfterEventSegsRendered = function (segs) {
-        var _this = this;
-        // an optimization, because getEventLegacy is expensive
-        if (this.hasPublicHandlers('eventAfterRender')) {
-            segs.forEach(function (seg) {
-                var legacy;
-                if (seg.el) {
-                    legacy = seg.footprint.getEventLegacy();
-                    _this.publiclyTrigger('eventAfterRender', {
-                        context: legacy,
-                        args: [legacy, seg.el, _this]
-                    });
-                }
-            });
+        if (rowStruct.limitedEls) {
+            rowStruct.limitedEls.removeClass('fc-limited');
+            rowStruct.limitedEls = null;
         }
     };
-    DateComponent.prototype.triggerBeforeEventsDestroyed = function () {
-        this.triggerBeforeEventSegsDestroyed(this.getEventSegs());
-    };
-    DateComponent.prototype.triggerBeforeEventSegsDestroyed = function (segs) {
+    // Renders an <a> element that represents hidden event element for a cell.
+    // Responsible for attaching click handler as well.
+    DayGrid.prototype.renderMoreLink = function (row, col, hiddenSegs) {
         var _this = this;
-        if (this.hasPublicHandlers('eventDestroy')) {
-            segs.forEach(function (seg) {
-                var legacy;
-                if (seg.el) {
-                    legacy = seg.footprint.getEventLegacy();
-                    _this.publiclyTrigger('eventDestroy', {
-                        context: legacy,
-                        args: [legacy, seg.el, _this]
-                    });
-                }
-            });
-        }
-    };
-    // Event Rendering Utils
-    // -----------------------------------------------------------------------------------------------------------------
-    // Hides all rendered event segments linked to the given event
-    // RECURSIVE with subcomponents
-    DateComponent.prototype.showEventsWithId = function (eventDefId) {
-        this.getEventSegs().forEach(function (seg) {
-            if (seg.footprint.eventDef.id === eventDefId &&
-                seg.el // necessary?
-            ) {
-                seg.el.css('visibility', '');
+        var view = this.view;
+        return $('<a class="fc-more">')
+            .text(this.getMoreLinkText(hiddenSegs.length))
+            .on('click', function (ev) {
+            var clickOption = _this.opt('eventLimitClick');
+            var date = _this.getCellDate(row, col);
+            var moreEl = $(ev.currentTarget);
+            var dayEl = _this.getCellEl(row, col);
+            var allSegs = _this.getCellSegs(row, col);
+            // rescope the segments to be within the cell's date
+            var reslicedAllSegs = _this.resliceDaySegs(allSegs, date);
+            var reslicedHiddenSegs = _this.resliceDaySegs(hiddenSegs, date);
+            if (typeof clickOption === 'function') {
+                // the returned value can be an atomic option
+                clickOption = _this.publiclyTrigger('eventLimitClick', {
+                    context: view,
+                    args: [
+                        {
+                            date: date.clone(),
+                            dayEl: dayEl,
+                            moreEl: moreEl,
+                            segs: reslicedAllSegs,
+                            hiddenSegs: reslicedHiddenSegs
+                        },
+                        ev,
+                        view
+                    ]
+                });
             }
-        });
-        this.callChildren('showEventsWithId', arguments);
-    };
-    // Shows all rendered event segments linked to the given event
-    // RECURSIVE with subcomponents
-    DateComponent.prototype.hideEventsWithId = function (eventDefId) {
-        this.getEventSegs().forEach(function (seg) {
-            if (seg.footprint.eventDef.id === eventDefId &&
-                seg.el // necessary?
-            ) {
-                seg.el.css('visibility', 'hidden');
+            if (clickOption === 'popover') {
+                _this.showSegPopover(row, col, moreEl, reslicedAllSegs);
             }
-        });
-        this.callChildren('hideEventsWithId', arguments);
-    };
-    // Drag-n-Drop Rendering (for both events and external elements)
-    // ---------------------------------------------------------------------------------------------------------------
-    // Renders a visual indication of a event or external-element drag over the given drop zone.
-    // If an external-element, seg will be `null`.
-    // Must return elements used for any mock events.
-    DateComponent.prototype.renderDrag = function (eventFootprints, seg, isTouch) {
-        var renderedHelper = false;
-        this.iterChildren(function (child) {
-            if (child.renderDrag(eventFootprints, seg, isTouch)) {
-                renderedHelper = true;
+            else if (typeof clickOption === 'string') { // a view name
+                view.calendar.zoomTo(date, clickOption);
             }
         });
-        return renderedHelper;
-    };
-    // Unrenders a visual indication of an event or external-element being dragged.
-    DateComponent.prototype.unrenderDrag = function () {
-        this.callChildren('unrenderDrag', arguments);
-    };
-    // Event Resizing
-    // ---------------------------------------------------------------------------------------------------------------
-    // Renders a visual indication of an event being resized.
-    DateComponent.prototype.renderEventResize = function (eventFootprints, seg, isTouch) {
-        this.callChildren('renderEventResize', arguments);
-    };
-    // Unrenders a visual indication of an event being resized.
-    DateComponent.prototype.unrenderEventResize = function () {
-        this.callChildren('unrenderEventResize', arguments);
-    };
-    // Selection
-    // ---------------------------------------------------------------------------------------------------------------
-    // Renders a visual indication of the selection
-    // TODO: rename to `renderSelection` after legacy is gone
-    DateComponent.prototype.renderSelectionFootprint = function (componentFootprint) {
-        this.renderHighlight(componentFootprint);
-        this.callChildren('renderSelectionFootprint', arguments);
-    };
-    // Unrenders a visual indication of selection
-    DateComponent.prototype.unrenderSelection = function () {
-        this.unrenderHighlight();
-        this.callChildren('unrenderSelection', arguments);
     };
-    // Highlight
-    // ---------------------------------------------------------------------------------------------------------------
-    // Renders an emphasis on the given date range. Given a span (unzoned start/end and other misc data)
-    DateComponent.prototype.renderHighlight = function (componentFootprint) {
-        if (this.fillRenderer) {
-            this.fillRenderer.renderFootprint('highlight', componentFootprint, {
-                getClasses: function () {
-                    return ['fc-highlight'];
-                }
-            });
+    // Reveals the popover that displays all events within a cell
+    DayGrid.prototype.showSegPopover = function (row, col, moreLink, segs) {
+        var _this = this;
+        var view = this.view;
+        var moreWrap = moreLink.parent(); // the <div> wrapper around the <a>
+        var topEl; // the element we want to match the top coordinate of
+        var options;
+        if (this.rowCnt === 1) {
+            topEl = view.el; // will cause the popover to cover any sort of header
         }
-        this.callChildren('renderHighlight', arguments);
-    };
-    // Unrenders the emphasis on a date range
-    DateComponent.prototype.unrenderHighlight = function () {
-        if (this.fillRenderer) {
-            this.fillRenderer.unrender('highlight');
+        else {
+            topEl = this.rowEls.eq(row); // will align with top of row
         }
-        this.callChildren('unrenderHighlight', arguments);
-    };
-    // Hit Areas
-    // ---------------------------------------------------------------------------------------------------------------
-    // just because all DateComponents support this interface
-    // doesn't mean they need to have their own internal coord system. they can defer to sub-components.
-    DateComponent.prototype.hitsNeeded = function () {
-        if (!(this.hitsNeededDepth++)) {
-            this.prepareHits();
+        options = {
+            className: 'fc-more-popover ' + view.calendar.theme.getClass('popover'),
+            content: this.renderSegPopoverContent(row, col, segs),
+            parentEl: view.el,
+            top: topEl.offset().top,
+            autoHide: true,
+            viewportConstrain: this.opt('popoverViewportConstrain'),
+            hide: function () {
+                // kill everything when the popover is hidden
+                // notify events to be removed
+                if (_this.popoverSegs) {
+                    _this.triggerBeforeEventSegsDestroyed(_this.popoverSegs);
+                }
+                _this.segPopover.removeElement();
+                _this.segPopover = null;
+                _this.popoverSegs = null;
+            }
+        };
+        // Determine horizontal coordinate.
+        // We use the moreWrap instead of the <td> to avoid border confusion.
+        if (this.isRTL) {
+            options.right = moreWrap.offset().left + moreWrap.outerWidth() + 1; // +1 to be over cell border
         }
-        this.callChildren('hitsNeeded', arguments);
+        else {
+            options.left = moreWrap.offset().left - 1; // -1 to be over cell border
+        }
+        this.segPopover = new Popover_1.default(options);
+        this.segPopover.show();
+        // the popover doesn't live within the grid's container element, and thus won't get the event
+        // delegated-handlers for free. attach event-related handlers to the popover.
+        this.bindAllSegHandlersToEl(this.segPopover.el);
+        this.triggerAfterEventSegsRendered(segs);
     };
-    DateComponent.prototype.hitsNotNeeded = function () {
-        if (this.hitsNeededDepth && !(--this.hitsNeededDepth)) {
-            this.releaseHits();
+    // Builds the inner DOM contents of the segment popover
+    DayGrid.prototype.renderSegPopoverContent = function (row, col, segs) {
+        var view = this.view;
+        var theme = view.calendar.theme;
+        var title = this.getCellDate(row, col).format(this.opt('dayPopoverFormat'));
+        var content = $('<div class="fc-header ' + theme.getClass('popoverHeader') + '">' +
+            '<span class="fc-close ' + theme.getIconClass('close') + '"></span>' +
+            '<span class="fc-title">' +
+            util_1.htmlEscape(title) +
+            '</span>' +
+            '<div class="fc-clear"></div>' +
+            '</div>' +
+            '<div class="fc-body ' + theme.getClass('popoverContent') + '">' +
+            '<div class="fc-event-container"></div>' +
+            '</div>');
+        var segContainer = content.find('.fc-event-container');
+        var i;
+        // render each seg's `el` and only return the visible segs
+        segs = this.eventRenderer.renderFgSegEls(segs, true); // disableResizing=true
+        this.popoverSegs = segs;
+        for (i = 0; i < segs.length; i++) {
+            // because segments in the popover are not part of a grid coordinate system, provide a hint to any
+            // grids that want to do drag-n-drop about which cell it came from
+            this.hitsNeeded();
+            segs[i].hit = this.getCellHit(row, col);
+            this.hitsNotNeeded();
+            segContainer.append(segs[i].el);
         }
-        this.callChildren('hitsNotNeeded', arguments);
-    };
-    DateComponent.prototype.prepareHits = function () {
-        // subclasses can implement
-    };
-    DateComponent.prototype.releaseHits = function () {
-        // subclasses can implement
+        return content;
     };
-    // Given coordinates from the topleft of the document, return data about the date-related area underneath.
-    // Can return an object with arbitrary properties (although top/right/left/bottom are encouraged).
-    // Must have a `grid` property, a reference to this current grid. TODO: avoid this
-    // The returned object will be processed by getHitFootprint and getHitEl.
-    DateComponent.prototype.queryHit = function (leftOffset, topOffset) {
-        var childrenByUid = this.childrenByUid;
-        var uid;
-        var hit;
-        for (uid in childrenByUid) {
-            hit = childrenByUid[uid].queryHit(leftOffset, topOffset);
-            if (hit) {
-                break;
+    // Given the events within an array of segment objects, reslice them to be in a single day
+    DayGrid.prototype.resliceDaySegs = function (segs, dayDate) {
+        var dayStart = dayDate.clone();
+        var dayEnd = dayStart.clone().add(1, 'days');
+        var dayRange = new UnzonedRange_1.default(dayStart, dayEnd);
+        var newSegs = [];
+        var i;
+        var seg;
+        var slicedRange;
+        for (i = 0; i < segs.length; i++) {
+            seg = segs[i];
+            slicedRange = seg.footprint.componentFootprint.unzonedRange.intersect(dayRange);
+            if (slicedRange) {
+                newSegs.push($.extend({}, seg, {
+                    footprint: new EventFootprint_1.default(new ComponentFootprint_1.default(slicedRange, seg.footprint.componentFootprint.isAllDay), seg.footprint.eventDef, seg.footprint.eventInstance),
+                    isStart: seg.isStart && slicedRange.isStart,
+                    isEnd: seg.isEnd && slicedRange.isEnd
+                }));
             }
         }
-        return hit;
+        // force an order because eventsToSegs doesn't guarantee one
+        // TODO: research if still needed
+        this.eventRenderer.sortEventSegs(newSegs);
+        return newSegs;
     };
-    DateComponent.prototype.getSafeHitFootprint = function (hit) {
-        var footprint = this.getHitFootprint(hit);
-        if (!this.dateProfile.activeUnzonedRange.containsRange(footprint.unzonedRange)) {
-            return null;
+    // Generates the text that should be inside a "more" link, given the number of events it represents
+    DayGrid.prototype.getMoreLinkText = function (num) {
+        var opt = this.opt('eventLimitText');
+        if (typeof opt === 'function') {
+            return opt(num);
         }
-        return footprint;
-    };
-    DateComponent.prototype.getHitFootprint = function (hit) {
-        // what about being abstract!?
-    };
-    // Given position-level information about a date-related area within the grid,
-    // should return a jQuery element that best represents it. passed to dayClick callback.
-    DateComponent.prototype.getHitEl = function (hit) {
-        // what about being abstract!?
-    };
-    /* Converting eventRange -> eventFootprint
-    ------------------------------------------------------------------------------------------------------------------*/
-    DateComponent.prototype.eventRangesToEventFootprints = function (eventRanges) {
-        var eventFootprints = [];
-        var i;
-        for (i = 0; i < eventRanges.length; i++) {
-            eventFootprints.push.apply(// append
-            eventFootprints, this.eventRangeToEventFootprints(eventRanges[i]));
+        else {
+            return '+' + num + ' ' + opt;
         }
-        return eventFootprints;
     };
-    DateComponent.prototype.eventRangeToEventFootprints = function (eventRange) {
-        return [util_2.eventRangeToEventFootprint(eventRange)];
-    };
-    /* Converting componentFootprint/eventFootprint -> segs
-    ------------------------------------------------------------------------------------------------------------------*/
-    DateComponent.prototype.eventFootprintsToSegs = function (eventFootprints) {
+    // Returns segments within a given cell.
+    // If `startLevel` is specified, returns only events including and below that level. Otherwise returns all segs.
+    DayGrid.prototype.getCellSegs = function (row, col, startLevel) {
+        var segMatrix = this.eventRenderer.rowStructs[row].segMatrix;
+        var level = startLevel || 0;
         var segs = [];
-        var i;
-        for (i = 0; i < eventFootprints.length; i++) {
-            segs.push.apply(segs, this.eventFootprintToSegs(eventFootprints[i]));
+        var seg;
+        while (level < segMatrix.length) {
+            seg = segMatrix[level][col];
+            if (seg) {
+                segs.push(seg);
+            }
+            level++;
         }
         return segs;
     };
-    // Given an event's span (unzoned start/end and other misc data), and the event itself,
-    // slices into segments and attaches event-derived properties to them.
-    // eventSpan - { start, end, isStart, isEnd, otherthings... }
-    DateComponent.prototype.eventFootprintToSegs = function (eventFootprint) {
-        var unzonedRange = eventFootprint.componentFootprint.unzonedRange;
-        var segs;
-        var i;
-        var seg;
-        segs = this.componentFootprintToSegs(eventFootprint.componentFootprint);
-        for (i = 0; i < segs.length; i++) {
-            seg = segs[i];
-            if (!unzonedRange.isStart) {
-                seg.isStart = false;
+    return DayGrid;
+}(InteractiveDateComponent_1.default));
+exports.default = DayGrid;
+DayGrid.prototype.eventRendererClass = DayGridEventRenderer_1.default;
+DayGrid.prototype.businessHourRendererClass = BusinessHourRenderer_1.default;
+DayGrid.prototype.helperRendererClass = DayGridHelperRenderer_1.default;
+DayGrid.prototype.fillRendererClass = DayGridFillRenderer_1.default;
+StandardInteractionsMixin_1.default.mixInto(DayGrid);
+DayTableMixin_1.default.mixInto(DayGrid);
+
+
+/***/ }),
+/* 67 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var $ = __webpack_require__(3);
+var util_1 = __webpack_require__(4);
+var Scroller_1 = __webpack_require__(41);
+var View_1 = __webpack_require__(43);
+var BasicViewDateProfileGenerator_1 = __webpack_require__(68);
+var DayGrid_1 = __webpack_require__(66);
+/* An abstract class for the "basic" views, as well as month view. Renders one or more rows of day cells.
+----------------------------------------------------------------------------------------------------------------------*/
+// It is a manager for a DayGrid subcomponent, which does most of the heavy lifting.
+// It is responsible for managing width/height.
+var BasicView = /** @class */ (function (_super) {
+    tslib_1.__extends(BasicView, _super);
+    function BasicView(calendar, viewSpec) {
+        var _this = _super.call(this, calendar, viewSpec) || this;
+        _this.dayGrid = _this.instantiateDayGrid();
+        _this.dayGrid.isRigid = _this.hasRigidRows();
+        if (_this.opt('weekNumbers')) {
+            if (_this.opt('weekNumbersWithinDays')) {
+                _this.dayGrid.cellWeekNumbersVisible = true;
+                _this.dayGrid.colWeekNumbersVisible = false;
             }
-            if (!unzonedRange.isEnd) {
-                seg.isEnd = false;
+            else {
+                _this.dayGrid.cellWeekNumbersVisible = false;
+                _this.dayGrid.colWeekNumbersVisible = true;
             }
-            seg.footprint = eventFootprint;
-            // TODO: rename to seg.eventFootprint
         }
-        return segs;
+        _this.addChild(_this.dayGrid);
+        _this.scroller = new Scroller_1.default({
+            overflowX: 'hidden',
+            overflowY: 'auto'
+        });
+        return _this;
+    }
+    // Generates the DayGrid object this view needs. Draws from this.dayGridClass
+    BasicView.prototype.instantiateDayGrid = function () {
+        // generate a subclass on the fly with BasicView-specific behavior
+        // TODO: cache this subclass
+        var subclass = makeDayGridSubclass(this.dayGridClass);
+        return new subclass(this);
     };
-    DateComponent.prototype.componentFootprintToSegs = function (componentFootprint) {
-        return [];
+    BasicView.prototype.executeDateRender = function (dateProfile) {
+        this.dayGrid.breakOnWeeks = /year|month|week/.test(dateProfile.currentRangeUnit);
+        _super.prototype.executeDateRender.call(this, dateProfile);
     };
-    // Utils
-    // ---------------------------------------------------------------------------------------------------------------
-    DateComponent.prototype.callChildren = function (methodName, args) {
-        this.iterChildren(function (child) {
-            child[methodName].apply(child, args);
-        });
+    BasicView.prototype.renderSkeleton = function () {
+        var dayGridContainerEl;
+        var dayGridEl;
+        this.el.addClass('fc-basic-view').html(this.renderSkeletonHtml());
+        this.scroller.render();
+        dayGridContainerEl = this.scroller.el.addClass('fc-day-grid-container');
+        dayGridEl = $('<div class="fc-day-grid">').appendTo(dayGridContainerEl);
+        this.el.find('.fc-body > tr > td').append(dayGridContainerEl);
+        this.dayGrid.headContainerEl = this.el.find('.fc-head-container');
+        this.dayGrid.setElement(dayGridEl);
     };
-    DateComponent.prototype.iterChildren = function (func) {
-        var childrenByUid = this.childrenByUid;
-        var uid;
-        for (uid in childrenByUid) {
-            func(childrenByUid[uid]);
-        }
+    BasicView.prototype.unrenderSkeleton = function () {
+        this.dayGrid.removeElement();
+        this.scroller.destroy();
     };
-    DateComponent.prototype._getCalendar = function () {
-        var t = this;
-        return t.calendar || t.view.calendar;
+    // Builds the HTML skeleton for the view.
+    // The day-grid component will render inside of a container defined by this HTML.
+    BasicView.prototype.renderSkeletonHtml = function () {
+        var theme = this.calendar.theme;
+        return '' +
+            '<table class="' + theme.getClass('tableGrid') + '">' +
+            (this.opt('columnHeader') ?
+                '<thead class="fc-head">' +
+                    '<tr>' +
+                    '<td class="fc-head-container ' + theme.getClass('widgetHeader') + '">&nbsp;</td>' +
+                    '</tr>' +
+                    '</thead>' :
+                '') +
+            '<tbody class="fc-body">' +
+            '<tr>' +
+            '<td class="' + theme.getClass('widgetContent') + '"></td>' +
+            '</tr>' +
+            '</tbody>' +
+            '</table>';
     };
-    DateComponent.prototype._getView = function () {
-        return this.view;
+    // Generates an HTML attribute string for setting the width of the week number column, if it is known
+    BasicView.prototype.weekNumberStyleAttr = function () {
+        if (this.weekNumberWidth != null) {
+            return 'style="width:' + this.weekNumberWidth + 'px"';
+        }
+        return '';
     };
-    DateComponent.prototype._getDateProfile = function () {
-        return this._getView().get('dateProfile');
+    // Determines whether each row should have a constant height
+    BasicView.prototype.hasRigidRows = function () {
+        var eventLimit = this.opt('eventLimit');
+        return eventLimit && typeof eventLimit !== 'number';
     };
-    // Generates HTML for an anchor to another view into the calendar.
-    // Will either generate an <a> tag or a non-clickable <span> tag, depending on enabled settings.
-    // `gotoOptions` can either be a moment input, or an object with the form:
-    // { date, type, forceOff }
-    // `type` is a view-type like "day" or "week". default value is "day".
-    // `attrs` and `innerHtml` are use to generate the rest of the HTML tag.
-    DateComponent.prototype.buildGotoAnchorHtml = function (gotoOptions, attrs, innerHtml) {
-        var date;
-        var type;
-        var forceOff;
-        var finalOptions;
-        if ($.isPlainObject(gotoOptions)) {
-            date = gotoOptions.date;
-            type = gotoOptions.type;
-            forceOff = gotoOptions.forceOff;
+    /* Dimensions
+    ------------------------------------------------------------------------------------------------------------------*/
+    // Refreshes the horizontal dimensions of the view
+    BasicView.prototype.updateSize = function (totalHeight, isAuto, isResize) {
+        var eventLimit = this.opt('eventLimit');
+        var headRowEl = this.dayGrid.headContainerEl.find('.fc-row');
+        var scrollerHeight;
+        var scrollbarWidths;
+        // hack to give the view some height prior to dayGrid's columns being rendered
+        // TODO: separate setting height from scroller VS dayGrid.
+        if (!this.dayGrid.rowEls) {
+            if (!isAuto) {
+                scrollerHeight = this.computeScrollerHeight(totalHeight);
+                this.scroller.setHeight(scrollerHeight);
+            }
+            return;
         }
-        else {
-            date = gotoOptions; // a single moment input
+        _super.prototype.updateSize.call(this, totalHeight, isAuto, isResize);
+        if (this.dayGrid.colWeekNumbersVisible) {
+            // Make sure all week number cells running down the side have the same width.
+            // Record the width for cells created later.
+            this.weekNumberWidth = util_1.matchCellWidths(this.el.find('.fc-week-number'));
         }
-        date = moment_ext_1.default(date); // if a string, parse it
-        finalOptions = {
-            date: date.format('YYYY-MM-DD'),
-            type: type || 'day'
-        };
-        if (typeof attrs === 'string') {
-            innerHtml = attrs;
-            attrs = null;
+        // reset all heights to be natural
+        this.scroller.clear();
+        util_1.uncompensateScroll(headRowEl);
+        this.dayGrid.removeSegPopover(); // kill the "more" popover if displayed
+        // is the event limit a constant level number?
+        if (eventLimit && typeof eventLimit === 'number') {
+            this.dayGrid.limitRows(eventLimit); // limit the levels first so the height can redistribute after
         }
-        attrs = attrs ? ' ' + util_1.attrsToStr(attrs) : ''; // will have a leading space
-        innerHtml = innerHtml || '';
-        if (!forceOff && this.opt('navLinks')) {
-            return '<a' + attrs +
-                ' data-goto="' + util_1.htmlEscape(JSON.stringify(finalOptions)) + '">' +
-                innerHtml +
-                '</a>';
+        // distribute the height to the rows
+        // (totalHeight is a "recommended" value if isAuto)
+        scrollerHeight = this.computeScrollerHeight(totalHeight);
+        this.setGridHeight(scrollerHeight, isAuto);
+        // is the event limit dynamically calculated?
+        if (eventLimit && typeof eventLimit !== 'number') {
+            this.dayGrid.limitRows(eventLimit); // limit the levels after the grid's row heights have been set
         }
-        else {
-            return '<span' + attrs + '>' +
-                innerHtml +
-                '</span>';
+        if (!isAuto) { // should we force dimensions of the scroll container?
+            this.scroller.setHeight(scrollerHeight);
+            scrollbarWidths = this.scroller.getScrollbarWidths();
+            if (scrollbarWidths.left || scrollbarWidths.right) { // using scrollbars?
+                util_1.compensateScroll(headRowEl, scrollbarWidths);
+                // doing the scrollbar compensation might have created text overflow which created more height. redo
+                scrollerHeight = this.computeScrollerHeight(totalHeight);
+                this.scroller.setHeight(scrollerHeight);
+            }
+            // guarantees the same scrollbar widths
+            this.scroller.lockOverflow(scrollbarWidths);
         }
     };
-    DateComponent.prototype.getAllDayHtml = function () {
-        return this.opt('allDayHtml') || util_1.htmlEscape(this.opt('allDayText'));
+    // given a desired total height of the view, returns what the height of the scroller should be
+    BasicView.prototype.computeScrollerHeight = function (totalHeight) {
+        return totalHeight -
+            util_1.subtractInnerElHeight(this.el, this.scroller.el); // everything that's NOT the scroller
     };
-    // Computes HTML classNames for a single-day element
-    DateComponent.prototype.getDayClasses = function (date, noThemeHighlight) {
-        var view = this._getView();
-        var classes = [];
-        var today;
-        if (!this.dateProfile.activeUnzonedRange.containsDate(date)) {
-            classes.push('fc-disabled-day'); // TODO: jQuery UI theme?
+    // Sets the height of just the DayGrid component in this view
+    BasicView.prototype.setGridHeight = function (height, isAuto) {
+        if (isAuto) {
+            util_1.undistributeHeight(this.dayGrid.rowEls); // let the rows be their natural height with no expanding
         }
         else {
-            classes.push('fc-' + util_1.dayIDs[date.day()]);
-            if (view.isDateInOtherMonth(date, this.dateProfile)) {
-                classes.push('fc-other-month');
-            }
-            today = view.calendar.getNow();
-            if (date.isSame(today, 'day')) {
-                classes.push('fc-today');
-                if (noThemeHighlight !== true) {
-                    classes.push(view.calendar.theme.getClass('today'));
-                }
-            }
-            else if (date < today) {
-                classes.push('fc-past');
-            }
-            else {
-                classes.push('fc-future');
-            }
+            util_1.distributeHeight(this.dayGrid.rowEls, height, true); // true = compensate for height-hogging rows
         }
-        return classes;
     };
-    // Utility for formatting a range. Accepts a range object, formatting string, and optional separator.
-    // Displays all-day ranges naturally, with an inclusive end. Takes the current isRTL into account.
-    // The timezones of the dates within `range` will be respected.
-    DateComponent.prototype.formatRange = function (range, isAllDay, formatStr, separator) {
-        var end = range.end;
-        if (isAllDay) {
-            end = end.clone().subtract(1); // convert to inclusive. last ms of previous day
-        }
-        return date_formatting_1.formatRange(range.start, end, formatStr, separator, this.isRTL);
+    /* Scroll
+    ------------------------------------------------------------------------------------------------------------------*/
+    BasicView.prototype.computeInitialDateScroll = function () {
+        return { top: 0 };
     };
-    // Compute the number of the give units in the "current" range.
-    // Will return a floating-point number. Won't round.
-    DateComponent.prototype.currentRangeAs = function (unit) {
-        return this._getDateProfile().currentUnzonedRange.as(unit);
+    BasicView.prototype.queryDateScroll = function () {
+        return { top: this.scroller.getScrollTop() };
     };
-    // Returns the date range of the full days the given range visually appears to occupy.
-    // Returns a plain object with start/end, NOT an UnzonedRange!
-    DateComponent.prototype.computeDayRange = function (unzonedRange) {
-        var calendar = this._getCalendar();
-        var startDay = calendar.msToUtcMoment(unzonedRange.startMs, true); // the beginning of the day the range starts
-        var end = calendar.msToUtcMoment(unzonedRange.endMs);
-        var endTimeMS = +end.time(); // # of milliseconds into `endDay`
-        var endDay = end.clone().stripTime(); // the beginning of the day the range exclusively ends
-        // If the end time is actually inclusively part of the next day and is equal to or
-        // beyond the next day threshold, adjust the end to be the exclusive end of `endDay`.
-        // Otherwise, leaving it as inclusive will cause it to exclude `endDay`.
-        if (endTimeMS && endTimeMS >= this.nextDayThreshold) {
-            endDay.add(1, 'days');
-        }
-        // If end is within `startDay` but not past nextDayThreshold, assign the default duration of one day.
-        if (endDay <= startDay) {
-            endDay = startDay.clone().add(1, 'days');
+    BasicView.prototype.applyDateScroll = function (scroll) {
+        if (scroll.top !== undefined) {
+            this.scroller.setScrollTop(scroll.top);
         }
-        return { start: startDay, end: endDay };
-    };
-    // Does the given range visually appear to occupy more than one day?
-    DateComponent.prototype.isMultiDayRange = function (unzonedRange) {
-        var dayRange = this.computeDayRange(unzonedRange);
-        return dayRange.end.diff(dayRange.start, 'days') > 1;
     };
-    DateComponent.guid = 0; // TODO: better system for this?
-    return DateComponent;
-}(Component_1.default));
-exports.default = DateComponent;
-// legacy
-function convertEventsPayloadToLegacyArray(eventsPayload) {
-    var eventDefId;
-    var eventInstances;
-    var legacyEvents = [];
-    var i;
-    for (eventDefId in eventsPayload) {
-        eventInstances = eventsPayload[eventDefId].eventInstances;
-        for (i = 0; i < eventInstances.length; i++) {
-            legacyEvents.push(eventInstances[i].toLegacy());
+    return BasicView;
+}(View_1.default));
+exports.default = BasicView;
+BasicView.prototype.dateProfileGeneratorClass = BasicViewDateProfileGenerator_1.default;
+BasicView.prototype.dayGridClass = DayGrid_1.default;
+// customize the rendering behavior of BasicView's dayGrid
+function makeDayGridSubclass(SuperClass) {
+    return /** @class */ (function (_super) {
+        tslib_1.__extends(SubClass, _super);
+        function SubClass() {
+            var _this = _super !== null && _super.apply(this, arguments) || this;
+            _this.colWeekNumbersVisible = false; // display week numbers along the side?
+            return _this;
         }
-    }
-    return legacyEvents;
+        // Generates the HTML that will go before the day-of week header cells
+        SubClass.prototype.renderHeadIntroHtml = function () {
+            var view = this.view;
+            if (this.colWeekNumbersVisible) {
+                return '' +
+                    '<th class="fc-week-number ' + view.calendar.theme.getClass('widgetHeader') + '" ' + view.weekNumberStyleAttr() + '>' +
+                    '<span>' + // needed for matchCellWidths
+                    util_1.htmlEscape(this.opt('weekNumberTitle')) +
+                    '</span>' +
+                    '</th>';
+            }
+            return '';
+        };
+        // Generates the HTML that will go before content-skeleton cells that display the day/week numbers
+        SubClass.prototype.renderNumberIntroHtml = function (row) {
+            var view = this.view;
+            var weekStart = this.getCellDate(row, 0);
+            if (this.colWeekNumbersVisible) {
+                return '' +
+                    '<td class="fc-week-number" ' + view.weekNumberStyleAttr() + '>' +
+                    view.buildGotoAnchorHtml(// aside from link, important for matchCellWidths
+                    { date: weekStart, type: 'week', forceOff: this.colCnt === 1 }, weekStart.format('w') // inner HTML
+                    ) +
+                    '</td>';
+            }
+            return '';
+        };
+        // Generates the HTML that goes before the day bg cells for each day-row
+        SubClass.prototype.renderBgIntroHtml = function () {
+            var view = this.view;
+            if (this.colWeekNumbersVisible) {
+                return '<td class="fc-week-number ' + view.calendar.theme.getClass('widgetContent') + '" ' +
+                    view.weekNumberStyleAttr() + '></td>';
+            }
+            return '';
+        };
+        // Generates the HTML that goes before every other type of row generated by DayGrid.
+        // Affects helper-skeleton and highlight-skeleton rows.
+        SubClass.prototype.renderIntroHtml = function () {
+            var view = this.view;
+            if (this.colWeekNumbersVisible) {
+                return '<td class="fc-week-number" ' + view.weekNumberStyleAttr() + '></td>';
+            }
+            return '';
+        };
+        SubClass.prototype.getIsNumbersVisible = function () {
+            return DayGrid_1.default.prototype.getIsNumbersVisible.apply(this, arguments) || this.colWeekNumbersVisible;
+        };
+        return SubClass;
+    }(SuperClass));
 }
 
 
 /***/ }),
-/* 220 */
+/* 68 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var UnzonedRange_1 = __webpack_require__(5);
+var DateProfileGenerator_1 = __webpack_require__(55);
+var BasicViewDateProfileGenerator = /** @class */ (function (_super) {
+    tslib_1.__extends(BasicViewDateProfileGenerator, _super);
+    function BasicViewDateProfileGenerator() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    // Computes the date range that will be rendered.
+    BasicViewDateProfileGenerator.prototype.buildRenderRange = function (currentUnzonedRange, currentRangeUnit, isRangeAllDay) {
+        var renderUnzonedRange = _super.prototype.buildRenderRange.call(this, currentUnzonedRange, currentRangeUnit, isRangeAllDay); // an UnzonedRange
+        var start = this.msToUtcMoment(renderUnzonedRange.startMs, isRangeAllDay);
+        var end = this.msToUtcMoment(renderUnzonedRange.endMs, isRangeAllDay);
+        // year and month views should be aligned with weeks. this is already done for week
+        if (/^(year|month)$/.test(currentRangeUnit)) {
+            start.startOf('week');
+            // make end-of-week if not already
+            if (end.weekday()) {
+                end.add(1, 'week').startOf('week'); // exclusively move backwards
+            }
+        }
+        return new UnzonedRange_1.default(start, end);
+    };
+    return BasicViewDateProfileGenerator;
+}(DateProfileGenerator_1.default));
+exports.default = BasicViewDateProfileGenerator;
+
+
+/***/ }),
+/* 69 */,
+/* 70 */,
+/* 71 */,
+/* 72 */,
+/* 73 */,
+/* 74 */,
+/* 75 */,
+/* 76 */,
+/* 77 */,
+/* 78 */,
+/* 79 */,
+/* 80 */,
+/* 81 */,
+/* 82 */,
+/* 83 */,
+/* 84 */,
+/* 85 */,
+/* 86 */,
+/* 87 */,
+/* 88 */,
+/* 89 */,
+/* 90 */,
+/* 91 */,
+/* 92 */,
+/* 93 */,
+/* 94 */,
+/* 95 */,
+/* 96 */,
+/* 97 */,
+/* 98 */,
+/* 99 */,
+/* 100 */,
+/* 101 */,
+/* 102 */,
+/* 103 */,
+/* 104 */,
+/* 105 */,
+/* 106 */,
+/* 107 */,
+/* 108 */,
+/* 109 */,
+/* 110 */,
+/* 111 */,
+/* 112 */,
+/* 113 */,
+/* 114 */,
+/* 115 */,
+/* 116 */,
+/* 117 */,
+/* 118 */,
+/* 119 */,
+/* 120 */,
+/* 121 */,
+/* 122 */,
+/* 123 */,
+/* 124 */,
+/* 125 */,
+/* 126 */,
+/* 127 */,
+/* 128 */,
+/* 129 */,
+/* 130 */,
+/* 131 */,
+/* 132 */,
+/* 133 */,
+/* 134 */,
+/* 135 */,
+/* 136 */,
+/* 137 */,
+/* 138 */,
+/* 139 */,
+/* 140 */,
+/* 141 */,
+/* 142 */,
+/* 143 */,
+/* 144 */,
+/* 145 */,
+/* 146 */,
+/* 147 */,
+/* 148 */,
+/* 149 */,
+/* 150 */,
+/* 151 */,
+/* 152 */,
+/* 153 */,
+/* 154 */,
+/* 155 */,
+/* 156 */,
+/* 157 */,
+/* 158 */,
+/* 159 */,
+/* 160 */,
+/* 161 */,
+/* 162 */,
+/* 163 */,
+/* 164 */,
+/* 165 */,
+/* 166 */,
+/* 167 */,
+/* 168 */,
+/* 169 */,
+/* 170 */,
+/* 171 */,
+/* 172 */,
+/* 173 */,
+/* 174 */,
+/* 175 */,
+/* 176 */,
+/* 177 */,
+/* 178 */,
+/* 179 */,
+/* 180 */,
+/* 181 */,
+/* 182 */,
+/* 183 */,
+/* 184 */,
+/* 185 */,
+/* 186 */,
+/* 187 */,
+/* 188 */,
+/* 189 */,
+/* 190 */,
+/* 191 */,
+/* 192 */,
+/* 193 */,
+/* 194 */,
+/* 195 */,
+/* 196 */,
+/* 197 */,
+/* 198 */,
+/* 199 */,
+/* 200 */,
+/* 201 */,
+/* 202 */,
+/* 203 */,
+/* 204 */,
+/* 205 */,
+/* 206 */,
+/* 207 */,
+/* 208 */,
+/* 209 */,
+/* 210 */,
+/* 211 */,
+/* 212 */,
+/* 213 */,
+/* 214 */,
+/* 215 */,
+/* 216 */,
+/* 217 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var $ = __webpack_require__(3);
-var moment = __webpack_require__(0);
-var util_1 = __webpack_require__(4);
-var options_1 = __webpack_require__(32);
-var Iterator_1 = __webpack_require__(238);
-var GlobalEmitter_1 = __webpack_require__(21);
-var EmitterMixin_1 = __webpack_require__(11);
-var ListenerMixin_1 = __webpack_require__(7);
-var Toolbar_1 = __webpack_require__(239);
-var OptionsManager_1 = __webpack_require__(240);
-var ViewSpecManager_1 = __webpack_require__(241);
-var Constraints_1 = __webpack_require__(207);
-var locale_1 = __webpack_require__(31);
-var moment_ext_1 = __webpack_require__(10);
 var UnzonedRange_1 = __webpack_require__(5);
 var ComponentFootprint_1 = __webpack_require__(12);
-var EventDateProfile_1 = __webpack_require__(17);
-var EventManager_1 = __webpack_require__(242);
-var BusinessHourGenerator_1 = __webpack_require__(212);
-var EventSourceParser_1 = __webpack_require__(38);
-var EventDefParser_1 = __webpack_require__(49);
-var SingleEventDef_1 = __webpack_require__(13);
-var EventDefMutation_1 = __webpack_require__(37);
+var EventDefParser_1 = __webpack_require__(36);
 var EventSource_1 = __webpack_require__(6);
-var ThemeRegistry_1 = __webpack_require__(51);
-var Calendar = /** @class */ (function () {
-    function Calendar(el, overrides) {
-        this.loadingLevel = 0; // number of simultaneous loading tasks
-        this.ignoreUpdateViewSize = 0;
-        this.freezeContentHeightDepth = 0;
-        // declare the current calendar instance relies on GlobalEmitter. needed for garbage collection.
-        // unneeded() is called in destroy.
-        GlobalEmitter_1.default.needed();
-        this.el = el;
-        this.viewsByType = {};
-        this.optionsManager = new OptionsManager_1.default(this, overrides);
-        this.viewSpecManager = new ViewSpecManager_1.default(this.optionsManager, this);
-        this.initMomentInternals(); // needs to happen after options hash initialized
-        this.initCurrentDate();
-        this.initEventManager();
-        this.constraints = new Constraints_1.default(this.eventManager, this);
-        this.constructed();
+var util_1 = __webpack_require__(19);
+var Constraints = /** @class */ (function () {
+    function Constraints(eventManager, _calendar) {
+        this.eventManager = eventManager;
+        this._calendar = _calendar;
     }
-    Calendar.prototype.constructed = function () {
-        // useful for monkeypatching. used?
-    };
-    Calendar.prototype.getView = function () {
-        return this.view;
+    Constraints.prototype.opt = function (name) {
+        return this._calendar.opt(name);
     };
-    Calendar.prototype.publiclyTrigger = function (name, triggerInfo) {
-        var optHandler = this.opt(name);
-        var context;
-        var args;
-        if ($.isPlainObject(triggerInfo)) {
-            context = triggerInfo.context;
-            args = triggerInfo.args;
-        }
-        else if ($.isArray(triggerInfo)) {
-            args = triggerInfo;
-        }
-        if (context == null) {
-            context = this.el[0]; // fallback context
-        }
-        if (!args) {
-            args = [];
+    /*
+    determines if eventInstanceGroup is allowed,
+    in relation to other EVENTS and business hours.
+    */
+    Constraints.prototype.isEventInstanceGroupAllowed = function (eventInstanceGroup) {
+        var eventDef = eventInstanceGroup.getEventDef();
+        var eventFootprints = this.eventRangesToEventFootprints(eventInstanceGroup.getAllEventRanges());
+        var i;
+        var peerEventInstances = this.getPeerEventInstances(eventDef);
+        var peerEventRanges = peerEventInstances.map(util_1.eventInstanceToEventRange);
+        var peerEventFootprints = this.eventRangesToEventFootprints(peerEventRanges);
+        var constraintVal = eventDef.getConstraint();
+        var overlapVal = eventDef.getOverlap();
+        var eventAllowFunc = this.opt('eventAllow');
+        for (i = 0; i < eventFootprints.length; i++) {
+            if (!this.isFootprintAllowed(eventFootprints[i].componentFootprint, peerEventFootprints, constraintVal, overlapVal, eventFootprints[i].eventInstance)) {
+                return false;
+            }
         }
-        this.triggerWith(name, context, args); // Emitter's method
-        if (optHandler) {
-            return optHandler.apply(context, args);
+        if (eventAllowFunc) {
+            for (i = 0; i < eventFootprints.length; i++) {
+                if (eventAllowFunc(eventFootprints[i].componentFootprint.toLegacy(this._calendar), eventFootprints[i].getEventLegacy()) === false) {
+                    return false;
+                }
+            }
         }
+        return true;
     };
-    Calendar.prototype.hasPublicHandlers = function (name) {
-        return this.hasHandlers(name) ||
-            this.opt(name); // handler specified in options
+    Constraints.prototype.getPeerEventInstances = function (eventDef) {
+        return this.eventManager.getEventInstancesWithoutId(eventDef.id);
     };
-    // Options Public API
-    // -----------------------------------------------------------------------------------------------------------------
-    // public getter/setter
-    Calendar.prototype.option = function (name, value) {
-        var newOptionHash;
-        if (typeof name === 'string') {
-            if (value === undefined) {
-                return this.optionsManager.get(name);
+    Constraints.prototype.isSelectionFootprintAllowed = function (componentFootprint) {
+        var peerEventInstances = this.eventManager.getEventInstances();
+        var peerEventRanges = peerEventInstances.map(util_1.eventInstanceToEventRange);
+        var peerEventFootprints = this.eventRangesToEventFootprints(peerEventRanges);
+        var selectAllowFunc;
+        if (this.isFootprintAllowed(componentFootprint, peerEventFootprints, this.opt('selectConstraint'), this.opt('selectOverlap'))) {
+            selectAllowFunc = this.opt('selectAllow');
+            if (selectAllowFunc) {
+                return selectAllowFunc(componentFootprint.toLegacy(this._calendar)) !== false;
             }
             else {
-                newOptionHash = {};
-                newOptionHash[name] = value;
-                this.optionsManager.add(newOptionHash);
+                return true;
             }
         }
-        else if (typeof name === 'object') {
-            this.optionsManager.add(name);
+        return false;
+    };
+    Constraints.prototype.isFootprintAllowed = function (componentFootprint, peerEventFootprints, constraintVal, overlapVal, subjectEventInstance // optional
+    ) {
+        var constraintFootprints; // ComponentFootprint[]
+        var overlapEventFootprints; // EventFootprint[]
+        if (constraintVal != null) {
+            constraintFootprints = this.constraintValToFootprints(constraintVal, componentFootprint.isAllDay);
+            if (!this.isFootprintWithinConstraints(componentFootprint, constraintFootprints)) {
+                return false;
+            }
+        }
+        overlapEventFootprints = this.collectOverlapEventFootprints(peerEventFootprints, componentFootprint);
+        if (overlapVal === false) {
+            if (overlapEventFootprints.length) {
+                return false;
+            }
+        }
+        else if (typeof overlapVal === 'function') {
+            if (!isOverlapsAllowedByFunc(overlapEventFootprints, overlapVal, subjectEventInstance)) {
+                return false;
+            }
+        }
+        if (subjectEventInstance) {
+            if (!isOverlapEventInstancesAllowed(overlapEventFootprints, subjectEventInstance)) {
+                return false;
+            }
         }
+        return true;
     };
-    // private getter
-    Calendar.prototype.opt = function (name) {
-        return this.optionsManager.get(name);
-    };
-    // View
-    // -----------------------------------------------------------------------------------------------------------------
-    // Given a view name for a custom view or a standard view, creates a ready-to-go View object
-    Calendar.prototype.instantiateView = function (viewType) {
-        var spec = this.viewSpecManager.getViewSpec(viewType);
-        if (!spec) {
-            throw new Error("View type \"" + viewType + "\" is not valid");
+    // Constraint
+    // ------------------------------------------------------------------------------------------------
+    Constraints.prototype.isFootprintWithinConstraints = function (componentFootprint, constraintFootprints) {
+        var i;
+        for (i = 0; i < constraintFootprints.length; i++) {
+            if (this.footprintContainsFootprint(constraintFootprints[i], componentFootprint)) {
+                return true;
+            }
         }
-        return new spec['class'](this, spec);
-    };
-    // Returns a boolean about whether the view is okay to instantiate at some point
-    Calendar.prototype.isValidViewType = function (viewType) {
-        return Boolean(this.viewSpecManager.getViewSpec(viewType));
+        return false;
     };
-    Calendar.prototype.changeView = function (viewName, dateOrRange) {
-        if (dateOrRange) {
-            if (dateOrRange.start && dateOrRange.end) {
-                this.optionsManager.recordOverrides({
-                    visibleRange: dateOrRange
-                });
+    Constraints.prototype.constraintValToFootprints = function (constraintVal, isAllDay) {
+        var eventInstances;
+        if (constraintVal === 'businessHours') {
+            return this.buildCurrentBusinessFootprints(isAllDay);
+        }
+        else if (typeof constraintVal === 'object') {
+            eventInstances = this.parseEventDefToInstances(constraintVal); // handles recurring events
+            if (!eventInstances) { // invalid input. fallback to parsing footprint directly
+                return this.parseFootprints(constraintVal);
             }
             else {
-                this.currentDate = this.moment(dateOrRange).stripZone(); // just like gotoDate
+                return this.eventInstancesToFootprints(eventInstances);
             }
         }
-        this.renderView(viewName);
-    };
-    // Forces navigation to a view for the given date.
-    // `viewType` can be a specific view name or a generic one like "week" or "day".
-    Calendar.prototype.zoomTo = function (newDate, viewType) {
-        var spec;
-        viewType = viewType || 'day'; // day is default zoom
-        spec = this.viewSpecManager.getViewSpec(viewType) ||
-            this.viewSpecManager.getUnitViewSpec(viewType);
-        this.currentDate = newDate.clone();
-        this.renderView(spec ? spec.type : null);
+        else if (constraintVal != null) { // an ID
+            eventInstances = this.eventManager.getEventInstancesWithId(constraintVal);
+            return this.eventInstancesToFootprints(eventInstances);
+        }
     };
-    // Current Date
-    // -----------------------------------------------------------------------------------------------------------------
-    Calendar.prototype.initCurrentDate = function () {
-        var defaultDateInput = this.opt('defaultDate');
-        // compute the initial ambig-timezone date
-        if (defaultDateInput != null) {
-            this.currentDate = this.moment(defaultDateInput).stripZone();
+    // returns ComponentFootprint[]
+    // uses current view's range
+    Constraints.prototype.buildCurrentBusinessFootprints = function (isAllDay) {
+        var view = this._calendar.view;
+        var businessHourGenerator = view.get('businessHourGenerator');
+        var unzonedRange = view.dateProfile.activeUnzonedRange;
+        var eventInstanceGroup = businessHourGenerator.buildEventInstanceGroup(isAllDay, unzonedRange);
+        if (eventInstanceGroup) {
+            return this.eventInstancesToFootprints(eventInstanceGroup.eventInstances);
         }
         else {
-            this.currentDate = this.getNow(); // getNow already returns unzoned
+            return [];
         }
     };
-    Calendar.prototype.prev = function () {
-        var view = this.view;
-        var prevInfo = view.dateProfileGenerator.buildPrev(view.get('dateProfile'));
-        if (prevInfo.isValid) {
-            this.currentDate = prevInfo.date;
-            this.renderView();
-        }
+    // conversion util
+    Constraints.prototype.eventInstancesToFootprints = function (eventInstances) {
+        var eventRanges = eventInstances.map(util_1.eventInstanceToEventRange);
+        var eventFootprints = this.eventRangesToEventFootprints(eventRanges);
+        return eventFootprints.map(util_1.eventFootprintToComponentFootprint);
     };
-    Calendar.prototype.next = function () {
-        var view = this.view;
-        var nextInfo = view.dateProfileGenerator.buildNext(view.get('dateProfile'));
-        if (nextInfo.isValid) {
-            this.currentDate = nextInfo.date;
-            this.renderView();
+    // Overlap
+    // ------------------------------------------------------------------------------------------------
+    Constraints.prototype.collectOverlapEventFootprints = function (peerEventFootprints, targetFootprint) {
+        var overlapEventFootprints = [];
+        var i;
+        for (i = 0; i < peerEventFootprints.length; i++) {
+            if (this.footprintsIntersect(targetFootprint, peerEventFootprints[i].componentFootprint)) {
+                overlapEventFootprints.push(peerEventFootprints[i]);
+            }
         }
+        return overlapEventFootprints;
     };
-    Calendar.prototype.prevYear = function () {
-        this.currentDate.add(-1, 'years');
-        this.renderView();
+    // Conversion: eventDefs -> eventInstances -> eventRanges -> eventFootprints -> componentFootprints
+    // ------------------------------------------------------------------------------------------------
+    // NOTE: this might seem like repetitive code with the Grid class, however, this code is related to
+    // constraints whereas the Grid code is related to rendering. Each approach might want to convert
+    // eventRanges -> eventFootprints in a different way. Regardless, there are opportunities to make
+    // this more DRY.
+    /*
+    Returns false on invalid input.
+    */
+    Constraints.prototype.parseEventDefToInstances = function (eventInput) {
+        var eventManager = this.eventManager;
+        var eventDef = EventDefParser_1.default.parse(eventInput, new EventSource_1.default(this._calendar));
+        if (!eventDef) { // invalid
+            return false;
+        }
+        return eventDef.buildInstances(eventManager.currentPeriod.unzonedRange);
     };
-    Calendar.prototype.nextYear = function () {
-        this.currentDate.add(1, 'years');
-        this.renderView();
+    Constraints.prototype.eventRangesToEventFootprints = function (eventRanges) {
+        var i;
+        var eventFootprints = [];
+        for (i = 0; i < eventRanges.length; i++) {
+            eventFootprints.push.apply(// footprints
+            eventFootprints, this.eventRangeToEventFootprints(eventRanges[i]));
+        }
+        return eventFootprints;
     };
-    Calendar.prototype.today = function () {
-        this.currentDate = this.getNow(); // should deny like prev/next?
-        this.renderView();
+    Constraints.prototype.eventRangeToEventFootprints = function (eventRange) {
+        return [util_1.eventRangeToEventFootprint(eventRange)];
     };
-    Calendar.prototype.gotoDate = function (zonedDateInput) {
-        this.currentDate = this.moment(zonedDateInput).stripZone();
-        this.renderView();
+    /*
+    Parses footprints directly.
+    Very similar to EventDateProfile::parse :(
+    */
+    Constraints.prototype.parseFootprints = function (rawInput) {
+        var start;
+        var end;
+        if (rawInput.start) {
+            start = this._calendar.moment(rawInput.start);
+            if (!start.isValid()) {
+                start = null;
+            }
+        }
+        if (rawInput.end) {
+            end = this._calendar.moment(rawInput.end);
+            if (!end.isValid()) {
+                end = null;
+            }
+        }
+        return [
+            new ComponentFootprint_1.default(new UnzonedRange_1.default(start, end), (start && !start.hasTime()) || (end && !end.hasTime()) // isAllDay
+            )
+        ];
     };
-    Calendar.prototype.incrementDate = function (delta) {
-        this.currentDate.add(moment.duration(delta));
-        this.renderView();
+    // Footprint Utils
+    // ----------------------------------------------------------------------------------------
+    Constraints.prototype.footprintContainsFootprint = function (outerFootprint, innerFootprint) {
+        return outerFootprint.unzonedRange.containsRange(innerFootprint.unzonedRange);
     };
-    // for external API
-    Calendar.prototype.getDate = function () {
-        return this.applyTimezone(this.currentDate); // infuse the calendar's timezone
+    Constraints.prototype.footprintsIntersect = function (footprint0, footprint1) {
+        return footprint0.unzonedRange.intersectsWith(footprint1.unzonedRange);
     };
-    // Loading Triggering
-    // -----------------------------------------------------------------------------------------------------------------
-    // Should be called when any type of async data fetching begins
-    Calendar.prototype.pushLoading = function () {
-        if (!(this.loadingLevel++)) {
-            this.publiclyTrigger('loading', [true, this.view]);
+    return Constraints;
+}());
+exports.default = Constraints;
+// optional subjectEventInstance
+function isOverlapsAllowedByFunc(overlapEventFootprints, overlapFunc, subjectEventInstance) {
+    var i;
+    for (i = 0; i < overlapEventFootprints.length; i++) {
+        if (!overlapFunc(overlapEventFootprints[i].eventInstance.toLegacy(), subjectEventInstance ? subjectEventInstance.toLegacy() : null)) {
+            return false;
+        }
+    }
+    return true;
+}
+function isOverlapEventInstancesAllowed(overlapEventFootprints, subjectEventInstance) {
+    var subjectLegacyInstance = subjectEventInstance.toLegacy();
+    var i;
+    var overlapEventInstance;
+    var overlapEventDef;
+    var overlapVal;
+    for (i = 0; i < overlapEventFootprints.length; i++) {
+        overlapEventInstance = overlapEventFootprints[i].eventInstance;
+        overlapEventDef = overlapEventInstance.def;
+        // don't need to pass in calendar, because don't want to consider global eventOverlap property,
+        // because we already considered that earlier in the process.
+        overlapVal = overlapEventDef.getOverlap();
+        if (overlapVal === false) {
+            return false;
+        }
+        else if (typeof overlapVal === 'function') {
+            if (!overlapVal(overlapEventInstance.toLegacy(), subjectLegacyInstance)) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
+
+/***/ }),
+/* 218 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var $ = __webpack_require__(3);
+var util_1 = __webpack_require__(19);
+var EventInstanceGroup_1 = __webpack_require__(20);
+var RecurringEventDef_1 = __webpack_require__(54);
+var EventSource_1 = __webpack_require__(6);
+var BUSINESS_HOUR_EVENT_DEFAULTS = {
+    start: '09:00',
+    end: '17:00',
+    dow: [1, 2, 3, 4, 5],
+    rendering: 'inverse-background'
+    // classNames are defined in businessHoursSegClasses
+};
+var BusinessHourGenerator = /** @class */ (function () {
+    function BusinessHourGenerator(rawComplexDef, calendar) {
+        this.rawComplexDef = rawComplexDef;
+        this.calendar = calendar;
+    }
+    BusinessHourGenerator.prototype.buildEventInstanceGroup = function (isAllDay, unzonedRange) {
+        var eventDefs = this.buildEventDefs(isAllDay);
+        var eventInstanceGroup;
+        if (eventDefs.length) {
+            eventInstanceGroup = new EventInstanceGroup_1.default(util_1.eventDefsToEventInstances(eventDefs, unzonedRange));
+            // so that inverse-background rendering can happen even when no eventRanges in view
+            eventInstanceGroup.explicitEventDef = eventDefs[0];
+            return eventInstanceGroup;
         }
     };
-    // Should be called when any type of async data fetching completes
-    Calendar.prototype.popLoading = function () {
-        if (!(--this.loadingLevel)) {
-            this.publiclyTrigger('loading', [false, this.view]);
+    BusinessHourGenerator.prototype.buildEventDefs = function (isAllDay) {
+        var rawComplexDef = this.rawComplexDef;
+        var rawDefs = [];
+        var requireDow = false;
+        var i;
+        var defs = [];
+        if (rawComplexDef === true) {
+            rawDefs = [{}]; // will get BUSINESS_HOUR_EVENT_DEFAULTS verbatim
         }
-    };
-    // High-level Rendering
-    // -----------------------------------------------------------------------------------
-    Calendar.prototype.render = function () {
-        if (!this.contentEl) {
-            this.initialRender();
+        else if ($.isPlainObject(rawComplexDef)) {
+            rawDefs = [rawComplexDef];
         }
-        else if (this.elementVisible()) {
-            // mainly for the public API
-            this.calcSize();
-            this.updateViewSize();
+        else if ($.isArray(rawComplexDef)) {
+            rawDefs = rawComplexDef;
+            requireDow = true; // every sub-definition NEEDS a day-of-week
         }
-    };
-    Calendar.prototype.initialRender = function () {
-        var _this = this;
-        var el = this.el;
-        el.addClass('fc');
-        // event delegation for nav links
-        el.on('click.fc', 'a[data-goto]', function (ev) {
-            var anchorEl = $(ev.currentTarget);
-            var gotoOptions = anchorEl.data('goto'); // will automatically parse JSON
-            var date = _this.moment(gotoOptions.date);
-            var viewType = gotoOptions.type;
-            // property like "navLinkDayClick". might be a string or a function
-            var customAction = _this.view.opt('navLink' + util_1.capitaliseFirstLetter(viewType) + 'Click');
-            if (typeof customAction === 'function') {
-                customAction(date, ev);
-            }
-            else {
-                if (typeof customAction === 'string') {
-                    viewType = customAction;
-                }
-                _this.zoomTo(date, viewType);
-            }
-        });
-        // called immediately, and upon option change
-        this.optionsManager.watch('settingTheme', ['?theme', '?themeSystem'], function (opts) {
-            var themeClass = ThemeRegistry_1.getThemeSystemClass(opts.themeSystem || opts.theme);
-            var theme = new themeClass(_this.optionsManager);
-            var widgetClass = theme.getClass('widget');
-            _this.theme = theme;
-            if (widgetClass) {
-                el.addClass(widgetClass);
-            }
-        }, function () {
-            var widgetClass = _this.theme.getClass('widget');
-            _this.theme = null;
-            if (widgetClass) {
-                el.removeClass(widgetClass);
-            }
-        });
-        this.optionsManager.watch('settingBusinessHourGenerator', ['?businessHours'], function (deps) {
-            _this.businessHourGenerator = new BusinessHourGenerator_1.default(deps.businessHours, _this);
-            if (_this.view) {
-                _this.view.set('businessHourGenerator', _this.businessHourGenerator);
+        for (i = 0; i < rawDefs.length; i++) {
+            if (!requireDow || rawDefs[i].dow) {
+                defs.push(this.buildEventDef(isAllDay, rawDefs[i]));
             }
-        }, function () {
-            _this.businessHourGenerator = null;
-        });
-        // called immediately, and upon option change.
-        // HACK: locale often affects isRTL, so we explicitly listen to that too.
-        this.optionsManager.watch('applyingDirClasses', ['?isRTL', '?locale'], function (opts) {
-            el.toggleClass('fc-ltr', !opts.isRTL);
-            el.toggleClass('fc-rtl', opts.isRTL);
-        });
-        this.contentEl = $("<div class='fc-view-container'/>").prependTo(el);
-        this.initToolbars();
-        this.renderHeader();
-        this.renderFooter();
-        this.renderView(this.opt('defaultView'));
-        if (this.opt('handleWindowResize')) {
-            $(window).resize(this.windowResizeProxy = util_1.debounce(// prevents rapid calls
-            this.windowResize.bind(this), this.opt('windowResizeDelay')));
         }
+        return defs;
     };
-    Calendar.prototype.destroy = function () {
-        if (this.view) {
-            this.clearView();
-        }
-        this.toolbarsManager.proxyCall('removeElement');
-        this.contentEl.remove();
-        this.el.removeClass('fc fc-ltr fc-rtl');
-        // removes theme-related root className
-        this.optionsManager.unwatch('settingTheme');
-        this.optionsManager.unwatch('settingBusinessHourGenerator');
-        this.el.off('.fc'); // unbind nav link handlers
-        if (this.windowResizeProxy) {
-            $(window).unbind('resize', this.windowResizeProxy);
-            this.windowResizeProxy = null;
+    BusinessHourGenerator.prototype.buildEventDef = function (isAllDay, rawDef) {
+        var fullRawDef = $.extend({}, BUSINESS_HOUR_EVENT_DEFAULTS, rawDef);
+        if (isAllDay) {
+            fullRawDef.start = null;
+            fullRawDef.end = null;
         }
-        GlobalEmitter_1.default.unneeded();
+        return RecurringEventDef_1.default.parse(fullRawDef, new EventSource_1.default(this.calendar) // dummy source
+        );
     };
-    Calendar.prototype.elementVisible = function () {
-        return this.el.is(':visible');
+    return BusinessHourGenerator;
+}());
+exports.default = BusinessHourGenerator;
+
+
+/***/ }),
+/* 219 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var $ = __webpack_require__(3);
+var util_1 = __webpack_require__(4);
+var Promise_1 = __webpack_require__(21);
+var EmitterMixin_1 = __webpack_require__(13);
+var UnzonedRange_1 = __webpack_require__(5);
+var EventInstanceGroup_1 = __webpack_require__(20);
+var EventPeriod = /** @class */ (function () {
+    function EventPeriod(start, end, timezone) {
+        this.pendingCnt = 0;
+        this.freezeDepth = 0;
+        this.stuntedReleaseCnt = 0;
+        this.releaseCnt = 0;
+        this.start = start;
+        this.end = end;
+        this.timezone = timezone;
+        this.unzonedRange = new UnzonedRange_1.default(start.clone().stripZone(), end.clone().stripZone());
+        this.requestsByUid = {};
+        this.eventDefsByUid = {};
+        this.eventDefsById = {};
+        this.eventInstanceGroupsById = {};
+    }
+    EventPeriod.prototype.isWithinRange = function (start, end) {
+        // TODO: use a range util function?
+        return !start.isBefore(this.start) && !end.isAfter(this.end);
     };
-    // Render Queue
+    // Requesting and Purging
     // -----------------------------------------------------------------------------------------------------------------
-    Calendar.prototype.bindViewHandlers = function (view) {
+    EventPeriod.prototype.requestSources = function (sources) {
+        this.freeze();
+        for (var i = 0; i < sources.length; i++) {
+            this.requestSource(sources[i]);
+        }
+        this.thaw();
+    };
+    EventPeriod.prototype.requestSource = function (source) {
         var _this = this;
-        view.watch('titleForCalendar', ['title'], function (deps) {
-            if (view === _this.view) {
-                _this.setToolbarsTitle(deps.title);
+        var request = { source: source, status: 'pending', eventDefs: null };
+        this.requestsByUid[source.uid] = request;
+        this.pendingCnt += 1;
+        source.fetch(this.start, this.end, this.timezone).then(function (eventDefs) {
+            if (request.status !== 'cancelled') {
+                request.status = 'completed';
+                request.eventDefs = eventDefs;
+                _this.addEventDefs(eventDefs);
+                _this.pendingCnt--;
+                _this.tryRelease();
             }
-        });
-        view.watch('dateProfileForCalendar', ['dateProfile'], function (deps) {
-            if (view === _this.view) {
-                _this.currentDate = deps.dateProfile.date; // might have been constrained by view dates
-                _this.updateToolbarButtons(deps.dateProfile);
+        }, function () {
+            if (request.status !== 'cancelled') {
+                request.status = 'failed';
+                _this.pendingCnt--;
+                _this.tryRelease();
             }
         });
     };
-    Calendar.prototype.unbindViewHandlers = function (view) {
-        view.unwatch('titleForCalendar');
-        view.unwatch('dateProfileForCalendar');
-    };
-    // View Rendering
-    // -----------------------------------------------------------------------------------
-    // Renders a view because of a date change, view-type change, or for the first time.
-    // If not given a viewType, keep the current view but render different dates.
-    // Accepts an optional scroll state to restore to.
-    Calendar.prototype.renderView = function (viewType) {
-        var oldView = this.view;
-        var newView;
-        this.freezeContentHeight();
-        if (oldView && viewType && oldView.type !== viewType) {
-            this.clearView();
-        }
-        // if viewType changed, or the view was never created, create a fresh view
-        if (!this.view && viewType) {
-            newView = this.view =
-                this.viewsByType[viewType] ||
-                    (this.viewsByType[viewType] = this.instantiateView(viewType));
-            this.bindViewHandlers(newView);
-            newView.startBatchRender(); // so that setElement+setDate rendering are joined
-            newView.setElement($("<div class='fc-view fc-" + viewType + "-view' />").appendTo(this.contentEl));
-            this.toolbarsManager.proxyCall('activateButton', viewType);
-        }
-        if (this.view) {
-            // prevent unnecessary change firing
-            if (this.view.get('businessHourGenerator') !== this.businessHourGenerator) {
-                this.view.set('businessHourGenerator', this.businessHourGenerator);
+    EventPeriod.prototype.purgeSource = function (source) {
+        var request = this.requestsByUid[source.uid];
+        if (request) {
+            delete this.requestsByUid[source.uid];
+            if (request.status === 'pending') {
+                request.status = 'cancelled';
+                this.pendingCnt--;
+                this.tryRelease();
             }
-            this.view.setDate(this.currentDate);
-            if (newView) {
-                newView.stopBatchRender();
+            else if (request.status === 'completed') {
+                request.eventDefs.forEach(this.removeEventDef.bind(this));
             }
         }
-        this.thawContentHeight();
-    };
-    // Unrenders the current view and reflects this change in the Header.
-    // Unregsiters the `view`, but does not remove from viewByType hash.
-    Calendar.prototype.clearView = function () {
-        var currentView = this.view;
-        this.toolbarsManager.proxyCall('deactivateButton', currentView.type);
-        this.unbindViewHandlers(currentView);
-        currentView.removeElement();
-        currentView.unsetDate(); // so bindViewHandlers doesn't fire with old values next time
-        this.view = null;
-    };
-    // Destroys the view, including the view object. Then, re-instantiates it and renders it.
-    // Maintains the same scroll state.
-    // TODO: maintain any other user-manipulated state.
-    Calendar.prototype.reinitView = function () {
-        var oldView = this.view;
-        var scroll = oldView.queryScroll(); // wouldn't be so complicated if Calendar owned the scroll
-        this.freezeContentHeight();
-        this.clearView();
-        this.calcSize();
-        this.renderView(oldView.type); // needs the type to freshly render
-        this.view.applyScroll(scroll);
-        this.thawContentHeight();
-    };
-    // Resizing
-    // -----------------------------------------------------------------------------------
-    Calendar.prototype.getSuggestedViewHeight = function () {
-        if (this.suggestedViewHeight == null) {
-            this.calcSize();
-        }
-        return this.suggestedViewHeight;
-    };
-    Calendar.prototype.isHeightAuto = function () {
-        return this.opt('contentHeight') === 'auto' || this.opt('height') === 'auto';
     };
-    Calendar.prototype.updateViewSize = function (isResize) {
-        if (isResize === void 0) { isResize = false; }
-        var view = this.view;
-        var scroll;
-        if (!this.ignoreUpdateViewSize && view) {
-            if (isResize) {
-                this.calcSize();
-                scroll = view.queryScroll();
+    EventPeriod.prototype.purgeAllSources = function () {
+        var requestsByUid = this.requestsByUid;
+        var uid;
+        var request;
+        var completedCnt = 0;
+        for (uid in requestsByUid) {
+            request = requestsByUid[uid];
+            if (request.status === 'pending') {
+                request.status = 'cancelled';
             }
-            this.ignoreUpdateViewSize++;
-            view.updateSize(this.getSuggestedViewHeight(), this.isHeightAuto(), isResize);
-            this.ignoreUpdateViewSize--;
-            if (isResize) {
-                view.applyScroll(scroll);
+            else if (request.status === 'completed') {
+                completedCnt++;
             }
-            return true; // signal success
         }
-    };
-    Calendar.prototype.calcSize = function () {
-        if (this.elementVisible()) {
-            this._calcSize();
+        this.requestsByUid = {};
+        this.pendingCnt = 0;
+        if (completedCnt) {
+            this.removeAllEventDefs(); // might release
         }
     };
-    Calendar.prototype._calcSize = function () {
-        var contentHeightInput = this.opt('contentHeight');
-        var heightInput = this.opt('height');
-        if (typeof contentHeightInput === 'number') {
-            this.suggestedViewHeight = contentHeightInput;
+    // Event Definitions
+    // -----------------------------------------------------------------------------------------------------------------
+    EventPeriod.prototype.getEventDefByUid = function (eventDefUid) {
+        return this.eventDefsByUid[eventDefUid];
+    };
+    EventPeriod.prototype.getEventDefsById = function (eventDefId) {
+        var a = this.eventDefsById[eventDefId];
+        if (a) {
+            return a.slice(); // clone
         }
-        else if (typeof contentHeightInput === 'function') {
-            this.suggestedViewHeight = contentHeightInput();
+        return [];
+    };
+    EventPeriod.prototype.addEventDefs = function (eventDefs) {
+        for (var i = 0; i < eventDefs.length; i++) {
+            this.addEventDef(eventDefs[i]);
         }
-        else if (typeof heightInput === 'number') {
-            this.suggestedViewHeight = heightInput - this.queryToolbarsHeight();
+    };
+    EventPeriod.prototype.addEventDef = function (eventDef) {
+        var eventDefsById = this.eventDefsById;
+        var eventDefId = eventDef.id;
+        var eventDefs = eventDefsById[eventDefId] || (eventDefsById[eventDefId] = []);
+        var eventInstances = eventDef.buildInstances(this.unzonedRange);
+        var i;
+        eventDefs.push(eventDef);
+        this.eventDefsByUid[eventDef.uid] = eventDef;
+        for (i = 0; i < eventInstances.length; i++) {
+            this.addEventInstance(eventInstances[i], eventDefId);
         }
-        else if (typeof heightInput === 'function') {
-            this.suggestedViewHeight = heightInput() - this.queryToolbarsHeight();
+    };
+    EventPeriod.prototype.removeEventDefsById = function (eventDefId) {
+        var _this = this;
+        this.getEventDefsById(eventDefId).forEach(function (eventDef) {
+            _this.removeEventDef(eventDef);
+        });
+    };
+    EventPeriod.prototype.removeAllEventDefs = function () {
+        var isEmpty = $.isEmptyObject(this.eventDefsByUid);
+        this.eventDefsByUid = {};
+        this.eventDefsById = {};
+        this.eventInstanceGroupsById = {};
+        if (!isEmpty) {
+            this.tryRelease();
         }
-        else if (heightInput === 'parent') {
-            this.suggestedViewHeight = this.el.parent().height() - this.queryToolbarsHeight();
+    };
+    EventPeriod.prototype.removeEventDef = function (eventDef) {
+        var eventDefsById = this.eventDefsById;
+        var eventDefs = eventDefsById[eventDef.id];
+        delete this.eventDefsByUid[eventDef.uid];
+        if (eventDefs) {
+            util_1.removeExact(eventDefs, eventDef);
+            if (!eventDefs.length) {
+                delete eventDefsById[eventDef.id];
+            }
+            this.removeEventInstancesForDef(eventDef);
         }
-        else {
-            this.suggestedViewHeight = Math.round(this.contentEl.width() /
-                Math.max(this.opt('aspectRatio'), .5));
+    };
+    // Event Instances
+    // -----------------------------------------------------------------------------------------------------------------
+    EventPeriod.prototype.getEventInstances = function () {
+        var eventInstanceGroupsById = this.eventInstanceGroupsById;
+        var eventInstances = [];
+        var id;
+        for (id in eventInstanceGroupsById) {
+            eventInstances.push.apply(eventInstances, // append
+            eventInstanceGroupsById[id].eventInstances);
         }
+        return eventInstances;
     };
-    Calendar.prototype.windowResize = function (ev) {
-        if (
-        // the purpose: so we don't process jqui "resize" events that have bubbled up
-        // cast to any because .target, which is Element, can't be compared to window for some reason.
-        ev.target === window &&
-            this.view &&
-            this.view.isDatesRendered) {
-            if (this.updateViewSize(true)) {
-                this.publiclyTrigger('windowResize', [this.view]);
-            }
+    EventPeriod.prototype.getEventInstancesWithId = function (eventDefId) {
+        var eventInstanceGroup = this.eventInstanceGroupsById[eventDefId];
+        if (eventInstanceGroup) {
+            return eventInstanceGroup.eventInstances.slice(); // clone
         }
+        return [];
     };
-    /* Height "Freezing"
-    -----------------------------------------------------------------------------*/
-    Calendar.prototype.freezeContentHeight = function () {
-        if (!(this.freezeContentHeightDepth++)) {
-            this.forceFreezeContentHeight();
+    EventPeriod.prototype.getEventInstancesWithoutId = function (eventDefId) {
+        var eventInstanceGroupsById = this.eventInstanceGroupsById;
+        var matchingInstances = [];
+        var id;
+        for (id in eventInstanceGroupsById) {
+            if (id !== eventDefId) {
+                matchingInstances.push.apply(matchingInstances, // append
+                eventInstanceGroupsById[id].eventInstances);
+            }
         }
+        return matchingInstances;
     };
-    Calendar.prototype.forceFreezeContentHeight = function () {
-        this.contentEl.css({
-            width: '100%',
-            height: this.contentEl.height(),
-            overflow: 'hidden'
-        });
+    EventPeriod.prototype.addEventInstance = function (eventInstance, eventDefId) {
+        var eventInstanceGroupsById = this.eventInstanceGroupsById;
+        var eventInstanceGroup = eventInstanceGroupsById[eventDefId] ||
+            (eventInstanceGroupsById[eventDefId] = new EventInstanceGroup_1.default());
+        eventInstanceGroup.eventInstances.push(eventInstance);
+        this.tryRelease();
     };
-    Calendar.prototype.thawContentHeight = function () {
-        this.freezeContentHeightDepth--;
-        // always bring back to natural height
-        this.contentEl.css({
-            width: '',
-            height: '',
-            overflow: ''
-        });
-        // but if there are future thaws, re-freeze
-        if (this.freezeContentHeightDepth) {
-            this.forceFreezeContentHeight();
+    EventPeriod.prototype.removeEventInstancesForDef = function (eventDef) {
+        var eventInstanceGroupsById = this.eventInstanceGroupsById;
+        var eventInstanceGroup = eventInstanceGroupsById[eventDef.id];
+        var removeCnt;
+        if (eventInstanceGroup) {
+            removeCnt = util_1.removeMatching(eventInstanceGroup.eventInstances, function (currentEventInstance) {
+                return currentEventInstance.def === eventDef;
+            });
+            if (!eventInstanceGroup.eventInstances.length) {
+                delete eventInstanceGroupsById[eventDef.id];
+            }
+            if (removeCnt) {
+                this.tryRelease();
+            }
         }
     };
-    // Toolbar
+    // Releasing and Freezing
     // -----------------------------------------------------------------------------------------------------------------
-    Calendar.prototype.initToolbars = function () {
-        this.header = new Toolbar_1.default(this, this.computeHeaderOptions());
-        this.footer = new Toolbar_1.default(this, this.computeFooterOptions());
-        this.toolbarsManager = new Iterator_1.default([this.header, this.footer]);
-    };
-    Calendar.prototype.computeHeaderOptions = function () {
-        return {
-            extraClasses: 'fc-header-toolbar',
-            layout: this.opt('header')
-        };
+    EventPeriod.prototype.tryRelease = function () {
+        if (!this.pendingCnt) {
+            if (!this.freezeDepth) {
+                this.release();
+            }
+            else {
+                this.stuntedReleaseCnt++;
+            }
+        }
     };
-    Calendar.prototype.computeFooterOptions = function () {
-        return {
-            extraClasses: 'fc-footer-toolbar',
-            layout: this.opt('footer')
-        };
+    EventPeriod.prototype.release = function () {
+        this.releaseCnt++;
+        this.trigger('release', this.eventInstanceGroupsById);
     };
-    // can be called repeatedly and Header will rerender
-    Calendar.prototype.renderHeader = function () {
-        var header = this.header;
-        header.setToolbarOptions(this.computeHeaderOptions());
-        header.render();
-        if (header.el) {
-            this.el.prepend(header.el);
+    EventPeriod.prototype.whenReleased = function () {
+        var _this = this;
+        if (this.releaseCnt) {
+            return Promise_1.default.resolve(this.eventInstanceGroupsById);
         }
-    };
-    // can be called repeatedly and Footer will rerender
-    Calendar.prototype.renderFooter = function () {
-        var footer = this.footer;
-        footer.setToolbarOptions(this.computeFooterOptions());
-        footer.render();
-        if (footer.el) {
-            this.el.append(footer.el);
+        else {
+            return Promise_1.default.construct(function (onResolve) {
+                _this.one('release', onResolve);
+            });
         }
     };
-    Calendar.prototype.setToolbarsTitle = function (title) {
-        this.toolbarsManager.proxyCall('updateTitle', title);
+    EventPeriod.prototype.freeze = function () {
+        if (!(this.freezeDepth++)) {
+            this.stuntedReleaseCnt = 0;
+        }
     };
-    Calendar.prototype.updateToolbarButtons = function (dateProfile) {
-        var now = this.getNow();
-        var view = this.view;
-        var todayInfo = view.dateProfileGenerator.build(now);
-        var prevInfo = view.dateProfileGenerator.buildPrev(view.get('dateProfile'));
-        var nextInfo = view.dateProfileGenerator.buildNext(view.get('dateProfile'));
-        this.toolbarsManager.proxyCall((todayInfo.isValid && !dateProfile.currentUnzonedRange.containsDate(now)) ?
-            'enableButton' :
-            'disableButton', 'today');
-        this.toolbarsManager.proxyCall(prevInfo.isValid ?
-            'enableButton' :
-            'disableButton', 'prev');
-        this.toolbarsManager.proxyCall(nextInfo.isValid ?
-            'enableButton' :
-            'disableButton', 'next');
+    EventPeriod.prototype.thaw = function () {
+        if (!(--this.freezeDepth) && this.stuntedReleaseCnt && !this.pendingCnt) {
+            this.release();
+        }
     };
-    Calendar.prototype.queryToolbarsHeight = function () {
-        return this.toolbarsManager.items.reduce(function (accumulator, toolbar) {
-            var toolbarHeight = toolbar.el ? toolbar.el.outerHeight(true) : 0; // includes margin
-            return accumulator + toolbarHeight;
-        }, 0);
+    return EventPeriod;
+}());
+exports.default = EventPeriod;
+EmitterMixin_1.default.mixInto(EventPeriod);
+
+
+/***/ }),
+/* 220 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var $ = __webpack_require__(3);
+var util_1 = __webpack_require__(4);
+var EventPeriod_1 = __webpack_require__(219);
+var ArrayEventSource_1 = __webpack_require__(56);
+var EventSource_1 = __webpack_require__(6);
+var EventSourceParser_1 = __webpack_require__(38);
+var SingleEventDef_1 = __webpack_require__(9);
+var EventInstanceGroup_1 = __webpack_require__(20);
+var EmitterMixin_1 = __webpack_require__(13);
+var ListenerMixin_1 = __webpack_require__(7);
+var EventManager = /** @class */ (function () {
+    function EventManager(calendar) {
+        this.calendar = calendar;
+        this.stickySource = new ArrayEventSource_1.default(calendar);
+        this.otherSources = [];
+    }
+    EventManager.prototype.requestEvents = function (start, end, timezone, force) {
+        if (force ||
+            !this.currentPeriod ||
+            !this.currentPeriod.isWithinRange(start, end) ||
+            timezone !== this.currentPeriod.timezone) {
+            this.setPeriod(// will change this.currentPeriod
+            new EventPeriod_1.default(start, end, timezone));
+        }
+        return this.currentPeriod.whenReleased();
     };
-    // Selection
+    // Source Adding/Removing
     // -----------------------------------------------------------------------------------------------------------------
-    // this public method receives start/end dates in any format, with any timezone
-    Calendar.prototype.select = function (zonedStartInput, zonedEndInput) {
-        this.view.select(this.buildSelectFootprint.apply(this, arguments));
+    EventManager.prototype.addSource = function (eventSource) {
+        this.otherSources.push(eventSource);
+        if (this.currentPeriod) {
+            this.currentPeriod.requestSource(eventSource); // might release
+        }
     };
-    Calendar.prototype.unselect = function () {
-        if (this.view) {
-            this.view.unselect();
+    EventManager.prototype.removeSource = function (doomedSource) {
+        util_1.removeExact(this.otherSources, doomedSource);
+        if (this.currentPeriod) {
+            this.currentPeriod.purgeSource(doomedSource); // might release
         }
     };
-    // Given arguments to the select method in the API, returns a span (unzoned start/end and other info)
-    Calendar.prototype.buildSelectFootprint = function (zonedStartInput, zonedEndInput) {
-        var start = this.moment(zonedStartInput).stripZone();
-        var end;
-        if (zonedEndInput) {
-            end = this.moment(zonedEndInput).stripZone();
+    EventManager.prototype.removeAllSources = function () {
+        this.otherSources = [];
+        if (this.currentPeriod) {
+            this.currentPeriod.purgeAllSources(); // might release
         }
-        else if (start.hasTime()) {
-            end = start.clone().add(this.defaultTimedEventDuration);
+    };
+    // Source Refetching
+    // -----------------------------------------------------------------------------------------------------------------
+    EventManager.prototype.refetchSource = function (eventSource) {
+        var currentPeriod = this.currentPeriod;
+        if (currentPeriod) {
+            currentPeriod.freeze();
+            currentPeriod.purgeSource(eventSource);
+            currentPeriod.requestSource(eventSource);
+            currentPeriod.thaw();
         }
-        else {
-            end = start.clone().add(this.defaultAllDayEventDuration);
+    };
+    EventManager.prototype.refetchAllSources = function () {
+        var currentPeriod = this.currentPeriod;
+        if (currentPeriod) {
+            currentPeriod.freeze();
+            currentPeriod.purgeAllSources();
+            currentPeriod.requestSources(this.getSources());
+            currentPeriod.thaw();
         }
-        return new ComponentFootprint_1.default(new UnzonedRange_1.default(start, end), !start.hasTime());
     };
-    // Date Utils
+    // Source Querying
     // -----------------------------------------------------------------------------------------------------------------
-    Calendar.prototype.initMomentInternals = function () {
-        var _this = this;
-        this.defaultAllDayEventDuration = moment.duration(this.opt('defaultAllDayEventDuration'));
-        this.defaultTimedEventDuration = moment.duration(this.opt('defaultTimedEventDuration'));
-        // Called immediately, and when any of the options change.
-        // Happens before any internal objects rebuild or rerender, because this is very core.
-        this.optionsManager.watch('buildingMomentLocale', [
-            '?locale', '?monthNames', '?monthNamesShort', '?dayNames', '?dayNamesShort',
-            '?firstDay', '?weekNumberCalculation'
-        ], function (opts) {
-            var weekNumberCalculation = opts.weekNumberCalculation;
-            var firstDay = opts.firstDay;
-            var _week;
-            // normalize
-            if (weekNumberCalculation === 'iso') {
-                weekNumberCalculation = 'ISO'; // normalize
-            }
-            var localeData = Object.create(// make a cheap copy
-            locale_1.getMomentLocaleData(opts.locale) // will fall back to en
-            );
-            if (opts.monthNames) {
-                localeData._months = opts.monthNames;
-            }
-            if (opts.monthNamesShort) {
-                localeData._monthsShort = opts.monthNamesShort;
-            }
-            if (opts.dayNames) {
-                localeData._weekdays = opts.dayNames;
-            }
-            if (opts.dayNamesShort) {
-                localeData._weekdaysShort = opts.dayNamesShort;
-            }
-            if (firstDay == null && weekNumberCalculation === 'ISO') {
-                firstDay = 1;
-            }
-            if (firstDay != null) {
-                _week = Object.create(localeData._week); // _week: { dow: # }
-                _week.dow = firstDay;
-                localeData._week = _week;
-            }
-            if (weekNumberCalculation === 'ISO' ||
-                weekNumberCalculation === 'local' ||
-                typeof weekNumberCalculation === 'function') {
-                localeData._fullCalendar_weekCalc = weekNumberCalculation; // moment-ext will know what to do with it
-            }
-            _this.localeData = localeData;
-            // If the internal current date object already exists, move to new locale.
-            // We do NOT need to do this technique for event dates, because this happens when converting to "segments".
-            if (_this.currentDate) {
-                _this.localizeMoment(_this.currentDate); // sets to localeData
-            }
-        });
+    EventManager.prototype.getSources = function () {
+        return [this.stickySource].concat(this.otherSources);
     };
-    // Builds a moment using the settings of the current calendar: timezone and locale.
-    // Accepts anything the vanilla moment() constructor accepts.
-    Calendar.prototype.moment = function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        var mom;
-        if (this.opt('timezone') === 'local') {
-            mom = moment_ext_1.default.apply(null, args);
-            // Force the moment to be local, because momentExt doesn't guarantee it.
-            if (mom.hasTime()) {
-                mom.local();
-            }
+    // like querySources, but accepts multple match criteria (like multiple IDs)
+    EventManager.prototype.multiQuerySources = function (matchInputs) {
+        // coerce into an array
+        if (!matchInputs) {
+            matchInputs = [];
         }
-        else if (this.opt('timezone') === 'UTC') {
-            mom = moment_ext_1.default.utc.apply(null, args); // process as UTC
+        else if (!$.isArray(matchInputs)) {
+            matchInputs = [matchInputs];
         }
-        else {
-            mom = moment_ext_1.default.parseZone.apply(null, args); // let the input decide the zone
+        var matchingSources = [];
+        var i;
+        // resolve raw inputs to real event source objects
+        for (i = 0; i < matchInputs.length; i++) {
+            matchingSources.push.apply(// append
+            matchingSources, this.querySources(matchInputs[i]));
         }
-        this.localizeMoment(mom); // TODO
-        return mom;
+        return matchingSources;
     };
-    Calendar.prototype.msToMoment = function (ms, forceAllDay) {
-        var mom = moment_ext_1.default.utc(ms); // TODO: optimize by using Date.UTC
-        if (forceAllDay) {
-            mom.stripTime();
+    // matchInput can either by a real event source object, an ID, or the function/URL for the source.
+    // returns an array of matching source objects.
+    EventManager.prototype.querySources = function (matchInput) {
+        var sources = this.otherSources;
+        var i;
+        var source;
+        // given a proper event source object
+        for (i = 0; i < sources.length; i++) {
+            source = sources[i];
+            if (source === matchInput) {
+                return [source];
+            }
         }
-        else {
-            mom = this.applyTimezone(mom); // may or may not apply locale
+        // an ID match
+        source = this.getSourceById(EventSource_1.default.normalizeId(matchInput));
+        if (source) {
+            return [source];
+        }
+        // parse as an event source
+        matchInput = EventSourceParser_1.default.parse(matchInput, this.calendar);
+        if (matchInput) {
+            return $.grep(sources, function (source) {
+                return isSourcesEquivalent(matchInput, source);
+            });
         }
-        this.localizeMoment(mom);
-        return mom;
     };
-    Calendar.prototype.msToUtcMoment = function (ms, forceAllDay) {
-        var mom = moment_ext_1.default.utc(ms); // TODO: optimize by using Date.UTC
-        if (forceAllDay) {
-            mom.stripTime();
+    /*
+    ID assumed to already be normalized
+    */
+    EventManager.prototype.getSourceById = function (id) {
+        return $.grep(this.otherSources, function (source) {
+            return source.id && source.id === id;
+        })[0];
+    };
+    // Event-Period
+    // -----------------------------------------------------------------------------------------------------------------
+    EventManager.prototype.setPeriod = function (eventPeriod) {
+        if (this.currentPeriod) {
+            this.unbindPeriod(this.currentPeriod);
+            this.currentPeriod = null;
         }
-        this.localizeMoment(mom);
-        return mom;
+        this.currentPeriod = eventPeriod;
+        this.bindPeriod(eventPeriod);
+        eventPeriod.requestSources(this.getSources());
     };
-    // Updates the given moment's locale settings to the current calendar locale settings.
-    Calendar.prototype.localizeMoment = function (mom) {
-        mom._locale = this.localeData;
+    EventManager.prototype.bindPeriod = function (eventPeriod) {
+        this.listenTo(eventPeriod, 'release', function (eventsPayload) {
+            this.trigger('release', eventsPayload);
+        });
     };
-    // Returns a boolean about whether or not the calendar knows how to calculate
-    // the timezone offset of arbitrary dates in the current timezone.
-    Calendar.prototype.getIsAmbigTimezone = function () {
-        return this.opt('timezone') !== 'local' && this.opt('timezone') !== 'UTC';
+    EventManager.prototype.unbindPeriod = function (eventPeriod) {
+        this.stopListeningTo(eventPeriod);
     };
-    // Returns a copy of the given date in the current timezone. Has no effect on dates without times.
-    Calendar.prototype.applyTimezone = function (date) {
-        if (!date.hasTime()) {
-            return date.clone();
+    // Event Getting/Adding/Removing
+    // -----------------------------------------------------------------------------------------------------------------
+    EventManager.prototype.getEventDefByUid = function (uid) {
+        if (this.currentPeriod) {
+            return this.currentPeriod.getEventDefByUid(uid);
         }
-        var zonedDate = this.moment(date.toArray());
-        var timeAdjust = date.time().asMilliseconds() - zonedDate.time().asMilliseconds();
-        var adjustedZonedDate;
-        // Safari sometimes has problems with this coersion when near DST. Adjust if necessary. (bug #2396)
-        if (timeAdjust) {
-            adjustedZonedDate = zonedDate.clone().add(timeAdjust); // add milliseconds
-            if (date.time().asMilliseconds() - adjustedZonedDate.time().asMilliseconds() === 0) {
-                zonedDate = adjustedZonedDate;
-            }
+    };
+    EventManager.prototype.addEventDef = function (eventDef, isSticky) {
+        if (isSticky) {
+            this.stickySource.addEventDef(eventDef);
+        }
+        if (this.currentPeriod) {
+            this.currentPeriod.addEventDef(eventDef); // might release
+        }
+    };
+    EventManager.prototype.removeEventDefsById = function (eventId) {
+        this.getSources().forEach(function (eventSource) {
+            eventSource.removeEventDefsById(eventId);
+        });
+        if (this.currentPeriod) {
+            this.currentPeriod.removeEventDefsById(eventId); // might release
+        }
+    };
+    EventManager.prototype.removeAllEventDefs = function () {
+        this.getSources().forEach(function (eventSource) {
+            eventSource.removeAllEventDefs();
+        });
+        if (this.currentPeriod) {
+            this.currentPeriod.removeAllEventDefs();
         }
-        return zonedDate;
     };
+    // Event Mutating
+    // -----------------------------------------------------------------------------------------------------------------
     /*
-    Assumes the footprint is non-open-ended.
+    Returns an undo function.
     */
-    Calendar.prototype.footprintToDateProfile = function (componentFootprint, ignoreEnd) {
-        if (ignoreEnd === void 0) { ignoreEnd = false; }
-        var start = moment_ext_1.default.utc(componentFootprint.unzonedRange.startMs);
-        var end;
-        if (!ignoreEnd) {
-            end = moment_ext_1.default.utc(componentFootprint.unzonedRange.endMs);
-        }
-        if (componentFootprint.isAllDay) {
-            start.stripTime();
-            if (end) {
-                end.stripTime();
-            }
+    EventManager.prototype.mutateEventsWithId = function (eventDefId, eventDefMutation) {
+        var currentPeriod = this.currentPeriod;
+        var eventDefs;
+        var undoFuncs = [];
+        if (currentPeriod) {
+            currentPeriod.freeze();
+            eventDefs = currentPeriod.getEventDefsById(eventDefId);
+            eventDefs.forEach(function (eventDef) {
+                // add/remove esp because id might change
+                currentPeriod.removeEventDef(eventDef);
+                undoFuncs.push(eventDefMutation.mutateSingle(eventDef));
+                currentPeriod.addEventDef(eventDef);
+            });
+            currentPeriod.thaw();
+            return function () {
+                currentPeriod.freeze();
+                for (var i = 0; i < eventDefs.length; i++) {
+                    currentPeriod.removeEventDef(eventDefs[i]);
+                    undoFuncs[i]();
+                    currentPeriod.addEventDef(eventDefs[i]);
+                }
+                currentPeriod.thaw();
+            };
         }
-        else {
-            start = this.applyTimezone(start);
-            if (end) {
-                end = this.applyTimezone(end);
+        return function () { };
+    };
+    /*
+    copies and then mutates
+    */
+    EventManager.prototype.buildMutatedEventInstanceGroup = function (eventDefId, eventDefMutation) {
+        var eventDefs = this.getEventDefsById(eventDefId);
+        var i;
+        var defCopy;
+        var allInstances = [];
+        for (i = 0; i < eventDefs.length; i++) {
+            defCopy = eventDefs[i].clone();
+            if (defCopy instanceof SingleEventDef_1.default) {
+                eventDefMutation.mutateSingle(defCopy);
+                allInstances.push.apply(allInstances, // append
+                defCopy.buildInstances());
             }
         }
-        return new EventDateProfile_1.default(start, end, this);
+        return new EventInstanceGroup_1.default(allInstances);
     };
-    // Returns a moment for the current date, as defined by the client's computer or from the `now` option.
-    // Will return an moment with an ambiguous timezone.
-    Calendar.prototype.getNow = function () {
-        var now = this.opt('now');
-        if (typeof now === 'function') {
-            now = now();
+    // Freezing
+    // -----------------------------------------------------------------------------------------------------------------
+    EventManager.prototype.freeze = function () {
+        if (this.currentPeriod) {
+            this.currentPeriod.freeze();
         }
-        return this.moment(now).stripZone();
-    };
-    // Produces a human-readable string for the given duration.
-    // Side-effect: changes the locale of the given duration.
-    Calendar.prototype.humanizeDuration = function (duration) {
-        return duration.locale(this.opt('locale')).humanize();
     };
-    // will return `null` if invalid range
-    Calendar.prototype.parseUnzonedRange = function (rangeInput) {
-        var start = null;
-        var end = null;
-        if (rangeInput.start) {
-            start = this.moment(rangeInput.start).stripZone();
-        }
-        if (rangeInput.end) {
-            end = this.moment(rangeInput.end).stripZone();
-        }
-        if (!start && !end) {
-            return null;
-        }
-        if (start && end && end.isBefore(start)) {
-            return null;
+    EventManager.prototype.thaw = function () {
+        if (this.currentPeriod) {
+            this.currentPeriod.thaw();
         }
-        return new UnzonedRange_1.default(start, end);
     };
-    // Event-Date Utilities
-    // -----------------------------------------------------------------------------------------------------------------
-    Calendar.prototype.initEventManager = function () {
-        var _this = this;
-        var eventManager = new EventManager_1.default(this);
-        var rawSources = this.opt('eventSources') || [];
-        var singleRawSource = this.opt('events');
-        this.eventManager = eventManager;
-        if (singleRawSource) {
-            rawSources.unshift(singleRawSource);
-        }
-        eventManager.on('release', function (eventsPayload) {
-            _this.trigger('eventsReset', eventsPayload);
-        });
-        eventManager.freeze();
-        rawSources.forEach(function (rawSource) {
-            var source = EventSourceParser_1.default.parse(rawSource, _this);
-            if (source) {
-                eventManager.addSource(source);
-            }
-        });
-        eventManager.thaw();
+    // methods that simply forward to EventPeriod
+    EventManager.prototype.getEventDefsById = function (eventDefId) {
+        return this.currentPeriod.getEventDefsById(eventDefId);
     };
-    Calendar.prototype.requestEvents = function (start, end) {
-        return this.eventManager.requestEvents(start, end, this.opt('timezone'), !this.opt('lazyFetching'));
+    EventManager.prototype.getEventInstances = function () {
+        return this.currentPeriod.getEventInstances();
     };
-    // Get an event's normalized end date. If not present, calculate it from the defaults.
-    Calendar.prototype.getEventEnd = function (event) {
-        if (event.end) {
-            return event.end.clone();
-        }
-        else {
-            return this.getDefaultEventEnd(event.allDay, event.start);
-        }
+    EventManager.prototype.getEventInstancesWithId = function (eventDefId) {
+        return this.currentPeriod.getEventInstancesWithId(eventDefId);
     };
-    // Given an event's allDay status and start date, return what its fallback end date should be.
-    // TODO: rename to computeDefaultEventEnd
-    Calendar.prototype.getDefaultEventEnd = function (allDay, zonedStart) {
-        var end = zonedStart.clone();
-        if (allDay) {
-            end.stripTime().add(this.defaultAllDayEventDuration);
+    EventManager.prototype.getEventInstancesWithoutId = function (eventDefId) {
+        return this.currentPeriod.getEventInstancesWithoutId(eventDefId);
+    };
+    return EventManager;
+}());
+exports.default = EventManager;
+EmitterMixin_1.default.mixInto(EventManager);
+ListenerMixin_1.default.mixInto(EventManager);
+function isSourcesEquivalent(source0, source1) {
+    return source0.getPrimitive() === source1.getPrimitive();
+}
+
+
+/***/ }),
+/* 221 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var Theme_1 = __webpack_require__(22);
+var StandardTheme = /** @class */ (function (_super) {
+    tslib_1.__extends(StandardTheme, _super);
+    function StandardTheme() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return StandardTheme;
+}(Theme_1.default));
+exports.default = StandardTheme;
+StandardTheme.prototype.classes = {
+    widget: 'fc-unthemed',
+    widgetHeader: 'fc-widget-header',
+    widgetContent: 'fc-widget-content',
+    buttonGroup: 'fc-button-group',
+    button: 'fc-button',
+    cornerLeft: 'fc-corner-left',
+    cornerRight: 'fc-corner-right',
+    stateDefault: 'fc-state-default',
+    stateActive: 'fc-state-active',
+    stateDisabled: 'fc-state-disabled',
+    stateHover: 'fc-state-hover',
+    stateDown: 'fc-state-down',
+    popoverHeader: 'fc-widget-header',
+    popoverContent: 'fc-widget-content',
+    // day grid
+    headerRow: 'fc-widget-header',
+    dayRow: 'fc-widget-content',
+    // list view
+    listView: 'fc-widget-content'
+};
+StandardTheme.prototype.baseIconClass = 'fc-icon';
+StandardTheme.prototype.iconClasses = {
+    close: 'fc-icon-x',
+    prev: 'fc-icon-left-single-arrow',
+    next: 'fc-icon-right-single-arrow',
+    prevYear: 'fc-icon-left-double-arrow',
+    nextYear: 'fc-icon-right-double-arrow'
+};
+StandardTheme.prototype.iconOverrideOption = 'buttonIcons';
+StandardTheme.prototype.iconOverrideCustomButtonOption = 'icon';
+StandardTheme.prototype.iconOverridePrefix = 'fc-icon-';
+
+
+/***/ }),
+/* 222 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var Theme_1 = __webpack_require__(22);
+var JqueryUiTheme = /** @class */ (function (_super) {
+    tslib_1.__extends(JqueryUiTheme, _super);
+    function JqueryUiTheme() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return JqueryUiTheme;
+}(Theme_1.default));
+exports.default = JqueryUiTheme;
+JqueryUiTheme.prototype.classes = {
+    widget: 'ui-widget',
+    widgetHeader: 'ui-widget-header',
+    widgetContent: 'ui-widget-content',
+    buttonGroup: 'fc-button-group',
+    button: 'ui-button',
+    cornerLeft: 'ui-corner-left',
+    cornerRight: 'ui-corner-right',
+    stateDefault: 'ui-state-default',
+    stateActive: 'ui-state-active',
+    stateDisabled: 'ui-state-disabled',
+    stateHover: 'ui-state-hover',
+    stateDown: 'ui-state-down',
+    today: 'ui-state-highlight',
+    popoverHeader: 'ui-widget-header',
+    popoverContent: 'ui-widget-content',
+    // day grid
+    headerRow: 'ui-widget-header',
+    dayRow: 'ui-widget-content',
+    // list view
+    listView: 'ui-widget-content'
+};
+JqueryUiTheme.prototype.baseIconClass = 'ui-icon';
+JqueryUiTheme.prototype.iconClasses = {
+    close: 'ui-icon-closethick',
+    prev: 'ui-icon-circle-triangle-w',
+    next: 'ui-icon-circle-triangle-e',
+    prevYear: 'ui-icon-seek-prev',
+    nextYear: 'ui-icon-seek-next'
+};
+JqueryUiTheme.prototype.iconOverrideOption = 'themeButtonIcons';
+JqueryUiTheme.prototype.iconOverrideCustomButtonOption = 'themeIcon';
+JqueryUiTheme.prototype.iconOverridePrefix = 'ui-icon-';
+
+
+/***/ }),
+/* 223 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var $ = __webpack_require__(3);
+var Promise_1 = __webpack_require__(21);
+var EventSource_1 = __webpack_require__(6);
+var FuncEventSource = /** @class */ (function (_super) {
+    tslib_1.__extends(FuncEventSource, _super);
+    function FuncEventSource() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    FuncEventSource.parse = function (rawInput, calendar) {
+        var rawProps;
+        // normalize raw input
+        if ($.isFunction(rawInput.events)) { // extended form
+            rawProps = rawInput;
         }
-        else {
-            end.add(this.defaultTimedEventDuration);
+        else if ($.isFunction(rawInput)) { // short form
+            rawProps = { events: rawInput };
         }
-        if (this.getIsAmbigTimezone()) {
-            end.stripZone(); // we don't know what the tzo should be
+        if (rawProps) {
+            return EventSource_1.default.parse.call(this, rawProps, calendar);
         }
-        return end;
+        return false;
     };
-    // Public Events API
-    // -----------------------------------------------------------------------------------------------------------------
-    Calendar.prototype.rerenderEvents = function () {
-        this.view.flash('displayingEvents');
+    FuncEventSource.prototype.fetch = function (start, end, timezone) {
+        var _this = this;
+        this.calendar.pushLoading();
+        return Promise_1.default.construct(function (onResolve) {
+            _this.func.call(_this.calendar, start.clone(), end.clone(), timezone, function (rawEventDefs) {
+                _this.calendar.popLoading();
+                onResolve(_this.parseEventDefs(rawEventDefs));
+            });
+        });
     };
-    Calendar.prototype.refetchEvents = function () {
-        this.eventManager.refetchAllSources();
+    FuncEventSource.prototype.getPrimitive = function () {
+        return this.func;
     };
-    Calendar.prototype.renderEvents = function (eventInputs, isSticky) {
-        this.eventManager.freeze();
-        for (var i = 0; i < eventInputs.length; i++) {
-            this.renderEvent(eventInputs[i], isSticky);
-        }
-        this.eventManager.thaw();
+    FuncEventSource.prototype.applyManualStandardProps = function (rawProps) {
+        var superSuccess = _super.prototype.applyManualStandardProps.call(this, rawProps);
+        this.func = rawProps.events;
+        return superSuccess;
     };
-    Calendar.prototype.renderEvent = function (eventInput, isSticky) {
-        if (isSticky === void 0) { isSticky = false; }
-        var eventManager = this.eventManager;
-        var eventDef = EventDefParser_1.default.parse(eventInput, eventInput.source || eventManager.stickySource);
-        if (eventDef) {
-            eventManager.addEventDef(eventDef, isSticky);
+    return FuncEventSource;
+}(EventSource_1.default));
+exports.default = FuncEventSource;
+FuncEventSource.defineStandardProps({
+    events: false // don't automatically transfer
+});
+
+
+/***/ }),
+/* 224 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var $ = __webpack_require__(3);
+var util_1 = __webpack_require__(4);
+var Promise_1 = __webpack_require__(21);
+var EventSource_1 = __webpack_require__(6);
+var JsonFeedEventSource = /** @class */ (function (_super) {
+    tslib_1.__extends(JsonFeedEventSource, _super);
+    function JsonFeedEventSource() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    JsonFeedEventSource.parse = function (rawInput, calendar) {
+        var rawProps;
+        // normalize raw input
+        if (typeof rawInput.url === 'string') { // extended form
+            rawProps = rawInput;
         }
-    };
-    // legacyQuery operates on legacy event instance objects
-    Calendar.prototype.removeEvents = function (legacyQuery) {
-        var eventManager = this.eventManager;
-        var legacyInstances = [];
-        var idMap = {};
-        var eventDef;
-        var i;
-        if (legacyQuery == null) {
-            eventManager.removeAllEventDefs(); // persist=true
+        else if (typeof rawInput === 'string') { // short form
+            rawProps = { url: rawInput };
         }
-        else {
-            eventManager.getEventInstances().forEach(function (eventInstance) {
-                legacyInstances.push(eventInstance.toLegacy());
-            });
-            legacyInstances = filterLegacyEventInstances(legacyInstances, legacyQuery);
-            // compute unique IDs
-            for (i = 0; i < legacyInstances.length; i++) {
-                eventDef = this.eventManager.getEventDefByUid(legacyInstances[i]._id);
-                idMap[eventDef.id] = true;
-            }
-            eventManager.freeze();
-            for (i in idMap) {
-                eventManager.removeEventDefsById(i); // persist=true
-            }
-            eventManager.thaw();
+        if (rawProps) {
+            return EventSource_1.default.parse.call(this, rawProps, calendar);
         }
+        return false;
     };
-    // legacyQuery operates on legacy event instance objects
-    Calendar.prototype.clientEvents = function (legacyQuery) {
-        var legacyEventInstances = [];
-        this.eventManager.getEventInstances().forEach(function (eventInstance) {
-            legacyEventInstances.push(eventInstance.toLegacy());
+    JsonFeedEventSource.prototype.fetch = function (start, end, timezone) {
+        var _this = this;
+        var ajaxSettings = this.ajaxSettings;
+        var onSuccess = ajaxSettings.success;
+        var onError = ajaxSettings.error;
+        var requestParams = this.buildRequestParams(start, end, timezone);
+        // todo: eventually handle the promise's then,
+        // don't intercept success/error
+        // tho will be a breaking API change
+        this.calendar.pushLoading();
+        return Promise_1.default.construct(function (onResolve, onReject) {
+            $.ajax($.extend({}, // destination
+            JsonFeedEventSource.AJAX_DEFAULTS, ajaxSettings, {
+                url: _this.url,
+                data: requestParams,
+                success: function (rawEventDefs, status, xhr) {
+                    var callbackRes;
+                    _this.calendar.popLoading();
+                    if (rawEventDefs) {
+                        callbackRes = util_1.applyAll(onSuccess, _this, [rawEventDefs, status, xhr]); // redirect `this`
+                        if ($.isArray(callbackRes)) {
+                            rawEventDefs = callbackRes;
+                        }
+                        onResolve(_this.parseEventDefs(rawEventDefs));
+                    }
+                    else {
+                        onReject();
+                    }
+                },
+                error: function (xhr, statusText, errorThrown) {
+                    _this.calendar.popLoading();
+                    util_1.applyAll(onError, _this, [xhr, statusText, errorThrown]); // redirect `this`
+                    onReject();
+                }
+            }));
         });
-        return filterLegacyEventInstances(legacyEventInstances, legacyQuery);
     };
-    Calendar.prototype.updateEvents = function (eventPropsArray) {
-        this.eventManager.freeze();
-        for (var i = 0; i < eventPropsArray.length; i++) {
-            this.updateEvent(eventPropsArray[i]);
+    JsonFeedEventSource.prototype.buildRequestParams = function (start, end, timezone) {
+        var calendar = this.calendar;
+        var ajaxSettings = this.ajaxSettings;
+        var startParam;
+        var endParam;
+        var timezoneParam;
+        var customRequestParams;
+        var params = {};
+        startParam = this.startParam;
+        if (startParam == null) {
+            startParam = calendar.opt('startParam');
         }
-        this.eventManager.thaw();
-    };
-    Calendar.prototype.updateEvent = function (eventProps) {
-        var eventDef = this.eventManager.getEventDefByUid(eventProps._id);
-        var eventInstance;
-        var eventDefMutation;
-        if (eventDef instanceof SingleEventDef_1.default) {
-            eventInstance = eventDef.buildInstance();
-            eventDefMutation = EventDefMutation_1.default.createFromRawProps(eventInstance, eventProps, // raw props
-            null // largeUnit -- who uses it?
-            );
-            this.eventManager.mutateEventsWithId(eventDef.id, eventDefMutation); // will release
+        endParam = this.endParam;
+        if (endParam == null) {
+            endParam = calendar.opt('endParam');
         }
-    };
-    // Public Event Sources API
-    // ------------------------------------------------------------------------------------
-    Calendar.prototype.getEventSources = function () {
-        return this.eventManager.otherSources.slice(); // clone
-    };
-    Calendar.prototype.getEventSourceById = function (id) {
-        return this.eventManager.getSourceById(EventSource_1.default.normalizeId(id));
-    };
-    Calendar.prototype.addEventSource = function (sourceInput) {
-        var source = EventSourceParser_1.default.parse(sourceInput, this);
-        if (source) {
-            this.eventManager.addSource(source);
+        timezoneParam = this.timezoneParam;
+        if (timezoneParam == null) {
+            timezoneParam = calendar.opt('timezoneParam');
         }
-    };
-    Calendar.prototype.removeEventSources = function (sourceMultiQuery) {
-        var eventManager = this.eventManager;
-        var sources;
-        var i;
-        if (sourceMultiQuery == null) {
-            this.eventManager.removeAllSources();
+        // retrieve any outbound GET/POST $.ajax data from the options
+        if ($.isFunction(ajaxSettings.data)) {
+            // supplied as a function that returns a key/value object
+            customRequestParams = ajaxSettings.data();
         }
         else {
-            sources = eventManager.multiQuerySources(sourceMultiQuery);
-            eventManager.freeze();
-            for (i = 0; i < sources.length; i++) {
-                eventManager.removeSource(sources[i]);
-            }
-            eventManager.thaw();
+            // probably supplied as a straight key/value object
+            customRequestParams = ajaxSettings.data || {};
         }
-    };
-    Calendar.prototype.removeEventSource = function (sourceQuery) {
-        var eventManager = this.eventManager;
-        var sources = eventManager.querySources(sourceQuery);
-        var i;
-        eventManager.freeze();
-        for (i = 0; i < sources.length; i++) {
-            eventManager.removeSource(sources[i]);
+        $.extend(params, customRequestParams);
+        params[startParam] = start.format();
+        params[endParam] = end.format();
+        if (timezone && timezone !== 'local') {
+            params[timezoneParam] = timezone;
         }
-        eventManager.thaw();
+        return params;
     };
-    Calendar.prototype.refetchEventSources = function (sourceMultiQuery) {
-        var eventManager = this.eventManager;
-        var sources = eventManager.multiQuerySources(sourceMultiQuery);
-        var i;
-        eventManager.freeze();
-        for (i = 0; i < sources.length; i++) {
-            eventManager.refetchSource(sources[i]);
+    JsonFeedEventSource.prototype.getPrimitive = function () {
+        return this.url;
+    };
+    JsonFeedEventSource.prototype.applyMiscProps = function (rawProps) {
+        this.ajaxSettings = rawProps;
+    };
+    JsonFeedEventSource.AJAX_DEFAULTS = {
+        dataType: 'json',
+        cache: false
+    };
+    return JsonFeedEventSource;
+}(EventSource_1.default));
+exports.default = JsonFeedEventSource;
+JsonFeedEventSource.defineStandardProps({
+    // automatically transfer (true)...
+    url: true,
+    startParam: true,
+    endParam: true,
+    timezoneParam: true
+});
+
+
+/***/ }),
+/* 225 */
+/***/ (function(module, exports) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var Iterator = /** @class */ (function () {
+    function Iterator(items) {
+        this.items = items || [];
+    }
+    /* Calls a method on every item passing the arguments through */
+    Iterator.prototype.proxyCall = function (methodName) {
+        var args = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            args[_i - 1] = arguments[_i];
         }
-        eventManager.thaw();
+        var results = [];
+        this.items.forEach(function (item) {
+            results.push(item[methodName].apply(item, args));
+        });
+        return results;
     };
-    // not for internal use. use options module directly instead.
-    Calendar.defaults = options_1.globalDefaults;
-    Calendar.englishDefaults = options_1.englishDefaults;
-    Calendar.rtlDefaults = options_1.rtlDefaults;
-    return Calendar;
+    return Iterator;
 }());
-exports.default = Calendar;
-EmitterMixin_1.default.mixInto(Calendar);
-ListenerMixin_1.default.mixInto(Calendar);
-function filterLegacyEventInstances(legacyEventInstances, legacyQuery) {
-    if (legacyQuery == null) {
-        return legacyEventInstances;
-    }
-    else if ($.isFunction(legacyQuery)) {
-        return legacyEventInstances.filter(legacyQuery);
-    }
-    else {
-        legacyQuery += ''; // normalize to string
-        return legacyEventInstances.filter(function (legacyEventInstance) {
-            // soft comparison because id not be normalized to string
-            // tslint:disable-next-line
-            return legacyEventInstance.id == legacyQuery ||
-                legacyEventInstance._id === legacyQuery; // can specify internal id, but must exactly match
-        });
-    }
-}
+exports.default = Iterator;
 
 
 /***/ }),
-/* 221 */
+/* 226 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var moment = __webpack_require__(0);
+var $ = __webpack_require__(3);
 var util_1 = __webpack_require__(4);
-var UnzonedRange_1 = __webpack_require__(5);
-var DateProfileGenerator = /** @class */ (function () {
-    function DateProfileGenerator(_view) {
-        this._view = _view;
+var ListenerMixin_1 = __webpack_require__(7);
+/* Creates a clone of an element and lets it track the mouse as it moves
+----------------------------------------------------------------------------------------------------------------------*/
+var MouseFollower = /** @class */ (function () {
+    function MouseFollower(sourceEl, options) {
+        this.isFollowing = false;
+        this.isHidden = false;
+        this.isAnimating = false; // doing the revert animation?
+        this.options = options = options || {};
+        this.sourceEl = sourceEl;
+        this.parentEl = options.parentEl ? $(options.parentEl) : sourceEl.parent(); // default to sourceEl's parent
     }
-    DateProfileGenerator.prototype.opt = function (name) {
-        return this._view.opt(name);
-    };
-    DateProfileGenerator.prototype.trimHiddenDays = function (unzonedRange) {
-        return this._view.trimHiddenDays(unzonedRange);
-    };
-    DateProfileGenerator.prototype.msToUtcMoment = function (ms, forceAllDay) {
-        return this._view.calendar.msToUtcMoment(ms, forceAllDay);
-    };
-    /* Date Range Computation
-    ------------------------------------------------------------------------------------------------------------------*/
-    // Builds a structure with info about what the dates/ranges will be for the "prev" view.
-    DateProfileGenerator.prototype.buildPrev = function (currentDateProfile) {
-        var prevDate = currentDateProfile.date.clone()
-            .startOf(currentDateProfile.currentRangeUnit)
-            .subtract(currentDateProfile.dateIncrement);
-        return this.build(prevDate, -1);
-    };
-    // Builds a structure with info about what the dates/ranges will be for the "next" view.
-    DateProfileGenerator.prototype.buildNext = function (currentDateProfile) {
-        var nextDate = currentDateProfile.date.clone()
-            .startOf(currentDateProfile.currentRangeUnit)
-            .add(currentDateProfile.dateIncrement);
-        return this.build(nextDate, 1);
-    };
-    // Builds a structure holding dates/ranges for rendering around the given date.
-    // Optional direction param indicates whether the date is being incremented/decremented
-    // from its previous value. decremented = -1, incremented = 1 (default).
-    DateProfileGenerator.prototype.build = function (date, direction, forceToValid) {
-        if (forceToValid === void 0) { forceToValid = false; }
-        var isDateAllDay = !date.hasTime();
-        var validUnzonedRange;
-        var minTime = null;
-        var maxTime = null;
-        var currentInfo;
-        var isRangeAllDay;
-        var renderUnzonedRange;
-        var activeUnzonedRange;
-        var isValid;
-        validUnzonedRange = this.buildValidRange();
-        validUnzonedRange = this.trimHiddenDays(validUnzonedRange);
-        if (forceToValid) {
-            date = this.msToUtcMoment(validUnzonedRange.constrainDate(date), // returns MS
-            isDateAllDay);
-        }
-        currentInfo = this.buildCurrentRangeInfo(date, direction);
-        isRangeAllDay = /^(year|month|week|day)$/.test(currentInfo.unit);
-        renderUnzonedRange = this.buildRenderRange(this.trimHiddenDays(currentInfo.unzonedRange), currentInfo.unit, isRangeAllDay);
-        renderUnzonedRange = this.trimHiddenDays(renderUnzonedRange);
-        activeUnzonedRange = renderUnzonedRange.clone();
-        if (!this.opt('showNonCurrentDates')) {
-            activeUnzonedRange = activeUnzonedRange.intersect(currentInfo.unzonedRange);
-        }
-        minTime = moment.duration(this.opt('minTime'));
-        maxTime = moment.duration(this.opt('maxTime'));
-        activeUnzonedRange = this.adjustActiveRange(activeUnzonedRange, minTime, maxTime);
-        activeUnzonedRange = activeUnzonedRange.intersect(validUnzonedRange); // might return null
-        if (activeUnzonedRange) {
-            date = this.msToUtcMoment(activeUnzonedRange.constrainDate(date), // returns MS
-            isDateAllDay);
+    // Causes the element to start following the mouse
+    MouseFollower.prototype.start = function (ev) {
+        if (!this.isFollowing) {
+            this.isFollowing = true;
+            this.y0 = util_1.getEvY(ev);
+            this.x0 = util_1.getEvX(ev);
+            this.topDelta = 0;
+            this.leftDelta = 0;
+            if (!this.isHidden) {
+                this.updatePosition();
+            }
+            if (util_1.getEvIsTouch(ev)) {
+                this.listenTo($(document), 'touchmove', this.handleMove);
+            }
+            else {
+                this.listenTo($(document), 'mousemove', this.handleMove);
+            }
         }
-        // it's invalid if the originally requested date is not contained,
-        // or if the range is completely outside of the valid range.
-        isValid = currentInfo.unzonedRange.intersectsWith(validUnzonedRange);
-        return {
-            // constraint for where prev/next operations can go and where events can be dragged/resized to.
-            // an object with optional start and end properties.
-            validUnzonedRange: validUnzonedRange,
-            // range the view is formally responsible for.
-            // for example, a month view might have 1st-31st, excluding padded dates
-            currentUnzonedRange: currentInfo.unzonedRange,
-            // name of largest unit being displayed, like "month" or "week"
-            currentRangeUnit: currentInfo.unit,
-            isRangeAllDay: isRangeAllDay,
-            // dates that display events and accept drag-n-drop
-            // will be `null` if no dates accept events
-            activeUnzonedRange: activeUnzonedRange,
-            // date range with a rendered skeleton
-            // includes not-active days that need some sort of DOM
-            renderUnzonedRange: renderUnzonedRange,
-            // Duration object that denotes the first visible time of any given day
-            minTime: minTime,
-            // Duration object that denotes the exclusive visible end time of any given day
-            maxTime: maxTime,
-            isValid: isValid,
-            date: date,
-            // how far the current date will move for a prev/next operation
-            dateIncrement: this.buildDateIncrement(currentInfo.duration)
-            // pass a fallback (might be null) ^
-        };
-    };
-    // Builds an object with optional start/end properties.
-    // Indicates the minimum/maximum dates to display.
-    // not responsible for trimming hidden days.
-    DateProfileGenerator.prototype.buildValidRange = function () {
-        return this._view.getUnzonedRangeOption('validRange', this._view.calendar.getNow()) ||
-            new UnzonedRange_1.default(); // completely open-ended
     };
-    // Builds a structure with info about the "current" range, the range that is
-    // highlighted as being the current month for example.
-    // See build() for a description of `direction`.
-    // Guaranteed to have `range` and `unit` properties. `duration` is optional.
-    // TODO: accept a MS-time instead of a moment `date`?
-    DateProfileGenerator.prototype.buildCurrentRangeInfo = function (date, direction) {
-        var viewSpec = this._view.viewSpec;
-        var duration = null;
-        var unit = null;
-        var unzonedRange = null;
-        var dayCount;
-        if (viewSpec.duration) {
-            duration = viewSpec.duration;
-            unit = viewSpec.durationUnit;
-            unzonedRange = this.buildRangeFromDuration(date, direction, duration, unit);
+    // Causes the element to stop following the mouse. If shouldRevert is true, will animate back to original position.
+    // `callback` gets invoked when the animation is complete. If no animation, it is invoked immediately.
+    MouseFollower.prototype.stop = function (shouldRevert, callback) {
+        var _this = this;
+        var revertDuration = this.options.revertDuration;
+        var complete = function () {
+            _this.isAnimating = false;
+            _this.removeElement();
+            _this.top0 = _this.left0 = null; // reset state for future updatePosition calls
+            if (callback) {
+                callback();
+            }
+        };
+        if (this.isFollowing && !this.isAnimating) { // disallow more than one stop animation at a time
+            this.isFollowing = false;
+            this.stopListeningTo($(document));
+            if (shouldRevert && revertDuration && !this.isHidden) { // do a revert animation?
+                this.isAnimating = true;
+                this.el.animate({
+                    top: this.top0,
+                    left: this.left0
+                }, {
+                    duration: revertDuration,
+                    complete: complete
+                });
+            }
+            else {
+                complete();
+            }
         }
-        else if ((dayCount = this.opt('dayCount'))) {
-            unit = 'day';
-            unzonedRange = this.buildRangeFromDayCount(date, direction, dayCount);
+    };
+    // Gets the tracking element. Create it if necessary
+    MouseFollower.prototype.getEl = function () {
+        var el = this.el;
+        if (!el) {
+            el = this.el = this.sourceEl.clone()
+                .addClass(this.options.additionalClass || '')
+                .css({
+                position: 'absolute',
+                visibility: '',
+                display: this.isHidden ? 'none' : '',
+                margin: 0,
+                right: 'auto',
+                bottom: 'auto',
+                width: this.sourceEl.width(),
+                height: this.sourceEl.height(),
+                opacity: this.options.opacity || '',
+                zIndex: this.options.zIndex
+            });
+            // we don't want long taps or any mouse interaction causing selection/menus.
+            // would use preventSelection(), but that prevents selectstart, causing problems.
+            el.addClass('fc-unselectable');
+            el.appendTo(this.parentEl);
         }
-        else if ((unzonedRange = this.buildCustomVisibleRange(date))) {
-            unit = util_1.computeGreatestUnit(unzonedRange.getStart(), unzonedRange.getEnd());
+        return el;
+    };
+    // Removes the tracking element if it has already been created
+    MouseFollower.prototype.removeElement = function () {
+        if (this.el) {
+            this.el.remove();
+            this.el = null;
         }
-        else {
-            duration = this.getFallbackDuration();
-            unit = util_1.computeGreatestUnit(duration);
-            unzonedRange = this.buildRangeFromDuration(date, direction, duration, unit);
+    };
+    // Update the CSS position of the tracking element
+    MouseFollower.prototype.updatePosition = function () {
+        var sourceOffset;
+        var origin;
+        this.getEl(); // ensure this.el
+        // make sure origin info was computed
+        if (this.top0 == null) {
+            sourceOffset = this.sourceEl.offset();
+            origin = this.el.offsetParent().offset();
+            this.top0 = sourceOffset.top - origin.top;
+            this.left0 = sourceOffset.left - origin.left;
         }
-        return { duration: duration, unit: unit, unzonedRange: unzonedRange };
+        this.el.css({
+            top: this.top0 + this.topDelta,
+            left: this.left0 + this.leftDelta
+        });
     };
-    DateProfileGenerator.prototype.getFallbackDuration = function () {
-        return moment.duration({ days: 1 });
+    // Gets called when the user moves the mouse
+    MouseFollower.prototype.handleMove = function (ev) {
+        this.topDelta = util_1.getEvY(ev) - this.y0;
+        this.leftDelta = util_1.getEvX(ev) - this.x0;
+        if (!this.isHidden) {
+            this.updatePosition();
+        }
     };
-    // Returns a new activeUnzonedRange to have time values (un-ambiguate)
-    // minTime or maxTime causes the range to expand.
-    DateProfileGenerator.prototype.adjustActiveRange = function (unzonedRange, minTime, maxTime) {
-        var start = unzonedRange.getStart();
-        var end = unzonedRange.getEnd();
-        if (this._view.usesMinMaxTime) {
-            if (minTime < 0) {
-                start.time(0).add(minTime);
-            }
-            if (maxTime > 24 * 60 * 60 * 1000) {
-                end.time(maxTime - (24 * 60 * 60 * 1000));
+    // Temporarily makes the tracking element invisible. Can be called before following starts
+    MouseFollower.prototype.hide = function () {
+        if (!this.isHidden) {
+            this.isHidden = true;
+            if (this.el) {
+                this.el.hide();
             }
         }
-        return new UnzonedRange_1.default(start, end);
     };
-    // Builds the "current" range when it is specified as an explicit duration.
-    // `unit` is the already-computed computeGreatestUnit value of duration.
-    // TODO: accept a MS-time instead of a moment `date`?
-    DateProfileGenerator.prototype.buildRangeFromDuration = function (date, direction, duration, unit) {
-        var alignment = this.opt('dateAlignment');
-        var dateIncrementInput;
-        var dateIncrementDuration;
-        var start;
-        var end;
-        var res;
-        // compute what the alignment should be
-        if (!alignment) {
-            dateIncrementInput = this.opt('dateIncrement');
-            if (dateIncrementInput) {
-                dateIncrementDuration = moment.duration(dateIncrementInput);
-                // use the smaller of the two units
-                if (dateIncrementDuration < duration) {
-                    alignment = util_1.computeDurationGreatestUnit(dateIncrementDuration, dateIncrementInput);
-                }
-                else {
-                    alignment = unit;
-                }
-            }
-            else {
-                alignment = unit;
-            }
+    // Show the tracking element after it has been temporarily hidden
+    MouseFollower.prototype.show = function () {
+        if (this.isHidden) {
+            this.isHidden = false;
+            this.updatePosition();
+            this.getEl().show();
         }
-        // if the view displays a single day or smaller
-        if (duration.as('days') <= 1) {
-            if (this._view.isHiddenDay(start)) {
-                start = this._view.skipHiddenDays(start, direction);
-                start.startOf('day');
+    };
+    return MouseFollower;
+}());
+exports.default = MouseFollower;
+ListenerMixin_1.default.mixInto(MouseFollower);
+
+
+/***/ }),
+/* 227 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/* A rectangular panel that is absolutely positioned over other content
+------------------------------------------------------------------------------------------------------------------------
+Options:
+  - className (string)
+  - content (HTML string or jQuery element set)
+  - parentEl
+  - top
+  - left
+  - right (the x coord of where the right edge should be. not a "CSS" right)
+  - autoHide (boolean)
+  - show (callback)
+  - hide (callback)
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+var $ = __webpack_require__(3);
+var util_1 = __webpack_require__(4);
+var ListenerMixin_1 = __webpack_require__(7);
+var Popover = /** @class */ (function () {
+    function Popover(options) {
+        this.isHidden = true;
+        this.margin = 10; // the space required between the popover and the edges of the scroll container
+        this.options = options || {};
+    }
+    // Shows the popover on the specified position. Renders it if not already
+    Popover.prototype.show = function () {
+        if (this.isHidden) {
+            if (!this.el) {
+                this.render();
             }
+            this.el.show();
+            this.position();
+            this.isHidden = false;
+            this.trigger('show');
         }
-        function computeRes() {
-            start = date.clone().startOf(alignment);
-            end = start.clone().add(duration);
-            res = new UnzonedRange_1.default(start, end);
-        }
-        computeRes();
-        // if range is completely enveloped by hidden days, go past the hidden days
-        if (!this.trimHiddenDays(res)) {
-            date = this._view.skipHiddenDays(date, direction);
-            computeRes();
+    };
+    // Hides the popover, through CSS, but does not remove it from the DOM
+    Popover.prototype.hide = function () {
+        if (!this.isHidden) {
+            this.el.hide();
+            this.isHidden = true;
+            this.trigger('hide');
         }
-        return res;
     };
-    // Builds the "current" range when a dayCount is specified.
-    // TODO: accept a MS-time instead of a moment `date`?
-    DateProfileGenerator.prototype.buildRangeFromDayCount = function (date, direction, dayCount) {
-        var customAlignment = this.opt('dateAlignment');
-        var runningCount = 0;
-        var start = date.clone();
-        var end;
-        if (customAlignment) {
-            start.startOf(customAlignment);
+    // Creates `this.el` and renders content inside of it
+    Popover.prototype.render = function () {
+        var _this = this;
+        var options = this.options;
+        this.el = $('<div class="fc-popover">')
+            .addClass(options.className || '')
+            .css({
+            // position initially to the top left to avoid creating scrollbars
+            top: 0,
+            left: 0
+        })
+            .append(options.content)
+            .appendTo(options.parentEl);
+        // when a click happens on anything inside with a 'fc-close' className, hide the popover
+        this.el.on('click', '.fc-close', function () {
+            _this.hide();
+        });
+        if (options.autoHide) {
+            this.listenTo($(document), 'mousedown', this.documentMousedown);
         }
-        start.startOf('day');
-        start = this._view.skipHiddenDays(start, direction);
-        end = start.clone();
-        do {
-            end.add(1, 'day');
-            if (!this._view.isHiddenDay(end)) {
-                runningCount++;
-            }
-        } while (runningCount < dayCount);
-        return new UnzonedRange_1.default(start, end);
     };
-    // Builds a normalized range object for the "visible" range,
-    // which is a way to define the currentUnzonedRange and activeUnzonedRange at the same time.
-    // TODO: accept a MS-time instead of a moment `date`?
-    DateProfileGenerator.prototype.buildCustomVisibleRange = function (date) {
-        var visibleUnzonedRange = this._view.getUnzonedRangeOption('visibleRange', this._view.calendar.applyTimezone(date) // correct zone. also generates new obj that avoids mutations
-        );
-        if (visibleUnzonedRange && (visibleUnzonedRange.startMs == null || visibleUnzonedRange.endMs == null)) {
-            return null;
+    // Triggered when the user clicks *anywhere* in the document, for the autoHide feature
+    Popover.prototype.documentMousedown = function (ev) {
+        // only hide the popover if the click happened outside the popover
+        if (this.el && !$(ev.target).closest(this.el).length) {
+            this.hide();
         }
-        return visibleUnzonedRange;
     };
-    // Computes the range that will represent the element/cells for *rendering*,
-    // but which may have voided days/times.
-    // not responsible for trimming hidden days.
-    DateProfileGenerator.prototype.buildRenderRange = function (currentUnzonedRange, currentRangeUnit, isRangeAllDay) {
-        return currentUnzonedRange.clone();
+    // Hides and unregisters any handlers
+    Popover.prototype.removeElement = function () {
+        this.hide();
+        if (this.el) {
+            this.el.remove();
+            this.el = null;
+        }
+        this.stopListeningTo($(document), 'mousedown');
     };
-    // Compute the duration value that should be added/substracted to the current date
-    // when a prev/next operation happens.
-    DateProfileGenerator.prototype.buildDateIncrement = function (fallback) {
-        var dateIncrementInput = this.opt('dateIncrement');
-        var customAlignment;
-        if (dateIncrementInput) {
-            return moment.duration(dateIncrementInput);
+    // Positions the popover optimally, using the top/left/right options
+    Popover.prototype.position = function () {
+        var options = this.options;
+        var origin = this.el.offsetParent().offset();
+        var width = this.el.outerWidth();
+        var height = this.el.outerHeight();
+        var windowEl = $(window);
+        var viewportEl = util_1.getScrollParent(this.el);
+        var viewportTop;
+        var viewportLeft;
+        var viewportOffset;
+        var top; // the "position" (not "offset") values for the popover
+        var left; //
+        // compute top and left
+        top = options.top || 0;
+        if (options.left !== undefined) {
+            left = options.left;
         }
-        else if ((customAlignment = this.opt('dateAlignment'))) {
-            return moment.duration(1, customAlignment);
+        else if (options.right !== undefined) {
+            left = options.right - width; // derive the left value from the right value
         }
-        else if (fallback) {
-            return fallback;
+        else {
+            left = 0;
+        }
+        if (viewportEl.is(window) || viewportEl.is(document)) { // normalize getScrollParent's result
+            viewportEl = windowEl;
+            viewportTop = 0; // the window is always at the top left
+            viewportLeft = 0; // (and .offset() won't work if called here)
         }
         else {
-            return moment.duration({ days: 1 });
+            viewportOffset = viewportEl.offset();
+            viewportTop = viewportOffset.top;
+            viewportLeft = viewportOffset.left;
+        }
+        // if the window is scrolled, it causes the visible area to be further down
+        viewportTop += windowEl.scrollTop();
+        viewportLeft += windowEl.scrollLeft();
+        // constrain to the view port. if constrained by two edges, give precedence to top/left
+        if (options.viewportConstrain !== false) {
+            top = Math.min(top, viewportTop + viewportEl.outerHeight() - height - this.margin);
+            top = Math.max(top, viewportTop + this.margin);
+            left = Math.min(left, viewportLeft + viewportEl.outerWidth() - width - this.margin);
+            left = Math.max(left, viewportLeft + this.margin);
+        }
+        this.el.css({
+            top: top - origin.top,
+            left: left - origin.left
+        });
+    };
+    // Triggers a callback. Calls a function in the option hash of the same name.
+    // Arguments beyond the first `name` are forwarded on.
+    // TODO: better code reuse for this. Repeat code
+    Popover.prototype.trigger = function (name) {
+        if (this.options[name]) {
+            this.options[name].apply(this, Array.prototype.slice.call(arguments, 1));
         }
     };
-    return DateProfileGenerator;
+    return Popover;
 }());
-exports.default = DateProfileGenerator;
+exports.default = Popover;
+ListenerMixin_1.default.mixInto(Popover);
 
 
 /***/ }),
-/* 222 */
+/* 228 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var $ = __webpack_require__(3);
-var moment = __webpack_require__(0);
-var exportHooks = __webpack_require__(16);
-var util_1 = __webpack_require__(4);
-var moment_ext_1 = __webpack_require__(10);
-var ListenerMixin_1 = __webpack_require__(7);
-var HitDragListener_1 = __webpack_require__(23);
-var SingleEventDef_1 = __webpack_require__(13);
-var EventInstanceGroup_1 = __webpack_require__(18);
-var EventSource_1 = __webpack_require__(6);
-var Interaction_1 = __webpack_require__(15);
-var ExternalDropping = /** @class */ (function (_super) {
-    tslib_1.__extends(ExternalDropping, _super);
-    function ExternalDropping() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.isDragging = false; // jqui-dragging an external element? boolean
-        return _this;
+var EmitterMixin_1 = __webpack_require__(13);
+var TaskQueue = /** @class */ (function () {
+    function TaskQueue() {
+        this.q = [];
+        this.isPaused = false;
+        this.isRunning = false;
     }
-    /*
-    component impements:
-      - eventRangesToEventFootprints
-      - isEventInstanceGroupAllowed
-      - isExternalInstanceGroupAllowed
-      - renderDrag
-      - unrenderDrag
-    */
-    ExternalDropping.prototype.end = function () {
-        if (this.dragListener) {
-            this.dragListener.endInteraction();
+    TaskQueue.prototype.queue = function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
         }
+        this.q.push.apply(this.q, args); // append
+        this.tryStart();
     };
-    ExternalDropping.prototype.bindToDocument = function () {
-        this.listenTo($(document), {
-            dragstart: this.handleDragStart,
-            sortstart: this.handleDragStart // jqui
-        });
+    TaskQueue.prototype.pause = function () {
+        this.isPaused = true;
     };
-    ExternalDropping.prototype.unbindFromDocument = function () {
-        this.stopListeningTo($(document));
+    TaskQueue.prototype.resume = function () {
+        this.isPaused = false;
+        this.tryStart();
     };
-    // Called when a jQuery UI drag is initiated anywhere in the DOM
-    ExternalDropping.prototype.handleDragStart = function (ev, ui) {
-        var el;
-        var accept;
-        if (this.opt('droppable')) {
-            el = $((ui ? ui.item : null) || ev.target);
-            // Test that the dragged element passes the dropAccept selector or filter function.
-            // FYI, the default is "*" (matches all)
-            accept = this.opt('dropAccept');
-            if ($.isFunction(accept) ? accept.call(el[0], el) : el.is(accept)) {
-                if (!this.isDragging) {
-                    this.listenToExternalDrag(el, ev, ui);
-                }
-            }
+    TaskQueue.prototype.getIsIdle = function () {
+        return !this.isRunning && !this.isPaused;
+    };
+    TaskQueue.prototype.tryStart = function () {
+        if (!this.isRunning && this.canRunNext()) {
+            this.isRunning = true;
+            this.trigger('start');
+            this.runRemaining();
         }
     };
-    // Called when a jQuery UI drag starts and it needs to be monitored for dropping
-    ExternalDropping.prototype.listenToExternalDrag = function (el, ev, ui) {
+    TaskQueue.prototype.canRunNext = function () {
+        return !this.isPaused && this.q.length;
+    };
+    TaskQueue.prototype.runRemaining = function () {
         var _this = this;
-        var component = this.component;
-        var view = this.view;
-        var meta = getDraggedElMeta(el); // extra data about event drop, including possible event to create
-        var singleEventDef; // a null value signals an unsuccessful drag
-        // listener that tracks mouse movement over date-associated pixel regions
-        var dragListener = this.dragListener = new HitDragListener_1.default(component, {
-            interactionStart: function () {
-                _this.isDragging = true;
-            },
-            hitOver: function (hit) {
-                var isAllowed = true;
-                var hitFootprint = hit.component.getSafeHitFootprint(hit); // hit might not belong to this grid
-                var mutatedEventInstanceGroup;
-                if (hitFootprint) {
-                    singleEventDef = _this.computeExternalDrop(hitFootprint, meta);
-                    if (singleEventDef) {
-                        mutatedEventInstanceGroup = new EventInstanceGroup_1.default(singleEventDef.buildInstances());
-                        isAllowed = meta.eventProps ? // isEvent?
-                            component.isEventInstanceGroupAllowed(mutatedEventInstanceGroup) :
-                            component.isExternalInstanceGroupAllowed(mutatedEventInstanceGroup);
-                    }
-                    else {
-                        isAllowed = false;
+        var task;
+        var res;
+        do {
+            task = this.q.shift(); // always freshly reference q. might have been reassigned.
+            res = this.runTask(task);
+            if (res && res.then) {
+                res.then(function () {
+                    if (_this.canRunNext()) {
+                        _this.runRemaining();
                     }
-                }
-                else {
-                    isAllowed = false;
-                }
-                if (!isAllowed) {
-                    singleEventDef = null;
-                    util_1.disableCursor();
-                }
-                if (singleEventDef) {
-                    component.renderDrag(// called without a seg parameter
-                    component.eventRangesToEventFootprints(mutatedEventInstanceGroup.sliceRenderRanges(component.dateProfile.renderUnzonedRange, view.calendar)));
-                }
-            },
-            hitOut: function () {
-                singleEventDef = null; // signal unsuccessful
-            },
-            hitDone: function () {
-                util_1.enableCursor();
-                component.unrenderDrag();
-            },
-            interactionEnd: function (ev) {
-                if (singleEventDef) {
-                    view.reportExternalDrop(singleEventDef, Boolean(meta.eventProps), // isEvent
-                    Boolean(meta.stick), // isSticky
-                    el, ev, ui);
-                }
-                _this.isDragging = false;
-                _this.dragListener = null;
+                });
+                return; // prevent marking as stopped
             }
-        });
-        dragListener.startDrag(ev); // start listening immediately
+        } while (this.canRunNext());
+        this.trigger('stop'); // not really a 'stop' ... more of a 'drained'
+        this.isRunning = false;
+        // if 'stop' handler added more tasks.... TODO: write test for this
+        this.tryStart();
     };
-    // Given a hit to be dropped upon, and misc data associated with the jqui drag (guaranteed to be a plain object),
-    // returns the zoned start/end dates for the event that would result from the hypothetical drop. end might be null.
-    // Returning a null value signals an invalid drop hit.
-    // DOES NOT consider overlap/constraint.
-    // Assumes both footprints are non-open-ended.
-    ExternalDropping.prototype.computeExternalDrop = function (componentFootprint, meta) {
-        var calendar = this.view.calendar;
-        var start = moment_ext_1.default.utc(componentFootprint.unzonedRange.startMs).stripZone();
-        var end;
-        var eventDef;
-        if (componentFootprint.isAllDay) {
-            // if dropped on an all-day span, and element's metadata specified a time, set it
-            if (meta.startTime) {
-                start.time(meta.startTime);
+    TaskQueue.prototype.runTask = function (task) {
+        return task(); // task *is* the function, but subclasses can change the format of a task
+    };
+    return TaskQueue;
+}());
+exports.default = TaskQueue;
+EmitterMixin_1.default.mixInto(TaskQueue);
+
+
+/***/ }),
+/* 229 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var TaskQueue_1 = __webpack_require__(228);
+var RenderQueue = /** @class */ (function (_super) {
+    tslib_1.__extends(RenderQueue, _super);
+    function RenderQueue(waitsByNamespace) {
+        var _this = _super.call(this) || this;
+        _this.waitsByNamespace = waitsByNamespace || {};
+        return _this;
+    }
+    RenderQueue.prototype.queue = function (taskFunc, namespace, type) {
+        var task = {
+            func: taskFunc,
+            namespace: namespace,
+            type: type
+        };
+        var waitMs;
+        if (namespace) {
+            waitMs = this.waitsByNamespace[namespace];
+        }
+        if (this.waitNamespace) {
+            if (namespace === this.waitNamespace && waitMs != null) {
+                this.delayWait(waitMs);
             }
             else {
-                start.stripTime();
+                this.clearWait();
+                this.tryStart();
             }
         }
-        if (meta.duration) {
-            end = start.clone().add(meta.duration);
+        if (this.compoundTask(task)) { // appended to queue?
+            if (!this.waitNamespace && waitMs != null) {
+                this.startWait(namespace, waitMs);
+            }
+            else {
+                this.tryStart();
+            }
         }
-        start = calendar.applyTimezone(start);
-        if (end) {
-            end = calendar.applyTimezone(end);
+    };
+    RenderQueue.prototype.startWait = function (namespace, waitMs) {
+        this.waitNamespace = namespace;
+        this.spawnWait(waitMs);
+    };
+    RenderQueue.prototype.delayWait = function (waitMs) {
+        clearTimeout(this.waitId);
+        this.spawnWait(waitMs);
+    };
+    RenderQueue.prototype.spawnWait = function (waitMs) {
+        var _this = this;
+        this.waitId = setTimeout(function () {
+            _this.waitNamespace = null;
+            _this.tryStart();
+        }, waitMs);
+    };
+    RenderQueue.prototype.clearWait = function () {
+        if (this.waitNamespace) {
+            clearTimeout(this.waitId);
+            this.waitId = null;
+            this.waitNamespace = null;
+        }
+    };
+    RenderQueue.prototype.canRunNext = function () {
+        if (!_super.prototype.canRunNext.call(this)) {
+            return false;
+        }
+        // waiting for a certain namespace to stop receiving tasks?
+        if (this.waitNamespace) {
+            var q = this.q;
+            // if there was a different namespace task in the meantime,
+            // that forces all previously-waiting tasks to suddenly execute.
+            // TODO: find a way to do this in constant time.
+            for (var i = 0; i < q.length; i++) {
+                if (q[i].namespace !== this.waitNamespace) {
+                    return true; // allow execution
+                }
+            }
+            return false;
         }
-        eventDef = SingleEventDef_1.default.parse($.extend({}, meta.eventProps, {
-            start: start,
-            end: end
-        }), new EventSource_1.default(calendar));
-        return eventDef;
+        return true;
     };
-    return ExternalDropping;
-}(Interaction_1.default));
-exports.default = ExternalDropping;
-ListenerMixin_1.default.mixInto(ExternalDropping);
-/* External-Dragging-Element Data
-----------------------------------------------------------------------------------------------------------------------*/
-// Require all HTML5 data-* attributes used by FullCalendar to have this prefix.
-// A value of '' will query attributes like data-event. A value of 'fc' will query attributes like data-fc-event.
-exportHooks.dataAttrPrefix = '';
-// Given a jQuery element that might represent a dragged FullCalendar event, returns an intermediate data structure
-// to be used for Event Object creation.
-// A defined `.eventProps`, even when empty, indicates that an event should be created.
-function getDraggedElMeta(el) {
-    var prefix = exportHooks.dataAttrPrefix;
-    var eventProps; // properties for creating the event, not related to date/time
-    var startTime; // a Duration
-    var duration;
-    var stick;
-    if (prefix) {
-        prefix += '-';
-    }
-    eventProps = el.data(prefix + 'event') || null;
-    if (eventProps) {
-        if (typeof eventProps === 'object') {
-            eventProps = $.extend({}, eventProps); // make a copy
+    RenderQueue.prototype.runTask = function (task) {
+        task.func();
+    };
+    RenderQueue.prototype.compoundTask = function (newTask) {
+        var q = this.q;
+        var shouldAppend = true;
+        var i;
+        var task;
+        if (newTask.namespace && newTask.type === 'destroy') {
+            // remove all init/add/remove ops with same namespace, regardless of order
+            for (i = q.length - 1; i >= 0; i--) {
+                task = q[i];
+                if (task.namespace === newTask.namespace) {
+                    switch (task.type) {
+                        case 'init':
+                            shouldAppend = false;
+                        // the latest destroy is cancelled out by not doing the init
+                        /* falls through */
+                        case 'add':
+                        /* falls through */
+                        case 'remove':
+                            q.splice(i, 1); // remove task
+                    }
+                }
+            }
         }
-        else {
-            eventProps = {};
+        if (shouldAppend) {
+            q.push(newTask);
         }
-        // pluck special-cased date/time properties
-        startTime = eventProps.start;
-        if (startTime == null) {
-            startTime = eventProps.time;
-        } // accept 'time' as well
-        duration = eventProps.duration;
-        stick = eventProps.stick;
-        delete eventProps.start;
-        delete eventProps.time;
-        delete eventProps.duration;
-        delete eventProps.stick;
-    }
-    // fallback to standalone attribute values for each of the date/time properties
-    if (startTime == null) {
-        startTime = el.data(prefix + 'start');
-    }
-    if (startTime == null) {
-        startTime = el.data(prefix + 'time');
-    } // accept 'time' as well
-    if (duration == null) {
-        duration = el.data(prefix + 'duration');
-    }
-    if (stick == null) {
-        stick = el.data(prefix + 'stick');
+        return shouldAppend;
+    };
+    return RenderQueue;
+}(TaskQueue_1.default));
+exports.default = RenderQueue;
+
+
+/***/ }),
+/* 230 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var Model_1 = __webpack_require__(51);
+var Component = /** @class */ (function (_super) {
+    tslib_1.__extends(Component, _super);
+    function Component() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
-    // massage into correct data types
-    startTime = startTime != null ? moment.duration(startTime) : null;
-    duration = duration != null ? moment.duration(duration) : null;
-    stick = Boolean(stick);
-    return { eventProps: eventProps, startTime: startTime, duration: duration, stick: stick };
-}
+    Component.prototype.setElement = function (el) {
+        this.el = el;
+        this.bindGlobalHandlers();
+        this.renderSkeleton();
+        this.set('isInDom', true);
+    };
+    Component.prototype.removeElement = function () {
+        this.unset('isInDom');
+        this.unrenderSkeleton();
+        this.unbindGlobalHandlers();
+        this.el.remove();
+        // NOTE: don't null-out this.el in case the View was destroyed within an API callback.
+        // We don't null-out the View's other jQuery element references upon destroy,
+        //  so we shouldn't kill this.el either.
+    };
+    Component.prototype.bindGlobalHandlers = function () {
+        // subclasses can override
+    };
+    Component.prototype.unbindGlobalHandlers = function () {
+        // subclasses can override
+    };
+    /*
+    NOTE: Can't have a `render` method. Read the deprecation notice in View::executeDateRender
+    */
+    // Renders the basic structure of the view before any content is rendered
+    Component.prototype.renderSkeleton = function () {
+        // subclasses should implement
+    };
+    // Unrenders the basic structure of the view
+    Component.prototype.unrenderSkeleton = function () {
+        // subclasses should implement
+    };
+    return Component;
+}(Model_1.default));
+exports.default = Component;
 
 
 /***/ }),
-/* 223 */
+/* 231 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
 var $ = __webpack_require__(3);
+var moment = __webpack_require__(0);
 var util_1 = __webpack_require__(4);
-var EventDefMutation_1 = __webpack_require__(37);
-var EventDefDateMutation_1 = __webpack_require__(50);
-var HitDragListener_1 = __webpack_require__(23);
-var Interaction_1 = __webpack_require__(15);
-var EventResizing = /** @class */ (function (_super) {
-    tslib_1.__extends(EventResizing, _super);
-    /*
-    component impements:
-      - bindSegHandlerToEl
-      - publiclyTrigger
-      - diffDates
-      - eventRangesToEventFootprints
-      - isEventInstanceGroupAllowed
-      - getSafeHitFootprint
-    */
-    function EventResizing(component, eventPointing) {
-        var _this = _super.call(this, component) || this;
-        _this.isResizing = false;
-        _this.eventPointing = eventPointing;
+var moment_ext_1 = __webpack_require__(11);
+var date_formatting_1 = __webpack_require__(49);
+var Component_1 = __webpack_require__(230);
+var util_2 = __webpack_require__(19);
+var DateComponent = /** @class */ (function (_super) {
+    tslib_1.__extends(DateComponent, _super);
+    function DateComponent(_view, _options) {
+        var _this = _super.call(this) || this;
+        _this.isRTL = false; // frequently accessed options
+        _this.hitsNeededDepth = 0; // necessary because multiple callers might need the same hits
+        _this.hasAllDayBusinessHours = false; // TODO: unify with largeUnit and isTimeScale?
+        _this.isDatesRendered = false;
+        // hack to set options prior to the this.opt calls
+        if (_view) {
+            _this['view'] = _view;
+        }
+        if (_options) {
+            _this['options'] = _options;
+        }
+        _this.uid = String(DateComponent.guid++);
+        _this.childrenByUid = {};
+        _this.nextDayThreshold = moment.duration(_this.opt('nextDayThreshold'));
+        _this.isRTL = _this.opt('isRTL');
+        if (_this.fillRendererClass) {
+            _this.fillRenderer = new _this.fillRendererClass(_this);
+        }
+        if (_this.eventRendererClass) { // fillRenderer is optional -----v
+            _this.eventRenderer = new _this.eventRendererClass(_this, _this.fillRenderer);
+        }
+        if (_this.helperRendererClass && _this.eventRenderer) {
+            _this.helperRenderer = new _this.helperRendererClass(_this, _this.eventRenderer);
+        }
+        if (_this.businessHourRendererClass && _this.fillRenderer) {
+            _this.businessHourRenderer = new _this.businessHourRendererClass(_this, _this.fillRenderer);
+        }
         return _this;
     }
-    EventResizing.prototype.end = function () {
-        if (this.dragListener) {
-            this.dragListener.endInteraction();
+    DateComponent.prototype.addChild = function (child) {
+        if (!this.childrenByUid[child.uid]) {
+            this.childrenByUid[child.uid] = child;
+            return true;
+        }
+        return false;
+    };
+    DateComponent.prototype.removeChild = function (child) {
+        if (this.childrenByUid[child.uid]) {
+            delete this.childrenByUid[child.uid];
+            return true;
+        }
+        return false;
+    };
+    // TODO: only do if isInDom?
+    // TODO: make part of Component, along with children/batch-render system?
+    DateComponent.prototype.updateSize = function (totalHeight, isAuto, isResize) {
+        this.callChildren('updateSize', arguments);
+    };
+    // Options
+    // -----------------------------------------------------------------------------------------------------------------
+    DateComponent.prototype.opt = function (name) {
+        return this._getView().opt(name); // default implementation
+    };
+    DateComponent.prototype.publiclyTrigger = function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        var calendar = this._getCalendar();
+        return calendar.publiclyTrigger.apply(calendar, args);
+    };
+    DateComponent.prototype.hasPublicHandlers = function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        var calendar = this._getCalendar();
+        return calendar.hasPublicHandlers.apply(calendar, args);
+    };
+    // Date
+    // -----------------------------------------------------------------------------------------------------------------
+    DateComponent.prototype.executeDateRender = function (dateProfile) {
+        this.dateProfile = dateProfile; // for rendering
+        this.renderDates(dateProfile);
+        this.isDatesRendered = true;
+        this.callChildren('executeDateRender', arguments);
+    };
+    DateComponent.prototype.executeDateUnrender = function () {
+        this.callChildren('executeDateUnrender', arguments);
+        this.dateProfile = null;
+        this.unrenderDates();
+        this.isDatesRendered = false;
+    };
+    // date-cell content only
+    DateComponent.prototype.renderDates = function (dateProfile) {
+        // subclasses should implement
+    };
+    // date-cell content only
+    DateComponent.prototype.unrenderDates = function () {
+        // subclasses should override
+    };
+    // Now-Indicator
+    // -----------------------------------------------------------------------------------------------------------------
+    // Returns a string unit, like 'second' or 'minute' that defined how often the current time indicator
+    // should be refreshed. If something falsy is returned, no time indicator is rendered at all.
+    DateComponent.prototype.getNowIndicatorUnit = function () {
+        // subclasses should implement
+    };
+    // Renders a current time indicator at the given datetime
+    DateComponent.prototype.renderNowIndicator = function (date) {
+        this.callChildren('renderNowIndicator', arguments);
+    };
+    // Undoes the rendering actions from renderNowIndicator
+    DateComponent.prototype.unrenderNowIndicator = function () {
+        this.callChildren('unrenderNowIndicator', arguments);
+    };
+    // Business Hours
+    // ---------------------------------------------------------------------------------------------------------------
+    DateComponent.prototype.renderBusinessHours = function (businessHourGenerator) {
+        if (this.businessHourRenderer) {
+            this.businessHourRenderer.render(businessHourGenerator);
         }
+        this.callChildren('renderBusinessHours', arguments);
     };
-    EventResizing.prototype.bindToEl = function (el) {
-        var component = this.component;
-        component.bindSegHandlerToEl(el, 'mousedown', this.handleMouseDown.bind(this));
-        component.bindSegHandlerToEl(el, 'touchstart', this.handleTouchStart.bind(this));
+    // Unrenders previously-rendered business-hours
+    DateComponent.prototype.unrenderBusinessHours = function () {
+        this.callChildren('unrenderBusinessHours', arguments);
+        if (this.businessHourRenderer) {
+            this.businessHourRenderer.unrender();
+        }
     };
-    EventResizing.prototype.handleMouseDown = function (seg, ev) {
-        if (this.component.canStartResize(seg, ev)) {
-            this.buildDragListener(seg, $(ev.target).is('.fc-start-resizer'))
-                .startInteraction(ev, { distance: 5 });
+    // Event Displaying
+    // -----------------------------------------------------------------------------------------------------------------
+    DateComponent.prototype.executeEventRender = function (eventsPayload) {
+        if (this.eventRenderer) {
+            this.eventRenderer.rangeUpdated(); // poorly named now
+            this.eventRenderer.render(eventsPayload);
+        }
+        else if (this['renderEvents']) { // legacy
+            this['renderEvents'](convertEventsPayloadToLegacyArray(eventsPayload));
         }
+        this.callChildren('executeEventRender', arguments);
     };
-    EventResizing.prototype.handleTouchStart = function (seg, ev) {
-        if (this.component.canStartResize(seg, ev)) {
-            this.buildDragListener(seg, $(ev.target).is('.fc-start-resizer'))
-                .startInteraction(ev);
+    DateComponent.prototype.executeEventUnrender = function () {
+        this.callChildren('executeEventUnrender', arguments);
+        if (this.eventRenderer) {
+            this.eventRenderer.unrender();
+        }
+        else if (this['destroyEvents']) { // legacy
+            this['destroyEvents']();
         }
     };
-    // Creates a listener that tracks the user as they resize an event segment.
-    // Generic enough to work with any type of Grid.
-    EventResizing.prototype.buildDragListener = function (seg, isStart) {
+    DateComponent.prototype.getBusinessHourSegs = function () {
+        var segs = this.getOwnBusinessHourSegs();
+        this.iterChildren(function (child) {
+            segs.push.apply(segs, child.getBusinessHourSegs());
+        });
+        return segs;
+    };
+    DateComponent.prototype.getOwnBusinessHourSegs = function () {
+        if (this.businessHourRenderer) {
+            return this.businessHourRenderer.getSegs();
+        }
+        return [];
+    };
+    DateComponent.prototype.getEventSegs = function () {
+        var segs = this.getOwnEventSegs();
+        this.iterChildren(function (child) {
+            segs.push.apply(segs, child.getEventSegs());
+        });
+        return segs;
+    };
+    DateComponent.prototype.getOwnEventSegs = function () {
+        if (this.eventRenderer) {
+            return this.eventRenderer.getSegs();
+        }
+        return [];
+    };
+    // Event Rendering Triggering
+    // -----------------------------------------------------------------------------------------------------------------
+    DateComponent.prototype.triggerAfterEventsRendered = function () {
+        this.triggerAfterEventSegsRendered(this.getEventSegs());
+        this.publiclyTrigger('eventAfterAllRender', {
+            context: this,
+            args: [this]
+        });
+    };
+    DateComponent.prototype.triggerAfterEventSegsRendered = function (segs) {
         var _this = this;
-        var component = this.component;
-        var view = this.view;
-        var calendar = view.calendar;
-        var eventManager = calendar.eventManager;
-        var el = seg.el;
-        var eventDef = seg.footprint.eventDef;
-        var eventInstance = seg.footprint.eventInstance;
-        var isDragging;
-        var resizeMutation; // zoned event date properties. falsy if invalid resize
-        // Tracks mouse movement over the *grid's* coordinate map
-        var dragListener = this.dragListener = new HitDragListener_1.default(component, {
-            scroll: this.opt('dragScroll'),
-            subjectEl: el,
-            interactionStart: function () {
-                isDragging = false;
-            },
-            dragStart: function (ev) {
-                isDragging = true;
-                // ensure a mouseout on the manipulated event has been reported
-                _this.eventPointing.handleMouseout(seg, ev);
-                _this.segResizeStart(seg, ev);
-            },
-            hitOver: function (hit, isOrig, origHit) {
-                var isAllowed = true;
-                var origHitFootprint = component.getSafeHitFootprint(origHit);
-                var hitFootprint = component.getSafeHitFootprint(hit);
-                var mutatedEventInstanceGroup;
-                if (origHitFootprint && hitFootprint) {
-                    resizeMutation = isStart ?
-                        _this.computeEventStartResizeMutation(origHitFootprint, hitFootprint, seg.footprint) :
-                        _this.computeEventEndResizeMutation(origHitFootprint, hitFootprint, seg.footprint);
-                    if (resizeMutation) {
-                        mutatedEventInstanceGroup = eventManager.buildMutatedEventInstanceGroup(eventDef.id, resizeMutation);
-                        isAllowed = component.isEventInstanceGroupAllowed(mutatedEventInstanceGroup);
-                    }
-                    else {
-                        isAllowed = false;
-                    }
-                }
-                else {
-                    isAllowed = false;
-                }
-                if (!isAllowed) {
-                    resizeMutation = null;
-                    util_1.disableCursor();
-                }
-                else if (resizeMutation.isEmpty()) {
-                    // no change. (FYI, event dates might have zones)
-                    resizeMutation = null;
-                }
-                if (resizeMutation) {
-                    view.hideEventsWithId(seg.footprint.eventDef.id);
-                    view.renderEventResize(component.eventRangesToEventFootprints(mutatedEventInstanceGroup.sliceRenderRanges(component.dateProfile.renderUnzonedRange, calendar)), seg);
+        // an optimization, because getEventLegacy is expensive
+        if (this.hasPublicHandlers('eventAfterRender')) {
+            segs.forEach(function (seg) {
+                var legacy;
+                if (seg.el) { // necessary?
+                    legacy = seg.footprint.getEventLegacy();
+                    _this.publiclyTrigger('eventAfterRender', {
+                        context: legacy,
+                        args: [legacy, seg.el, _this]
+                    });
                 }
-            },
-            hitOut: function () {
-                resizeMutation = null;
-            },
-            hitDone: function () {
-                view.unrenderEventResize(seg);
-                view.showEventsWithId(seg.footprint.eventDef.id);
-                util_1.enableCursor();
-            },
-            interactionEnd: function (ev) {
-                if (isDragging) {
-                    _this.segResizeStop(seg, ev);
+            });
+        }
+    };
+    DateComponent.prototype.triggerBeforeEventsDestroyed = function () {
+        this.triggerBeforeEventSegsDestroyed(this.getEventSegs());
+    };
+    DateComponent.prototype.triggerBeforeEventSegsDestroyed = function (segs) {
+        var _this = this;
+        if (this.hasPublicHandlers('eventDestroy')) {
+            segs.forEach(function (seg) {
+                var legacy;
+                if (seg.el) { // necessary?
+                    legacy = seg.footprint.getEventLegacy();
+                    _this.publiclyTrigger('eventDestroy', {
+                        context: legacy,
+                        args: [legacy, seg.el, _this]
+                    });
                 }
-                if (resizeMutation) {
-                    // no need to re-show original, will rerender all anyways. esp important if eventRenderWait
-                    view.reportEventResize(eventInstance, resizeMutation, el, ev);
+            });
+        }
+    };
+    // Event Rendering Utils
+    // -----------------------------------------------------------------------------------------------------------------
+    // Hides all rendered event segments linked to the given event
+    // RECURSIVE with subcomponents
+    DateComponent.prototype.showEventsWithId = function (eventDefId) {
+        this.getEventSegs().forEach(function (seg) {
+            if (seg.footprint.eventDef.id === eventDefId &&
+                seg.el // necessary?
+            ) {
+                seg.el.css('visibility', '');
+            }
+        });
+        this.callChildren('showEventsWithId', arguments);
+    };
+    // Shows all rendered event segments linked to the given event
+    // RECURSIVE with subcomponents
+    DateComponent.prototype.hideEventsWithId = function (eventDefId) {
+        this.getEventSegs().forEach(function (seg) {
+            if (seg.footprint.eventDef.id === eventDefId &&
+                seg.el // necessary?
+            ) {
+                seg.el.css('visibility', 'hidden');
+            }
+        });
+        this.callChildren('hideEventsWithId', arguments);
+    };
+    // Drag-n-Drop Rendering (for both events and external elements)
+    // ---------------------------------------------------------------------------------------------------------------
+    // Renders a visual indication of a event or external-element drag over the given drop zone.
+    // If an external-element, seg will be `null`.
+    // Must return elements used for any mock events.
+    DateComponent.prototype.renderDrag = function (eventFootprints, seg, isTouch) {
+        var renderedHelper = false;
+        this.iterChildren(function (child) {
+            if (child.renderDrag(eventFootprints, seg, isTouch)) {
+                renderedHelper = true;
+            }
+        });
+        return renderedHelper;
+    };
+    // Unrenders a visual indication of an event or external-element being dragged.
+    DateComponent.prototype.unrenderDrag = function () {
+        this.callChildren('unrenderDrag', arguments);
+    };
+    // Event Resizing
+    // ---------------------------------------------------------------------------------------------------------------
+    // Renders a visual indication of an event being resized.
+    DateComponent.prototype.renderEventResize = function (eventFootprints, seg, isTouch) {
+        this.callChildren('renderEventResize', arguments);
+    };
+    // Unrenders a visual indication of an event being resized.
+    DateComponent.prototype.unrenderEventResize = function () {
+        this.callChildren('unrenderEventResize', arguments);
+    };
+    // Selection
+    // ---------------------------------------------------------------------------------------------------------------
+    // Renders a visual indication of the selection
+    // TODO: rename to `renderSelection` after legacy is gone
+    DateComponent.prototype.renderSelectionFootprint = function (componentFootprint) {
+        this.renderHighlight(componentFootprint);
+        this.callChildren('renderSelectionFootprint', arguments);
+    };
+    // Unrenders a visual indication of selection
+    DateComponent.prototype.unrenderSelection = function () {
+        this.unrenderHighlight();
+        this.callChildren('unrenderSelection', arguments);
+    };
+    // Highlight
+    // ---------------------------------------------------------------------------------------------------------------
+    // Renders an emphasis on the given date range. Given a span (unzoned start/end and other misc data)
+    DateComponent.prototype.renderHighlight = function (componentFootprint) {
+        if (this.fillRenderer) {
+            this.fillRenderer.renderFootprint('highlight', componentFootprint, {
+                getClasses: function () {
+                    return ['fc-highlight'];
                 }
-                _this.dragListener = null;
-            }
-        });
-        return dragListener;
+            });
+        }
+        this.callChildren('renderHighlight', arguments);
     };
-    // Called before event segment resizing starts
-    EventResizing.prototype.segResizeStart = function (seg, ev) {
-        this.isResizing = true;
-        this.component.publiclyTrigger('eventResizeStart', {
-            context: seg.el[0],
-            args: [
-                seg.footprint.getEventLegacy(),
-                ev,
-                {},
-                this.view
-            ]
-        });
+    // Unrenders the emphasis on a date range
+    DateComponent.prototype.unrenderHighlight = function () {
+        if (this.fillRenderer) {
+            this.fillRenderer.unrender('highlight');
+        }
+        this.callChildren('unrenderHighlight', arguments);
     };
-    // Called after event segment resizing stops
-    EventResizing.prototype.segResizeStop = function (seg, ev) {
-        this.isResizing = false;
-        this.component.publiclyTrigger('eventResizeStop', {
-            context: seg.el[0],
-            args: [
-                seg.footprint.getEventLegacy(),
-                ev,
-                {},
-                this.view
-            ]
-        });
+    // Hit Areas
+    // ---------------------------------------------------------------------------------------------------------------
+    // just because all DateComponents support this interface
+    // doesn't mean they need to have their own internal coord system. they can defer to sub-components.
+    DateComponent.prototype.hitsNeeded = function () {
+        if (!(this.hitsNeededDepth++)) {
+            this.prepareHits();
+        }
+        this.callChildren('hitsNeeded', arguments);
     };
-    // Returns new date-information for an event segment being resized from its start
-    EventResizing.prototype.computeEventStartResizeMutation = function (startFootprint, endFootprint, origEventFootprint) {
-        var origRange = origEventFootprint.componentFootprint.unzonedRange;
-        var startDelta = this.component.diffDates(endFootprint.unzonedRange.getStart(), startFootprint.unzonedRange.getStart());
-        var dateMutation;
-        var eventDefMutation;
-        if (origRange.getStart().add(startDelta) < origRange.getEnd()) {
-            dateMutation = new EventDefDateMutation_1.default();
-            dateMutation.setStartDelta(startDelta);
-            eventDefMutation = new EventDefMutation_1.default();
-            eventDefMutation.setDateMutation(dateMutation);
-            return eventDefMutation;
+    DateComponent.prototype.hitsNotNeeded = function () {
+        if (this.hitsNeededDepth && !(--this.hitsNeededDepth)) {
+            this.releaseHits();
         }
-        return false;
+        this.callChildren('hitsNotNeeded', arguments);
     };
-    // Returns new date-information for an event segment being resized from its end
-    EventResizing.prototype.computeEventEndResizeMutation = function (startFootprint, endFootprint, origEventFootprint) {
-        var origRange = origEventFootprint.componentFootprint.unzonedRange;
-        var endDelta = this.component.diffDates(endFootprint.unzonedRange.getEnd(), startFootprint.unzonedRange.getEnd());
-        var dateMutation;
-        var eventDefMutation;
-        if (origRange.getEnd().add(endDelta) > origRange.getStart()) {
-            dateMutation = new EventDefDateMutation_1.default();
-            dateMutation.setEndDelta(endDelta);
-            eventDefMutation = new EventDefMutation_1.default();
-            eventDefMutation.setDateMutation(dateMutation);
-            return eventDefMutation;
+    DateComponent.prototype.prepareHits = function () {
+        // subclasses can implement
+    };
+    DateComponent.prototype.releaseHits = function () {
+        // subclasses can implement
+    };
+    // Given coordinates from the topleft of the document, return data about the date-related area underneath.
+    // Can return an object with arbitrary properties (although top/right/left/bottom are encouraged).
+    // Must have a `grid` property, a reference to this current grid. TODO: avoid this
+    // The returned object will be processed by getHitFootprint and getHitEl.
+    DateComponent.prototype.queryHit = function (leftOffset, topOffset) {
+        var childrenByUid = this.childrenByUid;
+        var uid;
+        var hit;
+        for (uid in childrenByUid) {
+            hit = childrenByUid[uid].queryHit(leftOffset, topOffset);
+            if (hit) {
+                break;
+            }
         }
-        return false;
+        return hit;
     };
-    return EventResizing;
-}(Interaction_1.default));
-exports.default = EventResizing;
-
-
-/***/ }),
-/* 224 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var util_1 = __webpack_require__(4);
-var EventDefMutation_1 = __webpack_require__(37);
-var EventDefDateMutation_1 = __webpack_require__(50);
-var DragListener_1 = __webpack_require__(54);
-var HitDragListener_1 = __webpack_require__(23);
-var MouseFollower_1 = __webpack_require__(244);
-var Interaction_1 = __webpack_require__(15);
-var EventDragging = /** @class */ (function (_super) {
-    tslib_1.__extends(EventDragging, _super);
-    /*
-    component implements:
-      - bindSegHandlerToEl
-      - publiclyTrigger
-      - diffDates
-      - eventRangesToEventFootprints
-      - isEventInstanceGroupAllowed
-    */
-    function EventDragging(component, eventPointing) {
-        var _this = _super.call(this, component) || this;
-        _this.isDragging = false;
-        _this.eventPointing = eventPointing;
-        return _this;
-    }
-    EventDragging.prototype.end = function () {
-        if (this.dragListener) {
-            this.dragListener.endInteraction();
+    DateComponent.prototype.getSafeHitFootprint = function (hit) {
+        var footprint = this.getHitFootprint(hit);
+        if (!this.dateProfile.activeUnzonedRange.containsRange(footprint.unzonedRange)) {
+            return null;
         }
+        return footprint;
     };
-    EventDragging.prototype.getSelectionDelay = function () {
-        var delay = this.opt('eventLongPressDelay');
-        if (delay == null) {
-            delay = this.opt('longPressDelay'); // fallback
+    DateComponent.prototype.getHitFootprint = function (hit) {
+        // what about being abstract!?
+    };
+    // Given position-level information about a date-related area within the grid,
+    // should return a jQuery element that best represents it. passed to dayClick callback.
+    DateComponent.prototype.getHitEl = function (hit) {
+        // what about being abstract!?
+    };
+    /* Converting eventRange -> eventFootprint
+    ------------------------------------------------------------------------------------------------------------------*/
+    DateComponent.prototype.eventRangesToEventFootprints = function (eventRanges) {
+        var eventFootprints = [];
+        var i;
+        for (i = 0; i < eventRanges.length; i++) {
+            eventFootprints.push.apply(// append
+            eventFootprints, this.eventRangeToEventFootprints(eventRanges[i]));
         }
-        return delay;
+        return eventFootprints;
     };
-    EventDragging.prototype.bindToEl = function (el) {
-        var component = this.component;
-        component.bindSegHandlerToEl(el, 'mousedown', this.handleMousedown.bind(this));
-        component.bindSegHandlerToEl(el, 'touchstart', this.handleTouchStart.bind(this));
+    DateComponent.prototype.eventRangeToEventFootprints = function (eventRange) {
+        return [util_2.eventRangeToEventFootprint(eventRange)];
     };
-    EventDragging.prototype.handleMousedown = function (seg, ev) {
-        if (!this.component.shouldIgnoreMouse() &&
-            this.component.canStartDrag(seg, ev)) {
-            this.buildDragListener(seg).startInteraction(ev, { distance: 5 });
+    /* Converting componentFootprint/eventFootprint -> segs
+    ------------------------------------------------------------------------------------------------------------------*/
+    DateComponent.prototype.eventFootprintsToSegs = function (eventFootprints) {
+        var segs = [];
+        var i;
+        for (i = 0; i < eventFootprints.length; i++) {
+            segs.push.apply(segs, this.eventFootprintToSegs(eventFootprints[i]));
         }
+        return segs;
     };
-    EventDragging.prototype.handleTouchStart = function (seg, ev) {
-        var component = this.component;
-        var settings = {
-            delay: this.view.isEventDefSelected(seg.footprint.eventDef) ? // already selected?
-                0 : this.getSelectionDelay()
+    // Given an event's span (unzoned start/end and other misc data), and the event itself,
+    // slices into segments and attaches event-derived properties to them.
+    // eventSpan - { start, end, isStart, isEnd, otherthings... }
+    DateComponent.prototype.eventFootprintToSegs = function (eventFootprint) {
+        var unzonedRange = eventFootprint.componentFootprint.unzonedRange;
+        var segs;
+        var i;
+        var seg;
+        segs = this.componentFootprintToSegs(eventFootprint.componentFootprint);
+        for (i = 0; i < segs.length; i++) {
+            seg = segs[i];
+            if (!unzonedRange.isStart) {
+                seg.isStart = false;
+            }
+            if (!unzonedRange.isEnd) {
+                seg.isEnd = false;
+            }
+            seg.footprint = eventFootprint;
+            // TODO: rename to seg.eventFootprint
+        }
+        return segs;
+    };
+    DateComponent.prototype.componentFootprintToSegs = function (componentFootprint) {
+        return [];
+    };
+    // Utils
+    // ---------------------------------------------------------------------------------------------------------------
+    DateComponent.prototype.callChildren = function (methodName, args) {
+        this.iterChildren(function (child) {
+            child[methodName].apply(child, args);
+        });
+    };
+    DateComponent.prototype.iterChildren = function (func) {
+        var childrenByUid = this.childrenByUid;
+        var uid;
+        for (uid in childrenByUid) {
+            func(childrenByUid[uid]);
+        }
+    };
+    DateComponent.prototype._getCalendar = function () {
+        var t = this;
+        return t.calendar || t.view.calendar;
+    };
+    DateComponent.prototype._getView = function () {
+        return this.view;
+    };
+    DateComponent.prototype._getDateProfile = function () {
+        return this._getView().get('dateProfile');
+    };
+    // Generates HTML for an anchor to another view into the calendar.
+    // Will either generate an <a> tag or a non-clickable <span> tag, depending on enabled settings.
+    // `gotoOptions` can either be a moment input, or an object with the form:
+    // { date, type, forceOff }
+    // `type` is a view-type like "day" or "week". default value is "day".
+    // `attrs` and `innerHtml` are use to generate the rest of the HTML tag.
+    DateComponent.prototype.buildGotoAnchorHtml = function (gotoOptions, attrs, innerHtml) {
+        var date;
+        var type;
+        var forceOff;
+        var finalOptions;
+        if ($.isPlainObject(gotoOptions)) {
+            date = gotoOptions.date;
+            type = gotoOptions.type;
+            forceOff = gotoOptions.forceOff;
+        }
+        else {
+            date = gotoOptions; // a single moment input
+        }
+        date = moment_ext_1.default(date); // if a string, parse it
+        finalOptions = {
+            date: date.format('YYYY-MM-DD'),
+            type: type || 'day'
         };
-        if (component.canStartDrag(seg, ev)) {
-            this.buildDragListener(seg).startInteraction(ev, settings);
+        if (typeof attrs === 'string') {
+            innerHtml = attrs;
+            attrs = null;
+        }
+        attrs = attrs ? ' ' + util_1.attrsToStr(attrs) : ''; // will have a leading space
+        innerHtml = innerHtml || '';
+        if (!forceOff && this.opt('navLinks')) {
+            return '<a' + attrs +
+                ' data-goto="' + util_1.htmlEscape(JSON.stringify(finalOptions)) + '">' +
+                innerHtml +
+                '</a>';
         }
-        else if (component.canStartSelection(seg, ev)) {
-            this.buildSelectListener(seg).startInteraction(ev, settings);
+        else {
+            return '<span' + attrs + '>' +
+                innerHtml +
+                '</span>';
         }
     };
-    // seg isn't draggable, but let's use a generic DragListener
-    // simply for the delay, so it can be selected.
-    // Has side effect of setting/unsetting `dragListener`
-    EventDragging.prototype.buildSelectListener = function (seg) {
-        var _this = this;
-        var view = this.view;
-        var eventDef = seg.footprint.eventDef;
-        var eventInstance = seg.footprint.eventInstance; // null for inverse-background events
-        if (this.dragListener) {
-            return this.dragListener;
-        }
-        var dragListener = this.dragListener = new DragListener_1.default({
-            dragStart: function (ev) {
-                if (dragListener.isTouch &&
-                    !view.isEventDefSelected(eventDef) &&
-                    eventInstance) {
-                    // if not previously selected, will fire after a delay. then, select the event
-                    view.selectEventInstance(eventInstance);
-                }
-            },
-            interactionEnd: function (ev) {
-                _this.dragListener = null;
-            }
-        });
-        return dragListener;
+    DateComponent.prototype.getAllDayHtml = function () {
+        return this.opt('allDayHtml') || util_1.htmlEscape(this.opt('allDayText'));
     };
-    // Builds a listener that will track user-dragging on an event segment.
-    // Generic enough to work with any type of Grid.
-    // Has side effect of setting/unsetting `dragListener`
-    EventDragging.prototype.buildDragListener = function (seg) {
-        var _this = this;
-        var component = this.component;
-        var view = this.view;
-        var calendar = view.calendar;
-        var eventManager = calendar.eventManager;
-        var el = seg.el;
-        var eventDef = seg.footprint.eventDef;
-        var eventInstance = seg.footprint.eventInstance; // null for inverse-background events
-        var isDragging;
-        var mouseFollower; // A clone of the original element that will move with the mouse
-        var eventDefMutation;
-        if (this.dragListener) {
-            return this.dragListener;
+    // Computes HTML classNames for a single-day element
+    DateComponent.prototype.getDayClasses = function (date, noThemeHighlight) {
+        var view = this._getView();
+        var classes = [];
+        var today;
+        if (!this.dateProfile.activeUnzonedRange.containsDate(date)) {
+            classes.push('fc-disabled-day'); // TODO: jQuery UI theme?
         }
-        // Tracks mouse movement over the *view's* coordinate map. Allows dragging and dropping between subcomponents
-        // of the view.
-        var dragListener = this.dragListener = new HitDragListener_1.default(view, {
-            scroll: this.opt('dragScroll'),
-            subjectEl: el,
-            subjectCenter: true,
-            interactionStart: function (ev) {
-                seg.component = component; // for renderDrag
-                isDragging = false;
-                mouseFollower = new MouseFollower_1.default(seg.el, {
-                    additionalClass: 'fc-dragging',
-                    parentEl: view.el,
-                    opacity: dragListener.isTouch ? null : _this.opt('dragOpacity'),
-                    revertDuration: _this.opt('dragRevertDuration'),
-                    zIndex: 2 // one above the .fc-view
-                });
-                mouseFollower.hide(); // don't show until we know this is a real drag
-                mouseFollower.start(ev);
-            },
-            dragStart: function (ev) {
-                if (dragListener.isTouch &&
-                    !view.isEventDefSelected(eventDef) &&
-                    eventInstance) {
-                    // if not previously selected, will fire after a delay. then, select the event
-                    view.selectEventInstance(eventInstance);
-                }
-                isDragging = true;
-                // ensure a mouseout on the manipulated event has been reported
-                _this.eventPointing.handleMouseout(seg, ev);
-                _this.segDragStart(seg, ev);
-                view.hideEventsWithId(seg.footprint.eventDef.id);
-            },
-            hitOver: function (hit, isOrig, origHit) {
-                var isAllowed = true;
-                var origFootprint;
-                var footprint;
-                var mutatedEventInstanceGroup;
-                // starting hit could be forced (DayGrid.limit)
-                if (seg.hit) {
-                    origHit = seg.hit;
-                }
-                // hit might not belong to this grid, so query origin grid
-                origFootprint = origHit.component.getSafeHitFootprint(origHit);
-                footprint = hit.component.getSafeHitFootprint(hit);
-                if (origFootprint && footprint) {
-                    eventDefMutation = _this.computeEventDropMutation(origFootprint, footprint, eventDef);
-                    if (eventDefMutation) {
-                        mutatedEventInstanceGroup = eventManager.buildMutatedEventInstanceGroup(eventDef.id, eventDefMutation);
-                        isAllowed = component.isEventInstanceGroupAllowed(mutatedEventInstanceGroup);
-                    }
-                    else {
-                        isAllowed = false;
-                    }
-                }
-                else {
-                    isAllowed = false;
-                }
-                if (!isAllowed) {
-                    eventDefMutation = null;
-                    util_1.disableCursor();
-                }
-                // if a valid drop location, have the subclass render a visual indication
-                if (eventDefMutation &&
-                    view.renderDrag(// truthy if rendered something
-                    component.eventRangesToEventFootprints(mutatedEventInstanceGroup.sliceRenderRanges(component.dateProfile.renderUnzonedRange, calendar)), seg, dragListener.isTouch)) {
-                    mouseFollower.hide(); // if the subclass is already using a mock event "helper", hide our own
-                }
-                else {
-                    mouseFollower.show(); // otherwise, have the helper follow the mouse (no snapping)
-                }
-                if (isOrig) {
-                    // needs to have moved hits to be a valid drop
-                    eventDefMutation = null;
+        else {
+            classes.push('fc-' + util_1.dayIDs[date.day()]);
+            if (view.isDateInOtherMonth(date, this.dateProfile)) { // TODO: use DateComponent subclass somehow
+                classes.push('fc-other-month');
+            }
+            today = view.calendar.getNow();
+            if (date.isSame(today, 'day')) {
+                classes.push('fc-today');
+                if (noThemeHighlight !== true) {
+                    classes.push(view.calendar.theme.getClass('today'));
                 }
-            },
-            hitOut: function () {
-                view.unrenderDrag(seg); // unrender whatever was done in renderDrag
-                mouseFollower.show(); // show in case we are moving out of all hits
-                eventDefMutation = null;
-            },
-            hitDone: function () {
-                util_1.enableCursor();
-            },
-            interactionEnd: function (ev) {
-                delete seg.component; // prevent side effects
-                // do revert animation if hasn't changed. calls a callback when finished (whether animation or not)
-                mouseFollower.stop(!eventDefMutation, function () {
-                    if (isDragging) {
-                        view.unrenderDrag(seg);
-                        _this.segDragStop(seg, ev);
-                    }
-                    view.showEventsWithId(seg.footprint.eventDef.id);
-                    if (eventDefMutation) {
-                        // no need to re-show original, will rerender all anyways. esp important if eventRenderWait
-                        view.reportEventDrop(eventInstance, eventDefMutation, el, ev);
-                    }
-                });
-                _this.dragListener = null;
             }
-        });
-        return dragListener;
-    };
-    // Called before event segment dragging starts
-    EventDragging.prototype.segDragStart = function (seg, ev) {
-        this.isDragging = true;
-        this.component.publiclyTrigger('eventDragStart', {
-            context: seg.el[0],
-            args: [
-                seg.footprint.getEventLegacy(),
-                ev,
-                {},
-                this.view
-            ]
-        });
-    };
-    // Called after event segment dragging stops
-    EventDragging.prototype.segDragStop = function (seg, ev) {
-        this.isDragging = false;
-        this.component.publiclyTrigger('eventDragStop', {
-            context: seg.el[0],
-            args: [
-                seg.footprint.getEventLegacy(),
-                ev,
-                {},
-                this.view
-            ]
-        });
-    };
-    // DOES NOT consider overlap/constraint
-    EventDragging.prototype.computeEventDropMutation = function (startFootprint, endFootprint, eventDef) {
-        var eventDefMutation = new EventDefMutation_1.default();
-        eventDefMutation.setDateMutation(this.computeEventDateMutation(startFootprint, endFootprint));
-        return eventDefMutation;
-    };
-    EventDragging.prototype.computeEventDateMutation = function (startFootprint, endFootprint) {
-        var date0 = startFootprint.unzonedRange.getStart();
-        var date1 = endFootprint.unzonedRange.getStart();
-        var clearEnd = false;
-        var forceTimed = false;
-        var forceAllDay = false;
-        var dateDelta;
-        var dateMutation;
-        if (startFootprint.isAllDay !== endFootprint.isAllDay) {
-            clearEnd = true;
-            if (endFootprint.isAllDay) {
-                forceAllDay = true;
-                date0.stripTime();
+            else if (date < today) {
+                classes.push('fc-past');
             }
             else {
-                forceTimed = true;
+                classes.push('fc-future');
             }
         }
-        dateDelta = this.component.diffDates(date1, date0);
-        dateMutation = new EventDefDateMutation_1.default();
-        dateMutation.clearEnd = clearEnd;
-        dateMutation.forceTimed = forceTimed;
-        dateMutation.forceAllDay = forceAllDay;
-        dateMutation.setDateDelta(dateDelta);
-        return dateMutation;
+        return classes;
+    };
+    // Utility for formatting a range. Accepts a range object, formatting string, and optional separator.
+    // Displays all-day ranges naturally, with an inclusive end. Takes the current isRTL into account.
+    // The timezones of the dates within `range` will be respected.
+    DateComponent.prototype.formatRange = function (range, isAllDay, formatStr, separator) {
+        var end = range.end;
+        if (isAllDay) {
+            end = end.clone().subtract(1); // convert to inclusive. last ms of previous day
+        }
+        return date_formatting_1.formatRange(range.start, end, formatStr, separator, this.isRTL);
+    };
+    // Compute the number of the give units in the "current" range.
+    // Will return a floating-point number. Won't round.
+    DateComponent.prototype.currentRangeAs = function (unit) {
+        return this._getDateProfile().currentUnzonedRange.as(unit);
+    };
+    // Returns the date range of the full days the given range visually appears to occupy.
+    // Returns a plain object with start/end, NOT an UnzonedRange!
+    DateComponent.prototype.computeDayRange = function (unzonedRange) {
+        var calendar = this._getCalendar();
+        var startDay = calendar.msToUtcMoment(unzonedRange.startMs, true); // the beginning of the day the range starts
+        var end = calendar.msToUtcMoment(unzonedRange.endMs);
+        var endTimeMS = +end.time(); // # of milliseconds into `endDay`
+        var endDay = end.clone().stripTime(); // the beginning of the day the range exclusively ends
+        // If the end time is actually inclusively part of the next day and is equal to or
+        // beyond the next day threshold, adjust the end to be the exclusive end of `endDay`.
+        // Otherwise, leaving it as inclusive will cause it to exclude `endDay`.
+        if (endTimeMS && endTimeMS >= this.nextDayThreshold) {
+            endDay.add(1, 'days');
+        }
+        // If end is within `startDay` but not past nextDayThreshold, assign the default duration of one day.
+        if (endDay <= startDay) {
+            endDay = startDay.clone().add(1, 'days');
+        }
+        return { start: startDay, end: endDay };
     };
-    return EventDragging;
-}(Interaction_1.default));
-exports.default = EventDragging;
+    // Does the given range visually appear to occupy more than one day?
+    DateComponent.prototype.isMultiDayRange = function (unzonedRange) {
+        var dayRange = this.computeDayRange(unzonedRange);
+        return dayRange.end.diff(dayRange.start, 'days') > 1;
+    };
+    DateComponent.guid = 0; // TODO: better system for this?
+    return DateComponent;
+}(Component_1.default));
+exports.default = DateComponent;
+// legacy
+function convertEventsPayloadToLegacyArray(eventsPayload) {
+    var eventDefId;
+    var eventInstances;
+    var legacyEvents = [];
+    var i;
+    for (eventDefId in eventsPayload) {
+        eventInstances = eventsPayload[eventDefId].eventInstances;
+        for (i = 0; i < eventInstances.length; i++) {
+            legacyEvents.push(eventInstances[i].toLegacy());
+        }
+    }
+    return legacyEvents;
+}
 
 
 /***/ }),
-/* 225 */
+/* 232 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
+var $ = __webpack_require__(3);
+var moment = __webpack_require__(0);
 var util_1 = __webpack_require__(4);
-var HitDragListener_1 = __webpack_require__(23);
-var ComponentFootprint_1 = __webpack_require__(12);
+var options_1 = __webpack_require__(33);
+var Iterator_1 = __webpack_require__(225);
+var GlobalEmitter_1 = __webpack_require__(23);
+var EmitterMixin_1 = __webpack_require__(13);
+var ListenerMixin_1 = __webpack_require__(7);
+var Toolbar_1 = __webpack_require__(257);
+var OptionsManager_1 = __webpack_require__(258);
+var ViewSpecManager_1 = __webpack_require__(259);
+var Constraints_1 = __webpack_require__(217);
+var locale_1 = __webpack_require__(32);
+var moment_ext_1 = __webpack_require__(11);
 var UnzonedRange_1 = __webpack_require__(5);
-var Interaction_1 = __webpack_require__(15);
-var DateSelecting = /** @class */ (function (_super) {
-    tslib_1.__extends(DateSelecting, _super);
-    /*
-    component must implement:
-      - bindDateHandlerToEl
-      - getSafeHitFootprint
-      - renderHighlight
-      - unrenderHighlight
-    */
-    function DateSelecting(component) {
-        var _this = _super.call(this, component) || this;
-        _this.dragListener = _this.buildDragListener();
-        return _this;
+var ComponentFootprint_1 = __webpack_require__(12);
+var EventDateProfile_1 = __webpack_require__(16);
+var EventManager_1 = __webpack_require__(220);
+var BusinessHourGenerator_1 = __webpack_require__(218);
+var EventSourceParser_1 = __webpack_require__(38);
+var EventDefParser_1 = __webpack_require__(36);
+var SingleEventDef_1 = __webpack_require__(9);
+var EventDefMutation_1 = __webpack_require__(39);
+var EventSource_1 = __webpack_require__(6);
+var ThemeRegistry_1 = __webpack_require__(57);
+var Calendar = /** @class */ (function () {
+    function Calendar(el, overrides) {
+        this.loadingLevel = 0; // number of simultaneous loading tasks
+        this.ignoreUpdateViewSize = 0;
+        this.freezeContentHeightDepth = 0;
+        // declare the current calendar instance relies on GlobalEmitter. needed for garbage collection.
+        // unneeded() is called in destroy.
+        GlobalEmitter_1.default.needed();
+        this.el = el;
+        this.viewsByType = {};
+        this.optionsManager = new OptionsManager_1.default(this, overrides);
+        this.viewSpecManager = new ViewSpecManager_1.default(this.optionsManager, this);
+        this.initMomentInternals(); // needs to happen after options hash initialized
+        this.initCurrentDate();
+        this.initEventManager();
+        this.constraints = new Constraints_1.default(this.eventManager, this);
+        this.constructed();
     }
-    DateSelecting.prototype.end = function () {
-        this.dragListener.endInteraction();
+    Calendar.prototype.constructed = function () {
+        // useful for monkeypatching. used?
     };
-    DateSelecting.prototype.getDelay = function () {
-        var delay = this.opt('selectLongPressDelay');
-        if (delay == null) {
-            delay = this.opt('longPressDelay'); // fallback
+    Calendar.prototype.getView = function () {
+        return this.view;
+    };
+    Calendar.prototype.publiclyTrigger = function (name, triggerInfo) {
+        var optHandler = this.opt(name);
+        var context;
+        var args;
+        if ($.isPlainObject(triggerInfo)) {
+            context = triggerInfo.context;
+            args = triggerInfo.args;
+        }
+        else if ($.isArray(triggerInfo)) {
+            args = triggerInfo;
+        }
+        if (context == null) {
+            context = this.el[0]; // fallback context
+        }
+        if (!args) {
+            args = [];
+        }
+        this.triggerWith(name, context, args); // Emitter's method
+        if (optHandler) {
+            return optHandler.apply(context, args);
         }
-        return delay;
     };
-    DateSelecting.prototype.bindToEl = function (el) {
-        var _this = this;
-        var component = this.component;
-        var dragListener = this.dragListener;
-        component.bindDateHandlerToEl(el, 'mousedown', function (ev) {
-            if (_this.opt('selectable') && !component.shouldIgnoreMouse()) {
-                dragListener.startInteraction(ev, {
-                    distance: _this.opt('selectMinDistance')
-                });
+    Calendar.prototype.hasPublicHandlers = function (name) {
+        return this.hasHandlers(name) ||
+            this.opt(name); // handler specified in options
+    };
+    // Options Public API
+    // -----------------------------------------------------------------------------------------------------------------
+    // public getter/setter
+    Calendar.prototype.option = function (name, value) {
+        var newOptionHash;
+        if (typeof name === 'string') {
+            if (value === undefined) { // getter
+                return this.optionsManager.get(name);
             }
-        });
-        component.bindDateHandlerToEl(el, 'touchstart', function (ev) {
-            if (_this.opt('selectable') && !component.shouldIgnoreTouch()) {
-                dragListener.startInteraction(ev, {
-                    delay: _this.getDelay()
-                });
+            else { // setter for individual option
+                newOptionHash = {};
+                newOptionHash[name] = value;
+                this.optionsManager.add(newOptionHash);
             }
-        });
-        util_1.preventSelection(el);
+        }
+        else if (typeof name === 'object') { // compound setter with object input
+            this.optionsManager.add(name);
+        }
     };
-    // Creates a listener that tracks the user's drag across day elements, for day selecting.
-    DateSelecting.prototype.buildDragListener = function () {
-        var _this = this;
-        var component = this.component;
-        var selectionFootprint; // null if invalid selection
-        var dragListener = new HitDragListener_1.default(component, {
-            scroll: this.opt('dragScroll'),
-            interactionStart: function () {
-                selectionFootprint = null;
-            },
-            dragStart: function (ev) {
-                _this.view.unselect(ev); // since we could be rendering a new selection, we want to clear any old one
-            },
-            hitOver: function (hit, isOrig, origHit) {
-                var origHitFootprint;
-                var hitFootprint;
-                if (origHit) {
-                    origHitFootprint = component.getSafeHitFootprint(origHit);
-                    hitFootprint = component.getSafeHitFootprint(hit);
-                    if (origHitFootprint && hitFootprint) {
-                        selectionFootprint = _this.computeSelection(origHitFootprint, hitFootprint);
-                    }
-                    else {
-                        selectionFootprint = null;
-                    }
-                    if (selectionFootprint) {
-                        component.renderSelectionFootprint(selectionFootprint);
-                    }
-                    else if (selectionFootprint === false) {
-                        util_1.disableCursor();
-                    }
-                }
-            },
-            hitOut: function () {
-                selectionFootprint = null;
-                component.unrenderSelection();
-            },
-            hitDone: function () {
-                util_1.enableCursor();
-            },
-            interactionEnd: function (ev, isCancelled) {
-                if (!isCancelled && selectionFootprint) {
-                    // the selection will already have been rendered. just report it
-                    _this.view.reportSelection(selectionFootprint, ev);
-                }
+    // private getter
+    Calendar.prototype.opt = function (name) {
+        return this.optionsManager.get(name);
+    };
+    // View
+    // -----------------------------------------------------------------------------------------------------------------
+    // Given a view name for a custom view or a standard view, creates a ready-to-go View object
+    Calendar.prototype.instantiateView = function (viewType) {
+        var spec = this.viewSpecManager.getViewSpec(viewType);
+        if (!spec) {
+            throw new Error("View type \"" + viewType + "\" is not valid");
+        }
+        return new spec['class'](this, spec);
+    };
+    // Returns a boolean about whether the view is okay to instantiate at some point
+    Calendar.prototype.isValidViewType = function (viewType) {
+        return Boolean(this.viewSpecManager.getViewSpec(viewType));
+    };
+    Calendar.prototype.changeView = function (viewName, dateOrRange) {
+        if (dateOrRange) {
+            if (dateOrRange.start && dateOrRange.end) { // a range
+                this.optionsManager.recordOverrides({
+                    visibleRange: dateOrRange
+                });
             }
-        });
-        return dragListener;
+            else { // a date
+                this.currentDate = this.moment(dateOrRange).stripZone(); // just like gotoDate
+            }
+        }
+        this.renderView(viewName);
     };
-    // Given the first and last date-spans of a selection, returns another date-span object.
-    // Subclasses can override and provide additional data in the span object. Will be passed to renderSelectionFootprint().
-    // Will return false if the selection is invalid and this should be indicated to the user.
-    // Will return null/undefined if a selection invalid but no error should be reported.
-    DateSelecting.prototype.computeSelection = function (footprint0, footprint1) {
-        var wholeFootprint = this.computeSelectionFootprint(footprint0, footprint1);
-        if (wholeFootprint && !this.isSelectionFootprintAllowed(wholeFootprint)) {
-            return false;
+    // Forces navigation to a view for the given date.
+    // `viewType` can be a specific view name or a generic one like "week" or "day".
+    Calendar.prototype.zoomTo = function (newDate, viewType) {
+        var spec;
+        viewType = viewType || 'day'; // day is default zoom
+        spec = this.viewSpecManager.getViewSpec(viewType) ||
+            this.viewSpecManager.getUnitViewSpec(viewType);
+        this.currentDate = newDate.clone();
+        this.renderView(spec ? spec.type : null);
+    };
+    // Current Date
+    // -----------------------------------------------------------------------------------------------------------------
+    Calendar.prototype.initCurrentDate = function () {
+        var defaultDateInput = this.opt('defaultDate');
+        // compute the initial ambig-timezone date
+        if (defaultDateInput != null) {
+            this.currentDate = this.moment(defaultDateInput).stripZone();
+        }
+        else {
+            this.currentDate = this.getNow(); // getNow already returns unzoned
+        }
+    };
+    Calendar.prototype.prev = function () {
+        var view = this.view;
+        var prevInfo = view.dateProfileGenerator.buildPrev(view.get('dateProfile'));
+        if (prevInfo.isValid) {
+            this.currentDate = prevInfo.date;
+            this.renderView();
+        }
+    };
+    Calendar.prototype.next = function () {
+        var view = this.view;
+        var nextInfo = view.dateProfileGenerator.buildNext(view.get('dateProfile'));
+        if (nextInfo.isValid) {
+            this.currentDate = nextInfo.date;
+            this.renderView();
         }
-        return wholeFootprint;
     };
-    // Given two spans, must return the combination of the two.
-    // TODO: do this separation of concerns (combining VS validation) for event dnd/resize too.
-    // Assumes both footprints are non-open-ended.
-    DateSelecting.prototype.computeSelectionFootprint = function (footprint0, footprint1) {
-        var ms = [
-            footprint0.unzonedRange.startMs,
-            footprint0.unzonedRange.endMs,
-            footprint1.unzonedRange.startMs,
-            footprint1.unzonedRange.endMs
-        ];
-        ms.sort(util_1.compareNumbers);
-        return new ComponentFootprint_1.default(new UnzonedRange_1.default(ms[0], ms[3]), footprint0.isAllDay);
+    Calendar.prototype.prevYear = function () {
+        this.currentDate.add(-1, 'years');
+        this.renderView();
     };
-    DateSelecting.prototype.isSelectionFootprintAllowed = function (componentFootprint) {
-        return this.component.dateProfile.validUnzonedRange.containsRange(componentFootprint.unzonedRange) &&
-            this.view.calendar.constraints.isSelectionFootprintAllowed(componentFootprint);
+    Calendar.prototype.nextYear = function () {
+        this.currentDate.add(1, 'years');
+        this.renderView();
     };
-    return DateSelecting;
-}(Interaction_1.default));
-exports.default = DateSelecting;
-
-
-/***/ }),
-/* 226 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var moment = __webpack_require__(0);
-var $ = __webpack_require__(3);
-var util_1 = __webpack_require__(4);
-var Scroller_1 = __webpack_require__(39);
-var View_1 = __webpack_require__(41);
-var TimeGrid_1 = __webpack_require__(227);
-var DayGrid_1 = __webpack_require__(61);
-var AGENDA_ALL_DAY_EVENT_LIMIT = 5;
-var agendaTimeGridMethods;
-var agendaDayGridMethods;
-/* An abstract class for all agenda-related views. Displays one more columns with time slots running vertically.
-----------------------------------------------------------------------------------------------------------------------*/
-// Is a manager for the TimeGrid subcomponent and possibly the DayGrid subcomponent (if allDaySlot is on).
-// Responsible for managing width/height.
-var AgendaView = /** @class */ (function (_super) {
-    tslib_1.__extends(AgendaView, _super);
-    function AgendaView(calendar, viewSpec) {
-        var _this = _super.call(this, calendar, viewSpec) || this;
-        _this.usesMinMaxTime = true; // indicates that minTime/maxTime affects rendering
-        _this.timeGrid = _this.instantiateTimeGrid();
-        _this.addChild(_this.timeGrid);
-        if (_this.opt('allDaySlot')) {
-            _this.dayGrid = _this.instantiateDayGrid(); // the all-day subcomponent of this view
-            _this.addChild(_this.dayGrid);
-        }
-        _this.scroller = new Scroller_1.default({
-            overflowX: 'hidden',
-            overflowY: 'auto'
-        });
-        return _this;
-    }
-    // Instantiates the TimeGrid object this view needs. Draws from this.timeGridClass
-    AgendaView.prototype.instantiateTimeGrid = function () {
-        var timeGrid = new this.timeGridClass(this);
-        util_1.copyOwnProps(agendaTimeGridMethods, timeGrid);
-        return timeGrid;
+    Calendar.prototype.today = function () {
+        this.currentDate = this.getNow(); // should deny like prev/next?
+        this.renderView();
     };
-    // Instantiates the DayGrid object this view might need. Draws from this.dayGridClass
-    AgendaView.prototype.instantiateDayGrid = function () {
-        var dayGrid = new this.dayGridClass(this);
-        util_1.copyOwnProps(agendaDayGridMethods, dayGrid);
-        return dayGrid;
+    Calendar.prototype.gotoDate = function (zonedDateInput) {
+        this.currentDate = this.moment(zonedDateInput).stripZone();
+        this.renderView();
     };
-    /* Rendering
-    ------------------------------------------------------------------------------------------------------------------*/
-    AgendaView.prototype.renderSkeleton = function () {
-        var timeGridWrapEl;
-        var timeGridEl;
-        this.el.addClass('fc-agenda-view').html(this.renderSkeletonHtml());
-        this.scroller.render();
-        timeGridWrapEl = this.scroller.el.addClass('fc-time-grid-container');
-        timeGridEl = $('<div class="fc-time-grid" />').appendTo(timeGridWrapEl);
-        this.el.find('.fc-body > tr > td').append(timeGridWrapEl);
-        this.timeGrid.headContainerEl = this.el.find('.fc-head-container');
-        this.timeGrid.setElement(timeGridEl);
-        if (this.dayGrid) {
-            this.dayGrid.setElement(this.el.find('.fc-day-grid'));
-            // have the day-grid extend it's coordinate area over the <hr> dividing the two grids
-            this.dayGrid.bottomCoordPadding = this.dayGrid.el.next('hr').outerHeight();
-        }
+    Calendar.prototype.incrementDate = function (delta) {
+        this.currentDate.add(moment.duration(delta));
+        this.renderView();
     };
-    AgendaView.prototype.unrenderSkeleton = function () {
-        this.timeGrid.removeElement();
-        if (this.dayGrid) {
-            this.dayGrid.removeElement();
-        }
-        this.scroller.destroy();
+    // for external API
+    Calendar.prototype.getDate = function () {
+        return this.applyTimezone(this.currentDate); // infuse the calendar's timezone
     };
-    // Builds the HTML skeleton for the view.
-    // The day-grid and time-grid components will render inside containers defined by this HTML.
-    AgendaView.prototype.renderSkeletonHtml = function () {
-        var theme = this.calendar.theme;
-        return '' +
-            '<table class="' + theme.getClass('tableGrid') + '">' +
-            (this.opt('columnHeader') ?
-                '<thead class="fc-head">' +
-                    '<tr>' +
-                    '<td class="fc-head-container ' + theme.getClass('widgetHeader') + '">&nbsp;</td>' +
-                    '</tr>' +
-                    '</thead>' :
-                '') +
-            '<tbody class="fc-body">' +
-            '<tr>' +
-            '<td class="' + theme.getClass('widgetContent') + '">' +
-            (this.dayGrid ?
-                '<div class="fc-day-grid"/>' +
-                    '<hr class="fc-divider ' + theme.getClass('widgetHeader') + '"/>' :
-                '') +
-            '</td>' +
-            '</tr>' +
-            '</tbody>' +
-            '</table>';
+    // Loading Triggering
+    // -----------------------------------------------------------------------------------------------------------------
+    // Should be called when any type of async data fetching begins
+    Calendar.prototype.pushLoading = function () {
+        if (!(this.loadingLevel++)) {
+            this.publiclyTrigger('loading', [true, this.view]);
+        }
     };
-    // Generates an HTML attribute string for setting the width of the axis, if it is known
-    AgendaView.prototype.axisStyleAttr = function () {
-        if (this.axisWidth != null) {
-            return 'style="width:' + this.axisWidth + 'px"';
+    // Should be called when any type of async data fetching completes
+    Calendar.prototype.popLoading = function () {
+        if (!(--this.loadingLevel)) {
+            this.publiclyTrigger('loading', [false, this.view]);
         }
-        return '';
     };
-    /* Now Indicator
-    ------------------------------------------------------------------------------------------------------------------*/
-    AgendaView.prototype.getNowIndicatorUnit = function () {
-        return this.timeGrid.getNowIndicatorUnit();
+    // High-level Rendering
+    // -----------------------------------------------------------------------------------
+    Calendar.prototype.render = function () {
+        if (!this.contentEl) {
+            this.initialRender();
+        }
+        else if (this.elementVisible()) {
+            // mainly for the public API
+            this.calcSize();
+            this.updateViewSize();
+        }
     };
-    /* Dimensions
-    ------------------------------------------------------------------------------------------------------------------*/
-    // Adjusts the vertical dimensions of the view to the specified values
-    AgendaView.prototype.updateSize = function (totalHeight, isAuto, isResize) {
-        var eventLimit;
-        var scrollerHeight;
-        var scrollbarWidths;
-        _super.prototype.updateSize.call(this, totalHeight, isAuto, isResize);
-        // make all axis cells line up, and record the width so newly created axis cells will have it
-        this.axisWidth = util_1.matchCellWidths(this.el.find('.fc-axis'));
-        // hack to give the view some height prior to timeGrid's columns being rendered
-        // TODO: separate setting height from scroller VS timeGrid.
-        if (!this.timeGrid.colEls) {
-            if (!isAuto) {
-                scrollerHeight = this.computeScrollerHeight(totalHeight);
-                this.scroller.setHeight(scrollerHeight);
+    Calendar.prototype.initialRender = function () {
+        var _this = this;
+        var el = this.el;
+        el.addClass('fc');
+        // event delegation for nav links
+        el.on('click.fc', 'a[data-goto]', function (ev) {
+            var anchorEl = $(ev.currentTarget);
+            var gotoOptions = anchorEl.data('goto'); // will automatically parse JSON
+            var date = _this.moment(gotoOptions.date);
+            var viewType = gotoOptions.type;
+            // property like "navLinkDayClick". might be a string or a function
+            var customAction = _this.view.opt('navLink' + util_1.capitaliseFirstLetter(viewType) + 'Click');
+            if (typeof customAction === 'function') {
+                customAction(date, ev);
             }
-            return;
+            else {
+                if (typeof customAction === 'string') {
+                    viewType = customAction;
+                }
+                _this.zoomTo(date, viewType);
+            }
+        });
+        // called immediately, and upon option change
+        this.optionsManager.watch('settingTheme', ['?theme', '?themeSystem'], function (opts) {
+            var themeClass = ThemeRegistry_1.getThemeSystemClass(opts.themeSystem || opts.theme);
+            var theme = new themeClass(_this.optionsManager);
+            var widgetClass = theme.getClass('widget');
+            _this.theme = theme;
+            if (widgetClass) {
+                el.addClass(widgetClass);
+            }
+        }, function () {
+            var widgetClass = _this.theme.getClass('widget');
+            _this.theme = null;
+            if (widgetClass) {
+                el.removeClass(widgetClass);
+            }
+        });
+        this.optionsManager.watch('settingBusinessHourGenerator', ['?businessHours'], function (deps) {
+            _this.businessHourGenerator = new BusinessHourGenerator_1.default(deps.businessHours, _this);
+            if (_this.view) {
+                _this.view.set('businessHourGenerator', _this.businessHourGenerator);
+            }
+        }, function () {
+            _this.businessHourGenerator = null;
+        });
+        // called immediately, and upon option change.
+        // HACK: locale often affects isRTL, so we explicitly listen to that too.
+        this.optionsManager.watch('applyingDirClasses', ['?isRTL', '?locale'], function (opts) {
+            el.toggleClass('fc-ltr', !opts.isRTL);
+            el.toggleClass('fc-rtl', opts.isRTL);
+        });
+        this.contentEl = $("<div class='fc-view-container'>").prependTo(el);
+        this.initToolbars();
+        this.renderHeader();
+        this.renderFooter();
+        this.renderView(this.opt('defaultView'));
+        if (this.opt('handleWindowResize')) {
+            $(window).resize(this.windowResizeProxy = util_1.debounce(// prevents rapid calls
+            this.windowResize.bind(this), this.opt('windowResizeDelay')));
         }
-        // set of fake row elements that must compensate when scroller has scrollbars
-        var noScrollRowEls = this.el.find('.fc-row:not(.fc-scroller *)');
-        // reset all dimensions back to the original state
-        this.timeGrid.bottomRuleEl.hide(); // .show() will be called later if this <hr> is necessary
-        this.scroller.clear(); // sets height to 'auto' and clears overflow
-        util_1.uncompensateScroll(noScrollRowEls);
-        // limit number of events in the all-day area
-        if (this.dayGrid) {
-            this.dayGrid.removeSegPopover(); // kill the "more" popover if displayed
-            eventLimit = this.opt('eventLimit');
-            if (eventLimit && typeof eventLimit !== 'number') {
-                eventLimit = AGENDA_ALL_DAY_EVENT_LIMIT; // make sure "auto" goes to a real number
+    };
+    Calendar.prototype.destroy = function () {
+        if (this.view) {
+            this.clearView();
+        }
+        this.toolbarsManager.proxyCall('removeElement');
+        this.contentEl.remove();
+        this.el.removeClass('fc fc-ltr fc-rtl');
+        // removes theme-related root className
+        this.optionsManager.unwatch('settingTheme');
+        this.optionsManager.unwatch('settingBusinessHourGenerator');
+        this.el.off('.fc'); // unbind nav link handlers
+        if (this.windowResizeProxy) {
+            $(window).unbind('resize', this.windowResizeProxy);
+            this.windowResizeProxy = null;
+        }
+        GlobalEmitter_1.default.unneeded();
+    };
+    Calendar.prototype.elementVisible = function () {
+        return this.el.is(':visible');
+    };
+    // Render Queue
+    // -----------------------------------------------------------------------------------------------------------------
+    Calendar.prototype.bindViewHandlers = function (view) {
+        var _this = this;
+        view.watch('titleForCalendar', ['title'], function (deps) {
+            if (view === _this.view) { // hack
+                _this.setToolbarsTitle(deps.title);
             }
-            if (eventLimit) {
-                this.dayGrid.limitRows(eventLimit);
+        });
+        view.watch('dateProfileForCalendar', ['dateProfile'], function (deps) {
+            if (view === _this.view) { // hack
+                _this.currentDate = deps.dateProfile.date; // might have been constrained by view dates
+                _this.updateToolbarButtons(deps.dateProfile);
             }
+        });
+    };
+    Calendar.prototype.unbindViewHandlers = function (view) {
+        view.unwatch('titleForCalendar');
+        view.unwatch('dateProfileForCalendar');
+    };
+    // View Rendering
+    // -----------------------------------------------------------------------------------
+    // Renders a view because of a date change, view-type change, or for the first time.
+    // If not given a viewType, keep the current view but render different dates.
+    // Accepts an optional scroll state to restore to.
+    Calendar.prototype.renderView = function (viewType) {
+        var oldView = this.view;
+        var newView;
+        this.freezeContentHeight();
+        if (oldView && viewType && oldView.type !== viewType) {
+            this.clearView();
         }
-        if (!isAuto) {
-            scrollerHeight = this.computeScrollerHeight(totalHeight);
-            this.scroller.setHeight(scrollerHeight);
-            scrollbarWidths = this.scroller.getScrollbarWidths();
-            if (scrollbarWidths.left || scrollbarWidths.right) {
-                // make the all-day and header rows lines up
-                util_1.compensateScroll(noScrollRowEls, scrollbarWidths);
-                // the scrollbar compensation might have changed text flow, which might affect height, so recalculate
-                // and reapply the desired height to the scroller.
-                scrollerHeight = this.computeScrollerHeight(totalHeight);
-                this.scroller.setHeight(scrollerHeight);
+        // if viewType changed, or the view was never created, create a fresh view
+        if (!this.view && viewType) {
+            newView = this.view =
+                this.viewsByType[viewType] ||
+                    (this.viewsByType[viewType] = this.instantiateView(viewType));
+            this.bindViewHandlers(newView);
+            newView.startBatchRender(); // so that setElement+setDate rendering are joined
+            newView.setElement($("<div class='fc-view fc-" + viewType + "-view'>").appendTo(this.contentEl));
+            this.toolbarsManager.proxyCall('activateButton', viewType);
+        }
+        if (this.view) {
+            // prevent unnecessary change firing
+            if (this.view.get('businessHourGenerator') !== this.businessHourGenerator) {
+                this.view.set('businessHourGenerator', this.businessHourGenerator);
             }
-            // guarantees the same scrollbar widths
-            this.scroller.lockOverflow(scrollbarWidths);
-            // if there's any space below the slats, show the horizontal rule.
-            // this won't cause any new overflow, because lockOverflow already called.
-            if (this.timeGrid.getTotalSlatHeight() < scrollerHeight) {
-                this.timeGrid.bottomRuleEl.show();
+            this.view.setDate(this.currentDate);
+            if (newView) {
+                newView.stopBatchRender();
             }
         }
+        this.thawContentHeight();
     };
-    // given a desired total height of the view, returns what the height of the scroller should be
-    AgendaView.prototype.computeScrollerHeight = function (totalHeight) {
-        return totalHeight -
-            util_1.subtractInnerElHeight(this.el, this.scroller.el); // everything that's NOT the scroller
+    // Unrenders the current view and reflects this change in the Header.
+    // Unregsiters the `view`, but does not remove from viewByType hash.
+    Calendar.prototype.clearView = function () {
+        var currentView = this.view;
+        this.toolbarsManager.proxyCall('deactivateButton', currentView.type);
+        this.unbindViewHandlers(currentView);
+        currentView.removeElement();
+        currentView.unsetDate(); // so bindViewHandlers doesn't fire with old values next time
+        this.view = null;
     };
-    /* Scroll
-    ------------------------------------------------------------------------------------------------------------------*/
-    // Computes the initial pre-configured scroll state prior to allowing the user to change it
-    AgendaView.prototype.computeInitialDateScroll = function () {
-        var scrollTime = moment.duration(this.opt('scrollTime'));
-        var top = this.timeGrid.computeTimeTop(scrollTime);
-        // zoom can give weird floating-point values. rather scroll a little bit further
-        top = Math.ceil(top);
-        if (top) {
-            top++; // to overcome top border that slots beyond the first have. looks better
+    // Destroys the view, including the view object. Then, re-instantiates it and renders it.
+    // Maintains the same scroll state.
+    // TODO: maintain any other user-manipulated state.
+    Calendar.prototype.reinitView = function () {
+        var oldView = this.view;
+        var scroll = oldView.queryScroll(); // wouldn't be so complicated if Calendar owned the scroll
+        this.freezeContentHeight();
+        this.clearView();
+        this.calcSize();
+        this.renderView(oldView.type); // needs the type to freshly render
+        this.view.applyScroll(scroll);
+        this.thawContentHeight();
+    };
+    // Resizing
+    // -----------------------------------------------------------------------------------
+    Calendar.prototype.getSuggestedViewHeight = function () {
+        if (this.suggestedViewHeight == null) {
+            this.calcSize();
         }
-        return { top: top };
+        return this.suggestedViewHeight;
     };
-    AgendaView.prototype.queryDateScroll = function () {
-        return { top: this.scroller.getScrollTop() };
+    Calendar.prototype.isHeightAuto = function () {
+        return this.opt('contentHeight') === 'auto' || this.opt('height') === 'auto';
     };
-    AgendaView.prototype.applyDateScroll = function (scroll) {
-        if (scroll.top !== undefined) {
-            this.scroller.setScrollTop(scroll.top);
+    Calendar.prototype.updateViewSize = function (isResize) {
+        if (isResize === void 0) { isResize = false; }
+        var view = this.view;
+        var scroll;
+        if (!this.ignoreUpdateViewSize && view) {
+            if (isResize) {
+                this.calcSize();
+                scroll = view.queryScroll();
+            }
+            this.ignoreUpdateViewSize++;
+            view.updateSize(this.getSuggestedViewHeight(), this.isHeightAuto(), isResize);
+            this.ignoreUpdateViewSize--;
+            if (isResize) {
+                view.applyScroll(scroll);
+            }
+            return true; // signal success
         }
     };
-    /* Hit Areas
-    ------------------------------------------------------------------------------------------------------------------*/
-    // forward all hit-related method calls to the grids (dayGrid might not be defined)
-    AgendaView.prototype.getHitFootprint = function (hit) {
-        // TODO: hit.component is set as a hack to identify where the hit came from
-        return hit.component.getHitFootprint(hit);
+    Calendar.prototype.calcSize = function () {
+        if (this.elementVisible()) {
+            this._calcSize();
+        }
     };
-    AgendaView.prototype.getHitEl = function (hit) {
-        // TODO: hit.component is set as a hack to identify where the hit came from
-        return hit.component.getHitEl(hit);
+    Calendar.prototype._calcSize = function () {
+        var contentHeightInput = this.opt('contentHeight');
+        var heightInput = this.opt('height');
+        if (typeof contentHeightInput === 'number') { // exists and not 'auto'
+            this.suggestedViewHeight = contentHeightInput;
+        }
+        else if (typeof contentHeightInput === 'function') { // exists and is a function
+            this.suggestedViewHeight = contentHeightInput();
+        }
+        else if (typeof heightInput === 'number') { // exists and not 'auto'
+            this.suggestedViewHeight = heightInput - this.queryToolbarsHeight();
+        }
+        else if (typeof heightInput === 'function') { // exists and is a function
+            this.suggestedViewHeight = heightInput() - this.queryToolbarsHeight();
+        }
+        else if (heightInput === 'parent') { // set to height of parent element
+            this.suggestedViewHeight = this.el.parent().height() - this.queryToolbarsHeight();
+        }
+        else {
+            this.suggestedViewHeight = Math.round(this.contentEl.width() /
+                Math.max(this.opt('aspectRatio'), .5));
+        }
     };
-    /* Event Rendering
-    ------------------------------------------------------------------------------------------------------------------*/
-    AgendaView.prototype.executeEventRender = function (eventsPayload) {
-        var dayEventsPayload = {};
-        var timedEventsPayload = {};
-        var id;
-        var eventInstanceGroup;
-        // separate the events into all-day and timed
-        for (id in eventsPayload) {
-            eventInstanceGroup = eventsPayload[id];
-            if (eventInstanceGroup.getEventDef().isAllDay()) {
-                dayEventsPayload[id] = eventInstanceGroup;
-            }
-            else {
-                timedEventsPayload[id] = eventInstanceGroup;
+    Calendar.prototype.windowResize = function (ev) {
+        if (
+        // the purpose: so we don't process jqui "resize" events that have bubbled up
+        // cast to any because .target, which is Element, can't be compared to window for some reason.
+        ev.target === window &&
+            this.view &&
+            this.view.isDatesRendered) {
+            if (this.updateViewSize(true)) { // isResize=true, returns true on success
+                this.publiclyTrigger('windowResize', [this.view]);
             }
         }
-        this.timeGrid.executeEventRender(timedEventsPayload);
-        if (this.dayGrid) {
-            this.dayGrid.executeEventRender(dayEventsPayload);
+    };
+    /* Height "Freezing"
+    -----------------------------------------------------------------------------*/
+    Calendar.prototype.freezeContentHeight = function () {
+        if (!(this.freezeContentHeightDepth++)) {
+            this.forceFreezeContentHeight();
         }
     };
-    /* Dragging/Resizing Routing
-    ------------------------------------------------------------------------------------------------------------------*/
-    // A returned value of `true` signals that a mock "helper" event has been rendered.
-    AgendaView.prototype.renderDrag = function (eventFootprints, seg, isTouch) {
-        var groups = groupEventFootprintsByAllDay(eventFootprints);
-        var renderedHelper = false;
-        renderedHelper = this.timeGrid.renderDrag(groups.timed, seg, isTouch);
-        if (this.dayGrid) {
-            renderedHelper = this.dayGrid.renderDrag(groups.allDay, seg, isTouch) || renderedHelper;
+    Calendar.prototype.forceFreezeContentHeight = function () {
+        this.contentEl.css({
+            width: '100%',
+            height: this.contentEl.height(),
+            overflow: 'hidden'
+        });
+    };
+    Calendar.prototype.thawContentHeight = function () {
+        this.freezeContentHeightDepth--;
+        // always bring back to natural height
+        this.contentEl.css({
+            width: '',
+            height: '',
+            overflow: ''
+        });
+        // but if there are future thaws, re-freeze
+        if (this.freezeContentHeightDepth) {
+            this.forceFreezeContentHeight();
         }
-        return renderedHelper;
     };
-    AgendaView.prototype.renderEventResize = function (eventFootprints, seg, isTouch) {
-        var groups = groupEventFootprintsByAllDay(eventFootprints);
-        this.timeGrid.renderEventResize(groups.timed, seg, isTouch);
-        if (this.dayGrid) {
-            this.dayGrid.renderEventResize(groups.allDay, seg, isTouch);
+    // Toolbar
+    // -----------------------------------------------------------------------------------------------------------------
+    Calendar.prototype.initToolbars = function () {
+        this.header = new Toolbar_1.default(this, this.computeHeaderOptions());
+        this.footer = new Toolbar_1.default(this, this.computeFooterOptions());
+        this.toolbarsManager = new Iterator_1.default([this.header, this.footer]);
+    };
+    Calendar.prototype.computeHeaderOptions = function () {
+        return {
+            extraClasses: 'fc-header-toolbar',
+            layout: this.opt('header')
+        };
+    };
+    Calendar.prototype.computeFooterOptions = function () {
+        return {
+            extraClasses: 'fc-footer-toolbar',
+            layout: this.opt('footer')
+        };
+    };
+    // can be called repeatedly and Header will rerender
+    Calendar.prototype.renderHeader = function () {
+        var header = this.header;
+        header.setToolbarOptions(this.computeHeaderOptions());
+        header.render();
+        if (header.el) {
+            this.el.prepend(header.el);
         }
     };
-    /* Selection
-    ------------------------------------------------------------------------------------------------------------------*/
-    // Renders a visual indication of a selection
-    AgendaView.prototype.renderSelectionFootprint = function (componentFootprint) {
-        if (!componentFootprint.isAllDay) {
-            this.timeGrid.renderSelectionFootprint(componentFootprint);
-        }
-        else if (this.dayGrid) {
-            this.dayGrid.renderSelectionFootprint(componentFootprint);
+    // can be called repeatedly and Footer will rerender
+    Calendar.prototype.renderFooter = function () {
+        var footer = this.footer;
+        footer.setToolbarOptions(this.computeFooterOptions());
+        footer.render();
+        if (footer.el) {
+            this.el.append(footer.el);
         }
     };
-    return AgendaView;
-}(View_1.default));
-exports.default = AgendaView;
-AgendaView.prototype.timeGridClass = TimeGrid_1.default;
-AgendaView.prototype.dayGridClass = DayGrid_1.default;
-// Will customize the rendering behavior of the AgendaView's timeGrid
-agendaTimeGridMethods = {
-    // Generates the HTML that will go before the day-of week header cells
-    renderHeadIntroHtml: function () {
+    Calendar.prototype.setToolbarsTitle = function (title) {
+        this.toolbarsManager.proxyCall('updateTitle', title);
+    };
+    Calendar.prototype.updateToolbarButtons = function (dateProfile) {
+        var now = this.getNow();
         var view = this.view;
-        var calendar = view.calendar;
-        var weekStart = calendar.msToUtcMoment(this.dateProfile.renderUnzonedRange.startMs, true);
-        var weekText;
-        if (this.opt('weekNumbers')) {
-            weekText = weekStart.format(this.opt('smallWeekFormat'));
-            return '' +
-                '<th class="fc-axis fc-week-number ' + calendar.theme.getClass('widgetHeader') + '" ' + view.axisStyleAttr() + '>' +
-                view.buildGotoAnchorHtml(// aside from link, important for matchCellWidths
-                { date: weekStart, type: 'week', forceOff: this.colCnt > 1 }, util_1.htmlEscape(weekText) // inner HTML
-                ) +
-                '</th>';
+        var todayInfo = view.dateProfileGenerator.build(now);
+        var prevInfo = view.dateProfileGenerator.buildPrev(view.get('dateProfile'));
+        var nextInfo = view.dateProfileGenerator.buildNext(view.get('dateProfile'));
+        this.toolbarsManager.proxyCall((todayInfo.isValid && !dateProfile.currentUnzonedRange.containsDate(now)) ?
+            'enableButton' :
+            'disableButton', 'today');
+        this.toolbarsManager.proxyCall(prevInfo.isValid ?
+            'enableButton' :
+            'disableButton', 'prev');
+        this.toolbarsManager.proxyCall(nextInfo.isValid ?
+            'enableButton' :
+            'disableButton', 'next');
+    };
+    Calendar.prototype.queryToolbarsHeight = function () {
+        return this.toolbarsManager.items.reduce(function (accumulator, toolbar) {
+            var toolbarHeight = toolbar.el ? toolbar.el.outerHeight(true) : 0; // includes margin
+            return accumulator + toolbarHeight;
+        }, 0);
+    };
+    // Selection
+    // -----------------------------------------------------------------------------------------------------------------
+    // this public method receives start/end dates in any format, with any timezone
+    Calendar.prototype.select = function (zonedStartInput, zonedEndInput) {
+        this.view.select(this.buildSelectFootprint.apply(this, arguments));
+    };
+    Calendar.prototype.unselect = function () {
+        if (this.view) {
+            this.view.unselect();
         }
-        else {
-            return '<th class="fc-axis ' + calendar.theme.getClass('widgetHeader') + '" ' + view.axisStyleAttr() + '></th>';
+    };
+    // Given arguments to the select method in the API, returns a span (unzoned start/end and other info)
+    Calendar.prototype.buildSelectFootprint = function (zonedStartInput, zonedEndInput) {
+        var start = this.moment(zonedStartInput).stripZone();
+        var end;
+        if (zonedEndInput) {
+            end = this.moment(zonedEndInput).stripZone();
         }
-    },
-    // Generates the HTML that goes before the bg of the TimeGrid slot area. Long vertical column.
-    renderBgIntroHtml: function () {
-        var view = this.view;
-        return '<td class="fc-axis ' + view.calendar.theme.getClass('widgetContent') + '" ' + view.axisStyleAttr() + '></td>';
-    },
-    // Generates the HTML that goes before all other types of cells.
-    // Affects content-skeleton, helper-skeleton, highlight-skeleton for both the time-grid and day-grid.
-    renderIntroHtml: function () {
-        var view = this.view;
-        return '<td class="fc-axis" ' + view.axisStyleAttr() + '></td>';
-    }
-};
-// Will customize the rendering behavior of the AgendaView's dayGrid
-agendaDayGridMethods = {
-    // Generates the HTML that goes before the all-day cells
-    renderBgIntroHtml: function () {
-        var view = this.view;
-        return '' +
-            '<td class="fc-axis ' + view.calendar.theme.getClass('widgetContent') + '" ' + view.axisStyleAttr() + '>' +
-            '<span>' + // needed for matchCellWidths
-            view.getAllDayHtml() +
-            '</span>' +
-            '</td>';
-    },
-    // Generates the HTML that goes before all other types of cells.
-    // Affects content-skeleton, helper-skeleton, highlight-skeleton for both the time-grid and day-grid.
-    renderIntroHtml: function () {
-        var view = this.view;
-        return '<td class="fc-axis" ' + view.axisStyleAttr() + '></td>';
-    }
-};
-function groupEventFootprintsByAllDay(eventFootprints) {
-    var allDay = [];
-    var timed = [];
-    var i;
-    for (i = 0; i < eventFootprints.length; i++) {
-        if (eventFootprints[i].componentFootprint.isAllDay) {
-            allDay.push(eventFootprints[i]);
+        else if (start.hasTime()) {
+            end = start.clone().add(this.defaultTimedEventDuration);
         }
         else {
-            timed.push(eventFootprints[i]);
+            end = start.clone().add(this.defaultAllDayEventDuration);
         }
-    }
-    return { allDay: allDay, timed: timed };
-}
-
-
-/***/ }),
-/* 227 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var $ = __webpack_require__(3);
-var moment = __webpack_require__(0);
-var util_1 = __webpack_require__(4);
-var InteractiveDateComponent_1 = __webpack_require__(40);
-var BusinessHourRenderer_1 = __webpack_require__(56);
-var StandardInteractionsMixin_1 = __webpack_require__(60);
-var DayTableMixin_1 = __webpack_require__(55);
-var CoordCache_1 = __webpack_require__(53);
-var UnzonedRange_1 = __webpack_require__(5);
-var ComponentFootprint_1 = __webpack_require__(12);
-var TimeGridEventRenderer_1 = __webpack_require__(246);
-var TimeGridHelperRenderer_1 = __webpack_require__(247);
-var TimeGridFillRenderer_1 = __webpack_require__(248);
-/* A component that renders one or more columns of vertical time slots
-----------------------------------------------------------------------------------------------------------------------*/
-// We mixin DayTable, even though there is only a single row of days
-// potential nice values for the slot-duration and interval-duration
-// from largest to smallest
-var AGENDA_STOCK_SUB_DURATIONS = [
-    { hours: 1 },
-    { minutes: 30 },
-    { minutes: 15 },
-    { seconds: 30 },
-    { seconds: 15 }
-];
-var TimeGrid = /** @class */ (function (_super) {
-    tslib_1.__extends(TimeGrid, _super);
-    function TimeGrid(view) {
-        var _this = _super.call(this, view) || this;
-        _this.processOptions();
-        return _this;
-    }
-    // Slices up the given span (unzoned start/end with other misc data) into an array of segments
-    TimeGrid.prototype.componentFootprintToSegs = function (componentFootprint) {
-        var segs = this.sliceRangeByTimes(componentFootprint.unzonedRange);
-        var i;
-        for (i = 0; i < segs.length; i++) {
-            if (this.isRTL) {
-                segs[i].col = this.daysPerRow - 1 - segs[i].dayIndex;
+        return new ComponentFootprint_1.default(new UnzonedRange_1.default(start, end), !start.hasTime());
+    };
+    // Date Utils
+    // -----------------------------------------------------------------------------------------------------------------
+    Calendar.prototype.initMomentInternals = function () {
+        var _this = this;
+        this.defaultAllDayEventDuration = moment.duration(this.opt('defaultAllDayEventDuration'));
+        this.defaultTimedEventDuration = moment.duration(this.opt('defaultTimedEventDuration'));
+        // Called immediately, and when any of the options change.
+        // Happens before any internal objects rebuild or rerender, because this is very core.
+        this.optionsManager.watch('buildingMomentLocale', [
+            '?locale', '?monthNames', '?monthNamesShort', '?dayNames', '?dayNamesShort',
+            '?firstDay', '?weekNumberCalculation'
+        ], function (opts) {
+            var weekNumberCalculation = opts.weekNumberCalculation;
+            var firstDay = opts.firstDay;
+            var _week;
+            // normalize
+            if (weekNumberCalculation === 'iso') {
+                weekNumberCalculation = 'ISO'; // normalize
             }
-            else {
-                segs[i].col = segs[i].dayIndex;
+            var localeData = Object.create(// make a cheap copy
+            locale_1.getMomentLocaleData(opts.locale) // will fall back to en
+            );
+            if (opts.monthNames) {
+                localeData._months = opts.monthNames;
             }
-        }
-        return segs;
-    };
-    /* Date Handling
-    ------------------------------------------------------------------------------------------------------------------*/
-    TimeGrid.prototype.sliceRangeByTimes = function (unzonedRange) {
-        var segs = [];
-        var segRange;
-        var dayIndex;
-        for (dayIndex = 0; dayIndex < this.daysPerRow; dayIndex++) {
-            segRange = unzonedRange.intersect(this.dayRanges[dayIndex]);
-            if (segRange) {
-                segs.push({
-                    startMs: segRange.startMs,
-                    endMs: segRange.endMs,
-                    isStart: segRange.isStart,
-                    isEnd: segRange.isEnd,
-                    dayIndex: dayIndex
-                });
+            if (opts.monthNamesShort) {
+                localeData._monthsShort = opts.monthNamesShort;
             }
-        }
-        return segs;
-    };
-    /* Options
-    ------------------------------------------------------------------------------------------------------------------*/
-    // Parses various options into properties of this object
-    TimeGrid.prototype.processOptions = function () {
-        var slotDuration = this.opt('slotDuration');
-        var snapDuration = this.opt('snapDuration');
-        var input;
-        slotDuration = moment.duration(slotDuration);
-        snapDuration = snapDuration ? moment.duration(snapDuration) : slotDuration;
-        this.slotDuration = slotDuration;
-        this.snapDuration = snapDuration;
-        this.snapsPerSlot = slotDuration / snapDuration; // TODO: ensure an integer multiple?
-        // might be an array value (for TimelineView).
-        // if so, getting the most granular entry (the last one probably).
-        input = this.opt('slotLabelFormat');
-        if ($.isArray(input)) {
-            input = input[input.length - 1];
-        }
-        this.labelFormat = input ||
-            this.opt('smallTimeFormat'); // the computed default
-        input = this.opt('slotLabelInterval');
-        this.labelInterval = input ?
-            moment.duration(input) :
-            this.computeLabelInterval(slotDuration);
+            if (opts.dayNames) {
+                localeData._weekdays = opts.dayNames;
+            }
+            if (opts.dayNamesShort) {
+                localeData._weekdaysShort = opts.dayNamesShort;
+            }
+            if (firstDay == null && weekNumberCalculation === 'ISO') {
+                firstDay = 1;
+            }
+            if (firstDay != null) {
+                _week = Object.create(localeData._week); // _week: { dow: # }
+                _week.dow = firstDay;
+                localeData._week = _week;
+            }
+            if ( // whitelist certain kinds of input
+            weekNumberCalculation === 'ISO' ||
+                weekNumberCalculation === 'local' ||
+                typeof weekNumberCalculation === 'function') {
+                localeData._fullCalendar_weekCalc = weekNumberCalculation; // moment-ext will know what to do with it
+            }
+            _this.localeData = localeData;
+            // If the internal current date object already exists, move to new locale.
+            // We do NOT need to do this technique for event dates, because this happens when converting to "segments".
+            if (_this.currentDate) {
+                _this.localizeMoment(_this.currentDate); // sets to localeData
+            }
+        });
     };
-    // Computes an automatic value for slotLabelInterval
-    TimeGrid.prototype.computeLabelInterval = function (slotDuration) {
-        var i;
-        var labelInterval;
-        var slotsPerLabel;
-        // find the smallest stock label interval that results in more than one slots-per-label
-        for (i = AGENDA_STOCK_SUB_DURATIONS.length - 1; i >= 0; i--) {
-            labelInterval = moment.duration(AGENDA_STOCK_SUB_DURATIONS[i]);
-            slotsPerLabel = util_1.divideDurationByDuration(labelInterval, slotDuration);
-            if (util_1.isInt(slotsPerLabel) && slotsPerLabel > 1) {
-                return labelInterval;
+    // Builds a moment using the settings of the current calendar: timezone and locale.
+    // Accepts anything the vanilla moment() constructor accepts.
+    Calendar.prototype.moment = function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        var mom;
+        if (this.opt('timezone') === 'local') {
+            mom = moment_ext_1.default.apply(null, args);
+            // Force the moment to be local, because momentExt doesn't guarantee it.
+            if (mom.hasTime()) { // don't give ambiguously-timed moments a local zone
+                mom.local();
             }
         }
-        return moment.duration(slotDuration); // fall back. clone
+        else if (this.opt('timezone') === 'UTC') {
+            mom = moment_ext_1.default.utc.apply(null, args); // process as UTC
+        }
+        else {
+            mom = moment_ext_1.default.parseZone.apply(null, args); // let the input decide the zone
+        }
+        this.localizeMoment(mom); // TODO
+        return mom;
     };
-    /* Date Rendering
-    ------------------------------------------------------------------------------------------------------------------*/
-    TimeGrid.prototype.renderDates = function (dateProfile) {
-        this.dateProfile = dateProfile;
-        this.updateDayTable();
-        this.renderSlats();
-        this.renderColumns();
+    Calendar.prototype.msToMoment = function (ms, forceAllDay) {
+        var mom = moment_ext_1.default.utc(ms); // TODO: optimize by using Date.UTC
+        if (forceAllDay) {
+            mom.stripTime();
+        }
+        else {
+            mom = this.applyTimezone(mom); // may or may not apply locale
+        }
+        this.localizeMoment(mom);
+        return mom;
     };
-    TimeGrid.prototype.unrenderDates = function () {
-        // this.unrenderSlats(); // don't need this because repeated .html() calls clear
-        this.unrenderColumns();
+    Calendar.prototype.msToUtcMoment = function (ms, forceAllDay) {
+        var mom = moment_ext_1.default.utc(ms); // TODO: optimize by using Date.UTC
+        if (forceAllDay) {
+            mom.stripTime();
+        }
+        this.localizeMoment(mom);
+        return mom;
     };
-    TimeGrid.prototype.renderSkeleton = function () {
-        var theme = this.view.calendar.theme;
-        this.el.html('<div class="fc-bg"></div>' +
-            '<div class="fc-slats"></div>' +
-            '<hr class="fc-divider ' + theme.getClass('widgetHeader') + '" style="display:none" />');
-        this.bottomRuleEl = this.el.find('hr');
+    // Updates the given moment's locale settings to the current calendar locale settings.
+    Calendar.prototype.localizeMoment = function (mom) {
+        mom._locale = this.localeData;
     };
-    TimeGrid.prototype.renderSlats = function () {
-        var theme = this.view.calendar.theme;
-        this.slatContainerEl = this.el.find('> .fc-slats')
-            .html(// avoids needing ::unrenderSlats()
-        '<table class="' + theme.getClass('tableGrid') + '">' +
-            this.renderSlatRowHtml() +
-            '</table>');
-        this.slatEls = this.slatContainerEl.find('tr');
-        this.slatCoordCache = new CoordCache_1.default({
-            els: this.slatEls,
-            isVertical: true
-        });
+    // Returns a boolean about whether or not the calendar knows how to calculate
+    // the timezone offset of arbitrary dates in the current timezone.
+    Calendar.prototype.getIsAmbigTimezone = function () {
+        return this.opt('timezone') !== 'local' && this.opt('timezone') !== 'UTC';
     };
-    // Generates the HTML for the horizontal "slats" that run width-wise. Has a time axis on a side. Depends on RTL.
-    TimeGrid.prototype.renderSlatRowHtml = function () {
-        var view = this.view;
-        var calendar = view.calendar;
-        var theme = calendar.theme;
-        var isRTL = this.isRTL;
-        var dateProfile = this.dateProfile;
-        var html = '';
-        var slotTime = moment.duration(+dateProfile.minTime); // wish there was .clone() for durations
-        var slotIterator = moment.duration(0);
-        var slotDate; // will be on the view's first day, but we only care about its time
-        var isLabeled;
-        var axisHtml;
-        // Calculate the time for each slot
-        while (slotTime < dateProfile.maxTime) {
-            slotDate = calendar.msToUtcMoment(dateProfile.renderUnzonedRange.startMs).time(slotTime);
-            isLabeled = util_1.isInt(util_1.divideDurationByDuration(slotIterator, this.labelInterval));
-            axisHtml =
-                '<td class="fc-axis fc-time ' + theme.getClass('widgetContent') + '" ' + view.axisStyleAttr() + '>' +
-                    (isLabeled ?
-                        '<span>' + // for matchCellWidths
-                            util_1.htmlEscape(slotDate.format(this.labelFormat)) +
-                            '</span>' :
-                        '') +
-                    '</td>';
-            html +=
-                '<tr data-time="' + slotDate.format('HH:mm:ss') + '"' +
-                    (isLabeled ? '' : ' class="fc-minor"') +
-                    '>' +
-                    (!isRTL ? axisHtml : '') +
-                    '<td class="' + theme.getClass('widgetContent') + '"/>' +
-                    (isRTL ? axisHtml : '') +
-                    '</tr>';
-            slotTime.add(this.slotDuration);
-            slotIterator.add(this.slotDuration);
+    // Returns a copy of the given date in the current timezone. Has no effect on dates without times.
+    Calendar.prototype.applyTimezone = function (date) {
+        if (!date.hasTime()) {
+            return date.clone();
         }
-        return html;
-    };
-    TimeGrid.prototype.renderColumns = function () {
-        var dateProfile = this.dateProfile;
-        var theme = this.view.calendar.theme;
-        this.dayRanges = this.dayDates.map(function (dayDate) {
-            return new UnzonedRange_1.default(dayDate.clone().add(dateProfile.minTime), dayDate.clone().add(dateProfile.maxTime));
-        });
-        if (this.headContainerEl) {
-            this.headContainerEl.html(this.renderHeadHtml());
+        var zonedDate = this.moment(date.toArray());
+        var timeAdjust = date.time().asMilliseconds() - zonedDate.time().asMilliseconds();
+        var adjustedZonedDate;
+        // Safari sometimes has problems with this coersion when near DST. Adjust if necessary. (bug #2396)
+        if (timeAdjust) { // is the time result different than expected?
+            adjustedZonedDate = zonedDate.clone().add(timeAdjust); // add milliseconds
+            if (date.time().asMilliseconds() - adjustedZonedDate.time().asMilliseconds() === 0) { // does it match perfectly now?
+                zonedDate = adjustedZonedDate;
+            }
         }
-        this.el.find('> .fc-bg').html('<table class="' + theme.getClass('tableGrid') + '">' +
-            this.renderBgTrHtml(0) + // row=0
-            '</table>');
-        this.colEls = this.el.find('.fc-day, .fc-disabled-day');
-        this.colCoordCache = new CoordCache_1.default({
-            els: this.colEls,
-            isHorizontal: true
-        });
-        this.renderContentSkeleton();
-    };
-    TimeGrid.prototype.unrenderColumns = function () {
-        this.unrenderContentSkeleton();
+        return zonedDate;
     };
-    /* Content Skeleton
-    ------------------------------------------------------------------------------------------------------------------*/
-    // Renders the DOM that the view's content will live in
-    TimeGrid.prototype.renderContentSkeleton = function () {
-        var cellHtml = '';
-        var i;
-        var skeletonEl;
-        for (i = 0; i < this.colCnt; i++) {
-            cellHtml +=
-                '<td>' +
-                    '<div class="fc-content-col">' +
-                    '<div class="fc-event-container fc-helper-container"></div>' +
-                    '<div class="fc-event-container"></div>' +
-                    '<div class="fc-highlight-container"></div>' +
-                    '<div class="fc-bgevent-container"></div>' +
-                    '<div class="fc-business-container"></div>' +
-                    '</div>' +
-                    '</td>';
+    /*
+    Assumes the footprint is non-open-ended.
+    */
+    Calendar.prototype.footprintToDateProfile = function (componentFootprint, ignoreEnd) {
+        if (ignoreEnd === void 0) { ignoreEnd = false; }
+        var start = moment_ext_1.default.utc(componentFootprint.unzonedRange.startMs);
+        var end;
+        if (!ignoreEnd) {
+            end = moment_ext_1.default.utc(componentFootprint.unzonedRange.endMs);
         }
-        skeletonEl = this.contentSkeletonEl = $('<div class="fc-content-skeleton">' +
-            '<table>' +
-            '<tr>' + cellHtml + '</tr>' +
-            '</table>' +
-            '</div>');
-        this.colContainerEls = skeletonEl.find('.fc-content-col');
-        this.helperContainerEls = skeletonEl.find('.fc-helper-container');
-        this.fgContainerEls = skeletonEl.find('.fc-event-container:not(.fc-helper-container)');
-        this.bgContainerEls = skeletonEl.find('.fc-bgevent-container');
-        this.highlightContainerEls = skeletonEl.find('.fc-highlight-container');
-        this.businessContainerEls = skeletonEl.find('.fc-business-container');
-        this.bookendCells(skeletonEl.find('tr')); // TODO: do this on string level
-        this.el.append(skeletonEl);
-    };
-    TimeGrid.prototype.unrenderContentSkeleton = function () {
-        if (this.contentSkeletonEl) {
-            this.contentSkeletonEl.remove();
-            this.contentSkeletonEl = null;
-            this.colContainerEls = null;
-            this.helperContainerEls = null;
-            this.fgContainerEls = null;
-            this.bgContainerEls = null;
-            this.highlightContainerEls = null;
-            this.businessContainerEls = null;
+        if (componentFootprint.isAllDay) {
+            start.stripTime();
+            if (end) {
+                end.stripTime();
+            }
         }
-    };
-    // Given a flat array of segments, return an array of sub-arrays, grouped by each segment's col
-    TimeGrid.prototype.groupSegsByCol = function (segs) {
-        var segsByCol = [];
-        var i;
-        for (i = 0; i < this.colCnt; i++) {
-            segsByCol.push([]);
+        else {
+            start = this.applyTimezone(start);
+            if (end) {
+                end = this.applyTimezone(end);
+            }
         }
-        for (i = 0; i < segs.length; i++) {
-            segsByCol[segs[i].col].push(segs[i]);
+        this.localizeMoment(start);
+        if (end) {
+            this.localizeMoment(end);
         }
-        return segsByCol;
+        return new EventDateProfile_1.default(start, end, this);
     };
-    // Given segments grouped by column, insert the segments' elements into a parallel array of container
-    // elements, each living within a column.
-    TimeGrid.prototype.attachSegsByCol = function (segsByCol, containerEls) {
-        var col;
-        var segs;
-        var i;
-        for (col = 0; col < this.colCnt; col++) {
-            segs = segsByCol[col];
-            for (i = 0; i < segs.length; i++) {
-                containerEls.eq(col).append(segs[i].el);
-            }
+    // Returns a moment for the current date, as defined by the client's computer or from the `now` option.
+    // Will return an moment with an ambiguous timezone.
+    Calendar.prototype.getNow = function () {
+        var now = this.opt('now');
+        if (typeof now === 'function') {
+            now = now();
         }
+        return this.moment(now).stripZone();
     };
-    /* Now Indicator
-    ------------------------------------------------------------------------------------------------------------------*/
-    TimeGrid.prototype.getNowIndicatorUnit = function () {
-        return 'minute'; // will refresh on the minute
+    // Produces a human-readable string for the given duration.
+    // Side-effect: changes the locale of the given duration.
+    Calendar.prototype.humanizeDuration = function (duration) {
+        return duration.locale(this.opt('locale')).humanize();
     };
-    TimeGrid.prototype.renderNowIndicator = function (date) {
-        // HACK: if date columns not ready for some reason (scheduler)
-        if (!this.colContainerEls) {
-            return;
+    // will return `null` if invalid range
+    Calendar.prototype.parseUnzonedRange = function (rangeInput) {
+        var start = null;
+        var end = null;
+        if (rangeInput.start) {
+            start = this.moment(rangeInput.start).stripZone();
         }
-        // seg system might be overkill, but it handles scenario where line needs to be rendered
-        //  more than once because of columns with the same date (resources columns for example)
-        var segs = this.componentFootprintToSegs(new ComponentFootprint_1.default(new UnzonedRange_1.default(date, date.valueOf() + 1), // protect against null range
-        false // all-day
-        ));
-        var top = this.computeDateTop(date, date);
-        var nodes = [];
-        var i;
-        // render lines within the columns
-        for (i = 0; i < segs.length; i++) {
-            nodes.push($('<div class="fc-now-indicator fc-now-indicator-line"></div>')
-                .css('top', top)
-                .appendTo(this.colContainerEls.eq(segs[i].col))[0]);
+        if (rangeInput.end) {
+            end = this.moment(rangeInput.end).stripZone();
         }
-        // render an arrow over the axis
-        if (segs.length > 0) {
-            nodes.push($('<div class="fc-now-indicator fc-now-indicator-arrow"></div>')
-                .css('top', top)
-                .appendTo(this.el.find('.fc-content-skeleton'))[0]);
+        if (!start && !end) {
+            return null;
         }
-        this.nowIndicatorEls = $(nodes);
+        if (start && end && end.isBefore(start)) {
+            return null;
+        }
+        return new UnzonedRange_1.default(start, end);
     };
-    TimeGrid.prototype.unrenderNowIndicator = function () {
-        if (this.nowIndicatorEls) {
-            this.nowIndicatorEls.remove();
-            this.nowIndicatorEls = null;
+    // Event-Date Utilities
+    // -----------------------------------------------------------------------------------------------------------------
+    Calendar.prototype.initEventManager = function () {
+        var _this = this;
+        var eventManager = new EventManager_1.default(this);
+        var rawSources = this.opt('eventSources') || [];
+        var singleRawSource = this.opt('events');
+        this.eventManager = eventManager;
+        if (singleRawSource) {
+            rawSources.unshift(singleRawSource);
         }
+        eventManager.on('release', function (eventsPayload) {
+            _this.trigger('eventsReset', eventsPayload);
+        });
+        eventManager.freeze();
+        rawSources.forEach(function (rawSource) {
+            var source = EventSourceParser_1.default.parse(rawSource, _this);
+            if (source) {
+                eventManager.addSource(source);
+            }
+        });
+        eventManager.thaw();
     };
-    /* Coordinates
-    ------------------------------------------------------------------------------------------------------------------*/
-    TimeGrid.prototype.updateSize = function (totalHeight, isAuto, isResize) {
-        _super.prototype.updateSize.call(this, totalHeight, isAuto, isResize);
-        this.slatCoordCache.build();
-        if (isResize) {
-            this.updateSegVerticals([].concat(this.eventRenderer.getSegs(), this.businessSegs || []));
+    Calendar.prototype.requestEvents = function (start, end) {
+        return this.eventManager.requestEvents(start, end, this.opt('timezone'), !this.opt('lazyFetching'));
+    };
+    // Get an event's normalized end date. If not present, calculate it from the defaults.
+    Calendar.prototype.getEventEnd = function (event) {
+        if (event.end) {
+            return event.end.clone();
+        }
+        else {
+            return this.getDefaultEventEnd(event.allDay, event.start);
         }
     };
-    TimeGrid.prototype.getTotalSlatHeight = function () {
-        return this.slatContainerEl.outerHeight();
+    // Given an event's allDay status and start date, return what its fallback end date should be.
+    // TODO: rename to computeDefaultEventEnd
+    Calendar.prototype.getDefaultEventEnd = function (allDay, zonedStart) {
+        var end = zonedStart.clone();
+        if (allDay) {
+            end.stripTime().add(this.defaultAllDayEventDuration);
+        }
+        else {
+            end.add(this.defaultTimedEventDuration);
+        }
+        if (this.getIsAmbigTimezone()) {
+            end.stripZone(); // we don't know what the tzo should be
+        }
+        return end;
     };
-    // Computes the top coordinate, relative to the bounds of the grid, of the given date.
-    // `ms` can be a millisecond UTC time OR a UTC moment.
-    // A `startOfDayDate` must be given for avoiding ambiguity over how to treat midnight.
-    TimeGrid.prototype.computeDateTop = function (ms, startOfDayDate) {
-        return this.computeTimeTop(moment.duration(ms - startOfDayDate.clone().stripTime()));
+    // Public Events API
+    // -----------------------------------------------------------------------------------------------------------------
+    Calendar.prototype.rerenderEvents = function () {
+        this.view.flash('displayingEvents');
     };
-    // Computes the top coordinate, relative to the bounds of the grid, of the given time (a Duration).
-    TimeGrid.prototype.computeTimeTop = function (time) {
-        var len = this.slatEls.length;
-        var dateProfile = this.dateProfile;
-        var slatCoverage = (time - dateProfile.minTime) / this.slotDuration; // floating-point value of # of slots covered
-        var slatIndex;
-        var slatRemainder;
-        // compute a floating-point number for how many slats should be progressed through.
-        // from 0 to number of slats (inclusive)
-        // constrained because minTime/maxTime might be customized.
-        slatCoverage = Math.max(0, slatCoverage);
-        slatCoverage = Math.min(len, slatCoverage);
-        // an integer index of the furthest whole slat
-        // from 0 to number slats (*exclusive*, so len-1)
-        slatIndex = Math.floor(slatCoverage);
-        slatIndex = Math.min(slatIndex, len - 1);
-        // how much further through the slatIndex slat (from 0.0-1.0) must be covered in addition.
-        // could be 1.0 if slatCoverage is covering *all* the slots
-        slatRemainder = slatCoverage - slatIndex;
-        return this.slatCoordCache.getTopPosition(slatIndex) +
-            this.slatCoordCache.getHeight(slatIndex) * slatRemainder;
+    Calendar.prototype.refetchEvents = function () {
+        this.eventManager.refetchAllSources();
     };
-    // Refreshes the CSS top/bottom coordinates for each segment element.
-    // Works when called after initial render, after a window resize/zoom for example.
-    TimeGrid.prototype.updateSegVerticals = function (segs) {
-        this.computeSegVerticals(segs);
-        this.assignSegVerticals(segs);
+    Calendar.prototype.renderEvents = function (eventInputs, isSticky) {
+        this.eventManager.freeze();
+        for (var i = 0; i < eventInputs.length; i++) {
+            this.renderEvent(eventInputs[i], isSticky);
+        }
+        this.eventManager.thaw();
     };
-    // For each segment in an array, computes and assigns its top and bottom properties
-    TimeGrid.prototype.computeSegVerticals = function (segs) {
-        var eventMinHeight = this.opt('agendaEventMinHeight');
-        var i;
-        var seg;
-        var dayDate;
-        for (i = 0; i < segs.length; i++) {
-            seg = segs[i];
-            dayDate = this.dayDates[seg.dayIndex];
-            seg.top = this.computeDateTop(seg.startMs, dayDate);
-            seg.bottom = Math.max(seg.top + eventMinHeight, this.computeDateTop(seg.endMs, dayDate));
+    Calendar.prototype.renderEvent = function (eventInput, isSticky) {
+        if (isSticky === void 0) { isSticky = false; }
+        var eventManager = this.eventManager;
+        var eventDef = EventDefParser_1.default.parse(eventInput, eventInput.source || eventManager.stickySource);
+        if (eventDef) {
+            eventManager.addEventDef(eventDef, isSticky);
         }
     };
-    // Given segments that already have their top/bottom properties computed, applies those values to
-    // the segments' elements.
-    TimeGrid.prototype.assignSegVerticals = function (segs) {
+    // legacyQuery operates on legacy event instance objects
+    Calendar.prototype.removeEvents = function (legacyQuery) {
+        var eventManager = this.eventManager;
+        var legacyInstances = [];
+        var idMap = {};
+        var eventDef;
         var i;
-        var seg;
-        for (i = 0; i < segs.length; i++) {
-            seg = segs[i];
-            seg.el.css(this.generateSegVerticalCss(seg));
+        if (legacyQuery == null) { // shortcut for removing all
+            eventManager.removeAllEventDefs(); // persist=true
+        }
+        else {
+            eventManager.getEventInstances().forEach(function (eventInstance) {
+                legacyInstances.push(eventInstance.toLegacy());
+            });
+            legacyInstances = filterLegacyEventInstances(legacyInstances, legacyQuery);
+            // compute unique IDs
+            for (i = 0; i < legacyInstances.length; i++) {
+                eventDef = this.eventManager.getEventDefByUid(legacyInstances[i]._id);
+                idMap[eventDef.id] = true;
+            }
+            eventManager.freeze();
+            for (i in idMap) { // reuse `i` as an "id"
+                eventManager.removeEventDefsById(i); // persist=true
+            }
+            eventManager.thaw();
         }
     };
-    // Generates an object with CSS properties for the top/bottom coordinates of a segment element
-    TimeGrid.prototype.generateSegVerticalCss = function (seg) {
-        return {
-            top: seg.top,
-            bottom: -seg.bottom // flipped because needs to be space beyond bottom edge of event container
-        };
-    };
-    /* Hit System
-    ------------------------------------------------------------------------------------------------------------------*/
-    TimeGrid.prototype.prepareHits = function () {
-        this.colCoordCache.build();
-        this.slatCoordCache.build();
-    };
-    TimeGrid.prototype.releaseHits = function () {
-        this.colCoordCache.clear();
-        // NOTE: don't clear slatCoordCache because we rely on it for computeTimeTop
+    // legacyQuery operates on legacy event instance objects
+    Calendar.prototype.clientEvents = function (legacyQuery) {
+        var legacyEventInstances = [];
+        this.eventManager.getEventInstances().forEach(function (eventInstance) {
+            legacyEventInstances.push(eventInstance.toLegacy());
+        });
+        return filterLegacyEventInstances(legacyEventInstances, legacyQuery);
     };
-    TimeGrid.prototype.queryHit = function (leftOffset, topOffset) {
-        var snapsPerSlot = this.snapsPerSlot;
-        var colCoordCache = this.colCoordCache;
-        var slatCoordCache = this.slatCoordCache;
-        if (colCoordCache.isLeftInBounds(leftOffset) && slatCoordCache.isTopInBounds(topOffset)) {
-            var colIndex = colCoordCache.getHorizontalIndex(leftOffset);
-            var slatIndex = slatCoordCache.getVerticalIndex(topOffset);
-            if (colIndex != null && slatIndex != null) {
-                var slatTop = slatCoordCache.getTopOffset(slatIndex);
-                var slatHeight = slatCoordCache.getHeight(slatIndex);
-                var partial = (topOffset - slatTop) / slatHeight; // floating point number between 0 and 1
-                var localSnapIndex = Math.floor(partial * snapsPerSlot); // the snap # relative to start of slat
-                var snapIndex = slatIndex * snapsPerSlot + localSnapIndex;
-                var snapTop = slatTop + (localSnapIndex / snapsPerSlot) * slatHeight;
-                var snapBottom = slatTop + ((localSnapIndex + 1) / snapsPerSlot) * slatHeight;
-                return {
-                    col: colIndex,
-                    snap: snapIndex,
-                    component: this,
-                    left: colCoordCache.getLeftOffset(colIndex),
-                    right: colCoordCache.getRightOffset(colIndex),
-                    top: snapTop,
-                    bottom: snapBottom
-                };
-            }
+    Calendar.prototype.updateEvents = function (eventPropsArray) {
+        this.eventManager.freeze();
+        for (var i = 0; i < eventPropsArray.length; i++) {
+            this.updateEvent(eventPropsArray[i]);
         }
+        this.eventManager.thaw();
     };
-    TimeGrid.prototype.getHitFootprint = function (hit) {
-        var start = this.getCellDate(0, hit.col); // row=0
-        var time = this.computeSnapTime(hit.snap); // pass in the snap-index
-        var end;
-        start.time(time);
-        end = start.clone().add(this.snapDuration);
-        return new ComponentFootprint_1.default(new UnzonedRange_1.default(start, end), false // all-day?
-        );
+    Calendar.prototype.updateEvent = function (eventProps) {
+        var eventDef = this.eventManager.getEventDefByUid(eventProps._id);
+        var eventInstance;
+        var eventDefMutation;
+        if (eventDef instanceof SingleEventDef_1.default) {
+            eventInstance = eventDef.buildInstance();
+            eventDefMutation = EventDefMutation_1.default.createFromRawProps(eventInstance, eventProps, // raw props
+            null // largeUnit -- who uses it?
+            );
+            this.eventManager.mutateEventsWithId(eventDef.id, eventDefMutation); // will release
+        }
     };
-    // Given a row number of the grid, representing a "snap", returns a time (Duration) from its start-of-day
-    TimeGrid.prototype.computeSnapTime = function (snapIndex) {
-        return moment.duration(this.dateProfile.minTime + this.snapDuration * snapIndex);
+    // Public Event Sources API
+    // ------------------------------------------------------------------------------------
+    Calendar.prototype.getEventSources = function () {
+        return this.eventManager.otherSources.slice(); // clone
     };
-    TimeGrid.prototype.getHitEl = function (hit) {
-        return this.colEls.eq(hit.col);
+    Calendar.prototype.getEventSourceById = function (id) {
+        return this.eventManager.getSourceById(EventSource_1.default.normalizeId(id));
     };
-    /* Event Drag Visualization
-    ------------------------------------------------------------------------------------------------------------------*/
-    // Renders a visual indication of an event being dragged over the specified date(s).
-    // A returned value of `true` signals that a mock "helper" event has been rendered.
-    TimeGrid.prototype.renderDrag = function (eventFootprints, seg, isTouch) {
+    Calendar.prototype.addEventSource = function (sourceInput) {
+        var source = EventSourceParser_1.default.parse(sourceInput, this);
+        if (source) {
+            this.eventManager.addSource(source);
+        }
+    };
+    Calendar.prototype.removeEventSources = function (sourceMultiQuery) {
+        var eventManager = this.eventManager;
+        var sources;
         var i;
-        if (seg) {
-            if (eventFootprints.length) {
-                this.helperRenderer.renderEventDraggingFootprints(eventFootprints, seg, isTouch);
-                // signal that a helper has been rendered
-                return true;
-            }
+        if (sourceMultiQuery == null) {
+            this.eventManager.removeAllSources();
         }
         else {
-            for (i = 0; i < eventFootprints.length; i++) {
-                this.renderHighlight(eventFootprints[i].componentFootprint);
+            sources = eventManager.multiQuerySources(sourceMultiQuery);
+            eventManager.freeze();
+            for (i = 0; i < sources.length; i++) {
+                eventManager.removeSource(sources[i]);
             }
+            eventManager.thaw();
         }
     };
-    // Unrenders any visual indication of an event being dragged
-    TimeGrid.prototype.unrenderDrag = function () {
-        this.unrenderHighlight();
-        this.helperRenderer.unrender();
-    };
-    /* Event Resize Visualization
-    ------------------------------------------------------------------------------------------------------------------*/
-    // Renders a visual indication of an event being resized
-    TimeGrid.prototype.renderEventResize = function (eventFootprints, seg, isTouch) {
-        this.helperRenderer.renderEventResizingFootprints(eventFootprints, seg, isTouch);
-    };
-    // Unrenders any visual indication of an event being resized
-    TimeGrid.prototype.unrenderEventResize = function () {
-        this.helperRenderer.unrender();
-    };
-    /* Selection
-    ------------------------------------------------------------------------------------------------------------------*/
-    // Renders a visual indication of a selection. Overrides the default, which was to simply render a highlight.
-    TimeGrid.prototype.renderSelectionFootprint = function (componentFootprint) {
-        if (this.opt('selectHelper')) {
-            this.helperRenderer.renderComponentFootprint(componentFootprint);
-        }
-        else {
-            this.renderHighlight(componentFootprint);
+    Calendar.prototype.removeEventSource = function (sourceQuery) {
+        var eventManager = this.eventManager;
+        var sources = eventManager.querySources(sourceQuery);
+        var i;
+        eventManager.freeze();
+        for (i = 0; i < sources.length; i++) {
+            eventManager.removeSource(sources[i]);
         }
+        eventManager.thaw();
     };
-    // Unrenders any visual indication of a selection
-    TimeGrid.prototype.unrenderSelection = function () {
-        this.helperRenderer.unrender();
-        this.unrenderHighlight();
+    Calendar.prototype.refetchEventSources = function (sourceMultiQuery) {
+        var eventManager = this.eventManager;
+        var sources = eventManager.multiQuerySources(sourceMultiQuery);
+        var i;
+        eventManager.freeze();
+        for (i = 0; i < sources.length; i++) {
+            eventManager.refetchSource(sources[i]);
+        }
+        eventManager.thaw();
     };
-    return TimeGrid;
-}(InteractiveDateComponent_1.default));
-exports.default = TimeGrid;
-TimeGrid.prototype.eventRendererClass = TimeGridEventRenderer_1.default;
-TimeGrid.prototype.businessHourRendererClass = BusinessHourRenderer_1.default;
-TimeGrid.prototype.helperRendererClass = TimeGridHelperRenderer_1.default;
-TimeGrid.prototype.fillRendererClass = TimeGridFillRenderer_1.default;
-StandardInteractionsMixin_1.default.mixInto(TimeGrid);
-DayTableMixin_1.default.mixInto(TimeGrid);
+    // not for internal use. use options module directly instead.
+    Calendar.defaults = options_1.globalDefaults;
+    Calendar.englishDefaults = options_1.englishDefaults;
+    Calendar.rtlDefaults = options_1.rtlDefaults;
+    return Calendar;
+}());
+exports.default = Calendar;
+EmitterMixin_1.default.mixInto(Calendar);
+ListenerMixin_1.default.mixInto(Calendar);
+function filterLegacyEventInstances(legacyEventInstances, legacyQuery) {
+    if (legacyQuery == null) {
+        return legacyEventInstances;
+    }
+    else if ($.isFunction(legacyQuery)) {
+        return legacyEventInstances.filter(legacyQuery);
+    }
+    else { // an event ID
+        legacyQuery += ''; // normalize to string
+        return legacyEventInstances.filter(function (legacyEventInstance) {
+            // soft comparison because id not be normalized to string
+            // tslint:disable-next-line
+            return legacyEventInstance.id == legacyQuery ||
+                legacyEventInstance._id === legacyQuery; // can specify internal id, but must exactly match
+        });
+    }
+}
 
 
 /***/ }),
-/* 228 */
+/* 233 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
-var UnzonedRange_1 = __webpack_require__(5);
-var DateProfileGenerator_1 = __webpack_require__(221);
-var BasicViewDateProfileGenerator = /** @class */ (function (_super) {
-    tslib_1.__extends(BasicViewDateProfileGenerator, _super);
-    function BasicViewDateProfileGenerator() {
-        return _super !== null && _super.apply(this, arguments) || this;
+var $ = __webpack_require__(3);
+var moment = __webpack_require__(0);
+var exportHooks = __webpack_require__(18);
+var util_1 = __webpack_require__(4);
+var moment_ext_1 = __webpack_require__(11);
+var ListenerMixin_1 = __webpack_require__(7);
+var HitDragListener_1 = __webpack_require__(17);
+var SingleEventDef_1 = __webpack_require__(9);
+var EventInstanceGroup_1 = __webpack_require__(20);
+var EventSource_1 = __webpack_require__(6);
+var Interaction_1 = __webpack_require__(14);
+var ExternalDropping = /** @class */ (function (_super) {
+    tslib_1.__extends(ExternalDropping, _super);
+    function ExternalDropping() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.isDragging = false; // jqui-dragging an external element? boolean
+        return _this;
     }
-    // Computes the date range that will be rendered.
-    BasicViewDateProfileGenerator.prototype.buildRenderRange = function (currentUnzonedRange, currentRangeUnit, isRangeAllDay) {
-        var renderUnzonedRange = _super.prototype.buildRenderRange.call(this, currentUnzonedRange, currentRangeUnit, isRangeAllDay); // an UnzonedRange
-        var start = this.msToUtcMoment(renderUnzonedRange.startMs, isRangeAllDay);
-        var end = this.msToUtcMoment(renderUnzonedRange.endMs, isRangeAllDay);
-        // year and month views should be aligned with weeks. this is already done for week
-        if (/^(year|month)$/.test(currentRangeUnit)) {
-            start.startOf('week');
-            // make end-of-week if not already
-            if (end.weekday()) {
-                end.add(1, 'week').startOf('week'); // exclusively move backwards
+    /*
+    component impements:
+      - eventRangesToEventFootprints
+      - isEventInstanceGroupAllowed
+      - isExternalInstanceGroupAllowed
+      - renderDrag
+      - unrenderDrag
+    */
+    ExternalDropping.prototype.end = function () {
+        if (this.dragListener) {
+            this.dragListener.endInteraction();
+        }
+    };
+    ExternalDropping.prototype.bindToDocument = function () {
+        this.listenTo($(document), {
+            dragstart: this.handleDragStart,
+            sortstart: this.handleDragStart // jqui
+        });
+    };
+    ExternalDropping.prototype.unbindFromDocument = function () {
+        this.stopListeningTo($(document));
+    };
+    // Called when a jQuery UI drag is initiated anywhere in the DOM
+    ExternalDropping.prototype.handleDragStart = function (ev, ui) {
+        var el;
+        var accept;
+        if (this.opt('droppable')) { // only listen if this setting is on
+            el = $((ui ? ui.item : null) || ev.target);
+            // Test that the dragged element passes the dropAccept selector or filter function.
+            // FYI, the default is "*" (matches all)
+            accept = this.opt('dropAccept');
+            if ($.isFunction(accept) ? accept.call(el[0], el) : el.is(accept)) {
+                if (!this.isDragging) { // prevent double-listening if fired twice
+                    this.listenToExternalDrag(el, ev, ui);
+                }
+            }
+        }
+    };
+    // Called when a jQuery UI drag starts and it needs to be monitored for dropping
+    ExternalDropping.prototype.listenToExternalDrag = function (el, ev, ui) {
+        var _this = this;
+        var component = this.component;
+        var view = this.view;
+        var meta = getDraggedElMeta(el); // extra data about event drop, including possible event to create
+        var singleEventDef; // a null value signals an unsuccessful drag
+        // listener that tracks mouse movement over date-associated pixel regions
+        var dragListener = this.dragListener = new HitDragListener_1.default(component, {
+            interactionStart: function () {
+                _this.isDragging = true;
+            },
+            hitOver: function (hit) {
+                var isAllowed = true;
+                var hitFootprint = hit.component.getSafeHitFootprint(hit); // hit might not belong to this grid
+                var mutatedEventInstanceGroup;
+                if (hitFootprint) {
+                    singleEventDef = _this.computeExternalDrop(hitFootprint, meta);
+                    if (singleEventDef) {
+                        mutatedEventInstanceGroup = new EventInstanceGroup_1.default(singleEventDef.buildInstances());
+                        isAllowed = meta.eventProps ? // isEvent?
+                            component.isEventInstanceGroupAllowed(mutatedEventInstanceGroup) :
+                            component.isExternalInstanceGroupAllowed(mutatedEventInstanceGroup);
+                    }
+                    else {
+                        isAllowed = false;
+                    }
+                }
+                else {
+                    isAllowed = false;
+                }
+                if (!isAllowed) {
+                    singleEventDef = null;
+                    util_1.disableCursor();
+                }
+                if (singleEventDef) {
+                    component.renderDrag(// called without a seg parameter
+                    component.eventRangesToEventFootprints(mutatedEventInstanceGroup.sliceRenderRanges(component.dateProfile.renderUnzonedRange, view.calendar)));
+                }
+            },
+            hitOut: function () {
+                singleEventDef = null; // signal unsuccessful
+            },
+            hitDone: function () {
+                util_1.enableCursor();
+                component.unrenderDrag();
+            },
+            interactionEnd: function (ev) {
+                if (singleEventDef) { // element was dropped on a valid hit
+                    view.reportExternalDrop(singleEventDef, Boolean(meta.eventProps), // isEvent
+                    Boolean(meta.stick), // isSticky
+                    el, ev, ui);
+                }
+                _this.isDragging = false;
+                _this.dragListener = null;
+            }
+        });
+        dragListener.startDrag(ev); // start listening immediately
+    };
+    // Given a hit to be dropped upon, and misc data associated with the jqui drag (guaranteed to be a plain object),
+    // returns the zoned start/end dates for the event that would result from the hypothetical drop. end might be null.
+    // Returning a null value signals an invalid drop hit.
+    // DOES NOT consider overlap/constraint.
+    // Assumes both footprints are non-open-ended.
+    ExternalDropping.prototype.computeExternalDrop = function (componentFootprint, meta) {
+        var calendar = this.view.calendar;
+        var start = moment_ext_1.default.utc(componentFootprint.unzonedRange.startMs).stripZone();
+        var end;
+        var eventDef;
+        if (componentFootprint.isAllDay) {
+            // if dropped on an all-day span, and element's metadata specified a time, set it
+            if (meta.startTime) {
+                start.time(meta.startTime);
+            }
+            else {
+                start.stripTime();
             }
         }
-        return new UnzonedRange_1.default(start, end);
+        if (meta.duration) {
+            end = start.clone().add(meta.duration);
+        }
+        start = calendar.applyTimezone(start);
+        if (end) {
+            end = calendar.applyTimezone(end);
+        }
+        eventDef = SingleEventDef_1.default.parse($.extend({}, meta.eventProps, {
+            start: start,
+            end: end
+        }), new EventSource_1.default(calendar));
+        return eventDef;
     };
-    return BasicViewDateProfileGenerator;
-}(DateProfileGenerator_1.default));
-exports.default = BasicViewDateProfileGenerator;
+    return ExternalDropping;
+}(Interaction_1.default));
+exports.default = ExternalDropping;
+ListenerMixin_1.default.mixInto(ExternalDropping);
+/* External-Dragging-Element Data
+----------------------------------------------------------------------------------------------------------------------*/
+// Require all HTML5 data-* attributes used by FullCalendar to have this prefix.
+// A value of '' will query attributes like data-event. A value of 'fc' will query attributes like data-fc-event.
+exportHooks.dataAttrPrefix = '';
+// Given a jQuery element that might represent a dragged FullCalendar event, returns an intermediate data structure
+// to be used for Event Object creation.
+// A defined `.eventProps`, even when empty, indicates that an event should be created.
+function getDraggedElMeta(el) {
+    var prefix = exportHooks.dataAttrPrefix;
+    var eventProps; // properties for creating the event, not related to date/time
+    var startTime; // a Duration
+    var duration;
+    var stick;
+    if (prefix) {
+        prefix += '-';
+    }
+    eventProps = el.data(prefix + 'event') || null;
+    if (eventProps) {
+        if (typeof eventProps === 'object') {
+            eventProps = $.extend({}, eventProps); // make a copy
+        }
+        else { // something like 1 or true. still signal event creation
+            eventProps = {};
+        }
+        // pluck special-cased date/time properties
+        startTime = eventProps.start;
+        if (startTime == null) {
+            startTime = eventProps.time;
+        } // accept 'time' as well
+        duration = eventProps.duration;
+        stick = eventProps.stick;
+        delete eventProps.start;
+        delete eventProps.time;
+        delete eventProps.duration;
+        delete eventProps.stick;
+    }
+    // fallback to standalone attribute values for each of the date/time properties
+    if (startTime == null) {
+        startTime = el.data(prefix + 'start');
+    }
+    if (startTime == null) {
+        startTime = el.data(prefix + 'time');
+    } // accept 'time' as well
+    if (duration == null) {
+        duration = el.data(prefix + 'duration');
+    }
+    if (stick == null) {
+        stick = el.data(prefix + 'stick');
+    }
+    // massage into correct data types
+    startTime = startTime != null ? moment.duration(startTime) : null;
+    duration = duration != null ? moment.duration(duration) : null;
+    stick = Boolean(stick);
+    return { eventProps: eventProps, startTime: startTime, duration: duration, stick: stick };
+}
 
 
 /***/ }),
-/* 229 */
+/* 234 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
-var moment = __webpack_require__(0);
+var $ = __webpack_require__(3);
 var util_1 = __webpack_require__(4);
-var BasicView_1 = __webpack_require__(62);
-var MonthViewDateProfileGenerator_1 = __webpack_require__(253);
-/* A month view with day cells running in rows (one-per-week) and columns
-----------------------------------------------------------------------------------------------------------------------*/
-var MonthView = /** @class */ (function (_super) {
-    tslib_1.__extends(MonthView, _super);
-    function MonthView() {
-        return _super !== null && _super.apply(this, arguments) || this;
+var EventDefMutation_1 = __webpack_require__(39);
+var EventDefDateMutation_1 = __webpack_require__(40);
+var HitDragListener_1 = __webpack_require__(17);
+var Interaction_1 = __webpack_require__(14);
+var EventResizing = /** @class */ (function (_super) {
+    tslib_1.__extends(EventResizing, _super);
+    /*
+    component impements:
+      - bindSegHandlerToEl
+      - publiclyTrigger
+      - diffDates
+      - eventRangesToEventFootprints
+      - isEventInstanceGroupAllowed
+      - getSafeHitFootprint
+    */
+    function EventResizing(component, eventPointing) {
+        var _this = _super.call(this, component) || this;
+        _this.isResizing = false;
+        _this.eventPointing = eventPointing;
+        return _this;
     }
-    // Overrides the default BasicView behavior to have special multi-week auto-height logic
-    MonthView.prototype.setGridHeight = function (height, isAuto) {
-        // if auto, make the height of each row the height that it would be if there were 6 weeks
-        if (isAuto) {
-            height *= this.dayGrid.rowCnt / 6;
+    EventResizing.prototype.end = function () {
+        if (this.dragListener) {
+            this.dragListener.endInteraction();
+        }
+    };
+    EventResizing.prototype.bindToEl = function (el) {
+        var component = this.component;
+        component.bindSegHandlerToEl(el, 'mousedown', this.handleMouseDown.bind(this));
+        component.bindSegHandlerToEl(el, 'touchstart', this.handleTouchStart.bind(this));
+    };
+    EventResizing.prototype.handleMouseDown = function (seg, ev) {
+        if (this.component.canStartResize(seg, ev)) {
+            this.buildDragListener(seg, $(ev.target).is('.fc-start-resizer'))
+                .startInteraction(ev, { distance: 5 });
+        }
+    };
+    EventResizing.prototype.handleTouchStart = function (seg, ev) {
+        if (this.component.canStartResize(seg, ev)) {
+            this.buildDragListener(seg, $(ev.target).is('.fc-start-resizer'))
+                .startInteraction(ev);
+        }
+    };
+    // Creates a listener that tracks the user as they resize an event segment.
+    // Generic enough to work with any type of Grid.
+    EventResizing.prototype.buildDragListener = function (seg, isStart) {
+        var _this = this;
+        var component = this.component;
+        var view = this.view;
+        var calendar = view.calendar;
+        var eventManager = calendar.eventManager;
+        var el = seg.el;
+        var eventDef = seg.footprint.eventDef;
+        var eventInstance = seg.footprint.eventInstance;
+        var isDragging;
+        var resizeMutation; // zoned event date properties. falsy if invalid resize
+        // Tracks mouse movement over the *grid's* coordinate map
+        var dragListener = this.dragListener = new HitDragListener_1.default(component, {
+            scroll: this.opt('dragScroll'),
+            subjectEl: el,
+            interactionStart: function () {
+                isDragging = false;
+            },
+            dragStart: function (ev) {
+                isDragging = true;
+                // ensure a mouseout on the manipulated event has been reported
+                _this.eventPointing.handleMouseout(seg, ev);
+                _this.segResizeStart(seg, ev);
+            },
+            hitOver: function (hit, isOrig, origHit) {
+                var isAllowed = true;
+                var origHitFootprint = component.getSafeHitFootprint(origHit);
+                var hitFootprint = component.getSafeHitFootprint(hit);
+                var mutatedEventInstanceGroup;
+                if (origHitFootprint && hitFootprint) {
+                    resizeMutation = isStart ?
+                        _this.computeEventStartResizeMutation(origHitFootprint, hitFootprint, seg.footprint) :
+                        _this.computeEventEndResizeMutation(origHitFootprint, hitFootprint, seg.footprint);
+                    if (resizeMutation) {
+                        mutatedEventInstanceGroup = eventManager.buildMutatedEventInstanceGroup(eventDef.id, resizeMutation);
+                        isAllowed = component.isEventInstanceGroupAllowed(mutatedEventInstanceGroup);
+                    }
+                    else {
+                        isAllowed = false;
+                    }
+                }
+                else {
+                    isAllowed = false;
+                }
+                if (!isAllowed) {
+                    resizeMutation = null;
+                    util_1.disableCursor();
+                }
+                else if (resizeMutation.isEmpty()) {
+                    // no change. (FYI, event dates might have zones)
+                    resizeMutation = null;
+                }
+                if (resizeMutation) {
+                    view.hideEventsWithId(seg.footprint.eventDef.id);
+                    view.renderEventResize(component.eventRangesToEventFootprints(mutatedEventInstanceGroup.sliceRenderRanges(component.dateProfile.renderUnzonedRange, calendar)), seg);
+                }
+            },
+            hitOut: function () {
+                resizeMutation = null;
+            },
+            hitDone: function () {
+                view.unrenderEventResize(seg);
+                view.showEventsWithId(seg.footprint.eventDef.id);
+                util_1.enableCursor();
+            },
+            interactionEnd: function (ev) {
+                if (isDragging) {
+                    _this.segResizeStop(seg, ev);
+                }
+                if (resizeMutation) { // valid date to resize to?
+                    // no need to re-show original, will rerender all anyways. esp important if eventRenderWait
+                    view.reportEventResize(eventInstance, resizeMutation, el, ev);
+                }
+                _this.dragListener = null;
+            }
+        });
+        return dragListener;
+    };
+    // Called before event segment resizing starts
+    EventResizing.prototype.segResizeStart = function (seg, ev) {
+        this.isResizing = true;
+        this.component.publiclyTrigger('eventResizeStart', {
+            context: seg.el[0],
+            args: [
+                seg.footprint.getEventLegacy(),
+                ev,
+                {},
+                this.view
+            ]
+        });
+    };
+    // Called after event segment resizing stops
+    EventResizing.prototype.segResizeStop = function (seg, ev) {
+        this.isResizing = false;
+        this.component.publiclyTrigger('eventResizeStop', {
+            context: seg.el[0],
+            args: [
+                seg.footprint.getEventLegacy(),
+                ev,
+                {},
+                this.view
+            ]
+        });
+    };
+    // Returns new date-information for an event segment being resized from its start
+    EventResizing.prototype.computeEventStartResizeMutation = function (startFootprint, endFootprint, origEventFootprint) {
+        var origRange = origEventFootprint.componentFootprint.unzonedRange;
+        var startDelta = this.component.diffDates(endFootprint.unzonedRange.getStart(), startFootprint.unzonedRange.getStart());
+        var dateMutation;
+        var eventDefMutation;
+        if (origRange.getStart().add(startDelta) < origRange.getEnd()) {
+            dateMutation = new EventDefDateMutation_1.default();
+            dateMutation.setStartDelta(startDelta);
+            eventDefMutation = new EventDefMutation_1.default();
+            eventDefMutation.setDateMutation(dateMutation);
+            return eventDefMutation;
+        }
+        return false;
+    };
+    // Returns new date-information for an event segment being resized from its end
+    EventResizing.prototype.computeEventEndResizeMutation = function (startFootprint, endFootprint, origEventFootprint) {
+        var origRange = origEventFootprint.componentFootprint.unzonedRange;
+        var endDelta = this.component.diffDates(endFootprint.unzonedRange.getEnd(), startFootprint.unzonedRange.getEnd());
+        var dateMutation;
+        var eventDefMutation;
+        if (origRange.getEnd().add(endDelta) > origRange.getStart()) {
+            dateMutation = new EventDefDateMutation_1.default();
+            dateMutation.setEndDelta(endDelta);
+            eventDefMutation = new EventDefMutation_1.default();
+            eventDefMutation.setDateMutation(dateMutation);
+            return eventDefMutation;
         }
-        util_1.distributeHeight(this.dayGrid.rowEls, height, !isAuto); // if auto, don't compensate for height-hogging rows
-    };
-    MonthView.prototype.isDateInOtherMonth = function (date, dateProfile) {
-        return date.month() !== moment.utc(dateProfile.currentUnzonedRange.startMs).month(); // TODO: optimize
+        return false;
     };
-    return MonthView;
-}(BasicView_1.default));
-exports.default = MonthView;
-MonthView.prototype.dateProfileGeneratorClass = MonthViewDateProfileGenerator_1.default;
+    return EventResizing;
+}(Interaction_1.default));
+exports.default = EventResizing;
 
 
 /***/ }),
-/* 230 */
+/* 235 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
-var $ = __webpack_require__(3);
 var util_1 = __webpack_require__(4);
-var UnzonedRange_1 = __webpack_require__(5);
-var View_1 = __webpack_require__(41);
-var Scroller_1 = __webpack_require__(39);
-var ListEventRenderer_1 = __webpack_require__(254);
-var ListEventPointing_1 = __webpack_require__(255);
-/*
-Responsible for the scroller, and forwarding event-related actions into the "grid".
-*/
-var ListView = /** @class */ (function (_super) {
-    tslib_1.__extends(ListView, _super);
-    function ListView(calendar, viewSpec) {
-        var _this = _super.call(this, calendar, viewSpec) || this;
-        _this.segSelector = '.fc-list-item'; // which elements accept event actions
-        _this.scroller = new Scroller_1.default({
-            overflowX: 'hidden',
-            overflowY: 'auto'
-        });
+var EventDefMutation_1 = __webpack_require__(39);
+var EventDefDateMutation_1 = __webpack_require__(40);
+var DragListener_1 = __webpack_require__(59);
+var HitDragListener_1 = __webpack_require__(17);
+var MouseFollower_1 = __webpack_require__(226);
+var Interaction_1 = __webpack_require__(14);
+var EventDragging = /** @class */ (function (_super) {
+    tslib_1.__extends(EventDragging, _super);
+    /*
+    component implements:
+      - bindSegHandlerToEl
+      - publiclyTrigger
+      - diffDates
+      - eventRangesToEventFootprints
+      - isEventInstanceGroupAllowed
+    */
+    function EventDragging(component, eventPointing) {
+        var _this = _super.call(this, component) || this;
+        _this.isDragging = false;
+        _this.eventPointing = eventPointing;
         return _this;
     }
-    ListView.prototype.renderSkeleton = function () {
-        this.el.addClass('fc-list-view ' +
-            this.calendar.theme.getClass('listView'));
-        this.scroller.render();
-        this.scroller.el.appendTo(this.el);
-        this.contentEl = this.scroller.scrollEl; // shortcut
-    };
-    ListView.prototype.unrenderSkeleton = function () {
-        this.scroller.destroy(); // will remove the Grid too
+    EventDragging.prototype.end = function () {
+        if (this.dragListener) {
+            this.dragListener.endInteraction();
+        }
     };
-    ListView.prototype.updateSize = function (totalHeight, isAuto, isResize) {
-        _super.prototype.updateSize.call(this, totalHeight, isAuto, isResize);
-        this.scroller.clear(); // sets height to 'auto' and clears overflow
-        if (!isAuto) {
-            this.scroller.setHeight(this.computeScrollerHeight(totalHeight));
+    EventDragging.prototype.getSelectionDelay = function () {
+        var delay = this.opt('eventLongPressDelay');
+        if (delay == null) {
+            delay = this.opt('longPressDelay'); // fallback
         }
+        return delay;
     };
-    ListView.prototype.computeScrollerHeight = function (totalHeight) {
-        return totalHeight -
-            util_1.subtractInnerElHeight(this.el, this.scroller.el); // everything that's NOT the scroller
+    EventDragging.prototype.bindToEl = function (el) {
+        var component = this.component;
+        component.bindSegHandlerToEl(el, 'mousedown', this.handleMousedown.bind(this));
+        component.bindSegHandlerToEl(el, 'touchstart', this.handleTouchStart.bind(this));
     };
-    ListView.prototype.renderDates = function (dateProfile) {
-        var calendar = this.calendar;
-        var dayStart = calendar.msToUtcMoment(dateProfile.renderUnzonedRange.startMs, true);
-        var viewEnd = calendar.msToUtcMoment(dateProfile.renderUnzonedRange.endMs, true);
-        var dayDates = [];
-        var dayRanges = [];
-        while (dayStart < viewEnd) {
-            dayDates.push(dayStart.clone());
-            dayRanges.push(new UnzonedRange_1.default(dayStart, dayStart.clone().add(1, 'day')));
-            dayStart.add(1, 'day');
+    EventDragging.prototype.handleMousedown = function (seg, ev) {
+        if (!this.component.shouldIgnoreMouse() &&
+            this.component.canStartDrag(seg, ev)) {
+            this.buildDragListener(seg).startInteraction(ev, { distance: 5 });
         }
-        this.dayDates = dayDates;
-        this.dayRanges = dayRanges;
-        // all real rendering happens in EventRenderer
     };
-    // slices by day
-    ListView.prototype.componentFootprintToSegs = function (footprint) {
-        var dayRanges = this.dayRanges;
-        var dayIndex;
-        var segRange;
-        var seg;
-        var segs = [];
-        for (dayIndex = 0; dayIndex < dayRanges.length; dayIndex++) {
-            segRange = footprint.unzonedRange.intersect(dayRanges[dayIndex]);
-            if (segRange) {
-                seg = {
-                    startMs: segRange.startMs,
-                    endMs: segRange.endMs,
-                    isStart: segRange.isStart,
-                    isEnd: segRange.isEnd,
-                    dayIndex: dayIndex
-                };
-                segs.push(seg);
-                // detect when footprint won't go fully into the next day,
-                // and mutate the latest seg to the be the end.
-                if (!seg.isEnd && !footprint.isAllDay &&
-                    dayIndex + 1 < dayRanges.length &&
-                    footprint.unzonedRange.endMs < dayRanges[dayIndex + 1].startMs + this.nextDayThreshold) {
-                    seg.endMs = footprint.unzonedRange.endMs;
-                    seg.isEnd = true;
-                    break;
-                }
-            }
+    EventDragging.prototype.handleTouchStart = function (seg, ev) {
+        var component = this.component;
+        var settings = {
+            delay: this.view.isEventDefSelected(seg.footprint.eventDef) ? // already selected?
+                0 : this.getSelectionDelay()
+        };
+        if (component.canStartDrag(seg, ev)) {
+            this.buildDragListener(seg).startInteraction(ev, settings);
+        }
+        else if (component.canStartSelection(seg, ev)) {
+            this.buildSelectListener(seg).startInteraction(ev, settings);
         }
-        return segs;
-    };
-    ListView.prototype.renderEmptyMessage = function () {
-        this.contentEl.html('<div class="fc-list-empty-wrap2">' + // TODO: try less wraps
-            '<div class="fc-list-empty-wrap1">' +
-            '<div class="fc-list-empty">' +
-            util_1.htmlEscape(this.opt('noEventsMessage')) +
-            '</div>' +
-            '</div>' +
-            '</div>');
     };
-    // render the event segments in the view
-    ListView.prototype.renderSegList = function (allSegs) {
-        var segsByDay = this.groupSegsByDay(allSegs); // sparse array
-        var dayIndex;
-        var daySegs;
-        var i;
-        var tableEl = $('<table class="fc-list-table ' + this.calendar.theme.getClass('tableList') + '"><tbody/></table>');
-        var tbodyEl = tableEl.find('tbody');
-        for (dayIndex = 0; dayIndex < segsByDay.length; dayIndex++) {
-            daySegs = segsByDay[dayIndex];
-            if (daySegs) {
-                // append a day header
-                tbodyEl.append(this.dayHeaderHtml(this.dayDates[dayIndex]));
-                this.eventRenderer.sortEventSegs(daySegs);
-                for (i = 0; i < daySegs.length; i++) {
-                    tbodyEl.append(daySegs[i].el); // append event row
+    // seg isn't draggable, but let's use a generic DragListener
+    // simply for the delay, so it can be selected.
+    // Has side effect of setting/unsetting `dragListener`
+    EventDragging.prototype.buildSelectListener = function (seg) {
+        var _this = this;
+        var view = this.view;
+        var eventDef = seg.footprint.eventDef;
+        var eventInstance = seg.footprint.eventInstance; // null for inverse-background events
+        if (this.dragListener) {
+            return this.dragListener;
+        }
+        var dragListener = this.dragListener = new DragListener_1.default({
+            dragStart: function (ev) {
+                if (dragListener.isTouch &&
+                    !view.isEventDefSelected(eventDef) &&
+                    eventInstance) {
+                    // if not previously selected, will fire after a delay. then, select the event
+                    view.selectEventInstance(eventInstance);
                 }
+            },
+            interactionEnd: function (ev) {
+                _this.dragListener = null;
             }
-        }
-        this.contentEl.empty().append(tableEl);
+        });
+        return dragListener;
     };
-    // Returns a sparse array of arrays, segs grouped by their dayIndex
-    ListView.prototype.groupSegsByDay = function (segs) {
-        var segsByDay = []; // sparse array
-        var i;
-        var seg;
-        for (i = 0; i < segs.length; i++) {
-            seg = segs[i];
-            (segsByDay[seg.dayIndex] || (segsByDay[seg.dayIndex] = []))
-                .push(seg);
+    // Builds a listener that will track user-dragging on an event segment.
+    // Generic enough to work with any type of Grid.
+    // Has side effect of setting/unsetting `dragListener`
+    EventDragging.prototype.buildDragListener = function (seg) {
+        var _this = this;
+        var component = this.component;
+        var view = this.view;
+        var calendar = view.calendar;
+        var eventManager = calendar.eventManager;
+        var el = seg.el;
+        var eventDef = seg.footprint.eventDef;
+        var eventInstance = seg.footprint.eventInstance; // null for inverse-background events
+        var isDragging;
+        var mouseFollower; // A clone of the original element that will move with the mouse
+        var eventDefMutation;
+        if (this.dragListener) {
+            return this.dragListener;
         }
-        return segsByDay;
-    };
-    // generates the HTML for the day headers that live amongst the event rows
-    ListView.prototype.dayHeaderHtml = function (dayDate) {
-        var mainFormat = this.opt('listDayFormat');
-        var altFormat = this.opt('listDayAltFormat');
-        return '<tr class="fc-list-heading" data-date="' + dayDate.format('YYYY-MM-DD') + '">' +
-            '<td class="' + (this.calendar.theme.getClass('tableListHeading') ||
-            this.calendar.theme.getClass('widgetHeader')) + '" colspan="3">' +
-            (mainFormat ?
-                this.buildGotoAnchorHtml(dayDate, { 'class': 'fc-list-heading-main' }, util_1.htmlEscape(dayDate.format(mainFormat)) // inner HTML
-                ) :
-                '') +
-            (altFormat ?
-                this.buildGotoAnchorHtml(dayDate, { 'class': 'fc-list-heading-alt' }, util_1.htmlEscape(dayDate.format(altFormat)) // inner HTML
-                ) :
-                '') +
-            '</td>' +
-            '</tr>';
-    };
-    return ListView;
-}(View_1.default));
-exports.default = ListView;
-ListView.prototype.eventRendererClass = ListEventRenderer_1.default;
-ListView.prototype.eventPointingClass = ListEventPointing_1.default;
-
-
-/***/ }),
-/* 231 */,
-/* 232 */,
-/* 233 */,
-/* 234 */,
-/* 235 */,
-/* 236 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var $ = __webpack_require__(3);
-var exportHooks = __webpack_require__(16);
-var util_1 = __webpack_require__(4);
-var Calendar_1 = __webpack_require__(220);
-// for intentional side-effects
-__webpack_require__(10);
-__webpack_require__(47);
-__webpack_require__(256);
-__webpack_require__(257);
-__webpack_require__(260);
-__webpack_require__(261);
-__webpack_require__(262);
-__webpack_require__(263);
-$.fullCalendar = exportHooks;
-$.fn.fullCalendar = function (options) {
-    var args = Array.prototype.slice.call(arguments, 1); // for a possible method call
-    var res = this; // what this function will return (this jQuery object by default)
-    this.each(function (i, _element) {
-        var element = $(_element);
-        var calendar = element.data('fullCalendar'); // get the existing calendar object (if any)
-        var singleRes; // the returned value of this single method call
-        // a method call
-        if (typeof options === 'string') {
-            if (options === 'getCalendar') {
-                if (!i) {
-                    res = calendar;
+        // Tracks mouse movement over the *view's* coordinate map. Allows dragging and dropping between subcomponents
+        // of the view.
+        var dragListener = this.dragListener = new HitDragListener_1.default(view, {
+            scroll: this.opt('dragScroll'),
+            subjectEl: el,
+            subjectCenter: true,
+            interactionStart: function (ev) {
+                seg.component = component; // for renderDrag
+                isDragging = false;
+                mouseFollower = new MouseFollower_1.default(seg.el, {
+                    additionalClass: 'fc-dragging',
+                    parentEl: view.el,
+                    opacity: dragListener.isTouch ? null : _this.opt('dragOpacity'),
+                    revertDuration: _this.opt('dragRevertDuration'),
+                    zIndex: 2 // one above the .fc-view
+                });
+                mouseFollower.hide(); // don't show until we know this is a real drag
+                mouseFollower.start(ev);
+            },
+            dragStart: function (ev) {
+                if (dragListener.isTouch &&
+                    !view.isEventDefSelected(eventDef) &&
+                    eventInstance) {
+                    // if not previously selected, will fire after a delay. then, select the event
+                    view.selectEventInstance(eventInstance);
                 }
-            }
-            else if (options === 'destroy') {
-                if (calendar) {
-                    calendar.destroy();
-                    element.removeData('fullCalendar');
+                isDragging = true;
+                // ensure a mouseout on the manipulated event has been reported
+                _this.eventPointing.handleMouseout(seg, ev);
+                _this.segDragStart(seg, ev);
+                view.hideEventsWithId(seg.footprint.eventDef.id);
+            },
+            hitOver: function (hit, isOrig, origHit) {
+                var isAllowed = true;
+                var origFootprint;
+                var footprint;
+                var mutatedEventInstanceGroup;
+                // starting hit could be forced (DayGrid.limit)
+                if (seg.hit) {
+                    origHit = seg.hit;
                 }
-            }
-            else if (!calendar) {
-                util_1.warn('Attempting to call a FullCalendar method on an element with no calendar.');
-            }
-            else if ($.isFunction(calendar[options])) {
-                singleRes = calendar[options].apply(calendar, args);
-                if (!i) {
-                    res = singleRes; // record the first method call result
+                // hit might not belong to this grid, so query origin grid
+                origFootprint = origHit.component.getSafeHitFootprint(origHit);
+                footprint = hit.component.getSafeHitFootprint(hit);
+                if (origFootprint && footprint) {
+                    eventDefMutation = _this.computeEventDropMutation(origFootprint, footprint, eventDef);
+                    if (eventDefMutation) {
+                        mutatedEventInstanceGroup = eventManager.buildMutatedEventInstanceGroup(eventDef.id, eventDefMutation);
+                        isAllowed = component.isEventInstanceGroupAllowed(mutatedEventInstanceGroup);
+                    }
+                    else {
+                        isAllowed = false;
+                    }
                 }
-                if (options === 'destroy') {
-                    element.removeData('fullCalendar');
+                else {
+                    isAllowed = false;
                 }
+                if (!isAllowed) {
+                    eventDefMutation = null;
+                    util_1.disableCursor();
+                }
+                // if a valid drop location, have the subclass render a visual indication
+                if (eventDefMutation &&
+                    view.renderDrag(// truthy if rendered something
+                    component.eventRangesToEventFootprints(mutatedEventInstanceGroup.sliceRenderRanges(component.dateProfile.renderUnzonedRange, calendar)), seg, dragListener.isTouch)) {
+                    mouseFollower.hide(); // if the subclass is already using a mock event "helper", hide our own
+                }
+                else {
+                    mouseFollower.show(); // otherwise, have the helper follow the mouse (no snapping)
+                }
+                if (isOrig) {
+                    // needs to have moved hits to be a valid drop
+                    eventDefMutation = null;
+                }
+            },
+            hitOut: function () {
+                view.unrenderDrag(seg); // unrender whatever was done in renderDrag
+                mouseFollower.show(); // show in case we are moving out of all hits
+                eventDefMutation = null;
+            },
+            hitDone: function () {
+                util_1.enableCursor();
+            },
+            interactionEnd: function (ev) {
+                delete seg.component; // prevent side effects
+                // do revert animation if hasn't changed. calls a callback when finished (whether animation or not)
+                mouseFollower.stop(!eventDefMutation, function () {
+                    if (isDragging) {
+                        view.unrenderDrag(seg);
+                        _this.segDragStop(seg, ev);
+                    }
+                    view.showEventsWithId(seg.footprint.eventDef.id);
+                    if (eventDefMutation) {
+                        // no need to re-show original, will rerender all anyways. esp important if eventRenderWait
+                        view.reportEventDrop(eventInstance, eventDefMutation, el, ev);
+                    }
+                });
+                _this.dragListener = null;
             }
-            else {
-                util_1.warn("'" + options + "' is an unknown FullCalendar method.");
-            }
-        }
-        else if (!calendar) {
-            calendar = new Calendar_1.default(element, options);
-            element.data('fullCalendar', calendar);
-            calendar.render();
-        }
-    });
-    return res;
-};
-module.exports = exportHooks;
-
-
-/***/ }),
-/* 237 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var Model_1 = __webpack_require__(48);
-var Component = /** @class */ (function (_super) {
-    tslib_1.__extends(Component, _super);
-    function Component() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Component.prototype.setElement = function (el) {
-        this.el = el;
-        this.bindGlobalHandlers();
-        this.renderSkeleton();
-        this.set('isInDom', true);
-    };
-    Component.prototype.removeElement = function () {
-        this.unset('isInDom');
-        this.unrenderSkeleton();
-        this.unbindGlobalHandlers();
-        this.el.remove();
-        // NOTE: don't null-out this.el in case the View was destroyed within an API callback.
-        // We don't null-out the View's other jQuery element references upon destroy,
-        //  so we shouldn't kill this.el either.
-    };
-    Component.prototype.bindGlobalHandlers = function () {
-        // subclasses can override
+        });
+        return dragListener;
     };
-    Component.prototype.unbindGlobalHandlers = function () {
-        // subclasses can override
+    // Called before event segment dragging starts
+    EventDragging.prototype.segDragStart = function (seg, ev) {
+        this.isDragging = true;
+        this.component.publiclyTrigger('eventDragStart', {
+            context: seg.el[0],
+            args: [
+                seg.footprint.getEventLegacy(),
+                ev,
+                {},
+                this.view
+            ]
+        });
     };
-    /*
-    NOTE: Can't have a `render` method. Read the deprecation notice in View::executeDateRender
-    */
-    // Renders the basic structure of the view before any content is rendered
-    Component.prototype.renderSkeleton = function () {
-        // subclasses should implement
+    // Called after event segment dragging stops
+    EventDragging.prototype.segDragStop = function (seg, ev) {
+        this.isDragging = false;
+        this.component.publiclyTrigger('eventDragStop', {
+            context: seg.el[0],
+            args: [
+                seg.footprint.getEventLegacy(),
+                ev,
+                {},
+                this.view
+            ]
+        });
     };
-    // Unrenders the basic structure of the view
-    Component.prototype.unrenderSkeleton = function () {
-        // subclasses should implement
+    // DOES NOT consider overlap/constraint
+    EventDragging.prototype.computeEventDropMutation = function (startFootprint, endFootprint, eventDef) {
+        var eventDefMutation = new EventDefMutation_1.default();
+        eventDefMutation.setDateMutation(this.computeEventDateMutation(startFootprint, endFootprint));
+        return eventDefMutation;
     };
-    return Component;
-}(Model_1.default));
-exports.default = Component;
-
-
-/***/ }),
-/* 238 */
-/***/ (function(module, exports) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var Iterator = /** @class */ (function () {
-    function Iterator(items) {
-        this.items = items || [];
-    }
-    /* Calls a method on every item passing the arguments through */
-    Iterator.prototype.proxyCall = function (methodName) {
-        var args = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            args[_i - 1] = arguments[_i];
+    EventDragging.prototype.computeEventDateMutation = function (startFootprint, endFootprint) {
+        var date0 = startFootprint.unzonedRange.getStart();
+        var date1 = endFootprint.unzonedRange.getStart();
+        var clearEnd = false;
+        var forceTimed = false;
+        var forceAllDay = false;
+        var dateDelta;
+        var dateMutation;
+        if (startFootprint.isAllDay !== endFootprint.isAllDay) {
+            clearEnd = true;
+            if (endFootprint.isAllDay) {
+                forceAllDay = true;
+                date0.stripTime();
+            }
+            else {
+                forceTimed = true;
+            }
         }
-        var results = [];
-        this.items.forEach(function (item) {
-            results.push(item[methodName].apply(item, args));
-        });
-        return results;
+        dateDelta = this.component.diffDates(date1, date0);
+        dateMutation = new EventDefDateMutation_1.default();
+        dateMutation.clearEnd = clearEnd;
+        dateMutation.forceTimed = forceTimed;
+        dateMutation.forceAllDay = forceAllDay;
+        dateMutation.setDateDelta(dateDelta);
+        return dateMutation;
     };
-    return Iterator;
-}());
-exports.default = Iterator;
+    return EventDragging;
+}(Interaction_1.default));
+exports.default = EventDragging;
 
 
 /***/ }),
-/* 239 */
+/* 236 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var $ = __webpack_require__(3);
-var util_1 = __webpack_require__(4);
-/* Toolbar with buttons and title
-----------------------------------------------------------------------------------------------------------------------*/
-var Toolbar = /** @class */ (function () {
-    function Toolbar(calendar, toolbarOptions) {
-        this.el = null; // mirrors local `el`
-        this.viewsWithButtons = [];
-        this.calendar = calendar;
-        this.toolbarOptions = toolbarOptions;
+var tslib_1 = __webpack_require__(2);
+var util_1 = __webpack_require__(4);
+var HitDragListener_1 = __webpack_require__(17);
+var ComponentFootprint_1 = __webpack_require__(12);
+var UnzonedRange_1 = __webpack_require__(5);
+var Interaction_1 = __webpack_require__(14);
+var DateSelecting = /** @class */ (function (_super) {
+    tslib_1.__extends(DateSelecting, _super);
+    /*
+    component must implement:
+      - bindDateHandlerToEl
+      - getSafeHitFootprint
+      - renderHighlight
+      - unrenderHighlight
+    */
+    function DateSelecting(component) {
+        var _this = _super.call(this, component) || this;
+        _this.dragListener = _this.buildDragListener();
+        return _this;
     }
-    // method to update toolbar-specific options, not calendar-wide options
-    Toolbar.prototype.setToolbarOptions = function (newToolbarOptions) {
-        this.toolbarOptions = newToolbarOptions;
+    DateSelecting.prototype.end = function () {
+        this.dragListener.endInteraction();
     };
-    // can be called repeatedly and will rerender
-    Toolbar.prototype.render = function () {
-        var sections = this.toolbarOptions.layout;
-        var el = this.el;
-        if (sections) {
-            if (!el) {
-                el = this.el = $("<div class='fc-toolbar " + this.toolbarOptions.extraClasses + "'/>");
-            }
-            else {
-                el.empty();
-            }
-            el.append(this.renderSection('left'))
-                .append(this.renderSection('right'))
-                .append(this.renderSection('center'))
-                .append('<div class="fc-clear"/>');
-        }
-        else {
-            this.removeElement();
+    DateSelecting.prototype.getDelay = function () {
+        var delay = this.opt('selectLongPressDelay');
+        if (delay == null) {
+            delay = this.opt('longPressDelay'); // fallback
         }
+        return delay;
     };
-    Toolbar.prototype.removeElement = function () {
-        if (this.el) {
-            this.el.remove();
-            this.el = null;
-        }
+    DateSelecting.prototype.bindToEl = function (el) {
+        var _this = this;
+        var component = this.component;
+        var dragListener = this.dragListener;
+        component.bindDateHandlerToEl(el, 'mousedown', function (ev) {
+            if (_this.opt('selectable') && !component.shouldIgnoreMouse()) {
+                dragListener.startInteraction(ev, {
+                    distance: _this.opt('selectMinDistance')
+                });
+            }
+        });
+        component.bindDateHandlerToEl(el, 'touchstart', function (ev) {
+            if (_this.opt('selectable') && !component.shouldIgnoreTouch()) {
+                dragListener.startInteraction(ev, {
+                    delay: _this.getDelay()
+                });
+            }
+        });
+        util_1.preventSelection(el);
     };
-    Toolbar.prototype.renderSection = function (position) {
+    // Creates a listener that tracks the user's drag across day elements, for day selecting.
+    DateSelecting.prototype.buildDragListener = function () {
         var _this = this;
-        var calendar = this.calendar;
-        var theme = calendar.theme;
-        var optionsManager = calendar.optionsManager;
-        var viewSpecManager = calendar.viewSpecManager;
-        var sectionEl = $('<div class="fc-' + position + '"/>');
-        var buttonStr = this.toolbarOptions.layout[position];
-        var calendarCustomButtons = optionsManager.get('customButtons') || {};
-        var calendarButtonTextOverrides = optionsManager.overrides.buttonText || {};
-        var calendarButtonText = optionsManager.get('buttonText') || {};
-        if (buttonStr) {
-            $.each(buttonStr.split(' '), function (i, buttonGroupStr) {
-                var groupChildren = $();
-                var isOnlyButtons = true;
-                var groupEl;
-                $.each(buttonGroupStr.split(','), function (j, buttonName) {
-                    var customButtonProps;
-                    var viewSpec;
-                    var buttonClick;
-                    var buttonIcon; // only one of these will be set
-                    var buttonText; // "
-                    var buttonInnerHtml;
-                    var buttonClasses;
-                    var buttonEl;
-                    var buttonAriaAttr;
-                    if (buttonName === 'title') {
-                        groupChildren = groupChildren.add($('<h2>&nbsp;</h2>')); // we always want it to take up height
-                        isOnlyButtons = false;
+        var component = this.component;
+        var selectionFootprint; // null if invalid selection
+        var dragListener = new HitDragListener_1.default(component, {
+            scroll: this.opt('dragScroll'),
+            interactionStart: function () {
+                selectionFootprint = null;
+            },
+            dragStart: function (ev) {
+                _this.view.unselect(ev); // since we could be rendering a new selection, we want to clear any old one
+            },
+            hitOver: function (hit, isOrig, origHit) {
+                var origHitFootprint;
+                var hitFootprint;
+                if (origHit) { // click needs to have started on a hit
+                    origHitFootprint = component.getSafeHitFootprint(origHit);
+                    hitFootprint = component.getSafeHitFootprint(hit);
+                    if (origHitFootprint && hitFootprint) {
+                        selectionFootprint = _this.computeSelection(origHitFootprint, hitFootprint);
                     }
                     else {
-                        if ((customButtonProps = calendarCustomButtons[buttonName])) {
-                            buttonClick = function (ev) {
-                                if (customButtonProps.click) {
-                                    customButtonProps.click.call(buttonEl[0], ev);
-                                }
-                            };
-                            (buttonIcon = theme.getCustomButtonIconClass(customButtonProps)) ||
-                                (buttonIcon = theme.getIconClass(buttonName)) ||
-                                (buttonText = customButtonProps.text);
-                        }
-                        else if ((viewSpec = viewSpecManager.getViewSpec(buttonName))) {
-                            _this.viewsWithButtons.push(buttonName);
-                            buttonClick = function () {
-                                calendar.changeView(buttonName);
-                            };
-                            (buttonText = viewSpec.buttonTextOverride) ||
-                                (buttonIcon = theme.getIconClass(buttonName)) ||
-                                (buttonText = viewSpec.buttonTextDefault);
-                        }
-                        else if (calendar[buttonName]) {
-                            buttonClick = function () {
-                                calendar[buttonName]();
-                            };
-                            (buttonText = calendarButtonTextOverrides[buttonName]) ||
-                                (buttonIcon = theme.getIconClass(buttonName)) ||
-                                (buttonText = calendarButtonText[buttonName]);
-                            //            ^ everything else is considered default
-                        }
-                        if (buttonClick) {
-                            buttonClasses = [
-                                'fc-' + buttonName + '-button',
-                                theme.getClass('button'),
-                                theme.getClass('stateDefault')
-                            ];
-                            if (buttonText) {
-                                buttonInnerHtml = util_1.htmlEscape(buttonText);
-                                buttonAriaAttr = '';
-                            }
-                            else if (buttonIcon) {
-                                buttonInnerHtml = "<span class='" + buttonIcon + "'></span>";
-                                buttonAriaAttr = ' aria-label="' + buttonName + '"';
-                            }
-                            buttonEl = $(// type="button" so that it doesn't submit a form
-                            '<button type="button" class="' + buttonClasses.join(' ') + '"' +
-                                buttonAriaAttr +
-                                '>' + buttonInnerHtml + '</button>')
-                                .click(function (ev) {
-                                // don't process clicks for disabled buttons
-                                if (!buttonEl.hasClass(theme.getClass('stateDisabled'))) {
-                                    buttonClick(ev);
-                                    // after the click action, if the button becomes the "active" tab, or disabled,
-                                    // it should never have a hover class, so remove it now.
-                                    if (buttonEl.hasClass(theme.getClass('stateActive')) ||
-                                        buttonEl.hasClass(theme.getClass('stateDisabled'))) {
-                                        buttonEl.removeClass(theme.getClass('stateHover'));
-                                    }
-                                }
-                            })
-                                .mousedown(function () {
-                                // the *down* effect (mouse pressed in).
-                                // only on buttons that are not the "active" tab, or disabled
-                                buttonEl
-                                    .not('.' + theme.getClass('stateActive'))
-                                    .not('.' + theme.getClass('stateDisabled'))
-                                    .addClass(theme.getClass('stateDown'));
-                            })
-                                .mouseup(function () {
-                                // undo the *down* effect
-                                buttonEl.removeClass(theme.getClass('stateDown'));
-                            })
-                                .hover(function () {
-                                // the *hover* effect.
-                                // only on buttons that are not the "active" tab, or disabled
-                                buttonEl
-                                    .not('.' + theme.getClass('stateActive'))
-                                    .not('.' + theme.getClass('stateDisabled'))
-                                    .addClass(theme.getClass('stateHover'));
-                            }, function () {
-                                // undo the *hover* effect
-                                buttonEl
-                                    .removeClass(theme.getClass('stateHover'))
-                                    .removeClass(theme.getClass('stateDown')); // if mouseleave happens before mouseup
-                            });
-                            groupChildren = groupChildren.add(buttonEl);
-                        }
+                        selectionFootprint = null;
                     }
-                });
-                if (isOnlyButtons) {
-                    groupChildren
-                        .first().addClass(theme.getClass('cornerLeft')).end()
-                        .last().addClass(theme.getClass('cornerRight')).end();
-                }
-                if (groupChildren.length > 1) {
-                    groupEl = $('<div/>');
-                    if (isOnlyButtons) {
-                        groupEl.addClass(theme.getClass('buttonGroup'));
+                    if (selectionFootprint) {
+                        component.renderSelectionFootprint(selectionFootprint);
+                    }
+                    else if (selectionFootprint === false) {
+                        util_1.disableCursor();
                     }
-                    groupEl.append(groupChildren);
-                    sectionEl.append(groupEl);
                 }
-                else {
-                    sectionEl.append(groupChildren); // 1 or 0 children
+            },
+            hitOut: function () {
+                selectionFootprint = null;
+                component.unrenderSelection();
+            },
+            hitDone: function () {
+                util_1.enableCursor();
+            },
+            interactionEnd: function (ev, isCancelled) {
+                if (!isCancelled && selectionFootprint) {
+                    // the selection will already have been rendered. just report it
+                    _this.view.reportSelection(selectionFootprint, ev);
                 }
-            });
-        }
-        return sectionEl;
+            }
+        });
+        return dragListener;
     };
-    Toolbar.prototype.updateTitle = function (text) {
-        if (this.el) {
-            this.el.find('h2').text(text);
+    // Given the first and last date-spans of a selection, returns another date-span object.
+    // Subclasses can override and provide additional data in the span object. Will be passed to renderSelectionFootprint().
+    // Will return false if the selection is invalid and this should be indicated to the user.
+    // Will return null/undefined if a selection invalid but no error should be reported.
+    DateSelecting.prototype.computeSelection = function (footprint0, footprint1) {
+        var wholeFootprint = this.computeSelectionFootprint(footprint0, footprint1);
+        if (wholeFootprint && !this.isSelectionFootprintAllowed(wholeFootprint)) {
+            return false;
         }
+        return wholeFootprint;
     };
-    Toolbar.prototype.activateButton = function (buttonName) {
-        if (this.el) {
-            this.el.find('.fc-' + buttonName + '-button')
-                .addClass(this.calendar.theme.getClass('stateActive'));
-        }
+    // Given two spans, must return the combination of the two.
+    // TODO: do this separation of concerns (combining VS validation) for event dnd/resize too.
+    // Assumes both footprints are non-open-ended.
+    DateSelecting.prototype.computeSelectionFootprint = function (footprint0, footprint1) {
+        var ms = [
+            footprint0.unzonedRange.startMs,
+            footprint0.unzonedRange.endMs,
+            footprint1.unzonedRange.startMs,
+            footprint1.unzonedRange.endMs
+        ];
+        ms.sort(util_1.compareNumbers);
+        return new ComponentFootprint_1.default(new UnzonedRange_1.default(ms[0], ms[3]), footprint0.isAllDay);
     };
-    Toolbar.prototype.deactivateButton = function (buttonName) {
-        if (this.el) {
-            this.el.find('.fc-' + buttonName + '-button')
-                .removeClass(this.calendar.theme.getClass('stateActive'));
-        }
+    DateSelecting.prototype.isSelectionFootprintAllowed = function (componentFootprint) {
+        return this.component.dateProfile.validUnzonedRange.containsRange(componentFootprint.unzonedRange) &&
+            this.view.calendar.constraints.isSelectionFootprintAllowed(componentFootprint);
     };
-    Toolbar.prototype.disableButton = function (buttonName) {
-        if (this.el) {
-            this.el.find('.fc-' + buttonName + '-button')
-                .prop('disabled', true)
-                .addClass(this.calendar.theme.getClass('stateDisabled'));
-        }
+    return DateSelecting;
+}(Interaction_1.default));
+exports.default = DateSelecting;
+
+
+/***/ }),
+/* 237 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var HitDragListener_1 = __webpack_require__(17);
+var Interaction_1 = __webpack_require__(14);
+var DateClicking = /** @class */ (function (_super) {
+    tslib_1.__extends(DateClicking, _super);
+    /*
+    component must implement:
+      - bindDateHandlerToEl
+      - getSafeHitFootprint
+      - getHitEl
+    */
+    function DateClicking(component) {
+        var _this = _super.call(this, component) || this;
+        _this.dragListener = _this.buildDragListener();
+        return _this;
+    }
+    DateClicking.prototype.end = function () {
+        this.dragListener.endInteraction();
     };
-    Toolbar.prototype.enableButton = function (buttonName) {
-        if (this.el) {
-            this.el.find('.fc-' + buttonName + '-button')
-                .prop('disabled', false)
-                .removeClass(this.calendar.theme.getClass('stateDisabled'));
-        }
+    DateClicking.prototype.bindToEl = function (el) {
+        var component = this.component;
+        var dragListener = this.dragListener;
+        component.bindDateHandlerToEl(el, 'mousedown', function (ev) {
+            if (!component.shouldIgnoreMouse()) {
+                dragListener.startInteraction(ev);
+            }
+        });
+        component.bindDateHandlerToEl(el, 'touchstart', function (ev) {
+            if (!component.shouldIgnoreTouch()) {
+                dragListener.startInteraction(ev);
+            }
+        });
     };
-    Toolbar.prototype.getViewsWithButtons = function () {
-        return this.viewsWithButtons;
+    // Creates a listener that tracks the user's drag across day elements, for day clicking.
+    DateClicking.prototype.buildDragListener = function () {
+        var _this = this;
+        var component = this.component;
+        var dayClickHit; // null if invalid dayClick
+        var dragListener = new HitDragListener_1.default(component, {
+            scroll: this.opt('dragScroll'),
+            interactionStart: function () {
+                dayClickHit = dragListener.origHit;
+            },
+            hitOver: function (hit, isOrig, origHit) {
+                // if user dragged to another cell at any point, it can no longer be a dayClick
+                if (!isOrig) {
+                    dayClickHit = null;
+                }
+            },
+            hitOut: function () {
+                dayClickHit = null;
+            },
+            interactionEnd: function (ev, isCancelled) {
+                var componentFootprint;
+                if (!isCancelled && dayClickHit) {
+                    componentFootprint = component.getSafeHitFootprint(dayClickHit);
+                    if (componentFootprint) {
+                        _this.view.triggerDayClick(componentFootprint, component.getHitEl(dayClickHit), ev);
+                    }
+                }
+            }
+        });
+        // because dragListener won't be called with any time delay, "dragging" will begin immediately,
+        // which will kill any touchmoving/scrolling. Prevent this.
+        dragListener.shouldCancelTouchScroll = false;
+        dragListener.scrollAlwaysKills = true;
+        return dragListener;
     };
-    return Toolbar;
-}());
-exports.default = Toolbar;
+    return DateClicking;
+}(Interaction_1.default));
+exports.default = DateClicking;
 
 
 /***/ }),
-/* 240 */
+/* 238 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
+var moment = __webpack_require__(0);
 var $ = __webpack_require__(3);
 var util_1 = __webpack_require__(4);
-var options_1 = __webpack_require__(32);
-var locale_1 = __webpack_require__(31);
-var Model_1 = __webpack_require__(48);
-var OptionsManager = /** @class */ (function (_super) {
-    tslib_1.__extends(OptionsManager, _super);
-    function OptionsManager(_calendar, overrides) {
-        var _this = _super.call(this) || this;
-        _this._calendar = _calendar;
-        _this.overrides = $.extend({}, overrides); // make a copy
-        _this.dynamicOverrides = {};
-        _this.compute();
+var Scroller_1 = __webpack_require__(41);
+var View_1 = __webpack_require__(43);
+var TimeGrid_1 = __webpack_require__(239);
+var DayGrid_1 = __webpack_require__(66);
+var AGENDA_ALL_DAY_EVENT_LIMIT = 5;
+var agendaTimeGridMethods;
+var agendaDayGridMethods;
+/* An abstract class for all agenda-related views. Displays one more columns with time slots running vertically.
+----------------------------------------------------------------------------------------------------------------------*/
+// Is a manager for the TimeGrid subcomponent and possibly the DayGrid subcomponent (if allDaySlot is on).
+// Responsible for managing width/height.
+var AgendaView = /** @class */ (function (_super) {
+    tslib_1.__extends(AgendaView, _super);
+    function AgendaView(calendar, viewSpec) {
+        var _this = _super.call(this, calendar, viewSpec) || this;
+        _this.usesMinMaxTime = true; // indicates that minTime/maxTime affects rendering
+        _this.timeGrid = _this.instantiateTimeGrid();
+        _this.addChild(_this.timeGrid);
+        if (_this.opt('allDaySlot')) { // should we display the "all-day" area?
+            _this.dayGrid = _this.instantiateDayGrid(); // the all-day subcomponent of this view
+            _this.addChild(_this.dayGrid);
+        }
+        _this.scroller = new Scroller_1.default({
+            overflowX: 'hidden',
+            overflowY: 'auto'
+        });
         return _this;
     }
-    OptionsManager.prototype.add = function (newOptionHash) {
-        var optionCnt = 0;
-        var optionName;
-        this.recordOverrides(newOptionHash); // will trigger this model's watchers
-        for (optionName in newOptionHash) {
-            optionCnt++;
+    // Instantiates the TimeGrid object this view needs. Draws from this.timeGridClass
+    AgendaView.prototype.instantiateTimeGrid = function () {
+        var timeGrid = new this.timeGridClass(this);
+        util_1.copyOwnProps(agendaTimeGridMethods, timeGrid);
+        return timeGrid;
+    };
+    // Instantiates the DayGrid object this view might need. Draws from this.dayGridClass
+    AgendaView.prototype.instantiateDayGrid = function () {
+        var dayGrid = new this.dayGridClass(this);
+        util_1.copyOwnProps(agendaDayGridMethods, dayGrid);
+        return dayGrid;
+    };
+    /* Rendering
+    ------------------------------------------------------------------------------------------------------------------*/
+    AgendaView.prototype.renderSkeleton = function () {
+        var timeGridWrapEl;
+        var timeGridEl;
+        this.el.addClass('fc-agenda-view').html(this.renderSkeletonHtml());
+        this.scroller.render();
+        timeGridWrapEl = this.scroller.el.addClass('fc-time-grid-container');
+        timeGridEl = $('<div class="fc-time-grid">').appendTo(timeGridWrapEl);
+        this.el.find('.fc-body > tr > td').append(timeGridWrapEl);
+        this.timeGrid.headContainerEl = this.el.find('.fc-head-container');
+        this.timeGrid.setElement(timeGridEl);
+        if (this.dayGrid) {
+            this.dayGrid.setElement(this.el.find('.fc-day-grid'));
+            // have the day-grid extend it's coordinate area over the <hr> dividing the two grids
+            this.dayGrid.bottomCoordPadding = this.dayGrid.el.next('hr').outerHeight();
         }
-        // special-case handling of single option change.
-        // if only one option change, `optionName` will be its name.
-        if (optionCnt === 1) {
-            if (optionName === 'height' || optionName === 'contentHeight' || optionName === 'aspectRatio') {
-                this._calendar.updateViewSize(true); // isResize=true
-                return;
+    };
+    AgendaView.prototype.unrenderSkeleton = function () {
+        this.timeGrid.removeElement();
+        if (this.dayGrid) {
+            this.dayGrid.removeElement();
+        }
+        this.scroller.destroy();
+    };
+    // Builds the HTML skeleton for the view.
+    // The day-grid and time-grid components will render inside containers defined by this HTML.
+    AgendaView.prototype.renderSkeletonHtml = function () {
+        var theme = this.calendar.theme;
+        return '' +
+            '<table class="' + theme.getClass('tableGrid') + '">' +
+            (this.opt('columnHeader') ?
+                '<thead class="fc-head">' +
+                    '<tr>' +
+                    '<td class="fc-head-container ' + theme.getClass('widgetHeader') + '">&nbsp;</td>' +
+                    '</tr>' +
+                    '</thead>' :
+                '') +
+            '<tbody class="fc-body">' +
+            '<tr>' +
+            '<td class="' + theme.getClass('widgetContent') + '">' +
+            (this.dayGrid ?
+                '<div class="fc-day-grid"></div>' +
+                    '<hr class="fc-divider ' + theme.getClass('widgetHeader') + '"></hr>' :
+                '') +
+            '</td>' +
+            '</tr>' +
+            '</tbody>' +
+            '</table>';
+    };
+    // Generates an HTML attribute string for setting the width of the axis, if it is known
+    AgendaView.prototype.axisStyleAttr = function () {
+        if (this.axisWidth != null) {
+            return 'style="width:' + this.axisWidth + 'px"';
+        }
+        return '';
+    };
+    /* Now Indicator
+    ------------------------------------------------------------------------------------------------------------------*/
+    AgendaView.prototype.getNowIndicatorUnit = function () {
+        return this.timeGrid.getNowIndicatorUnit();
+    };
+    /* Dimensions
+    ------------------------------------------------------------------------------------------------------------------*/
+    // Adjusts the vertical dimensions of the view to the specified values
+    AgendaView.prototype.updateSize = function (totalHeight, isAuto, isResize) {
+        var eventLimit;
+        var scrollerHeight;
+        var scrollbarWidths;
+        _super.prototype.updateSize.call(this, totalHeight, isAuto, isResize);
+        // make all axis cells line up, and record the width so newly created axis cells will have it
+        this.axisWidth = util_1.matchCellWidths(this.el.find('.fc-axis'));
+        // hack to give the view some height prior to timeGrid's columns being rendered
+        // TODO: separate setting height from scroller VS timeGrid.
+        if (!this.timeGrid.colEls) {
+            if (!isAuto) {
+                scrollerHeight = this.computeScrollerHeight(totalHeight);
+                this.scroller.setHeight(scrollerHeight);
             }
-            else if (optionName === 'defaultDate') {
-                return; // can't change date this way. use gotoDate instead
+            return;
+        }
+        // set of fake row elements that must compensate when scroller has scrollbars
+        var noScrollRowEls = this.el.find('.fc-row:not(.fc-scroller *)');
+        // reset all dimensions back to the original state
+        this.timeGrid.bottomRuleEl.hide(); // .show() will be called later if this <hr> is necessary
+        this.scroller.clear(); // sets height to 'auto' and clears overflow
+        util_1.uncompensateScroll(noScrollRowEls);
+        // limit number of events in the all-day area
+        if (this.dayGrid) {
+            this.dayGrid.removeSegPopover(); // kill the "more" popover if displayed
+            eventLimit = this.opt('eventLimit');
+            if (eventLimit && typeof eventLimit !== 'number') {
+                eventLimit = AGENDA_ALL_DAY_EVENT_LIMIT; // make sure "auto" goes to a real number
             }
-            else if (optionName === 'businessHours') {
-                return; // this model already reacts to this
+            if (eventLimit) {
+                this.dayGrid.limitRows(eventLimit);
             }
-            else if (/^(event|select)(Overlap|Constraint|Allow)$/.test(optionName)) {
-                return; // doesn't affect rendering. only interactions.
+        }
+        if (!isAuto) { // should we force dimensions of the scroll container?
+            scrollerHeight = this.computeScrollerHeight(totalHeight);
+            this.scroller.setHeight(scrollerHeight);
+            scrollbarWidths = this.scroller.getScrollbarWidths();
+            if (scrollbarWidths.left || scrollbarWidths.right) { // using scrollbars?
+                // make the all-day and header rows lines up
+                util_1.compensateScroll(noScrollRowEls, scrollbarWidths);
+                // the scrollbar compensation might have changed text flow, which might affect height, so recalculate
+                // and reapply the desired height to the scroller.
+                scrollerHeight = this.computeScrollerHeight(totalHeight);
+                this.scroller.setHeight(scrollerHeight);
             }
-            else if (optionName === 'timezone') {
-                this._calendar.view.flash('initialEvents');
-                return;
+            // guarantees the same scrollbar widths
+            this.scroller.lockOverflow(scrollbarWidths);
+            // if there's any space below the slats, show the horizontal rule.
+            // this won't cause any new overflow, because lockOverflow already called.
+            if (this.timeGrid.getTotalSlatHeight() < scrollerHeight) {
+                this.timeGrid.bottomRuleEl.show();
             }
         }
-        // catch-all. rerender the header and footer and rebuild/rerender the current view
-        this._calendar.renderHeader();
-        this._calendar.renderFooter();
-        // even non-current views will be affected by this option change. do before rerender
-        // TODO: detangle
-        this._calendar.viewsByType = {};
-        this._calendar.reinitView();
     };
-    // Computes the flattened options hash for the calendar and assigns to `this.options`.
-    // Assumes this.overrides and this.dynamicOverrides have already been initialized.
-    OptionsManager.prototype.compute = function () {
-        var locale;
-        var localeDefaults;
-        var isRTL;
-        var dirDefaults;
-        var rawOptions;
-        locale = util_1.firstDefined(// explicit locale option given?
-        this.dynamicOverrides.locale, this.overrides.locale);
-        localeDefaults = locale_1.localeOptionHash[locale];
-        if (!localeDefaults) {
-            locale = options_1.globalDefaults.locale;
-            localeDefaults = locale_1.localeOptionHash[locale] || {};
-        }
-        isRTL = util_1.firstDefined(// based on options computed so far, is direction RTL?
-        this.dynamicOverrides.isRTL, this.overrides.isRTL, localeDefaults.isRTL, options_1.globalDefaults.isRTL);
-        dirDefaults = isRTL ? options_1.rtlDefaults : {};
-        this.dirDefaults = dirDefaults;
-        this.localeDefaults = localeDefaults;
-        rawOptions = options_1.mergeOptions([
-            options_1.globalDefaults,
-            dirDefaults,
-            localeDefaults,
-            this.overrides,
-            this.dynamicOverrides
-        ]);
-        locale_1.populateInstanceComputableOptions(rawOptions); // fill in gaps with computed options
-        this.reset(rawOptions);
+    // given a desired total height of the view, returns what the height of the scroller should be
+    AgendaView.prototype.computeScrollerHeight = function (totalHeight) {
+        return totalHeight -
+            util_1.subtractInnerElHeight(this.el, this.scroller.el); // everything that's NOT the scroller
     };
-    // stores the new options internally, but does not rerender anything.
-    OptionsManager.prototype.recordOverrides = function (newOptionHash) {
-        var optionName;
-        for (optionName in newOptionHash) {
-            this.dynamicOverrides[optionName] = newOptionHash[optionName];
+    /* Scroll
+    ------------------------------------------------------------------------------------------------------------------*/
+    // Computes the initial pre-configured scroll state prior to allowing the user to change it
+    AgendaView.prototype.computeInitialDateScroll = function () {
+        var scrollTime = moment.duration(this.opt('scrollTime'));
+        var top = this.timeGrid.computeTimeTop(scrollTime);
+        // zoom can give weird floating-point values. rather scroll a little bit further
+        top = Math.ceil(top);
+        if (top) {
+            top++; // to overcome top border that slots beyond the first have. looks better
         }
-        this._calendar.viewSpecManager.clearCache(); // the dynamic override invalidates the options in this cache, so just clear it
-        this.compute(); // this.options needs to be recomputed after the dynamic override
-    };
-    return OptionsManager;
-}(Model_1.default));
-exports.default = OptionsManager;
-
-
-/***/ }),
-/* 241 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var moment = __webpack_require__(0);
-var $ = __webpack_require__(3);
-var ViewRegistry_1 = __webpack_require__(22);
-var util_1 = __webpack_require__(4);
-var options_1 = __webpack_require__(32);
-var locale_1 = __webpack_require__(31);
-var ViewSpecManager = /** @class */ (function () {
-    function ViewSpecManager(optionsManager, _calendar) {
-        this.optionsManager = optionsManager;
-        this._calendar = _calendar;
-        this.clearCache();
-    }
-    ViewSpecManager.prototype.clearCache = function () {
-        this.viewSpecCache = {};
+        return { top: top };
     };
-    // Gets information about how to create a view. Will use a cache.
-    ViewSpecManager.prototype.getViewSpec = function (viewType) {
-        var cache = this.viewSpecCache;
-        return cache[viewType] || (cache[viewType] = this.buildViewSpec(viewType));
+    AgendaView.prototype.queryDateScroll = function () {
+        return { top: this.scroller.getScrollTop() };
     };
-    // Given a duration singular unit, like "week" or "day", finds a matching view spec.
-    // Preference is given to views that have corresponding buttons.
-    ViewSpecManager.prototype.getUnitViewSpec = function (unit) {
-        var viewTypes;
-        var i;
-        var spec;
-        if ($.inArray(unit, util_1.unitsDesc) !== -1) {
-            // put views that have buttons first. there will be duplicates, but oh well
-            viewTypes = this._calendar.header.getViewsWithButtons(); // TODO: include footer as well?
-            $.each(ViewRegistry_1.viewHash, function (viewType) {
-                viewTypes.push(viewType);
-            });
-            for (i = 0; i < viewTypes.length; i++) {
-                spec = this.getViewSpec(viewTypes[i]);
-                if (spec) {
-                    if (spec.singleUnit === unit) {
-                        return spec;
-                    }
-                }
-            }
+    AgendaView.prototype.applyDateScroll = function (scroll) {
+        if (scroll.top !== undefined) {
+            this.scroller.setScrollTop(scroll.top);
         }
     };
-    // Builds an object with information on how to create a given view
-    ViewSpecManager.prototype.buildViewSpec = function (requestedViewType) {
-        var viewOverrides = this.optionsManager.overrides.views || {};
-        var specChain = []; // for the view. lowest to highest priority
-        var defaultsChain = []; // for the view. lowest to highest priority
-        var overridesChain = []; // for the view. lowest to highest priority
-        var viewType = requestedViewType;
-        var spec; // for the view
-        var overrides; // for the view
-        var durationInput;
-        var duration;
-        var unit;
-        // iterate from the specific view definition to a more general one until we hit an actual View class
-        while (viewType) {
-            spec = ViewRegistry_1.viewHash[viewType];
-            overrides = viewOverrides[viewType];
-            viewType = null; // clear. might repopulate for another iteration
-            if (typeof spec === 'function') {
-                spec = { 'class': spec };
-            }
-            if (spec) {
-                specChain.unshift(spec);
-                defaultsChain.unshift(spec.defaults || {});
-                durationInput = durationInput || spec.duration;
-                viewType = viewType || spec.type;
+    /* Hit Areas
+    ------------------------------------------------------------------------------------------------------------------*/
+    // forward all hit-related method calls to the grids (dayGrid might not be defined)
+    AgendaView.prototype.getHitFootprint = function (hit) {
+        // TODO: hit.component is set as a hack to identify where the hit came from
+        return hit.component.getHitFootprint(hit);
+    };
+    AgendaView.prototype.getHitEl = function (hit) {
+        // TODO: hit.component is set as a hack to identify where the hit came from
+        return hit.component.getHitEl(hit);
+    };
+    /* Event Rendering
+    ------------------------------------------------------------------------------------------------------------------*/
+    AgendaView.prototype.executeEventRender = function (eventsPayload) {
+        var dayEventsPayload = {};
+        var timedEventsPayload = {};
+        var id;
+        var eventInstanceGroup;
+        // separate the events into all-day and timed
+        for (id in eventsPayload) {
+            eventInstanceGroup = eventsPayload[id];
+            if (eventInstanceGroup.getEventDef().isAllDay()) {
+                dayEventsPayload[id] = eventInstanceGroup;
             }
-            if (overrides) {
-                overridesChain.unshift(overrides); // view-specific option hashes have options at zero-level
-                durationInput = durationInput || overrides.duration;
-                viewType = viewType || overrides.type;
+            else {
+                timedEventsPayload[id] = eventInstanceGroup;
             }
         }
-        spec = util_1.mergeProps(specChain);
-        spec.type = requestedViewType;
-        if (!spec['class']) {
-            return false;
+        this.timeGrid.executeEventRender(timedEventsPayload);
+        if (this.dayGrid) {
+            this.dayGrid.executeEventRender(dayEventsPayload);
         }
-        // fall back to top-level `duration` option
-        durationInput = durationInput ||
-            this.optionsManager.dynamicOverrides.duration ||
-            this.optionsManager.overrides.duration;
-        if (durationInput) {
-            duration = moment.duration(durationInput);
-            if (duration.valueOf()) {
-                unit = util_1.computeDurationGreatestUnit(duration, durationInput);
-                spec.duration = duration;
-                spec.durationUnit = unit;
-                // view is a single-unit duration, like "week" or "day"
-                // incorporate options for this. lowest priority
-                if (duration.as(unit) === 1) {
-                    spec.singleUnit = unit;
-                    overridesChain.unshift(viewOverrides[unit] || {});
-                }
-            }
+    };
+    /* Dragging/Resizing Routing
+    ------------------------------------------------------------------------------------------------------------------*/
+    // A returned value of `true` signals that a mock "helper" event has been rendered.
+    AgendaView.prototype.renderDrag = function (eventFootprints, seg, isTouch) {
+        var groups = groupEventFootprintsByAllDay(eventFootprints);
+        var renderedHelper = false;
+        renderedHelper = this.timeGrid.renderDrag(groups.timed, seg, isTouch);
+        if (this.dayGrid) {
+            renderedHelper = this.dayGrid.renderDrag(groups.allDay, seg, isTouch) || renderedHelper;
         }
-        spec.defaults = options_1.mergeOptions(defaultsChain);
-        spec.overrides = options_1.mergeOptions(overridesChain);
-        this.buildViewSpecOptions(spec);
-        this.buildViewSpecButtonText(spec, requestedViewType);
-        return spec;
+        return renderedHelper;
     };
-    // Builds and assigns a view spec's options object from its already-assigned defaults and overrides
-    ViewSpecManager.prototype.buildViewSpecOptions = function (spec) {
-        var optionsManager = this.optionsManager;
-        spec.options = options_1.mergeOptions([
-            options_1.globalDefaults,
-            spec.defaults,
-            optionsManager.dirDefaults,
-            optionsManager.localeDefaults,
-            optionsManager.overrides,
-            spec.overrides,
-            optionsManager.dynamicOverrides // dynamically set via setter. highest precedence
-        ]);
-        locale_1.populateInstanceComputableOptions(spec.options);
+    AgendaView.prototype.renderEventResize = function (eventFootprints, seg, isTouch) {
+        var groups = groupEventFootprintsByAllDay(eventFootprints);
+        this.timeGrid.renderEventResize(groups.timed, seg, isTouch);
+        if (this.dayGrid) {
+            this.dayGrid.renderEventResize(groups.allDay, seg, isTouch);
+        }
     };
-    // Computes and assigns a view spec's buttonText-related options
-    ViewSpecManager.prototype.buildViewSpecButtonText = function (spec, requestedViewType) {
-        var optionsManager = this.optionsManager;
-        // given an options object with a possible `buttonText` hash, lookup the buttonText for the
-        // requested view, falling back to a generic unit entry like "week" or "day"
-        function queryButtonText(options) {
-            var buttonText = options.buttonText || {};
-            return buttonText[requestedViewType] ||
-                // view can decide to look up a certain key
-                (spec.buttonTextKey ? buttonText[spec.buttonTextKey] : null) ||
-                // a key like "month"
-                (spec.singleUnit ? buttonText[spec.singleUnit] : null);
+    /* Selection
+    ------------------------------------------------------------------------------------------------------------------*/
+    // Renders a visual indication of a selection
+    AgendaView.prototype.renderSelectionFootprint = function (componentFootprint) {
+        if (!componentFootprint.isAllDay) {
+            this.timeGrid.renderSelectionFootprint(componentFootprint);
+        }
+        else if (this.dayGrid) {
+            this.dayGrid.renderSelectionFootprint(componentFootprint);
         }
-        // highest to lowest priority
-        spec.buttonTextOverride =
-            queryButtonText(optionsManager.dynamicOverrides) ||
-                queryButtonText(optionsManager.overrides) || // constructor-specified buttonText lookup hash takes precedence
-                spec.overrides.buttonText; // `buttonText` for view-specific options is a string
-        // highest to lowest priority. mirrors buildViewSpecOptions
-        spec.buttonTextDefault =
-            queryButtonText(optionsManager.localeDefaults) ||
-                queryButtonText(optionsManager.dirDefaults) ||
-                spec.defaults.buttonText || // a single string. from ViewSubclass.defaults
-                queryButtonText(options_1.globalDefaults) ||
-                (spec.duration ? this._calendar.humanizeDuration(spec.duration) : null) || // like "3 days"
-                requestedViewType; // fall back to given view name
     };
-    return ViewSpecManager;
-}());
-exports.default = ViewSpecManager;
+    return AgendaView;
+}(View_1.default));
+exports.default = AgendaView;
+AgendaView.prototype.timeGridClass = TimeGrid_1.default;
+AgendaView.prototype.dayGridClass = DayGrid_1.default;
+// Will customize the rendering behavior of the AgendaView's timeGrid
+agendaTimeGridMethods = {
+    // Generates the HTML that will go before the day-of week header cells
+    renderHeadIntroHtml: function () {
+        var view = this.view;
+        var calendar = view.calendar;
+        var weekStart = calendar.msToUtcMoment(this.dateProfile.renderUnzonedRange.startMs, true);
+        var weekText;
+        if (this.opt('weekNumbers')) {
+            weekText = weekStart.format(this.opt('smallWeekFormat'));
+            return '' +
+                '<th class="fc-axis fc-week-number ' + calendar.theme.getClass('widgetHeader') + '" ' + view.axisStyleAttr() + '>' +
+                view.buildGotoAnchorHtml(// aside from link, important for matchCellWidths
+                { date: weekStart, type: 'week', forceOff: this.colCnt > 1 }, util_1.htmlEscape(weekText) // inner HTML
+                ) +
+                '</th>';
+        }
+        else {
+            return '<th class="fc-axis ' + calendar.theme.getClass('widgetHeader') + '" ' + view.axisStyleAttr() + '></th>';
+        }
+    },
+    // Generates the HTML that goes before the bg of the TimeGrid slot area. Long vertical column.
+    renderBgIntroHtml: function () {
+        var view = this.view;
+        return '<td class="fc-axis ' + view.calendar.theme.getClass('widgetContent') + '" ' + view.axisStyleAttr() + '></td>';
+    },
+    // Generates the HTML that goes before all other types of cells.
+    // Affects content-skeleton, helper-skeleton, highlight-skeleton for both the time-grid and day-grid.
+    renderIntroHtml: function () {
+        var view = this.view;
+        return '<td class="fc-axis" ' + view.axisStyleAttr() + '></td>';
+    }
+};
+// Will customize the rendering behavior of the AgendaView's dayGrid
+agendaDayGridMethods = {
+    // Generates the HTML that goes before the all-day cells
+    renderBgIntroHtml: function () {
+        var view = this.view;
+        return '' +
+            '<td class="fc-axis ' + view.calendar.theme.getClass('widgetContent') + '" ' + view.axisStyleAttr() + '>' +
+            '<span>' + // needed for matchCellWidths
+            view.getAllDayHtml() +
+            '</span>' +
+            '</td>';
+    },
+    // Generates the HTML that goes before all other types of cells.
+    // Affects content-skeleton, helper-skeleton, highlight-skeleton for both the time-grid and day-grid.
+    renderIntroHtml: function () {
+        var view = this.view;
+        return '<td class="fc-axis" ' + view.axisStyleAttr() + '></td>';
+    }
+};
+function groupEventFootprintsByAllDay(eventFootprints) {
+    var allDay = [];
+    var timed = [];
+    var i;
+    for (i = 0; i < eventFootprints.length; i++) {
+        if (eventFootprints[i].componentFootprint.isAllDay) {
+            allDay.push(eventFootprints[i]);
+        }
+        else {
+            timed.push(eventFootprints[i]);
+        }
+    }
+    return { allDay: allDay, timed: timed };
+}
 
 
 /***/ }),
-/* 242 */
+/* 239 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
 var $ = __webpack_require__(3);
+var moment = __webpack_require__(0);
 var util_1 = __webpack_require__(4);
-var EventPeriod_1 = __webpack_require__(243);
-var ArrayEventSource_1 = __webpack_require__(52);
-var EventSource_1 = __webpack_require__(6);
-var EventSourceParser_1 = __webpack_require__(38);
-var SingleEventDef_1 = __webpack_require__(13);
-var EventInstanceGroup_1 = __webpack_require__(18);
-var EmitterMixin_1 = __webpack_require__(11);
-var ListenerMixin_1 = __webpack_require__(7);
-var EventManager = /** @class */ (function () {
-    function EventManager(calendar) {
-        this.calendar = calendar;
-        this.stickySource = new ArrayEventSource_1.default(calendar);
-        this.otherSources = [];
+var InteractiveDateComponent_1 = __webpack_require__(42);
+var BusinessHourRenderer_1 = __webpack_require__(61);
+var StandardInteractionsMixin_1 = __webpack_require__(65);
+var DayTableMixin_1 = __webpack_require__(60);
+var CoordCache_1 = __webpack_require__(58);
+var UnzonedRange_1 = __webpack_require__(5);
+var ComponentFootprint_1 = __webpack_require__(12);
+var TimeGridEventRenderer_1 = __webpack_require__(240);
+var TimeGridHelperRenderer_1 = __webpack_require__(241);
+var TimeGridFillRenderer_1 = __webpack_require__(242);
+/* A component that renders one or more columns of vertical time slots
+----------------------------------------------------------------------------------------------------------------------*/
+// We mixin DayTable, even though there is only a single row of days
+// potential nice values for the slot-duration and interval-duration
+// from largest to smallest
+var AGENDA_STOCK_SUB_DURATIONS = [
+    { hours: 1 },
+    { minutes: 30 },
+    { minutes: 15 },
+    { seconds: 30 },
+    { seconds: 15 }
+];
+var TimeGrid = /** @class */ (function (_super) {
+    tslib_1.__extends(TimeGrid, _super);
+    function TimeGrid(view) {
+        var _this = _super.call(this, view) || this;
+        _this.processOptions();
+        return _this;
     }
-    EventManager.prototype.requestEvents = function (start, end, timezone, force) {
-        if (force ||
-            !this.currentPeriod ||
-            !this.currentPeriod.isWithinRange(start, end) ||
-            timezone !== this.currentPeriod.timezone) {
-            this.setPeriod(// will change this.currentPeriod
-            new EventPeriod_1.default(start, end, timezone));
-        }
-        return this.currentPeriod.whenReleased();
-    };
-    // Source Adding/Removing
-    // -----------------------------------------------------------------------------------------------------------------
-    EventManager.prototype.addSource = function (eventSource) {
-        this.otherSources.push(eventSource);
-        if (this.currentPeriod) {
-            this.currentPeriod.requestSource(eventSource); // might release
-        }
-    };
-    EventManager.prototype.removeSource = function (doomedSource) {
-        util_1.removeExact(this.otherSources, doomedSource);
-        if (this.currentPeriod) {
-            this.currentPeriod.purgeSource(doomedSource); // might release
-        }
-    };
-    EventManager.prototype.removeAllSources = function () {
-        this.otherSources = [];
-        if (this.currentPeriod) {
-            this.currentPeriod.purgeAllSources(); // might release
-        }
-    };
-    // Source Refetching
-    // -----------------------------------------------------------------------------------------------------------------
-    EventManager.prototype.refetchSource = function (eventSource) {
-        var currentPeriod = this.currentPeriod;
-        if (currentPeriod) {
-            currentPeriod.freeze();
-            currentPeriod.purgeSource(eventSource);
-            currentPeriod.requestSource(eventSource);
-            currentPeriod.thaw();
+    // Slices up the given span (unzoned start/end with other misc data) into an array of segments
+    TimeGrid.prototype.componentFootprintToSegs = function (componentFootprint) {
+        var segs = this.sliceRangeByTimes(componentFootprint.unzonedRange);
+        var i;
+        for (i = 0; i < segs.length; i++) {
+            if (this.isRTL) {
+                segs[i].col = this.daysPerRow - 1 - segs[i].dayIndex;
+            }
+            else {
+                segs[i].col = segs[i].dayIndex;
+            }
         }
+        return segs;
     };
-    EventManager.prototype.refetchAllSources = function () {
-        var currentPeriod = this.currentPeriod;
-        if (currentPeriod) {
-            currentPeriod.freeze();
-            currentPeriod.purgeAllSources();
-            currentPeriod.requestSources(this.getSources());
-            currentPeriod.thaw();
+    /* Date Handling
+    ------------------------------------------------------------------------------------------------------------------*/
+    TimeGrid.prototype.sliceRangeByTimes = function (unzonedRange) {
+        var segs = [];
+        var segRange;
+        var dayIndex;
+        for (dayIndex = 0; dayIndex < this.daysPerRow; dayIndex++) {
+            segRange = unzonedRange.intersect(this.dayRanges[dayIndex]);
+            if (segRange) {
+                segs.push({
+                    startMs: segRange.startMs,
+                    endMs: segRange.endMs,
+                    isStart: segRange.isStart,
+                    isEnd: segRange.isEnd,
+                    dayIndex: dayIndex
+                });
+            }
         }
+        return segs;
     };
-    // Source Querying
-    // -----------------------------------------------------------------------------------------------------------------
-    EventManager.prototype.getSources = function () {
-        return [this.stickySource].concat(this.otherSources);
-    };
-    // like querySources, but accepts multple match criteria (like multiple IDs)
-    EventManager.prototype.multiQuerySources = function (matchInputs) {
-        // coerce into an array
-        if (!matchInputs) {
-            matchInputs = [];
-        }
-        else if (!$.isArray(matchInputs)) {
-            matchInputs = [matchInputs];
-        }
-        var matchingSources = [];
-        var i;
-        // resolve raw inputs to real event source objects
-        for (i = 0; i < matchInputs.length; i++) {
-            matchingSources.push.apply(// append
-            matchingSources, this.querySources(matchInputs[i]));
+    /* Options
+    ------------------------------------------------------------------------------------------------------------------*/
+    // Parses various options into properties of this object
+    TimeGrid.prototype.processOptions = function () {
+        var slotDuration = this.opt('slotDuration');
+        var snapDuration = this.opt('snapDuration');
+        var input;
+        slotDuration = moment.duration(slotDuration);
+        snapDuration = snapDuration ? moment.duration(snapDuration) : slotDuration;
+        this.slotDuration = slotDuration;
+        this.snapDuration = snapDuration;
+        this.snapsPerSlot = slotDuration / snapDuration; // TODO: ensure an integer multiple?
+        // might be an array value (for TimelineView).
+        // if so, getting the most granular entry (the last one probably).
+        input = this.opt('slotLabelFormat');
+        if ($.isArray(input)) {
+            input = input[input.length - 1];
         }
-        return matchingSources;
+        this.labelFormat = input ||
+            this.opt('smallTimeFormat'); // the computed default
+        input = this.opt('slotLabelInterval');
+        this.labelInterval = input ?
+            moment.duration(input) :
+            this.computeLabelInterval(slotDuration);
     };
-    // matchInput can either by a real event source object, an ID, or the function/URL for the source.
-    // returns an array of matching source objects.
-    EventManager.prototype.querySources = function (matchInput) {
-        var sources = this.otherSources;
-        var i;
-        var source;
-        // given a proper event source object
-        for (i = 0; i < sources.length; i++) {
-            source = sources[i];
-            if (source === matchInput) {
-                return [source];
+    // Computes an automatic value for slotLabelInterval
+    TimeGrid.prototype.computeLabelInterval = function (slotDuration) {
+        var i;
+        var labelInterval;
+        var slotsPerLabel;
+        // find the smallest stock label interval that results in more than one slots-per-label
+        for (i = AGENDA_STOCK_SUB_DURATIONS.length - 1; i >= 0; i--) {
+            labelInterval = moment.duration(AGENDA_STOCK_SUB_DURATIONS[i]);
+            slotsPerLabel = util_1.divideDurationByDuration(labelInterval, slotDuration);
+            if (util_1.isInt(slotsPerLabel) && slotsPerLabel > 1) {
+                return labelInterval;
             }
         }
-        // an ID match
-        source = this.getSourceById(EventSource_1.default.normalizeId(matchInput));
-        if (source) {
-            return [source];
-        }
-        // parse as an event source
-        matchInput = EventSourceParser_1.default.parse(matchInput, this.calendar);
-        if (matchInput) {
-            return $.grep(sources, function (source) {
-                return isSourcesEquivalent(matchInput, source);
-            });
-        }
+        return moment.duration(slotDuration); // fall back. clone
     };
-    /*
-    ID assumed to already be normalized
-    */
-    EventManager.prototype.getSourceById = function (id) {
-        return $.grep(this.otherSources, function (source) {
-            return source.id && source.id === id;
-        })[0];
+    /* Date Rendering
+    ------------------------------------------------------------------------------------------------------------------*/
+    TimeGrid.prototype.renderDates = function (dateProfile) {
+        this.dateProfile = dateProfile;
+        this.updateDayTable();
+        this.renderSlats();
+        this.renderColumns();
     };
-    // Event-Period
-    // -----------------------------------------------------------------------------------------------------------------
-    EventManager.prototype.setPeriod = function (eventPeriod) {
-        if (this.currentPeriod) {
-            this.unbindPeriod(this.currentPeriod);
-            this.currentPeriod = null;
-        }
-        this.currentPeriod = eventPeriod;
-        this.bindPeriod(eventPeriod);
-        eventPeriod.requestSources(this.getSources());
+    TimeGrid.prototype.unrenderDates = function () {
+        // this.unrenderSlats(); // don't need this because repeated .html() calls clear
+        this.unrenderColumns();
     };
-    EventManager.prototype.bindPeriod = function (eventPeriod) {
-        this.listenTo(eventPeriod, 'release', function (eventsPayload) {
-            this.trigger('release', eventsPayload);
-        });
+    TimeGrid.prototype.renderSkeleton = function () {
+        var theme = this.view.calendar.theme;
+        this.el.html('<div class="fc-bg"></div>' +
+            '<div class="fc-slats"></div>' +
+            '<hr class="fc-divider ' + theme.getClass('widgetHeader') + '" style="display:none"></hr>');
+        this.bottomRuleEl = this.el.find('hr');
     };
-    EventManager.prototype.unbindPeriod = function (eventPeriod) {
-        this.stopListeningTo(eventPeriod);
+    TimeGrid.prototype.renderSlats = function () {
+        var theme = this.view.calendar.theme;
+        this.slatContainerEl = this.el.find('> .fc-slats')
+            .html(// avoids needing ::unrenderSlats()
+        '<table class="' + theme.getClass('tableGrid') + '">' +
+            this.renderSlatRowHtml() +
+            '</table>');
+        this.slatEls = this.slatContainerEl.find('tr');
+        this.slatCoordCache = new CoordCache_1.default({
+            els: this.slatEls,
+            isVertical: true
+        });
     };
-    // Event Getting/Adding/Removing
-    // -----------------------------------------------------------------------------------------------------------------
-    EventManager.prototype.getEventDefByUid = function (uid) {
-        if (this.currentPeriod) {
-            return this.currentPeriod.getEventDefByUid(uid);
+    // Generates the HTML for the horizontal "slats" that run width-wise. Has a time axis on a side. Depends on RTL.
+    TimeGrid.prototype.renderSlatRowHtml = function () {
+        var view = this.view;
+        var calendar = view.calendar;
+        var theme = calendar.theme;
+        var isRTL = this.isRTL;
+        var dateProfile = this.dateProfile;
+        var html = '';
+        var slotTime = moment.duration(+dateProfile.minTime); // wish there was .clone() for durations
+        var slotIterator = moment.duration(0);
+        var slotDate; // will be on the view's first day, but we only care about its time
+        var isLabeled;
+        var axisHtml;
+        // Calculate the time for each slot
+        while (slotTime < dateProfile.maxTime) {
+            slotDate = calendar.msToUtcMoment(dateProfile.renderUnzonedRange.startMs).time(slotTime);
+            isLabeled = util_1.isInt(util_1.divideDurationByDuration(slotIterator, this.labelInterval));
+            axisHtml =
+                '<td class="fc-axis fc-time ' + theme.getClass('widgetContent') + '" ' + view.axisStyleAttr() + '>' +
+                    (isLabeled ?
+                        '<span>' + // for matchCellWidths
+                            util_1.htmlEscape(slotDate.format(this.labelFormat)) +
+                            '</span>' :
+                        '') +
+                    '</td>';
+            html +=
+                '<tr data-time="' + slotDate.format('HH:mm:ss') + '"' +
+                    (isLabeled ? '' : ' class="fc-minor"') +
+                    '>' +
+                    (!isRTL ? axisHtml : '') +
+                    '<td class="' + theme.getClass('widgetContent') + '"></td>' +
+                    (isRTL ? axisHtml : '') +
+                    '</tr>';
+            slotTime.add(this.slotDuration);
+            slotIterator.add(this.slotDuration);
         }
+        return html;
     };
-    EventManager.prototype.addEventDef = function (eventDef, isSticky) {
-        if (isSticky) {
-            this.stickySource.addEventDef(eventDef);
+    TimeGrid.prototype.renderColumns = function () {
+        var dateProfile = this.dateProfile;
+        var theme = this.view.calendar.theme;
+        this.dayRanges = this.dayDates.map(function (dayDate) {
+            return new UnzonedRange_1.default(dayDate.clone().add(dateProfile.minTime), dayDate.clone().add(dateProfile.maxTime));
+        });
+        if (this.headContainerEl) {
+            this.headContainerEl.html(this.renderHeadHtml());
         }
-        if (this.currentPeriod) {
-            this.currentPeriod.addEventDef(eventDef); // might release
+        this.el.find('> .fc-bg').html('<table class="' + theme.getClass('tableGrid') + '">' +
+            this.renderBgTrHtml(0) + // row=0
+            '</table>');
+        this.colEls = this.el.find('.fc-day, .fc-disabled-day');
+        this.colCoordCache = new CoordCache_1.default({
+            els: this.colEls,
+            isHorizontal: true
+        });
+        this.renderContentSkeleton();
+    };
+    TimeGrid.prototype.unrenderColumns = function () {
+        this.unrenderContentSkeleton();
+    };
+    /* Content Skeleton
+    ------------------------------------------------------------------------------------------------------------------*/
+    // Renders the DOM that the view's content will live in
+    TimeGrid.prototype.renderContentSkeleton = function () {
+        var cellHtml = '';
+        var i;
+        var skeletonEl;
+        for (i = 0; i < this.colCnt; i++) {
+            cellHtml +=
+                '<td>' +
+                    '<div class="fc-content-col">' +
+                    '<div class="fc-event-container fc-helper-container"></div>' +
+                    '<div class="fc-event-container"></div>' +
+                    '<div class="fc-highlight-container"></div>' +
+                    '<div class="fc-bgevent-container"></div>' +
+                    '<div class="fc-business-container"></div>' +
+                    '</div>' +
+                    '</td>';
         }
+        skeletonEl = this.contentSkeletonEl = $('<div class="fc-content-skeleton">' +
+            '<table>' +
+            '<tr>' + cellHtml + '</tr>' +
+            '</table>' +
+            '</div>');
+        this.colContainerEls = skeletonEl.find('.fc-content-col');
+        this.helperContainerEls = skeletonEl.find('.fc-helper-container');
+        this.fgContainerEls = skeletonEl.find('.fc-event-container:not(.fc-helper-container)');
+        this.bgContainerEls = skeletonEl.find('.fc-bgevent-container');
+        this.highlightContainerEls = skeletonEl.find('.fc-highlight-container');
+        this.businessContainerEls = skeletonEl.find('.fc-business-container');
+        this.bookendCells(skeletonEl.find('tr')); // TODO: do this on string level
+        this.el.append(skeletonEl);
     };
-    EventManager.prototype.removeEventDefsById = function (eventId) {
-        this.getSources().forEach(function (eventSource) {
-            eventSource.removeEventDefsById(eventId);
-        });
-        if (this.currentPeriod) {
-            this.currentPeriod.removeEventDefsById(eventId); // might release
+    TimeGrid.prototype.unrenderContentSkeleton = function () {
+        if (this.contentSkeletonEl) { // defensive :(
+            this.contentSkeletonEl.remove();
+            this.contentSkeletonEl = null;
+            this.colContainerEls = null;
+            this.helperContainerEls = null;
+            this.fgContainerEls = null;
+            this.bgContainerEls = null;
+            this.highlightContainerEls = null;
+            this.businessContainerEls = null;
         }
     };
-    EventManager.prototype.removeAllEventDefs = function () {
-        this.getSources().forEach(function (eventSource) {
-            eventSource.removeAllEventDefs();
-        });
-        if (this.currentPeriod) {
-            this.currentPeriod.removeAllEventDefs();
+    // Given a flat array of segments, return an array of sub-arrays, grouped by each segment's col
+    TimeGrid.prototype.groupSegsByCol = function (segs) {
+        var segsByCol = [];
+        var i;
+        for (i = 0; i < this.colCnt; i++) {
+            segsByCol.push([]);
+        }
+        for (i = 0; i < segs.length; i++) {
+            segsByCol[segs[i].col].push(segs[i]);
         }
+        return segsByCol;
     };
-    // Event Mutating
-    // -----------------------------------------------------------------------------------------------------------------
-    /*
-    Returns an undo function.
-    */
-    EventManager.prototype.mutateEventsWithId = function (eventDefId, eventDefMutation) {
-        var currentPeriod = this.currentPeriod;
-        var eventDefs;
-        var undoFuncs = [];
-        if (currentPeriod) {
-            currentPeriod.freeze();
-            eventDefs = currentPeriod.getEventDefsById(eventDefId);
-            eventDefs.forEach(function (eventDef) {
-                // add/remove esp because id might change
-                currentPeriod.removeEventDef(eventDef);
-                undoFuncs.push(eventDefMutation.mutateSingle(eventDef));
-                currentPeriod.addEventDef(eventDef);
-            });
-            currentPeriod.thaw();
-            return function () {
-                currentPeriod.freeze();
-                for (var i = 0; i < eventDefs.length; i++) {
-                    currentPeriod.removeEventDef(eventDefs[i]);
-                    undoFuncs[i]();
-                    currentPeriod.addEventDef(eventDefs[i]);
-                }
-                currentPeriod.thaw();
-            };
+    // Given segments grouped by column, insert the segments' elements into a parallel array of container
+    // elements, each living within a column.
+    TimeGrid.prototype.attachSegsByCol = function (segsByCol, containerEls) {
+        var col;
+        var segs;
+        var i;
+        for (col = 0; col < this.colCnt; col++) { // iterate each column grouping
+            segs = segsByCol[col];
+            for (i = 0; i < segs.length; i++) {
+                containerEls.eq(col).append(segs[i].el);
+            }
         }
-        return function () { };
     };
-    /*
-    copies and then mutates
-    */
-    EventManager.prototype.buildMutatedEventInstanceGroup = function (eventDefId, eventDefMutation) {
-        var eventDefs = this.getEventDefsById(eventDefId);
+    /* Now Indicator
+    ------------------------------------------------------------------------------------------------------------------*/
+    TimeGrid.prototype.getNowIndicatorUnit = function () {
+        return 'minute'; // will refresh on the minute
+    };
+    TimeGrid.prototype.renderNowIndicator = function (date) {
+        // HACK: if date columns not ready for some reason (scheduler)
+        if (!this.colContainerEls) {
+            return;
+        }
+        // seg system might be overkill, but it handles scenario where line needs to be rendered
+        //  more than once because of columns with the same date (resources columns for example)
+        var segs = this.componentFootprintToSegs(new ComponentFootprint_1.default(new UnzonedRange_1.default(date, date.valueOf() + 1), // protect against null range
+        false // all-day
+        ));
+        var top = this.computeDateTop(date, date);
+        var nodes = [];
         var i;
-        var defCopy;
-        var allInstances = [];
-        for (i = 0; i < eventDefs.length; i++) {
-            defCopy = eventDefs[i].clone();
-            if (defCopy instanceof SingleEventDef_1.default) {
-                eventDefMutation.mutateSingle(defCopy);
-                allInstances.push.apply(allInstances, // append
-                defCopy.buildInstances());
-            }
+        // render lines within the columns
+        for (i = 0; i < segs.length; i++) {
+            nodes.push($('<div class="fc-now-indicator fc-now-indicator-line"></div>')
+                .css('top', top)
+                .appendTo(this.colContainerEls.eq(segs[i].col))[0]);
         }
-        return new EventInstanceGroup_1.default(allInstances);
+        // render an arrow over the axis
+        if (segs.length > 0) { // is the current time in view?
+            nodes.push($('<div class="fc-now-indicator fc-now-indicator-arrow"></div>')
+                .css('top', top)
+                .appendTo(this.el.find('.fc-content-skeleton'))[0]);
+        }
+        this.nowIndicatorEls = $(nodes);
     };
-    // Freezing
-    // -----------------------------------------------------------------------------------------------------------------
-    EventManager.prototype.freeze = function () {
-        if (this.currentPeriod) {
-            this.currentPeriod.freeze();
+    TimeGrid.prototype.unrenderNowIndicator = function () {
+        if (this.nowIndicatorEls) {
+            this.nowIndicatorEls.remove();
+            this.nowIndicatorEls = null;
         }
     };
-    EventManager.prototype.thaw = function () {
-        if (this.currentPeriod) {
-            this.currentPeriod.thaw();
+    /* Coordinates
+    ------------------------------------------------------------------------------------------------------------------*/
+    TimeGrid.prototype.updateSize = function (totalHeight, isAuto, isResize) {
+        _super.prototype.updateSize.call(this, totalHeight, isAuto, isResize);
+        this.slatCoordCache.build();
+        if (isResize) {
+            this.updateSegVerticals([].concat(this.eventRenderer.getSegs(), this.businessSegs || []));
         }
     };
-    // methods that simply forward to EventPeriod
-    EventManager.prototype.getEventDefsById = function (eventDefId) {
-        return this.currentPeriod.getEventDefsById(eventDefId);
+    TimeGrid.prototype.getTotalSlatHeight = function () {
+        return this.slatContainerEl.outerHeight();
     };
-    EventManager.prototype.getEventInstances = function () {
-        return this.currentPeriod.getEventInstances();
+    // Computes the top coordinate, relative to the bounds of the grid, of the given date.
+    // `ms` can be a millisecond UTC time OR a UTC moment.
+    // A `startOfDayDate` must be given for avoiding ambiguity over how to treat midnight.
+    TimeGrid.prototype.computeDateTop = function (ms, startOfDayDate) {
+        return this.computeTimeTop(moment.duration(ms - startOfDayDate.clone().stripTime()));
     };
-    EventManager.prototype.getEventInstancesWithId = function (eventDefId) {
-        return this.currentPeriod.getEventInstancesWithId(eventDefId);
+    // Computes the top coordinate, relative to the bounds of the grid, of the given time (a Duration).
+    TimeGrid.prototype.computeTimeTop = function (time) {
+        var len = this.slatEls.length;
+        var dateProfile = this.dateProfile;
+        var slatCoverage = (time - dateProfile.minTime) / this.slotDuration; // floating-point value of # of slots covered
+        var slatIndex;
+        var slatRemainder;
+        // compute a floating-point number for how many slats should be progressed through.
+        // from 0 to number of slats (inclusive)
+        // constrained because minTime/maxTime might be customized.
+        slatCoverage = Math.max(0, slatCoverage);
+        slatCoverage = Math.min(len, slatCoverage);
+        // an integer index of the furthest whole slat
+        // from 0 to number slats (*exclusive*, so len-1)
+        slatIndex = Math.floor(slatCoverage);
+        slatIndex = Math.min(slatIndex, len - 1);
+        // how much further through the slatIndex slat (from 0.0-1.0) must be covered in addition.
+        // could be 1.0 if slatCoverage is covering *all* the slots
+        slatRemainder = slatCoverage - slatIndex;
+        return this.slatCoordCache.getTopPosition(slatIndex) +
+            this.slatCoordCache.getHeight(slatIndex) * slatRemainder;
     };
-    EventManager.prototype.getEventInstancesWithoutId = function (eventDefId) {
-        return this.currentPeriod.getEventInstancesWithoutId(eventDefId);
+    // Refreshes the CSS top/bottom coordinates for each segment element.
+    // Works when called after initial render, after a window resize/zoom for example.
+    TimeGrid.prototype.updateSegVerticals = function (segs) {
+        this.computeSegVerticals(segs);
+        this.assignSegVerticals(segs);
     };
-    return EventManager;
-}());
-exports.default = EventManager;
-EmitterMixin_1.default.mixInto(EventManager);
-ListenerMixin_1.default.mixInto(EventManager);
-function isSourcesEquivalent(source0, source1) {
-    return source0.getPrimitive() === source1.getPrimitive();
-}
-
-
-/***/ }),
-/* 243 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var $ = __webpack_require__(3);
-var util_1 = __webpack_require__(4);
-var Promise_1 = __webpack_require__(20);
-var EmitterMixin_1 = __webpack_require__(11);
-var UnzonedRange_1 = __webpack_require__(5);
-var EventInstanceGroup_1 = __webpack_require__(18);
-var EventPeriod = /** @class */ (function () {
-    function EventPeriod(start, end, timezone) {
-        this.pendingCnt = 0;
-        this.freezeDepth = 0;
-        this.stuntedReleaseCnt = 0;
-        this.releaseCnt = 0;
-        this.start = start;
-        this.end = end;
-        this.timezone = timezone;
-        this.unzonedRange = new UnzonedRange_1.default(start.clone().stripZone(), end.clone().stripZone());
-        this.requestsByUid = {};
-        this.eventDefsByUid = {};
-        this.eventDefsById = {};
-        this.eventInstanceGroupsById = {};
-    }
-    EventPeriod.prototype.isWithinRange = function (start, end) {
-        // TODO: use a range util function?
-        return !start.isBefore(this.start) && !end.isAfter(this.end);
+    // For each segment in an array, computes and assigns its top and bottom properties
+    TimeGrid.prototype.computeSegVerticals = function (segs) {
+        var eventMinHeight = this.opt('agendaEventMinHeight');
+        var i;
+        var seg;
+        var dayDate;
+        for (i = 0; i < segs.length; i++) {
+            seg = segs[i];
+            dayDate = this.dayDates[seg.dayIndex];
+            seg.top = this.computeDateTop(seg.startMs, dayDate);
+            seg.bottom = Math.max(seg.top + eventMinHeight, this.computeDateTop(seg.endMs, dayDate));
+        }
     };
-    // Requesting and Purging
-    // -----------------------------------------------------------------------------------------------------------------
-    EventPeriod.prototype.requestSources = function (sources) {
-        this.freeze();
-        for (var i = 0; i < sources.length; i++) {
-            this.requestSource(sources[i]);
+    // Given segments that already have their top/bottom properties computed, applies those values to
+    // the segments' elements.
+    TimeGrid.prototype.assignSegVerticals = function (segs) {
+        var i;
+        var seg;
+        for (i = 0; i < segs.length; i++) {
+            seg = segs[i];
+            seg.el.css(this.generateSegVerticalCss(seg));
         }
-        this.thaw();
     };
-    EventPeriod.prototype.requestSource = function (source) {
-        var _this = this;
-        var request = { source: source, status: 'pending', eventDefs: null };
-        this.requestsByUid[source.uid] = request;
-        this.pendingCnt += 1;
-        source.fetch(this.start, this.end, this.timezone).then(function (eventDefs) {
-            if (request.status !== 'cancelled') {
-                request.status = 'completed';
-                request.eventDefs = eventDefs;
-                _this.addEventDefs(eventDefs);
-                _this.pendingCnt--;
-                _this.tryRelease();
-            }
-        }, function () {
-            if (request.status !== 'cancelled') {
-                request.status = 'failed';
-                _this.pendingCnt--;
-                _this.tryRelease();
-            }
-        });
+    // Generates an object with CSS properties for the top/bottom coordinates of a segment element
+    TimeGrid.prototype.generateSegVerticalCss = function (seg) {
+        return {
+            top: seg.top,
+            bottom: -seg.bottom // flipped because needs to be space beyond bottom edge of event container
+        };
     };
-    EventPeriod.prototype.purgeSource = function (source) {
-        var request = this.requestsByUid[source.uid];
-        if (request) {
-            delete this.requestsByUid[source.uid];
-            if (request.status === 'pending') {
-                request.status = 'cancelled';
-                this.pendingCnt--;
-                this.tryRelease();
-            }
-            else if (request.status === 'completed') {
-                request.eventDefs.forEach(this.removeEventDef.bind(this));
+    /* Hit System
+    ------------------------------------------------------------------------------------------------------------------*/
+    TimeGrid.prototype.prepareHits = function () {
+        this.colCoordCache.build();
+        this.slatCoordCache.build();
+    };
+    TimeGrid.prototype.releaseHits = function () {
+        this.colCoordCache.clear();
+        // NOTE: don't clear slatCoordCache because we rely on it for computeTimeTop
+    };
+    TimeGrid.prototype.queryHit = function (leftOffset, topOffset) {
+        var snapsPerSlot = this.snapsPerSlot;
+        var colCoordCache = this.colCoordCache;
+        var slatCoordCache = this.slatCoordCache;
+        if (colCoordCache.isLeftInBounds(leftOffset) && slatCoordCache.isTopInBounds(topOffset)) {
+            var colIndex = colCoordCache.getHorizontalIndex(leftOffset);
+            var slatIndex = slatCoordCache.getVerticalIndex(topOffset);
+            if (colIndex != null && slatIndex != null) {
+                var slatTop = slatCoordCache.getTopOffset(slatIndex);
+                var slatHeight = slatCoordCache.getHeight(slatIndex);
+                var partial = (topOffset - slatTop) / slatHeight; // floating point number between 0 and 1
+                var localSnapIndex = Math.floor(partial * snapsPerSlot); // the snap # relative to start of slat
+                var snapIndex = slatIndex * snapsPerSlot + localSnapIndex;
+                var snapTop = slatTop + (localSnapIndex / snapsPerSlot) * slatHeight;
+                var snapBottom = slatTop + ((localSnapIndex + 1) / snapsPerSlot) * slatHeight;
+                return {
+                    col: colIndex,
+                    snap: snapIndex,
+                    component: this,
+                    left: colCoordCache.getLeftOffset(colIndex),
+                    right: colCoordCache.getRightOffset(colIndex),
+                    top: snapTop,
+                    bottom: snapBottom
+                };
             }
         }
     };
-    EventPeriod.prototype.purgeAllSources = function () {
-        var requestsByUid = this.requestsByUid;
-        var uid;
-        var request;
-        var completedCnt = 0;
-        for (uid in requestsByUid) {
-            request = requestsByUid[uid];
-            if (request.status === 'pending') {
-                request.status = 'cancelled';
-            }
-            else if (request.status === 'completed') {
-                completedCnt++;
+    TimeGrid.prototype.getHitFootprint = function (hit) {
+        var start = this.getCellDate(0, hit.col); // row=0
+        var time = this.computeSnapTime(hit.snap); // pass in the snap-index
+        var end;
+        start.time(time);
+        end = start.clone().add(this.snapDuration);
+        return new ComponentFootprint_1.default(new UnzonedRange_1.default(start, end), false // all-day?
+        );
+    };
+    // Given a row number of the grid, representing a "snap", returns a time (Duration) from its start-of-day
+    TimeGrid.prototype.computeSnapTime = function (snapIndex) {
+        return moment.duration(this.dateProfile.minTime + this.snapDuration * snapIndex);
+    };
+    TimeGrid.prototype.getHitEl = function (hit) {
+        return this.colEls.eq(hit.col);
+    };
+    /* Event Drag Visualization
+    ------------------------------------------------------------------------------------------------------------------*/
+    // Renders a visual indication of an event being dragged over the specified date(s).
+    // A returned value of `true` signals that a mock "helper" event has been rendered.
+    TimeGrid.prototype.renderDrag = function (eventFootprints, seg, isTouch) {
+        var i;
+        if (seg) { // if there is event information for this drag, render a helper event
+            if (eventFootprints.length) {
+                this.helperRenderer.renderEventDraggingFootprints(eventFootprints, seg, isTouch);
+                // signal that a helper has been rendered
+                return true;
             }
         }
-        this.requestsByUid = {};
-        this.pendingCnt = 0;
-        if (completedCnt) {
-            this.removeAllEventDefs(); // might release
+        else { // otherwise, just render a highlight
+            for (i = 0; i < eventFootprints.length; i++) {
+                this.renderHighlight(eventFootprints[i].componentFootprint);
+            }
         }
     };
-    // Event Definitions
-    // -----------------------------------------------------------------------------------------------------------------
-    EventPeriod.prototype.getEventDefByUid = function (eventDefUid) {
-        return this.eventDefsByUid[eventDefUid];
+    // Unrenders any visual indication of an event being dragged
+    TimeGrid.prototype.unrenderDrag = function () {
+        this.unrenderHighlight();
+        this.helperRenderer.unrender();
     };
-    EventPeriod.prototype.getEventDefsById = function (eventDefId) {
-        var a = this.eventDefsById[eventDefId];
-        if (a) {
-            return a.slice(); // clone
-        }
-        return [];
+    /* Event Resize Visualization
+    ------------------------------------------------------------------------------------------------------------------*/
+    // Renders a visual indication of an event being resized
+    TimeGrid.prototype.renderEventResize = function (eventFootprints, seg, isTouch) {
+        this.helperRenderer.renderEventResizingFootprints(eventFootprints, seg, isTouch);
     };
-    EventPeriod.prototype.addEventDefs = function (eventDefs) {
-        for (var i = 0; i < eventDefs.length; i++) {
-            this.addEventDef(eventDefs[i]);
-        }
+    // Unrenders any visual indication of an event being resized
+    TimeGrid.prototype.unrenderEventResize = function () {
+        this.helperRenderer.unrender();
     };
-    EventPeriod.prototype.addEventDef = function (eventDef) {
-        var eventDefsById = this.eventDefsById;
-        var eventDefId = eventDef.id;
-        var eventDefs = eventDefsById[eventDefId] || (eventDefsById[eventDefId] = []);
-        var eventInstances = eventDef.buildInstances(this.unzonedRange);
-        var i;
-        eventDefs.push(eventDef);
-        this.eventDefsByUid[eventDef.uid] = eventDef;
-        for (i = 0; i < eventInstances.length; i++) {
-            this.addEventInstance(eventInstances[i], eventDefId);
+    /* Selection
+    ------------------------------------------------------------------------------------------------------------------*/
+    // Renders a visual indication of a selection. Overrides the default, which was to simply render a highlight.
+    TimeGrid.prototype.renderSelectionFootprint = function (componentFootprint) {
+        if (this.opt('selectHelper')) { // this setting signals that a mock helper event should be rendered
+            this.helperRenderer.renderComponentFootprint(componentFootprint);
+        }
+        else {
+            this.renderHighlight(componentFootprint);
         }
     };
-    EventPeriod.prototype.removeEventDefsById = function (eventDefId) {
-        var _this = this;
-        this.getEventDefsById(eventDefId).forEach(function (eventDef) {
-            _this.removeEventDef(eventDef);
-        });
+    // Unrenders any visual indication of a selection
+    TimeGrid.prototype.unrenderSelection = function () {
+        this.helperRenderer.unrender();
+        this.unrenderHighlight();
     };
-    EventPeriod.prototype.removeAllEventDefs = function () {
-        var isEmpty = $.isEmptyObject(this.eventDefsByUid);
-        this.eventDefsByUid = {};
-        this.eventDefsById = {};
-        this.eventInstanceGroupsById = {};
-        if (!isEmpty) {
-            this.tryRelease();
-        }
+    return TimeGrid;
+}(InteractiveDateComponent_1.default));
+exports.default = TimeGrid;
+TimeGrid.prototype.eventRendererClass = TimeGridEventRenderer_1.default;
+TimeGrid.prototype.businessHourRendererClass = BusinessHourRenderer_1.default;
+TimeGrid.prototype.helperRendererClass = TimeGridHelperRenderer_1.default;
+TimeGrid.prototype.fillRendererClass = TimeGridFillRenderer_1.default;
+StandardInteractionsMixin_1.default.mixInto(TimeGrid);
+DayTableMixin_1.default.mixInto(TimeGrid);
+
+
+/***/ }),
+/* 240 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var util_1 = __webpack_require__(4);
+var EventRenderer_1 = __webpack_require__(44);
+/*
+Only handles foreground segs.
+Does not own rendering. Use for low-level util methods by TimeGrid.
+*/
+var TimeGridEventRenderer = /** @class */ (function (_super) {
+    tslib_1.__extends(TimeGridEventRenderer, _super);
+    function TimeGridEventRenderer(timeGrid, fillRenderer) {
+        var _this = _super.call(this, timeGrid, fillRenderer) || this;
+        _this.timeGrid = timeGrid;
+        return _this;
+    }
+    TimeGridEventRenderer.prototype.renderFgSegs = function (segs) {
+        this.renderFgSegsIntoContainers(segs, this.timeGrid.fgContainerEls);
     };
-    EventPeriod.prototype.removeEventDef = function (eventDef) {
-        var eventDefsById = this.eventDefsById;
-        var eventDefs = eventDefsById[eventDef.id];
-        delete this.eventDefsByUid[eventDef.uid];
-        if (eventDefs) {
-            util_1.removeExact(eventDefs, eventDef);
-            if (!eventDefs.length) {
-                delete eventDefsById[eventDef.id];
-            }
-            this.removeEventInstancesForDef(eventDef);
+    // Given an array of foreground segments, render a DOM element for each, computes position,
+    // and attaches to the column inner-container elements.
+    TimeGridEventRenderer.prototype.renderFgSegsIntoContainers = function (segs, containerEls) {
+        var segsByCol;
+        var col;
+        segsByCol = this.timeGrid.groupSegsByCol(segs);
+        for (col = 0; col < this.timeGrid.colCnt; col++) {
+            this.updateFgSegCoords(segsByCol[col]);
         }
+        this.timeGrid.attachSegsByCol(segsByCol, containerEls);
     };
-    // Event Instances
-    // -----------------------------------------------------------------------------------------------------------------
-    EventPeriod.prototype.getEventInstances = function () {
-        var eventInstanceGroupsById = this.eventInstanceGroupsById;
-        var eventInstances = [];
-        var id;
-        for (id in eventInstanceGroupsById) {
-            eventInstances.push.apply(eventInstances, // append
-            eventInstanceGroupsById[id].eventInstances);
+    TimeGridEventRenderer.prototype.unrenderFgSegs = function () {
+        if (this.fgSegs) { // hack
+            this.fgSegs.forEach(function (seg) {
+                seg.el.remove();
+            });
         }
-        return eventInstances;
     };
-    EventPeriod.prototype.getEventInstancesWithId = function (eventDefId) {
-        var eventInstanceGroup = this.eventInstanceGroupsById[eventDefId];
-        if (eventInstanceGroup) {
-            return eventInstanceGroup.eventInstances.slice(); // clone
-        }
-        return [];
+    // Computes a default event time formatting string if `timeFormat` is not explicitly defined
+    TimeGridEventRenderer.prototype.computeEventTimeFormat = function () {
+        return this.opt('noMeridiemTimeFormat'); // like "6:30" (no AM/PM)
     };
-    EventPeriod.prototype.getEventInstancesWithoutId = function (eventDefId) {
-        var eventInstanceGroupsById = this.eventInstanceGroupsById;
-        var matchingInstances = [];
-        var id;
-        for (id in eventInstanceGroupsById) {
-            if (id !== eventDefId) {
-                matchingInstances.push.apply(matchingInstances, // append
-                eventInstanceGroupsById[id].eventInstances);
+    // Computes a default `displayEventEnd` value if one is not expliclty defined
+    TimeGridEventRenderer.prototype.computeDisplayEventEnd = function () {
+        return true;
+    };
+    // Renders the HTML for a single event segment's default rendering
+    TimeGridEventRenderer.prototype.fgSegHtml = function (seg, disableResizing) {
+        var view = this.view;
+        var calendar = view.calendar;
+        var componentFootprint = seg.footprint.componentFootprint;
+        var isAllDay = componentFootprint.isAllDay;
+        var eventDef = seg.footprint.eventDef;
+        var isDraggable = view.isEventDefDraggable(eventDef);
+        var isResizableFromStart = !disableResizing && seg.isStart && view.isEventDefResizableFromStart(eventDef);
+        var isResizableFromEnd = !disableResizing && seg.isEnd && view.isEventDefResizableFromEnd(eventDef);
+        var classes = this.getSegClasses(seg, isDraggable, isResizableFromStart || isResizableFromEnd);
+        var skinCss = util_1.cssToStr(this.getSkinCss(eventDef));
+        var timeText;
+        var fullTimeText; // more verbose time text. for the print stylesheet
+        var startTimeText; // just the start time text
+        classes.unshift('fc-time-grid-event', 'fc-v-event');
+        // if the event appears to span more than one day...
+        if (view.isMultiDayRange(componentFootprint.unzonedRange)) {
+            // Don't display time text on segments that run entirely through a day.
+            // That would appear as midnight-midnight and would look dumb.
+            // Otherwise, display the time text for the *segment's* times (like 6pm-midnight or midnight-10am)
+            if (seg.isStart || seg.isEnd) {
+                var zonedStart = calendar.msToMoment(seg.startMs);
+                var zonedEnd = calendar.msToMoment(seg.endMs);
+                timeText = this._getTimeText(zonedStart, zonedEnd, isAllDay);
+                fullTimeText = this._getTimeText(zonedStart, zonedEnd, isAllDay, 'LT');
+                startTimeText = this._getTimeText(zonedStart, zonedEnd, isAllDay, null, false); // displayEnd=false
             }
         }
-        return matchingInstances;
+        else {
+            // Display the normal time text for the *event's* times
+            timeText = this.getTimeText(seg.footprint);
+            fullTimeText = this.getTimeText(seg.footprint, 'LT');
+            startTimeText = this.getTimeText(seg.footprint, null, false); // displayEnd=false
+        }
+        return '<a class="' + classes.join(' ') + '"' +
+            (eventDef.url ?
+                ' href="' + util_1.htmlEscape(eventDef.url) + '"' :
+                '') +
+            (skinCss ?
+                ' style="' + skinCss + '"' :
+                '') +
+            '>' +
+            '<div class="fc-content">' +
+            (timeText ?
+                '<div class="fc-time"' +
+                    ' data-start="' + util_1.htmlEscape(startTimeText) + '"' +
+                    ' data-full="' + util_1.htmlEscape(fullTimeText) + '"' +
+                    '>' +
+                    '<span>' + util_1.htmlEscape(timeText) + '</span>' +
+                    '</div>' :
+                '') +
+            (eventDef.title ?
+                '<div class="fc-title">' +
+                    util_1.htmlEscape(eventDef.title) +
+                    '</div>' :
+                '') +
+            '</div>' +
+            '<div class="fc-bg"></div>' +
+            /* TODO: write CSS for this
+            (isResizableFromStart ?
+              '<div class="fc-resizer fc-start-resizer"></div>' :
+              ''
+              ) +
+            */
+            (isResizableFromEnd ?
+                '<div class="fc-resizer fc-end-resizer"></div>' :
+                '') +
+            '</a>';
     };
-    EventPeriod.prototype.addEventInstance = function (eventInstance, eventDefId) {
-        var eventInstanceGroupsById = this.eventInstanceGroupsById;
-        var eventInstanceGroup = eventInstanceGroupsById[eventDefId] ||
-            (eventInstanceGroupsById[eventDefId] = new EventInstanceGroup_1.default());
-        eventInstanceGroup.eventInstances.push(eventInstance);
-        this.tryRelease();
+    // Given segments that are assumed to all live in the *same column*,
+    // compute their verical/horizontal coordinates and assign to their elements.
+    TimeGridEventRenderer.prototype.updateFgSegCoords = function (segs) {
+        this.timeGrid.computeSegVerticals(segs); // horizontals relies on this
+        this.computeFgSegHorizontals(segs); // compute horizontal coordinates, z-index's, and reorder the array
+        this.timeGrid.assignSegVerticals(segs);
+        this.assignFgSegHorizontals(segs);
     };
-    EventPeriod.prototype.removeEventInstancesForDef = function (eventDef) {
-        var eventInstanceGroupsById = this.eventInstanceGroupsById;
-        var eventInstanceGroup = eventInstanceGroupsById[eventDef.id];
-        var removeCnt;
-        if (eventInstanceGroup) {
-            removeCnt = util_1.removeMatching(eventInstanceGroup.eventInstances, function (currentEventInstance) {
-                return currentEventInstance.def === eventDef;
-            });
-            if (!eventInstanceGroup.eventInstances.length) {
-                delete eventInstanceGroupsById[eventDef.id];
+    // Given an array of segments that are all in the same column, sets the backwardCoord and forwardCoord on each.
+    // NOTE: Also reorders the given array by date!
+    TimeGridEventRenderer.prototype.computeFgSegHorizontals = function (segs) {
+        var levels;
+        var level0;
+        var i;
+        this.sortEventSegs(segs); // order by certain criteria
+        levels = buildSlotSegLevels(segs);
+        computeForwardSlotSegs(levels);
+        if ((level0 = levels[0])) {
+            for (i = 0; i < level0.length; i++) {
+                computeSlotSegPressures(level0[i]);
             }
-            if (removeCnt) {
-                this.tryRelease();
+            for (i = 0; i < level0.length; i++) {
+                this.computeFgSegForwardBack(level0[i], 0, 0);
             }
         }
     };
-    // Releasing and Freezing
-    // -----------------------------------------------------------------------------------------------------------------
-    EventPeriod.prototype.tryRelease = function () {
-        if (!this.pendingCnt) {
-            if (!this.freezeDepth) {
-                this.release();
+    // Calculate seg.forwardCoord and seg.backwardCoord for the segment, where both values range
+    // from 0 to 1. If the calendar is left-to-right, the seg.backwardCoord maps to "left" and
+    // seg.forwardCoord maps to "right" (via percentage). Vice-versa if the calendar is right-to-left.
+    //
+    // The segment might be part of a "series", which means consecutive segments with the same pressure
+    // who's width is unknown until an edge has been hit. `seriesBackwardPressure` is the number of
+    // segments behind this one in the current series, and `seriesBackwardCoord` is the starting
+    // coordinate of the first segment in the series.
+    TimeGridEventRenderer.prototype.computeFgSegForwardBack = function (seg, seriesBackwardPressure, seriesBackwardCoord) {
+        var forwardSegs = seg.forwardSegs;
+        var i;
+        if (seg.forwardCoord === undefined) { // not already computed
+            if (!forwardSegs.length) {
+                // if there are no forward segments, this segment should butt up against the edge
+                seg.forwardCoord = 1;
             }
             else {
-                this.stuntedReleaseCnt++;
+                // sort highest pressure first
+                this.sortForwardSegs(forwardSegs);
+                // this segment's forwardCoord will be calculated from the backwardCoord of the
+                // highest-pressure forward segment.
+                this.computeFgSegForwardBack(forwardSegs[0], seriesBackwardPressure + 1, seriesBackwardCoord);
+                seg.forwardCoord = forwardSegs[0].backwardCoord;
+            }
+            // calculate the backwardCoord from the forwardCoord. consider the series
+            seg.backwardCoord = seg.forwardCoord -
+                (seg.forwardCoord - seriesBackwardCoord) / // available width for series
+                    (seriesBackwardPressure + 1); // # of segments in the series
+            // use this segment's coordinates to computed the coordinates of the less-pressurized
+            // forward segments
+            for (i = 0; i < forwardSegs.length; i++) {
+                this.computeFgSegForwardBack(forwardSegs[i], 0, seg.forwardCoord);
             }
         }
     };
-    EventPeriod.prototype.release = function () {
-        this.releaseCnt++;
-        this.trigger('release', this.eventInstanceGroupsById);
+    TimeGridEventRenderer.prototype.sortForwardSegs = function (forwardSegs) {
+        forwardSegs.sort(util_1.proxy(this, 'compareForwardSegs'));
     };
-    EventPeriod.prototype.whenReleased = function () {
-        var _this = this;
-        if (this.releaseCnt) {
-            return Promise_1.default.resolve(this.eventInstanceGroupsById);
+    // A cmp function for determining which forward segment to rely on more when computing coordinates.
+    TimeGridEventRenderer.prototype.compareForwardSegs = function (seg1, seg2) {
+        // put higher-pressure first
+        return seg2.forwardPressure - seg1.forwardPressure ||
+            // put segments that are closer to initial edge first (and favor ones with no coords yet)
+            (seg1.backwardCoord || 0) - (seg2.backwardCoord || 0) ||
+            // do normal sorting...
+            this.compareEventSegs(seg1, seg2);
+    };
+    // Given foreground event segments that have already had their position coordinates computed,
+    // assigns position-related CSS values to their elements.
+    TimeGridEventRenderer.prototype.assignFgSegHorizontals = function (segs) {
+        var i;
+        var seg;
+        for (i = 0; i < segs.length; i++) {
+            seg = segs[i];
+            seg.el.css(this.generateFgSegHorizontalCss(seg));
+            // if the event is short that the title will be cut off,
+            // attach a className that condenses the title into the time area.
+            if (seg.footprint.eventDef.title && seg.bottom - seg.top < 30) {
+                seg.el.addClass('fc-short'); // TODO: "condensed" is a better name
+            }
+        }
+    };
+    // Generates an object with CSS properties/values that should be applied to an event segment element.
+    // Contains important positioning-related properties that should be applied to any event element, customized or not.
+    TimeGridEventRenderer.prototype.generateFgSegHorizontalCss = function (seg) {
+        var shouldOverlap = this.opt('slotEventOverlap');
+        var backwardCoord = seg.backwardCoord; // the left side if LTR. the right side if RTL. floating-point
+        var forwardCoord = seg.forwardCoord; // the right side if LTR. the left side if RTL. floating-point
+        var props = this.timeGrid.generateSegVerticalCss(seg); // get top/bottom first
+        var isRTL = this.timeGrid.isRTL;
+        var left; // amount of space from left edge, a fraction of the total width
+        var right; // amount of space from right edge, a fraction of the total width
+        if (shouldOverlap) {
+            // double the width, but don't go beyond the maximum forward coordinate (1.0)
+            forwardCoord = Math.min(1, backwardCoord + (forwardCoord - backwardCoord) * 2);
+        }
+        if (isRTL) {
+            left = 1 - forwardCoord;
+            right = backwardCoord;
         }
         else {
-            return Promise_1.default.construct(function (onResolve) {
-                _this.one('release', onResolve);
-            });
+            left = backwardCoord;
+            right = 1 - forwardCoord;
         }
-    };
-    EventPeriod.prototype.freeze = function () {
-        if (!(this.freezeDepth++)) {
-            this.stuntedReleaseCnt = 0;
+        props.zIndex = seg.level + 1; // convert from 0-base to 1-based
+        props.left = left * 100 + '%';
+        props.right = right * 100 + '%';
+        if (shouldOverlap && seg.forwardPressure) {
+            // add padding to the edge so that forward stacked events don't cover the resizer's icon
+            props[isRTL ? 'marginLeft' : 'marginRight'] = 10 * 2; // 10 is a guesstimate of the icon's width
         }
+        return props;
     };
-    EventPeriod.prototype.thaw = function () {
-        if (!(--this.freezeDepth) && this.stuntedReleaseCnt && !this.pendingCnt) {
-            this.release();
+    return TimeGridEventRenderer;
+}(EventRenderer_1.default));
+exports.default = TimeGridEventRenderer;
+// Builds an array of segments "levels". The first level will be the leftmost tier of segments if the calendar is
+// left-to-right, or the rightmost if the calendar is right-to-left. Assumes the segments are already ordered by date.
+function buildSlotSegLevels(segs) {
+    var levels = [];
+    var i;
+    var seg;
+    var j;
+    for (i = 0; i < segs.length; i++) {
+        seg = segs[i];
+        // go through all the levels and stop on the first level where there are no collisions
+        for (j = 0; j < levels.length; j++) {
+            if (!computeSlotSegCollisions(seg, levels[j]).length) {
+                break;
+            }
         }
-    };
-    return EventPeriod;
-}());
-exports.default = EventPeriod;
-EmitterMixin_1.default.mixInto(EventPeriod);
+        seg.level = j;
+        (levels[j] || (levels[j] = [])).push(seg);
+    }
+    return levels;
+}
+// For every segment, figure out the other segments that are in subsequent
+// levels that also occupy the same vertical space. Accumulate in seg.forwardSegs
+function computeForwardSlotSegs(levels) {
+    var i;
+    var level;
+    var j;
+    var seg;
+    var k;
+    for (i = 0; i < levels.length; i++) {
+        level = levels[i];
+        for (j = 0; j < level.length; j++) {
+            seg = level[j];
+            seg.forwardSegs = [];
+            for (k = i + 1; k < levels.length; k++) {
+                computeSlotSegCollisions(seg, levels[k], seg.forwardSegs);
+            }
+        }
+    }
+}
+// Figure out which path forward (via seg.forwardSegs) results in the longest path until
+// the furthest edge is reached. The number of segments in this path will be seg.forwardPressure
+function computeSlotSegPressures(seg) {
+    var forwardSegs = seg.forwardSegs;
+    var forwardPressure = 0;
+    var i;
+    var forwardSeg;
+    if (seg.forwardPressure === undefined) { // not already computed
+        for (i = 0; i < forwardSegs.length; i++) {
+            forwardSeg = forwardSegs[i];
+            // figure out the child's maximum forward path
+            computeSlotSegPressures(forwardSeg);
+            // either use the existing maximum, or use the child's forward pressure
+            // plus one (for the forwardSeg itself)
+            forwardPressure = Math.max(forwardPressure, 1 + forwardSeg.forwardPressure);
+        }
+        seg.forwardPressure = forwardPressure;
+    }
+}
+// Find all the segments in `otherSegs` that vertically collide with `seg`.
+// Append into an optionally-supplied `results` array and return.
+function computeSlotSegCollisions(seg, otherSegs, results) {
+    if (results === void 0) { results = []; }
+    for (var i = 0; i < otherSegs.length; i++) {
+        if (isSlotSegCollision(seg, otherSegs[i])) {
+            results.push(otherSegs[i]);
+        }
+    }
+    return results;
+}
+// Do these segments occupy the same vertical space?
+function isSlotSegCollision(seg1, seg2) {
+    return seg1.bottom > seg2.top && seg1.top < seg2.bottom;
+}
 
 
 /***/ }),
-/* 244 */
+/* 241 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
 var $ = __webpack_require__(3);
-var util_1 = __webpack_require__(4);
-var ListenerMixin_1 = __webpack_require__(7);
-/* Creates a clone of an element and lets it track the mouse as it moves
-----------------------------------------------------------------------------------------------------------------------*/
-var MouseFollower = /** @class */ (function () {
-    function MouseFollower(sourceEl, options) {
-        this.isFollowing = false;
-        this.isHidden = false;
-        this.isAnimating = false; // doing the revert animation?
-        this.options = options = options || {};
-        this.sourceEl = sourceEl;
-        this.parentEl = options.parentEl ? $(options.parentEl) : sourceEl.parent(); // default to sourceEl's parent
+var HelperRenderer_1 = __webpack_require__(63);
+var TimeGridHelperRenderer = /** @class */ (function (_super) {
+    tslib_1.__extends(TimeGridHelperRenderer, _super);
+    function TimeGridHelperRenderer() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
-    // Causes the element to start following the mouse
-    MouseFollower.prototype.start = function (ev) {
-        if (!this.isFollowing) {
-            this.isFollowing = true;
-            this.y0 = util_1.getEvY(ev);
-            this.x0 = util_1.getEvX(ev);
-            this.topDelta = 0;
-            this.leftDelta = 0;
-            if (!this.isHidden) {
-                this.updatePosition();
-            }
-            if (util_1.getEvIsTouch(ev)) {
-                this.listenTo($(document), 'touchmove', this.handleMove);
-            }
-            else {
-                this.listenTo($(document), 'mousemove', this.handleMove);
-            }
-        }
-    };
-    // Causes the element to stop following the mouse. If shouldRevert is true, will animate back to original position.
-    // `callback` gets invoked when the animation is complete. If no animation, it is invoked immediately.
-    MouseFollower.prototype.stop = function (shouldRevert, callback) {
-        var _this = this;
-        var revertDuration = this.options.revertDuration;
-        var complete = function () {
-            _this.isAnimating = false;
-            _this.removeElement();
-            _this.top0 = _this.left0 = null; // reset state for future updatePosition calls
-            if (callback) {
-                callback();
-            }
-        };
-        if (this.isFollowing && !this.isAnimating) {
-            this.isFollowing = false;
-            this.stopListeningTo($(document));
-            if (shouldRevert && revertDuration && !this.isHidden) {
-                this.isAnimating = true;
-                this.el.animate({
-                    top: this.top0,
-                    left: this.left0
-                }, {
-                    duration: revertDuration,
-                    complete: complete
+    TimeGridHelperRenderer.prototype.renderSegs = function (segs, sourceSeg) {
+        var helperNodes = [];
+        var i;
+        var seg;
+        var sourceEl;
+        // TODO: not good to call eventRenderer this way
+        this.eventRenderer.renderFgSegsIntoContainers(segs, this.component.helperContainerEls);
+        // Try to make the segment that is in the same row as sourceSeg look the same
+        for (i = 0; i < segs.length; i++) {
+            seg = segs[i];
+            if (sourceSeg && sourceSeg.col === seg.col) {
+                sourceEl = sourceSeg.el;
+                seg.el.css({
+                    left: sourceEl.css('left'),
+                    right: sourceEl.css('right'),
+                    'margin-left': sourceEl.css('margin-left'),
+                    'margin-right': sourceEl.css('margin-right')
                 });
             }
-            else {
-                complete();
-            }
+            helperNodes.push(seg.el[0]);
         }
+        return $(helperNodes); // must return the elements rendered
     };
-    // Gets the tracking element. Create it if necessary
-    MouseFollower.prototype.getEl = function () {
-        var el = this.el;
-        if (!el) {
-            el = this.el = this.sourceEl.clone()
-                .addClass(this.options.additionalClass || '')
-                .css({
-                position: 'absolute',
-                visibility: '',
-                display: this.isHidden ? 'none' : '',
-                margin: 0,
-                right: 'auto',
-                bottom: 'auto',
-                width: this.sourceEl.width(),
-                height: this.sourceEl.height(),
-                opacity: this.options.opacity || '',
-                zIndex: this.options.zIndex
-            });
-            // we don't want long taps or any mouse interaction causing selection/menus.
-            // would use preventSelection(), but that prevents selectstart, causing problems.
-            el.addClass('fc-unselectable');
-            el.appendTo(this.parentEl);
+    return TimeGridHelperRenderer;
+}(HelperRenderer_1.default));
+exports.default = TimeGridHelperRenderer;
+
+
+/***/ }),
+/* 242 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var FillRenderer_1 = __webpack_require__(62);
+var TimeGridFillRenderer = /** @class */ (function (_super) {
+    tslib_1.__extends(TimeGridFillRenderer, _super);
+    function TimeGridFillRenderer() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    TimeGridFillRenderer.prototype.attachSegEls = function (type, segs) {
+        var timeGrid = this.component;
+        var containerEls;
+        // TODO: more efficient lookup
+        if (type === 'bgEvent') {
+            containerEls = timeGrid.bgContainerEls;
         }
-        return el;
-    };
-    // Removes the tracking element if it has already been created
-    MouseFollower.prototype.removeElement = function () {
-        if (this.el) {
-            this.el.remove();
-            this.el = null;
+        else if (type === 'businessHours') {
+            containerEls = timeGrid.businessContainerEls;
         }
-    };
-    // Update the CSS position of the tracking element
-    MouseFollower.prototype.updatePosition = function () {
-        var sourceOffset;
-        var origin;
-        this.getEl(); // ensure this.el
-        // make sure origin info was computed
-        if (this.top0 == null) {
-            sourceOffset = this.sourceEl.offset();
-            origin = this.el.offsetParent().offset();
-            this.top0 = sourceOffset.top - origin.top;
-            this.left0 = sourceOffset.left - origin.left;
+        else if (type === 'highlight') {
+            containerEls = timeGrid.highlightContainerEls;
         }
-        this.el.css({
-            top: this.top0 + this.topDelta,
-            left: this.left0 + this.leftDelta
+        timeGrid.updateSegVerticals(segs);
+        timeGrid.attachSegsByCol(timeGrid.groupSegsByCol(segs), containerEls);
+        return segs.map(function (seg) {
+            return seg.el[0];
         });
     };
-    // Gets called when the user moves the mouse
-    MouseFollower.prototype.handleMove = function (ev) {
-        this.topDelta = util_1.getEvY(ev) - this.y0;
-        this.leftDelta = util_1.getEvX(ev) - this.x0;
-        if (!this.isHidden) {
-            this.updatePosition();
-        }
-    };
-    // Temporarily makes the tracking element invisible. Can be called before following starts
-    MouseFollower.prototype.hide = function () {
-        if (!this.isHidden) {
-            this.isHidden = true;
-            if (this.el) {
-                this.el.hide();
-            }
-        }
-    };
-    // Show the tracking element after it has been temporarily hidden
-    MouseFollower.prototype.show = function () {
-        if (this.isHidden) {
-            this.isHidden = false;
-            this.updatePosition();
-            this.getEl().show();
-        }
-    };
-    return MouseFollower;
-}());
-exports.default = MouseFollower;
-ListenerMixin_1.default.mixInto(MouseFollower);
+    return TimeGridFillRenderer;
+}(FillRenderer_1.default));
+exports.default = TimeGridFillRenderer;
 
 
 /***/ }),
-/* 245 */
+/* 243 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
-var HitDragListener_1 = __webpack_require__(23);
-var Interaction_1 = __webpack_require__(15);
-var DateClicking = /** @class */ (function (_super) {
-    tslib_1.__extends(DateClicking, _super);
-    /*
-    component must implement:
-      - bindDateHandlerToEl
-      - getSafeHitFootprint
-      - getHitEl
-    */
-    function DateClicking(component) {
-        var _this = _super.call(this, component) || this;
-        _this.dragListener = _this.buildDragListener();
+var $ = __webpack_require__(3);
+var util_1 = __webpack_require__(4);
+var EventRenderer_1 = __webpack_require__(44);
+/* Event-rendering methods for the DayGrid class
+----------------------------------------------------------------------------------------------------------------------*/
+var DayGridEventRenderer = /** @class */ (function (_super) {
+    tslib_1.__extends(DayGridEventRenderer, _super);
+    function DayGridEventRenderer(dayGrid, fillRenderer) {
+        var _this = _super.call(this, dayGrid, fillRenderer) || this;
+        _this.dayGrid = dayGrid;
         return _this;
     }
-    DateClicking.prototype.end = function () {
-        this.dragListener.endInteraction();
-    };
-    DateClicking.prototype.bindToEl = function (el) {
-        var component = this.component;
-        var dragListener = this.dragListener;
-        component.bindDateHandlerToEl(el, 'mousedown', function (ev) {
-            if (!component.shouldIgnoreMouse()) {
-                dragListener.startInteraction(ev);
-            }
+    DayGridEventRenderer.prototype.renderBgRanges = function (eventRanges) {
+        // don't render timed background events
+        eventRanges = $.grep(eventRanges, function (eventRange) {
+            return eventRange.eventDef.isAllDay();
         });
-        component.bindDateHandlerToEl(el, 'touchstart', function (ev) {
-            if (!component.shouldIgnoreTouch()) {
-                dragListener.startInteraction(ev);
-            }
+        _super.prototype.renderBgRanges.call(this, eventRanges);
+    };
+    // Renders the given foreground event segments onto the grid
+    DayGridEventRenderer.prototype.renderFgSegs = function (segs) {
+        var rowStructs = this.rowStructs = this.renderSegRows(segs);
+        // append to each row's content skeleton
+        this.dayGrid.rowEls.each(function (i, rowNode) {
+            $(rowNode).find('.fc-content-skeleton > table').append(rowStructs[i].tbodyEl);
         });
     };
-    // Creates a listener that tracks the user's drag across day elements, for day clicking.
-    DateClicking.prototype.buildDragListener = function () {
-        var _this = this;
-        var component = this.component;
-        var dayClickHit; // null if invalid dayClick
-        var dragListener = new HitDragListener_1.default(component, {
-            scroll: this.opt('dragScroll'),
-            interactionStart: function () {
-                dayClickHit = dragListener.origHit;
-            },
-            hitOver: function (hit, isOrig, origHit) {
-                // if user dragged to another cell at any point, it can no longer be a dayClick
-                if (!isOrig) {
-                    dayClickHit = null;
+    // Unrenders all currently rendered foreground event segments
+    DayGridEventRenderer.prototype.unrenderFgSegs = function () {
+        var rowStructs = this.rowStructs || [];
+        var rowStruct;
+        while ((rowStruct = rowStructs.pop())) {
+            rowStruct.tbodyEl.remove();
+        }
+        this.rowStructs = null;
+    };
+    // Uses the given events array to generate <tbody> elements that should be appended to each row's content skeleton.
+    // Returns an array of rowStruct objects (see the bottom of `renderSegRow`).
+    // PRECONDITION: each segment shoud already have a rendered and assigned `.el`
+    DayGridEventRenderer.prototype.renderSegRows = function (segs) {
+        var rowStructs = [];
+        var segRows;
+        var row;
+        segRows = this.groupSegRows(segs); // group into nested arrays
+        // iterate each row of segment groupings
+        for (row = 0; row < segRows.length; row++) {
+            rowStructs.push(this.renderSegRow(row, segRows[row]));
+        }
+        return rowStructs;
+    };
+    // Given a row # and an array of segments all in the same row, render a <tbody> element, a skeleton that contains
+    // the segments. Returns object with a bunch of internal data about how the render was calculated.
+    // NOTE: modifies rowSegs
+    DayGridEventRenderer.prototype.renderSegRow = function (row, rowSegs) {
+        var colCnt = this.dayGrid.colCnt;
+        var segLevels = this.buildSegLevels(rowSegs); // group into sub-arrays of levels
+        var levelCnt = Math.max(1, segLevels.length); // ensure at least one level
+        var tbody = $('<tbody>');
+        var segMatrix = []; // lookup for which segments are rendered into which level+col cells
+        var cellMatrix = []; // lookup for all <td> elements of the level+col matrix
+        var loneCellMatrix = []; // lookup for <td> elements that only take up a single column
+        var i;
+        var levelSegs;
+        var col;
+        var tr;
+        var j;
+        var seg;
+        var td;
+        // populates empty cells from the current column (`col`) to `endCol`
+        function emptyCellsUntil(endCol) {
+            while (col < endCol) {
+                // try to grab a cell from the level above and extend its rowspan. otherwise, create a fresh cell
+                td = (loneCellMatrix[i - 1] || [])[col];
+                if (td) {
+                    td.attr('rowspan', parseInt(td.attr('rowspan') || 1, 10) + 1);
                 }
-            },
-            hitOut: function () {
-                dayClickHit = null;
-            },
-            interactionEnd: function (ev, isCancelled) {
-                var componentFootprint;
-                if (!isCancelled && dayClickHit) {
-                    componentFootprint = component.getSafeHitFootprint(dayClickHit);
-                    if (componentFootprint) {
-                        _this.view.triggerDayClick(componentFootprint, component.getHitEl(dayClickHit), ev);
+                else {
+                    td = $('<td>');
+                    tr.append(td);
+                }
+                cellMatrix[i][col] = td;
+                loneCellMatrix[i][col] = td;
+                col++;
+            }
+        }
+        for (i = 0; i < levelCnt; i++) { // iterate through all levels
+            levelSegs = segLevels[i];
+            col = 0;
+            tr = $('<tr>');
+            segMatrix.push([]);
+            cellMatrix.push([]);
+            loneCellMatrix.push([]);
+            // levelCnt might be 1 even though there are no actual levels. protect against this.
+            // this single empty row is useful for styling.
+            if (levelSegs) {
+                for (j = 0; j < levelSegs.length; j++) { // iterate through segments in level
+                    seg = levelSegs[j];
+                    emptyCellsUntil(seg.leftCol);
+                    // create a container that occupies or more columns. append the event element.
+                    td = $('<td class="fc-event-container">').append(seg.el);
+                    if (seg.leftCol !== seg.rightCol) {
+                        td.attr('colspan', seg.rightCol - seg.leftCol + 1);
+                    }
+                    else { // a single-column segment
+                        loneCellMatrix[i][col] = td;
+                    }
+                    while (col <= seg.rightCol) {
+                        cellMatrix[i][col] = td;
+                        segMatrix[i][col] = seg;
+                        col++;
                     }
+                    tr.append(td);
                 }
             }
-        });
-        // because dragListener won't be called with any time delay, "dragging" will begin immediately,
-        // which will kill any touchmoving/scrolling. Prevent this.
-        dragListener.shouldCancelTouchScroll = false;
-        dragListener.scrollAlwaysKills = true;
-        return dragListener;
-    };
-    return DateClicking;
-}(Interaction_1.default));
-exports.default = DateClicking;
-
-
-/***/ }),
-/* 246 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var util_1 = __webpack_require__(4);
-var EventRenderer_1 = __webpack_require__(42);
-/*
-Only handles foreground segs.
-Does not own rendering. Use for low-level util methods by TimeGrid.
-*/
-var TimeGridEventRenderer = /** @class */ (function (_super) {
-    tslib_1.__extends(TimeGridEventRenderer, _super);
-    function TimeGridEventRenderer(timeGrid, fillRenderer) {
-        var _this = _super.call(this, timeGrid, fillRenderer) || this;
-        _this.timeGrid = timeGrid;
-        return _this;
-    }
-    TimeGridEventRenderer.prototype.renderFgSegs = function (segs) {
-        this.renderFgSegsIntoContainers(segs, this.timeGrid.fgContainerEls);
+            emptyCellsUntil(colCnt); // finish off the row
+            this.dayGrid.bookendCells(tr);
+            tbody.append(tr);
+        }
+        return {
+            row: row,
+            tbodyEl: tbody,
+            cellMatrix: cellMatrix,
+            segMatrix: segMatrix,
+            segLevels: segLevels,
+            segs: rowSegs
+        };
     };
-    // Given an array of foreground segments, render a DOM element for each, computes position,
-    // and attaches to the column inner-container elements.
-    TimeGridEventRenderer.prototype.renderFgSegsIntoContainers = function (segs, containerEls) {
-        var segsByCol;
-        var col;
-        segsByCol = this.timeGrid.groupSegsByCol(segs);
-        for (col = 0; col < this.timeGrid.colCnt; col++) {
-            this.updateFgSegCoords(segsByCol[col]);
+    // Stacks a flat array of segments, which are all assumed to be in the same row, into subarrays of vertical levels.
+    // NOTE: modifies segs
+    DayGridEventRenderer.prototype.buildSegLevels = function (segs) {
+        var levels = [];
+        var i;
+        var seg;
+        var j;
+        // Give preference to elements with certain criteria, so they have
+        // a chance to be closer to the top.
+        this.sortEventSegs(segs);
+        for (i = 0; i < segs.length; i++) {
+            seg = segs[i];
+            // loop through levels, starting with the topmost, until the segment doesn't collide with other segments
+            for (j = 0; j < levels.length; j++) {
+                if (!isDaySegCollision(seg, levels[j])) {
+                    break;
+                }
+            }
+            // `j` now holds the desired subrow index
+            seg.level = j;
+            // create new level array if needed and append segment
+            (levels[j] || (levels[j] = [])).push(seg);
         }
-        this.timeGrid.attachSegsByCol(segsByCol, containerEls);
+        // order segments left-to-right. very important if calendar is RTL
+        for (j = 0; j < levels.length; j++) {
+            levels[j].sort(compareDaySegCols);
+        }
+        return levels;
     };
-    TimeGridEventRenderer.prototype.unrenderFgSegs = function () {
-        if (this.fgSegs) {
-            this.fgSegs.forEach(function (seg) {
-                seg.el.remove();
-            });
+    // Given a flat array of segments, return an array of sub-arrays, grouped by each segment's row
+    DayGridEventRenderer.prototype.groupSegRows = function (segs) {
+        var segRows = [];
+        var i;
+        for (i = 0; i < this.dayGrid.rowCnt; i++) {
+            segRows.push([]);
         }
+        for (i = 0; i < segs.length; i++) {
+            segRows[segs[i].row].push(segs[i]);
+        }
+        return segRows;
     };
     // Computes a default event time formatting string if `timeFormat` is not explicitly defined
-    TimeGridEventRenderer.prototype.computeEventTimeFormat = function () {
-        return this.opt('noMeridiemTimeFormat'); // like "6:30" (no AM/PM)
+    DayGridEventRenderer.prototype.computeEventTimeFormat = function () {
+        return this.opt('extraSmallTimeFormat'); // like "6p" or "6:30p"
     };
     // Computes a default `displayEventEnd` value if one is not expliclty defined
-    TimeGridEventRenderer.prototype.computeDisplayEventEnd = function () {
-        return true;
+    DayGridEventRenderer.prototype.computeDisplayEventEnd = function () {
+        return this.dayGrid.colCnt === 1; // we'll likely have space if there's only one day
     };
-    // Renders the HTML for a single event segment's default rendering
-    TimeGridEventRenderer.prototype.fgSegHtml = function (seg, disableResizing) {
+    // Builds the HTML to be used for the default element for an individual segment
+    DayGridEventRenderer.prototype.fgSegHtml = function (seg, disableResizing) {
         var view = this.view;
-        var calendar = view.calendar;
-        var componentFootprint = seg.footprint.componentFootprint;
-        var isAllDay = componentFootprint.isAllDay;
         var eventDef = seg.footprint.eventDef;
+        var isAllDay = seg.footprint.componentFootprint.isAllDay;
         var isDraggable = view.isEventDefDraggable(eventDef);
-        var isResizableFromStart = !disableResizing && seg.isStart && view.isEventDefResizableFromStart(eventDef);
-        var isResizableFromEnd = !disableResizing && seg.isEnd && view.isEventDefResizableFromEnd(eventDef);
+        var isResizableFromStart = !disableResizing && isAllDay &&
+            seg.isStart && view.isEventDefResizableFromStart(eventDef);
+        var isResizableFromEnd = !disableResizing && isAllDay &&
+            seg.isEnd && view.isEventDefResizableFromEnd(eventDef);
         var classes = this.getSegClasses(seg, isDraggable, isResizableFromStart || isResizableFromEnd);
         var skinCss = util_1.cssToStr(this.getSkinCss(eventDef));
+        var timeHtml = '';
         var timeText;
-        var fullTimeText; // more verbose time text. for the print stylesheet
-        var startTimeText; // just the start time text
-        classes.unshift('fc-time-grid-event', 'fc-v-event');
-        // if the event appears to span more than one day...
-        if (view.isMultiDayRange(componentFootprint.unzonedRange)) {
-            // Don't display time text on segments that run entirely through a day.
-            // That would appear as midnight-midnight and would look dumb.
-            // Otherwise, display the time text for the *segment's* times (like 6pm-midnight or midnight-10am)
-            if (seg.isStart || seg.isEnd) {
-                var zonedStart = calendar.msToMoment(seg.startMs);
-                var zonedEnd = calendar.msToMoment(seg.endMs);
-                timeText = this._getTimeText(zonedStart, zonedEnd, isAllDay);
-                fullTimeText = this._getTimeText(zonedStart, zonedEnd, isAllDay, 'LT');
-                startTimeText = this._getTimeText(zonedStart, zonedEnd, isAllDay, null, false); // displayEnd=false
-            }
-        }
-        else {
-            // Display the normal time text for the *event's* times
+        var titleHtml;
+        classes.unshift('fc-day-grid-event', 'fc-h-event');
+        // Only display a timed events time if it is the starting segment
+        if (seg.isStart) {
             timeText = this.getTimeText(seg.footprint);
-            fullTimeText = this.getTimeText(seg.footprint, 'LT');
-            startTimeText = this.getTimeText(seg.footprint, null, false); // displayEnd=false
+            if (timeText) {
+                timeHtml = '<span class="fc-time">' + util_1.htmlEscape(timeText) + '</span>';
+            }
         }
+        titleHtml =
+            '<span class="fc-title">' +
+                (util_1.htmlEscape(eventDef.title || '') || '&nbsp;') + // we always want one line of height
+                '</span>';
         return '<a class="' + classes.join(' ') + '"' +
             (eventDef.url ?
                 ' href="' + util_1.htmlEscape(eventDef.url) + '"' :
@@ -13817,450 +13872,461 @@
                 '') +
             '>' +
             '<div class="fc-content">' +
-            (timeText ?
-                '<div class="fc-time"' +
-                    ' data-start="' + util_1.htmlEscape(startTimeText) + '"' +
-                    ' data-full="' + util_1.htmlEscape(fullTimeText) + '"' +
-                    '>' +
-                    '<span>' + util_1.htmlEscape(timeText) + '</span>' +
-                    '</div>' :
-                '') +
-            (eventDef.title ?
-                '<div class="fc-title">' +
-                    util_1.htmlEscape(eventDef.title) +
-                    '</div>' :
-                '') +
+            (this.dayGrid.isRTL ?
+                titleHtml + ' ' + timeHtml : // put a natural space in between
+                timeHtml + ' ' + titleHtml //
+            ) +
             '</div>' +
-            '<div class="fc-bg"/>' +
-            /* TODO: write CSS for this
             (isResizableFromStart ?
-              '<div class="fc-resizer fc-start-resizer" />' :
-              ''
-              ) +
-            */
+                '<div class="fc-resizer fc-start-resizer"></div>' :
+                '') +
             (isResizableFromEnd ?
-                '<div class="fc-resizer fc-end-resizer" />' :
+                '<div class="fc-resizer fc-end-resizer"></div>' :
                 '') +
             '</a>';
     };
-    // Given segments that are assumed to all live in the *same column*,
-    // compute their verical/horizontal coordinates and assign to their elements.
-    TimeGridEventRenderer.prototype.updateFgSegCoords = function (segs) {
-        this.timeGrid.computeSegVerticals(segs); // horizontals relies on this
-        this.computeFgSegHorizontals(segs); // compute horizontal coordinates, z-index's, and reorder the array
-        this.timeGrid.assignSegVerticals(segs);
-        this.assignFgSegHorizontals(segs);
-    };
-    // Given an array of segments that are all in the same column, sets the backwardCoord and forwardCoord on each.
-    // NOTE: Also reorders the given array by date!
-    TimeGridEventRenderer.prototype.computeFgSegHorizontals = function (segs) {
-        var levels;
-        var level0;
-        var i;
-        this.sortEventSegs(segs); // order by certain criteria
-        levels = buildSlotSegLevels(segs);
-        computeForwardSlotSegs(levels);
-        if ((level0 = levels[0])) {
-            for (i = 0; i < level0.length; i++) {
-                computeSlotSegPressures(level0[i]);
-            }
-            for (i = 0; i < level0.length; i++) {
-                this.computeFgSegForwardBack(level0[i], 0, 0);
-            }
+    return DayGridEventRenderer;
+}(EventRenderer_1.default));
+exports.default = DayGridEventRenderer;
+// Computes whether two segments' columns collide. They are assumed to be in the same row.
+function isDaySegCollision(seg, otherSegs) {
+    var i;
+    var otherSeg;
+    for (i = 0; i < otherSegs.length; i++) {
+        otherSeg = otherSegs[i];
+        if (otherSeg.leftCol <= seg.rightCol &&
+            otherSeg.rightCol >= seg.leftCol) {
+            return true;
         }
-    };
-    // Calculate seg.forwardCoord and seg.backwardCoord for the segment, where both values range
-    // from 0 to 1. If the calendar is left-to-right, the seg.backwardCoord maps to "left" and
-    // seg.forwardCoord maps to "right" (via percentage). Vice-versa if the calendar is right-to-left.
-    //
-    // The segment might be part of a "series", which means consecutive segments with the same pressure
-    // who's width is unknown until an edge has been hit. `seriesBackwardPressure` is the number of
-    // segments behind this one in the current series, and `seriesBackwardCoord` is the starting
-    // coordinate of the first segment in the series.
-    TimeGridEventRenderer.prototype.computeFgSegForwardBack = function (seg, seriesBackwardPressure, seriesBackwardCoord) {
-        var forwardSegs = seg.forwardSegs;
-        var i;
-        if (seg.forwardCoord === undefined) {
-            if (!forwardSegs.length) {
-                // if there are no forward segments, this segment should butt up against the edge
-                seg.forwardCoord = 1;
+    }
+    return false;
+}
+// A cmp function for determining the leftmost event
+function compareDaySegCols(a, b) {
+    return a.leftCol - b.leftCol;
+}
+
+
+/***/ }),
+/* 244 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var $ = __webpack_require__(3);
+var HelperRenderer_1 = __webpack_require__(63);
+var DayGridHelperRenderer = /** @class */ (function (_super) {
+    tslib_1.__extends(DayGridHelperRenderer, _super);
+    function DayGridHelperRenderer() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    // Renders a mock "helper" event. `sourceSeg` is the associated internal segment object. It can be null.
+    DayGridHelperRenderer.prototype.renderSegs = function (segs, sourceSeg) {
+        var helperNodes = [];
+        var rowStructs;
+        // TODO: not good to call eventRenderer this way
+        rowStructs = this.eventRenderer.renderSegRows(segs);
+        // inject each new event skeleton into each associated row
+        this.component.rowEls.each(function (row, rowNode) {
+            var rowEl = $(rowNode); // the .fc-row
+            var skeletonEl = $('<div class="fc-helper-skeleton"><table></table></div>'); // will be absolutely positioned
+            var skeletonTopEl;
+            var skeletonTop;
+            // If there is an original segment, match the top position. Otherwise, put it at the row's top level
+            if (sourceSeg && sourceSeg.row === row) {
+                skeletonTop = sourceSeg.el.position().top;
             }
             else {
-                // sort highest pressure first
-                this.sortForwardSegs(forwardSegs);
-                // this segment's forwardCoord will be calculated from the backwardCoord of the
-                // highest-pressure forward segment.
-                this.computeFgSegForwardBack(forwardSegs[0], seriesBackwardPressure + 1, seriesBackwardCoord);
-                seg.forwardCoord = forwardSegs[0].backwardCoord;
-            }
-            // calculate the backwardCoord from the forwardCoord. consider the series
-            seg.backwardCoord = seg.forwardCoord -
-                (seg.forwardCoord - seriesBackwardCoord) / // available width for series
-                    (seriesBackwardPressure + 1); // # of segments in the series
-            // use this segment's coordinates to computed the coordinates of the less-pressurized
-            // forward segments
-            for (i = 0; i < forwardSegs.length; i++) {
-                this.computeFgSegForwardBack(forwardSegs[i], 0, seg.forwardCoord);
+                skeletonTopEl = rowEl.find('.fc-content-skeleton tbody');
+                if (!skeletonTopEl.length) { // when no events
+                    skeletonTopEl = rowEl.find('.fc-content-skeleton table');
+                }
+                skeletonTop = skeletonTopEl.position().top;
             }
-        }
-    };
-    TimeGridEventRenderer.prototype.sortForwardSegs = function (forwardSegs) {
-        forwardSegs.sort(util_1.proxy(this, 'compareForwardSegs'));
-    };
-    // A cmp function for determining which forward segment to rely on more when computing coordinates.
-    TimeGridEventRenderer.prototype.compareForwardSegs = function (seg1, seg2) {
-        // put higher-pressure first
-        return seg2.forwardPressure - seg1.forwardPressure ||
-            // put segments that are closer to initial edge first (and favor ones with no coords yet)
-            (seg1.backwardCoord || 0) - (seg2.backwardCoord || 0) ||
-            // do normal sorting...
-            this.compareEventSegs(seg1, seg2);
+            skeletonEl.css('top', skeletonTop)
+                .find('table')
+                .append(rowStructs[row].tbodyEl);
+            rowEl.append(skeletonEl);
+            helperNodes.push(skeletonEl[0]);
+        });
+        return $(helperNodes); // must return the elements rendered
     };
-    // Given foreground event segments that have already had their position coordinates computed,
-    // assigns position-related CSS values to their elements.
-    TimeGridEventRenderer.prototype.assignFgSegHorizontals = function (segs) {
+    return DayGridHelperRenderer;
+}(HelperRenderer_1.default));
+exports.default = DayGridHelperRenderer;
+
+
+/***/ }),
+/* 245 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var $ = __webpack_require__(3);
+var FillRenderer_1 = __webpack_require__(62);
+var DayGridFillRenderer = /** @class */ (function (_super) {
+    tslib_1.__extends(DayGridFillRenderer, _super);
+    function DayGridFillRenderer() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.fillSegTag = 'td'; // override the default tag name
+        return _this;
+    }
+    DayGridFillRenderer.prototype.attachSegEls = function (type, segs) {
+        var nodes = [];
         var i;
         var seg;
+        var skeletonEl;
         for (i = 0; i < segs.length; i++) {
             seg = segs[i];
-            seg.el.css(this.generateFgSegHorizontalCss(seg));
-            // if the height is short, add a className for alternate styling
-            if (seg.bottom - seg.top < 30) {
-                seg.el.addClass('fc-short');
-            }
+            skeletonEl = this.renderFillRow(type, seg);
+            this.component.rowEls.eq(seg.row).append(skeletonEl);
+            nodes.push(skeletonEl[0]);
         }
+        return nodes;
     };
-    // Generates an object with CSS properties/values that should be applied to an event segment element.
-    // Contains important positioning-related properties that should be applied to any event element, customized or not.
-    TimeGridEventRenderer.prototype.generateFgSegHorizontalCss = function (seg) {
-        var shouldOverlap = this.opt('slotEventOverlap');
-        var backwardCoord = seg.backwardCoord; // the left side if LTR. the right side if RTL. floating-point
-        var forwardCoord = seg.forwardCoord; // the right side if LTR. the left side if RTL. floating-point
-        var props = this.timeGrid.generateSegVerticalCss(seg); // get top/bottom first
-        var isRTL = this.timeGrid.isRTL;
-        var left; // amount of space from left edge, a fraction of the total width
-        var right; // amount of space from right edge, a fraction of the total width
-        if (shouldOverlap) {
-            // double the width, but don't go beyond the maximum forward coordinate (1.0)
-            forwardCoord = Math.min(1, backwardCoord + (forwardCoord - backwardCoord) * 2);
-        }
-        if (isRTL) {
-            left = 1 - forwardCoord;
-            right = backwardCoord;
+    // Generates the HTML needed for one row of a fill. Requires the seg's el to be rendered.
+    DayGridFillRenderer.prototype.renderFillRow = function (type, seg) {
+        var colCnt = this.component.colCnt;
+        var startCol = seg.leftCol;
+        var endCol = seg.rightCol + 1;
+        var className;
+        var skeletonEl;
+        var trEl;
+        if (type === 'businessHours') {
+            className = 'bgevent';
         }
         else {
-            left = backwardCoord;
-            right = 1 - forwardCoord;
-        }
-        props.zIndex = seg.level + 1; // convert from 0-base to 1-based
-        props.left = left * 100 + '%';
-        props.right = right * 100 + '%';
-        if (shouldOverlap && seg.forwardPressure) {
-            // add padding to the edge so that forward stacked events don't cover the resizer's icon
-            props[isRTL ? 'marginLeft' : 'marginRight'] = 10 * 2; // 10 is a guesstimate of the icon's width
-        }
-        return props;
-    };
-    return TimeGridEventRenderer;
-}(EventRenderer_1.default));
-exports.default = TimeGridEventRenderer;
-// Builds an array of segments "levels". The first level will be the leftmost tier of segments if the calendar is
-// left-to-right, or the rightmost if the calendar is right-to-left. Assumes the segments are already ordered by date.
-function buildSlotSegLevels(segs) {
-    var levels = [];
-    var i;
-    var seg;
-    var j;
-    for (i = 0; i < segs.length; i++) {
-        seg = segs[i];
-        // go through all the levels and stop on the first level where there are no collisions
-        for (j = 0; j < levels.length; j++) {
-            if (!computeSlotSegCollisions(seg, levels[j]).length) {
-                break;
-            }
-        }
-        seg.level = j;
-        (levels[j] || (levels[j] = [])).push(seg);
-    }
-    return levels;
-}
-// For every segment, figure out the other segments that are in subsequent
-// levels that also occupy the same vertical space. Accumulate in seg.forwardSegs
-function computeForwardSlotSegs(levels) {
-    var i;
-    var level;
-    var j;
-    var seg;
-    var k;
-    for (i = 0; i < levels.length; i++) {
-        level = levels[i];
-        for (j = 0; j < level.length; j++) {
-            seg = level[j];
-            seg.forwardSegs = [];
-            for (k = i + 1; k < levels.length; k++) {
-                computeSlotSegCollisions(seg, levels[k], seg.forwardSegs);
-            }
+            className = type.toLowerCase();
         }
-    }
-}
-// Figure out which path forward (via seg.forwardSegs) results in the longest path until
-// the furthest edge is reached. The number of segments in this path will be seg.forwardPressure
-function computeSlotSegPressures(seg) {
-    var forwardSegs = seg.forwardSegs;
-    var forwardPressure = 0;
-    var i;
-    var forwardSeg;
-    if (seg.forwardPressure === undefined) {
-        for (i = 0; i < forwardSegs.length; i++) {
-            forwardSeg = forwardSegs[i];
-            // figure out the child's maximum forward path
-            computeSlotSegPressures(forwardSeg);
-            // either use the existing maximum, or use the child's forward pressure
-            // plus one (for the forwardSeg itself)
-            forwardPressure = Math.max(forwardPressure, 1 + forwardSeg.forwardPressure);
+        skeletonEl = $('<div class="fc-' + className + '-skeleton">' +
+            '<table><tr></tr></table>' +
+            '</div>');
+        trEl = skeletonEl.find('tr');
+        if (startCol > 0) {
+            trEl.append(
+            // will create (startCol + 1) td's
+            new Array(startCol + 1).join('<td></td>'));
         }
-        seg.forwardPressure = forwardPressure;
-    }
-}
-// Find all the segments in `otherSegs` that vertically collide with `seg`.
-// Append into an optionally-supplied `results` array and return.
-function computeSlotSegCollisions(seg, otherSegs, results) {
-    if (results === void 0) { results = []; }
-    for (var i = 0; i < otherSegs.length; i++) {
-        if (isSlotSegCollision(seg, otherSegs[i])) {
-            results.push(otherSegs[i]);
+        trEl.append(seg.el.attr('colspan', endCol - startCol));
+        if (endCol < colCnt) {
+            trEl.append(
+            // will create (colCnt - endCol) td's
+            new Array(colCnt - endCol + 1).join('<td></td>'));
         }
-    }
-    return results;
-}
-// Do these segments occupy the same vertical space?
-function isSlotSegCollision(seg1, seg2) {
-    return seg1.bottom > seg2.top && seg1.top < seg2.bottom;
-}
+        this.component.bookendCells(trEl);
+        return skeletonEl;
+    };
+    return DayGridFillRenderer;
+}(FillRenderer_1.default));
+exports.default = DayGridFillRenderer;
 
 
 /***/ }),
-/* 247 */
+/* 246 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
-var $ = __webpack_require__(3);
-var HelperRenderer_1 = __webpack_require__(58);
-var TimeGridHelperRenderer = /** @class */ (function (_super) {
-    tslib_1.__extends(TimeGridHelperRenderer, _super);
-    function TimeGridHelperRenderer() {
+var moment = __webpack_require__(0);
+var util_1 = __webpack_require__(4);
+var BasicView_1 = __webpack_require__(67);
+var MonthViewDateProfileGenerator_1 = __webpack_require__(247);
+/* A month view with day cells running in rows (one-per-week) and columns
+----------------------------------------------------------------------------------------------------------------------*/
+var MonthView = /** @class */ (function (_super) {
+    tslib_1.__extends(MonthView, _super);
+    function MonthView() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    TimeGridHelperRenderer.prototype.renderSegs = function (segs, sourceSeg) {
-        var helperNodes = [];
-        var i;
-        var seg;
-        var sourceEl;
-        // TODO: not good to call eventRenderer this way
-        this.eventRenderer.renderFgSegsIntoContainers(segs, this.component.helperContainerEls);
-        // Try to make the segment that is in the same row as sourceSeg look the same
-        for (i = 0; i < segs.length; i++) {
-            seg = segs[i];
-            if (sourceSeg && sourceSeg.col === seg.col) {
-                sourceEl = sourceSeg.el;
-                seg.el.css({
-                    left: sourceEl.css('left'),
-                    right: sourceEl.css('right'),
-                    'margin-left': sourceEl.css('margin-left'),
-                    'margin-right': sourceEl.css('margin-right')
-                });
-            }
-            helperNodes.push(seg.el[0]);
+    // Overrides the default BasicView behavior to have special multi-week auto-height logic
+    MonthView.prototype.setGridHeight = function (height, isAuto) {
+        // if auto, make the height of each row the height that it would be if there were 6 weeks
+        if (isAuto) {
+            height *= this.dayGrid.rowCnt / 6;
         }
-        return $(helperNodes); // must return the elements rendered
+        util_1.distributeHeight(this.dayGrid.rowEls, height, !isAuto); // if auto, don't compensate for height-hogging rows
     };
-    return TimeGridHelperRenderer;
-}(HelperRenderer_1.default));
-exports.default = TimeGridHelperRenderer;
+    MonthView.prototype.isDateInOtherMonth = function (date, dateProfile) {
+        return date.month() !== moment.utc(dateProfile.currentUnzonedRange.startMs).month(); // TODO: optimize
+    };
+    return MonthView;
+}(BasicView_1.default));
+exports.default = MonthView;
+MonthView.prototype.dateProfileGeneratorClass = MonthViewDateProfileGenerator_1.default;
 
 
 /***/ }),
-/* 248 */
+/* 247 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
-var FillRenderer_1 = __webpack_require__(57);
-var TimeGridFillRenderer = /** @class */ (function (_super) {
-    tslib_1.__extends(TimeGridFillRenderer, _super);
-    function TimeGridFillRenderer() {
+var BasicViewDateProfileGenerator_1 = __webpack_require__(68);
+var UnzonedRange_1 = __webpack_require__(5);
+var MonthViewDateProfileGenerator = /** @class */ (function (_super) {
+    tslib_1.__extends(MonthViewDateProfileGenerator, _super);
+    function MonthViewDateProfileGenerator() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    TimeGridFillRenderer.prototype.attachSegEls = function (type, segs) {
-        var timeGrid = this.component;
-        var containerEls;
-        // TODO: more efficient lookup
-        if (type === 'bgEvent') {
-            containerEls = timeGrid.bgContainerEls;
-        }
-        else if (type === 'businessHours') {
-            containerEls = timeGrid.businessContainerEls;
-        }
-        else if (type === 'highlight') {
-            containerEls = timeGrid.highlightContainerEls;
+    // Computes the date range that will be rendered.
+    MonthViewDateProfileGenerator.prototype.buildRenderRange = function (currentUnzonedRange, currentRangeUnit, isRangeAllDay) {
+        var renderUnzonedRange = _super.prototype.buildRenderRange.call(this, currentUnzonedRange, currentRangeUnit, isRangeAllDay);
+        var start = this.msToUtcMoment(renderUnzonedRange.startMs, isRangeAllDay);
+        var end = this.msToUtcMoment(renderUnzonedRange.endMs, isRangeAllDay);
+        var rowCnt;
+        // ensure 6 weeks
+        if (this.opt('fixedWeekCount')) {
+            rowCnt = Math.ceil(// could be partial weeks due to hiddenDays
+            end.diff(start, 'weeks', true) // dontRound=true
+            );
+            end.add(6 - rowCnt, 'weeks');
         }
-        timeGrid.updateSegVerticals(segs);
-        timeGrid.attachSegsByCol(timeGrid.groupSegsByCol(segs), containerEls);
-        return segs.map(function (seg) {
-            return seg.el[0];
-        });
+        return new UnzonedRange_1.default(start, end);
     };
-    return TimeGridFillRenderer;
-}(FillRenderer_1.default));
-exports.default = TimeGridFillRenderer;
+    return MonthViewDateProfileGenerator;
+}(BasicViewDateProfileGenerator_1.default));
+exports.default = MonthViewDateProfileGenerator;
 
 
 /***/ }),
-/* 249 */
+/* 248 */
 /***/ (function(module, exports, __webpack_require__) {
 
-/* A rectangular panel that is absolutely positioned over other content
-------------------------------------------------------------------------------------------------------------------------
-Options:
-  - className (string)
-  - content (HTML string or jQuery element set)
-  - parentEl
-  - top
-  - left
-  - right (the x coord of where the right edge should be. not a "CSS" right)
-  - autoHide (boolean)
-  - show (callback)
-  - hide (callback)
-*/
 Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
 var $ = __webpack_require__(3);
 var util_1 = __webpack_require__(4);
-var ListenerMixin_1 = __webpack_require__(7);
-var Popover = /** @class */ (function () {
-    function Popover(options) {
-        this.isHidden = true;
-        this.margin = 10; // the space required between the popover and the edges of the scroll container
-        this.options = options || {};
+var UnzonedRange_1 = __webpack_require__(5);
+var View_1 = __webpack_require__(43);
+var Scroller_1 = __webpack_require__(41);
+var ListEventRenderer_1 = __webpack_require__(249);
+var ListEventPointing_1 = __webpack_require__(250);
+/*
+Responsible for the scroller, and forwarding event-related actions into the "grid".
+*/
+var ListView = /** @class */ (function (_super) {
+    tslib_1.__extends(ListView, _super);
+    function ListView(calendar, viewSpec) {
+        var _this = _super.call(this, calendar, viewSpec) || this;
+        _this.segSelector = '.fc-list-item'; // which elements accept event actions
+        _this.scroller = new Scroller_1.default({
+            overflowX: 'hidden',
+            overflowY: 'auto'
+        });
+        return _this;
     }
-    // Shows the popover on the specified position. Renders it if not already
-    Popover.prototype.show = function () {
-        if (this.isHidden) {
-            if (!this.el) {
-                this.render();
+    ListView.prototype.renderSkeleton = function () {
+        this.el.addClass('fc-list-view ' +
+            this.calendar.theme.getClass('listView'));
+        this.scroller.render();
+        this.scroller.el.appendTo(this.el);
+        this.contentEl = this.scroller.scrollEl; // shortcut
+    };
+    ListView.prototype.unrenderSkeleton = function () {
+        this.scroller.destroy(); // will remove the Grid too
+    };
+    ListView.prototype.updateSize = function (totalHeight, isAuto, isResize) {
+        _super.prototype.updateSize.call(this, totalHeight, isAuto, isResize);
+        this.scroller.clear(); // sets height to 'auto' and clears overflow
+        if (!isAuto) {
+            this.scroller.setHeight(this.computeScrollerHeight(totalHeight));
+        }
+    };
+    ListView.prototype.computeScrollerHeight = function (totalHeight) {
+        return totalHeight -
+            util_1.subtractInnerElHeight(this.el, this.scroller.el); // everything that's NOT the scroller
+    };
+    ListView.prototype.renderDates = function (dateProfile) {
+        var calendar = this.calendar;
+        var dayStart = calendar.msToUtcMoment(dateProfile.renderUnzonedRange.startMs, true);
+        var viewEnd = calendar.msToUtcMoment(dateProfile.renderUnzonedRange.endMs, true);
+        var dayDates = [];
+        var dayRanges = [];
+        while (dayStart < viewEnd) {
+            dayDates.push(dayStart.clone());
+            dayRanges.push(new UnzonedRange_1.default(dayStart, dayStart.clone().add(1, 'day')));
+            dayStart.add(1, 'day');
+        }
+        this.dayDates = dayDates;
+        this.dayRanges = dayRanges;
+        // all real rendering happens in EventRenderer
+    };
+    // slices by day
+    ListView.prototype.componentFootprintToSegs = function (footprint) {
+        var dayRanges = this.dayRanges;
+        var dayIndex;
+        var segRange;
+        var seg;
+        var segs = [];
+        for (dayIndex = 0; dayIndex < dayRanges.length; dayIndex++) {
+            segRange = footprint.unzonedRange.intersect(dayRanges[dayIndex]);
+            if (segRange) {
+                seg = {
+                    startMs: segRange.startMs,
+                    endMs: segRange.endMs,
+                    isStart: segRange.isStart,
+                    isEnd: segRange.isEnd,
+                    dayIndex: dayIndex
+                };
+                segs.push(seg);
+                // detect when footprint won't go fully into the next day,
+                // and mutate the latest seg to the be the end.
+                if (!seg.isEnd && !footprint.isAllDay &&
+                    dayIndex + 1 < dayRanges.length &&
+                    footprint.unzonedRange.endMs < dayRanges[dayIndex + 1].startMs + this.nextDayThreshold) {
+                    seg.endMs = footprint.unzonedRange.endMs;
+                    seg.isEnd = true;
+                    break;
+                }
             }
-            this.el.show();
-            this.position();
-            this.isHidden = false;
-            this.trigger('show');
         }
+        return segs;
     };
-    // Hides the popover, through CSS, but does not remove it from the DOM
-    Popover.prototype.hide = function () {
-        if (!this.isHidden) {
-            this.el.hide();
-            this.isHidden = true;
-            this.trigger('hide');
+    ListView.prototype.renderEmptyMessage = function () {
+        this.contentEl.html('<div class="fc-list-empty-wrap2">' + // TODO: try less wraps
+            '<div class="fc-list-empty-wrap1">' +
+            '<div class="fc-list-empty">' +
+            util_1.htmlEscape(this.opt('noEventsMessage')) +
+            '</div>' +
+            '</div>' +
+            '</div>');
+    };
+    // render the event segments in the view
+    ListView.prototype.renderSegList = function (allSegs) {
+        var segsByDay = this.groupSegsByDay(allSegs); // sparse array
+        var dayIndex;
+        var daySegs;
+        var i;
+        var tableEl = $('<table class="fc-list-table ' + this.calendar.theme.getClass('tableList') + '"><tbody></tbody></table>');
+        var tbodyEl = tableEl.find('tbody');
+        for (dayIndex = 0; dayIndex < segsByDay.length; dayIndex++) {
+            daySegs = segsByDay[dayIndex];
+            if (daySegs) { // sparse array, so might be undefined
+                // append a day header
+                tbodyEl.append(this.dayHeaderHtml(this.dayDates[dayIndex]));
+                this.eventRenderer.sortEventSegs(daySegs);
+                for (i = 0; i < daySegs.length; i++) {
+                    tbodyEl.append(daySegs[i].el); // append event row
+                }
+            }
         }
+        this.contentEl.empty().append(tableEl);
     };
-    // Creates `this.el` and renders content inside of it
-    Popover.prototype.render = function () {
-        var _this = this;
-        var options = this.options;
-        this.el = $('<div class="fc-popover"/>')
-            .addClass(options.className || '')
-            .css({
-            // position initially to the top left to avoid creating scrollbars
-            top: 0,
-            left: 0
-        })
-            .append(options.content)
-            .appendTo(options.parentEl);
-        // when a click happens on anything inside with a 'fc-close' className, hide the popover
-        this.el.on('click', '.fc-close', function () {
-            _this.hide();
-        });
-        if (options.autoHide) {
-            this.listenTo($(document), 'mousedown', this.documentMousedown);
+    // Returns a sparse array of arrays, segs grouped by their dayIndex
+    ListView.prototype.groupSegsByDay = function (segs) {
+        var segsByDay = []; // sparse array
+        var i;
+        var seg;
+        for (i = 0; i < segs.length; i++) {
+            seg = segs[i];
+            (segsByDay[seg.dayIndex] || (segsByDay[seg.dayIndex] = []))
+                .push(seg);
         }
+        return segsByDay;
     };
-    // Triggered when the user clicks *anywhere* in the document, for the autoHide feature
-    Popover.prototype.documentMousedown = function (ev) {
-        // only hide the popover if the click happened outside the popover
-        if (this.el && !$(ev.target).closest(this.el).length) {
-            this.hide();
+    // generates the HTML for the day headers that live amongst the event rows
+    ListView.prototype.dayHeaderHtml = function (dayDate) {
+        var mainFormat = this.opt('listDayFormat');
+        var altFormat = this.opt('listDayAltFormat');
+        return '<tr class="fc-list-heading" data-date="' + dayDate.format('YYYY-MM-DD') + '">' +
+            '<td class="' + (this.calendar.theme.getClass('tableListHeading') ||
+            this.calendar.theme.getClass('widgetHeader')) + '" colspan="3">' +
+            (mainFormat ?
+                this.buildGotoAnchorHtml(dayDate, { 'class': 'fc-list-heading-main' }, util_1.htmlEscape(dayDate.format(mainFormat)) // inner HTML
+                ) :
+                '') +
+            (altFormat ?
+                this.buildGotoAnchorHtml(dayDate, { 'class': 'fc-list-heading-alt' }, util_1.htmlEscape(dayDate.format(altFormat)) // inner HTML
+                ) :
+                '') +
+            '</td>' +
+            '</tr>';
+    };
+    return ListView;
+}(View_1.default));
+exports.default = ListView;
+ListView.prototype.eventRendererClass = ListEventRenderer_1.default;
+ListView.prototype.eventPointingClass = ListEventPointing_1.default;
+
+
+/***/ }),
+/* 249 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = __webpack_require__(2);
+var util_1 = __webpack_require__(4);
+var EventRenderer_1 = __webpack_require__(44);
+var ListEventRenderer = /** @class */ (function (_super) {
+    tslib_1.__extends(ListEventRenderer, _super);
+    function ListEventRenderer() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    ListEventRenderer.prototype.renderFgSegs = function (segs) {
+        if (!segs.length) {
+            this.component.renderEmptyMessage();
         }
-    };
-    // Hides and unregisters any handlers
-    Popover.prototype.removeElement = function () {
-        this.hide();
-        if (this.el) {
-            this.el.remove();
-            this.el = null;
+        else {
+            this.component.renderSegList(segs);
         }
-        this.stopListeningTo($(document), 'mousedown');
     };
-    // Positions the popover optimally, using the top/left/right options
-    Popover.prototype.position = function () {
-        var options = this.options;
-        var origin = this.el.offsetParent().offset();
-        var width = this.el.outerWidth();
-        var height = this.el.outerHeight();
-        var windowEl = $(window);
-        var viewportEl = util_1.getScrollParent(this.el);
-        var viewportTop;
-        var viewportLeft;
-        var viewportOffset;
-        var top; // the "position" (not "offset") values for the popover
-        var left; //
-        // compute top and left
-        top = options.top || 0;
-        if (options.left !== undefined) {
-            left = options.left;
-        }
-        else if (options.right !== undefined) {
-            left = options.right - width; // derive the left value from the right value
-        }
-        else {
-            left = 0;
+    // generates the HTML for a single event row
+    ListEventRenderer.prototype.fgSegHtml = function (seg) {
+        var view = this.view;
+        var calendar = view.calendar;
+        var theme = calendar.theme;
+        var eventFootprint = seg.footprint;
+        var eventDef = eventFootprint.eventDef;
+        var componentFootprint = eventFootprint.componentFootprint;
+        var url = eventDef.url;
+        var classes = ['fc-list-item'].concat(this.getClasses(eventDef));
+        var bgColor = this.getBgColor(eventDef);
+        var timeHtml;
+        if (componentFootprint.isAllDay) {
+            timeHtml = view.getAllDayHtml();
         }
-        if (viewportEl.is(window) || viewportEl.is(document)) {
-            viewportEl = windowEl;
-            viewportTop = 0; // the window is always at the top left
-            viewportLeft = 0; // (and .offset() won't work if called here)
+        else if (view.isMultiDayRange(componentFootprint.unzonedRange)) {
+            if (seg.isStart || seg.isEnd) { // outer segment that probably lasts part of the day
+                timeHtml = util_1.htmlEscape(this._getTimeText(calendar.msToMoment(seg.startMs), calendar.msToMoment(seg.endMs), componentFootprint.isAllDay));
+            }
+            else { // inner segment that lasts the whole day
+                timeHtml = view.getAllDayHtml();
+            }
         }
         else {
-            viewportOffset = viewportEl.offset();
-            viewportTop = viewportOffset.top;
-            viewportLeft = viewportOffset.left;
+            // Display the normal time text for the *event's* times
+            timeHtml = util_1.htmlEscape(this.getTimeText(eventFootprint));
         }
-        // if the window is scrolled, it causes the visible area to be further down
-        viewportTop += windowEl.scrollTop();
-        viewportLeft += windowEl.scrollLeft();
-        // constrain to the view port. if constrained by two edges, give precedence to top/left
-        if (options.viewportConstrain !== false) {
-            top = Math.min(top, viewportTop + viewportEl.outerHeight() - height - this.margin);
-            top = Math.max(top, viewportTop + this.margin);
-            left = Math.min(left, viewportLeft + viewportEl.outerWidth() - width - this.margin);
-            left = Math.max(left, viewportLeft + this.margin);
+        if (url) {
+            classes.push('fc-has-url');
         }
-        this.el.css({
-            top: top - origin.top,
-            left: left - origin.left
-        });
+        return '<tr class="' + classes.join(' ') + '">' +
+            (this.displayEventTime ?
+                '<td class="fc-list-item-time ' + theme.getClass('widgetContent') + '">' +
+                    (timeHtml || '') +
+                    '</td>' :
+                '') +
+            '<td class="fc-list-item-marker ' + theme.getClass('widgetContent') + '">' +
+            '<span class="fc-event-dot"' +
+            (bgColor ?
+                ' style="background-color:' + bgColor + '"' :
+                '') +
+            '></span>' +
+            '</td>' +
+            '<td class="fc-list-item-title ' + theme.getClass('widgetContent') + '">' +
+            '<a' + (url ? ' href="' + util_1.htmlEscape(url) + '"' : '') + '>' +
+            util_1.htmlEscape(eventDef.title || '') +
+            '</a>' +
+            '</td>' +
+            '</tr>';
     };
-    // Triggers a callback. Calls a function in the option hash of the same name.
-    // Arguments beyond the first `name` are forwarded on.
-    // TODO: better code reuse for this. Repeat code
-    Popover.prototype.trigger = function (name) {
-        if (this.options[name]) {
-            this.options[name].apply(this, Array.prototype.slice.call(arguments, 1));
-        }
+    // like "4:00am"
+    ListEventRenderer.prototype.computeEventTimeFormat = function () {
+        return this.opt('mediumTimeFormat');
     };
-    return Popover;
-}());
-exports.default = Popover;
-ListenerMixin_1.default.mixInto(Popover);
+    return ListEventRenderer;
+}(EventRenderer_1.default));
+exports.default = ListEventRenderer;
 
 
 /***/ }),
@@ -14270,530 +14336,602 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
 var $ = __webpack_require__(3);
-var util_1 = __webpack_require__(4);
-var EventRenderer_1 = __webpack_require__(42);
-/* Event-rendering methods for the DayGrid class
-----------------------------------------------------------------------------------------------------------------------*/
-var DayGridEventRenderer = /** @class */ (function (_super) {
-    tslib_1.__extends(DayGridEventRenderer, _super);
-    function DayGridEventRenderer(dayGrid, fillRenderer) {
-        var _this = _super.call(this, dayGrid, fillRenderer) || this;
-        _this.dayGrid = dayGrid;
-        return _this;
+var EventPointing_1 = __webpack_require__(64);
+var ListEventPointing = /** @class */ (function (_super) {
+    tslib_1.__extends(ListEventPointing, _super);
+    function ListEventPointing() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
-    DayGridEventRenderer.prototype.renderBgRanges = function (eventRanges) {
-        // don't render timed background events
-        eventRanges = $.grep(eventRanges, function (eventRange) {
-            return eventRange.eventDef.isAllDay();
-        });
-        _super.prototype.renderBgRanges.call(this, eventRanges);
-    };
-    // Renders the given foreground event segments onto the grid
-    DayGridEventRenderer.prototype.renderFgSegs = function (segs) {
-        var rowStructs = this.rowStructs = this.renderSegRows(segs);
-        // append to each row's content skeleton
-        this.dayGrid.rowEls.each(function (i, rowNode) {
-            $(rowNode).find('.fc-content-skeleton > table').append(rowStructs[i].tbodyEl);
-        });
-    };
-    // Unrenders all currently rendered foreground event segments
-    DayGridEventRenderer.prototype.unrenderFgSegs = function () {
-        var rowStructs = this.rowStructs || [];
-        var rowStruct;
-        while ((rowStruct = rowStructs.pop())) {
-            rowStruct.tbodyEl.remove();
-        }
-        this.rowStructs = null;
-    };
-    // Uses the given events array to generate <tbody> elements that should be appended to each row's content skeleton.
-    // Returns an array of rowStruct objects (see the bottom of `renderSegRow`).
-    // PRECONDITION: each segment shoud already have a rendered and assigned `.el`
-    DayGridEventRenderer.prototype.renderSegRows = function (segs) {
-        var rowStructs = [];
-        var segRows;
-        var row;
-        segRows = this.groupSegRows(segs); // group into nested arrays
-        // iterate each row of segment groupings
-        for (row = 0; row < segRows.length; row++) {
-            rowStructs.push(this.renderSegRow(row, segRows[row]));
+    // for events with a url, the whole <tr> should be clickable,
+    // but it's impossible to wrap with an <a> tag. simulate this.
+    ListEventPointing.prototype.handleClick = function (seg, ev) {
+        var url;
+        _super.prototype.handleClick.call(this, seg, ev); // might prevent the default action
+        // not clicking on or within an <a> with an href
+        if (!$(ev.target).closest('a[href]').length) {
+            url = seg.footprint.eventDef.url;
+            if (url && !ev.isDefaultPrevented()) { // jsEvent not cancelled in handler
+                window.location.href = url; // simulate link click
+            }
         }
-        return rowStructs;
     };
-    // Given a row # and an array of segments all in the same row, render a <tbody> element, a skeleton that contains
-    // the segments. Returns object with a bunch of internal data about how the render was calculated.
-    // NOTE: modifies rowSegs
-    DayGridEventRenderer.prototype.renderSegRow = function (row, rowSegs) {
-        var colCnt = this.dayGrid.colCnt;
-        var segLevels = this.buildSegLevels(rowSegs); // group into sub-arrays of levels
-        var levelCnt = Math.max(1, segLevels.length); // ensure at least one level
-        var tbody = $('<tbody/>');
-        var segMatrix = []; // lookup for which segments are rendered into which level+col cells
-        var cellMatrix = []; // lookup for all <td> elements of the level+col matrix
-        var loneCellMatrix = []; // lookup for <td> elements that only take up a single column
-        var i;
-        var levelSegs;
-        var col;
-        var tr;
-        var j;
-        var seg;
-        var td;
-        // populates empty cells from the current column (`col`) to `endCol`
-        function emptyCellsUntil(endCol) {
-            while (col < endCol) {
-                // try to grab a cell from the level above and extend its rowspan. otherwise, create a fresh cell
-                td = (loneCellMatrix[i - 1] || [])[col];
-                if (td) {
-                    td.attr('rowspan', parseInt(td.attr('rowspan') || 1, 10) + 1);
-                }
-                else {
-                    td = $('<td/>');
-                    tr.append(td);
+    return ListEventPointing;
+}(EventPointing_1.default));
+exports.default = ListEventPointing;
+
+
+/***/ }),
+/* 251 */,
+/* 252 */,
+/* 253 */,
+/* 254 */,
+/* 255 */,
+/* 256 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var $ = __webpack_require__(3);
+var exportHooks = __webpack_require__(18);
+var util_1 = __webpack_require__(4);
+var Calendar_1 = __webpack_require__(232);
+// for intentional side-effects
+__webpack_require__(11);
+__webpack_require__(49);
+__webpack_require__(260);
+__webpack_require__(261);
+__webpack_require__(264);
+__webpack_require__(265);
+__webpack_require__(266);
+__webpack_require__(267);
+$.fullCalendar = exportHooks;
+$.fn.fullCalendar = function (options) {
+    var args = Array.prototype.slice.call(arguments, 1); // for a possible method call
+    var res = this; // what this function will return (this jQuery object by default)
+    this.each(function (i, _element) {
+        var element = $(_element);
+        var calendar = element.data('fullCalendar'); // get the existing calendar object (if any)
+        var singleRes; // the returned value of this single method call
+        // a method call
+        if (typeof options === 'string') {
+            if (options === 'getCalendar') {
+                if (!i) { // first element only
+                    res = calendar;
                 }
-                cellMatrix[i][col] = td;
-                loneCellMatrix[i][col] = td;
-                col++;
             }
-        }
-        for (i = 0; i < levelCnt; i++) {
-            levelSegs = segLevels[i];
-            col = 0;
-            tr = $('<tr/>');
-            segMatrix.push([]);
-            cellMatrix.push([]);
-            loneCellMatrix.push([]);
-            // levelCnt might be 1 even though there are no actual levels. protect against this.
-            // this single empty row is useful for styling.
-            if (levelSegs) {
-                for (j = 0; j < levelSegs.length; j++) {
-                    seg = levelSegs[j];
-                    emptyCellsUntil(seg.leftCol);
-                    // create a container that occupies or more columns. append the event element.
-                    td = $('<td class="fc-event-container"/>').append(seg.el);
-                    if (seg.leftCol !== seg.rightCol) {
-                        td.attr('colspan', seg.rightCol - seg.leftCol + 1);
-                    }
-                    else {
-                        loneCellMatrix[i][col] = td;
-                    }
-                    while (col <= seg.rightCol) {
-                        cellMatrix[i][col] = td;
-                        segMatrix[i][col] = seg;
-                        col++;
-                    }
-                    tr.append(td);
+            else if (options === 'destroy') { // don't warn if no calendar object
+                if (calendar) {
+                    calendar.destroy();
+                    element.removeData('fullCalendar');
                 }
             }
-            emptyCellsUntil(colCnt); // finish off the row
-            this.dayGrid.bookendCells(tr);
-            tbody.append(tr);
-        }
-        return {
-            row: row,
-            tbodyEl: tbody,
-            cellMatrix: cellMatrix,
-            segMatrix: segMatrix,
-            segLevels: segLevels,
-            segs: rowSegs
-        };
-    };
-    // Stacks a flat array of segments, which are all assumed to be in the same row, into subarrays of vertical levels.
-    // NOTE: modifies segs
-    DayGridEventRenderer.prototype.buildSegLevels = function (segs) {
-        var levels = [];
-        var i;
-        var seg;
-        var j;
-        // Give preference to elements with certain criteria, so they have
-        // a chance to be closer to the top.
-        this.sortEventSegs(segs);
-        for (i = 0; i < segs.length; i++) {
-            seg = segs[i];
-            // loop through levels, starting with the topmost, until the segment doesn't collide with other segments
-            for (j = 0; j < levels.length; j++) {
-                if (!isDaySegCollision(seg, levels[j])) {
-                    break;
+            else if (!calendar) {
+                util_1.warn('Attempting to call a FullCalendar method on an element with no calendar.');
+            }
+            else if ($.isFunction(calendar[options])) {
+                singleRes = calendar[options].apply(calendar, args);
+                if (!i) {
+                    res = singleRes; // record the first method call result
+                }
+                if (options === 'destroy') { // for the destroy method, must remove Calendar object data
+                    element.removeData('fullCalendar');
                 }
             }
-            // `j` now holds the desired subrow index
-            seg.level = j;
-            // create new level array if needed and append segment
-            (levels[j] || (levels[j] = [])).push(seg);
+            else {
+                util_1.warn("'" + options + "' is an unknown FullCalendar method.");
+            }
         }
-        // order segments left-to-right. very important if calendar is RTL
-        for (j = 0; j < levels.length; j++) {
-            levels[j].sort(compareDaySegCols);
+        else if (!calendar) { // don't initialize twice
+            calendar = new Calendar_1.default(element, options);
+            element.data('fullCalendar', calendar);
+            calendar.render();
         }
-        return levels;
+    });
+    return res;
+};
+module.exports = exportHooks;
+
+
+/***/ }),
+/* 257 */
+/***/ (function(module, exports, __webpack_require__) {
+
+Object.defineProperty(exports, "__esModule", { value: true });
+var $ = __webpack_require__(3);
+var util_1 = __webpack_require__(4);
+/* Toolbar with buttons and title
+----------------------------------------------------------------------------------------------------------------------*/
+var Toolbar = /** @class */ (function () {
+    function Toolbar(calendar, toolbarOptions) {
+        this.el = null; // mirrors local `el`
+        this.viewsWithButtons = [];
+        this.calendar = calendar;
+        this.toolbarOptions = toolbarOptions;
+    }
+    // method to update toolbar-specific options, not calendar-wide options
+    Toolbar.prototype.setToolbarOptions = function (newToolbarOptions) {
+        this.toolbarOptions = newToolbarOptions;
     };
-    // Given a flat array of segments, return an array of sub-arrays, grouped by each segment's row
-    DayGridEventRenderer.prototype.groupSegRows = function (segs) {
-        var segRows = [];
-        var i;
-        for (i = 0; i < this.dayGrid.rowCnt; i++) {
-            segRows.push([]);
+    // can be called repeatedly and will rerender
+    Toolbar.prototype.render = function () {
+        var sections = this.toolbarOptions.layout;
+        var el = this.el;
+        if (sections) {
+            if (!el) {
+                el = this.el = $("<div class='fc-toolbar " + this.toolbarOptions.extraClasses + "'>");
+            }
+            else {
+                el.empty();
+            }
+            el.append(this.renderSection('left'))
+                .append(this.renderSection('right'))
+                .append(this.renderSection('center'))
+                .append('<div class="fc-clear"></div>');
         }
-        for (i = 0; i < segs.length; i++) {
-            segRows[segs[i].row].push(segs[i]);
+        else {
+            this.removeElement();
         }
-        return segRows;
-    };
-    // Computes a default event time formatting string if `timeFormat` is not explicitly defined
-    DayGridEventRenderer.prototype.computeEventTimeFormat = function () {
-        return this.opt('extraSmallTimeFormat'); // like "6p" or "6:30p"
     };
-    // Computes a default `displayEventEnd` value if one is not expliclty defined
-    DayGridEventRenderer.prototype.computeDisplayEventEnd = function () {
-        return this.dayGrid.colCnt === 1; // we'll likely have space if there's only one day
+    Toolbar.prototype.removeElement = function () {
+        if (this.el) {
+            this.el.remove();
+            this.el = null;
+        }
     };
-    // Builds the HTML to be used for the default element for an individual segment
-    DayGridEventRenderer.prototype.fgSegHtml = function (seg, disableResizing) {
-        var view = this.view;
-        var eventDef = seg.footprint.eventDef;
-        var isAllDay = seg.footprint.componentFootprint.isAllDay;
-        var isDraggable = view.isEventDefDraggable(eventDef);
-        var isResizableFromStart = !disableResizing && isAllDay &&
-            seg.isStart && view.isEventDefResizableFromStart(eventDef);
-        var isResizableFromEnd = !disableResizing && isAllDay &&
-            seg.isEnd && view.isEventDefResizableFromEnd(eventDef);
-        var classes = this.getSegClasses(seg, isDraggable, isResizableFromStart || isResizableFromEnd);
-        var skinCss = util_1.cssToStr(this.getSkinCss(eventDef));
-        var timeHtml = '';
-        var timeText;
-        var titleHtml;
-        classes.unshift('fc-day-grid-event', 'fc-h-event');
-        // Only display a timed events time if it is the starting segment
-        if (seg.isStart) {
-            timeText = this.getTimeText(seg.footprint);
-            if (timeText) {
-                timeHtml = '<span class="fc-time">' + util_1.htmlEscape(timeText) + '</span>';
-            }
+    Toolbar.prototype.renderSection = function (position) {
+        var _this = this;
+        var calendar = this.calendar;
+        var theme = calendar.theme;
+        var optionsManager = calendar.optionsManager;
+        var viewSpecManager = calendar.viewSpecManager;
+        var sectionEl = $('<div class="fc-' + position + '">');
+        var buttonStr = this.toolbarOptions.layout[position];
+        var calendarCustomButtons = optionsManager.get('customButtons') || {};
+        var calendarButtonTextOverrides = optionsManager.overrides.buttonText || {};
+        var calendarButtonText = optionsManager.get('buttonText') || {};
+        if (buttonStr) {
+            $.each(buttonStr.split(' '), function (i, buttonGroupStr) {
+                var groupChildren = $();
+                var isOnlyButtons = true;
+                var groupEl;
+                $.each(buttonGroupStr.split(','), function (j, buttonName) {
+                    var customButtonProps;
+                    var viewSpec;
+                    var buttonClick;
+                    var buttonIcon; // only one of these will be set
+                    var buttonText; // "
+                    var buttonInnerHtml;
+                    var buttonClasses;
+                    var buttonEl;
+                    var buttonAriaAttr;
+                    if (buttonName === 'title') {
+                        groupChildren = groupChildren.add($('<h2>&nbsp;</h2>')); // we always want it to take up height
+                        isOnlyButtons = false;
+                    }
+                    else {
+                        if ((customButtonProps = calendarCustomButtons[buttonName])) {
+                            buttonClick = function (ev) {
+                                if (customButtonProps.click) {
+                                    customButtonProps.click.call(buttonEl[0], ev);
+                                }
+                            };
+                            (buttonIcon = theme.getCustomButtonIconClass(customButtonProps)) ||
+                                (buttonIcon = theme.getIconClass(buttonName)) ||
+                                (buttonText = customButtonProps.text);
+                        }
+                        else if ((viewSpec = viewSpecManager.getViewSpec(buttonName))) {
+                            _this.viewsWithButtons.push(buttonName);
+                            buttonClick = function () {
+                                calendar.changeView(buttonName);
+                            };
+                            (buttonText = viewSpec.buttonTextOverride) ||
+                                (buttonIcon = theme.getIconClass(buttonName)) ||
+                                (buttonText = viewSpec.buttonTextDefault);
+                        }
+                        else if (calendar[buttonName]) { // a calendar method
+                            buttonClick = function () {
+                                calendar[buttonName]();
+                            };
+                            (buttonText = calendarButtonTextOverrides[buttonName]) ||
+                                (buttonIcon = theme.getIconClass(buttonName)) ||
+                                (buttonText = calendarButtonText[buttonName]);
+                            //            ^ everything else is considered default
+                        }
+                        if (buttonClick) {
+                            buttonClasses = [
+                                'fc-' + buttonName + '-button',
+                                theme.getClass('button'),
+                                theme.getClass('stateDefault')
+                            ];
+                            if (buttonText) {
+                                buttonInnerHtml = util_1.htmlEscape(buttonText);
+                                buttonAriaAttr = '';
+                            }
+                            else if (buttonIcon) {
+                                buttonInnerHtml = "<span class='" + buttonIcon + "'></span>";
+                                buttonAriaAttr = ' aria-label="' + buttonName + '"';
+                            }
+                            buttonEl = $(// type="button" so that it doesn't submit a form
+                            '<button type="button" class="' + buttonClasses.join(' ') + '"' +
+                                buttonAriaAttr +
+                                '>' + buttonInnerHtml + '</button>')
+                                .click(function (ev) {
+                                // don't process clicks for disabled buttons
+                                if (!buttonEl.hasClass(theme.getClass('stateDisabled'))) {
+                                    buttonClick(ev);
+                                    // after the click action, if the button becomes the "active" tab, or disabled,
+                                    // it should never have a hover class, so remove it now.
+                                    if (buttonEl.hasClass(theme.getClass('stateActive')) ||
+                                        buttonEl.hasClass(theme.getClass('stateDisabled'))) {
+                                        buttonEl.removeClass(theme.getClass('stateHover'));
+                                    }
+                                }
+                            })
+                                .mousedown(function () {
+                                // the *down* effect (mouse pressed in).
+                                // only on buttons that are not the "active" tab, or disabled
+                                buttonEl
+                                    .not('.' + theme.getClass('stateActive'))
+                                    .not('.' + theme.getClass('stateDisabled'))
+                                    .addClass(theme.getClass('stateDown'));
+                            })
+                                .mouseup(function () {
+                                // undo the *down* effect
+                                buttonEl.removeClass(theme.getClass('stateDown'));
+                            })
+                                .hover(function () {
+                                // the *hover* effect.
+                                // only on buttons that are not the "active" tab, or disabled
+                                buttonEl
+                                    .not('.' + theme.getClass('stateActive'))
+                                    .not('.' + theme.getClass('stateDisabled'))
+                                    .addClass(theme.getClass('stateHover'));
+                            }, function () {
+                                // undo the *hover* effect
+                                buttonEl
+                                    .removeClass(theme.getClass('stateHover'))
+                                    .removeClass(theme.getClass('stateDown')); // if mouseleave happens before mouseup
+                            });
+                            groupChildren = groupChildren.add(buttonEl);
+                        }
+                    }
+                });
+                if (isOnlyButtons) {
+                    groupChildren
+                        .first().addClass(theme.getClass('cornerLeft')).end()
+                        .last().addClass(theme.getClass('cornerRight')).end();
+                }
+                if (groupChildren.length > 1) {
+                    groupEl = $('<div>');
+                    if (isOnlyButtons) {
+                        groupEl.addClass(theme.getClass('buttonGroup'));
+                    }
+                    groupEl.append(groupChildren);
+                    sectionEl.append(groupEl);
+                }
+                else {
+                    sectionEl.append(groupChildren); // 1 or 0 children
+                }
+            });
         }
-        titleHtml =
-            '<span class="fc-title">' +
-                (util_1.htmlEscape(eventDef.title || '') || '&nbsp;') + // we always want one line of height
-                '</span>';
-        return '<a class="' + classes.join(' ') + '"' +
-            (eventDef.url ?
-                ' href="' + util_1.htmlEscape(eventDef.url) + '"' :
-                '') +
-            (skinCss ?
-                ' style="' + skinCss + '"' :
-                '') +
-            '>' +
-            '<div class="fc-content">' +
-            (this.dayGrid.isRTL ?
-                titleHtml + ' ' + timeHtml : // put a natural space in between
-                timeHtml + ' ' + titleHtml //
-            ) +
-            '</div>' +
-            (isResizableFromStart ?
-                '<div class="fc-resizer fc-start-resizer" />' :
-                '') +
-            (isResizableFromEnd ?
-                '<div class="fc-resizer fc-end-resizer" />' :
-                '') +
-            '</a>';
+        return sectionEl;
     };
-    return DayGridEventRenderer;
-}(EventRenderer_1.default));
-exports.default = DayGridEventRenderer;
-// Computes whether two segments' columns collide. They are assumed to be in the same row.
-function isDaySegCollision(seg, otherSegs) {
-    var i;
-    var otherSeg;
-    for (i = 0; i < otherSegs.length; i++) {
-        otherSeg = otherSegs[i];
-        if (otherSeg.leftCol <= seg.rightCol &&
-            otherSeg.rightCol >= seg.leftCol) {
-            return true;
+    Toolbar.prototype.updateTitle = function (text) {
+        if (this.el) {
+            this.el.find('h2').text(text);
         }
-    }
-    return false;
-}
-// A cmp function for determining the leftmost event
-function compareDaySegCols(a, b) {
-    return a.leftCol - b.leftCol;
-}
-
-
-/***/ }),
-/* 251 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var $ = __webpack_require__(3);
-var HelperRenderer_1 = __webpack_require__(58);
-var DayGridHelperRenderer = /** @class */ (function (_super) {
-    tslib_1.__extends(DayGridHelperRenderer, _super);
-    function DayGridHelperRenderer() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    // Renders a mock "helper" event. `sourceSeg` is the associated internal segment object. It can be null.
-    DayGridHelperRenderer.prototype.renderSegs = function (segs, sourceSeg) {
-        var helperNodes = [];
-        var rowStructs;
-        // TODO: not good to call eventRenderer this way
-        rowStructs = this.eventRenderer.renderSegRows(segs);
-        // inject each new event skeleton into each associated row
-        this.component.rowEls.each(function (row, rowNode) {
-            var rowEl = $(rowNode); // the .fc-row
-            var skeletonEl = $('<div class="fc-helper-skeleton"><table/></div>'); // will be absolutely positioned
-            var skeletonTopEl;
-            var skeletonTop;
-            // If there is an original segment, match the top position. Otherwise, put it at the row's top level
-            if (sourceSeg && sourceSeg.row === row) {
-                skeletonTop = sourceSeg.el.position().top;
-            }
-            else {
-                skeletonTopEl = rowEl.find('.fc-content-skeleton tbody');
-                if (!skeletonTopEl.length) {
-                    skeletonTopEl = rowEl.find('.fc-content-skeleton table');
-                }
-                skeletonTop = skeletonTopEl.position().top;
-            }
-            skeletonEl.css('top', skeletonTop)
-                .find('table')
-                .append(rowStructs[row].tbodyEl);
-            rowEl.append(skeletonEl);
-            helperNodes.push(skeletonEl[0]);
-        });
-        return $(helperNodes); // must return the elements rendered
     };
-    return DayGridHelperRenderer;
-}(HelperRenderer_1.default));
-exports.default = DayGridHelperRenderer;
-
-
-/***/ }),
-/* 252 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var $ = __webpack_require__(3);
-var FillRenderer_1 = __webpack_require__(57);
-var DayGridFillRenderer = /** @class */ (function (_super) {
-    tslib_1.__extends(DayGridFillRenderer, _super);
-    function DayGridFillRenderer() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.fillSegTag = 'td'; // override the default tag name
-        return _this;
-    }
-    DayGridFillRenderer.prototype.attachSegEls = function (type, segs) {
-        var nodes = [];
-        var i;
-        var seg;
-        var skeletonEl;
-        for (i = 0; i < segs.length; i++) {
-            seg = segs[i];
-            skeletonEl = this.renderFillRow(type, seg);
-            this.component.rowEls.eq(seg.row).append(skeletonEl);
-            nodes.push(skeletonEl[0]);
+    Toolbar.prototype.activateButton = function (buttonName) {
+        if (this.el) {
+            this.el.find('.fc-' + buttonName + '-button')
+                .addClass(this.calendar.theme.getClass('stateActive'));
         }
-        return nodes;
     };
-    // Generates the HTML needed for one row of a fill. Requires the seg's el to be rendered.
-    DayGridFillRenderer.prototype.renderFillRow = function (type, seg) {
-        var colCnt = this.component.colCnt;
-        var startCol = seg.leftCol;
-        var endCol = seg.rightCol + 1;
-        var className;
-        var skeletonEl;
-        var trEl;
-        if (type === 'businessHours') {
-            className = 'bgevent';
-        }
-        else {
-            className = type.toLowerCase();
+    Toolbar.prototype.deactivateButton = function (buttonName) {
+        if (this.el) {
+            this.el.find('.fc-' + buttonName + '-button')
+                .removeClass(this.calendar.theme.getClass('stateActive'));
         }
-        skeletonEl = $('<div class="fc-' + className + '-skeleton">' +
-            '<table><tr/></table>' +
-            '</div>');
-        trEl = skeletonEl.find('tr');
-        if (startCol > 0) {
-            trEl.append('<td colspan="' + startCol + '"/>');
+    };
+    Toolbar.prototype.disableButton = function (buttonName) {
+        if (this.el) {
+            this.el.find('.fc-' + buttonName + '-button')
+                .prop('disabled', true)
+                .addClass(this.calendar.theme.getClass('stateDisabled'));
         }
-        trEl.append(seg.el.attr('colspan', endCol - startCol));
-        if (endCol < colCnt) {
-            trEl.append('<td colspan="' + (colCnt - endCol) + '"/>');
+    };
+    Toolbar.prototype.enableButton = function (buttonName) {
+        if (this.el) {
+            this.el.find('.fc-' + buttonName + '-button')
+                .prop('disabled', false)
+                .removeClass(this.calendar.theme.getClass('stateDisabled'));
         }
-        this.component.bookendCells(trEl);
-        return skeletonEl;
     };
-    return DayGridFillRenderer;
-}(FillRenderer_1.default));
-exports.default = DayGridFillRenderer;
+    Toolbar.prototype.getViewsWithButtons = function () {
+        return this.viewsWithButtons;
+    };
+    return Toolbar;
+}());
+exports.default = Toolbar;
 
 
 /***/ }),
-/* 253 */
+/* 258 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
-var BasicViewDateProfileGenerator_1 = __webpack_require__(228);
-var UnzonedRange_1 = __webpack_require__(5);
-var MonthViewDateProfileGenerator = /** @class */ (function (_super) {
-    tslib_1.__extends(MonthViewDateProfileGenerator, _super);
-    function MonthViewDateProfileGenerator() {
-        return _super !== null && _super.apply(this, arguments) || this;
+var $ = __webpack_require__(3);
+var util_1 = __webpack_require__(4);
+var options_1 = __webpack_require__(33);
+var locale_1 = __webpack_require__(32);
+var Model_1 = __webpack_require__(51);
+var OptionsManager = /** @class */ (function (_super) {
+    tslib_1.__extends(OptionsManager, _super);
+    function OptionsManager(_calendar, overrides) {
+        var _this = _super.call(this) || this;
+        _this._calendar = _calendar;
+        _this.overrides = $.extend({}, overrides); // make a copy
+        _this.dynamicOverrides = {};
+        _this.compute();
+        return _this;
     }
-    // Computes the date range that will be rendered.
-    MonthViewDateProfileGenerator.prototype.buildRenderRange = function (currentUnzonedRange, currentRangeUnit, isRangeAllDay) {
-        var renderUnzonedRange = _super.prototype.buildRenderRange.call(this, currentUnzonedRange, currentRangeUnit, isRangeAllDay);
-        var start = this.msToUtcMoment(renderUnzonedRange.startMs, isRangeAllDay);
-        var end = this.msToUtcMoment(renderUnzonedRange.endMs, isRangeAllDay);
-        var rowCnt;
-        // ensure 6 weeks
-        if (this.opt('fixedWeekCount')) {
-            rowCnt = Math.ceil(// could be partial weeks due to hiddenDays
-            end.diff(start, 'weeks', true) // dontRound=true
-            );
-            end.add(6 - rowCnt, 'weeks');
+    OptionsManager.prototype.add = function (newOptionHash) {
+        var optionCnt = 0;
+        var optionName;
+        this.recordOverrides(newOptionHash); // will trigger this model's watchers
+        for (optionName in newOptionHash) {
+            optionCnt++;
+        }
+        // special-case handling of single option change.
+        // if only one option change, `optionName` will be its name.
+        if (optionCnt === 1) {
+            if (optionName === 'height' || optionName === 'contentHeight' || optionName === 'aspectRatio') {
+                this._calendar.updateViewSize(true); // isResize=true
+                return;
+            }
+            else if (optionName === 'defaultDate') {
+                return; // can't change date this way. use gotoDate instead
+            }
+            else if (optionName === 'businessHours') {
+                return; // this model already reacts to this
+            }
+            else if (/^(event|select)(Overlap|Constraint|Allow)$/.test(optionName)) {
+                return; // doesn't affect rendering. only interactions.
+            }
+            else if (optionName === 'timezone') {
+                this._calendar.view.flash('initialEvents');
+                return;
+            }
+        }
+        // catch-all. rerender the header and footer and rebuild/rerender the current view
+        this._calendar.renderHeader();
+        this._calendar.renderFooter();
+        // even non-current views will be affected by this option change. do before rerender
+        // TODO: detangle
+        this._calendar.viewsByType = {};
+        this._calendar.reinitView();
+    };
+    // Computes the flattened options hash for the calendar and assigns to `this.options`.
+    // Assumes this.overrides and this.dynamicOverrides have already been initialized.
+    OptionsManager.prototype.compute = function () {
+        var locale;
+        var localeDefaults;
+        var isRTL;
+        var dirDefaults;
+        var rawOptions;
+        locale = util_1.firstDefined(// explicit locale option given?
+        this.dynamicOverrides.locale, this.overrides.locale);
+        localeDefaults = locale_1.localeOptionHash[locale];
+        if (!localeDefaults) { // explicit locale option not given or invalid?
+            locale = options_1.globalDefaults.locale;
+            localeDefaults = locale_1.localeOptionHash[locale] || {};
+        }
+        isRTL = util_1.firstDefined(// based on options computed so far, is direction RTL?
+        this.dynamicOverrides.isRTL, this.overrides.isRTL, localeDefaults.isRTL, options_1.globalDefaults.isRTL);
+        dirDefaults = isRTL ? options_1.rtlDefaults : {};
+        this.dirDefaults = dirDefaults;
+        this.localeDefaults = localeDefaults;
+        rawOptions = options_1.mergeOptions([
+            options_1.globalDefaults,
+            dirDefaults,
+            localeDefaults,
+            this.overrides,
+            this.dynamicOverrides
+        ]);
+        locale_1.populateInstanceComputableOptions(rawOptions); // fill in gaps with computed options
+        this.reset(rawOptions);
+    };
+    // stores the new options internally, but does not rerender anything.
+    OptionsManager.prototype.recordOverrides = function (newOptionHash) {
+        var optionName;
+        for (optionName in newOptionHash) {
+            this.dynamicOverrides[optionName] = newOptionHash[optionName];
         }
-        return new UnzonedRange_1.default(start, end);
+        this._calendar.viewSpecManager.clearCache(); // the dynamic override invalidates the options in this cache, so just clear it
+        this.compute(); // this.options needs to be recomputed after the dynamic override
     };
-    return MonthViewDateProfileGenerator;
-}(BasicViewDateProfileGenerator_1.default));
-exports.default = MonthViewDateProfileGenerator;
+    return OptionsManager;
+}(Model_1.default));
+exports.default = OptionsManager;
 
 
 /***/ }),
-/* 254 */
+/* 259 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
+var moment = __webpack_require__(0);
+var $ = __webpack_require__(3);
+var ViewRegistry_1 = __webpack_require__(24);
 var util_1 = __webpack_require__(4);
-var EventRenderer_1 = __webpack_require__(42);
-var ListEventRenderer = /** @class */ (function (_super) {
-    tslib_1.__extends(ListEventRenderer, _super);
-    function ListEventRenderer() {
-        return _super !== null && _super.apply(this, arguments) || this;
+var options_1 = __webpack_require__(33);
+var locale_1 = __webpack_require__(32);
+var ViewSpecManager = /** @class */ (function () {
+    function ViewSpecManager(optionsManager, _calendar) {
+        this.optionsManager = optionsManager;
+        this._calendar = _calendar;
+        this.clearCache();
     }
-    ListEventRenderer.prototype.renderFgSegs = function (segs) {
-        if (!segs.length) {
-            this.component.renderEmptyMessage();
-        }
-        else {
-            this.component.renderSegList(segs);
-        }
+    ViewSpecManager.prototype.clearCache = function () {
+        this.viewSpecCache = {};
     };
-    // generates the HTML for a single event row
-    ListEventRenderer.prototype.fgSegHtml = function (seg) {
-        var view = this.view;
-        var calendar = view.calendar;
-        var theme = calendar.theme;
-        var eventFootprint = seg.footprint;
-        var eventDef = eventFootprint.eventDef;
-        var componentFootprint = eventFootprint.componentFootprint;
-        var url = eventDef.url;
-        var classes = ['fc-list-item'].concat(this.getClasses(eventDef));
-        var bgColor = this.getBgColor(eventDef);
-        var timeHtml;
-        if (componentFootprint.isAllDay) {
-            timeHtml = view.getAllDayHtml();
+    // Gets information about how to create a view. Will use a cache.
+    ViewSpecManager.prototype.getViewSpec = function (viewType) {
+        var cache = this.viewSpecCache;
+        return cache[viewType] || (cache[viewType] = this.buildViewSpec(viewType));
+    };
+    // Given a duration singular unit, like "week" or "day", finds a matching view spec.
+    // Preference is given to views that have corresponding buttons.
+    ViewSpecManager.prototype.getUnitViewSpec = function (unit) {
+        var viewTypes;
+        var i;
+        var spec;
+        if ($.inArray(unit, util_1.unitsDesc) !== -1) {
+            // put views that have buttons first. there will be duplicates, but oh well
+            viewTypes = this._calendar.header.getViewsWithButtons(); // TODO: include footer as well?
+            $.each(ViewRegistry_1.viewHash, function (viewType) {
+                viewTypes.push(viewType);
+            });
+            for (i = 0; i < viewTypes.length; i++) {
+                spec = this.getViewSpec(viewTypes[i]);
+                if (spec) {
+                    if (spec.singleUnit === unit) {
+                        return spec;
+                    }
+                }
+            }
         }
-        else if (view.isMultiDayRange(componentFootprint.unzonedRange)) {
-            if (seg.isStart || seg.isEnd) {
-                timeHtml = util_1.htmlEscape(this._getTimeText(calendar.msToMoment(seg.startMs), calendar.msToMoment(seg.endMs), componentFootprint.isAllDay));
+    };
+    // Builds an object with information on how to create a given view
+    ViewSpecManager.prototype.buildViewSpec = function (requestedViewType) {
+        var viewOverrides = this.optionsManager.overrides.views || {};
+        var specChain = []; // for the view. lowest to highest priority
+        var defaultsChain = []; // for the view. lowest to highest priority
+        var overridesChain = []; // for the view. lowest to highest priority
+        var viewType = requestedViewType;
+        var spec; // for the view
+        var overrides; // for the view
+        var durationInput;
+        var duration;
+        var unit;
+        // iterate from the specific view definition to a more general one until we hit an actual View class
+        while (viewType) {
+            spec = ViewRegistry_1.viewHash[viewType];
+            overrides = viewOverrides[viewType];
+            viewType = null; // clear. might repopulate for another iteration
+            if (typeof spec === 'function') { // TODO: deprecate
+                spec = { 'class': spec };
             }
-            else {
-                timeHtml = view.getAllDayHtml();
+            if (spec) {
+                specChain.unshift(spec);
+                defaultsChain.unshift(spec.defaults || {});
+                durationInput = durationInput || spec.duration;
+                viewType = viewType || spec.type;
+            }
+            if (overrides) {
+                overridesChain.unshift(overrides); // view-specific option hashes have options at zero-level
+                durationInput = durationInput || overrides.duration;
+                viewType = viewType || overrides.type;
             }
         }
-        else {
-            // Display the normal time text for the *event's* times
-            timeHtml = util_1.htmlEscape(this.getTimeText(eventFootprint));
+        spec = util_1.mergeProps(specChain);
+        spec.type = requestedViewType;
+        if (!spec['class']) {
+            return false;
         }
-        if (url) {
-            classes.push('fc-has-url');
+        // fall back to top-level `duration` option
+        durationInput = durationInput ||
+            this.optionsManager.dynamicOverrides.duration ||
+            this.optionsManager.overrides.duration;
+        if (durationInput) {
+            duration = moment.duration(durationInput);
+            if (duration.valueOf()) { // valid?
+                unit = util_1.computeDurationGreatestUnit(duration, durationInput);
+                spec.duration = duration;
+                spec.durationUnit = unit;
+                // view is a single-unit duration, like "week" or "day"
+                // incorporate options for this. lowest priority
+                if (duration.as(unit) === 1) {
+                    spec.singleUnit = unit;
+                    overridesChain.unshift(viewOverrides[unit] || {});
+                }
+            }
         }
-        return '<tr class="' + classes.join(' ') + '">' +
-            (this.displayEventTime ?
-                '<td class="fc-list-item-time ' + theme.getClass('widgetContent') + '">' +
-                    (timeHtml || '') +
-                    '</td>' :
-                '') +
-            '<td class="fc-list-item-marker ' + theme.getClass('widgetContent') + '">' +
-            '<span class="fc-event-dot"' +
-            (bgColor ?
-                ' style="background-color:' + bgColor + '"' :
-                '') +
-            '></span>' +
-            '</td>' +
-            '<td class="fc-list-item-title ' + theme.getClass('widgetContent') + '">' +
-            '<a' + (url ? ' href="' + util_1.htmlEscape(url) + '"' : '') + '>' +
-            util_1.htmlEscape(eventDef.title || '') +
-            '</a>' +
-            '</td>' +
-            '</tr>';
+        spec.defaults = options_1.mergeOptions(defaultsChain);
+        spec.overrides = options_1.mergeOptions(overridesChain);
+        this.buildViewSpecOptions(spec);
+        this.buildViewSpecButtonText(spec, requestedViewType);
+        return spec;
     };
-    // like "4:00am"
-    ListEventRenderer.prototype.computeEventTimeFormat = function () {
-        return this.opt('mediumTimeFormat');
+    // Builds and assigns a view spec's options object from its already-assigned defaults and overrides
+    ViewSpecManager.prototype.buildViewSpecOptions = function (spec) {
+        var optionsManager = this.optionsManager;
+        spec.options = options_1.mergeOptions([
+            options_1.globalDefaults,
+            spec.defaults,
+            optionsManager.dirDefaults,
+            optionsManager.localeDefaults,
+            optionsManager.overrides,
+            spec.overrides,
+            optionsManager.dynamicOverrides // dynamically set via setter. highest precedence
+        ]);
+        locale_1.populateInstanceComputableOptions(spec.options);
     };
-    return ListEventRenderer;
-}(EventRenderer_1.default));
-exports.default = ListEventRenderer;
-
-
-/***/ }),
-/* 255 */
-/***/ (function(module, exports, __webpack_require__) {
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = __webpack_require__(2);
-var $ = __webpack_require__(3);
-var EventPointing_1 = __webpack_require__(59);
-var ListEventPointing = /** @class */ (function (_super) {
-    tslib_1.__extends(ListEventPointing, _super);
-    function ListEventPointing() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    // for events with a url, the whole <tr> should be clickable,
-    // but it's impossible to wrap with an <a> tag. simulate this.
-    ListEventPointing.prototype.handleClick = function (seg, ev) {
-        var url;
-        _super.prototype.handleClick.call(this, seg, ev); // might prevent the default action
-        // not clicking on or within an <a> with an href
-        if (!$(ev.target).closest('a[href]').length) {
-            url = seg.footprint.eventDef.url;
-            if (url && !ev.isDefaultPrevented()) {
-                window.location.href = url; // simulate link click
-            }
+    // Computes and assigns a view spec's buttonText-related options
+    ViewSpecManager.prototype.buildViewSpecButtonText = function (spec, requestedViewType) {
+        var optionsManager = this.optionsManager;
+        // given an options object with a possible `buttonText` hash, lookup the buttonText for the
+        // requested view, falling back to a generic unit entry like "week" or "day"
+        function queryButtonText(options) {
+            var buttonText = options.buttonText || {};
+            return buttonText[requestedViewType] ||
+                // view can decide to look up a certain key
+                (spec.buttonTextKey ? buttonText[spec.buttonTextKey] : null) ||
+                // a key like "month"
+                (spec.singleUnit ? buttonText[spec.singleUnit] : null);
         }
+        // highest to lowest priority
+        spec.buttonTextOverride =
+            queryButtonText(optionsManager.dynamicOverrides) ||
+                queryButtonText(optionsManager.overrides) || // constructor-specified buttonText lookup hash takes precedence
+                spec.overrides.buttonText; // `buttonText` for view-specific options is a string
+        // highest to lowest priority. mirrors buildViewSpecOptions
+        spec.buttonTextDefault =
+            queryButtonText(optionsManager.localeDefaults) ||
+                queryButtonText(optionsManager.dirDefaults) ||
+                spec.defaults.buttonText || // a single string. from ViewSubclass.defaults
+                queryButtonText(options_1.globalDefaults) ||
+                (spec.duration ? this._calendar.humanizeDuration(spec.duration) : null) || // like "3 days"
+                requestedViewType; // fall back to given view name
     };
-    return ListEventPointing;
-}(EventPointing_1.default));
-exports.default = ListEventPointing;
+    return ViewSpecManager;
+}());
+exports.default = ViewSpecManager;
 
 
 /***/ }),
-/* 256 */
+/* 260 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var EventSourceParser_1 = __webpack_require__(38);
-var ArrayEventSource_1 = __webpack_require__(52);
-var FuncEventSource_1 = __webpack_require__(215);
-var JsonFeedEventSource_1 = __webpack_require__(216);
+var ArrayEventSource_1 = __webpack_require__(56);
+var FuncEventSource_1 = __webpack_require__(223);
+var JsonFeedEventSource_1 = __webpack_require__(224);
 EventSourceParser_1.default.registerClass(ArrayEventSource_1.default);
 EventSourceParser_1.default.registerClass(FuncEventSource_1.default);
 EventSourceParser_1.default.registerClass(JsonFeedEventSource_1.default);
 
 
 /***/ }),
-/* 257 */
+/* 261 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var ThemeRegistry_1 = __webpack_require__(51);
-var StandardTheme_1 = __webpack_require__(213);
-var JqueryUiTheme_1 = __webpack_require__(214);
-var Bootstrap3Theme_1 = __webpack_require__(258);
-var Bootstrap4Theme_1 = __webpack_require__(259);
+var ThemeRegistry_1 = __webpack_require__(57);
+var StandardTheme_1 = __webpack_require__(221);
+var JqueryUiTheme_1 = __webpack_require__(222);
+var Bootstrap3Theme_1 = __webpack_require__(262);
+var Bootstrap4Theme_1 = __webpack_require__(263);
 ThemeRegistry_1.defineThemeSystem('standard', StandardTheme_1.default);
 ThemeRegistry_1.defineThemeSystem('jquery-ui', JqueryUiTheme_1.default);
 ThemeRegistry_1.defineThemeSystem('bootstrap3', Bootstrap3Theme_1.default);
@@ -14801,12 +14939,12 @@
 
 
 /***/ }),
-/* 258 */
+/* 262 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
-var Theme_1 = __webpack_require__(19);
+var Theme_1 = __webpack_require__(22);
 var Bootstrap3Theme = /** @class */ (function (_super) {
     tslib_1.__extends(Bootstrap3Theme, _super);
     function Bootstrap3Theme() {
@@ -14850,12 +14988,12 @@
 
 
 /***/ }),
-/* 259 */
+/* 263 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = __webpack_require__(2);
-var Theme_1 = __webpack_require__(19);
+var Theme_1 = __webpack_require__(22);
 var Bootstrap4Theme = /** @class */ (function (_super) {
     tslib_1.__extends(Bootstrap4Theme, _super);
     function Bootstrap4Theme() {
@@ -14899,13 +15037,13 @@
 
 
 /***/ }),
-/* 260 */
+/* 264 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var ViewRegistry_1 = __webpack_require__(22);
-var BasicView_1 = __webpack_require__(62);
-var MonthView_1 = __webpack_require__(229);
+var ViewRegistry_1 = __webpack_require__(24);
+var BasicView_1 = __webpack_require__(67);
+var MonthView_1 = __webpack_require__(246);
 ViewRegistry_1.defineView('basic', {
     'class': BasicView_1.default
 });
@@ -14927,12 +15065,12 @@
 
 
 /***/ }),
-/* 261 */
+/* 265 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var ViewRegistry_1 = __webpack_require__(22);
-var AgendaView_1 = __webpack_require__(226);
+var ViewRegistry_1 = __webpack_require__(24);
+var AgendaView_1 = __webpack_require__(238);
 ViewRegistry_1.defineView('agenda', {
     'class': AgendaView_1.default,
     defaults: {
@@ -14952,12 +15090,12 @@
 
 
 /***/ }),
-/* 262 */
+/* 266 */
 /***/ (function(module, exports, __webpack_require__) {
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var ViewRegistry_1 = __webpack_require__(22);
-var ListView_1 = __webpack_require__(230);
+var ViewRegistry_1 = __webpack_require__(24);
+var ListView_1 = __webpack_require__(248);
 ViewRegistry_1.defineView('list', {
     'class': ListView_1.default,
     buttonTextKey: 'list',
@@ -14999,7 +15137,7 @@
 
 
 /***/ }),
-/* 263 */
+/* 267 */
 /***/ (function(module, exports) {
 
 Object.defineProperty(exports, "__esModule", { value: true });

iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/composer.json -> iRony-0.4.4.tar.gz/lib/plugins/kolab_addressbook/composer.json Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php -> iRony-0.4.4.tar.gz/lib/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php -> iRony-0.4.4.tar.gz/lib/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_auth/composer.json -> iRony-0.4.4.tar.gz/lib/plugins/kolab_auth/composer.json Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_chat/composer.json -> iRony-0.4.4.tar.gz/lib/plugins/kolab_chat/composer.json Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_chat/drivers/mattermost.php -> iRony-0.4.4.tar.gz/lib/plugins/kolab_chat/drivers/mattermost.php Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/composer.json -> iRony-0.4.4.tar.gz/lib/plugins/kolab_notes/composer.json Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/kolab_notes_ui.php -> iRony-0.4.4.tar.gz/lib/plugins/kolab_notes/kolab_notes_ui.php Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_sso/composer.json -> iRony-0.4.4.tar.gz/lib/plugins/kolab_sso/composer.json Changed

iRony-0.4.3.tar.gz/lib/plugins/libkolab/bin/modcache.sh -> iRony-0.4.4.tar.gz/lib/plugins/libkolab/bin/modcache.sh Changed

@@ -23,12 +23,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALL_PATH', realpath('.') . '/' );
+define('INSTALL_PATH', __DIR__ . '/../../../');
 ini_set('display_errors', 1);
 
-if (!file_exists(INSTALL_PATH . 'program/include/clisetup.php'))
-    die("Execute this from the Roundcube installation dir!\n\n");
-
 require_once INSTALL_PATH . 'program/include/clisetup.php';
 
 function print_usage()
@@ -58,6 +55,10 @@
 
 $rcmail = rcube::get_instance(rcube::INIT_WITH_DB | rcube::INIT_WITH_PLUGINS);
 
+// Make --host argument optional where the default_host is a simple string
+if (empty($opts['host'])) {
+    $opts['host'] = imap_host();
+}
 
 // connect to database
 $db = $rcmail->get_dbh();
@@ -236,3 +237,23 @@
     return $auth['valid'];
 }
 
+function imap_host()
+{
+    global $rcmail;
+
+    $default_host = $rcmail->config->get('default_host');
+
+    if (is_array($default_host)) {
+        $key = key($default_host);
+        $imap_host = is_numeric($key) ? $default_host[$key] : $key;
+    }
+    else {
+        $imap_host = $default_host;
+    }
+
+    // strip protocol prefix
+    $uri = parse_url($imap_host);
+    if (!empty($uri['host'])) {
+        return $uri['host'];
+    }
+}

iRony-0.4.3.tar.gz/lib/plugins/libkolab/bin/randomcontacts.sh -> iRony-0.4.4.tar.gz/lib/plugins/libkolab/bin/randomcontacts.sh Changed

@@ -23,18 +23,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALL_PATH', realpath('.') . '/' );
+define('INSTALL_PATH', __DIR__ . '/../../../');
 ini_set('display_errors', 1);
 
-if (!file_exists(INSTALL_PATH . 'program/include/clisetup.php'))
-    die("Execute this from the Roundcube installation dir!\n\n");
-
 require_once INSTALL_PATH . 'program/include/clisetup.php';
 
 function print_usage()
 {
     print "Usage:  randomcontacts.sh [OPTIONS] USERNAME FOLDER\n";
-    print "Create random contact that for then given user in the specified folder.\n";
+    print "Create random contact for a given user in a specified folder.\n";
     print "-n, --num      Number of contacts to be created, defaults to 50\n";
     print "-h, --host     IMAP host name\n";
     print "-p, --password IMAP user password\n";
@@ -56,11 +53,8 @@
 $rcmail->plugins->load_plugins(array('libkolab'));
 ini_set('display_errors', 1);
 
-
 if (empty($opts['host'])) {
-    $opts['host'] = $rcmail->config->get('default_host');
-    if (is_array($opts['host']))  // not unique
-        $opts['host'] = null;
+    $opts['host'] = imap_host();
 }
 
 if (empty($opts['username']) || empty($opts['folder']) || empty($opts['host'])) {
@@ -179,3 +173,24 @@
 
     return rtrim($str);
 }
+
+function imap_host()
+{
+    global $rcmail;
+
+    $default_host = $rcmail->config->get('default_host');
+
+    if (is_array($default_host)) {
+        $key = key($default_host);
+        $imap_host = is_numeric($key) ? $default_host[$key] : $key;
+    }
+    else {
+        $imap_host = $default_host;
+    }
+
+    // strip protocol prefix
+    $uri = parse_url($imap_host);
+    if (!empty($uri['host'])) {
+        return $uri['host'];
+    }
+}

iRony-0.4.3.tar.gz/lib/plugins/libkolab/bin/readcache.sh -> iRony-0.4.4.tar.gz/lib/plugins/libkolab/bin/readcache.sh Changed

@@ -22,13 +22,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('INSTALL_PATH', realpath('.') . '/' );
+define('INSTALL_PATH', __DIR__ . '/../../../');
 ini_set('display_errors', 1);
 libxml_use_internal_errors(true);
 
-if (!file_exists(INSTALL_PATH . 'program/include/clisetup.php'))
-    die("Execute this from the Roundcube installation dir!\n\n");
-
 require_once INSTALL_PATH . 'program/include/clisetup.php';
 
 function print_usage()
@@ -51,17 +48,7 @@
 $rcmail = rcube::get_instance(rcube::INIT_WITH_DB | rcube::INIT_WITH_PLUGINS);
 
 if (empty($imap_host)) {
-    $default_host = $rcmail->config->get('default_host');
-    if (is_array($default_host)) {
-        list($k,$v) = each($default_host);
-        $imap_host = is_numeric($k) ? $v : $k;
-    }
-    else {
-        $imap_host = $default_host;
-    }
-
-    // strip protocol prefix
-    $imap_host = preg_replace('!^[a-z]+://!', '', $imap_host);
+    $imap_host = imap_host();
 }
 
 if (empty($folder) || empty($imap_host)) {
@@ -72,8 +59,9 @@
 // connect to database
 $db = $rcmail->get_dbh();
 $db->db_connect('r');
-if (!$db->is_connected() || $db->is_error())
+if (!$db->is_connected() || $db->is_error()) {
     die("No DB connection\n");
+}
 
 
 // resolve folder_id
@@ -118,11 +106,13 @@
 $extra_cols_ = $extra_cols[$folder_data['type']] ?: array();
 $sql_arr = $db->fetch_assoc($db->query("SELECT COUNT(*) as cnt FROM `$cache_table` WHERE `folder_id`=?", intval($folder_id)));
 
-print "CTag  = " . $folder_data['ctag'] . "\n";
-print "Lock  = " . $folder_data['synclock'] . "\n";
-print "Count = " . $sql_arr['cnt'] . "\n";
+print "CTag     = " . $folder_data['ctag'] . "\n";
+print "Lock     = " . $folder_data['synclock'] . "\n";
+print "Changed  = " . $folder_data['changed'] . "\n";
+print "ObjCount = " . $folder_data['objectcount'] . "\n";
+print "Count    = " . $sql_arr['cnt'] . "\n";
 print "----------------------------------------------------------------------------------\n";
-print "<MSG>\t<UUID>\t<CHANGED>\t<DATA>\t<XML>\t";
+print "<MSG>\t<UUID>\t<CHANGED>\t<DATA>\t";
 print join("\t", array_map(function($c) { return '<' . strtoupper($c) . '>'; }, $extra_cols_));
 print "\n----------------------------------------------------------------------------------\n";
 
@@ -131,12 +121,8 @@
     print $sql_arr['msguid'] . "\t" . $sql_arr['uid'] . "\t" . $sql_arr['changed'];
 
     // try to unserialize data block
-    $object = @unserialize(@base64_decode($sql_arr['data']));
-    print "\t" . ($object === false ? 'FAIL!' : ($object['uid'] == $sql_arr['uid'] ? 'OK' : '!!!'));
-
-    // check XML validity
-    $xml = simplexml_load_string($sql_arr['xml']);
-    print "\t" . ($xml === false ? 'FAIL!' : 'OK');
+    $object = json_decode($sql_arr['data']);
+    print "\t" . ($object === false ? 'FAIL!' : 'OK');
 
     // print extra cols
     array_walk($extra_cols_, function($c) use ($sql_arr) {
@@ -148,3 +134,25 @@
 
 print "----------------------------------------------------------------------------------\n";
 echo "Done.\n";
+
+
+function imap_host()
+{
+    global $rcmail;
+
+    $default_host = $rcmail->config->get('default_host');
+
+    if (is_array($default_host)) {
+        $key = key($default_host);
+        $imap_host = is_numeric($key) ? $default_host[$key] : $key;
+    }
+    else {
+        $imap_host = $default_host;
+    }
+
+    // strip protocol prefix
+    $uri = parse_url($imap_host);
+    if (!empty($uri['host'])) {
+        return $uri['host'];
+    }
+}

iRony-0.4.3.tar.gz/lib/plugins/libkolab/composer.json -> iRony-0.4.4.tar.gz/lib/plugins/libkolab/composer.json Changed

iRony-0.4.3.tar.gz/lib/plugins/libkolab/lib/kolab_format_xcal.php -> iRony-0.4.4.tar.gz/lib/plugins/libkolab/lib/kolab_format_xcal.php Changed

@@ -203,7 +203,7 @@
                 for ($i=0; $i < $byday->size(); $i++) {
                     $daypos = $byday->get($i);
                     $prefix = $daypos->occurence();
-                    $weekdays[] = ($prefix ? $prefix : '') . $weekday_map[$daypos->weekday()];
+                    $weekdays[] = ($prefix ?: '') . $weekday_map[$daypos->weekday()];
                 }
                 $object['recurrence']['BYDAY'] = join(',', $weekdays);
             }
@@ -382,8 +382,8 @@
                 $att = new Attendee;
                 $att->setContact($cr);
                 $att->setPartStat($this->part_status_map[$attendee['status']]);
-                $att->setRole($this->role_map[$attendee['role']] ? $this->role_map[$attendee['role']] : kolabformat::Required);
-                $att->setCutype($this->cutype_map[$attendee['cutype']] ? $this->cutype_map[$attendee['cutype']] : kolabformat::CutypeIndividual);
+                $att->setRole($this->role_map[$attendee['role']] ?: kolabformat::Required);
+                $att->setCutype($this->cutype_map[$attendee['cutype']] ?: kolabformat::CutypeIndividual);
                 $att->setRSVP((bool)$attendee['rsvp']);
 
                 if (!empty($attendee['delegated-from'])) {

iRony-0.4.3.tar.gz/lib/plugins/libkolab/lib/kolab_storage.php -> iRony-0.4.4.tar.gz/lib/plugins/libkolab/lib/kolab_storage.php Changed

iRony-0.4.3.tar.gz/lib/plugins/tasklist/composer.json -> iRony-0.4.4.tar.gz/lib/plugins/tasklist/composer.json Changed

iRony-0.4.3.tar.gz/vendor/autoload.php -> iRony-0.4.4.tar.gz/vendor/autoload.php Changed

iRony-0.4.3.tar.gz/vendor/composer/ClassLoader.php -> iRony-0.4.4.tar.gz/vendor/composer/ClassLoader.php Changed

iRony-0.4.3.tar.gz/vendor/composer/autoload_real.php -> iRony-0.4.4.tar.gz/vendor/composer/autoload_real.php Changed

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit19391cad60298ed18ee44f901f020bb5
+class ComposerAutoloaderInitcdf8a7f128c335357e9ae823f2040e43
 {
     private static $loader;
 
@@ -13,21 +13,24 @@
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit19391cad60298ed18ee44f901f020bb5', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitcdf8a7f128c335357e9ae823f2040e43', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit19391cad60298ed18ee44f901f020bb5', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitcdf8a7f128c335357e9ae823f2040e43', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit19391cad60298ed18ee44f901f020bb5::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitcdf8a7f128c335357e9ae823f2040e43::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {

iRony-0.4.3.tar.gz/vendor/composer/autoload_static.php -> iRony-0.4.4.tar.gz/vendor/composer/autoload_static.php Changed

iRony.dsc Changed