[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php,1.42.2.5.2.6,1.42.2.5.2.7 class.soprojects.inc.php,1.34.2.6.2.5,1.34.2.6.2.6

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv24342

Modified Files:
      Tag: Version-0_9_16-branch
        class.boprojects.inc.php class.soprojects.inc.php 
Log Message:
fix

Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.42.2.5.2.6
retrieving revision 1.42.2.5.2.7
diff -C2 -r1.42.2.5.2.6 -r1.42.2.5.2.7
*** class.boprojects.inc.php    14 May 2003 20:50:38 -0000      1.42.2.5.2.6
--- class.boprojects.inc.php    27 May 2003 13:28:28 -0000      1.42.2.5.2.7
***************
*** 303,323 ****
                {
                        $admins = $this->read_admins($action, 'all');
- 
                        $allaccounts = 
$GLOBALS['phpgw']->accounts->get_list($type, $start, $sort, $order, $query);
  
!                       if (is_array($allaccounts))
                        {
!                               while (list($null,$account) = 
each($allaccounts))
                                {
!                                       for ($i=0;$i<count($admins);$i++)
                                        {
!                                               if ($account['account_id'] == 
$admins[$i]['account_id'])
!                                               {
!                                                       
$admin_data[$i]['account_id']   = $account['account_id'];
!                                                       $admin_data[$i]['lid']  
                = $account['account_lid'];
!                                                       
$admin_data[$i]['firstname']    = $account['account_firstname'];
!                                                       
$admin_data[$i]['lastname']             = $account['account_lastname'];
!                                                       $admin_data[$i]['type'] 
                = $account['account_type'];
!                                               }
                                        }
                                }
--- 303,321 ----
                {
                        $admins = $this->read_admins($action, 'all');
                        $allaccounts = 
$GLOBALS['phpgw']->accounts->get_list($type, $start, $sort, $order, $query);
  
!                       $j = 0;
!                       while (is_array($allaccounts) && list($null,$account) = 
each($allaccounts))
                        {
!                               for ($i=0;$i<count($admins);$i++)
                                {
!                                       if ($account['account_id'] == 
$admins[$i]['account_id'])
                                        {
!                                               $admin_data[$j]['account_id']   
= $account['account_id'];
!                                               $admin_data[$j]['lid']          
        = $account['account_lid'];
!                                               $admin_data[$j]['firstname']    
= $account['account_firstname'];
!                                               $admin_data[$j]['lastname']     
        = $account['account_lastname'];
!                                               $admin_data[$j]['type']         
        = $account['account_type'];
!                                               $j++;
                                        }
                                }

Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.34.2.6.2.5
retrieving revision 1.34.2.6.2.6
diff -C2 -r1.34.2.6.2.5 -r1.34.2.6.2.6
*** class.soprojects.inc.php    6 May 2003 15:47:45 -0000       1.34.2.6.2.5
--- class.soprojects.inc.php    27 May 2003 13:28:28 -0000      1.34.2.6.2.6
***************
*** 541,547 ****
                                switch ($type)
                                {
!                                       case 'all': $filter = " type='aa' or 
type='ag'"; break;
!                                       case 'aa': $filter = " type='aa'"; 
break;
!                                       case 'ag': $filter = " type='ag'"; 
break;
                                }
                        }
--- 541,547 ----
                                switch ($type)
                                {
!                                       case 'all':     $filter = " type='aa' 
or type='ag'"; break;
!                                       case 'aa':      $filter = " type='aa'"; 
break;
!                                       case 'ag':      $filter = " type='ag'"; 
break;
                                }
                        }
***************
*** 550,560 ****
                                switch ($type)
                                {
!                                       case 'all': $filter = " type='ba' or 
type='bg'"; break;
!                                       case 'aa': $filter = " type='ba'"; 
break;
!                                       case 'ag': $filter = " type='bg'"; 
break;
                                }
                        }
  
!                       $this->db->query("select account_id,type from 
phpgw_p_projectmembers WHERE $filter");
                        $this->total_records = $this->db->num_rows();
                        while ($this->db->next_record())
--- 550,561 ----
                                switch ($type)
                                {
!                                       case 'all':     $filter = " type='ba' 
or type='bg'"; break;
!                                       case 'aa':      $filter = " type='ba'"; 
break;
!                                       case 'ag':      $filter = " type='bg'"; 
break;
                                }
                        }
  
!                       $sql = 'select account_id,type from 
phpgw_p_projectmembers WHERE ' . $filter;
!                       $this->db->query($sql);
                        $this->total_records = $this->db->num_rows();
                        while ($this->db->next_record())