Changeset 750

Timestamp:

02/07/03 23:53:57 (21 years ago)

Author:

jalet

Message:

Checks if printer name is valid before adding it

Files:

• pykota/trunk/bin/edpykota (modified) (2 diffs)

pykota/trunk/bin/edpykota

@@ -17 +17 @@
 #
 # $Log$
+# Revision 1.8  2003/02/07 22:53:57  jalet
+# Checks if printer name is valid before adding it
+#
 # Revision 1.7  2003/02/07 22:17:58  jalet
 # Incomplete test
@@ -122 +125 @@
 class EdPyKota(PyKotaTool) :        
     """A class for edpykota."""
+    def isValidPrinterName(self, printername) :
+        """Checks if a printername is valid."""
+        import string
+        if printername[0] in string.ascii_letters :
+            validchars = string.ascii_letters + string.digits + "-_"
+            for c in printername[1:] :
+                if c not in validchars :
+                    return 0
+            return 1        
+        return 0
+        
     def main(self, names, options) :
         """Edit user or group quotas."""
         printernames = self.storage.getMatchingPrinters(options["printer"])
         if not printernames :
-            if options["add"] and options["printer"] and options["printer"].isalpha() :
-                self.storage.addPrinter(options["printer"])
+            pname = options["printer"]
+            if options["add"] and pname :
+                if self.isValidPrinterName(pname) :
+                    self.storage.addPrinter(pname)
+                else :    
+                    raise PyKotaToolError, "Invalid printer name %s" % pname
             else :
-                raise PyKotaToolError, "There's no printer matching %s" % options["printer"]
+                raise PyKotaToolError, "There's no printer matching %s" % pname
         softlimit = hardlimit = None    
         if options["softlimit"] :