Refactored source code

Kero76 · Dec 22, 2016 · 6286ae4 · 6286ae4
1 parent a460c82
commit 6286ae4
Show file tree

Hide file tree

Showing 35 changed files with 147 additions and 81 deletions.
diff --git a/src/Controller/BuildDomain/Administration/BuildAddCategory.php b/src/Controller/BuildDomain/Administration/BuildAddCategory.php
@@ -2,6 +2,8 @@
     namespace SciMS\Controller\BuildDomain\Administration;
 
     use \SciMS\Controller\BuildDomain\AbstractBuildDomain;
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\Website;
     use \SciMS\Form\Input;
 
     /**
@@ -40,8 +42,8 @@ public function __construct($template) {
          * @version 1.0
          */
         public function buildDomain(array $services) {
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach($themes as $t) {

diff --git a/src/Controller/BuildDomain/Administration/BuildAdministrationHome.php b/src/Controller/BuildDomain/Administration/BuildAdministrationHome.php
@@ -1,7 +1,9 @@
 <?php
     namespace SciMS\Controller\BuildDomain\Administration;
 
-    use SciMS\Controller\BuildDomain\AbstractBuildDomain;
+    use \SciMS\Controller\BuildDomain\AbstractBuildDomain;
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\Website;
 
     /**
      * Class BuildAdministrationHome
@@ -37,8 +39,8 @@ public function __construct($template) {
          * @version 1.0
          */
         public function buildDomain(array $services) {
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach ($themes as $t) {

diff --git a/src/Controller/BuildDomain/Administration/BuildArticles.php b/src/Controller/BuildDomain/Administration/BuildArticles.php
@@ -1,8 +1,10 @@
 <?php
     namespace SciMS\Controller\BuildDomain\Administration;
 
-    use SciMS\Controller\BuildDomain\AbstractBuildDomain;
-    use SciMS\Domain\User;
+    use \SciMS\Controller\BuildDomain\AbstractBuildDomain;
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\User;
+    use \SciMS\Domain\Website;
 
     /**
      * Class BuildDomainArticles.
@@ -38,8 +40,8 @@ public function __construct($template) {
          * @version 1.0
          */
         public function buildDomain(array $services) {
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach ($themes as $t) {

diff --git a/src/Controller/BuildDomain/Administration/BuildCategories.php b/src/Controller/BuildDomain/Administration/BuildCategories.php
@@ -1,7 +1,9 @@
 <?php
     namespace SciMS\Controller\BuildDomain\Administration;
 
-    use SciMS\Controller\BuildDomain\AbstractBuildDomain;
+    use \SciMS\Controller\BuildDomain\AbstractBuildDomain;
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\Website;
 
     class BuildCategories extends AbstractBuildDomain {
 
@@ -29,8 +31,8 @@ public function __construct($template) {
          * @version 1.0
          */
         public function buildDomain(array $services) {
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach ($themes as $t) {

diff --git a/src/Controller/BuildDomain/Administration/BuildEditArticle.php b/src/Controller/BuildDomain/Administration/BuildEditArticle.php
@@ -3,6 +3,8 @@
 
     use \SciMS\Controller\BuildDomain\AbstractBuildDomain;
     use \SciMS\Domain\Article;
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\Website;
     use \SciMS\Form\Input;
     use \SciMS\Form\Option;
     use \SciMS\Form\Select;
@@ -44,16 +46,15 @@ public function __construct($template) {
          * @version 1.0
          */
         public function buildDomain(array $services) {
-            $services['get.handler']->setRequest($_GET);         // Retrieve $_GET.
-            $user    = $services['dao.user']->findById($services['session.handler']->getRequestField('user_id'));
-            $article = $services['dao.article']->findById($services['get.handler']->getRequestField('article'));
-
             $services['post.handler']->setRequest($_POST);  // Retrieve $_POST.
             $services['get.handler']->setRequest($_GET);    // Retrieve $_GET.
             $services['file.handler']->setRequest($_FILES); // Retrieve $_SESSION.
 
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+            $user    = $services['dao.user']->findById($services['session.handler']->getRequestField('user_id'));
+            $article = $services['dao.article']->findById($services['get.handler']->getRequestField('article'));
+
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach($themes as $t) {

diff --git a/src/Controller/BuildDomain/Administration/BuildEditCategory.php b/src/Controller/BuildDomain/Administration/BuildEditCategory.php
@@ -1,7 +1,9 @@
 <?php
     namespace SciMS\Controller\BuildDomain\Administration;
 
-    use SciMS\Controller\BuildDomain\AbstractBuildDomain;
+    use \SciMS\Controller\BuildDomain\AbstractBuildDomain;
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\Website;
     use \SciMS\Form\Input;
 
     /**
@@ -39,8 +41,8 @@ public function __construct($template) {
          */
         public function buildDomain(array $services) {
             $services['get.handler']->setRequest($_GET);         // Retrieve $_GET.
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach($themes as $t) {

diff --git a/src/Controller/BuildDomain/Administration/BuildEditProfile.php b/src/Controller/BuildDomain/Administration/BuildEditProfile.php
@@ -2,6 +2,8 @@
     namespace SciMS\Controller\BuildDomain\Administration;
 
     use \SciMS\Controller\BuildDomain\AbstractBuildDomain;
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\Website;
     use \SciMS\Form\Input;
     use \SciMS\Form\TextArea;
 
@@ -42,8 +44,8 @@ public function __construct($template) {
          */
         public function buildDomain(array $services) {
             $services['get.handler']->setRequest($_GET); // Retrieve $_GET.
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach($themes as $t) {

diff --git a/src/Controller/BuildDomain/Administration/BuildInstallation.php b/src/Controller/BuildDomain/Administration/BuildInstallation.php
@@ -1,8 +1,10 @@
 <?php
     namespace SciMS\Controller\BuildDomain\Administration;
 
-    use SciMS\Controller\BuildDomain\AbstractBuildDomain;
-    use SciMS\Form\Input;
+    use \SciMS\Controller\BuildDomain\AbstractBuildDomain;
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\Website;
+    use \SciMS\Form\Input;
 
     /**
      * Class BuildInstallation.
@@ -39,8 +41,8 @@ public function __construct($template) {
          * @version 1.0
          */
         public function buildDomain(array $services) {
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach ($themes as $t) {

diff --git a/src/Controller/BuildDomain/Administration/BuildUsers.php b/src/Controller/BuildDomain/Administration/BuildUsers.php
@@ -1,7 +1,9 @@
 <?php
     namespace SciMS\Controller\BuildDomain\Administration;
 
-    use SciMS\Controller\BuildDomain\AbstractBuildDomain;
+    use \SciMS\Controller\BuildDomain\AbstractBuildDomain;
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\Website;
 
     /**
      * Class BuildDomainUsers.
@@ -37,8 +39,8 @@ public function __construct($template) {
          * @version 1.0
          */
         public function buildDomain(array $services) {
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach ($themes as $t) {

diff --git a/src/Controller/BuildDomain/Administration/BuildWriteArticle.php b/src/Controller/BuildDomain/Administration/BuildWriteArticle.php
@@ -3,6 +3,8 @@
 
     use \SciMS\Controller\BuildDomain\AbstractBuildDomain;
     use \SciMS\Domain\Article;
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\Website;
     use \SciMS\Form\Input;
     use \SciMS\Form\Option;
     use \SciMS\Form\Select;
@@ -44,8 +46,8 @@ public function __construct($template) {
          * @version 1.0
          */
         public function buildDomain(array $services) {
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach($themes as $t) {

diff --git a/src/Controller/BuildDomain/Build404.php b/src/Controller/BuildDomain/Build404.php
@@ -1,5 +1,8 @@
 <?php
     namespace SciMS\Controller\BuildDomain;
+
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\Website;
 
     /**
      * Class Build404.
@@ -37,8 +40,8 @@ public function __construct($template) {
          * @version 1.0
          */
         public function buildDomain(array $services) {
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach($themes as $t) {

diff --git a/src/Controller/BuildDomain/BuildConnection.php b/src/Controller/BuildDomain/BuildConnection.php
@@ -1,6 +1,8 @@
 <?php
     namespace SciMS\Controller\BuildDomain;
 
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\Website;
     use \SciMS\Form\Input;
 
     /**
@@ -39,8 +41,8 @@ public function __construct($template) {
          * @version 1.0
          */
         public function buildDomain(array $services) {
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach($themes as $t) {

diff --git a/src/Controller/BuildDomain/BuildConsultArticle.php b/src/Controller/BuildDomain/BuildConsultArticle.php
@@ -1,5 +1,8 @@
 <?php
     namespace SciMS\Controller\BuildDomain;
+
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\Website;
 
     /**
      * Class BuildConsultArticle.
@@ -38,8 +41,8 @@ public function __construct($template) {
          */
         public function buildDomain(array $services) {
             $services['get.handler']->setRequest($_GET); // Retrieve $_GET.
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach($themes as $t) {

diff --git a/src/Controller/BuildDomain/BuildConsultArticleCategory.php b/src/Controller/BuildDomain/BuildConsultArticleCategory.php
@@ -1,5 +1,8 @@
 <?php
     namespace SciMS\Controller\BuildDomain;
+
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\Website;
 
     /**
      * Class BuildConsultArticleCategory.
@@ -38,8 +41,8 @@ public function __construct($template) {
          */
         public function buildDomain(array $services) {
             $services['get.handler']->setRequest($_GET); // Retrieve $_GET.
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach($themes as $t) {

diff --git a/src/Controller/BuildDomain/BuildConsultProfile.php b/src/Controller/BuildDomain/BuildConsultProfile.php
@@ -1,5 +1,8 @@
 <?php
     namespace SciMS\Controller\BuildDomain;
+
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\Website;
 
     /**
      * Class BuildConsultProfile.
@@ -37,8 +40,8 @@ public function __construct($template) {
          */
         public function buildDomain(array $services) {
             $services['get.handler']->setRequest($_GET); // Retrieve $_GET.
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach($themes as $t) {

diff --git a/src/Controller/BuildDomain/BuildHome.php b/src/Controller/BuildDomain/BuildHome.php
@@ -1,6 +1,10 @@
 <?php
     namespace SciMS\Controller\BuildDomain;
 
+    use \SciMS\Database\DatabaseSetting;
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\Website;
+
     /**
      * Class BuildHome
      *
@@ -46,13 +50,13 @@ public function __construct($template) {
          */
         public function buildDomain(array $services) {
             // Check if the database file not exist on server, and if not exist redirect the user on the installation page.
-            if (!$services['file.checker']->fileExist('../app/db.yml')) {
+            if (!$services['file.checker']->fileExist(DatabaseSetting::DB_SETTING_PATH)) {
                 $url = '/web/index.php?action=installation';
                 $services['redirect.handler']->redirect($url);
             }
 
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach($themes as $t) {

diff --git a/src/Controller/BuildDomain/BuildInscription.php b/src/Controller/BuildDomain/BuildInscription.php
@@ -1,6 +1,8 @@
 <?php
     namespace SciMS\Controller\BuildDomain;
 
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\Website;
     use \SciMS\Form\Input;
 
     /**
@@ -39,8 +41,8 @@ public function __construct($template) {
          * @version 1.0
          */
         public function buildDomain(array $services) {
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach($themes as $t) {

diff --git a/src/Controller/BuildDomain/BuildSearchResultDomain.php b/src/Controller/BuildDomain/BuildSearchResultDomain.php
@@ -1,6 +1,9 @@
 <?php
     namespace SciMS\Controller\BuildDomain;
 
+    use \SciMS\Domain\Theme;
+    use \SciMS\Domain\Website;
+
     /**
      * Class BuildSearchResultDomain.
      *
@@ -38,9 +41,9 @@ public function buildDomain(array $services) {
             $services['post.handler']->setRequest($_POST);  // Retrieve $_POST.
             $services['get.handler']->setRequest($_GET);    // Retrieve $_GET.
             $services['file.handler']->setRequest($_FILES); // Retrieve $_SESSION.
-            
-            $website = $services['dao.website']->findSettings('../app/settings.yml');
-            $themes  = $services['dao.theme']->findSettings('../app/themes.yml');
+
+            $website = $services['dao.website']->findSettings(Website::WEBSITE_SETTING_PATH);
+            $themes  = $services['dao.theme']->findSettings(Theme::THEMES_SETTING_PATH);
             $theme   = "";
 
             foreach($themes as $t) {