Changeset 1090 for trunk/include/functions_calendar.inc.php
- Timestamp:
- Mar 21, 2006, 2:27:21 AM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/functions_calendar.inc.php
r1086 r1090 35 35 $inner_sql = ' FROM ' . IMAGES_TABLE; 36 36 37 if (!isset($page['category']) or is_numeric($page['category'])) 37 if ($page['section']=='categories' or 38 ( isset($page['category']) and is_numeric($page['category']) ) ) 38 39 { // we will regenerate the items by including subcats elements 39 40 $page['cat_nb_images'] = 0; … … 102 103 103 104 // Retrieve calendar field 104 if ( !isset( $fields[ $page['chronology ']['field'] ] ) )105 { 106 die('bad field');105 if ( !isset( $fields[ $page['chronology_field'] ] ) ) 106 { 107 die('bad chronology field'); 107 108 } 108 109 109 110 // Retrieve style 110 if ( !isset( $styles[ $page['chronology ']['style'] ] ) )111 { 112 $page['chronology ']['style'] = 'monthly';113 } 114 $cal_style = $page['chronology ']['style'];111 if ( !isset( $styles[ $page['chronology_style'] ] ) ) 112 { 113 $page['chronology_style'] = 'monthly'; 114 } 115 $cal_style = $page['chronology_style']; 115 116 include(PHPWG_ROOT_PATH.'include/'. $styles[$cal_style]['include']); 116 117 $calendar = new Calendar(); … … 118 119 // Retrieve view 119 120 120 if ( !isset($page['chronology ']['view']) or121 !in_array( $page['chronology ']['view'], $views ) )122 { 123 $page['chronology ']['view'] = CAL_VIEW_LIST;124 } 125 126 if ( CAL_VIEW_CALENDAR==$page['chronology ']['view'] and121 if ( !isset($page['chronology_view']) or 122 !in_array( $page['chronology_view'], $views ) ) 123 { 124 $page['chronology_view'] = CAL_VIEW_LIST; 125 } 126 127 if ( CAL_VIEW_CALENDAR==$page['chronology_view'] and 127 128 !$styles[$cal_style]['view_calendar'] ) 128 129 { 129 130 130 $page['chronology']['view'] = CAL_VIEW_LIST; 131 } 132 $cal_view = $page['chronology']['view']; 131 $page['chronology_view'] = CAL_VIEW_LIST; 132 } 133 133 134 134 // perform a sanity check on $requested … … 147 147 if ($page['chronology_date'][$i] == 'any') 148 148 { 149 if ($ cal_view== CAL_VIEW_CALENDAR)149 if ($page['chronology_view'] == CAL_VIEW_CALENDAR) 150 150 {// we dont allow any in calendar view 151 151 while ($i < count($page['chronology_date'])) … … 178 178 //echo ('<pre>'. var_export($calendar, true) . '</pre>'); 179 179 180 /* $url_base = get_query_string_diff(array('start', 'calendar'));181 $url_base =182 PHPWG_ROOT_PATH.'category.php'183 .$url_base184 .(empty($url_base) ? '?' : '&')185 .'calendar='.$cal_field.'-'186 ;*/187 180 $must_show_list = true; // true until calendar generates its own display 188 if (basename($_SERVER[ "PHP_SELF"]) == 'category.php')181 if (basename($_SERVER['SCRIPT_NAME']) == 'category.php') 189 182 { 190 183 $template->assign_block_vars('calendar', array()); … … 209 202 { 210 203 $selected = ''; 211 $chronology = $page['chronology'];212 $chronology['style'] = $style;213 $chronology['view'] = $view;214 204 215 205 if ($style!=$cal_style) … … 227 217 $url = duplicate_index_url( 228 218 array( 229 'chronology' => $chronology, 219 'chronology_style' => $style, 220 'chronology_view' => $view, 230 221 'chronology_date' => $chronology_date, 231 222 ) 232 223 ); 233 224 234 if ($style==$cal_style and $view==$ cal_view)225 if ($style==$cal_style and $view==$page['chronology_view'] ) 235 226 { 236 227 $selected = 'SELECTED'; … … 241 232 array( 242 233 'VALUE' => $url, 243 'CONTENT' => l10n('c alendar_'.$style.'_'.$view),234 'CONTENT' => l10n('chronology_'.$style.'_'.$view), 244 235 'SELECTED' => $selected, 245 236 ) … … 249 240 } 250 241 $url = duplicate_index_url( 251 array( 'chronology_date'=>array()), array('start')242 array(), array('start', 'chronology_date') 252 243 ); 253 244 $calendar_title = '<a href="'.$url.'">' 254 .$fields[$ chronology['field']]['label'].'</a>';245 .$fields[$page['chronology_field']]['label'].'</a>'; 255 246 $calendar_title.= $calendar->get_display_name(); 256 247 //this should be an assign_block_vars, but I need to assign 'calendar'
Note: See TracChangeset
for help on using the changeset viewer.