Changeset 656 for trunk/expressoCalendar/inc

Timestamp:

02/02/09 08:07:49 (15 years ago)

Author:

niltonneto

Message:

Implementações do desenvolvedor. amuller@…

Location:

trunk/expressoCalendar/inc

Files:

• class.bocalendar.inc.php (modified) (1 diff)
• class.uicalendar.inc.php (modified) (3 diffs)

trunk/expressoCalendar/inc/class.bocalendar.inc.php

@@ -30 +30 @@
         function requestDayCal ($dayTime) {
                 $day = getdate($dayTime);
-                $query = ("SELECT * FROM phpgw_cal where (owner = '".$this->user_id."') and ((datetime > ".mktime(0,0,0,$day['mon'],$day['mday'],$day['year'])." and datetime < ".(mktime(0,0,0,$day['mon'],($day['mday']+1),$day['year'])).") or (edatetime > ".mktime(0,0,0,$day['mon'],$day['mday'],$day['year'])." and edatetime < ".(mktime(0,0,0,($day['mon']+1),$day['mday'],$day['year']))."))");
+                $query = ("SELECT * FROM phpgw_cal where (owner = '".$this->user_id."') and ((datetime > ".mktime(0,0,0,$day['mon'],$day['mday'],$day['year'])." and datetime < ".(mktime(0,0,0,$day['mon'],($day['mday']+1),$day['year'])).") or (edatetime > ".mktime(0,0,0,$day['mon'],$day['mday'],$day['year'])." and edatetime < ".(mktime(0,0,0,$day['mon'],$day['mday']+1,$day['year']))."))");
                 if (!$this->db->query($query))
                         return false;

trunk/expressoCalendar/inc/class.uicalendar.inc.php

@@ -94 +94 @@
         function getViewDay () {
                 $dayViewTime = isset ($_REQUEST["time"]) ?  strtotime(substr($_REQUEST["time"],0,4)."-".substr($_REQUEST["time"],6,2)."-".substr($_REQUEST["time"],4,2)) : strtotime(date('Y-m-d', time()));
+                if (isset ($_REQUEST["uid"]))
+                        $this->db_obj->user_id = $_REQUEST["uid"];
 
                 $retorno = "<today>".date('Ydm',$dayViewTime)."</today>";
@@ -125 +127 @@
                 $dayViewTime -= (date('N', $dayViewTime)%7)*86400;
                 $retorno = "<today>".date('Ydm', $dayViewTime)."</today>";
+                if (isset ($_REQUEST["uid"]))
+                        $this->db_obj->user_id = $_REQUEST["uid"];
+
 
                 $fromBo = $this->db_obj->requestWeekCal($dayViewTime);
@@ -169 +174 @@
         function getViewMonth () {
                 $monthViewTime = isset ($_REQUEST["time"]) ?  strtotime(substr($_REQUEST["time"],0,4)."-".substr($_REQUEST["time"],6,2)."-".substr($_REQUEST["time"],4,2)) : strtotime(date('Y-m-d', time()));
+                if (isset ($_REQUEST["uid"]))
+                        $this->db_obj->user_id = $_REQUEST["uid"];
 
                 $todayTime = strtotime(date('Y-m', $monthViewTime)."-01");