*** /usr/src/eprints/eprints-2.2.1/cgi/confirm	Thu Nov 14 14:41:29 2002
--- /opt1/cgi/confirm	Thu Sep  4 14:26:19 2003
***************
*** 31,37 ****
  Apache::exit( 0 ) unless( defined $session );
  
  my( $title, $page ) = make_confirm_page( $session );
! $page->appendChild( $session->html_phrase( "general:frontpage_link" ) );
  
  $session->build_page( $title, $page, "confirm" );
  $session->send_page();
--- 31,37 ----
  Apache::exit( 0 ) unless( defined $session );
  
  my( $title, $page ) = make_confirm_page( $session );
! ## $page->appendChild( $session->html_phrase( "general:frontpage_link" ) );
  
  $session->build_page( $title, $page, "confirm" );
  $session->send_page();
***************
*** 94,99 ****
--- 94,100 ----
  	if( $user->is_set( "newemail" ) )
  	{
  		# check no one else has this email! cjg
+ ##CSL no.
  		my $sql = "UPDATE ".$user_ds->get_sql_table_name()." SET email=newemail, newemail=NULL, pin=NULL where userid=".$userid; 
  		$session->get_db()->do( $sql );
  		$page->appendChild( $session->html_phrase( 
***************
*** 107,117 ****
  		$session->get_db()->do( $sql );
  		$page->appendChild( $session->html_phrase( "cgi/confirm:set_password" ) );
  	}
  
  	$page->appendChild( $session->html_phrase( "cgi/confirm:username",
  		username => $user->render_value( "username" ) ) );
  
! 	$page->appendChild( $session->html_phrase( "general:userhome_link" ) );
  
  	return( $session->html_phrase( "cgi/confirm:title" ) , $page );
  }
--- 108,123 ----
  		$session->get_db()->do( $sql );
  		$page->appendChild( $session->html_phrase( "cgi/confirm:set_password" ) );
  	}
+ ##CSL set the status of this new confirmed user...
+ 	$session->get_archive()->call(
+ 		"confirm_user",
+ 		$user,
+ 		$session );
  
  	$page->appendChild( $session->html_phrase( "cgi/confirm:username",
  		username => $user->render_value( "username" ) ) );
  
! 	$page->appendChild( $session->html_phrase( "cgi/confirm:tail" ) );
  
  	return( $session->html_phrase( "cgi/confirm:title" ) , $page );
  }
*** /usr/src/eprints/eprints-2.2.1/cgi/search	Thu Nov 14 14:41:29 2002
--- /opt1/cgi/search	Tue Aug 12 15:33:09 2003
***************
*** 43,48 ****
  
  my $title = $session->html_phrase( "cgi/search:simple_search" );
  
! $searchexp->process_webpage( $title, $preamble );
  
  $session->terminate;
--- 43,48 ----
  
  my $title = $session->html_phrase( "cgi/search:simple_search" );
  
! $searchexp->process_webpage( $title, $preamble, 0 );
  
  $session->terminate;
*** /usr/src/eprints/eprints-2.2.1/cgi/set_password	Thu Nov 14 14:41:29 2002
--- /opt1/cgi/set_password	Tue Aug 12 13:59:30 2003
***************
*** 29,34 ****
--- 29,39 ----
  
  my $session = new EPrints::Session;
  Apache::exit( 0 ) unless( defined $session );
+ ##CSL
+ $session->redirect( "register" );
+ $session->terminate();
+ exit;
+ ###
  
  my( $page, $title ) = make_page( $session );
  
***************
*** 80,86 ****
  		}
  		$page->appendChild( $session->html_phrase( "cgi/set_password:pchange" ) );
  
! 		my $fields = [ $f_email, $f_newpass ];
  
  		if( $websignup )
  		{
--- 85,92 ----
  		}
  		$page->appendChild( $session->html_phrase( "cgi/set_password:pchange" ) );
  
! ##CSL		my $fields = [ $f_email, $f_newpass ];
! 		my $fields = [ $f_email ];
  
  		if( $websignup )
  		{
***************
*** 91,96 ****
--- 97,105 ----
  				push @{$fields},$f_lang;
  			}
  		}
