Kolab Groupware OBS

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_' . $matches1;
-                    $viewer = new $class($this->api);
-
-                    if ($viewer->supports($mimetype)) {
-                        return $viewer;
-                    }
+                    $files$matches1 = $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';

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($matches1);
-        $host = $matches2;
-        $path = file_utils::decode_path($matches3);
+        $user   = rawurldecode($matches1);
+        $host   = $matches2;
+        $path   = file_utils::decode_path($matches3);
+        $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_' . $matches1;
                     $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($invitations0'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 ($invitations0'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');
+

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($invitations0'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 ($invitations0'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($invitations0'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);

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 = $capabilitiesstrtolower($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) {

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 reffunc(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 reffunc(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_capabilitiesctypesi)
@@ -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 (callbacksdata.id)
+    if (data.id && callbacksdata.id)
       result = callbacksdata.id(data);
+    else if (typeof data.callback == 'function')
+      result = data.callback(data);
+
     if (result !== false && data.name && confdata.name)
       result = confdata.name(data);
 
@@ -743,7 +764,7 @@
 
       case 'memberRemoved':
         // @TODO: display notification?
-        if (conf.members_list) {
+        if (conf.members_list && membersdata.memberId) {
           $('#' + membersdata.memberId.id, conf.members_list).remove();
           delete membersdata.memberId;
         }
@@ -755,8 +776,111 @@
     }
   };

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

chwala.dsc Changed

debian.changelog Changed

debian.control Changed

debian.series Changed

Changes of Revision 4