Change activation to verification

carlbennett · carlbennett · commit ba8cf2d49a43 · 2019-08-24T01:55:50.000Z
diff --git a/src/controllers/User/Verify.php b/src/controllers/User/Verify.php
@@ -12,17 +12,17 @@
 use \BNETDocs\Libraries\Logger;
 use \BNETDocs\Libraries\User;
 
-use \BNETDocs\Models\User\Activate as UserActivateModel;
+use \BNETDocs\Models\User\Verify as UserVerifyModel;
 
 use \InvalidArgumentException;
 
-class Activate extends Controller {
+class Verify extends Controller {
 
   public function &run( Router &$router, View &$view, array &$args ) {
 
     $data = $router->getRequestQueryArray();
 
-    $model = new UserActivateModel();
+    $model = new UserVerifyModel();
 
     $model->error   = 'INVALID_TOKEN';
     $model->token   = isset( $data[ 't' ]) ? $data[ 't' ] : null;
diff --git a/src/main.php b/src/main.php
@@ -234,9 +234,6 @@ function main() {
     $router->addRoute( // URL: /user/:id
       "#^/user/(\d+)/?#", "User\\View", "User\\ViewHtml"
     );
-    $router->addRoute( // URL: /user/activate
-      "#^/user/activate/?$#", "User\\Activate", "User\\ActivateHtml"
-    );
     $router->addRoute( // URL: /user/changepassword
       "#^/user/changepassword/?$#",
       "User\\ChangePassword", "User\\ChangePasswordHtml"
@@ -264,6 +261,9 @@ function main() {
     $router->addRoute( // URL: /user/update
       "#^/user/update/?$#", "User\\Update", "User\\UpdateHtml"
     );
+    $router->addRoute( // URL: /user/verify
+      "#^/user/verify/?$#", "User\\Verify", "User\\VerifyHtml"
+    );
     $router->addRoute( // URL: /welcome
       "#^/welcome/?$#", "Welcome", "WelcomeHtml"
     );
diff --git a/src/models/User/Verify.php b/src/models/User/Verify.php
@@ -4,7 +4,7 @@
 
 use \CarlBennett\MVC\Libraries\Model;
 
-class Activate extends Model {
+class Verify extends Model {
 
   public $error;
   public $token;
diff --git a/src/templates/Email/User/Register.plain.phtml b/src/templates/Email/User/Register.plain.phtml
@@ -2,7 +2,7 @@
 namespace BNETDocs\Templates\Email\User;
 use \CarlBennett\MVC\Libraries\Common;
 $name = $this->getContext()->name;
-$url = Common::relativeUrlToAbsolute('/user/activate?u=' . rawurlencode($this->getContext()->user_id) . '&t=' . rawurlencode($this->getContext()->token));
+$url = Common::relativeUrlToAbsolute('/user/verify?u=' . rawurlencode($this->getContext()->user_id) . '&t=' . rawurlencode($this->getContext()->token));
 require('./Email/header.plain.inc.phtml');
 ?>
 Hello <?=$name?>,
diff --git a/src/templates/Email/User/Register.rich.phtml b/src/templates/Email/User/Register.rich.phtml
@@ -2,7 +2,7 @@
 namespace BNETDocs\Templates\Email\User;
 use \CarlBennett\MVC\Libraries\Common;
 $name = $this->getContext()->name;
-$url = Common::relativeUrlToAbsolute('/user/activate?u=' . rawurlencode($this->getContext()->user_id) . '&t=' . rawurlencode($this->getContext()->token));
+$url = Common::relativeUrlToAbsolute('/user/verify?u=' . rawurlencode($this->getContext()->user_id) . '&t=' . rawurlencode($this->getContext()->token));
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional //EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml">
diff --git a/src/templates/User/Verify.phtml b/src/templates/User/Verify.phtml
@@ -5,9 +5,9 @@ namespace BNETDocs\Templates\User;
 use \CarlBennett\MVC\Libraries\Common;
 use \CarlBennett\MVC\Libraries\Pair;
 
-$title       = 'Activate Account';
-$description = 'This form allows an individual to activate their account with a token.';
-$this->opengraph->attach( new Pair( 'url', '/user/activate' ));
+$title       = 'Verify Account';
+$description = 'This form allows an individual to verify their account with a token.';
+$this->opengraph->attach( new Pair( 'url', '/user/verify' ));
 
 switch ( $this->getContext()->error ) {
   case 'INVALID_TOKEN':
@@ -26,7 +26,7 @@ require('./header.inc.phtml');
 ?>
       <article>
 <?php if ($this->getContext()->error !== false) { ?>
-        <header>Activate Account</header>
+        <header>Verify Account</header>
 <?php if (!empty($message)) { ?>
         <section class="red">
           <p><?php echo $message; ?></p>
@@ -57,15 +57,15 @@ require('./header.inc.phtml');
           <section>
             <input
               type="submit"
-              value="Activate Account"
+              value="Verify Account"
               tabindex="3"
             />
           </section>
         </form>
 <?php } else { ?>
-        <header class="green">Account Activated</header>
+        <header class="green">Account Verified</header>
         <section class="green">
-          <p>Your account has been activated successfully!</p>
+          <p>Your account has been verified successfully!</p>
           <p>Use the navigation to the left to move to another page.</p>
         </section>
 <?php } ?>
diff --git a/src/views/User/VerifyHtml.php b/src/views/User/VerifyHtml.php
@@ -2,24 +2,24 @@
 
 namespace BNETDocs\Views\User;
 
-use \BNETDocs\Models\User\Activate as UserActivateModel;
+use \BNETDocs\Models\User\Verify as UserVerifyModel;
 
 use \CarlBennett\MVC\Libraries\Exceptions\IncorrectModelException;
 use \CarlBennett\MVC\Libraries\Model;
 use \CarlBennett\MVC\Libraries\Template;
 use \CarlBennett\MVC\Libraries\View;
 
-class ActivateHtml extends View {
+class VerifyHtml extends View {
 
   public function getMimeType() {
     return 'text/html;charset=utf-8';
   }
 
   public function render( Model &$model ) {
-    if (!$model instanceof UserActivateModel) {
+    if (!$model instanceof UserVerifyModel) {
       throw new IncorrectModelException();
     }
-    (new Template( $model, 'User/Activate' ))->render();
+    (new Template( $model, 'User/Verify' ))->render();
   }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -2,24 +2,24 @@`
`2`	`2`
`3`	`3`	`namespace BNETDocs\Views\User;`
`4`	`4`
`5`		`-use \BNETDocs\Models\User\Activate as UserActivateModel;`
	`5`	`+use \BNETDocs\Models\User\Verify as UserVerifyModel;`
`6`	`6`
`7`	`7`	`use \CarlBennett\MVC\Libraries\Exceptions\IncorrectModelException;`
`8`	`8`	`use \CarlBennett\MVC\Libraries\Model;`
`9`	`9`	`use \CarlBennett\MVC\Libraries\Template;`
`10`	`10`	`use \CarlBennett\MVC\Libraries\View;`
`11`	`11`
`12`		`-class ActivateHtml extends View {`
	`12`	`+class VerifyHtml extends View {`
`13`	`13`
`14`	`14`	`public function getMimeType() {`
`15`	`15`	`return 'text/html;charset=utf-8';`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public function render( Model &$model ) {`
`19`		`- if (!$model instanceof UserActivateModel) {`
	`19`	`+ if (!$model instanceof UserVerifyModel) {`
`20`	`20`	`throw new IncorrectModelException();`
`21`	`21`	`}`
`22`		`- (new Template( $model, 'User/Activate' ))->render();`
	`22`	`+ (new Template( $model, 'User/Verify' ))->render();`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`}`