+ ##CSL
+ 		push @{$fields},$f_newpass;
+ ##
  	
  		$page->appendChild( $session->render_input_form(
  			fields=>$fields,
*** /usr/src/eprints/eprints-2.2.1/cgi/users/home	Thu Nov 14 14:41:29 2002
--- /opt1/cgi/users/home	Mon Sep 22 09:01:52 2003
***************
*** 60,69 ****
  	
  my $user = $session->current_user;
  
! my $fullname = $user->render_description();
! 
! my $probs = $user->validate();
! my $valid_user = ( scalar @{$probs} == 0 );
  
  ######################################################################
  #
--- 61,72 ----
  	
  my $user = $session->current_user;
  
! if( 0 != scalar (@{$user->validate()}) ){
! 	$session->redirect(
! 	    $session->get_archive()->get_conf( "userhome" )."_fill" );
! 	$session->terminate();
! 	exit;
! }
  
  ######################################################################
  #
***************
*** 78,84 ****
  ### Welcome author blurb
  $page->appendChild( $session->html_phrase( "cgi/users/home:intro" ) );
  
! if( $valid_user && $user->has_priv( "deposit" ) )
  {
  	### Workspace
  	$page->appendChild(
--- 81,87 ----
  ### Welcome author blurb
  $page->appendChild( $session->html_phrase( "cgi/users/home:intro" ) );
  
! if( $user->has_priv( "deposit" ) )
  {
  	### Workspace
  	$page->appendChild(
***************
*** 91,102 ****
  	$page->appendChild( $session->render_ruler() );
  }
  
- if( !$valid_user )
- {
- 	### User needs to update their record
- 	$page->appendChild( $session->html_phrase( "cgi/users/home:before" ) );
- }
- 
  $dl = $session->make_element( "dl" );
  
  ### Change author record
--- 94,99 ----
***************
*** 184,194 ****
  	}
  ];
  
! if( $valid_user )
  {
- 	my $tool;
- 	foreach	$tool (@{$tools})
- 	{
  		next unless $user->has_priv( $tool->{priv} );
  	
  		$dt = $session->make_element( "dt" );
--- 181,188 ----
  	}
  ];
  
! foreach	my $tool (@{$tools})
  {
  	next unless $user->has_priv( $tool->{priv} );
  
  	$dt = $session->make_element( "dt" );
***************
*** 200,206 ****
  		$dd = $session->make_element( "dd" );
  		$dd->appendChild( $session->html_phrase( "cgi/users/home:".$tool->{code}."_info" ) );
  		$dl->appendChild( $dd );
- 	}
  }
  
  $page->appendChild( $dl );
--- 194,199 ----
***************
*** 208,214 ****
  $session->build_page( 
  		$session->html_phrase( 
  			"cgi/users/home:user_home", 
! 			name => $fullname ),
  		$page,
  		"user_home" );
  $session->send_page();
--- 201,207 ----
  $session->build_page(
  		$session->html_phrase( 
  			"cgi/users/home:user_home", 
! 			name => $user->render_description() ),
  		$page,
  		"user_home" );
  $session->send_page();
***************
*** 351,357 ****
  		$table->appendChild( $tr );	
  		$td = $session->make_element( "td" );
  		$tr->appendChild( $td );
! 		$td->appendChild( $e->render_description() );
  		$td = $session->make_element( "td" );
  		$tr->appendChild( $td );
  		$td->appendChild( $session->html_phrase( 
--- 344,355 ----
  		$table->appendChild( $tr );	
  		$td = $session->make_element( "td" );
  		$tr->appendChild( $td );
! ##CSL edit it...
! 		my $a = $session->render_link( "staff/edit_eprint?dataset=buffer&eprintid=".$e->get_value("eprintid") );
! 		$a->appendChild( $e->render_description() );
! 		$td->appendChild( $a );
! ###		$td->appendChild( $e->render_description() );
! ###
  		$td = $session->make_element( "td" );
  		$tr->appendChild( $td );
  		$td->appendChild( $session->html_phrase( 
*** /usr/src/eprints/eprints-2.2.1/cgi/users/record	Thu Nov 14 14:41:29 2002
--- /opt1/cgi/users/record	Mon Sep 22 08:45:32 2003
***************
*** 40,47 ****
  	$session->terminate();
  	Apache::exit( 0 );
  }
! my $userform = new EPrints::UserForm( $session, "home", 0);
! 
  $userform->process();
  
  $session->terminate();
--- 40,49 ----
  	$session->terminate();
  	Apache::exit( 0 );
  }
! ##CSL my $userform = new EPrints::UserForm( $session, "home", 0);
! my $userform = new EPrints::UserForm( $session, 
! 		$session->get_archive()->get_conf( "userhome" ),
! 		0);
  $userform->process();
  
  $session->terminate();
*** /usr/src/eprints/eprints-2.2.1/cgi/users/review	Thu Nov 14 14:41:29 2002
--- /opt1/cgi/users/review	Mon Sep 22 16:56:40 2003
***************
*** 78,84 ****
  			"cgi/users/review:no_docs" ) );
  
  		$page->appendChild( $session->html_phrase( 
! 			"general:userhome_link" ) );
  
  		$session->build_page( $title, $page, "review_none" );
  		$session->send_page();
--- 78,84 ----
  			"cgi/users/review:no_docs" ) );
  
  		$page->appendChild( $session->html_phrase( 
! 			"cgi/users/review:tail" ) );
  
  		$session->build_page( $title, $page, "review_none" );
  		$session->send_page();
