mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-07 16:44:20 +01:00
Upgrade API version to 0.9.15.001, add post-install dependency failure
test to detection class and applications.php
This commit is contained in:
parent
d8528bba33
commit
478ca3adc4
@ -14,7 +14,7 @@
|
||||
/* Basic information about this app */
|
||||
$setup_info['phpgwapi']['name'] = 'phpgwapi';
|
||||
$setup_info['phpgwapi']['title'] = 'phpgwapi';
|
||||
$setup_info['phpgwapi']['version'] = '0.9.13.017';
|
||||
$setup_info['phpgwapi']['version'] = '0.9.15.001';
|
||||
$setup_info['phpgwapi']['versions']['current_header'] = '1.19';
|
||||
$setup_info['phpgwapi']['enable'] = 3;
|
||||
$setup_info['phpgwapi']['app_order'] = 1;
|
||||
|
@ -413,4 +413,11 @@
|
||||
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.13.017';
|
||||
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
|
||||
}
|
||||
|
||||
$test[] = '0.9.13.017';
|
||||
function phpgwapi_upgrade0_9_13_017()
|
||||
{
|
||||
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.15.001';
|
||||
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
|
||||
}
|
||||
?>
|
||||
|
@ -263,9 +263,19 @@
|
||||
$notables = $HTTP_GET_VARS['notables'];
|
||||
$setup_tpl->set_var('description',lang('Problem resolution'). ':');
|
||||
$setup_tpl->pparse('out','header');
|
||||
if ($badinstall)
|
||||
|
||||
if($HTTP_GET_VARS['post'])
|
||||
{
|
||||
echo $setup_info[$resolve]['title'] . ' ' . lang('is broken') . ' ';
|
||||
echo '"' . $setup_info[$resolve]['title'] . '" ' . lang('may be broken') . ' ';
|
||||
echo lang('because an application it depends upon was upgraded');
|
||||
echo '<br>';
|
||||
echo lang('to a version it does not know about') . '.';
|
||||
echo '<br>';
|
||||
echo lang('However, the application may still work') . '.';
|
||||
}
|
||||
elseif ($HTTP_GET_VARS['badinstall'])
|
||||
{
|
||||
echo '"' . $setup_info[$resolve]['title'] . '" ' . lang('is broken') . ' ';
|
||||
echo lang('because of a failed upgrade or install') . '.';
|
||||
echo '<br>';
|
||||
echo lang('Some or all of its tables are missing') . '.';
|
||||
@ -276,11 +286,11 @@
|
||||
{
|
||||
if($setup_info[$resolve]['enabled'])
|
||||
{
|
||||
echo $setup_info[$resolve]['title'] . ' ' . lang('is broken') . ' ';
|
||||
echo '"' . $setup_info[$resolve]['title'] . '" ' . lang('is broken') . ' ';
|
||||
}
|
||||
else
|
||||
{
|
||||
echo $setup_info[$resolve]['title'] . ' ' . lang('is disabled') . ' ';
|
||||
echo '"' . $setup_info[$resolve]['title'] . '" ' . lang('is disabled') . ' ';
|
||||
}
|
||||
|
||||
if (!$notables)
|
||||
@ -464,6 +474,18 @@
|
||||
$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '">' . lang('Possible Solutions') . '</a>');
|
||||
$status = lang('Dependency Failure') . ':' . $depstring . $value['status'];
|
||||
break;
|
||||
case 'P':
|
||||
$setup_tpl->set_var('bg_color','FFCCFF');
|
||||
$depstring = parsedep($value['depends']);
|
||||
$depstring .= ')';
|
||||
$setup_tpl->set_var('instimg','dep.gif');
|
||||
$setup_tpl->set_var('instalt',lang('Post-install Dependency Failure'));
|
||||
$setup_tpl->set_var('install',' ');
|
||||
$setup_tpl->set_var('remove',' ');
|
||||
$setup_tpl->set_var('upgrade',' ');
|
||||
$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' . $value['name'] . '&post=True">' . lang('Possible Solutions') . '</a>');
|
||||
$status = lang('Post-install Dependency Failure') . ':' . $depstring . $value['status'];
|
||||
break;
|
||||
default:
|
||||
$setup_tpl->set_var('instimg','incomplete.gif');
|
||||
$setup_tpl->set_var('instalt',lang('Not Completed'));
|
||||
|
@ -96,6 +96,7 @@
|
||||
R upgrade in pRogress
|
||||
C upgrade Completed successfully
|
||||
D Dependency failure
|
||||
P Post-install dependency failure
|
||||
F upgrade Failed
|
||||
V Version mismatch at end of upgrade (Not used, proposed only)
|
||||
M Missing files at start of upgrade (Not used, proposed only)
|
||||
@ -169,9 +170,16 @@
|
||||
if ($setup_info['depends'][$depkey]['status'] == False)
|
||||
{
|
||||
/* Only set this if it has not already failed to upgrade - Milosch */
|
||||
if (!( ($setup_info[$key]['status'] == 'F') || ($setup_info[$key]['status'] == 'C') ))
|
||||
if ($setup_info[$key]['status'] != 'F' )//&& $setup_info[$key]['status'] != 'C')
|
||||
{
|
||||
$setup_info[$key]['status'] = 'D';
|
||||
if($setup_info[$key]['status'] == 'C')
|
||||
{
|
||||
$setup_info[$key]['status'] = 'P';
|
||||
}
|
||||
else
|
||||
{
|
||||
$setup_info[$key]['status'] = 'D';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user