ExternalVendorCode/devilbox
1
0
Fork 0
mirror of https://github.com/cytopia/devilbox.git synced 2025-02-01 08:48:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #140 from cytopia/DVL-013-intranet-fixes

Browse Source 
Dvl 013 intranet fixes
This commit is contained in:
cytopia 2017-11-04 17:40:40 +01:00 committed by GitHub
commit 959aa29f92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.devilbox/www/htdocs/mail.php
View File

@ -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();

4
.devilbox/www/include/lib/Helper.php
View File

@ -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);

8
README.md
View File

@ -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>