Enigma: Fix bug where revoked users/keys were not greyed out in key info

The 'deleted' class was assigned to the wrong (next) row in a table.
It also didn't work in Elastic skin at all because of the missing style.
pull/6748/head
Aleksander Machniak 5 years ago
parent b89031e335
commit 6efa88f049

@ -5,7 +5,6 @@ CHANGELOG Roundcube Webmail
- Clarified 'address_book_type' option behavior (#6680)
- Added cookie mismatch detection, display an error message informing the user to clear cookies
- Renamed 'log_session' option to 'session_debug'
- Password: Added ldap_exop driver (#4992)
- Don't log full session identifiers in userlogins log (#6625)
- installto.sh: Add possibility to run the update even on the up-to-date installation (#6533)
- Elastic: Add Prev/Next buttons on message page toolbar (#6648)
@ -19,10 +18,12 @@ CHANGELOG Roundcube Webmail
- Elastic: Various internal refactorings
- Elastic: Fix issue with absolute positioned mail content (#6739)
- Elastic: Fix bug where some menu actions could cause a browser popup warning
- Larry: Fix regression where menu actions didn't work with keyboard (#6740)
- Password: Added ldap_exop driver (#4992)
- Managesieve: Fix bug where global includes were requested for vacation (#6716)
- Managesieve: Use RFC-compliant line endings, CRLF instead of LF (#6686)
- Managesieve: Fix so "Create filter" option does not show up when Filters menu is disabled (#6723)
- Larry: Fix regression where menu actions didn't work with keyboard (#6740)
- Enigma: Fix bug where revoked users/keys were not greyed out in key info
- Fix so advanced search dialog is not automatically displayed on searchonly addressbooks (#6679)
- Fix so an error is logged when more than one attachment plugin has been enabled, initialize the first one (#6735)
- Fix bug where flag change could have been passed to a preview frame when not expected

@ -69,7 +69,7 @@ Make sure that vendor/bin/crypt-gpg-pinentry works from command line.
Possible reasons:
- non-working loader in shebang (#! /usr/bin/env php)
Make sure it works for the user the php scripts are executed upon
(i.e. apache, www-date, etc.)
(i.e. apache, www-data, etc.)
- SELinux setting, try command: setsebool -P httpd_unified 0
Note: pinentry is used with gpg >= 2.0 and <= 2.1.12.

@ -415,12 +415,12 @@ class enigma_ui
}
}
$table->set_row_attribs($subkey->revoked || ($subkey->expires && $subkey->expires < $now) ? 'deleted' : '');
$table->add('id', $subkey->get_short_id());
$table->add('algo', $algo);
$table->add('created', $subkey->created ? $this->rc->format_date($subkey->created, $date_format, false) : '');
$table->add('expires', $subkey->expires ? $this->rc->format_date($subkey->expires, $date_format, false) : $this->enigma->gettext('expiresnever'));
$table->add('usage', implode(',', $usage));
$table->set_row_attribs($subkey->revoked || ($subkey->expires && $subkey->expires < $now) ? 'deleted' : '');
}
$out .= html::tag('fieldset', null,
@ -440,9 +440,9 @@ class enigma_ui
}
$username .= ' <' . $user->email . '>';
$table->set_row_attribs($user->revoked || !$user->valid ? 'deleted' : '');
$table->add('id', rcube::Q(trim($username)));
$table->add('valid', $this->enigma->gettext($user->valid ? 'valid' : 'unknown'));
$table->set_row_attribs($user->revoked || !$user->valid ? 'deleted' : '');
}
$out .= html::tag('fieldset', null,

@ -570,6 +570,10 @@ table.table {
fieldset.tab-pane & thead th {
border: 0;
}
tr.deleted td {
color: @color-list-deleted !important;
}
}
/* Bootstrap's .table style overwrites */

Loading…
Cancel
Save