From 000bb9a55cdca43a7111eb3a5e655a28fa04d8a4 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 13 Sep 2008 10:26:57 -0400
Subject: [PATCH] - localization fix for 'replyto' label length (use short 'replyto' and long 'reply-to')
---
program/include/rcube_user.php | 38 +++++++++++++++-----------------------
1 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index 0c044ca..a5dc73b 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -59,17 +59,7 @@
}
}
- /**
- * PHP 4 object constructor
- *
- * @see rcube_user::__construct
- */
- function rcube_user($id = null, $sql_arr = null)
- {
- $this->__construct($id, $sql_arr);
- }
-
-
+
/**
* Build a user name string (as e-mail address)
*
@@ -326,16 +316,18 @@
{
$dbh = rcmail::get_instance()->get_dbh();
- // query if user already registered
- $sql_result = $dbh->query(
- "SELECT * FROM ".get_table_name('users')."
- WHERE mail_host=? AND (username=? OR alias=?)",
- $host,
- $user,
- $user);
-
+ // query for matching user name
+ $query = "SELECT * FROM ".get_table_name('users')." WHERE mail_host=? AND %s=?";
+ $sql_result = $dbh->query(sprintf($query, 'username'), $host, $user);
+
+ // query for matching alias
+ if (!($sql_arr = $dbh->fetch_assoc($sql_result))) {
+ $sql_result = $dbh->query(sprintf($query, 'alias'), $host, $user);
+ $sql_arr = $dbh->fetch_assoc($sql_result);
+ }
+
// user already registered -> overwrite username
- if ($sql_arr = $dbh->fetch_assoc($sql_result))
+ if ($sql_arr)
return new rcube_user($sql_arr['user_id'], $sql_arr);
else
return false;
@@ -428,7 +420,7 @@
static function email2user($email)
{
$user = $email;
- $r = self::findinvirtual("^$email\s");
+ $r = self::findinvirtual('^' . quotemeta($email) . '[[:space:]]');
for ($i=0; $i<count($r); $i++)
{
@@ -453,8 +445,8 @@
*/
static function user2email($user)
{
- $email = "";
- $r = self::findinvirtual("\s$user\s*$");
+ $email = '';
+ $r = self::findinvirtual('[[:space:]]' . quotemeta($user) . '[[:space:]]*$');
for ($i=0; $i<count($r); $i++)
{
--
Gitblit v1.9.1