From df8a460cfd4a21e35441bd1e0c4cefe6739463ea Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 26 Feb 2010 07:09:42 -0500
Subject: [PATCH] Impoved the software update function to enable the installation of apps like phpmyadmin into the apps vhost.
---
install/lib/installer_base.lib.php | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index bf14ca4..2b6c055 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1076,9 +1076,9 @@
//* Create the ispconfig apps vhost user and group
- $apps_vhost_user = $conf['web']['apps_vhost_user'];
- $apps_vhost_group = $conf['web']['apps_vhost_group'];
- $install_dir = $conf['web']['website_basedir'].'/apps';
+ $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');
$command = 'groupadd '.$apps_vhost_user;
if(!is_group($apps_vhost_group)) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
@@ -1090,7 +1090,8 @@
$command = 'adduser '.$conf['apache']['user'].' '.$apps_vhost_group;
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
- exec('mkdir -p '.escapeshellcmd($conf['web']['website_basedir'].'/apps'));
+ exec('mkdir -p '.$install_dir);
+ exec("chown $apps_vhost_user:$apps_vhost_group $install_dir");
//* Copy the apps vhost file
$vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
--
Gitblit v1.9.1