',
+ '#prefix' => '
',
'#suffix' => '
',
);
- $form['simplenews_subscriptions_filter']['filter'] = array(
+
+ // Filter values are default
+ $form['filters']['newsletter'] = array(
'#type' => 'select',
- '#options' => $names,
- '#default_value' => $_SESSION['simplenews_subscriptions_filter'],
+ '#title' => $filters['newsletter']['title'],
+ '#options' => $filters['newsletter']['options'],
+ '#default_value' => $session['newsletter'],
+ );
+ $form['filters']['email'] = array(
+ '#type' => 'textfield',
+ '#title' => $filters['email']['title'],
+ '#default_value' => $session['email'],
);
- $form['simplenews_subscriptions_filter']['submit'] = array(
+ $form['filters']['submit'] = array(
'#type' => 'submit',
'#value' => t('Filter'),
+ '#prefix' => '
',
);
- $header = array(NULL, t('E-mail'), t('Username'), t('Status'), array('data' => t('Operations'), 'colspan' => '3'));
- $query = 'SELECT DISTINCT ss.*, u.name FROM {simplenews_subscriptions} ss INNER JOIN {users} u ON ss.uid = u.uid INNER JOIN {simplenews_snid_tid} s ON ss.snid = s.snid'. $queries[$_SESSION['simplenews_subscriptions_filter']].' ORDER BY ss.mail ASC';
- $count_query = 'SELECT COUNT(DISTINCT(ss.snid)) FROM {simplenews_subscriptions} ss INNER JOIN {simplenews_snid_tid} s ON ss.snid = s.snid'. $queries[$_SESSION['simplenews_subscriptions_filter']];
- $result = pager_query($query, 15, 0, $count_query);
- if ($_GET['page']) {
- $i = (int) $_GET['page'] * 15;
+ // Add Reset button if filter is in use
+ if ($session != _simplenews_subscription_filter_default()) {
+ $form['filters']['reset'] = array(
+ '#type' => 'submit',
+ '#value' => t('Reset')
+ );
+ }
+
+ return $form;
+}
+
+/**
+ * Helper function: returns subscription filter default settings
+ */
+function _simplenews_subscription_filter_default() {
+ return array('newsletter' => 'all', 'email' => '');
+}
+
+function simplenews_subscription_filter_form_submit($form_id, $form_values) {
+ switch ($form_values['op']) {
+ case t('Filter'):
+ $_SESSION['simplenews_subscriptions_filter'] = array(
+ 'newsletter' => $form_values['newsletter'],
+ 'email' => $form_values['email'],
+ );
+ break;
+ case t('Reset'):
+ $_SESSION['simplenews_subscriptions_filter'] = _simplenews_subscription_filter_default();
+ break;
}
+}
+
+/**
+ * Menu callback: subscription administration.
+ */
+function simplenews_admin_list() {
+ drupal_add_css(drupal_get_path('module', 'simplenews') .'/simplenews.css', 'module', 'all', FALSE);
+
+ // Deleting subscriptions requires delete confirmation. This is handled with a different form
+ if ($_POST['operation'] == 'delete' && $_POST['snids']) {
+ if ($_REQUEST['destination']) {
+ $destination = drupal_get_destination();
+ unset($_REQUEST['destination']);
+ }
+ $_SESSION['simplenews_subscriptions_delete'] = $_POST['snids'];
+ // Note: we redirect from admin/content/newsletters/users to admin/content/newsletters/subscriptions/delete to make the tabs disappear.
+ drupal_goto("admin/content/newsletters/subscriptions/delete", $destination);
+ }
+
+ // Call the filter form first, to allow for the form_values array to be populated.
+ $output = drupal_get_form('simplenews_subscription_filter_form');
+ $output .= drupal_get_form('simplenews_admin_list_form');
+
+ return $output;
+}
+
+function simplenews_admin_list_form() {
+ global $form_values;
+
+ $filter = simplenews_build_subscription_filter_query();
+ $query = 'SELECT DISTINCT ss.*, u.name FROM {simplenews_subscriptions} ss INNER JOIN {users} u ON ss.uid = u.uid INNER JOIN {simplenews_snid_tid} s ON ss.snid = s.snid'. $filter['where'].' ORDER BY ss.mail ASC';
+ $result = pager_query($query, 30, 0, NULL);
+
+ $form['options'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Update options'),
+ '#prefix' => '
',
+ '#suffix' => '
',
+ );
+ $form['options']['operation'] = array(
+ '#type' => 'select',
+ '#options' => array (
+ 'activate' => 'Activate',
+ 'inactivate' => 'Inactivate',
+ 'delete' => 'Delete',
+ ),
+ '#default_value' => 'activate');
+ $form['options']['submit'] = array(
+ '#type' => 'submit',
+ '#value' => t('Update')
+ );
+
+ $destination = drupal_get_destination();
while ($subs = db_fetch_object($result)) {
- $key_table = TRUE;
- $i++;
- if ($subs->uid == 0) {
- $subs->name = t('Unregistered user');
- }
- if ($subs->a_status == 0) {
- $activate = l(t('activate'), 'admin/content/newsletters/users/activate/'. $subs->snid);
- }
- elseif ($subs->a_status == 1) {
- $activate = l(t('inactivate'), 'admin/content/newsletters/users/inactivate/'. $subs->snid);
+ $snids[$subs->snid] = '';
+ $form['mail'][$subs->snid] = array('#value' => $subs->mail);
+ $form['name'][$subs->snid] = array('#value' => $subs->uid ? l($subs->name, 'user/'. $subs->uid) : $subs->name);
+ $form['status'][$subs->snid] = array('#value' => theme('simplenews_status', $subs->a_status, 'activated'));
+ $form['operations'][$subs->snid] = array('#value' => l(t('edit'), 'admin/content/newsletters/users/edit/'. $subs->snid, array(), drupal_get_destination()));
+ }
+ $form['snids'] = array('#type' => 'checkboxes', '#options' => $snids);
+ $form['pager'] = array('#value' => theme('pager', NULL, 30, 0));
+ return $form;
+}
+
+function simplenews_admin_list_form_validate($form_id, $form_values) {
+ if (isset($form_values['operation'])) {
+ $snids = array_filter($form_values['snids']);
+ if (empty($snids)) {
+ form_set_error('', t('No items selected.'));
}
- $rows[] = array($i, $subs->mail, ($subs->uid ? l($subs->name, 'user/'. $subs->uid) : $subs->name), theme('simplenews_status', $subs->a_status, 'published'), l(t('edit'), 'admin/content/newsletters/users/edit/'. $subs->snid, array(), drupal_get_destination()),l(t('delete'), 'admin/content/newsletters/users/delete/'. $subs->snid), $activate);
}
- if ($pager = theme('pager', NULL, 15, 0)) {
- $rows[] = array(array('data' => $pager, 'colspan' => '7'));
+}
+
+/**
+ * Submit the subscription administration update form.
+ */
+function simplenews_admin_list_form_submit($form_id, $form_values) {
+ if (isset($form_values['operation'])) {
+ $snids = array_filter($form_values['snids']);
+ $args = array($snids);
+ switch ($form_values['operation']) {
+ case 'activate':
+ call_user_func_array('simplenews_activate_subscription', $args);
+ drupal_set_message(t('The update has been performed.'));
+ break;
+ case 'inactivate':
+ call_user_func_array('simplenews_inactivate_subscription', $args);
+ drupal_set_message(t('The update has been performed.'));
+ break;
+ }
}
- if (!$rows) {
- $rows[] = array(array('data' => t('No subscriptions available.'), 'colspan' => '7'));
+}
+
+/**
+ * Theme subscription administration overview.
+ */
+function theme_simplenews_admin_list_form($form) {
+ // Overview table:
+ $header = array(theme('table_select_header_cell'), t('E-mail'), t('Username'), t('Status'), t('Operations'));
+
+ $output .= drupal_render($form['options']);
+ if (isset($form['mail']) && is_array($form['mail'])) {
+ foreach (element_children($form['mail']) as $key) {
+ $row = array();
+ $row[] = drupal_render($form['snids'][$key]);
+ $row[] = drupal_render($form['mail'][$key]);
+ $row[] = drupal_render($form['name'][$key]);
+ $row[] = drupal_render($form['status'][$key]);
+ $row[] = drupal_render($form['operations'][$key]);
+ $rows[] = $row;
+ }
+ }
+ else {
+ $rows[] = array(array('data' => t('No subscriptions available.'), 'colspan' => '4'));
+ }
+
+ $output .= theme('table', $header, $rows);
+ if ($form['pager']['#value']) {
+ $output .= drupal_render($form['pager']);
}
- $table = theme('table', $header, $rows);
- if ($key_table) {
- $key_header = array(array('data' => t('Table key'), 'colspan' => '2'));
- $key_rows[] = array(theme('simplenews_status', 0, 'published'), t('Inactive/No newsletters will be sent'));
- $key_rows[] = array(theme('simplenews_status', 1, 'published'), t('Active/User will receive newsletters'));
- $table .= theme('table', $key_header, $key_rows);
+
+ $output .= drupal_render($form);
+
+ return $output;
+}
+
+/**
+ * Delete multiple subscriptions
+ */
+function simplenews_subscription_multiple_delete_confirm() {
+ // Subscriptions to be deleted are passed via session var.
+ $snids = $_SESSION['simplenews_subscriptions_delete'];
+
+ $form['snids'] = array('#prefix' => '
', '#tree' => TRUE);
+ // array_filter returns only elements with TRUE values
+ foreach (array_filter($snids) as $snid => $value) {
+ $mail = db_result(db_query('SELECT mail FROM {simplenews_subscriptions} WHERE snid = %d', $snid));
+ $form['snids'][$snid] = array(
+ '#type' => 'hidden',
+ '#value' => $snid,
+ '#prefix' => '
',
+ '#suffix' => check_plain($mail) ."\n"
+ );
}
- $form['table'] = array('#value' => $table);
- return $form;
+ $form['operation'] = array('#type' => 'hidden', '#value' => 'delete');
+
+ return confirm_form($form,
+ t('Are you sure you want to delete these subscriptions?'),
+ 'admin/content/newsletters/users', t('This action cannot be undone.'),
+ t('Delete all'), t('Cancel'));
}
-function simplenews_admin_list_submit($form_id, $form_values) {
- simplenews_set_filter('simplenews_subscriptions_filter', $form_values);
+function simplenews_subscription_multiple_delete_confirm_submit($form_id, $form_values) {
+ if ($form_values['confirm']) {
+ foreach ($form_values['snids'] as $snid => $value) {
+ simplenews_delete_subscription($snid);
+ }
+ drupal_set_message(t('The subscriptions have been deleted.'));
+ }
+
+ // Route the user back to the subscription admin form
+ return 'admin/content/newsletters/users';
}
function simplenews_admin_list_add() {
Index: simplenews.css
===================================================================
RCS file: simplenews.css
diff -N simplenews.css
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ simplenews.css 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,19 @@
+.simplenews-subscription-filter .form-item {
+ clear: both;
+ line-height:1.75em;
+ margin:0pt 1em 0pt 0pt;
+}
+
+.simplenews-subscription-filter .form-item label {
+ float: left;
+ width: 12em;
+}
+
+.simplenews-subscription-filter .spacer {
+ margin-left: 12em;
+}
+
+.simplenews-subscription-filter .form-select, .simplenews-subscription-filter .form-text {
+ width: 14em;
+}
+
';
+ $output = '