phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.33.


From: Dave Hall <address@hidden>
Subject: [Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.33.2.2,1.71.2.33.2.3 class.socalendar_sql.inc.php,1.28.2.4.2.1,1.28.2.4.2.2
Date: Sat, 03 May 2003 20:21:35 -0400

Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv21426

Modified Files:
      Tag: Version-0_9_16-branch
        class.bocalendar.inc.php class.socalendar_sql.inc.php 
Log Message:
sync support

Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71.2.33.2.2
retrieving revision 1.71.2.33.2.3
diff -C2 -r1.71.2.33.2.2 -r1.71.2.33.2.3
*** class.bocalendar.inc.php    8 Apr 2003 22:37:22 -0000       1.71.2.33.2.2
--- class.bocalendar.inc.php    4 May 2003 00:21:33 -0000       1.71.2.33.2.3
***************
*** 2399,2402 ****
--- 2399,2428 ----
                        }
                }
+               
+               function get_dirty_entries($lastmod=-1)
+               {
+                       $events = false;
+                       $event_ids = 
$this->so->cal->list_dirty_events($lastmod);
+                       if(is_array($event_ids))
+                       {
+                       foreach($event_ids as $key => $id)
+                       {
+                               $events[$id] = $this->so->cal->fetch_event($id);
+                       }
+                       }
+                       unset($event_ids);
+ 
+                       $rep_event_ids = 
$this->so->cal->list_dirty_events($lastmod,$true);
+                       if(is_array($rep_event_ids))
+                       {
+                       foreach($rep_event_ids as $key => $id)
+                       {
+                               $events[$id] = $this->so->cal->fetch_event($id);
+                       }
+                       }
+                       unset($rep_event_ids);
+                       
+                       return $events;
+               }
  
                function _debug_array($data)

Index: class.socalendar_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.socalendar_sql.inc.php,v
retrieving revision 1.28.2.4.2.1
retrieving revision 1.28.2.4.2.2
diff -C2 -r1.28.2.4.2.1 -r1.28.2.4.2.2
*** class.socalendar_sql.inc.php        14 Apr 2003 21:33:44 -0000      
1.28.2.4.2.1
--- class.socalendar_sql.inc.php        4 May 2003 00:21:33 -0000       
1.28.2.4.2.2
***************
*** 620,622 ****
--- 620,661 ----
                return 
$this->localdates(mktime(0,0,0,intval(substr($d,4,2)),intval(substr($d,6,2)),intval(substr($d,0,4))));
        }
+ 
+       function list_dirty_events($lastmod=-1,$repeats=false)
+       {
+               if(!isset($this->stream))
+               {
+                       return False;
+               }
+               $lastmod = intval($lastmod);
+               $repeats = (bool) $repeats;
+ 
+               $user_where = " AND phpgw_cal_user.cal_login = $this->user";
+ 
+               $member_groups = 
$GLOBALS['phpgw']->accounts->membership($this->user);
+               @reset($member_groups);
+               while($member_groups != False && list($key,$group_info) = 
each($member_groups))
+               {
+                       $member[] = $group_info['account_id'];
+               }
+               @reset($member);
+ //            $user_where .= ','.implode(',',$member);
+               //$user_where .= ')) ';
+ 
+               if($this->debug)
+               {
+                       echo '<!-- '.$user_where.' -->'."\n";
+               }
+ 
+               if($lastmod > 0)
+               {
+                       $wheremod = "AND mdatetime = $lastmod"; 
+               }
+               
+               $order_by = ' ORDER BY phpgw_cal.cal_id ASC';
+               if($this->debug)
+               {
+                       echo "SQL : ".$user_where.$wheremod.$extra."<br>\n";
+               }
+               return 
$this->get_event_ids($repeats,$user_where.$wheremod.$extra.$order_by);
+       }
  }





reply via email to

[Prev in Thread] Current Thread [Next in Thread]