[Phpgroupware-cvs] calendar/inc class.socalendar.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    calendar
Changes by:     Sigurd Nes <sigurdne>   06/12/08 15:12:33

Modified files:
        inc            : class.socalendar.inc.php 

Log message:
        Check for repeated events

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.socalendar.inc.php?cvsroot=phpgroupware&r1=1.34&r2=1.35

Patches:
Index: class.socalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.socalendar.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- class.socalendar.inc.php    6 Dec 2006 19:10:45 -0000       1.34
+++ class.socalendar.inc.php    8 Dec 2006 15:12:33 -0000       1.35
@@ -12,7 +12,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: class.socalendar.inc.php,v 1.34 2006/12/06 19:10:45 sigurdne Exp $ */
+  /* $Id: class.socalendar.inc.php,v 1.35 2006/12/08 15:12:33 sigurdne Exp $ */
 
        class socalendar
        {
@@ -35,10 +35,12 @@
                                $GLOBALS['phpgw']->datetime = 
createobject('phpgwapi.datetimefunctions');
                        }
 
-                       $this->owner = (!isset($param['owner']) || 
$param['owner'] == 
0?$GLOBALS['phpgw_info']['user']['account_id']:$param['owner']);
+               //      $this->owner = (!isset($param['owner']) || 
$param['owner'] == 
0?$GLOBALS['phpgw_info']['user']['account_id']:$param['owner']);
+                       $this->owner = (!isset($param['owner']) || 
$param['owner'] == 
0?$GLOBALS['phpgw']->accounts->search_person($GLOBALS['phpgw_info']['user']['account_id']):$param['owner']);
+                       
                        $this->filter = (isset($param['filter']) && 
$param['filter'] != ''?$param['filter']:$this->filter);
                        $this->cat_id = (isset($param['category']) && 
$param['category'] != ''?$param['category']:$this->cat_id);
-                       if(isset($param['g_owner']) && 
is_array($param['g_owner']))
+                       if(isset($param['g_owner']) && 
is_array($param['g_owner']) && count($param['g_owner'])>0)
                        {
                                $this->is_group = True;
                                $this->g_owner = $param['g_owner'];