Changeset 625 for trunk/calendar/inc/class.uicalendar.inc.php

Timestamp:

01/26/09 14:56:58 (15 years ago)

Author:

niltonneto

Message:

Resolve #411.

File:

• trunk/calendar/inc/class.uicalendar.inc.php (modified) (4 diffs)

trunk/calendar/inc/class.uicalendar.inc.php

@@ -3170 +3170 @@
 
 /*****************************************************************************************/
-
+                function normDec($num)
+                {
+                        if ($num > 9)
+                                return $num;
+                        else
+                                return "0".$num;
+                }
                 function overlap($params)
                 {
@@ -3193 +3199 @@
                         {
                                 $overlapped_event = $this->bo->read_entry($overlapping_events[$i],True);
-                                $overlap .= '<li>'.$this->link_to_entry($overlapped_event,$month,$mday,$year);
-                                $overlap .= '<ul>';
                                 foreach($overlapped_event['participants'] as $id => $status)
                                 {
@@ -3200 +3204 @@
                                         $overlap .= '<li>'.($conflict?'<b>':'').
                                                 $GLOBALS['phpgw']->common->grab_owner_name($id).
-                                                ($conflict?'</b> - '.lang('Scheduling conflict'):'')."</li>\n";
-                                }
-                                $overlap .= "</ul>\n";
+                                                ($conflict?'</b> - '.lang('Scheduling conflict'):'')."</li>";
+                                }
+                         if ($this->bo->prefs['calendar']['hide_event_conflict'])
+                                 $overlap .= '<ul><font size="1"><span>'.
+                                         $this->normDec($overlapped_event['start']['hour']).":".
+                                         $this->normDec($overlapped_event['start']['min'])."-".
+                                         $this->normDec($overlapped_event['end']['hour']).":".
+                                         $this->normDec($overlapped_event['end']['min']).
+                                         '<br><b>'.lang('title').": ".lang("Hidden").
+                                         '</b><br>'.lang('description').": ".lang("Hidden").'<br></span></ul><br>';
+                         else
+                                 $overlap .= '<ul>'.$this->link_to_entry($overlapped_event,$month,$mday,$year)."</ul><br>";     
                         }
 
@@ -3919 +3932 @@
                                         {       
                                                 $icon = '<img src="'.$GLOBALS['phpgw']->common->image('calendar',($alarm['enabled']?'enabled':'disabled')).'" width="13" height="13">';
-                                                $var = Array(
+                                                $var = Array(                                   
                                                         'field' => $icon.$GLOBALS['phpgw']->common->show_date($alarm['time']),
                                                         'data'  => lang('Email Notification for %1',$GLOBALS['phpgw']->common->grab_owner_name($alarm['owner']))