[Phpgroupware-cvs] CVS: filemanager view.php,NONE,1.1 index.php,1.40,1.41

[Jonathon Sim <address@hidden>]

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

Modified Files:
        index.php 
Added Files:
        view.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"

--- NEW FILE ---
<?php
  /**************************************************************************\
  * phpGroupWare                                                             *
  * This file written by Jonathon Sim <address@hidden> for Zeald Ltd          *
  * View interface for the filemanager                                       *
  * Copyright (C) 2003 Zeald Ltd                                             *
  * --------------------------------------------                             *
  *  This program is free software; you can redistribute it and/or modify it *
  *  under the terms of the GNU General Public License as published by the   *
  *  Free Software Foundation; either version 2 of the License, or (at your  *
  *  option) any later version.                                              *
  \**************************************************************************/

/*Due to incredibly annoying aspects of the XSLT template system, to be able to
output binary data you need to bypass XSLT altogether.  Hence this file. */

        $phpgw_flags = Array(
                'currentapp'    =>      'filemanager',
                'noheader'      =>      True,
                'nonavbar'      =>      True,
                'noappheader'   =>      True,
                'noappfooter'   =>      True,
                'nofooter'      =>      True
        );
        $GLOBALS['phpgw_info']['flags'] = $phpgw_flags;
        
        include('../header.inc.php');

        $ui = CreateObject($phpgw_flags['currentapp'].'.uifilemanager');
        $ui->bo->vfs->view(array (
                                'string'        => 
$ui->bo->path.'/'.$ui->bo->file,
                                'relatives'     => array (RELATIVE_NONE)
                        ));

?>

Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/filemanager/index.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** index.php   4 Mar 2003 00:56:26 -0000       1.40
--- index.php   8 Apr 2003 20:47:38 -0000       1.41
***************
*** 19,24 ****
                'noappheader'   =>      True,
                'noappfooter'   =>      True,
!               'nofooter'      =>      True,
!               'xslt_app' => True
        );
        $GLOBALS['phpgw_info']['flags'] = $phpgw_flags;
--- 19,23 ----
                'noappheader'   =>      True,
                'noappfooter'   =>      True,
!               'nofooter'      =>      True
        );
        $GLOBALS['phpgw_info']['flags'] = $phpgw_flags;
***************
*** 30,34 ****
        );
  
!       Header('Location: '.$GLOBALS['phpgw']->link('/index.php',$parms));
        $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
        exit;
--- 29,33 ----
        );
  
!       
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php',$parms));
        $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
        exit;