Use of NetworkPort_NetworkPort-->add() instead of MakeConnector(). Se…

…e release fusioninventory#47
ddurieux · Apr 29, 2010 · cb8bc51 · cb8bc51
1 parent 3454f2a
commit cb8bc51
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/inc/port.class.php b/inc/port.class.php
@@ -266,7 +266,9 @@ function connectDB($destination_port='') {
          if ($DB->numrows($resultVerif) == "0") { // no existing connection between those 2 ports
             $this->disconnectDB($this->getValue('ID')); // disconnect this port
             $this->disconnectDB($destination_port);     // disconnect destination port
-            if (makeConnector($this->getValue('ID'),$destination_port)) { // connect those 2 ports
+            $nn = new NetworkPort_NetworkPort();
+            if ($nn->add(array('networkports_id_1'=> $this->getValue('ID'),
+                               'networkports_id_2' => $destination_port))) { //connect those 2 ports
                $ptap->updateProcess($_SESSION['glpi_plugin_fusioninventory_processnumber'],
                                     array('query_nb_connections_created' => '1'));
                PluginFusioninventorySnmphistory::addLogConnection("make",$this->getValue('ID'));

diff --git a/inc/snmp.classes.php b/inc/snmp.classes.php
@@ -331,7 +331,8 @@ function PortsConnection($source_port, $destination_port,$FK_process,$vlan="") {
                $nn->delete(array('id'=>$destination_port));
             }
 
-				makeConnector($source_port,$destination_port);
+            $nn->add(array('networkports_id_1'=> $source_port,
+                           'networkports_id_2' => $destination_port));
 				PluginFusioninventorySnmphistory::addLogConnection("make",$destination_port,$FK_process);
 				PluginFusioninventorySnmphistory::addLogConnection("make",$source_port,$FK_process);
 

diff --git a/inc/unknowndevice.class.php b/inc/unknowndevice.class.php
@@ -447,6 +447,7 @@ function hubNetwork($p_oPort) {
 
       $nw = new Netwire;
       $np = new Netport;
+      $nn = new NetworkPort_NetworkPort();
       // List of macs : $p_oPort->getPortsToConnect
 
       // recherche dans unknown_device table le hub
@@ -478,7 +479,8 @@ function hubNetwork($p_oPort) {
       $input["device_type"] = $this->type;
       $input["name"] = "Link";
       $id_port = $np->add($input);
-      makeConnector($p_oPort->getValue('ID'), $id_port);
+      $nn->add(array('networkports_id_1'=> $p_oPort->getValue('ID'),
+                     'networkports_id_2' => $id_port));
 
       foreach ($p_oPort->getMacsToConnect() as $ifmac) {
          $input = array();
@@ -492,7 +494,8 @@ function hubNetwork($p_oPort) {
          $result = $DB->query($query);
          if ($DB->numrows($result) == 1) {
             $line = $DB->fetch_assoc($result);
-            makeConnector($line['ID'], $id_port);
+            $nn->add(array('networkports_id_1'=> $line['ID'],
+                           'networkports_id_2' => $id_port));
          } else {
             // Create device inconnu