Changeset 333c48c in github

Timestamp:

Feb 23, 2010 1:31:23 PM (3 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

7481dd9

Parents:

6a31558

Message:

• Squirrelmail_usercopy: support reply-to field (#1486506)
• Use rcube_user::insert_identity() instead of custom SQL query in rcube_user::create()

Files:

• CHANGELOG (modified) (1 diff)
• plugins/squirrelmail_usercopy/squirrelmail_usercopy.php (modified) (3 diffs)
• program/include/rcube_user.php (modified) (2 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Squirrelmail_usercopy: support reply-to field (#1486506)
 - Fix IE spellcheck suggestion popup issue (#1486471)
 - Fix email address auto-completion shows regexp pattern (#1486258)

plugins/squirrelmail_usercopy/squirrelmail_usercopy.php

@@ -6 +6 @@
  * Currently only file-based data storage of Squirrelmail is supported.
  *
- * @version 1.0
+ * @version 1.1
  * @author Thomas Bruederli
  */
@@ -34 +34 @@
         public function create_identity($p)
         {
+                $rcmail = rcmail::get_instance();
+
                 // only execute on login
-                if ($p['login'] && $this->prefs) {
+                if ($rcmail->task == 'login' && $this->prefs) {
                         if ($this->prefs['full_name'])
                                 $p['record']['name'] = $this->prefs['full_name'];
@@ -42 +44 @@
                         if ($this->prefs['signature'])
                                 $p['record']['signature'] = $this->prefs['signature'];
-                
+                        if ($this->prefs['reply-to']) 
+                                $p['record']['reply-to'] = $this->prefs['reply-to'];            
+
                         // copy address book
-                        $rcmail = rcmail::get_instance();
                         $contacts = $rcmail->get_address_book(null, true);
                         if ($contacts && count($this->abook)) {

program/include/rcube_user.php

@@ -216 +216 @@
       return false;
 
+    unset($data['user_id']);
+
     $insert_cols = $insert_values = array();
     foreach ((array)$data as $col => $value)
@@ -423 +425 @@
             '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;