From 3625cfb8552c2d69a6418401856a36fa27d5e51a Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 31 Oct 2012 17:17:28 +0000 Subject: [PATCH] setup too: new function "Clear cache and register hooks", also called automatic when restoring a backup --- setup/applications.php | 2 ++ setup/inc/class.setup_html.inc.php | 6 +++--- setup/lang/egw_de.lang | 2 +- setup/lang/egw_en.lang | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/setup/applications.php b/setup/applications.php index 44643d077d..a4b2bc0cd0 100644 --- a/setup/applications.php +++ b/setup/applications.php @@ -232,6 +232,8 @@ else if(@get_var('hooks', Array('GET'))) { + egw_cache::flush(egw_cache::INSTANCE); + // Find & register all application hooks foreach($setup_info as $appname => $info) { diff --git a/setup/inc/class.setup_html.inc.php b/setup/inc/class.setup_html.inc.php index 0592b413d9..915c96a6e6 100644 --- a/setup/inc/class.setup_html.inc.php +++ b/setup/inc/class.setup_html.inc.php @@ -69,7 +69,7 @@ class setup_html } $GLOBALS['header_template']->set_var('domain',''); - + $setting = get_var('setting',Array('POST')); while($setting && list($k,$v) = @each($setting)) { @@ -135,7 +135,7 @@ class setup_html { $btn_logout = '' . lang('Logout').''; $check_install = ''.lang('Check installation').''; - $register_hooks = ''.lang('Find and Register all Application Hooks').''; + $register_hooks = ''.lang('Clear cache and register hooks').''; } $GLOBALS['setup_tpl']->set_var('lang_setup', lang('setup')); @@ -305,7 +305,7 @@ class setup_html } } $select .= '' . "\n"; - + return $select; } diff --git a/setup/lang/egw_de.lang b/setup/lang/egw_de.lang index 27603a0cb8..26a7660679 100644 --- a/setup/lang/egw_de.lang +++ b/setup/lang/egw_de.lang @@ -151,6 +151,7 @@ checking php.ini setup de Überprüfe die php.ini Datei checking required php version %1 (recommended %2) setup de Überprüfe benötigte PHP Version %1 (empfohlen %2) checking the egroupware installation setup de Überprüfe die EGroupware-Installation checks egroupware's installed, it's versions and necessary upgrads (return values see --exit-codes) setup de Überprüft ob EGroupware installiert ist, die Version und notwendige Aktualisierungen (Rückgabewerte siehe --exit-codes) +clear cache and register hooks setup de Cache löschen und Hooks registrieren click here to return to setup. setup de Hier klicken um zu Setup zurück zu kehren. click here setup de Hier klicken click here to re-run the installation tests setup de zum Wiederholen der Installationstests hier klicken @@ -294,7 +295,6 @@ file uploads are switched off: you can not use any of the filemanagers, nor can filename setup de Dateiname filesystem setup de Dateisystem filesystem (default) setup de Dateisystem (Vorgabe) -find and register all application hooks setup de Suchen und registrieren der "Hooks" aller Anwendungen force selectbox setup de Auswahl erzwingen give admin access to all installed apps setup de Admin Zugang zu allen installierten Anwendungen geben gives further options setup de gibt zusätzliche Optionen diff --git a/setup/lang/egw_en.lang b/setup/lang/egw_en.lang index 9fd72ea15b..403036ef85 100644 --- a/setup/lang/egw_en.lang +++ b/setup/lang/egw_en.lang @@ -151,6 +151,7 @@ checking php.ini setup en Checking php.ini checking required php version %1 (recommended %2) setup en Checking required PHP version %1 (recommended %2) checking the egroupware installation setup en Checking the eGroupWare Installation checks egroupware's installed, it's versions and necessary upgrads (return values see --exit-codes) setup en Checks EGroupware, it's versions and necessary upgrades (return values see --exit-codes) +clear cache and register hooks setup en Clear cache and register hooks click here to return to setup. setup en Click here to return to setup. click here setup en Click here click here to re-run the installation tests setup en Click here to re-run the installation tests @@ -294,7 +295,6 @@ file uploads are switched off: you can not use any of the filemanagers, nor can filename setup en File name filesystem setup en File system filesystem (default) setup en File system (default) -find and register all application hooks setup en Find and register all application hooks force selectbox setup en Force select box give admin access to all installed apps setup en Give admin access to all installed apps gives further options setup en Gives further options