Merge branch 'master' of git+ssh://vmazzoni@forge.fusioninventory.org…

…/git/fusioninventory/fusioninventory-for-glpi
ddurieux · Apr 28, 2010 · 0d6a378 · 0d6a378
2 parents 6787210 + 0f7ce7b
commit 0d6a378
Showing 1 changed file with 37 additions and 35 deletions.
diff --git a/inc/snmp.importexport.class.php b/inc/snmp.importexport.class.php
@@ -378,47 +378,49 @@ function import_netdiscovery($p_xml, $agentKey) {
             $a_lockable = PluginFusioninventoryLock::getLockFields($a_device[1], $a_device[0]);
             $data = array();
             $data['ID'] = $ci->getField('ID');
-            $data['FK_snmp_connection'] = 0;
-
-            if ($ci->getField('name') && !in_array('name', $a_lockable)) {
-               if (!empty($discovery->NETBIOSNAME)) {
-                  $data['name'] = $discovery->NETBIOSNAME;
-               } else if (!empty($discovery->SNMPHOSTNAME)) {
-                  $data['name'] = $discovery->SNMPHOSTNAME;
+            if ($a_device[1] == PLUGIN_FUSIONINVENTORY_MAC_UNKNOWN) {
+               $data['FK_snmp_connection'] = 0;
+
+               if ($ci->getField('name') && !in_array('name', $a_lockable)) {
+                  if (!empty($discovery->NETBIOSNAME)) {
+                     $data['name'] = $discovery->NETBIOSNAME;
+                  } else if (!empty($discovery->SNMPHOSTNAME)) {
+                     $data['name'] = $discovery->SNMPHOSTNAME;
+                  }
                }
-            }
-            if ($ci->getField('dnsname') && !in_array('dnsname', $a_lockable))
-               $data['dnsname'] = $discovery->DNSHOSTNAME;
-            if ($ci->getField('FK_entities') && !in_array('FK_entities', $a_lockable))
-               $data['FK_entities'] = $discovery->ENTITY;
-            if ($ci->getField('serial') && !in_array('serial', $a_lockable))
-               $data['serial'] = $discovery->SERIAL;
-            if ($ci->getField('contact') && !in_array('contact', $a_lockable))
-               $data['contact'] = $discovery->USERSESSION;
-            if ($ci->getField('domain') && !in_array('domain', $a_lockable)) {
-               $data['domain'] = 0;
-               if (!empty($discovery->WORKGROUP)) {
-                  $data['domain'] = externalImportDropdown(
-                                  "glpi_dropdown_domain",$discovery->WORKGROUP,$discovery->ENTITY);
+               if ($ci->getField('dnsname') && !in_array('dnsname', $a_lockable))
+                  $data['dnsname'] = $discovery->DNSHOSTNAME;
+               if ($ci->getField('FK_entities') && !in_array('FK_entities', $a_lockable))
+                  $data['FK_entities'] = $discovery->ENTITY;
+               if ($ci->getField('serial') && !in_array('serial', $a_lockable))
+                  $data['serial'] = $discovery->SERIAL;
+               if ($ci->getField('contact') && !in_array('contact', $a_lockable))
+                  $data['contact'] = $discovery->USERSESSION;
+               if ($ci->getField('domain') && !in_array('domain', $a_lockable)) {
+                  $data['domain'] = 0;
+                  if (!empty($discovery->WORKGROUP)) {
+                     $data['domain'] = externalImportDropdown(
+                                     "glpi_dropdown_domain",$discovery->WORKGROUP,$discovery->ENTITY);
+                  }
+               }
+               if ($ci->getField('FK_snmp_connection') && !in_array('FK_snmp_connection', $a_lockable))
+                  $data['FK_snmp_connection'] = $discovery->AUTHSNMP;
+               if ($ci->getField('snmp') && !in_array('snmp', $a_lockable)) {
+                  $data['snmp'] = 0;
+                  if ($discovery->AUTHSNMP != "") {
+                     $data['snmp'] = 1;
+                  }
                }
+               $data['type'] = $discovery->TYPE;
+
+               $explodeprocess = explode("/", $_SESSION['glpi_plugin_fusioninventory_processnumber']);
+               $data['FK_agent'] = intval($explodeprocess[1]);
             }
+            if ($ci->getField('FK_model_infos') && !in_array('FK_model_infos', $a_lockable))
+               $data['FK_model_infos'] = $FK_model;
             if ($ci->getField('comments') && !in_array('comments', $a_lockable))
                $data['comments'] = $discovery->DESCRIPTION;
-            if ($ci->getField('FK_model_infos') && !in_array('FK_model_infos', $a_lockable));
-               $data['FK_model_infos'] = $FK_model;
-            if ($ci->getField('FK_snmp_connection') && !in_array('FK_snmp_connection', $a_lockable));
-               $data['FK_snmp_connection'] = $discovery->AUTHSNMP;
-            if ($ci->getField('snmp') && !in_array('snmp', $a_lockable)) {
-               $data['snmp'] = 0;
-               if ($discovery->AUTHSNMP != "") {
-                  $data['snmp'] = 1;
-               }
-            }
-            $data['type'] = $discovery->TYPE;
 
-            $explodeprocess = explode("/", $_SESSION['glpi_plugin_fusioninventory_processnumber']);
-            $data['FK_agent'] = intval($explodeprocess[1]);
-
             if ($a_device[1] == NETWORKING_TYPE) {
                if (!in_array('ifaddr', $a_lockable))
                   $data["ifaddr"] = $discovery->IP;