From aaaab931b7afb97f2aadd5919c548832f62831ab Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sat, 4 Nov 2017 13:42:15 +0100
Subject: [PATCH 1/2] DVL-013 Sort Feature list

---
 README.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8bf3484a..7fed3669 100644
--- a/README.md
+++ b/README.md
@@ -195,8 +195,12 @@ The devilbox has everything setup for you. The only thing you will have to insta
 <table>
 <tbody>
   <tr>
-    <td width="220" style="width:220px;">:star: Mass virtual hosts</td>
-    <td>New vhosts are created automatically whenever you add a project directory. This is done internally and automatically via <a href="https://travis-ci.org/devilbox/vhost-gen">vhost-gen</a> and <a href="https://github.com/devilbox/watcherd">watcherd</a>.</td>
+    <td width="220" style="width:220px;">:star: Auto virtual hosts</td>
+    <td>New virtual hosts are created automatically and instantly whenever you add a project directory. This is done internally via <a href="https://travis-ci.org/devilbox/vhost-gen">vhost-gen</a> and <a href="https://github.com/devilbox/watcherd">watcherd</a>.</td>
+  </tr>
+  <tr>
+    <td>:star: Unlimited vhosts</td>
+    <td>Run as many projects as you need with a single instance of the devilbox.</td>
   </tr>
   <tr>
     <td>:star: Custom vhosts</td>

From e254d01a65fc352e71cad4d0f9c66f65a82be244 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sat, 4 Nov 2017 13:42:41 +0100
Subject: [PATCH 2/2] DVL-013 Fix error handling in logger

---
 .devilbox/www/htdocs/mail.php        | 2 +-
 .devilbox/www/include/lib/Helper.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.devilbox/www/htdocs/mail.php b/.devilbox/www/htdocs/mail.php
index 0a726399..4db0e9b7 100644
--- a/.devilbox/www/htdocs/mail.php
+++ b/.devilbox/www/htdocs/mail.php
@@ -10,7 +10,7 @@ if (isset($_GET['email']) && isset($_GET['subject']) && isset($_GET['message']))
 	$subj = $_GET['subject'];
 	$mess = $_GET['message'];
 	if (! mail($mail, $subj, $mess)) {
-		loadClass('Logger')->error('Could not send mail to: '.$mail.' | subject: '.$subject);
+		loadClass('Logger')->error('Could not send mail to: '.$mail.' | subject: '.$subj);
 	}
 	header('Location: /mail.php');
 	exit();
diff --git a/.devilbox/www/include/lib/Helper.php b/.devilbox/www/include/lib/Helper.php
index 8b91e129..4c3526be 100644
--- a/.devilbox/www/include/lib/Helper.php
+++ b/.devilbox/www/include/lib/Helper.php
@@ -123,8 +123,8 @@ class Helper
 
 		// New request, generic check
 		// Note the traiing dot to prevent recursive lookups
-		$ip = $this->exec('ping -c 1 '.$hostname.'. 2>/dev/null | grep -Eo \'[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\' | head -1');
-		//$ip = gethostbyname($hostname.'');
+		//$ip = $this->exec('ping -c 1 '.$hostname.'. 2>/dev/null | grep -Eo \'[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\' | head -1');
+		$ip = gethostbyname($hostname.'');
 
 		if (filter_var($ip, FILTER_VALIDATE_IP) === false) {
 			//loadClass('Logger')->error('Retrieving the IP address of host \''.$hostname.'\' failed: '.$ip);