From 2dd160ff9c1fa8ff8216fec0658ea81a6a9084f5 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <jcwiklinski@teclib.com>
Date: Mon, 18 Dec 2017 11:50:54 +0100
Subject: [PATCH 1/2] Unset selected, should not be handled with select
 attributes

---
 inc/html.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/inc/html.class.php b/inc/html.class.php
index 9f902f536db..eead4fb790e 100644
--- a/inc/html.class.php
+++ b/inc/html.class.php
@@ -4542,7 +4542,11 @@ static function input($fieldName, $options = []) {
     * @return string
     */
    static function select($name, array $values, $options = []) {
-      $selected = (isset($options['selected'])) ? $options['selected'] : false;
+      $selected = false;
+      if (isset($options['selected'])) {
+         $selected = $options['selected'];
+         unset ($options['selected']);
+      }
       $select = sprintf(
          '<select name="%1$s" %2$s>',
          self::cleanInputText($name),

From 95ecbcb3cfe6e5fdec30c3740de72ca19951bfec Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <jcwiklinski@teclib.com>
Date: Mon, 18 Dec 2017 11:19:47 +0100
Subject: [PATCH 2/2] Handle minified in themes list; fixes #3310

---
 .travis.yml            |  1 +
 inc/config.class.php   | 43 ++++++++++++++++++++++++++++++------------
 tests/units/Config.php | 26 +++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0cffa72e2a5..17e8212dcde 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,7 @@ before_script:
   - if [[ "$LDAP" == "true" ]]; then ./tests/LDAP/ldap_fixtures.sh > /dev/null; fi
   #APCu
   - phpenv config-add tests/enable-apcu.ini
+  - if [[ "$UPDATE" == "true" ]]; then ./vendor/bin/robo --load-from tools minify; fi
 script:
   - mysql -u root -e 'select version();'
   - if [[ "$UPDATE" == "true" ]]; then composer testdb; fi
diff --git a/inc/config.class.php b/inc/config.class.php
index 944bae673d9..3bbd3440ffa 100644
--- a/inc/config.class.php
+++ b/inc/config.class.php
@@ -1142,18 +1142,14 @@ function showFormUserPrefs($data = []) {
 
       echo "<tr class='tab_bg_2'>";
       echo "<td><label for='theme-selector'>" . __("Color palette") . "</label></td><td>";
-      $themes_files = scandir(GLPI_ROOT."/css/palettes/");
-      echo "<select name='palette' id='theme-selector'>";
-      foreach ($themes_files as $key => $file) {
-         if (strpos($file, ".css") !== false) {
-            $name     = substr($file, 0, -4);
-            $selected = "";
-            if ($data["palette"] == $name) {
-               $selected = "selected='selected'";
-            }
-            echo "<option value='$name' $selected>".ucfirst($name)."</option>";
-         }
-      }
+      echo Html::select(
+         'palette',
+         $this->getPalettes(),
+         [
+            'id'        => 'theme-selector',
+            'selected'  => $data['palette']
+         ]
+      );
       echo Html::scriptBlock("
          function formatThemes(theme) {
              if (!theme.id) {
@@ -2810,4 +2806,27 @@ public static function getCache($optname, $context = 'core') {
       //Toolbox::logDebug("CACHE $optname", get_class($cache));
       return $cache;
    }
+
+   /**
+    * Get available palettes
+    *
+    * @return array
+    */
+   public function getPalettes() {
+      $themes_files = scandir(GLPI_ROOT."/css/palettes/");
+      $themes = [];
+      foreach ($themes_files as $file) {
+         if (strpos($file, ".css") !== false) {
+            $name     = substr($file, 0, -4);
+            if (strpos($name, '.min') !== false) {
+               $name     = substr($name, 0, -4);
+               if (isset($themes[$name])) {
+                  continue;
+               }
+            }
+            $themes[$name] = ucfirst($name);
+         }
+      }
+      return $themes;
+   }
 }
diff --git a/tests/units/Config.php b/tests/units/Config.php
index 0008332abc6..4e95d3156e0 100644
--- a/tests/units/Config.php
+++ b/tests/units/Config.php
@@ -393,4 +393,30 @@ public function testGetRights() {
          UPDATE   => 'Update'
       ]);
    }
+
+   public function testGetPalettes() {
+      $expected = [
+         'aerialgreen'     => 'Aerialgreen',
+         'auror'           => 'Auror',
+         'automn'          => 'Automn',
+         'classic'         => 'Classic',
+         'clockworkorange' => 'Clockworkorange',
+         'dark'            => 'Dark',
+         'flood'           => 'Flood',
+         'greenflat'       => 'Greenflat',
+         'hipster'         => 'Hipster',
+         'icecream'        => 'Icecream',
+         'lightblue'       => 'Lightblue',
+         'premiumred'      => 'Premiumred',
+         'purplehaze'      => 'Purplehaze',
+         'teclib'          => 'Teclib',
+         'vintage'         => 'Vintage'
+      ];
+      $this
+         ->if($this->newTestedInstance)
+         ->then
+            ->array($this->testedInstance->getPalettes())
+            ->isIdenticalTo($expected);
+
+   }
 }