4.15.0

Author: lbr38

.github/workflows/phpcs.yml

@@ -5,7 +5,7 @@ on:
     branches: [ devel ]
   pull_request:
     push:
-      branches: [ stable ]
+      branches: [ main ]
 jobs:
   phpcs:
     runs-on: ubuntu-latest

.github/workflows/tasks.yml

@@ -5,7 +5,7 @@ on:
     branches: [ devel ]
   pull_request:
     push:
-      branches: [ stable ]
+      branches: [ main ]
 
 jobs:
   run-deb-tasks:

.github/workflows/test-ansible-role.yml

@@ -5,7 +5,7 @@ on:
     branches: [ devel ]
   pull_request:
     push:
-      branches: [ stable ]
+      branches: [ main ]
 jobs:
   ansible:
     runs-on: ubuntu-latest

.github/workflows/test-database-update.yml

@@ -5,7 +5,7 @@ on:
     branches: [ devel ]
   pull_request:
     push:
-      branches: [ stable ]
+      branches: [ main ]
 jobs:
   test-database-update:
     runs-on: ubuntu-latest

www/config/properties.php

@@ -2,9 +2,9 @@
 $config = array(
     'project_name' => 'Repomanager',
     'project_dir_name' => 'repomanager',
-    'project_logo' => 'https://github.com/lbr38/repomanager/raw/stable/www/public/assets/images/repomanager.png',
+    'project_logo' => 'https://github.com/lbr38/repomanager/raw/main/www/public/assets/images/repomanager.png',
     'project_git_repo' => 'https://github.com/lbr38/repomanager',
-    'project_git_repo_raw' => 'https://raw.githubusercontent.com/lbr38/repomanager/stable',
+    'project_git_repo_raw' => 'https://raw.githubusercontent.com/lbr38/repomanager/main',
     'project_update_doc_url' => 'https://github.com/lbr38/repomanager/wiki/01.-Installation-and-update#update-repomanager',
 
     // RPM release versions default values

www/controllers/App/Config/Main.php

@@ -101,10 +101,6 @@ public static function get()
         if (!defined('CVE_IMPORT_HOSTS_DIR')) {
             define('CVE_IMPORT_HOSTS_DIR', TEMP_DIR . '/cve');
         }
-        // Logbuilder
-        if (!defined('LOGBUILDER')) {
-            define('LOGBUILDER', ROOT . '/tasks/logbuilder.php');
-        }
         // Actual release version and available version on github
         if (!defined('VERSION')) {
             define('VERSION', trim(file_get_contents(ROOT . '/version')));

www/controllers/App/Config/Settings.php

@@ -304,15 +304,6 @@ public static function get()
             }
         }
 
-        if (!defined('MANAGE_PROFILES')) {
-            if (!empty($settings['MANAGE_PROFILES'])) {
-                define('MANAGE_PROFILES', $settings['MANAGE_PROFILES']);
-            } else {
-                define('MANAGE_PROFILES', '');
-                $__LOAD_SETTINGS_MESSAGES[] = "<code>MANAGE PROFILES</code> setting is not defined.";
-            }
-        }
-
         /**
          *  CVE settings
          */

www/controllers/Host.php

@@ -41,82 +41,82 @@ public function __construct()
 
     public function setId(string $id)
     {
-        $this->id = Common::validateData($id);
+        $this->id = \Controllers\Common::validateData($id);
     }
 
     public function setIp(string $ip)
     {
-        $this->ip = Common::validateData($ip);
+        $this->ip = \Controllers\Common::validateData($ip);
     }
 
     public function setHostname(string $hostname)
     {
-        $this->hostname = Common::validateData($hostname);
+        $this->hostname = \Controllers\Common::validateData($hostname);
     }
 
     public function setOS(string $os)
     {
-        $this->os = Common::validateData($os);
+        $this->os = \Controllers\Common::validateData($os);
     }
 
     public function setOsVersion(string $os_version)
     {
-        $this->os_version = Common::validateData($os_version);
+        $this->os_version = \Controllers\Common::validateData($os_version);
     }
 
     public function setOsFamily(string $os_family)
     {
-        $this->os_family = Common::validateData($os_family);
+        $this->os_family = \Controllers\Common::validateData($os_family);
     }
 
     public function setType(string $type)
     {
-        $this->type = Common::validateData($type);
+        $this->type = \Controllers\Common::validateData($type);
     }
 
     public function setKernel(string $kernel)
     {
-        $this->kernel = Common::validateData($kernel);
+        $this->kernel = \Controllers\Common::validateData($kernel);
     }
 
     public function setArch(string $arch)
     {
-        $this->arch = Common::validateData($arch);
+        $this->arch = \Controllers\Common::validateData($arch);
     }
 
     public function setProfile(string $profile)
     {
-        $this->profile = Common::validateData($profile);
+        $this->profile = \Controllers\Common::validateData($profile);
     }
 
     public function setEnv(string $env)
     {
-        $this->env = Common::validateData($env);
+        $this->env = \Controllers\Common::validateData($env);
     }
 
     public function setPackageId(string $packageId)
     {
-        $this->packageId = Common::validateData($packageId);
+        $this->packageId = \Controllers\Common::validateData($packageId);
     }
 
     public function setPackageName(string $packageName)
     {
-        $this->packageName = Common::validateData($packageName);
+        $this->packageName = \Controllers\Common::validateData($packageName);
     }
 
     public function setPackageVersion(string $packageVersion)
     {
-        $this->packageVersion = Common::validateData($packageVersion);
+        $this->packageVersion = \Controllers\Common::validateData($packageVersion);
     }
 
     public function setAuthId(string $authId)
     {
-        $this->authId = Common::validateData($authId);
+        $this->authId = \Controllers\Common::validateData($authId);
     }
 
     public function setToken(string $token)
     {
-        $this->token = Common::validateData($token);
+        $this->token = \Controllers\Common::validateData($token);
     }
 
     public function getId()
