- Squirrelmail_usercopy: support reply-to field (#1486506)

- Use rcube_user::insert_identity() instead of custom SQL query in rcube_user::create()


git-svn-id: https://svn.roundcube.net/trunk@3286 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 3 insertions, 10 deletions

diff --git a/roundcubemail/program/include/rcube_user.php b/roundcubemail/program/include/rcube_user.php
index a5294f552..127efa746 100644
--- a/roundcubemail/program/include/rcube_user.php
+++ b/roundcubemail/program/include/rcube_user.php
@@ -215,6 +215,8 @@ class rcube_user
     if (!$this->ID)
       return false;
 
+    unset($data['user_id']);
+
     $insert_cols = $insert_values = array();
     foreach ((array)$data as $col => $value)
     {
@@ -422,20 +424,11 @@ class rcube_user
             'name' => strip_newlines($name),
             'email' => $email,
             'standard' => $standard,
-            'signature' => '',
           ),
         ));
           
         if (!$plugin['abort'] && $plugin['record']['email']) {
-          $dbh->query(
-              "INSERT INTO ".get_table_name('identities')."
-                (user_id, del, standard, name, email, signature)
-               VALUES (?, 0, ?, ?, ?, ?)",
-              $user_id,
-              $plugin['record']['standard'],
-              $plugin['record']['name'] != NULL ? $plugin['record']['name'] : '',
-              $plugin['record']['email'],
-              $plugin['record']['signature']);
+          $rcmail->user->insert_identity($plugin['record']);
         }
         $standard = 0;
       }