[Phpgroupware-cvs] property/inc/class.uis_agreement.inc.php, 1.12.2.2

[nomail]

Update of /property/inc
Modified Files:
        Branch: proposed-0_9_18-branch
          class.uis_agreement.inc.php

date: 2004/11/09 14:30:25;  author: sigurdne;  state: Exp;  lines: +6 -13

Log Message:
no message
=====================================================================
Index: property/inc/class.uis_agreement.inc.php
diff -u property/inc/class.uis_agreement.inc.php:1.12.2.1 
property/inc/class.uis_agreement.inc.php:1.12.2.2
--- property/inc/class.uis_agreement.inc.php:1.12.2.1   Fri Oct 29 18:45:17 2004
+++ property/inc/class.uis_agreement.inc.php    Tue Nov  9 14:30:25 2004
@@ -158,33 +158,26 @@
 
                        $file = $this->fakebase. SEP . 'service_agreement' . 
SEP . $id . SEP . $file_name;
 
-//echo 'file: ' . $file . '<br>';
                        if($this->bo->vfs->file_exists(array(
                                'string' => $file,
                                'relatives' => Array(RELATIVE_NONE)
                                )))
                        {
-                               $filename       = current(explode('.', 
basename($file_name)));
-
-                               $filetype       = 
$this->bo->vfs->file_type(array(
-                                                       'string' => $file,
-                                                       'relatives' => 
Array(RELATIVE_NONE)));
-
                                $size           = 
$this->bo->vfs->get_size(array(
                                                        'string' => $file,
                                                        'relatives' => 
Array(RELATIVE_NONE),
                                                        'checksubdirs' => 
True));
 
-                               $browser = CreateObject('phpgwapi.browser');
-                               
$browser->content_header($filename,$filetype,$size);
-
                                $document= $this->bo->vfs->read(array(
                                        'string' => $file,
                                        'relatives' => Array(RELATIVE_NONE)));
 
-                               echo $document;
+                               $filename       = 
basename($values['document_name']);
+                               $filetype = array_pop(explode('.', 
basename($file)));
+                               $browser = CreateObject('phpgwapi.browser');
+                               
$browser->content_header($filename,$filetype,$size);
 
-//                             flush();
+                               echo $document;
                        }
                }