Changeset 852 for pykota/trunk/pykota

Timestamp:

03/16/03 00:01:28 (21 years ago)

Author:

jalet

Message:

New mailto option in configuration file added.
No time to test this tonight (although it should work).

Location:

pykota/trunk/pykota

Files:

• config.py (modified) (2 diffs)
• tool.py (modified) (3 diffs)

pykota/trunk/pykota/config.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.17  2003/03/15 23:01:28  jalet
+# New mailto option in configuration file added.
+# No time to test this tonight (although it should work).
+#
 # Revision 1.16  2003/02/17 23:01:56  jalet
 # Typos
@@ -189 +193 @@
         return self.getPrinterOption(printer, "admin")
         
+    def getMailTo(self, printer) :    
+        """Returns the recipient of email messages."""
+        validmailtos = [ "DEVNULL", "BOTH", "USER", "ADMIN" ]
+        mailto = self.getPrinterOption(printer, "mailto").upper()
+        if mailto not in validmailtos :
+            raise PyKotaConfigError, _("Option mailto in section %s only supports values in %s") % (printer, str(validmailtos))
+        return mailto    
+        
     def getGraceDelay(self, printer) :    
         """Returns the grace delay in days."""

pykota/trunk/pykota/tool.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.27  2003/03/15 23:01:28  jalet
+# New mailto option in configuration file added.
+# No time to test this tonight (although it should work).
+#
 # Revision 1.26  2003/03/09 23:58:16  jalet
 # Comment
@@ -312 +316 @@
         admin = self.config.getAdmin(pname)
         adminmail = self.config.getAdminMail(pname)
+        mailto = self.config.getMailTo(pname)
         action = self.checkUserPQuota(username, pname)
         if action.startswith("POLICY_") :
@@ -318 +323 @@
             adminmessage = _("Print Quota exceeded for user %s on printer %s") % (username, pname)
             self.logger.log_message(adminmessage)
-            self.sendMessageToUser(admin, adminmail, username, _("Print Quota Exceeded"), _("You are not allowed to print anymore because\nyour Print Quota is exceeded on printer %s.") % pname)
-            self.sendMessageToAdmin(adminmail, _("Print Quota"), adminmessage)
+            if mailto in [ "BOTH", "USER" ] :
+                self.sendMessageToUser(admin, adminmail, username, _("Print Quota Exceeded"), _("You are not allowed to print anymore because\nyour Print Quota is exceeded on printer %s.") % pname)
+            if mailto in [ "BOTH", "ADMIN" ] :
+                self.sendMessageToAdmin(adminmail, _("Print Quota"), adminmessage)
         elif action == "WARN" :    
             adminmessage = _("Print Quota soft limit exceeded for user %s on printer %s") % (username, pname)
             self.logger.log_message(adminmessage)
-            self.sendMessageToUser(admin, adminmail, username, _("Print Quota Exceeded"), _("You will soon be forbidden to print anymore because\nyour Print Quota is almost reached on printer %s.") % pname)
-            self.sendMessageToAdmin(adminmail, _("Print Quota"), adminmessage)
+            if mailto in [ "BOTH", "USER" ] :
+                self.sendMessageToUser(admin, adminmail, username, _("Print Quota Exceeded"), _("You will soon be forbidden to print anymore because\nyour Print Quota is almost reached on printer %s.") % pname)
+            if mailto in [ "BOTH", "ADMIN" ] :
+                self.sendMessageToAdmin(adminmail, _("Print Quota"), adminmessage)
         return action