Changeset 3012
- Timestamp:
- 09/06/06 22:06:13 (18 years ago)
- Location:
- pykota/trunk
- Files:
-
- 5 modified
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/bin/cupspykota
r3008 r3012 279 279 # use CUPS' user when printing test pages from CUPS' web interface 280 280 self.UserName = sys.argv[2].strip() or self.originalUserName or pwd.getpwuid(os.geteuid())[0] 281 self.OriginalUserName = self.UserName[:] 281 282 self.Title = sys.argv[3].strip() 282 283 self.Copies = int(sys.argv[4].strip()) … … 356 357 jbing = jbing[-1] 357 358 (jbtype, self.JobBillingCode) = jbing 358 359 if self.JobBillingCode is None : 360 self.OriginalJobBillingCode = None 361 else : 362 self.OriginalJobBillingCode = self.JobBillingCode[:] 363 359 364 baselockfilename = self.DeviceURI.replace("/", ".") 360 365 baselockfilename = baselockfilename.replace(":", ".") … … 647 652 os.environ["PYKOTAJOBID"] = self.JobId 648 653 os.environ["PYKOTAUSERNAME"] = self.UserName 654 os.environ["PYKOTAORIGINALUSERNAME"] = self.OriginalUserName 649 655 os.environ["PYKOTATITLE"] = self.Title 650 656 os.environ["PYKOTACOPIES"] = str(self.Copies) … … 652 658 os.environ["PYKOTAFILENAME"] = self.InputFile or "" 653 659 os.environ["PYKOTAJOBBILLING"] = self.JobBillingCode or "" 660 os.environ["PYKOTAORIGINALJOBBILLING"] = self.OriginalJobBillingCode or "" 654 661 os.environ["PYKOTACONTROLFILE"] = self.ControlFile 655 662 os.environ["PYKOTAPRINTERHOSTNAME"] = self.PrinterHostName -
pykota/trunk/conf/pykota.conf.sample
r2965 r3012 897 897 # PYKOTAPHASE : BEFORE or AFTER the job is sent to the printer 898 898 # PYKOTAACTION : ALLOW or DENY or WARN for current print job 899 # PYKOTAUSERNAME : user's name 899 # PYKOTAUSERNAME : user's name, possibly modified through the overwrite_jobticket directive. 900 # PYKOTAORIGINALUSERNAME : user's name, unmodified. 900 901 # PYKOTAPRINTERNAME : printer's name 901 902 # PYKOTAPGROUPS : list of printers groups the current printer is a member of … … 925 926 # page was still printed on the current printer. 926 927 # PYKOTAOVERCHARGE : user's overcharging factor. 927 # PYKOTAJOBBILLING : Job's billing code if present (CUPS only) 928 # PYKOTAJOBBILLING : Job's billing code if present, possibly modified through the overwrite_jobticket directive. 929 # PYKOTAORIGINALJOBBILLING : Job's billing code if present, unmodified. 928 930 # PYKOTAREASON : if the job was denied or a warning needs to be issued, contains 929 931 # the message to send to the user. -
pykota/trunk/NEWS
r3008 r3012 22 22 PyKota NEWS : 23 23 24 - 1.25alpha11 (2006-09-06) : 25 26 - Now fails in an helpful manner if python-mysqldb is too old. 27 28 - Now exports the original username and billing code (i.e. 29 their values before they are eventually overwritten) in 30 two additionnal environment variables. 31 24 32 - 1.25alpha10 (2006-09-03) : 25 33 -
pykota/trunk/pykota/version.py
r3007 r3012 22 22 # 23 23 24 __version__ = "1.25alpha1 0_unofficial"24 __version__ = "1.25alpha11_unofficial" 25 25 26 26 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS." -
pykota/trunk/TODO
r3011 r3012 1 # $Id$1 it's a pyt# $Id$ 2 2 3 3 PyKota - Print Quotas for CUPS and LPRng … … 29 29 deleting it. 30 30 31 - Exports the original username and billing code in two32 additional environment variables (in case they are33 overwritten later).34 35 31 - Improve the documentation of edpykota's --printer command 36 32 line option.