X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcommands%2Fhtml%2Fclass_HtmlResendLinkCommand.php;h=ab8974dbadef3015f546ed38d991f73284f1b6df;hb=5dfec1886bc8db372483aa4f710c948f4fdc8027;hp=db4c68772222151418efc24eab606dd9dda90568;hpb=78c80d535ab3e108f8c89f2aae9ebe02270e4d63;p=core.git

diff --git a/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php b/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
index db4c6877..ab8974db 100644
--- a/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
@@ -7,8 +7,9 @@ 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\Database\Frontend\User\UserDatabaseFrontend;
 use Org\Mxchange\CoreFramework\Factory\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;
@@ -76,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');
@@ -91,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
 		FrameworkBootstrap::getConfigurationInstance()->setConfigEntry('html_template_class', FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('mail_template_class'));
 
-		// Prepare the template engine
-		$templateInstance = $this->prepareTemplateInstance($applicationInstance);
-
 		// 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');