remove autoexpiry

[nj-awaymsg.git] / mason / main

diff --git a/mason/main b/mason/main
index 11dba6bc637c571f84d0f7b54e070f0b96fe02c5..ac49c50ccbfa35592dd2fa359a02eceff88a63f1 100755 (executable)
--- a/mason/main
+++ b/mason/main
@@ -12,8 +12,8 @@ my ($sth,$row,$sthi,$rowi);
 <%perl>
 $sth = $dbh->prepare(<<END);
     SELECT *
-     FROM        addresses
-       LEFT JOIN config    USING (emailaddr)
+     FROM        config
+       LEFT JOIN addresses USING (emailaddr)
        LEFT JOIN texts     USING (textid)
      ORDER BY emailaddr
 END
@@ -24,20 +24,12 @@ $sth->execute();
 <td>Address</td>
 <td>Status</td>
 <td>Which message?</td>
-<td>Expiry date</td>
 </tr><tr>
 % while (my $row= $sth->fetchrow_hashref()) {
 <tr>
 <td><% $row->{'emailaddr'} |h %></td>
 %     if (defined $row->{'textid'}) {
-%         my $expires = expires2timet($row->{'expires'});
-%        if (defined($expires) && $expires < time) {
-<td>expired</td>
-%         } else {
-<td>active</td>
-%         }
 <td><% $row->{'desc'} |h %></td>
-<td><% expirestime2show($expires) |h %></td>
 %     } else {
 <td>inactive</td>
 <td></td>