add some hrs

[nj-awaymsg.git] / mason / main

diff --git a/mason/main b/mason/main
index b70a3de9e395e86c22e5ea54411cff70dbedd72a..4e98c172f9cb21c85203777e0a4722f701a42a64 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>
@@ -47,6 +39,7 @@ $sth->execute();
 % }
 </table>
 
+<hr>
 <h2>Outbound messages</h2>
 <%perl>
 $sth = $dbh->prepare("SELECT * FROM texts ORDER BY desc");
@@ -61,18 +54,19 @@ $sth->execute();
 <form action="edit" method="get">
 <h3>Message "<% $row->{'desc'} |h %>"</h3>
 
-<& txtable, tx => $row &>
-%#    $sthi->execute($row->{'textid'});
-% #   while (my $rowi= $sthi->fetchrow_hashref()) {
-%#<tr><td>Used for:</td><td><% $rowi->{'emailaddr'} |h %></td></tr>
-%#    }
-%#</&>
+<&| txtable, tx => $row &>
+%    $sthi->execute($row->{'textid'});
+%    while (my $rowi= $sthi->fetchrow_hashref()) {
+<tr><td>Used for:</td><td><% $rowi->{'emailaddr'} |h %></td></tr>
+%    }
+</&>
 <pre>
 <% $row->{'text'} |h %>
 </pre>
 
 <input type="submit" name="t<% $row->{'textid'} %>"
    value="Edit or configure this message">
+<hr>
 % }
 <h3>Add new message</h3>
 <input type="submit" name="create"