feat(config): lock mqtt prefix setting

Signed-off-by: Thierry Bugier <[email protected]>
flyve-mdm · Aug 1, 2018 · f52f0f4 · f52f0f4
1 parent 36c1e27
commit f52f0f4
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 21 deletions.
diff --git a/inc/agent.class.php b/inc/agent.class.php
@@ -545,10 +545,6 @@ public function prepareInputForUpdate($input) {
    public function post_addItem() {
       // Notify the agent about its fleets
       $this->updateSubscription();
-
-      if (PluginFlyvemdmConfig::canUpdate()) {
-         // Here we must update mqtt_prefix_locked
-      }
    }
 
    public function post_getFromDB() {

diff --git a/inc/common.class.php b/inc/common.class.php
@@ -209,7 +209,7 @@ public static function getGlpiVersion() {
    }
 
    /**
-    * Removes the mqtt prefix from
+    * Removes the mqtt prefix from a MQTT topic
     *
     * @param string  $topic Topic to modify
     * @param boolean $readConfig set to True to force reading the configuration

diff --git a/inc/config.class.php b/inc/config.class.php
@@ -405,6 +405,16 @@ public static function configUpdate($input) {
          }
       }
 
+      //lock mqtt prefix if needed
+      $DbUtil = new DbUtils();
+      $agentsCount = $DbUtil->countElementsInTable('glpi_plugin_flyvemdm_agents');
+      $fleetsCount = $DbUtil->countElementsInTable('glpi_plugin_flyvemdm_fleets');
+      $invitationCount = $DbUtil->countElementsInTable('glpi_plugin_flyvemdm_invitations');
+      if ($agentsCount + $fleetsCount + $invitationCount > 0) {
+         unset($input['mqtt_prefix']);
+         Session::addMessageAfterRedirect(__('Update of MQTT prefix ignored (invitations, agents or fleets created)', 'flyvemdm'), false, WARNING);
+      }
+
       if (isset($_SESSION['plugin_flyvemdm_wizard_step'])) {
          $input = static::processStep($input);
          if (count($input) > 0 && $input !== false) {
@@ -530,11 +540,4 @@ public function isGlpiConfigured() {
 
       return true;
    }
-
-   public function prepareInputForUpdate($input) {
-      if ($input['mqtt_prefix'] != $this->fields['mqtt_prefix'] && $this->fields['mqtt_prefix_locked'] == 0) {
-         $input['mqtt_prefix_locked'] = 1;
-      }
-      return $input;
-   }
 }
diff --git a/inc/fleet.class.php b/inc/fleet.class.php
@@ -302,10 +302,6 @@ public function post_addItem() {
          $topic = $this->getTopic();
          $this->notify("$topic/Policy/$policyName", null, 0, 1);
       }
-
-      if (PluginFlyvemdmConfig::canUpdate()) {
-         // Here we must update mqtt_prefix_locked
-      }
    }
 
    /**

diff --git a/inc/invitation.class.php b/inc/invitation.class.php
@@ -270,10 +270,6 @@ public function post_addItem() {
 
       // Sent invitation email
       $this->sendInvitation();
-
-      if (PluginFlyvemdmConfig::canUpdate()) {
-         // Here we must update mqtt_prefix_locked
-      }
    }
 
    public function post_updateItem($history = 1) {

diff --git a/install/installer.class.php b/install/installer.class.php
@@ -608,7 +608,6 @@ protected function createInitialConfig() {
          'mqtt_user'                       => self::BACKEND_MQTT_USER,
          'mqtt_passwd'                     => $MdmMqttPassword,
          'mqtt_prefix'                     => '',
-         'mqtt_prefix_locked'              => '0',
          'instance_id'                     => $instanceId,
          'registered_profiles_id'          => '',
          'guest_profiles_id'               => '',