4.15.1

lbr38 · Jan 7, 2025 · 9cbedae · 9cbedae
1 parent d10ff19
commit 9cbedae
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 35 deletions.
diff --git a/www/controllers/Environment.php b/www/controllers/Environment.php
@@ -18,19 +18,16 @@ public function __construct()
      */
     public static function getEnvColor(string $name)
     {
-        // Default color
-        $color = '#ffffff';
-
         // Retrieve color from ENVS array
         if (defined('ENVS')) {
             foreach (ENVS as $env) {
                 if ($env['Name'] == $name and !empty($env['Color'])) {
-                    $color = $env['Color'];
+                    return $env['Color'];
                 }
             }
         }
 
-        return $color;
+        return '#ffffff';
     }
 
     /**

diff --git a/www/controllers/Repo/Repo.php b/www/controllers/Repo/Repo.php
@@ -583,8 +583,15 @@ public function getEnvIdBySnapId(string $snapId)
     /**
      *  Set environment description
      */
-    public function envSetDescription(string $envId, string $description)
+    public function envSetDescription(string $envId, string $description) : void
     {
+        // Description cannot contain single quotes or backslashes
+        if (str_contains($description, "'") || str_contains($description, "\\")) {
+            throw new Exception('Description contains invalid characters');
+        }
+
+        $description = \Controllers\Common::validateData($description);
+
         $this->model->envSetDescription($envId, $description);
     }
 

diff --git a/www/controllers/Task/Form/Param/Description.php b/www/controllers/Task/Form/Param/Description.php
@@ -12,7 +12,8 @@ public static function check(string $description = null) : void
             return;
         }
 
-        if (!\Controllers\Common::isAlphanumDash($description, array('.', '(', ')', '@', 'é', 'è', 'à', 'ç', 'ù', 'ê', 'ô', '+', '\'', ' '))) {
+        // Description cannot contain single quotes or backslashes
+        if (str_contains($description, "'") || str_contains($description, "\\")) {
             throw new Exception('Description contains invalid characters');
         }
     }

diff --git a/www/controllers/Task/Repo/Env.php b/www/controllers/Task/Repo/Env.php
@@ -109,7 +109,7 @@ public function execute()
                  *  If the description is empty then the description will remain empty
                  */
                 if (!empty($actualDescription)) {
-                    $this->repo->setDescription($actualDescription);
+                    $this->repo->setDescription(htmlspecialchars_decode($actualDescription));
                 } else {
                     $this->repo->setDescription('');
                 }

diff --git a/www/controllers/Task/Repo/Finalize.php b/www/controllers/Task/Repo/Finalize.php
@@ -171,7 +171,7 @@ protected function finalize()
                  *  Si la description récupérée est vide alors la description restera vide
                  */
                 if (!empty($actualDescription)) {
-                    $this->repo->setDescription($actualDescription);
+                    $this->repo->setDescription(htmlspecialchars_decode($actualDescription));
                 } else {
                     $this->repo->setDescription('');
                 }

diff --git a/www/models/Repo/Repo.php b/www/models/Repo/Repo.php
@@ -526,26 +526,18 @@ public function getUnunsedSnapshot(string $repoId, string $retention)
     }
 
     /**
-     *  Modification de la description
-    */
-    public function envSetDescription(string $envId, string $description)
+     *  Set environment description
+     */
+    public function envSetDescription(string $envId, string $description) : void
     {
-        /**
-         *  Vérification des caractères de la description
-         */
-        if (\Controllers\Common::isAlphanumDash($description, array(' ', '(', ')', '@', ',', '.', '\'', 'é', 'è', 'ê', 'à', 'ç', 'ù', 'ô', 'ï', '"')) === false) {
-            throw new Exception('Description contains invalid characters');
-        }
-
         try {
             $stmt = $this->db->prepare("UPDATE repos_env SET Description = :description WHERE Id = :envId");
-            $stmt->bindValue(':description', \Controllers\Common::validateData($description));
+            $stmt->bindValue(':description', $description);
             $stmt->bindValue(':envId', $envId);
             $stmt->execute();
         } catch (\Exception $e) {
             $this->db->logError($e);
         }
-        unset($stmt);
     }
 
     /**

diff --git a/www/public/resources/js/host.js b/www/public/resources/js/host.js
@@ -89,7 +89,8 @@ function searchHost()
      */
     if (!$("#search-host-input").val()) {
         // Show all containers and host lines before quit
-        $('.hosts-group-container, .host-line, .js-select-all-button').show();
+        $('.hosts-group-container, .js-select-all-button').show();
+        $('.host-line').addClass('flex').show();
 
         return;
     }
