Changeset 2232 for pykota/trunk/bin/pykotme

Timestamp:

05/05/05 23:52:49 (19 years ago)

Author:

jerome

Message:

Improved stability in pykotme and pykotme.cgi
Now uses real userid instead of effective userid in pykotme and pykosd,
to allow user root to check his own account instead of user pykota's one
(since we drop priviledges early).
Better setup instructions for pykotme.cgi

Files:

• pykota/trunk/bin/pykotme (modified) (1 diff)

pykota/trunk/bin/pykotme

@@ -104 +104 @@
                 self.printInfo(msg)
             
-        # get current user
-        username = pwd.getpwuid(os.geteuid())[0]
+        printers = self.storage.getMatchingPrinters(options["printer"])
+        if not printers :
+            raise PyKotaToolError, _("There's no printer matching %s") % options["printer"]
+            
+        username = pwd.getpwuid(os.getuid())[0]
         user = self.storage.getUser(username)
         if user.Exists and user.LimitBy and (user.LimitBy.lower() == "balance"):
             print _("Your account balance : %.2f") % (user.AccountBalance or 0.0)
             
-        printers = self.storage.getMatchingPrinters(options["printer"])
-        if not printers :
-            raise PyKotaToolError, _("There's no printer matching %s") % options["printer"]
-            
         print _("Job size : %i pages") % totalsize    
-        for printer in printers :
-            userpquota = self.storage.getUserPQuota(user, printer)
-            cost = userpquota.computeJobPrice(totalsize)
-            print _("Cost on printer %s : %.2f") % (printer.Name, cost)
+        if user.Exists :
+            for printer in printers :
+                userpquota = self.storage.getUserPQuota(user, printer)
+                if userpquota.Exists :
+                    cost = userpquota.computeJobPrice(totalsize)
+                    print _("Cost on printer %s : %.2f") % (printer.Name, cost)
             
 if __name__ == "__main__" :