diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/html.php | 2 | ||||
| -rw-r--r-- | program/include/rcube_ldap.php | 4 | ||||
| -rw-r--r-- | program/include/rcube_output_html.php | 3 | ||||
| -rw-r--r-- | program/js/app.js | 3 | ||||
| -rw-r--r-- | program/steps/addressbook/search.inc | 7 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 2 | ||||
| -rw-r--r-- | program/steps/settings/edit_identity.inc | 4 | ||||
| -rw-r--r-- | program/steps/settings/save_identity.inc | 15 |
8 files changed, 17 insertions, 23 deletions
diff --git a/program/include/html.php b/program/include/html.php index 880c90463..d15d50875 100644 --- a/program/include/html.php +++ b/program/include/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', + 'type','name','value','size','tabindex','autocapitalize', 'autocomplete','checked','onchange','onclick','disabled','readonly', 'spellcheck','results','maxlength','src','multiple','placeholder', ); diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php index 7f51b8fa7..dbab0fd06 100644 --- a/program/include/rcube_ldap.php +++ b/program/include/rcube_ldap.php @@ -767,9 +767,9 @@ class rcube_ldap extends rcube_addressbook } // use VLV pseudo-search for autocompletion - $rcmail = rcmail::get_instance(); + $rcube = rcube::get_instance(); - if ($this->prop['vlv_search'] && $this->conn && join(',', (array)$fields) == join(',', $rcmail->config->get('contactlist_fields'))) + if ($this->prop['vlv_search'] && $this->conn && join(',', (array)$fields) == join(',', $rcube->config->get('contactlist_fields'))) { // add general filter to query if (!empty($this->prop['filter']) && empty($this->filter)) diff --git a/program/include/rcube_output_html.php b/program/include/rcube_output_html.php index 30512d227..0a8f0e364 100644 --- a/program/include/rcube_output_html.php +++ b/program/include/rcube_output_html.php @@ -1378,6 +1378,9 @@ class rcube_output_html extends rcube_output if (empty($url) && !preg_match('/_(task|action)=logout/', $_SERVER['QUERY_STRING'])) $url = $_SERVER['QUERY_STRING']; + // Disable autocapitalization on iPad/iPhone (#1488609) + $attrib['autocapitalize'] = 'off'; + // set atocomplete attribute $user_attrib = $autocomplete > 0 ? array() : array('autocomplete' => 'off'); $host_attrib = $autocomplete > 0 ? array() : array('autocomplete' => 'off'); diff --git a/program/js/app.js b/program/js/app.js index 214a5cb80..de61b21f1 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -4031,8 +4031,7 @@ function rcube_webmail() // if a group is currently selected, and there is at least one contact selected // thend we can enable the group-remove-selected command - this.enable_command('group-remove-selected', typeof this.env.group != 'undefined' && list.selection.length > 0); - + this.enable_command('group-remove-selected', this.env.group && list.selection.length > 0); this.enable_command('compose', this.env.group || list.selection.length > 0); this.enable_command('edit', id && writable); this.enable_command('delete', list.selection.length && writable); diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc index d31e54b1a..851325070 100644 --- a/program/steps/addressbook/search.inc +++ b/program/steps/addressbook/search.inc @@ -237,9 +237,12 @@ function rcmail_contact_search() $OUTPUT->command('set_env', 'source', ''); $OUTPUT->command('set_env', 'group', ''); - // unselect currently selected directory/group - if (!$sid) + if (!$sid) { + // unselect currently selected directory/group $OUTPUT->command('unselect_directory'); + // enable "Save search" command + $OUTPUT->command('enable_command', 'search-create', true); + } $OUTPUT->command('update_group_commands'); // send response diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index b2f81d73c..3d65eacb1 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1488,7 +1488,7 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null, function rcmail_wrap_and_quote($text, $length = 72) { // Rebuild the message body with a maximum of $max chars, while keeping quoted message. - $max = min(77, $length + 8); + $max = max(75, $length + 8); $lines = preg_split('/\r?\n/', trim($text)); $out = ''; diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc index ebc2c1b20..aa1aeea5d 100644 --- a/program/steps/settings/edit_identity.inc +++ b/program/steps/settings/edit_identity.inc @@ -97,9 +97,7 @@ function rcube_identity_form($attrib) $form['addressing']['content']['email']['class'] = 'disabled'; } - $IDENTITY_RECORD['email'] = rcube_idn_to_utf8($IDENTITY_RECORD['email']); - $IDENTITY_RECORD['reply-to'] = rcube_idn_to_utf8($IDENTITY_RECORD['reply-to']); - $IDENTITY_RECORD['bcc'] = rcube_idn_to_utf8($IDENTITY_RECORD['bcc']); + $IDENTITY_RECORD['email'] = rcube_idn_to_utf8($IDENTITY_RECORD['email']); // Allow plugins to modify identity form content $plugin = $RCMAIL->plugins->exec_hook('identity_form', array( diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc index dba143dd8..8515c44f1 100644 --- a/program/steps/settings/save_identity.inc +++ b/program/steps/settings/save_identity.inc @@ -58,8 +58,8 @@ if (IDENTITIES_LEVEL == 1 || IDENTITIES_LEVEL == 3) // Validate e-mail addresses $email_checks = array(rcube_idn_to_ascii($save_data['email'])); foreach (array('reply-to', 'bcc') as $item) { - foreach (rcube_mime::decode_address_list(rcube_idn_to_ascii($save_data[$item]), null, false) as $rcpt) - $email_checks[] = $rcpt['mailto']; + foreach (rcube_mime::decode_address_list($save_data[$item], null, false) as $rcpt) + $email_checks[] = rcube_idn_to_ascii($rcpt['mailto']); } foreach ($email_checks as $email) { @@ -80,11 +80,6 @@ if ($_POST['_iid']) if ($save_data['email']) $save_data['email'] = rcube_idn_to_ascii($save_data['email']); - if ($save_data['bcc']) - $save_data['bcc'] = rcube_idn_to_ascii($save_data['bcc']); - if ($save_data['reply-to']) - $save_data['reply-to'] = rcube_idn_to_ascii($save_data['reply-to']); - if (!$plugin['abort']) $updated = $RCMAIL->user->update_identity($iid, $save_data); else @@ -119,11 +114,7 @@ else if (IDENTITIES_LEVEL < 2) $save_data = $plugin['record']; if ($save_data['email']) - $save_data['email'] = rcube_idn_to_ascii($save_data['email']); - if ($save_data['bcc']) - $save_data['bcc'] = rcube_idn_to_ascii($save_data['bcc']); - if ($save_data['reply-to']) - $save_data['reply-to'] = rcube_idn_to_ascii($save_data['reply-to']); + $save_data['email'] = rcube_idn_to_ascii($save_data['email']); if (!$plugin['abort']) $insert_id = $save_data['email'] ? $RCMAIL->user->insert_identity($save_data) : null; |