[Phpgroupware-developers] applying diff patch help

[Will Taylor]

Hello!
I am having a problem. Dave coded this info log patch for me for 
9.16.009, I have since upgrade to .10 by downloading a tarball. I would 
like to patch the tar ball with the old changes, because my users are 
not able to view infolog items delegated to them without granting them 
read access for all the infolog items of the person doing the 
delegating. Below are the two patches. I do not know if they are 
compatible with the newest version, and if they are how to apply them.

Thanks very much,
Will
infolog-changes.diff:

? .class.uiinfolog.inc.php.swp
? infolog-changes.diff
? infolog-fix.diff
Index: class.soinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.soinfolog.inc.php,v
retrieving revision 1.10.2.1.2.13
diff -r1.10.2.1.2.13 class.soinfolog.inc.php
17c17
<  /* $Id: class.soinfolog.inc.php,v 1.10.2.1.2.13 2005/01/06 23:21:19 
ceb Exp $ */
---
>  /* $Id: class.soinfolog.inc.php,v 1.10.2.1.2.11 2004/11/07 14:49:57 
ceb Exp $ */
75a76
>                       $delegate = $info['info_responsible'];
77a79
>                                       $delegate == $this->user ||     
// delegated person has rights
97c99
<                       ereg('.*(own|privat|all|none).*',$filter,$vars);
---
>                       
ereg('.*(own|privat|all|none|delegated).*',$filter,$vars);
99a102
>
123c126,127
<                       $filtermethod = " (info_owner=$this->user"; // 
user has all rights
---
>                       $filtermethod = " (info_owner=$this->user" // 
user has all rights
>                                       . " OR 
info_responsible=$this->user"; // user is delegated
128,129c132,137
<                               $filtermethod .= " OR 
(info_responsible=$this->user OR info_status = 'offer')".
<                                                " AND 
(info_access='public'".($has_private_access?" OR 
$has_private_access":'').')';
---
>                               $filtermethod = ' ( (info_owner = ' . 
$this->user . ' AND info_responsible = 0)'
>                                                . '  OR 
(info_responsible = ' . $this->user . ')';
>                       }
>                       else if ( $filter == 'delegated' )
>                       {
>                               $filtermethod = ' ( (info_owner = ' . 
$this->user . ' AND info_responsible <> 0)';
143c151
<
---
>
485c493
<                       // echo "<p>filtermethod='$filtermethod'</p>";
---
>                       //echo "<p>filtermethod='$filtermethod'</p>";
Index: class.uiinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.uiinfolog.inc.php,v
retrieving revision 1.30.2.12.2.10
diff -r1.30.2.12.2.10 class.uiinfolog.inc.php
61,69c61,73
<                               'none'             =>   'no Filter',
<                               'done'             =>   'done',
<                               'own'              =>   'own',
<                               'own-open-today'   =>   'own open',
<                               'own-open-overdue' =>   'own overdue',
<                               'own-upcoming'     =>   'own upcoming',
<                               'open-today'       =>   'open',
<                               'open-overdue'     =>   'overdue',
<                               'upcoming'         =>   'upcoming'
---
>                               'none'                          =>      
'no Filter',
>                               'done'                          =>      
'done',
>                               'own'                           =>      
'own',
>                               'own-open-today'                =>      
'own open',
>                               'own-open-overdue'              =>      
'own overdue',
>                               'own-upcoming'                  =>      
'own upcoming',
>                               'delegated'                     =>      
'delegated',
>                               'delegated-open-today'          =>      
'delegated open',
>                               'delegated-open-overdue'        =>      
'delegated overdue',
>                               'delegated-upcoming'            =>      
'delegated upcoming',
>                               'open-today'                    =>      
'open',
>                               'open-overdue'                  =>      
'overdue',
>                               'upcoming'                      =>      
'upcoming'

infolog-fix.diff:

Index: class.soinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.soinfolog.inc.php,v
retrieving revision 1.10.2.1.2.13
diff -r1.10.2.1.2.13 class.soinfolog.inc.php
75a76
>                       $delegate = $info['info_responsible'];
77a79
>                                       $delegate == $this->user ||     
// delegated person has rights
123c125,126
<                       $filtermethod = " (info_owner=$this->user"; // 
user has all rights
---
>                       $filtermethod = " (info_owner=$this->user" // 
user has all rights
>                                       . " OR 
info_responsible=$this->user"; // user is delegated
128c131
<                               $filtermethod .= " OR 
(info_responsible=$this->user OR info_status = 'offer')".
---
>                               $filtermethod .= " OR info_status = 
'offer'".
address@hidden:~$ cat infolog-fix.diff
Index: class.soinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.soinfolog.inc.php,v
retrieving revision 1.10.2.1.2.13
diff -r1.10.2.1.2.13 class.soinfolog.inc.php
75a76
>                       $delegate = $info['info_responsible'];
77a79
>                                       $delegate == $this->user ||     
// delegated person has rights
123c125,126
<                       $filtermethod = " (info_owner=$this->user"; // 
user has all rights
---
>                       $filtermethod = " (info_owner=$this->user" // 
user has all rights
>                                       . " OR 
info_responsible=$this->user"; // user is delegated
128c131
<                               $filtermethod .= " OR 
(info_responsible=$this->user OR info_status = 'offer')".
---
>                               $filtermethod .= " OR info_status = 
'offer'".