Request 1901 (accepted)

Overview

Request 1901 (accepted)

No description set

Created by dhoffend almost 8 years ago
In state accepted
Open review for Admin

Submit chwala

Submit package Kolab:Winterfell / chwala to package Kolab:16 / chwala

chwala.spec Changed

fix-autoload-path-debian.patch Added

chwala-0.4.tar.gz/config/config.inc.php.dist -> chwala-0.5.tar.gz/config/config.inc.php.dist Changed

@@ -40,6 +40,14 @@
 // Note: this URL should be accessible from Chwala host and Roundcube host as well.
 $config['fileapi_manticore'] = null;
 
+// WOPI/Office service URL. Enables use of collaborative editor supporting WOPI.
+// Note: this URL should be accessible from Chwala host and Roundcube host as well.
+$config['fileapi_wopi_office'] = null;
+
+// Kolab WOPI service URL. Enables use of collaborative editor supporting WOPI.
+// Note: this URL should be accessible from Chwala host and Office host as well.
+$config['fileapi_wopi_service'] = null;
+
 // Name of the user interface skin.
 $config['file_api_skin'] = 'default';
 
@@ -48,6 +56,13 @@
 // the UI location is used with addition of /api/ suffix.
 $config['file_api_url'] = '';
 
+// Type of Chwala cache. Supported values: 'db', 'apc' and 'memcache'.
+// Note: This is only for some additional data like WOPI capabilities.
+$config['chwala_cache'] = 'db';
+
+// lifetime of Chwala cache
+// possible units: s, m, h, d, w
+$config['chwala_cache_ttl'] = '1d';
 
 // ------------------------------------------------
 // SeaFile driver settings
@@ -64,6 +79,7 @@
 $config['fileapi_seafile_cache_ttl'] = '7d';
 
 // Default SeaFile Web API host
+// Note: http:// and https:// (default) prefixes can be used here
 $config['fileapi_seafile_host'] = 'localhost';
 
 // Enables SSL certificates validation when connecting

chwala-0.4.tar.gz/doc/SQL/mysql.initial.sql -> chwala-0.5.tar.gz/doc/SQL/mysql.initial.sql Changed

chwala-0.5.tar.gz/doc/SQL/mysql/2016101700.sql Added

chwala-0.4.tar.gz/doc/SQL/oracle.initial.sql -> chwala-0.5.tar.gz/doc/SQL/oracle.initial.sql Changed

chwala-0.5.tar.gz/doc/SQL/oracle/2016101700.sql Added

chwala-0.4.tar.gz/lib/api/common.php -> chwala-0.5.tar.gz/lib/api/common.php Changed

@@ -102,22 +102,30 @@
      */
     protected function find_viewer($mimetype)
     {
-        $dir = RCUBE_INSTALL_PATH . 'lib/viewers';
+        $dir   = RCUBE_INSTALL_PATH . 'lib/viewers';
+        $files = array();
 
+        // 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)) {
-                    include_once $dir . '/' . $file;
-                    $class  = 'file_viewer_' . $matches[1];
-                    $viewer = new $class($this->api);
-
-                    if ($viewer->supports($mimetype)) {
-                        return $viewer;
-                    }
+                    $files[$matches[1]] = $dir . '/' . $file;
                 }
             }
             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;
+            }
+        }
     }
 
     /**
@@ -163,4 +171,20 @@
 
         return $result;
     }
+
+    /**
+     * Update manticore session on file/folder move
+     */
+    protected function session_uri_update($from, $to, $is_folder = false)
+    {
+        // check Manticore 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['MANTICORE'])) {
+            return;
+        }
+
+        $manticore = new file_manticore($this->api);
+        $manticore->session_uri_update($from, $to, $is_folder);
+    }
 }

chwala-0.4.tar.gz/lib/api/document.php -> chwala-0.5.tar.gz/lib/api/document.php Changed

@@ -40,8 +40,14 @@
         if ($this->args['method'] == 'invitations') {
             return $this->invitations();
         }
+
+        // Sessions list
+        if ($this->args['method'] == 'sessions') {
+            return $this->sessions();
+        }
+
         // Session and invitations management
-        else if (strpos($this->args['method'], 'document_') === 0) {
+        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);
@@ -59,6 +65,7 @@
                 case 'document_decline':
                 case 'document_accept':
                 case 'document_cancel':
+                case 'document_info':
                     return $this->{$this->args['method']}($this->args['id']);
             }
         }
@@ -81,9 +88,11 @@
      */
     protected function get_file_path($id)
     {
-        $manticore = new file_manticore($this->api);
+        $document = new file_document($this->api);
+
+        $file = $document->session_file($id);
 
-        return $manticore->session_file($id);
+        return $file['file'];
     }
 
     /**
@@ -100,14 +109,14 @@
             // that require user action, otherwise we may skip some unintentionally
         }
 
-        $manticore = new file_manticore($this->api);
-        $filter    = array();
+        $document = new file_document($this->api);
+        $filter   = array();
 
         if ($this->args['timestamp']) {
             $filter['timestamp'] = $this->args['timestamp'];
         }
 
-        $list = $manticore->invitations_list($filter);
+        $list = $document->invitations_list($filter);
 
         return array(
             'list'      => $list,
@@ -116,13 +125,31 @@
     }
 
     /**
+     * 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)
     {
-        $manticore = new file_manticore($this->api);
+        $document = file_document::get_handler($this->api, $id);
 
-        if (!$manticore->session_delete($id)) {
+        if (!$document->session_delete($id)) {
             throw new Exception("Failed deleting the document session.", file_api_core::ERROR_CODE);
         }
     }
@@ -132,9 +159,9 @@
      */
     protected function document_invite($id)
     {
-        $manticore = new file_manticore($this->api);
-        $users     = $this->args['users'];
-        $comment   = $this->args['comment'];
+        $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);
@@ -142,13 +169,13 @@
 
         foreach ((array) $users as $user) {
             if (!empty($user['user'])) {
-                $manticore->invitation_create($id, $user['user'], file_manticore::STATUS_INVITED, $comment, $user['name']);
+                $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_manticore::STATUS_INVITED,
+                    'status'     => file_document::STATUS_INVITED,
                 );
             }
         }
@@ -163,8 +190,8 @@
      */
     protected function document_request($id)
     {
-        $manticore = new file_manticore($this->api);
-        $manticore->invitation_create($id, null, file_manticore::STATUS_REQUESTED, $this->args['comment']);
+        $document = file_document::get_handler($this->api, $id);
+        $document->invitation_create($id, null, file_document::STATUS_REQUESTED, $this->args['comment']);
     }
 
     /**
@@ -172,8 +199,8 @@
      */
     protected function document_decline($id)
     {
-        $manticore = new file_manticore($this->api);
-        $manticore->invitation_update($id, $this->args['user'], file_manticore::STATUS_DECLINED, $this->args['comment']);
+        $document = file_document::get_handler($this->api, $id);
+        $document->invitation_update($id, $this->args['user'], file_document::STATUS_DECLINED, $this->args['comment']);
     }
 
     /**
@@ -181,8 +208,8 @@
      */
     protected function document_accept($id)
     {
-        $manticore = new file_manticore($this->api);
-        $manticore->invitation_update($id, $this->args['user'], file_manticore::STATUS_ACCEPTED, $this->args['comment']);
+        $document = file_document::get_handler($this->api, $id);
+        $document->invitation_update($id, $this->args['user'], file_document::STATUS_ACCEPTED, $this->args['comment']);
     }
 
     /**
@@ -190,15 +217,15 @@
      */
     protected function document_cancel($id)
     {
-        $manticore = new file_manticore($this->api);
-        $users     = $this->args['users'];
+        $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) {
-            $manticore->invitation_delete($id, $user);
+            $document->invitation_delete($id, $user);
             $result[] = $user;
         }
 
@@ -208,6 +235,47 @@
     }
 
     /**
+     * Return document informations
+     */
+    protected function document_info($id)
+    {
+        $document = file_document::get_handler($this->api, $id);
+        $file     = $document->session_file($id);
+        $session  = $document->session_info($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'],
+            );
+        }
+
+        $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($file)
@@ -236,15 +304,20 @@
             throw new Exception("Failed writing to temp file.", file_api_core::ERROR_CODE);
         }
 
-        $file = array(
+        $file_data = array(
             'path' => $tmp_path,
             'type' => rcube_mime::file_content_type($tmp_path, $file),
         );
 
-        $driver->file_update($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);
     }
 
     /**

chwala-0.4.tar.gz/lib/api/file_get.php -> chwala-0.5.tar.gz/lib/api/file_get.php Changed

chwala-0.4.tar.gz/lib/api/file_info.php -> chwala-0.5.tar.gz/lib/api/file_info.php Changed

@@ -35,11 +35,14 @@
         // here as it may be not properly set if backend driver wasn't initialized yet
         $capabilities = $this->api->capabilities(false);
         $manticore    = $capabilities['MANTICORE'];
+        $wopi         = $capabilities['WOPI'];
 
         // support file_info by session ID
         if (!isset($this->args['file']) || $this->args['file'] === '') {
-            if ($manticore && !empty($this->args['session'])) {
-                $this->args['file'] = $this->file_manticore_file($this->args['session']);
+            if (($manticore || $wopi) && !empty($this->args['session'])) {
+                if ($info = $this->file_document_file($this->args['session'])) {
+                    $this->args['file'] = $info['file'];
+                }
             }
             else {
                 throw new Exception("Missing file name", file_api_core::ERROR_CODE);
@@ -47,41 +50,40 @@
         }
 
         if ($this->args['file'] !== null) {
-            list($driver, $path) = $this->api->get_driver($this->args['file']);
+            try {
+                list($driver, $path) = $this->api->get_driver($this->args['file']);
 
-            $info = $driver->file_info($path);
-            $info['file'] = $this->args['file'];
-        }
-        else {
-            $info = array(
-                // @TODO: session exists, invitation exists, assume ODF format
-                // however, this should be done in a different way,
-                // e.g. this info should be stored in sessions database
-                'type'     => 'application/vnd.oasis.opendocument.text',
-                'writable' => false,
-            );
+                $info = $driver->file_info($path);
+                $info['file'] = $this->args['file'];
+            }
+            catch (Exception $e) {
+                // Invited user may have no access to the file,
+                // ignore errors if session exists
+                if (!$this->args['viewer'] || !$this->args['session']) {
+                    throw $e;
+                }
+            }
         }
 
         // Possible 'viewer' types are defined in files_api.js:file_type_supported()
         // 1 - Native browser support
         // 2 - Chwala viewer exists
-        // 4 - Editor exists
+        // 4 - Editor exists (manticore/wopi)
 
         if (rcube_utils::get_boolean((string) $this->args['viewer'])) {
             if ($this->args['file'] !== null) {
                 $this->file_viewer_info($info);
             }
 
-            // check if file type is supported by webodf editor?
-            if ($manticore) {
-                if (strtolower($info['type']) == 'application/vnd.oasis.opendocument.text') {
-                    $info['viewer']['manticore'] = true;
+            if ((intval($this->args['viewer']) & 4)) {
+                // @TODO: Chwala client should have a possibility to select
+                //        between wopi and manticore?
+                if (!$wopi || !$this->file_wopi_handler($info)) {
+                    if ($manticore) {
+                        $this->file_manticore_handler($info);
+                    }
                 }
             }
-
-            if ((intval($this->args['viewer']) & 4) && $info['viewer']['manticore']) {
-                $this->file_manticore_handler($info);
-            }
         }
 
         // check writable flag
@@ -117,6 +119,16 @@
     }
 
     /**
+     * Get file from manticore/wopi session
+     */
+    protected function file_document_file($session_id)
+    {
+        $document = file_document::get_handler($this->api, $session_id);
+
+        return $document->session_file($session_id, true);
+    }
+
+    /**
      * Merge manticore session data into file info
      */
     protected function file_manticore_handler(&$info)
