[Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.74.2.1,1.74.2.2

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv28187

Modified Files:
      Tag: Version-0_9_14-branch
        class.categories.inc.php 
Log Message:
fixed cats to work in global cats apps part

Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.74.2.1
retrieving revision 1.74.2.2
diff -C2 -r1.74.2.1 -r1.74.2.2
*** class.categories.inc.php    23 Jan 2002 20:46:34 -0000      1.74.2.1
--- class.categories.inc.php    13 Mar 2002 21:31:12 -0000      1.74.2.2
***************
*** 139,156 ****
                        }
  
!                       if (is_array($this->grants))
                        {
!                               $grants = $this->grants;
!                               while(list($user) = each($grants))
!                               {
!                                       $public_user_list[] = $user;
!                               }
!                               reset($public_user_list);
!                               $public_user_list[] = -1;
!                               $grant_cats = " (cat_owner='" . 
$this->account_id . "' OR cat_access='public' AND cat_owner in(" . 
implode(',',$public_user_list) . ")) ";
                        }
                        else
                        {
!                               $grant_cats = " cat_owner='" . 
$this->account_id . "' or cat_owner='-1' ";
                        }
  
--- 139,162 ----
                        }
  
!                       if ($this->account_id == '-1')
                        {
!                               $grant_cats = " cat_owner='-1' ";
                        }
                        else
                        {
!                               if (is_array($this->grants))
!                               {
!                                       $grants = $this->grants;
!                                       while(list($user) = each($grants))
!                                       {
!                                               $public_user_list[] = $user;
!                                       }
!                                       reset($public_user_list);
!                                       $grant_cats = " (cat_owner='" . 
$this->account_id . "' OR cat_owner='-1' OR cat_access='public' AND cat_owner 
in(" . implode(',',$public_user_list) . ")) ";
!                               }
!                               else
!                               {
!                                       $grant_cats = " cat_owner='" . 
$this->account_id . "' OR cat_owner='-1' ";
!                               }
                        }
  
***************
*** 219,236 ****
                        }
  
!                       if (is_array($this->grants))
                        {
!                               $grants = $this->grants;
!                               while(list($user) = each($grants))
!                               {
!                                       $public_user_list[] = $user;
!                               }
!                               $public_user_list[] = -1;
!                               reset($public_user_list);
!                               $grant_cats = " (cat_owner='" . 
$this->account_id . "' OR cat_access='public' AND cat_owner in(" . 
implode(',',$public_user_list) . ")) ";
                        }
                        else
                        {
!                               $grant_cats = " cat_owner='" . 
$this->account_id . "' or cat_owner='-1' ";
                        }
  
--- 225,248 ----
                        }
  
!                       if ($this->account_id == '-1')
                        {
!                               $grant_cats = " cat_owner='-1' ";
                        }
                        else
                        {
!                               if (is_array($this->grants))
!                               {
!                                       $grants = $this->grants;
!                                       while(list($user) = each($grants))
!                                       {
!                                               $public_user_list[] = $user;
!                                       }
!                                       reset($public_user_list);
!                                       $grant_cats = " (cat_owner='" . 
$this->account_id . "' OR cat_owner='-1' OR cat_access='public' AND cat_owner 
in(" . implode(',',$public_user_list) . ")) ";
!                               }
!                               else
!                               {
!                                       $grant_cats = " cat_owner='" . 
$this->account_id . "' OR cat_owner='-1' ";
!                               }
                        }
  
***************
*** 410,413 ****
--- 422,429 ----
                                        {
                                                $s .= '<' . lang('Global') . 
'>';
+                                       }
+                                       if ($cats[$i]['owner'] == '-1')
+                                       {
+                                               $s .= '<' . lang('Global') . 
' ' . $GLOBALS['phpgw_info']['apps'][$this->app_name]['title'] . '>';
                                        }
                                        $s .= '</option>' . "\n";