X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-adduser;h=6b4becb5fde045a2ff4229e2bfa0ee75c9bf7141;hp=530481377df7ca66f793a82136ff09fba1839b8e;hb=1f1190b8fb6d06852dbd16c6a288f9acd9cc83dd;hpb=b5c4237a34aef94976bc343c8d9e138664fc3984

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
old mode 100644
new mode 100755
index 530481377..6b4becb5f
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -7,45 +7,9 @@ use Getopt::Std;
 
 my $FREESIDE_CONF = "%%%FREESIDE_CONF%%%";
 
-getopts("s:g:n");
+getopts("g:");
 my $user = shift or die &usage;
-
-if ( $opt_s ) {
-
-  #if ( -e "$FREESIDE_CONF/mapsecrets" ) {
-  #  open(MAPSECRETS,"<$FREESIDE_CONF/mapsecrets")
-  #    or die "can't open $FREESIDE_CONF/mapsecrets: $!";
-  #  while (<MAPSECRETS>) {
-  #    /^(\S+) / or die "unparsable line in mapsecrets: $_";
-  #    die "user $user already exists\n" if $user eq $1;
-  #  }
-  #  close MAPSECRETS;
-  #}
-
-  #insert new entry before a wildcard...
-  open(MAPSECRETS,"<$FREESIDE_CONF/mapsecrets")
-    and flock(MAPSECRETS,LOCK_EX)
-      or die "can't open $FREESIDE_CONF/mapsecrets: $!";
-  open(NEW,">$FREESIDE_CONF/mapsecrets.new")
-    or die "can't open $FREESIDE_CONF/mapsecrets.new: $!";
-  while(<MAPSECRETS>) {
-    if ( /^\*\s/ ) {
-      print NEW "$user $opt_s\n";
-    }
-    print NEW $_;
-  }
-  close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
-  close NEW or die "can't close $FREESIDE_CONF/mapsecrets.new: $!";
-  rename("$FREESIDE_CONF/mapsecrets.new", "$FREESIDE_CONF/mapsecrets")
-    or die "can't move mapsecrets.new into place: $!";
-
-}
-
-###
-
-exit if $opt_n;
-
-###
+my $password = shift;
 
 use FS::UID qw(adminsuidsetup);
 use FS::CurrentUser;
@@ -58,10 +22,10 @@ adminsuidsetup $user;
 
 my $access_user = new FS::access_user {
   'username'  => $user,
-  '_password' => 'notyet',
   'first'     => 'Firstname', # $opt_f || 
   'last'      => 'Lastname',  # $opt_l || 
 };
+$access_user->change_password_fields($password) if length($password);
 my $au_error = $access_user->insert;
 die $au_error if $au_error;
 
@@ -79,7 +43,7 @@ if ( $opt_g ) {
 ###
 
 sub usage {
-  die "Usage:\n\n  freeside-adduser [ -n ] [ -s ] [ -g groupnum ] username [ password ]"
+  die "Usage:\n\n  freeside-adduser [ -g groupnum ] username [ password ]"
 }
 
 =head1 NAME
@@ -88,7 +52,7 @@ freeside-adduser - Command line interface to add (freeside) users.
 
 =head1 SYNOPSIS
 
-  freeside-adduser [ -n ] [ -s ] [ -g groupnum ] username [ password ]
+  freeside-adduser [ -g groupnum ] username [ password ]
 
 =head1 DESCRIPTION
 
@@ -100,17 +64,6 @@ B<Configuration | Employees | View/Edit employees>.
 
   -g: initial groupnum
 
-  Development/multi-DB options:
-
-  -s: alternate secrets file
-
-  -n: no ACL added, for bootstrapping
-
-=head1 NOTE
-
-No explicit htpasswd options are available in 1.7 - passwords are now
-maintained automatically.
-
 =head1 SEE ALSO
 
 Base Freeside documentation