[Phpgroupware-cvs] filemanager/inc class.uifilemanager.inc.php, 1.9 class.uiaction_edit.inc.php, 1.5

[ceb]

Update of filemanager/inc

Modified Files:
     Branch: MAIN
            class.uifilemanager.inc.php lines: +7 -4
            class.uiaction_edit.inc.php lines: +2 -1

Log Message:
update

====================================================
Index: filemanager/inc/class.uifilemanager.inc.php
diff -u filemanager/inc/class.uifilemanager.inc.php:1.8 
filemanager/inc/class.uifilemanager.inc.php:1.9
--- filemanager/inc/class.uifilemanager.inc.php:1.8     Tue Jan 18 23:54:13 2005
+++ filemanager/inc/class.uifilemanager.inc.php Thu Jan 20 01:13:30 2005
@@ -934,8 +934,8 @@
                                }

                                @reset($this->bofilemanager->file_attributes);
-                               $data['settings'] = 
$this->bofilemanager->settings;
-                               $data['display_settings'] = 
$GLOBALS['phpgw_info']['theme'];
+                               //$data['settings'] = 
$this->bofilemanager->settings;
+                               //$data['display_settings'] = 
$GLOBALS['phpgw_info']['theme'];

                                if(!count($edit))
                                {
@@ -943,10 +943,13 @@
                                        $data['uploads'] = 
$this->display_uploads();
                                }

+                               $data['lang_show']      = lang('show');
+                               $data['lang_upload_fields']     = lang('upload 
fields');
+
                                $GLOBALS['phpgw']->xslttpl->set_var('phpgw', 
array('index' => $data));
                        }
-
                }
+
                function cancel()
                {
                        $var = Array(

====================================================
Index: filemanager/inc/class.uiaction_edit.inc.php
diff -u filemanager/inc/class.uiaction_edit.inc.php:1.4 
filemanager/inc/class.uiaction_edit.inc.php:1.5
--- filemanager/inc/class.uiaction_edit.inc.php:1.4     Tue Jan 18 23:54:13 2005
+++ filemanager/inc/class.uiaction_edit.inc.php Thu Jan 20 01:13:30 2005
@@ -43,10 +43,11 @@
                                                                                
        'alt' => lang('folder')
                                                                                
        )),
                                );
-                               $GLOBALS['phpgw']->xslttpl->set_var('phpgw', 
array('filemanager_nav' => $var));
+                               //$GLOBALS['phpgw']->xslttpl->set_var('phpgw', 
array('filemanager_nav' => $var));

                        $this->template_dir = 
$GLOBALS['phpgw']->common->get_tpl_dir($GLOBALS['phpgw_info']['flags']['currentapp']);
                }
+
                function edit($parent, $param=false)
                {