[Svn] r2191 - trunk/roundcubemail/program/include

[trac at roundcube.net]

Author: alec
Date: 2008-12-28 11:17:01 -0600 (Sun, 28 Dec 2008)
New Revision: 2191

Modified:
   trunk/roundcubemail/program/include/rcube_user.php
Log:
#1485648: fix multiple identities from virtuser_query all set to default


Modified: trunk/roundcubemail/program/include/rcube_user.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_user.php	2008-12-27 19:45:49 UTC (rev 2190)
+++ trunk/roundcubemail/program/include/rcube_user.php	2008-12-28 17:17:01 UTC (rev 2191)
@@ -377,15 +377,18 @@
     	&& ($sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($user), $virtuser_query)))
 	&& ($dbh->num_rows() > 0))
       {
+        $standard = 1;
         while ($sql_arr = $dbh->fetch_array($sql_result))
         {
           $dbh->query(
             "INSERT INTO ".get_table_name('identities')."
               (user_id, del, standard, name, email)
-             VALUES (?, 0, 1, ?, ?)",
+             VALUES (?, 0, ?, ?, ?)",
             $user_id,
+	    $standard,
             strip_newlines($user_name),
             preg_replace('/^@/', $user . '@', $sql_arr[0]));
+	  $standard = 0;
         }
       }
       else

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn