fix wrong visible-callback for ssl-editor in domain-listing; fix adding new certificate via form; don't show logs-icon when domain is email_only
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
@@ -88,10 +88,12 @@ class Domain
|
||||
|
||||
public static function canViewLogs(array $attributes): bool
|
||||
{
|
||||
if ((int) UI::getCurrentUser()['adminsession'] == 0 && (bool)UI::getCurrentUser()['logviewenabled']) {
|
||||
return true;
|
||||
} elseif ((int) UI::getCurrentUser()['adminsession'] == 1 && (int)$attributes['fields']['email_only'] == 0) {
|
||||
return true;
|
||||
if ((int)$attributes['fields']['email_only'] == 0) {
|
||||
if ((int) UI::getCurrentUser()['adminsession'] == 0 && (bool)UI::getCurrentUser()['logviewenabled']) {
|
||||
return true;
|
||||
} elseif ((int) UI::getCurrentUser()['adminsession'] == 1) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -59,6 +59,11 @@ return array(
|
||||
'cols' => 100,
|
||||
'rows' => 15,
|
||||
'value' => $result['ssl_ca_file']
|
||||
),
|
||||
'do_insert' => array(
|
||||
'type' => 'hidden',
|
||||
'value' => '1',
|
||||
'visible' => empty($result['ssl_cert_file'])
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
@@ -173,7 +173,7 @@ return [
|
||||
'action' => 'view',
|
||||
'id' => ':id'
|
||||
],
|
||||
'visible' => [Domain::class, 'adminCanEditDNS']
|
||||
'visible' => [Domain::class, 'canEditSSL']
|
||||
],
|
||||
'letsencrypt' => [
|
||||
'icon' => 'fa fa-shield',
|
||||
|
||||
Reference in New Issue
Block a user