[eGroupWare-cvs] calendar/inc class.bocal.inc.php,1.10.2.26,1.10.2.27 class.uiforms.inc.php,1.4.2.23,1.4.2.24

[<nel...@us...>]

Update of /cvsroot/egroupware/calendar/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3753/inc

Modified Files:
      Tag: contacts_and_resources
	class.bocal.inc.php class.uiforms.inc.php 
Log Message:
show resources in view mode of a calendar evemt amd let the status be changeable if user has appropriate rights


Index: class.bocal.inc.php
===================================================================
RCS file: /cvsroot/egroupware/calendar/inc/class.bocal.inc.php,v
retrieving revision 1.10.2.26
retrieving revision 1.10.2.27
diff -C2 -d -r1.10.2.26 -r1.10.2.27
*** class.bocal.inc.php	13 Oct 2005 18:05:53 -0000	1.10.2.26
--- class.bocal.inc.php	18 Oct 2005 21:30:36 -0000	1.10.2.27
***************
*** 755,758 ****
--- 755,764 ----
  	{
  		$event_in = $event;
+ 		if (!is_numeric($other) && (string)$other !='0')
+ 		{
+ 			$resource = ExecMethod($this->resources[$other{0}]['info'],substr($other,1));
+ 			return $needed & $resource[0]['rights'];
+ 			
+ 		}
  		if (is_int($event) && $event == 0)
  		{
***************
*** 802,806 ****
  					// if we have a resource as participant
  					$resource = ExecMethod($this->resources[$uid{0}]['info'],substr($uid,1));
! 					$grants = $resource['rights'];
  				}	
  			}
--- 808,812 ----
  					// if we have a resource as participant
  					$resource = ExecMethod($this->resources[$uid{0}]['info'],substr($uid,1));
! 					$grants = $resource[0]['rights'];
  				}	
  			}

Index: class.uiforms.inc.php
===================================================================
RCS file: /cvsroot/egroupware/calendar/inc/class.uiforms.inc.php,v
retrieving revision 1.4.2.23
retrieving revision 1.4.2.24
diff -C2 -d -r1.4.2.23 -r1.4.2.24
*** class.uiforms.inc.php	13 Oct 2005 18:05:53 -0000	1.4.2.23
--- class.uiforms.inc.php	18 Oct 2005 21:30:36 -0000	1.4.2.24
***************
*** 483,487 ****
  				foreach($participants as $id => $status)
  				{
! 					$readonlys[$name.'_status['.$id.']'] = !$this->bo->check_perms(EGW_ACL_EDIT,0,$id);
  				}
  			}
--- 483,487 ----
  				foreach($participants as $id => $status)
  				{
! 					$readonlys[$name.'_status['.$id.']'] = !$this->bo->check_perms(EGW_ACL_EDIT,0,($type != 'u' ? $type : '').$id);
  				}
  			}