Added Missed patch edit, and correct the vhost loop

Change the name from proxy_protocol to use_proxy_protocol in vhost file due to site level overriding the check

tested both on apache2 and nginx with haproxy load balancer on TCP Mode

Author: tophitter

interface/web/admin/lib/lang/en_server_config.lng

@@ -301,3 +301,6 @@ $wb['content_filter_txt'] = 'Content Filter';
 $wb['rspamd_url_txt'] = 'Rspamd URL';
 $wb['rspamd_user_txt'] = 'Rspamd User';
 $wb['rspamd_password_txt'] = 'Rspamd Password';
+$wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
+$wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';

server/conf/nginx_vhost.conf.master

@@ -1,6 +1,6 @@
 server {
         listen <tmpl_var name='ip_address'>:<tmpl_var name='http_port'>;
-<tmpl_if name='proxy_protocol' op='==' value='y'>
+<tmpl_if name='use_proxy_protocol' op='==' value='y'>
 <tmpl_if name='proxy_protocol_http' op='>' value='0'>
         listen <tmpl_var name='ip_address'>:<tmpl_var name='proxy_protocol_http'> proxy_protocol;
 </tmpl_if>
@@ -13,7 +13,7 @@ server {
 </tmpl_if>
 <tmpl_if name='ssl_enabled'>
         listen <tmpl_var name='ip_address'>:<tmpl_var name='https_port'> ssl{tmpl_if name='enable_http2' op='==' value='y'} http2{/tmpl_if}{tmpl_if name='enable_spdy' op='==' value='y'} spdy{/tmpl_if};
-<tmpl_if name='proxy_protocol' op='==' value='y'>
+<tmpl_if name='use_proxy_protocol' op='==' value='y'>
 <tmpl_if name='proxy_protocol_https' op='>' value='0'>
         listen <tmpl_var name='ip_address'>:<tmpl_var name='proxy_protocol_https'> ssl proxy_protocol;
 </tmpl_if>

server/conf/vhost.conf.master

@@ -12,8 +12,7 @@
 
 <tmpl_loop name='vhosts'>
 <VirtualHost {tmpl_var name='ip_address'}:{tmpl_var name='port'}>
-
-<tmpl_if name='proxy_protocol' op='==' value='y'>
+<tmpl_if name='use_proxy_protocol' op='==' value='y'>
 <tmpl_if name='apache_version' op='>=' value='2.4.30' format='version'>
 	<IfModule mod_remoteip.c>
 		RemoteIPProxyProtocol On

server/plugins-available/apache2_plugin.inc.php

@@ -1680,7 +1680,7 @@ function update($event_name, $data) {
 		if($web_config['vhost_proxy_protocol_enabled'] == 'y' && $data['new']['proxy_protocol'] == 'y'){
 			if((int)$web_config['vhost_proxy_protocol_http_port'] > 0) {
 				$tmp_vhost_arr['port']           = (int)$web_config['vhost_proxy_protocol_http_port'];
-				$tmp_vhost_arr['proxy_protocol'] = $data['new']['proxy_protocol'];
+				$tmp_vhost_arr['use_proxy_protocol'] = $data['new']['proxy_protocol'];
 				$vhosts[]                        = $tmp_vhost_arr;
 			}
 		}
@@ -1704,7 +1704,7 @@ function update($event_name, $data) {
 			if($web_config['vhost_proxy_protocol_enabled'] == 'y' && $data['new']['proxy_protocol'] == 'y'){
 				if((int)$web_config['vhost_proxy_protocol_https_port'] > 0) {
 					$tmp_vhost_arr['port']           = (int)$web_config['vhost_proxy_protocol_https_port'];
-					$tmp_vhost_arr['proxy_protocol'] = $data['new']['proxy_protocol'];
+					$tmp_vhost_arr['use_proxy_protocol'] = $data['new']['proxy_protocol'];
 					$vhosts[]                        = $tmp_vhost_arr;
 				}
 			}

server/plugins-available/nginx_plugin.inc.php

@@ -1522,11 +1522,11 @@ function update($event_name, $data) {
 
 		//proxy protocol settings
 		if($web_config['vhost_proxy_protocol_enabled'] == "y"){
-			$vhost_data['proxy_protocol'] = $data['new']['proxy_protocol'];
+			$vhost_data['use_proxy_protocol'] = $data['new']['proxy_protocol'];
 			$vhost_data['proxy_protocol_http'] = (int)$web_config['vhost_proxy_protocol_http_port'];
 			$vhost_data['proxy_protocol_https'] = (int)$web_config['vhost_proxy_protocol_https_port'];
 		}else{
-			$vhost_data['proxy_protocol'] = "n";
+			$vhost_data['use_proxy_protocol'] = "n";
 		}
 
 		// set logging variable