First Database, then Frontend (not Wrapper)

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/framework/config-global.php b/framework/config-global.php
index f11a27e75afd76266842724877a5e17326ffd197..303029d5aba7ed6ea1b11ec329424dc4f1c6c3f3 100644 (file)
--- a/framework/config-global.php
+++ b/framework/config-global.php
@@ -238,10 +238,10 @@ $cfg->setConfigEntry('crypto_class', 'CoreFramework\Helper\Crypto\CryptoHelper')
 $cfg->setConfigEntry('rng_class', 'CoreFramework\Crypto\RandomNumber\RandomNumberGenerator');
 
 // CFG: USER-DB-WRAPPER-CLASS
-$cfg->setConfigEntry('user_db_wrapper_class', 'CoreFramework\Wrapper\Database\User\UserDatabaseWrapper');
+$cfg->setConfigEntry('user_db_wrapper_class', 'CoreFramework\Database\Frontend\User\UserDatabaseWrapper');
 
 // CFG: NEWS-DB-WRAPPER-CLASS
-$cfg->setConfigEntry('news_db_wrapper_class', 'CoreFramework\Wrapper\Database\News\NewsDatabaseWrapper');
+$cfg->setConfigEntry('news_db_wrapper_class', 'CoreFramework\Database\Frontend\News\NewsDatabaseWrapper');
 
 // CFG: HTML-CMD-RESOLVER-CLASS
 $cfg->setConfigEntry('html_cmd_resolver_class', 'CoreFramework\Resolver\Command\HtmlCommandResolver');

diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index 248da1269eceeec71b5777527bbb9cb7113ed6bd..ab2e5540a5d5bb7fc0136fe42afdc04225127bdc 100644 (file)
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -13,6 +13,7 @@ use CoreFramework\Criteria\Local\LocalSearchCriteria;
 use CoreFramework\Criteria\Local\LocalUpdateCriteria;
 use CoreFramework\Crypto\Cryptable;
 use CoreFramework\Crypto\RandomNumber\RandomNumberGenerator;
+use CoreFramework\Database\Frontend\DatabaseWrapper;
 use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filesystem\Block;
@@ -39,7 +40,6 @@ use CoreFramework\Stream\Output\OutputStreamer;
 use CoreFramework\Template\CompileableTemplate;
 use CoreFramework\User\ManageableAccount;
 use CoreFramework\Visitor\Visitor;
-use CoreFramework\Wrapper\Database\DatabaseWrapper;
 
 // Import SPL stuff
 use \stdClass;

diff --git a/framework/main/classes/commands/html/class_HtmlConfirmCommand.php b/framework/main/classes/commands/html/class_HtmlConfirmCommand.php
index 9ad5288525602c97c9dc5bb7da555f1abbc9838f..3180836ac69aad8d3e96c4ca9b4a3db95601d484 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlConfirmCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlConfirmCommand.php
@@ -6,13 +6,13 @@ namespace CoreFramework\Command\Guest;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\Commandable;
 use CoreFramework\Controller\Controller;
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\NullPointerException;
 use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\Command\CommandResolver;
 use CoreFramework\Response\Responseable;
