[Phpgroupware-cvs] projects/inc/class.soprojects.inc.php, 1.99

[nomail]

Update of /projects/inc
Modified Files:
        Branch: 
          class.soprojects.inc.php

date: 2004/06/02 16:27:26;  author: ceb;  state: Exp;  lines: +26 -24

Log Message:
update
=====================================================================
Index: projects/inc/class.soprojects.inc.php
diff -u projects/inc/class.soprojects.inc.php:1.98 
projects/inc/class.soprojects.inc.php:1.99
--- projects/inc/class.soprojects.inc.php:1.98  Tue Jun  1 15:34:41 2004
+++ projects/inc/class.soprojects.inc.php       Wed Jun  2 16:27:26 2004
@@ -291,8 +291,8 @@
 
                function read_gantt_projects($data)
                {
-                       $parent         = intval($data['parent']);
-                       $project_id     = intval($data['project_id']);
+                       $parent_array   = $data['parent_array'];
+                       $project_id             = intval($data['project_id']);
 
                        $ordermethod = ' order by p_number,title,start_date 
ASC';
 
@@ -304,34 +304,36 @@
 
                        $pro = $this->db2projects();
 
-                       if ($parent > 0)
+                       if (is_array($parent_array))
                        {
                                $num_pro = count($pro);
                                for ($i=0;$i < $num_pro;$i++)
                                {
-                                       $sub_select = 'parent=' . 
$pro[$i]['project_id'] . ' AND level=' . ($pro[$i]['level']+1);
-
-                                       $this->db->query($sql . $sub_select . 
$ordermethod,__LINE__,__FILE__);
-                                       $subpro = $this->db2projects();
-
-                                       $num_subpro = count($subpro);
-                                       if ($num_subpro != 0)
+                                       
if(in_array($pro[$i]['project_id'],$parent_array))
                                        {
-                                               $newpro = array();
-                                               for ($k = 0; $k <= $i; $k++)
-                                               {
-                                                       $newpro[$k] = $pro[$k];
-                                               }
-                                               for ($k = 0; $k < $num_subpro; 
$k++)
-                                               {
-                                                       $newpro[$k+$i+1] = 
$subpro[$k];
-                                               }
-                                               for ($k = $i+1; $k < $num_pro; 
$k++)
+                                               $sub_select = 'parent=' . 
$pro[$i]['project_id'] . ' AND level=' . ($pro[$i]['level']+1);
+                                               $this->db->query($sql . 
$sub_select . $ordermethod,__LINE__,__FILE__);
+                                               $subpro = $this->db2projects();
+       
+                                               $num_subpro = count($subpro);
+                                               if ($num_subpro != 0)
                                                {
-                                                       $newpro[$k+$num_subpro] 
= $pro[$k];
+                                                       $newpro = array();
+                                                       for ($k = 0; $k <= $i; 
$k++)
+                                                       {
+                                                               $newpro[$k] = 
$pro[$k];
+                                                       }
+                                                       for ($k = 0; $k < 
$num_subpro; $k++)
+                                                       {
+                                                               
$newpro[$k+$i+1] = $subpro[$k];
+                                                       }
+                                                       for ($k = $i+1; $k < 
$num_pro; $k++)
+                                                       {
+                                                               
$newpro[$k+$num_subpro] = $pro[$k];
+                                                       }
+                                                       $pro = $newpro;
+                                                       $num_pro = count($pro);
                                                }
-                                               $pro = $newpro;
-                                               $num_pro = count($pro);
                                        }
                                }
                        }