Replace usage of negative values in preference.locations_id

pluginsGLPI · Feb 4, 2022 · 5e06ae7 · 5e06ae7
1 parent ccf700a
commit 5e06ae7
Showing 1 changed file with 56 additions and 9 deletions.
diff --git a/inc/preference.class.php b/inc/preference.class.php
@@ -32,6 +32,26 @@ class PluginUninstallPreference extends CommonDBTM {
 
    static $rightname = "uninstall:replace";
 
+   function prepareInputForAdd($input) {
+      return $this->handleLocationPref($input);
+   }
+
+   function prepareInputForUpdate($input) {
+      return $this->handleLocationPref($input);
+   }
+
+   public function handleLocationPref(array $input): array {
+      if (array_key_exists('locations_id', $input)) {
+         if ($input['locations_id'] == -1) {
+            $input['locations_action'] = 'old';
+            $input['locations_id']     = 0;
+         } else {
+            $input['locations_action'] = 'set';
+         }
+      }
+      return $input;
+   }
+
    function showFormUserPreferences() {
       global $DB;
 
@@ -190,16 +210,24 @@ static function addDefaultPreference($user_id, $template, $entity) {
    static function getLocationByUserByEntity($user_id, $template, $entity) {
       global $DB;
 
-      $query = "SELECT `locations_id`
-                FROM `".getTableForItemType(__CLASS__)."`
-                WHERE `users_id` = '" . $user_id . "'
-                      AND `entities_id` = '" . $entity. "'
-                      AND `templates_id` = '".$template."'";
-      $result = $DB->query($query);
-
-      if ($DB->numrows($result) > 0) {
-         return $DB->result($result, 0, "locations_id");
+      $result = $DB->request(
+         [
+            'SELECT' => ['locations_action', 'locations_id'],
+            'FROM'   => self::getTable(),
+            'WHERE'  => [
+               'users_id'     => $user_id,
+               'entities_id'  => $entity,
+               'templates_id' => $template,
+            ]
+         ]
+      );
+
+      if ($userpref = $result->next()) {
+         return $userpref['locations_action'] === 'old'
+            ? -1
+            : $userpref['locations_id'];
       }
+
       return '';
    }
 
@@ -247,13 +275,32 @@ static function install(Migration $migration) {
             $migration->changeField($table, 'location', 'locations_id', "integer");
          }
 
+         // 2.7.2
+         if (!$DB->fieldExists($table, 'locations_action')) {
+            $migration->addField($table, 'locations_action', "varchar(10) NOT NULL DEFAULT 'set'");
+            $migration->addPostQuery(
+                $DB->buildUpdate(
+                    $table,
+                    ['locations_action' => 'set'],
+                    ['NOT' => ['locations_id' => '-1']]
+                )
+            );
+            $migration->addPostQuery(
+                $DB->buildUpdate(
+                    $table,
+                    ['locations_action' => 'old', 'locations_id' => '0'],
+                    ['locations_id' => '-1']
+                )
+            );
+         }
       } else {
          // plugin nevers installed
          $query = "CREATE TABLE `".$table."` (
                      `id` int(11) NOT NULL AUTO_INCREMENT,
                      `users_id` int(11) NOT NULL,
                      `entities_id` int(11) DEFAULT '0',
                      `templates_id` int(11) DEFAULT '0',
+                     `locations_action` varchar(10) NOT NULL DEFAULT 'set',
                      `locations_id` int(11) DEFAULT '0',
                      PRIMARY KEY (`id`)
                      ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;";