feat(MemberApprovalController): Add 'redirect_to_admin' config.

- Wrap $Content in <p> tags.
- Add fullstop to 'ALREADYAPPROVEDNOTE' text.
- Add LiteralField # anchor. This is to ensure future breakage is unlikely.
- Update README.md to document configuration behaviour.

README.md

@@ -88,6 +88,15 @@ class MemberExtension extends DataExtension {
 }
 ```
 
+Configuration
+------------
+```yml
+MemberApprovalController:
+  # Redirect the user to the 'admin/Security' member edit page instead
+  # of immediately approving after visiting the approve link.
+  redirect_to_admin: false
+```
+
 Known Issues
 ------------
 [Issue Tracker](http://github.com/ajshort/silverstripe-memberprofiles/issues)

code/controllers/MemberApprovalController.php

@@ -12,6 +12,15 @@ class MemberApprovalController extends Page_Controller {
 		'index'
 	);
 
+	/**
+	 * Redirect the user to the 'admin/Security' member edit page instead
+	 * of immediately approving after visiting the approve link.
+	 *
+	 * @config
+	 * @var boolean
+	 */
+	private static $redirect_to_admin = false;
+
 	public function index($request) {
 		$id    = $request->param('ID');
 		$token = $request->getVar('token');
@@ -31,25 +40,37 @@ public function index($request) {
 		}
 
 		if ($token != $member->ValidationKey) {
-			$this->httpError(400, 'An invalid token was specified.');
+			return $this->httpError(400, 'An invalid token was specified.');
+		}
+
+		if (!$member->ValidationKey) {
+			return $this->httpError(400, 'Not a MemberProfilePage member.');
 		}
 
 		if (!$member->NeedsApproval) {
 			$title   = _t('MemberProfiles.ALREADYAPPROVED', 'Already Approved');
-			$content = _t('MemberProfiles.ALREADYAPPROVEDNOTE', 'This member has already been approved');
+			$content = _t('MemberProfiles.ALREADYAPPROVEDNOTE', 'This member has already been approved.');
 
 			return $this->render(array(
 				'Title'   => $title,
 				'Content' => "<p>$content</p>"
 			));
 		}
 
+		if ($this->config()->redirect_to_admin) {
+			$controller = singleton('SecurityAdmin');
+			if (!$controller->canView()) {
+				return Security::permissionFailure();
+			}
+			return $controller->Link('EditForm/field/Members/item/'.$member->ID.'/edit#MemberProfileRegistrationApproval');
+		}
+
 		$member->NeedsApproval = false;
 		$member->write();
 
 		$title   = _t('MemberProfiles.MEMBERAPPROVED', 'Member Approved');
 		$content = _t('MemberProfiles.MEMBERAPPROVEDCONTENT', 'The member "%s" has been approved and can now log in.');
-		$content = sprintf($content, Convert::raw2xml("$member->Name <$member->Email>"));
+		$content = '<p>'.sprintf($content, Convert::raw2xml("$member->Name <$member->Email>")).'</p>';
 
 		return $this->render(array(
 			'Title'   => $title,

code/extensions/MemberProfileExtension.php

@@ -104,6 +104,8 @@ public function updateCMSFields(FieldList $fields) {
 			);
 
 			$fields->addFieldsToTab('Root.Main', array(
+				// ApprovalAnchor is used by MemberApprovalController (2017-02-01)
+				new LiteralField('ApprovalAnchor', "<div id=\"MemberProfileRegistrationApproval\"></div>"),
 				new HeaderField('ApprovalHeader', _t('MemberProfiles.REGAPPROVAL', 'Registration Approval')),
 				new LiteralField('ApprovalNote', "<p>$note</p>"),
 				new DropdownField('NeedsApproval', '', array(