plugins/kolab_files

Aleksander Machniak machniak at kolabsys.com
Fri Mar 1 18:26:13 CET 2013


 plugins/kolab_files/lib/kolab_files_engine.php |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit f5420a31160ece6f504d08325d721d270e0a5313
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Fri Mar 1 18:25:40 2013 +0100

    Make get_api_token() public, add css file with mimetype only when needed

diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index 53a2a4f..47b8299 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -73,7 +73,6 @@ class kolab_files_engine
         $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/style.css');
 
         if (!empty($template)) {
-            $this->plugin->include_stylesheet($this->url . '/skins/default/images/mimetypes/style.css');
             $this->plugin->include_script($this->url . '/js/files_api.js');
             $this->plugin->include_script('kolab_files.js');
             $this->rc->output->set_env('files_url', $this->url . '/api/');
@@ -228,6 +227,9 @@ class kolab_files_engine
 
         $this->rc->output->include_script('list.js');
 
+        // attach css rules for mimetype icons
+        $this->plugin->include_stylesheet($this->url . '/skins/default/images/mimetypes/style.css');
+
         $thead = '';
         foreach ($this->file_list_head($attrib, $a_show_cols) as $cell) {
             $thead .= html::tag('td', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);
@@ -338,7 +340,7 @@ class kolab_files_engine
     /**
      * Get API token for current user session, authenticate if needed
      */
-    protected function get_api_token()
+    public function get_api_token()
     {
         $token = $_SESSION['kolab_files_token'];
         $time  = $_SESSION['kolab_files_time'];





More information about the commits mailing list