- WebDAV Users: show only domains that run on Apache (because nginx does no...

ftimme

2011-10-11 81d79a79e4b29e9314b64b2e4c49b48ae8319767

 install/lib/install.lib.php

@@ -57,7 +57,7 @@

//** Get distribution identifier
//** IMPORTANT!
//   This is the same code as in server/mods-available/monitor_core_module.inc.php
//   This is the same code as in server/lib/classes/monitor_tools.inc.php
//   So if you change it here, you also have to change it in there!
function get_distname() {
   
@@ -633,11 +633,17 @@

function get_ispconfig_port_number() {
   global $conf;
   $ispconfig_vhost_file = $conf['apache']['vhost_conf_dir'].'/ispconfig.vhost';

   if($conf['nginx']['installed'] == true){
      $ispconfig_vhost_file = $conf['nginx']['vhost_conf_dir'].'/ispconfig.vhost';
      $regex = '/listen (\d+)/';
   } else {
      $ispconfig_vhost_file = $conf['apache']['vhost_conf_dir'].'/ispconfig.vhost';
      $regex = '/\<VirtualHost.*\:(\d{1,})\>/';
   }
	
   if(is_file($ispconfig_vhost_file)) {
      $tmp = file_get_contents($ispconfig_vhost_file);
      preg_match('/\<VirtualHost.*\:(\d{1,})\>/',$tmp,$matches);
      preg_match($regex,$tmp,$matches);
      $port_number = intval($matches[1]);
      if($port_number > 0) {
         return $port_number;