Index: system.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v retrieving revision 1.158 diff -u -r1.158 system.admin.inc --- system.admin.inc 19 Jun 2009 20:35:05 -0000 1.158 +++ system.admin.inc 27 Jun 2009 23:20:36 -0000 @@ -1241,6 +1241,14 @@ '#description' => t('Render all blocks on the default 404 (not found) page. Disabling blocks can help with performance but might leave users with a less functional site.'), '#default_value' => variable_get('site_404_blocks', 0) ); + $form['cron_safe_threshold'] = array( + '#type' => 'select', + '#title' => t('Automatically run cron'), + '#default_value' => variable_get('cron_safe_threshold', 10800), + '#options' => array(0 => t('Never')) + drupal_map_assoc(array(3600, 10800, 21600, 43200, 86400, 604800), 'format_interval'), + '#description' => t('When enabled, the site will check whether cron has been run in the configured interval and automatically run it upon the next page request. For more information visit the status report page.', array('@status-report-url' => url('admin/reports/status'))), + ); + $form['#validate'][] = 'system_site_information_settings_validate'; return system_settings_form($form); Index: system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.715 diff -u -r1.715 system.module --- system.module 23 Jun 2009 12:11:19 -0000 1.715 +++ system.module 27 Jun 2009 23:13:43 -0000 @@ -476,6 +476,13 @@ 'access callback' => TRUE, 'type' => MENU_CALLBACK, ); + $items['system/cron/%'] = array( + 'title' => 'Execute cron', + 'page callback' => 'system_execute_cron', + 'page arguments' => array(2), + 'access callback' => TRUE, + 'type' => MENU_CALLBACK, + ); $items['admin'] = array( 'title' => 'Administer', 'access arguments' => array('access administration pages'), @@ -2569,3 +2576,34 @@ } return $local; } + +/** + * Implement hook_footer(). + * + * Add a transparent 1x1 image in the closure of the page when the cron needs + * to run. + */ +function system_footer() { + if ($cron_treshold = variable_get('cron_safe_threshold', 10800)) { + $cron_last = variable_get('cron_last', NULL); + if (!isset($cron_last) || (REQUEST_TIME - $cron_last > $cron_treshold)) { + return ''; + } + } +} + +/** + * Menu callback; execute the cron via an image callback. + */ +function system_execute_cron($token) { + // Output a transparent 1x1 image to the browser. + drupal_set_header('Content-Type: image/gif'); + echo "\x47\x49\x46\x38\x39\x61\x1\x0\x1\x0\x80\xff\x0\xc0\xc0\xc0\x0\x0\x0\x21\xf9\x4\x1\x0\x0\x0\x0\x2c\x0\x0\x0\x0\x1\x0\x1\x0\x0\x2\x2\x44\x1\x0\x3b"; + + // Execute the cron if the token is valid or if user is anonymous + $cron_last = variable_get('cron_last', NULL); + if (drupal_valid_token($token, $cron_last, TRUE)) { + drupal_cron_run(); + } + exit; +}