[Phpgroupware-cvs] CVS: filemanager/inc class.uifilemanager.inc.php,1.5,1.6

[Jonathon Sim <address@hidden>]

Update of /cvsroot/phpgroupware/filemanager/inc
In directory subversions:/tmp/cvs-serv17158/inc

Modified Files:
        class.uifilemanager.inc.php 
Log Message:
Fixes a problem with file viewing using vfs_sql - where XSLT gets in the way of 
outputing binary data.  XSLT still gets in the way of outputting binary data 
(grrr), but now we side-step it by using a seperate non-xslt "view.php"

Index: class.uifilemanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/filemanager/inc/class.uifilemanager.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uifilemanager.inc.php 6 Mar 2003 22:15:58 -0000       1.5
--- class.uifilemanager.inc.php 8 Apr 2003 20:47:38 -0000       1.6
***************
*** 80,84 ****
                        $this->verify_path();
                        $this->update();
!                       $GLOBALS['phpgw']->xslttpl->add_file(array('widgets'));
                }
  
--- 80,84 ----
                        $this->verify_path();
                        $this->update();
!                       
                }
  
***************
*** 91,95 ****
--- 91,97 ----
                        unset($GLOBALS['phpgw_info']['flags']['noappfooter']);
                        unset($GLOBALS['phpgw_info']['flags']['headonly']);
+                       $GLOBALS['phpgw']->xslttpl->add_file(array('widgets'));
                        
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_header'));
+                       
                }
                function no_header()
***************
*** 100,104 ****
                        $GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
                         $GLOBALS['phpgw_info']['flags']['headonly'] = True;
!  
  
  
--- 102,106 ----
                        $GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
                         $GLOBALS['phpgw_info']['flags']['headonly'] = True;
!                       $GLOBALS['phpgw']->xslttpl->add_file(array('widgets'));
  
  
***************
*** 744,747 ****
--- 746,750 ----
                        
                        $files_array = $this->bo->load_files();
+ 
                        $usage = 0;
                        $files_array = $this->dirs_first($files_array);
***************
*** 761,769 ****
                                                                ));
                                        }
- 
                                        @reset($this->bo->file_attributes);
                                        while(list($internal,$displayed) = 
each($this->bo->file_attributes))
                                        {
!                                               if 
($this->bo->settings[$internal])
                                                {
                                                        if 
($internal==$edit[$file['name']])
--- 764,771 ----
                                                                ));
                                        }
                                        @reset($this->bo->file_attributes);
                                        while(list($internal,$displayed) = 
each($this->bo->file_attributes))
                                        {
!                                               if 
(!is_array($this->bo->settings)||$this->bo->settings[$internal])
                                                {
                                                        if 
($internal==$edit[$file['name']])
***************
*** 850,853 ****
--- 852,856 ----
                                        }
                                }
+ 
                                
                                $GLOBALS['phpgw']->xslttpl->set_var('phpgw', 
array('summary' =>  array(
***************
*** 992,1006 ****
                }
                function view()
!               {       
!                       $GLOBALS['phpgw_info']['flags']['noheader'] = true;
!                       $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
!                       $GLOBALS['phpgw_info']['flags']['noappheader'] = true;
!                       $GLOBALS['phpgw_info']['flags']['noappfooter'] = true;
! 
!                       $this->bo->vfs->view(array (
!                               'string'        => 
$this->bo->path.'/'.$this->bo->file,
!                               'relatives'     => array (RELATIVE_NONE)
!                       ));
!                       exit();;
                }
                
--- 995,1006 ----
                }
                function view()
!               {
!                       Header('Location: '.$GLOBALS['phpgw']->link(
!                                               'view.php',
!                                               Array('path' => 
urlencode($this->bo->path),
!                                               'file'  => 
urlencode($this->bo->file))
!                                       )
!                               );
!                       
                }