From eadeeb94095975b5436ee19660596b5f29452d04 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Tue, 9 Aug 2016 15:00:12 -0500
Subject: [PATCH] Fix addHost force_add logic Use boolean where we can Fixes
 #4001

---
 addhost.php                |  4 ++--
 html/pages/addhost.inc.php |  8 +-------
 includes/functions.php     | 18 ++++++++++--------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/addhost.php b/addhost.php
index d82b03241e..d510256011 100755
--- a/addhost.php
+++ b/addhost.php
@@ -37,9 +37,9 @@ if (isset($options['f']) && $options['f'] == 0) {
     $cmd = array_shift($argv);
     array_shift($argv);
     array_unshift($argv, $cmd);
-    $force_add = 1;
+    $force_add = true;
 } else {
-    $force_add = 0;
+    $force_add = false;
 }
 
 $port_assoc_mode = $config['default_port_association_mode'];
diff --git a/html/pages/addhost.inc.php b/html/pages/addhost.inc.php
index 947478ee62..76a5a0ce66 100644
--- a/html/pages/addhost.inc.php
+++ b/html/pages/addhost.inc.php
@@ -57,13 +57,7 @@ if ($_POST['hostname']) {
             print_error('Unsupported SNMP Version. There was a dropdown menu, how did you reach this error ?');
         }//end if
         $poller_group = $_POST['poller_group'];
-        $force_add    = $_POST['force_add'];
-        if ($force_add == 'on') {
-            $force_add = 1;
-        }
-        else {
-            $force_add = 0;
-        }
+        $force_add    = ($_POST['force_add'] == 'on');
 
         $port_assoc_mode = $_POST['port_assoc_mode'];
         try {
diff --git a/includes/functions.php b/includes/functions.php
index 819511f7fb..3700bc917a 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -255,7 +255,7 @@ function delete_device($id) {
  * @param string $port the port to connect to for snmp
  * @param string $transport udp or tcp
  * @param string $poller_group the poller group this device will belong to
- * @param string $force_add add even if the device isn't pingable
+ * @param boolean $force_add add even if the device isn't reachable
  * @param string $port_assoc_mode snmp field to use to determine unique ports
  *
  * @return int returns the device_id of the added device
@@ -267,7 +267,7 @@ function delete_device($id) {
  * @throws InvalidPortAssocModeException The given port association mode was invalid
  * @throws SnmpVersionUnsupportedException The given snmp version was invalid
  */
-function addHost($host, $snmp_version = '', $port = '161', $transport = 'udp', $poller_group = '0', $force_add = '0', $port_assoc_mode = 'ifIndex') {
+function addHost($host, $snmp_version = '', $port = '161', $transport = 'udp', $poller_group = '0', $force_add = false, $port_assoc_mode = 'ifIndex') {
     global $config;
 
     // Test Database Exists
@@ -291,10 +291,12 @@ function addHost($host, $snmp_version = '', $port = '161', $transport = 'udp', $
     }
 
     // Test reachability
-    $address_family = snmpTransportToAddressFamily($transport);
-    $ping_result = isPingable($host, $address_family);
-    if ($force_add == 1 || !$ping_result['result']) {
-        throw new HostUnreachablePingException("Could not ping $host");
+    if (!$force_add) {
+        $address_family = snmpTransportToAddressFamily($transport);
+        $ping_result = isPingable($host, $address_family);
+        if (!$ping_result['result']) {
+            throw new HostUnreachablePingException("Could not ping $host");
+        }
     }
 
     // if $snmpver isn't set, try each version of snmp
@@ -311,7 +313,7 @@ function addHost($host, $snmp_version = '', $port = '161', $transport = 'udp', $
             // Try each set of parameters from config
             foreach ($config['snmp']['v3'] as $v3) {
                 $device = deviceArray($host, null, $snmpver, $port, $transport, $v3, $port_assoc_mode);
-                if ($force_add == 1 || isSNMPable($device)) {
+                if ($force_add || isSNMPable($device)) {
                     $snmphost = snmp_get($device, "sysName.0", "-Oqv", "SNMPv2-MIB");
                     $result = createHost($host, null, $snmpver, $port, $transport, $v3, $poller_group, $port_assoc_mode, $snmphost);
                     if ($result !== false) {
@@ -326,7 +328,7 @@ function addHost($host, $snmp_version = '', $port = '161', $transport = 'udp', $
             foreach ($config['snmp']['community'] as $community) {
                 $device = deviceArray($host, $community, $snmpver, $port, $transport, null, $port_assoc_mode);
 
-                if ($force_add == 1 || isSNMPable($device)) {
+                if ($force_add || isSNMPable($device)) {
                     $snmphost = snmp_get($device, "sysName.0", "-Oqv", "SNMPv2-MIB");
                     $result = createHost($host, $community, $snmpver, $port, $transport, array(), $poller_group, $port_assoc_mode, $snmphost);
                     if ($result !== false) {