SYSTEM BAN LIST is an internal thing

The user should not have to step over it

include/i18n/en_US/help/tips/emails.banlist.yaml

@@ -13,35 +13,8 @@
 # must match the HTML #ids put into the page template.
 #
 ---
-ban_new_email:
-    title: Ban New Email
-    content: >
-
-banned_email_addresses:
+ban_list:
     title: Banned Email Addresses
     content: >
-        (Offer an intro to email address banning here.)
-
-query_search:
-    title: Query Search
-    content: >
-
-showing_:
-    title: Showing…
-    content: >
-
-email_address:
-    title: Email Address
-    content: >
-
-ban_status:
-    title: Ban Status
-    content: >
-
-date_added:
-    title: Date Added
-    content: >
-
-last_updated:
-    title: Last Updated
-    content: >
+        Emails received from banned email addresses listed in the ban list
+        will be automatically rejected.

include/staff/banlist.inc.php

@@ -46,7 +46,9 @@ $qstr.='&order='.($order=='DESC'?'ASC':'DESC');
 $query="$select $from $where ORDER BY $order_by LIMIT ".$pageNav->getStart().",".$pageNav->getLimit();
 //echo $query;
 ?>
-<h2>Banned Email Addresses</h2>
+<h2>Banned Email Addresses
+    <i class="help-tip icon-question-sign" href="#ban_list"></i>
+    </h2>
 <div style="width:600; float:left;padding-top:5px;">
     <form action="banlist.php" method="GET" name="filter">
      <input type="hidden" name="a" value="filter" >

include/staff/banrule.inc.php

@@ -24,7 +24,9 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
  <input type="hidden" name="do" value="<?php echo $action; ?>">
  <input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
  <input type="hidden" name="id" value="<?php echo $info['id']; ?>">
- <h2>Manage Email Ban List</h2>
+ <h2>Manage Email Ban Rule
+    <i class="help-tip icon-question-sign" href="#ban_list"></i>
+    </h2>
  <table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2">
     <thead>
         <tr>
@@ -35,12 +37,6 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
     </thead>
     <tbody>
-        <tr>
-            <td width="180" class="required">
-              Filter Name:
-            </td>
-            <td><?php echo $filter->getName(); ?></td>
-        </tr>
         <tr>
             <td width="180" class="required">
                 Ban Status:

include/staff/filters.inc.php

@@ -5,6 +5,7 @@ $qstr='';
 $sql='SELECT filter.*,count(rule.id) as rules '.
      'FROM '.FILTER_TABLE.' filter '.
      'LEFT JOIN '.FILTER_RULE_TABLE.' rule ON(rule.filter_id=filter.id) '.
+     "WHERE filter.`name` <> 'SYSTEM BAN LIST' ".
      'GROUP BY filter.id';
 $sortOptions=array('name'=>'filter.name','status'=>'filter.isactive','order'=>'filter.execorder','rules'=>'rules',
                    'target'=>'filter.target', 'created'=>'filter.created','updated'=>'filter.updated');

scp/banlist.php

@@ -123,7 +123,6 @@ $page='banlist.inc.php';
 $tip_namespace = 'emails.banlist';
 if(!$filter || ($rule || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))) {
     $page='banrule.inc.php';
-    $tip_namespace = 'emails.manage_banlist';
 }
 
 $nav->setTabActive('emails');