diff -u b/webform_clear.info b/webform_clear.info --- b/webform_clear.info +++ b/webform_clear.info @@ -1,6 +1,7 @@ name = Webform Clear -description = Clears Webforms from the database after a specified period. +description = Clears specific Webforms from the database after a specified period (or immediately upon submission). core = 7.x +version = 7.x-1.2 package = Webform dependencies[] = webform files[] = webform_clear.test diff -u b/webform_clear.install b/webform_clear.install --- b/webform_clear.install +++ b/webform_clear.install @@ -51,0 +52,7 @@ +/** + * Change the default value to "delete immediately" for people upgrading from + * version 1.1 in order to maintain backwards compatibility. + */ +function webform_clear_update_7102() { + variable_set('webform_clear_default_time', WEBFORM_CLEAR_DELETE_IMMEDIATELY); +} diff -u b/webform_clear.module b/webform_clear.module --- b/webform_clear.module +++ b/webform_clear.module @@ -14,6 +14,7 @@ * dropdown. */ define('WEBFORM_CLEAR_DO_NOT_DELETE', -1); +define('WEBFORM_CLEAR_DELETE_IMMEDIATELY', 0); /** * Implements hook_permission(). @@ -123,7 +124,10 @@ $is_new = $form_state['values']['details']['is_new']; $nid = $form_state['values']['details']['nid']; - $clear = db_query("SELECT COUNT(nid) FROM {webform_clear} WHERE nid = :nid AND clear_time = 0", array(':nid' => $nid))->fetchField(); + $clear = db_query("SELECT COUNT(nid) FROM {webform_clear} WHERE nid = :nid AND clear_time = :delete_immediately", array( + ':nid' => $nid, + ':delete_immediately' => WEBFORM_CLEAR_DELETE_IMMEDIATELY, + ))->fetchField(); if ($sid && $is_new && $clear) { _webform_clear_delete($nid, $sid); } @@ -189,9 +193,9 @@ function _webform_clear_get_clear_time_options() { return array( - WEBFORM_CLEAR_DO_NOT_DELETE => t('Do not delete submissions'), - 0 => t('Delete submissions immediately'), - 1*24*60*60 => t('Delete submissions after 1 day'), - 7*24*60*60 => t('Delete submissions after @count days', array('@count' => 7)), - 30*24*60*60 => t('Delete submissions after @count days', array('@count' => 30)), + WEBFORM_CLEAR_DO_NOT_DELETE => t('Do not delete submissions'), + WEBFORM_CLEAR_DELETE_IMMEDIATELY => t('Delete submissions immediately'), + 1*24*60*60 => t('Delete submissions after 1 day'), + 7*24*60*60 => t('Delete submissions after @count days', array('@count' => 7)), + 30*24*60*60 => t('Delete submissions after @count days', array('@count' => 30)), ); }