Menu
▾
▴
[eGroupWare-svn] r38211 - in /trunk: admin/inc/ admin/lang/ filemanager/inc/ filemanager/lang/
|
From: <ral...@us...> - 2012-02-29 14:57:42
|
Author: ralfbecker Date: Wed Feb 29 15:55:25 2012 New Revision: 38211 URL: http://svn.stylite.de/viewvc/egroupware?rev=38211&view=rev Log: moved sqlfs filesystem check from Admin to Admin >> Filemanager, as most people seem to expect it there Modified: trunk/admin/inc/class.admin_prefs_sidebox_hooks.inc.php trunk/admin/lang/egw_de.lang trunk/admin/lang/egw_en.lang trunk/filemanager/inc/class.filemanager_hooks.inc.php trunk/filemanager/lang/egw_de.lang trunk/filemanager/lang/egw_en.lang Modified: trunk/admin/inc/class.admin_prefs_sidebox_hooks.inc.php URL: http://svn.stylite.de/viewvc/egroupware/trunk/admin/inc/class.admin_prefs_sidebox_hooks.inc.php?rev=38211&r1=38210&r2=38211&view=diff ============================================================================== --- trunk/admin/inc/class.admin_prefs_sidebox_hooks.inc.php (original) +++ trunk/admin/inc/class.admin_prefs_sidebox_hooks.inc.php Wed Feb 29 15:55:25 2012 @@ -22,7 +22,6 @@ */ var $public_functions = array( 'register_all_hooks' => True, - 'fsck' => true, ); /** @@ -102,11 +101,6 @@ $file['Find and Register all Application Hooks'] = egw::link('/index.php','menuaction=admin.admin_prefs_sidebox_hooks.register_all_hooks'); } - //if (! $GLOBALS['egw']->acl->check('applications_access',16,'admin')) - { - $file['Check virtual filesystem'] = egw::link('/index.php','menuaction=admin.admin_prefs_sidebox_hooks.fsck'); - } - if (! $GLOBALS['egw']->acl->check('asyncservice_access',1,'admin')) { $file['Asynchronous timed services'] = egw::link('/index.php','menuaction=admin.uiasyncservice.index'); @@ -157,24 +151,4 @@ } $GLOBALS['egw']->redirect_link('/admin/index.php'); } - - /** - * Run fsck on sqlfs - */ - function fsck() - { - $check_only = !isset($_POST['fix']); - - if (!($msgs = sqlfs_utils::fsck($check_only))) - { - $msgs = lang('Filesystem check reported no problems.'); - } - $content = '<p>'.implode("</p>\n<p>", (array)$msgs)."</p>\n"; - - $content .= html::form('<p>'.($check_only&&is_array($msgs)?html::submit_button('fix', lang('Fix reported problems')):''). - html::submit_button('cancel', lang('Cancel'), "window.location.href='".egw::link('/admin/index.php')."'; return false;").'</p>', - '','/index.php',array('menuaction'=>'admin.admin_prefs_sidebox_hooks.fsck')); - - $GLOBALS['egw']->framework->render($content, lang('Admin').' - '.lang('Check virtual filesystem'), true); - } } Modified: trunk/admin/lang/egw_de.lang URL: http://svn.stylite.de/viewvc/egroupware/trunk/admin/lang/egw_de.lang?rev=38211&r1=38210&r2=38211&view=diff ============================================================================== --- trunk/admin/lang/egw_de.lang (original) +++ trunk/admin/lang/egw_de.lang Wed Feb 29 15:55:25 2012 @@ -123,7 +123,6 @@ check acl for entries of not (longer) existing accounts admin de Prüfe ACL Einträge auf Bezüge zu nicht (mehr) existierenden Benutzerkonten check ip address of all sessions admin de IP-Adresse für alle Sessions überprüfen check items to <b>%1</b> to %2 for %3 admin de Durch Abhaken %3 in %2 <b>%1</b> -check virtual filesystem admin de Virtuelles Dateisystem überprüfen children admin de Kinder click to select a color admin de Anclicken um eine Farbe auszuwählen color admin de Farbe @@ -278,7 +277,6 @@ field '%1' already exists !!! admin de Feld '%1' existiert bereits !!! file space admin de Speicherplatz file space must be an integer admin de Speicherplatz muss eine Zahl sein -filesystem check reported no problems. admin de Ãberprüfung des Dateisystem ergab keine Probleme. find and register all application hooks admin de Suchen und registrieren der "Hooks" aller Anwendungen for the times above admin de für die oben angegebenen Zeiten for the times below (empty values count as '*', all empty = every minute) admin de für die darunter angegebenen Zeiten (leere Felder zählen als "*", alles leer = jede Minute) Modified: trunk/admin/lang/egw_en.lang URL: http://svn.stylite.de/viewvc/egroupware/trunk/admin/lang/egw_en.lang?rev=38211&r1=38210&r2=38211&view=diff ============================================================================== --- trunk/admin/lang/egw_en.lang (original) +++ trunk/admin/lang/egw_en.lang Wed Feb 29 15:55:25 2012 @@ -125,7 +125,6 @@ check acl for entries of not (longer) existing accounts admin en Check ACL for entries of not existing accounts. check ip address of all sessions admin en Check IP address of all sessions check items to <b>%1</b> to %2 for %3 admin en Check items to <b>%1</b> to %2 for %3 -check virtual filesystem admin en Check virtual filesystem children admin en Children click to select a color admin en Click to select a color color admin en Color @@ -282,7 +281,6 @@ field '%1' already exists !!! admin en Field '%1' already exists! file space admin en File space file space must be an integer admin en File space must be an integer -filesystem check reported no problems. admin en Filesystem check reported no problems. find and register all application hooks admin en Find and register all application hooks for the times above admin en For the times above for the times below (empty values count as '*', all empty = every minute) admin en For the times below: empty values count as '*', all empty = every minute. Modified: trunk/filemanager/inc/class.filemanager_hooks.inc.php URL: http://svn.stylite.de/viewvc/egroupware/trunk/filemanager/inc/class.filemanager_hooks.inc.php?rev=38211&r1=38210&r2=38211&view=diff ============================================================================== --- trunk/filemanager/inc/class.filemanager_hooks.inc.php (original) +++ trunk/filemanager/inc/class.filemanager_hooks.inc.php Wed Feb 29 15:55:25 2012 @@ -14,6 +14,15 @@ */ class filemanager_hooks { + /** + * Functions callable via menuaction + * + * @var unknown_type + */ + var $public_functions = array( + 'fsck' => true, + ); + static $appname = 'filemanager'; static $foldercount = 1; @@ -91,6 +100,7 @@ $file = Array( 'Site Configuration' => egw::link('/index.php','menuaction=admin.uiconfig.index&appname='.self::$appname), 'Custom fields' => egw::link('/index.php','menuaction=admin.customfields.edit&appname='.self::$appname), + 'Check virtual filesystem' => egw::link('/index.php','menuaction=filemanager.filemanager_hooks.fsck'), ); // add other administration links, eg. of filesystem backends like versioning if (($other = $GLOBALS['egw']->hooks->process('filemanager_admin',array(),true))) @@ -235,4 +245,28 @@ } return $settings; } + + /** + * Run fsck on sqlfs + */ + function fsck() + { + if (!isset($GLOBALS['egw_info']['user']['apps']['admin'])) + { + throw new egw_exception_no_permission_admin(); + } + $check_only = !isset($_POST['fix']); + + if (!($msgs = sqlfs_utils::fsck($check_only))) + { + $msgs = lang('Filesystem check reported no problems.'); + } + $content = '<p>'.implode("</p>\n<p>", (array)$msgs)."</p>\n"; + + $content .= html::form('<p>'.($check_only&&is_array($msgs)?html::submit_button('fix', lang('Fix reported problems')):''). + html::submit_button('cancel', lang('Cancel'), "window.location.href='".egw::link('/admin/index.php')."'; return false;").'</p>', + '','/index.php',array('menuaction'=>'filemanager.filemanager_hooks.fsck')); + + $GLOBALS['egw']->framework->render($content, lang('Admin').' - '.lang('Check virtual filesystem'), true); + } } Modified: trunk/filemanager/lang/egw_de.lang URL: http://svn.stylite.de/viewvc/egroupware/trunk/filemanager/lang/egw_de.lang?rev=38211&r1=38210&r2=38211&view=diff ============================================================================== --- trunk/filemanager/lang/egw_de.lang (original) +++ trunk/filemanager/lang/egw_de.lang Wed Feb 29 15:55:25 2012 @@ -30,6 +30,7 @@ cannot create directory because it begins or ends in a space filemanager de Die Erstellung des Verzeichnisses schlug fehl, da es mit einem Leerzeichen beginnt oder endet cautiously rejecting to remove folder '%1'! filemanager de Löschen des Verzeichnisses '%1' aus Vorsicht zurück gewiesen! check all filemanager de Alle auswählen +check virtual filesystem filemanager de Virtuelles Dateisystem überprüfen clear search filemanager de Suchfelder zurücksetzen comment filemanager de Kommentar copied filemanager de kopiert @@ -96,6 +97,8 @@ 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 +filesystem check reported no problems. filemanager de Ãberprüfung des Dateisystem ergab keine Probleme. +fix reported problems filemanager de Gefundene Probleme beheben folder up filemanager de darüberliegendes Verzeichnis general filemanager de Allgemein go home filemanager de Heimatverzeichnis Modified: trunk/filemanager/lang/egw_en.lang URL: http://svn.stylite.de/viewvc/egroupware/trunk/filemanager/lang/egw_en.lang?rev=38211&r1=38210&r2=38211&view=diff ============================================================================== --- trunk/filemanager/lang/egw_en.lang (original) +++ trunk/filemanager/lang/egw_en.lang Wed Feb 29 15:55:25 2012 @@ -34,6 +34,7 @@ cannot create directory because it begins or ends in a space filemanager en Can not create directory because it begins or ends in a space. cautiously rejecting to remove folder '%1'! filemanager en Cautiously rejecting to remove folder '%1'! check all filemanager en Check all +check virtual filesystem filemanager en Check virtual filesystem clear search filemanager en Clear search comment filemanager en Comment copied filemanager en Copied @@ -101,6 +102,8 @@ filename must not be empty! filemanager en File name must not be empty! files from subdirectories filemanager en Files from sub directories files in this directory filemanager en Files in this directory +filesystem check reported no problems. filemanager en Filesystem check reported no problems. +fix reported problems filemanager en Fix reported problems folder up filemanager en Folder up general filemanager en General go home filemanager en Go home |