@@ -177,15 +177,15 @@ public function getHostnameById(int $id)
      */
     public function getHostWithKernel(string $kernel)
     {
-        return $this->model->getHostWithKernel(Common::validateData($kernel));
+        return $this->model->getHostWithKernel($kernel);
     }
 
     /**
      *  Return hosts that have the specified profile
      */
-    public function getHostWithProfile(string $kernel)
+    public function getHostWithProfile(string $profile)
     {
-        return $this->model->getHostWithProfile(Common::validateData($kernel));
+        return $this->model->getHostWithProfile($profile);
     }
 
     /**
@@ -261,7 +261,7 @@ public function getEventDetails(string $id, string $eventId, string $packageStat
             throw new Exception('Host Id must be specified');
         }
 
-        $packageState = Common::validateData($packageState);
+        $packageState = \Controllers\Common::validateData($packageState);
 
         /**
          *  Ouverture de la BDD dédiée de l'hôte
@@ -553,7 +553,7 @@ public function setPackagesInventory(string $packagesInventory)
         /**
          *  Les paquets sont transmis sous forme de chaine, séparés par une virgule. On explode cette chaine en array et on retire les entrées vides.
          */
-        $packagesList = array_filter(explode(",", Common::validateData($packagesInventory)));
+        $packagesList = array_filter(explode(",", \Controllers\Common::validateData($packagesInventory)));
 
         /**
          *  On traite si l'array n'est pas vide
@@ -659,7 +659,7 @@ public function setPackagesAvailable(string $packagesAvailable)
             /**
              *  Les paquets sont transmis sous forme de chaine, séparés par une virgule. On explode cette chaine en array et on retire les entrées vides.
              */
-            $packagesList = array_filter(explode(",", Common::validateData($packagesAvailable)));
+            $packagesList = array_filter(explode(",", \Controllers\Common::validateData($packagesAvailable)));
         }
 
         /**
@@ -1358,71 +1358,71 @@ public function getHostsWithPackage(array $hostsId, string $packageName)
      */
     public function updateHostname(string $hostname)
     {
-        $this->model->updateHostname($this->id, Common::validateData($hostname));
+        $this->model->updateHostname($this->id, \Controllers\Common::validateData($hostname));
     }
 
     /**
      *  Update OS in database
      */
     public function updateOS(string $os)
     {
-        $this->model->updateOS($this->id, Common::validateData($os));
+        $this->model->updateOS($this->id, \Controllers\Common::validateData($os));
     }
 
     /**
      *  Update OS version in database
      */
     public function updateOsVersion(string $osVersion)
     {
-        $this->model->updateOsVersion($this->id, Common::validateData($osVersion));
+        $this->model->updateOsVersion($this->id, \Controllers\Common::validateData($osVersion));
     }
 
     /**
      *  Update OS family in database
      */
     public function updateOsFamily(string $osFamily)
     {
-        $this->model->updateOsFamily($this->id, Common::validateData($osFamily));
+        $this->model->updateOsFamily($this->id, \Controllers\Common::validateData($osFamily));
     }
 
     /**
      *  Update virtualization type in database
      */
     public function updateType(string $virtType)
     {
-        $this->model->updateType($this->id, Common::validateData($virtType));
+        $this->model->updateType($this->id, \Controllers\Common::validateData($virtType));
     }
 
     /**
      *  Update kernel version in database
      */
     public function updateKernel(string $kernel)
     {
-        $this->model->updateKernel($this->id, Common::validateData($kernel));
+        $this->model->updateKernel($this->id, \Controllers\Common::validateData($kernel));
     }
 
     /**
      *  Update arch in database
      */
     public function updateArch(string $arch)
     {
-        $this->model->updateArch($this->id, Common::validateData($arch));
+        $this->model->updateArch($this->id, \Controllers\Common::validateData($arch));
     }
 
     /**
      *  Update profile in database
      */
     public function updateProfile(string $profile)
     {
-        $this->model->updateProfile($this->id, Common::validateData($profile));
+        $this->model->updateProfile($this->id, \Controllers\Common::validateData($profile));
     }
 
     /**
      *  Update environment in database
      */
     public function updateEnv(string $env)
     {
-        $this->model->updateEnv($this->id, Common::validateData($env));
+        $this->model->updateEnv($this->id, \Controllers\Common::validateData($env));
     }
 
     /**
@@ -1442,7 +1442,7 @@ public function updateAgentStatus(string $status)
      */
     public function updateLinupdateVersion(string $version)
     {
-        $this->model->updateLinupdateVersion($this->id, Common::validateData($version));
+        $this->model->updateLinupdateVersion($this->id, \Controllers\Common::validateData($version));
     }
 
     /**