Index: perl_lib/EPrints/Apache/Auth.pm
===================================================================
--- perl_lib/EPrints/Apache/Auth.pm (revision 1)
+++ perl_lib/EPrints/Apache/Auth.pm (working copy)
@@ -142,7 +142,7 @@
{
my $target_url = $r->uri;
$target_url =~ s/([^A-Z0-9])/sprintf( "%%%02X", ord($1) )/ieg;
- my $login_url = $session->get_repository->get_conf( "perl_url" )."/users/login?target=$target_url";
+ my $login_url = $session->get_repository->get_conf( "users_url" )."/users/login?target=$target_url";
EPrints::Apache::AnApache::send_status_line( $r, 302, "Need to login first" );
EPrints::Apache::AnApache::header_out( $r, "Location", $login_url );
EPrints::Apache::AnApache::send_http_header( $r );
Index: perl_lib/EPrints/Session.pm
===================================================================
--- perl_lib/EPrints/Session.pm (revision 1)
+++ perl_lib/EPrints/Session.pm (working copy)
@@ -1167,7 +1167,7 @@
my @core = $screen->list_items( "key_tools" );
my @other = $screen->list_items( "other_tools" );
- my $url = $self->get_repository->get_conf( "perl_url" )."/users/home";
+ my $url = $self->get_repository->get_conf( "users_url" )."/users/home";
my $first = 1;
foreach my $tool ( @core )
Index: perl_lib/EPrints/DataObj/SavedSearch.pm
===================================================================
--- perl_lib/EPrints/DataObj/SavedSearch.pm (revision 1)
+++ perl_lib/EPrints/DataObj/SavedSearch.pm (working copy)
@@ -400,7 +400,7 @@
$last_month."-" );
}
- my $url = $self->{session}->get_repository->get_conf( "perl_url" ).
+ my $url = $self->{session}->get_repository->get_conf( "users_url" ).
"/users/home?screenid=SavedSearh::View";
my $freqphrase = $self->{session}->html_phrase(
"lib/saved_search:".$freq );
Index: perl_lib/EPrints/DataObj/User.pm
===================================================================
--- perl_lib/EPrints/DataObj/User.pm (revision 1)
+++ perl_lib/EPrints/DataObj/User.pm (working copy)
@@ -801,14 +801,14 @@
{
my( $self ) = @_;
- return $self->{session}->get_repository->get_conf( "perl_url" )."/users/home?screen=User::View&userid=".$self->get_value( "userid" );
+ return $self->{session}->get_repository->get_conf( "users_url" )."/users/home?screen=User::View&userid=".$self->get_value( "userid" );
}
sub get_control_url
{
my( $self ) = @_;
- return $self->{session}->get_repository->get_conf( "perl_url" )."/users/home?screen=User::View&userid=".$self->get_value( "userid" );
+ return $self->{session}->get_repository->get_conf( "users_url" )."/users/home?screen=User::View&userid=".$self->get_value( "userid" );
}
@@ -911,7 +911,7 @@
if( $list->count > 0 || $self->get_value( "mailempty" ) eq 'TRUE' )
{
- my $url = $self->{session}->get_repository->get_conf( "perl_url" ).
+ my $url = $self->{session}->get_repository->get_conf( "users_url" ).
"/users/record";
my $freqphrase = $self->{session}->html_phrase(
"lib/saved_search:".$freq ); # nb. reusing the SavedSearch.pm phrase
Index: perl_lib/EPrints/DataObj/EPrint.pm
===================================================================
--- perl_lib/EPrints/DataObj/EPrint.pm (revision 1)
+++ perl_lib/EPrints/DataObj/EPrint.pm (working copy)
@@ -1597,7 +1597,7 @@
{
my( $self ) = @_;
- return $self->{session}->get_repository->get_conf( "perl_url" ).
+ return $self->{session}->get_repository->get_conf( "users_url" ).
"/users/home?screen=EPrint::View&eprintid=".
$self->get_value( "eprintid" )
}
Index: perl_lib/EPrints/Plugin/Screen/Public/RequestCopy.pm
===================================================================
--- perl_lib/EPrints/Plugin/Screen/Public/RequestCopy.pm (revision 1)
+++ perl_lib/EPrints/Plugin/Screen/Public/RequestCopy.pm (working copy)
@@ -156,7 +156,7 @@
# Contact is registered user and EPrints holds requested document
# Send email to contact with accept/reject links
- my $url = $session->get_repository->get_conf( "perl_url" ) .
+ my $url = $session->get_repository->get_conf( "users_url" ) .
"/users/home?screen=Request::Respond&requestid=" . $request->get_id;
$mail->appendChild( $session->html_phrase( "request/request_email:links",
Index: perl_lib/EPrints/Plugin/Export.pm
===================================================================
--- perl_lib/EPrints/Plugin/Export.pm (revision 1)
+++ perl_lib/EPrints/Plugin/Export.pm (working copy)
@@ -185,7 +185,7 @@
my $format = $1;
my $url = $plugin->{session}->get_repository->get_conf( "perl_url" );
- $url .= "/users" if $staff;
+ $url = $plugin->{session}->get_repository->get_conf( "users_url" )."/users" if $staff;
$url .= "/export/".$dataobj->get_id."/".$format;
$url .= "/".$plugin->{session}->get_repository->get_id;
$url .= "-".$dataobj->get_dataset->confid."-".$dataobj->get_id.$plugin->param("suffix");
Index: cgi/users/export
===================================================================
--- cgi/users/export (revision 1)
+++ cgi/users/export (working copy)
@@ -42,7 +42,7 @@
my $id = $1;
my $afterid = $2;
my $format = $3;
-my $export_url = $session->get_repository->get_conf( "perl_url" )."/users/export";
+my $export_url = $session->get_repository->get_conf( "users_url" )."/users/export";
if( !defined $id ) {
error( $session, $session->html_phrase( "cgi/export:no_id" ) );
Index: cgi/users/home
===================================================================
--- cgi/users/home (revision 1)
+++ cgi/users/home (working copy)
@@ -36,7 +36,7 @@
EPrints::ScreenProcessor->process(
session=>$session,
- url=>$session->get_repository->get_conf( "perl_url" )."/users/home" );
+ url=>$session->get_repository->get_conf( "users_url" )."/users/home" );
$session->terminate;
Index: lib/lang/en/phrases/system.xml
===================================================================
--- lib/lang/en/phrases/system.xml (revision 1)
+++ lib/lang/en/phrases/system.xml (working copy)
@@ -532,7 +532,7 @@
You are already logged in as If you wish to log in as a different user you must Logout first. You are already logged in as If you wish to log in as a different user you must Logout first. You may now view
Before you can start uploading
-items, you need to fill out some personal details into a form (
The first thing you'll need to do, after registering, is fill out your
-user record using the form at