X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fsvc_acct.cgi;h=515d89e91a6cdb5cf7dc8358970cd6c73e74e3ba;hb=43e42a04ae37ca7a84c05d9ff8b94d9f8cde6dcf;hp=950a8602fb1b550a418b8295b85eb43d7aef8519;hpb=5fc8c5edf574ab024d4646914b6432d458e2ffbd;p=freeside.git

diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi
index 950a8602f..515d89e91 100755
--- a/httemplate/edit/process/svc_acct.cgi
+++ b/httemplate/edit/process/svc_acct.cgi
@@ -1,7 +1,17 @@
-<%
+%if ( $error ) {
+%  $cgi->param('error', $error);
+<% $cgi->redirect(popurl(2). "svc_acct.cgi?". $cgi->query_string ) %>
+%} else {
+<% $cgi->redirect(popurl(3). "view/svc_acct.cgi?" . $svcnum ) %>
+%}
+<%init>
+use CGI::Carp;
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Provision customer service'); #something else more specific?
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my $svcnum = $1;
+my $error;
 
 my $old;
 if ( $svcnum ) {
@@ -14,36 +24,44 @@ if ( $svcnum ) {
 #unmunge popnum
 $cgi->param('popnum', (split(/:/, $cgi->param('popnum') ))[0] );
 
-#unmunge passwd
-if ( $cgi->param('_password') eq '*HIDDEN*' ) {
-  die "fatal: no previous account to recall hidden password from!" unless $old;
-  $cgi->param('_password',$old->getfield('_password'));
-}
-
 #unmunge usergroup
 $cgi->param('usergroup', [ $cgi->param('radius_usergroup') ] );
 
-my $new = new FS::svc_acct ( {
-  map {
-    $_, scalar($cgi->param($_));
+#unmunge bytecounts
+foreach (map { $_,$_."_threshold" } qw( upbytes downbytes totalbytes )) {
+  $cgi->param($_, FS::UI::bytecount::parse_bytecount($cgi->param($_)) );
+}
+
+my %hash = $svcnum ? $old->hash : ();
+map {
+    $hash{$_} = scalar($cgi->param($_));
   #} qw(svcnum pkgnum svcpart username _password popnum uid gid finger dir
   #  shell quota slipip)
-  } ( fields('svc_acct'), qw( pkgnum svcpart usergroup ) )
-} );
+  } (fields('svc_acct'), qw ( pkgnum svcpart usergroup ));
+my $new = new FS::svc_acct ( \%hash );
+
+$new->_password($old->_password) if $old;
+if(  $cgi->param('clear_password') eq '*HIDDEN*'
+  or $cgi->param('clear_password') =~ /^\(.* encrypted\)$/ ) {
+  die "fatal: no previous account to recall hidden password from!" unless $old;
+} 
+else {
+  $error = $new->set_password($cgi->param('clear_password'));
+}
 
-my $error;
 if ( $svcnum ) {
-  $error = $new->replace($old);
+  foreach (grep { $old->$_ != $new->$_ } qw( seconds upbytes downbytes totalbytes )) {
+    my %hash = map { $_ => $new->$_ } 
+               grep { $new->$_ }
+               qw( seconds upbytes downbytes totalbytes );
+
+    $error = $new->set_usage(\%hash);  #unoverlimit and trigger radius changes
+    last;                              #once is enough
+  }
+  $error ||= $new->replace($old);
 } else {
   $error = $new->insert;
   $svcnum = $new->svcnum;
 }
 
-if ( $error ) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "svc_acct.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/svc_acct.cgi?" . $svcnum );
-}
-
-%>
+</%init>