Changeset 1240 for pykota/trunk/pykota/tool.py

Timestamp:

12/27/03 17:49:25 (20 years ago)

Author:

uid67467

Message:

Should be ok now.

Files:

• pykota/trunk/pykota/tool.py (modified) (7 diffs)

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.65  2003/12/27 16:49:25  uid67467
+# Should be ok now.
+#
+# Revision 1.65  2003/12/06 08:14:38  jalet
+# Added support for CUPS device uris which contain authentication information.
+#
 # Revision 1.64  2003/11/29 22:03:17  jalet
 # Some code refactoring work. New code is not used at this time.
@@ -288 +294 @@
         self.documentation = doc
         self.config = config.PyKotaConfig("/etc/pykota")
-        self.logger = logger.openLogger(self, self.config.getLoggingBackend())
+        self.logger = logger.openLogger(self.config.getLoggingBackend())
         self.debug = self.config.getDebug()
         self.storage = storage.openConnection(self)
@@ -574 +580 @@
                 self.sendMessageToAdmin(adminmail, _("Print Quota"), adminmessage)
             if mailto in [ "BOTH", "USER", "EXTERNAL" ] :
+                message = self.config.getHardWarn(printer.Name)
                 for user in self.storage.getGroupMembers(group) :
                     if mailto != "EXTERNAL" :
-                        self.sendMessageToUser(admin, adminmail, user, _("Print Quota Exceeded"), self.config.getHardWarn(printer.Name))
+                        self.sendMessageToUser(admin, adminmail, user, _("Print Quota Exceeded"), message)
                     else :    
                         self.externalMailTo(arguments, action, user, printer, message)
@@ -599 +606 @@
         """Checks a user quota and send him a message if quota is exceeded on current printer."""
         user = userpquota.User
-        printer = userpquota.Printer
-        admin = self.config.getAdmin(printer.Name)
-        adminmail = self.config.getAdminMail(printer.Name)
-        (mailto, arguments) = self.config.getMailTo(printer.Name)
-        action = self.checkUserPQuota(userpquota)
-        if action.startswith("POLICY_") :
-            action = action[7:]
-        if action == "DENY" :
-            adminmessage = _("Print Quota exceeded for user %s on printer %s") % (user.Name, printer.Name)
-            self.logger.log_message(adminmessage)
-            if mailto in [ "BOTH", "USER", "EXTERNAL" ] :
-                message = self.config.getHardWarn(printer.Name)
-                if mailto != "EXTERNAL" :
-                    self.sendMessageToUser(admin, adminmail, user, _("Print Quota Exceeded"), message)
-                else :    
-                    self.externalMailTo(arguments, action, user, printer, message)
-            if mailto in [ "BOTH", "ADMIN" ] :
-                self.sendMessageToAdmin(adminmail, _("Print Quota"), adminmessage)
-        elif action == "WARN" :    
-            adminmessage = _("Print Quota low for user %s on printer %s") % (user.Name, printer.Name)
-            self.logger.log_message(adminmessage)
-            if mailto in [ "BOTH", "USER", "EXTERNAL" ] :
-                if user.LimitBy and (user.LimitBy.lower() == "balance") : 
-                    message = self.config.getPoorWarn()
-                else :     
-                    message = self.config.getSoftWarn(printer.Name)
-                if mailto != "EXTERNAL" :    
-                    self.sendMessageToUser(admin, adminmail, user, _("Print Quota Low"), message)
-                else :    
-                    self.externalMailTo(arguments, action, user, printer, message)
-            if mailto in [ "BOTH", "ADMIN" ] :
-                self.sendMessageToAdmin(adminmail, _("Print Quota"), adminmessage)
-        return action        
+        actions = []
+        for upq in [userpquota] + userpquota.ParentPrintersUserPQuota :
+            printer = upq.Printer
+            admin = self.config.getAdmin(printer.Name)
+            adminmail = self.config.getAdminMail(printer.Name)
+            (mailto, arguments) = self.config.getMailTo(printer.Name)
+            self.logdebug("Checking quota for user %s on printer %s" % (upq.User.Name, printer.Name))
+            action = self.checkUserPQuota(upq)
+            self.logdebug("Result is %s" % action)
+            if action.startswith("POLICY_") :
+                action = action[7:]
+            if action == "DENY" :
+                adminmessage = _("Print Quota exceeded for user %s on printer %s") % (user.Name, printer.Name)
+                self.logger.log_message(adminmessage)
+                if mailto in [ "BOTH", "USER", "EXTERNAL" ] :
+                    message = self.config.getHardWarn(printer.Name)
+                    if mailto != "EXTERNAL" :
+                        self.sendMessageToUser(admin, adminmail, user, _("Print Quota Exceeded"), message)
+                    else :    
+                        self.externalMailTo(arguments, action, user, printer, message)
+                if mailto in [ "BOTH", "ADMIN" ] :
+                    self.sendMessageToAdmin(adminmail, _("Print Quota"), adminmessage)
+            elif action == "WARN" :    
+                adminmessage = _("Print Quota low for user %s on printer %s") % (user.Name, printer.Name)
+                self.logger.log_message(adminmessage)
+                if mailto in [ "BOTH", "USER", "EXTERNAL" ] :
+                    if user.LimitBy and (user.LimitBy.lower() == "balance") : 
+                        message = self.config.getPoorWarn()
+                    else :     
+                        message = self.config.getSoftWarn(printer.Name)
+                    if mailto != "EXTERNAL" :    
+                        self.sendMessageToUser(admin, adminmail, user, _("Print Quota Low"), message)
+                    else :    
+                        self.externalMailTo(arguments, action, user, printer, message)
+                if mailto in [ "BOTH", "ADMIN" ] :
+                    self.sendMessageToAdmin(adminmail, _("Print Quota"), adminmessage)
+            actions.append(action)        
+        if "DENY" in actions :    
+            self.logdebug("Final result is %s" % action)
+            return "DENY"
+        elif "WARN" in actions :    
+            self.logdebug("Final result is %s" % action)
+            return "WARN"
+        else :    
+            self.logdebug("Final result is %s" % action)
+            return "ALLOW"
         
 class PyKotaFilterOrBackend(PyKotaTool) :    
@@ -651 +671 @@
             self.username = self.username.lower()
         self.preserveinputfile = self.inputfile 
+        #
+        # Export internal data to the environment
+        os.environ["PYKOTAUSERNAME"] = str(self.username)
+        os.environ["PYKOTAPRINTERNAME"] = str(self.printername)
+        os.environ["PYKOTACOPIES"] = str(self.copies)
+        os.environ["PYKOTATITLE"] = str(self.title)
+        os.environ["PYKOTAOPTIONS"] = str(self.options)
+        os.environ["PYKOTAFILENAME"] = str(self.inputfile)
+        #
+        # And opens the correct accounter 
         self.accounter = accounter.openAccounter(self)
     
@@ -683 +713 @@
             while destination.startswith("/") :
                 destination = destination[1:]
+            checkauth = destination.split("@", 1)    
+            if len(checkauth) == 2 :
+                destination = checkauth[1]
             printerhostname = destination.split("/")[0].split(":")[0]
             return ("CUPS", \
@@ -737 +770 @@
            was returned by the external command.
         """
-        for passnumber in range(1, 3) :
+        for dummy in range(1, 3) :
             printer = self.storage.getPrinter(self.printername)
             user = self.storage.getUser(self.username)