[Phpgroupware-cvs] filemanager/inc class.bofilemanager.inc.php, 1.21 class.uifilemanager.inc.php, 1.28

[ceb]

Update of filemanager/inc

Modified Files:
     Branch: MAIN
            class.bofilemanager.inc.php lines: +6 -1
            class.uifilemanager.inc.php lines: +8 -13

Log Message:
update

====================================================
Index: filemanager/inc/class.bofilemanager.inc.php
diff -u filemanager/inc/class.bofilemanager.inc.php:1.20 
filemanager/inc/class.bofilemanager.inc.php:1.21
--- filemanager/inc/class.bofilemanager.inc.php:1.20    Fri Feb 11 00:29:41 2005
+++ filemanager/inc/class.bofilemanager.inc.php Sat Feb 12 01:07:35 2005
@@ -368,6 +368,11 @@
                        return $edit;
                }

+               function unset_sessiondata()
+               {
+                       
$GLOBALS['phpgw']->session->appsession('session_data','filemanager','');
+               }
+
                function create_home_dir()
                {
                        ###

====================================================
Index: filemanager/inc/class.uifilemanager.inc.php
diff -u filemanager/inc/class.uifilemanager.inc.php:1.27 
filemanager/inc/class.uifilemanager.inc.php:1.28
--- filemanager/inc/class.uifilemanager.inc.php:1.27    Sat Feb 12 00:36:23 2005
+++ filemanager/inc/class.uifilemanager.inc.php Sat Feb 12 01:07:36 2005
@@ -229,6 +229,10 @@
                                                        case 'go':
                                                                
$link_data['path'] = urlencode($this->bofilemanager->todir);
                                                                break;
+                                                       case 'cancel':
+                                                               
$this->bofilemanager->unset_sessiondata();
+                                                               $var_msg = 
lang('action canceled');
+                                                               break;
                                                        default:
                                                                
if(in_array($action,$bo_functions))
                                                                {
@@ -243,7 +247,7 @@
                                                                        }
                                                                        
elseif(is_array($msg))
                                                                        {
-                                                                               
$var['msg'] = implode("\n",$msg);
+                                                                               
$var_msg = implode("\n",$msg);
                                                                        }
                                                                }
                                                                break;
@@ -251,11 +255,11 @@
                                        }
                                        elseif($action != '')
                                        {
-                                               $var['msg'] = lang('unknown 
action');
+                                               $var_msg = lang('unsupported 
action');
                                        }
                                }
                        }
-                       $link_data['msg'] = $var['msg'];
+                       $link_data['msg'] = $var_msg;
                        
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
                }

@@ -810,15 +814,6 @@
                        $GLOBALS['phpgw']->xslttpl->set_var('phpgw', 
array('index' => $data));
                }

-               function cancel()
-               {
-                       $var = Array(
-                                       'menuaction'    => 
$this->bofilemanager->appname.'.ui'.$this->bofilemanager->appname.'.index',
-                                       'path'  => 
urlencode($this->bofilemanager->path)
-                               );
-                       Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php',$var));
-               }
-
                function edit_comments()
                {
                        $edit=array();