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/installer_base.lib.php | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index cbabdee..94a176a 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1420,7 +1420,7 @@
global $conf;
//* Create the ispconfig apps vhost user and group
- if($conf['apache']['installed'] == true && $this->install_ispconfig_interface == true){
+ if($conf['apache']['installed'] == true){
$apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']);
$apps_vhost_group = escapeshellcmd($conf['web']['apps_vhost_group']);
$install_dir = escapeshellcmd($conf['web']['website_basedir'].'/apps');
@@ -1482,7 +1482,7 @@
}
}
- if($conf['nginx']['installed'] == true && $this->install_ispconfig_interface == true){
+ if($conf['nginx']['installed'] == true){
$apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']);
$apps_vhost_group = escapeshellcmd($conf['web']['apps_vhost_group']);
$install_dir = escapeshellcmd($conf['web']['website_basedir'].'/apps');
@@ -1784,9 +1784,8 @@
}
if(is_dir($install_dir.'/interface/invoices')) {
- chmod($install_dir.'/interface/invoices', 0770);
- chown($install_dir.'/interface/invoices', 'ispconfig');
- chgrp($install_dir.'/interface/invoices', 'ispconfig');
+ exec('chmod -R 770 '.escapeshellarg($install_dir.'/interface/invoices'));
+ exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices'));
}
// TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
--
Gitblit v1.9.1