"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "inc/networkportinstantiation.class.php" between
glpi-9.3.3.tgz and glpi-9.4.0.tgz

About: GLPI is an IT and asset management software (Information Resource Manager).

networkportinstantiation.class.php  (glpi-9.3.3.tgz):networkportinstantiation.class.php  (glpi-9.4.0.tgz)
skipping to change at line 270 skipping to change at line 270
function getInstantiationHTMLTable(NetworkPort $netport, HTMLTableRow $row, function getInstantiationHTMLTable(NetworkPort $netport, HTMLTableRow $row,
HTMLTableCell $father = null, array $optio ns = []) { HTMLTableCell $father = null, array $optio ns = []) {
global $DB; global $DB;
$display_options = $options['display_options']; $display_options = $options['display_options'];
if (($this->canHaveVirtualPort) && ($display_options['virtual_ports'])) { if (($this->canHaveVirtualPort) && ($display_options['virtual_ports'])) {
$virtual_header = $row->getHeaderByName('Instantiation', 'VirtualPorts' ); $virtual_header = $row->getHeaderByName('Instantiation', 'VirtualPorts' );
$query = "(SELECT `networkports_id` $iterator = $DB->request([
FROM `glpi_networkportaliases` 'FROM' => new \QueryUnion([
WHERE `networkports_id_alias`='".$netport->getID()."') [
UNION 'SELECT' => 'networkports_id',
(SELECT `networkports_id` 'FROM' => 'glpi_networkportaliases',
FROM `glpi_networkportaggregates` 'WHERE' => ['networkports_id_alias' => $netport->getID()]
WHERE `networkports_id_list` LIKE '%\"".$netport->getID()."\ ], [
"%')"; 'SELECT' => 'networkports_id',
'FROM' => 'glpi_networkportaggregates',
'WHERE' => ['networkports_id_list' => ['LIKE', '%"'.$netport-
getID().'"%']]
]
])
]);
$iterator = $DB->request($query); if (count($iterator)) {
if ($iterator->numrows() > 0) {
$new_father = $row->addCell($virtual_header, __('this port'), $fathe r); $new_father = $row->addCell($virtual_header, __('this port'), $fathe r);
} else { } else {
$new_father = $row->addCell($virtual_header, '', $father); $new_father = $row->addCell($virtual_header, '', $father);
} }
foreach ($iterator as $networkports_ids) { foreach ($iterator as $networkports_ids) {
$virtualPort = new NetworkPort(); $virtualPort = new NetworkPort();
if ($virtualPort->getFromDB($networkports_ids['networkports_id'])) { if ($virtualPort->getFromDB($networkports_ids['networkports_id'])) {
 End of changes. 2 change blocks. 
11 lines changed or deleted 15 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)