From 74be739c40eb3146b7a809f2277f07fc0ef65ab8 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 28 Jan 2010 09:46:26 -0500
Subject: [PATCH] - speed up templates parsing
---
program/include/rcube_user.php | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index e02ed49..5498709 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -16,7 +16,7 @@
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
- $Id: rcube_user.inc 933 2007-11-29 14:17:32Z thomasb $
+ $Id$
*/
@@ -231,7 +231,7 @@
call_user_func_array(array($this->db, 'query'),
array_merge(array($sql), $insert_values));
- return $this->db->insert_id(get_sequence_name('identities'));
+ return $this->db->insert_id('identities');
}
@@ -359,21 +359,22 @@
$user_email = '';
$rcmail = rcmail::get_instance();
- $data = $rcmail->plugins->exec_hook('create_user', array('user'=>$user, 'user_name'=>$user_name, 'user_email'=>$user_email));
- $user_name = $data['user_name'];
- $user_email = $data['user_email'];
-
+ // try to resolve user in virtuser table and file
+ if ($email_list = self::user2email($user, false, true)) {
+ $user_email = is_array($email_list[0]) ? $email_list[0][0] : $email_list[0];
+ }
+
+ $data = $rcmail->plugins->exec_hook('create_user',
+ array('user'=>$user, 'user_name'=>$user_name, 'user_email'=>$user_email));
+
// plugin aborted this operation
if ($data['abort'])
return false;
- $dbh = $rcmail->get_dbh();
+ $user_name = $data['user_name'];
+ $user_email = $data['user_email'];
- // try to resolve user in virtuser table and file
- if ($user_email != '' && !strpos($user, '@')) {
- if ($email_list = self::user2email($user, false, true))
- $user_email = is_array($email_list[0]) ? $email_list[0][0] : $email_list[0];
- }
+ $dbh = $rcmail->get_dbh();
$dbh->query(
"INSERT INTO ".get_table_name('users')."
@@ -384,7 +385,7 @@
strip_newlines($data['alias'] ? $data['alias'] : $user_email),
$_SESSION['language']);
- if ($user_id = $dbh->insert_id(get_sequence_name('users')))
+ if ($user_id = $dbh->insert_id('users'))
{
// create rcube_user instance to make plugin hooks work
$user_instance = new rcube_user($user_id);
@@ -400,10 +401,9 @@
}
if (empty($email_list))
- $email_list[] = strip_newlines($user_email);
-
+ $email_list[] = strip_newlines($user_email);
// identities_level check
- if (count($email_list) > 1 && $rcmail->config->get('identities_level', 0) > 1)
+ else if (count($email_list) > 1 && $rcmail->config->get('identities_level', 0) > 1)
$email_list = array($email_list[0]);
// create new identities records
--
Gitblit v1.9.1