X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-adduser;h=530481377df7ca66f793a82136ff09fba1839b8e;hp=424123226c29356512809635d8f0f0b9b4a030df;hb=17a8b72b78ba455b58d53731fe557a471e0f2947;hpb=3dc9eeed220e7f7adbf08526f109a190deb3f552

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
old mode 100644
new mode 100755
index 424123226..530481377
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,35 +1,85 @@
 #!/usr/bin/perl -w
-#
-# $Id: freeside-adduser,v 1.7 2002-08-25 01:16:30 ivan Exp $
 
 use strict;
-use vars qw($opt_h $opt_b $opt_c $opt_s);
+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:s:");
-die &usage if $opt_c && ! $opt_h;
+getopts("s:g:n");
 my $user = shift or die &usage;
 
-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: $?";
+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: $!";
+
 }
 
-my $secretfile = $opt_s || 'secrets';
+###
+
+exit if $opt_n;
+
+###
+
+use FS::UID qw(adminsuidsetup);
+use FS::CurrentUser;
+use FS::access_user;
+use FS::access_usergroup;
+
+$FS::CurrentUser::upgrade_hack = 1;
+#adminsuidsetup $rootuser;
+adminsuidsetup $user;
+
+my $access_user = new FS::access_user {
+  'username'  => $user,
+  '_password' => 'notyet',
+  'first'     => 'Firstname', # $opt_f || 
+  'last'      => 'Lastname',  # $opt_l || 
+};
+my $au_error = $access_user->insert;
+die $au_error if $au_error;
+
+if ( $opt_g ) {
 
-open(MAPSECRETS,">>$FREESIDE_CONF/mapsecrets")
-  or die "can't open $FREESIDE_CONF/mapsecrets: $!";
-print MAPSECRETS "$user $secretfile\n";
-close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
+  my $access_usergroup = new FS::access_usergroup {
+    'usernum'  => $access_user->usernum,
+    'groupnum' => $opt_g,
+  };
+  my $aug_error = $access_usergroup->insert;
+  die $aug_error if $aug_error;
+
+}
+
+###
 
 sub usage {
-  die "Usage:\n\n  freeside-adduser [ -h htpasswd_file [ -c ] [ -b ] ] [ -s secretfile ] username"
+  die "Usage:\n\n  freeside-adduser [ -n ] [ -s ] [ -g groupnum ] username [ password ]"
 }
 
 =head1 NAME
@@ -38,24 +88,32 @@ freeside-adduser - Command line interface to add (freeside) users.
 
 =head1 SYNOPSIS
 
-  freeside-adduser [ -h htpasswd_file [ -c ] ] [ -s secretfile ] username
+  freeside-adduser [ -n ] [ -s ] [ -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
+This functionality is now available in the web interface as well, under
+B<Configuration | Employees | View/Edit employees>.
+
+  -g: initial groupnum
+
+  Development/multi-DB options:
+
+  -s: alternate secrets file
 
-  -c: Passed to htpasswd(1)
+  -n: no ACL added, for bootstrapping
 
-  -s: Specify an alternate secret file
+=head1 NOTE
 
-  -b: same as htpasswd(1), probably insecure, not recommended
+No explicit htpasswd options are available in 1.7 - passwords are now
+maintained automatically.
 
 =head1 SEE ALSO
 
-L<htpasswd>(1), base Freeside documentation
+Base Freeside documentation
 
 =cut