diff --git a/scripts/capisuitefax.in b/scripts/capisuitefax.in index 5ad394f..2e53e46 100755 --- a/scripts/capisuitefax.in +++ b/scripts/capisuitefax.in @@ -4,7 +4,7 @@ # --------------------------------------------------- # copyright : (C) 2002 by Gernot Hillier # email : gernot@hillier.de -# version : $Revision: 1.4 $ +# version : $Revision: 1.5 $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -140,7 +140,8 @@ if (user==""): if (not config.has_section(user)): print "Sorry, you're no valid user for CapiSuite" sys.exit(1) -if (not config.has_option(user,"fax_numbers")): + +if ((cs_helpers.getOption(config,user,"outgoing_MSN","")=="") and (config.get(user,"fax_numbers","")=="")): print "Sorry, you're not allowed to use fax services" sys.exit(1) diff --git a/scripts/fax.confin b/scripts/fax.confin index 625de1a..962872b 100644 --- a/scripts/fax.confin +++ b/scripts/fax.confin @@ -1,4 +1,4 @@ -# $Id: fax.confin,v 1.7 2003/04/25 10:34:28 gernot Exp $ +# $Id: fax.confin,v 1.8 2003/06/19 14:56:20 gernot Exp $ # # This is the fax configuration file for the scripts distributed with CapiSuite # @@ -19,7 +19,7 @@ # # The file is split in sections starting with "[sectionname]". The section # [GLOBAL] contains all options common for all users. For each different user, -# an own section is used which must at least contain "fax_numbers" +# an own section is used. # # Nearly all options are available in the [GLOBAL] section and # the user sections. The defaults from the global section can be overwritten in @@ -75,7 +75,8 @@ send_controller="1" # outgoing_MSN (optional, default is empty) # # The MSN (number) to use for outgoing calls. You can also leave this empty. -# Then the first number of fax_numbers will be used as outgoing MSN. +# Then the first number of fax_numbers will be used as outgoing MSN. If this +# one is empty, too, the user can't send faxes. outgoing_MSN="" # outgoing_timeout (optional, defaults to 60)