Changeset 515 in subversion for trunk/roundcubemail/program/include/main.inc

Timestamp:

Mar 21, 2007 5:56:49 AM (6 years ago)

Author:

thomasb

Message:

Minor bugfixes posted to the dev-mailing list

File:

• trunk/roundcubemail/program/include/main.inc (modified) (5 diffs)

trunk/roundcubemail/program/include/main.inc

@@ -581 +581 @@
               (created, last_login, username, mail_host, alias, language)
               VALUES (".$DB->now().", ".$DB->now().", ?, ?, ?, ?)",
-              $user,
-              $host,
-              $user_email,
-                      $_SESSION['user_lang']);
+              strip_newlines($user),
+              strip_newlines($host),
+              strip_newlines($user_email),
+              $_SESSION['user_lang']);
 
   if ($user_id = $DB->insert_id(get_sequence_name('users')))
@@ -596 +596 @@
 
     // try to resolve the e-mail address from the virtuser table
-        if (!empty($CONFIG['virtuser_query']) &&
+    if (!empty($CONFIG['virtuser_query']) &&
         ($sql_result = $DB->query(preg_replace('/%u/', $user, $CONFIG['virtuser_query']))) &&
         ($DB->num_rows()>0))
@@ -605 +605 @@
                    VALUES (?, 0, 1, ?, ?)",
                    $user_id,
-                   $user_name,
+                   strip_newlines($user_name),
                    preg_replace('/^@/', $user . '@', $sql_arr[0]));
         }
@@ -615 +615 @@
                   VALUES (?, 0, 1, ?, ?)",
                   $user_id,
-                  $user_name,
-                  $user_email);
+                  strip_newlines($user_name),
+                  strip_newlines($user_email));
       }
                        
@@ -1139 +1139 @@
 {
   return preg_replace('/[\'"]/', '', $str);
+}
+
+/**
+ * Remove new lines characters from given string
+ */
+function strip_newlines($str)
+{
+  return preg_replace('/[\r\n]/', '', $str);
 }