From 56647e75e19401bbe7c4e2a9647b7487c8c450a5 Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 29 Dec 2005 16:23:42 +0000
Subject: [PATCH] a little tidying.. more to come

git-svn-id: svn://svn.open-ils.org/ILS/trunk@2548 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../src/perlmods/OpenILS/Application/Actor.pm | 26 ++++---------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
index ea802c8bb7..cb80da6af0 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
@@ -226,15 +226,10 @@ __PACKAGE__->register_method(
 
 sub user_retrieve_fleshed_by_id {
 	my( $self, $client, $user_session, $user_id ) = @_;
-	my $user_obj = $apputils->check_user_session( $user_session ); 
-
-	if(!defined($user_id)) { $user_id = $user_obj->id; }
 
-	if( $user_obj->id ne $user_id ) {
-		if($apputils->check_user_perms($user_obj->id, $user_obj->home_ou, "VIEW_USER")) {
-			return OpenILS::Perm->new("VIEW_USER");
-		}
-	}
+	my( $requestor, $target, $evt ) = $apputils->
+		checkses_requestor( $user_session, $user_id, 'VIEW_USER' );
+	return $evt if $evt;
 
 	return flesh_user($user_id);
 }
@@ -277,17 +272,8 @@ sub flesh_user {
 	$user->addresses( $add_req->gather(1) );
 
 	for my $c(@{$user->addresses}) {
-		if($c->id == $user->billing_address || $c->id eq $user->billing_address ) {
-			warn "Setting my address to " . $c->id . "\n";
-			$user->billing_address($c);
-		}
-	}
-
-	for my $c(@{$user->addresses}) {
-		if($c->id == $user->mailing_address || $c->id eq $user->mailing_address ) {
-			warn "Setting my address to " . $c->id . "\n";
-			$user->mailing_address($c);
-		}
+		if($c->id eq $user->billing_address ) { $user->billing_address($c); }
+		if($c->id eq $user->mailing_address ) { $user->mailing_address($c); }
 	}
 
 	my $stat_req = $session->request(
@@ -297,10 +283,8 @@ sub flesh_user {
 
 	if($kill) { $session->disconnect(); }
 	$user->clear_passwd();
-	warn Dumper $user;
 
 	return $user;
-
 }
 
 
-- 
2.43.2