adding freeside-addgroup

[freeside.git] / FS / bin / freeside-adduser

diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index 4517a83..0d8b454 100644 (file)
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -1,30 +1,78 @@
 #!/usr/bin/perl -w
-#
-# $Id: freeside-adduser,v 1.1 2001-10-30 10:20:32 ivan Exp $
 
 use strict;
-use vars qw($opt_h $opt_c);
+use vars qw($opt_h $opt_b $opt_c $opt_g);
+use Fcntl qw(:flock);
 use Getopt::Std;
 
 my $FREESIDE_CONF = "/usr/local/etc/freeside";
 
-getopts("ch:");
+getopts("bch:g:");
 die &usage if $opt_c && ! $opt_h;
-my $secretfile = shift or die &usage;
 my $user = shift or die &usage;
 
-my @args = ( 'htpasswd' );
-push @args, '-c' if $opt_c;
-push @args, $opt_h, $user;
-system(@args) == 0 or die "htpasswd failed: $?";
+#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: $!";
+
+###
+
+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 ) {
+
+  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;
+
+}
 
-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: $!";
+###
 
 sub usage {
-  die "Usage:\n\n  freeside-adduser [ -h htpasswd_file [ -c ] ] secretfile username"
+  die "Usage:\n\n  freeside-adduser [ -h htpasswd_file [ -c ] [ -b ] ] [ -g groupnum ] username"
 }
 
 =head1 NAME
@@ -33,20 +81,24 @@ freeside-adduser - Command line interface to add (freeside) users.
 
 =head1 SYNOPSIS
 
-  freeside-adduser [ -h htpasswd_file [ -c ] ] username
+  freeside-adduser [ -h htpasswd_file [ -c ] ] -g 1 username
 
-=head DESCRIPTION
+=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
+  -c: Passed to htpasswd(1)
+
+  -b: same as htpasswd(1), probably insecure, not recommended
+
+  -g: initial groupnum
 
 =head1 SEE ALSO
 
-L<htpasswd>, base Freeside documentation
+L<htpasswd>(1), base Freeside documentation
 
 =cut