diff --git a/html/netcmd.php b/html/netcmd.php
index 106fc66e4a..9c520c3b05 100644
--- a/html/netcmd.php
+++ b/html/netcmd.php
@@ -1,19 +1,36 @@
 <?php
 
-switch ($_GET[cmd]) {
-  case 'whois':
-    $output = `/usr/bin/whois $_GET[query] | grep -v \%`;
-    break;
-  case 'ping':
-    $output = `/bin/ping $_GET[query]`;
-    break;
-  case 'tracert':
-    $output = `/usr/sbin/traceroute $_GET[query]`;
-    break;
-  case 'nmap':
-    $output = `/usr/bin/nmap $_GET[query]`;
-    break;
+include_once("Net/IPv6.php");
+
+function check_ip($ip)
+{
+  if ($ip == long2ip(ip2long($ip))) {
+    return true;
+  } else {
+      return false;
+  }
 }
+
+if($_GET['query']) {
+  $ip = $_GET['query'];
+  if(Net_IPv6::checkIPv6($ip)||check_ip($ip)) {
+    switch ($_GET[cmd]) {
+      case 'whois':
+        $output = `/usr/bin/whois $_GET[query] | grep -v \%`;
+        break;
+      case 'ping':
+        $output = `/bin/ping $_GET[query]`;
+        break;
+      case 'tracert':
+        $output = `/usr/sbin/traceroute $_GET[query]`;
+        break;
+      case 'nmap':
+        $output = `/usr/bin/nmap $_GET[query]`;
+        break; 
+    }
+  }
+}
+
 $output = trim($output);
 echo("<pre>$output</pre>");
 
diff --git a/html/whois.php b/html/whois.php
deleted file mode 100644
index bf6b104cf2..0000000000
--- a/html/whois.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-
-$output = `/usr/bin/whois $_GET[query] | grep -v \%`;
-
-$output = trim($output);
-
-echo("<pre>$output</pre>");
-
-?>