phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] property/inc class.uiagreement.inc.php class.ui...


From: Sigurd Nes
Subject: [Phpgroupware-cvs] property/inc class.uiagreement.inc.php class.ui...
Date: Mon, 21 May 2007 07:41:42 +0000

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   07/05/21 07:41:42

Modified files:
        inc            : class.uiagreement.inc.php 
                         class.uidocument.inc.php 
                         class.uir_agreement.inc.php 
                         class.uirequest.inc.php 
                         class.uis_agreement.inc.php 

Log message:
        file download

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiagreement.inc.php?cvsroot=phpgroupware&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uidocument.inc.php?cvsroot=phpgroupware&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uir_agreement.inc.php?cvsroot=phpgroupware&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uirequest.inc.php?cvsroot=phpgroupware&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uis_agreement.inc.php?cvsroot=phpgroupware&r1=1.39&r2=1.40

Patches:
Index: class.uiagreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiagreement.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- class.uiagreement.inc.php   26 Jan 2007 14:53:47 -0000      1.34
+++ class.uiagreement.inc.php   21 May 2007 07:41:42 -0000      1.35
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage agreement
-       * @version $Id: class.uiagreement.inc.php,v 1.34 2007/01/26 14:53:47 
sigurdne Exp $
+       * @version $Id: class.uiagreement.inc.php,v 1.35 2007/05/21 07:41:42 
sigurdne Exp $
        */
 
        /**
@@ -180,23 +180,22 @@
                                'relatives' => Array(RELATIVE_NONE)
                                )))
                        {
-
-                               $size           = 
$this->bo->vfs->get_size(array(
+                               $ls_array = $this->bo->vfs->ls (array (
                                                        'string' => $file,
                                                        'relatives' => 
Array(RELATIVE_NONE),
-                                                       'checksubdirs' => 
True));
+                                               'checksubdirs'  => False,
+                                               'nofiles'       => True
+                                       )
+                               );
 
                                $document= $this->bo->vfs->read(array(
                                        'string' => $file,
                                        'relatives' => Array(RELATIVE_NONE)));
 
-                               $filename       = 
basename($values['document_name']);
-                               $filetype = array_pop(explode('.', 
basename($file)));
                                $browser = CreateObject('phpgwapi.browser');
-                               
$browser->content_header($filename,$filetype,$size);
+                               
$browser->content_header($ls_array[0]['name'],$ls_array[0]['mime_type'],$ls_array[0]['size']);
 
                                echo $document;
-
                        }
                }
 

Index: class.uidocument.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uidocument.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- class.uidocument.inc.php    11 May 2007 08:47:40 -0000      1.21
+++ class.uidocument.inc.php    21 May 2007 07:41:42 -0000      1.22
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage document
-       * @version $Id: class.uidocument.inc.php,v 1.21 2007/05/11 08:47:40 
sigurdne Exp $
+       * @version $Id: class.uidocument.inc.php,v 1.22 2007/05/21 07:41:42 
sigurdne Exp $
        */
 
        /**
@@ -655,19 +655,20 @@
                                )))
                        {
 
-                               $size           = 
$this->bo->vfs->get_size(array(
+                               $ls_array = $this->bo->vfs->ls (array (
                                                        'string' => $file,
                                                        'relatives' => 
Array(RELATIVE_NONE),
-                                                       'checksubdirs' => 
True));
+                                               'checksubdirs'  => False,
+                                               'nofiles'       => True
+                                       )
+                               );
 
                                $document= $this->bo->vfs->read(array(
                                        'string' => $file,
                                        'relatives' => Array(RELATIVE_NONE)));
 
-                               $filename       = 
basename($values['document_name']);
-                               $filetype = array_pop(explode('.', 
basename($file)));
                                $browser = CreateObject('phpgwapi.browser');
-                               
$browser->content_header($filename,$filetype,$size);
+                               
$browser->content_header($ls_array[0]['name'],$ls_array[0]['mime_type'],$ls_array[0]['size']);
 
                                echo $document;
                        }

Index: class.uir_agreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uir_agreement.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- class.uir_agreement.inc.php 26 Jan 2007 14:53:47 -0000      1.27
+++ class.uir_agreement.inc.php 21 May 2007 07:41:42 -0000      1.28
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage agreement
-       * @version $Id: class.uir_agreement.inc.php,v 1.27 2007/01/26 14:53:47 
sigurdne Exp $
+       * @version $Id: class.uir_agreement.inc.php,v 1.28 2007/05/21 07:41:42 
sigurdne Exp $
        */
 
        /**
@@ -184,19 +184,20 @@
                                'relatives' => Array(RELATIVE_NONE)
                                )))
                        {
-                               $size           = 
$this->bo->vfs->get_size(array(
+                               $ls_array = $this->bo->vfs->ls (array (
                                                        'string' => $file,
                                                        'relatives' => 
Array(RELATIVE_NONE),
-                                                       'checksubdirs' => 
True));
+                                               'checksubdirs'  => False,
+                                               'nofiles'       => True
+                                       )
+                               );
 
                                $document= $this->bo->vfs->read(array(
                                        'string' => $file,
                                        'relatives' => Array(RELATIVE_NONE)));
 
-                               $filename       = 
basename($values['document_name']);
-                               $filetype = array_pop(explode('.', 
basename($file)));
                                $browser = CreateObject('phpgwapi.browser');
-                               
$browser->content_header($filename,$filetype,$size);
+                               
$browser->content_header($ls_array[0]['name'],$ls_array[0]['mime_type'],$ls_array[0]['size']);
 
                                echo $document;
                        }

Index: class.uirequest.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- class.uirequest.inc.php     26 Jan 2007 14:53:47 -0000      1.31
+++ class.uirequest.inc.php     21 May 2007 07:41:42 -0000      1.32
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage project
-       * @version $Id: class.uirequest.inc.php,v 1.31 2007/01/26 14:53:47 
sigurdne Exp $
+       * @version $Id: class.uirequest.inc.php,v 1.32 2007/05/21 07:41:42 
sigurdne Exp $
        */
 
        /**
@@ -128,22 +128,22 @@
                                'relatives' => Array(RELATIVE_NONE)
                                )))
                        {
-                               $size           = 
$this->bo->vfs->get_size(array(
+                               $ls_array = $this->bo->vfs->ls (array (
                                                        'string' => $file,
                                                        'relatives' => 
Array(RELATIVE_NONE),
-                                                       'checksubdirs' => 
True));
+                                               'checksubdirs'  => False,
+                                               'nofiles'       => True
+                                       )
+                               );
 
                                $document= $this->bo->vfs->read(array(
                                        'string' => $file,
                                        'relatives' => Array(RELATIVE_NONE)));
 
-                               $filename       = 
basename($values['document_name']);
-                               $filetype = array_pop(explode('.', 
basename($file)));
                                $browser = CreateObject('phpgwapi.browser');
-                               
$browser->content_header($filename,$filetype,$size);
+                               
$browser->content_header($ls_array[0]['name'],$ls_array[0]['mime_type'],$ls_array[0]['size']);
 
                                echo $document;
-
                        }
                }
 

Index: class.uis_agreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uis_agreement.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- class.uis_agreement.inc.php 26 Jan 2007 14:53:47 -0000      1.39
+++ class.uis_agreement.inc.php 21 May 2007 07:41:42 -0000      1.40
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage agreement
-       * @version $Id: class.uis_agreement.inc.php,v 1.39 2007/01/26 14:53:47 
sigurdne Exp $
+       * @version $Id: class.uis_agreement.inc.php,v 1.40 2007/05/21 07:41:42 
sigurdne Exp $
        */
 
        /**
@@ -180,19 +180,20 @@
                                'relatives' => Array(RELATIVE_NONE)
                                )))
                        {
-                               $size           = 
$this->bo->vfs->get_size(array(
+                               $ls_array = $this->bo->vfs->ls (array (
                                                        'string' => $file,
                                                        'relatives' => 
Array(RELATIVE_NONE),
-                                                       'checksubdirs' => 
True));
+                                               'checksubdirs'  => False,
+                                               'nofiles'       => True
+                                       )
+                               );
 
                                $document= $this->bo->vfs->read(array(
                                        'string' => $file,
                                        'relatives' => Array(RELATIVE_NONE)));
 
-                               $filename       = 
basename($values['document_name']);
-                               $filetype = array_pop(explode('.', 
basename($file)));
                                $browser = CreateObject('phpgwapi.browser');
-                               
$browser->content_header($filename,$filetype,$size);
+                               
$browser->content_header($ls_array[0]['name'],$ls_array[0]['mime_type'],$ls_array[0]['size']);
 
                                echo $document;
                        }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]