'. t('This section lists modules implementing the cronplus hook for each available time period. The listing is purely informational; there are no settings to change here.'); + $periods = & cronplus_periods(); + // Add one special case. + $periods['cronplus'] = 'cronplus '. t('(multiplex hook)'); + foreach ($periods as $period => $period_t) { + $html .= '
'. t('Hook: {module}_%hook()', array('%hook' => $hook)) .'
'. t('Implemented by: '); + $modules = module_implements($hook); + if (count($modules) > 0) { + $group .= ''. implode(', ', $modules) .''; + } + else { + $group .= t('None'); + } + $group .= '
'. t('Last invoked: '); + if ($period == 'cronplus') { + $group .= t('Invoked along with each of the above'); + } + else { + $last_invoked = intval(variable_get('cronplus_'. $period .'_last', 0)); + $group .= $last_invoked ? gmdate('Y-m-d H:i:s', $last_invoked) .' UTC' : t('Never'); + } + $html .= $group .'
'; + + + return $html; + + //return theme("page", $html); +} diff -upN /home/denis/downloaded_stuff/drupal5_modules/cronplus/cronplus.info /home/denis/downloaded_stuff/drupal6_modules/cronplus/cronplus.info --- /home/denis/downloaded_stuff/drupal5_modules/cronplus/cronplus.info 2007-03-22 19:50:07.000000000 -0400 +++ /home/denis/downloaded_stuff/drupal6_modules/cronplus/cronplus.info 2008-08-05 22:14:50.000000000 -0400 @@ -1,8 +1,6 @@ -; $Id: cronplus.info,v 1.1 2007/03/22 23:41:18 syscrusher Exp $ -name = Cronplus -description = "Cronplus intercepts Drupal's normal cron hook to provide API calls at (nominally) fixed time intervals rather than every cron cycle." - -; Information added by drupal.org packaging script on 2007-03-22 -version = "5.x-1.0" -project = "cronplus" - +; $Id$ +name = Cron Plus +package = Cron Plus +description = Provides advanced cron functionality +core = 6.x +version = 6.x-1.x-dev diff -upN /home/denis/downloaded_stuff/drupal5_modules/cronplus/cronplus.module /home/denis/downloaded_stuff/drupal6_modules/cronplus/cronplus.module --- /home/denis/downloaded_stuff/drupal5_modules/cronplus/cronplus.module 2007-03-22 19:41:18.000000000 -0400 +++ /home/denis/downloaded_stuff/drupal6_modules/cronplus/cronplus.module 2008-08-05 23:52:22.000000000 -0400 @@ -1,12 +1,5 @@ 'admin/settings/cronplus', - 'title' => t('cronplus'), - 'callback' => 'cronplus_settings_main', - 'description' => 'Select which hour and on what day you would like houly and daily crons to run. Also see the status of cronplus', - 'access' => user_access('administer site configuration'), -// 'type' => MENU_LOCAL_TASK, - ); - $items[] = array( - 'path' => 'admin/settings/cronplus/main', - 'title' => t('configuration'), - 'type' => MENU_DEFAULT_LOCAL_TASK, - 'weight' => -10, - ); - } - else { - $items[] = array( - 'path' => 'admin/settings/cronplus/status', - 'title' => t('status report'), - 'callback' => 'cronplus_settings_status', 'access' => user_access('administer site configuration'), - 'type' => MENU_LOCAL_TASK, 'weight' => 10); - } + + + $items['admin/settings/cronplus'] = array( + 'title' => 'Cron Plus', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('cronplus_settings_form'), + 'access arguments' => array('administer cronplus'), + 'file' => 'cronplus.admin.inc', + ); + + // Tabs: + $items['admin/settings/cronplus/main'] = array( + 'title' => 'Main', + 'type' => MENU_DEFAULT_LOCAL_TASK, + 'weight' => -10, + ); + + + /* + $items['admin/settings/cronplus/status'] = array( + 'title' => 'Status', + 'access arguments' => array('administer cronplus'), + 'page callback' => 'drupal_get_form', + 'page arguments' => array('cronplus_settings_status'), + 'type' => MENU_LOCAL_TASK, + 'file' => 'cronplus.admin.inc', + ); + */ + + $items['admin/settings/cronplus/status'] = array( + 'title' => 'Status', + 'access arguments' => array('administer cronplus'), + 'page callback' => 'drupal_get_form', + 'page callback' => 'cronplus_settings_status', + 'page arguments' => array(), + 'type' => MENU_LOCAL_TASK, + 'file' => 'cronplus.admin.inc', + ); + + return $items; } @@ -56,57 +66,6 @@ function cronplus_menu($may_cache) { * Right now, all the fields are dropdown/select, so validation errors are * unlikely. */ -function cronplus_settings_form_validate($form_id, $form_values) { - $cronplus_preferred_hour = intval($form_values['cronplus_preferred_hour']); - if ($cronplus_preferred_hour < 0 || $cronplus_preferred_hour > 23) { - form_set_error('cronplus_preferred_hour', t('Hour must be 0 to 23 inclusive')); - } - $cronplus_preferred_wkdy = intval($form_values['cronplus_preferred_wkdy']); - if ($cronplus_preferred_wkdy < 0 || $cronplus_preferred_wkdy > 6) { - form_set_error('cronplus_preferred_wkdy', t('Weekday must be 0 to 6 (Sunday through Saturday, respectively) inclusive')); - } -} - -/** - * Handle submission of the settings form - */ -function cronplus_settings_form_submit($form_id, $form_values) { - $cronplus_preferred_hour = intval($form_values['cronplus_preferred_hour']); - $cronplus_preferred_wkdy = intval($form_values['cronplus_preferred_wkdy']); - variable_set('cronplus_preferred_hour', $cronplus_preferred_hour); - variable_set('cronplus_preferred_wkdy', $cronplus_preferred_wkdy); - drupal_set_message(t('Cronplus settings saved'), 'info'); -} - -/** - * Handle the module's settings. - */ -function cronplus_settings_main() { - return drupal_get_form('cronplus_settings_form'); -} - -function cronplus_settings_form() { - $form = array(); - $form['cronplus_preferred_hour'] = array( - '#type' => 'select', - '#title' => t('Preferred hour'), - '#description' => t('Preferred hour of the day at which daily, weekly, monthly, and yearly jobs will run, if possible. Not guaranteed.'), - '#default_value' => intval(variable_get('cronplus_preferred_hour', 0)), - '#options' => _cronplus_int_options(0, 23), - ); - $form['cronplus_preferred_wkdy'] = array( - '#type' => 'select', - '#title' => t('Preferred weekday'), - '#description' => t('Preferred day of the week on which weekly, monthly, and yearly jobs will run, if possible. Not guaranteed.'), - '#default_value' => intval(variable_get('cronplus_preferred_wkdy', 0)), - '#options' => _cronplus_int_options(0, 6, array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'), TRUE), - ); - $form['cronplus_submit'] = array( - '#type' => 'submit', - '#value' => t('Save settings'), - ); - return $form; -} /** * Returns an array of the time periods supported by the module. This can @@ -146,41 +105,6 @@ function cronplus_logview_form_submit($f drupal_goto('admin/logs/watchdog'); } -/** - * Shows a page listing all the places that implement each of the cronplus - * hooks. - */ -function cronplus_settings_status() { - $html = '
'. t('This section lists modules implementing the cronplus hook for each available time period. The listing is purely informational; there are no settings to change here.'); - $html .= '
' . drupal_get_form('cronplus_logview_form'); - $periods =& cronplus_periods(); - // Add one special case. - $periods['cronplus'] = 'cronplus '. t('(multiplex hook)'); - foreach ($periods as $period => $period_t) { - $html .= '
'. t('Hook: {module}_%hook()', array('%hook' => $hook)) .'
'. t('Implemented by: '); - $modules = module_implements($hook); - if (count($modules) > 0) { - $group .= ''. implode(', ', $modules) .''; - } - else { - $group .= t('None'); - } - $group .= '
'. t('Last invoked: '); - if ($period == 'cronplus') { - $group .= t('Invoked along with each of the above'); - } - else { - $last_invoked = intval(variable_get('cronplus_'. $period .'_last', 0)); - $group .= $last_invoked ? gmdate('Y-m-d H:i:s', $last_invoked) .' UTC' : t('Never'); - } - $html .= $group .'
'; - print theme("page", $html); -} /** * Implements hook_cron. Examines the current date and time, and makes the @@ -267,7 +191,7 @@ function cronplus_invoke_hook($period, $ watchdog('cronplus', t('Processing %period cron for %d UTC, calling {module}_%func() for all modules', array('%d' => $now_fmt, '%period' => t($period), '%func' => $function_name)), WATCHDOG_NOTICE); @module_invoke_all($function_name, $now, $last_cron, $last_this); @module_invoke_all('cronplus', $period, $now, $last_cron, $last_this); -} +} /** * Returns an associative array filled with integers pointing to themselves, or @@ -286,4 +210,4 @@ function _cronplus_int_options($min, $ma } return $options; } -?> +