diff --git a/main/auth/gotocourse.php b/main/auth/gotocourse.php index ef5a8ee0e8..d0b2d65d77 100755 --- a/main/auth/gotocourse.php +++ b/main/auth/gotocourse.php @@ -27,8 +27,18 @@ if (isset($_GET['firstpage'])) { $action = api_get_self().'?'.Security::remove_XSS($_SERVER['QUERY_STRING']); $action = str_replace('&', '&', $action); $form = new FormValidator('formLogin', 'post', $action, null, array('class'=>'form-stacked')); - $form->addElement('text', 'login', null, array('placeholder' => get_lang('UserName'), 'class' => 'autocapitalize_off')); //new - $form->addElement('password', 'password', null, array('placeholder' => get_lang('Password'))); //new + $form->addElement( + 'text', + 'login', + null, + array('placeholder' => get_lang('UserName'), 'autocapitalize' => 'none') + ); + $form->addElement( + 'password', + 'password', + null, + array('placeholder' => get_lang('Password'), 'autocapitalize' => 'none') + ); $form->addButtonNext(get_lang('LoginEnter'), 'submitAuth'); // see same text in main_api.lib.php function api_not_allowed if (api_is_cas_activated()) { diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php index 9af77e8d86..02975d70f6 100644 --- a/main/inc/lib/api.lib.php +++ b/main/inc/lib/api.lib.php @@ -3418,8 +3418,18 @@ function api_not_allowed($print_headers = false, $message = null) array(), FormValidator::LAYOUT_BOX_NO_LABEL ); - $form->addElement('text', 'login', null, array('placeholder' => get_lang('UserName'), 'class' => 'autocapitalize_off')); - $form->addElement('password', 'password', null, array('placeholder' => get_lang('Password'))); + $form->addElement( + 'text', + 'login', + null, + array('placeholder' => get_lang('UserName'), 'autocapitalize' => 'none') + ); + $form->addElement( + 'password', + 'password', + null, + array('placeholder' => get_lang('Password'), 'autocapitalize' => 'none') + ); $form->addButton('submitAuth', get_lang('LoginEnter'), '', 'primary'); // see same text in auth/gotocourse.php and main_api.lib.php function api_not_allowed (above) @@ -3472,7 +3482,7 @@ function api_not_allowed($print_headers = false, $message = null) $action = api_get_self().'?'.Security::remove_XSS($_SERVER['QUERY_STRING']); $action = str_replace('&', '&', $action); $form = new FormValidator('formLogin', 'post', $action, null, array('class'=>'form-stacked')); - $form->addElement('text', 'login', null, array('placeholder' => get_lang('UserName'), 'class' => 'col-md-3 autocapitalize_off')); //new + $form->addElement('text', 'login', null, array('autocapitalize' => 'none', 'placeholder' => get_lang('UserName'), 'class' => 'col-md-3')); $form->addElement('password', 'password', null, array('placeholder' => get_lang('Password'), 'class' => 'col-md-3')); //new $form->addButtonNext(get_lang('LoginEnter'), 'submitAuth'); diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php index 425540d1e0..7866570a02 100755 --- a/main/inc/lib/template.lib.php +++ b/main/inc/lib/template.lib.php @@ -1115,7 +1115,7 @@ class Template $tpl = $this->get_template('layout/show_footer.tpl'); $this->display($tpl); } - + /** * Show footer js template. */ @@ -1288,18 +1288,30 @@ class Template 'login', get_lang('UserName'), true, - array('id' => 'login', 'autofocus' => 'autofocus', 'icon' => 'user fa-fw', 'placeholder' => get_lang('UserName'))); + array( + 'id' => 'login', + 'autofocus' => 'autofocus', + 'icon' => 'user fa-fw', + 'placeholder' => get_lang('UserName'), + 'autocapitalize' => 'none' + ) + ); $form->addElement( 'password', 'password', get_lang('Pass'), - array('id' => 'password', 'icon' => 'lock fa-fw', 'placeholder' => get_lang('Pass')) + array( + 'id' => 'password', + 'icon' => 'lock fa-fw', + 'placeholder' => get_lang('Pass'), + 'autocapitalize' => 'none', + ) ); // Captcha $captcha = api_get_setting('allow_captcha'); - $allowCaptcha = $captcha == 'true'; + $allowCaptcha = $captcha === 'true'; if ($allowCaptcha) { $useCaptcha = isset($_SESSION['loginFailed']) ? $_SESSION['loginFailed'] : null; diff --git a/main/template/default/layout/footer.js.tpl b/main/template/default/layout/footer.js.tpl index 19bdc90959..b93ba3f2ff 100644 --- a/main/template/default/layout/footer.js.tpl +++ b/main/template/default/layout/footer.js.tpl @@ -1,14 +1,4 @@