Merge branch 'remove-php-modes' into 'master'

Marius Burkard · Marius Burkard · commit 001bac916814 · 2018-11-12T11:12:23.000+01:00
Remove php modes

Closes #4893

See merge request ispconfig/ispconfig3!840
diff --git a/install/dist/conf/gentoo.conf.php b/install/dist/conf/gentoo.conf.php
@@ -72,9 +72,6 @@
 $conf['mysql']['master_ispconfig_user'] = '';
 $conf['mysql']['master_ispconfig_password'] = md5(uniqid(rand()));
 
-//* SuPHP
-$conf['suphp']['config_file'] = '/etc/suphp.conf';
-
 //* Apache
 $conf['apache']['installed'] = false; // will be detected automatically during installation
 $conf['apache']['user'] = 'apache';
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
@@ -696,11 +696,6 @@ public function configure_apache()
 		global $conf;
 
 		if($conf['apache']['installed'] == false) return;
-		if(is_file('/etc/suphp.conf')) {
-			//replaceLine('/etc/suphp.conf','php=php:/usr/bin','x-httpd-suphp=php:/usr/bin/php-cgi',0);
-			replaceLine('/etc/suphp.conf', 'docroot=', 'docroot=/var/www', 0);
-			replaceLine('/etc/suphp.conf', 'umask=0077', 'umask=0022', 0);
-		}
 
 		//* Create the logging directory for the vhost logfiles
 		exec('mkdir -p /var/log/ispconfig/httpd');
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
@@ -555,19 +555,6 @@ public function configure_apache()
 			mkdir($conf['ispconfig_log_dir'].'/httpd', 0755, true);
 		}
 
-		if (is_file($conf['suphp']['config_file']))
-		{
-			$content = rf($conf['suphp']['config_file']);
-
-			if (!preg_match('|^x-httpd-suphp=php:/usr/bin/php-cgi$|m', $content))
-			{
-				$content = preg_replace('/;Handler for php-scripts/', ";Handler for php-scripts\nx-httpd-suphp=php:/usr/bin/php-cgi", $content);
-				$content = preg_replace('/;?umask=\d+/', 'umask=0022', $content);
-			}
-
-			$this->write_config_file($conf['suphp']['config_file'], $content);
-		}
-
 		//* Enable ISPConfig default vhost settings
 		$default_vhost_path = $conf['apache']['vhost_conf_dir'].'/'.$conf['apache']['vhost_default'];
 		if (is_file($default_vhost_path))
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
@@ -663,13 +663,6 @@ public function configure_apache()
 		//* enable apache logio module
 		exec('a2enmod logio');
 
-		//if(is_file('/etc/suphp.conf')) {
-		replaceLine('/etc/suphp.conf', 'php=php', 'x-httpd-suphp="php:/srv/www/cgi-bin/php5"', 0, 0);
-		replaceLine('/etc/suphp.conf', 'php="php', 'x-httpd-suphp="php:/srv/www/cgi-bin/php5"', 0, 0);
-		replaceLine('/etc/suphp.conf', 'docroot=', 'docroot=/srv/www', 0, 0);
-		replaceLine('/etc/suphp.conf', 'umask=0077', 'umask=0022', 0);
-		//}
-
 		if(!file_exists('/srv/www/cgi-bin/php5') && file_exists('/srv/www/cgi-bin/php')) {
 			symlink('/srv/www/cgi-bin/php', '/srv/www/cgi-bin/php5');
 		}
@@ -1249,9 +1242,6 @@ public function install_ispconfig()
 				}
 
 			}