@@ -125,19 +137,44 @@
         $file      = $this->args['file'];
         $session   = $this->args['session'];
 
-        if ($uri = $manticore->session_start($file, $session)) {
+        if (in_array_nocase($info['type'], $manticore->supported_filetypes(true))) {
+            $info['viewer']['manticore'] = true;
+        }
+        else {
+            return false;
+        }
+
+        if ($uri = $manticore->session_start($file, $info, $session)) {
             $info['viewer']['href'] = $uri;
+            $info['viewer']['post'] = $manticore->editor_post_params($info);
             $info['session']        = $manticore->session_info($session, true);
         }
+
+        return true;
     }
 
     /**
-     * Get file from manticore session
+     * Merge WOPI session data into file info
      */
-    protected function file_manticore_file($session_id)
+    protected function file_wopi_handler(&$info)
     {
-        $manticore = new file_manticore($this->api);
+        $wopi    = new file_wopi($this->api);
+        $file    = $this->args['file'];
+        $session = $this->args['session'];
+
+        if (in_array_nocase($info['type'], $wopi->supported_filetypes(true))) {
+            $info['viewer']['wopi'] = true;
+        }
+        else {
+            return false;
+        }
+
+        if ($uri = $wopi->session_start($file, $info, $session)) {
+            $info['viewer']['href'] = $uri;
+            $info['viewer']['post'] = $wopi->editor_post_params($info);
+            $info['session']        = $wopi->session_info($session, true);
+        }
 
-        return $manticore->session_file($session_id, true);
+        return true;
     }
 }

chwala-0.4.tar.gz/lib/api/file_move.php -> chwala-0.5.tar.gz/lib/api/file_move.php Changed

chwala-0.4.tar.gz/lib/api/folder_move.php -> chwala-0.5.tar.gz/lib/api/folder_move.php Changed

chwala-0.4.tar.gz/lib/drivers/kolab/kolab_file_storage.php -> chwala-0.5.tar.gz/lib/drivers/kolab/kolab_file_storage.php Changed

chwala-0.4.tar.gz/lib/drivers/seafile/seafile_api.php -> chwala-0.5.tar.gz/lib/drivers/seafile/seafile_api.php Changed

chwala-0.4.tar.gz/lib/drivers/seafile/seafile_file_storage.php -> chwala-0.5.tar.gz/lib/drivers/seafile/seafile_file_storage.php Changed

@@ -1295,8 +1295,9 @@
     {
         list($file, $repo_id, $library) = $this->find_library($path);
 
-        return 'seafile://' . rawurlencode($library['owner']) . '@' . $this->config['host']
-            . '/' . file_utils::encode_path($path);
+        $host = preg_replace('|https?://|i', '', $this->config['host']);
+
+        return 'seafile://' . rawurlencode($library['owner']) . '@' . $host . '/' . file_utils::encode_path($path);
     }
 
     /**
@@ -1313,13 +1314,14 @@
             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]);
+        $user   = rawurldecode($matches[1]);
+        $host   = $matches[2];
+        $path   = file_utils::decode_path($matches[3]);
+        $c_host = preg_replace('|https?://|i', '', $this->config['host']);
 
         list($file, $repo_id, $library) = $this->find_library($path, true);
 
-        if (empty($library) || $host != $this->config['host'] || $user != $library['owner']) {
+        if (empty($library) || $host != $c_host || $user != $library['owner']) {
             throw new Exception("Internal storage error. Unresolvable URI.", file_storage::ERROR);
         }

chwala-0.4.tar.gz/lib/drivers/webdav/webdav_file_storage.php -> chwala-0.5.tar.gz/lib/drivers/webdav/webdav_file_storage.php Changed

chwala-0.4.tar.gz/lib/file_api.php -> chwala-0.5.tar.gz/lib/file_api.php Changed

@@ -37,12 +37,6 @@
 
         $this->config = $rcube->config;
         $this->session_init();
-
-        if ($_SESSION['env']) {
-            $this->env = $_SESSION['env'];
-        }
-
-        $this->locale_init();
     }
 
     /**
@@ -53,11 +47,15 @@
         $this->request = strtolower($_GET['method']);
 
         // Check the session, authenticate the user
-        if (!$this->session_validate()) {
+        if (!$this->session_validate($this->request == 'authenticate')) {
             $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;
+
                 $_SESSION['user'] = $username;
                 $_SESSION['env']  = $this->env;
 
@@ -77,6 +75,10 @@
                 throw new Exception("Invalid session", 403);
             }
         }
+        else {
+            // Init locale after the session started
+            $this->locale_init();
+        }
 
         // Call service method
         $result = $this->request_handler($this->request);
@@ -89,9 +91,11 @@
     /**
      * Session validation check and session start
      */
-    private function session_validate()
+    private function session_validate($new_session = false)
     {
-        $sess_id = rcube_utils::request_header('X-Session-Token') ?: $_REQUEST['token'];
+        if (!$new_session) {
+            $sess_id = rcube_utils::request_header('X-Session-Token') ?: $_REQUEST['token'];
+        }
 
         if (empty($sess_id)) {
             $this->session->start();
@@ -105,6 +109,17 @@
             return false;
         }
 
+        // Document-only session
+        if (($doc_id = $_SESSION['document_session'])
+            && (strpos($this->request, 'document') !== 0 || $doc_id != $_GET['id'])
+        ) {
+            throw new Exception("Access denied", 403);
+        }
+
+        if ($_SESSION['env']) {
+            $this->env = $_SESSION['env'];
+        }
+
         return true;
     }
 
@@ -259,7 +274,7 @@
             );
 
             // Redirect all document_* actions into 'document' action
-            if (preg_match('/^(invitations|document_[a-z]+)$/', $request)) {
+            if (preg_match('/^(sessions|invitations|document_[a-z]+)$/', $request)) {
                 $request = 'document';
             }
 
@@ -375,12 +390,22 @@
 
         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);
     }
 
@@ -398,6 +423,15 @@
     }
 
     /**
+     * Find out if current request expects binary output
+     */
+    protected function is_binary_request()
+    {
+        return preg_match('/^(file_get|document)$/', $this->request)
+            && $_SERVER['REQUEST_METHOD'] == 'GET';
+    }
+
+    /**
      * Returns API version supported by the client
      */
     public function client_version()

chwala-0.4.tar.gz/lib/file_api_core.php -> chwala-0.5.tar.gz/lib/file_api_core.php Changed

@@ -24,7 +24,7 @@
 
 class file_api_core extends file_locale
 {
-    const API_VERSION = 2;
+    const API_VERSION = 3;
 
     const ERROR_CODE    = 500;
     const ERROR_INVALID = 501;
@@ -232,14 +232,29 @@
         }
 
         // Manticore support
-        if ($manticore = $rcube->config->get('fileapi_manticore')) {
+        if ($rcube->config->get('fileapi_manticore')) {
             $caps['MANTICORE'] = true;
         }
 
+        // WOPI support
+        if ($rcube->config->get('fileapi_wopi_office')) {
+            $caps['WOPI'] = 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);
 
@@ -294,8 +309,10 @@
      */
     protected function supported_mimetypes()
     {
-        $mimetypes = array();
-        $dir       = __DIR__ . '/viewers';
+        $rcube       = rcube::get_instance();
+        $mimetypes   = array();
+        $mimetypes_c = array();
+        $dir         = __DIR__ . '/viewers';
 
         if ($handle = opendir($dir)) {
             while (false !== ($file = readdir($handle))) {
@@ -304,13 +321,38 @@
                     $class  = 'file_viewer_' . $matches[1];
                     $viewer = new $class($this);
 
-                    $mimetypes = array_merge($mimetypes, $viewer->supported_mimetypes());
+                    if ($supported = $viewer->supported_mimetypes()) {
+                        $mimetypes = array_merge($mimetypes, $supported);
+                    }
                 }
             }
             closedir($handle);
         }
 
-        return $mimetypes;
+        // 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,
+        );
     }
 
     /**

chwala-0.5.tar.gz/lib/file_document.php Added

@@ -0,0 +1,864 @@
+<?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
+
+
+    /**
+     * 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();
+        $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->fromunixtime($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 (?, ?, ?, ?, ?, " . $db->now() . ")",
+            $session_id, $user, $user_name, $status, $comment ?: '');
+
+        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` = " . $db->now()
+            . " WHERE `session_id` = ? AND `user` = ?",
+            $status, $comment ?: '', $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 $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'];
+    }
+}

chwala-0.4.tar.gz/lib/file_locale.php -> chwala-0.5.tar.gz/lib/file_locale.php Changed

chwala-0.4.tar.gz/lib/file_manticore.php -> chwala-0.5.tar.gz/lib/file_manticore.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-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 |
@@ -23,240 +23,40 @@
 */
 
 /**
- * Document editing sessions handling
+ * Document editing sessions handling (Manticore)
  */
