From 0ae667e6cfdd1bcc85bacf85cd93a84f99fa88f8 Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Tue, 22 May 2012 04:08:05 -0400
Subject: [PATCH] added missing language string already present in default theme
---
install/lib/install.lib.php | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 44b4052..0d8eb40 100644
--- a/install/lib/install.lib.php
+++ b/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() {
@@ -582,8 +582,8 @@
}
function is_installed($appname) {
- exec('which '.escapeshellcmd($appname).' 2> /dev/null',$out);
- if(isset($out[0]) && stristr($out[0],$appname)) {
+ exec('which '.escapeshellcmd($appname).' 2> /dev/null',$out,$returncode);
+ if(isset($out[0]) && stristr($out[0],$appname) && $returncode == 0) {
return true;
} else {
return false;
@@ -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;
--
Gitblit v1.9.1