holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow to uninstall apps with dependency failures or which sources are no longer there, plus some missing translations

Browse Source
This commit is contained in:
Ralf Becker 2007-05-08 09:53:11 +00:00
parent 3630f964fb
commit 1e0f7c71e8
4 changed files with 54 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
setup/applications.php
View File

@ -305,6 +305,15 @@
echo '<br />';
echo lang('You should either uninstall and then reinstall it, or attempt manual repairs') . '.';
}
elseif(get_var('deleted',Array('GET')))
{
echo '"' . $app_title . '" ' . lang('is broken') . ' ';
echo lang('because its sources are missing') . '!';
echo '<br />';
echo lang('However the tables are still in the database') . '.';
echo '<br />';
echo lang('You should either install the sources or uninstall it, to get rid of the tables') . '.';
}
elseif (!$version)
{
if($setup_info[$resolve]['enabled'])
@ -486,9 +495,18 @@
$setup_tpl->set_var('instalt',lang('Not Completed'));
$setup_tpl->set_var('install','&nbsp;');
$setup_tpl->set_var('remove',$key == 'phpgwapi' ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
if ($value['version'] == 'deleted')
{
$setup_tpl->set_var('upgrade','&nbsp;');
$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&deleted=True">' . lang('Possible Solutions') . '</a>');
$status = lang('Sources deleted/missing') . ' - ' . $value['status'];
}
else
{
$setup_tpl->set_var('upgrade','<input type="checkbox" name="upgrade[' . $value['name'] . ']" />');
$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&version=True">' . lang('Possible Solutions') . '</a>');
$status = lang('Version Mismatch') . ' - ' . $value['status'];
}
break;
case 'D':
$setup_tpl->set_var('bg_color','FFCCCC');
@ -497,9 +515,17 @@
$setup_tpl->set_var('instimg','dep.png');
$setup_tpl->set_var('instalt',lang('Dependency Failure'));
$setup_tpl->set_var('install','&nbsp;');
$setup_tpl->set_var('remove','&nbsp;');
$setup_tpl->set_var('upgrade','&nbsp;');
if ($values['currentver'])
{
$setup_tpl->set_var('remove',$key == 'phpgwapi' ? '&nbsp;' : '<input type="checkbox" name="remove[' . $value['name'] . ']" />');
$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '">' . lang('Possible Solutions') . '</a>');
}
else
{
$setup_tpl->set_var('remove','&nbsp;');
$setup_tpl->set_var('resolution','&nbsp;');
}
$setup_tpl->set_var('upgrade','&nbsp;');
$status = lang('Dependency Failure') . ':' . $depstring . $value['status'];
break;
case 'P':

13
setup/inc/class.setup_detection.inc.php
View File

@ -49,8 +49,17 @@
$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table,'*',false,__LINE__,__FILE__);
while(@$GLOBALS['egw_setup']->db->next_record())
{
$setup_info[$GLOBALS['egw_setup']->db->f('app_name')]['currentver'] = $GLOBALS['egw_setup']->db->f('app_version');
$setup_info[$GLOBALS['egw_setup']->db->f('app_name')]['enabled'] = $GLOBALS['egw_setup']->db->f('app_enabled');
$app = $GLOBALS['egw_setup']->db->f('app_name');
if (!isset($setup_info[$app])) // app source no longer there
{
$setup_info[$app] = array(
'name' => $app,
'tables' => $GLOBALS['egw_setup']->db->f('app_tables'),
'version' => 'deleted',
);
}
$setup_info[$app]['currentver'] = $GLOBALS['egw_setup']->db->f('app_version');
$setup_info[$app]['enabled'] = $GLOBALS['egw_setup']->db->f('app_enabled');
}
/* This is to catch old setup installs that did not have phpgwapi listed as an app */
$tmp = @$setup_info['phpgwapi']['version']; /* save the file version */

6
setup/lang/phpgw_de.lang
View File