***************
*** 164,170 ****
  			if( defined $copy )
  			{
  				# Copied OK, redirect to workspace
! 				$session->redirect( "home" );
  #cjg is the next bit meaningless? (upto return)
  				my $page = $session->make_doc_fragment();
  				my $title = $session->html_phrase( "cgi/users/review:title" );
--- 164,173 ----
  			if( defined $copy )
  			{
  				# Copied OK, redirect to workspace
! ##
! ##				$session->redirect( "home" );
! 				$session->redirect(
! 					$session->get_archive()->get_conf( "userhome" ) );
  #cjg is the next bit meaningless? (upto return)
  				my $page = $session->make_doc_fragment();
  				my $title = $session->html_phrase( "cgi/users/review:title" );
***************
*** 308,314 ****
  	my $title = $session->html_phrase( "cgi/users/review:remove_title" );
  	my $page = $session->make_doc_fragment();
  	$page->appendChild( $session->html_phrase( "cgi/users/review:done" ) );
! 	$page->appendChild( $session->html_phrase( "general:userhome_link" ) );
  	$session->build_page( $title, $page, "review_remove_done" );
  	$session->send_page();
  	
--- 311,317 ----
  	my $title = $session->html_phrase( "cgi/users/review:remove_title" );
  	my $page = $session->make_doc_fragment();
  	$page->appendChild( $session->html_phrase( "cgi/users/review:done" ) );
! 	$page->appendChild( $session->html_phrase( "cgi/users/review:tail" ) );
  	$session->build_page( $title, $page, "review_remove_done" );
  	$session->send_page();
  	
*** /usr/src/eprints/eprints-2.2.1/cgi/users/status	Thu Nov 14 14:41:29 2002
--- /opt1/cgi/users/status	Fri Sep  5 08:38:05 2003
***************
*** 213,219 ****
  			$session->make_text( $n ),
  			$session->make_text( $sent ) ) );
  }
! 
  $session->build_page( 
  	$session->html_phrase( "cgi/users/status:title" ),
  	$html,
--- 213,220 ----
  			$session->make_text( $n ),
  			$session->make_text( $sent ) ) );
  }
! #CSL
! $html->appendChild( $session->html_phrase( "cgi/users/status:tail" ) );
  $session->build_page( 
  	$session->html_phrase( "cgi/users/status:title" ),
  	$html,
*** /usr/src/eprints/eprints-2.2.1/cgi/users/subscribe	Thu Nov 14 14:41:29 2002
--- /opt1/cgi/users/subscribe	Fri Sep  5 08:32:22 2003
***************
*** 217,222 ****
--- 217,224 ----
  			new => $session->phrase( 
  				"cgi/users/subscribe:action_new" ) ) );
  	
+ #CSL
+ 	$page->appendChild( $session->html_phrase( "cgi/users/subscribe:tail" ) );
  	$session->build_page( $title, $page, "subscribe_list"  );
  	$session->send_page();
  }
***************
*** 252,259 ****
  					"cgi/users/subscribe:action_finish" )
  			}
  		) );
! 			
! 	
  	$session->build_page( $title, $page, "subscribe_edit" );
  	$session->send_page();
  }
--- 254,261 ----
  					"cgi/users/subscribe:action_finish" )
  			}
  		) );
! #CSL
! 	$page->appendChild( $session->html_phrase( "cgi/users/subscribe:tail" ) );
  	$session->build_page( $title, $page, "subscribe_edit" );
  	$session->send_page();
  }
