From 93292a992c740e29c676c566180c64774a2a0bac Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 02 Mar 2016 13:24:43 -0500
Subject: [PATCH] Use correct php.ini master file on custom directives (Fixes #3790)

---
 server/plugins-available/apache2_plugin.inc.php |   94 +++++++++++++++++++++++++---------------------
 1 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index a8377f5..03e2c8f 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -91,8 +91,52 @@
 		$app->plugins->registerAction('php_ini_changed', $this->plugin_name, 'php_ini_changed');
 	}
 
-	// check for php.ini changes
-
+	private function get_master_php_ini_content($web_data) {
+		global $app, $conf;
+		
+		$app->uses('getconf');
+		$web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
+		$fastcgi_config = $app->getconf->get_server_config($conf['server_id'], 'fastcgi');
+		
+		$php_ini_content = '';
+		$master_php_ini_path = '';
+		
+		if($web_data['php'] == 'mod') {
+			$master_php_ini_path = $web_config['php_ini_path_apache'];
+		} else {
+			// check for custom php
+			if($web_data['fastcgi_php_version'] != '') {
+				$tmp = explode(':', $web_data['fastcgi_php_version']);
+				if(isset($tmp[2])) {
+					$tmppath = $tmp[2];
+					if(substr($tmppath, -7) != 'php.ini') {
+						if(substr($tmppath, -1) != '/') $tmppath .= '/';
+						$tmppath .= 'php.ini';
+					}
+					if(file_exists($tmppath)) {
+						$master_php_ini_path = $tmppath;
+					}
+					unset($tmppath);
+				}
+				unset($tmp);
+			}
+			
+			if(!$master_php_ini_path) {
+				if($web_data['php'] == 'fast-cgi' && file_exists($fastcgi_config["fastcgi_phpini_path"])) {
+					$master_php_ini_path = $fastcgi_config["fastcgi_phpini_path"];
+				} elseif($web_data['php'] == 'php-fpm' && file_exists($web_config['php_fpm_ini_path'])) {
+					$master_php_ini_path = $fastcgi_config["fastcgi_phpini_path"];
+				} else {
+					$master_php_ini_path = $web_config['php_ini_path_cgi'];
+				}
+			}
+		}
+		if($master_php_ini_path != '' && substr($master_php_ini_path, -7) == 'php.ini' && is_file($master_php_ini_path)) {
+			$php_ini_content .= $app->system->file_get_contents($master_php_ini_path)."\n";
+		}
+		
+		return $php_ini_content;
+	}
 
 	// Handle php.ini changes
 	function php_ini_changed($event_name, $data) {
@@ -145,22 +189,10 @@
 				$custom_php_ini_dir .= '_' . $web_folder;
 			}
 			if(!is_dir($web_config['website_basedir'].'/conf')) $app->system->mkdir($web_config['website_basedir'].'/conf');
-
-
+			
 			if(!is_dir($custom_php_ini_dir)) $app->system->mkdir($custom_php_ini_dir);
-			$php_ini_content = '';
-			if($web_data['php'] == 'mod') {
-				$master_php_ini_path = $web_config['php_ini_path_apache'];
-			} else {
-				if($web_data['php'] == 'fast-cgi' && file_exists($fastcgi_config["fastcgi_phpini_path"])) {
-					$master_php_ini_path = $fastcgi_config["fastcgi_phpini_path"];
-				} else {
-					$master_php_ini_path = $web_config['php_ini_path_cgi'];
-				}
-			}
-			if($master_php_ini_path != '' && substr($master_php_ini_path, -7) == 'php.ini' && is_file($master_php_ini_path)) {
-				$php_ini_content .= $app->system->file_get_contents($master_php_ini_path)."\n";
-			}
+			
+			$php_ini_content = $this->get_master_php_ini_content($web_data);
 			
 			if(intval($web_data['directive_snippets_id']) > 0){
 				$snippet = $app->db->queryOneRecord("SELECT * FROM directive_snippets WHERE directive_snippets_id = ? AND type = 'apache' AND active = 'y' AND customer_viewable = 'y'", intval($web_data['directive_snippets_id']));
@@ -1009,32 +1041,8 @@
 		if(trim($data['new']['custom_php_ini']) != '') {
 			$has_custom_php_ini = true;
 			if(!is_dir($custom_php_ini_dir)) $app->system->mkdirpath($custom_php_ini_dir);
-			$php_ini_content = '';
-			if($data['new']['php'] == 'mod') {
-				$master_php_ini_path = $web_config['php_ini_path_apache'];
-			} else {
-				if($data["new"]['php'] == 'fast-cgi') {
-					if(trim($data['new']['fastcgi_php_version']) != '' && file_exists($custom_fastcgi_php_ini_dir)){
-						$master_php_ini_path = $custom_fastcgi_php_ini_dir;
-					} elseif(file_exists($fastcgi_config["fastcgi_phpini_path"])){
-						$master_php_ini_path = $fastcgi_config["fastcgi_phpini_path"];
-					} else {
-						$master_php_ini_path = $web_config['php_ini_path_cgi'];
-					}
-				} else {
-					$master_php_ini_path = $web_config['php_ini_path_cgi'];
-				}
-			}
-
-			//* Add php.ini to the path in case that the master_php_ini_path is a directory
-			if($master_php_ini_path != '' && is_dir($master_php_ini_path) && is_file($master_php_ini_path.'/php.ini')) {
-				if(substr($master_php_ini_path, -1) == '/') $master_php_ini_path = substr($master_php_ini_path, 0, -1);
-				$master_php_ini_path .= '/php.ini';
-			}
-
-			if($master_php_ini_path != '' && substr($master_php_ini_path, -7) == 'php.ini' && is_file($master_php_ini_path)) {
-				$php_ini_content .= $app->system->file_get_contents($master_php_ini_path)."\n";
-			}
+			
+			$php_ini_content = $this->get_master_php_ini_content($data['new']);
 			$php_ini_content .= str_replace("\r", '', trim($data['new']['custom_php_ini']));
 			
 			if(intval($data['new']['directive_snippets_id']) > 0){

--
Gitblit v1.9.1