Changeset 1121

Timestamp:

08/25/03 13:23:05 (21 years ago)

Author:

jalet

Message:

More powerful CGI script for quota reports

Location:

pykota/trunk

Files:

• cgi-bin/printquota.cgi (modified) (2 diffs)
• NEWS (modified) (1 diff)
• pykota/version.py (modified) (1 diff)

pykota/trunk/cgi-bin/printquota.cgi

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.13  2003/08/25 11:23:05  jalet
+# More powerful CGI script for quota reports
+#
 # Revision 1.12  2003/07/29 20:55:17  jalet
 # 1.14 is out !
@@ -158 +161 @@
                 else :    
                     printers = self.storage.getMatchingPrinters("*")
-                if self.form.has_key("ugmask") :     
-                    ugmask = self.form["ugmask"].value
-                else :     
-                    ugmask = "*"
+                remuser = os.environ.get("REMOTE_USER", "root")    
+                if remuser == "root" :
+                    if self.form.has_key("ugmask") :     
+                        ugmask = self.form["ugmask"].value
+                    else :     
+                        ugmask = "*"
+                else :        
+                    if self.form.has_key("isgroup") :    
+                        user = self.storage.getUser(remuser)
+                        if user.Exists :
+                            ugmask = " ".join([ g.Name for g in self.storage.getUserGroups(user) ])
+                        else :    
+                            ugmask = remuser # result will probably be empty, we don't care
+                    else :    
+                        ugmask = remuser
                 if self.form.has_key("isgroup") :    
                     isgroup = 1

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.15alpha3 :
+    
+        - CGI script now tries to restrict view when the 
+          REMOTE_USER environment variable is set. This allows
+          people to protect its use with .htaccess files.
+          When unprotected, or if REMOTE_USER is 'root', then 
+          unrestricted access is granted.
+          
     - 1.15alpha2 :
     

pykota/trunk/pykota/version.py

@@ -21 +21 @@
 #
 
-__version__ = "1.15alpha2_unofficial"
+__version__ = "1.15alpha3_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""