Commit b8badecc authored by Joep Bär's avatar Joep Bär Committed by Jeroen Tubex
Browse files

Issue #3200130 by PROMES, JeroenT: suppress message nothing purged

parent 1e8950ca

webform_purge.install

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ function webform_purge_uninstall() { 
  variable_del('webform_purge_days_to_retain');

  variable_del('webform_purge_checkbox_state');

  variable_del('webform_purge_cron_limit');

  variable_del('webform_purge_not_found_message');



  // Inform the user of the removal.

  $t = get_t();

webform_purge.module

+9 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ function webform_purge_cron() { 
        }

        watchdog('webform_purge', 'Purged %total webform submissions.', array('%total' => $deleted));

      }

      else {

      elseif (variable_get('webform_purge_not_found_message', TRUE)) {

        watchdog('webform_purge', 'No eligible webform submissions found to purge.', array());

      }

    }
@@ -176,6 +176,13 @@ function webform_purge_admin_settings_form($form, &$form_state) { 
    '#default_value' => variable_get('webform_purge_run_once'),

  );



  $form['webform_purge_not_found_message'] = array(

    '#title' => t('Log a message when no submissions are purged'),

    '#description' => t('Enable message no submissions to purge found.'),

    '#type' => 'checkbox',

    '#default_value' => variable_get('webform_purge_not_found_message', TRUE),

  );



  $form['webform_purge_all_submissions'] = array(

    '#title' => t('Purge all submissions'),

    '#description' => t('When enabled, all web form submissions will be purged. When disabled, only selected forms below will be purged.'),
@@ -282,6 +289,7 @@ function webform_purge_admin_settings_form_submit($form, &$form_state) { 
  variable_set('webform_purge_days_to_retain', $form_state['values']['webform_purge_days_to_retain']);

  variable_set('webform_purge_all_submissions', $form_state['values']['webform_purge_all_submissions']);

  variable_set('webform_purge_cron_limit', $form_state['values']['webform_purge_cron_limit']);

  variable_set('webform_purge_not_found_message', $form_state['values']['webform_purge_not_found_message']);



  $webforms_to_be_purged = array_diff($form_state['values']['form_list'], [0]);

  variable_set('webform_purge_checkbox_state', $webforms_to_be_purged);