'. t('Here you can set all options for the calendar. Please refer to our !help_section for a complete guide on the module', array('!help_section' => l(t('help section'), 'admin/help/calendar_block'))) .'
', ); - $form['elements'] = array( - '#type' => 'value', - '#value' => array('background_color' => 'FFFFFF', 'font_color' => '494949', 'header_color' => '494949', 'link_color' => '027AC6', 'border_color' => 'a5a5a5', 'width' => 173, 'first_day_of_the_week' => 'mo') - ); - foreach ($form['elements']['#value'] as $element => $default_value) { + $settings = calendar_block_settings_get($delta); + + foreach ($settings as $element => $default_value) { if ($element == 'first_day_of_the_week') { $form['calendar_block'][$element] = array( '#type' => 'select', '#title' => t('First day of the week'), - '#default_value' => variable_get("calendar_$element", $default_value), + '#default_value' => calendar_block_settings_get($delta, $element), '#options' => array('su' => t('sunday'), 'mo' => t('monday')), ); } @@ -64,20 +97,25 @@ function calendar_block_block($op = 'lis $form['calendar_block'][$element] = array( '#type' => ($element !== 'width' && module_exists('colorpicker')) ? 'colorpicker_textfield' : (module_exists('slider_textfield') ? 'slider_textfield' : 'textfield'), '#title' => t(drupal_ucfirst(str_replace('_', ' ', $element))), - '#default_value' => variable_get("calendar_$element", $default_value), + '#default_value' => calendar_block_settings_get($delta, $element), '#size' => '7', '#maxlength' => '7', ); if ($element !== 'width') { - $form['calendar_block'][$element]['#default_value'] = '#'. $form['calendar_block'][$element]['#default_value']; + $form['calendar_block'][$element]['#default_value'] = '#' . $form['calendar_block'][$element]['#default_value']; + $form['calendar_block'][$element]['#required'] = TRUE; } else { $form['calendar_block'][$element]['#slider_settings'] = array('min' => 120, 'max' => 200, 'slide' => 'Drupal.calendar.sliderSlide'); + $form['calendar_block'][$element]['#required'] = TRUE; } } } + $form['calendar_block']['submit'] = array('#type' => 'submit', '#value' => t('Save block')); - $form['calendar_block']['reset'] = array('#type' => 'submit', '#value' => t('Reset to defaults')); + if ($delta) { + $form['calendar_block']['reset'] = array('#type' => 'submit', '#value' => t('Reset to defaults')); + } if (module_exists('colorpicker')) { $form['calendar_block']['my_colorpicker'] = array( @@ -88,23 +126,20 @@ function calendar_block_block($op = 'lis $form['calendar_block']['reset']['#suffix'] = ''; } - return $form; case 'save': - foreach (array_keys($edit['elements']) as $element) { if ($edit['op'] == t('Reset to defaults')) { - variable_del("calendar_$element"); + calendar_block_settings_reset($edit['delta']); } else { - variable_set("calendar_$element", str_replace('#', '', $edit[$element])); + _calendar_block_block_save($edit['delta'], $edit); } - } break; case 'view': $block['subject'] = t('Calendar'); - $block['content'] = ''; + $block['content'] = ''; - if (variable_get('calendar_first_day_of_the_week', 'mo') == 'mo') { + if (calendar_block_settings_get($delta, 'first_day_of_the_week') == 'mo') { $weekdays = array('mo' => 'mo', 'tu' => 'tu', 'we' => 'we', 'th' => 'th', 'fr' => 'fr', 'sa' => 'sa', 'su' => 'su'); } else { @@ -112,35 +147,255 @@ function calendar_block_block($op = 'lis } $calendar = (object) array( - 'year' => date('Y'), - 'month' => date('m'), + 'year' => format_date(time(), 'custom', 'Y'), + 'month' => format_date(time(), 'custom', 'm'), 'weekdays' => $weekdays, + 'delta' => $delta, ); $date = (object) array(); // Give other modules the opportunity set the date for the calendar + foreach (module_implements('calendar_block') as $module) { $function = $module .'_calendar_block'; $function($calendar, $date, 'load'); } + $calendar_block_settings[$delta] = array( + 'delta' => $delta, + 'calendar' => $calendar, + 'ajax_response_path' => url('calendar_block_ajax'), + 'background_color' => '#'. calendar_block_settings_get($delta, 'background_color'), + 'font_color' => '#'. calendar_block_settings_get($delta, 'font_color'), + 'header_color' => '#'. calendar_block_settings_get($delta, 'header_color'), + 'link_color' => '#'. calendar_block_settings_get($delta, 'link_color'), + 'border_color' => '#'. calendar_block_settings_get($delta, 'border_color'), + 'width' => calendar_block_settings_get($delta, 'width'), + ); + $path = drupal_get_path('module', 'calendar_block'); drupal_add_css("$path/calendar_block.css", 'module'); drupal_add_js("$path/calendar_block.js"); - drupal_add_js(array('calendar_block' => array( - 'calendar' => $calendar, - 'ajax_response_path' => url('calendar_block_ajax'), - 'background_color' => '#'. variable_get('calendar_background_color', 'FFFFFF'), - 'font_color' => '#'. variable_get('calendar_font_color', '494949'), - 'header_color' => '#'. variable_get('calendar_header_color', '494949'), - 'link_color' => '#'. variable_get('calendar_link_color', '027AC6'), - 'border_color' => '#'. variable_get('calendar_border_color', 'a5a5a5'), - 'width' => variable_get('calendar_width', 173), - )), 'setting'); + + // We need to add settings to JS for each delta, however we can't use drupal_add_js for the same + // settings variable more than once. Therefore, we add specially-named settings variables and + // check to see which deltas are set in the JS. + // We could have also used one drupal_add_js in hook_exit(), but this would not be compatible with + // aggressive caching. + _calendar_block_setup(); + drupal_add_js(array('calendar_block_' . $delta => $calendar_block_settings[$delta]), 'setting'); + return $block; } } /** + * Add list of possible deltas for JS to check for settings. + */ +function _calendar_block_setup() { + static $once; + if (!isset($once)) { + drupal_add_js(array('calendar_block_deltas' => array_keys(_calendar_block_block_list())), 'setting'); + $once = TRUE; + } +} + +/** + * Alters the block admin form to add delete links next to menu blocks. + */ +function calendar_block_form_block_admin_display_form_alter(&$form, $form_state) { + $blocks = _calendar_block_block_list(); + foreach ($blocks as $delta => $block) { + $form['calendar_block_' . $delta]['delete'] = array('#value' => l(t('delete'), 'admin/build/block/delete-calendar-block/'. $delta)); + } +} + +/** + * @todo get caching to work somehow :) + */ +function _calendar_block_block_list($reset = FALSE) { + static $blocks; + + if (!isset($blocks) || $reset) { + $result = db_query("SELECT delta, title FROM {blocks} WHERE module = 'calendar_block'"); + $blocks = array(); + while ($block = db_fetch_object($result)) { + $title = ($block->title) ? $block->delta . ' (' . $block->title . ')':$block->delta; + $blocks[$block->delta] = array( + 'info' => t('Calendar block: @title', array('@title' => $title)), + 'cache' => BLOCK_NO_CACHE, + ); + } + } + + return $blocks; +} + +/** + * Save settings for the particular block delta + */ +function _calendar_block_block_save($delta, $edit) { + // save the settings + $keys = array_keys(calendar_block_settings_get()); + foreach ($edit as $key => $value) { + if (!in_array($key, $keys)) { + unset($edit[$key]); + } + else { + // save hex color values without the # character + $edit[$key] = str_replace('#', '', $value); + } + } + calendar_block_settings_set($delta, array_map('calendar_block_remove_hash', $edit)); +} + + +/** + * Make sure the user-input delta is the correct format and is unique + */ +function calendar_block_delta_validate($element, &$form_state) { + // Safe format + if (!preg_match('/^[a-z0-9_]+$/', $form_state['values']['delta_input'])) { + form_error($element, t('The delta value must only contain lowercase letters, numbers, and underscores')); + } + // Unique + if (db_result(db_query("SELECT bid FROM {blocks} WHERE module = 'calendar_block' AND delta = '%s'", $form_state['values']['delta_input']))) { + form_error($element, t('The delta value must be unique')); + } +} + +/** + * Form to add a calendar block + */ +function calendar_block_add_block_form(&$form_state) { + include_once './' . drupal_get_path('module', 'block') . '/block.admin.inc'; + return block_admin_configure($form_state, 'calendar_block', NULL); +} + +/** + * _submit handler for adding calendar block + */ +function calendar_block_add_block_form_submit($form, &$form_state) { + // If we are saving a new calendar block, delta is user-set in delta_input + $delta = $form_state['values']['delta_input'] ? $form_state['values']['delta_input']:$form_state['values']['delta']; + + // Save settings as per usual + _calendar_block_block_save($delta, $form_state['values']); + + // Run the normal new block submission (borrowed from block_add_block_form_submit). + foreach (list_themes() as $key => $theme) { + if ($theme->status) { + db_query("INSERT INTO {blocks} (visibility, pages, custom, title, module, theme, status, weight, delta, cache) VALUES(%d, '%s', %d, '%s', '%s', '%s', %d, %d, '%s', %d)", $form_state['values']['visibility'], trim($form_state['values']['pages']), $form_state['values']['custom'], $form_state['values']['title'], $form_state['values']['module'], $theme->name, 0, 0, $delta, BLOCK_NO_CACHE); + } + } + + foreach (array_filter($form_state['values']['roles']) as $rid) { + db_query("INSERT INTO {blocks_roles} (rid, module, delta) VALUES (%d, '%s', '%s')", $rid, $form_state['values']['module'], $delta); + } + + drupal_set_message(t('The calendar block has been created.')); + cache_clear_all(); + + $form_state['redirect'] = 'admin/build/block'; + return; +} + +/** + * Confirm form for deletion + */ +function calendar_block_delete_block_form(&$form_state, $delta) { + $form = array(); + + $blocks = _calendar_block_block_list(); + $title = $blocks[$delta]['info']; + + $form['delta'] = array( + '#type' => 'value', + '#value' => $delta, + ); + $form['block_title'] = array( + '#type' => 'value', + '#value' => $title, + ); + + $question = t('Are you sure you want to delete the block %title?', array('%title' => $title)); + $path = 'admin/build/block'; + $description = t('This action cannot be undone.'); + + return confirm_form($form, $question, $path, $description); +} + +/** + * _submit handler for deletion + */ +function calendar_block_delete_block_form_submit($form, &$form_state) { + $delta = $form_state['values']['delta']; + $title = $form_state['values']['block_title']; + // delete settings + calendar_block_settings_reset($delta); + // delete block + db_query("DELETE FROM {blocks} WHERE module = 'calendar_block' AND delta = '%s'", $delta); + db_query("DELETE FROM {blocks_roles} WHERE module = 'calendar_block' AND delta = '%s'", $delta); + drupal_set_message(t('The "%name" block has been removed.', array('%name' => $title))); + cache_clear_all(); + _calendar_block_block_list(TRUE); // clear static cache + $form_state['redirect'] = 'admin/build/block'; +} + +/** + * Get settings for a general calendar delta + */ +function calendar_block_settings_get($delta = 0, $key = NULL, $reset = FALSE) { + $defaults = array( + 'background_color' => 'FFFFFF', + 'font_color' => '494949', + 'header_color' => '494949', + 'link_color' => '027AC6', + 'border_color' => 'a5a5a5', + 'width' => 173, + 'first_day_of_the_week' => 'mo', + ); + static $all_settings; + if (!isset($all_settings) || $reset) { + $all_settings = variable_get('calendar_block_settings', array()); + } + if (!$all_settings[$delta]) { + $all_settings[$delta] = $defaults; + } + if ($key) { + return $all_settings[$delta][$key]; + } + else { + return $all_settings[$delta]; + } +} + +/** + * Reset calendar settings for a given delta, or all + */ +function calendar_block_settings_reset($delta = NULL) { + if (!isset($delta)) { + // delete all + variable_del('calendar_block_settings'); + } + else { + $all_settings = variable_get('calendar_block_settings', array()); + unset($all_settings[$delta]); + variable_set('calendar_block_settings', $all_settings); + return calendar_block_settings_get($delta, NULL, TRUE); + } +} + +/** + * Set calendar settings for a given delta + */ +function calendar_block_settings_set($delta, $settings) { + $all_settings = variable_get('calendar_block_settings', $array); + $all_settings[$delta] = $settings; + variable_set('calendar_block_settings', $all_settings); + return calendar_block_settings_get($delta, NULL, TRUE); +} + +/** * Implementation of hook_theme(). */ function calendar_block_theme() { @@ -157,22 +412,23 @@ function calendar_block_theme() { function calendar_block_ajax() { $calendar = (object) $_POST; - $curr_date = ($calendar->year && $calendar->month) ? mktime(1, 1, 1, $calendar->month, 1, $calendar->year) : time(); + // use the middle of the month + $curr_date = ($calendar->year && $calendar->month) ? gmmktime(1, 1, 1, $calendar->month, 15, $calendar->year) : gmmktime(1, 1, 1, gmdate('n'), 15, gmdate('Y')); $calendar->weekdays = json_decode($calendar->weekdays, TRUE); $weekdays = array_keys($calendar->weekdays); - $calendar->month = date('m', $curr_date); // The numeric current month (09) - $calendar->year = date('Y', $curr_date); // The numeric current year (2008) + $calendar->month = format_date($curr_date, 'custom', 'm'); // The numeric current month (09) + $calendar->year = format_date($curr_date, 'custom', 'Y'); // The numeric current year (2008) // If the month is equal to the current month, get the current day - if (date('Y-m', $curr_date) == date('Y-m')) { - $calendar->day = date('d', time()); // The numeric current day (20) + if (format_date($curr_date, 'custom', 'Y-m') == format_date(time(), 'custom', 'Y-m')) { + $calendar->day = format_date(time(), 'custom', 'd'); // The numeric current day (20) } - $calendar->month_str = date('F', $curr_date); // The current month (September) + $calendar->month_str = format_date($curr_date, 'custom', 'F'); // The current month (September) $calendar->days_in_month = cal_days_in_month(0, $calendar->month, $calendar->year); // The number of days in this month (31) - $calendar->first_day_of_month = drupal_substr(drupal_strtolower(date('D', mktime(0, 0, 0, $calendar->month, 1, $calendar->year))), 0, 2); // The first week day of this month (mo, tu, we ....) + $calendar->first_day_of_month = drupal_substr(drupal_strtolower(format_date(gmmktime(0, 0, 0, $calendar->month, 1, $calendar->year), 'custom', 'D')), 0, 2); // The first week day of this month (mo, tu, we ....) // If the first day of the month is not the same as the first day in the weekdays, set in the configuration settings, // we need to set the last days of the previous month first @@ -225,15 +481,16 @@ function theme_calendar_block($calendar) $row_counter = 0; $num_rows = (count($calendar->dates) / 7); $weekdays = array_values($calendar->weekdays); + $cal_id = 'calendar_' . $calendar->delta; - $output[] = '