Subversion Repositories ALCASAR

Rev

Rev 3100 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log

Rev 3100 Rev 3179
Line 229... Line 229...
229
                        }
229
                        }
230
                    }
230
                    }
231
                }
231
                }
232
                $device->addAttribute('Err', $dev->getErrors());
232
                $device->addAttribute('Err', $dev->getErrors());
233
                $device->addAttribute('Drops', $dev->getDrops());
233
                $device->addAttribute('Drops', $dev->getDrops());
-
 
234
                if (defined('PSI_SHOW_NETWORK_BRIDGE') && PSI_SHOW_NETWORK_BRIDGE && $dev->getBridge()) {
-
 
235
                    $device->addAttribute('Bridge', $dev->getBridge());
-
 
236
                }
234
                if (defined('PSI_SHOW_NETWORK_INFOS') && PSI_SHOW_NETWORK_INFOS && $dev->getInfo())
237
                if (defined('PSI_SHOW_NETWORK_INFOS') && PSI_SHOW_NETWORK_INFOS && $dev->getInfo()) {
235
                    $device->addAttribute('Info', $dev->getInfo());
238
                    $device->addAttribute('Info', $dev->getInfo());
-
 
239
                }
236
            }
240
            }
237
        }
241
        }
238
    }
242
    }
239
 
243
 
240
    /**
244
    /**
Line 291... Line 295...
291
                    $virtstring .= 'qemu-kvm';
295
                    $virtstring .= 'qemu-kvm';
292
                } elseif ($virtkey === 'oracle') {
296
                } elseif ($virtkey === 'oracle') {
293
                    $virtstring .= 'virtualbox';
297
                    $virtstring .= 'virtualbox';
294
                } elseif ($virtkey === 'zvm') {
298
                } elseif ($virtkey === 'zvm') {
295
                    $virtstring .= 'z/vm';
299
                    $virtstring .= 'z/vm';
-
 
300
                } elseif ($virtkey === 'sre') {
-
 
301
                    $virtstring .= 'lmhs sre';
296
                } else {
302
                } else {
297
                    $virtstring .= $virtkey;
303
                    $virtstring .= $virtkey;
298
                }
304
                }
299
            }
305
            }
300
            if ($virtstring !== "") {
306
            if ($virtstring !== "") {
Line 925... Line 931...
925
            }
931
            }
926
            if (($this->_plugin != '')) {
932
            if (($this->_plugin != '')) {
927
                $plugins = array($this->_plugin);
933
                $plugins = array($this->_plugin);
928
            }
934
            }
929
            foreach ($plugins as $plugin) {
935
            foreach ($plugins as $plugin) {
-
 
936
                if (!$this->_complete_request ||
930
                if (!$this->_complete_request || !defined('PSI_PLUGIN_'.strtoupper($plugin).'_WMI_HOSTNAME') ||
937
                   (!defined('PSI_PLUGIN_'.strtoupper($plugin).'_SSH_HOSTNAME') && !defined('PSI_PLUGIN_'.strtoupper($plugin).'_WMI_HOSTNAME')) ||
-
 
938
                   (defined('PSI_SSH_HOSTNAME') && (PSI_SSH_HOSTNAME == constant('PSI_PLUGIN_'.strtoupper($plugin).'_SSH_HOSTNAME'))) ||
931
                   (defined('PSI_WMI_HOSTNAME') && (PSI_WMI_HOSTNAME == constant('PSI_PLUGIN_'.strtoupper($plugin).'_WMI_HOSTNAME')))) {
939
                   (defined('PSI_WMI_HOSTNAME') && (PSI_WMI_HOSTNAME == constant('PSI_PLUGIN_'.strtoupper($plugin).'_WMI_HOSTNAME')))) {
932
                    $object = new $plugin($this->_sysinfo->getEncoding());
940
                    $object = new $plugin($this->_sysinfo->getEncoding());
933
                    $object->execute();
941
                    $object->execute();
934
                    $oxml = $object->xml();
942
                    $oxml = $object->xml();
935
                    if (sizeof($oxml) > 0) {
943
                    if (sizeof($oxml) > 0) {