-class file_manticore
+class file_manticore extends file_document
 {
-    protected $api;
-    protected $rc;
     protected $request;
-    protected $user;
-    protected $sessions_table    = 'chwala_sessions';
-    protected $invitations_table = 'chwala_invitations';
-    protected $icache            = array();
 
-    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
-
-
-    /**
-     * Class constructor
-     *
-     * @param file_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);
-    }
 
     /**
      * 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, &$session_id = null)
+    public function session_start($file, &$file_info, &$session_id = null, $readonly = false)
     {
-        if ($file !== null) {
-            list($driver, $path) = $this->api->get_driver($file);
-            $uri = $driver->path2uri($path);
-        }
-
-        $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);
-                }
-            }
-
-            // authenticate to Manticore, we need auth token for frame_uri
-            $req = $this->get_request();
+        parent::session_start($file, $file_info, $session_id, $readonly);
 
-            // @TODO: make sure the session exists in Manticore?
+        // authenticate to Manticore, we need auth token for frame_uri
+        if (empty($_SESSION['manticore_token'])) {
+            $this->get_request();
         }
-        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` = ?", $this->user, $uri);
-
-            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));
-                $data       = array();
-                $owner      = $this->user;
-
-                // 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);
-            }
 
-            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);
-        }
+        // @TODO: make sure the session exists in Manticore?
 
         return $this->frame_uri($session_id);
     }
 
     /**
-     * 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 string File path
-     * @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);
-            }
-        }
-
-        return $path;
-    }
-
-    /**
-     * 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
-        list($driver, $path) = $this->api->get_driver($path);
-
-        $uri = trim($driver->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 `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
@@ -264,12 +64,7 @@
      */
     public function session_delete($id, $local = false)
     {
-        $db     = $this->rc->get_dbh();
-        $result = $db->query("DELETE FROM `{$this->sessions_table}`"
-            . " WHERE `id` = ? AND `owner` = ?",
-            $id, $this->user);
-
-        $success = $db->affected_rows($result) > 0;
+        $success = parent::session_delete($id, $local);
 
         // Send document delete to Manticore
         if ($success && !$local) {
@@ -283,20 +78,9 @@
     /**
      * Create editing session
      */
-    protected function session_create($id, $uri, $owner, $data)
+    protected function session_create($id, $uri, $owner, $data, $readonly = false)
     {
-        // get user name
-        $owner_name = $this->api->resolve_user($owner) ?: '';
-
-        // Do this before starting the session in Manticore,
-        // it will immediately call api/document to get the file body
-        $db     = $this->rc->get_dbh();
-        $result = $db->query("INSERT INTO `{$this->sessions_table}`"
-            . " (`id`, `uri`, `owner`, `owner_name`, `data`)"
-            . " VALUES (?, ?, ?, ?, ?)",
-            $id, $uri, $owner, $owner_name, json_encode($data));
-
-        $success = $db->affected_rows($result) > 0;
+        $success = parent::session_create($id, $uri, $owner, $data, $readonly);
 
         // create the session in Manticore
         if ($success) {
@@ -322,114 +106,6 @@
     }
 
     /**
-     * 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->fromunixtime($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 `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
@@ -442,55 +118,18 @@
      */
     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);
-        }
+        parent::invitation_create($session_id, $user, $status, $comment, $user_name);
 
         // Update Manticore 'access' array
-        if ($status == self::STATUS_INVITED) {
+        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);
             }
         }
