[Hastymail-cvs] SF.net SVN: hastymail: [503] trunk/hastymail2/lib/site_page_class.php

[<sai...@us...>]

Revision: 503
          http://hastymail.svn.sourceforge.net/hastymail/?rev=503&view=rev
Author:   sailfrog
Date:     2008-06-04 07:44:08 -0700 (Wed, 04 Jun 2008)

Log Message:
-----------
testing a fix for misplaced folders in the dropdowns and tree

Modified Paths:
--------------
    trunk/hastymail2/lib/site_page_class.php

Modified: trunk/hastymail2/lib/site_page_class.php
===================================================================
--- trunk/hastymail2/lib/site_page_class.php	2008-06-04 14:24:51 UTC (rev 502)
+++ trunk/hastymail2/lib/site_page_class.php	2008-06-04 14:44:08 UTC (rev 503)
@@ -1594,9 +1594,15 @@
         }
         if ($vals['has_kids'] && strtoupper($vals['name']) != 'INBOX') {
             $subfolders = array();
+            $depth_check = count($vals['name_parts']);
+            if (!$depth_check) {
+                $depth_check = 1;
+            }
             foreach ($this->pd['folders'] as $atts) {
                 if (isset($atts['parent']) && $atts['parent'] == $vals['basename']) {
-                    $subfolders[$atts['name']] = $atts;
+                    if (count($atts['name_parts']) == $depth_check + 1) {
+                        $subfolders[$atts['name']] = $atts;
+                    }
                 }
             }
             if (!empty($subfolders)) {
@@ -1718,9 +1724,15 @@
             }
             if ($vals['has_kids'] && strtoupper($vals['name']) != 'INBOX') {
                 $subfolders = array();
+                $depth_check = count($vals['name_parts']);
+                if (!$depth_check) {
+                    $depth_check = 1;
+                }
                 foreach ($this->pd['folders'] as $atts) {
                     if ($atts['parent'] == $vals['basename']) {
-                        $subfolders[$atts['name']] = $atts;
+                        if (count($atts['name_parts']) == $depth_check + 1) {
+                            $subfolders[$atts['name']] = $atts;
+                        }
                     }
                 }
                 if (!empty($subfolders)) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.