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

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
old mode 100644
new mode 100755
index 3ec2e72cd..6b4becb5f
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,46 +1,15 @@
 #!/usr/bin/perl -w
-#
-# $Id: freeside-adduser,v 1.11 2006-06-30 14:30:26 ivan Exp $
 
 use strict;
-use vars qw($opt_h $opt_b $opt_c $opt_g);
+use vars qw($opt_s $opt_g $opt_n);
 use Fcntl qw(:flock);
 use Getopt::Std;
 
-my $FREESIDE_CONF = "/usr/local/etc/freeside";
+my $FREESIDE_CONF = "%%%FREESIDE_CONF%%%";
 
-getopts("bch:g:");
-die &usage if $opt_c && ! $opt_h;
+getopts("g:");
 my $user = shift or die &usage;
-
-#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;
-#}
-
-if ( $opt_h ) {
-  my @args = ( 'htpasswd' );
-  push @args, '-b' if $opt_b;
-  push @args, '-c' if $opt_c;
-  push @args, $opt_h, $user;
-  push @args, shift if $opt_b;
-  system(@args) == 0 or die "htpasswd failed: $?";
-}
-
-#my $secretfile = $opt_s || 'secrets';
-#
-#open(MAPSECRETS,">>$FREESIDE_CONF/mapsecrets")
-#  and flock(MAPSECRETS,LOCK_EX)
-#    or die "can't open $FREESIDE_CONF/mapsecrets: $!";
-#print MAPSECRETS "$user $secretfile\n";
-#close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
-
-###
+my $password = shift;
 
 use FS::UID qw(adminsuidsetup);
 use FS::CurrentUser;
@@ -53,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;
 
@@ -74,7 +43,7 @@ if ( $opt_g ) {
 ###
 
 sub usage {
-  die "Usage:\n\n  freeside-adduser [ -h htpasswd_file [ -c ] [ -b ] ] [ -g groupnum ] username"
+  die "Usage:\n\n  freeside-adduser [ -g groupnum ] username [ password ]"
 }
 
 =head1 NAME
@@ -83,24 +52,21 @@ freeside-adduser - Command line interface to add (freeside) users.
 
 =head1 SYNOPSIS
 
-  freeside-adduser [ -h htpasswd_file [ -c ] ] -g 1 username
+  freeside-adduser [ -g groupnum ] username [ password ]
 
 =head1 DESCRIPTION
 
 Adds a user to the Freeside billing system.  This is for adding users (internal
 sales/tech folks) to the web interface, not for adding customer accounts.
 
-  -h: Also call htpasswd for this user with the given filename
-
-  -c: Passed to htpasswd(1)
-
-  -b: same as htpasswd(1), probably insecure, not recommended
+This functionality is now available in the web interface as well, under
+B<Configuration | Employees | View/Edit employees>.
 
   -g: initial groupnum
 
 =head1 SEE ALSO
 
-L<htpasswd>(1), base Freeside documentation
+Base Freeside documentation
 
 =cut