Browse code

remove obsolete code

Bernd Wurst authored on12/02/2021 15:04:22
Showing1 changed files
... ...
@@ -25,9 +25,9 @@ function get_lists($filter)
25 25
     $result = null;
26 26
     if ($filter) {
27 27
         $filter = '%'.$filter.'%';
28
-        $result = db_query("SELECT id, created, status, listname, fqdn, urlhost, admin, archivesize, subscribers, lastactivity, backend FROM mail.v_mailman_lists WHERE owner=:uid AND (listname LIKE :filter OR fqdn LIKE :filter OR admin LIKE :filter) ORDER BY listname", array('uid' => $uid, 'filter' => $filter));
28
+        $result = db_query("SELECT id, created, status, listname, fqdn, urlhost, admin, archivesize, subscribers, lastactivity, backend FROM mail.v_mailman_lists WHERE status!='deleted' AND owner=:uid AND (listname LIKE :filter OR fqdn LIKE :filter OR admin LIKE :filter) ORDER BY listname", array('uid' => $uid, 'filter' => $filter));
29 29
     } else {
30
-        $result = db_query("SELECT id, created, status, listname, fqdn, urlhost, admin, archivesize, subscribers, lastactivity, backend FROM mail.v_mailman_lists WHERE owner=:uid ORDER BY listname", array('uid' => $uid));
30
+        $result = db_query("SELECT id, created, status, listname, fqdn, urlhost, admin, archivesize, subscribers, lastactivity, backend FROM mail.v_mailman_lists WHERE status!='deleted' AND owner=:uid ORDER BY listname", array('uid' => $uid));
31 31
     }
32 32
     $ret = array();
33 33
     while ($list = $result->fetch()) {
... ...
@@ -127,7 +127,7 @@ function insert_mailman_domain($subdomain, $domainid, $backend = 'mailman')
127 127
 function lists_on_domain($domainid)
128 128
 {
129 129
     DEBUG("lists_on_domain()");
130
-    $result = db_query("SELECT id, listname FROM mail.mailman_lists WHERE status != 'delete' AND maildomain=(SELECT id FROM mail.mailman_domains WHERE domain=?)", array($domainid));
130
+    $result = db_query("SELECT id, listname FROM mail.mailman_lists WHERE status != 'delete' AND status != 'deleted' AND maildomain=(SELECT id FROM mail.mailman_domains WHERE domain=?)", array($domainid));
131 131
     $ret = array();
132 132
     while ($l = $result->fetch()) {
133 133
         $ret[] = $l;