This commit was manufactured by cvs2svn to create tag 'freeside_2_1_0'.

[freeside.git] / FS / FS / otaker_Mixin.pm

diff --git a/FS/FS/otaker_Mixin.pm b/FS/FS/otaker_Mixin.pm
index 0da9aee..071958c 100644 (file)
--- a/FS/FS/otaker_Mixin.pm
+++ b/FS/FS/otaker_Mixin.pm
@@ -9,15 +9,8 @@ sub otaker {
   my $self = shift;
   if ( scalar(@_) ) { #set
     my $otaker = shift;
-    my $access_user = qsearchs('access_user', { 'username' => $otaker } );
-    if ( !$access_user && $otaker =~ /^(.+), (.+)$/ ) { #same as below..
-      my($lastname, $firstname) = ($1, $2);
-      $otaker = lc($firstname.$lastname);
-      $access_user =  qsearchs('access_user', { 'first' => $firstname, 
-                                                'last'  => $lastname  } )
-                   || qsearchs('access_user', { 'username' => $otaker } );
-    }
-    croak "can't set otaker: $otaker not found!" unless $access_user; #confess?
+    my $access_user = qsearchs('access_user', { 'username' => $otaker } )
+      or croak "can't set otaker: $otaker not found!"; #confess?
     $self->usernum( $access_user->usernum );
     $otaker; #not sure return is used anywhere, but just in case
   } else { #get
@@ -40,30 +33,22 @@ sub _upgrade_otaker {
   my $class = shift;
   my $table = $class->table;
 
-  my $limit = ( $table eq 'cust_attachment' ? 10 : 1000 );
-
   while ( 1 ) {
     my @records = qsearch({
                     'table'     => $table,
                     'hashref'   => {},
-                    'extra_sql' => "WHERE otaker IS NOT NULL LIMIT $limit",
+                    'extra_sql' => 'WHERE otaker IS NOT NULL LIMIT 1000',
                   });
     last unless @records;
 
     foreach my $record (@records) {
       eval { $record->otaker($record->otaker) };
       if ( $@ ) {
-        my $username = $record->otaker;
-        my($lastname, $firstname) = ( 'User', 'Legacy' );
-        if ( $username =~ /^(.+), (.+)$/ ) {
-          ($lastname, $firstname) = ($1, $2);
-          $username = lc($firstname.$lastname);
-        }
         my $access_user = new FS::access_user {
-          'username'  => $username,
+          'username'  => $record->otaker,
           '_password' => 'CHANGEME',
-          'first'     => $firstname,
-          'last'      => $lastname,
+          'first'     => 'Legacy',
+          'last'      => 'User',
           'disabled'  => 'Y',
         };
         my $error = $access_user->insert;