Fixes for Integrations.

Opmantek · Apr 17, 2024 · fccc272 · fccc272
1 parent 5d2e0df
commit fccc272
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/app/Controllers/Queue.php b/app/Controllers/Queue.php
@@ -43,7 +43,7 @@ public function start()
         $this->devicesModel = new \App\Models\DevicesModel();
         $this->discoveriesModel = new \App\Models\DiscoveriesModel();
         $this->discoveryLogModel = new \App\Models\DiscoveryLogModel();
-        #$this->integrationsModel = new \App\Models\IntegrationsModel();
+        $this->integrationsModel = new \App\Models\IntegrationsModel();
         $this->locationsModel = new \App\Models\LocationsModel();
         $this->networksModel = new \App\Models\NetworksModel();
         $this->orgsModel = new \App\Models\OrgsModel();
@@ -54,7 +54,7 @@ public function start()
         helper('components');
         helper('device');
         helper('discoveries');
-        #helper('integrations_nmis');
+        helper('integrations_nmis');
         helper('mac_model');
         helper('network');
         helper('security');

diff --git a/app/Helpers/integrations_nmis_helper.php b/app/Helpers/integrations_nmis_helper.php
@@ -34,7 +34,7 @@ function generate_token()
             $message = 'One of the auth methods must be set to token for NMIS integrations to work without a username and password.';
             log_message('error', $message);
         }
-        $files = array(APPPATH . '/../other/generate_auth_token.pl', $bin.'generate_auth_token.exe', $bin.'generate_auth_token.pl');
+        $files = array(ROOTPATH . 'other/generate_auth_token.pl', $bin.'generate_auth_token.exe', $bin.'generate_auth_token.pl');
         foreach ($files as $file) {
             if (file_exists($file)) {
                 log_message('debug', 'Using ' . $file . ' to generate token.');

diff --git a/app/Models/IntegrationsModel.php b/app/Models/IntegrationsModel.php
@@ -927,7 +927,7 @@ public function getLocalDevices($integration)
         }
         // Select by Query
         if ($integration->attributes->select_internal_type === 'query') {
-            $devices = $queriesModel->execute($integration->attributes->select_internal_attribute, $instance->user);
+            $devices = $queriesModel->execute(intval($integration->attributes->select_internal_attribute), $instance->user);
             $dev_ids = array();
             foreach ($devices as $device) {
                 if (!empty($device->attributes->{'devices.id'})) {

diff --git a/app/Models/QueriesModel.php b/app/Models/QueriesModel.php
@@ -152,8 +152,9 @@ public function execute(int $id = 0, object $user = null): array
         if (!empty($instance->config->feature_queries_advanced) and $instance->config->feature_queries_advanced === 'y' and !empty($query->advanced) and $query->advanced === 'y') {
             $sql = str_ireplace('@orgs', "({$user->org_list})", $sql);
         }
-
-        $sql .= ' LIMIT ' . $instance->resp->meta->limit;
+        if (!empty($instance->resp->meta->limit) and is_int($instance->resp->meta->limit)) {
+            $sql .= ' LIMIT ' . $instance->resp->meta->limit;
+        }
         $query = $this->db->query($sql);
         // log_message('debug', str_replace("\n", " ", (string)$this->db->getLastQuery()));
         if ($this->sqlError($this->db->error())) {