ExternalVendorCode/devilbox
1
0
Fork 0
mirror of https://github.com/cytopia/devilbox.git synced 2025-03-11 15:03:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

REL-0.9 Fix DNS vHost check

Browse Source
This commit is contained in:
cytopia 2017-05-12 09:25:38 +02:00
parent 21ce41e6f3
commit d6fd9d1cda
No known key found for this signature in database
GPG Key ID: 6D56EDB8695128A2
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.devilbox/www/htdocs/vhosts.php
View File

@ -49,8 +49,9 @@
</table> </table>
<?php else: ?> <?php else: ?>
<h4>No projects here.</h4> <h4>No projects here.</h4>
<p>Simply create a folder in <strong><?php echo $Docker->getEnv('HOST_PATH_HTTPD_DATADIR');?></strong> (on your host computer - not inside the docker).</p> <p>Simply create a directory in <strong><?php echo $Docker->getEnv('HOST_PATH_HTTPD_DATADIR');?></strong> on your host computer (or in <strong>/shared/httpd</strong> inside the php container).</p>
<p><strong>Example:</strong><br/><?php echo $Docker->getEnv('HOST_PATH_HTTPD_DATADIR');?>/my_project</p> <p><strong>Example:</strong><br/><?php echo $Docker->getEnv('HOST_PATH_HTTPD_DATADIR');?>/my_project</p>
<p>It will then be available via <strong>http://my_project.<?php echo loadClass('Php')->getTldSuffix();?></strong></p>
<?php endif;?> <?php endif;?>
</div> </div>
</div> </div>
@ -98,7 +99,7 @@
function checkDns(vhost) { function checkDns(vhost) {
var xhttp = new XMLHttpRequest(); var xhttp = new XMLHttpRequest();
// Timeout after 1 seconds and mark it invalid DNS // Timeout after 1 seconds and mark it invalid DNS
xhttp.timeout = <?php echo loadClass('Docker')->getEnv('DNS_CHECK_TIMEOUT');?>000; xhttp.timeout = <?php echo loadClass('Docker')->getEnv('DNS_CHECK_TIMEOUT');?> * 100;
var el_valid = document.getElementById('valid-' + vhost); var el_valid = document.getElementById('valid-' + vhost);
var el_href = document.getElementById('href-' + vhost); var el_href = document.getElementById('href-' + vhost);
@ -106,7 +107,7 @@
xhttp.onreadystatechange = function(e) { xhttp.onreadystatechange = function(e) {
if (this.readyState == 4 && this.status == 200) { if (this.readyState == 4 && this.status == 200) {
//clearTimeout(xmlHttpTimeout); clearTimeout(xmlHttpTimeout);
el_valid.className += ' bg-success'; el_valid.className += ' bg-success';
el_valid.innerHTML = 'OK'; el_valid.innerHTML = 'OK';
el_href.innerHTML = '<a target="_blank" href="http://'+vhost+'.<?php echo loadClass('Php')->getTldSuffix().$Docker->getPort();?>">'+vhost+'.<?php echo loadClass('Php')->getTldSuffix().$Docker->getPort();?></a>'; el_href.innerHTML = '<a target="_blank" href="http://'+vhost+'.<?php echo loadClass('Php')->getTldSuffix().$Docker->getPort();?>">'+vhost+'.<?php echo loadClass('Php')->getTldSuffix().$Docker->getPort();?></a>';
@ -125,10 +126,10 @@
xhttp.open('GET', 'http://'+vhost+'.<?php echo loadClass('Php')->getTldSuffix();?>', true); xhttp.open('GET', 'http://'+vhost+'.<?php echo loadClass('Php')->getTldSuffix();?>', true);
xhttp.send(); xhttp.send();
// Timeout to abort in 1 second // Timeout to abort in 1 second
//var xmlHttpTimeout=setTimeout(ajaxTimeout,20000); var xmlHttpTimeout=setTimeout(ajaxTimeout, <?php echo loadClass('Docker')->getEnv('DNS_CHECK_TIMEOUT');?>100);
//function ajaxTimeout(){ function ajaxTimeout(){
// xhttp.abort(); xhttp.ontimeout();
//} }
} }