Applied the patch of Jason Wies (zone):

- Splash screen for check-install and
- Link to re-run check-install
This commit is contained in:
Ralf Becker 2004-05-05 21:05:13 +00:00
parent 5631d6a830
commit d8cc4fb849
4 changed files with 35 additions and 13 deletions

View File

@ -417,9 +417,19 @@
'T_footer' => 'footer.tpl',
));
$ConfigDomain = get_var('ConfigDomain',Array('POST','COOKIE'));
$GLOBALS['phpgw_setup']->html->show_header(lang('Checking the eGroupWare Installation'),False,'config',$ConfigDomain ? $ConfigDomain . '(' . @$phpgw_domain[$ConfigDomain]['db_type'] . ')' : '');
echo '<h1>'.lang('Checking the eGroupWare Installation')."</h1>\n";
echo "<pre style=\"text-align: left;\">\n";;
if (@$_GET['intro']) {
$GLOBALS['phpgw_setup']->html->show_header(lang('Welcome to the eGroupWare Installation'),False,'config');
echo '<h1>'.lang('Welcome to the eGroupWare Installation')."</h1>\n";
echo lang('The first step in installing eGroupWare is to ensure your environment has the necessary settings to correctly run the application.');
echo ,'<br /><br />'.lang('We will now run a series of tests, which may take a few minutes. Click the link below to proceed.');
echo '<h3><a href="check_install.php">'.lang('Run installation tests').'</a></h3>';
$setup_tpl->pparse('out','T_footer');
exit;
} else {
$GLOBALS['phpgw_setup']->html->show_header(lang('Checking the eGroupWare Installation'),False,'config',$ConfigDomain ? $ConfigDomain . '(' . @$phpgw_domain[$ConfigDomain]['db_type'] . ')' : '');
echo '<h1>'.lang('Checking the eGroupWare Installation')."</h1>\n";
echo "<pre style=\"text-align: left;\">\n";;
}
}
else
{
@ -442,7 +452,9 @@
{
if (!$Ok)
{
echo '<h3>'.lang('Please fix the above errors (%1) and warnings(%2) and %3continue to the Header Admin%4',$error_icon,$warning_icon,'<a href="manageheader.php">','</a>')."</h3>\n";
echo '<h3>'.lang('Please fix the above errors (%1) and warnings(%2)',$error_icon,$warning_icon)."</h3>\n";
echo '<h3><a href="check_install.php">'.lang('Click here to re-run the installation tests')."</a></h3>\n";
echo '<h3>'.lang('or %1Continue to the Header Admin%2','<a href="manageheader.php">','</a>')."</h3>\n";
}
else
{
@ -454,7 +466,7 @@
echo '<h3>';
if (!$Ok)
{
echo lang('Please fix the above errors (%1) and warnings(%2) and',$error_icon,$warning_icon).' ';
echo lang('Please fix the above errors (%1) and warnings(%2)',$error_icon,$warning_icon).'. ';
}
echo '<a href="'.str_replace('check_install.php','',$_SERVER['HTTP_REFERER']).'">'.lang('Return to Setup')."</a></h3>\n";
}

View File

@ -55,7 +55,7 @@
if ($GLOBALS['phpgw_info']['setup']['stage']['header'] != '10')
{
// Header('Location: manageheader.php');
Header('Location: check_install.php');
Header('Location: check_install.php?intro=1');
exit;
}
elseif(!$GLOBALS['phpgw_setup']->auth('Config'))

View File

@ -72,6 +72,7 @@ checking php.ini setup de
checking the egroupware installation setup de Überprüfe die eGroupWare-Installation
click <a href="index.php">here</a> to return to setup. setup de <a href="index.php">Hier klicken</a> um zum Setup zurück zu kommen.
click here setup de Hier klicken
click here to re-run the installation tests setup de zum Wiederholen der Installationstests hier klicken
completed setup de Abgeschlossen
config password setup de Konfigurationspasswort
config username setup de Konfigurationsbenutzername
@ -166,9 +167,9 @@ go back setup de Zur
go to setup de Gehen zu
grant access setup de Zugriff gewähren
has a version mismatch setup de hat eine falsche Versionsanpassung
header admin login setup de Headerverwaltungs-Login
header password setup de Headerverwaltungspasswort
header username setup de Headerverwaltungsbenutzername
header admin login setup de Login Headerverwaltung
header password setup de Passwort der Headerverwaltung
header username setup de Benutzername der Headerverwaltung
historylog removed setup de Historylog gelöscht
hooks deregistered setup de Haken nicht mehr aktiv
hooks registered setup de Haken registriert
@ -267,6 +268,7 @@ one week setup de eine Woche
only add languages that are not in the database already setup de Nur Sprachen hinzufügen, die noch nicht in der Datenbank sind
only add new phrases setup de Nur neue Begriffe hinzufügen
or setup de oder
or %1continue to the header admin%2 setup de oder %1mit der Headerverwaltung weiter machen%2
or http://webdav.domain.com (webdav) setup de oder http://webdav.domain.com (für WebDAV)
or we can attempt to create the database for you: setup de Oder wir können versuchen die Datenbank für Sie anzulegen:
password needed for configuration setup de Passwort wird für die Konfiguration benötgt
@ -279,8 +281,7 @@ please check for sql scripts within the application's directory setup de Bitte s
please check read/write permissions on directories, or back up and use another option. setup de Bitte überprüfen Sie die Lese/Schreib-Rechte der Verzeichnisse oder gehen Sie zurück und benutzen eine andere Option.
please configure egroupware for your environment setup de Bitte konfigurieren Sie eGroupWare für Ihre Umgebung
please consult the %1. setup de Bitte konsultieren Sie das %1.
please fix the above errors (%1) and warnings(%2) and setup de Bitte beheben Sie die obigen Fehler (%1) und Warnungen (%2) und gehen Sie dann
please fix the above errors (%1) and warnings(%2) and %3continue to the header admin%4 setup de Bitte beheben Sie die obigen Fehler (%1) und Warnungen (%2) und machen Sie %3weiter mit der Headerverwaltung%4
please fix the above errors (%1) and warnings(%2) setup de Bitte beheben Sie die obigen Fehler (%1) und Warnungen (%2)
please install setup de Bitte installieren
please login setup de Bitte einloggen
please login to egroupware and run the admin application for additional site configuration setup de Bitte in eGroupWare einloggen und für weitere Konfigurationseinstellungen die Administrationsanwendung aufrufen
@ -308,6 +309,7 @@ requires reinstall or manual repair setup de Erfordert Neuinstallation oder manu
requires upgrade setup de Erfordert Aktualisierung
resolve setup de Lösen
return to setup setup de Zurück zum Setup
run installation tests setup de Installationstests starten
safe_mode is turned on, which is generaly a good thing as it makes your install more secure. setup de safe_mode ist eingeschaltet, was ist generell gut, da es Ihre Installation sicherer macht.
sample configuration not found. using built in defaults setup de Beispiel Konfiguration nicht gefunden, benutze eingebaute Voreinstellungen
save setup de Speichern
@ -364,6 +366,7 @@ text entry setup de Texteingabe
the %1 extension is needed, if you plan to use a %2 database. setup de Die %1 Erweiterung (php extension) wird benötigt, wenn Sie die %2 Datenbank einsetzen wollen.
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 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
@ -408,6 +411,8 @@ view setup de Anzeigen
warning! setup de Warnung!
we can proceed setup de Wir können fortfahren
we will automatically update your tables/records to %1 setup de Wir werden Ihre Tabellen/Einträge automatisch zu %1 aktualisieren
we will now run a series of tests, which may take a few minutes. click the link below to proceed. setup de Wir werden jetzt eine Serie von Tests durchführen. Das kann ein paar Minuten dauern. Klicken sie auf den folgenden Link um Fortzufahren.
welcome to the egroupware installation setup de Herzlich willkommen zur eGroupWare Installation
what type of sessions management do you want to use (php4 session management may perform better)? setup de Welches Session-Management wollen Sie verwenden (PHP4 Session-Management hat eine bessere Performance)?
which database type do you want to use with egroupware? setup de Welchen Datenbanktyp wollen Sie mit eGroupWare verwenden?
world readable setup de lesbar von jedem (world readable)

View File

@ -70,6 +70,7 @@ checking php.ini setup en Checking php.ini
checking the egroupware installation setup en Checking the eGroupWare Installation
click <a href="index.php">here</a> to return to setup. setup en Click <a href="index.php">here</a> 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
completed setup en Completed
config password setup en Config Password
config username setup en Config Username
@ -263,6 +264,7 @@ one week setup en one week
only add languages that are not in the database already setup en Only add languages that are not in the database already
only add new phrases setup en Only add new phrases
or setup en or
or %1continue to the header admin%2 setup en or %1Continue to the Header Admin%2
or http://webdav.domain.com (webdav) setup en or http://webdav.domain.com (WebDAV)
or we can attempt to create the database for you: setup en Or we can attempt to create the database for you:
password needed for configuration setup en Password needed for configuration
@ -275,8 +277,7 @@ please check for sql scripts within the application's directory setup en Please
please check read/write permissions on directories, or back up and use another option. setup en Please check read/write permissions on directories, or back up and use another option.
please configure egroupware for your environment setup en Please configure eGroupWare for your environment
please consult the %1. setup en Please consult the %1.
please fix the above errors (%1) and warnings(%2) and setup en Please fix the above errors (%1) and warnings(%2) and
please fix the above errors (%1) and warnings(%2) and %3continue to the header admin%4 setup en Please fix the above errors (%1) and warnings(%2) and %3continue to the Header Admin%4
please fix the above errors (%1) and warnings(%2) setup en Please fix the above errors (%1) and warnings(%2)
please install setup en Please install
please login setup en Please login
please login to egroupware and run the admin application for additional site configuration setup en Please login to eGroupWare and run the admin application for additional site configuration
@ -304,6 +305,7 @@ requires reinstall or manual repair setup en Requires reinstall or manual repair
requires upgrade setup en Requires upgrade
resolve setup en Resolve
return to setup setup en Return to Setup
run installation tests setup en Run installation tests
safe_mode is turned on, which is generaly a good thing as it makes your install more secure. setup en safe_mode is turned on, which is generaly a good thing as it makes your install more secure.
sample configuration not found. using built in defaults setup en Sample configuration not found. using built in defaults
save setup en Save
@ -360,6 +362,7 @@ text entry setup en Text Entry
the %1 extension is needed, if you plan to use a %2 database. setup en The %1 extension is needed, if you plan to use a %2 database.
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 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
@ -403,6 +406,8 @@ view setup en View
warning! setup en Warning!
we can proceed setup en We can proceed
we will automatically update your tables/records to %1 setup en We will automatically update your tables/records to %1
we will now run a series of tests, which may take a few minutes. click the link below to proceed. setup en We will now run a series of tests, which may take a few minutes. Click the link below to proceed.
welcome to the egroupware installation setup en Welcome to the eGroupWare Installation
what type of sessions management do you want to use (php4 session management may perform better)? setup en What type of sessions management do you want to use (PHP4 session management may perform better)?
which database type do you want to use with egroupware? setup en Which database type do you want to use with eGroupWare?
world readable setup en world readable