Changeset 1762 for trunk/gsdl/src/recpt/receptionist.cpp

Timestamp:

2000-12-07T18:18:21+13:00 (23 years ago)

Author:

sjboddie

Message:

Added support for the new LogEvents, EmailEvents, EmailUserEvents and
MailServer configuration options (though they haven't actually been
implemented yet).

File:

• trunk/gsdl/src/recpt/receptionist.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -56 +56 @@
   usecookies = false;
   logcgiargs = false;
+
+  maintainer.clear();
+  MailServer.clear();
+  LogEvents = Disabled;
+  EmailEvents = Disabled;
+  EmailUserEvents = false;
 
   // these default page parameters can always be overriden
@@ -206 +212 @@
     else if (key == "usecookies") configinfo.usecookies = (cfgline[0] == "true");
     else if (key == "logcgiargs") configinfo.logcgiargs = (cfgline[0] == "true");
+    else if (key == "maintainer") configinfo.maintainer = cfgline[0];
+    else if (key == "MailServer") configinfo.MailServer = cfgline[0];
+    else if (key == "LogEvents") {
+      if (cfgline[0] == "CollectorEvents") configinfo.LogEvents = CollectorEvents;
+      else if (cfgline[0] == "AllEvents") configinfo.LogEvents = AllEvents;
+    } 
+    else if (key == "EmailEvents") {
+      if (cfgline[0] == "CollectorEvents") configinfo.EmailEvents = CollectorEvents;
+      else if (cfgline[0] == "AllEvents") configinfo.EmailEvents = AllEvents;
+    } 
+    else if (key == "EmailUserEvents") configinfo.EmailUserEvents = (cfgline[0] == "true");
     else if (key == "pageparam") {
       if (cfgline.size() >= 2) configinfo.pageparams[cfgline[0]] = cfgline[1];
@@ -399 +416 @@
   }
 
+  // if maintainer email address is something dodgy (for now I'll define
+  // dodgy as being anything that doesn't contain '@') disable EmailEvents
+  // and EmailUserEvents
+  text_t::const_iterator maintainer_end = configinfo.maintainer.end ();
+  text_t::const_iterator maintainer_here = findchar (configinfo.maintainer.begin(),
+                             maintainer_end, '@');
+  if (maintainer_here == maintainer_end) {
+    configinfo.EmailEvents = Disabled;
+    configinfo.EmailUserEvents = Disabled;
+  } else {
+    // if MailServer isn't set it should default to mail.maintainer-domain
+    if (configinfo.MailServer.empty()) {
+      configinfo.MailServer = "mail." + substr (maintainer_here, maintainer_end);
+    }
+  }
+
   // init the actions
   actionptrmap::iterator actionhere = actions.begin ();