Changeset 3914

Timestamp:

03/25/11 13:47:32 (12 years ago)

Author:

rafaelraymundo

Message:

Ticket #1671 - Feriados não são destacados na visão diária e mensal

Location:

branches/2.2/calendar/inc

Files:

• class.boholiday.inc.php (modified) (1 diff)
• class.uicalendar.inc.php (modified) (5 diffs)

branches/2.2/calendar/inc/class.boholiday.inc.php

@@ -256 +256 @@
                                 }
 //                              echo 'Loading from: '.$load_from.'/holidays.'.strtoupper($locale).'.csv'."<br>\n";
-                                $lines = $network->gethttpsocketfile($load_from.'/holidays.'.strtoupper($locale).'.csv');
+                                if(isset($GLOBALS['phpgw_info']['server']['holidays_url_path']) && $GLOBALS['phpgw_info']['server']['holidays_url_path'] != 'localhost')
+                                {
+                                    $lines = $network->gethttpsocketfile($load_from.'/holidays.'.strtoupper($locale).'.csv');
+                                }
+                                else
+                                {
+                                    $lines = explode(chr(0x0A),file_get_contents($load_from.'/holidays.'.strtoupper($locale).'.csv'));
+                                }
                                 if (!$lines)
                                 {

branches/2.2/calendar/inc/class.uicalendar.inc.php

@@ -392 +392 @@
                                                 {
 //NDEE: class def what for?
-                                                        $str = '<a href="'.$this->page($params['link'],'&date='.$date).'" class="'.$day_params['class'].'">'.$day.'</a>';
+                                                        $str = '<a href="'.$this->page($params['link'],'&date='.$date).'" class="'.$day_params['class'].'" ' . ($day_params['class']=='bminicalhol' || $day_params['class']=='minicalhol'?' title="' . $day_params['holidays'][0] . '" ' :'') . ' >'.$day.'</a>';
                                                 }
                                                 else
@@ -545 +545 @@
                                 $minical_next = '';
                         }
-
+                        $this->bo->read_holidays($params['year']);
                         if($_POST['year']) {                    
         
@@ -666 +666 @@
                         if (isset($this->bo->prefs['calendar']['display_minicals']) && $this->bo->prefs['calendar']['display_minicals'] == "1" && !$this->bo->printer_friendly)
                         {
-                                $minical_this = $this->mini_calendar(
-                                        Array(
-                                                'day'   => $this->bo->day,
-                                                'month' => $this->bo->month,
-                                                'year'  => $this->bo->year,
-                                                'link'  => 'day',
-                                                'butons'        => 'none',
-                                                'outside_month' => False
-                                        )
-                                );
                                 $minical_prev = $this->mini_calendar(
                                         Array(
@@ -693 +683 @@
                                                 'link'  => 'day',
                                                 'butons'        => 'right',
+                                                'outside_month' => False
+                                        )
+                                );
+                                $minical_this = $this->mini_calendar(
+                                        Array(
+                                                'day'   => $this->bo->day,
+                                                'month' => $this->bo->month,
+                                                'year'  => $this->bo->year,
+                                                'link'  => 'day',
+                                                'butons'        => 'none',
                                                 'outside_month' => False
                                         )
@@ -5773 +5773 @@
                                         $appts = False;
                                 }
-
                                 $holidays = $this->bo->cached_holidays[$date];
                                 if($weekly)