Ticket #3569: RequestCopy_name_and_org.patch

perl_lib/EPrints/Plugin/Screen/Public/RequestCopy.pm

@@ -94 +94 @@
         my $session = $self->{session};
 
         my $email = $session->param( "requester_email" );
+        my $org = $session->param( "requester_org" );
+        my $given = $session->param( "requester_name_given" );
+        my $family = $session->param( "requester_name_family" );
+        my $reason = $session->param( "reason" );
+
+        unless( defined $email && $email ne "" 
+                && EPrints::Utils::is_set( $org ) 
+                && EPrints::Utils::is_set( $given ) 
+                && EPrints::Utils::is_set( $family ) 
+        )
+        {
+                $self->{processor}->{requester_email} = $email if EPrints::Utils::is_set( $email );
+                $self->{processor}->{requester_org} = $org if EPrints::Utils::is_set( $org );
+                $self->{processor}->{requester_name_given} = $given if EPrints::Utils::is_set( $given );
+                $self->{processor}->{requester_name_family} = $family if EPrints::Utils::is_set( $family );
+                $self->{processor}->{reason} = $reason if EPrints::Utils::is_set( $reason );
 
-        unless( defined $email && $email ne "" )
-        {
                 $self->{processor}->add_message( "error", $session->html_phrase( "request:no_email" ) );
                 return;
         }
@@ -111 +125 @@
         $data->{docid} = $doc->get_id if defined $doc;
         $data->{requester_email} = $email;
         $data->{email} = $contact_email;
+        $data->{requester_org} = $org;
+        $data->{requester_name} = {
+                given => $given,
+                family => $family,
+        };
 
         my $user = EPrints::DataObj::User::user_with_email( $session, $contact_email );
         $data->{userid} = $user->get_id if defined $user;
 
-        my $reason = $session->param( "reason" );
         $data->{reason} = $reason if EPrints::Utils::is_set( $reason );
 
         my $request = $session->get_repository->get_dataset( "request" )->create_object( $session, $data );
@@ -141 +159 @@
 
         # Send request email
         my $subject = $session->phrase( "request/request_email:subject", eprint => $eprint->get_value( "title" ) );
+        my $requester_details = $session->html_phrase( "request/request_email:requester_details",
+                name => $session->make_text( EPrints::Utils::make_name_string( $request->get_value( "requester_name" ), 1 ) ),
+                email => $request->render_value( "requester_email" ),
+                org => $request->render_value( "requester_org" ),
+        );
         my $mail = $session->make_element( "mail" );
         $mail->appendChild( $session->html_phrase(
                 "request/request_email:body", 
                 eprint => $eprint->render_citation_link_staff,
                 document => defined $doc ? $doc->render_value( "main" ) : $session->make_doc_fragment,
-                requester => $session->make_text( $email ),
+                requester => $requester_details,
                 reason => EPrints::Utils::is_set( $reason ) ? $session->make_text( $reason )
                         : $session->html_phrase( "Plugin/Screen/EPrint/RequestRemoval:reason" ) ) );
 
@@ -186 +209 @@
                         message => $mail,
                         sig => $session->html_phrase( "mail_sig" ),
                         replyto_email => $email,
+                        replyto_name => EPrints::Utils::tree_to_utf8( $request->render_value( "requester_name" ) ),
                 );
         }
 
@@ -206 +230 @@
                 session => $session,
                 langid => $session->get_langid,
                 to_email => $email,
+                to_name => EPrints::Utils::tree_to_utf8( $request->render_value( "requester_name" ) ),
                 subject => $session->phrase( "request/ack_email:subject", eprint=>$eprint->get_value( "title" ) ), 
                 message => $mail,
                 sig => $session->html_phrase( "mail_sig" )
@@ -238 +263 @@
         {
                 $url.="&request_sent=".$self->{processor}->{request_sent};
         }
+        return $url if defined $self->{processor}->{request_sent};
+        $url.="&requester_email=".$self->{processor}->{requester_email} if defined $self->{processor}->{requester_email};
+        $url.="&requester_org=".$self->{processor}->{requester_org} if defined $self->{processor}->{requester_org};
+        $url.="&requester_name_given=".$self->{processor}->{requester_name_given} if defined $self->{processor}->{requester_name_given};
+        $url.="&requester_name_family=".$self->{processor}->{requester_name_family} if defined $self->{processor}->{requester_name_family};
+        $url.="&reason=".$self->{processor}->{reason} if defined $self->{processor}->{reason};
         return $url;
 } 
 
@@ -262 +293 @@
 
         my $form = $session->render_input_form(
                 fields => [ 
+                        $session->get_repository->get_dataset( "request" )->get_field( "requester_name" ),
                         $session->get_repository->get_dataset( "request" )->get_field( "requester_email" ),
+                        $session->get_repository->get_dataset( "request" )->get_field( "requester_org" ),
                         $session->get_repository->get_dataset( "request" )->get_field( "reason" ),
                 ],
+                values => {
+                        requester_name => {
+                                given => $session->param( "requester_name_given" ) || "",
+                                family => $session->param( "requester_name_family" ) || "",
+                        },
+                        requester_email => $session->param( "requester_email" ) || "",
+                        requester_org => $session->param( "requester_org" ) || "",
+                        reason => $session->param( "reason" ) || "",
+                },
                 show_names => 1,
                 show_help => 1,
                 buttons => { request => $session->phrase( "request:button" ) },