Changeset 2631

Timestamp:

01/26/06 16:25:44 (18 years ago)

Author:

jerome

Message:

Added support for the CANCEL command in subprocesses launched from the
overwrite_jobticket directive : this will allow end users to be asked
if they really want to proceed to printing once the new version
of pykoticon will be ready.
Several minor fixes.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (12 diffs)
• bin/pkbanner (modified) (1 diff)
• cgi-bin/printquota.cgi (modified) (1 diff)
• conf/pykota.conf.sample (modified) (4 diffs)
• initscripts/ldap/pykota.schema (modified) (1 diff)
• NEWS (modified) (1 diff)
• pykota/version.py (modified) (1 diff)
• stylesheets/pykota.css (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -296 +296 @@
                     self.logdebug("Seen DENY command.")
                     action = "DENY"
+                elif line == "CANCEL" :
+                    self.logdebug("Seen CANCEL command.")
+                    action = "CANCEL"
                 elif line.startswith("USERNAME=") :    
                     username = line.split("=", 1)[1].strip()
@@ -307 +310 @@
             
             # now overwrite the job's ticket if new data was supplied
-            if action :
+            if action == "DENY" :
                 self.Action = action
                 self.Reason = _("You are not allowed to print at this time.")
+            elif action == "CANCEL" :
+                self.Action = action
+                self.Reason = _("Print job cancelled.")
             if username :
                 self.UserName = username
@@ -891 +897 @@
         self.exportPhaseInfo("BEFORE")
         
-        if self.Action != "DENY" : 
+        if self.Action not in ("DENY", "CANCEL") : 
             if self.Printer.MaxJobSize and (self.softwareJobSize > self.Printer.MaxJobSize) :
                 # This printer was set to refuse jobs this large.
@@ -900 +906 @@
                 self.Reason = _("You are not allowed to print so many pages on printer %s at this time.") % self.PrinterName
             
-        if self.Action != "DENY" :
+        if self.Action not in ("DENY", "CANCEL") :
             if self.User.LimitBy == "noprint" :
                 self.printInfo(_("User %s is not allowed to print at this time.") % self.UserName, "warn")
@@ -906 +912 @@
                 self.Reason = _("Your account settings forbid you to print at this time.")
                 
-        if self.Action != "DENY" :
+        if self.Action not in ("DENY", "CANCEL") :
             # If printing is still allowed at this time, we
             # need to extract the billing code information from the database.
@@ -913 +919 @@
             self.getBillingCode()
             
-        if self.Action != "DENY" :
+        if self.Action not in ("DENY", "CANCEL") :
             # If printing is still allowed at this time, we
             # need to check if the job is a dupe or not, and what to do then.
@@ -920 +926 @@
             self.checkIfDupe()
                     
-        if self.Action != "DENY" :
+        if self.Action not in ("DENY", "CANCEL") :
             # If printing is still allowed at this time, we
             # need to check the user's print quota on the current printer.
@@ -962 +968 @@
         if self.Action == "DENY" :
             self.printInfo(_("Job denied, no accounting will be done."))
+        elif self.Action == "CANCEL" :    
+            self.printInfo(_("Job cancelled, no accounting will be done."))
         else :
             self.printInfo(_("Job accounting begins."))
@@ -990 +998 @@
         if self.Action == "DENY" :
             self.printInfo(_("Job denied, no accounting has been done."))
+        elif self.Action == "CANCEL" :    
+            self.printInfo(_("Job cancelled, no accounting has been done."))
         else :
             self.deinstallSigTermHandler()
@@ -1020 +1030 @@
                 self.JobSize = 0
                 self.printInfo(_("Job size forced to 0 because printing is denied."))
+            elif self.Action == "CANCEL" :     
+                self.JobSize = 0
+                self.printInfo(_("Job size forced to 0 because printing was cancelled."))
             else :    
                 self.UserPQuota.resetDenyBannerCounter()
@@ -1028 +1041 @@
             self.printInfo(_("Job size : %i") % self.JobSize)
             
-            if (self.Action == "PROBLEM") and (onbackenderror == "NOCHARGE") :
+            if ((self.Action == "PROBLEM") and (onbackenderror == "NOCHARGE")) or \
+                (self.Action in ("DENY", "CANCEL")) :
                 self.JobPrice = 0.0
             elif (self.User.LimitBy == "nochange") or self.Printer.PassThrough :
@@ -1048 +1062 @@
             
             if hasattr(self, "BillingCode") and self.BillingCode and self.BillingCode.Exists :
-                if (self.Action != "PROBLEM") or (onbackenderror == "CHARGE") :
+                if (self.Action in ("ALLOW", "WARN")) or \
+                   ((self.Action == "PROBLEM") and (onbackenderror == "CHARGE")) :
                     self.BillingCode.consume(self.JobSize, self.JobPrice)
                     self.printInfo(_("Billing code %s was updated.") % self.BillingCode.BillingCode)

pykota/trunk/bin/pkbanner

@@ -188 +188 @@
         elif action == "WARN" :    
             action = _("Allowed with Warning")
+        elif action == "PROBLEM" :    
+            # should never occur
+            action = _("Problem")
+        elif action == "CANCEL" :    
+            # should never occur
+            action = _("Cancelled")
         ypos -= self.printVar(c, xcenter, ypos, _("Result"), action, 14, savetoner) 
         

pykota/trunk/cgi-bin/printquota.cgi

@@ -234 +234 @@
                         elif job.JobAction == "PROBLEM" :
                             oddevenclass = "problem"
+                        elif job.JobAction == "CANCEL" :
+                            oddevenclass = "cancel"
                         username_url = '<a href="%s?%s">%s</a>' % (os.environ.get("SCRIPT_NAME", ""), urllib.urlencode({"history" : 1, "username" : job.UserName}), job.UserName)
                         printername_url = '<a href="%s?%s">%s</a>' % (os.environ.get("SCRIPT_NAME", ""), urllib.urlencode({"history" : 1, "printername" : job.PrinterName}), job.PrinterName)

pykota/trunk/conf/pykota.conf.sample

@@ -346 +346 @@
 # Should we launch a command to overwrite the job's ticket ?
 # This allows a command to overwrite the username and/or the
-# billing code used, or to deny the job.
+# billing code used, or to deny or cancel the job.
 # If unset no command is launched and the job's username and
 # billing code are used as they are received.
@@ -356 +356 @@
 #    BILLINGCODE=the_billingcode_we_want_to_overwrite_with
 #    DENY 
+#    CANCEL
 #
 # NB : the output is entirely read, and the latest value
@@ -364 +365 @@
 # If only BILLINGCODE= lines are printed, the username is
 # used unchanged.
-# If DENY is output, but is followed by new USERNAME= or
-# BILLINGCODE= lines, the job is not denied.
+# If DENY or CANCEL is output, but is followed by new USERNAME= or
+# BILLINGCODE= lines, the job is not denied nor cancelled.
 #
 # This value can be set either globally or on a per printer basis
@@ -388 +389 @@
 # If both are defined, the printer option has priority.
 #
+# unknown_billingcode : deny
+# unknown_billingcode : deny(/path/to/some/script)
 # unknown_billingcode : create
 

pykota/trunk/initscripts/ldap/pykota.schema

@@ -104 +104 @@
 # pykotaAction
 attributetype ( 1.3.6.1.4.1.16868.1.1.14 NAME 'pykotaAction'
-        DESC 'Was the job allowed, denied, or failed : ( "ALLOW" |  "DENY" | "PROBLEM" )'
+        DESC 'Was the job allowed, denied, warned, cancelled or failed : ( "ALLOW" |  "DENY" | "WARN" | "CANCEL" | "PROBLEM" )'
         EQUALITY caseExactIA5Match
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.24alpha8 :
+    
+        - Now subprocesses launched through the overwrite_jobticket directive
+          can also output 'CANCEL', to represent the user's own choice to
+          cancel the print job.
+          
     - 1.24alpha7 :
      

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.24alpha7_unofficial"
+__version__ = "1.24alpha8_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS."

pykota/trunk/stylesheets/pykota.css

@@ -44 +44 @@
       }
       
+.cancel {     
+        background-color: #BEDBED;
+      }
+      
 .pykotacolsheader {      
         background-color: #AAAAAA;