X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcommands%2Fhtml%2Fclass_HtmlResendLinkCommand.php;h=b09a3b4f219d41d6593e33096fda5c18a8e8638a;hb=79e6029823f993ec7503a399aa2fdbb95aadb2d1;hp=289a5d9497e270536ab28cda71f7636b5c98cbfd;hpb=f57dd51863ec9baacba447d76b46d5c709b9b02e;p=core.git

diff --git a/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php b/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
index 289a5d94..b09a3b4f 100644
--- a/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
@@ -3,11 +3,13 @@
 namespace Org\Mxchange\CoreFramework\Command\Guest;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
-use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseFrontend;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
+use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
@@ -18,7 +20,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2019 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -75,7 +77,7 @@ class HtmlResendLinkCommand extends BaseCommand implements Commandable {
 		$userInstance = GenericRegistry::getRegistry()->getInstance('user');
 
 		// Get an application instance
-		$applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+		$applicationInstance = ApplicationHelper::getSelfInstance();
 
 		// Get a RNG instance (Random Number Generator)
 		$rngInstance = ObjectFactory::createObjectByConfiguredName('rng_class');
@@ -90,22 +92,19 @@ class HtmlResendLinkCommand extends BaseCommand implements Commandable {
 		$hashedString = $cryptoInstance->hashString($cryptoInstance->encryptString($randomString));
 
 		// Update the user class
-		$userInstance->updateDatabaseField(UserDatabaseWrapper::DB_COLUMN_CONFIRM_HASH, $hashedString);
+		$userInstance->updateDatabaseField(UserDatabaseFrontend::DB_COLUMN_CONFIRM_HASH, $hashedString);
 
 		// Re-set config entry to mailer engine
-		$this->getConfigInstance()->setConfigEntry('html_template_class', $this->getConfigInstance()->getConfigEntry('mail_template_class'));
-
-		// Prepare the template engine
-		$templateInstance = $this->prepareTemplateInstance($applicationInstance);
+		FrameworkBootstrap::getConfigurationInstance()->setConfigEntry('html_template_class', FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('mail_template_class'));
 
 		// Assign the application data with the template engine
-		$templateInstance->assignApplicationData();
+		$this->getTemplateInstance()->assignApplicationData();
 
 		// Get a mailer class
-		$mailerInstance = ObjectFactory::createObjectByConfiguredName('mailer_class', array($templateInstance, 'resend_link'));
+		$mailerInstance = ObjectFactory::createObjectByConfiguredName('mailer_class', array($this->getTemplateInstance(), 'resend_link'));
 
 		// Set this mailer in our template engine
-		$templateInstance->setMailerInstance($mailerInstance);
+		$this->getTemplateInstance()->setMailerInstance($mailerInstance);
 
 		// Add template variables we shall get
 		$mailerInstance->addConfigTemplateVariable('base_url');