Changeset 426 for trunk

Timestamp:

07/08/10 13:16:24 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweak mailNotify call on SWIP-is-on
Note "special" notification option for SWIP-is-on
Fix add-special-notice so that the special flag content gets inserted
Complain if any of reciplist, section, and target/alloctype are missing while

adding a new notification

Fix mailNotify to actually iterate over all of the combinations it's supposed

to instead of just looking up the passed action code

Closes #21

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (1 diff)
• admin.cgi (modified) (3 diffs)
• main.cgi (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -847 +847 @@
   my @reciplist;
   foreach (@actionsets) {
-    $sth->execute($action);
+    $sth->execute($_);
 ##fixme - need to handle db errors
     my ($recipsub) = $sth->fetchrow_array;

trunk/cgi-bin/admin.cgi

@@ -534 +534 @@
         qq(<td><a href="admin.cgi?action=delnotice&code=$notice_code">Delete</a></tr>\n);
   }
-  print "</table>\n";
+  print qq(<tr><td colspan=2>Known "special" codes:<br>
+<ul style="margin-top: 0px; margin-bottom: 0px;">
+        <li>swi: Notify if block being updated has SWIP flag set</li>
+</ul></td></tr>
+</table>
+);
 
 # add new entries from this tangle:
@@ -581 +586 @@
 
 } elsif ($webvar{action} eq 'addnotice') {
-  $webvar{reciplist} =~ s/[\r\n]+/,/g;
-  print "Adding notice to $webvar{reciplist} for ".dispNoticeCode($webvar{msgaction}.$webvar{alloctype}).":\n";
-  $sth = $ip_dbh->prepare("INSERT INTO notify (action, reciplist) VALUES (?,?)");
+  $webvar{alloctype} = $webvar{special} if $webvar{msgaction} eq 's:';
+  if ($webvar{msgaction} && $webvar{alloctype} && $webvar{reciplist}) {
+    $webvar{reciplist} =~ s/[\r\n]+/,/g;
+    print "Adding notice to $webvar{reciplist} for ".dispNoticeCode($webvar{msgaction}.$webvar{alloctype}).":\n";
+    $sth = $ip_dbh->prepare("INSERT INTO notify (action, reciplist) VALUES (?,?)");
 ##fixme:  automagically merge reciplists iff action already exists
-  $webvar{msgaction} = "f:$webvar{msgaction}" if $webvar{onfail};
-  $sth->execute($webvar{msgaction}.$webvar{alloctype}, $webvar{reciplist});
-  if ($sth->err) {
-    print "Failed:  DB error: ".$sth->errstr."\n";
+    $webvar{msgaction} = "f:$webvar{msgaction}" if $webvar{onfail};
+    $sth->execute($webvar{msgaction}.$webvar{alloctype}, $webvar{reciplist});
+    if ($sth->err) {
+      print "Failed:  DB error: ".$sth->errstr."\n";
+    } else {
+      print "OK!<br>\n"
+    }
   } else {
-    print "OK!<br>\n"
+    print "Need to specify at least one recipient, an action, and an allocation type. ".
+        qq{("Special" content is considered an allocation type).  Hit the Back button and try again.<br>\n};
   }
   print qq(<a href="admin.cgi?action=emailnotice">Back to email notice list</a>\n);
@@ -784 +795 @@
   my $code = shift;
   my $action_out = '';
-#    my $code = $notice_code;
+
+  if ($code =~ /^s:/) {
+    $code =~ s/^s:/Special: /;
+    return $code;
+  }
   if ($code =~ /^f:(.+)$/) {
     $code =~ s/^f://;

trunk/cgi-bin/main.cgi

@@ -1230 +1230 @@
 ##fixme:  need to wedge something in to allow "update:field" notifications
 ## hmm.  how to tell what changed?  O_o
-mailNotify($ip_dbh, 'ua', "SWIPed: $disp_alloctypes{$webvar{alloctype}} $webvar{block}",
+mailNotify($ip_dbh, 's:swi', "SWIPed: $disp_alloctypes{$webvar{alloctype}} $webvar{block}",
         "$webvar{block} had SWIP status changed to \"Yes\" by $authuser") if $webvar{swip} eq 'on';
   open (HTML, "../updated.html")