X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fshellcommands_withdomain.pm;h=7c5d9045f8b1bdf84e16616d5b150dfac40ae9c8;hb=c545a57d21341c49674defed65a4243f07b5ebaf;hp=4f1b25bc44200010eceed21c5f63da9d8023cd89;hpb=4e4a935e10dad30648d9d9ebb2069ca80217dc72;p=freeside.git

diff --git a/FS/FS/part_export/shellcommands_withdomain.pm b/FS/FS/part_export/shellcommands_withdomain.pm
index 4f1b25bc4..7c5d9045f 100644
--- a/FS/FS/part_export/shellcommands_withdomain.pm
+++ b/FS/FS/part_export/shellcommands_withdomain.pm
@@ -29,9 +29,12 @@ tie my %options, 'Tie::IxHash',
                        type =>'textarea',
                        #default=>"$_password\n$_password\n",
                      },
-  'usermod_pwonly' => { label=>'Disallow username changes',
+  'usermod_pwonly' => { label=>'Disallow username, domain, uid, dir and RADIUS group changes',
                         type =>'checkbox',
                       },
+  'usermod_nousername' => { label=>'Disallow just username changes',
+                            type =>'checkbox',
+                          },
   'suspend' => { label=>'Suspension command',
                  default=>'',
                },
@@ -44,6 +47,10 @@ tie my %options, 'Tie::IxHash',
   'unsuspend_stdin' => { label=>'Unsuspension command STDIN',
                          default=>'',
                        },
+  'crypt' => { label   => 'Default password encryption',
+               type=>'select', options=>[qw(crypt md5)],
+               default => 'crypt',
+             },
 ;
 
 %info = (
@@ -73,7 +80,7 @@ the same username with different domains.  You will need to
     this.form.useradd_stdin.value = "";
     this.form.userdel.value = "/usr/local/ispman/bin/ispman.delUser -d $domain $username";
     this.form.userdel_stdin.value="";
-    this.form.usermod.value = "/usr/local/ispman/bin/ispman.passwd.user $username\\\@$domain $new_quoted_password";
+    this.form.usermod.value = "/usr/local/ispman/bin/ispman.passwd.user $new_username\\\@$new_domain $new_quoted_password";
     this.form.usermod_stdin.value = "";
     this.form.usermod_pwonly.checked = true;
   '>
@@ -85,8 +92,8 @@ The following variables are available for interpolation (prefixed with
   <LI><code>$username</code>
   <LI><code>$domain</code>
   <LI><code>$_password</code>
-  <LI><code>$quoted_password</code> - unencrypted password quoted for the shell
-  <LI><code>$crypt_password</code> - encrypted password
+  <LI><code>$quoted_password</code> - unencrypted password, already quoted for the shell (do not add additional quotes)
+  <LI><code>$crypt_password</code> - encrypted password, already quoted for the shell (do not add additional quotes)
   <LI><code>$uid</code>
   <LI><code>$gid</code>
   <LI><code>$finger</code> - GECOS, already quoted for the shell (do not add additional quotes)