[Phpgroupware-cvs] CVS: ftp index.php,1.16.2.1,1.16.2.1.2.1

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/ftp
In directory subversions:/tmp/cvs-serv3931

Modified Files:
      Tag: Version-0_9_16-branch
        index.php 
Log Message:
empty array fix

Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/ftp/index.php,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.1.2.1
diff -C2 -r1.16.2.1 -r1.16.2.1.2.1
*** index.php   2 Mar 2003 21:12:52 -0000       1.16.2.1
--- index.php   10 Jul 2003 07:13:17 -0000      1.16.2.1.2.1
***************
*** 286,329 ****
                        
$GLOBALS['phpgw']->template->fp('rowlist_dir','row',True);
  
!                       while (list(,$fileinfo) = each($contents))
                        {
! //                            echo '<pre>'; print_r($fileinfo); echo '</pre>';
!                               $newdir = $fileinfo['name'];
!                               
$GLOBALS['phpgw']->template->set_var('owner',$fileinfo['owner']);
!                               
$GLOBALS['phpgw']->template->set_var('group',$fileinfo['group']);
!                               
$GLOBALS['phpgw']->template->set_var('permissions',$fileinfo['permissions']);
! 
! /*                            if ($fileinfo['size'] < 1024)
!                               {
!                                       $fileinfo['size'] = $fileinfo['size'] . 
' b';
!                               }
!                               else */
!                               if ($fileinfo['size'] < 999999)
!                               {
!                                       $fileinfo['size'] = 
round(10*($fileinfo['size']/1024))/10 .' k';
!                               }
!                               else
                                {
!                                       //  round to W.XYZ megs by rounding 
WX.YZ
!                                       $fileinfo['size'] = 
round($fileinfo['size']/(1024*100));
!                                       // then bring it back one digit and add 
the MB string
!                                       $fileinfo['size'] = 
($fileinfo['size']/10) .' MB';
!                               }
!                               if (substr($fileinfo['permissions'],0,1) == 'd')
!                               {
!                                       $file = $fileinfo['name'];
!                                       
$GLOBALS['phpgw']->template->set_var('name',macro_get_link('cwd',$fileinfo['name']));
!                                       
$GLOBALS['phpgw']->template->set_var('del_link',macro_get_link('rmdir',lang('Delete')));
!                                       
$GLOBALS['phpgw']->template->set_var('size','');
!                               }
!                               else
!                               {
!                                       $file = $fileinfo['name'];
!                                       
$GLOBALS['phpgw']->template->set_var('del_link',macro_get_link('delete',lang('Delete')));
!                                       
$GLOBALS['phpgw']->template->set_var('name',macro_get_link('get',$fileinfo['name']));
!                                       
$GLOBALS['phpgw']->template->set_var('size',$fileinfo['size']);
                                }
-                               
$GLOBALS['phpgw']->template->set_var('rename_link',macro_get_link('rename',lang('Rename')));
-                               
$GLOBALS['phpgw']->template->fp('rowlist_dir','row',True);
                        }
                        ftp_quit($ftp);
--- 286,332 ----
                        
$GLOBALS['phpgw']->template->fp('rowlist_dir','row',True);
  
!                       if(is_array($contents))
                        {
!                               while (list(,$fileinfo) = each($contents))
                                {
! //                                    echo '<pre>'; print_r($fileinfo); echo 
'</pre>';
!                                       $newdir = $fileinfo['name'];
!                                       
$GLOBALS['phpgw']->template->set_var('owner',$fileinfo['owner']);
!                                       
$GLOBALS['phpgw']->template->set_var('group',$fileinfo['group']);
!                                       
$GLOBALS['phpgw']->template->set_var('permissions',$fileinfo['permissions']);
! 
! /*                                    if ($fileinfo['size'] < 1024)
!                                       {
!                                               $fileinfo['size'] = 
$fileinfo['size'] . ' b';
!                                       }
!                                       else */
!                                       if ($fileinfo['size'] < 999999)
!                                       {
!                                               $fileinfo['size'] = 
round(10*($fileinfo['size']/1024))/10 .' k';
!                                       }
!                                       else
!                                       {
!                                               //  round to W.XYZ megs by 
rounding WX.YZ
!                                               $fileinfo['size'] = 
round($fileinfo['size']/(1024*100));
!                                               // then bring it back one digit 
and add the MB string
!                                               $fileinfo['size'] = 
($fileinfo['size']/10) .' MB';
!                                       }
!                                       if 
(substr($fileinfo['permissions'],0,1) == 'd')
!                                       {
!                                               $file = $fileinfo['name'];
!                                               
$GLOBALS['phpgw']->template->set_var('name',macro_get_link('cwd',$fileinfo['name']));
!                                               
$GLOBALS['phpgw']->template->set_var('del_link',macro_get_link('rmdir',lang('Delete')));
!                                               
$GLOBALS['phpgw']->template->set_var('size','');
!                                       }
!                                       else
!                                       {
!                                               $file = $fileinfo['name'];
!                                               
$GLOBALS['phpgw']->template->set_var('del_link',macro_get_link('delete',lang('Delete')));
!                                               
$GLOBALS['phpgw']->template->set_var('name',macro_get_link('get',$fileinfo['name']));
!                                               
$GLOBALS['phpgw']->template->set_var('size',$fileinfo['size']);
!                                       }
!                                       
$GLOBALS['phpgw']->template->set_var('rename_link',macro_get_link('rename',lang('Rename')));
!                                       
$GLOBALS['phpgw']->template->fp('rowlist_dir','row',True);
                                }
                        }
                        ftp_quit($ftp);