[Comoblog-commit] comoblog/modules/mod_calendar mod_calendar.php,1.7,1.8

[Mark W. \(a. serialmonkey\) <mar...@us...>]

Update of /cvsroot/comoblog/comoblog/modules/mod_calendar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1063

Modified Files:
	mod_calendar.php 
Log Message:
Fix problem with display when starting day is Monday

Index: mod_calendar.php
===================================================================
RCS file: /cvsroot/comoblog/comoblog/modules/mod_calendar/mod_calendar.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mod_calendar.php	9 Jan 2006 02:52:56 -0000	1.7
+++ mod_calendar.php	15 Feb 2006 04:13:44 -0000	1.8
@@ -39,8 +39,8 @@
 	   $val = 6;
 	   break;
     }	
-
-   return $val;
+   
+  return $val;
 }   
    
 function start_day ($month, $year)
@@ -60,11 +60,14 @@
 	$start_day = ($total_days_since_1901 + 2) % 7;
 
 	$start_day = $start_day - convert_offset(CFG_CALENDAR_DAY_OFFSET);
+	
+	if ($start_day < 0)
+		$start_day = 7 + $start_day;  
 
 	if ($start_day == 0) {
 		$start_day = 7;
 	}
-   
+
 	return ($start_day);
 }
 
@@ -289,7 +292,7 @@
 
    //echo $start_day.'<br>';
    
-   if ($start_day == 7)                         // new row in table
+   if ($start_day == 7 && $cnt + 1 <= $days_in_month)                   // new row in table
    {
       $mod_calendar_tpl->parse("main.calendar.row");
       $start_day = 0;