[Fmsystem-commits] [7119] api: file management

[Sigurd Nes]

Revision: 7119
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7119
Author:   sigurdne
Date:     2011-03-15 08:49:59 +0000 (Tue, 15 Mar 2011)
Log Message:
-----------
api: file management

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.account.inc.php
    trunk/phpgwapi/inc/class.vfs_shared.inc.php

Modified: trunk/phpgwapi/inc/class.account.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.account.inc.php    2011-03-14 15:14:27 UTC (rev 
7118)
+++ trunk/phpgwapi/inc/class.account.inc.php    2011-03-15 08:49:59 UTC (rev 
7119)
@@ -861,7 +861,8 @@
                        $vals = explode(',', $config['set_quota']);
                        foreach ( $vals as $val )
                        {
-                               if ( $quota == $val * 1024 ) // compare kb to kb
+               //              if ( $quota == $val * 1024 ) // compare kb to kb
+                               if ( $quota == $val )
                                {
                                        return true;
                                }

Modified: trunk/phpgwapi/inc/class.vfs_shared.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.vfs_shared.inc.php 2011-03-14 15:14:27 UTC (rev 
7118)
+++ trunk/phpgwapi/inc/class.vfs_shared.inc.php 2011-03-15 08:49:59 UTC (rev 
7119)
@@ -585,7 +585,7 @@
                                        'nofiles'       => True
                                )
                        );
-               
+
                        if ($ls_array[0]['mime_type'])
                        {
                                $mime_type = $ls_array[0]['mime_type'];
@@ -595,7 +595,10 @@
                                $mime_type = 'text/plain';
                        }
                
-                       header('Content-type: ' . $mime_type);
+//                     header('Content-type: ' . $mime_type);
+                       $browser = CreateObject('phpgwapi.browser');
+                       
$browser->content_header($ls_array[0]['name'],$mime_type,$ls_array[0]['size']);
+
                        echo $this->read (array (
                                        'string'        =>  $data['string'],
                                        'relatives'     => $data['relatives']