X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fuser%2Fclass_BaseUser.php;fp=framework%2Fmain%2Fclasses%2Fuser%2Fclass_BaseUser.php;h=1a2da22ed2f91654659e391d0cd594eace12d347;hb=fea88c89d790fd1cc5101744e675a99db097d0a8;hp=f3da469e25f1b6445c98def6dcc4ae32ebe8325a;hpb=9a7a272f04e54537aaf30c282598c1742fe0ad88;p=core.git

diff --git a/framework/main/classes/user/class_BaseUser.php b/framework/main/classes/user/class_BaseUser.php
index f3da469e..1a2da22e 100644
--- a/framework/main/classes/user/class_BaseUser.php
+++ b/framework/main/classes/user/class_BaseUser.php
@@ -4,7 +4,7 @@ namespace Org\Mxchange\CoreFramework\User;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
-use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
+use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseFrontend;
 use Org\Mxchange\CoreFramework\Database\Updateable;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
@@ -139,21 +139,21 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 
 		// Is a previous result there?
 		if (!$this->getResultInstance() instanceof SearchableResult) {
-			// Get a UserDatabaseWrapper instance
-			$wrapperInstance = ObjectFactory::createObjectByConfiguredName('user_db_wrapper_class');
+			// Get a UserDatabaseFrontend instance
+			$frontendInstance = ObjectFactory::createObjectByConfiguredName('user_db_frontend_class');
 
 			// Create a search criteria
 			$criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
 
 			// Add the username as a criteria and set limit to one entry
-			$criteriaInstance->addCriteria(UserDatabaseWrapper::DB_COLUMN_USERNAME, $this->getUserName());
+			$criteriaInstance->addCriteria(UserDatabaseFrontend::DB_COLUMN_USERNAME, $this->getUserName());
 			$criteriaInstance->setLimit(1);
 
 			// Get a search result
-			$resultInstance = $wrapperInstance->doSelectByCriteria($criteriaInstance);
+			$resultInstance = $frontendInstance->doSelectByCriteria($criteriaInstance);
 
 			// Set the index "solver"
-			$resultInstance->solveResultIndex(UserDatabaseWrapper::DB_COLUMN_USERID, $wrapperInstance, array($this, 'setUserId'));
+			$resultInstance->solveResultIndex(UserDatabaseFrontend::DB_COLUMN_USERID, $frontendInstance, array($this, 'setUserId'));
 
 			// And finally set it
 			$this->setResultInstance($resultInstance);
@@ -183,21 +183,21 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 
 		// Is a previous result there?
 		if (!$this->getResultInstance() instanceof SearchableResult) {
-			// Get a UserDatabaseWrapper instance
-			$wrapperInstance = ObjectFactory::createObjectByConfiguredName('user_db_wrapper_class');
+			// Get a UserDatabaseFrontend instance
+			$frontendInstance = ObjectFactory::createObjectByConfiguredName('user_db_frontend_class');
 
 			// Create a search criteria
 			$criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
 
 			// Add the username as a criteria and set limit to one entry
-			$criteriaInstance->addCriteria(UserDatabaseWrapper::DB_COLUMN_EMAIL, $this->getEmail());
+			$criteriaInstance->addCriteria(UserDatabaseFrontend::DB_COLUMN_EMAIL, $this->getEmail());
 			$criteriaInstance->setLimit(1);
 
 			// Get a search result
-			$resultInstance = $wrapperInstance->doSelectByCriteria($criteriaInstance);
+			$resultInstance = $frontendInstance->doSelectByCriteria($criteriaInstance);
 
 			// Set the index "solver"
-			$resultInstance->solveResultIndex(UserDatabaseWrapper::DB_COLUMN_USERID, $wrapperInstance, array($this, 'setUserId'));
+			$resultInstance->solveResultIndex(UserDatabaseFrontend::DB_COLUMN_USERID, $frontendInstance, array($this, 'setUserId'));
 
 			// And finally set it
 			$this->setResultInstance($resultInstance);
@@ -238,21 +238,21 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 
 		// Is a previous result there?
 		if ((!$this->getResultInstance() instanceof SearchableResult) || ($this->getResultInstance()->count() == 0)) {
-			// Get a UserDatabaseWrapper instance
-			$wrapperInstance = ObjectFactory::createObjectByConfiguredName('user_db_wrapper_class');
+			// Get a UserDatabaseFrontend instance
+			$frontendInstance = ObjectFactory::createObjectByConfiguredName('user_db_frontend_class');
 
 			// Create a search criteria
 			$criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
 
 			// Add the username as a criteria and set limit to one entry
-			$criteriaInstance->addCriteria(UserDatabaseWrapper::DB_COLUMN_USERNAME, $this->getUserName());
+			$criteriaInstance->addCriteria(UserDatabaseFrontend::DB_COLUMN_USERNAME, $this->getUserName());
 			$criteriaInstance->setLimit(1);
 
 			// Get a search result
-			$resultInstance = $wrapperInstance->doSelectByCriteria($criteriaInstance);
+			$resultInstance = $frontendInstance->doSelectByCriteria($criteriaInstance);
 
 			// Set the index "solver"
-			$resultInstance->solveResultIndex(UserDatabaseWrapper::DB_COLUMN_USERID, $wrapperInstance, array($this, 'setUserId'));
+			$resultInstance->solveResultIndex(UserDatabaseFrontend::DB_COLUMN_USERID, $frontendInstance, array($this, 'setUserId'));
 
 			// And finally set it
 			$this->setResultInstance($resultInstance);
@@ -303,11 +303,11 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 	 * @return	$primaryValue	Value of the primary key based on database type
 	 */
 	public final function getPrimaryKey () {
-		// Get a user database wrapper
-		$wrapperInstance = ObjectFactory::createObjectByConfiguredName('user_db_wrapper_class');
+		// Get a user database frontend
+		$frontendInstance = ObjectFactory::createObjectByConfiguredName('user_db_frontend_class');
 
-		// Get the primary key back from the wrapper
-		$primaryKey = $wrapperInstance->getPrimaryKeyValue();
+		// Get the primary key back from the frontend
+		$primaryKey = $frontendInstance->getPrimaryKeyValue();
 
 		// Get that field
 		$primaryValue = $this->getField($primaryKey);
@@ -329,7 +329,7 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 		$searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
 
 		// Add search criteria
-		$searchInstance->addCriteria(UserDatabaseWrapper::DB_COLUMN_USERNAME, $this->getUserName());
+		$searchInstance->addCriteria(UserDatabaseFrontend::DB_COLUMN_USERNAME, $this->getUserName());
 		$searchInstance->setLimit(1);
 
 		// Now get another criteria
@@ -341,8 +341,8 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 		// Add the search criteria for searching for the right entry
 		$updateInstance->setSearchInstance($searchInstance);
 
-		// Set wrapper class name
-		$updateInstance->setWrapperConfigEntry('user_db_wrapper_class');
+		// Set frontend class name
+		$updateInstance->setFrontendConfigEntry('user_db_frontend_class');
 
 		// Remember the update in database result
 		$this->getResultInstance()->add2UpdateQueue($updateInstance);
@@ -355,7 +355,7 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 	 */
 	public function isConfirmed () {
 		// Determine it
-		$isConfirmed = ($this->getField(UserDatabaseWrapper::DB_COLUMN_USER_STATUS) == FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('user_status_confirmed'));
+		$isConfirmed = ($this->getField(UserDatabaseFrontend::DB_COLUMN_USER_STATUS) == FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('user_status_confirmed'));
 
 		// Return it
 		return $isConfirmed;
@@ -368,7 +368,7 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 	 */
 	public function isGuest () {
 		// Determine it
-		$isGuest = ($this->getField(UserDatabaseWrapper::DB_COLUMN_USER_STATUS) == FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('user_status_guest'));
+		$isGuest = ($this->getField(UserDatabaseFrontend::DB_COLUMN_USER_STATUS) == FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('user_status_guest'));
 
 		// Return it
 		return $isGuest;