From 1ba38621ba57deabc7e12574d771fdfb03eb56cb Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 27 Jun 2004 09:06:05 +0000 Subject: [PATCH] - added acces to admin-account-section, if there is an update pending - show apps which need upgrading in the message in front of the application management and not "This stage is completed", if there are ones --- setup/index.php | 11 +++++++++++ setup/lang/phpgw_de.lang | 4 ++++ setup/lang/phpgw_en.lang | 4 ++++ setup/templates/default/setup_db_blocks.tpl | 4 ++++ 4 files changed, 23 insertions(+) diff --git a/setup/index.php b/setup/index.php index a09cc258e3..f84abec1bb 100644 --- a/setup/index.php +++ b/setup/index.php @@ -215,6 +215,7 @@ $setup_tpl->set_var('upgrade',lang('Upgrade')); $setup_tpl->set_var('goto',lang('Go to')); $setup_tpl->set_var('configuration',lang('configuration')); + $setup_tpl->set_var('admin_account',lang('Create admin account')); $setup_tpl->set_var('applications',lang('Manage Applications')); $setup_tpl->set_var('language_management',lang('Manage Languages')); $setup_tpl->set_var('uninstall_all_applications',lang('Uninstall all applications')); @@ -462,7 +463,17 @@ case 10: $setup_tpl->set_var('apps_status_img',$completed); $setup_tpl->set_var('apps_status_alt',lang('completed')); + // check if we have apps to upgrade + $to_upgrade = array(); + foreach($setup_info as $app => $data) + { + if ($data['currentver'] && $data['version'] && $data['version'] != $data['currentver']) + { + $to_upgrade[] = $app; + } + } $btn_manage_apps = $GLOBALS['phpgw_setup']->html->make_frm_btn_simple( + count($to_upgrade) ? ''.lang('The following applications need to be upgraded:').' '.implode(', ',$to_upgrade) : lang('This stage is completed
'), '','applications.php', 'submit',lang('Manage Applications'), diff --git a/setup/lang/phpgw_de.lang b/setup/lang/phpgw_de.lang index 8730847de2..de586548e5 100644 --- a/setup/lang/phpgw_de.lang +++ b/setup/lang/phpgw_de.lang @@ -68,6 +68,7 @@ check installation setup de Installation check ip address of all sessions setup de IP Adresse bei allen Sessions überprüfen checking extension %1 is loaded or loadable setup de Überprüfe ob die Erweiterung %1 geladen oder ladbar ist checking file-permissions of %1 for %2: %3 setup de Überprüfe die Datei-Zugriffsrechte von %1 auf %2: %3 +checking for gd support... setup de Überprüfe die GD Unterstützung... checking php.ini setup de Überprüfe die php.ini Datei checking the egroupware installation setup de Überprüfe die eGroupWare-Installation click here to return to setup. setup de Hier klicken um zum Setup zurück zu kommen. @@ -96,6 +97,7 @@ create the empty database - setup de Legen Sie eine leere Datenbank an - create the empty database and grant user permissions - setup de Leere Datenbank anlegen und Benutzerrechte daran gewähren - create your header.inc.php setup de Datei header.inc.php anlegen created setup de erzeugt +created header.inc.php! setup de header.inc.php erzeugt! creating tables setup de Erstelle Tabellen current system-charset setup de Aktueller Systemzeichensatz current system-charset is %1, click %2here%3 to change it. setup de Aktueller Systemzeichensatz ist %1, %2hier%3 klicken um ihn zu ändern. @@ -367,6 +369,7 @@ the %1 extension is needed, if you plan to use a %2 database. setup de Die %1 Er the db_type in defaults (%1) is not supported on this server. using first supported type. setup de Der Datenbanktyp in den Vorgaben (%1) wird von diesem Server nicht unterstützt, verwende ersten unterstützten Typ. the file setup de der Datei the first step in installing egroupware is to ensure your environment has the necessary settings to correctly run the application. setup de Der erste Schritt bei Installation von eGroupWare ist sicherzustellen, dass Ihre Umgebung die notwendigen Einstellungen hat, um die Anwendung korrekt auszuführen. +the following applications need to be upgraded: setup de Die folgenden Anwendungen müssen aktualisiert werden: the imap extension is needed by the two email apps (even if you use email with pop3 as protocoll). setup de Die imap Erweiterung (php extension) wird von den beiden Email Applikationen benötigt (auch wenn Sie das POP3-Protokoll verwenden). the mbstring extension is needed to fully support unicode (utf-8) or other multibyte-charsets. setup de Die mbstring Erweiterung (php extension) ist notwendig um Unicode (utf-8) oder andere mehr-byte (multibyte) Zeichensätze vollständig zu unterstützen. the table definition was correct, and the tables were installed setup de Die Tabellen Definition war korrekt und die Tabellen wurden installiert @@ -457,6 +460,7 @@ your database is working, but you dont have any applications installed setup de your header admin password is not set. please set it now! setup de Ihr Headerverwaltungspasswort wurde NICHT gesetzt. Bitte setzen Sie es jetzt! your header.inc.php needs upgrading. setup de Ihre header.inc.php muss aktualisiert werden. your header.inc.php needs upgrading.
warning!
make backups! setup de Ihre header.inc.php muss aktualisiert werden.
WARNUNG!
MACHEN SIE EINE SICHERUNG! +your php installation does not have appropriate gd support. you need gd library version 1.8 or newer to see gantt charts in projects. setup de Ihre PHP Installation hat nicht die benötigte GD Unterstützung. Die Anwendung Projekte benötigen die GD Bibliothek in der Version 1.8 um Gantcharts anzeigen zu können. your tables are current setup de Ihre Tabellen sind aktuell your tables may be altered and you may lose data setup de Ihre Tabellen könnten verändert werden, und Sie könnten Daten verlieren! your tables will be dropped and you will lose data setup de Ihre Tabellen werden gelöscht werden und Sie werden Daten verlieren! diff --git a/setup/lang/phpgw_en.lang b/setup/lang/phpgw_en.lang index dc5f674a21..1cdc583294 100644 --- a/setup/lang/phpgw_en.lang +++ b/setup/lang/phpgw_en.lang @@ -66,6 +66,7 @@ check installation setup en Check installation check ip address of all sessions setup en check ip address of all sessions checking extension %1 is loaded or loadable setup en Checking extension %1 is loaded or loadable checking file-permissions of %1 for %2: %3 setup en Checking file-permissions of %1 for %2: %3 +checking for gd support... setup en Checking for GD support... checking php.ini setup en Checking php.ini checking the egroupware installation setup en Checking the eGroupWare Installation click here to return to setup. setup en Click here to return to setup. @@ -94,6 +95,7 @@ create the empty database - setup en Create the empty database - create the empty database and grant user permissions - setup en Create the empty database and grant user permissions - create your header.inc.php setup en Create your header.inc.php created setup en created +created header.inc.php! setup en Created header.inc.php! creating tables setup en Creating Tables current system-charset setup en Current system-charset current system-charset is %1, click %2here%3 to change it. setup en Current system-charset is %1, click %2here%3 to change it. @@ -363,6 +365,7 @@ the %1 extension is needed, if you plan to use a %2 database. setup en The %1 ex the db_type in defaults (%1) is not supported on this server. using first supported type. setup en The db_type in defaults (%1) is not supported on this server. using first supported type. the file setup en the file the first step in installing egroupware is to ensure your environment has the necessary settings to correctly run the application. setup en The first step in installing eGroupWare is to ensure your environment has the necessary settings to correctly run the application. +the following applications need to be upgraded: setup en The following applications need to be upgraded: the imap extension is needed by the two email apps (even if you use email with pop3 as protocoll). setup en The imap extension is needed by the two email apps (even if you use email with pop3 as protocoll). the mbstring extension is needed to fully support unicode (utf-8) or other multibyte-charsets. setup en The mbstring extension is needed to fully support unicode (utf-8) or other multibyte-charsets. the table definition was correct, and the tables were installed setup en The table definition was correct, and the tables were installed @@ -452,6 +455,7 @@ your database is working, but you dont have any applications installed setup en your header admin password is not set. please set it now! setup en Your header admin password is NOT set. Please set it now! your header.inc.php needs upgrading. setup en Your header.inc.php needs upgrading. your header.inc.php needs upgrading.
warning!
make backups! setup en Your header.inc.php needs upgrading.
WARNING!
MAKE BACKUPS! +your php installation does not have appropriate gd support. you need gd library version 1.8 or newer to see gantt charts in projects. setup en Your PHP installation does not have appropriate GD support. You need gd library version 1.8 or newer to see Gantt charts in projects. your tables are current setup en Your tables are current your tables may be altered and you may lose data setup en Your tables may be altered and you may lose data. your tables will be dropped and you will lose data setup en Your tables will be dropped and you will lose data !! diff --git a/setup/templates/default/setup_db_blocks.tpl b/setup/templates/default/setup_db_blocks.tpl index ca8d966988..2bf656a510 100644 --- a/setup/templates/default/setup_db_blocks.tpl +++ b/setup/templates/default/setup_db_blocks.tpl @@ -88,6 +88,10 @@
+
+
+ +