wip

[nj-awaymsg.git] / mason / main
diff --git a/mason/main b/mason/main

index ec7c6536abc0158f524c84bcae49484c4778b5fd..5997c3af035faf164ad6dc953b3a72ce68143101 100755 (executable)
--- a/mason/main
+++ b/mason/main
@@ -6,39 +6,44 @@ db_connect();
  <title>Email "out of office" setup</title>
  </head><body>
  <h1>Email "out of office" setup</h1>
-<h2>Our email addresses</h2>
+<h2>Email addresses and their configuration</h2>
  
  
  <%perl>
  my %row;
  my $sth = $dbh->prepare(<<END);
-    SELECT emailaddr, textid, expires
-     FROM        config
-       LEFT JOIN addresses USING (emailaddr)
+    SELECT *
+     FROM        addresses
+       LEFT JOIN config    USING (emailaddr)
         LEFT JOIN texts     USING (textid)
       ORDER BY emailaddr
  END
  </%perl>
  
-<table>
+<table rules="all">
  <tr>
  <td>Address</td>
-<td>O-o-o status</td>
+<td>Status</td>
  <td>Which message?</td>
  <td>Expiry date</td>
  </tr><tr>
+% $sth->execute();
  % while (my $row= $sth->fetchrow_hashref()) {
  <tr>
  <td><% $row->{'emailaddr'} |h %></td>
  %     if (defined $row->{'textid'}) {
-%         my $expiry = expires2timet($row->{'expires'});
-%        if ($expiry > time) {
-<td>active</td>
-%         } else {
+%         my $expires = expires2timet($row->{'expires'});
+%        if (defined($expires) && $expires < time) {
  <td>expired</td>
+%         } else {
+<td>active</td>
  %         }
-<td><% $row->{'textid'} |h %></td>
+<td><% $row->{'name'} |h %></td>
+%         if (defined $expires) {
  <td><% $row->{'expires'} |h %></td>
+%         } else {
+<td>never</td>
+%         }
  %     } else {
  <td>inactive</td>
  <td></td>