diff options
| author | Thomas B. <thomas@roundcube.net> | 2013-07-29 23:25:54 -0700 |
|---|---|---|
| committer | Thomas B. <thomas@roundcube.net> | 2013-07-29 23:25:54 -0700 |
| commit | 86dd03677466ceb37e0a2d3d43e8a76472966745 (patch) | |
| tree | b481ebe916723698e9db839f9bf53bf228c650bb /program | |
| parent | d59a8d29d6ae877e9f56a0e3fe3d1068661a9473 (diff) | |
| parent | bb0ff201408a7bc5711588e6afdacf7e7f30d920 (diff) | |
Merge pull request #96 from Dennis1993/patch-6
Added required attribute and delete deprecated border attributes
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/rcmail_output_html.php | 4 | ||||
| -rw-r--r-- | program/lib/Roundcube/html.php | 2 | ||||
| -rw-r--r-- | program/steps/settings/func.inc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index 998779509..a2ec29ca3 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -1531,9 +1531,9 @@ class rcmail_output_html extends rcmail_output $input_action = new html_hiddenfield(array('name' => '_action', 'value' => 'login')); $input_tzone = new html_hiddenfield(array('name' => '_timezone', 'id' => 'rcmlogintz', 'value' => '_default_')); $input_url = new html_hiddenfield(array('name' => '_url', 'id' => 'rcmloginurl', 'value' => $url)); - $input_user = new html_inputfield(array('name' => '_user', 'id' => 'rcmloginuser') + $input_user = new html_inputfield(array('name' => '_user', 'id' => 'rcmloginuser', 'required' => 'required') + $attrib + $user_attrib); - $input_pass = new html_passwordfield(array('name' => '_pass', 'id' => 'rcmloginpwd') + $input_pass = new html_passwordfield(array('name' => '_pass', 'id' => 'rcmloginpwd', 'required' => 'required') + $attrib + $pass_attrib); $input_host = null; diff --git a/program/lib/Roundcube/html.php b/program/lib/Roundcube/html.php index 3e6e47a56..a36711281 100644 --- a/program/lib/Roundcube/html.php +++ b/program/lib/Roundcube/html.php @@ -358,7 +358,7 @@ class html_inputfield extends html protected $tagname = 'input'; protected $type = 'text'; protected $allowed = array( - 'type','name','value','size','tabindex','autocapitalize', + 'type','name','value','size','tabindex','autocapitalize','required', 'autocomplete','checked','onchange','onclick','disabled','readonly', 'spellcheck','results','maxlength','src','multiple','accept', 'placeholder','autofocus', diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index dbc9b3ce2..f6ea79ec6 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -546,7 +546,7 @@ function rcmail_user_prefs($current = null) $blocks['main']['options']['default_charset'] = array( 'title' => html::label($field_id, Q(rcube_label('defaultcharset'))), 'content' => $RCMAIL->output->charset_selector(array( - 'name' => '_default_charset', 'selected' => $config['default_charset'] + 'id' => $field_id, 'name' => '_default_charset', 'selected' => $config['default_charset'] ))); } |