steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView day.php, 1.2, 1.3 week.php, 1.2, 1.3 workweek.php, 1.2, 1.3

cvs at intevation.de cvs at intevation.de
Tue Oct 12 12:34:50 CEST 2004


Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView
In directory doto:/tmp/cvs-serv28768/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView

Modified Files:
	day.php week.php workweek.php 
Log Message:
fix for issue441

Index: day.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/day.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- day.php	15 Jul 2004 22:08:05 -0000	1.2
+++ day.php	12 Oct 2004 10:34:47 -0000	1.3
@@ -126,7 +126,11 @@
         $width = 100 / ($endHour - $startHour);
         for ($i = $startHour; $i < $endHour; $i+= $step) {
             $t = mktime($i);
-            $hour = intval(strftime("%I", $t)) . strftime(" %p", $t);
+	    if( $prefs->getValue('twentyFour') ) {
+	      $hour = intval(strftime("%H", $t));
+	    } else {
+	      $hour = intval(strftime("%I", $t)) . strftime(" %p", $t);
+	    }
             if ($i > $startHour) {
                 $hours_html .= "<td style=\"border-left:1px solid black;width:$width%\">$hour</td>";
             } else {

Index: week.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/week.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- week.php	15 Jul 2004 22:08:05 -0000	1.2
+++ week.php	12 Oct 2004 10:34:47 -0000	1.3
@@ -86,7 +86,11 @@
             for ($h = 9; $h < 18; $h += 3) {
                 $t = mktime($h, 0, 0, date('n', $day), date('j', $day), date('Y', $day));
 
-                $hour = intval(strftime("%I", $t)) . strftime(" %p", $t);
+		if( $prefs->getValue('twentyFour') ) {
+		  $hour = intval(strftime("%H", $t));
+		} else {
+		  $hour = intval(strftime("%I", $t)) . strftime(" %p", $t);
+		}
                 if (($i + $h) > 9) {
                     $hours_html .= "<td style=\"white-space:nowrap;overflow:hidden;border-left:1px solid black;width:4%\">$hour</td>";
                 } else {

Index: workweek.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/workweek.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- workweek.php	15 Jul 2004 22:08:05 -0000	1.2
+++ workweek.php	12 Oct 2004 10:34:47 -0000	1.3
@@ -85,7 +85,12 @@
             for ($h = 9; $h < 18; $h += 3) {
                 $t = mktime($h, 0, 0, date('n', $day), date('j', $day), date('Y', $day));
 
-                $hour = intval(strftime("%I", $t)) . strftime(" %p", $t);
+		if( $prefs->getValue('twentyFour') ) {
+		  $hour = intval(strftime("%H", $t));
+		} else {
+		  $hour = intval(strftime("%I", $t)) . strftime(" %p", $t);
+		}
+
                 if (($i + $h) > 9) {
                     $hours_html .= "<td style=\"white-space:nowrap;overflow:hidden;border-left:1px solid black;width:6.5%\">$hour</td>";
                 } else {





More information about the commits mailing list