diff --git a/plugins/bat/class.bat.inc.php b/plugins/bat/class.bat.inc.php index e3cf6de84..f868ebf45 100644 --- a/plugins/bat/class.bat.inc.php +++ b/plugins/bat/class.bat.inc.php @@ -35,7 +35,7 @@ public function __construct($enc) $buffer = array(); switch (strtolower(PSI_PLUGIN_BAT_ACCESS)) { case 'command': - if ((PSI_OS == 'WINNT') || (defined('PSI_EMU_HOSTNAME') && !defined('PSI_EMU_PORT'))) { + if ((((PSI_OS == 'WINNT') && !defined('PSI_EMU_HOSTNAME')) || (defined('PSI_EMU_HOSTNAME') && !defined('PSI_EMU_PORT'))) { $_cim = WINNT::getcimv2wmi(); $_wmi = WINNT::initWMI('root\WMI'); $bufferWB = array(); diff --git a/plugins/diskload/class.diskload.inc.php b/plugins/diskload/class.diskload.inc.php index 7e5a3f4f0..57c5a5c67 100644 --- a/plugins/diskload/class.diskload.inc.php +++ b/plugins/diskload/class.diskload.inc.php @@ -38,7 +38,7 @@ public function __construct($enc) */ public function execute() { - if ((PSI_OS == 'WINNT') || (defined('PSI_EMU_HOSTNAME') && !defined('PSI_EMU_PORT'))) { + if (((PSI_OS == 'WINNT') && !defined('PSI_EMU_HOSTNAME')) || (defined('PSI_EMU_HOSTNAME') && !defined('PSI_EMU_PORT'))) { $diskphys = array(); $disklogi = array(); try { diff --git a/plugins/hyperv/class.hyperv.inc.php b/plugins/hyperv/class.hyperv.inc.php index 00fc53ff1..cd415ffbf 100644 --- a/plugins/hyperv/class.hyperv.inc.php +++ b/plugins/hyperv/class.hyperv.inc.php @@ -38,7 +38,7 @@ public function __construct($enc) */ public function execute() { - if ((PSI_OS == 'WINNT') || (defined('PSI_EMU_HOSTNAME') && !defined('PSI_EMU_PORT'))) switch (strtolower(PSI_PLUGIN_HYPERV_ACCESS)) { + if (((PSI_OS == 'WINNT') && !defined('PSI_EMU_HOSTNAME')) || (defined('PSI_EMU_HOSTNAME') && !defined('PSI_EMU_PORT'))) switch (strtolower(PSI_PLUGIN_HYPERV_ACCESS)) { case 'command': try { $buffer = WINNT::_get_Win32_OperatingSystem(); diff --git a/plugins/ps/class.ps.inc.php b/plugins/ps/class.ps.inc.php index d25b5a293..09e771393 100644 --- a/plugins/ps/class.ps.inc.php +++ b/plugins/ps/class.ps.inc.php @@ -38,7 +38,7 @@ public function __construct($enc) $buffer = ""; switch (strtolower(PSI_PLUGIN_PS_ACCESS)) { case 'command': - if ((PSI_OS == 'WINNT') || (defined('PSI_EMU_HOSTNAME') && !defined('PSI_EMU_PORT'))) { + if (((PSI_OS == 'WINNT') && !defined('PSI_EMU_HOSTNAME')) || (defined('PSI_EMU_HOSTNAME') && !defined('PSI_EMU_PORT'))) { try { $os_wmi = WINNT::_get_Win32_OperatingSystem(); $memtotal = 0; diff --git a/plugins/psstatus/class.psstatus.inc.php b/plugins/psstatus/class.psstatus.inc.php index d12b40489..da1e316dc 100644 --- a/plugins/psstatus/class.psstatus.inc.php +++ b/plugins/psstatus/class.psstatus.inc.php @@ -53,7 +53,7 @@ public function __construct($enc) } else { $processes = array(PSI_PLUGIN_PSSTATUS_PROCESSES); } - if ((PSI_OS == 'WINNT') || (defined('PSI_EMU_HOSTNAME') && !defined('PSI_EMU_PORT'))) { + if (((PSI_OS == 'WINNT') && !defined('PSI_EMU_HOSTNAME')) || (defined('PSI_EMU_HOSTNAME') && !defined('PSI_EMU_PORT'))) { $short = true; if (strcasecmp($enc, "UTF-8") == 0) { foreach ($processes as $process) { @@ -136,7 +136,7 @@ public function __construct($enc) public function execute() { if (defined('PSI_PLUGIN_PSSTATUS_PROCESSES') && is_string(PSI_PLUGIN_PSSTATUS_PROCESSES)) { - if (((PSI_OS == 'WINNT') || (defined('PSI_EMU_HOSTNAME') && !defined('PSI_EMU_PORT'))) && + if ((((PSI_OS == 'WINNT') && !defined('PSI_EMU_HOSTNAME')) || (defined('PSI_EMU_HOSTNAME') && !defined('PSI_EMU_PORT'))) && (strtolower(PSI_PLUGIN_PSSTATUS_ACCESS) == 'command')) { $strBuf = PSI_PLUGIN_PSSTATUS_PROCESSES; if (defined('PSI_EMU_HOSTNAME')) { diff --git a/plugins/smart/class.smart.inc.php b/plugins/smart/class.smart.inc.php index 271284a90..583489d54 100644 --- a/plugins/smart/class.smart.inc.php +++ b/plugins/smart/class.smart.inc.php @@ -76,7 +76,7 @@ public function __construct($enc) switch (strtolower(PSI_PLUGIN_SMART_ACCESS)) { case 'wmi': - if ((PSI_OS == 'WINNT') || (defined('PSI_EMU_HOSTNAME') && !defined('PSI_EMU_PORT'))) { + if (((PSI_OS == 'WINNT') && !defined('PSI_EMU_HOSTNAME')) || (defined('PSI_EMU_HOSTNAME') && !defined('PSI_EMU_PORT'))) { if ((PSI_OS == 'WINNT') && !defined('PSI_EMU_HOSTNAME') && !WINNT::isAdmin()) { $this->global_error->addError("SMART WMI mode error", "Mode allowed for WinNT systems, with administrator privileges (run as administrator)"); } else { diff --git a/plugins/stablebit/class.stablebit.inc.php b/plugins/stablebit/class.stablebit.inc.php index 1db715510..9aa8e8b16 100644 --- a/plugins/stablebit/class.stablebit.inc.php +++ b/plugins/stablebit/class.stablebit.inc.php @@ -40,7 +40,7 @@ public function __construct($enc) */ public function execute() { - if ((PSI_OS == 'WINNT') || (defined('PSI_EMU_HOSTNAME') && !defined('PSI_EMU_PORT'))) { + if (((PSI_OS == 'WINNT') && !defined('PSI_EMU_HOSTNAME')) || (defined('PSI_EMU_HOSTNAME') && !defined('PSI_EMU_PORT'))) { try { $wmi = WINNT::initWMI('root\StableBit\Scanner'); $this->_result = WINNT::getWMI($wmi, 'Disks', $this->stablebit_items);