database editing etc. works

diff --git a/mason/main b/mason/main
index 03a01d90615c7725fa88fc775010585e3b905aa6..a9bc72e20621da1a183218ecba490259ef544095 100755 (executable)
--- a/mason/main
+++ b/mason/main
@@ -54,8 +54,13 @@ $sth->execute();
 
 <&| txtable, tx => $row &>
 %    $sthi->execute($row->{'textid'});
 
 <&| txtable, tx => $row &>
 %    $sthi->execute($row->{'textid'});

+%    my $anyused = 0;

 %    while (my $rowi= $sthi->fetchrow_hashref()) {
 <tr><td>Used for:</td><td><% $rowi->{'emailaddr'} |h %></td></tr>
 %    while (my $rowi= $sthi->fetchrow_hashref()) {
 <tr><td>Used for:</td><td><% $rowi->{'emailaddr'} |h %></td></tr>

+%        $anyused++;
+%    }
+%    if ($anyused) {
+<tr><td colspan=2>Not currently in use</td></tr>

 %    }
 </&>
 <pre>
 %    }
 </&>
 <pre>

diff --git a/mason/save b/mason/save
index cedd05b28e87d389583cddfccb492fa5a520f343..c749084c757cb10928d2f7e25c804135f1c44703 100755 (executable)
--- a/mason/save
+++ b/mason/save
@@ -48,12 +48,15 @@ $dinsertq->execute($textid, $desc, $subject, $text);
 my $tdeleteq = $dbh->prepare("DELETE FROM addresses WHERE textid = ?");
 $tdeleteq->execute($textid);
 
 my $tdeleteq = $dbh->prepare("DELETE FROM addresses WHERE textid = ?");
 $tdeleteq->execute($textid);
 

+my $odeleteq = $dbh->prepare("DELETE FROM addresses WHERE emailaddr = ?");
+

 my $tinsertq = $dbh->prepare("INSERT INTO addresses (emailaddr, textid)".
                             " VALUES (?,?)");
 my $tlistq = $dbh->prepare("SELECT * FROM config");
 $tlistq->execute();
 while (my $row = $tlistq->fetchrow_hashref()) {
     if ($ARGS{"u_".hquote($row->{'emailaddr'})}) {
 my $tinsertq = $dbh->prepare("INSERT INTO addresses (emailaddr, textid)".
                             " VALUES (?,?)");
 my $tlistq = $dbh->prepare("SELECT * FROM config");
 $tlistq->execute();
 while (my $row = $tlistq->fetchrow_hashref()) {
     if ($ARGS{"u_".hquote($row->{'emailaddr'})}) {

+       $odeleteq->execute($row->{'emailaddr'});

        $tinsertq->execute($row->{'emailaddr'}, $textid);
     }
 }
        $tinsertq->execute($row->{'emailaddr'}, $textid);
     }
 }