Changeset 4321 for sandbox

Timestamp:

05/10/11 17:00:22 (13 years ago)

Author:

airton

Message:

Ticket #1820 - Problema na apresentacao da agenda diaria no home - r4270

Location:

sandbox/2.2.0.2/calendar/inc

Files:

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

sandbox/2.2.0.2/calendar/inc/class.bocalendar.inc.php

@@ -1189 +1189 @@
                                 $this->so->set_description($l_cal['description']);
                                 $this->so->set_observations($l_cal['observations']);
-                                $this->so->set_notifications_owner($l_cal['notifications_owner'])
+                                $this->so->set_notifications_owner($l_cal['notifications_owner']);
                                 $this->so->set_attachment($l_cal['attachment']);
                                 $this->so->set_ex_participants($l_cal['ex_participants']);

sandbox/2.2.0.2/calendar/inc/class.socalendar__.inc.php

@@ -107 +107 @@
                 }
 
-                unction set_notifications_owner($notifications_owner='') 
+                function set_notifications_owner($notifications_owner='') 
                 { 
                 $this->add_attribute('notifications_owner',$notifications_owner); 

sandbox/2.2.0.2/calendar/inc/class.uicalendar.inc.php

@@ -5078 +5078 @@
                         $templateSet = $GLOBALS['phpgw_info']['server']['template_set'];
 
+                        if(isset($_GET['date']))
+                        {
+                $dia = substr($_GET['date'],-2);
+            }
+            elseif(isset($_POST['day']))
+            {
+                $dia = $_POST['day'];
+            }
+            else
+            {
+                $dia = $params['day'];
+            }
+                        
+            $print =  '<a href="javascript:void(0)" id="printFriendly">['.lang('Printer Friendly').']</a>';
+            $param = '&year='.$this->bo->year.'&month='.$this->bo->month.'&friendly=1'.'&day_ini='.$dia.'&num_dias=1'.'&d=1';
+                        
+                        
                         $p->set_file($templates);
                         $p->set_block('day_cal','day','day');
@@ -5085 +5102 @@
                         $p->set_var('date',$result_events_json['date_events_json']);
                         $p->set_var('templateSet',$templateSet);
+                        $p->set_var('iprint',$print); 
+                $p->set_var('param',$param);            
                         $p->set_var('hora_final',$result_events_json['hora_final']);
                         $p->set_var('hora_inicial',$result_events_json['hora_inicial']);