extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 09:32:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use application name if title is not set in setup.inc.php for upgrade, install, etc.

Browse Source
This commit is contained in:
Miles Lott 2004-11-17 13:37:33 +00:00
parent 272be2942b
commit 4ea51095d5
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
setup/applications.php
View File

@ -133,28 +133,29 @@
foreach($remove as $appname => $key) foreach($remove as $appname => $key)
{ {
$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
$terror = array(); $terror = array();
$terror[] = $setup_info[$appname]; $terror[] = $setup_info[$appname];
if ($setup_info[$appname]['tables']) if ($setup_info[$appname]['tables'])
{ {
$GLOBALS['phpgw_setup']->process->droptables($terror,$DEBUG); $GLOBALS['phpgw_setup']->process->droptables($terror,$DEBUG);
echo '<br>' . $setup_info[$appname]['title'] . ' ' . lang('tables dropped') . '.'; echo '<br>' . $app_title . ' ' . lang('tables dropped') . '.';
} }
$GLOBALS['phpgw_setup']->deregister_app($setup_info[$appname]['name']); $GLOBALS['phpgw_setup']->deregister_app($setup_info[$appname]['name']);
echo '<br>' . $setup_info[$appname]['title'] . ' ' . lang('deregistered') . '.'; echo '<br>' . $app_title . ' ' . lang('deregistered') . '.';
if ($setup_info[$appname]['hooks']) if ($setup_info[$appname]['hooks'])
{ {
$GLOBALS['phpgw_setup']->deregister_hooks($setup_info[$appname]['name']); $GLOBALS['phpgw_setup']->deregister_hooks($setup_info[$appname]['name']);
echo '<br>' . $setup_info[$appname]['title'] . ' ' . lang('hooks deregistered') . '.'; echo '<br>' . $app_title . ' ' . lang('hooks deregistered') . '.';
} }
$do_langs = true; $do_langs = true;
if ($historylog->delete($appname)) if ($historylog->delete($appname))
{ {
echo '<br>' . $setup_info[$appname]['title'] . ' ' . lang('Historylog removed') . '.'; echo '<br>' . $app_title . ' ' . lang('Historylog removed') . '.';
} }
// delete all application categories and ACL // delete all application categories and ACL
@ -167,6 +168,7 @@
{ {
foreach($install as $appname => $key) foreach($install as $appname => $key)
{ {
$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
$terror = array(); $terror = array();
$terror[] = $setup_info[$appname]; $terror[] = $setup_info[$appname];
@ -174,7 +176,7 @@
{ {
$terror = $GLOBALS['phpgw_setup']->process->current($terror,$DEBUG); $terror = $GLOBALS['phpgw_setup']->process->current($terror,$DEBUG);
$terror = $GLOBALS['phpgw_setup']->process->default_records($terror,$DEBUG); $terror = $GLOBALS['phpgw_setup']->process->default_records($terror,$DEBUG);
echo '<br>' . $setup_info[$appname]['title'] . ' ' echo '<br>' . $app_title . ' '
. lang('tables installed, unless there are errors printed above') . '.'; . lang('tables installed, unless there are errors printed above') . '.';
} }
else else
@ -187,12 +189,12 @@
{ {
$GLOBALS['phpgw_setup']->register_app($setup_info[$appname]['name']); $GLOBALS['phpgw_setup']->register_app($setup_info[$appname]['name']);
} }
echo '<br>' . $setup_info[$appname]['title'] . ' ' . lang('registered') . '.'; echo '<br>' . $app_title . ' ' . lang('registered') . '.';
if ($setup_info[$appname]['hooks']) if ($setup_info[$appname]['hooks'])
{ {
$GLOBALS['phpgw_setup']->register_hooks($setup_info[$appname]['name']); $GLOBALS['phpgw_setup']->register_hooks($setup_info[$appname]['name']);
echo '<br>' . $setup_info[$appname]['title'] . ' ' . lang('hooks registered') . '.'; echo '<br>' . $app_title . ' ' . lang('hooks registered') . '.';
} }
} }
$do_langs = true; $do_langs = true;
@ -203,18 +205,19 @@
{ {
foreach($upgrade as $appname => $key) foreach($upgrade as $appname => $key)
{ {
$app_title = $setup_info[$appname]['title'] ? $setup_info[$appname]['title'] : $setup_info[$appname]['name'];
$terror = array(); $terror = array();
$terror[] = $setup_info[$appname]; $terror[] = $setup_info[$appname];
$GLOBALS['phpgw_setup']->process->upgrade($terror,$DEBUG); $GLOBALS['phpgw_setup']->process->upgrade($terror,$DEBUG);
if ($setup_info[$appname]['tables']) if ($setup_info[$appname]['tables'])
{ {
echo '<br>' . $setup_info[$appname]['title'] . ' ' . lang('tables upgraded') . '.'; echo '<br>' . $app_title . ' ' . lang('tables upgraded') . '.';
// The process_upgrade() function also handles registration // The process_upgrade() function also handles registration
} }
else else
{ {
echo '<br>' . $setup_info[$appname]['title'] . ' ' . lang('upgraded') . '.'; echo '<br>' . $app_title . ' ' . lang('upgraded') . '.';
} }
$do_langs = true; $do_langs = true;
} }
@ -252,7 +255,6 @@
{ {
$i = ($i ? 0 : 1); $i = ($i ? 0 : 1);
if ($key == 'tables') if ($key == 'tables')
{ {
$tblcnt = count($setup_info[$detail][$key]); $tblcnt = count($setup_info[$detail][$key]);
@ -283,10 +285,11 @@
$notables = get_var('notables',Array('GET')); $notables = get_var('notables',Array('GET'));
$setup_tpl->set_var('description',lang('Problem resolution'). ':'); $setup_tpl->set_var('description',lang('Problem resolution'). ':');
$setup_tpl->pparse('out','header'); $setup_tpl->pparse('out','header');
$app_title = $setup_info[$resolve]['title'] ? $setup_info[$resolve]['title'] : $setup_info[$resolve]['name'];
if(get_var('post',Array('GET'))) if(get_var('post',Array('GET')))
{ {
echo '"' . $setup_info[$resolve]['title'] . '" ' . lang('may be broken') . ' '; echo '"' . $app_title . '" ' . lang('may be broken') . ' ';
echo lang('because an application it depends upon was upgraded'); echo lang('because an application it depends upon was upgraded');
echo '<br>'; echo '<br>';
echo lang('to a version it does not know about') . '.'; echo lang('to a version it does not know about') . '.';
@ -295,7 +298,7 @@
} }
elseif(get_var('badinstall',Array('GET'))) elseif(get_var('badinstall',Array('GET')))
{ {
echo '"' . $setup_info[$resolve]['title'] . '" ' . lang('is broken') . ' '; echo '"' . $app_title . '" ' . lang('is broken') . ' ';
echo lang('because of a failed upgrade or install') . '.'; echo lang('because of a failed upgrade or install') . '.';
echo '<br>'; echo '<br>';
echo lang('Some or all of its tables are missing') . '.'; echo lang('Some or all of its tables are missing') . '.';
@ -306,11 +309,11 @@
{ {
if($setup_info[$resolve]['enabled']) if($setup_info[$resolve]['enabled'])
{ {
echo '"' . $setup_info[$resolve]['title'] . '" ' . lang('is broken') . ' '; echo '"' . $app_title . '" ' . lang('is broken') . ' ';
} }
else else
{ {
echo '"' . $setup_info[$resolve]['title'] . '" ' . lang('is disabled') . ' '; echo '"' . $app_title . '" ' . lang('is disabled') . ' ';
} }
if (!$notables) if (!$notables)
@ -355,7 +358,7 @@
} }
else else
{ {
echo $setup_info[$resolve]['title'] . ' ' . lang('has a version mismatch') . ' '; echo $app_title . ' ' . lang('has a version mismatch') . ' ';
echo lang('because of a failed upgrade, or the database is newer than the installed version of this app') . '.'; echo lang('because of a failed upgrade, or the database is newer than the installed version of this app') . '.';
echo '<br>'; echo '<br>';
echo lang('If the application has no defined tables, selecting upgrade should remedy the problem') . '.'; echo lang('If the application has no defined tables, selecting upgrade should remedy the problem') . '.';