Case-insensitive matching in autocompletion (#1487933); replace old string offset syntax

release-0.6
thomascube 14 years ago
parent 340546c975
commit 09c59abf85

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail CHANGELOG Roundcube Webmail
=========================== ===========================
- Case-insensitive matching in autocompletion (#1487933)
- Added option to force spellchecking before sending a message (#1485458) - Added option to force spellchecking before sending a message (#1485458)
- Fix handling of "<" character in contact data, search fields and folder names (#1487864) - Fix handling of "<" character in contact data, search fields and folder names (#1487864)
- Fix saving "<" character in identity name and organization fields (#1487864) - Fix saving "<" character in identity name and organization fields (#1487864)

@ -1090,28 +1090,28 @@ function format_date($date, $format=NULL)
// an alternative would be to convert the date() format string to fit with strftime() // an alternative would be to convert the date() format string to fit with strftime()
$out = ''; $out = '';
for($i=0; $i<strlen($format); $i++) { for($i=0; $i<strlen($format); $i++) {
if ($format{$i}=='\\') // skip escape chars if ($format[$i]=='\\') // skip escape chars
continue; continue;
// write char "as-is" // write char "as-is"
if ($format{$i}==' ' || $format{$i-1}=='\\') if ($format[$i]==' ' || $format{$i-1}=='\\')
$out .= $format{$i}; $out .= $format[$i];
// weekday (short) // weekday (short)
else if ($format{$i}=='D') else if ($format[$i]=='D')
$out .= rcube_label(strtolower(date('D', $timestamp))); $out .= rcube_label(strtolower(date('D', $timestamp)));
// weekday long // weekday long
else if ($format{$i}=='l') else if ($format[$i]=='l')
$out .= rcube_label(strtolower(date('l', $timestamp))); $out .= rcube_label(strtolower(date('l', $timestamp)));
// month name (short) // month name (short)
else if ($format{$i}=='M') else if ($format[$i]=='M')
$out .= rcube_label(strtolower(date('M', $timestamp))); $out .= rcube_label(strtolower(date('M', $timestamp)));
// month name (long) // month name (long)
else if ($format{$i}=='F') else if ($format[$i]=='F')
$out .= rcube_label('long'.strtolower(date('M', $timestamp))); $out .= rcube_label('long'.strtolower(date('M', $timestamp)));
else if ($format{$i}=='x') else if ($format[$i]=='x')
$out .= strftime('%x %X', $timestamp); $out .= strftime('%x %X', $timestamp);
else else
$out .= date($format{$i}, $timestamp); $out .= date($format[$i], $timestamp);
} }
if ($today) { if ($today) {

@ -53,7 +53,7 @@ else if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_GPC, tr
foreach ($email_arr as $email) { foreach ($email_arr as $email) {
$contact = format_email_recipient($email, $sql_arr['name']); $contact = format_email_recipient($email, $sql_arr['name']);
// skip entries that don't match // skip entries that don't match
if ($email_cnt > 1 && strpos($contact, $search) === false) { if ($email_cnt > 1 && stripos($contact, $search) === false) {
continue; continue;
} }
// when we've got more than one book, we need to skip duplicates // when we've got more than one book, we need to skip duplicates

Loading…
Cancel
Save