diff --git a/addhost.php b/addhost.php
index 82082afeb..1d067deb8 100755
--- a/addhost.php
+++ b/addhost.php
@@ -44,20 +44,23 @@ if (isset($argv[1]) && $argv[1])
     {
       if (isPingable($argv[1]))
       {
-        # FIXME should be a foreach $config['snmp']['community'][0] as $community
-        $community = $config['snmp']['community'][0];
+        $added = 0;
+        
+        foreach ($config['snmp']['community'] as $community)
+        {
+          $device = deviceArray($host, $community, $snmpver, $port, $transport);
 
-        $device = deviceArray($host, $community, $snmpver, $port, $transport);
+          if (isSNMPable($device))
+          {
+            $snmphost = snmp_get($device, "sysName.0", "-Oqv", "SNMPv2-MIB");
+            if ($snmphost == "" || ($snmphost && ($snmphost == $host || $hostshort = $host)))
+            {
+              $added = createHost ($host, $community, $snmpver, $port, $transport);
+              if($added) { echo($added . "\n"); break; }
 
-	if (isSNMPable($device))
-	{
-	  $snmphost = snmp_get($device, "sysName.0", "-Oqv", "SNMPv2-MIB");
-	  if ($snmphost == "" || ($snmphost && ($snmphost == $host || $hostshort = $host)))
-	  {
-	    $return = createHost ($host, $community, $snmpver, $port, $transport);
-	    if($return) { echo($return . "\n"); } else { echo("Adding $host failed\n"); }
-	  } else { echo("Given hostname does not match SNMP-read hostname ($snmphost)!\n"); }
-	} else { echo("Could not reach $host with SNMP\n"); }
+            } else { echo("Given hostname does not match SNMP-read hostname ($snmphost)!\n"); }
+          }
+        }
       } else { echo("Could not ping $host\n"); }
     } else { echo("Could not resolve $host\n"); }
   } else { echo("Already got host $host\n"); }
diff --git a/includes/functions.php b/includes/functions.php
index a0d597399..5a23ac029 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -528,7 +528,7 @@ function createHost($host, $community, $snmpver, $port = 161, $transport = 'udp'
 
 function isDomainResolves($domain)
 {
-  return (gethostbyname($domain) != $domain | count(dns_get_record($domain)) != 0);
+  return (gethostbyname($domain) != $domain || count(dns_get_record($domain)) != 0);
 }
 
 function hoststatus($id)
diff --git a/includes/unix-graphing.php b/includes/unix-graphing.php
index 2808f4954..149b0a6fb 100755
--- a/includes/unix-graphing.php
+++ b/includes/unix-graphing.php
@@ -1,7 +1,6 @@
 <?php 
 
 ## FIXME not used, do we still need this?
-## included from includes/unix.php, which is also unused
 
 function mailerrorgraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $vertical) {
   global $config, $installdir;
diff --git a/includes/unix.php b/includes/unix.php
deleted file mode 100755
index c6cfff126..000000000
--- a/includes/unix.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  include("unix-graphing.php");
-?>