projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import of rt 3.0.9
[freeside.git]
/
rt
/
lib
/
RT
/
User_Overlay.pm
diff --git
a/rt/lib/RT/User_Overlay.pm
b/rt/lib/RT/User_Overlay.pm
index
e828ebd
..
ba322cd
100644
(file)
--- a/
rt/lib/RT/User_Overlay.pm
+++ b/
rt/lib/RT/User_Overlay.pm
@@
-203,14
+203,16
@@
sub Create {
@_ # get the real argumentlist
);
@_ # get the real argumentlist
);
-
- $args{'EmailAddress'} = $self->CanonicalizeEmailAddress($args{'EmailAddress'});
-
#Check the ACL
unless ( $self->CurrentUser->HasRight(Right => 'AdminUsers', Object => $RT::System) ) {
return ( 0, $self->loc('No permission to create users') );
}
#Check the ACL
unless ( $self->CurrentUser->HasRight(Right => 'AdminUsers', Object => $RT::System) ) {
return ( 0, $self->loc('No permission to create users') );
}
+ $args{'EmailAddress'} = $self->CanonicalizeEmailAddress($args{'EmailAddress'});
+ # if the user doesn't have a name defined, set it to the email address
+ $args{'Name'} = $args{'EmailAddress'} unless ($args{'Name'});
+
+
# Privileged is no longer a column in users
my $privileged = $args{'Privileged'};
# Privileged is no longer a column in users
my $privileged = $args{'Privileged'};
@@
-234,7
+236,9
@@
sub Create {
#TODO Specify some sensible defaults.
#TODO Specify some sensible defaults.
- unless ( defined( $args{'Name'} ) ) {
+ unless ( $args{'Name'} ) {
+ use Data::Dumper;
+ $RT::Logger->crit(Dumper \%args);
return ( 0, $self->loc("Must specify 'Name' attribute") );
}
return ( 0, $self->loc("Must specify 'Name' attribute") );
}
@@
-274,6
+278,7
@@
sub Create {
#If the create failed.
unless ($id) {
#If the create failed.
unless ($id) {
+ $RT::Handle->Rollback();
$RT::Logger->error("Could not create a new user - " .join('-'. %args));
return ( 0, $self->loc('Could not create user') );
$RT::Logger->error("Could not create a new user - " .join('-'. %args));
return ( 0, $self->loc('Could not create user') );
@@
-729,7
+734,7
@@
sub ResetPassword {
my $template = RT::Template->new( $self->CurrentUser );
my $template = RT::Template->new( $self->CurrentUser );
- if ( $self->
Is
Privileged ) {
+ if ( $self->Privileged ) {
$template->LoadGlobalTemplate('RT_PasswordChange_Privileged');
}
else {
$template->LoadGlobalTemplate('RT_PasswordChange_Privileged');
}
else {
@@
-929,7
+934,7
@@
sub GenerateRandomPassword {
my $length = $min_length + int( rand( $max_length - $min_length ) );
my $length = $min_length + int( rand( $max_length - $min_length ) );
- my $char = $self->GenerateRandomNextChar( $total_sum, $start_freq );
+ my $char = $self->
_
GenerateRandomNextChar( $total_sum, $start_freq );
my @word = ( $char + $a );
for ( 2 .. $length ) {
$char =
my @word = ( $char + $a );
for ( 2 .. $length ) {
$char =