-
-        // 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 (?, ?, ?, ?, ?, " . $db->now() . ")",
-            $session_id, $user, $user_name, $status, $comment ?: '');
-
-        if (!$db->affected_rows($result)) {
-            throw new Exception("Failed to create an invitation.", file_api_core::ERROR_CODE);
-        }
     }
 
     /**
@@ -498,27 +137,22 @@
      *
      * @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)
+    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);
-        }
+        parent::invitation_delete($session_id, $user, $local);
 
         // Update Manticore 'access' array
-        $req = $this->get_request();
-        $res = $req->editor_delete($session_id, $user);
+        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);
+            if (!$res) {
+                throw new Exception("Failed to remove an invitation.", file_api_core::ERROR_CODE);
+            }
         }
     }
 
@@ -534,42 +168,10 @@
      */
     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` = " . $db->now()
-            . " WHERE `session_id` = ? AND `user` = ?",
-            $status, $comment ?: '', $session_id, $user);
-
-        if (!$db->affected_rows($result)) {
-            throw new Exception("Failed to update an invitation status.", file_api_core::ERROR_CODE);
-        }
+        parent::invitation_update($session_id, $user, $status, $comment);
 
         // Update Manticore 'access' array if an owner accepted an invitation request
-        if ($status == self::STATUS_ACCEPTED_OWNER) {
+        if ($status == file_document::STATUS_ACCEPTED_OWNER) {
             $req = $this->get_request();
             $res = $req->editor_add($session_id, $user, file_manticore_api::ACCESS_WRITE);
 
@@ -580,39 +182,17 @@
     }
 
     /**
-     * Parse session info data
+     * List supported mimetypes
+     *
+     * @param bool $editable Return only editable mimetypes
+     *
+     * @return array List of supported mimetypes
      */
-    protected function session_info_parse($record, $path = null, $filter = array())
+    public function supported_filetypes($editable = false)
     {
-/*
-        if (is_string($data) && !empty($data)) {
-            $data = json_decode($data, true);
-        }
-*/
-        $session = array();
-        $fields  = array('id', 'uri', 'owner', 'owner_name');
-
-        foreach ($fields as $field) {
-            if (isset($record[$field])) {
-                $session[$field] = $record[$field];
-            }
-        }
-
-        if ($path) {
-            $session['file'] = $path;
-        }
-
-        // @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;
+        return array(
+            'application/vnd.oasis.opendocument.text',
+        );
     }
 
     /**
@@ -626,37 +206,6 @@
     }
 
     /**
-     * Get file path from the URI
-     */
-    protected function uri2path($uri)
-    {
-        $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
-            }
-        }
-    }
-
-    /**
      * Initialize Manticore API request handler
      */
     protected function get_request()

chwala-0.4.tar.gz/lib/file_ui.php -> chwala-0.5.tar.gz/lib/file_ui.php Changed

chwala-0.4.tar.gz/lib/file_viewer.php -> chwala-0.5.tar.gz/lib/file_viewer.php Changed

chwala-0.5.tar.gz/lib/file_wopi.php Added

@@ -0,0 +1,313 @@
+<?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 (WOPI)
+ */
+class file_wopi extends file_document
+{
+    protected $cache;
+
+    // Mimetypes supported by CODE, but not advertised by all possible names
+    protected $aliases = array(
+        'application/vnd.corel-draw' => 'image/x-coreldraw',
+    );
+
+    /**
+     * 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);
+        }
+
+        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  = rtrim($this->rc->config->get('fileapi_wopi_service'), ' /'); // kolab-wopi
+        $service_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($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, true);
+        }
+
+        // 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, true);
+        }
+
+        $this->save_in_cache($cache_key, $result);
+
+        return $this->apply_aliases($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) {
+            $cache = $this->rc->get_cache_shared('chwala');
+            $this->cache = $cache ?: false;
+        }
+
+        return $this->cache;
+    }
+
+    /**
+     * Support more mimetypes in CODE capabilities
+     */
+    protected function apply_aliases($caps)
+    {
+        foreach ($this->aliases as $type => $alias) {
+            if (isset($caps[$type]) && !isset($caps[$alias])) {
+                $caps[$alias] = $caps[$type];
+            }
+        }
+
+        return $caps;
+    }
+}

chwala-0.4.tar.gz/lib/locale/en_US.php -> chwala-0.5.tar.gz/lib/locale/en_US.php Changed

chwala-0.5.tar.gz/lib/templates/empty.odp Added

chwala-0.5.tar.gz/lib/templates/empty.ods Added

chwala-0.5.tar.gz/lib/viewers/doc Added

chwala-0.5.tar.gz/lib/viewers/doc.php Added

@@ -0,0 +1,133 @@
+<?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 file_utils::script_uri() . '?method=file_get'
+            . '&viewer=doc'
+            . '&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)
+     */
+    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;
+    }
+}

chwala-0.5.tar.gz/lib/viewers/doc/file_editor.js Added

chwala-0.4.tar.gz/lib/viewers/image.php -> chwala-0.5.tar.gz/lib/viewers/image.php Changed

chwala-0.4.tar.gz/lib/viewers/odf.php -> chwala-0.5.tar.gz/lib/viewers/odf.php Changed

chwala-0.4.tar.gz/lib/viewers/text.php -> chwala-0.5.tar.gz/lib/viewers/text.php Changed

chwala-0.4.tar.gz/public_html/js/files_api.js -> chwala-0.5.tar.gz/public_html/js/files_api.js Changed

@@ -67,13 +67,6 @@
       return label;
   };
 
-  // print a message into browser console
-  this.log = function(msg)
-  {
-    if (window.console && console.log)
-      console.log(msg);
-  };
-
   /********************************************************/
   /*********        Remote request methods        *********/
   /********************************************************/
@@ -91,7 +84,7 @@
       type: 'POST', url: url, data: JSON.stringify(data), dataType: 'json',
       contentType: 'application/json; charset=utf-8',
       success: function(response) { if (typeof func == 'function') func(response); else ref[func](response); },
-      error: function(o, status, err) { ref.http_error(o, status, err); },
+      error: function(o, status, err) { ref.http_error(o, status, err, data); },
       cache: false,
       beforeSend: function(xmlhttp) { xmlhttp.setRequestHeader('X-Session-Token', ref.env.token); }
     });
@@ -110,7 +103,7 @@
     return $.ajax({
       type: 'GET', url: url, data: data, dataType: 'json',
       success: function(response) { if (typeof func == 'function') func(response); else ref[func](response); },
-      error: function(o, status, err) { ref.http_error(o, status, err); },
+      error: function(o, status, err) { ref.http_error(o, status, err, data); },
       cache: false,
       beforeSend: function(xmlhttp) { xmlhttp.setRequestHeader('X-Session-Token', ref.env.token); }
     });
@@ -125,7 +118,7 @@
   };
 
   // handle HTTP request errors
-  this.http_error = function(request, status, err)
+  this.http_error = function(request, status, err, data)
   {
     var errmsg = request.statusText;
 
@@ -404,9 +397,12 @@
     if (!type)
       return '';
 
-    type = type.replace(/[^a-z0-9]/g, '_');
+    var classes = [];
 
-    return type;
+    classes.push(type.replace(/\/.*/, ''));
+    classes.push(type.replace(/[^a-z0-9]/g, '_'));
+
+    return classes.join(' ');
   };
 
   // convert bytes into number with size unit
@@ -468,18 +464,37 @@
 
   // Checks if specified mimetype is supported natively by the browser (return 1)
   // or can be displayed in the browser using File API viewer (return 2)
-  // or is editable (using File API viewer or Manticore) (return 4)
+  // or is editable (using File API viewer, Manticore or WOPI) (return 4)
   this.file_type_supported = function(type, capabilities)
   {
     var i, t, res = 0, regexps = [], img = 'jpg|jpeg|gif|bmp|png',
       caps = this.env.browser_capabilities || {},
       doc = /^application\/vnd.oasis.opendocument.(text)$/i;
 
-    // Manticore?
-    if (capabilities && capabilities.MANTICORE && doc.test(type))
-      res |= 4;
+    type = String(type).toLowerCase();
+
+    if (capabilities) {
+      // Manticore?
+      $.each(capabilities.MANTICORE_EDITABLE || [], function() {
+        if (type == this) {
+          res |= 4;
+          return false;
+        }
+      });
+      // old version of the check
+      if (capabilities && capabilities.MANTICORE && doc.test(type))
+        res |= 4;
+
+      // WOPI (Collabora Online)?
+      $.each(capabilities.WOPI_EDITABLE || [], function() {
+        if (type == this) {
+          res |= 4;
+          return false;
+        }
+      });
+    }
 
-    if (caps.tif)
+    if (caps.tiff)
       img += '|tiff';
 
     if ((new RegExp('^image/(' + img + ')$', 'i')).test(type))
@@ -517,7 +532,7 @@
   // Return browser capabilities
   this.browser_capabilities = function()
   {
-    var i, caps = [], ctypes = ['pdf', 'flash', 'tif'];
+    var i, caps = [], ctypes = ['pdf', 'flash', 'tiff'];
 
     for (i in ctypes)
       if (this.env.browser_capabilities[ctypes[i]])
@@ -538,17 +553,17 @@
     if (this.env.browser_capabilities.flash === undefined)
       this.env.browser_capabilities.flash = this.flash_support_check();
 
-    if (this.env.browser_capabilities.tif === undefined)
-      this.tif_support_check();
+    if (this.env.browser_capabilities.tiff === undefined)
+      this.tiff_support_check();
   };
 
-  this.tif_support_check = function()
+  this.tiff_support_check = function()
   {
     var img = new Image(), ref = this;
 
-    img.onload = function() { ref.env.browser_capabilities.tif = 1; };
-    img.onerror = function() { ref.env.browser_capabilities.tif = 0; };
-    img.src = this.env.resources_dir + '/blank.tif';
+    img.onload = function() { ref.env.browser_capabilities.tiff = 1; };
+    img.onerror = function() { ref.env.browser_capabilities.tiff = 0; };
+    img.src = this.env.resources_dir + '/blank.tiff';
   };
 
   this.pdf_support_check = function()
@@ -642,15 +657,17 @@
 };
 
 /**
- * Class implementing Manticore Client API
+ * Class implementing Document Editor Host API
+ * supporting Manticore and Collabora Online
  *
  * Configuration:
- *    iframe - manticore iframe element
+ *    iframe - editor iframe element
  *    title_input - document title element
  *    export_menu - export formats list
  *    members_list - collaborators list
  *    photo_url - <img> src for a collaborator
  *    photo_default_url - default image of a collaborator
+ *    domain - iframe origin
  *
  *    set_busy, display_message, hide_message, gettext - common methods
  *
@@ -661,9 +678,10 @@
  *    invitationChange - method to handle invitation state updates
  *    invitationSave - method to handle invitation state update
  */
-function manticore_api(conf)
+function document_editor_api(conf)
 {
-  var domain, manticore,
+  var domain, editor,
+    is_wopi = false,
     locks = {},
     callbacks = {},
     members = {},
@@ -702,15 +720,18 @@
     return label;
   };
 
-  // Handle messages from Manticore
+  // Handle messages from the editor
   this.message_handler = function(data)
   {
     var result;
 
-    console.log(data);
+    data = this.message_convert(data);
 
-    if (callbacks[data.id])
+    if (data.id && callbacks[data.id])
       result = callbacks[data.id](data);
+    else if (typeof data.callback == 'function')
+      result = data.callback(data);
+
     if (result !== false && data.name && conf[data.name])
       result = conf[data.name](data);
 
@@ -743,7 +764,7 @@
 
       case 'memberRemoved':
         // @TODO: display notification?
-        if (conf.members_list) {
+        if (conf.members_list && members[data.memberId]) {
           $('#' + members[data.memberId].id, conf.members_list).remove();
           delete members[data.memberId];
         }
@@ -755,8 +776,111 @@
     }
   };
 
+  // Convert WOPI postMessage into internal (Manticore) format
+  this.message_convert = function(data)
+  {
+    // In WOPI data is JSON-stringified
+    if ($.type(data) == 'string')
+      data = JSON.parse(data);
+
+    // non-WOPI format
+    if (!data.MessageId)
+      return data;
+
+    var value = data.Values,
+      result = {name: data.MessageId, wopi: true, id: data.MessageId},
+      member_fn = function(value) {
+        var color = value.Color;
+
+        // make sure color is in css hex format
+        if (color) {
+          if ($.type(color) == 'string' && color.charAt(0) != '#')
+            color = '#' + color;
+          else if ($.type(color) == 'number')
+            color = ((color)>>>0).toString(16).slice(-6);
+            color = '#' + ("000000").substring(0, 6 - color.length) + color;
+        }
+
+        return {
+          memberId: value.ViewId,
+          email: value.UserId,
+          fullName: value.UserName,
+          color: color
+        };
+      };
+
+    switch (result.name) {
+      // WOPI editor is ready
+      case 'App_LoadingStatus':
+        is_wopi = true;
+        result.name = 'ready';
+        // Enable Save button, there's no documentChanged event in WOPI
+        if (typeof conf.documentChanged == 'function')
+          conf.documentChanged();
+        break;
+
+      // WOPI session member exited
+      case 'View_Removed':
+        result.name = 'memberRemoved';
+        result.memberId = value.ViewId;
+        break;
+
+      // WOPI session member entered
+      case 'View_Added':
+        result.name = 'memberAdded';
+        $.extend(result, member_fn(value));
+        break;
+
+      // Listing WOPI session members
+      case 'Get_Views_Resp':
+        result.list = $.map(value || [], member_fn);
+        result.callback = function(data) { self.members_list(data.list); return false; };
+        break;
+
+      case 'Session_Closed':
+        result.name = 'sessionClosed';
+        break;
+
+      case 'Get_Export_Formats_Resp':
+        result.list = $.map(value || [], function(v) { return {label: v.Label, format: v.Format}; });
+        result.callback = function(data) { self.export_menu_init(data.list); return false; };
+        break;
+    }
+
+    return result;
+  };
+
+  // Sends Manticore postMessage
   this.post = function(action, data, callback, lock_label)
   {
+    if (is_wopi) {
+      // replace Manticore messages with WOPI messages
+      // ignore unsupported functionality
+      switch (action) {
+        case 'getMembers':
+          // ignore, Collabora Online sends View_Added for current user
+          break;
+
+        case 'actionSave':
+          this.wopi_post('Action_Save', {DontTerminateEdit: true, DontSaveIfUnmodified: true});
+
+          // Enable Save button, there's no documentChanged event in WOPI
+          if (typeof conf.documentChanged == 'function')
+            conf.documentChanged();
+          break;
+
+        case 'ActionExport':
+          this.wopi_post('Action_Export', {Format: data.value});
+          break;
+
+        case 'getExportFormats':
+          this.wopi_post('Get_Export_Formats');
+          break;
+      }
+
+      return;
+    }
+
     if (!data) data = {};
 
     if (lock_label) {
@@ -775,11 +899,22 @@
 
     callbacks[data.id] = callback;
 
-    console.log(data);
+    editor.postMessage(data, domain);
+  };
+
+  // Sends WOPI postMessage
+  this.wopi_post = function(action, data)
+  {
+    var msg = {
+        MessageId: action,
+        SendTime: Date.now(),
+        Values: data || {}
+      };
 
-    manticore.postMessage(data, domain);
+    editor.postMessage(JSON.stringify(msg), domain);
   };
 
+  // Callback for 'ready' message
   this.ready = function()
   {
     if (this.init_lock) {
@@ -792,13 +927,7 @@
       this.export_menu(conf.export_menu);
 
     if (conf.members_list)
-      this.get_members(function(data) {
-        var images = [], id = (new Date).getTime();
-        $.each(data.value || [], function() {
-          images.push(self.member_item(this, id++));
-        });
-        $(conf.members_list).html('').append(images);
-      });
+      this.get_members(function(data) { self.members_list(data.value); });
 
     if (conf.title_input)
       this.get_title(function(data) {
@@ -812,6 +941,23 @@
     this.post('actionSave', {}, callback, 'saving');
   };
 
+  // Terminate session
+  this.terminate = function()
+  {
+    // we send it only to WOPI editor, Manticore session will
+    // be terminated by Chwala backend
+    if (is_wopi)
+      this.wopi_post('Close_Session');
+  };
+
+  // Print document
+  this.print = function()
+  {
+    // this is implemented only by WOPI editor
+    if (is_wopi)
+      this.wopi_post('Action_Print');
+  };
+
   // Export/download current document
   this.export = function(type, callback)
   {
@@ -821,18 +967,21 @@
   // Get supported export formats and create content of menu element
   this.export_menu = function(menu)
   {
-    this.post('getExportFormats', {}, function(data) {
-      var items = [];
-
-      $.each(data.value || [], function(i, v) {
-        items.push($('<li>').attr({role: 'menuitem'}).append(
-          $('<a>').attr({href: '#', role: 'button', tabindex: 0, 'aria-disabled': false, 'class': 'active'})
-            .text(v.label).click(function() { self.export(v.format); })
-        ));
-      });
+    this.post('getExportFormats', {}, function(data) { self.export_menu_init(data.value); });
+  };
+
+  this.export_formats_init = function(formats)
+  {
+    var items = [];
 
-      $(menu).html('').append(items);
+    $.each(formats || [], function(i, v) {
+      items.push($('<li>').attr({role: 'menuitem'}).append(
+        $('<a>').attr({href: '#', role: 'button', tabindex: 0, 'aria-disabled': false, 'class': 'active'})
+          .text(v.label).click(function() { self.export(v.format); })
+      ));
     });
+
+    $(menu).html('').append(items);
   };
 
   // Get document title
@@ -868,12 +1017,23 @@
     if (conf.photo_url) {
       img.attr('src', conf.photo_url.replace(/%email/, urlencode(member.email)));
       if (conf.photo_default_url)
-        img.error(function() { this.src = conf.photo_default_url; });
+        img.on('error', function() { this.src = conf.photo_default_url; });
     }
 
     return img;
   };
 
+  this.members_list = function(list)
+  {
+    var images = [], id = (new Date).getTime();
+
+    $.each(list || [], function() {
+      images.push(self.member_item(this, id++));
+    });
+
+    $(conf.members_list).html('').append(images);
+  };
+
   // track changes in invitations
   this.track_invitations = function()
   {
@@ -1007,16 +1167,17 @@
   if (!conf)
     conf = {};
 
-  // Got Manticore iframe, use Client API
+  // Got editor iframe, use editor's API
   if (conf.iframe) {
-    manticore = conf.iframe.contentWindow;
+    editor = conf.iframe.contentWindow;
+    domain = conf.domain;
 
-    if (/^(https?:\/\/[^/]+)/i.test(conf.iframe.src))
+    if (!domain && /^(https?:\/\/[^/]+)/i.test(conf.iframe.src))
       domain = RegExp.$1;
 
-    // Register 'message' event to receive messages from Manticore iframe
+    // Register 'message' event to receive messages from the editor iframe
     window.addEventListener('message', function(event) {
-      if (event.source == manticore && event.origin == domain) {
+      if (event.source == editor && event.origin == domain) {
         self.message_handler(event.data);
       }
     });
@@ -1027,6 +1188,8 @@
 
     // Display loading message
     this.init_lock = this.set_busy(true, 'loading');
+
+    this.wopi_post('Host_PostmessageReady');
   }
 
   if (conf.api)

chwala-0.5.tar.gz/public_html/resources/blank.tiff Changed

chwala-0.4.tar.gz/public_html/skins/default/images/mimetypes/_css.sh -> chwala-0.5.tar.gz/public_html/skins/default/images/mimetypes/_css.sh Changed

@@ -3,6 +3,17 @@
 my %aliases = (
     'application_vnd_ms_word' => [
         'application_msword',
+        'application_vnd_openxmlformats_officedocument_wordprocessingml_document',
+        'application_vnd_openxmlformats_officedocument_wordprocessingml_template',
+    ],
+    'application_vnd_ms_excel' => [
+        'application_vnd_openxmlformats_officedocument_spreadsheetml_sheet',
+        'application_vnd_openxmlformats_officedocument_spreadsheetml_template',
+    ],
+    'application_vnd_ms_powerpoint' => [
+        'application_vnd_openxmlformats_officedocument_presentationml_presentation',
+        'application_vnd_openxmlformats_officedocument_presentationml_template',
+        'application_vnd_openxmlformats_officedocument_presentationml_slideshow',
     ],
     'application_pgp_keys' => [
         'application_pkcs7_mime',
@@ -72,10 +83,10 @@
     $class =~ s/\.png$//;
     $class =~ s/[^a-z0-9_]/_/g;
 
-    $line .= "#filelist tbody td.filename." .$class . " span";
+    $line .= ".filelist tbody td.filename." .$class . " span";
 
     for my $alias (@{$aliases{$class}}) {
-        $line .= ",\n#filelist tbody td.filename." .$alias . " span";
+        $line .= ",\n.filelist tbody td.filename." .$alias . " span";
     }
 
     $line .= " {\n  background: url($file) 0 0 no-repeat;\n";

chwala-0.4.tar.gz/public_html/skins/default/images/mimetypes/style.css -> chwala-0.5.tar.gz/public_html/skins/default/images/mimetypes/style.css Changed

@@ -1,715 +1,715 @@
-#filelist tbody td.filename._css_sh span {
-  background: url(_css.sh) 0 0 no-repeat;
+.filelist tbody td.filename.application_vnd_sun_xml_calc span {
+  background: url(application_vnd.sun.xml.calc.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_illustrator span {
-  background: url(application_illustrator.png) 0 0 no-repeat;
+.filelist tbody td.filename.message_rfc822 span {
+  background: url(message_rfc822.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_octet_stream span {
-  background: url(application_octet_stream.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_illustrator span {
+  background: url(application_illustrator.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_pgp_encrypted span {
-  background: url(application_pgp_encrypted.png) 0 0 no-repeat;
+.filelist tbody td.filename.audio_ac3 span {
+  background: url(audio_ac3.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_pgp_keys span,
-#filelist tbody td.filename.application_pkcs7_mime span {
-  background: url(application_pgp_keys.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_gzdvi span {
+  background: url(application_x_gzdvi.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_pgp_signature span,
-#filelist tbody td.filename.application_pkcs7_signature span {
-  background: url(application_pgp_signature.png) 0 0 no-repeat;
+.filelist tbody td.filename.sound span {
+  background: url(sound.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_relaxng span {
-  background: url(application_relaxng.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_executable span {
+  background: url(application_x_executable.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_rss_xml span {
-  background: url(application_rss+xml.png) 0 0 no-repeat;
+.filelist tbody td.filename.wordprocessing span {
+  background: url(wordprocessing.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_rtf span {
-  background: url(application_rtf.png) 0 0 no-repeat;
+.filelist tbody td.filename.image_x_eps span {
+  background: url(image_x_eps.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_vnd_ms_excel span {
-  background: url(application_vnd.ms_excel.png) 0 0 no-repeat;
+.filelist tbody td.filename.news span {
+  background: url(news.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_vnd_ms_powerpoint span {
-  background: url(application_vnd.ms_powerpoint.png) 0 0 no-repeat;
+.filelist tbody td.filename.x_media_podcast span {
+  background: url(x_media_podcast.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_vnd_ms_word span,
-#filelist tbody td.filename.application_msword span {
-  background: url(application_vnd.ms_word.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_vnd_oasis_opendocument_spreadsheet span {
+  background: url(application_vnd.oasis.opendocument.spreadsheet.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_vnd_oasis_opendocument_chart span {
-  background: url(application_vnd.oasis.opendocument.chart.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_dtd span {
+  background: url(text_x_dtd.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_vnd_oasis_opendocument_database span {
-  background: url(application_vnd.oasis.opendocument.database.png) 0 0 no-repeat;
+.filelist tbody td.filename.txt span {
+  background: url(txt.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_vnd_oasis_opendocument_formula span {
-  background: url(application_vnd.oasis.opendocument.formula.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_xslfo span {
+  background: url(text_x_xslfo.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_vnd_oasis_opendocument_graphics span {
-  background: url(application_vnd.oasis.opendocument.graphics.png) 0 0 no-repeat;
+.filelist tbody td.filename.html span {
+  background: url(html.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_vnd_oasis_opendocument_image span {
+.filelist tbody td.filename.application_vnd_oasis_opendocument_image span {
   background: url(application_vnd.oasis.opendocument.image.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_vnd_oasis_opendocument_presentation span {
-  background: url(application_vnd.oasis.opendocument.presentation.png) 0 0 no-repeat;
+.filelist tbody td.filename.x_office_document span {
+  background: url(x_office_document.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_vnd_oasis_opendocument_presentation_template span {
-  background: url(application_vnd.oasis.opendocument.presentation_template.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_compress span {
+  background: url(application_x_compress.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_vnd_oasis_opendocument_spreadsheet span {
-  background: url(application_vnd.oasis.opendocument.spreadsheet.png) 0 0 no-repeat;
+.filelist tbody td.filename.man span {
+  background: url(man.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_vnd_oasis_opendocument_spreadsheet_template span {
-  background: url(application_vnd.oasis.opendocument.spreadsheet_template.png) 0 0 no-repeat;
+.filelist tbody td.filename.audio span {
+  background: url(audio.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_vnd_oasis_opendocument_text span {
-  background: url(application_vnd.oasis.opendocument.text.png) 0 0 no-repeat;
+.filelist tbody td.filename.font_truetype span {
+  background: url(font_truetype.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_vnd_rn_realmedia span {
-  background: url(application_vnd.rn_realmedia.png) 0 0 no-repeat;
+.filelist tbody td.filename.source_py span {
+  background: url(source_py.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_vnd_stardivision_calc span {
-  background: url(application_vnd.stardivision.calc.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_mswinurl span {
+  background: url(application_x_mswinurl.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_vnd_sun_xml_calc span {
-  background: url(application_vnd.sun.xml.calc.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_octet_stream span {
+  background: url(application_octet_stream.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_vnd_sun_xml_calc_template span {
-  background: url(application_vnd.sun.xml.calc.template.png) 0 0 no-repeat;
+.filelist tbody td.filename.folder span {
+  background: url(folder.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_applix_spreadsheet span {
-  background: url(application_x_applix_spreadsheet.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_lzop span {
+  background: url(application_x_lzop.png) 0 0 no-repeat;
+}
+.filelist tbody td.filename.text_x_pascal span {
+  background: url(text_x_pascal.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_archive span,
-#filelist tbody td.filename.application_x_ar span,
-#filelist tbody td.filename.application_x_cpio span {
+.filelist tbody td.filename.vcard span {
+  background: url(vcard.png) 0 0 no-repeat;
+}
+.filelist tbody td.filename.application_x_quattropro span {
+  background: url(application_x_quattropro.png) 0 0 no-repeat;
+}
+.filelist tbody td.filename.application_x_archive span,
+.filelist tbody td.filename.application_x_ar span,
+.filelist tbody td.filename.application_x_cpio span {
   background: url(application_x_archive.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_awk span {
-  background: url(application_x_awk.png) 0 0 no-repeat;
+.filelist tbody td.filename.audio_x_flac span {
+  background: url(audio_x_flac.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_bittorrent span {
-  background: url(application_x_bittorrent.png) 0 0 no-repeat;
+.filelist tbody td.filename.tex span {
+  background: url(tex.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_bzdvi span {
-  background: url(application_x_bzdvi.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_vnd_oasis_opendocument_chart span {
+  background: url(application_vnd.oasis.opendocument.chart.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_bzip span {
-  background: url(application_x_bzip.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_php span {
+  background: url(application_x_php.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_cd_image span {
-  background: url(application_x_cd_image.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_chdr span {
+  background: url(text_x_chdr.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_cda span {
-  background: url(application_x_cda.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_kgetlist span {
+  background: url(application_x_kgetlist.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_compress span {
-  background: url(application_x_compress.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_texinfo span {
+  background: url(text_x_texinfo.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_compressed_tar span {
-  background: url(application_x_compressed_tar.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_vnd_ms_excel span {
+  background: url(application_vnd.ms_excel.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_cue span {
-  background: url(application_x_cue.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_vnd_oasis_opendocument_graphics span {
+  background: url(application_vnd.oasis.opendocument.graphics.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_deb span {
-  background: url(application_x_deb.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_katefilelist span {
+  background: url(text_x_katefilelist.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_designer span {
-  background: url(application_x_designer.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_mimearchive span {
+  background: url(application_x_mimearchive.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_desktop span {
-  background: url(application_x_desktop.png) 0 0 no-repeat;
+.filelist tbody td.filename.midi span {
+  background: url(midi.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_egon span {
-  background: url(application_x_egon.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_vnd_rn_realmedia span {
+  background: url(application_vnd.rn_realmedia.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_executable span {
-  background: url(application_x_executable.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_deb span {
+  background: url(application_x_deb.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_executable_script span {
-  background: url(application_x_executable_script.png) 0 0 no-repeat;
+.filelist tbody td.filename.package_x_generic span {
+  background: url(package_x_generic.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_font_afm span {
-  background: url(application_x_font_afm.png) 0 0 no-repeat;
+.filelist tbody td.filename.recycled span {
+  background: url(recycled.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_font_bdf span {
-  background: url(application_x_font_bdf.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_mswrite span {
+  background: url(application_x_mswrite.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_font_otf span {
-  background: url(application_x_font_otf.png) 0 0 no-repeat;
+.filelist tbody td.filename.jar span {
+  background: url(jar.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_font_pcf span {
-  background: url(application_x_font_pcf.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_css span {
+  background: url(text_css.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_font_snf span {
+.filelist tbody td.filename.application_x_font_snf span {
   background: url(application_x_font_snf.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_font_ttf span {
-  background: url(application_x_font_ttf.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_rtf span {
+  background: url(application_rtf.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_font_type1 span {
-  background: url(application_x_font_type1.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_patch span {
+  background: url(text_x_patch.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_gnumeric span {
-  background: url(application_x_gnumeric.png) 0 0 no-repeat;
+.filelist tbody td.filename.image_png span {
+  background: url(image_png.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_gzdvi span {
-  background: url(application_x_gzdvi.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_bibtex span {
+  background: url(text_x_bibtex.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_gzip span {
-  background: url(application_x_gzip.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_csrc span {
+  background: url(text_x_csrc.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_gzpostscript span {
-  background: url(application_x_gzpostscript.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_sgml span {
+  background: url(text_sgml.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_java span {
-  background: url(application_x_java.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_vnd_oasis_opendocument_formula span {
+  background: url(application_vnd.oasis.opendocument.formula.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_java_applet span {
-  background: url(application_x_java_applet.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_tgif span {
+  background: url(application_x_tgif.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_java_archive span {
-  background: url(application_x_java_archive.png) 0 0 no-repeat;
+.filelist tbody td.filename.vectorgfx span {
+  background: url(vectorgfx.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_javascript span {
-  background: url(application_x_javascript.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_xml span {
+  background: url(text_xml.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_kcsrc span {
-  background: url(application_x_kcsrc.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_xsd span {
+  background: url(application_xsd.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_kgetlist span {
-  background: url(application_x_kgetlist.png) 0 0 no-repeat;
+.filelist tbody td.filename.x_office_contact span {
+  background: url(x_office_contact.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_kontour span {
-  background: url(application_x_kontour.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_tar span {
+  background: url(application_x_tar.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_krita span {
-  background: url(application_x_krita.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_csharp span {
+  background: url(text_x_csharp.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_lzop span {
-  background: url(application_x_lzop.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_nzb span {
+  background: url(application_x_nzb.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_marble span {
-  background: url(application_x_marble.png) 0 0 no-repeat;
+.filelist tbody td.filename.exec span {
+  background: url(exec.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_mimearchive span {
-  background: url(application_x_mimearchive.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_trash span {
+  background: url(application_x_trash.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_mplayer2 span {
-  background: url(application_x_mplayer2.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_kontour span {
+  background: url(application_x_kontour.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_ms_dos_executable span {
-  background: url(application_x_ms_dos_executable.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_vnd_oasis_opendocument_presentation_template span {
+  background: url(application_vnd.oasis.opendocument.presentation_template.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_mswinurl span {
-  background: url(application_x_mswinurl.png) 0 0 no-repeat;
+.filelist tbody td.filename.bt span {
+  background: url(bt.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_mswrite span {
-  background: url(application_x_mswrite.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_font_ttf span {
+  background: url(application_x_font_ttf.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_nzb span {
-  background: url(application_x_nzb.png) 0 0 no-repeat;
+.filelist tbody td.filename.image_jpeg2000 span {
+  background: url(image_jpeg2000.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_object span {
-  background: url(application_x_object.png) 0 0 no-repeat;
+.filelist tbody td.filename.plasmoid span {
+  background: url(plasmoid.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_pak span {
-  background: url(application_x_pak.png) 0 0 no-repeat;
+.filelist tbody td.filename.source_p span {
+  background: url(source_p.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_perl span {
-  background: url(application_x_perl.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_bzip span {
+  background: url(application_x_bzip.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_php span {
-  background: url(application_x_php.png) 0 0 no-repeat;
+.filelist tbody td.filename.ascii span {
+  background: url(ascii.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_plasma span {
-  background: url(application_x_plasma.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_directory span {
+  background: url(text_directory.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_python_bytecode span {
-  background: url(application_x_python_bytecode.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_c__hdr span {
+  background: url(text_x_c++hdr.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_quattropro span {
-  background: url(application_x_quattropro.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_python span {
+  background: url(text_x_python.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_rpm span {
-  background: url(application_x_rpm.png) 0 0 no-repeat;
+.filelist tbody td.filename.zip span {
+  background: url(zip.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_ruby span {
-  background: url(application_x_ruby.png) 0 0 no-repeat;
+.filelist tbody td.filename.x_office_calendar span {
+  background: url(x_office_calendar.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_sharedlib span {
-  background: url(application_x_sharedlib.png) 0 0 no-repeat;
+.filelist tbody td.filename.audio_x_monkey span {
+  background: url(audio_x_monkey.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_shellscript span {
-  background: url(application_x_shellscript.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_gnumeric span {
+  background: url(application_x_gnumeric.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_siag span {
-  background: url(application_x_siag.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_vcalendar span {
+  background: url(text_vcalendar.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_tar span {
-  background: url(application_x_tar.png) 0 0 no-repeat;
+.filelist tbody td.filename.krita_kra span {
+  background: url(krita_kra.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_tgif span {
-  background: url(application_x_tgif.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_objcsrc span {
+  background: url(text_x_objcsrc.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_trash span {
-  background: url(application_x_trash.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_xslt_xml span {
+  background: url(application_xslt+xml.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_troff_man span {
-  background: url(application_x_troff_man.png) 0 0 no-repeat;
+.filelist tbody td.filename.image_x_vnd_trolltech_qpicture span {
+  background: url(image_x_vnd.trolltech.qpicture.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_wmf span {
-  background: url(application_x_wmf.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_cda span {
+  background: url(application_x_cda.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_x_zerosize span {
-  background: url(application_x_zerosize.png) 0 0 no-repeat;
+.filelist tbody td.filename.spreadsheet span {
+  background: url(spreadsheet.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_xhtml_xml span {
-  background: url(application_xhtml+xml.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_javascript span {
+  background: url(application_x_javascript.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_xml span {
-  background: url(application_xml.png) 0 0 no-repeat;
+.filelist tbody td.filename.formula span {
+  background: url(formula.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_xsd span {
-  background: url(application_xsd.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_wmf span {
+  background: url(application_x_wmf.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_xslt_xml span {
-  background: url(application_xslt+xml.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_adasrc span {
+  background: url(text_x_adasrc.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.application_zip span,
-#filelist tbody td.filename.application_x_7z_compressed span,
-#filelist tbody td.filename.application_x_ace span,
-#filelist tbody td.filename.application_x_arc span,
-#filelist tbody td.filename.application_x_arj span,
-#filelist tbody td.filename.application_x_bzip_compressed_tar span,
-#filelist tbody td.filename.application_x_lha span,
-#filelist tbody td.filename.application_x_rar span,
-#filelist tbody td.filename.application_x_tarz span,
-#filelist tbody td.filename.application_x_tzo span,
-#filelist tbody td.filename.application_x_zip span,
-#filelist tbody td.filename.application_x_zoo span {
-  background: url(application_zip.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_executable_script span {
+  background: url(application_x_executable_script.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.ascii span {
-  background: url(ascii.png) 0 0 no-repeat;
+.filelist tbody td.filename.message span {
+  background: url(message.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.audio span {
-  background: url(audio.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_font_pcf span {
+  background: url(application_x_font_pcf.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.audio_ac3 span {
-  background: url(audio_ac3.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_html span {
+  background: url(text_html.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.audio_midi span,
-#filelist tbody td.filename.audio_prs_sid span {
-  background: url(audio_midi.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_vnd_abc span {
+  background: url(text_vnd.abc.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.audio_x_flac span {
-  background: url(audio_x_flac.png) 0 0 no-repeat;
+.filelist tbody td.filename.kdeprint_addprinter span {
+  background: url(kdeprint_addprinter.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.audio_x_monkey span {
-  background: url(audio_x_monkey.png) 0 0 no-repeat;
+.filelist tbody td.filename.tgz span {
+  background: url(tgz.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.audio_x_speex_ogg span {
-  background: url(audio_x_speex+ogg.png) 0 0 no-repeat;
+.filelist tbody td.filename.deb span {
+  background: url(deb.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.audio_x_wav span,
-#filelist tbody td.filename.audio_x_aiff span {
+.filelist tbody td.filename.audio_x_wav span,
+.filelist tbody td.filename.audio_x_aiff span {
   background: url(audio_x_wav.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.binary span {
-  background: url(binary.png) 0 0 no-repeat;
-}
-#filelist tbody td.filename.bt span {
-  background: url(bt.png) 0 0 no-repeat;
-}
-#filelist tbody td.filename.cdbo_list span {
-  background: url(cdbo_list.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_relaxng span {
+  background: url(application_relaxng.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.cdimage span {
-  background: url(cdimage.png) 0 0 no-repeat;
+.filelist tbody td.filename.kchart_chrt span {
+  background: url(kchart_chrt.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.cdtrack span {
-  background: url(cdtrack.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_vnd_sun_xml_calc_template span {
+  background: url(application_vnd.sun.xml.calc.template.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.colorscm span {
-  background: url(colorscm.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_vnd_oasis_opendocument_spreadsheet_template span {
+  background: url(application_vnd.oasis.opendocument.spreadsheet_template.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.deb span {
-  background: url(deb.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_ms_dos_executable span {
+  background: url(application_x_ms_dos_executable.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.document span {
-  background: url(document.png) 0 0 no-repeat;
+.filelist tbody td.filename.image span,
+.filelist tbody td.filename.application_vnd_stardivision_draw span,
+.filelist tbody td.filename.application_vnd_sun_xml_draw span,
+.filelist tbody td.filename.application_vnd_sun_xml_draw_template span {
+  background: url(image.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.drawing span {
-  background: url(drawing.png) 0 0 no-repeat;
+.filelist tbody td.filename.image_svg_xml_compressed span {
+  background: url(image_svg+xml_compressed.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.empty span {
-  background: url(empty.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_bzdvi span {
+  background: url(application_x_bzdvi.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.encrypted span {
-  background: url(encrypted.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_designer span {
+  background: url(application_x_designer.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.exe span {
-  background: url(exe.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_plasma span {
+  background: url(application_x_plasma.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.exec span {
-  background: url(exec.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_rpm span {
+  background: url(application_x_rpm.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.flv span {
+.filelist tbody td.filename.flv span {
   background: url(flv.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.folder span {
-  background: url(folder.png) 0 0 no-repeat;
+.filelist tbody td.filename.source_cpp span {
+  background: url(source_cpp.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.font_bitmap span {
-  background: url(font_bitmap.png) 0 0 no-repeat;
+.filelist tbody td.filename.vcalendar span {
+  background: url(vcalendar.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.font_truetype span {
-  background: url(font_truetype.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_awk span {
+  background: url(application_x_awk.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.font_type1 span {
-  background: url(font_type1.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_gzip span {
+  background: url(application_x_gzip.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.formula span {
-  background: url(formula.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_object span {
+  background: url(application_x_object.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.html span {
-  background: url(html.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_ldif span {
+  background: url(text_x_ldif.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.image span,
-#filelist tbody td.filename.application_vnd_stardivision_draw span,
-#filelist tbody td.filename.application_vnd_sun_xml_draw span,
-#filelist tbody td.filename.application_vnd_sun_xml_draw_template span {
-  background: url(image.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_enriched span,
+.filelist tbody td.filename.text_rtf span {
+  background: url(text_enriched.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.image_jpeg2000 span {
-  background: url(image_jpeg2000.png) 0 0 no-repeat;
+.filelist tbody td.filename.kget_list span {
+  background: url(kget_list.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.image_png span {
-  background: url(image_png.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_marble span {
+  background: url(application_x_marble.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.image_svg_xml span {
-  background: url(image_svg+xml.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_cue span {
+  background: url(application_x_cue.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.image_svg_xml_compressed span {
-  background: url(image_svg+xml_compressed.png) 0 0 no-repeat;
+.filelist tbody td.filename.font_bitmap span {
+  background: url(font_bitmap.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.image_x_eps span {
-  background: url(image_x_eps.png) 0 0 no-repeat;
+.filelist tbody td.filename.source_h span {
+  background: url(source_h.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.image_x_vnd_trolltech_qpicture span {
-  background: url(image_x_vnd.trolltech.qpicture.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_vnd_ms_word span,
+.filelist tbody td.filename.application_msword span {
+  background: url(application_vnd.ms_word.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.image_x_xfig span {
-  background: url(image_x_xfig.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_rdf span {
+  background: url(text_rdf.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.info span {
-  background: url(info.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_script span {
+  background: url(text_x_script.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.inode_directory span {
+.filelist tbody td.filename.inode_directory span {
   background: url(inode_directory.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.jar span {
-  background: url(jar.png) 0 0 no-repeat;
-}
-#filelist tbody td.filename.java_jar span {
-  background: url(java_jar.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_tcl span {
+  background: url(text_x_tcl.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.kchart_chrt span {
-  background: url(kchart_chrt.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_objchdr span {
+  background: url(text_x_objchdr.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.kdeprint_addprinter span {
-  background: url(kdeprint_addprinter.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_font_bdf span {
+  background: url(application_x_font_bdf.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.kget_list span {
-  background: url(kget_list.png) 0 0 no-repeat;
+.filelist tbody td.filename.drawing span {
+  background: url(drawing.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.krita_kra span {
-  background: url(krita_kra.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_java span {
+  background: url(text_x_java.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.kwordquiz_do span {
-  background: url(kwordquiz_do.png) 0 0 no-repeat;
+.filelist tbody td.filename.x_office_address_book span {
+  background: url(x_office_address_book.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.make span {
-  background: url(make.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_csv span {
+  background: url(text_csv.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.man span {
-  background: url(man.png) 0 0 no-repeat;
+.filelist tbody td.filename.source_java span {
+  background: url(source_java.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.message span {
-  background: url(message.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_rss_xml span {
+  background: url(application_rss+xml.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.message_news span {
-  background: url(message_news.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_pgp_keys span,
+.filelist tbody td.filename.application_pkcs7_mime span {
+  background: url(application_pgp_keys.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.message_rfc822 span {
-  background: url(message_rfc822.png) 0 0 no-repeat;
+.filelist tbody td.filename.cdbo_list span {
+  background: url(cdbo_list.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.midi span {
-  background: url(midi.png) 0 0 no-repeat;
+.filelist tbody td.filename.exe span {
+  background: url(exe.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.msi span {
-  background: url(msi.png) 0 0 no-repeat;
+.filelist tbody td.filename.binary span {
+  background: url(binary.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.news span {
-  background: url(news.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_vnd_oasis_opendocument_text span {
+  background: url(application_vnd.oasis.opendocument.text.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.odf span {
-  background: url(odf.png) 0 0 no-repeat;
+.filelist tbody td.filename.msi span {
+  background: url(msi.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.package_x_generic span {
-  background: url(package_x_generic.png) 0 0 no-repeat;
+.filelist tbody td.filename.font_type1 span {
+  background: url(font_type1.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.pdf span,
-#filelist tbody td.filename.application_pdf span {
-  background: url(pdf.png) 0 0 no-repeat;
+.filelist tbody td.filename.source_c span {
+  background: url(source_c.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.plasmoid span {
-  background: url(plasmoid.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_kcsrc span {
+  background: url(application_x_kcsrc.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.postscript span {
-  background: url(postscript.png) 0 0 no-repeat;
+.filelist tbody td.filename.encrypted span {
+  background: url(encrypted.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.presentation span {
-  background: url(presentation.png) 0 0 no-repeat;
+.filelist tbody td.filename.tar span {
+  background: url(tar.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.recycled span {
-  background: url(recycled.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_desktop span {
+  background: url(application_x_desktop.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.rpm span {
-  background: url(rpm.png) 0 0 no-repeat;
+.filelist tbody td.filename.image_x_xfig span {
+  background: url(image_x_xfig.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.shellscript span {
-  background: url(shellscript.png) 0 0 no-repeat;
+.filelist tbody td.filename._css_sh span {
+  background: url(_css.sh) 0 0 no-repeat;
 }
-#filelist tbody td.filename.sound span {
-  background: url(sound.png) 0 0 no-repeat;
+.filelist tbody td.filename.odf span {
+  background: url(odf.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.source span {
-  background: url(source.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_xmcd span {
+  background: url(text_xmcd.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.source_c span {
-  background: url(source_c.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_tex span {
+  background: url(text_x_tex.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.source_cpp span {
-  background: url(source_cpp.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_java_archive span {
+  background: url(application_x_java_archive.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.source_h span {
-  background: url(source_h.png) 0 0 no-repeat;
+.filelist tbody td.filename.document span {
+  background: url(document.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.source_java span {
-  background: url(source_java.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_font_afm span {
+  background: url(application_x_font_afm.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.source_p span {
-  background: url(source_p.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_zerosize span {
+  background: url(application_x_zerosize.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.source_php span {
-  background: url(source_php.png) 0 0 no-repeat;
+.filelist tbody td.filename.colorscm span {
+  background: url(colorscm.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.source_pl span {
-  background: url(source_pl.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_vcard span {
+  background: url(text_x_vcard.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.source_py span {
-  background: url(source_py.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_vnd_wap_wml span {
+  background: url(text_vnd.wap.wml.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.spreadsheet span {
-  background: url(spreadsheet.png) 0 0 no-repeat;
+.filelist tbody td.filename.cdimage span {
+  background: url(cdimage.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.style_css span {
-  background: url(style.css) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_hex span {
+  background: url(text_x_hex.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.tar span {
-  background: url(tar.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_egon span {
+  background: url(application_x_egon.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.tex span {
-  background: url(tex.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_generic span {
+  background: url(text_x_generic.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text span {
-  background: url(text.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_java span {
+  background: url(application_x_java.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_calendar span {
-  background: url(text_calendar.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_plain span {
+  background: url(text_plain.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_css span {
-  background: url(text_css.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_python_bytecode span {
+  background: url(application_x_python_bytecode.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_csv span {
-  background: url(text_csv.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_font_type1 span {
+  background: url(application_x_font_type1.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_directory span {
-  background: url(text_directory.png) 0 0 no-repeat;
+.filelist tbody td.filename.source_php span {
+  background: url(source_php.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_enriched span,
-#filelist tbody td.filename.text_rtf span {
-  background: url(text_enriched.png) 0 0 no-repeat;
+.filelist tbody td.filename.x_office_spreadsheet span {
+  background: url(x_office_spreadsheet.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_html span {
-  background: url(text_html.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_siag span {
+  background: url(application_x_siag.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_mathml span {
-  background: url(text_mathml.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_vnd_oasis_opendocument_presentation span {
+  background: url(application_vnd.oasis.opendocument.presentation.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_plain span {
-  background: url(text_plain.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_troff_man span {
+  background: url(application_x_troff_man.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_rdf span {
-  background: url(text_rdf.png) 0 0 no-repeat;
+.filelist tbody td.filename.widget_doc span {
+  background: url(widget_doc.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_sgml span {
-  background: url(text_sgml.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_krita span {
+  background: url(application_x_krita.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_troff span {
-  background: url(text_troff.png) 0 0 no-repeat;
+.filelist tbody td.filename.shellscript span {
+  background: url(shellscript.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_vcalendar span {
-  background: url(text_vcalendar.png) 0 0 no-repeat;
+.filelist tbody td.filename.rpm span {
+  background: url(rpm.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_vnd_abc span {
-  background: url(text_vnd.abc.png) 0 0 no-repeat;
+.filelist tbody td.filename.uri_mms span,
+.filelist tbody td.filename.uri_mmst span,
+.filelist tbody td.filename.uri_mmsu span,
+.filelist tbody td.filename.uri_pnm span,
+.filelist tbody td.filename.uri_rtspt span,
+.filelist tbody td.filename.uri_rtspu span {
+  background: url(uri_mms.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_vnd_wap_wml span {
-  background: url(text_vnd.wap.wml.png) 0 0 no-repeat;
+.filelist tbody td.filename.java_jar span {
+  background: url(java_jar.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_adasrc span {
-  background: url(text_x_adasrc.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_font_otf span {
+  background: url(application_x_font_otf.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_bibtex span {
-  background: url(text_x_bibtex.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_mathml span {
+  background: url(text_mathml.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_c__hdr span {
-  background: url(text_x_c++hdr.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_vnd_stardivision_calc span {
+  background: url(application_vnd.stardivision.calc.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_c__src span {
-  background: url(text_x_c++src.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_calendar span {
+  background: url(text_calendar.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_chdr span {
-  background: url(text_x_chdr.png) 0 0 no-repeat;
+.filelist tbody td.filename.kwordquiz_do span {
+  background: url(kwordquiz_do.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_csharp span {
-  background: url(text_x_csharp.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_pak span {
+  background: url(application_x_pak.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_csrc span {
-  background: url(text_x_csrc.png) 0 0 no-repeat;
+.filelist tbody td.filename.message_news span {
+  background: url(message_news.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_dtd span {
-  background: url(text_x_dtd.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_pgp_encrypted span {
+  background: url(application_pgp_encrypted.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_generic span {
-  background: url(text_x_generic.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_makefile span {
+  background: url(text_x_makefile.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_hex span {
-  background: url(text_x_hex.png) 0 0 no-repeat;
+.filelist tbody td.filename.source span {
+  background: url(source.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_java span {
-  background: url(text_x_java.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_mplayer2 span {
+  background: url(application_x_mplayer2.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_katefilelist span {
-  background: url(text_x_katefilelist.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_shellscript span {
+  background: url(application_x_shellscript.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_ldif span {
-  background: url(text_x_ldif.png) 0 0 no-repeat;
+.filelist tbody td.filename.unknown span {
+  background: url(unknown.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_makefile span {
-  background: url(text_x_makefile.png) 0 0 no-repeat;
+.filelist tbody td.filename.postscript span {
+  background: url(postscript.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_objchdr span {
-  background: url(text_x_objchdr.png) 0 0 no-repeat;
+.filelist tbody td.filename.style_css span {
+  background: url(style.css) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_objcsrc span {
-  background: url(text_x_objcsrc.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_cd_image span {
+  background: url(application_x_cd_image.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_pascal span {
-  background: url(text_x_pascal.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_xml span {
+  background: url(application_xml.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_patch span {
-  background: url(text_x_patch.png) 0 0 no-repeat;
+.filelist tbody td.filename.source_pl span {
+  background: url(source_pl.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_python span {
-  background: url(text_x_python.png) 0 0 no-repeat;
+.filelist tbody td.filename.cdtrack span {
+  background: url(cdtrack.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_script span {
-  background: url(text_x_script.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_vnd_ms_powerpoint span {
+  background: url(application_vnd.ms_powerpoint.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_tcl span {
-  background: url(text_x_tcl.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_zip span,
+.filelist tbody td.filename.application_x_7z_compressed span,
+.filelist tbody td.filename.application_x_ace span,
+.filelist tbody td.filename.application_x_arc span,
+.filelist tbody td.filename.application_x_arj span,
+.filelist tbody td.filename.application_x_bzip_compressed_tar span,
+.filelist tbody td.filename.application_x_lha span,
+.filelist tbody td.filename.application_x_rar span,
+.filelist tbody td.filename.application_x_tarz span,
+.filelist tbody td.filename.application_x_tzo span,
+.filelist tbody td.filename.application_x_zip span,
+.filelist tbody td.filename.application_x_zoo span {
+  background: url(application_zip.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_tex span {
-  background: url(text_x_tex.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_xhtml_xml span {
+  background: url(application_xhtml+xml.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_texinfo span {
-  background: url(text_x_texinfo.png) 0 0 no-repeat;
+.filelist tbody td.filename.audio_midi span,
+.filelist tbody td.filename.audio_prs_sid span {
+  background: url(audio_midi.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_vcard span {
-  background: url(text_x_vcard.png) 0 0 no-repeat;
+.filelist tbody td.filename.presentation span {
+  background: url(presentation.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_x_xslfo span {
-  background: url(text_x_xslfo.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_ruby span {
+  background: url(application_x_ruby.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_xmcd span {
-  background: url(text_xmcd.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_pgp_signature span,
+.filelist tbody td.filename.application_pkcs7_signature span {
+  background: url(application_pgp_signature.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.text_xml span {
-  background: url(text_xml.png) 0 0 no-repeat;
+.filelist tbody td.filename.empty span {
+  background: url(empty.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.tgz span {
-  background: url(tgz.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_applix_spreadsheet span {
+  background: url(application_x_applix_spreadsheet.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.txt span {
-  background: url(txt.png) 0 0 no-repeat;
+.filelist tbody td.filename.audio_x_speex_ogg span {
+  background: url(audio_x_speex+ogg.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.unknown span {
-  background: url(unknown.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_gzpostscript span {
+  background: url(application_x_gzpostscript.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.uri_mms span,
-#filelist tbody td.filename.uri_mmst span,
-#filelist tbody td.filename.uri_mmsu span,
-#filelist tbody td.filename.uri_pnm span,
-#filelist tbody td.filename.uri_rtspt span,
-#filelist tbody td.filename.uri_rtspu span {
-  background: url(uri_mms.png) 0 0 no-repeat;
+.filelist tbody td.filename.text span {
+  background: url(text.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.vcalendar span {
-  background: url(vcalendar.png) 0 0 no-repeat;
+.filelist tbody td.filename.video span {
+  background: url(video.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.vcard span {
-  background: url(vcard.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_java_applet span {
+  background: url(application_x_java_applet.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.vectorgfx span {
-  background: url(vectorgfx.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_vnd_oasis_opendocument_database span {
+  background: url(application_vnd.oasis.opendocument.database.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.video span {
-  background: url(video.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_x_c__src span {
+  background: url(text_x_c++src.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.widget_doc span {
-  background: url(widget_doc.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_bittorrent span {
+  background: url(application_x_bittorrent.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.wordprocessing span {
-  background: url(wordprocessing.png) 0 0 no-repeat;
+.filelist tbody td.filename.text_troff span {
+  background: url(text_troff.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.x_media_podcast span {
-  background: url(x_media_podcast.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_sharedlib span {
+  background: url(application_x_sharedlib.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.x_office_address_book span {
-  background: url(x_office_address_book.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_compressed_tar span {
+  background: url(application_x_compressed_tar.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.x_office_calendar span {
-  background: url(x_office_calendar.png) 0 0 no-repeat;
+.filelist tbody td.filename.make span {
+  background: url(make.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.x_office_contact span {
-  background: url(x_office_contact.png) 0 0 no-repeat;
+.filelist tbody td.filename.info span {
+  background: url(info.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.x_office_document span {
-  background: url(x_office_document.png) 0 0 no-repeat;
+.filelist tbody td.filename.image_svg_xml span {
+  background: url(image_svg+xml.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.x_office_spreadsheet span {
-  background: url(x_office_spreadsheet.png) 0 0 no-repeat;
+.filelist tbody td.filename.pdf span,
+.filelist tbody td.filename.application_pdf span {
+  background: url(pdf.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.xml span {
+.filelist tbody td.filename.xml span {
   background: url(xml.png) 0 0 no-repeat;
 }
-#filelist tbody td.filename.zip span {
-  background: url(zip.png) 0 0 no-repeat;
+.filelist tbody td.filename.application_x_perl span {
+  background: url(application_x_perl.png) 0 0 no-repeat;
 }

chwala.dsc Changed

debian.changelog Changed

debian.control Changed

debian.series Changed

Build Results
RPM Lint

Refresh

Comments for request 1901 0

Request History

dhoffend created request almost 8 years ago

vanmeeuwen accepted review almost 8 years ago

vanmeeuwen accepted request almost 8 years ago

Please add a comment