Changeset 1056 for trunk/include/calendar_monthly.class.php
- Timestamp:
- Feb 24, 2006, 2:16:30 AM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/calendar_monthly.class.php
r1055 r1056 74 74 $this->build_nav_bar2($view_type, $requested, 1, 'MONTH', $lang['month']); // month 75 75 if (count($requested)>1) 76 $this->build_nav_bar2($view_type, $requested, 2, 'DAYOF WEEK' ); // days76 $this->build_nav_bar2($view_type, $requested, 2, 'DAYOFMONTH' ); // days 77 77 } 78 78 return false; … … 152 152 function build_global_calendar(&$requested) 153 153 { 154 assert( count($requested) == 0 ); 154 155 $query='SELECT DISTINCT(DATE_FORMAT('.$this->date_field.',"%Y%m")) as period, 155 156 COUNT(id) as count'; 156 157 $query.= $this->inner_sql; 157 $query.= $this->get_date_where($requested , 0);158 $query.= $this->get_date_where($requested); 158 159 $query.= ' 159 160 GROUP BY period'; … … 189 190 190 191 $url_base .= '-'; 191 $nav_bar .= $this->get_nav_bar_from_items( $url_base, $year_data['children'], $requested[0], 'calCal', false, $lang['month'] ); 192 $nav_bar .= $this->get_nav_bar_from_items( $url_base, 193 $year_data['children'], null, 'calCal', false, $lang['month'] ); 192 194 193 195 $template->assign_block_vars( 'calendar.calbar', … … 200 202 function build_year_calendar(&$requested) 201 203 { 204 assert( count($requested) == 1 ); 202 205 $query='SELECT DISTINCT(DATE_FORMAT('.$this->date_field.',"%m%d")) as period, 203 206 COUNT(id) as count'; 204 207 $query.= $this->inner_sql; 205 $query.= $this->get_date_where($requested , 1);208 $query.= $this->get_date_where($requested); 206 209 $query.= ' 207 210 GROUP BY period'; … … 243 246 $url_base .= '-'; 244 247 $nav_bar .= $this->get_nav_bar_from_items( $url_base, 245 $month_data['children'], $requested[1], 'calCal', false );248 $month_data['children'], null, 'calCal', false ); 246 249 247 250 $template->assign_block_vars( 'calendar.calbar',
Note: See TracChangeset
for help on using the changeset viewer.