From c75bf426145e091aa1d3492f9fb87789c2257912 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 16 Apr 2009 19:28:18 -0600
Subject: [PATCH] Make label and parent optional values to save on
 transport/parsing.

---
 imp/js/src/DimpBase.js |  7 ++++---
 imp/lib/DIMP.php       | 14 ++++++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/imp/js/src/DimpBase.js b/imp/js/src/DimpBase.js
index 583ed5611..1494a1473 100644
--- a/imp/js/src/DimpBase.js
+++ b/imp/js/src/DimpBase.js
@@ -1870,12 +1870,13 @@ var DimpBase = {
     {
         var div, f_node, li, ll, parent_e,
             fid = this.getFolderId(ob.m),
+            label = ob.l || ob.m,
             mbox = decodeURIComponent(ob.m),
             submboxid = this.getSubFolderId(fid),
             submbox = $(submboxid),
             ftype = ob.v ? (ob.co ? 'vcontainer' : 'virtual') : (ob.co ? 'container' : (ob.s ? 'special' : 'folder'));
 
-        li = new Element('LI', { className: 'folder', id: fid, l: ob.l, mbox: mbox, ftype: ftype });
+        li = new Element('LI', { className: 'folder', id: fid, l: label, mbox: mbox, ftype: ftype });
 
         div = new Element('DIV', { className: ob.cl || 'base', id: fid + '_div' });
         if (ob.i) {
@@ -1885,7 +1886,7 @@ var DimpBase = {
             div.writeAttribute({ className: 'exp' });
         }
 
-        li.insert(div).insert(new Element('A', { id: fid + '_label', title: ob.l }).insert(ob.l));
+        li.insert(div).insert(new Element('A', { id: fid + '_label', title: label }).insert(label));
 
         // Now walk through the parent <ul> to find the right place to
         // insert the new folder.
@@ -1899,7 +1900,7 @@ var DimpBase = {
             if (ob.s) {
                 parent_e = $('specialfolders');
             } else {
-                parent_e = $(this.getSubFolderId(this.getFolderId(ob.pa)));
+                parent_e = $(this.getSubFolderId(this.getFolderId(ob.pa || DIMP.conf.base_mbox)));
                 parent_e = parent_e ? parent_e.down() : $('normalfolders');
             }
 
diff --git a/imp/lib/DIMP.php b/imp/lib/DIMP.php
index 6b849422d..da0dd9bc1 100644
--- a/imp/lib/DIMP.php
+++ b/imp/lib/DIMP.php
@@ -199,6 +199,7 @@ class DIMP
             'ham_spammbox' => intval(!empty($conf['notspam']['spamfolder'])),
             'refresh_time' => intval($prefs->getValue('refresh_time')),
 
+            'base_mbox' => IMP_Imap_Tree::BASE_ELT,
             'fixed_folders' => empty($conf['server']['fixed_folders'])
                 ? array()
                 : array_map(array('DIMP', '_appendedFolderPref'), $conf['server']['fixed_folders']),
@@ -386,9 +387,10 @@ class DIMP
      * 'co' (container) = Is this folder a container element? [boolean]
      *                    [DEFAULT: no]
      * 'i' (icon) = A user defined icon to use. [string] [DEFAULT: none]
-     * 'l' (label) = The folder display label. [string]
+     * 'l' (label) = The folder display label. [string] [DEFAULT: 'm' val]
      * 'm' (mbox) = The mailbox value. [string]
-     * 'pa' (parent) = The parent element. [string]
+     * 'pa' (parent) = The parent element. [string] [DEFAULT:
+     *                                               DIMP.conf.base_mbox]
      * 'po' (polled) = Is the element polled? [boolean] [DEFAULT: no]
      * 's' (special) = Is this a "special" element? [boolean] [DEFAULT: no]
      * 'u' (unseen) = The number of unseen messages. [integer]
@@ -401,9 +403,13 @@ class DIMP
         if ($elt['children']) {
            $ob->ch = 1;
         }
-        $ob->l = $elt['base_elt']['l'];
         $ob->m = rawurlencode($elt['value']);
-        $ob->pa = rawurlencode($elt['parent']);
+        if ($ob->m != $elt['base_elt']['l']) {
+            $ob->l = $elt['base_elt']['l'];
+        }
+        if ($elt['parent'] != IMP_Imap_Tree::BASE_ELT) {
+            $ob->pa = rawurlencode($elt['parent']);
+        }
         if ($elt['polled']) {
             $ob->po = 1;
         }
-- 
2.11.0