Changeset 686 in subversion

Timestamp:

Aug 15, 2007 6:30:31 PM (6 years ago)

Author:

till

Message:

+ fixed CS

• removed debug code

+ bug fix in folder display

Location:

branches/devel-vnext/program/steps/mail

Files:

• check_recent.inc (modified) (2 diffs)
• compose.inc (modified) (1 diff)
• func.inc (modified) (4 diffs)
• move_del.inc (modified) (1 diff)

branches/devel-vnext/program/steps/mail/check_recent.inc

@@ -19 +19 @@
 */
 
-rc_main::tfk_debug('recent!');
+//rc_main::tfk_debug('recent!');
 
 $registry    = rc_registry::getInstance();
@@ -27 +27 @@
 
 //rc_main::tfk_debug('About to get some mailboxes.');
-rc_main::tfk_debug('Mailboxes: ' . var_export($a_mailboxes, true));
+//rc_main::tfk_debug('Mailboxes: ' . var_export($a_mailboxes, true));
 
 foreach ($a_mailboxes as $mbox_name) {

branches/devel-vnext/program/steps/mail/compose.inc

@@ -37 +37 @@
         $status = @unlink($_SESSION['compose']['attachments'][$id]['path']);
         if ($status === false) {
-            rc_main::tfk_debug('Could not delete attachment.');
+            //rc_main::tfk_debug('Could not delete attachment.');
         }
         $_SESSION['compose']['attachments'][$id] = NULL;

branches/devel-vnext/program/steps/mail/func.inc

@@ -220 +220 @@
 
 
-// return html for a structured list <ul> for the mailbox tree
+/**
+ * return html for a structured list <ul> for the mailbox tree
+ */
 function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox_name, $maxlength, $nestLevel=0)
 {
@@ -260 +262 @@
 
         // set special class for Sent, Drafts, Trash and Junk
-        if ($folder['id']==$CONFIG['sent_mbox'])
+        if ($folder['id']==$CONFIG['sent_mbox']) {
             $class_name = 'sent';
-        else if ($folder['id']==$CONFIG['drafts_mbox'])
+        }
+        else if ($folder['id']==$CONFIG['drafts_mbox']) {
             $class_name = 'drafts';
-        else if ($folder['id']==$CONFIG['trash_mbox'])
+        }
+        else if ($folder['id']==$CONFIG['trash_mbox']) {
             $class_name = 'trash';
-        else if ($folder['id']==$CONFIG['junk_mbox'])
+        }
+        else if ($folder['id']==$CONFIG['junk_mbox']) {
             $class_name = 'junk';
+        }
 
         $js_name = htmlspecialchars(rc_main::JQ($folder['id']));
@@ -303 +309 @@
         /**
          * Append a new list if it has subfolders.
+         *
+         * Work with a seperate list-entry (<li>) to combat giant
+         * onmouseover fuckups.
+         *
+         * @ignore
          */
         if (!empty($folder['folders'])) {
-            $out .= "\n<ul>\n";
-            $out .= rcmail_render_folder_tree_html($folder['folders'], $special, $mbox_name, $maxlength, $nestLevel+1) . "</ul>\n";
+            $out .= '<li class="mailboxsub">' . "\n<ul>\n";
+            $out .= rcmail_render_folder_tree_html($folder['folders'], $special, $mbox_name, $maxlength, $nestLevel+1);
+            $out .= "</ul>\n";
+            $out .= '</li>' . "\n";
         }
 
@@ -1293 +1306 @@
 
     if (isset($MESSAGE) === false) {
-        rc_main::tfk_debug('rcmail_message_headers: no $MESSAGE :(');
+        //rc_main::tfk_debug('rcmail_message_headers: no $MESSAGE :(');
         return FALSE;
     }

branches/devel-vnext/program/steps/mail/move_del.inc

@@ -52 +52 @@
 // unknown action or missing query param
 else {
-    rc_main::tfk_debug('/ unknown action');
+    //rc_main::tfk_debug('/ unknown action');
     exit;
 }