Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-09 17:46:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

CS fixes, update changelog

Browse Source
This commit is contained in:
Aleksander Machniak
2021-11-28 08:39:12 +01:00
parent e2a9d36f5e
commit a9f51ced21
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
program/include/rcmail_output_html.php
View File

@@ -2375,8 +2375,8 @@ EOF;
}
}
else if (is_array($default_host) && ($host = key($default_host)) !== null) {
$input_host = new html_hiddenfield([
'name' => '_host', 'id' => 'rcmloginhost', 'value' => is_numeric($host) ? $default_host[$host] : $host] + $attrib);
$val = is_numeric($host) ? $default_host[$host] : $host;
$input_host = new html_hiddenfield(['name' => '_host', 'id' => 'rcmloginhost', 'value' => $val] + $attrib);
$form_content['hidden']['host'] = $input_host->show();
$input_host = null;
@@ -2396,7 +2396,9 @@ EOF;
if (rcube_utils::get_boolean($attrib['submit'])) {
$button_attr = ['type' => 'submit', 'id' => 'rcmloginsubmit', 'class' => 'button mainaction submit'];
$form_content['buttons']['submit'] = ['outterclass' => 'formbuttons', 'content' => html::tag('button', $button_attr, $this->app->gettext('login'))];
$button = html::tag('button', $button_attr, $this->app->gettext('login'));
$form_content['buttons']['submit'] = ['outterclass' => 'formbuttons', 'content' => $button];
}
// add oauth login button
@@ -2408,8 +2410,15 @@ EOF;
$form_content['buttons'] = [];
}
$link_attr = ['href' => $this->app->url(['action' => 'oauth']), 'id' => 'rcmloginoauth', 'class' => 'button oauth ' . $this->config->get('oauth_provider')];
$button = html::a($link_attr, $this->app->gettext(['name' => 'oauthlogin', 'vars' => ['provider' => $this->config->get('oauth_provider_name', 'OAuth')]]));
$link_attr = [
'href' => $this->app->url(['action' => 'oauth']),
'id' => 'rcmloginoauth',
'class' => 'button oauth ' . $this->config->get('oauth_provider')
];
$provider = $this->config->get('oauth_provider_name', 'OAuth');
$button = html::a($link_attr, $this->app->gettext(['name' => 'oauthlogin', 'vars' => ['provider' => $provider]]));
$form_content['buttons']['oauthlogin'] = ['outterclass' => 'oauthlogin', 'content' => $button];
}