diff --git a/core/Models/ContactModelAbstract.php b/core/Models/ContactModelAbstract.php
index d8fe12c86d030e8a26fe69277d504d366d195031..4eefbd10f3bdc2fc4838437d60cd0df85e386581 100644
--- a/core/Models/ContactModelAbstract.php
+++ b/core/Models/ContactModelAbstract.php
@@ -16,6 +16,8 @@
namespace Core\Models;
+use SrcCore\models\DatabaseModel;
+
class ContactModelAbstract
{
public static function getById(array $aArgs = [])
diff --git a/core/Models/DocserverModelAbstract.php b/core/Models/DocserverModelAbstract.php
index 7acd1ba5b3cced735d67a211bf7a163a77d87cad..a76646081920133cc75152cd8b60962014c21814 100755
--- a/core/Models/DocserverModelAbstract.php
+++ b/core/Models/DocserverModelAbstract.php
@@ -15,6 +15,8 @@
namespace Core\Models;
+use SrcCore\models\DatabaseModel;
+
class DocserverModelAbstract
{
public static function get(array $aArgs = [])
diff --git a/core/Models/DocserverTypeModelAbstract.php b/core/Models/DocserverTypeModelAbstract.php
index d16e99acee780a2da8a7982fa15d236cb92af357..56978f3e9c6d225a23f7ece25e7dd93d62e60d21 100755
--- a/core/Models/DocserverTypeModelAbstract.php
+++ b/core/Models/DocserverTypeModelAbstract.php
@@ -15,6 +15,8 @@
namespace Core\Models;
+use SrcCore\models\DatabaseModel;
+
class DocserverTypeModelAbstract
{
public static function get(array $aArgs = [])
diff --git a/core/Models/GroupModelAbstract.php b/core/Models/GroupModelAbstract.php
index aea37bf0ed1492522ac01dc3983af24d9fc4cd9b..d712b4402e0d2a948105f67393274ca8a898820b 100755
--- a/core/Models/GroupModelAbstract.php
+++ b/core/Models/GroupModelAbstract.php
@@ -15,6 +15,8 @@
namespace Core\Models;
+use SrcCore\models\DatabaseModel;
+
class GroupModelAbstract
{
public static function get(array $aArgs = [])
diff --git a/core/Models/LinkModelAbstract.php b/core/Models/LinkModelAbstract.php
index a57ddddd1ad21b55985842fe91cbde5db2af97cb..c06c857aa148677948f1bad2a7ca8d6d84e5bdcc 100644
--- a/core/Models/LinkModelAbstract.php
+++ b/core/Models/LinkModelAbstract.php
@@ -16,6 +16,8 @@
namespace Core\Models;
+use SrcCore\models\DatabaseModel;
+
class LinkModelAbstract
{
public static function getByResId(array $aArgs)
diff --git a/core/Models/ResDocserverModelAbstract.php b/core/Models/ResDocserverModelAbstract.php
index 0ae989b0d076aa9451e391fe451ee7d60a697557..9023c6e28adf445981093b9eb56eac9cb4c825d0 100644
--- a/core/Models/ResDocserverModelAbstract.php
+++ b/core/Models/ResDocserverModelAbstract.php
@@ -15,6 +15,8 @@
namespace Core\Models;
+use SrcCore\models\DatabaseModel;
+
class ResDocserverModelAbstract
{
diff --git a/core/Models/ResExtModelAbstract.php b/core/Models/ResExtModelAbstract.php
index f8a93784f0a67a812df2295bc6f2abcbe588c412..048495ebad50501b6ea2cdc4a4ae8d888f0d82e2 100755
--- a/core/Models/ResExtModelAbstract.php
+++ b/core/Models/ResExtModelAbstract.php
@@ -15,6 +15,8 @@
namespace Core\Models;
+use SrcCore\models\DatabaseModel;
+
class ResExtModelAbstract
{
diff --git a/core/Models/SecurityModelAbstract.php b/core/Models/SecurityModelAbstract.php
index 700aed7d4208f9e10f28a788abe6c806bee50239..450ab885157786471297b56d58b65f5677b44d41 100755
--- a/core/Models/SecurityModelAbstract.php
+++ b/core/Models/SecurityModelAbstract.php
@@ -16,6 +16,7 @@
namespace Core\Models;
use SrcCore\models\CoreConfigModel;
+use SrcCore\models\DatabaseModel;
class SecurityModelAbstract
{
diff --git a/core/Models/UserModelAbstract.php b/core/Models/UserModelAbstract.php
index 2a18a0feca84315a5a9ff4777c6dac12e085e606..3679689f2dfd704a8984b0389a206ce05a417c9c 100755
--- a/core/Models/UserModelAbstract.php
+++ b/core/Models/UserModelAbstract.php
@@ -18,6 +18,7 @@ namespace Core\Models;
use Entity\models\EntityModel;
use History\controllers\HistoryController;
use SrcCore\models\CoreConfigModel;
+use SrcCore\models\DatabaseModel;
class UserModelAbstract
{
diff --git a/core/Test/ResControllerTest.php b/core/Test/ResControllerTest.php
index aff876c6e242cc9020dd229a29330f5499668ea2..8625db950f9d5ccbe0f07120c26e4733cb6e81fd 100755
--- a/core/Test/ResControllerTest.php
+++ b/core/Test/ResControllerTest.php
@@ -132,7 +132,7 @@ class ResControllerTest extends TestCase
$this->assertSame('DEL', $res['status']);
// REAL DELETE
- \Core\Models\DatabaseModel::delete([
+ \SrcCore\models\DatabaseModel::delete([
'table' => 'res_letterbox',
'where' => ['res_id = ?'],
'data' => [self::$id]
diff --git a/core/Test/UserControllerTest.php b/core/Test/UserControllerTest.php
index 89d094d3e48ca54fc0194abb1ae22b2cfd0eddb8..8a537a1e5cc4cd833ac4c7caad2acb1cef3dce48 100755
--- a/core/Test/UserControllerTest.php
+++ b/core/Test/UserControllerTest.php
@@ -9,7 +9,6 @@
use PHPUnit\Framework\TestCase;
-use Core\Models\DatabaseModel;
class UserControllerTest extends TestCase
{
@@ -127,7 +126,7 @@ class UserControllerTest extends TestCase
$this->assertSame(null, $responseBody->thumbprint);
// REAL DELETE
- DatabaseModel::delete([
+ \SrcCore\models\DatabaseModel::delete([
'table' => 'users',
'where' => ['id = ?'],
'data' => [self::$id]
diff --git a/modules/attachments/Models/AttachmentsModelAbstract.php b/modules/attachments/Models/AttachmentsModelAbstract.php
index 27b5bbf3b92698c1df94472b1e1410016f7c94f4..1d20dd6bea98cf9e10e3668d57b9ca7a1505af74 100755
--- a/modules/attachments/Models/AttachmentsModelAbstract.php
+++ b/modules/attachments/Models/AttachmentsModelAbstract.php
@@ -9,9 +9,9 @@
namespace Attachments\Models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
use SrcCore\models\CoreConfigModel;
+use SrcCore\models\DatabaseModel;
class AttachmentsModelAbstract
{
diff --git a/modules/attachments/Models/ReconciliationModelAbstract.php b/modules/attachments/Models/ReconciliationModelAbstract.php
index effc4e6db5c5cd2939fe9ebcca51ffab7eb980e1..f7bfefc1aab72dea271efbfe6f4a852b510c8f33 100755
--- a/modules/attachments/Models/ReconciliationModelAbstract.php
+++ b/modules/attachments/Models/ReconciliationModelAbstract.php
@@ -9,7 +9,7 @@
namespace Attachments\Models;
use Core\Models\ValidatorModel;
-use Core\Models\DatabaseModel;
+use SrcCore\models\DatabaseModel;
class ReconciliationModelAbstract{
public static function selectReconciliation (array $aArgs = [])
diff --git a/modules/convert/Models/ProcessConvertModelAbstract.php b/modules/convert/Models/ProcessConvertModelAbstract.php
index fd9f4410f1ac6241de8a3bd1b3607e5e73b7c164..67e9e0bc8c5ab594734e8519a4d3547d85ed068a 100644
--- a/modules/convert/Models/ProcessConvertModelAbstract.php
+++ b/modules/convert/Models/ProcessConvertModelAbstract.php
@@ -15,9 +15,9 @@
namespace Convert\Models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
use History\controllers\HistoryController;
+use SrcCore\models\DatabaseModel;
class ProcessConvertModelAbstract
{
diff --git a/modules/convert/Models/ProcessFulltextModelAbstract.php b/modules/convert/Models/ProcessFulltextModelAbstract.php
index 7ab8ba491a049bacd44cca2811071c71b4f5f6df..14a1c8626bf4094487d025f576b31a320035ba9a 100644
--- a/modules/convert/Models/ProcessFulltextModelAbstract.php
+++ b/modules/convert/Models/ProcessFulltextModelAbstract.php
@@ -15,9 +15,9 @@
namespace Convert\Models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
use History\controllers\HistoryController;
+use SrcCore\models\DatabaseModel;
class ProcessFulltextModelAbstract
{
diff --git a/modules/convert/Models/ProcessThumbnailsModelAbstract.php b/modules/convert/Models/ProcessThumbnailsModelAbstract.php
index 0ab1c1c1a6d67c03624584db156f40b7f5de93e7..f5e5e6be10206afb57fc14c787587048215b99f9 100644
--- a/modules/convert/Models/ProcessThumbnailsModelAbstract.php
+++ b/modules/convert/Models/ProcessThumbnailsModelAbstract.php
@@ -15,9 +15,9 @@
namespace Convert\Models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
use History\controllers\HistoryController;
+use SrcCore\models\DatabaseModel;
class ProcessThumbnailsModelAbstract
{
diff --git a/modules/entities/Models/ListModelsModelAbstract.php b/modules/entities/Models/ListModelsModelAbstract.php
index 4876c873024770621e0d67a480eb624610eb1035..8837e8d7c54f0fe6a4215ae7a5723d1265095459 100755
--- a/modules/entities/Models/ListModelsModelAbstract.php
+++ b/modules/entities/Models/ListModelsModelAbstract.php
@@ -11,8 +11,8 @@
namespace Entities\Models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
+use SrcCore\models\DatabaseModel;
class ListModelsModelAbstract
{
diff --git a/modules/notes/Models/NoteModelAbstract.php b/modules/notes/Models/NoteModelAbstract.php
index 92fe668a4d3b9b215940fb9ed90719b92a5bfeb7..5af2d59e9857463d57215a1c0a513ebabac2c1e4 100755
--- a/modules/notes/Models/NoteModelAbstract.php
+++ b/modules/notes/Models/NoteModelAbstract.php
@@ -15,8 +15,8 @@
namespace Notes\Models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
+use SrcCore\models\DatabaseModel;
class NoteModelAbstract
{
diff --git a/modules/sendmail/mail_form.php b/modules/sendmail/mail_form.php
index 8ed60b5013b447a74a3cd883a01942ba2a0309a8..810ba463f2decda3424c5e7d86c8c452c22f9dca 100755
--- a/modules/sendmail/mail_form.php
+++ b/modules/sendmail/mail_form.php
@@ -42,8 +42,7 @@ require_once 'modules/sendmail/sendmail_tables.php';
require_once "modules" . DIRECTORY_SEPARATOR . "sendmail" . DIRECTORY_SEPARATOR
. "class" . DIRECTORY_SEPARATOR . "class_modules_tools.php";
require_once 'modules/sendmail/class/class_email_signatures.php';
-require_once 'core/Models/DatabaseModel.php';
-require_once 'core/Models/UserModel.php';
+require_once 'core/Models/UserModel.php';
$core_tools = new core_tools();
$request = new request();
@@ -114,7 +113,7 @@ if(empty($userEntities)){
$userEntities = [''];
}
-$userTemplates = \Core\Models\DatabaseModel::select(['select' => ['t.template_id', 't.template_label', 't.template_content'],
+$userTemplates = \SrcCore\models\DatabaseModel::select(['select' => ['t.template_id', 't.template_label', 't.template_content'],
'table' => ['templates t', 'templates_association ta'],
'left_join' => ['t.template_id = ta.template_id'],
'where' => ['t.template_target = \'sendmail\'', '(ta.value_field is null or value_field in (?))'],
diff --git a/modules/thumbnails/class/class_modules_tools.php b/modules/thumbnails/class/class_modules_tools.php
index 008bbe26d17b777021a196126363c5b0eae9e181..7c4f69c231a4a6d0a5995225e295ff61c94f02d9 100755
--- a/modules/thumbnails/class/class_modules_tools.php
+++ b/modules/thumbnails/class/class_modules_tools.php
@@ -255,7 +255,7 @@ class thumbnails
return false;
}
- $oRowSet = \Core\Models\DatabaseModel::select([
+ $oRowSet = \SrcCore\models\DatabaseModel::select([
'select' => ['path_template'],
'table' => ['docservers'],
'where' => ['docserver_type_id = ?'],
@@ -268,7 +268,7 @@ class thumbnails
$docserverPath = $oRowSet[0]['path_template'];
- $oRowSet = \Core\Models\DatabaseModel::select([
+ $oRowSet = \SrcCore\models\DatabaseModel::select([
'select' => ['tnl_path', 'tnl_filename'],
'table' => [$resTable],
'where' => ['res_id = ?'],
diff --git a/modules/visa/Models/VisaModelAbstract.php b/modules/visa/Models/VisaModelAbstract.php
index 15c6983e9baba32db93178d58b7b9aa87190cbc3..3f0ce0d83709eb6988e6da85da7e75a61ebd89cc 100755
--- a/modules/visa/Models/VisaModelAbstract.php
+++ b/modules/visa/Models/VisaModelAbstract.php
@@ -9,8 +9,8 @@
namespace Visa\Models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
+use SrcCore\models\DatabaseModel;
class VisaModelAbstract
{
diff --git a/src/app/action/models/ActionModelAbstract.php b/src/app/action/models/ActionModelAbstract.php
index d70b2aee5f51f61fd38966642b83b303c30bcdeb..ee11b0972c109305d2ac4df271f504c1164045af 100644
--- a/src/app/action/models/ActionModelAbstract.php
+++ b/src/app/action/models/ActionModelAbstract.php
@@ -11,9 +11,9 @@
namespace Action\models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
use SrcCore\models\CoreConfigModel;
+use SrcCore\models\DatabaseModel;
class ActionModelAbstract
{
diff --git a/src/app/basket/models/BasketModelAbstract.php b/src/app/basket/models/BasketModelAbstract.php
index 7cb27e673e82944aab23aadf7427c5159f961c00..230667c2444ef14de57a2135410af5ebc4c172d5 100644
--- a/src/app/basket/models/BasketModelAbstract.php
+++ b/src/app/basket/models/BasketModelAbstract.php
@@ -14,12 +14,12 @@
namespace Basket\models;
-use Core\Models\DatabaseModel;
use Core\Models\UserModel;
use Core\Models\ValidatorModel;
use Resource\models\ResModel;
use SrcCore\controllers\PreparedClauseController;
use SrcCore\models\CoreConfigModel;
+use SrcCore\models\DatabaseModel;
class BasketModelAbstract
{
diff --git a/src/app/entity/models/EntityModelAbstract.php b/src/app/entity/models/EntityModelAbstract.php
index c95043ba4fc15d879d06d1aabdf8515851df28b1..d2a2bcf80acb0228f97b678b7462e7257b7dcff3 100644
--- a/src/app/entity/models/EntityModelAbstract.php
+++ b/src/app/entity/models/EntityModelAbstract.php
@@ -14,9 +14,9 @@
namespace Entity\models;
-use Core\Models\DatabaseModel;
use Core\Models\UserModel;
use Core\Models\ValidatorModel;
+use SrcCore\models\DatabaseModel;
class EntityModelAbstract
{
diff --git a/src/app/entity/models/ListInstanceModelAbstract.php b/src/app/entity/models/ListInstanceModelAbstract.php
index 7014de08bdd9f2bc70c3b0e520ce915e94a764dc..92268312f50a1f74493cef0ba95a7eb4c2275cf6 100644
--- a/src/app/entity/models/ListInstanceModelAbstract.php
+++ b/src/app/entity/models/ListInstanceModelAbstract.php
@@ -14,8 +14,8 @@
namespace Entity\models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
+use SrcCore\models\DatabaseModel;
class ListInstanceModelAbstract
{
diff --git a/src/app/entity/models/ListTemplateModelAbstract.php b/src/app/entity/models/ListTemplateModelAbstract.php
index 339c9d158e73d0daddef24b6e8ae6e0912196891..9367d612fae17d24ecb560415d5332983cf886f9 100644
--- a/src/app/entity/models/ListTemplateModelAbstract.php
+++ b/src/app/entity/models/ListTemplateModelAbstract.php
@@ -14,8 +14,8 @@
namespace Entity\models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
+use SrcCore\models\DatabaseModel;
class ListTemplateModelAbstract
{
diff --git a/src/app/entity/models/UserEntityModelAbstract.php b/src/app/entity/models/UserEntityModelAbstract.php
index c46356753f299c59b11335767531fb2b6643948a..ebfe2ab484f20780f7ade1e4bd00b180772d54c5 100644
--- a/src/app/entity/models/UserEntityModelAbstract.php
+++ b/src/app/entity/models/UserEntityModelAbstract.php
@@ -14,9 +14,8 @@
namespace Entity\models;
-use Core\Models\DatabaseModel;
-use Core\Models\UserModel;
use Core\Models\ValidatorModel;
+use SrcCore\models\DatabaseModel;
class UserEntityModelAbstract
{
diff --git a/src/app/history/models/HistoryModelAbstract.php b/src/app/history/models/HistoryModelAbstract.php
index 537b2325a200d7c219fe1bff90156042205d06bd..d1f32e2a78d7ad6b199eee83cfa592e7626ae897 100644
--- a/src/app/history/models/HistoryModelAbstract.php
+++ b/src/app/history/models/HistoryModelAbstract.php
@@ -15,9 +15,9 @@
namespace History\models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
use SrcCore\models\CoreConfigModel;
+use SrcCore\models\DatabaseModel;
require_once('apps/maarch_entreprise/tools/log4php/Logger.php'); //TODO composer
diff --git a/src/app/notification/models/NotificationModelAbstract.php b/src/app/notification/models/NotificationModelAbstract.php
index 1add9cfbbf7aa9c4c9bdd1fc798212804087aa38..c29bd75913b71f586c718c3fa0eae0f5366dec5f 100644
--- a/src/app/notification/models/NotificationModelAbstract.php
+++ b/src/app/notification/models/NotificationModelAbstract.php
@@ -15,9 +15,9 @@
namespace Notification\models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
use Entity\models\EntityModel;
+use SrcCore\models\DatabaseModel;
use Status\models\StatusModel;
use Core\Models\GroupModelAbstract;
use SrcCore\models\CoreConfigModel;
diff --git a/src/app/notification/models/NotificationsEventsModelAbstract.php b/src/app/notification/models/NotificationsEventsModelAbstract.php
index 98ef74ba6872082299bc483c4b261aa98a4eb5fd..58497e87e40107cb4cb9e25f50a1fb930196e0f6 100644
--- a/src/app/notification/models/NotificationsEventsModelAbstract.php
+++ b/src/app/notification/models/NotificationsEventsModelAbstract.php
@@ -15,8 +15,8 @@
namespace Notification\models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
+use SrcCore\models\DatabaseModel;
class NotificationsEventsModelAbstract
{
diff --git a/src/app/parameter/models/ParameterModelAbstract.php b/src/app/parameter/models/ParameterModelAbstract.php
index fe20c2dd70e3b822a1a729732231d623278515b7..73cb26f519117f9f54096418cc781d23e7550199 100644
--- a/src/app/parameter/models/ParameterModelAbstract.php
+++ b/src/app/parameter/models/ParameterModelAbstract.php
@@ -17,8 +17,8 @@
namespace Parameter\models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
+use SrcCore\models\DatabaseModel;
class ParameterModelAbstract
{
diff --git a/src/app/priority/models/PriorityModelAbstract.php b/src/app/priority/models/PriorityModelAbstract.php
index d3da4dfb6d7388a1c513204bc42bb9e63d05eda6..2e17010af99805d3eb8c7fa0a89a99348fe7dad9 100644
--- a/src/app/priority/models/PriorityModelAbstract.php
+++ b/src/app/priority/models/PriorityModelAbstract.php
@@ -13,8 +13,8 @@
namespace Priority\models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
+use SrcCore\models\DatabaseModel;
abstract class PriorityModelAbstract
{
diff --git a/src/app/report/models/ReportModelAbstract.php b/src/app/report/models/ReportModelAbstract.php
index 060c7dc5055f5db151e59145c331b185cae712fe..afaf979c43bbf2f3afb937ce584ceea0f69154fa 100644
--- a/src/app/report/models/ReportModelAbstract.php
+++ b/src/app/report/models/ReportModelAbstract.php
@@ -14,9 +14,9 @@
namespace Report\models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
use SrcCore\models\CoreConfigModel;
+use SrcCore\models\DatabaseModel;
class ReportModelAbstract
{
diff --git a/src/app/resource/models/ResModelAbstract.php b/src/app/resource/models/ResModelAbstract.php
index b569076543fd7efe135e1d160f57535aa78ef1e3..10f1dda45c9f7c999c08cc53a7498e3a39711ac3 100644
--- a/src/app/resource/models/ResModelAbstract.php
+++ b/src/app/resource/models/ResModelAbstract.php
@@ -14,8 +14,8 @@
namespace Resource\models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
+use SrcCore\models\DatabaseModel;
class ResModelAbstract
{
diff --git a/src/app/status/models/StatusImagesModelAbstract.php b/src/app/status/models/StatusImagesModelAbstract.php
index faef457545cc5744cb963d030e76646391d6cf07..bed8bf03f5a27d4824c8d7f7b4eecf99a0b41e58 100644
--- a/src/app/status/models/StatusImagesModelAbstract.php
+++ b/src/app/status/models/StatusImagesModelAbstract.php
@@ -10,13 +10,11 @@
/**
* @brief Status Images Model
* @author dev@maarch.org
-* @ingroup core
*/
namespace Status\models;
-use Core\Models\DatabaseModel;
-use Core\Models\ValidatorModel;
+use SrcCore\models\DatabaseModel;
class StatusImagesModelAbstract
{
diff --git a/src/app/status/models/StatusModelAbstract.php b/src/app/status/models/StatusModelAbstract.php
index 80cae28a1bd9f2865f391c2827d63ad1c21a884b..5535e252eed6733950018362912866fa47dc7e22 100755
--- a/src/app/status/models/StatusModelAbstract.php
+++ b/src/app/status/models/StatusModelAbstract.php
@@ -15,8 +15,8 @@
namespace Status\models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
+use SrcCore\models\DatabaseModel;
class StatusModelAbstract
{
diff --git a/src/app/template/models/TemplateModelAbstract.php b/src/app/template/models/TemplateModelAbstract.php
index 7ce5d17fd1add67186bdd8752b8e0bd0587312e0..c2131c2b3a2c417e3a1dda6161003a05134d1dd4 100644
--- a/src/app/template/models/TemplateModelAbstract.php
+++ b/src/app/template/models/TemplateModelAbstract.php
@@ -14,8 +14,8 @@
namespace Template\models;
-use Core\Models\DatabaseModel;
use Core\Models\ValidatorModel;
+use SrcCore\models\DatabaseModel;
class TemplateModelAbstract
{
diff --git a/core/Models/DatabaseModel.php b/src/core/models/DatabaseModel.php
old mode 100755
new mode 100644
similarity index 99%
rename from core/Models/DatabaseModel.php
rename to src/core/models/DatabaseModel.php
index 2cc3e9c65b1f11ada5de3c487785ec411f7fdd0e..965d4bfb30cf580d009dfc82bef27529db9a88c1
--- a/core/Models/DatabaseModel.php
+++ b/src/core/models/DatabaseModel.php
@@ -10,14 +10,14 @@
/**
* @brief Database Model
* @author dev@maarch.org
-* @ingroup core
*/
-namespace Core\Models;
+namespace SrcCore\models;
+
+use Core\Models\ValidatorModel;
class DatabaseModel
{
-
/**
* Database Unique Id Function
*
diff --git a/core/Models/DatabasePDO.php b/src/core/models/DatabasePDO.php
old mode 100755
new mode 100644
similarity index 98%
rename from core/Models/DatabasePDO.php
rename to src/core/models/DatabasePDO.php
index 225e57fe1058815304093705781ef0ace1766589..50ca81503ba2aae44d0c2fd55022bfc66cd8984c
--- a/core/Models/DatabasePDO.php
+++ b/src/core/models/DatabasePDO.php
@@ -10,12 +10,12 @@
/**
* @brief DatabasePDO
* @author dev@maarch.org
- * @ingroup core
*/
-namespace Core\Models;
+namespace SrcCore\models;
-use SrcCore\models\CoreConfigModel;
+
+use Core\Models\ValidatorModel;
class DatabasePDO
{