[Phpgroupware-cvs] CVS: property/inc class.uidrawing.inc.php,1.5,1.6

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv11897/inc

Modified Files:
        class.uidrawing.inc.php 
Log Message:
no message

Index: class.uidrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidrawing.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uidrawing.inc.php     23 Apr 2003 07:21:34 -0000      1.5
--- class.uidrawing.inc.php     23 Apr 2003 10:58:57 -0000      1.6
***************
*** 22,29 ****
                var $public_functions = array
                (
!                       'index'  => True,
!                       'view'   => True,
!                       'edit'   => True,
!                       'delete' => True
                );
  
--- 22,29 ----
                var $public_functions = array
                (
!                       'index'         => True,
!                       'view_file' => True,
!                       'edit'          => True,
!                       'delete'        => True
                );
  
***************
*** 71,74 ****
--- 71,77 ----
                function index()
                {
+ //                    define('PHPGW_FOOTER_RAN',True);
+ 
+ 
  
                        $GLOBALS['phpgw']->xslttpl->add_file(array('drawing',
***************
*** 101,105 ****
                                        'floor'                                 
        => $drawing['floor'],
                                        'address'                               
        => $drawing['address'],
!                                       'link_view'                             
        => $drawing_path . SEP .$drawing['drawing_name'],
                                        'link_edit'                             
        => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.edit&drawing_id='
 . $drawing['drawing_id']),
                                        'link_delete'                           
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.delete&drawing_id='
 . $drawing['drawing_id']),
--- 104,109 ----
                                        'floor'                                 
        => $drawing['floor'],
                                        'address'                               
        => $drawing['address'],
!                                       'link_view'                             
        => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.view_file&drawing_id='
 . $drawing['drawing_id']),
! //                                    'link_view'                             
        => $drawing_path . SEP .$drawing['drawing_name'],
                                        'link_edit'                             
        => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.edit&drawing_id='
 . $drawing['drawing_id']),
                                        'link_delete'                           
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.delete&drawing_id='
 . $drawing['drawing_id']),
***************
*** 274,308 ****
                function view_file($file_array='')
                {
!                       if(is_array($file_array))
!                       {
!                               $this->bo->path = $file_array['path'];
!                               $this->bo->file = $file_array['file'];
!                       }
!                       $file = $this->bo->path.SEP.$this->bo->file;
!                       if($this->bo->vfs->file_exists(array(
                                'string' => $file,
                                'relatives' => Array(RELATIVE_NONE)
                                )))
                        {
                                $browser = CreateObject('phpgwapi.browser');
!                               
$browser->content_header($this->bo->file,$this->bo->vfs->file_type(array(
!                                               'string' => $file,
!                                               'relatives' => 
Array(RELATIVE_NONE))),
!                                       $this->bo->vfs->get_size(array(
!                                               'string' => $file,
!                                               'relatives' => 
Array(RELATIVE_NONE),
!                                               'checksubdirs' => True
!                                               )));
! //                            $browser->content_header($this->bo->file);
!                               echo $this->bo->vfs->read(array(
                                        'string' => $file,
!                                       'relatives' => Array(RELATIVE_NONE)
!                                       ));
                                flush();
                        }
-                       if(!is_array($file_array))
-                       {
-                               exit();
-                       }
                }
  
--- 278,319 ----
                function view_file($file_array='')
                {
! //                    define('PHPGW_FOOTER_RAN',True);
!                       $GLOBALS['phpgw']->common->stop_xslt_capture();
!                       $GLOBALS['phpgw_info']['flags']['noheader']=true;
!                       $GLOBALS['phpgw_info']['flags']['nonavbar']=true;
!                       $GLOBALS['phpgw_info']['flags']['xslt_app']=false;
! //_debug_array($GLOBALS['phpgw_info']['flags']);
!                       $drawing_id             = 
get_var('drawing_id',array('POST','GET'));
!                       $values = $this->bo->read_single($drawing_id);
! 
!                       $file = $this->fakebase. SEP . 'drawing'. SEP . 
$values['drawing_name'];
! 
!                       if($this->vfs->file_exists(array(
                                'string' => $file,
                                'relatives' => Array(RELATIVE_NONE)
                                )))
                        {
+                               $filename       = current(explode('.', 
basename($values['drawing_name'])));
+ 
+                               $filetype       = $this->vfs->file_type(array(
+                                                       'string' => $file,
+                                                       'relatives' => 
Array(RELATIVE_NONE)));
+ 
+                               $size           = $this->vfs->get_size(array(
+                                                       'string' => $file,
+                                                       'relatives' => 
Array(RELATIVE_NONE),
+                                                       'checksubdirs' => 
True));
+ 
                                $browser = CreateObject('phpgwapi.browser');
!                               
$browser->content_header($filename,$filetype,$size);
! 
!                               $document= $this->vfs->read(array(
                                        'string' => $file,
!                                       'relatives' => Array(RELATIVE_NONE)));
! 
!                               echo $document;
! 
                                flush();
                        }
                }
  
***************
*** 311,316 ****
                {
                        $drawing_id             = 
get_var('drawing_id',array('POST','GET'));
-       //      $_FILES = $GLOBALS['HTTP_POST_FILES'];
- 
                        $values                         = 
get_var('values',array('POST'));
  
--- 322,325 ----
***************
*** 394,408 ****
                        }
  
- /*                    define('PHPGW_FOOTER_RAN',True);
- 
-                       echo $this->fakebase. SEP . 'drawing'. SEP . 
$values['drawing_name'];
-                       $this->vfs->override_acl = 1;
- 
-                       $this->vfs->read(array(
-                                               'string' => $this->fakebase. 
SEP . 'drawing'. SEP . $values['drawing_name'],
-                                               'relatives' => 
Array(RELATIVE_NONE)
-                                       ));
- 
- */
                        $table_header_history[] = array
                        (
--- 403,406 ----