diff --git a/modules/job_scheduler_trigger/job_scheduler_trigger.admin.inc b/modules/job_scheduler_trigger/job_scheduler_trigger.admin.inc index 584f662..24ad95e 100644 --- a/modules/job_scheduler_trigger/job_scheduler_trigger.admin.inc +++ b/modules/job_scheduler_trigger/job_scheduler_trigger.admin.inc @@ -2,7 +2,11 @@ /** * @file - * Job Scheduler Trigger admin pages + * Job Scheduler Trigger admin pages. + */ + +/** + * Admin Overview. */ function job_scheduler_trigger_admin_overview() { $base_path = 'admin/config/system/job_scheduler'; @@ -52,13 +56,18 @@ function job_scheduler_trigger_admin_overview() { return $form; } - /** - * Edit form for a trigger + * Edit form for a trigger. */ function job_scheduler_trigger_edit_form($form, &$form_state, $trigger) { if (!$trigger) { - $trigger = (object)array('trid' => NULL, 'title' => t('New trigger'), 'crontab' => '* * * * *', 'status' => 0, 'last' => 0); + $trigger = (object) array( + 'trid' => NULL, + 'title' => t('New trigger'), + 'crontab' => '* * * * *', + 'status' => 0, + 'last' => 0, + ); } $form['trigger'] = array('#tree' => TRUE); $form['trigger']['trid'] = array('#type' => 'value', '#value' => $trigger->trid); @@ -84,16 +93,16 @@ function job_scheduler_trigger_edit_form($form, &$form_state, $trigger) { '#description' => t('When enabled, a trigger will be created with this crontab and jobs will be scheduled for it. Check everything is OK before enabling the trigger.'), ); $form['trigger']['last'] = array( - '#type' => 'item', - '#title' => t('Last triggered'), - '#markup' => format_date($trigger->last), + '#type' => 'item', + '#title' => t('Last triggered'), + '#markup' => format_date($trigger->last), ); if ($trigger->trid && $trigger->crontab) { $next = job_scheduler_trigger_next_time($trigger->crontab); $form['trigger']['next'] = array( - '#type' => 'item', - '#title' => t('Next trigger'), - '#markup' => $next ? format_date($next) : t('Never in the next year.'), + '#type' => 'item', + '#title' => t('Next trigger'), + '#markup' => $next ? format_date($next) : t('Never in the next year.'), ); } $form['buttons']['update'] = array('#type' => 'submit', '#value' => t('Save')); @@ -106,7 +115,7 @@ function job_scheduler_trigger_edit_form($form, &$form_state, $trigger) { } /** - * Validate trigger + * Validate trigger. */ function job_scheduler_trigger_edit_form_validate($form, &$form_state) { $trigger = $form_state['values']['trigger']; @@ -118,14 +127,14 @@ function job_scheduler_trigger_edit_form_validate($form, &$form_state) { } /** - * Submit trigger + * Submit trigger. */ function job_scheduler_trigger_edit_form_submit($form, &$form_state) { $op = isset($form_state['values']['op']) ? $form_state['values']['op'] : ''; $trigger = $form_state['values']['trigger']; if ($op == t('Save')) { if (empty($trigger['trid'])) { - // Create and then assign trigger name and create trigger + // Create and then assign trigger name and create trigger. drupal_write_record('job_scheduler_trigger', $trigger); $trigger['hook'] = 'job_scheduler_' . $trigger['trid']; drupal_write_record('job_scheduler_trigger', $trigger, 'trid'); @@ -149,7 +158,7 @@ function job_scheduler_trigger_edit_form_submit($form, &$form_state) { } /** - * Quick calculate next time cron + * Quick calculate next time cron. */ function job_scheduler_trigger_next_time($crontab) { $crontab = new JobSchedulerCronTab($crontab); diff --git a/modules/job_scheduler_trigger/job_scheduler_trigger.info b/modules/job_scheduler_trigger/job_scheduler_trigger.info index 5ba3e7e..15f9a17 100644 --- a/modules/job_scheduler_trigger/job_scheduler_trigger.info +++ b/modules/job_scheduler_trigger/job_scheduler_trigger.info @@ -1,6 +1,7 @@ name = Job Scheduler Trigger description = Creates scheduler triggers that fire up at certain days, times core = 7.x +# @codingStandardsIgnoreLine php = 5.2 dependencies[] = job_scheduler dependencies[] = trigger diff --git a/modules/job_scheduler_trigger/job_scheduler_trigger.install b/modules/job_scheduler_trigger/job_scheduler_trigger.install index 594b67f..fa43d5a 100644 --- a/modules/job_scheduler_trigger/job_scheduler_trigger.install +++ b/modules/job_scheduler_trigger/job_scheduler_trigger.install @@ -1,13 +1,18 @@ 'Schedule of triggers to be created.', 'fields' => array( - 'trid' => array( + 'trid' => array( 'description' => 'Primary Key: unique trigger id.', 'type' => 'serial', 'unsigned' => TRUE, diff --git a/modules/job_scheduler_trigger/job_scheduler_trigger.module b/modules/job_scheduler_trigger/job_scheduler_trigger.module index f969dc2..d2d217c 100644 --- a/modules/job_scheduler_trigger/job_scheduler_trigger.module +++ b/modules/job_scheduler_trigger/job_scheduler_trigger.module @@ -2,7 +2,7 @@ /** * @file - * job scheduler module. + * Job scheduler module. */ /** @@ -11,10 +11,12 @@ function job_scheduler_trigger_help($path, $arg) { switch ($path) { case 'admin/structure/trigger/job_scheduler': - // The first line is the very same text trigger module provides. Do not edit. + // The first line is the very same text trigger module provides. Do not + // edit. $output = '

' . t('Triggers are events on your site, such as new content being added or a user logging in. The Trigger module associates these triggers with actions (functional tasks), such as unpublishing content containing certain keywords or e-mailing an administrator. The Actions settings page contains a list of existing actions and provides the ability to create and configure advanced actions (actions requiring configuration, such as an e-mail address or a list of banned words).', array('@url' => url('admin/config/system/actions'))) . '

'; $output .= '

' . t('Below you can assign actions to run on a periodic basis. To create more triggers of this type use the Job Scheduler configuration page.', array('@url' => url('admin/config/system/job_scheduler'))) . '

'; return $output; + case 'admin/config/system/job_scheduler': $output = '

' . t('You can create any number of jobs that are triggered depending on a crontab.') . '

'; $output .= '

' . t('To set actions for these triggers, go to the Job Scheduler Triggers page.', array('@url' => url('admin/structure/trigger/job_scheduler'))) . '

'; @@ -23,7 +25,7 @@ function job_scheduler_trigger_help($path, $arg) { } /** - * Implementation of hook_menu() + * Implements hook_menu(). */ function job_scheduler_trigger_menu() { $items['admin/config/system/job_scheduler'] = array( @@ -53,7 +55,7 @@ function job_scheduler_trigger_menu() { } /** - * Implementation of hook_trigger_info(). + * Implements hook_trigger_info(). */ function job_scheduler_trigger_trigger_info() { $triggers = array(); @@ -67,12 +69,17 @@ function job_scheduler_trigger_trigger_info() { } /** - * Implementation of hook_job_scheduler_info() + * Implements hook_job_scheduler_info(). */ function job_scheduler_trigger_cron_job_scheduler_info() { foreach (job_scheduler_trigger_list() as $trigger) { if ($trigger->status) { - $jobs[$trigger->trid] = array('id' => $trigger->trid, 'type' => $trigger->hook, 'crontab' => $trigger->crontab, 'periodic' => TRUE); + $jobs[$trigger->trid] = array( + 'id' => $trigger->trid, + 'type' => $trigger->hook, + 'crontab' => $trigger->crontab, + 'periodic' => TRUE, + ); } } if (!empty($jobs)) { @@ -85,7 +92,7 @@ function job_scheduler_trigger_cron_job_scheduler_info() { } /** - * Get job list for job scheduler + * Get job list for job scheduler. */ function job_scheduler_trigger_list() { return db_select('job_scheduler_trigger', 't') @@ -95,10 +102,10 @@ function job_scheduler_trigger_list() { } /** - * Fire up a scheduled trigger + * Fire up a scheduled trigger. */ function job_scheduler_trigger_worker($job) { - // Mark last time triggered for the records + // Mark last time triggered for the records. db_update('job_scheduler_trigger') ->fields(array('last' => REQUEST_TIME)) ->condition('trid', $job['id']) @@ -109,14 +116,14 @@ function job_scheduler_trigger_worker($job) { 'hook' => $job['type'], 'job' => $job, ); - // Scheduler's object is the job from job_scheduler - $object = (object)$job; + // Scheduler's object is the job from job_scheduler. + $object = (object) $job; actions_do(array_keys($aids), $object, $context); } } /** - * Menu loader + * Menu loader. */ function job_scheduler_trigger_load($trid) { return db_select('job_scheduler_trigger', 't')