From 8327175c81fe98a145b6eef52424ceb33c83e551 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 30 Nov 2010 14:34:01 +0000 Subject: [PATCH] * new preference to disable "Your home directory" or "Users and groups" in sidebox menu plus missing translations --- .../inc/class.filemanager_hooks.inc.php | 54 ++++++++++++++----- .../inc/class.filemanager_select.inc.php | 4 +- filemanager/lang/egw_de.lang | 4 +- filemanager/lang/egw_en.lang | 2 + 4 files changed, 47 insertions(+), 17 deletions(-) diff --git a/filemanager/inc/class.filemanager_hooks.inc.php b/filemanager/inc/class.filemanager_hooks.inc.php index e2d85d3a9a..608775858d 100644 --- a/filemanager/inc/class.filemanager_hooks.inc.php +++ b/filemanager/inc/class.filemanager_hooks.inc.php @@ -35,10 +35,15 @@ class filemanager_hooks if ($location == 'sidebox_menu') { $title = $GLOBALS['egw_info']['apps'][self::$appname]['title'] . ' '. lang('Menu'); - $file = array( - 'Your home directory' => $GLOBALS['egw']->link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$homepath)), - 'Users and groups' => $GLOBALS['egw']->link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$basepath)), - ); + $file = array(); + if ($file_prefs['showhome'] != 'no') + { + $file['Your home directory'] = egw::link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$homepath)); + } + if ($file_prefs['showusers'] != 'no') + { + $file['Users and groups'] = egw::link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$basepath)); + } if (!empty($file_prefs['showbase']) && $file_prefs['showbase']=='yes') { $file['Basedirectory'] = $GLOBALS['egw']->link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$rootpath)); @@ -131,16 +136,6 @@ class filemanager_hooks ); $settings = array( - 'showbase' => array( - 'type' => 'select', - 'name' => 'showbase', - 'values' => $yes_no, - 'label' => 'Show link to filemanagers basedirectory (/) in side box menu?', - 'help' => 'Default behavior is NO. The link will not be shown, but you are still able to navigate to this location, or configure this paricular location as startfolder or folderlink.', - 'xmlrpc' => True, - 'admin' => False, - 'default' => 'no', - ), 'startfolder' => array( 'type' => 'input', 'name' => 'startfolder', @@ -164,6 +159,37 @@ class filemanager_hooks 'admin' => False ); } + + $settings += array( + 'showbase' => array( + 'type' => 'select', + 'name' => 'showbase', + 'values' => $yes_no, + 'label' => 'Show link to filemanagers basedirectory (/) in side box menu?', + 'help' => 'Default behavior is NO. The link will not be shown, but you are still able to navigate to this location, or configure this paricular location as startfolder or folderlink.', + 'xmlrpc' => True, + 'admin' => False, + 'default' => 'no', + ), + 'showhome' => array( + 'type' => 'select', + 'name' => 'showhome', + 'values' => $yes_no, + 'label' => lang('Show link "%1" in side box menu?',lang('Your home directory')), + 'xmlrpc' => True, + 'admin' => False, + 'forced' => 'yes', + ), + 'showusers' => array( + 'type' => 'select', + 'name' => 'showusers', + 'values' => $yes_no, + 'label' => lang('Show link "%1" in side box menu?',lang('Users and groups')), + 'xmlrpc' => True, + 'admin' => False, + 'forced' => 'yes', + ), + ); return $settings; } } diff --git a/filemanager/inc/class.filemanager_select.inc.php b/filemanager/inc/class.filemanager_select.inc.php index 7c8e2ef5f6..cf628ea650 100644 --- a/filemanager/inc/class.filemanager_select.inc.php +++ b/filemanager/inc/class.filemanager_select.inc.php @@ -144,11 +144,11 @@ class filemanager_select { if ($copy_result === false) { - $content['msg'] = lang("Error while processing your upload request."); + $content['msg'] = lang('Error uploading file!'); } else { - $content['msg'] = lang("The name field may not be empty."); + $content['msg'] = lang('Filename must not be empty!'); } $content['name'] = ''; diff --git a/filemanager/lang/egw_de.lang b/filemanager/lang/egw_de.lang index 5999059cd8..36434a0227 100644 --- a/filemanager/lang/egw_de.lang +++ b/filemanager/lang/egw_de.lang @@ -90,6 +90,7 @@ file or directory not found! filemanager de Datei oder Verzeichnis nicht gefunde file successful uploaded. filemanager de Datei erfolgreich hochgeladen. filemanager common de Dateimanager filemanager configuration admin de Dateimanager Konfiguration +filename must not be empty! filemanager de Dateinamen darf nicht leer sein! files from subdirectories filemanager de Dateien aus Unterverzeichnissen files in this directory filemanager de Dateien in diesem Verzeichnis folder up filemanager de darüberliegendes Verzeichnis @@ -154,7 +155,8 @@ select action... filemanager de Befehl auswählen... select file to upload in current directory filemanager de Datei zum hochladen in das aktuelle Verzeichnis auswählen show filemanager de Zeige show hidden files filemanager de Zeige versteckte Dateien -show link to filemanagers basedirectory (/) in side box menu? filemanager de Zeige die Verknüpfung zum Basisverzeichnis (/) des Dateimanagers im Seitenmenu? +show link "%1" in side box menu? filemanager de Zeige die Verknüpfung "%1" im Seitenmenü? +show link to filemanagers basedirectory (/) in side box menu? filemanager de Zeige die Verknüpfung zum Basisverzeichnis (/) des Dateimanagers im Seitenmenü? size filemanager de Größe start search filemanager de Suche starten startfolder filemanager de Anfangsordner diff --git a/filemanager/lang/egw_en.lang b/filemanager/lang/egw_en.lang index 9fe66abe28..0fa9aa6af2 100644 --- a/filemanager/lang/egw_en.lang +++ b/filemanager/lang/egw_en.lang @@ -90,6 +90,7 @@ file or directory not found! filemanager en File or directory not found! file successful uploaded. filemanager en File successful uploaded. filemanager common en Filemanager filemanager configuration admin en filemanager configuration +filename must not be empty! filemanager en Filename must not be empty! files from subdirectories filemanager en Files from subdirectories files in this directory filemanager en Files in this directory folder up filemanager en Folder Up @@ -154,6 +155,7 @@ select action... filemanager en Select action... select file to upload in current directory filemanager en Select file to upload in current directory show filemanager en Show show hidden files filemanager en Show hidden files +show link "%1" in side box menu? filemanager en Show link "%1" in side box menu? show link to filemanagers basedirectory (/) in side box menu? filemanager en Show link to File Manager's base directory (/) in side box menu? size filemanager en Size start search filemanager en start search