Changeset d5ae977 in github

Timestamp:

Sep 6, 2011 1:18:12 PM (22 months ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.7, release-0.8

Children:

2a76f8d

Parents:

f8e48df

Message:

• Fix username case-insensitivity issue in MySQL (#1488021)

Files:

• CHANGELOG (modified) (1 diff)
• SQL/mysql.initial.sql (modified) (1 diff)
• SQL/mysql.update.sql (modified) (1 diff)
• program/include/rcube_user.php (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix username case-insensitivity issue in MySQL (#1488021)
 - Addressbook Saved Searches
 - Added spellchecker exceptions dictionary (shared or per-user)

SQL/mysql.initial.sql

@@ -21 +21 @@
 CREATE TABLE `users` (
  `user_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
- `username` varchar(128) NOT NULL,
+ `username` varchar(128) BINARY NOT NULL,
  `mail_host` varchar(128) NOT NULL,
- `alias` varchar(128) NOT NULL,
+ `alias` varchar(128) BINARY NOT NULL,
  `created` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
  `last_login` datetime DEFAULT NULL,

SQL/mysql.update.sql

@@ -148 +148 @@
 -- Updates from version 0.6-stable
 
+ALTER TABLE `users` CHANGE `alias` `alias` varchar(128) BINARY NOT NULL;
+ALTER TABLE `users` CHANGE `username` `username` varchar(128) BINARY NOT NULL;
+
 CREATE TABLE `dictionary` (
   `user_id` int(10) UNSIGNED DEFAULT NULL,

program/include/rcube_user.php

@@ -400 +400 @@
         $dbh = rcmail::get_instance()->get_dbh();
 
-        // use BINARY (case-sensitive) comparison on MySQL, other engines are case-sensitive
-        $mod = preg_match('/^mysql/', $dbh->db_provider) ? 'BINARY' : '';
-
         // query for matching user name
-        $query = "SELECT * FROM ".get_table_name('users')." WHERE mail_host = ? AND %s = $mod ?";
+        $query = "SELECT * FROM ".get_table_name('users')." WHERE mail_host = ? AND %s = ?";
         $sql_result = $dbh->query(sprintf($query, 'username'), $host, $user);