Changeset 8626 for trunk/include/calendar_monthly.class.php

Timestamp:

Jan 12, 2011, 2:41:55 PM (13 years ago)

Author:

plg

Message:

feature 2103 added: week may start on sunday/monday in the monthly calendar

File:

• trunk/include/calendar_monthly.class.php (modified) (3 diffs)

trunk/include/calendar_monthly.class.php

@@ -331 +331 @@
 function build_month_calendar(&$tpl_var)
 {
-  global $page;
+  global $page, $lang, $conf;
 
   $query='SELECT '.pwg_db_get_dayofmonth($this->date_field).' as period,
@@ -369 +369 @@
     $items[$day]['height'] = $row['height'];
     $items[$day]['dow'] = $row['dow'];
-  }
-
-  global $lang, $conf;
+
+    if ('sunday' == $conf['week_starts_on'])
+    {
+      $items[$day]['dow']++;
+    }
+  }
 
   if ( !empty($items)
@@ -396 +399 @@
       $first_day_dow -= 1;
     }
-    array_push( $wday_labels, array_shift($wday_labels) );
+
+    if ('monday' == $conf['week_starts_on'])
+    {
+      array_push( $wday_labels, array_shift($wday_labels) );
+    }
     // END - pass now in week starting Monday