From 8d01eb0ea3afa104db70c4776a9b759eb35683e3 Mon Sep 17 00:00:00 2001 From: tbrehm Date: Tue, 9 Mar 2010 10:00:23 +0000 Subject: [PATCH] Added missing path /var/www/domain.tld/web to the php open basedir path. --- install/tpl/apache_ispconfig_fcgi_starter.master | 2 +- install/tpl/server.ini.master | 2 +- interface/web/sites/web_domain_edit.php | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/install/tpl/apache_ispconfig_fcgi_starter.master b/install/tpl/apache_ispconfig_fcgi_starter.master index a638732da9..6c84e7e597 100644 --- a/install/tpl/apache_ispconfig_fcgi_starter.master +++ b/install/tpl/apache_ispconfig_fcgi_starter.master @@ -3,4 +3,4 @@ PHPRC=/etc/php5/cgi/ export PHPRC export PHP_FCGI_MAX_REQUESTS=5000 export PHP_FCGI_CHILDREN=1 -exec /usr/lib/cgi-bin/php -d magic_quotes_gpc=off \ No newline at end of file +exec /usr/lib/cgi-bin/php -d magic_quotes_gpc=off -d session.save_path=/usr/local/ispconfig/server/temp \ No newline at end of file diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index ee2cb94594..fb5d3f22d6 100644 --- a/install/tpl/server.ini.master +++ b/install/tpl/server.ini.master @@ -44,7 +44,7 @@ group=www-data apps_vhost_port=8081 apps_vhost_ip=_default_ apps_vhost_servername= -php_open_basedir=[website_path]/web:[website_path]/tmp:/usr/share/php5:/tmp:/usr/share/phpmyadmin +php_open_basedir=[website_path]/web:[website_path]/tmp:/var/www/[website_domain]/web:/srv/www/[website_domain]/web:/usr/share/php5:/tmp:/usr/share/phpmyadmin htaccess_allow_override=All [dns] diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php index 77367000e7..edfce6741b 100644 --- a/interface/web/sites/web_domain_edit.php +++ b/interface/web/sites/web_domain_edit.php @@ -316,7 +316,8 @@ class page_action extends tform_actions { $system_user = $app->db->quote('web'.$this->id); $system_group = $app->db->quote('client'.$client_id); $document_root = $app->db->quote(str_replace("[client_id]",$client_id,$document_root)); - $php_open_basedir = $app->db->quote(str_replace("[website_path]",$document_root,$web_config["php_open_basedir"])); + $php_open_basedir = str_replace("[website_path]",$document_root,$web_config["php_open_basedir"]); + $php_open_basedir = $app->db->quote(str_replace("[website_domain]",$web_rec['domain'],$php_open_basedir)); $htaccess_allow_override = $app->db->quote($web_config["htaccess_allow_override"]); $sql = "UPDATE web_domain SET system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$this->id; @@ -438,7 +439,8 @@ class page_action extends tform_actions { $app->db->query($sql); } if($web_rec['php_open_basedir'] == '') { - $php_open_basedir = $app->db->quote(str_replace("[website_path]",$document_root,$web_config["php_open_basedir"])); + $php_open_basedir = str_replace("[website_path]",$document_root,$web_config["php_open_basedir"]); + $php_open_basedir = $app->db->quote(str_replace("[website_domain]",$web_rec['domain'],$php_open_basedir)); $sql = "UPDATE web_domain SET php_open_basedir = '$php_open_basedir' WHERE domain_id = ".$this->id; $app->db->query($sql); } -- GitLab