[Phpgroupware-cvs] CVS: todo/inc class.so.inc.php,1.3,1.4

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/todo/inc
In directory subversions:/tmp/cvs-serv20799/inc

Modified Files:
        class.so.inc.php 
Log Message:
added the option to assign todos to groups

Index: class.so.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/todo/inc/class.so.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.so.inc.php    31 Jan 2002 01:33:02 -0000      1.3
--- class.so.inc.php    31 Jan 2002 02:04:52 -0000      1.4
***************
*** 63,82 ****
                        }
  
!                       if ($filter == 'none')
!                       {
!                               $filtermethod = "(( todo_owner='" . 
$this->account . "' OR todo_assigned like '%," . $this->account . ",%' OR 
todo_assigned='"
                                                                . 
$this->account . "'";
  
!                               if (is_array($this->user_groups))
                                {
!                                       $groups = $this->user_groups;
!                                       while (list($null,$group) = 
each($groups))
!                                       {
!                                               $filtermethod .= " OR 
assigned_group like '%," . $group['account_id'] . ",%' OR assigned_group='" . 
$group['account_id'] . "'";
!                                       }
                                }
  
!                               $filtermethod .= ')';
  
                                if (is_array($this->grants))
                                {
--- 63,82 ----
                        }
  
!                       $filtermethod = "(( todo_owner='" . $this->account . "' 
OR todo_assigned like '%," . $this->account . ",%' OR todo_assigned='"
                                                                . 
$this->account . "'";
  
!                       if (is_array($this->user_groups))
!                       {
!                               $groups = $this->user_groups;
!                               while (list($null,$group) = each($groups))
                                {
!                                       $filtermethod .= " OR assigned_group 
like '%," . $group['account_id'] . ",%' OR assigned_group='" . 
$group['account_id'] . "'";
                                }
+                       }
  
!                       $filtermethod .= ')';
  
+                       if ($filter == 'none')
+                       {
                                if (is_array($this->grants))
                                {
***************
*** 87,106 ****
                                        }
                                        reset($public_user_list);
!                                       $filtermethod .= " OR 
(todo_access='public' AND todo_owner in(" . implode(',',$public_user_list) . 
")))";
!                               }
!                               else
!                               {
!                                       $filtermethod .= ' )';
                                }
                        }
!                       elseif ($filter == 'yours')
!                       {
!                               $filtermethod = " (todo_owner='" . 
$this->account . "' OR todo_assigned like '%," . $this->account . ",%' OR 
todo_assigned='"
!                                                               . 
$this->account . "')";
!                       }
!                       else
                        {
!                               $filtermethod =  " (todo_owner='" . 
$this->owner . "' OR todo_assigned like '%," . $this->account . ",%' OR 
todo_assigned='"
!                                                               . 
$this->account . "' AND todo_access='private')";
                        }
  
--- 87,99 ----
                                        }
                                        reset($public_user_list);
!                                       $filtermethod .= " OR 
(todo_access='public' AND todo_owner in(" . implode(',',$public_user_list) . 
"))";
                                }
                        }
! 
!                       $filtermethod .= ')';
! 
!                       if ($filter == 'private')
                        {
!                               $filtermethod .=  " AND todo_access='private'";
                        }