-
-			// Fix a setting in vhost master file for suse
-			replaceLine('/usr/local/ispconfig/server/conf/vhost.conf.master', "suPHP_UserGroup", "        suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>", 0);
 		}
 
 		if($conf['nginx']['installed'] == true && $this->install_ispconfig_interface == true){
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -1938,12 +1938,6 @@ public function configure_apache() {
 		//* Create the logging directory for the vhost logfiles
 		if(!@is_dir($conf['ispconfig_log_dir'].'/httpd')) mkdir($conf['ispconfig_log_dir'].'/httpd', 0755, true);
 
-		if(is_file('/etc/suphp/suphp.conf')) {
-			replaceLine('/etc/suphp/suphp.conf', 'php="php:/usr/bin', 'x-httpd-suphp="php:/usr/bin/php-cgi"', 0);
-			//replaceLine('/etc/suphp/suphp.conf','docroot=','docroot=/var/clients',0);
-			replaceLine('/etc/suphp/suphp.conf', 'umask=00', 'umask=0022', 0);
-		}
-
 		if(is_file('/etc/apache2/sites-enabled/000-default')) {
 			replaceLine('/etc/apache2/sites-available/000-default', 'NameVirtualHost *', 'NameVirtualHost *:80', 1, 0);
 			replaceLine('/etc/apache2/sites-available/000-default', '<VirtualHost *>', '<VirtualHost *:80>', 1, 0);
diff --git a/interface/lib/classes/remote.d/server.inc.php b/interface/lib/classes/remote.d/server.inc.php
@@ -269,7 +269,7 @@ public function server_get_php_versions($session_id, $server_id, $php)
 			$web_config[$server_id] = $app->getconf->get_server_config($server_id, 'web');
 			$server_type = !empty($web_config[$server_id]['server_type']) ? $web_config[$server_id]['server_type'] : 'apache';
 
-			if ($php === 'php-fpm' || ($php === 'hhvm' && $server_type === 'nginx')) {
+			if ($php === 'php-fpm') {
 				$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? AND (client_id = 0)", $server_id);
 				foreach ($php_records as $php_record) {
 					$php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
@@ -1242,7 +1242,7 @@
 			'datatype' => 'VARCHAR',
 			'formtype' => 'SELECT',
 			'default' => 'fast-cgi',
-			'value' => array('no' => 'disabled_txt', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM', 'hhvm' => 'HHVM'),
+			'value' => array('no' => 'disabled_txt', 'fast-cgi' => 'Fast-CGI', 'mod' => 'Mod-PHP', 'php-fpm' => 'PHP-FPM'),
 			'searchable' => 2
 		),
 		'nginx_cgi_socket' => array(
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
@@ -1100,7 +1100,7 @@
 			'default' => '',
 			'separator' => ',',
 			'valuelimit' => 'client:web_php_options',
-			'value'  => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM', 'hhvm' => 'HHVM')
+			'value'  => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'mod' => 'Mod-PHP', 'php-fpm' => 'PHP-FPM')
 		),
 		'limit_cgi' => array (
 			'datatype' => 'VARCHAR',
diff --git a/interface/web/client/form/client_template.tform.php b/interface/web/client/form/client_template.tform.php
@@ -508,7 +508,7 @@
 			'default' => '',
 			'separator' => ',',
 			'valuelimit' => 'client:web_php_options',
-			'value'  => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM', 'hhvm' => 'HHVM')
+			'value'  => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'mod' => 'Mod-PHP', 'php-fpm' => 'PHP-FPM')
 		),
 		'limit_cgi' => array (
 			'datatype' => 'VARCHAR',
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
@@ -1097,7 +1097,7 @@
 			),
 			'default' => '',
 			'separator' => ',',
-			'value'  => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM', 'hhvm' => 'HHVM')
+			'value'  => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'mod' => 'Mod-PHP', 'php-fpm' => 'PHP-FPM')
 		),
 		'limit_cgi' => array (
 			'datatype' => 'VARCHAR',
diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php
@@ -92,7 +92,7 @@
 		$sql_where .= ")";
 	}
 
-	if($php_type == 'php-fpm' || ($php_type == 'hhvm' && $server_type == 'nginx')){
+	if($php_type == 'php-fpm'){
 		$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? AND active = 'y' ORDER BY name".$sql_where, $server_id);
 	} elseif($php_type == 'fast-cgi'){
 		$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND active = 'y' ORDER BY name".$sql_where, $server_id);
@@ -102,7 +102,7 @@
 	$php_select = "";
 	if(is_array($php_records) && !empty($php_records)) {
 		foreach( $php_records as $php_record) {
-			if($php_type == 'php-fpm' || ($php_type == 'hhvm' && $server_type == 'nginx')){
+			if($php_type == 'php-fpm'){
 				$php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
 			} else {
 				$php_version = $php_record['name'].':'.$php_record['php_fastcgi_binary'].':'.$php_record['php_fastcgi_ini_dir'];
diff --git a/interface/web/sites/form/web_vhost_domain.tform.php b/interface/web/sites/form/web_vhost_domain.tform.php
@@ -251,7 +251,7 @@
 			'formtype' => 'SELECT',
 			'default' => 'fast-cgi',
 			'valuelimit' => 'client:web_php_options',
-			'value'  => array('no' => 'disabled_txt', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM', 'hhvm' => 'HHVM'),
+			'value'  => array('no' => 'disabled_txt', 'fast-cgi' => 'Fast-CGI', 'mod' => 'Mod-PHP', 'php-fpm' => 'PHP-FPM'),
 			'searchable' => 2
 		),
 		'fastcgi_php_version' => array (
diff --git a/interface/web/sites/templates/web_vhost_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm
@@ -293,31 +293,21 @@ <h1><tmpl_var name="list_head_txt"></h1>
 		reloadFastcgiPHPVersions();
     });
 		
-    if(jQuery('#php').val() == 'fast-cgi' || jQuery('#php').val() == 'php-fpm' || (jQuery('#php').val() == 'hhvm' && serverType == 'nginx')){
+    if(jQuery('#php').val() == 'fast-cgi' || jQuery('#php').val() == 'php-fpm'){
         jQuery('.fastcgi_php_version:hidden').show();
-		if(jQuery('#php').val() == 'hhvm'){
-			jQuery('#fastcgi_php_version_txt').hide();
-			jQuery('#fastcgi_php_fallback_version_txt').show();
-		} else {
-			jQuery('#fastcgi_php_version_txt').show();
-			jQuery('#fastcgi_php_fallback_version_txt').hide();
-		}
-    } else {
+		jQuery('#fastcgi_php_version_txt').show();
+		jQuery('#fastcgi_php_fallback_version_txt').hide();
+	} else {
         jQuery('.fastcgi_php_version:visible').hide();
     }
     //ISPConfig.resetFormChanged();
     
     jQuery('#php').change(function(){
         reloadFastcgiPHPVersions();
-        if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm' || (jQuery(this).val() == 'hhvm' && serverType == 'nginx')){	
+        if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm'){	
             jQuery('.fastcgi_php_version:hidden').show();
-			if(jQuery(this).val() == 'hhvm'){
-				jQuery('#fastcgi_php_version_txt').hide();
-				jQuery('#fastcgi_php_fallback_version_txt').show();
-			} else {
-				jQuery('#fastcgi_php_version_txt').show();
-				jQuery('#fastcgi_php_fallback_version_txt').hide();
-			}
+			jQuery('#fastcgi_php_version_txt').show();
+			jQuery('#fastcgi_php_fallback_version_txt').hide();
         } else {
             jQuery('.fastcgi_php_version:visible').hide();
         }
@@ -373,21 +363,17 @@ <h1><tmpl_var name="list_head_txt"></h1>
 					}
 				});
 */
-                if(selected != "no" && selected != "php-fpm" && selected != "hhvm") {
+                if(selected != "no" && selected != "php-fpm") {
                     jQuery('#php option[value="php-fpm"]').attr('selected', 'selected').val('php-fpm');
                 }
                 jQuery('#php option[value="fast-cgi"]').hide();
-                jQuery('#php option[value="cgi"]').hide();
                 jQuery('#php option[value="mod"]').hide();
-                jQuery('#php option[value="suphp"]').hide();
             } else {
 				serverType = 'apache';
 				jQuery('.nginx').hide();
                 jQuery('.apache').show();
                 jQuery('#php option[value="fast-cgi"]').show();
-                jQuery('#php option[value="cgi"]').show();
                 jQuery('#php option[value="mod"]').show();
-                jQuery('#php option[value="suphp"]').show();
             }
             if(noFormChange) {
                 ISPConfig.resetFormChanged();
diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
@@ -243,14 +243,14 @@ function onShowEnd() {
 			if($server_type == 'nginx' && $this->dataRecord['php'] == 'fast-cgi') $this->dataRecord['php'] = 'php-fpm';
 
 			if($this->_vhostdomain_type == 'domain') {
-				if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
+				if($this->dataRecord['php'] == 'php-fpm'){
 					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y' ORDER BY name", ($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver']), $_SESSION['s']['user']['client_id']);
 				}
 				if($this->dataRecord['php'] == 'fast-cgi'){
 					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y' ORDER BY name", ($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver']), $_SESSION['s']['user']['client_id']);
 				}
 			} else {
-				if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
+				if($this->dataRecord['php'] == 'php-fpm'){
 					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y' ORDER BY name", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);
 				}
 				if($this->dataRecord['php'] == 'fast-cgi'){
@@ -260,7 +260,7 @@ function onShowEnd() {
 			$php_select = "<option value=''>".$app->functions->htmlentities($web_config['php_default_name'])."</option>";
 			if(is_array($php_records) && !empty($php_records)) {
 				foreach( $php_records as $php_record) {
-					if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
+					if($this->dataRecord['php'] == 'php-fpm'){
 						$php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
 					} else {
 						$php_version = $php_record['name'].':'.$php_record['php_fastcgi_binary'].':'.$php_record['php_fastcgi_ini_dir'];
@@ -390,14 +390,14 @@ function onShowEnd() {
 			$selected_client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = ?", $selected_client_group_id);
 			$sql_where = " AND (client_id = 0 OR client_id = ?) AND active = 'y'";
 			if($this->_vhostdomain_type == 'domain') {
-				if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
+				if($this->dataRecord['php'] == 'php-fpm'){
 					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ?".$sql_where." ORDER BY name", ($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver']), $selected_client['client_id']);
 				}
 				if($this->dataRecord['php'] == 'fast-cgi') {
 					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ?".$sql_where." ORDER BY name", ($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver']), $selected_client['client_id']);
 				}
 			} else {
-				if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
+				if($this->dataRecord['php'] == 'php-fpm'){
 					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y' ORDER BY name", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);
 				}
 				if($this->dataRecord['php'] == 'fast-cgi') {
@@ -407,7 +407,7 @@ function onShowEnd() {
 			$php_select = "<option value=''>".$app->functions->htmlentities($web_config['php_default_name'])."</option>";
 			if(is_array($php_records) && !empty($php_records)) {
 				foreach( $php_records as $php_record) {
-					if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
+					if($this->dataRecord['php'] == 'php-fpm'){
 						$php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
 					} else {
 						$php_version = $php_record['name'].':'.$php_record['php_fastcgi_binary'].':'.$php_record['php_fastcgi_ini_dir'];
@@ -610,14 +610,14 @@ function onShowEnd() {
 			$selected_client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = ?", $selected_client_group_id);
 			$sql_where = " AND (client_id = 0 OR client_id = ?) AND active = 'y'";
 			if($this->_vhostdomain_type == 'domain') {
-				if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
+				if($this->dataRecord['php'] == 'php-fpm'){
 					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ?".$sql_where." ORDER BY name", $server_id, $selected_client['client_id']);
 				}
 				if($this->dataRecord['php'] == 'fast-cgi') {
 					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ?".$sql_where." ORDER BY name", $server_id, $selected_client['client_id']);
 				}
 			} else {
-				if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
+				if($this->dataRecord['php'] == 'php-fpm'){
 					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ? AND active = 'y' ORDER BY name", $parent_domain['server_id']);
 				}
 				if($this->dataRecord['php'] == 'fast-cgi') {
@@ -627,7 +627,7 @@ function onShowEnd() {
 			$php_select = "<option value=''>".$app->functions->htmlentities($web_config['php_default_name'])."</option>";
 			if(is_array($php_records) && !empty($php_records)) {
 				foreach( $php_records as $php_record) {
-					if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
+					if($this->dataRecord['php'] == 'php-fpm'){
 						$php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
 					} else {
 						$php_version = $php_record['name'].':'.$php_record['php_fastcgi_binary'].':'.$php_record['php_fastcgi_ini_dir'];
diff --git a/interface/web/tools/import_vpopmail.php b/interface/web/tools/import_vpopmail.php
@@ -111,7 +111,7 @@ function start_import() {
 
 				//* add client
 				$sql = "INSERT INTO `client` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `company_name`, `company_id`, `contact_name`, `customer_no`, `vat_id`, `street`, `zip`, `city`, `state`, `country`, `telephone`, `mobile`, `fax`, `email`, `internet`, `icq`, `notes`, `bank_account_owner`, `bank_account_number`, `bank_code`, `bank_name`, `bank_account_iban`, `bank_account_swift`, `default_mailserver`, `limit_maildomain`, `limit_mailbox`, `limit_mailalias`, `limit_mailaliasdomain`, `limit_mailforward`, `limit_mailcatchall`, `limit_mailrouting`, `limit_mailfilter`, `limit_fetchmail`, `limit_mailquota`, `limit_spamfilter_wblist`, `limit_spamfilter_user`, `limit_spamfilter_policy`, `default_webserver`, `limit_web_ip`, `limit_web_domain`, `limit_web_quota`, `web_php_options`, `limit_cgi`, `limit_ssi`, `limit_perl`, `limit_ruby`, `limit_python`, `force_suexec`, `limit_hterror`, `limit_wildcard`, `limit_ssl`, `limit_web_subdomain`, `limit_web_aliasdomain`, `limit_ftp_user`, `limit_shell_user`, `ssh_chroot`, `limit_webdav_user`, `limit_aps`, `default_dnsserver`, `limit_dns_zone`, `limit_dns_slave_zone`, `limit_dns_record`, `default_dbserver`, `limit_database`, `limit_cron`, `limit_cron_type`, `limit_cron_frequency`, `limit_traffic_quota`, `limit_client`, `limit_mailmailinglist`, `limit_openvz_vm`, `limit_openvz_vm_template_id`, `parent_client_id`, `username`, `password`, `language`, `usertheme`, `template_master`, `template_additional`, `created_at`, `id_rsa`, `ssh_rsa`)
-				VALUES(1, 1, 'riud', 'riud', '', '', '', ?, '', '', '', '', '', '', ?, '', '', '', '', 'http://', '', '', '', '', '', '', '', '', 1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, 0, 0, 0, 1, NULL, -1, -1, 'no,fast-cgi,cgi,mod,suphp', 'n', 'n', 'n', 'n', 'n', 'y', 'n', 'n', 'n', -1, -1, -1, 0, 'no,jailkit', 0, 0, 1, -1, -1, -1, 1, -1, 0, 'url', 5, -1, 0, -1, 0, 0, 0, ?, ?, ?, 'default', 0, '', NOW(), '', '')";
+				VALUES(1, 1, 'riud', 'riud', '', '', '', ?, '', '', '', '', '', '', ?, '', '', '', '', 'http://', '', '', '', '', '', '', '', '', 1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, 0, 0, 0, 1, NULL, -1, -1, 'no,fast-cgi,mod', 'n', 'n', 'n', 'n', 'n', 'y', 'n', 'n', 'n', -1, -1, -1, 0, 'no,jailkit', 0, 0, 1, -1, -1, -1, 1, -1, 0, 'url', 5, -1, 0, -1, 0, 0, 0, ?, ?, ?, 'default', 0, '', NOW(), '', '')";
 				$app->db->query($sql, $pw_domain,$country, $pw_domain, $pw_crypt_password, $conf['language']);
 				$client_id = $app->db->insertID();
 
diff --git a/remoting_client/examples/client_add.php b/remoting_client/examples/client_add.php
@@ -51,7 +51,7 @@
 		'limit_web_ip' => '',
 		'limit_web_domain' => -1,
 		'limit_web_quota' => -1,
-		'web_php_options' => 'no,fast-cgi,cgi,mod,suphp',
+		'web_php_options' => 'no,fast-cgi,mod',
 		'limit_web_subdomain' => -1,
 		'limit_web_aliasdomain' => -1,
 		'limit_ftp_user' => -1,
diff --git a/server/conf/hhvm_monit.master b/server/conf/hhvm_monit.master
diff --git a/server/conf/hhvm_starter.master b/server/conf/hhvm_starter.master
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
diff --git a/server/plugins-available/pma_symlink_plugin.inc.php b/server/plugins-available/pma_symlink_plugin.inc.php
diff --git a/server/plugins-available/webmail_symlink_plugin.inc.php b/server/plugins-available/webmail_symlink_plugin.inc.php

Original file line number	Diff line number	Diff line change
`@@ -663,13 +663,6 @@ public function configure_apache()`
`663`	`663`	`//* enable apache logio module`
`664`	`664`	`exec('a2enmod logio');`
`665`	`665`
`666`		`- //if(is_file('/etc/suphp.conf')) {`
`667`		`- replaceLine('/etc/suphp.conf', 'php=php', 'x-httpd-suphp="php:/srv/www/cgi-bin/php5"', 0, 0);`
`668`		`- replaceLine('/etc/suphp.conf', 'php="php', 'x-httpd-suphp="php:/srv/www/cgi-bin/php5"', 0, 0);`
`669`		`- replaceLine('/etc/suphp.conf', 'docroot=', 'docroot=/srv/www', 0, 0);`
`670`		`- replaceLine('/etc/suphp.conf', 'umask=0077', 'umask=0022', 0);`
`671`		`- //}`
`672`		`-`
`673`	`666`	`if(!file_exists('/srv/www/cgi-bin/php5') && file_exists('/srv/www/cgi-bin/php')) {`
`674`	`667`	`symlink('/srv/www/cgi-bin/php', '/srv/www/cgi-bin/php5');`
`675`	`668`	`}`
`@@ -1249,9 +1242,6 @@ public function install_ispconfig()`
`1249`	`1242`	`}`
`1250`	`1243`
`1251`	`1244`	`}`
`1252`		`-`
`1253`		`- // Fix a setting in vhost master file for suse`
`1254`		`- replaceLine('/usr/local/ispconfig/server/conf/vhost.conf.master', "suPHP_UserGroup", " suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>", 0);`
`1255`	`1245`	`}`
`1256`	`1246`
`1257`	`1247`	`if($conf['nginx']['installed'] == true && $this->install_ispconfig_interface == true){`