Renamed more stuff (will break app_die(), so it needs fixing).

[core.git] / inc / classes / main / commands / web / class_WebResendLinkCommand.php

diff --git a/inc/classes/main/commands/web/class_WebResendLinkCommand.php b/inc/classes/main/commands/web/class_WebResendLinkCommand.php
index 633a201650293ab3ec60a03a9c38e80e3b150024..37dfe80364958348351e202d5e5552f94d5e602f 100644 (file)
--- a/inc/classes/main/commands/web/class_WebResendLinkCommand.php
+++ b/inc/classes/main/commands/web/class_WebResendLinkCommand.php
@@ -2,11 +2,11 @@
 /**
  * A command class for resending the confirmation link
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ class WebResendLinkCommand extends BaseCommand implements Commandable {
         * @param       $resolverInstance       An instance of a command resolver class
         * @return      $commandInstance        An instance a prepared command class
         */
-       public final static function createWebResendLinkCommand (CommandResolver $resolverInstance) {
+       public static final function createWebResendLinkCommand (CommandResolver $resolverInstance) {
                // Get new instance
                $commandInstance = new WebResendLinkCommand();
 
@@ -61,7 +61,7 @@ class WebResendLinkCommand extends BaseCommand implements Commandable {
                $userInstance = Registry::getRegistry()->getInstance('user');
 
                // Get an application instance
-               $appInstance = $this->getResolverInstance()->getApplicationInstance();
+               $applicationInstance = $this->getResolverInstance()->getApplicationInstance();
 
                // Get a RNG instance (Random Number Generator)
                $rngInstance = ObjectFactory::createObjectByConfiguredName('rng_class');
@@ -79,16 +79,16 @@ class WebResendLinkCommand extends BaseCommand implements Commandable {
                $userInstance->updateDatabaseField(UserDatabaseWrapper::DB_COLUMN_CONFIRM_HASH, $hashedString);
 
                // Re-set config entry to mailer engine
-               $this->getConfigInstance()->setConfigEntry('template_class', $this->getConfigInstance()->getConfigEntry('mail_template_class'));
+               $this->getConfigInstance()->setConfigEntry('html_template_class', $this->getConfigInstance()->getConfigEntry('mail_template_class'));
 
                // Prepare the template engine
-               $templateInstance = $this->prepareTemplateInstance($appInstance);
+               $templateInstance = $this->prepareTemplateInstance($applicationInstance);
 
                // Assign the application data with the template engine
-               $templateInstance->assignApplicationData($appInstance);
+               $templateInstance->assignApplicationData($applicationInstance);
 
                // Get a mailer class
-               $mailerInstance = ObjectFactory::createObjectByConfiguredName('mailer_class', array($templateInstance, $appInstance, 'resend_link'));
+               $mailerInstance = ObjectFactory::createObjectByConfiguredName('mailer_class', array($templateInstance, $applicationInstance, 'resend_link'));
 
                // Set this mailer in our template engine
                $templateInstance->setMailerInstance($mailerInstance);