[Phpgroupware-cvs] ftp/index.php, 1.16.2.1.2.3

[nomail]

Update of /ftp
Modified Files:
        Branch: Version-0_9_16-branch
          index.php

date: 2004/07/15 01:56:03;  author: skwashd;  state: Exp;  lines: +19 -4

Log Message:
fixes bugs #5942, #2577 & #726
=====================================================================
Index: ftp/index.php
diff -u ftp/index.php:1.16.2.1.2.2 ftp/index.php:1.16.2.1.2.3
--- ftp/index.php:1.16.2.1.2.2  Tue Feb  3 23:01:16 2004
+++ ftp/index.php       Thu Jul 15 01:56:03 2004
@@ -202,10 +202,25 @@
                                }
                                else
                                {
-                                       ftp_chdir($ftp,$olddir . '/' . $newdir);
-                                               $olddir = $olddir . '/' . 
$newdir;
+                                       ftp_chdir($ftp,$olddir . $newdir . '/');
+                                       if($oldir == '/')
+                                       {
+                                               $olddir = $newdir;
+                                       }
+                                       elseif(! ($file && $newdir) )
+                                       {
+                                               $olddir = $newdir = '';
+                                       }
+                                       {
+                                               $olddir = $olddir . $newdir . 
'/';
+                                       }
                                }
                        }
+                       elseif ($action == 'up')
+                       {
+                               ftp_chdir($ftp,$connInfo['cwd']);
+                               ftp_cdup($ftp);
+                       }
                        elseif ($action == '' && $connInfo['cwd'] != '')
                        {
                                // this must have come back from another 
module, try to 
@@ -278,7 +293,7 @@
 
 
                        $newdir = $olddir;
-                       
$GLOBALS['phpgw']->template->set_var('name',macro_get_link('cwd','..'));
+                       
$GLOBALS['phpgw']->template->set_var('name',macro_get_link('up','..'));
                        
$GLOBALS['phpgw']->template->set_var('del_link',' ');
                        
$GLOBALS['phpgw']->template->set_var('rename_link',' ');
                        $GLOBALS['phpgw']->template->set_var('owner','');