feature(routing): Render email validation page with view

Elgg · May 28, 2015 · b1060e5 · mrclay · Jun 9, 2015 · b1060e5
1 parent a06a7e2
commit b1060e5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/mod/uservalidationbyemail/start.php b/mod/uservalidationbyemail/start.php
@@ -7,7 +7,6 @@
  * @subpackage UserValidationByEmail
  */
 
-elgg_register_event_handler('init', 'system', 'uservalidationbyemail_init');
 
 function uservalidationbyemail_init() {
 
@@ -195,14 +194,19 @@ function uservalidationbyemail_check_auth_attempt($credentials) {
  * @return bool
  */
 function uservalidationbyemail_page_handler($page) {
-	$valid_pages = array('emailsent', 'confirm');
+	switch ($page[0]) {
-
+		case 'confirm':
-	if (empty($page[0]) || !in_array($page[0], $valid_pages)) {
+			require __DIR__ . "/pages/confirm.php";
-		forward('', '404');
+			break;
+		case 'emailsent':
+			echo elgg_view("resources/uservalidationbyemail/emailsent");
+			break;
+		default:
+			forward('', '404');
+			return false;
 	}
 
 	// note, safe to include based on input because we validated above.
-	require dirname(__FILE__) . "/pages/{$page[0]}.php";
 	return true;
 }
 

diff --git a/...uservalidationbyemail/pages/emailsent.php → ...urces/uservalidationbyemail/emailsent.php b/...uservalidationbyemail/pages/emailsent.php → ...urces/uservalidationbyemail/emailsent.php