--- simplenews.module	2007-03-27 23:57:57.000000000 -0400
+++ simplenews.module.orig	2007-02-20 12:14:28.000000000 -0500
@@ -1412,11 +1412,6 @@
   if ($op == t('Filter') && isset($form_values['filter'])) {
     $_SESSION[$type] = $form_values['filter'];
   }
-  if ($op == t('Filter') && isset($form_values['simplenews_email'])) {
-    $_SESSION['simplenews_email'] = $form_values['simplenews_email'];
-  } else {
-    $_SESSION['simplenews_email'] = NULL;
-  }
 }
 
 function simplenews_get_filter($type, $na = TRUE) {
@@ -1430,12 +1425,6 @@
     $names[$newsletter->tid] = $newsletter->name;
     $queries[$newsletter->tid] = ' AND s.tid = '. $newsletter->tid;
   }
-  
-  $queries['simplenews_email'] = '';
-  if (!empty($_SESSION['simplenews_email'])) {
-    $queries['simplenews_email'] = ' AND ss.mail LIKE "%%'.db_escape_string($_SESSION['simplenews_email']).'%%" ';
-  }
-
   return array($names, $queries);
 }
 
@@ -1527,36 +1516,23 @@
   list($names, $queries) = array_values(simplenews_get_filter('simplenews_subscriptions_filter', FALSE));
   $form['simplenews_subscriptions_filter'] = array(
     '#type' => 'fieldset',
-#    '#title' => t('Show subscriptions to'),
-    '#title' => t('Filter susbriptions'),
+    '#title' => t('Show subscriptions to'),
     '#collapsible' => FALSE,
     '#prefix' => '<div class="container-inline">',
     '#suffix' => '</div>',
   );
   $form['simplenews_subscriptions_filter']['filter'] = array(
     '#type' => 'select',
-    '#title' => t('Show subscriptions to'),
     '#options' => $names,
     '#default_value' => $_SESSION['simplenews_subscriptions_filter'],
-    '#suffix' => '<br />',
-  );
-  $form['simplenews_subscriptions_filter']['simplenews_email'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Show emails like'),
-    '#default_value' => $_SESSION['simplenews_email'],
-    '#size' => 40,
-    '#suffix' => '<br />',
   );
   $form['simplenews_subscriptions_filter']['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Filter'),
   );
   $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';
-  $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']].' '.$queries['simplenews_email'].'  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']];
-  $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']] .' '.$queries['simplenews_email'];
-
+  $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;
@@ -2388,4 +2364,4 @@
 
   $mail->body .= $footer;
   return $mail;
-}
+}
\ No newline at end of file