@ -92,6 +92,7 @@ because it depends upon setup de weil es abh
because it is not a user application, or access is controlled via acl setup de weil es keine Benutzer-Anwendung ist, oder der Zugriff über ACL kontrolliert wird
because it requires manual table installation, <br />or the table definition was incorrect setup de weil es manuelle Installation der Tabelle erfordert, <br />oder die Tabellen-definition war nicht korrekt
because it was manually disabled setup de weil es manuell ausgeschaltet wurde
because its sources are missing setup de weil die Quelldateien fehlen
because of a failed upgrade or install setup de weil eine Aktualisierung oder eine Installation fehlgeschlug
because of a failed upgrade, or the database is newer than the installed version of this app setup de weil eine Aktualisierung fehlschlug, oder die Datenbank ist neuer als die installierte Version dieser Applikation
because the enable flag for this app is set to 0, or is undefined setup de weil der verfügbar-Eintrag für diese Applikation auf 0 gesetzt oder undefiniert ist
@ -270,6 +271,7 @@ host,{imap | pop3 | imaps | pop3s},[domain],[{standard(default)|vmailmgr = add d
host/ip domain controler setup de Hostname / IP des Domain Controler
hostname/ip of database server setup de Hostname/IP des Datenbank-Servers
hour (0-24) setup de Stunde (0-24)
however the tables are still in the database setup de Wie auch immer, die Tabellen sind noch immer in der Datenbank
however, the application is otherwise installed setup de Wie auch immer, die Anwendung ist ansonsten installiert
however, the application may still work setup de Wie auch immer, die Anwendung mag denoch funktionieren
if no acl records for user or any group the user is a member of setup de Wenn es keinen ACL-Eintrag für einen Benutzer oder eine Gruppe, der er angehört gibt
@ -488,6 +490,7 @@ skip the installation tests (not recommended) setup de Installationstests
smtp server hostname or ip address setup de SMTP Server Hostname oder IP Adresse
smtp server port setup de SMTP Server Port
some or all of its tables are missing setup de Einige oder alle Tabellen fehlen
sources deleted/missing setup de Quellen gelöscht/fehlen
sql encryption type setup de SQL-Verschlüsselungstyp für das Passwort (Vorgabe MD5)
standard (login-name identical to egroupware user-name) setup de Standard (Loginname identisch zu eGroupWare Benutzername)
standard mailserver settings (used for mail authentication too) setup de Standard Mailserver Einstellungen (werden auch für die Mail Authentifizierung benutzt)
@ -579,6 +582,7 @@ view setup de Anzeigen
virtual mail manager (login-name includes domain) setup de Virtual Mail Manager (Loginname enthalten Domain)
warning! setup de Warnung!
we can proceed setup de Wir können fortfahren
we could not determine the version of %1, please make sure it is at least %2 setup de Wir konnten die Version von %1 nicht ermitteln, bitte stellen Sie sicher das sie mindestens %2 ist.
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
@ -618,6 +622,7 @@ you need to configure egroupware: setup de Sie m
you need to fix the above errors, before the configuration file header.inc.php can be written! setup de Sie müssen die obigen Fehler beheben, bevor die Konfigurationsdatei header.inc.php gespeichert werden kann!
you need to save the settings you made here first! setup de Sie müssen die hier vorgenommenen Einstellungen zuerst speichern!
you need to select your current charset! setup de Sie müssen Ihren aktuellen Zeichensatz auswählen!
you should either install the sources or uninstall it, to get rid of the tables setup de Sie sollten entweder die Quellen installieren oder die Anwendung deinstallieren, um die Tabellen los zu werden.
you should either uninstall and then reinstall it, or attempt manual repairs setup de Sie sollten entweder de- und neuinstallieren, oder manuelle Reparaturen versuchen
you will not be able to log into egroupware using php sessions: "session could not be verified" !!! setup de Sie werden sich NICHT mit PHP Sitzungen in die eGroupWare einlogen: "Ihre Sitzung konnte nicht verifiziert werden" !!!
you're using an old configuration file format... setup de Sie verwenden ein altes Format der Konfigurationsdatei ...
@ -632,6 +637,7 @@ your files directory '%1' %2 setup de Ihr Dateiverzeichnis '%1' %2
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.<br /><blink><b class="msg">warning!</b></blink><br /><b>make backups!</b> setup de Ihre header.inc.php muss aktualisiert werden.<br /><blink><b class="msg">WARNUNG!</b></blink><br /><b>MACHEN SIE EINE SICHERUNG!</b>
your installed version of %1 is %2, required is at least %3, please run: setup de Ihre installierte Version von %1 ist %2, benötigt wir mindestens %3, bitte führen Sie folgenden Befehl aus:
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 will be dropped and you will lose data setup de Ihre Tabellen werden gelöscht werden und Sie werden alle Daten verlieren!

6
setup/lang/phpgw_en.lang
View File

@ -92,6 +92,7 @@ because it depends upon setup en because it depends upon
because it is not a user application, or access is controlled via acl setup en because it is not a user application, or access is controlled via acl
because it requires manual table installation, <br />or the table definition was incorrect setup en because it requires manual table installation, <br />or the table definition was incorrect
because it was manually disabled setup en because it was manually disabled
because its sources are missing setup en because its sources are missing
because of a failed upgrade or install setup en because of a failed upgrade or install
because of a failed upgrade, or the database is newer than the installed version of this app setup en because of a failed upgrade, or the database is newer than the installed version of this app
because the enable flag for this app is set to 0, or is undefined setup en because the enable flag for this app is set to 0, or is undefined
@ -268,6 +269,7 @@ host,{imap | pop3 | imaps | pop3s},[domain],[{standard(default)|vmailmgr = add d
host/ip domain controler setup en Host/IP Domain controler
hostname/ip of database server setup en Hostname/IP of database server
hour (0-24) setup en hour (0-24)
however the tables are still in the database setup en However the tables are still in the database
however, the application is otherwise installed setup en However, the application is otherwise installed
however, the application may still work setup en However, the application may still work
if no acl records for user or any group the user is a member of setup en If no ACL records for user or any group the user is a member of
@ -486,6 +488,7 @@ skip the installation tests (not recommended) setup en Skip the installation tes
smtp server hostname or ip address setup en SMTP server hostname or IP address
smtp server port setup en SMTP server port
some or all of its tables are missing setup en Some or all of its tables are missing
sources deleted/missing setup en Sources deleted/missing
sql encryption type setup en SQL encryption type for passwords (default - md5)
standard (login-name identical to egroupware user-name) setup en standard (login-name identical to eGroupWare user-name)
standard mailserver settings (used for mail authentication too) setup en Standard mailserver settings (used for Mail authentication too)
@ -577,6 +580,7 @@ view setup en View
virtual mail manager (login-name includes domain) setup en Virtual mail manager (login-name includes domain)
warning! setup en Warning!
we can proceed setup en We can proceed
we could not determine the version of %1, please make sure it is at least %2 setup en We could not determine the version of %1, please make sure it is at least %2
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
@ -616,6 +620,7 @@ you need to configure egroupware: setup en You need to configure eGroupWare:
you need to fix the above errors, before the configuration file header.inc.php can be written! setup en You need to fix the above errors, before the configuration file header.inc.php can be written!
you need to save the settings you made here first! setup en You need to save the settings you made here first!
you need to select your current charset! setup en You need to select your current charset!
you should either install the sources or uninstall it, to get rid of the tables setup en You should either install the sources or uninstall it, to get rid of the tables
you should either uninstall and then reinstall it, or attempt manual repairs setup en You should either uninstall and then reinstall it, or attempt manual repairs
you will not be able to log into egroupware using php sessions: "session could not be verified" !!! setup en You will NOT be able to log into eGroupWare using PHP sessions: "session could not be verified" !!!
you're using an old configuration file format... setup en You're using an old configuration file format...
@ -630,6 +635,7 @@ your files directory '%1' %2 setup en Your files directory '%1' %2
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.<br /><blink><b class="msg">warning!</b></blink><br /><b>make backups!</b> setup en Your header.inc.php needs upgrading.<br /><blink><b class="msg">WARNING!</b></blink><br /><b>MAKE BACKUPS!</b>
your installed version of %1 is %2, required is at least %3, please run: setup en Your installed version of %1 is %2, required is at least %3, please run:
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 will be dropped and you will lose data setup en Your tables will be dropped and you will lose data !!