*** /usr/src/eprints/eprints-2.2.1/cgi/users/staff/buffer	Thu Nov 14 14:41:29 2002
--- /opt1/cgi/users/staff/buffer	Fri Sep  5 08:46:04 2003
***************
*** 101,107 ****
  	}
  }
  
! $page->appendChild( $session->html_phrase( "general:userhome_link" ) );
  
  $session->build_page(
  	$session->html_phrase( "cgi/users/buffer:overview_title" ), 
--- 101,107 ----
  	}
  }
  
! $page->appendChild( $session->html_phrase( "cgi/users/buffer:tail" ) );
  
  $session->build_page(
  	$session->html_phrase( "cgi/users/buffer:overview_title" ), 
*** /usr/src/eprints/eprints-2.2.1/cgi/users/staff/edit_eprint	Thu Nov 14 14:41:29 2002
--- /opt1/cgi/users/staff/edit_eprint	Mon Sep 22 08:49:42 2003
***************
*** 23,29 ****
  my $session = EPrints::Session->new();
  
  # Check we have privs
! if( !$session->auth_check( "editor" ) )
  {
  	$session->terminate();
  	Apache::exit( 0 );
--- 23,31 ----
  my $session = EPrints::Session->new();
  
  # Check we have privs
! ##CSL  the depositer should be able to edit it
! #if( !$session->auth_check( "editor" ) )
! if( !defined $session->current_user )
  {
  	$session->terminate();
  	Apache::exit( 0 );
***************
*** 67,75 ****
  		return;
  	}
  
  	my $user_ds = $session->get_archive()->get_dataset( "user" );
  
- 	my $can_edit = 0;
  	my $ef_field = $user_ds->get_field( 'editperms' );
  	my $searches = $session->current_user->get_value( 'editperms' );
  	if( scalar @{$searches} == 0 )
--- 69,90 ----
  		return;
  	}
  
+ 	my $can_edit = 0;
+ 
+ ##CSL check whether currentuser can edit this item
+ 	if( ($datasetid eq "buffer" || $datasetid eq "inbox" ) &&
+ 		$session->current_user->get_value("userid") ==
+ 		$eprint->get_value( "userid" ) )
+ 	{
+ 		$can_edit = 1;
+ 	}
+ 	elsif( !$session->auth_check( "editor" ) )
+ 	{
+ 		return;
+ 	}
+ ##
  	my $user_ds = $session->get_archive()->get_dataset( "user" );
  
  	my $ef_field = $user_ds->get_field( 'editperms' );
  	my $searches = $session->current_user->get_value( 'editperms' );
  	if( scalar @{$searches} == 0 )
***************
*** 167,173 ****
  			"cgi/users/edit_eprint:moved",
  			link=>$session->render_link( "edit_eprint?dataset=buffer&eprintid=".$eprintid ) ) );
  		$page->appendChild( $session->html_phrase( 
! 			"general:userhome_link" ) );
  		$session->build_page( $session->html_phrase( "cgi/users/edit_eprint:move_title" ), $page, "move_eprint" );
  		$session->send_page();
  		return;
--- 182,188 ----
  			"cgi/users/edit_eprint:moved",
  			link=>$session->render_link( "edit_eprint?dataset=buffer&eprintid=".$eprintid ) ) );
  		$page->appendChild( $session->html_phrase( 
! 			"cgi/users/edit_eprint:move_tail" ) );
  		$session->build_page( $session->html_phrase( "cgi/users/edit_eprint:move_title" ), $page, "move_eprint" );
  		$session->send_page();
  		return;
***************
*** 186,192 ****
  		$page->appendChild( $session->html_phrase( 
  			"cgi/users/edit_eprint:removed" ) );
  		$page->appendChild( $session->html_phrase( 
! 			"general:userhome_link" ) );
  		$session->build_page( $session->html_phrase( "cgi/users/edit_eprint:remove_title" ), $page, "move_removed" );
  		$session->send_page();
  		return;
--- 201,207 ----
  		$page->appendChild( $session->html_phrase( 
  			"cgi/users/edit_eprint:removed" ) );
  		$page->appendChild( $session->html_phrase( 
! 			"cgi/users/edit_eprint:remove_tail"  ) );
  		$session->build_page( $session->html_phrase( "cgi/users/edit_eprint:remove_title" ), $page, "move_removed" );
  		$session->send_page();
  		return;
