Changeset 2937

Show
Ignore:
Timestamp:
06/13/06 23:10:15 (16 years ago)
Author:
jerome
Message:

pkusers now supports the --email command line option.

Location:
pykota/trunk
Files:
34 modified

Legend:

Unmodified
Added
Removed
  • pykota/trunk/bin/pkusers

    r2829 r2937  
    5454                        
    5555  -d | --delete        Deletes users from the quota storage. 
    56    
     56 
     57  -e | --email addr    Sets the email address for the users. 
     58                       If the addr parameter begins with @, then 
     59                       the username is prepended to addr to form 
     60                       a valid email address. 
     61 
    5762  -D | --description d Adds a textual description to users or groups. 
    5863                        
     
    154159  cost of each print job will be multiplied by zero before charging 
    155160  his account. 
     161 
     162  $ pkusers --email @example.com 
     163 
     164  This will set the email address for each user to username@example.com 
    156165""") 
    157166         
     
    165174            entry.setLimitBy(limitby) 
    166175        if not groups : 
    167             if email : 
    168                 entry.Email = email 
     176            if email is not None :      # we allow "" to empty the field 
     177                if email.startswith("@") : 
     178                    email = "%s%s" % (entry.Name, email) 
     179                if email and email.count('@') != 1 : 
     180                    raise PyKotaCommandLineError, _("Invalid email address %s") % email 
     181                entry.setEmail(email) 
    169182            if overcharge is not None : # NB : 0 is allowed !      
    170183                entry.setOverChargeFactor(overcharge) 
     
    279292            description = options["description"] 
    280293            if description : 
    281                 description = options["description"].strip() 
     294                description = description.strip() 
    282295                 
    283296            comment = options["comment"] 
    284297            if comment : 
    285                 comment = options["comment"].strip() 
     298                comment = comment.strip() 
     299            email = options["email"]     
     300            if email : 
     301                email = email.strip() 
    286302            skipexisting = options["skipexisting"]     
    287303            groups = options["groups"] 
     
    294310                    percent.setSize(len(names)) 
    295311                    for ename in names : 
    296                         email = None 
     312                        useremail = None 
    297313                        if not groups : 
    298314                            splitname = ename.split('/', 1)     # username/email 
    299315                            if len(splitname) == 1 : 
    300316                                splitname.append("") 
    301                             (ename, email) = splitname 
    302                             if email and (email.count('@') != 1) : 
    303                                 raise PyKotaCommandLineError, _("Invalid email address %s") % email 
     317                            (ename, useremail) = splitname 
    304318                        if self.isValidName(ename) : 
    305319                            reject = 0 
     
    326340                                                     description, overcharge,\ 
    327341                                                     balance, balancevalue, \ 
    328                                                      comment, email) 
     342                                                     comment, useremail or email) 
    329343                                oldentry = getattr(self.storage, "add%s" % suffix)(entry) 
    330344                                if oldentry is not None : 
     
    340354                                                     description, overcharge,\ 
    341355                                                     balance, balancevalue, \ 
    342                                                      comment, email) 
     356                                                     comment, useremail or email) 
    343357                                        oldentry.save() 
    344358                                        if not groups : 
     
    359373                            self.modifyEntry(entry, groups, limitby, description, \ 
    360374                                             overcharge, balance, balancevalue, \ 
    361                                              comment) 
     375                                             comment, email) 
    362376                            self.manageUsersGroups(usersgroups, entry, remove)                 
    363377                        entry.save()     
     
    378392                     "comment" : "", \ 
    379393                   } 
    380         short_options = "hvaD:dgl:rso:i:b:C:L" 
     394        short_options = "hvaD:dgl:rso:i:b:C:Le:" 
    381395        long_options = ["help", "version", "add", "description=", \ 
    382396                        "delete", "groups", "list", "remove", \ 
    383                         "skipexisting", "overcharge=", \ 
     397                        "skipexisting", "overcharge=", "email=", \ 
    384398                        "ingroups=", "limitby=", "balance=", "comment=", \ 
    385399                       ] 
     
    408422        options["overcharge"] = options["o"] or options["overcharge"] 
    409423        options["comment"] = options["C"] or options["comment"] or defaults["comment"] 
     424        options["email"] = options["e"] or options["email"] 
    410425         
    411426        if options["help"] : 
     
    413428        elif options["version"] : 
    414429            manager.display_version_and_quit() 
    415         elif (options["delete"] and (options["add"] or options["remove"] or options["description"])) \ 
     430        elif (options["delete"] and (options["add"] or options["remove"] or options["description"] or options["email"])) \ 
    416431           or (options["skipexisting"] and not options["add"]) \ 
    417            or (options["list"] and (options["add"] or options["delete"] or options["remove"] or options["description"])) \ 
     432           or (options["list"] and (options["add"] or options["delete"] or options["remove"] or options["description"] or options["email"])) \ 
    418433           or (options["groups"] and (options["balance"] or options["ingroups"] or options["overcharge"])) : 
    419434            raise PyKotaCommandLineError, _("incompatible options, see help.") 
  • pykota/trunk/man/de/pkusers.1

    r2910 r2937  
    22.TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands" 
    33.SH NOM 
    4 pkusers \- page de manuel de pkusers 1.25alpha5_unofficial 
     4pkusers \- page de manuel de pkusers 1.25alpha7_unofficial 
    55.SH DESCRIPTION 
    6 pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
     6pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
    77.PP 
    88An Users and Groups Manager for PyKota. 
     
    3131\fB\-d\fR | \fB\-\-delete\fR 
    3232Deletes users from the quota storage. 
     33.TP 
     34\fB\-e\fR | \fB\-\-email\fR addr 
     35Sets the email address for the users. 
     36If the addr parameter begins with @, then 
     37the username is prepended to addr to form 
     38a valid email address. 
    3339.HP 
    3440\fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups. 
     
    140146cost of each print job will be multiplied by zero before charging 
    141147his account. 
     148.IP 
     149\f(CW$ pkusers --email @example.com\fR 
     150.IP 
     151This will set the email address for each user to username@example.com 
    142152.PP 
    143153This program is free software; you can redistribute it and/or modify 
  • pykota/trunk/man/el_GR/pkusers.1

    r2910 r2937  
    22.TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands" 
    33.SH NOM 
    4 pkusers \- page de manuel de pkusers 1.25alpha5_unofficial 
     4pkusers \- page de manuel de pkusers 1.25alpha7_unofficial 
    55.SH DESCRIPTION 
    6 pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
     6pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
    77.PP 
    88An Users and Groups Manager for PyKota. 
     
    3131\fB\-d\fR | \fB\-\-delete\fR 
    3232Deletes users from the quota storage. 
     33.TP 
     34\fB\-e\fR | \fB\-\-email\fR addr 
     35Sets the email address for the users. 
     36If the addr parameter begins with @, then 
     37the username is prepended to addr to form 
     38a valid email address. 
    3339.HP 
    3440\fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups. 
     
    140146cost of each print job will be multiplied by zero before charging 
    141147his account. 
     148.IP 
     149\f(CW$ pkusers --email @example.com\fR 
     150.IP 
     151This will set the email address for each user to username@example.com 
    142152.PP 
    143153This program is free software; you can redistribute it and/or modify 
  • pykota/trunk/man/es/pkusers.1

    r2910 r2937  
    22.TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands" 
    33.SH NOM 
    4 pkusers \- page de manuel de pkusers 1.25alpha5_unofficial 
     4pkusers \- page de manuel de pkusers 1.25alpha7_unofficial 
    55.SH DESCRIPTION 
    6 pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
     6pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
    77.PP 
    88An Users and Groups Manager for PyKota. 
     
    3131\fB\-d\fR | \fB\-\-delete\fR 
    3232Deletes users from the quota storage. 
     33.TP 
     34\fB\-e\fR | \fB\-\-email\fR addr 
     35Sets the email address for the users. 
     36If the addr parameter begins with @, then 
     37the username is prepended to addr to form 
     38a valid email address. 
    3339.HP 
    3440\fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups. 
     
    140146cost of each print job will be multiplied by zero before charging 
    141147his account. 
     148.IP 
     149\f(CW$ pkusers --email @example.com\fR 
     150.IP 
     151This will set the email address for each user to username@example.com 
    142152.PP 
    143153This program is free software; you can redistribute it and/or modify 
  • pykota/trunk/man/fr/pkusers.1

    r2910 r2937  
    22.TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands" 
    33.SH NOM 
    4 pkusers \- page de manuel de pkusers 1.25alpha5_unofficial 
     4pkusers \- page de manuel de pkusers 1.25alpha7_unofficial 
    55.SH DESCRIPTION 
    6 pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
     6pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
    77.PP 
    88Un gestionnaire d'utilisateurs et de groupes pour PyKota. 
     
    3030\fB\-d\fR | \fB\-\-delete\fR 
    3131Efface des utilisateurs de la base de donn�. 
     32.TP 
     33\fB\-e\fR | \fB\-\-email\fR adr 
     34Positionne l'adresse email des utilisateurs. 
     35Si le param�e adr commence par @, alors 
     36cette valeur est pr�x�par le nom d'utilisateur 
     37pour former une adresse email valide. 
    3238.HP 
    3339\fB\-D\fR | \fB\-\-description\fR d Ajoute une description textuelle aux utilisateurs. 
     
    136142car le co� chaque job sera multipli�ar 0 avant de modifier le solde 
    137143de son compte. 
     144.IP 
     145\f(CW$ pkusers --email @example.com\fR 
     146.IP 
     147Ceci va fixer l'adresse email de chaque utilisateur �om@example.com 
    138148.PP 
    139149This program is free software; you can redistribute it and/or modify 
  • pykota/trunk/man/it/pkusers.1

    r2910 r2937  
    22.TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands" 
    33.SH NOM 
    4 pkusers \- page de manuel de pkusers 1.25alpha5_unofficial 
     4pkusers \- page de manuel de pkusers 1.25alpha7_unofficial 
    55.SH DESCRIPTION 
    6 pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
     6pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
    77.PP 
    88An Users and Groups Manager for PyKota. 
     
    3131\fB\-d\fR | \fB\-\-delete\fR 
    3232Deletes users from the quota storage. 
     33.TP 
     34\fB\-e\fR | \fB\-\-email\fR addr 
     35Sets the email address for the users. 
     36If the addr parameter begins with @, then 
     37the username is prepended to addr to form 
     38a valid email address. 
    3339.HP 
    3440\fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups. 
     
    140146cost of each print job will be multiplied by zero before charging 
    141147his account. 
     148.IP 
     149\f(CW$ pkusers --email @example.com\fR 
     150.IP 
     151This will set the email address for each user to username@example.com 
    142152.PP 
    143153This program is free software; you can redistribute it and/or modify 
  • pykota/trunk/man/nb_NO/pkusers.1

    r2910 r2937  
    22.TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands" 
    33.SH NOM 
    4 pkusers \- page de manuel de pkusers 1.25alpha5_unofficial 
     4pkusers \- page de manuel de pkusers 1.25alpha7_unofficial 
    55.SH DESCRIPTION 
    6 pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
     6pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
    77.PP 
    88An Users and Groups Manager for PyKota. 
     
    3131\fB\-d\fR | \fB\-\-delete\fR 
    3232Deletes users from the quota storage. 
     33.TP 
     34\fB\-e\fR | \fB\-\-email\fR addr 
     35Sets the email address for the users. 
     36If the addr parameter begins with @, then 
     37the username is prepended to addr to form 
     38a valid email address. 
    3339.HP 
    3440\fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups. 
     
    140146cost of each print job will be multiplied by zero before charging 
    141147his account. 
     148.IP 
     149\f(CW$ pkusers --email @example.com\fR 
     150.IP 
     151This will set the email address for each user to username@example.com 
    142152.PP 
    143153This program is free software; you can redistribute it and/or modify 
  • pykota/trunk/man/pkusers.1

    r2910 r2937  
    22.TH PKUSERS "1" "June 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands" 
    33.SH NAME 
    4 pkusers \- manual page for pkusers 1.25alpha5_unofficial 
     4pkusers \- manual page for pkusers 1.25alpha7_unofficial 
    55.SH DESCRIPTION 
    6 pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
     6pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
    77.PP 
    88An Users and Groups Manager for PyKota. 
     
    3131\fB\-d\fR | \fB\-\-delete\fR 
    3232Deletes users from the quota storage. 
     33.TP 
     34\fB\-e\fR | \fB\-\-email\fR addr 
     35Sets the email address for the users. 
     36If the addr parameter begins with @, then 
     37the username is prepended to addr to form 
     38a valid email address. 
    3339.HP 
    3440\fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups. 
     
    140146cost of each print job will be multiplied by zero before charging 
    141147his account. 
     148.IP 
     149\f(CW$ pkusers --email @example.com\fR 
     150.IP 
     151This will set the email address for each user to username@example.com 
    142152.PP 
    143153This program is free software; you can redistribute it and/or modify 
  • pykota/trunk/man/pl/pkusers.1

    r2910 r2937  
    22.TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands" 
    33.SH NOM 
    4 pkusers \- page de manuel de pkusers 1.25alpha5_unofficial 
     4pkusers \- page de manuel de pkusers 1.25alpha7_unofficial 
    55.SH DESCRIPTION 
    6 pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
     6pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
    77.PP 
    88An Users and Groups Manager for PyKota. 
     
    3131\fB\-d\fR | \fB\-\-delete\fR 
    3232Deletes users from the quota storage. 
     33.TP 
     34\fB\-e\fR | \fB\-\-email\fR addr 
     35Sets the email address for the users. 
     36If the addr parameter begins with @, then 
     37the username is prepended to addr to form 
     38a valid email address. 
    3339.HP 
    3440\fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups. 
     
    140146cost of each print job will be multiplied by zero before charging 
    141147his account. 
     148.IP 
     149\f(CW$ pkusers --email @example.com\fR 
     150.IP 
     151This will set the email address for each user to username@example.com 
    142152.PP 
    143153This program is free software; you can redistribute it and/or modify 
  • pykota/trunk/man/pt_BR/pkusers.1

    r2910 r2937  
    22.TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands" 
    33.SH NOM 
    4 pkusers \- page de manuel de pkusers 1.25alpha5_unofficial 
     4pkusers \- page de manuel de pkusers 1.25alpha7_unofficial 
    55.SH DESCRIPTION 
    6 pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
     6pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
    77.PP 
    88An Users and Groups Manager for PyKota. 
     
    3131\fB\-d\fR | \fB\-\-delete\fR 
    3232Deletes users from the quota storage. 
     33.TP 
     34\fB\-e\fR | \fB\-\-email\fR addr 
     35Sets the email address for the users. 
     36If the addr parameter begins with @, then 
     37the username is prepended to addr to form 
     38a valid email address. 
    3339.HP 
    3440\fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups. 
     
    140146cost of each print job will be multiplied by zero before charging 
    141147his account. 
     148.IP 
     149\f(CW$ pkusers --email @example.com\fR 
     150.IP 
     151This will set the email address for each user to username@example.com 
    142152.PP 
    143153This program is free software; you can redistribute it and/or modify 
  • pykota/trunk/man/pt/pkusers.1

    r2910 r2937  
    22.TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands" 
    33.SH NOM 
    4 pkusers \- page de manuel de pkusers 1.25alpha5_unofficial 
     4pkusers \- page de manuel de pkusers 1.25alpha7_unofficial 
    55.SH DESCRIPTION 
    6 pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
     6pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
    77.PP 
    88An Users and Groups Manager for PyKota. 
     
    3131\fB\-d\fR | \fB\-\-delete\fR 
    3232Deletes users from the quota storage. 
     33.TP 
     34\fB\-e\fR | \fB\-\-email\fR addr 
     35Sets the email address for the users. 
     36If the addr parameter begins with @, then 
     37the username is prepended to addr to form 
     38a valid email address. 
    3339.HP 
    3440\fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups. 
     
    140146cost of each print job will be multiplied by zero before charging 
    141147his account. 
     148.IP 
     149\f(CW$ pkusers --email @example.com\fR 
     150.IP 
     151This will set the email address for each user to username@example.com 
    142152.PP 
    143153This program is free software; you can redistribute it and/or modify 
  • pykota/trunk/man/sv_SE/pkusers.1

    r2910 r2937  
    22.TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands" 
    33.SH NOM 
    4 pkusers \- page de manuel de pkusers 1.25alpha5_unofficial 
     4pkusers \- page de manuel de pkusers 1.25alpha7_unofficial 
    55.SH DESCRIPTION 
    6 pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
     6pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
    77.PP 
    88An Users and Groups Manager for PyKota. 
     
    3131\fB\-d\fR | \fB\-\-delete\fR 
    3232Deletes users from the quota storage. 
     33.TP 
     34\fB\-e\fR | \fB\-\-email\fR addr 
     35Sets the email address for the users. 
     36If the addr parameter begins with @, then 
     37the username is prepended to addr to form 
     38a valid email address. 
    3339.HP 
    3440\fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups. 
     
    140146cost of each print job will be multiplied by zero before charging 
    141147his account. 
     148.IP 
     149\f(CW$ pkusers --email @example.com\fR 
     150.IP 
     151This will set the email address for each user to username@example.com 
    142152.PP 
    143153This program is free software; you can redistribute it and/or modify 
  • pykota/trunk/man/th/pkusers.1

    r2910 r2937  
    22.TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands" 
    33.SH NOM 
    4 pkusers \- page de manuel de pkusers 1.25alpha5_unofficial 
     4pkusers \- page de manuel de pkusers 1.25alpha7_unofficial 
    55.SH DESCRIPTION 
    6 pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
     6pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
    77.PP 
    88An Users and Groups Manager for PyKota. 
     
    3131\fB\-d\fR | \fB\-\-delete\fR 
    3232Deletes users from the quota storage. 
     33.TP 
     34\fB\-e\fR | \fB\-\-email\fR addr 
     35Sets the email address for the users. 
     36If the addr parameter begins with @, then 
     37the username is prepended to addr to form 
     38a valid email address. 
    3339.HP 
    3440\fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups. 
     
    140146cost of each print job will be multiplied by zero before charging 
    141147his account. 
     148.IP 
     149\f(CW$ pkusers --email @example.com\fR 
     150.IP 
     151This will set the email address for each user to username@example.com 
    142152.PP 
    143153This program is free software; you can redistribute it and/or modify 
  • pykota/trunk/man/tr/pkusers.1

    r2910 r2937  
    22.TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands" 
    33.SH NOM 
    4 pkusers \- page de manuel de pkusers 1.25alpha5_unofficial 
     4pkusers \- page de manuel de pkusers 1.25alpha7_unofficial 
    55.SH DESCRIPTION 
    6 pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
     6pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
    77.PP 
    88An Users and Groups Manager for PyKota. 
     
    3131\fB\-d\fR | \fB\-\-delete\fR 
    3232Deletes users from the quota storage. 
     33.TP 
     34\fB\-e\fR | \fB\-\-email\fR addr 
     35Sets the email address for the users. 
     36If the addr parameter begins with @, then 
     37the username is prepended to addr to form 
     38a valid email address. 
    3339.HP 
    3440\fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups. 
     
    140146cost of each print job will be multiplied by zero before charging 
    141147his account. 
     148.IP 
     149\f(CW$ pkusers --email @example.com\fR 
     150.IP 
     151This will set the email address for each user to username@example.com 
    142152.PP 
    143153This program is free software; you can redistribute it and/or modify 
  • pykota/trunk/man/zh_TW/pkusers.1

    r2910 r2937  
    22.TH PKUSERS "1" "juin 2006" "C@LL - Conseil Internet & Logiciels Libres" "User Commands" 
    33.SH NOM 
    4 pkusers \- page de manuel de pkusers 1.25alpha5_unofficial 
     4pkusers \- page de manuel de pkusers 1.25alpha7_unofficial 
    55.SH DESCRIPTION 
    6 pkusers v1.25alpha5_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
     6pkusers v1.25alpha7_unofficial (c) 2003, 2004, 2005, 2006 Jerome Alet \- alet@librelogiciel.com 
    77.PP 
    88An Users and Groups Manager for PyKota. 
     
    3131\fB\-d\fR | \fB\-\-delete\fR 
    3232Deletes users from the quota storage. 
     33.TP 
     34\fB\-e\fR | \fB\-\-email\fR addr 
     35Sets the email address for the users. 
     36If the addr parameter begins with @, then 
     37the username is prepended to addr to form 
     38a valid email address. 
    3339.HP 
    3440\fB\-D\fR | \fB\-\-description\fR d Adds a textual description to users or groups. 
     
    140146cost of each print job will be multiplied by zero before charging 
    141147his account. 
     148.IP 
     149\f(CW$ pkusers --email @example.com\fR 
     150.IP 
     151This will set the email address for each user to username@example.com 
    142152.PP 
    143153This program is free software; you can redistribute it and/or modify 
  • pykota/trunk/NEWS

    r2929 r2937  
    2222PyKota NEWS : 
    2323        
     24    - 1.25alpha6 (2006-06-13) : 
     25     
     26        - pkusers now supports the --email command line switch. 
     27          The old method to set the email address is still supported, 
     28          but the new one allows the email address to be modified 
     29          as well. 
     30           
    2431    - 1.25alpha6 (2006-06-09) : 
    2532     
  • pykota/trunk/po/de/pykota.po

    r2909 r2937  
    12091209"                       \n" 
    12101210"  -d | --delete        Deletes users from the quota storage.\n" 
    1211 "  \n" 
     1211"\n" 
     1212"  -e | --email addr    Sets the email address for the users.\n" 
     1213"                       If the addr parameter begins with @, then\n" 
     1214"                       the username is prepended to addr to form\n" 
     1215"                       a valid email address.\n" 
     1216"\n" 
    12121217"  -D | --description d Adds a textual description to users or groups.\n" 
    12131218"                       \n" 
     
    13131318"  cost of each print job will be multiplied by zero before charging\n" 
    13141319"  his account.\n" 
     1320"\n" 
     1321"  $ pkusers --email @example.com\n" 
     1322"\n" 
     1323"  This will set the email address for each user to username@example.com\n" 
    13151324msgstr "" 
    13161325 
  • pykota/trunk/po/el_GR/pykota.po

    r2909 r2937  
    12101210"                       \n" 
    12111211"  -d | --delete        Deletes users from the quota storage.\n" 
    1212 "  \n" 
     1212"\n" 
     1213"  -e | --email addr    Sets the email address for the users.\n" 
     1214"                       If the addr parameter begins with @, then\n" 
     1215"                       the username is prepended to addr to form\n" 
     1216"                       a valid email address.\n" 
     1217"\n" 
    12131218"  -D | --description d Adds a textual description to users or groups.\n" 
    12141219"                       \n" 
     
    13141319"  cost of each print job will be multiplied by zero before charging\n" 
    13151320"  his account.\n" 
     1321"\n" 
     1322"  $ pkusers --email @example.com\n" 
     1323"\n" 
     1324"  This will set the email address for each user to username@example.com\n" 
    13161325msgstr "" 
    13171326 
  • pykota/trunk/po/es/pykota.po

    r2909 r2937  
    12261226"                       \n" 
    12271227"  -d | --delete        Deletes users from the quota storage.\n" 
    1228 "  \n" 
     1228"\n" 
     1229"  -e | --email addr    Sets the email address for the users.\n" 
     1230"                       If the addr parameter begins with @, then\n" 
     1231"                       the username is prepended to addr to form\n" 
     1232"                       a valid email address.\n" 
     1233"\n" 
    12291234"  -D | --description d Adds a textual description to users or groups.\n" 
    12301235"                       \n" 
     
    13301335"  cost of each print job will be multiplied by zero before charging\n" 
    13311336"  his account.\n" 
     1337"\n" 
     1338"  $ pkusers --email @example.com\n" 
     1339"\n" 
     1340"  This will set the email address for each user to username@example.com\n" 
    13321341msgstr "" 
    13331342 
  • pykota/trunk/po/fr/pykota.po

    r2909 r2937  
    18611861"                       \n" 
    18621862"  -d | --delete        Deletes users from the quota storage.\n" 
    1863 "  \n" 
     1863"\n" 
     1864"  -e | --email addr    Sets the email address for the users.\n" 
     1865"                       If the addr parameter begins with @, then\n" 
     1866"                       the username is prepended to addr to form\n" 
     1867"                       a valid email address.\n" 
     1868"\n" 
    18641869"  -D | --description d Adds a textual description to users or groups.\n" 
    18651870"                       \n" 
     
    19651970"  cost of each print job will be multiplied by zero before charging\n" 
    19661971"  his account.\n" 
     1972"\n" 
     1973"  $ pkusers --email @example.com\n" 
     1974"\n" 
     1975"  This will set the email address for each user to username@example.com\n" 
    19671976msgstr "" 
    19681977"pkusers v%(__version__)s (c) %(__years__)s %(__author__)s\n" 
     
    19891998"\n" 
    19901999"  -d | --delete        Efface des utilisateurs de la base de donn�.\n" 
     2000"\n" 
     2001"  -e | --email adr     Positionne l'adresse email des utilisateurs.\n" 
     2002"                       Si le param�e adr commence par @, alors\n" 
     2003"                       cette valeur est pr�x�par le nom d'utilisateur\n" 
     2004"                       pour former une adresse email valide.\n" 
    19912005"\n" 
    19922006"  -D | --description d Ajoute une description textuelle aux utilisateurs.\n" 
     
    21022116"  car le co� chaque job sera multipli�ar 0 avant de modifier le solde\n" 
    21032117"  de son compte.\n" 
     2118"\n" 
     2119"  $ pkusers --email @example.com\n" 
     2120"\n" 
     2121"  Ceci va fixer l'adresse email de chaque utilisateur �om@example.com\n" 
    21042122 
    21052123#, python-format 
  • pykota/trunk/po/it/pykota.po

    r2909 r2937  
    12121212"                       \n" 
    12131213"  -d | --delete        Deletes users from the quota storage.\n" 
    1214 "  \n" 
     1214"\n" 
     1215"  -e | --email addr    Sets the email address for the users.\n" 
     1216"                       If the addr parameter begins with @, then\n" 
     1217"                       the username is prepended to addr to form\n" 
     1218"                       a valid email address.\n" 
     1219"\n" 
    12151220"  -D | --description d Adds a textual description to users or groups.\n" 
    12161221"                       \n" 
     
    13161321"  cost of each print job will be multiplied by zero before charging\n" 
    13171322"  his account.\n" 
     1323"\n" 
     1324"  $ pkusers --email @example.com\n" 
     1325"\n" 
     1326"  This will set the email address for each user to username@example.com\n" 
    13181327msgstr "" 
    13191328 
  • pykota/trunk/po/nb_NO/pykota.po

    r2909 r2937  
    12191219"                       \n" 
    12201220"  -d | --delete        Deletes users from the quota storage.\n" 
    1221 "  \n" 
     1221"\n" 
     1222"  -e | --email addr    Sets the email address for the users.\n" 
     1223"                       If the addr parameter begins with @, then\n" 
     1224"                       the username is prepended to addr to form\n" 
     1225"                       a valid email address.\n" 
     1226"\n" 
    12221227"  -D | --description d Adds a textual description to users or groups.\n" 
    12231228"                       \n" 
     
    13231328"  cost of each print job will be multiplied by zero before charging\n" 
    13241329"  his account.\n" 
     1330"\n" 
     1331"  $ pkusers --email @example.com\n" 
     1332"\n" 
     1333"  This will set the email address for each user to username@example.com\n" 
    13251334msgstr "" 
    13261335 
  • pykota/trunk/po/pl/pykota.po

    r2909 r2937  
    16161616"                       \n" 
    16171617"  -d | --delete        Deletes users from the quota storage.\n" 
    1618 "  \n" 
     1618"\n" 
     1619"  -e | --email addr    Sets the email address for the users.\n" 
     1620"                       If the addr parameter begins with @, then\n" 
     1621"                       the username is prepended to addr to form\n" 
     1622"                       a valid email address.\n" 
     1623"\n" 
    16191624"  -D | --description d Adds a textual description to users or groups.\n" 
    16201625"                       \n" 
     
    17201725"  cost of each print job will be multiplied by zero before charging\n" 
    17211726"  his account.\n" 
     1727"\n" 
     1728"  $ pkusers --email @example.com\n" 
     1729"\n" 
     1730"  This will set the email address for each user to username@example.com\n" 
    17221731msgstr "" 
    17231732 
  • pykota/trunk/po/pt_BR/pykota.po

    r2909 r2937  
    12071207"                       \n" 
    12081208"  -d | --delete        Deletes users from the quota storage.\n" 
    1209 "  \n" 
     1209"\n" 
     1210"  -e | --email addr    Sets the email address for the users.\n" 
     1211"                       If the addr parameter begins with @, then\n" 
     1212"                       the username is prepended to addr to form\n" 
     1213"                       a valid email address.\n" 
     1214"\n" 
    12101215"  -D | --description d Adds a textual description to users or groups.\n" 
    12111216"                       \n" 
     
    13111316"  cost of each print job will be multiplied by zero before charging\n" 
    13121317"  his account.\n" 
     1318"\n" 
     1319"  $ pkusers --email @example.com\n" 
     1320"\n" 
     1321"  This will set the email address for each user to username@example.com\n" 
    13131322msgstr "" 
    13141323 
  • pykota/trunk/po/pt/pykota.po

    r2909 r2937  
    12101210"                       \n" 
    12111211"  -d | --delete        Deletes users from the quota storage.\n" 
    1212 "  \n" 
     1212"\n" 
     1213"  -e | --email addr    Sets the email address for the users.\n" 
     1214"                       If the addr parameter begins with @, then\n" 
     1215"                       the username is prepended to addr to form\n" 
     1216"                       a valid email address.\n" 
     1217"\n" 
    12131218"  -D | --description d Adds a textual description to users or groups.\n" 
    12141219"                       \n" 
     
    13141319"  cost of each print job will be multiplied by zero before charging\n" 
    13151320"  his account.\n" 
     1321"\n" 
     1322"  $ pkusers --email @example.com\n" 
     1323"\n" 
     1324"  This will set the email address for each user to username@example.com\n" 
    13161325msgstr "" 
    13171326 
  • pykota/trunk/po/pykota.pot

    r2909 r2937  
    11891189"                       \n" 
    11901190"  -d | --delete        Deletes users from the quota storage.\n" 
    1191 "  \n" 
     1191"\n" 
     1192"  -e | --email addr    Sets the email address for the users.\n" 
     1193"                       If the addr parameter begins with @, then\n" 
     1194"                       the username is prepended to addr to form\n" 
     1195"                       a valid email address.\n" 
     1196"\n" 
    11921197"  -D | --description d Adds a textual description to users or groups.\n" 
    11931198"                       \n" 
     
    12931298"  cost of each print job will be multiplied by zero before charging\n" 
    12941299"  his account.\n" 
     1300"\n" 
     1301"  $ pkusers --email @example.com\n" 
     1302"\n" 
     1303"  This will set the email address for each user to username@example.com\n" 
    12951304msgstr "" 
    12961305 
  • pykota/trunk/po/sv_SE/pykota.po

    r2909 r2937  
    12251225"                       \n" 
    12261226"  -d | --delete        Deletes users from the quota storage.\n" 
    1227 "  \n" 
     1227"\n" 
     1228"  -e | --email addr    Sets the email address for the users.\n" 
     1229"                       If the addr parameter begins with @, then\n" 
     1230"                       the username is prepended to addr to form\n" 
     1231"                       a valid email address.\n" 
     1232"\n" 
    12281233"  -D | --description d Adds a textual description to users or groups.\n" 
    12291234"                       \n" 
     
    13291334"  cost of each print job will be multiplied by zero before charging\n" 
    13301335"  his account.\n" 
     1336"\n" 
     1337"  $ pkusers --email @example.com\n" 
     1338"\n" 
     1339"  This will set the email address for each user to username@example.com\n" 
    13311340msgstr "" 
    13321341 
  • pykota/trunk/po/th/pykota.po

    r2909 r2937  
    12031203"                       \n" 
    12041204"  -d | --delete        Deletes users from the quota storage.\n" 
    1205 "  \n" 
     1205"\n" 
     1206"  -e | --email addr    Sets the email address for the users.\n" 
     1207"                       If the addr parameter begins with @, then\n" 
     1208"                       the username is prepended to addr to form\n" 
     1209"                       a valid email address.\n" 
     1210"\n" 
    12061211"  -D | --description d Adds a textual description to users or groups.\n" 
    12071212"                       \n" 
     
    13071312"  cost of each print job will be multiplied by zero before charging\n" 
    13081313"  his account.\n" 
     1314"\n" 
     1315"  $ pkusers --email @example.com\n" 
     1316"\n" 
     1317"  This will set the email address for each user to username@example.com\n" 
    13091318msgstr "" 
    13101319 
  • pykota/trunk/po/tr/pykota.po

    r2909 r2937  
    12151215"                       \n" 
    12161216"  -d | --delete        Deletes users from the quota storage.\n" 
    1217 "  \n" 
     1217"\n" 
     1218"  -e | --email addr    Sets the email address for the users.\n" 
     1219"                       If the addr parameter begins with @, then\n" 
     1220"                       the username is prepended to addr to form\n" 
     1221"                       a valid email address.\n" 
     1222"\n" 
    12181223"  -D | --description d Adds a textual description to users or groups.\n" 
    12191224"                       \n" 
     
    13191324"  cost of each print job will be multiplied by zero before charging\n" 
    13201325"  his account.\n" 
     1326"\n" 
     1327"  $ pkusers --email @example.com\n" 
     1328"\n" 
     1329"  This will set the email address for each user to username@example.com\n" 
    13211330msgstr "" 
    13221331 
  • pykota/trunk/po/zh_TW/pykota.po

    r2909 r2937  
    11951195"                       \n" 
    11961196"  -d | --delete        Deletes users from the quota storage.\n" 
    1197 "  \n" 
     1197"\n" 
     1198"  -e | --email addr    Sets the email address for the users.\n" 
     1199"                       If the addr parameter begins with @, then\n" 
     1200"                       the username is prepended to addr to form\n" 
     1201"                       a valid email address.\n" 
     1202"\n" 
    11981203"  -D | --description d Adds a textual description to users or groups.\n" 
    11991204"                       \n" 
     
    12991304"  cost of each print job will be multiplied by zero before charging\n" 
    13001305"  his account.\n" 
     1306"\n" 
     1307"  $ pkusers --email @example.com\n" 
     1308"\n" 
     1309"  This will set the email address for each user to username@example.com\n" 
    13011310msgstr "" 
    13021311 
  • pykota/trunk/pykota/storage.py

    r2880 r2937  
    104104        """Sets the user's overcharging coefficient.""" 
    105105        self.OverCharge = factor 
     106        self.isDirty = True 
     107         
     108    def setEmail(self, email) :     
     109        """Sets the user's email address.""" 
     110        self.Email = email 
    106111        self.isDirty = True 
    107112         
  • pykota/trunk/pykota/version.py

    r2919 r2937  
    2222# 
    2323 
    24 __version__ = "1.25alpha6_unofficial" 
     24__version__ = "1.25alpha7_unofficial" 
    2525 
    2626__doc__ = "PyKota : a complete Printing Quota Solution for CUPS." 
  • pykota/trunk/TODO

    r2917 r2937  
    2222TODO, in no particular order : 
    2323         
    24         - Add a --email command line option to pkusers, to allow 
    25           modification of an existing email address. 
    26            
    2724        - Add a pkrefund command line tool & optional CGI script. 
    2825