-use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;
 
 /**
  * A command for the confirmation link handling

diff --git a/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php b/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
index d19d9c24f9b93e014931e42b27db80976e690316..aacfb613e3c4851d50f9a7fd870b9840f2b0152d 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlResendLinkCommand.php
@@ -6,12 +6,12 @@ namespace CoreFramework\Command\Guest;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\Commandable;
 use CoreFramework\Controller\Controller;
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\Command\CommandResolver;
 use CoreFramework\Response\Responseable;
-use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;
 
 /**
  * A command class for resending the confirmation link

diff --git a/framework/main/classes/database/class_BaseDatabaseWrapper.php b/framework/main/classes/database/class_BaseDatabaseWrapper.php
index dbf0872ea591140b0dd0ba0acf175b4b16784aec..5be68e3f801bca4fbd43168c7aa17ae3244a3f7d 100644 (file)
--- a/framework/main/classes/database/class_BaseDatabaseWrapper.php
+++ b/framework/main/classes/database/class_BaseDatabaseWrapper.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Wrapper\Database;
+namespace CoreFramework\Database\Frontend;
 
 // Import framework stuff
 use CoreFramework\Criteria\Criteria;

diff --git a/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
index fd383974d9e7e5334b0d4c863c87178776db3cb9..7a7d45e5f2358761fe9fe68d9b0c87ba7090e458 100644 (file)
--- a/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
@@ -1,9 +1,9 @@
 <?php
 // Own namespace
-namespace CoreFramework\Wrapper\Database\News;
+namespace CoreFramework\Database\Frontend\News;
 
 // Import framework stuff
-use CoreFramework\Wrapper\Database\BaseDatabaseWrapper;
+use CoreFramework\Database\Frontend\BaseDatabaseWrapper;
 use CoreFramework\Registry\Registerable;
 
 /**

diff --git a/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
index f34347b36ebac8e440dfd752e56edd484972fd2c..25ea8bad4c137cd79d4337e06e182b2cd6f54907 100644 (file)
--- a/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_PaymentsDatabaseWrapper.php
@@ -1,9 +1,9 @@
 <?php
 // Own namespace
-namespace CoreFramework\Wrapper\Database;
+namespace CoreFramework\Database\Frontend;
 
 // Import framework stuff
-use CoreFramework\Wrapper\Database\BaseDatabaseWrapper;
+use CoreFramework\Database\Frontend\BaseDatabaseWrapper;
 
 /**
  * A database wrapper for payments

diff --git a/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php b/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php
index b1288cdfccf5f2abe7cd604f95c32068afe36e7b..279375245ed32c70d43454bd418a49569d447499 100644 (file)
--- a/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_UserDatabaseWrapper.php
@@ -1,15 +1,15 @@
 <?php
 // Own namespace
-namespace CoreFramework\Wrapper\Database\User;
+namespace CoreFramework\Database\Frontend\User;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\BaseDatabaseWrapper;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\NullPointerException;
 use CoreFramework\Registration\User\UserRegister;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Result\Update\UpdateableResult;
 use CoreFramework\Wrapper\Account\ManageableAccountWrapper;
-use CoreFramework\Wrapper\Database\BaseDatabaseWrapper;
 
 /**
  * A database wrapper for the User class

diff --git a/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
index 4446b637a850101e1344c0c597f49747a3ff3504..dd6ea62e2ee9b8e14c08a829e358c63fcb35d9ae 100644 (file)
--- a/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
@@ -1,9 +1,9 @@
 <?php
 // Own namespace
-namespace CoreFramework\Wrapper\Database\Points;
+namespace CoreFramework\Database\Frontend\Points;
 
 // Import framework stuff
-use CoreFramework\Wrapper\Database\BaseDatabaseWrapper;
+use CoreFramework\Database\Frontend\BaseDatabaseWrapper;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
 

diff --git a/framework/main/classes/database/result/class_CachedDatabaseResult.php b/framework/main/classes/database/result/class_CachedDatabaseResult.php
index 17cf461da490feb49d07644b1048f4a4723e1006..d69b491794fc07c237c4ea164cc5142fd2f45fff 100644 (file)
--- a/framework/main/classes/database/result/class_CachedDatabaseResult.php
+++ b/framework/main/classes/database/result/class_CachedDatabaseResult.php
@@ -6,11 +6,11 @@ namespace CoreFramework\Result\Database;
 use CoreFramework\Criteria\Local\LocalSearchCriteria;
 use CoreFramework\Criteria\Local\LocalUpdateCriteria;
 use CoreFramework\Criteria\Storing\StoreableCriteria;
+use CoreFramework\Database\Frontend\DatabaseWrapper;
 use CoreFramework\Database\Backend\BaseDatabaseBackend;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Result\Search\SearchableResult;
 use CoreFramework\Result\Update\UpdateableResult;
-use CoreFramework\Wrapper\Database\DatabaseWrapper;
 
 // Import SPL stuff
 use \SeekableIterator;

diff --git a/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php b/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
index 8b2b52343caf9f04073f93d52712094a353049fa..cef39752d4c47936d1a2e2a6f489bfcb68295173 100644 (file)
--- a/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
+++ b/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
@@ -3,12 +3,12 @@
 namespace CoreFramework\Filter\User\Status;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use CoreFramework\Filter\BaseFilter;
 use CoreFramework\Filter\Filterable;
 use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
-use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;
 
 /**
  * A filter for updating the user account status to confirmed

diff --git a/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php b/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
index bbc2f17d50d917a5bb9fcc6d2bb5e04c6f71e077..a5b78c112f109d16846e5cca6b3a75e0d6fcc9d2 100644 (file)
--- a/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
@@ -3,12 +3,12 @@
 namespace CoreFramework\Filter\Verifier\Confirmation;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use CoreFramework\Filter\BaseFilter;
 use CoreFramework\Filter\Filterable;
 use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
-use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;
 
 /**
  * A filter for checking if supplied confirmation code is valid.

diff --git a/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
index 73ea3840915acb694f89fa02d7292185746346f9..d55b057d66ee732aec2b4ffc903c7e402b40505c 100644 (file)
--- a/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
@@ -3,12 +3,12 @@
 namespace CoreFramework\Filter\Verifier\User;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use CoreFramework\Filter\BaseFilter;
 use CoreFramework\Filter\Filterable;
 use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
-use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;
 
 /**
  * A filter for checking if user status is UNCONFIRMED.

diff --git a/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php b/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php
index 65e7f9c468ec0181a4485070c59b7bf26eb6ceb3..146be69433f2a2f87d0b383295cf1219bf8e4afa 100644 (file)
--- a/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php
+++ b/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php
@@ -3,12 +3,12 @@
 namespace CoreFramework\Helper;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Generic\NullPointerException;
 use CoreFramework\Registry\Registry;
 use CoreFramework\Template\CompileableTemplate;
-use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;
 
 /**
  * A helper for constructing web forms

diff --git a/framework/main/classes/user/class_BaseUser.php b/framework/main/classes/user/class_BaseUser.php
index 34761fefd06821934e3b89df9984886336af6959..2dd1d9f4363226d611bc60a3921cdabb190e3c6a 100644 (file)
--- a/framework/main/classes/user/class_BaseUser.php
+++ b/framework/main/classes/user/class_BaseUser.php
@@ -3,12 +3,12 @@
 namespace CoreFramework\User;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use CoreFramework\Database\Updateable;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Result\Search\SearchableResult;
-use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;
 
 /**
  * A general user class

diff --git a/framework/main/classes/user/member/class_Member.php b/framework/main/classes/user/member/class_Member.php
index 94a37639eb0c85b5c331771ebd759dac289026fb..84f05ed81b24dc1255cd9931cc36faebb513e243 100644 (file)
--- a/framework/main/classes/user/member/class_Member.php
+++ b/framework/main/classes/user/member/class_Member.php
@@ -3,11 +3,11 @@
 namespace CoreFramework\User\Login;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Manager\Login\ManageableMember;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\User\BaseUser;
-use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;
 
 /**
  * A generic class for handling users

diff --git a/framework/main/exceptions/user/class_UserNoGuestException.php b/framework/main/exceptions/user/class_UserNoGuestException.php
index 386a85396b498f54d2e2e3a5bda96ea4da410521..f368f0ac05d074b5ad12a06d6e6c2b60603cedbc 100644 (file)
--- a/framework/main/exceptions/user/class_UserNoGuestException.php
+++ b/framework/main/exceptions/user/class_UserNoGuestException.php
@@ -3,8 +3,8 @@
 namespace CoreFramework\Deprecated;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
 use CoreFramework\Generic\FrameworkException;
-use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;
 
 /**
  * An exception for non-guest accounts (but guest was expected)

diff --git a/framework/main/interfaces/database/class_DatabaseWrapper.php b/framework/main/interfaces/database/class_DatabaseWrapper.php
index 30ae7c68323daa309dea43036b041406c14ca22e..0bd5566db6c567b0dd97e78f663e00d4ae7bdebd 100644 (file)
--- a/framework/main/interfaces/database/class_DatabaseWrapper.php
+++ b/framework/main/interfaces/database/class_DatabaseWrapper.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Wrapper\Database;
+namespace CoreFramework\Database\Frontend;
 
 // Import framework stuff
 use CoreFramework\Criteria\Criteria;

diff --git a/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php b/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
index 2551540bbbbd9857ab9f5c2b6306146f37b52ed2..eb34681d1b163a1ad9ae714bbc44cff705926533 100644 (file)
--- a/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
+++ b/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
@@ -1,10 +1,10 @@
 <?php
 // Own namespace
-namespace CoreFramework\Wrapper\Database;
+namespace CoreFramework\Database\Frontend;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\DatabaseWrapper;
 use CoreFramework\Result\Update\UpdateableResult;
-use CoreFramework\Wrapper\Database\DatabaseWrapper;
 
 /**
  * An interface for wrapper dealing with bookable points

diff --git a/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php b/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php
index 4f40af5e4139ef1f8afe6a56529795ed2310538c..2e88489692ae4ccbcb3df25fcbcae7c8811370f2 100644 (file)
--- a/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php
+++ b/framework/main/interfaces/database/wrapper/class_ManageableAccountWrapper.php
@@ -3,9 +3,9 @@
 namespace CoreFramework\Wrapper\Account;
 
 // Import framework stuff
+use CoreFramework\Database\Frontend\DatabaseWrapper;
 use CoreFramework\Registration\User\UserRegister;
 use CoreFramework\Result\Update\UpdateableResult;
-use CoreFramework\Wrapper\Database\DatabaseWrapper;
 
 /**
  * An interface for wrapper handling manageable accounts

diff --git a/framework/main/interfaces/result/class_SearchableResult.php b/framework/main/interfaces/result/class_SearchableResult.php
index 870ecc70a4e7ffcd0795829545a546aa99a3387a..ce94d28b024204602d1cd85ae45f9fba77bf3a22 100644 (file)
--- a/framework/main/interfaces/result/class_SearchableResult.php
+++ b/framework/main/interfaces/result/class_SearchableResult.php
@@ -4,8 +4,8 @@ namespace CoreFramework\Result\Search;
 
 // Import framework stuff
 use CoreFramework\Criteria\Local\LocalSearchCriteria;
+use CoreFramework\Database\Frontend\DatabaseWrapper;
 use CoreFramework\Generic\FrameworkInterface;
-use CoreFramework\Wrapper\Database\DatabaseWrapper;
 
 /**
  * An interface for searchable results