***************
*** 233,239 ****
  	my $subform = new EPrints::SubmissionForm(
  		$session,
  		"edit_eprint?dataset=$datasetid&eprintid=$eprintid",
! 		1,
  		$dataset,
  		"edit_eprint" );
  
--- 248,254 ----
  	my $subform = new EPrints::SubmissionForm(
  		$session,
  		"edit_eprint?dataset=$datasetid&eprintid=$eprintid",
! 		$session->current_user->has_priv( "editor" ) ? 1 : 0,
  		$dataset,
  		"edit_eprint" );
  
***************
*** 316,322 ****
  		$r1 = [ "_toarchive" ];
  		$r2 = [ "edit", "_clone" ];
  	}
! 
  
  	my $form = $session->render_form( "post", "edit_eprint" );
  	foreach( @{$r1}, @{$r2} )
--- 331,342 ----
  		$r1 = [ "_toarchive" ];
  		$r2 = [ "edit", "_clone" ];
  	}
! ##CSL
! 	if( ! $session->current_user->has_priv( "editor" ) )
! 	{
! 		$r2 = [ "edit", "_clone" ];
! 	}
! #
  
  	my $form = $session->render_form( "post", "edit_eprint" );
  	foreach( @{$r1}, @{$r2} )
***************
*** 324,333 ****
  		$buttons->{$_} = $session->phrase( "cgi/users/edit_eprint:action_".$_ );
  	}
  	
  	$form->appendChild( $session->render_ruler() );
  	$buttons->{_order} = $r1;
  	$form->appendChild( $session->render_action_buttons( %{$buttons} ) );
! 
  	$form->appendChild( $session->render_ruler() );
  	$buttons->{_order} = $r2;
  	$form->appendChild( $session->render_action_buttons( %{$buttons} ) );
--- 344,356 ----
  		$buttons->{$_} = $session->phrase( "cgi/users/edit_eprint:action_".$_ );
  	}
  	
+ ##CSL
+ 	if( $session->current_user->has_priv( "editor" ) ){
  		$form->appendChild( $session->render_ruler() );
  		$buttons->{_order} = $r1;
  		$form->appendChild( $session->render_action_buttons( %{$buttons} ) );
! 	}
! ##
  	$form->appendChild( $session->render_ruler() );
  	$buttons->{_order} = $r2;
  	$form->appendChild( $session->render_action_buttons( %{$buttons} ) );
***************
*** 336,342 ****
  	$form->appendChild( $session->render_hidden_field( "dataset", $eprint->get_dataset()->id() ) );
  
  	$page->appendChild( $form );
! 	$page->appendChild( $session->html_phrase( "general:userhome_link" ) );
  		
  	$session->build_page( $session->html_phrase( "cgi/users/edit_eprint:form_title" ), $page, "move_form" );
  	$session->send_page();
--- 359,365 ----
  	$form->appendChild( $session->render_hidden_field( "dataset", $eprint->get_dataset()->id() ) );
  
  	$page->appendChild( $form );
! 	$page->appendChild( $session->html_phrase( "cgi/users/edit_eprint:form_tail" ) );
  		
  	$session->build_page( $session->html_phrase( "cgi/users/edit_eprint:form_title" ), $page, "move_form" );
  	$session->send_page();
*** /usr/src/eprints/eprints-2.2.1/cgi/users/staff/edit_user	Thu Nov 14 14:41:29 2002
--- /opt1/cgi/users/staff/edit_user	Mon Sep 22 08:50:06 2003
***************
*** 100,113 ****
  
  	if( $action eq "cancel" )
  	{
! 		$session->redirect( $session->get_archive()->get_conf( "userhome" ) );
  		return;
  	}
  	
  
  	my $userform = new EPrints::UserForm(
  		$session,
! 		$session->get_archive()->get_conf( "userhome" ),
  		1,
  		$user );
  	$userform->process();
--- 100,115 ----
  
  	if( $action eq "cancel" )
  	{
! ##CSL		$session->redirect( $session->get_archive()->get_conf( "userhome" ) );
! 		$session->redirect($session->get_archive()->get_conf( "perl_url" )."/users/staff/view_user?userid=".$user->get_value( "userid" ) ),
  		return;
  	}
  	
  
  	my $userform = new EPrints::UserForm(
  		$session,
! ##CSL		$session->get_archive()->get_conf( "userhome" ),
! 		$session->get_archive()->get_conf( "perl_url" )."/users/staff/view_user?userid=".$user->get_value( "userid" ),
  		1,
  		$user );
  	$userform->process();