|| $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 $newpass = $cgi->param('clear_password');
+ if ( !$old or ! $old->check_password($newpass) ) {
+ # then the password is being changed
+ $error ||= $new->is_password_allowed($newpass)
+ || $new->set_password($newpass);
+ }
}
if ( ! $error ) {
my $export_info = FS::part_export::export_info();
- my @svc_export_machine =
+ my @child_objects =
map FS::svc_export_machine->new({
'svcnum' => $svcnum,
'exportnum' => $_->exportnum,
grep { $_->machine eq '_SVC_MACHINE' }
$part_svc->part_export;
+ if ( $part_svc->has_router ) {
+ my $router = FS::router->new({
+ map { $_ => $cgi->param("router_$_") }
+ qw( routernum routername blocknum )
+ });
+ if (length($router->routername) == 0) {
+ #sensible default
+ $router->set('routername', $new->label);
+ }
+ if (length($router->blocknum) == 0) {
+ #unset it
+ $router->set('blocknum', 0);
+ }
+ push @child_objects, $router;
+ }
+
+
if ( $svcnum ) {
foreach ( grep { $old->$_ != $new->$_ }
qw( seconds upbytes downbytes totalbytes )
$error ||= $new->set_usage(\%hash); #unoverlimit and trigger radius changes
last; #once is enough
}
- $error ||= $new->replace($old, 'child_objects'=>\@svc_export_machine);
+ $error ||= $new->replace($old, 'child_objects'=>\@child_objects);
} else {
- $error ||= $new->insert('child_objects'=>\@svc_export_machine);
+ $error ||= $new->insert('child_objects'=>\@child_objects);
$svcnum = $new->svcnum;
}
}