@@ -110,7 +111,8 @@ function searchHost()
     /**
      *  Hide all host lines, only those corresponding to the search will be re-displayed
      */
-    $('.host-line, .js-select-all-button').hide();
+    $('.js-select-all-button').hide();
+    $('.host-line, .js-select-all-button').removeClass('flex').hide();
 
     /**
      *  Check if the user has entered a filter in his search, different filters are possible:
@@ -242,13 +244,14 @@ function searchHost()
      *  Then we process each div retrieved and display only those corresponding to the search
      */
     $.each(line, function () {
-        div = $(this).find("div")[2];
+        div = $(this).find("div")[0];
+
         if (div) {
             txtValue = div.textContent || div.innerText;
             if (txtValue.toUpperCase().indexOf(search) > -1) {
-                $(this).show();
+                $(this).addClass('flex').show();
             } else {
-                $(this).hide();
+                $(this).removeClass('flex').hide();
             }
         }
     });

diff --git a/www/version b/www/version
@@ -1 +1 @@
-4.15.0
+4.15.1
diff --git a/www/views/includes/containers/hosts/list.inc.php b/www/views/includes/containers/hosts/list.inc.php
@@ -264,8 +264,8 @@
                                                             <div class="grid hosts-compact-view column-gap-40">
                                                                 <div>
                                                                     <div>
-                                                                        <p title="Hostname">
-                                                                            <a href="/host/<?= $id ?>" class="wordbreakall copy" target="_blank" rel="noopener noreferrer">
+                                                                        <p title="Hostname" class="copy">
+                                                                            <a href="/host/<?= $id ?>" class="wordbreakall" target="_blank" rel="noopener noreferrer">
                                                                                 <b><?= $hostname ?></b>
                                                                             </a>
                                                                         </p>
@@ -319,8 +319,8 @@
 
                                                         if (!$compactView) : ?>
                                                             <div class="margin-bottom-15">
-                                                                <p>
-                                                                    <a href="/host/<?= $id ?>" class="wordbreakall copy" target="_blank" rel="noopener noreferrer">
+                                                                <p class="copy">
+                                                                    <a href="/host/<?= $id ?>" class="wordbreakall" target="_blank" rel="noopener noreferrer">
                                                                         <b><?= $hostname ?></b>
                                                                     </a>
                                                                 </p>

diff --git a/www/views/includes/containers/hosts/overview.inc.php b/www/views/includes/containers/hosts/overview.inc.php
@@ -242,8 +242,7 @@
 
                 $envNameList .= "'" . $envName . "',";
                 $envCountList .= "'" . $env['Env_count'] . "',";
-
-                $envBackgroundColor .= '"' . \Controllers\Environment::getEnvColor($envNameList) . '",';
+                $envBackgroundColor .= '"' . \Controllers\Environment::getEnvColor($envName) . '",';
             }
 
             $labels = rtrim($envNameList, ',');

diff --git a/www/views/includes/repos-list.inc.php b/www/views/includes/repos-list.inc.php
@@ -4,6 +4,7 @@
  */
 $mygroup = new \Controllers\Group('repo');
 $groupsList = $mygroup->listAll(true);
+$myrepoListing = new \Controllers\Repo\Listing();
 
 /**
  *  Print groups and repos
@@ -13,7 +14,7 @@
         /**
          *  Getting repos list of the group
          */
-        $myrepoListing = new \Controllers\Repo\Listing();
+
         $reposList = $myrepoListing->listByGroup($group['Name']);
 
         /**
@@ -373,7 +374,7 @@
                              */
                             echo '<div class="item-desc">';
                             if (!empty($env)) {
-                                echo '<input type="text" class="repoDescriptionInput" env-id="' . $envId . '" placeholder="🖉 add a description" value="' . $description . '" />';
+                                echo '<input type="text" class="repoDescriptionInput" env-id="' . $envId . '" placeholder="🖉 add a description" value=\'' . htmlspecialchars_decode($description) . '\' />';
                             }
                             echo '</div>';