Changeset 2638 in subversion

Timestamp:

Jun 11, 2009 11:15:28 AM (4 years ago)

Author:

alec

Message:

• fix folder ID generation (for example two folders 'aaa' and 'aaa "')

Location:

trunk/roundcubemail/program

Files:

• include/main.inc (modified) (2 diffs)
• js/app.js (modified) (2 diffs)

trunk/roundcubemail/program/include/main.inc

@@ -591 +591 @@
 /**
  * Remove all non-ascii and non-word chars
- * except . and -
- */
-function asciiwords($str, $css_id = false)
+ * except ., -, _
+ */
+function asciiwords($str, $css_id = false, $replace_with = '')
 {
   $allowed = 'a-z0-9\_\-' . (!$css_id ? '\.' : '');
-  return preg_replace("/[^$allowed]/i", '', $str);
+  return preg_replace("/[^$allowed]/i", $replace_with, $str);
 }
 
@@ -1202 +1202 @@
 
     // make folder name safe for ids and class names
-    $folder_id = asciiwords($folder['id'], true);
+    $folder_id = asciiwords($folder['id'], true, '_');
     $classes = array('mailbox');
 

trunk/roundcubemail/program/js/app.js

@@ -3497 +3497 @@
         $(current_li).removeClass('selected').removeClass('unfocused');
       }
-
       if ((target_li = this.get_folder_li(name))) {
         $(target_li).removeClass('unfocused').addClass('selected');
@@ -3512 +3511 @@
     if (this.gui_objects.folderlist)
     {
-      name = String(name).replace(this.identifier_expr, '');
+      name = String(name).replace(this.identifier_expr, '_');
       return document.getElementById('rcmli'+name);
     }