Commit 550b9255 authored by Gábor Hojtsy's avatar Gábor Hojtsy

#197186 by dww, testing by catch, webernet, greggles: (critical security...

#197186 by dww, testing by catch, webernet, greggles: (critical security functionality) update.module did not inform users when their current release became revoked/not supported
parent d6c286a5
This diff is collapsed.
This diff is collapsed.
......@@ -48,9 +48,11 @@ function theme_update_report($data) {
$icon = theme('image', 'misc/watchdog-ok.png');
break;
case UPDATE_NOT_SECURE:
case UPDATE_REVOKED:
case UPDATE_NOT_SUPPORTED:
case UPDATE_NOT_CURRENT:
if ($notification_level == 'all'
|| $project['status'] == UPDATE_NOT_SECURE) {
|| $project['status'] != UPDATE_NOT_CURRENT) {
$class = 'error';
$icon = theme('image', 'misc/watchdog-error.png');
break;
......@@ -64,16 +66,20 @@ function theme_update_report($data) {
$row = '<div class="version-status">';
switch ($project['status']) {
case UPDATE_CURRENT:
$row .= t('Up to date');
break;
case UPDATE_NOT_SECURE:
$row .= '<span class="security-error">';
$row .= t('Security update required!');
$row .= '</span>';
$row .= '<span class="security-error">'. t('Security update required!') .'</span>';
break;
case UPDATE_REVOKED:
$row .= '<span class="revoked">'. t('Revoked!') .'</span>';
break;
case UPDATE_NOT_SUPPORTED:
$row .= '<span class="not-supported">'. t('Not supported!') .'</span>';
break;
case UPDATE_NOT_CURRENT:
$row .= t('Update available');
$row .= '<span class="not-current">'. t('Update available') .'</span>';
break;
case UPDATE_CURRENT:
$row .= '<span class="current">'. t('Up to date') .'</span>';
break;
default:
$row .= check_plain($project['reason']);
......@@ -120,6 +126,7 @@ function theme_update_report($data) {
if ($project['recommended'] != $project['latest_version']
|| !empty($project['also'])
|| ($project['install_type'] == 'dev'
&& isset($project['dev_version'])
&& $project['latest_version'] != $project['dev_version']
&& $project['recommended'] != $project['dev_version'])
|| (isset($project['security updates'][0])
......@@ -143,6 +150,7 @@ function theme_update_report($data) {
}
if ($project['install_type'] == 'dev'
&& $project['status'] != UPDATE_CURRENT
&& isset($project['dev_version'])
&& $project['recommended'] != $project['dev_version']) {
$row .= theme('update_version', $project['releases'][$project['dev_version']], t('Development version:'), 'version-latest');
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment