1490 files changed, 64 insertions, 64 deletions

diff --git a/Makefile.am b/Makefile.am
index e3df08979e5..fbe6fd3b541 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ SUBDIRS = \
 EXTRA_DIST = \
 	bin \
 	build \
-	frontends \
+	ui \
 	include \
 	conf \
 	sass
@@ -54,8 +54,8 @@ dist-hook:
 	rm -rf `find $(top_distdir) -name ".gitignore" -o -name ".gitattributes"`
 	rm -f $(top_distdir)/include/config.h
 	rm -f $(top_distdir)/include/config.h.in~
-	rm -f $(top_distdir)/frontends/php/conf/zabbix.conf.php
-	rm -rf $(top_distdir)/frontends/php/tests
+	rm -f $(top_distdir)/ui/conf/zabbix.conf.php
+	rm -rf $(top_distdir)/ui/tests
 	rm -rf $(top_distdir)/sass/img_source
 
 if DBSCHEMA
@@ -88,34 +88,34 @@ dbschema: dbschema_mysql dbschema_oracle dbschema_postgresql dbschema_sqlite3 db
 endif
 
 gettext:
-	frontends/php/locale/make_mo.sh
+	ui/locale/make_mo.sh
 
 css_theme_blue:
-	sass --no-cache --sourcemap=none sass/stylesheets/sass/screen.scss frontends/php/assets/styles/blue-theme.css
-	cp frontends/php/assets/styles/blue-theme.css sass/stylesheets/screen.css
+	sass --no-cache --sourcemap=none sass/stylesheets/sass/screen.scss ui/assets/styles/blue-theme.css
+	cp ui/assets/styles/blue-theme.css sass/stylesheets/screen.css
 
 css_theme_dark:
-	sass --no-cache --sourcemap=none sass/stylesheets/sass/dark-theme.scss frontends/php/assets/styles/dark-theme.css
-	cp frontends/php/assets/styles/dark-theme.css sass/stylesheets/dark-theme.css
+	sass --no-cache --sourcemap=none sass/stylesheets/sass/dark-theme.scss ui/assets/styles/dark-theme.css
+	cp ui/assets/styles/dark-theme.css sass/stylesheets/dark-theme.css
 
 css_hc_light:
-	sass --no-cache --sourcemap=none sass/stylesheets/sass/hc-light.scss frontends/php/assets/styles/hc-light.css
-	cp frontends/php/assets/styles/hc-light.css sass/stylesheets/hc-light.css
+	sass --no-cache --sourcemap=none sass/stylesheets/sass/hc-light.scss ui/assets/styles/hc-light.css
+	cp ui/assets/styles/hc-light.css sass/stylesheets/hc-light.css
 
 css_hc_dark:
-	sass --no-cache --sourcemap=none sass/stylesheets/sass/hc-dark.scss frontends/php/assets/styles/hc-dark.css
-	cp frontends/php/assets/styles/hc-dark.css sass/stylesheets/hc-dark.css
+	sass --no-cache --sourcemap=none sass/stylesheets/sass/hc-dark.scss ui/assets/styles/hc-dark.css
+	cp ui/assets/styles/hc-dark.css sass/stylesheets/hc-dark.css
 
 css_icons:
-	cp sass/img/icon-sprite.svg frontends/php/assets/img/
-	cp sass/img/browser-sprite.png frontends/php/assets/img/
-	cp sass/apple-touch-icon-120x120-precomposed.png frontends/php/assets/img/
-	cp sass/apple-touch-icon-152x152-precomposed.png frontends/php/assets/img/
-	cp sass/apple-touch-icon-180x180-precomposed.png frontends/php/assets/img/
-	cp sass/apple-touch-icon-76x76-precomposed.png frontends/php/assets/img/
-	cp sass/ms-tile-144x144.png frontends/php/assets/img/
-	cp sass/touch-icon-192x192.png frontends/php/assets/img/
-	cp sass/favicon.ico frontends/php/
+	cp sass/img/icon-sprite.svg ui/assets/img/
+	cp sass/img/browser-sprite.png ui/assets/img/
+	cp sass/apple-touch-icon-120x120-precomposed.png ui/assets/img/
+	cp sass/apple-touch-icon-152x152-precomposed.png ui/assets/img/
+	cp sass/apple-touch-icon-180x180-precomposed.png ui/assets/img/
+	cp sass/apple-touch-icon-76x76-precomposed.png ui/assets/img/
+	cp sass/ms-tile-144x144.png ui/assets/img/
+	cp sass/touch-icon-192x192.png ui/assets/img/
+	cp sass/favicon.ico ui/
 
 css: css_theme_blue css_theme_dark css_hc_light css_hc_dark css_icons
 
diff --git a/build.xml b/build.xml
index 223bbfec3e0..c79718188ca 100644
--- a/build.xml
+++ b/build.xml
@@ -33,27 +33,27 @@
 		<property environment="env"/>
 
 		<!-- Create bootstrap.php -->
-		<copy overwrite="true" file="frontends/php/tests/bootstrap.php.template" tofile="frontends/php/tests/bootstrap.php"/>
-		<replace file="frontends/php/tests/bootstrap.php" token="{URL}" value="${env.WORKSPACE_URL}${url}"/>
-		<replace file="frontends/php/tests/bootstrap.php" token="{BASEDIR}" value="${basedir}"/>
-		<replace file="frontends/php/tests/bootstrap.php" token="{SCREENSHOT_DIR}" value="${env.SCREENSHOT_DIR}"/>
-		<replace file="frontends/php/tests/bootstrap.php" token="{SCREENSHOT_URL}" value="${env.SCREENSHOT_URL}"/>
-		<replace file="frontends/php/tests/bootstrap.php" token="{BINARY_DIR}" value="${basedir}/sbin/"/>
-		<replace file="frontends/php/tests/bootstrap.php" token="{CONFIG_SOURCE_DIR}" value="${basedir}/conf/"/>
-		<replace file="frontends/php/tests/bootstrap.php" token="{CONFIG_DIR}" value="${basedir}/etc/"/>
-		<replace file="frontends/php/tests/bootstrap.php" token="{COMPONENT_DIR}" value="${basedir}/runtime/"/>
-		<replace file="frontends/php/tests/bootstrap.php" token="{PORT_PREFIX}" value="${phpunit_port_prefix}"/>
-		<replace file="frontends/php/tests/bootstrap.php" token="{SCREENSHOT_REFERENCES_DIR}" value="${screenshot_references_dir}"/>
-		<replace file="frontends/php/tests/bootstrap.php" token="{PHPUNIT_DRIVER_ADDRESS}" value="${phpunit_driver_address}"/>
+		<copy overwrite="true" file="ui/tests/bootstrap.php.template" tofile="ui/tests/bootstrap.php"/>
+		<replace file="ui/tests/bootstrap.php" token="{URL}" value="${env.WORKSPACE_URL}${url}"/>
+		<replace file="ui/tests/bootstrap.php" token="{BASEDIR}" value="${basedir}"/>
+		<replace file="ui/tests/bootstrap.php" token="{SCREENSHOT_DIR}" value="${env.SCREENSHOT_DIR}"/>
+		<replace file="ui/tests/bootstrap.php" token="{SCREENSHOT_URL}" value="${env.SCREENSHOT_URL}"/>
+		<replace file="ui/tests/bootstrap.php" token="{BINARY_DIR}" value="${basedir}/sbin/"/>
+		<replace file="ui/tests/bootstrap.php" token="{CONFIG_SOURCE_DIR}" value="${basedir}/conf/"/>
+		<replace file="ui/tests/bootstrap.php" token="{CONFIG_DIR}" value="${basedir}/etc/"/>
+		<replace file="ui/tests/bootstrap.php" token="{COMPONENT_DIR}" value="${basedir}/runtime/"/>
+		<replace file="ui/tests/bootstrap.php" token="{PORT_PREFIX}" value="${phpunit_port_prefix}"/>
+		<replace file="ui/tests/bootstrap.php" token="{SCREENSHOT_REFERENCES_DIR}" value="${screenshot_references_dir}"/>
+		<replace file="ui/tests/bootstrap.php" token="{PHPUNIT_DRIVER_ADDRESS}" value="${phpunit_driver_address}"/>
 
 		<!-- Create PHP config file -->
-		<copy overwrite="true" file="frontends/php/tests/templates/zabbix.conf.php" tofile="frontends/php/conf/zabbix.conf.php"/>
-		<replace file="frontends/php/conf/zabbix.conf.php" token="{DBTYPE}" value="${dbtype}"/>
-		<replace file="frontends/php/conf/zabbix.conf.php" token="{DBHOST}" value="${dbhost}"/>
-		<replace file="frontends/php/conf/zabbix.conf.php" token="{DBNAME}" value="${dbname}"/>
-		<replace file="frontends/php/conf/zabbix.conf.php" token="{DBUSER}" value="${dbuser}"/>
-		<replace file="frontends/php/conf/zabbix.conf.php" token="{DBPASSWORD}" value="${dbpassword}"/>
-		<replace file="frontends/php/conf/zabbix.conf.php" token="{PHPUNIT_ERROR_LOG}" value="${phpunit_error_log}"/>
+		<copy overwrite="true" file="ui/tests/templates/zabbix.conf.php" tofile="ui/conf/zabbix.conf.php"/>
+		<replace file="ui/conf/zabbix.conf.php" token="{DBTYPE}" value="${dbtype}"/>
+		<replace file="ui/conf/zabbix.conf.php" token="{DBHOST}" value="${dbhost}"/>
+		<replace file="ui/conf/zabbix.conf.php" token="{DBNAME}" value="${dbname}"/>
+		<replace file="ui/conf/zabbix.conf.php" token="{DBUSER}" value="${dbuser}"/>
+		<replace file="ui/conf/zabbix.conf.php" token="{DBPASSWORD}" value="${dbpassword}"/>
+		<replace file="ui/conf/zabbix.conf.php" token="{PHPUNIT_ERROR_LOG}" value="${phpunit_error_log}"/>
 	</target>
 
 	<target name="init-integration">
@@ -175,7 +175,7 @@
 	</target>
 
 	<target name="init-frontend-postgresql" depends="create-configs,make-dbschema,init-server-postgresql">
-		<exec executable="psql" input="frontends/php/tests/selenium/data/data_test.sql" failonerror="on">
+		<exec executable="psql" input="ui/tests/selenium/data/data_test.sql" failonerror="on">
 			<env key="PGPASSWORD" value="${dbpassword}"/>
 			<arg line="-q"/>
 			<arg line="-h '${dbhost}'"/>
@@ -187,7 +187,7 @@
 	</target>
 
 	<target name="init-api-postgresql" depends="create-configs,make-dbschema,init-server-postgresql">
-		<exec executable="psql" input="frontends/php/tests/api_json/data/data_test.sql" failonerror="on">
+		<exec executable="psql" input="ui/tests/api_json/data/data_test.sql" failonerror="on">
 			<env key="PGPASSWORD" value="${dbpassword}"/>
 			<arg line="-q"/>
 			<arg line="-h '${dbhost}'"/>
@@ -199,7 +199,7 @@
 	</target>
 
 	<target name="init-integration-postgresql" depends="create-configs,init-integration,make-binaries-postgresql,init-server-postgresql,init-proxy-postgresql">
-		<exec executable="psql" input="frontends/php/tests/integration/data/data_test.sql" failonerror="on">
+		<exec executable="psql" input="ui/tests/integration/data/data_test.sql" failonerror="on">
 			<env key="PGPASSWORD" value="${dbpassword}"/>
 			<arg line="-q"/>
 			<arg line="-h '${dbhost}'"/>
@@ -291,7 +291,7 @@
 	</target>
 
 	<target name="init-frontend-mysql" depends="create-configs,make-dbschema,init-server-mysql">
-		<exec executable="mysql" input="frontends/php/tests/selenium/data/data_test.sql" failonerror="on">
+		<exec executable="mysql" input="ui/tests/selenium/data/data_test.sql" failonerror="on">
 			<arg line="--host=${dbhost}"/>
 			<arg line="--user=${dbuser}"/>
 			<arg line="--password=${dbpassword}"/>
@@ -300,7 +300,7 @@
 	</target>
 
 	<target name="init-api-mysql" depends="create-configs,make-dbschema,init-server-mysql">
-		<exec executable="mysql" input="frontends/php/tests/api_json/data/data_test.sql" failonerror="on">
+		<exec executable="mysql" input="ui/tests/api_json/data/data_test.sql" failonerror="on">
 			<arg line="--host=${dbhost}"/>
 			<arg line="--user=${dbuser}"/>
 			<arg line="--password=${dbpassword}"/>
@@ -309,7 +309,7 @@
 	</target>
 
 	<target name="init-integration-mysql" depends="create-configs,init-integration,make-binaries-mysql,init-server-mysql,init-proxy-mysql">
-		<exec executable="mysql" input="frontends/php/tests/integration/data/data_test.sql" failonerror="on">
+		<exec executable="mysql" input="ui/tests/integration/data/data_test.sql" failonerror="on">
 			<arg line="--host=${dbhost}"/>
 			<arg line="--user=${dbuser}"/>
 			<arg line="--password=${dbpassword}"/>
@@ -318,7 +318,7 @@
 	</target>
 
 	<target name="test-phpunit" depends="init-common">
-		<exec executable="phpunit" dir="frontends/php/tests/unit" failonerror="off">
+		<exec executable="phpunit" dir="ui/tests/unit" failonerror="off">
 			<arg line="--log-junit=${basedir}/build/logs/phpunit.xml"/>
 			<arg line="${phpunit_filter}"/>
 			<arg line="include/"/>
@@ -326,7 +326,7 @@
 	</target>
 
 	<target name="test-frontend">
-		<exec executable="phpunit" dir="frontends/php/tests" failonerror="off">
+		<exec executable="phpunit" dir="ui/tests" failonerror="off">
 			<arg line="--log-junit=${basedir}/build/logs/phpunit.xml"/>
 			<arg line="--bootstrap=bootstrap.php"/>
 			<arg line="${phpunit_filter}"/>
@@ -335,7 +335,7 @@
 	</target>
 
 	<target name="test-api">
-		<exec executable="phpunit" dir="frontends/php/tests" failonerror="off">
+		<exec executable="phpunit" dir="ui/tests" failonerror="off">
 			<arg line="--log-junit=${basedir}/build/logs/phpunit.xml"/>
 			<arg line="--bootstrap=bootstrap.php"/>
 			<arg line="${phpunit_filter}"/>
@@ -344,7 +344,7 @@
 	</target>
 
 	<target name="test-integration">
-		<exec executable="phpunit" dir="frontends/php/tests" failonerror="off">
+		<exec executable="phpunit" dir="ui/tests" failonerror="off">
 			<arg line="--log-junit=${basedir}/build/logs/phpunit.xml"/>
 			<arg line="--bootstrap=bootstrap.php"/>
 			<arg line="${phpunit_filter}"/>
diff --git a/frontends/php/actionconf.php b/ui/actionconf.php
index 421a6224be2..421a6224be2 100644
--- a/frontends/php/actionconf.php
+++ b/ui/actionconf.php
diff --git a/frontends/php/api_jsonrpc.php b/ui/api_jsonrpc.php
index 7ec56edcde5..7ec56edcde5 100644
--- a/frontends/php/api_jsonrpc.php
+++ b/ui/api_jsonrpc.php
diff --git a/frontends/php/app/.htaccess b/ui/app/.htaccess
index 2509de4fcf4..2509de4fcf4 100644
--- a/frontends/php/app/.htaccess
+++ b/ui/app/.htaccess
diff --git a/frontends/php/app/controllers/CControllerAuditLogList.php b/ui/app/controllers/CControllerAuditLogList.php
index 6639a21ecd0..6639a21ecd0 100644
--- a/frontends/php/app/controllers/CControllerAuditLogList.php
+++ b/ui/app/controllers/CControllerAuditLogList.php
diff --git a/frontends/php/app/controllers/CControllerAuthenticationEdit.php b/ui/app/controllers/CControllerAuthenticationEdit.php
index 298c945b85a..298c945b85a 100644
--- a/frontends/php/app/controllers/CControllerAuthenticationEdit.php
+++ b/ui/app/controllers/CControllerAuthenticationEdit.php
diff --git a/frontends/php/app/controllers/CControllerAuthenticationUpdate.php b/ui/app/controllers/CControllerAuthenticationUpdate.php
index 53cac78e739..53cac78e739 100644
--- a/frontends/php/app/controllers/CControllerAuthenticationUpdate.php
+++ b/ui/app/controllers/CControllerAuthenticationUpdate.php
diff --git a/frontends/php/app/controllers/CControllerAutoregEdit.php b/ui/app/controllers/CControllerAutoregEdit.php
index 550d062cf25..550d062cf25 100644
--- a/frontends/php/app/controllers/CControllerAutoregEdit.php
+++ b/ui/app/controllers/CControllerAutoregEdit.php
diff --git a/frontends/php/app/controllers/CControllerAutoregUpdate.php b/ui/app/controllers/CControllerAutoregUpdate.php
index d1d0f3f4c4a..d1d0f3f4c4a 100644
--- a/frontends/php/app/controllers/CControllerAutoregUpdate.php
+++ b/ui/app/controllers/CControllerAutoregUpdate.php
diff --git a/frontends/php/app/controllers/CControllerCharts.php b/ui/app/controllers/CControllerCharts.php
index f92ef9309f3..f92ef9309f3 100644
--- a/frontends/php/app/controllers/CControllerCharts.php
+++ b/ui/app/controllers/CControllerCharts.php
diff --git a/frontends/php/app/controllers/CControllerChartsView.php b/ui/app/controllers/CControllerChartsView.php
index d27c3c01af0..d27c3c01af0 100644
--- a/frontends/php/app/controllers/CControllerChartsView.php
+++ b/ui/app/controllers/CControllerChartsView.php
diff --git a/frontends/php/app/controllers/CControllerChartsViewJson.php b/ui/app/controllers/CControllerChartsViewJson.php
index edb2b0e6c97..edb2b0e6c97 100644
--- a/frontends/php/app/controllers/CControllerChartsViewJson.php
+++ b/ui/app/controllers/CControllerChartsViewJson.php
diff --git a/frontends/php/app/controllers/CControllerDashboardAbstract.php b/ui/app/controllers/CControllerDashboardAbstract.php
index 746dc1a358b..746dc1a358b 100644
--- a/frontends/php/app/controllers/CControllerDashboardAbstract.php
+++ b/ui/app/controllers/CControllerDashboardAbstract.php
diff --git a/frontends/php/app/controllers/CControllerDashboardDelete.php b/ui/app/controllers/CControllerDashboardDelete.php
index 92a17df3a8b..92a17df3a8b 100644
--- a/frontends/php/app/controllers/CControllerDashboardDelete.php
+++ b/ui/app/controllers/CControllerDashboardDelete.php
diff --git a/frontends/php/app/controllers/CControllerDashboardList.php b/ui/app/controllers/CControllerDashboardList.php
index 9528c844f8f..9528c844f8f 100644
--- a/frontends/php/app/controllers/CControllerDashboardList.php
+++ b/ui/app/controllers/CControllerDashboardList.php
diff --git a/frontends/php/app/controllers/CControllerDashboardPropertiesCheck.php b/ui/app/controllers/CControllerDashboardPropertiesCheck.php
index 3388be23d3f..3388be23d3f 100644
--- a/frontends/php/app/controllers/CControllerDashboardPropertiesCheck.php
+++ b/ui/app/controllers/CControllerDashboardPropertiesCheck.php
diff --git a/frontends/php/app/controllers/CControllerDashboardPropertiesEdit.php b/ui/app/controllers/CControllerDashboardPropertiesEdit.php
index 26b8c53ab7d..26b8c53ab7d 100644
--- a/frontends/php/app/controllers/CControllerDashboardPropertiesEdit.php
+++ b/ui/app/controllers/CControllerDashboardPropertiesEdit.php
diff --git a/frontends/php/app/controllers/CControllerDashboardShareEdit.php b/ui/app/controllers/CControllerDashboardShareEdit.php
index 17b0b2f4fef..17b0b2f4fef 100644
--- a/frontends/php/app/controllers/CControllerDashboardShareEdit.php
+++ b/ui/app/controllers/CControllerDashboardShareEdit.php
diff --git a/frontends/php/app/controllers/CControllerDashboardShareUpdate.php b/ui/app/controllers/CControllerDashboardShareUpdate.php
index b38d53810b7..b38d53810b7 100644
--- a/frontends/php/app/controllers/CControllerDashboardShareUpdate.php
+++ b/ui/app/controllers/CControllerDashboardShareUpdate.php
diff --git a/frontends/php/app/controllers/CControllerDashboardUpdate.php b/ui/app/controllers/CControllerDashboardUpdate.php
index 9e0d3a4438f..9e0d3a4438f 100644
--- a/frontends/php/app/controllers/CControllerDashboardUpdate.php
+++ b/ui/app/controllers/CControllerDashboardUpdate.php
diff --git a/frontends/php/app/controllers/CControllerDashboardView.php b/ui/app/controllers/CControllerDashboardView.php
index b62a3d69abc..b62a3d69abc 100644
--- a/frontends/php/app/controllers/CControllerDashboardView.php
+++ b/ui/app/controllers/CControllerDashboardView.php
diff --git a/frontends/php/app/controllers/CControllerDashboardWidgetCheck.php b/ui/app/controllers/CControllerDashboardWidgetCheck.php
index 923961f6678..923961f6678 100644
--- a/frontends/php/app/controllers/CControllerDashboardWidgetCheck.php
+++ b/ui/app/controllers/CControllerDashboardWidgetCheck.php
diff --git a/frontends/php/app/controllers/CControllerDashboardWidgetConfigure.php b/ui/app/controllers/CControllerDashboardWidgetConfigure.php
index 5ff7b92e1e1..5ff7b92e1e1 100644
--- a/frontends/php/app/controllers/CControllerDashboardWidgetConfigure.php
+++ b/ui/app/controllers/CControllerDashboardWidgetConfigure.php
diff --git a/frontends/php/app/controllers/CControllerDashboardWidgetEdit.php b/ui/app/controllers/CControllerDashboardWidgetEdit.php
index 52ddf496030..52ddf496030 100644
--- a/frontends/php/app/controllers/CControllerDashboardWidgetEdit.php
+++ b/ui/app/controllers/CControllerDashboardWidgetEdit.php
diff --git a/frontends/php/app/controllers/CControllerDashboardWidgetRfRate.php b/ui/app/controllers/CControllerDashboardWidgetRfRate.php
index 7a8b30100b6..7a8b30100b6 100644
--- a/frontends/php/app/controllers/CControllerDashboardWidgetRfRate.php
+++ b/ui/app/controllers/CControllerDashboardWidgetRfRate.php
diff --git a/frontends/php/app/controllers/CControllerDashboardWidgetSanitize.php b/ui/app/controllers/CControllerDashboardWidgetSanitize.php
index 08c71842f3a..08c71842f3a 100644
--- a/frontends/php/app/controllers/CControllerDashboardWidgetSanitize.php
+++ b/ui/app/controllers/CControllerDashboardWidgetSanitize.php
diff --git a/frontends/php/app/controllers/CControllerDiscoveryView.php b/ui/app/controllers/CControllerDiscoveryView.php
index 69eaa4f335f..69eaa4f335f 100644
--- a/frontends/php/app/controllers/CControllerDiscoveryView.php
+++ b/ui/app/controllers/CControllerDiscoveryView.php
diff --git a/frontends/php/app/controllers/CControllerExportXml.php b/ui/app/controllers/CControllerExportXml.php
index 6b1238b7008..6b1238b7008 100644
--- a/frontends/php/app/controllers/CControllerExportXml.php
+++ b/ui/app/controllers/CControllerExportXml.php
diff --git a/frontends/php/app/controllers/CControllerFavouriteCreate.php b/ui/app/controllers/CControllerFavouriteCreate.php
index 74009be152e..74009be152e 100644
--- a/frontends/php/app/controllers/CControllerFavouriteCreate.php
+++ b/ui/app/controllers/CControllerFavouriteCreate.php
diff --git a/frontends/php/app/controllers/CControllerFavouriteDelete.php b/ui/app/controllers/CControllerFavouriteDelete.php
index 50e8b6afae4..50e8b6afae4 100644
--- a/frontends/php/app/controllers/CControllerFavouriteDelete.php
+++ b/ui/app/controllers/CControllerFavouriteDelete.php
diff --git a/frontends/php/app/controllers/CControllerGuiEdit.php b/ui/app/controllers/CControllerGuiEdit.php
index 95b621d9930..95b621d9930 100644
--- a/frontends/php/app/controllers/CControllerGuiEdit.php
+++ b/ui/app/controllers/CControllerGuiEdit.php
diff --git a/frontends/php/app/controllers/CControllerGuiUpdate.php b/ui/app/controllers/CControllerGuiUpdate.php
index fe50c9dc4d7..fe50c9dc4d7 100644
--- a/frontends/php/app/controllers/CControllerGuiUpdate.php
+++ b/ui/app/controllers/CControllerGuiUpdate.php
diff --git a/frontends/php/app/controllers/CControllerHost.php b/ui/app/controllers/CControllerHost.php
index 8d0de19416b..8d0de19416b 100644
--- a/frontends/php/app/controllers/CControllerHost.php
+++ b/ui/app/controllers/CControllerHost.php
diff --git a/frontends/php/app/controllers/CControllerHostMacrosList.php b/ui/app/controllers/CControllerHostMacrosList.php
index 93b84f238ef..93b84f238ef 100644
--- a/frontends/php/app/controllers/CControllerHostMacrosList.php
+++ b/ui/app/controllers/CControllerHostMacrosList.php
diff --git a/frontends/php/app/controllers/CControllerHostView.php b/ui/app/controllers/CControllerHostView.php
index 800e31c9e9e..800e31c9e9e 100644
--- a/frontends/php/app/controllers/CControllerHostView.php
+++ b/ui/app/controllers/CControllerHostView.php
diff --git a/frontends/php/app/controllers/CControllerHostViewRefresh.php b/ui/app/controllers/CControllerHostViewRefresh.php
index ae7cfdae677..ae7cfdae677 100644
--- a/frontends/php/app/controllers/CControllerHostViewRefresh.php
+++ b/ui/app/controllers/CControllerHostViewRefresh.php
diff --git a/frontends/php/app/controllers/CControllerHousekeepingEdit.php b/ui/app/controllers/CControllerHousekeepingEdit.php
index 0ee9fb8c025..0ee9fb8c025 100644
--- a/frontends/php/app/controllers/CControllerHousekeepingEdit.php
+++ b/ui/app/controllers/CControllerHousekeepingEdit.php
diff --git a/frontends/php/app/controllers/CControllerHousekeepingUpdate.php b/ui/app/controllers/CControllerHousekeepingUpdate.php
index ea2a3fdb458..ea2a3fdb458 100644
--- a/frontends/php/app/controllers/CControllerHousekeepingUpdate.php
+++ b/ui/app/controllers/CControllerHousekeepingUpdate.php
diff --git a/frontends/php/app/controllers/CControllerIconMapCreate.php b/ui/app/controllers/CControllerIconMapCreate.php
index 90770ac4808..90770ac4808 100644
--- a/frontends/php/app/controllers/CControllerIconMapCreate.php
+++ b/ui/app/controllers/CControllerIconMapCreate.php
diff --git a/frontends/php/app/controllers/CControllerIconMapDelete.php b/ui/app/controllers/CControllerIconMapDelete.php
index 4c9374b27d3..4c9374b27d3 100644
--- a/frontends/php/app/controllers/CControllerIconMapDelete.php
+++ b/ui/app/controllers/CControllerIconMapDelete.php
diff --git a/frontends/php/app/controllers/CControllerIconMapEdit.php b/ui/app/controllers/CControllerIconMapEdit.php
index e12470079a0..e12470079a0 100644
--- a/frontends/php/app/controllers/CControllerIconMapEdit.php
+++ b/ui/app/controllers/CControllerIconMapEdit.php
diff --git a/frontends/php/app/controllers/CControllerIconMapList.php b/ui/app/controllers/CControllerIconMapList.php
index 2defbf3f23c..2defbf3f23c 100644
--- a/frontends/php/app/controllers/CControllerIconMapList.php
+++ b/ui/app/controllers/CControllerIconMapList.php
diff --git a/frontends/php/app/controllers/CControllerIconMapUpdate.php b/ui/app/controllers/CControllerIconMapUpdate.php
index 5874bf5f44c..5874bf5f44c 100644
--- a/frontends/php/app/controllers/CControllerIconMapUpdate.php
+++ b/ui/app/controllers/CControllerIconMapUpdate.php
diff --git a/frontends/php/app/controllers/CControllerImageCreate.php b/ui/app/controllers/CControllerImageCreate.php
index 9e64ae14338..9e64ae14338 100644
--- a/frontends/php/app/controllers/CControllerImageCreate.php
+++ b/ui/app/controllers/CControllerImageCreate.php
diff --git a/frontends/php/app/controllers/CControllerImageDelete.php b/ui/app/controllers/CControllerImageDelete.php
index 9f7a76b7816..9f7a76b7816 100644
--- a/frontends/php/app/controllers/CControllerImageDelete.php
+++ b/ui/app/controllers/CControllerImageDelete.php
diff --git a/frontends/php/app/controllers/CControllerImageEdit.php b/ui/app/controllers/CControllerImageEdit.php
index a3bc9810241..a3bc9810241 100644
--- a/frontends/php/app/controllers/CControllerImageEdit.php
+++ b/ui/app/controllers/CControllerImageEdit.php
diff --git a/frontends/php/app/controllers/CControllerImageList.php b/ui/app/controllers/CControllerImageList.php
index 65fb87d0482..65fb87d0482 100644
--- a/frontends/php/app/controllers/CControllerImageList.php
+++ b/ui/app/controllers/CControllerImageList.php
diff --git a/frontends/php/app/controllers/CControllerImageUpdate.php b/ui/app/controllers/CControllerImageUpdate.php
index fe6894c7992..fe6894c7992 100644
--- a/frontends/php/app/controllers/CControllerImageUpdate.php
+++ b/ui/app/controllers/CControllerImageUpdate.php
diff --git a/frontends/php/app/controllers/CControllerLatest.php b/ui/app/controllers/CControllerLatest.php
index c97133957b1..c97133957b1 100644
--- a/frontends/php/app/controllers/CControllerLatest.php
+++ b/ui/app/controllers/CControllerLatest.php
diff --git a/frontends/php/app/controllers/CControllerLatestView.php b/ui/app/controllers/CControllerLatestView.php
index b721a0afe2a..b721a0afe2a 100644
--- a/frontends/php/app/controllers/CControllerLatestView.php
+++ b/ui/app/controllers/CControllerLatestView.php
diff --git a/frontends/php/app/controllers/CControllerLatestViewRefresh.php b/ui/app/controllers/CControllerLatestViewRefresh.php
index 4f89e14cb2a..4f89e14cb2a 100644
--- a/frontends/php/app/controllers/CControllerLatestViewRefresh.php
+++ b/ui/app/controllers/CControllerLatestViewRefresh.php
diff --git a/frontends/php/app/controllers/CControllerMacrosEdit.php b/ui/app/controllers/CControllerMacrosEdit.php
index 24df4e49067..24df4e49067 100644
--- a/frontends/php/app/controllers/CControllerMacrosEdit.php
+++ b/ui/app/controllers/CControllerMacrosEdit.php
diff --git a/frontends/php/app/controllers/CControllerMacrosUpdate.php b/ui/app/controllers/CControllerMacrosUpdate.php
index 5b983a87ae4..5b983a87ae4 100644
--- a/frontends/php/app/controllers/CControllerMacrosUpdate.php
+++ b/ui/app/controllers/CControllerMacrosUpdate.php
diff --git a/frontends/php/app/controllers/CControllerMapView.php b/ui/app/controllers/CControllerMapView.php
index d012471d7ab..d012471d7ab 100644
--- a/frontends/php/app/controllers/CControllerMapView.php
+++ b/ui/app/controllers/CControllerMapView.php
diff --git a/frontends/php/app/controllers/CControllerMediatypeCreate.php b/ui/app/controllers/CControllerMediatypeCreate.php
index db8463fad61..db8463fad61 100644
--- a/frontends/php/app/controllers/CControllerMediatypeCreate.php
+++ b/ui/app/controllers/CControllerMediatypeCreate.php
diff --git a/frontends/php/app/controllers/CControllerMediatypeDelete.php b/ui/app/controllers/CControllerMediatypeDelete.php
index 2b820fa2c01..2b820fa2c01 100644
--- a/frontends/php/app/controllers/CControllerMediatypeDelete.php
+++ b/ui/app/controllers/CControllerMediatypeDelete.php
diff --git a/frontends/php/app/controllers/CControllerMediatypeDisable.php b/ui/app/controllers/CControllerMediatypeDisable.php
index abb800e0193..abb800e0193 100644
--- a/frontends/php/app/controllers/CControllerMediatypeDisable.php
+++ b/ui/app/controllers/CControllerMediatypeDisable.php
diff --git a/frontends/php/app/controllers/CControllerMediatypeEdit.php b/ui/app/controllers/CControllerMediatypeEdit.php
index d0b71c46fb6..d0b71c46fb6 100644
--- a/frontends/php/app/controllers/CControllerMediatypeEdit.php
+++ b/ui/app/controllers/CControllerMediatypeEdit.php
diff --git a/frontends/php/app/controllers/CControllerMediatypeEnable.php b/ui/app/controllers/CControllerMediatypeEnable.php
index a18fbaa58b2..a18fbaa58b2 100644
--- a/frontends/php/app/controllers/CControllerMediatypeEnable.php
+++ b/ui/app/controllers/CControllerMediatypeEnable.php
diff --git a/frontends/php/app/controllers/CControllerMediatypeList.php b/ui/app/controllers/CControllerMediatypeList.php
index c50bf76fca6..c50bf76fca6 100644
--- a/frontends/php/app/controllers/CControllerMediatypeList.php
+++ b/ui/app/controllers/CControllerMediatypeList.php
diff --git a/frontends/php/app/controllers/CControllerMediatypeUpdate.php b/ui/app/controllers/CControllerMediatypeUpdate.php
index 224200850ba..224200850ba 100644
--- a/frontends/php/app/controllers/CControllerMediatypeUpdate.php
+++ b/ui/app/controllers/CControllerMediatypeUpdate.php
diff --git a/frontends/php/app/controllers/CControllerMenuPopup.php b/ui/app/controllers/CControllerMenuPopup.php
index 6efc7544e36..6efc7544e36 100644
--- a/frontends/php/app/controllers/CControllerMenuPopup.php
+++ b/ui/app/controllers/CControllerMenuPopup.php
diff --git a/frontends/php/app/controllers/CControllerMiscConfigEdit.php b/ui/app/controllers/CControllerMiscConfigEdit.php
index f402563da9f..f402563da9f 100644
--- a/frontends/php/app/controllers/CControllerMiscConfigEdit.php
+++ b/ui/app/controllers/CControllerMiscConfigEdit.php
diff --git a/frontends/php/app/controllers/CControllerMiscConfigUpdate.php b/ui/app/controllers/CControllerMiscConfigUpdate.php
index a1534a8e527..a1534a8e527 100644
--- a/frontends/php/app/controllers/CControllerMiscConfigUpdate.php
+++ b/ui/app/controllers/CControllerMiscConfigUpdate.php
diff --git a/frontends/php/app/controllers/CControllerModuleEdit.php b/ui/app/controllers/CControllerModuleEdit.php
index 9a4e21e5eaf..9a4e21e5eaf 100644
--- a/frontends/php/app/controllers/CControllerModuleEdit.php
+++ b/ui/app/controllers/CControllerModuleEdit.php
diff --git a/frontends/php/app/controllers/CControllerModuleList.php b/ui/app/controllers/CControllerModuleList.php
index acef10c8b96..acef10c8b96 100644
--- a/frontends/php/app/controllers/CControllerModuleList.php
+++ b/ui/app/controllers/CControllerModuleList.php
diff --git a/frontends/php/app/controllers/CControllerModuleScan.php b/ui/app/controllers/CControllerModuleScan.php
index 5bc559512e3..5bc559512e3 100644
--- a/frontends/php/app/controllers/CControllerModuleScan.php
+++ b/ui/app/controllers/CControllerModuleScan.php
diff --git a/frontends/php/app/controllers/CControllerModuleUpdate.php b/ui/app/controllers/CControllerModuleUpdate.php
index e25e8ca2a28..e25e8ca2a28 100644
--- a/frontends/php/app/controllers/CControllerModuleUpdate.php
+++ b/ui/app/controllers/CControllerModuleUpdate.php
diff --git a/frontends/php/app/controllers/CControllerNotificationsGet.php b/ui/app/controllers/CControllerNotificationsGet.php
index 604ee3aa10c..604ee3aa10c 100644
--- a/frontends/php/app/controllers/CControllerNotificationsGet.php
+++ b/ui/app/controllers/CControllerNotificationsGet.php
diff --git a/frontends/php/app/controllers/CControllerNotificationsMute.php b/ui/app/controllers/CControllerNotificationsMute.php
index 7e645de2e94..7e645de2e94 100644
--- a/frontends/php/app/controllers/CControllerNotificationsMute.php
+++ b/ui/app/controllers/CControllerNotificationsMute.php
diff --git a/frontends/php/app/controllers/CControllerNotificationsRead.php b/ui/app/controllers/CControllerNotificationsRead.php
index b464be33308..b464be33308 100644
--- a/frontends/php/app/controllers/CControllerNotificationsRead.php
+++ b/ui/app/controllers/CControllerNotificationsRead.php
diff --git a/frontends/php/app/controllers/CControllerPopup.php b/ui/app/controllers/CControllerPopup.php
index 4191c81a0a0..4191c81a0a0 100644
--- a/frontends/php/app/controllers/CControllerPopup.php
+++ b/ui/app/controllers/CControllerPopup.php
diff --git a/frontends/php/app/controllers/CControllerPopupAcknowledgeCreate.php b/ui/app/controllers/CControllerPopupAcknowledgeCreate.php
index 1ec43006fb8..1ec43006fb8 100644
--- a/frontends/php/app/controllers/CControllerPopupAcknowledgeCreate.php
+++ b/ui/app/controllers/CControllerPopupAcknowledgeCreate.php
diff --git a/frontends/php/app/controllers/CControllerPopupAcknowledgeEdit.php b/ui/app/controllers/CControllerPopupAcknowledgeEdit.php
index de14eaf8bd1..de14eaf8bd1 100644
--- a/frontends/php/app/controllers/CControllerPopupAcknowledgeEdit.php
+++ b/ui/app/controllers/CControllerPopupAcknowledgeEdit.php
diff --git a/frontends/php/app/controllers/CControllerPopupActionAcknowledge.php b/ui/app/controllers/CControllerPopupActionAcknowledge.php
index e30be35acbc..e30be35acbc 100644
--- a/frontends/php/app/controllers/CControllerPopupActionAcknowledge.php
+++ b/ui/app/controllers/CControllerPopupActionAcknowledge.php
diff --git a/frontends/php/app/controllers/CControllerPopupActionOperation.php b/ui/app/controllers/CControllerPopupActionOperation.php
index 8b46effbfd7..8b46effbfd7 100644
--- a/frontends/php/app/controllers/CControllerPopupActionOperation.php
+++ b/ui/app/controllers/CControllerPopupActionOperation.php
diff --git a/frontends/php/app/controllers/CControllerPopupActionRecovery.php b/ui/app/controllers/CControllerPopupActionRecovery.php
index 5418adb807f..5418adb807f 100644
--- a/frontends/php/app/controllers/CControllerPopupActionRecovery.php
+++ b/ui/app/controllers/CControllerPopupActionRecovery.php
diff --git a/frontends/php/app/controllers/CControllerPopupConditionActions.php b/ui/app/controllers/CControllerPopupConditionActions.php
index 9df4093dacf..9df4093dacf 100644
--- a/frontends/php/app/controllers/CControllerPopupConditionActions.php
+++ b/ui/app/controllers/CControllerPopupConditionActions.php
diff --git a/frontends/php/app/controllers/CControllerPopupConditionCommon.php b/ui/app/controllers/CControllerPopupConditionCommon.php
index 136fc42e2c0..136fc42e2c0 100644
--- a/frontends/php/app/controllers/CControllerPopupConditionCommon.php
+++ b/ui/app/controllers/CControllerPopupConditionCommon.php
diff --git a/frontends/php/app/controllers/CControllerPopupConditionEventCorr.php b/ui/app/controllers/CControllerPopupConditionEventCorr.php
index 59ba4308f8b..59ba4308f8b 100644
--- a/frontends/php/app/controllers/CControllerPopupConditionEventCorr.php
+++ b/ui/app/controllers/CControllerPopupConditionEventCorr.php
diff --git a/frontends/php/app/controllers/CControllerPopupConditionOperations.php b/ui/app/controllers/CControllerPopupConditionOperations.php
index fc83e90fc24..fc83e90fc24 100644
--- a/frontends/php/app/controllers/CControllerPopupConditionOperations.php
+++ b/ui/app/controllers/CControllerPopupConditionOperations.php
diff --git a/frontends/php/app/controllers/CControllerPopupDiscoveryCheck.php b/ui/app/controllers/CControllerPopupDiscoveryCheck.php
index b15c588822e..b15c588822e 100644
--- a/frontends/php/app/controllers/CControllerPopupDiscoveryCheck.php
+++ b/ui/app/controllers/CControllerPopupDiscoveryCheck.php
diff --git a/frontends/php/app/controllers/CControllerPopupGeneric.php b/ui/app/controllers/CControllerPopupGeneric.php
index 8d245979e60..8d245979e60 100644
--- a/frontends/php/app/controllers/CControllerPopupGeneric.php
+++ b/ui/app/controllers/CControllerPopupGeneric.php
diff --git a/frontends/php/app/controllers/CControllerPopupHttpStep.php b/ui/app/controllers/CControllerPopupHttpStep.php
index 8d48b9f88df..8d48b9f88df 100644
--- a/frontends/php/app/controllers/CControllerPopupHttpStep.php
+++ b/ui/app/controllers/CControllerPopupHttpStep.php
diff --git a/frontends/php/app/controllers/CControllerPopupItemTest.php b/ui/app/controllers/CControllerPopupItemTest.php
index 853a8c84532..853a8c84532 100644
--- a/frontends/php/app/controllers/CControllerPopupItemTest.php
+++ b/ui/app/controllers/CControllerPopupItemTest.php
diff --git a/frontends/php/app/controllers/CControllerPopupItemTestEdit.php b/ui/app/controllers/CControllerPopupItemTestEdit.php
index d390cc6aad0..d390cc6aad0 100644
--- a/frontends/php/app/controllers/CControllerPopupItemTestEdit.php
+++ b/ui/app/controllers/CControllerPopupItemTestEdit.php
diff --git a/frontends/php/app/controllers/CControllerPopupItemTestGetValue.php b/ui/app/controllers/CControllerPopupItemTestGetValue.php
index fe29213927c..fe29213927c 100644
--- a/frontends/php/app/controllers/CControllerPopupItemTestGetValue.php
+++ b/ui/app/controllers/CControllerPopupItemTestGetValue.php
diff --git a/frontends/php/app/controllers/CControllerPopupItemTestSend.php b/ui/app/controllers/CControllerPopupItemTestSend.php
index 59ac0de256e..59ac0de256e 100644
--- a/frontends/php/app/controllers/CControllerPopupItemTestSend.php
+++ b/ui/app/controllers/CControllerPopupItemTestSend.php
diff --git a/frontends/php/app/controllers/CControllerPopupMaintenancePeriod.php b/ui/app/controllers/CControllerPopupMaintenancePeriod.php
index bf8fd9969ec..bf8fd9969ec 100644
--- a/frontends/php/app/controllers/CControllerPopupMaintenancePeriod.php
+++ b/ui/app/controllers/CControllerPopupMaintenancePeriod.php
diff --git a/frontends/php/app/controllers/CControllerPopupMedia.php b/ui/app/controllers/CControllerPopupMedia.php
index 667de4e07dd..667de4e07dd 100644
--- a/frontends/php/app/controllers/CControllerPopupMedia.php
+++ b/ui/app/controllers/CControllerPopupMedia.php
diff --git a/frontends/php/app/controllers/CControllerPopupMediatypeMessage.php b/ui/app/controllers/CControllerPopupMediatypeMessage.php
index 10c79ced428..10c79ced428 100644
--- a/frontends/php/app/controllers/CControllerPopupMediatypeMessage.php
+++ b/ui/app/controllers/CControllerPopupMediatypeMessage.php
diff --git a/frontends/php/app/controllers/CControllerPopupMediatypeTestEdit.php b/ui/app/controllers/CControllerPopupMediatypeTestEdit.php
index 9ab726edf2e..9ab726edf2e 100644
--- a/frontends/php/app/controllers/CControllerPopupMediatypeTestEdit.php
+++ b/ui/app/controllers/CControllerPopupMediatypeTestEdit.php
diff --git a/frontends/php/app/controllers/CControllerPopupMediatypeTestSend.php b/ui/app/controllers/CControllerPopupMediatypeTestSend.php
index 5db8887a103..5db8887a103 100644
--- a/frontends/php/app/controllers/CControllerPopupMediatypeTestSend.php
+++ b/ui/app/controllers/CControllerPopupMediatypeTestSend.php
diff --git a/frontends/php/app/controllers/CControllerPopupOperationCommon.php b/ui/app/controllers/CControllerPopupOperationCommon.php
index 392edb4c749..392edb4c749 100644
--- a/frontends/php/app/controllers/CControllerPopupOperationCommon.php
+++ b/ui/app/controllers/CControllerPopupOperationCommon.php
diff --git a/frontends/php/app/controllers/CControllerPopupScriptExec.php b/ui/app/controllers/CControllerPopupScriptExec.php
index 3f19af3687f..3f19af3687f 100644
--- a/frontends/php/app/controllers/CControllerPopupScriptExec.php
+++ b/ui/app/controllers/CControllerPopupScriptExec.php
diff --git a/frontends/php/app/controllers/CControllerPopupServices.php b/ui/app/controllers/CControllerPopupServices.php
index 6fb4c8ec0c0..6fb4c8ec0c0 100644
--- a/frontends/php/app/controllers/CControllerPopupServices.php
+++ b/ui/app/controllers/CControllerPopupServices.php
diff --git a/frontends/php/app/controllers/CControllerPopupTestTriggerExpr.php b/ui/app/controllers/CControllerPopupTestTriggerExpr.php
index 1608e034b9e..1608e034b9e 100644
--- a/frontends/php/app/controllers/CControllerPopupTestTriggerExpr.php
+++ b/ui/app/controllers/CControllerPopupTestTriggerExpr.php
diff --git a/frontends/php/app/controllers/CControllerPopupTriggerExpr.php b/ui/app/controllers/CControllerPopupTriggerExpr.php
index 65de11fcc28..65de11fcc28 100644
--- a/frontends/php/app/controllers/CControllerPopupTriggerExpr.php
+++ b/ui/app/controllers/CControllerPopupTriggerExpr.php
diff --git a/frontends/php/app/controllers/CControllerPopupTriggerWizard.php b/ui/app/controllers/CControllerPopupTriggerWizard.php
index b9634a1a110..b9634a1a110 100644
--- a/frontends/php/app/controllers/CControllerPopupTriggerWizard.php
+++ b/ui/app/controllers/CControllerPopupTriggerWizard.php
diff --git a/frontends/php/app/controllers/CControllerProblemView.php b/ui/app/controllers/CControllerProblemView.php
index 3036ea8dbd5..3036ea8dbd5 100644
--- a/frontends/php/app/controllers/CControllerProblemView.php
+++ b/ui/app/controllers/CControllerProblemView.php
diff --git a/frontends/php/app/controllers/CControllerProfileUpdate.php b/ui/app/controllers/CControllerProfileUpdate.php
index 828d9579a70..828d9579a70 100644
--- a/frontends/php/app/controllers/CControllerProfileUpdate.php
+++ b/ui/app/controllers/CControllerProfileUpdate.php
diff --git a/frontends/php/app/controllers/CControllerProxyCreate.php b/ui/app/controllers/CControllerProxyCreate.php
index 295f0b3f58a..295f0b3f58a 100644
--- a/frontends/php/app/controllers/CControllerProxyCreate.php
+++ b/ui/app/controllers/CControllerProxyCreate.php
diff --git a/frontends/php/app/controllers/CControllerProxyDelete.php b/ui/app/controllers/CControllerProxyDelete.php
index 1f5a8bc6dce..1f5a8bc6dce 100644
--- a/frontends/php/app/controllers/CControllerProxyDelete.php
+++ b/ui/app/controllers/CControllerProxyDelete.php
diff --git a/frontends/php/app/controllers/CControllerProxyEdit.php b/ui/app/controllers/CControllerProxyEdit.php
index 0997cb48d74..0997cb48d74 100644
--- a/frontends/php/app/controllers/CControllerProxyEdit.php
+++ b/ui/app/controllers/CControllerProxyEdit.php
diff --git a/frontends/php/app/controllers/CControllerProxyHostDisable.php b/ui/app/controllers/CControllerProxyHostDisable.php
index c526b77a2f6..c526b77a2f6 100644
--- a/frontends/php/app/controllers/CControllerProxyHostDisable.php
+++ b/ui/app/controllers/CControllerProxyHostDisable.php
diff --git a/frontends/php/app/controllers/CControllerProxyHostEnable.php b/ui/app/controllers/CControllerProxyHostEnable.php
index e74826b48fa..e74826b48fa 100644
--- a/frontends/php/app/controllers/CControllerProxyHostEnable.php
+++ b/ui/app/controllers/CControllerProxyHostEnable.php
diff --git a/frontends/php/app/controllers/CControllerProxyList.php b/ui/app/controllers/CControllerProxyList.php
index 17d4a64ecfe..17d4a64ecfe 100644
--- a/frontends/php/app/controllers/CControllerProxyList.php
+++ b/ui/app/controllers/CControllerProxyList.php
diff --git a/frontends/php/app/controllers/CControllerProxyUpdate.php b/ui/app/controllers/CControllerProxyUpdate.php
index 1cf39daabe3..1cf39daabe3 100644
--- a/frontends/php/app/controllers/CControllerProxyUpdate.php
+++ b/ui/app/controllers/CControllerProxyUpdate.php
diff --git a/frontends/php/app/controllers/CControllerRegExCreate.php b/ui/app/controllers/CControllerRegExCreate.php
index 14a8455a69c..14a8455a69c 100644
--- a/frontends/php/app/controllers/CControllerRegExCreate.php
+++ b/ui/app/controllers/CControllerRegExCreate.php
diff --git a/frontends/php/app/controllers/CControllerRegExDelete.php b/ui/app/controllers/CControllerRegExDelete.php
index acdb7f75e02..acdb7f75e02 100644
--- a/frontends/php/app/controllers/CControllerRegExDelete.php
+++ b/ui/app/controllers/CControllerRegExDelete.php
diff --git a/frontends/php/app/controllers/CControllerRegExEdit.php b/ui/app/controllers/CControllerRegExEdit.php
index 5c197f3fdd7..5c197f3fdd7 100644
--- a/frontends/php/app/controllers/CControllerRegExEdit.php
+++ b/ui/app/controllers/CControllerRegExEdit.php
diff --git a/frontends/php/app/controllers/CControllerRegExList.php b/ui/app/controllers/CControllerRegExList.php
index e1a2df722c8..e1a2df722c8 100644
--- a/frontends/php/app/controllers/CControllerRegExList.php
+++ b/ui/app/controllers/CControllerRegExList.php
diff --git a/frontends/php/app/controllers/CControllerRegExTest.php b/ui/app/controllers/CControllerRegExTest.php
index 137c7371c95..137c7371c95 100644
--- a/frontends/php/app/controllers/CControllerRegExTest.php
+++ b/ui/app/controllers/CControllerRegExTest.php
diff --git a/frontends/php/app/controllers/CControllerRegExUpdate.php b/ui/app/controllers/CControllerRegExUpdate.php
index 986ed6d8889..986ed6d8889 100644
--- a/frontends/php/app/controllers/CControllerRegExUpdate.php
+++ b/ui/app/controllers/CControllerRegExUpdate.php
diff --git a/frontends/php/app/controllers/CControllerReportServices.php b/ui/app/controllers/CControllerReportServices.php
index 4388855f8c6..4388855f8c6 100644
--- a/frontends/php/app/controllers/CControllerReportServices.php
+++ b/ui/app/controllers/CControllerReportServices.php
diff --git a/frontends/php/app/controllers/CControllerReportStatus.php b/ui/app/controllers/CControllerReportStatus.php
index 92e9f0af6f9..92e9f0af6f9 100644
--- a/frontends/php/app/controllers/CControllerReportStatus.php
+++ b/ui/app/controllers/CControllerReportStatus.php
diff --git a/frontends/php/app/controllers/CControllerScriptCreate.php b/ui/app/controllers/CControllerScriptCreate.php
index e9310cbfd5a..e9310cbfd5a 100644
--- a/frontends/php/app/controllers/CControllerScriptCreate.php
+++ b/ui/app/controllers/CControllerScriptCreate.php
diff --git a/frontends/php/app/controllers/CControllerScriptDelete.php b/ui/app/controllers/CControllerScriptDelete.php
index 50e4644da94..50e4644da94 100644
--- a/frontends/php/app/controllers/CControllerScriptDelete.php
+++ b/ui/app/controllers/CControllerScriptDelete.php
diff --git a/frontends/php/app/controllers/CControllerScriptEdit.php b/ui/app/controllers/CControllerScriptEdit.php
index 5f3ceebfd0a..5f3ceebfd0a 100644
--- a/frontends/php/app/controllers/CControllerScriptEdit.php
+++ b/ui/app/controllers/CControllerScriptEdit.php
diff --git a/frontends/php/app/controllers/CControllerScriptList.php b/ui/app/controllers/CControllerScriptList.php
index 94cecdb77da..94cecdb77da 100644
--- a/frontends/php/app/controllers/CControllerScriptList.php
+++ b/ui/app/controllers/CControllerScriptList.php
diff --git a/frontends/php/app/controllers/CControllerScriptUpdate.php b/ui/app/controllers/CControllerScriptUpdate.php
index b8de8157432..b8de8157432 100644
--- a/frontends/php/app/controllers/CControllerScriptUpdate.php
+++ b/ui/app/controllers/CControllerScriptUpdate.php
diff --git a/frontends/php/app/controllers/CControllerSearch.php b/ui/app/controllers/CControllerSearch.php
index 70284180203..70284180203 100644
--- a/frontends/php/app/controllers/CControllerSearch.php
+++ b/ui/app/controllers/CControllerSearch.php
diff --git a/frontends/php/app/controllers/CControllerSystemWarning.php b/ui/app/controllers/CControllerSystemWarning.php
index e7f284c3003..e7f284c3003 100644
--- a/frontends/php/app/controllers/CControllerSystemWarning.php
+++ b/ui/app/controllers/CControllerSystemWarning.php
diff --git a/frontends/php/app/controllers/CControllerTimeSelectorUpdate.php b/ui/app/controllers/CControllerTimeSelectorUpdate.php
index 6982010dbb1..6982010dbb1 100644
--- a/frontends/php/app/controllers/CControllerTimeSelectorUpdate.php
+++ b/ui/app/controllers/CControllerTimeSelectorUpdate.php
diff --git a/frontends/php/app/controllers/CControllerTrigDisplayEdit.php b/ui/app/controllers/CControllerTrigDisplayEdit.php
index 18a7d6fe598..18a7d6fe598 100644
--- a/frontends/php/app/controllers/CControllerTrigDisplayEdit.php
+++ b/ui/app/controllers/CControllerTrigDisplayEdit.php
diff --git a/frontends/php/app/controllers/CControllerTrigDisplayUpdate.php b/ui/app/controllers/CControllerTrigDisplayUpdate.php
index abc5ce5a675..abc5ce5a675 100644
--- a/frontends/php/app/controllers/CControllerTrigDisplayUpdate.php
+++ b/ui/app/controllers/CControllerTrigDisplayUpdate.php
diff --git a/frontends/php/app/controllers/CControllerTrigSeverityEdit.php b/ui/app/controllers/CControllerTrigSeverityEdit.php
index 0281cbc2f3f..0281cbc2f3f 100644
--- a/frontends/php/app/controllers/CControllerTrigSeverityEdit.php
+++ b/ui/app/controllers/CControllerTrigSeverityEdit.php
diff --git a/frontends/php/app/controllers/CControllerTrigSeverityUpdate.php b/ui/app/controllers/CControllerTrigSeverityUpdate.php
index bf7cb2ba6b5..bf7cb2ba6b5 100644
--- a/frontends/php/app/controllers/CControllerTrigSeverityUpdate.php
+++ b/ui/app/controllers/CControllerTrigSeverityUpdate.php
diff --git a/frontends/php/app/controllers/CControllerUserCreate.php b/ui/app/controllers/CControllerUserCreate.php
index 832d659062f..832d659062f 100644
--- a/frontends/php/app/controllers/CControllerUserCreate.php
+++ b/ui/app/controllers/CControllerUserCreate.php
diff --git a/frontends/php/app/controllers/CControllerUserDelete.php b/ui/app/controllers/CControllerUserDelete.php
index a746d689a10..a746d689a10 100644
--- a/frontends/php/app/controllers/CControllerUserDelete.php
+++ b/ui/app/controllers/CControllerUserDelete.php
diff --git a/frontends/php/app/controllers/CControllerUserEdit.php b/ui/app/controllers/CControllerUserEdit.php
index ddb93ff02d9..ddb93ff02d9 100644
--- a/frontends/php/app/controllers/CControllerUserEdit.php
+++ b/ui/app/controllers/CControllerUserEdit.php
diff --git a/frontends/php/app/controllers/CControllerUserEditGeneral.php b/ui/app/controllers/CControllerUserEditGeneral.php
index 005bd234cac..005bd234cac 100644
--- a/frontends/php/app/controllers/CControllerUserEditGeneral.php
+++ b/ui/app/controllers/CControllerUserEditGeneral.php
diff --git a/frontends/php/app/controllers/CControllerUserList.php b/ui/app/controllers/CControllerUserList.php
index 7d797952aad..7d797952aad 100644
--- a/frontends/php/app/controllers/CControllerUserList.php
+++ b/ui/app/controllers/CControllerUserList.php
diff --git a/frontends/php/app/controllers/CControllerUserProfileEdit.php b/ui/app/controllers/CControllerUserProfileEdit.php
index 8b58301abaa..8b58301abaa 100644
--- a/frontends/php/app/controllers/CControllerUserProfileEdit.php
+++ b/ui/app/controllers/CControllerUserProfileEdit.php
diff --git a/frontends/php/app/controllers/CControllerUserProfileUpdate.php b/ui/app/controllers/CControllerUserProfileUpdate.php
index cb5c5080a7d..cb5c5080a7d 100644
--- a/frontends/php/app/controllers/CControllerUserProfileUpdate.php
+++ b/ui/app/controllers/CControllerUserProfileUpdate.php
diff --git a/frontends/php/app/controllers/CControllerUserUnblock.php b/ui/app/controllers/CControllerUserUnblock.php
index 2f89e053532..2f89e053532 100644
--- a/frontends/php/app/controllers/CControllerUserUnblock.php
+++ b/ui/app/controllers/CControllerUserUnblock.php
diff --git a/frontends/php/app/controllers/CControllerUserUpdate.php b/ui/app/controllers/CControllerUserUpdate.php
index 37163c28943..37163c28943 100644
--- a/frontends/php/app/controllers/CControllerUserUpdate.php
+++ b/ui/app/controllers/CControllerUserUpdate.php
diff --git a/frontends/php/app/controllers/CControllerUserUpdateGeneral.php b/ui/app/controllers/CControllerUserUpdateGeneral.php
index 7a60f359071..7a60f359071 100644
--- a/frontends/php/app/controllers/CControllerUserUpdateGeneral.php
+++ b/ui/app/controllers/CControllerUserUpdateGeneral.php
diff --git a/frontends/php/app/controllers/CControllerUsergroupCreate.php b/ui/app/controllers/CControllerUsergroupCreate.php
index c32f3091508..c32f3091508 100644
--- a/frontends/php/app/controllers/CControllerUsergroupCreate.php
+++ b/ui/app/controllers/CControllerUsergroupCreate.php
diff --git a/frontends/php/app/controllers/CControllerUsergroupDelete.php b/ui/app/controllers/CControllerUsergroupDelete.php
index 1a8d029bfe9..1a8d029bfe9 100644
--- a/frontends/php/app/controllers/CControllerUsergroupDelete.php
+++ b/ui/app/controllers/CControllerUsergroupDelete.php
diff --git a/frontends/php/app/controllers/CControllerUsergroupEdit.php b/ui/app/controllers/CControllerUsergroupEdit.php
index 35cc9599b30..35cc9599b30 100644
--- a/frontends/php/app/controllers/CControllerUsergroupEdit.php
+++ b/ui/app/controllers/CControllerUsergroupEdit.php
diff --git a/frontends/php/app/controllers/CControllerUsergroupGrouprightAdd.php b/ui/app/controllers/CControllerUsergroupGrouprightAdd.php
index d92c1dfd6c3..d92c1dfd6c3 100644
--- a/frontends/php/app/controllers/CControllerUsergroupGrouprightAdd.php
+++ b/ui/app/controllers/CControllerUsergroupGrouprightAdd.php
diff --git a/frontends/php/app/controllers/CControllerUsergroupList.php b/ui/app/controllers/CControllerUsergroupList.php
index 2b364a10083..2b364a10083 100644
--- a/frontends/php/app/controllers/CControllerUsergroupList.php
+++ b/ui/app/controllers/CControllerUsergroupList.php
diff --git a/frontends/php/app/controllers/CControllerUsergroupMassUpdate.php b/ui/app/controllers/CControllerUsergroupMassUpdate.php
index e4c7d656918..e4c7d656918 100644
--- a/frontends/php/app/controllers/CControllerUsergroupMassUpdate.php
+++ b/ui/app/controllers/CControllerUsergroupMassUpdate.php
diff --git a/frontends/php/app/controllers/CControllerUsergroupTagfilterAdd.php b/ui/app/controllers/CControllerUsergroupTagfilterAdd.php
index 684b5610679..684b5610679 100644
--- a/frontends/php/app/controllers/CControllerUsergroupTagfilterAdd.php
+++ b/ui/app/controllers/CControllerUsergroupTagfilterAdd.php
diff --git a/frontends/php/app/controllers/CControllerUsergroupUpdate.php b/ui/app/controllers/CControllerUsergroupUpdate.php
index b60b0f27cd6..b60b0f27cd6 100644
--- a/frontends/php/app/controllers/CControllerUsergroupUpdate.php
+++ b/ui/app/controllers/CControllerUsergroupUpdate.php
diff --git a/frontends/php/app/controllers/CControllerValuemapCreate.php b/ui/app/controllers/CControllerValuemapCreate.php
index f58c04a6fb6..f58c04a6fb6 100644
--- a/frontends/php/app/controllers/CControllerValuemapCreate.php
+++ b/ui/app/controllers/CControllerValuemapCreate.php
diff --git a/frontends/php/app/controllers/CControllerValuemapDelete.php b/ui/app/controllers/CControllerValuemapDelete.php
index 2a2ca12a730..2a2ca12a730 100644
--- a/frontends/php/app/controllers/CControllerValuemapDelete.php
+++ b/ui/app/controllers/CControllerValuemapDelete.php
diff --git a/frontends/php/app/controllers/CControllerValuemapEdit.php b/ui/app/controllers/CControllerValuemapEdit.php
index 3c8ab4d83e7..3c8ab4d83e7 100644
--- a/frontends/php/app/controllers/CControllerValuemapEdit.php
+++ b/ui/app/controllers/CControllerValuemapEdit.php
diff --git a/frontends/php/app/controllers/CControllerValuemapList.php b/ui/app/controllers/CControllerValuemapList.php
index f44c70c91ed..f44c70c91ed 100644
--- a/frontends/php/app/controllers/CControllerValuemapList.php
+++ b/ui/app/controllers/CControllerValuemapList.php
diff --git a/frontends/php/app/controllers/CControllerValuemapUpdate.php b/ui/app/controllers/CControllerValuemapUpdate.php
index 6d2a6cd6b5f..6d2a6cd6b5f 100644
--- a/frontends/php/app/controllers/CControllerValuemapUpdate.php
+++ b/ui/app/controllers/CControllerValuemapUpdate.php
diff --git a/frontends/php/app/controllers/CControllerWebView.php b/ui/app/controllers/CControllerWebView.php
index a12749a7ccc..a12749a7ccc 100644
--- a/frontends/php/app/controllers/CControllerWebView.php
+++ b/ui/app/controllers/CControllerWebView.php
diff --git a/frontends/php/app/controllers/CControllerWidget.php b/ui/app/controllers/CControllerWidget.php
index 1e16b8b32bb..1e16b8b32bb 100644
--- a/frontends/php/app/controllers/CControllerWidget.php
+++ b/ui/app/controllers/CControllerWidget.php
diff --git a/frontends/php/app/controllers/CControllerWidgetActionLogView.php b/ui/app/controllers/CControllerWidgetActionLogView.php
index 962467d3a2f..962467d3a2f 100644
--- a/frontends/php/app/controllers/CControllerWidgetActionLogView.php
+++ b/ui/app/controllers/CControllerWidgetActionLogView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetClockView.php b/ui/app/controllers/CControllerWidgetClockView.php
index 97027bdb46e..97027bdb46e 100644
--- a/frontends/php/app/controllers/CControllerWidgetClockView.php
+++ b/ui/app/controllers/CControllerWidgetClockView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetDataOverView.php b/ui/app/controllers/CControllerWidgetDataOverView.php
index bcf3708c6aa..bcf3708c6aa 100644
--- a/frontends/php/app/controllers/CControllerWidgetDataOverView.php
+++ b/ui/app/controllers/CControllerWidgetDataOverView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetDiscoveryView.php b/ui/app/controllers/CControllerWidgetDiscoveryView.php
index 67772303004..67772303004 100644
--- a/frontends/php/app/controllers/CControllerWidgetDiscoveryView.php
+++ b/ui/app/controllers/CControllerWidgetDiscoveryView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetFavGraphsView.php b/ui/app/controllers/CControllerWidgetFavGraphsView.php
index 030b5c23574..030b5c23574 100644
--- a/frontends/php/app/controllers/CControllerWidgetFavGraphsView.php
+++ b/ui/app/controllers/CControllerWidgetFavGraphsView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetFavMapsView.php b/ui/app/controllers/CControllerWidgetFavMapsView.php
index aa4e902342a..aa4e902342a 100644
--- a/frontends/php/app/controllers/CControllerWidgetFavMapsView.php
+++ b/ui/app/controllers/CControllerWidgetFavMapsView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetFavScreensView.php b/ui/app/controllers/CControllerWidgetFavScreensView.php
index f76ac8f4c68..f76ac8f4c68 100644
--- a/frontends/php/app/controllers/CControllerWidgetFavScreensView.php
+++ b/ui/app/controllers/CControllerWidgetFavScreensView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetGraphView.php b/ui/app/controllers/CControllerWidgetGraphView.php
index 14a763368b2..14a763368b2 100644
--- a/frontends/php/app/controllers/CControllerWidgetGraphView.php
+++ b/ui/app/controllers/CControllerWidgetGraphView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetHostAvailView.php b/ui/app/controllers/CControllerWidgetHostAvailView.php
index 1d9987799b6..1d9987799b6 100644
--- a/frontends/php/app/controllers/CControllerWidgetHostAvailView.php
+++ b/ui/app/controllers/CControllerWidgetHostAvailView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetIterator.php b/ui/app/controllers/CControllerWidgetIterator.php
index 70deb311a3e..70deb311a3e 100644
--- a/frontends/php/app/controllers/CControllerWidgetIterator.php
+++ b/ui/app/controllers/CControllerWidgetIterator.php
diff --git a/frontends/php/app/controllers/CControllerWidgetIteratorGraphPrototypeView.php b/ui/app/controllers/CControllerWidgetIteratorGraphPrototypeView.php
index 4f938d10b87..4f938d10b87 100644
--- a/frontends/php/app/controllers/CControllerWidgetIteratorGraphPrototypeView.php
+++ b/ui/app/controllers/CControllerWidgetIteratorGraphPrototypeView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetMapView.php b/ui/app/controllers/CControllerWidgetMapView.php
index f0aca7cee5c..f0aca7cee5c 100644
--- a/frontends/php/app/controllers/CControllerWidgetMapView.php
+++ b/ui/app/controllers/CControllerWidgetMapView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetNavTreeItemEdit.php b/ui/app/controllers/CControllerWidgetNavTreeItemEdit.php
index 0e6e8d65fd5..0e6e8d65fd5 100644
--- a/frontends/php/app/controllers/CControllerWidgetNavTreeItemEdit.php
+++ b/ui/app/controllers/CControllerWidgetNavTreeItemEdit.php
diff --git a/frontends/php/app/controllers/CControllerWidgetNavTreeItemUpdate.php b/ui/app/controllers/CControllerWidgetNavTreeItemUpdate.php
index c3e32961e4e..c3e32961e4e 100644
--- a/frontends/php/app/controllers/CControllerWidgetNavTreeItemUpdate.php
+++ b/ui/app/controllers/CControllerWidgetNavTreeItemUpdate.php
diff --git a/frontends/php/app/controllers/CControllerWidgetNavTreeView.php b/ui/app/controllers/CControllerWidgetNavTreeView.php
index 54c0a22924b..54c0a22924b 100644
--- a/frontends/php/app/controllers/CControllerWidgetNavTreeView.php
+++ b/ui/app/controllers/CControllerWidgetNavTreeView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetPlainTextView.php b/ui/app/controllers/CControllerWidgetPlainTextView.php
index 0233d8a37af..0233d8a37af 100644
--- a/frontends/php/app/controllers/CControllerWidgetPlainTextView.php
+++ b/ui/app/controllers/CControllerWidgetPlainTextView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetProblemHostsView.php b/ui/app/controllers/CControllerWidgetProblemHostsView.php
index 11fed936ca3..11fed936ca3 100644
--- a/frontends/php/app/controllers/CControllerWidgetProblemHostsView.php
+++ b/ui/app/controllers/CControllerWidgetProblemHostsView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetProblemsBySvView.php b/ui/app/controllers/CControllerWidgetProblemsBySvView.php
index bd57a509fb5..bd57a509fb5 100644
--- a/frontends/php/app/controllers/CControllerWidgetProblemsBySvView.php
+++ b/ui/app/controllers/CControllerWidgetProblemsBySvView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetProblemsView.php b/ui/app/controllers/CControllerWidgetProblemsView.php
index 0384cc3930b..0384cc3930b 100644
--- a/frontends/php/app/controllers/CControllerWidgetProblemsView.php
+++ b/ui/app/controllers/CControllerWidgetProblemsView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetSvgGraphView.php b/ui/app/controllers/CControllerWidgetSvgGraphView.php
index 1979039e41f..1979039e41f 100644
--- a/frontends/php/app/controllers/CControllerWidgetSvgGraphView.php
+++ b/ui/app/controllers/CControllerWidgetSvgGraphView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetSystemInfoView.php b/ui/app/controllers/CControllerWidgetSystemInfoView.php
index d559241cbe7..d559241cbe7 100644
--- a/frontends/php/app/controllers/CControllerWidgetSystemInfoView.php
+++ b/ui/app/controllers/CControllerWidgetSystemInfoView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetTrigOverView.php b/ui/app/controllers/CControllerWidgetTrigOverView.php
index 339134866a7..339134866a7 100644
--- a/frontends/php/app/controllers/CControllerWidgetTrigOverView.php
+++ b/ui/app/controllers/CControllerWidgetTrigOverView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetUrlView.php b/ui/app/controllers/CControllerWidgetUrlView.php
index f07324750d8..f07324750d8 100644
--- a/frontends/php/app/controllers/CControllerWidgetUrlView.php
+++ b/ui/app/controllers/CControllerWidgetUrlView.php
diff --git a/frontends/php/app/controllers/CControllerWidgetWebView.php b/ui/app/controllers/CControllerWidgetWebView.php
index 4e78f322e3d..4e78f322e3d 100644
--- a/frontends/php/app/controllers/CControllerWidgetWebView.php
+++ b/ui/app/controllers/CControllerWidgetWebView.php
diff --git a/frontends/php/app/controllers/CControllerWorkingTimeEdit.php b/ui/app/controllers/CControllerWorkingTimeEdit.php
index bf283f066a7..bf283f066a7 100644
--- a/frontends/php/app/controllers/CControllerWorkingTimeEdit.php
+++ b/ui/app/controllers/CControllerWorkingTimeEdit.php
diff --git a/frontends/php/app/controllers/CControllerWorkingTimeUpdate.php b/ui/app/controllers/CControllerWorkingTimeUpdate.php
index 1fe158820db..1fe158820db 100644
--- a/frontends/php/app/controllers/CControllerWorkingTimeUpdate.php
+++ b/ui/app/controllers/CControllerWorkingTimeUpdate.php
diff --git a/frontends/php/app/partials/administration.usergroup.grouprights.html.php b/ui/app/partials/administration.usergroup.grouprights.html.php
index 9cfdd0b2ae5..9cfdd0b2ae5 100644
--- a/frontends/php/app/partials/administration.usergroup.grouprights.html.php
+++ b/ui/app/partials/administration.usergroup.grouprights.html.php
diff --git a/frontends/php/app/partials/administration.usergroup.tagfilters.html.php b/ui/app/partials/administration.usergroup.tagfilters.html.php
index 62d7d1dba23..62d7d1dba23 100644
--- a/frontends/php/app/partials/administration.usergroup.tagfilters.html.php
+++ b/ui/app/partials/administration.usergroup.tagfilters.html.php
diff --git a/frontends/php/app/partials/common.filter.trigger.php b/ui/app/partials/common.filter.trigger.php
index 60ac73ccba2..60ac73ccba2 100644
--- a/frontends/php/app/partials/common.filter.trigger.php
+++ b/ui/app/partials/common.filter.trigger.php
diff --git a/frontends/php/app/partials/configuration.tags.tab.php b/ui/app/partials/configuration.tags.tab.php
index 2d0e5dbcb66..2d0e5dbcb66 100644
--- a/frontends/php/app/partials/configuration.tags.tab.php
+++ b/ui/app/partials/configuration.tags.tab.php
diff --git a/frontends/php/app/partials/dataoverview.table.left.php b/ui/app/partials/dataoverview.table.left.php
index f861b7c020f..f861b7c020f 100644
--- a/frontends/php/app/partials/dataoverview.table.left.php
+++ b/ui/app/partials/dataoverview.table.left.php
diff --git a/frontends/php/app/partials/dataoverview.table.top.php b/ui/app/partials/dataoverview.table.top.php
index 38a82ef15ef..38a82ef15ef 100644
--- a/frontends/php/app/partials/dataoverview.table.top.php
+++ b/ui/app/partials/dataoverview.table.top.php
diff --git a/frontends/php/app/partials/hostmacros.inherited.list.html.php b/ui/app/partials/hostmacros.inherited.list.html.php
index 5fcf5020808..5fcf5020808 100644
--- a/frontends/php/app/partials/hostmacros.inherited.list.html.php
+++ b/ui/app/partials/hostmacros.inherited.list.html.php
diff --git a/frontends/php/app/partials/hostmacros.list.html.php b/ui/app/partials/hostmacros.list.html.php
index 08b858b30c4..08b858b30c4 100644
--- a/frontends/php/app/partials/hostmacros.list.html.php
+++ b/ui/app/partials/hostmacros.list.html.php
diff --git a/frontends/php/app/partials/js/common.filter.trigger.js.php b/ui/app/partials/js/common.filter.trigger.js.php
index 6ac27dfe787..6ac27dfe787 100644
--- a/frontends/php/app/partials/js/common.filter.trigger.js.php
+++ b/ui/app/partials/js/common.filter.trigger.js.php
diff --git a/frontends/php/app/partials/js/configuration.tags.tab.js.php b/ui/app/partials/js/configuration.tags.tab.js.php
index a0ecfecb82f..a0ecfecb82f 100644
--- a/frontends/php/app/partials/js/configuration.tags.tab.js.php
+++ b/ui/app/partials/js/configuration.tags.tab.js.php
diff --git a/frontends/php/app/partials/js/massupdate.macros.tab.js.php b/ui/app/partials/js/massupdate.macros.tab.js.php
index 58ef3d82ad4..58ef3d82ad4 100644
--- a/frontends/php/app/partials/js/massupdate.macros.tab.js.php
+++ b/ui/app/partials/js/massupdate.macros.tab.js.php
diff --git a/frontends/php/app/partials/layout.htmlpage.aside.php b/ui/app/partials/layout.htmlpage.aside.php
index 469dbff5c99..469dbff5c99 100644
--- a/frontends/php/app/partials/layout.htmlpage.aside.php
+++ b/ui/app/partials/layout.htmlpage.aside.php
diff --git a/frontends/php/app/partials/layout.htmlpage.footer.php b/ui/app/partials/layout.htmlpage.footer.php
index 4a566846d6e..4a566846d6e 100644
--- a/frontends/php/app/partials/layout.htmlpage.footer.php
+++ b/ui/app/partials/layout.htmlpage.footer.php
diff --git a/frontends/php/app/partials/layout.htmlpage.header.php b/ui/app/partials/layout.htmlpage.header.php
index 8c5b7b08abd..8c5b7b08abd 100644
--- a/frontends/php/app/partials/layout.htmlpage.header.php
+++ b/ui/app/partials/layout.htmlpage.header.php
diff --git a/frontends/php/app/partials/massupdate.macros.tab.php b/ui/app/partials/massupdate.macros.tab.php
index f1fd9c432c7..f1fd9c432c7 100644
--- a/frontends/php/app/partials/massupdate.macros.tab.php
+++ b/ui/app/partials/massupdate.macros.tab.php
diff --git a/frontends/php/app/partials/monitoring.dashboard.breadcrumbs.php b/ui/app/partials/monitoring.dashboard.breadcrumbs.php
index a92733818ab..a92733818ab 100644
--- a/frontends/php/app/partials/monitoring.dashboard.breadcrumbs.php
+++ b/ui/app/partials/monitoring.dashboard.breadcrumbs.php
diff --git a/frontends/php/app/partials/monitoring.host.view.html.php b/ui/app/partials/monitoring.host.view.html.php
index df237042b31..df237042b31 100644
--- a/frontends/php/app/partials/monitoring.host.view.html.php
+++ b/ui/app/partials/monitoring.host.view.html.php
diff --git a/frontends/php/app/partials/monitoring.latest.view.html.php b/ui/app/partials/monitoring.latest.view.html.php
index ea36ddc1742..ea36ddc1742 100644
--- a/frontends/php/app/partials/monitoring.latest.view.html.php
+++ b/ui/app/partials/monitoring.latest.view.html.php
diff --git a/frontends/php/app/partials/trigoverview.table.left.php b/ui/app/partials/trigoverview.table.left.php
index 66f13c76095..66f13c76095 100644
--- a/frontends/php/app/partials/trigoverview.table.left.php
+++ b/ui/app/partials/trigoverview.table.left.php
diff --git a/frontends/php/app/partials/trigoverview.table.top.php b/ui/app/partials/trigoverview.table.top.php
index ea73cce647a..ea73cce647a 100644
--- a/frontends/php/app/partials/trigoverview.table.top.php
+++ b/ui/app/partials/trigoverview.table.top.php
diff --git a/frontends/php/app/views/administration.authentication.edit.php b/ui/app/views/administration.authentication.edit.php
index 2489607b998..2489607b998 100644
--- a/frontends/php/app/views/administration.authentication.edit.php
+++ b/ui/app/views/administration.authentication.edit.php
diff --git a/frontends/php/app/views/administration.autoreg.edit.php b/ui/app/views/administration.autoreg.edit.php
index e432c77d9cb..e432c77d9cb 100644
--- a/frontends/php/app/views/administration.autoreg.edit.php
+++ b/ui/app/views/administration.autoreg.edit.php
diff --git a/frontends/php/app/views/administration.gui.edit.php b/ui/app/views/administration.gui.edit.php
index ddce159617f..ddce159617f 100644
--- a/frontends/php/app/views/administration.gui.edit.php
+++ b/ui/app/views/administration.gui.edit.php
diff --git a/frontends/php/app/views/administration.housekeeping.edit.php b/ui/app/views/administration.housekeeping.edit.php
index 57985d799bb..57985d799bb 100644
--- a/frontends/php/app/views/administration.housekeeping.edit.php
+++ b/ui/app/views/administration.housekeeping.edit.php
diff --git a/frontends/php/app/views/administration.iconmap.edit.php b/ui/app/views/administration.iconmap.edit.php
index 89ebaef9ca9..89ebaef9ca9 100644
--- a/frontends/php/app/views/administration.iconmap.edit.php
+++ b/ui/app/views/administration.iconmap.edit.php
diff --git a/frontends/php/app/views/administration.iconmap.list.php b/ui/app/views/administration.iconmap.list.php
index de66a50b006..de66a50b006 100644
--- a/frontends/php/app/views/administration.iconmap.list.php
+++ b/ui/app/views/administration.iconmap.list.php
diff --git a/frontends/php/app/views/administration.image.edit.php b/ui/app/views/administration.image.edit.php
index 6ad3e9e038a..6ad3e9e038a 100644
--- a/frontends/php/app/views/administration.image.edit.php
+++ b/ui/app/views/administration.image.edit.php
diff --git a/frontends/php/app/views/administration.image.list.php b/ui/app/views/administration.image.list.php
index c36e06e3a8e..c36e06e3a8e 100644
--- a/frontends/php/app/views/administration.image.list.php
+++ b/ui/app/views/administration.image.list.php
diff --git a/frontends/php/app/views/administration.macros.edit.php b/ui/app/views/administration.macros.edit.php
index 680c62f63fb..680c62f63fb 100644
--- a/frontends/php/app/views/administration.macros.edit.php
+++ b/ui/app/views/administration.macros.edit.php
diff --git a/frontends/php/app/views/administration.mediatype.edit.php b/ui/app/views/administration.mediatype.edit.php
index b12a0da0a76..b12a0da0a76 100644
--- a/frontends/php/app/views/administration.mediatype.edit.php
+++ b/ui/app/views/administration.mediatype.edit.php
diff --git a/frontends/php/app/views/administration.mediatype.list.php b/ui/app/views/administration.mediatype.list.php
index d812ef30675..d812ef30675 100644
--- a/frontends/php/app/views/administration.mediatype.list.php
+++ b/ui/app/views/administration.mediatype.list.php
diff --git a/frontends/php/app/views/administration.miscconfig.edit.php b/ui/app/views/administration.miscconfig.edit.php
index 3059f0052ac..3059f0052ac 100644
--- a/frontends/php/app/views/administration.miscconfig.edit.php
+++ b/ui/app/views/administration.miscconfig.edit.php
diff --git a/frontends/php/app/views/administration.module.edit.php b/ui/app/views/administration.module.edit.php
index 467cc53b30d..467cc53b30d 100644
--- a/frontends/php/app/views/administration.module.edit.php
+++ b/ui/app/views/administration.module.edit.php
diff --git a/frontends/php/app/views/administration.module.list.php b/ui/app/views/administration.module.list.php
index 332985f49ee..332985f49ee 100644
--- a/frontends/php/app/views/administration.module.list.php
+++ b/ui/app/views/administration.module.list.php
diff --git a/frontends/php/app/views/administration.proxy.edit.php b/ui/app/views/administration.proxy.edit.php
index 4c7a5e5f7b0..4c7a5e5f7b0 100644
--- a/frontends/php/app/views/administration.proxy.edit.php
+++ b/ui/app/views/administration.proxy.edit.php
diff --git a/frontends/php/app/views/administration.proxy.list.php b/ui/app/views/administration.proxy.list.php
index 5a443fcdb7e..5a443fcdb7e 100644
--- a/frontends/php/app/views/administration.proxy.list.php
+++ b/ui/app/views/administration.proxy.list.php
diff --git a/frontends/php/app/views/administration.regex.edit.php b/ui/app/views/administration.regex.edit.php
index 6f90fc203c8..6f90fc203c8 100644
--- a/frontends/php/app/views/administration.regex.edit.php
+++ b/ui/app/views/administration.regex.edit.php
diff --git a/frontends/php/app/views/administration.regex.list.php b/ui/app/views/administration.regex.list.php
index 17a7b0fb6df..17a7b0fb6df 100644
--- a/frontends/php/app/views/administration.regex.list.php
+++ b/ui/app/views/administration.regex.list.php
diff --git a/frontends/php/app/views/administration.script.edit.php b/ui/app/views/administration.script.edit.php
index eb1d31cb315..eb1d31cb315 100644
--- a/frontends/php/app/views/administration.script.edit.php
+++ b/ui/app/views/administration.script.edit.php
diff --git a/frontends/php/app/views/administration.script.list.php b/ui/app/views/administration.script.list.php
index 13457270ce5..13457270ce5 100644
--- a/frontends/php/app/views/administration.script.list.php
+++ b/ui/app/views/administration.script.list.php
diff --git a/frontends/php/app/views/administration.trigdisplay.edit.php b/ui/app/views/administration.trigdisplay.edit.php
index 84f6f0df9b3..84f6f0df9b3 100644
--- a/frontends/php/app/views/administration.trigdisplay.edit.php
+++ b/ui/app/views/administration.trigdisplay.edit.php
diff --git a/frontends/php/app/views/administration.trigseverity.edit.php b/ui/app/views/administration.trigseverity.edit.php
index 5c55028fc79..5c55028fc79 100644
--- a/frontends/php/app/views/administration.trigseverity.edit.php
+++ b/ui/app/views/administration.trigseverity.edit.php
diff --git a/frontends/php/app/views/administration.user.edit.php b/ui/app/views/administration.user.edit.php
index 02bcba6ee95..02bcba6ee95 100644
--- a/frontends/php/app/views/administration.user.edit.php
+++ b/ui/app/views/administration.user.edit.php
diff --git a/frontends/php/app/views/administration.user.list.php b/ui/app/views/administration.user.list.php
index 24903d69923..24903d69923 100644
--- a/frontends/php/app/views/administration.user.list.php
+++ b/ui/app/views/administration.user.list.php
diff --git a/frontends/php/app/views/administration.usergroup.edit.php b/ui/app/views/administration.usergroup.edit.php
index 021292b26cc..021292b26cc 100644
--- a/frontends/php/app/views/administration.usergroup.edit.php
+++ b/ui/app/views/administration.usergroup.edit.php
diff --git a/frontends/php/app/views/administration.usergroup.grouprights.php b/ui/app/views/administration.usergroup.grouprights.php
index 6d75690bf07..6d75690bf07 100644
--- a/frontends/php/app/views/administration.usergroup.grouprights.php
+++ b/ui/app/views/administration.usergroup.grouprights.php
diff --git a/frontends/php/app/views/administration.usergroup.list.php b/ui/app/views/administration.usergroup.list.php
index f5d22a9ac18..f5d22a9ac18 100644
--- a/frontends/php/app/views/administration.usergroup.list.php
+++ b/ui/app/views/administration.usergroup.list.php
diff --git a/frontends/php/app/views/administration.usergroup.tagfilters.php b/ui/app/views/administration.usergroup.tagfilters.php
index ccbe9f6760a..ccbe9f6760a 100644
--- a/frontends/php/app/views/administration.usergroup.tagfilters.php
+++ b/ui/app/views/administration.usergroup.tagfilters.php
diff --git a/frontends/php/app/views/administration.valuemap.edit.php b/ui/app/views/administration.valuemap.edit.php
index 8fbd22f0d66..8fbd22f0d66 100644
--- a/frontends/php/app/views/administration.valuemap.edit.php
+++ b/ui/app/views/administration.valuemap.edit.php
diff --git a/frontends/php/app/views/administration.valuemap.list.php b/ui/app/views/administration.valuemap.list.php
index df4bb0d9803..df4bb0d9803 100644
--- a/frontends/php/app/views/administration.valuemap.list.php
+++ b/ui/app/views/administration.valuemap.list.php
diff --git a/frontends/php/app/views/administration.workingtime.edit.php b/ui/app/views/administration.workingtime.edit.php
index 69b1606e3c4..69b1606e3c4 100644
--- a/frontends/php/app/views/administration.workingtime.edit.php
+++ b/ui/app/views/administration.workingtime.edit.php
diff --git a/frontends/php/app/views/dashboard.properties.edit.php b/ui/app/views/dashboard.properties.edit.php
index 8a8f913319c..8a8f913319c 100644
--- a/frontends/php/app/views/dashboard.properties.edit.php
+++ b/ui/app/views/dashboard.properties.edit.php
diff --git a/frontends/php/app/views/dashboard.sharing.edit.php b/ui/app/views/dashboard.sharing.edit.php
index 9c3650e1f40..9c3650e1f40 100644
--- a/frontends/php/app/views/dashboard.sharing.edit.php
+++ b/ui/app/views/dashboard.sharing.edit.php
diff --git a/frontends/php/app/views/hostmacros.list.php b/ui/app/views/hostmacros.list.php
index b4748b8d1b7..b4748b8d1b7 100644
--- a/frontends/php/app/views/hostmacros.list.php
+++ b/ui/app/views/hostmacros.list.php
diff --git a/frontends/php/app/views/js/administration.authentication.edit.js.php b/ui/app/views/js/administration.authentication.edit.js.php
index 1e313d6d750..1e313d6d750 100644
--- a/frontends/php/app/views/js/administration.authentication.edit.js.php
+++ b/ui/app/views/js/administration.authentication.edit.js.php
diff --git a/frontends/php/app/views/js/administration.autoreg.edit.js.php b/ui/app/views/js/administration.autoreg.edit.js.php
index 70a44324a06..70a44324a06 100644
--- a/frontends/php/app/views/js/administration.autoreg.edit.js.php
+++ b/ui/app/views/js/administration.autoreg.edit.js.php
diff --git a/frontends/php/app/views/js/administration.housekeeping.edit.js.php b/ui/app/views/js/administration.housekeeping.edit.js.php
index f6cedac52ba..f6cedac52ba 100644
--- a/frontends/php/app/views/js/administration.housekeeping.edit.js.php
+++ b/ui/app/views/js/administration.housekeeping.edit.js.php
diff --git a/frontends/php/app/views/js/administration.iconmap.edit.js.php b/ui/app/views/js/administration.iconmap.edit.js.php
index aed2943ef56..aed2943ef56 100644
--- a/frontends/php/app/views/js/administration.iconmap.edit.js.php
+++ b/ui/app/views/js/administration.iconmap.edit.js.php
diff --git a/frontends/php/app/views/js/administration.image.edit.js.php b/ui/app/views/js/administration.image.edit.js.php
index 654e9b71a2d..654e9b71a2d 100644
--- a/frontends/php/app/views/js/administration.image.edit.js.php
+++ b/ui/app/views/js/administration.image.edit.js.php
diff --git a/frontends/php/app/views/js/administration.macros.edit.js.php b/ui/app/views/js/administration.macros.edit.js.php
index f4f9f5af5f5..f4f9f5af5f5 100644
--- a/frontends/php/app/views/js/administration.macros.edit.js.php
+++ b/ui/app/views/js/administration.macros.edit.js.php
diff --git a/frontends/php/app/views/js/administration.mediatype.edit.js.php b/ui/app/views/js/administration.mediatype.edit.js.php
index 06be2ad7d72..06be2ad7d72 100644
--- a/frontends/php/app/views/js/administration.mediatype.edit.js.php
+++ b/ui/app/views/js/administration.mediatype.edit.js.php
diff --git a/frontends/php/app/views/js/administration.proxy.edit.js.php b/ui/app/views/js/administration.proxy.edit.js.php
index 4af218c2033..4af218c2033 100644
--- a/frontends/php/app/views/js/administration.proxy.edit.js.php
+++ b/ui/app/views/js/administration.proxy.edit.js.php
diff --git a/frontends/php/app/views/js/administration.regex.edit.js.php b/ui/app/views/js/administration.regex.edit.js.php
index a83b9841fd6..a83b9841fd6 100644
--- a/frontends/php/app/views/js/administration.regex.edit.js.php
+++ b/ui/app/views/js/administration.regex.edit.js.php
diff --git a/frontends/php/app/views/js/administration.script.edit.js.php b/ui/app/views/js/administration.script.edit.js.php
index a6b8a3cb1fa..a6b8a3cb1fa 100644
--- a/frontends/php/app/views/js/administration.script.edit.js.php
+++ b/ui/app/views/js/administration.script.edit.js.php
diff --git a/frontends/php/app/views/js/administration.trigdisplay.edit.js.php b/ui/app/views/js/administration.trigdisplay.edit.js.php
index 92ed415e3e1..92ed415e3e1 100644
--- a/frontends/php/app/views/js/administration.trigdisplay.edit.js.php
+++ b/ui/app/views/js/administration.trigdisplay.edit.js.php
diff --git a/frontends/php/app/views/js/administration.trigseverity.edit.js.php b/ui/app/views/js/administration.trigseverity.edit.js.php
index 820f6442509..820f6442509 100644
--- a/frontends/php/app/views/js/administration.trigseverity.edit.js.php
+++ b/ui/app/views/js/administration.trigseverity.edit.js.php
diff --git a/frontends/php/app/views/js/administration.user.edit.common.js.php b/ui/app/views/js/administration.user.edit.common.js.php
index 7a736b4c7ca..7a736b4c7ca 100644
--- a/frontends/php/app/views/js/administration.user.edit.common.js.php
+++ b/ui/app/views/js/administration.user.edit.common.js.php
diff --git a/frontends/php/app/views/js/administration.user.edit.js.php b/ui/app/views/js/administration.user.edit.js.php
index df4af8703f3..df4af8703f3 100644
--- a/frontends/php/app/views/js/administration.user.edit.js.php
+++ b/ui/app/views/js/administration.user.edit.js.php
diff --git a/frontends/php/app/views/js/administration.usergroup.edit.js.php b/ui/app/views/js/administration.usergroup.edit.js.php
index 147947c74b9..147947c74b9 100644
--- a/frontends/php/app/views/js/administration.usergroup.edit.js.php
+++ b/ui/app/views/js/administration.usergroup.edit.js.php
diff --git a/frontends/php/app/views/js/administration.userprofile.edit.js.php b/ui/app/views/js/administration.userprofile.edit.js.php
index ff8828c2b3e..ff8828c2b3e 100644
--- a/frontends/php/app/views/js/administration.userprofile.edit.js.php
+++ b/ui/app/views/js/administration.userprofile.edit.js.php
diff --git a/frontends/php/app/views/js/administration.valuemap.edit.js.php b/ui/app/views/js/administration.valuemap.edit.js.php
index 59d1d494264..59d1d494264 100644
--- a/frontends/php/app/views/js/administration.valuemap.edit.js.php
+++ b/ui/app/views/js/administration.valuemap.edit.js.php
diff --git a/frontends/php/app/views/js/monitoring.charts.view.js.php b/ui/app/views/js/monitoring.charts.view.js.php
index 56f09a9a585..56f09a9a585 100644
--- a/frontends/php/app/views/js/monitoring.charts.view.js.php
+++ b/ui/app/views/js/monitoring.charts.view.js.php
diff --git a/frontends/php/app/views/js/monitoring.dashboard.view.js.php b/ui/app/views/js/monitoring.dashboard.view.js.php
index 2cda8d136ad..2cda8d136ad 100644
--- a/frontends/php/app/views/js/monitoring.dashboard.view.js.php
+++ b/ui/app/views/js/monitoring.dashboard.view.js.php
diff --git a/frontends/php/app/views/js/monitoring.host.view.js.php b/ui/app/views/js/monitoring.host.view.js.php
index 8d86b6ef322..8d86b6ef322 100644
--- a/frontends/php/app/views/js/monitoring.host.view.js.php
+++ b/ui/app/views/js/monitoring.host.view.js.php
diff --git a/frontends/php/app/views/js/monitoring.latest.view.js.php b/ui/app/views/js/monitoring.latest.view.js.php
index 310f0f41b83..310f0f41b83 100644
--- a/frontends/php/app/views/js/monitoring.latest.view.js.php
+++ b/ui/app/views/js/monitoring.latest.view.js.php
diff --git a/frontends/php/app/views/js/monitoring.problem.view.js.php b/ui/app/views/js/monitoring.problem.view.js.php
index c397090dfc9..c397090dfc9 100644
--- a/frontends/php/app/views/js/monitoring.problem.view.js.php
+++ b/ui/app/views/js/monitoring.problem.view.js.php
diff --git a/frontends/php/app/views/js/popup.acknowledge.edit.js.php b/ui/app/views/js/popup.acknowledge.edit.js.php
index ed681b9111c..ed681b9111c 100644
--- a/frontends/php/app/views/js/popup.acknowledge.edit.js.php
+++ b/ui/app/views/js/popup.acknowledge.edit.js.php
diff --git a/frontends/php/app/views/js/popup.discovery.check.js.php b/ui/app/views/js/popup.discovery.check.js.php
index 001d8c00a91..001d8c00a91 100644
--- a/frontends/php/app/views/js/popup.discovery.check.js.php
+++ b/ui/app/views/js/popup.discovery.check.js.php
diff --git a/frontends/php/app/views/js/popup.itemtestedit.view.js.php b/ui/app/views/js/popup.itemtestedit.view.js.php
index b624e7e675c..b624e7e675c 100644
--- a/frontends/php/app/views/js/popup.itemtestedit.view.js.php
+++ b/ui/app/views/js/popup.itemtestedit.view.js.php
diff --git a/frontends/php/app/views/js/popup.maintenance.period.js.php b/ui/app/views/js/popup.maintenance.period.js.php
index bc6898511e3..bc6898511e3 100644
--- a/frontends/php/app/views/js/popup.maintenance.period.js.php
+++ b/ui/app/views/js/popup.maintenance.period.js.php
diff --git a/frontends/php/app/views/js/popup.media.js.php b/ui/app/views/js/popup.media.js.php
index b6eda0686d8..b6eda0686d8 100644
--- a/frontends/php/app/views/js/popup.media.js.php
+++ b/ui/app/views/js/popup.media.js.php
diff --git a/frontends/php/app/views/js/popup.mediatype.message.js.php b/ui/app/views/js/popup.mediatype.message.js.php
index d3d81754fc6..d3d81754fc6 100644
--- a/frontends/php/app/views/js/popup.mediatype.message.js.php
+++ b/ui/app/views/js/popup.mediatype.message.js.php
diff --git a/frontends/php/app/views/js/popup.mediatypetest.edit.js.php b/ui/app/views/js/popup.mediatypetest.edit.js.php
index e77a9056979..e77a9056979 100644
--- a/frontends/php/app/views/js/popup.mediatypetest.edit.js.php
+++ b/ui/app/views/js/popup.mediatypetest.edit.js.php
diff --git a/frontends/php/app/views/js/popup.triggerwizard.js.php b/ui/app/views/js/popup.triggerwizard.js.php
index 72f51f627e3..72f51f627e3 100644
--- a/frontends/php/app/views/js/popup.triggerwizard.js.php
+++ b/ui/app/views/js/popup.triggerwizard.js.php
diff --git a/frontends/php/app/views/layout.csv.php b/ui/app/views/layout.csv.php
index 40e4a2e07d1..40e4a2e07d1 100644
--- a/frontends/php/app/views/layout.csv.php
+++ b/ui/app/views/layout.csv.php
diff --git a/frontends/php/app/views/layout.htmlpage.php b/ui/app/views/layout.htmlpage.php
index 09aedf97052..09aedf97052 100644
--- a/frontends/php/app/views/layout.htmlpage.php
+++ b/ui/app/views/layout.htmlpage.php
diff --git a/frontends/php/app/views/layout.javascript.php b/ui/app/views/layout.javascript.php
index d3ab6959121..d3ab6959121 100644
--- a/frontends/php/app/views/layout.javascript.php
+++ b/ui/app/views/layout.javascript.php
diff --git a/frontends/php/app/views/layout.json.php b/ui/app/views/layout.json.php
index aa057667890..aa057667890 100644
--- a/frontends/php/app/views/layout.json.php
+++ b/ui/app/views/layout.json.php
diff --git a/frontends/php/app/views/layout.warning.php b/ui/app/views/layout.warning.php
index 01e41e1479c..01e41e1479c 100644
--- a/frontends/php/app/views/layout.warning.php
+++ b/ui/app/views/layout.warning.php
diff --git a/frontends/php/app/views/layout.widget.php b/ui/app/views/layout.widget.php
index aa057667890..aa057667890 100644
--- a/frontends/php/app/views/layout.widget.php
+++ b/ui/app/views/layout.widget.php
diff --git a/frontends/php/app/views/layout.xml.php b/ui/app/views/layout.xml.php
index abf37862b37..abf37862b37 100644
--- a/frontends/php/app/views/layout.xml.php
+++ b/ui/app/views/layout.xml.php
diff --git a/frontends/php/app/views/monitoring.charts.view.json.php b/ui/app/views/monitoring.charts.view.json.php
index 95248008e39..95248008e39 100644
--- a/frontends/php/app/views/monitoring.charts.view.json.php
+++ b/ui/app/views/monitoring.charts.view.json.php
diff --git a/frontends/php/app/views/monitoring.charts.view.php b/ui/app/views/monitoring.charts.view.php
index 60aa22aef59..60aa22aef59 100644
--- a/frontends/php/app/views/monitoring.charts.view.php
+++ b/ui/app/views/monitoring.charts.view.php
diff --git a/frontends/php/app/views/monitoring.dashboard.list.php b/ui/app/views/monitoring.dashboard.list.php
index 804ab778d94..804ab778d94 100644
--- a/frontends/php/app/views/monitoring.dashboard.list.php
+++ b/ui/app/views/monitoring.dashboard.list.php
diff --git a/frontends/php/app/views/monitoring.dashboard.view.php b/ui/app/views/monitoring.dashboard.view.php
index 6111567361e..6111567361e 100644
--- a/frontends/php/app/views/monitoring.dashboard.view.php
+++ b/ui/app/views/monitoring.dashboard.view.php
diff --git a/frontends/php/app/views/monitoring.dashboard.widget.edit.php b/ui/app/views/monitoring.dashboard.widget.edit.php
index 5219ea6284a..5219ea6284a 100644
--- a/frontends/php/app/views/monitoring.dashboard.widget.edit.php
+++ b/ui/app/views/monitoring.dashboard.widget.edit.php
diff --git a/frontends/php/app/views/monitoring.discovery.view.php b/ui/app/views/monitoring.discovery.view.php
index f769f8877eb..f769f8877eb 100644
--- a/frontends/php/app/views/monitoring.discovery.view.php
+++ b/ui/app/views/monitoring.discovery.view.php
diff --git a/frontends/php/app/views/monitoring.host.view.php b/ui/app/views/monitoring.host.view.php
index b98cfb9dfad..b98cfb9dfad 100644
--- a/frontends/php/app/views/monitoring.host.view.php
+++ b/ui/app/views/monitoring.host.view.php
diff --git a/frontends/php/app/views/monitoring.host.view.refresh.php b/ui/app/views/monitoring.host.view.refresh.php
index 52a545bbc15..52a545bbc15 100644
--- a/frontends/php/app/views/monitoring.host.view.refresh.php
+++ b/ui/app/views/monitoring.host.view.refresh.php
diff --git a/frontends/php/app/views/monitoring.latest.view.php b/ui/app/views/monitoring.latest.view.php
index 48c4156ef19..48c4156ef19 100644
--- a/frontends/php/app/views/monitoring.latest.view.php
+++ b/ui/app/views/monitoring.latest.view.php
diff --git a/frontends/php/app/views/monitoring.latest.view.refresh.php b/ui/app/views/monitoring.latest.view.refresh.php
index 30367775279..30367775279 100644
--- a/frontends/php/app/views/monitoring.latest.view.refresh.php
+++ b/ui/app/views/monitoring.latest.view.refresh.php
diff --git a/frontends/php/app/views/monitoring.map.view.php b/ui/app/views/monitoring.map.view.php
index 6c2466adbc2..6c2466adbc2 100644
--- a/frontends/php/app/views/monitoring.map.view.php
+++ b/ui/app/views/monitoring.map.view.php
diff --git a/frontends/php/app/views/monitoring.problem.view.php b/ui/app/views/monitoring.problem.view.php
index 47fce7f7a62..47fce7f7a62 100644
--- a/frontends/php/app/views/monitoring.problem.view.php
+++ b/ui/app/views/monitoring.problem.view.php
diff --git a/frontends/php/app/views/monitoring.web.view.php b/ui/app/views/monitoring.web.view.php
index 7642c8a6869..7642c8a6869 100644
--- a/frontends/php/app/views/monitoring.web.view.php
+++ b/ui/app/views/monitoring.web.view.php
diff --git a/frontends/php/app/views/monitoring.widget.actionlog.view.php b/ui/app/views/monitoring.widget.actionlog.view.php
index 8a1c3c0a348..8a1c3c0a348 100644
--- a/frontends/php/app/views/monitoring.widget.actionlog.view.php
+++ b/ui/app/views/monitoring.widget.actionlog.view.php
diff --git a/frontends/php/app/views/monitoring.widget.clock.view.php b/ui/app/views/monitoring.widget.clock.view.php
index 4242e9067db..4242e9067db 100644
--- a/frontends/php/app/views/monitoring.widget.clock.view.php
+++ b/ui/app/views/monitoring.widget.clock.view.php
diff --git a/frontends/php/app/views/monitoring.widget.dataover.view.php b/ui/app/views/monitoring.widget.dataover.view.php
index 0de1dcc5699..0de1dcc5699 100644
--- a/frontends/php/app/views/monitoring.widget.dataover.view.php
+++ b/ui/app/views/monitoring.widget.dataover.view.php
diff --git a/frontends/php/app/views/monitoring.widget.discovery.view.php b/ui/app/views/monitoring.widget.discovery.view.php
index 3e669ced386..3e669ced386 100644
--- a/frontends/php/app/views/monitoring.widget.discovery.view.php
+++ b/ui/app/views/monitoring.widget.discovery.view.php
diff --git a/frontends/php/app/views/monitoring.widget.favgraphs.view.php b/ui/app/views/monitoring.widget.favgraphs.view.php
index a0fc79e8d17..a0fc79e8d17 100644
--- a/frontends/php/app/views/monitoring.widget.favgraphs.view.php
+++ b/ui/app/views/monitoring.widget.favgraphs.view.php
diff --git a/frontends/php/app/views/monitoring.widget.favmaps.view.php b/ui/app/views/monitoring.widget.favmaps.view.php
index 084b00d978f..084b00d978f 100644
--- a/frontends/php/app/views/monitoring.widget.favmaps.view.php
+++ b/ui/app/views/monitoring.widget.favmaps.view.php
diff --git a/frontends/php/app/views/monitoring.widget.favscreens.view.php b/ui/app/views/monitoring.widget.favscreens.view.php
index 0295c717a1b..0295c717a1b 100644
--- a/frontends/php/app/views/monitoring.widget.favscreens.view.php
+++ b/ui/app/views/monitoring.widget.favscreens.view.php
diff --git a/frontends/php/app/views/monitoring.widget.graph.view.php b/ui/app/views/monitoring.widget.graph.view.php
index c822bc14309..c822bc14309 100644
--- a/frontends/php/app/views/monitoring.widget.graph.view.php
+++ b/ui/app/views/monitoring.widget.graph.view.php
diff --git a/frontends/php/app/views/monitoring.widget.hostavail.view.php b/ui/app/views/monitoring.widget.hostavail.view.php
index d549ba75655..d549ba75655 100644
--- a/frontends/php/app/views/monitoring.widget.hostavail.view.php
+++ b/ui/app/views/monitoring.widget.hostavail.view.php
diff --git a/frontends/php/app/views/monitoring.widget.map.view.php b/ui/app/views/monitoring.widget.map.view.php
index 4796a8d66d3..4796a8d66d3 100644
--- a/frontends/php/app/views/monitoring.widget.map.view.php
+++ b/ui/app/views/monitoring.widget.map.view.php
diff --git a/frontends/php/app/views/monitoring.widget.navtree.view.php b/ui/app/views/monitoring.widget.navtree.view.php
index 2814ef903a2..2814ef903a2 100644
--- a/frontends/php/app/views/monitoring.widget.navtree.view.php
+++ b/ui/app/views/monitoring.widget.navtree.view.php
diff --git a/frontends/php/app/views/monitoring.widget.navtreeitem.edit.php b/ui/app/views/monitoring.widget.navtreeitem.edit.php
index 5762ec53a06..5762ec53a06 100644
--- a/frontends/php/app/views/monitoring.widget.navtreeitem.edit.php
+++ b/ui/app/views/monitoring.widget.navtreeitem.edit.php
diff --git a/frontends/php/app/views/monitoring.widget.plaintext.view.php b/ui/app/views/monitoring.widget.plaintext.view.php
index 3e36093f1d2..3e36093f1d2 100644
--- a/frontends/php/app/views/monitoring.widget.plaintext.view.php
+++ b/ui/app/views/monitoring.widget.plaintext.view.php
diff --git a/frontends/php/app/views/monitoring.widget.problemhosts.view.php b/ui/app/views/monitoring.widget.problemhosts.view.php
index 47458caabf7..47458caabf7 100644
--- a/frontends/php/app/views/monitoring.widget.problemhosts.view.php
+++ b/ui/app/views/monitoring.widget.problemhosts.view.php
diff --git a/frontends/php/app/views/monitoring.widget.problems.view.php b/ui/app/views/monitoring.widget.problems.view.php
index c94a73e273f..c94a73e273f 100644
--- a/frontends/php/app/views/monitoring.widget.problems.view.php
+++ b/ui/app/views/monitoring.widget.problems.view.php
diff --git a/frontends/php/app/views/monitoring.widget.problemsbysv.view.php b/ui/app/views/monitoring.widget.problemsbysv.view.php
index 725e5ab6bab..725e5ab6bab 100644
--- a/frontends/php/app/views/monitoring.widget.problemsbysv.view.php
+++ b/ui/app/views/monitoring.widget.problemsbysv.view.php
diff --git a/frontends/php/app/views/monitoring.widget.svggraph.view.php b/ui/app/views/monitoring.widget.svggraph.view.php
index 17a8ad4dbae..17a8ad4dbae 100644
--- a/frontends/php/app/views/monitoring.widget.svggraph.view.php
+++ b/ui/app/views/monitoring.widget.svggraph.view.php
diff --git a/frontends/php/app/views/monitoring.widget.systeminfo.view.php b/ui/app/views/monitoring.widget.systeminfo.view.php
index c7568a44a19..c7568a44a19 100644
--- a/frontends/php/app/views/monitoring.widget.systeminfo.view.php
+++ b/ui/app/views/monitoring.widget.systeminfo.view.php
diff --git a/frontends/php/app/views/monitoring.widget.trigover.view.php b/ui/app/views/monitoring.widget.trigover.view.php
index fa9fef9e3dd..fa9fef9e3dd 100644
--- a/frontends/php/app/views/monitoring.widget.trigover.view.php
+++ b/ui/app/views/monitoring.widget.trigover.view.php
diff --git a/frontends/php/app/views/monitoring.widget.url.view.php b/ui/app/views/monitoring.widget.url.view.php
index 9c701200378..9c701200378 100644
--- a/frontends/php/app/views/monitoring.widget.url.view.php
+++ b/ui/app/views/monitoring.widget.url.view.php
diff --git a/frontends/php/app/views/monitoring.widget.web.view.php b/ui/app/views/monitoring.widget.web.view.php
index 3a5e3dd6a66..3a5e3dd6a66 100644
--- a/frontends/php/app/views/monitoring.widget.web.view.php
+++ b/ui/app/views/monitoring.widget.web.view.php
diff --git a/frontends/php/app/views/popup.acknowledge.edit.php b/ui/app/views/popup.acknowledge.edit.php
index 2831f32f6a0..2831f32f6a0 100644
--- a/frontends/php/app/views/popup.acknowledge.edit.php
+++ b/ui/app/views/popup.acknowledge.edit.php
diff --git a/frontends/php/app/views/popup.condition.common.php b/ui/app/views/popup.condition.common.php
index 3c158688c94..3c158688c94 100644
--- a/frontends/php/app/views/popup.condition.common.php
+++ b/ui/app/views/popup.condition.common.php
diff --git a/frontends/php/app/views/popup.discovery.check.php b/ui/app/views/popup.discovery.check.php
index f02fedaf1cb..f02fedaf1cb 100644
--- a/frontends/php/app/views/popup.discovery.check.php
+++ b/ui/app/views/popup.discovery.check.php
diff --git a/frontends/php/app/views/popup.generic.php b/ui/app/views/popup.generic.php
index 1f97502a85a..1f97502a85a 100644
--- a/frontends/php/app/views/popup.generic.php
+++ b/ui/app/views/popup.generic.php
diff --git a/frontends/php/app/views/popup.httpstep.php b/ui/app/views/popup.httpstep.php
index 4835ac8286b..4835ac8286b 100644
--- a/frontends/php/app/views/popup.httpstep.php
+++ b/ui/app/views/popup.httpstep.php
diff --git a/frontends/php/app/views/popup.itemtestedit.view.php b/ui/app/views/popup.itemtestedit.view.php
index 14e35f6c1f1..14e35f6c1f1 100644
--- a/frontends/php/app/views/popup.itemtestedit.view.php
+++ b/ui/app/views/popup.itemtestedit.view.php
diff --git a/frontends/php/app/views/popup.maintenance.period.php b/ui/app/views/popup.maintenance.period.php
index 415894015d7..415894015d7 100644
--- a/frontends/php/app/views/popup.maintenance.period.php
+++ b/ui/app/views/popup.maintenance.period.php
diff --git a/frontends/php/app/views/popup.media.php b/ui/app/views/popup.media.php
index 5050ec77001..5050ec77001 100644
--- a/frontends/php/app/views/popup.media.php
+++ b/ui/app/views/popup.media.php
diff --git a/frontends/php/app/views/popup.mediatype.message.php b/ui/app/views/popup.mediatype.message.php
index 241482856e1..241482856e1 100644
--- a/frontends/php/app/views/popup.mediatype.message.php
+++ b/ui/app/views/popup.mediatype.message.php
diff --git a/frontends/php/app/views/popup.mediatypetest.edit.php b/ui/app/views/popup.mediatypetest.edit.php
index 939701659cc..939701659cc 100644
--- a/frontends/php/app/views/popup.mediatypetest.edit.php
+++ b/ui/app/views/popup.mediatypetest.edit.php
diff --git a/frontends/php/app/views/popup.operation.common.php b/ui/app/views/popup.operation.common.php
index cfdc769e908..cfdc769e908 100644
--- a/frontends/php/app/views/popup.operation.common.php
+++ b/ui/app/views/popup.operation.common.php
diff --git a/frontends/php/app/views/popup.scriptexec.php b/ui/app/views/popup.scriptexec.php
index 8e905069fcf..8e905069fcf 100644
--- a/frontends/php/app/views/popup.scriptexec.php
+++ b/ui/app/views/popup.scriptexec.php
diff --git a/frontends/php/app/views/popup.services.php b/ui/app/views/popup.services.php
index a7ca81ed094..a7ca81ed094 100644
--- a/frontends/php/app/views/popup.services.php
+++ b/ui/app/views/popup.services.php
diff --git a/frontends/php/app/views/popup.testtriggerexpr.php b/ui/app/views/popup.testtriggerexpr.php
index 4d7aa37b459..4d7aa37b459 100644
--- a/frontends/php/app/views/popup.testtriggerexpr.php
+++ b/ui/app/views/popup.testtriggerexpr.php
diff --git a/frontends/php/app/views/popup.triggerexpr.php b/ui/app/views/popup.triggerexpr.php
index 674e952eaae..674e952eaae 100644
--- a/frontends/php/app/views/popup.triggerexpr.php
+++ b/ui/app/views/popup.triggerexpr.php
diff --git a/frontends/php/app/views/popup.triggerwizard.php b/ui/app/views/popup.triggerwizard.php
index abcd67251db..abcd67251db 100644
--- a/frontends/php/app/views/popup.triggerwizard.php
+++ b/ui/app/views/popup.triggerwizard.php
diff --git a/frontends/php/app/views/popup.view.php b/ui/app/views/popup.view.php
index 97a4274ab9f..97a4274ab9f 100644
--- a/frontends/php/app/views/popup.view.php
+++ b/ui/app/views/popup.view.php
diff --git a/frontends/php/app/views/report.services.php b/ui/app/views/report.services.php
index e9310981653..e9310981653 100644
--- a/frontends/php/app/views/report.services.php
+++ b/ui/app/views/report.services.php
diff --git a/frontends/php/app/views/report.status.php b/ui/app/views/report.status.php
index 2f1db93d232..2f1db93d232 100644
--- a/frontends/php/app/views/report.status.php
+++ b/ui/app/views/report.status.php
diff --git a/frontends/php/app/views/reports.auditlog.list.php b/ui/app/views/reports.auditlog.list.php
index b4752d6fcd9..b4752d6fcd9 100644
--- a/frontends/php/app/views/reports.auditlog.list.php
+++ b/ui/app/views/reports.auditlog.list.php
diff --git a/frontends/php/app/views/search.php b/ui/app/views/search.php
index 2d2f1dad7e2..2d2f1dad7e2 100644
--- a/frontends/php/app/views/search.php
+++ b/ui/app/views/search.php
diff --git a/frontends/php/app/views/system.warning.php b/ui/app/views/system.warning.php
index f66be9f7d62..f66be9f7d62 100644
--- a/frontends/php/app/views/system.warning.php
+++ b/ui/app/views/system.warning.php
diff --git a/frontends/php/applications.php b/ui/applications.php
index f51f0cf640a..f51f0cf640a 100644
--- a/frontends/php/applications.php
+++ b/ui/applications.php
diff --git a/frontends/php/assets/.gitignore b/ui/assets/.gitignore
index cc9028b1d7b..cc9028b1d7b 100644
--- a/frontends/php/assets/.gitignore
+++ b/ui/assets/.gitignore
diff --git a/frontends/php/assets/fonts/DejaVuSans.ttf b/ui/assets/fonts/DejaVuSans.ttf
index 5267218852f..5267218852f 100644
--- a/frontends/php/assets/fonts/DejaVuSans.ttf
+++ b/ui/assets/fonts/DejaVuSans.ttf
diff --git a/frontends/php/assets/img/apple-touch-icon-120x120-precomposed.png b/ui/assets/img/apple-touch-icon-120x120-precomposed.png
index b30dba21c57..b30dba21c57 100644
--- a/frontends/php/assets/img/apple-touch-icon-120x120-precomposed.png
+++ b/ui/assets/img/apple-touch-icon-120x120-precomposed.png
diff --git a/frontends/php/assets/img/apple-touch-icon-152x152-precomposed.png b/ui/assets/img/apple-touch-icon-152x152-precomposed.png
index 45e94da83e2..45e94da83e2 100644
--- a/frontends/php/assets/img/apple-touch-icon-152x152-precomposed.png
+++ b/ui/assets/img/apple-touch-icon-152x152-precomposed.png
diff --git a/frontends/php/assets/img/apple-touch-icon-180x180-precomposed.png b/ui/assets/img/apple-touch-icon-180x180-precomposed.png
index f3ce4e1b999..f3ce4e1b999 100644
--- a/frontends/php/assets/img/apple-touch-icon-180x180-precomposed.png
+++ b/ui/assets/img/apple-touch-icon-180x180-precomposed.png
diff --git a/frontends/php/assets/img/apple-touch-icon-76x76-precomposed.png b/ui/assets/img/apple-touch-icon-76x76-precomposed.png
index c6aca1f82a3..c6aca1f82a3 100644
--- a/frontends/php/assets/img/apple-touch-icon-76x76-precomposed.png
+++ b/ui/assets/img/apple-touch-icon-76x76-precomposed.png
diff --git a/frontends/php/assets/img/browser-sprite.png b/ui/assets/img/browser-sprite.png
index 759e633f123..759e633f123 100644
--- a/frontends/php/assets/img/browser-sprite.png
+++ b/ui/assets/img/browser-sprite.png
diff --git a/frontends/php/assets/img/icon-sprite.svg b/ui/assets/img/icon-sprite.svg
index 0e255fe726d..0e255fe726d 100644
--- a/frontends/php/assets/img/icon-sprite.svg
+++ b/ui/assets/img/icon-sprite.svg
diff --git a/frontends/php/assets/img/ms-tile-144x144.png b/ui/assets/img/ms-tile-144x144.png
index 87f13aaf425..87f13aaf425 100644
--- a/frontends/php/assets/img/ms-tile-144x144.png
+++ b/ui/assets/img/ms-tile-144x144.png
diff --git a/frontends/php/assets/img/touch-icon-192x192.png b/ui/assets/img/touch-icon-192x192.png
index eb138e7d183..eb138e7d183 100644
--- a/frontends/php/assets/img/touch-icon-192x192.png
+++ b/ui/assets/img/touch-icon-192x192.png
diff --git a/frontends/php/assets/styles/blue-theme.css b/ui/assets/styles/blue-theme.css
index fe58b3a2ffd..fe58b3a2ffd 100644
--- a/frontends/php/assets/styles/blue-theme.css
+++ b/ui/assets/styles/blue-theme.css
diff --git a/frontends/php/assets/styles/dark-theme.css b/ui/assets/styles/dark-theme.css
index 39bef2cf78d..39bef2cf78d 100644
--- a/frontends/php/assets/styles/dark-theme.css
+++ b/ui/assets/styles/dark-theme.css
diff --git a/frontends/php/assets/styles/hc-dark.css b/ui/assets/styles/hc-dark.css
index bbea07f2ae3..bbea07f2ae3 100644
--- a/frontends/php/assets/styles/hc-dark.css
+++ b/ui/assets/styles/hc-dark.css
diff --git a/frontends/php/assets/styles/hc-light.css b/ui/assets/styles/hc-light.css
index fe51182bbe7..fe51182bbe7 100644
--- a/frontends/php/assets/styles/hc-light.css
+++ b/ui/assets/styles/hc-light.css
diff --git a/frontends/php/audio/alarm_average.mp3 b/ui/audio/alarm_average.mp3
index 610da5f73b5..610da5f73b5 100644
--- a/frontends/php/audio/alarm_average.mp3
+++ b/ui/audio/alarm_average.mp3
diff --git a/frontends/php/audio/alarm_disaster.mp3 b/ui/audio/alarm_disaster.mp3
index b4177f92535..b4177f92535 100644
--- a/frontends/php/audio/alarm_disaster.mp3
+++ b/ui/audio/alarm_disaster.mp3
diff --git a/frontends/php/audio/alarm_high.mp3 b/ui/audio/alarm_high.mp3
index 6b87b14a94c..6b87b14a94c 100644
--- a/frontends/php/audio/alarm_high.mp3
+++ b/ui/audio/alarm_high.mp3
diff --git a/frontends/php/audio/alarm_information.mp3 b/ui/audio/alarm_information.mp3
index 73b9b096768..73b9b096768 100644
--- a/frontends/php/audio/alarm_information.mp3
+++ b/ui/audio/alarm_information.mp3
diff --git a/frontends/php/audio/alarm_ok.mp3 b/ui/audio/alarm_ok.mp3
index e7bad989638..e7bad989638 100644
--- a/frontends/php/audio/alarm_ok.mp3
+++ b/ui/audio/alarm_ok.mp3
diff --git a/frontends/php/audio/alarm_warning.mp3 b/ui/audio/alarm_warning.mp3
index 78a0289f5ec..78a0289f5ec 100644
--- a/frontends/php/audio/alarm_warning.mp3
+++ b/ui/audio/alarm_warning.mp3
diff --git a/frontends/php/audio/no_sound.mp3 b/ui/audio/no_sound.mp3
index 5e67c0eba48..5e67c0eba48 100644
--- a/frontends/php/audio/no_sound.mp3
+++ b/ui/audio/no_sound.mp3
diff --git a/frontends/php/auditacts.php b/ui/auditacts.php
index 1a6abb4601a..1a6abb4601a 100644
--- a/frontends/php/auditacts.php
+++ b/ui/auditacts.php
diff --git a/frontends/php/browserwarning.php b/ui/browserwarning.php
index d42cb4b267b..d42cb4b267b 100644
--- a/frontends/php/browserwarning.php
+++ b/ui/browserwarning.php
diff --git a/frontends/php/chart.php b/ui/chart.php
index 57d064c97cd..57d064c97cd 100644
--- a/frontends/php/chart.php
+++ b/ui/chart.php
diff --git a/frontends/php/chart2.php b/ui/chart2.php
index de7860c23a1..de7860c23a1 100644
--- a/frontends/php/chart2.php
+++ b/ui/chart2.php
diff --git a/frontends/php/chart3.php b/ui/chart3.php
index ae3a8aca9fe..ae3a8aca9fe 100644
--- a/frontends/php/chart3.php
+++ b/ui/chart3.php
diff --git a/frontends/php/chart4.php b/ui/chart4.php
index ba8c045e306..ba8c045e306 100644
--- a/frontends/php/chart4.php
+++ b/ui/chart4.php
diff --git a/frontends/php/chart5.php b/ui/chart5.php
index b2106783e7d..b2106783e7d 100644
--- a/frontends/php/chart5.php
+++ b/ui/chart5.php
diff --git a/frontends/php/chart6.php b/ui/chart6.php
index 6407b6f145c..6407b6f145c 100644
--- a/frontends/php/chart6.php
+++ b/ui/chart6.php
diff --git a/frontends/php/chart7.php b/ui/chart7.php
index 7e683845499..7e683845499 100644
--- a/frontends/php/chart7.php
+++ b/ui/chart7.php
diff --git a/frontends/php/conf.import.php b/ui/conf.import.php
index cc2f63e2983..cc2f63e2983 100644
--- a/frontends/php/conf.import.php
+++ b/ui/conf.import.php
diff --git a/frontends/php/conf/.htaccess b/ui/conf/.htaccess
index 2509de4fcf4..2509de4fcf4 100644
--- a/frontends/php/conf/.htaccess
+++ b/ui/conf/.htaccess
diff --git a/frontends/php/conf/certs/.gitignore b/ui/conf/certs/.gitignore
index 5e7d2734cfc..5e7d2734cfc 100644
--- a/frontends/php/conf/certs/.gitignore
+++ b/ui/conf/certs/.gitignore
diff --git a/frontends/php/conf/maintenance.inc.php b/ui/conf/maintenance.inc.php
index 96516898f26..96516898f26 100644
--- a/frontends/php/conf/maintenance.inc.php
+++ b/ui/conf/maintenance.inc.php
diff --git a/frontends/php/conf/zabbix.conf.php.example b/ui/conf/zabbix.conf.php.example
index 6c5a096cf45..6c5a096cf45 100644
--- a/frontends/php/conf/zabbix.conf.php.example
+++ b/ui/conf/zabbix.conf.php.example
diff --git a/frontends/php/correlation.php b/ui/correlation.php
index 5270c50ebc3..5270c50ebc3 100644
--- a/frontends/php/correlation.php
+++ b/ui/correlation.php
diff --git a/frontends/php/disc_prototypes.php b/ui/disc_prototypes.php
index c81bf625b6e..c81bf625b6e 100644
--- a/frontends/php/disc_prototypes.php
+++ b/ui/disc_prototypes.php
diff --git a/frontends/php/discoveryconf.php b/ui/discoveryconf.php
index f56913d10df..f56913d10df 100644
--- a/frontends/php/discoveryconf.php
+++ b/ui/discoveryconf.php
diff --git a/frontends/php/favicon.ico b/ui/favicon.ico
index 4b1f7a48bda..4b1f7a48bda 100644
--- a/frontends/php/favicon.ico
+++ b/ui/favicon.ico
diff --git a/frontends/php/graphs.php b/ui/graphs.php
index ceabf5ad262..ceabf5ad262 100644
--- a/frontends/php/graphs.php
+++ b/ui/graphs.php
diff --git a/frontends/php/history.php b/ui/history.php
index 4cb1b86ef9d..4cb1b86ef9d 100644
--- a/frontends/php/history.php
+++ b/ui/history.php
diff --git a/frontends/php/host_discovery.php b/ui/host_discovery.php
index 823235a94b6..823235a94b6 100644
--- a/frontends/php/host_discovery.php
+++ b/ui/host_discovery.php
diff --git a/frontends/php/host_prototypes.php b/ui/host_prototypes.php
index ed2ed17cbff..ed2ed17cbff 100644
--- a/frontends/php/host_prototypes.php
+++ b/ui/host_prototypes.php
diff --git a/frontends/php/host_screen.php b/ui/host_screen.php
index 8ea7d98f4ab..8ea7d98f4ab 100644
--- a/frontends/php/host_screen.php
+++ b/ui/host_screen.php
diff --git a/frontends/php/hostgroups.php b/ui/hostgroups.php
index 4c828edc3ae..4c828edc3ae 100644
--- a/frontends/php/hostgroups.php
+++ b/ui/hostgroups.php
diff --git a/frontends/php/hostinventories.php b/ui/hostinventories.php
index 348a9490f3a..348a9490f3a 100644
--- a/frontends/php/hostinventories.php
+++ b/ui/hostinventories.php
diff --git a/frontends/php/hostinventoriesoverview.php b/ui/hostinventoriesoverview.php
index 3b8f01de3af..3b8f01de3af 100644
--- a/frontends/php/hostinventoriesoverview.php
+++ b/ui/hostinventoriesoverview.php
diff --git a/frontends/php/hosts.php b/ui/hosts.php
index bbfd268f04e..bbfd268f04e 100644
--- a/frontends/php/hosts.php
+++ b/ui/hosts.php
diff --git a/frontends/php/httpconf.php b/ui/httpconf.php
index 9be3c181e1d..9be3c181e1d 100644
--- a/frontends/php/httpconf.php
+++ b/ui/httpconf.php
diff --git a/frontends/php/httpdetails.php b/ui/httpdetails.php
index 3f9bd204cde..3f9bd204cde 100644
--- a/frontends/php/httpdetails.php
+++ b/ui/httpdetails.php
diff --git a/frontends/php/image.php b/ui/image.php
index 8d00924e6c8..8d00924e6c8 100644
--- a/frontends/php/image.php
+++ b/ui/image.php
diff --git a/frontends/php/imgstore.php b/ui/imgstore.php
index b28874db17e..b28874db17e 100644
--- a/frontends/php/imgstore.php
+++ b/ui/imgstore.php
diff --git a/frontends/php/include/.htaccess b/ui/include/.htaccess
index 2509de4fcf4..2509de4fcf4 100644
--- a/frontends/php/include/.htaccess
+++ b/ui/include/.htaccess
diff --git a/frontends/php/include/actions.inc.php b/ui/include/actions.inc.php
index e3fb39d9ef8..e3fb39d9ef8 100644
--- a/frontends/php/include/actions.inc.php
+++ b/ui/include/actions.inc.php
diff --git a/frontends/php/include/audit.inc.php b/ui/include/audit.inc.php
index bec79a38703..bec79a38703 100644
--- a/frontends/php/include/audit.inc.php
+++ b/ui/include/audit.inc.php
diff --git a/frontends/php/include/blocks.inc.php b/ui/include/blocks.inc.php
index 64486dd1056..64486dd1056 100644
--- a/frontends/php/include/blocks.inc.php
+++ b/ui/include/blocks.inc.php
diff --git a/frontends/php/include/classes/api/API.php b/ui/include/classes/api/API.php
index 739ed07c633..739ed07c633 100644
--- a/frontends/php/include/classes/api/API.php
+++ b/ui/include/classes/api/API.php
diff --git a/frontends/php/include/classes/api/APIException.php b/ui/include/classes/api/APIException.php
index 16d58208949..16d58208949 100644
--- a/frontends/php/include/classes/api/APIException.php
+++ b/ui/include/classes/api/APIException.php
diff --git a/frontends/php/include/classes/api/CApiClientResponse.php b/ui/include/classes/api/CApiClientResponse.php
index 3fac0c49f77..3fac0c49f77 100644
--- a/frontends/php/include/classes/api/CApiClientResponse.php
+++ b/ui/include/classes/api/CApiClientResponse.php
diff --git a/frontends/php/include/classes/api/CApiService.php b/ui/include/classes/api/CApiService.php
index d449b3fc5fa..d449b3fc5fa 100644
--- a/frontends/php/include/classes/api/CApiService.php
+++ b/ui/include/classes/api/CApiService.php
diff --git a/frontends/php/include/classes/api/CApiServiceFactory.php b/ui/include/classes/api/CApiServiceFactory.php
index bb391255450..bb391255450 100644
--- a/frontends/php/include/classes/api/CApiServiceFactory.php
+++ b/ui/include/classes/api/CApiServiceFactory.php
diff --git a/frontends/php/include/classes/api/CAudit.php b/ui/include/classes/api/CAudit.php
index 7d0c7fe6229..7d0c7fe6229 100644
--- a/frontends/php/include/classes/api/CAudit.php
+++ b/ui/include/classes/api/CAudit.php
diff --git a/frontends/php/include/classes/api/CRelationMap.php b/ui/include/classes/api/CRelationMap.php
index 717f817b1a9..717f817b1a9 100644
--- a/frontends/php/include/classes/api/CRelationMap.php
+++ b/ui/include/classes/api/CRelationMap.php
diff --git a/frontends/php/include/classes/api/clients/CApiClient.php b/ui/include/classes/api/clients/CApiClient.php
index 678f2f436b1..678f2f436b1 100644
--- a/frontends/php/include/classes/api/clients/CApiClient.php
+++ b/ui/include/classes/api/clients/CApiClient.php
diff --git a/frontends/php/include/classes/api/clients/CLocalApiClient.php b/ui/include/classes/api/clients/CLocalApiClient.php
index 3f369186735..3f369186735 100644
--- a/frontends/php/include/classes/api/clients/CLocalApiClient.php
+++ b/ui/include/classes/api/clients/CLocalApiClient.php
diff --git a/frontends/php/include/classes/api/helpers/CApiHostHelper.php b/ui/include/classes/api/helpers/CApiHostHelper.php
index b8435638963..b8435638963 100644
--- a/frontends/php/include/classes/api/helpers/CApiHostHelper.php
+++ b/ui/include/classes/api/helpers/CApiHostHelper.php
diff --git a/frontends/php/include/classes/api/helpers/CApiTagHelper.php b/ui/include/classes/api/helpers/CApiTagHelper.php
index 17b847d9275..17b847d9275 100644
--- a/frontends/php/include/classes/api/helpers/CApiTagHelper.php
+++ b/ui/include/classes/api/helpers/CApiTagHelper.php
diff --git a/frontends/php/include/classes/api/managers/CApplicationManager.php b/ui/include/classes/api/managers/CApplicationManager.php
index 30f0f5236c8..30f0f5236c8 100644
--- a/frontends/php/include/classes/api/managers/CApplicationManager.php
+++ b/ui/include/classes/api/managers/CApplicationManager.php
diff --git a/frontends/php/include/classes/api/managers/CGraphManager.php b/ui/include/classes/api/managers/CGraphManager.php
index 9004509f293..9004509f293 100644
--- a/frontends/php/include/classes/api/managers/CGraphManager.php
+++ b/ui/include/classes/api/managers/CGraphManager.php
diff --git a/frontends/php/include/classes/api/managers/CGraphPrototypeManager.php b/ui/include/classes/api/managers/CGraphPrototypeManager.php
index dc239b72ced..dc239b72ced 100644
--- a/frontends/php/include/classes/api/managers/CGraphPrototypeManager.php
+++ b/ui/include/classes/api/managers/CGraphPrototypeManager.php
diff --git a/frontends/php/include/classes/api/managers/CHistoryManager.php b/ui/include/classes/api/managers/CHistoryManager.php
index 7e492d6dd2b..7e492d6dd2b 100644
--- a/frontends/php/include/classes/api/managers/CHistoryManager.php
+++ b/ui/include/classes/api/managers/CHistoryManager.php
diff --git a/frontends/php/include/classes/api/managers/CHttpTestManager.php b/ui/include/classes/api/managers/CHttpTestManager.php
index a528b1bb793..a528b1bb793 100644
--- a/frontends/php/include/classes/api/managers/CHttpTestManager.php
+++ b/ui/include/classes/api/managers/CHttpTestManager.php
diff --git a/frontends/php/include/classes/api/managers/CItemManager.php b/ui/include/classes/api/managers/CItemManager.php
index f9d08099f17..f9d08099f17 100644
--- a/frontends/php/include/classes/api/managers/CItemManager.php
+++ b/ui/include/classes/api/managers/CItemManager.php
diff --git a/frontends/php/include/classes/api/managers/CItemPrototypeManager.php b/ui/include/classes/api/managers/CItemPrototypeManager.php
index b32a9e4ca1c..b32a9e4ca1c 100644
--- a/frontends/php/include/classes/api/managers/CItemPrototypeManager.php
+++ b/ui/include/classes/api/managers/CItemPrototypeManager.php
diff --git a/frontends/php/include/classes/api/managers/CTriggerManager.php b/ui/include/classes/api/managers/CTriggerManager.php
index 3dc3b314e0a..3dc3b314e0a 100644
--- a/frontends/php/include/classes/api/managers/CTriggerManager.php
+++ b/ui/include/classes/api/managers/CTriggerManager.php
diff --git a/frontends/php/include/classes/api/managers/CTriggerPrototypeManager.php b/ui/include/classes/api/managers/CTriggerPrototypeManager.php
index 5b37c3174b4..5b37c3174b4 100644
--- a/frontends/php/include/classes/api/managers/CTriggerPrototypeManager.php
+++ b/ui/include/classes/api/managers/CTriggerPrototypeManager.php
diff --git a/frontends/php/include/classes/api/services/CAPIInfo.php b/ui/include/classes/api/services/CAPIInfo.php
index b6d25643312..b6d25643312 100644
--- a/frontends/php/include/classes/api/services/CAPIInfo.php
+++ b/ui/include/classes/api/services/CAPIInfo.php
diff --git a/frontends/php/include/classes/api/services/CAction.php b/ui/include/classes/api/services/CAction.php
index 995af5c6d73..995af5c6d73 100644
--- a/frontends/php/include/classes/api/services/CAction.php
+++ b/ui/include/classes/api/services/CAction.php
diff --git a/frontends/php/include/classes/api/services/CAlert.php b/ui/include/classes/api/services/CAlert.php
index d443eabd6b3..d443eabd6b3 100644
--- a/frontends/php/include/classes/api/services/CAlert.php
+++ b/ui/include/classes/api/services/CAlert.php
diff --git a/frontends/php/include/classes/api/services/CApplication.php b/ui/include/classes/api/services/CApplication.php
index 84b07db1546..84b07db1546 100644
--- a/frontends/php/include/classes/api/services/CApplication.php
+++ b/ui/include/classes/api/services/CApplication.php
diff --git a/frontends/php/include/classes/api/services/CAuditLog.php b/ui/include/classes/api/services/CAuditLog.php
index a03d6c6772a..a03d6c6772a 100644
--- a/frontends/php/include/classes/api/services/CAuditLog.php
+++ b/ui/include/classes/api/services/CAuditLog.php
diff --git a/frontends/php/include/classes/api/services/CAutoregistration.php b/ui/include/classes/api/services/CAutoregistration.php
index 4f3d302309a..4f3d302309a 100644
--- a/frontends/php/include/classes/api/services/CAutoregistration.php
+++ b/ui/include/classes/api/services/CAutoregistration.php
diff --git a/frontends/php/include/classes/api/services/CConfiguration.php b/ui/include/classes/api/services/CConfiguration.php
index 6bcb32006b4..6bcb32006b4 100644
--- a/frontends/php/include/classes/api/services/CConfiguration.php
+++ b/ui/include/classes/api/services/CConfiguration.php
diff --git a/frontends/php/include/classes/api/services/CCorrelation.php b/ui/include/classes/api/services/CCorrelation.php
index 22c9b37b8f1..22c9b37b8f1 100644
--- a/frontends/php/include/classes/api/services/CCorrelation.php
+++ b/ui/include/classes/api/services/CCorrelation.php
diff --git a/frontends/php/include/classes/api/services/CDCheck.php b/ui/include/classes/api/services/CDCheck.php
index 06ca6c181d7..06ca6c181d7 100644
--- a/frontends/php/include/classes/api/services/CDCheck.php
+++ b/ui/include/classes/api/services/CDCheck.php
diff --git a/frontends/php/include/classes/api/services/CDHost.php b/ui/include/classes/api/services/CDHost.php
index 4f65ed64bf0..4f65ed64bf0 100644
--- a/frontends/php/include/classes/api/services/CDHost.php
+++ b/ui/include/classes/api/services/CDHost.php
diff --git a/frontends/php/include/classes/api/services/CDRule.php b/ui/include/classes/api/services/CDRule.php
index 0c984c50519..0c984c50519 100644
--- a/frontends/php/include/classes/api/services/CDRule.php
+++ b/ui/include/classes/api/services/CDRule.php
diff --git a/frontends/php/include/classes/api/services/CDService.php b/ui/include/classes/api/services/CDService.php
index 78d57a0c4e3..78d57a0c4e3 100644
--- a/frontends/php/include/classes/api/services/CDService.php
+++ b/ui/include/classes/api/services/CDService.php
diff --git a/frontends/php/include/classes/api/services/CDashboard.php b/ui/include/classes/api/services/CDashboard.php
index e4bd8cade87..e4bd8cade87 100644
--- a/frontends/php/include/classes/api/services/CDashboard.php
+++ b/ui/include/classes/api/services/CDashboard.php
diff --git a/frontends/php/include/classes/api/services/CDiscoveryRule.php b/ui/include/classes/api/services/CDiscoveryRule.php
index 70103a6fddc..70103a6fddc 100644
--- a/frontends/php/include/classes/api/services/CDiscoveryRule.php
+++ b/ui/include/classes/api/services/CDiscoveryRule.php
diff --git a/frontends/php/include/classes/api/services/CEvent.php b/ui/include/classes/api/services/CEvent.php
index 8563ab21322..8563ab21322 100644
--- a/frontends/php/include/classes/api/services/CEvent.php
+++ b/ui/include/classes/api/services/CEvent.php
diff --git a/frontends/php/include/classes/api/services/CGraph.php b/ui/include/classes/api/services/CGraph.php
index b37099d6393..b37099d6393 100644
--- a/frontends/php/include/classes/api/services/CGraph.php
+++ b/ui/include/classes/api/services/CGraph.php
diff --git a/frontends/php/include/classes/api/services/CGraphGeneral.php b/ui/include/classes/api/services/CGraphGeneral.php
index 58cf4fd1d51..58cf4fd1d51 100644
--- a/frontends/php/include/classes/api/services/CGraphGeneral.php
+++ b/ui/include/classes/api/services/CGraphGeneral.php
diff --git a/frontends/php/include/classes/api/services/CGraphItem.php b/ui/include/classes/api/services/CGraphItem.php
index 9e8e92e90e3..9e8e92e90e3 100644
--- a/frontends/php/include/classes/api/services/CGraphItem.php
+++ b/ui/include/classes/api/services/CGraphItem.php
diff --git a/frontends/php/include/classes/api/services/CGraphPrototype.php b/ui/include/classes/api/services/CGraphPrototype.php
index 1931788e5ef..1931788e5ef 100644
--- a/frontends/php/include/classes/api/services/CGraphPrototype.php
+++ b/ui/include/classes/api/services/CGraphPrototype.php
diff --git a/frontends/php/include/classes/api/services/CHistory.php b/ui/include/classes/api/services/CHistory.php
index a9ec4754b72..a9ec4754b72 100644
--- a/frontends/php/include/classes/api/services/CHistory.php
+++ b/ui/include/classes/api/services/CHistory.php
diff --git a/frontends/php/include/classes/api/services/CHost.php b/ui/include/classes/api/services/CHost.php
index eed7d63a6bb..eed7d63a6bb 100644
--- a/frontends/php/include/classes/api/services/CHost.php
+++ b/ui/include/classes/api/services/CHost.php
diff --git a/frontends/php/include/classes/api/services/CHostBase.php b/ui/include/classes/api/services/CHostBase.php
index 46679d141a5..46679d141a5 100644
--- a/frontends/php/include/classes/api/services/CHostBase.php
+++ b/ui/include/classes/api/services/CHostBase.php
diff --git a/frontends/php/include/classes/api/services/CHostGeneral.php b/ui/include/classes/api/services/CHostGeneral.php
index 282bc86b292..282bc86b292 100644
--- a/frontends/php/include/classes/api/services/CHostGeneral.php
+++ b/ui/include/classes/api/services/CHostGeneral.php
diff --git a/frontends/php/include/classes/api/services/CHostGroup.php b/ui/include/classes/api/services/CHostGroup.php
index 25a4ada7b5a..25a4ada7b5a 100644
--- a/frontends/php/include/classes/api/services/CHostGroup.php
+++ b/ui/include/classes/api/services/CHostGroup.php
diff --git a/frontends/php/include/classes/api/services/CHostInterface.php b/ui/include/classes/api/services/CHostInterface.php
index bae9713a13b..bae9713a13b 100644
--- a/frontends/php/include/classes/api/services/CHostInterface.php
+++ b/ui/include/classes/api/services/CHostInterface.php
diff --git a/frontends/php/include/classes/api/services/CHostPrototype.php b/ui/include/classes/api/services/CHostPrototype.php
index aced54828a7..aced54828a7 100644
--- a/frontends/php/include/classes/api/services/CHostPrototype.php
+++ b/ui/include/classes/api/services/CHostPrototype.php
diff --git a/frontends/php/include/classes/api/services/CHttpTest.php b/ui/include/classes/api/services/CHttpTest.php
index 728d9afb8e9..728d9afb8e9 100644
--- a/frontends/php/include/classes/api/services/CHttpTest.php
+++ b/ui/include/classes/api/services/CHttpTest.php
diff --git a/frontends/php/include/classes/api/services/CIconMap.php b/ui/include/classes/api/services/CIconMap.php
index 944fd136191..944fd136191 100644
--- a/frontends/php/include/classes/api/services/CIconMap.php
+++ b/ui/include/classes/api/services/CIconMap.php
diff --git a/frontends/php/include/classes/api/services/CImage.php b/ui/include/classes/api/services/CImage.php
index 05117cfbb16..05117cfbb16 100644
--- a/frontends/php/include/classes/api/services/CImage.php
+++ b/ui/include/classes/api/services/CImage.php
diff --git a/frontends/php/include/classes/api/services/CItem.php b/ui/include/classes/api/services/CItem.php
index 4e87a7f645b..4e87a7f645b 100644
--- a/frontends/php/include/classes/api/services/CItem.php
+++ b/ui/include/classes/api/services/CItem.php
diff --git a/frontends/php/include/classes/api/services/CItemGeneral.php b/ui/include/classes/api/services/CItemGeneral.php
index e0d7fc68ab6..e0d7fc68ab6 100644
--- a/frontends/php/include/classes/api/services/CItemGeneral.php
+++ b/ui/include/classes/api/services/CItemGeneral.php
diff --git a/frontends/php/include/classes/api/services/CItemPrototype.php b/ui/include/classes/api/services/CItemPrototype.php
index d0672207e72..d0672207e72 100644
--- a/frontends/php/include/classes/api/services/CItemPrototype.php
+++ b/ui/include/classes/api/services/CItemPrototype.php
diff --git a/frontends/php/include/classes/api/services/CMaintenance.php b/ui/include/classes/api/services/CMaintenance.php
index 7ff053b6d75..7ff053b6d75 100644
--- a/frontends/php/include/classes/api/services/CMaintenance.php
+++ b/ui/include/classes/api/services/CMaintenance.php
diff --git a/frontends/php/include/classes/api/services/CMap.php b/ui/include/classes/api/services/CMap.php
index 10beef84ebb..10beef84ebb 100644
--- a/frontends/php/include/classes/api/services/CMap.php
+++ b/ui/include/classes/api/services/CMap.php
diff --git a/frontends/php/include/classes/api/services/CMapElement.php b/ui/include/classes/api/services/CMapElement.php
index ee989585630..ee989585630 100644
--- a/frontends/php/include/classes/api/services/CMapElement.php
+++ b/ui/include/classes/api/services/CMapElement.php
diff --git a/frontends/php/include/classes/api/services/CMediatype.php b/ui/include/classes/api/services/CMediatype.php
index de58030dc3d..de58030dc3d 100644
--- a/frontends/php/include/classes/api/services/CMediatype.php
+++ b/ui/include/classes/api/services/CMediatype.php
diff --git a/frontends/php/include/classes/api/services/CModule.php b/ui/include/classes/api/services/CModule.php
index 6bc9e5e11f7..6bc9e5e11f7 100644
--- a/frontends/php/include/classes/api/services/CModule.php
+++ b/ui/include/classes/api/services/CModule.php
diff --git a/frontends/php/include/classes/api/services/CProblem.php b/ui/include/classes/api/services/CProblem.php
index c9a58d9cbae..c9a58d9cbae 100644
--- a/frontends/php/include/classes/api/services/CProblem.php
+++ b/ui/include/classes/api/services/CProblem.php
diff --git a/frontends/php/include/classes/api/services/CProxy.php b/ui/include/classes/api/services/CProxy.php
index cff5920d6e5..cff5920d6e5 100644
--- a/frontends/php/include/classes/api/services/CProxy.php
+++ b/ui/include/classes/api/services/CProxy.php
diff --git a/frontends/php/include/classes/api/services/CScreen.php b/ui/include/classes/api/services/CScreen.php
index 1fb3c34bff2..1fb3c34bff2 100644
--- a/frontends/php/include/classes/api/services/CScreen.php
+++ b/ui/include/classes/api/services/CScreen.php
diff --git a/frontends/php/include/classes/api/services/CScreenItem.php b/ui/include/classes/api/services/CScreenItem.php
index 0e4517747cd..0e4517747cd 100644
--- a/frontends/php/include/classes/api/services/CScreenItem.php
+++ b/ui/include/classes/api/services/CScreenItem.php
diff --git a/frontends/php/include/classes/api/services/CScript.php b/ui/include/classes/api/services/CScript.php
index 7534b1e54b3..7534b1e54b3 100644
--- a/frontends/php/include/classes/api/services/CScript.php
+++ b/ui/include/classes/api/services/CScript.php
diff --git a/frontends/php/include/classes/api/services/CService.php b/ui/include/classes/api/services/CService.php
index 504b957727a..504b957727a 100644
--- a/frontends/php/include/classes/api/services/CService.php
+++ b/ui/include/classes/api/services/CService.php
diff --git a/frontends/php/include/classes/api/services/CTask.php b/ui/include/classes/api/services/CTask.php
index af2bf88a4bb..af2bf88a4bb 100644
--- a/frontends/php/include/classes/api/services/CTask.php
+++ b/ui/include/classes/api/services/CTask.php
diff --git a/frontends/php/include/classes/api/services/CTemplate.php b/ui/include/classes/api/services/CTemplate.php
index 214d213e9cc..214d213e9cc 100644
--- a/frontends/php/include/classes/api/services/CTemplate.php
+++ b/ui/include/classes/api/services/CTemplate.php
diff --git a/frontends/php/include/classes/api/services/CTemplateScreen.php b/ui/include/classes/api/services/CTemplateScreen.php
index 5bd9ac7cc66..5bd9ac7cc66 100644
--- a/frontends/php/include/classes/api/services/CTemplateScreen.php
+++ b/ui/include/classes/api/services/CTemplateScreen.php
diff --git a/frontends/php/include/classes/api/services/CTemplateScreenItem.php b/ui/include/classes/api/services/CTemplateScreenItem.php
index 678b7a6d398..678b7a6d398 100644
--- a/frontends/php/include/classes/api/services/CTemplateScreenItem.php
+++ b/ui/include/classes/api/services/CTemplateScreenItem.php
diff --git a/frontends/php/include/classes/api/services/CTrend.php b/ui/include/classes/api/services/CTrend.php
index 2026f5a2e9d..2026f5a2e9d 100644
--- a/frontends/php/include/classes/api/services/CTrend.php
+++ b/ui/include/classes/api/services/CTrend.php
diff --git a/frontends/php/include/classes/api/services/CTrigger.php b/ui/include/classes/api/services/CTrigger.php
index 517a10492eb..517a10492eb 100644
--- a/frontends/php/include/classes/api/services/CTrigger.php
+++ b/ui/include/classes/api/services/CTrigger.php
diff --git a/frontends/php/include/classes/api/services/CTriggerGeneral.php b/ui/include/classes/api/services/CTriggerGeneral.php
index be1caf388bc..be1caf388bc 100644
--- a/frontends/php/include/classes/api/services/CTriggerGeneral.php
+++ b/ui/include/classes/api/services/CTriggerGeneral.php
diff --git a/frontends/php/include/classes/api/services/CTriggerPrototype.php b/ui/include/classes/api/services/CTriggerPrototype.php
index f7ba4a2532c..f7ba4a2532c 100644
--- a/frontends/php/include/classes/api/services/CTriggerPrototype.php
+++ b/ui/include/classes/api/services/CTriggerPrototype.php
diff --git a/frontends/php/include/classes/api/services/CUser.php b/ui/include/classes/api/services/CUser.php
index c37d75477f2..c37d75477f2 100644
--- a/frontends/php/include/classes/api/services/CUser.php
+++ b/ui/include/classes/api/services/CUser.php
diff --git a/frontends/php/include/classes/api/services/CUserGroup.php b/ui/include/classes/api/services/CUserGroup.php
index 9fd58bd7652..9fd58bd7652 100644
--- a/frontends/php/include/classes/api/services/CUserGroup.php
+++ b/ui/include/classes/api/services/CUserGroup.php
diff --git a/frontends/php/include/classes/api/services/CUserMacro.php b/ui/include/classes/api/services/CUserMacro.php
index fce2708977b..fce2708977b 100644
--- a/frontends/php/include/classes/api/services/CUserMacro.php
+++ b/ui/include/classes/api/services/CUserMacro.php
diff --git a/frontends/php/include/classes/api/services/CValueMap.php b/ui/include/classes/api/services/CValueMap.php
index 23678abcfca..23678abcfca 100644
--- a/frontends/php/include/classes/api/services/CValueMap.php
+++ b/ui/include/classes/api/services/CValueMap.php
diff --git a/frontends/php/include/classes/api/wrappers/CApiWrapper.php b/ui/include/classes/api/wrappers/CApiWrapper.php
index 7b87cb777e3..7b87cb777e3 100644
--- a/frontends/php/include/classes/api/wrappers/CApiWrapper.php
+++ b/ui/include/classes/api/wrappers/CApiWrapper.php
diff --git a/frontends/php/include/classes/api/wrappers/CFrontendApiWrapper.php b/ui/include/classes/api/wrappers/CFrontendApiWrapper.php
index ef17f48bd52..ef17f48bd52 100644
--- a/frontends/php/include/classes/api/wrappers/CFrontendApiWrapper.php
+++ b/ui/include/classes/api/wrappers/CFrontendApiWrapper.php
diff --git a/frontends/php/include/classes/core/APP.php b/ui/include/classes/core/APP.php
index 6171f77b0e6..6171f77b0e6 100644
--- a/frontends/php/include/classes/core/APP.php
+++ b/ui/include/classes/core/APP.php
diff --git a/frontends/php/include/classes/core/CAjaxResponse.php b/ui/include/classes/core/CAjaxResponse.php
index 4ec12e63057..4ec12e63057 100644
--- a/frontends/php/include/classes/core/CAjaxResponse.php
+++ b/ui/include/classes/core/CAjaxResponse.php
diff --git a/frontends/php/include/classes/core/CAutoloader.php b/ui/include/classes/core/CAutoloader.php
index 982294469c5..982294469c5 100644
--- a/frontends/php/include/classes/core/CAutoloader.php
+++ b/ui/include/classes/core/CAutoloader.php
diff --git a/frontends/php/include/classes/core/CComponentRegistry.php b/ui/include/classes/core/CComponentRegistry.php
index 1e8187d8b6c..1e8187d8b6c 100644
--- a/frontends/php/include/classes/core/CComponentRegistry.php
+++ b/ui/include/classes/core/CComponentRegistry.php
diff --git a/frontends/php/include/classes/core/CConfigFile.php b/ui/include/classes/core/CConfigFile.php
index 0caa34b07d0..0caa34b07d0 100644
--- a/frontends/php/include/classes/core/CConfigFile.php
+++ b/ui/include/classes/core/CConfigFile.php
diff --git a/frontends/php/include/classes/core/CHttpRequest.php b/ui/include/classes/core/CHttpRequest.php
index ae85ae1d332..ae85ae1d332 100644
--- a/frontends/php/include/classes/core/CHttpRequest.php
+++ b/ui/include/classes/core/CHttpRequest.php
diff --git a/frontends/php/include/classes/core/CJsonRpc.php b/ui/include/classes/core/CJsonRpc.php
index ea4c9b91f52..ea4c9b91f52 100644
--- a/frontends/php/include/classes/core/CJsonRpc.php
+++ b/ui/include/classes/core/CJsonRpc.php
diff --git a/frontends/php/include/classes/core/CModule.php b/ui/include/classes/core/CModule.php
index f2accd2efa6..f2accd2efa6 100644
--- a/frontends/php/include/classes/core/CModule.php
+++ b/ui/include/classes/core/CModule.php
diff --git a/frontends/php/include/classes/core/CModuleManager.php b/ui/include/classes/core/CModuleManager.php
index dbadd1f9429..dbadd1f9429 100644
--- a/frontends/php/include/classes/core/CModuleManager.php
+++ b/ui/include/classes/core/CModuleManager.php
diff --git a/frontends/php/include/classes/core/CRegistryFactory.php b/ui/include/classes/core/CRegistryFactory.php
index 25fcd1dda3e..25fcd1dda3e 100644
--- a/frontends/php/include/classes/core/CRegistryFactory.php
+++ b/ui/include/classes/core/CRegistryFactory.php
diff --git a/frontends/php/include/classes/core/CSession.php b/ui/include/classes/core/CSession.php
index 72f22eac608..72f22eac608 100644
--- a/frontends/php/include/classes/core/CSession.php
+++ b/ui/include/classes/core/CSession.php
diff --git a/frontends/php/include/classes/core/ConfigFileException.php b/ui/include/classes/core/ConfigFileException.php
index e308c0ba0fd..e308c0ba0fd 100644
--- a/frontends/php/include/classes/core/ConfigFileException.php
+++ b/ui/include/classes/core/ConfigFileException.php
diff --git a/frontends/php/include/classes/core/Manager.php b/ui/include/classes/core/Manager.php
index 58ec092cffd..58ec092cffd 100644
--- a/frontends/php/include/classes/core/Manager.php
+++ b/ui/include/classes/core/Manager.php
diff --git a/frontends/php/include/classes/core/ZBase.php b/ui/include/classes/core/ZBase.php
index 9de44eb2348..9de44eb2348 100644
--- a/frontends/php/include/classes/core/ZBase.php
+++ b/ui/include/classes/core/ZBase.php
diff --git a/frontends/php/include/classes/db/DB.php b/ui/include/classes/db/DB.php
index 97095486b2c..97095486b2c 100644
--- a/frontends/php/include/classes/db/DB.php
+++ b/ui/include/classes/db/DB.php
diff --git a/frontends/php/include/classes/db/DBException.php b/ui/include/classes/db/DBException.php
index 4a4e147c274..4a4e147c274 100644
--- a/frontends/php/include/classes/db/DBException.php
+++ b/ui/include/classes/db/DBException.php
diff --git a/frontends/php/include/classes/db/DbBackend.php b/ui/include/classes/db/DbBackend.php
index 4b81f270ca1..4b81f270ca1 100644
--- a/frontends/php/include/classes/db/DbBackend.php
+++ b/ui/include/classes/db/DbBackend.php
diff --git a/frontends/php/include/classes/db/MysqlDbBackend.php b/ui/include/classes/db/MysqlDbBackend.php
index 6f8a46b69da..6f8a46b69da 100644
--- a/frontends/php/include/classes/db/MysqlDbBackend.php
+++ b/ui/include/classes/db/MysqlDbBackend.php
diff --git a/frontends/php/include/classes/db/OracleDbBackend.php b/ui/include/classes/db/OracleDbBackend.php
index 85b28d5a6f3..85b28d5a6f3 100644
--- a/frontends/php/include/classes/db/OracleDbBackend.php
+++ b/ui/include/classes/db/OracleDbBackend.php
diff --git a/frontends/php/include/classes/db/PostgresqlDbBackend.php b/ui/include/classes/db/PostgresqlDbBackend.php
index c350ecc7209..c350ecc7209 100644
--- a/frontends/php/include/classes/db/PostgresqlDbBackend.php
+++ b/ui/include/classes/db/PostgresqlDbBackend.php
diff --git a/frontends/php/include/classes/debug/CProfiler.php b/ui/include/classes/debug/CProfiler.php
index 03a492384be..03a492384be 100644
--- a/frontends/php/include/classes/debug/CProfiler.php
+++ b/ui/include/classes/debug/CProfiler.php
diff --git a/frontends/php/include/classes/export/CConfigurationExport.php b/ui/include/classes/export/CConfigurationExport.php
index e83c3221e54..e83c3221e54 100644
--- a/frontends/php/include/classes/export/CConfigurationExport.php
+++ b/ui/include/classes/export/CConfigurationExport.php
diff --git a/frontends/php/include/classes/export/CConfigurationExportBuilder.php b/ui/include/classes/export/CConfigurationExportBuilder.php
index e799264405e..e799264405e 100644
--- a/frontends/php/include/classes/export/CConfigurationExportBuilder.php
+++ b/ui/include/classes/export/CConfigurationExportBuilder.php
diff --git a/frontends/php/include/classes/export/CConfigurationExportException.php b/ui/include/classes/export/CConfigurationExportException.php
index 3e3ec2bdfa6..3e3ec2bdfa6 100644
--- a/frontends/php/include/classes/export/CConfigurationExportException.php
+++ b/ui/include/classes/export/CConfigurationExportException.php
diff --git a/frontends/php/include/classes/export/writers/CExportWriter.php b/ui/include/classes/export/writers/CExportWriter.php
index 4fe01999665..4fe01999665 100644
--- a/frontends/php/include/classes/export/writers/CExportWriter.php
+++ b/ui/include/classes/export/writers/CExportWriter.php
diff --git a/frontends/php/include/classes/export/writers/CExportWriterFactory.php b/ui/include/classes/export/writers/CExportWriterFactory.php
index ed36c368f9f..ed36c368f9f 100644
--- a/frontends/php/include/classes/export/writers/CExportWriterFactory.php
+++ b/ui/include/classes/export/writers/CExportWriterFactory.php
diff --git a/frontends/php/include/classes/export/writers/CJsonExportWriter.php b/ui/include/classes/export/writers/CJsonExportWriter.php
index 3c2d530b36b..3c2d530b36b 100644
--- a/frontends/php/include/classes/export/writers/CJsonExportWriter.php
+++ b/ui/include/classes/export/writers/CJsonExportWriter.php
diff --git a/frontends/php/include/classes/export/writers/CXmlExportWriter.php b/ui/include/classes/export/writers/CXmlExportWriter.php
index 59283d50a56..59283d50a56 100644
--- a/frontends/php/include/classes/export/writers/CXmlExportWriter.php
+++ b/ui/include/classes/export/writers/CXmlExportWriter.php
diff --git a/frontends/php/include/classes/graph/CSvgGraph.php b/ui/include/classes/graph/CSvgGraph.php
index afb61545493..afb61545493 100644
--- a/frontends/php/include/classes/graph/CSvgGraph.php
+++ b/ui/include/classes/graph/CSvgGraph.php
diff --git a/frontends/php/include/classes/graphdraw/CGraphDraw.php b/ui/include/classes/graphdraw/CGraphDraw.php
index 62fd5abb747..62fd5abb747 100644
--- a/frontends/php/include/classes/graphdraw/CGraphDraw.php
+++ b/ui/include/classes/graphdraw/CGraphDraw.php
diff --git a/frontends/php/include/classes/graphdraw/CLineGraphDraw.php b/ui/include/classes/graphdraw/CLineGraphDraw.php
index 3a90fb225b9..3a90fb225b9 100644
--- a/frontends/php/include/classes/graphdraw/CLineGraphDraw.php
+++ b/ui/include/classes/graphdraw/CLineGraphDraw.php
diff --git a/frontends/php/include/classes/graphdraw/CPieGraphDraw.php b/ui/include/classes/graphdraw/CPieGraphDraw.php
index eee112e4627..eee112e4627 100644
--- a/frontends/php/include/classes/graphdraw/CPieGraphDraw.php
+++ b/ui/include/classes/graphdraw/CPieGraphDraw.php
diff --git a/frontends/php/include/classes/helpers/CArrayHelper.php b/ui/include/classes/helpers/CArrayHelper.php
index c860fabbb53..c860fabbb53 100644
--- a/frontends/php/include/classes/helpers/CArrayHelper.php
+++ b/ui/include/classes/helpers/CArrayHelper.php
diff --git a/frontends/php/include/classes/helpers/CBrandHelper.php b/ui/include/classes/helpers/CBrandHelper.php
index a87d01841ae..a87d01841ae 100644
--- a/frontends/php/include/classes/helpers/CBrandHelper.php
+++ b/ui/include/classes/helpers/CBrandHelper.php
diff --git a/frontends/php/include/classes/helpers/CConditionHelper.php b/ui/include/classes/helpers/CConditionHelper.php
index 0ccba1d3118..0ccba1d3118 100644
--- a/frontends/php/include/classes/helpers/CConditionHelper.php
+++ b/ui/include/classes/helpers/CConditionHelper.php
diff --git a/frontends/php/include/classes/helpers/CElasticsearchHelper.php b/ui/include/classes/helpers/CElasticsearchHelper.php
index 79bfa1837e5..79bfa1837e5 100644
--- a/frontends/php/include/classes/helpers/CElasticsearchHelper.php
+++ b/ui/include/classes/helpers/CElasticsearchHelper.php
diff --git a/frontends/php/include/classes/helpers/CHtml.php b/ui/include/classes/helpers/CHtml.php
index 04bd58d5235..04bd58d5235 100644
--- a/frontends/php/include/classes/helpers/CHtml.php
+++ b/ui/include/classes/helpers/CHtml.php
diff --git a/frontends/php/include/classes/helpers/CMapHelper.php b/ui/include/classes/helpers/CMapHelper.php
index 57b7a265589..57b7a265589 100644
--- a/frontends/php/include/classes/helpers/CMapHelper.php
+++ b/ui/include/classes/helpers/CMapHelper.php
diff --git a/frontends/php/include/classes/helpers/CMathHelper.php b/ui/include/classes/helpers/CMathHelper.php
index 30588030fd2..30588030fd2 100644
--- a/frontends/php/include/classes/helpers/CMathHelper.php
+++ b/ui/include/classes/helpers/CMathHelper.php
diff --git a/frontends/php/include/classes/helpers/CMediatypeHelper.php b/ui/include/classes/helpers/CMediatypeHelper.php
index e17cde64c1c..e17cde64c1c 100644
--- a/frontends/php/include/classes/helpers/CMediatypeHelper.php
+++ b/ui/include/classes/helpers/CMediatypeHelper.php
diff --git a/frontends/php/include/classes/helpers/CMenuPopupHelper.php b/ui/include/classes/helpers/CMenuPopupHelper.php
index 7fbc08b80a4..7fbc08b80a4 100644
--- a/frontends/php/include/classes/helpers/CMenuPopupHelper.php
+++ b/ui/include/classes/helpers/CMenuPopupHelper.php
diff --git a/frontends/php/include/classes/helpers/CPagerHelper.php b/ui/include/classes/helpers/CPagerHelper.php
index 7b9bd8489c9..7b9bd8489c9 100644
--- a/frontends/php/include/classes/helpers/CPagerHelper.php
+++ b/ui/include/classes/helpers/CPagerHelper.php
diff --git a/frontends/php/include/classes/helpers/CSvgGraphHelper.php b/ui/include/classes/helpers/CSvgGraphHelper.php
index e7d04a71944..e7d04a71944 100644
--- a/frontends/php/include/classes/helpers/CSvgGraphHelper.php
+++ b/ui/include/classes/helpers/CSvgGraphHelper.php
diff --git a/frontends/php/include/classes/helpers/CUploadFile.php b/ui/include/classes/helpers/CUploadFile.php
index 69515e2d346..69515e2d346 100644
--- a/frontends/php/include/classes/helpers/CUploadFile.php
+++ b/ui/include/classes/helpers/CUploadFile.php
diff --git a/frontends/php/include/classes/helpers/CViewHelper.php b/ui/include/classes/helpers/CViewHelper.php
index c498969c249..c498969c249 100644
--- a/frontends/php/include/classes/helpers/CViewHelper.php
+++ b/ui/include/classes/helpers/CViewHelper.php
diff --git a/frontends/php/include/classes/html/CActionButtonList.php b/ui/include/classes/html/CActionButtonList.php
index 11aef41e777..11aef41e777 100644
--- a/frontends/php/include/classes/html/CActionButtonList.php
+++ b/ui/include/classes/html/CActionButtonList.php
diff --git a/frontends/php/include/classes/html/CButton.php b/ui/include/classes/html/CButton.php
index 4f55eb44706..4f55eb44706 100644
--- a/frontends/php/include/classes/html/CButton.php
+++ b/ui/include/classes/html/CButton.php
diff --git a/frontends/php/include/classes/html/CButtonCancel.php b/ui/include/classes/html/CButtonCancel.php
index 657d58362a5..657d58362a5 100644
--- a/frontends/php/include/classes/html/CButtonCancel.php
+++ b/ui/include/classes/html/CButtonCancel.php
diff --git a/frontends/php/include/classes/html/CButtonDelete.php b/ui/include/classes/html/CButtonDelete.php
index 592e8698110..592e8698110 100644
--- a/frontends/php/include/classes/html/CButtonDelete.php
+++ b/ui/include/classes/html/CButtonDelete.php
diff --git a/frontends/php/include/classes/html/CButtonDropdown.php b/ui/include/classes/html/CButtonDropdown.php
index b90f50e225b..b90f50e225b 100644
--- a/frontends/php/include/classes/html/CButtonDropdown.php
+++ b/ui/include/classes/html/CButtonDropdown.php
diff --git a/frontends/php/include/classes/html/CButtonQMessage.php b/ui/include/classes/html/CButtonQMessage.php
index 203fc0da4ee..203fc0da4ee 100644
--- a/frontends/php/include/classes/html/CButtonQMessage.php
+++ b/ui/include/classes/html/CButtonQMessage.php
diff --git a/frontends/php/include/classes/html/CCheckBox.php b/ui/include/classes/html/CCheckBox.php
index db3a653d258..db3a653d258 100644
--- a/frontends/php/include/classes/html/CCheckBox.php
+++ b/ui/include/classes/html/CCheckBox.php
diff --git a/frontends/php/include/classes/html/CCheckBoxList.php b/ui/include/classes/html/CCheckBoxList.php
index 2780f545779..2780f545779 100644
--- a/frontends/php/include/classes/html/CCheckBoxList.php
+++ b/ui/include/classes/html/CCheckBoxList.php
diff --git a/frontends/php/include/classes/html/CClock.php b/ui/include/classes/html/CClock.php
index 9e72b991af1..9e72b991af1 100644
--- a/frontends/php/include/classes/html/CClock.php
+++ b/ui/include/classes/html/CClock.php
diff --git a/frontends/php/include/classes/html/CCol.php b/ui/include/classes/html/CCol.php
index cbb6433f446..cbb6433f446 100644
--- a/frontends/php/include/classes/html/CCol.php
+++ b/ui/include/classes/html/CCol.php
diff --git a/frontends/php/include/classes/html/CColHeader.php b/ui/include/classes/html/CColHeader.php
index 31554be971a..31554be971a 100644
--- a/frontends/php/include/classes/html/CColHeader.php
+++ b/ui/include/classes/html/CColHeader.php
diff --git a/frontends/php/include/classes/html/CCollapsibleUiWidget.php b/ui/include/classes/html/CCollapsibleUiWidget.php
index 339eaa25f01..339eaa25f01 100644
--- a/frontends/php/include/classes/html/CCollapsibleUiWidget.php
+++ b/ui/include/classes/html/CCollapsibleUiWidget.php
diff --git a/frontends/php/include/classes/html/CColor.php b/ui/include/classes/html/CColor.php
index ad866938890..ad866938890 100644
--- a/frontends/php/include/classes/html/CColor.php
+++ b/ui/include/classes/html/CColor.php
diff --git a/frontends/php/include/classes/html/CComboBox.php b/ui/include/classes/html/CComboBox.php
index 8da59527986..8da59527986 100644
--- a/frontends/php/include/classes/html/CComboBox.php
+++ b/ui/include/classes/html/CComboBox.php
diff --git a/frontends/php/include/classes/html/CComboItem.php b/ui/include/classes/html/CComboItem.php
index f5fa3fcb818..f5fa3fcb818 100644
--- a/frontends/php/include/classes/html/CComboItem.php
+++ b/ui/include/classes/html/CComboItem.php
diff --git a/frontends/php/include/classes/html/CDashboardWidgetMap.php b/ui/include/classes/html/CDashboardWidgetMap.php
index fbf721e7905..fbf721e7905 100644
--- a/frontends/php/include/classes/html/CDashboardWidgetMap.php
+++ b/ui/include/classes/html/CDashboardWidgetMap.php
diff --git a/frontends/php/include/classes/html/CDateSelector.php b/ui/include/classes/html/CDateSelector.php
index 5a409bbaf45..5a409bbaf45 100644
--- a/frontends/php/include/classes/html/CDateSelector.php
+++ b/ui/include/classes/html/CDateSelector.php
diff --git a/frontends/php/include/classes/html/CDiv.php b/ui/include/classes/html/CDiv.php
index 5948b2d2810..5948b2d2810 100644
--- a/frontends/php/include/classes/html/CDiv.php
+++ b/ui/include/classes/html/CDiv.php
diff --git a/frontends/php/include/classes/html/CFile.php b/ui/include/classes/html/CFile.php
index 0787f8a1ffe..0787f8a1ffe 100644
--- a/frontends/php/include/classes/html/CFile.php
+++ b/ui/include/classes/html/CFile.php
diff --git a/frontends/php/include/classes/html/CFilter.php b/ui/include/classes/html/CFilter.php
index c0230cd7c56..c0230cd7c56 100644
--- a/frontends/php/include/classes/html/CFilter.php
+++ b/ui/include/classes/html/CFilter.php
diff --git a/frontends/php/include/classes/html/CForm.php b/ui/include/classes/html/CForm.php
index 43d42cbe9b5..43d42cbe9b5 100644
--- a/frontends/php/include/classes/html/CForm.php
+++ b/ui/include/classes/html/CForm.php
diff --git a/frontends/php/include/classes/html/CFormList.php b/ui/include/classes/html/CFormList.php
index 3db03dd7c89..3db03dd7c89 100644
--- a/frontends/php/include/classes/html/CFormList.php
+++ b/ui/include/classes/html/CFormList.php
diff --git a/frontends/php/include/classes/html/CHorList.php b/ui/include/classes/html/CHorList.php
index 5073ecb3fbf..5073ecb3fbf 100644
--- a/frontends/php/include/classes/html/CHorList.php
+++ b/ui/include/classes/html/CHorList.php
diff --git a/frontends/php/include/classes/html/CIFrame.php b/ui/include/classes/html/CIFrame.php
index 32220cd201b..32220cd201b 100644
--- a/frontends/php/include/classes/html/CIFrame.php
+++ b/ui/include/classes/html/CIFrame.php
diff --git a/frontends/php/include/classes/html/CImageTextTable.php b/ui/include/classes/html/CImageTextTable.php
index 2fe534f6d3e..2fe534f6d3e 100644
--- a/frontends/php/include/classes/html/CImageTextTable.php
+++ b/ui/include/classes/html/CImageTextTable.php
diff --git a/frontends/php/include/classes/html/CImg.php b/ui/include/classes/html/CImg.php
index 54ba7a2f464..54ba7a2f464 100644
--- a/frontends/php/include/classes/html/CImg.php
+++ b/ui/include/classes/html/CImg.php
diff --git a/frontends/php/include/classes/html/CInput.php b/ui/include/classes/html/CInput.php
index a7aa10dd627..a7aa10dd627 100644
--- a/frontends/php/include/classes/html/CInput.php
+++ b/ui/include/classes/html/CInput.php
diff --git a/frontends/php/include/classes/html/CInputSecret.php b/ui/include/classes/html/CInputSecret.php
index 7219a74586f..7219a74586f 100644
--- a/frontends/php/include/classes/html/CInputSecret.php
+++ b/ui/include/classes/html/CInputSecret.php
diff --git a/frontends/php/include/classes/html/CJsScript.php b/ui/include/classes/html/CJsScript.php
index 9f68c9c4be5..9f68c9c4be5 100644
--- a/frontends/php/include/classes/html/CJsScript.php
+++ b/ui/include/classes/html/CJsScript.php
diff --git a/frontends/php/include/classes/html/CLabel.php b/ui/include/classes/html/CLabel.php
index 85bfcaf9409..85bfcaf9409 100644
--- a/frontends/php/include/classes/html/CLabel.php
+++ b/ui/include/classes/html/CLabel.php
diff --git a/frontends/php/include/classes/html/CLink.php b/ui/include/classes/html/CLink.php
index a4ddd05fbbd..a4ddd05fbbd 100644
--- a/frontends/php/include/classes/html/CLink.php
+++ b/ui/include/classes/html/CLink.php
diff --git a/frontends/php/include/classes/html/CLinkAction.php b/ui/include/classes/html/CLinkAction.php
index 06a8bbfbe39..06a8bbfbe39 100644
--- a/frontends/php/include/classes/html/CLinkAction.php
+++ b/ui/include/classes/html/CLinkAction.php
diff --git a/frontends/php/include/classes/html/CList.php b/ui/include/classes/html/CList.php
index 126dcbcc2c7..126dcbcc2c7 100644
--- a/frontends/php/include/classes/html/CList.php
+++ b/ui/include/classes/html/CList.php
diff --git a/frontends/php/include/classes/html/CListBox.php b/ui/include/classes/html/CListBox.php
index 4abc02e553d..4abc02e553d 100644
--- a/frontends/php/include/classes/html/CListBox.php
+++ b/ui/include/classes/html/CListBox.php
diff --git a/frontends/php/include/classes/html/CListItem.php b/ui/include/classes/html/CListItem.php
index 26bf2c68614..26bf2c68614 100644
--- a/frontends/php/include/classes/html/CListItem.php
+++ b/ui/include/classes/html/CListItem.php
diff --git a/frontends/php/include/classes/html/CMacroValue.php b/ui/include/classes/html/CMacroValue.php
index a9c6d2c81b1..a9c6d2c81b1 100644
--- a/frontends/php/include/classes/html/CMacroValue.php
+++ b/ui/include/classes/html/CMacroValue.php
diff --git a/frontends/php/include/classes/html/CMenu.php b/ui/include/classes/html/CMenu.php
index 02845ae9a74..02845ae9a74 100644
--- a/frontends/php/include/classes/html/CMenu.php
+++ b/ui/include/classes/html/CMenu.php
diff --git a/frontends/php/include/classes/html/CMenuItem.php b/ui/include/classes/html/CMenuItem.php
index 152ac2e14cd..152ac2e14cd 100644
--- a/frontends/php/include/classes/html/CMenuItem.php
+++ b/ui/include/classes/html/CMenuItem.php
diff --git a/frontends/php/include/classes/html/CMultiSelect.php b/ui/include/classes/html/CMultiSelect.php
index 3f1a6d6948b..3f1a6d6948b 100644
--- a/frontends/php/include/classes/html/CMultiSelect.php
+++ b/ui/include/classes/html/CMultiSelect.php
diff --git a/frontends/php/include/classes/html/CMultilineInput.php b/ui/include/classes/html/CMultilineInput.php
index 9628e67424f..9628e67424f 100644
--- a/frontends/php/include/classes/html/CMultilineInput.php
+++ b/ui/include/classes/html/CMultilineInput.php
diff --git a/frontends/php/include/classes/html/CNavigationTree.php b/ui/include/classes/html/CNavigationTree.php
index c15613ae512..c15613ae512 100644
--- a/frontends/php/include/classes/html/CNavigationTree.php
+++ b/ui/include/classes/html/CNavigationTree.php
diff --git a/frontends/php/include/classes/html/CNumericBox.php b/ui/include/classes/html/CNumericBox.php
index bd67ffe9262..bd67ffe9262 100644
--- a/frontends/php/include/classes/html/CNumericBox.php
+++ b/ui/include/classes/html/CNumericBox.php
diff --git a/frontends/php/include/classes/html/CObject.php b/ui/include/classes/html/CObject.php
index eb53b86f0e5..eb53b86f0e5 100644
--- a/frontends/php/include/classes/html/CObject.php
+++ b/ui/include/classes/html/CObject.php
diff --git a/frontends/php/include/classes/html/CParam.php b/ui/include/classes/html/CParam.php
index 674b89dde1a..674b89dde1a 100644
--- a/frontends/php/include/classes/html/CParam.php
+++ b/ui/include/classes/html/CParam.php
diff --git a/frontends/php/include/classes/html/CPassBox.php b/ui/include/classes/html/CPassBox.php
index f2c1e02a043..f2c1e02a043 100644
--- a/frontends/php/include/classes/html/CPassBox.php
+++ b/ui/include/classes/html/CPassBox.php
diff --git a/frontends/php/include/classes/html/CPatternSelect.php b/ui/include/classes/html/CPatternSelect.php
index f60a0f22e99..f60a0f22e99 100644
--- a/frontends/php/include/classes/html/CPatternSelect.php
+++ b/ui/include/classes/html/CPatternSelect.php
diff --git a/frontends/php/include/classes/html/CPre.php b/ui/include/classes/html/CPre.php
index 586ca3af9da..586ca3af9da 100644
--- a/frontends/php/include/classes/html/CPre.php
+++ b/ui/include/classes/html/CPre.php
diff --git a/frontends/php/include/classes/html/CRadioButtonList.php b/ui/include/classes/html/CRadioButtonList.php
index ba4ff8e75fc..ba4ff8e75fc 100644
--- a/frontends/php/include/classes/html/CRadioButtonList.php
+++ b/ui/include/classes/html/CRadioButtonList.php
diff --git a/frontends/php/include/classes/html/CRangeControl.php b/ui/include/classes/html/CRangeControl.php
index 5f441e3ed9c..5f441e3ed9c 100644
--- a/frontends/php/include/classes/html/CRangeControl.php
+++ b/ui/include/classes/html/CRangeControl.php
diff --git a/frontends/php/include/classes/html/CRedirectButton.php b/ui/include/classes/html/CRedirectButton.php
index fbb63c07371..fbb63c07371 100644
--- a/frontends/php/include/classes/html/CRedirectButton.php
+++ b/ui/include/classes/html/CRedirectButton.php
diff --git a/frontends/php/include/classes/html/CRow.php b/ui/include/classes/html/CRow.php
index c352e4774e0..c352e4774e0 100644
--- a/frontends/php/include/classes/html/CRow.php
+++ b/ui/include/classes/html/CRow.php
diff --git a/frontends/php/include/classes/html/CRowHeader.php b/ui/include/classes/html/CRowHeader.php
index b39f20eed96..b39f20eed96 100644
--- a/frontends/php/include/classes/html/CRowHeader.php
+++ b/ui/include/classes/html/CRowHeader.php
diff --git a/frontends/php/include/classes/html/CScriptTag.php b/ui/include/classes/html/CScriptTag.php
index 7f74e1a1685..7f74e1a1685 100644
--- a/frontends/php/include/classes/html/CScriptTag.php
+++ b/ui/include/classes/html/CScriptTag.php
diff --git a/frontends/php/include/classes/html/CSeverity.php b/ui/include/classes/html/CSeverity.php
index a9370eb648b..a9370eb648b 100644
--- a/frontends/php/include/classes/html/CSeverity.php
+++ b/ui/include/classes/html/CSeverity.php
diff --git a/frontends/php/include/classes/html/CSeverityCheckBoxList.php b/ui/include/classes/html/CSeverityCheckBoxList.php
index 265541d0d96..265541d0d96 100644
--- a/frontends/php/include/classes/html/CSeverityCheckBoxList.php
+++ b/ui/include/classes/html/CSeverityCheckBoxList.php
diff --git a/frontends/php/include/classes/html/CSimpleButton.php b/ui/include/classes/html/CSimpleButton.php
index 1cf9de6431f..1cf9de6431f 100644
--- a/frontends/php/include/classes/html/CSimpleButton.php
+++ b/ui/include/classes/html/CSimpleButton.php
diff --git a/frontends/php/include/classes/html/CSpan.php b/ui/include/classes/html/CSpan.php
index f71ca33141c..f71ca33141c 100644
--- a/frontends/php/include/classes/html/CSpan.php
+++ b/ui/include/classes/html/CSpan.php
diff --git a/frontends/php/include/classes/html/CSubmit.php b/ui/include/classes/html/CSubmit.php
index 6d4e0060c5f..6d4e0060c5f 100644
--- a/frontends/php/include/classes/html/CSubmit.php
+++ b/ui/include/classes/html/CSubmit.php
diff --git a/frontends/php/include/classes/html/CSubmitButton.php b/ui/include/classes/html/CSubmitButton.php
index cf2621b99de..cf2621b99de 100644
--- a/frontends/php/include/classes/html/CSubmitButton.php
+++ b/ui/include/classes/html/CSubmitButton.php
diff --git a/frontends/php/include/classes/html/CSup.php b/ui/include/classes/html/CSup.php
index 68217583a00..68217583a00 100644
--- a/frontends/php/include/classes/html/CSup.php
+++ b/ui/include/classes/html/CSup.php
diff --git a/frontends/php/include/classes/html/CTabView.php b/ui/include/classes/html/CTabView.php
index a65d80980f3..a65d80980f3 100644
--- a/frontends/php/include/classes/html/CTabView.php
+++ b/ui/include/classes/html/CTabView.php
diff --git a/frontends/php/include/classes/html/CTable.php b/ui/include/classes/html/CTable.php
index 76f751e0667..76f751e0667 100644
--- a/frontends/php/include/classes/html/CTable.php
+++ b/ui/include/classes/html/CTable.php
diff --git a/frontends/php/include/classes/html/CTableInfo.php b/ui/include/classes/html/CTableInfo.php
index 8111cd8eab9..8111cd8eab9 100644
--- a/frontends/php/include/classes/html/CTableInfo.php
+++ b/ui/include/classes/html/CTableInfo.php
diff --git a/frontends/php/include/classes/html/CTag.php b/ui/include/classes/html/CTag.php
index fcba85ef37d..fcba85ef37d 100644
--- a/frontends/php/include/classes/html/CTag.php
+++ b/ui/include/classes/html/CTag.php
diff --git a/frontends/php/include/classes/html/CTextArea.php b/ui/include/classes/html/CTextArea.php
index d6d048cc3fb..d6d048cc3fb 100644
--- a/frontends/php/include/classes/html/CTextArea.php
+++ b/ui/include/classes/html/CTextArea.php
diff --git a/frontends/php/include/classes/html/CTextAreaFlexible.php b/ui/include/classes/html/CTextAreaFlexible.php
index e1edfe334fd..e1edfe334fd 100644
--- a/frontends/php/include/classes/html/CTextAreaFlexible.php
+++ b/ui/include/classes/html/CTextAreaFlexible.php
diff --git a/frontends/php/include/classes/html/CTextBox.php b/ui/include/classes/html/CTextBox.php
index bfd6a2988d2..bfd6a2988d2 100644
--- a/frontends/php/include/classes/html/CTextBox.php
+++ b/ui/include/classes/html/CTextBox.php
diff --git a/frontends/php/include/classes/html/CTriggersInfo.php b/ui/include/classes/html/CTriggersInfo.php
index 072dfd51a46..072dfd51a46 100644
--- a/frontends/php/include/classes/html/CTriggersInfo.php
+++ b/ui/include/classes/html/CTriggersInfo.php
diff --git a/frontends/php/include/classes/html/CUiWidget.php b/ui/include/classes/html/CUiWidget.php
index 63dbc811bdf..63dbc811bdf 100644
--- a/frontends/php/include/classes/html/CUiWidget.php
+++ b/ui/include/classes/html/CUiWidget.php
diff --git a/frontends/php/include/classes/html/CVar.php b/ui/include/classes/html/CVar.php
index 63d97987733..63d97987733 100644
--- a/frontends/php/include/classes/html/CVar.php
+++ b/ui/include/classes/html/CVar.php
diff --git a/frontends/php/include/classes/html/CVisibilityBox.php b/ui/include/classes/html/CVisibilityBox.php
index 1206af7e776..1206af7e776 100644
--- a/frontends/php/include/classes/html/CVisibilityBox.php
+++ b/ui/include/classes/html/CVisibilityBox.php
diff --git a/frontends/php/include/classes/html/CWarning.php b/ui/include/classes/html/CWarning.php
index 9c32a28b0c8..9c32a28b0c8 100644
--- a/frontends/php/include/classes/html/CWarning.php
+++ b/ui/include/classes/html/CWarning.php
diff --git a/frontends/php/include/classes/html/interfaces/CButtonInterface.php b/ui/include/classes/html/interfaces/CButtonInterface.php
index f121d652ce4..f121d652ce4 100644
--- a/frontends/php/include/classes/html/interfaces/CButtonInterface.php
+++ b/ui/include/classes/html/interfaces/CButtonInterface.php
diff --git a/frontends/php/include/classes/html/pageheader/CPageHeader.php b/ui/include/classes/html/pageheader/CPageHeader.php
index 590e024b140..590e024b140 100644
--- a/frontends/php/include/classes/html/pageheader/CPageHeader.php
+++ b/ui/include/classes/html/pageheader/CPageHeader.php
diff --git a/frontends/php/include/classes/html/svg/CSvg.php b/ui/include/classes/html/svg/CSvg.php
index 6f56bf2f73f..6f56bf2f73f 100644
--- a/frontends/php/include/classes/html/svg/CSvg.php
+++ b/ui/include/classes/html/svg/CSvg.php
diff --git a/frontends/php/include/classes/html/svg/CSvgCircle.php b/ui/include/classes/html/svg/CSvgCircle.php
index 88cd856a1ba..88cd856a1ba 100644
--- a/frontends/php/include/classes/html/svg/CSvgCircle.php
+++ b/ui/include/classes/html/svg/CSvgCircle.php
diff --git a/frontends/php/include/classes/html/svg/CSvgGraphAnnotation.php b/ui/include/classes/html/svg/CSvgGraphAnnotation.php
index 425b0cd1320..425b0cd1320 100644
--- a/frontends/php/include/classes/html/svg/CSvgGraphAnnotation.php
+++ b/ui/include/classes/html/svg/CSvgGraphAnnotation.php
diff --git a/frontends/php/include/classes/html/svg/CSvgGraphArea.php b/ui/include/classes/html/svg/CSvgGraphArea.php
index 1f04382a858..1f04382a858 100644
--- a/frontends/php/include/classes/html/svg/CSvgGraphArea.php
+++ b/ui/include/classes/html/svg/CSvgGraphArea.php
diff --git a/frontends/php/include/classes/html/svg/CSvgGraphAxis.php b/ui/include/classes/html/svg/CSvgGraphAxis.php
index be5cb5c2b97..be5cb5c2b97 100644
--- a/frontends/php/include/classes/html/svg/CSvgGraphAxis.php
+++ b/ui/include/classes/html/svg/CSvgGraphAxis.php
diff --git a/frontends/php/include/classes/html/svg/CSvgGraphBar.php b/ui/include/classes/html/svg/CSvgGraphBar.php
index 82bcf065ea2..82bcf065ea2 100644
--- a/frontends/php/include/classes/html/svg/CSvgGraphBar.php
+++ b/ui/include/classes/html/svg/CSvgGraphBar.php
diff --git a/frontends/php/include/classes/html/svg/CSvgGraphGrid.php b/ui/include/classes/html/svg/CSvgGraphGrid.php
index db8214f8d5e..db8214f8d5e 100644
--- a/frontends/php/include/classes/html/svg/CSvgGraphGrid.php
+++ b/ui/include/classes/html/svg/CSvgGraphGrid.php
diff --git a/frontends/php/include/classes/html/svg/CSvgGraphLegend.php b/ui/include/classes/html/svg/CSvgGraphLegend.php
index ade65c706e7..ade65c706e7 100644
--- a/frontends/php/include/classes/html/svg/CSvgGraphLegend.php
+++ b/ui/include/classes/html/svg/CSvgGraphLegend.php
diff --git a/frontends/php/include/classes/html/svg/CSvgGraphLine.php b/ui/include/classes/html/svg/CSvgGraphLine.php
index c200be89c44..c200be89c44 100644
--- a/frontends/php/include/classes/html/svg/CSvgGraphLine.php
+++ b/ui/include/classes/html/svg/CSvgGraphLine.php
diff --git a/frontends/php/include/classes/html/svg/CSvgGraphLineGroup.php b/ui/include/classes/html/svg/CSvgGraphLineGroup.php
index 62f2a9b04d9..62f2a9b04d9 100644
--- a/frontends/php/include/classes/html/svg/CSvgGraphLineGroup.php
+++ b/ui/include/classes/html/svg/CSvgGraphLineGroup.php
diff --git a/frontends/php/include/classes/html/svg/CSvgGraphPoints.php b/ui/include/classes/html/svg/CSvgGraphPoints.php
index 2efc8b32912..2efc8b32912 100644
--- a/frontends/php/include/classes/html/svg/CSvgGraphPoints.php
+++ b/ui/include/classes/html/svg/CSvgGraphPoints.php
diff --git a/frontends/php/include/classes/html/svg/CSvgGroup.php b/ui/include/classes/html/svg/CSvgGroup.php
index fec5e2af96a..fec5e2af96a 100644
--- a/frontends/php/include/classes/html/svg/CSvgGroup.php
+++ b/ui/include/classes/html/svg/CSvgGroup.php
diff --git a/frontends/php/include/classes/html/svg/CSvgLine.php b/ui/include/classes/html/svg/CSvgLine.php
index af46bfa7294..af46bfa7294 100644
--- a/frontends/php/include/classes/html/svg/CSvgLine.php
+++ b/ui/include/classes/html/svg/CSvgLine.php
diff --git a/frontends/php/include/classes/html/svg/CSvgPath.php b/ui/include/classes/html/svg/CSvgPath.php
index 65154469c2e..65154469c2e 100644
--- a/frontends/php/include/classes/html/svg/CSvgPath.php
+++ b/ui/include/classes/html/svg/CSvgPath.php
diff --git a/frontends/php/include/classes/html/svg/CSvgPolygon.php b/ui/include/classes/html/svg/CSvgPolygon.php
index e8010bf596d..e8010bf596d 100644
--- a/frontends/php/include/classes/html/svg/CSvgPolygon.php
+++ b/ui/include/classes/html/svg/CSvgPolygon.php
diff --git a/frontends/php/include/classes/html/svg/CSvgRect.php b/ui/include/classes/html/svg/CSvgRect.php
index a078c8b733f..a078c8b733f 100644
--- a/frontends/php/include/classes/html/svg/CSvgRect.php
+++ b/ui/include/classes/html/svg/CSvgRect.php
diff --git a/frontends/php/include/classes/html/svg/CSvgTag.php b/ui/include/classes/html/svg/CSvgTag.php
index b21e17f1c91..b21e17f1c91 100644
--- a/frontends/php/include/classes/html/svg/CSvgTag.php
+++ b/ui/include/classes/html/svg/CSvgTag.php
diff --git a/frontends/php/include/classes/html/svg/CSvgText.php b/ui/include/classes/html/svg/CSvgText.php
index c263eadea67..c263eadea67 100644
--- a/frontends/php/include/classes/html/svg/CSvgText.php
+++ b/ui/include/classes/html/svg/CSvgText.php
diff --git a/frontends/php/include/classes/html/widget/CWidget.php b/ui/include/classes/html/widget/CWidget.php
index 86760f21972..86760f21972 100644
--- a/frontends/php/include/classes/html/widget/CWidget.php
+++ b/ui/include/classes/html/widget/CWidget.php
diff --git a/frontends/php/include/classes/import/CConfigurationImport.php b/ui/include/classes/import/CConfigurationImport.php
index 36e54ccdaf3..36e54ccdaf3 100644
--- a/frontends/php/include/classes/import/CConfigurationImport.php
+++ b/ui/include/classes/import/CConfigurationImport.php
diff --git a/frontends/php/include/classes/import/CImportDataAdapter.php b/ui/include/classes/import/CImportDataAdapter.php
index c33dc2fcb25..c33dc2fcb25 100644
--- a/frontends/php/include/classes/import/CImportDataAdapter.php
+++ b/ui/include/classes/import/CImportDataAdapter.php
diff --git a/frontends/php/include/classes/import/CImportReferencer.php b/ui/include/classes/import/CImportReferencer.php
index a7c7004d10c..a7c7004d10c 100644
--- a/frontends/php/include/classes/import/CImportReferencer.php
+++ b/ui/include/classes/import/CImportReferencer.php
diff --git a/frontends/php/include/classes/import/CImportedObjectContainer.php b/ui/include/classes/import/CImportedObjectContainer.php
index 7fbf1d42bf1..7fbf1d42bf1 100644
--- a/frontends/php/include/classes/import/CImportedObjectContainer.php
+++ b/ui/include/classes/import/CImportedObjectContainer.php
diff --git a/frontends/php/include/classes/import/converters/C10ImportConverter.php b/ui/include/classes/import/converters/C10ImportConverter.php
index 097c0bb12a5..097c0bb12a5 100644
--- a/frontends/php/include/classes/import/converters/C10ImportConverter.php
+++ b/ui/include/classes/import/converters/C10ImportConverter.php
diff --git a/frontends/php/include/classes/import/converters/C10ItemKeyConverter.php b/ui/include/classes/import/converters/C10ItemKeyConverter.php
index fa76d32438a..fa76d32438a 100644
--- a/frontends/php/include/classes/import/converters/C10ItemKeyConverter.php
+++ b/ui/include/classes/import/converters/C10ItemKeyConverter.php
diff --git a/frontends/php/include/classes/import/converters/C10TriggerConverter.php b/ui/include/classes/import/converters/C10TriggerConverter.php
index 48601452470..48601452470 100644
--- a/frontends/php/include/classes/import/converters/C10TriggerConverter.php
+++ b/ui/include/classes/import/converters/C10TriggerConverter.php
diff --git a/frontends/php/include/classes/import/converters/C20ImportConverter.php b/ui/include/classes/import/converters/C20ImportConverter.php
index 424e781cd45..424e781cd45 100644
--- a/frontends/php/include/classes/import/converters/C20ImportConverter.php
+++ b/ui/include/classes/import/converters/C20ImportConverter.php
diff --git a/frontends/php/include/classes/import/converters/C20ItemKeyConverter.php b/ui/include/classes/import/converters/C20ItemKeyConverter.php
index 241c501a509..241c501a509 100644
--- a/frontends/php/include/classes/import/converters/C20ItemKeyConverter.php
+++ b/ui/include/classes/import/converters/C20ItemKeyConverter.php
diff --git a/frontends/php/include/classes/import/converters/C20TriggerConverter.php b/ui/include/classes/import/converters/C20TriggerConverter.php
index 2ae605d8e2e..2ae605d8e2e 100644
--- a/frontends/php/include/classes/import/converters/C20TriggerConverter.php
+++ b/ui/include/classes/import/converters/C20TriggerConverter.php
diff --git a/frontends/php/include/classes/import/converters/C30ImportConverter.php b/ui/include/classes/import/converters/C30ImportConverter.php
index 4ecd9683aaf..4ecd9683aaf 100644
--- a/frontends/php/include/classes/import/converters/C30ImportConverter.php
+++ b/ui/include/classes/import/converters/C30ImportConverter.php
diff --git a/frontends/php/include/classes/import/converters/C32ImportConverter.php b/ui/include/classes/import/converters/C32ImportConverter.php
index 2bae66b1be5..2bae66b1be5 100644
--- a/frontends/php/include/classes/import/converters/C32ImportConverter.php
+++ b/ui/include/classes/import/converters/C32ImportConverter.php
diff --git a/frontends/php/include/classes/import/converters/C34ImportConverter.php b/ui/include/classes/import/converters/C34ImportConverter.php
index c2e80698da4..c2e80698da4 100644
--- a/frontends/php/include/classes/import/converters/C34ImportConverter.php
+++ b/ui/include/classes/import/converters/C34ImportConverter.php
diff --git a/frontends/php/include/classes/import/converters/C40ImportConverter.php b/ui/include/classes/import/converters/C40ImportConverter.php
index 9fb534aabef..9fb534aabef 100644
--- a/frontends/php/include/classes/import/converters/C40ImportConverter.php
+++ b/ui/include/classes/import/converters/C40ImportConverter.php
diff --git a/frontends/php/include/classes/import/converters/C42ImportConverter.php b/ui/include/classes/import/converters/C42ImportConverter.php
index e28c1ae07cb..e28c1ae07cb 100644
--- a/frontends/php/include/classes/import/converters/C42ImportConverter.php
+++ b/ui/include/classes/import/converters/C42ImportConverter.php
diff --git a/frontends/php/include/classes/import/converters/C44ImportConverter.php b/ui/include/classes/import/converters/C44ImportConverter.php
index 3a11c4edf2f..3a11c4edf2f 100644
--- a/frontends/php/include/classes/import/converters/C44ImportConverter.php
+++ b/ui/include/classes/import/converters/C44ImportConverter.php
diff --git a/frontends/php/include/classes/import/converters/CArrayKeysImportConverter.php b/ui/include/classes/import/converters/CArrayKeysImportConverter.php
index ddaf6c8f657..ddaf6c8f657 100644
--- a/frontends/php/include/classes/import/converters/CArrayKeysImportConverter.php
+++ b/ui/include/classes/import/converters/CArrayKeysImportConverter.php
diff --git a/frontends/php/include/classes/import/converters/CConstantImportConverter.php b/ui/include/classes/import/converters/CConstantImportConverter.php
index 33d37893e66..33d37893e66 100644
--- a/frontends/php/include/classes/import/converters/CConstantImportConverter.php
+++ b/ui/include/classes/import/converters/CConstantImportConverter.php
diff --git a/frontends/php/include/classes/import/converters/CConverter.php b/ui/include/classes/import/converters/CConverter.php
index d46f9ed9135..d46f9ed9135 100644
--- a/frontends/php/include/classes/import/converters/CConverter.php
+++ b/ui/include/classes/import/converters/CConverter.php
diff --git a/frontends/php/include/classes/import/converters/CDefaultImportConverter.php b/ui/include/classes/import/converters/CDefaultImportConverter.php
index 653d2de9daf..653d2de9daf 100644
--- a/frontends/php/include/classes/import/converters/CDefaultImportConverter.php
+++ b/ui/include/classes/import/converters/CDefaultImportConverter.php
diff --git a/frontends/php/include/classes/import/converters/CImportConverterFactory.php b/ui/include/classes/import/converters/CImportConverterFactory.php
index 7315a9601f3..7315a9601f3 100644
--- a/frontends/php/include/classes/import/converters/CImportConverterFactory.php
+++ b/ui/include/classes/import/converters/CImportConverterFactory.php
diff --git a/frontends/php/include/classes/import/converters/CTransformImportConverter.php b/ui/include/classes/import/converters/CTransformImportConverter.php
index c7889b05ecc..c7889b05ecc 100644
--- a/frontends/php/include/classes/import/converters/CTransformImportConverter.php
+++ b/ui/include/classes/import/converters/CTransformImportConverter.php
diff --git a/frontends/php/include/classes/import/importers/CAbstractScreenImporter.php b/ui/include/classes/import/importers/CAbstractScreenImporter.php
index f6aa541f20b..f6aa541f20b 100644
--- a/frontends/php/include/classes/import/importers/CAbstractScreenImporter.php
+++ b/ui/include/classes/import/importers/CAbstractScreenImporter.php
diff --git a/frontends/php/include/classes/import/importers/CHostImporter.php b/ui/include/classes/import/importers/CHostImporter.php
index 24b53189b54..24b53189b54 100644
--- a/frontends/php/include/classes/import/importers/CHostImporter.php
+++ b/ui/include/classes/import/importers/CHostImporter.php
diff --git a/frontends/php/include/classes/import/importers/CImporter.php b/ui/include/classes/import/importers/CImporter.php
index 91c259d0879..91c259d0879 100644
--- a/frontends/php/include/classes/import/importers/CImporter.php
+++ b/ui/include/classes/import/importers/CImporter.php
diff --git a/frontends/php/include/classes/import/importers/CMapImporter.php b/ui/include/classes/import/importers/CMapImporter.php
index 2601eae46d7..2601eae46d7 100644
--- a/frontends/php/include/classes/import/importers/CMapImporter.php
+++ b/ui/include/classes/import/importers/CMapImporter.php
diff --git a/frontends/php/include/classes/import/importers/CScreenImporter.php b/ui/include/classes/import/importers/CScreenImporter.php
index 6f2d86cb937..6f2d86cb937 100644
--- a/frontends/php/include/classes/import/importers/CScreenImporter.php
+++ b/ui/include/classes/import/importers/CScreenImporter.php
diff --git a/frontends/php/include/classes/import/importers/CTemplateImporter.php b/ui/include/classes/import/importers/CTemplateImporter.php
index ddb873cd1dc..ddb873cd1dc 100644
--- a/frontends/php/include/classes/import/importers/CTemplateImporter.php
+++ b/ui/include/classes/import/importers/CTemplateImporter.php
diff --git a/frontends/php/include/classes/import/importers/CTemplateScreenImporter.php b/ui/include/classes/import/importers/CTemplateScreenImporter.php
index b7f63e6f823..b7f63e6f823 100644
--- a/frontends/php/include/classes/import/importers/CTemplateScreenImporter.php
+++ b/ui/include/classes/import/importers/CTemplateScreenImporter.php
diff --git a/frontends/php/include/classes/import/readers/CImportReader.php b/ui/include/classes/import/readers/CImportReader.php
index 943b882d56c..943b882d56c 100644
--- a/frontends/php/include/classes/import/readers/CImportReader.php
+++ b/ui/include/classes/import/readers/CImportReader.php
diff --git a/frontends/php/include/classes/import/readers/CImportReaderFactory.php b/ui/include/classes/import/readers/CImportReaderFactory.php
index fff3cc4fda0..fff3cc4fda0 100644
--- a/frontends/php/include/classes/import/readers/CImportReaderFactory.php
+++ b/ui/include/classes/import/readers/CImportReaderFactory.php
diff --git a/frontends/php/include/classes/import/readers/CJsonImportReader.php b/ui/include/classes/import/readers/CJsonImportReader.php
index 6880644e4be..6880644e4be 100644
--- a/frontends/php/include/classes/import/readers/CJsonImportReader.php
+++ b/ui/include/classes/import/readers/CJsonImportReader.php
diff --git a/frontends/php/include/classes/import/readers/CXmlImportReader.php b/ui/include/classes/import/readers/CXmlImportReader.php
index 235ff61fa1d..235ff61fa1d 100644
--- a/frontends/php/include/classes/import/readers/CXmlImportReader.php
+++ b/ui/include/classes/import/readers/CXmlImportReader.php
diff --git a/frontends/php/include/classes/import/validators/C10XmlValidator.php b/ui/include/classes/import/validators/C10XmlValidator.php
index 7c98969b4ee..7c98969b4ee 100644
--- a/frontends/php/include/classes/import/validators/C10XmlValidator.php
+++ b/ui/include/classes/import/validators/C10XmlValidator.php
diff --git a/frontends/php/include/classes/import/validators/C20XmlValidator.php b/ui/include/classes/import/validators/C20XmlValidator.php
index 7f00c1d076c..7f00c1d076c 100644
--- a/frontends/php/include/classes/import/validators/C20XmlValidator.php
+++ b/ui/include/classes/import/validators/C20XmlValidator.php
diff --git a/frontends/php/include/classes/import/validators/C30XmlValidator.php b/ui/include/classes/import/validators/C30XmlValidator.php
index 176bf937e16..176bf937e16 100644
--- a/frontends/php/include/classes/import/validators/C30XmlValidator.php
+++ b/ui/include/classes/import/validators/C30XmlValidator.php
diff --git a/frontends/php/include/classes/import/validators/C32XmlValidator.php b/ui/include/classes/import/validators/C32XmlValidator.php
index 884cf9e5c32..884cf9e5c32 100644
--- a/frontends/php/include/classes/import/validators/C32XmlValidator.php
+++ b/ui/include/classes/import/validators/C32XmlValidator.php
diff --git a/frontends/php/include/classes/import/validators/C34XmlValidator.php b/ui/include/classes/import/validators/C34XmlValidator.php
index 219674d1a02..219674d1a02 100644
--- a/frontends/php/include/classes/import/validators/C34XmlValidator.php
+++ b/ui/include/classes/import/validators/C34XmlValidator.php
diff --git a/frontends/php/include/classes/import/validators/C40XmlValidator.php b/ui/include/classes/import/validators/C40XmlValidator.php
index 276cd3d8f0c..276cd3d8f0c 100644
--- a/frontends/php/include/classes/import/validators/C40XmlValidator.php
+++ b/ui/include/classes/import/validators/C40XmlValidator.php
diff --git a/frontends/php/include/classes/import/validators/C42XmlValidator.php b/ui/include/classes/import/validators/C42XmlValidator.php
index 1faebb6b423..1faebb6b423 100644
--- a/frontends/php/include/classes/import/validators/C42XmlValidator.php
+++ b/ui/include/classes/import/validators/C42XmlValidator.php
diff --git a/frontends/php/include/classes/import/validators/C44XmlValidator.php b/ui/include/classes/import/validators/C44XmlValidator.php
index 33564cd02b0..33564cd02b0 100644
--- a/frontends/php/include/classes/import/validators/C44XmlValidator.php
+++ b/ui/include/classes/import/validators/C44XmlValidator.php
diff --git a/frontends/php/include/classes/import/validators/C50XmlValidator.php b/ui/include/classes/import/validators/C50XmlValidator.php
index 415596342c1..415596342c1 100644
--- a/frontends/php/include/classes/import/validators/C50XmlValidator.php
+++ b/ui/include/classes/import/validators/C50XmlValidator.php
diff --git a/frontends/php/include/classes/import/validators/CImportValidatorFactory.php b/ui/include/classes/import/validators/CImportValidatorFactory.php
index aea703dd1ae..aea703dd1ae 100644
--- a/frontends/php/include/classes/import/validators/CImportValidatorFactory.php
+++ b/ui/include/classes/import/validators/CImportValidatorFactory.php
diff --git a/frontends/php/include/classes/import/validators/CXmlValidator.php b/ui/include/classes/import/validators/CXmlValidator.php
index e105f05f45b..e105f05f45b 100644
--- a/frontends/php/include/classes/import/validators/CXmlValidator.php
+++ b/ui/include/classes/import/validators/CXmlValidator.php
diff --git a/frontends/php/include/classes/import/validators/CXmlValidatorGeneral.php b/ui/include/classes/import/validators/CXmlValidatorGeneral.php
index 62817d13064..62817d13064 100644
--- a/frontends/php/include/classes/import/validators/CXmlValidatorGeneral.php
+++ b/ui/include/classes/import/validators/CXmlValidatorGeneral.php
diff --git a/frontends/php/include/classes/items/CHelpItems.php b/ui/include/classes/items/CHelpItems.php
index 82178bebb44..82178bebb44 100644
--- a/frontends/php/include/classes/items/CHelpItems.php
+++ b/ui/include/classes/items/CHelpItems.php
diff --git a/frontends/php/include/classes/ldap/CLdap.php b/ui/include/classes/ldap/CLdap.php
index 56c0753f036..56c0753f036 100644
--- a/frontends/php/include/classes/ldap/CLdap.php
+++ b/ui/include/classes/ldap/CLdap.php
diff --git a/frontends/php/include/classes/macros/CMacrosResolver.php b/ui/include/classes/macros/CMacrosResolver.php
index 1b4c988142a..1b4c988142a 100644
--- a/frontends/php/include/classes/macros/CMacrosResolver.php
+++ b/ui/include/classes/macros/CMacrosResolver.php
diff --git a/frontends/php/include/classes/macros/CMacrosResolverGeneral.php b/ui/include/classes/macros/CMacrosResolverGeneral.php
index 70b769d284a..70b769d284a 100644
--- a/frontends/php/include/classes/macros/CMacrosResolverGeneral.php
+++ b/ui/include/classes/macros/CMacrosResolverGeneral.php
diff --git a/frontends/php/include/classes/macros/CMacrosResolverHelper.php b/ui/include/classes/macros/CMacrosResolverHelper.php
index 801766574c6..801766574c6 100644
--- a/frontends/php/include/classes/macros/CMacrosResolverHelper.php
+++ b/ui/include/classes/macros/CMacrosResolverHelper.php
diff --git a/frontends/php/include/classes/mvc/CController.php b/ui/include/classes/mvc/CController.php
index bba39eac638..bba39eac638 100644
--- a/frontends/php/include/classes/mvc/CController.php
+++ b/ui/include/classes/mvc/CController.php
diff --git a/frontends/php/include/classes/mvc/CControllerResponse.php b/ui/include/classes/mvc/CControllerResponse.php
index 907c6aebeaf..907c6aebeaf 100644
--- a/frontends/php/include/classes/mvc/CControllerResponse.php
+++ b/ui/include/classes/mvc/CControllerResponse.php
diff --git a/frontends/php/include/classes/mvc/CControllerResponseData.php b/ui/include/classes/mvc/CControllerResponseData.php
index cd570b21b03..cd570b21b03 100644
--- a/frontends/php/include/classes/mvc/CControllerResponseData.php
+++ b/ui/include/classes/mvc/CControllerResponseData.php
diff --git a/frontends/php/include/classes/mvc/CControllerResponseFatal.php b/ui/include/classes/mvc/CControllerResponseFatal.php
index 3b0329cce3b..3b0329cce3b 100644
--- a/frontends/php/include/classes/mvc/CControllerResponseFatal.php
+++ b/ui/include/classes/mvc/CControllerResponseFatal.php
diff --git a/frontends/php/include/classes/mvc/CControllerResponseRedirect.php b/ui/include/classes/mvc/CControllerResponseRedirect.php
index e8f2332caf9..e8f2332caf9 100644
--- a/frontends/php/include/classes/mvc/CControllerResponseRedirect.php
+++ b/ui/include/classes/mvc/CControllerResponseRedirect.php
diff --git a/frontends/php/include/classes/mvc/CLegacyAction.php b/ui/include/classes/mvc/CLegacyAction.php
index 514f4135079..514f4135079 100644
--- a/frontends/php/include/classes/mvc/CLegacyAction.php
+++ b/ui/include/classes/mvc/CLegacyAction.php
diff --git a/frontends/php/include/classes/mvc/CPartial.php b/ui/include/classes/mvc/CPartial.php
index 47f8e364a8c..47f8e364a8c 100644
--- a/frontends/php/include/classes/mvc/CPartial.php
+++ b/ui/include/classes/mvc/CPartial.php
diff --git a/frontends/php/include/classes/mvc/CRouter.php b/ui/include/classes/mvc/CRouter.php
index cb6e243b84a..cb6e243b84a 100644
--- a/frontends/php/include/classes/mvc/CRouter.php
+++ b/ui/include/classes/mvc/CRouter.php
diff --git a/frontends/php/include/classes/mvc/CView.php b/ui/include/classes/mvc/CView.php
index d88e337211d..d88e337211d 100644
--- a/frontends/php/include/classes/mvc/CView.php
+++ b/ui/include/classes/mvc/CView.php
diff --git a/frontends/php/include/classes/parsers/CADNameAttributeParser.php b/ui/include/classes/parsers/CADNameAttributeParser.php
index 95e7f5355b9..95e7f5355b9 100644
--- a/frontends/php/include/classes/parsers/CADNameAttributeParser.php
+++ b/ui/include/classes/parsers/CADNameAttributeParser.php
diff --git a/frontends/php/include/classes/parsers/CAbsoluteTimeParser.php b/ui/include/classes/parsers/CAbsoluteTimeParser.php
index c7058b33851..c7058b33851 100644
--- a/frontends/php/include/classes/parsers/CAbsoluteTimeParser.php
+++ b/ui/include/classes/parsers/CAbsoluteTimeParser.php
diff --git a/frontends/php/include/classes/parsers/CConditionFormula.php b/ui/include/classes/parsers/CConditionFormula.php
index 46bdfd9b776..46bdfd9b776 100644
--- a/frontends/php/include/classes/parsers/CConditionFormula.php
+++ b/ui/include/classes/parsers/CConditionFormula.php
diff --git a/frontends/php/include/classes/parsers/CDnsParser.php b/ui/include/classes/parsers/CDnsParser.php
index 9929b25694d..9929b25694d 100644
--- a/frontends/php/include/classes/parsers/CDnsParser.php
+++ b/ui/include/classes/parsers/CDnsParser.php
diff --git a/frontends/php/include/classes/parsers/CFlexibleIntervalParser.php b/ui/include/classes/parsers/CFlexibleIntervalParser.php
index 4cf9650e927..4cf9650e927 100644
--- a/frontends/php/include/classes/parsers/CFlexibleIntervalParser.php
+++ b/ui/include/classes/parsers/CFlexibleIntervalParser.php
diff --git a/frontends/php/include/classes/parsers/CFunctionIdParser.php b/ui/include/classes/parsers/CFunctionIdParser.php
index fb32343cf0b..fb32343cf0b 100644
--- a/frontends/php/include/classes/parsers/CFunctionIdParser.php
+++ b/ui/include/classes/parsers/CFunctionIdParser.php
diff --git a/frontends/php/include/classes/parsers/CFunctionMacroParser.php b/ui/include/classes/parsers/CFunctionMacroParser.php
index 1ac7f07f014..1ac7f07f014 100644
--- a/frontends/php/include/classes/parsers/CFunctionMacroParser.php
+++ b/ui/include/classes/parsers/CFunctionMacroParser.php
diff --git a/frontends/php/include/classes/parsers/CFunctionParser.php b/ui/include/classes/parsers/CFunctionParser.php
index 987c187b306..987c187b306 100644
--- a/frontends/php/include/classes/parsers/CFunctionParser.php
+++ b/ui/include/classes/parsers/CFunctionParser.php
diff --git a/frontends/php/include/classes/parsers/CHostGroupNameParser.php b/ui/include/classes/parsers/CHostGroupNameParser.php
index 40163261cff..40163261cff 100644
--- a/frontends/php/include/classes/parsers/CHostGroupNameParser.php
+++ b/ui/include/classes/parsers/CHostGroupNameParser.php
diff --git a/frontends/php/include/classes/parsers/CHostNameParser.php b/ui/include/classes/parsers/CHostNameParser.php
index 89a183df6bd..89a183df6bd 100644
--- a/frontends/php/include/classes/parsers/CHostNameParser.php
+++ b/ui/include/classes/parsers/CHostNameParser.php
diff --git a/frontends/php/include/classes/parsers/CIPParser.php b/ui/include/classes/parsers/CIPParser.php
index 7899ce67b6a..7899ce67b6a 100644
--- a/frontends/php/include/classes/parsers/CIPParser.php
+++ b/ui/include/classes/parsers/CIPParser.php
diff --git a/frontends/php/include/classes/parsers/CIPRangeParser.php b/ui/include/classes/parsers/CIPRangeParser.php
index 6d5d8c61081..6d5d8c61081 100644
--- a/frontends/php/include/classes/parsers/CIPRangeParser.php
+++ b/ui/include/classes/parsers/CIPRangeParser.php
diff --git a/frontends/php/include/classes/parsers/CIPv4Parser.php b/ui/include/classes/parsers/CIPv4Parser.php
index ab1ba5354d9..ab1ba5354d9 100644
--- a/frontends/php/include/classes/parsers/CIPv4Parser.php
+++ b/ui/include/classes/parsers/CIPv4Parser.php
diff --git a/frontends/php/include/classes/parsers/CIPv6Parser.php b/ui/include/classes/parsers/CIPv6Parser.php
index f1d0370898a..f1d0370898a 100644
--- a/frontends/php/include/classes/parsers/CIPv6Parser.php
+++ b/ui/include/classes/parsers/CIPv6Parser.php
diff --git a/frontends/php/include/classes/parsers/CItemKey.php b/ui/include/classes/parsers/CItemKey.php
index 5c4b0b2a1e4..5c4b0b2a1e4 100644
--- a/frontends/php/include/classes/parsers/CItemKey.php
+++ b/ui/include/classes/parsers/CItemKey.php
diff --git a/frontends/php/include/classes/parsers/CLLDMacroFunctionParser.php b/ui/include/classes/parsers/CLLDMacroFunctionParser.php
index 03ca60bda16..03ca60bda16 100644
--- a/frontends/php/include/classes/parsers/CLLDMacroFunctionParser.php
+++ b/ui/include/classes/parsers/CLLDMacroFunctionParser.php
diff --git a/frontends/php/include/classes/parsers/CLLDMacroParser.php b/ui/include/classes/parsers/CLLDMacroParser.php
index 8dfd12ff684..8dfd12ff684 100644
--- a/frontends/php/include/classes/parsers/CLLDMacroParser.php
+++ b/ui/include/classes/parsers/CLLDMacroParser.php
diff --git a/frontends/php/include/classes/parsers/CMacroFunctionParser.php b/ui/include/classes/parsers/CMacroFunctionParser.php
index 8166b0410b1..8166b0410b1 100644
--- a/frontends/php/include/classes/parsers/CMacroFunctionParser.php
+++ b/ui/include/classes/parsers/CMacroFunctionParser.php
diff --git a/frontends/php/include/classes/parsers/CMacroParser.php b/ui/include/classes/parsers/CMacroParser.php
index 532b4aedcbf..532b4aedcbf 100644
--- a/frontends/php/include/classes/parsers/CMacroParser.php
+++ b/ui/include/classes/parsers/CMacroParser.php
diff --git a/frontends/php/include/classes/parsers/CNumberParser.php b/ui/include/classes/parsers/CNumberParser.php
index 6860a1baf2a..6860a1baf2a 100644
--- a/frontends/php/include/classes/parsers/CNumberParser.php
+++ b/ui/include/classes/parsers/CNumberParser.php
diff --git a/frontends/php/include/classes/parsers/CParser.php b/ui/include/classes/parsers/CParser.php
index e11a28a6c4c..e11a28a6c4c 100644
--- a/frontends/php/include/classes/parsers/CParser.php
+++ b/ui/include/classes/parsers/CParser.php
diff --git a/frontends/php/include/classes/parsers/CPrometheusOutputParser.php b/ui/include/classes/parsers/CPrometheusOutputParser.php
index 5037dae5ea6..5037dae5ea6 100644
--- a/frontends/php/include/classes/parsers/CPrometheusOutputParser.php
+++ b/ui/include/classes/parsers/CPrometheusOutputParser.php
diff --git a/frontends/php/include/classes/parsers/CPrometheusPatternParser.php b/ui/include/classes/parsers/CPrometheusPatternParser.php
index 03ff4d0b3ab..03ff4d0b3ab 100644
--- a/frontends/php/include/classes/parsers/CPrometheusPatternParser.php
+++ b/ui/include/classes/parsers/CPrometheusPatternParser.php
diff --git a/frontends/php/include/classes/parsers/CRangeParser.php b/ui/include/classes/parsers/CRangeParser.php
index c9c3b9cb46f..c9c3b9cb46f 100644
--- a/frontends/php/include/classes/parsers/CRangeParser.php
+++ b/ui/include/classes/parsers/CRangeParser.php
diff --git a/frontends/php/include/classes/parsers/CRangeTimeParser.php b/ui/include/classes/parsers/CRangeTimeParser.php
index 870b1ece906..870b1ece906 100644
--- a/frontends/php/include/classes/parsers/CRangeTimeParser.php
+++ b/ui/include/classes/parsers/CRangeTimeParser.php
diff --git a/frontends/php/include/classes/parsers/CRangesParser.php b/ui/include/classes/parsers/CRangesParser.php
index 3718406c579..3718406c579 100644
--- a/frontends/php/include/classes/parsers/CRangesParser.php
+++ b/ui/include/classes/parsers/CRangesParser.php
diff --git a/frontends/php/include/classes/parsers/CReferenceParser.php b/ui/include/classes/parsers/CReferenceParser.php
index 32676d6a1b1..32676d6a1b1 100644
--- a/frontends/php/include/classes/parsers/CReferenceParser.php
+++ b/ui/include/classes/parsers/CReferenceParser.php
diff --git a/frontends/php/include/classes/parsers/CRelativeTimeParser.php b/ui/include/classes/parsers/CRelativeTimeParser.php
index f052172b51e..f052172b51e 100644
--- a/frontends/php/include/classes/parsers/CRelativeTimeParser.php
+++ b/ui/include/classes/parsers/CRelativeTimeParser.php
diff --git a/frontends/php/include/classes/parsers/CReplacementParser.php b/ui/include/classes/parsers/CReplacementParser.php
index b6c2389e5de..b6c2389e5de 100644
--- a/frontends/php/include/classes/parsers/CReplacementParser.php
+++ b/ui/include/classes/parsers/CReplacementParser.php
diff --git a/frontends/php/include/classes/parsers/CSchedulingIntervalParser.php b/ui/include/classes/parsers/CSchedulingIntervalParser.php
index e077eba33cb..e077eba33cb 100644
--- a/frontends/php/include/classes/parsers/CSchedulingIntervalParser.php
+++ b/ui/include/classes/parsers/CSchedulingIntervalParser.php
diff --git a/frontends/php/include/classes/parsers/CSetParser.php b/ui/include/classes/parsers/CSetParser.php
index 7120d0ea094..7120d0ea094 100644
--- a/frontends/php/include/classes/parsers/CSetParser.php
+++ b/ui/include/classes/parsers/CSetParser.php
diff --git a/frontends/php/include/classes/parsers/CSimpleIntervalParser.php b/ui/include/classes/parsers/CSimpleIntervalParser.php
index 28588d5d70c..28588d5d70c 100644
--- a/frontends/php/include/classes/parsers/CSimpleIntervalParser.php
+++ b/ui/include/classes/parsers/CSimpleIntervalParser.php
diff --git a/frontends/php/include/classes/parsers/CTimePeriodParser.php b/ui/include/classes/parsers/CTimePeriodParser.php
index 1d35a1a2625..1d35a1a2625 100644
--- a/frontends/php/include/classes/parsers/CTimePeriodParser.php
+++ b/ui/include/classes/parsers/CTimePeriodParser.php
diff --git a/frontends/php/include/classes/parsers/CTimePeriodsParser.php b/ui/include/classes/parsers/CTimePeriodsParser.php
index 73c036ce462..73c036ce462 100644
--- a/frontends/php/include/classes/parsers/CTimePeriodsParser.php
+++ b/ui/include/classes/parsers/CTimePeriodsParser.php
diff --git a/frontends/php/include/classes/parsers/CTriggerExpression.php b/ui/include/classes/parsers/CTriggerExpression.php
index 8400b3a082f..8400b3a082f 100644
--- a/frontends/php/include/classes/parsers/CTriggerExpression.php
+++ b/ui/include/classes/parsers/CTriggerExpression.php
diff --git a/frontends/php/include/classes/parsers/CUpdateIntervalParser.php b/ui/include/classes/parsers/CUpdateIntervalParser.php
index 8157748abbe..8157748abbe 100644
--- a/frontends/php/include/classes/parsers/CUpdateIntervalParser.php
+++ b/ui/include/classes/parsers/CUpdateIntervalParser.php
diff --git a/frontends/php/include/classes/parsers/CUserMacroParser.php b/ui/include/classes/parsers/CUserMacroParser.php
index 52f0de20b6a..52f0de20b6a 100644
--- a/frontends/php/include/classes/parsers/CUserMacroParser.php
+++ b/ui/include/classes/parsers/CUserMacroParser.php
diff --git a/frontends/php/include/classes/parsers/CValidationRule.php b/ui/include/classes/parsers/CValidationRule.php
index 33a2f67c42b..33a2f67c42b 100644
--- a/frontends/php/include/classes/parsers/CValidationRule.php
+++ b/ui/include/classes/parsers/CValidationRule.php
diff --git a/frontends/php/include/classes/parsers/results/CParserResult.php b/ui/include/classes/parsers/results/CParserResult.php
index 0bdd5197207..0bdd5197207 100644
--- a/frontends/php/include/classes/parsers/results/CParserResult.php
+++ b/ui/include/classes/parsers/results/CParserResult.php
diff --git a/frontends/php/include/classes/parsers/results/CTriggerExprParserResult.php b/ui/include/classes/parsers/results/CTriggerExprParserResult.php
index df6b61164e5..df6b61164e5 100644
--- a/frontends/php/include/classes/parsers/results/CTriggerExprParserResult.php
+++ b/ui/include/classes/parsers/results/CTriggerExprParserResult.php
diff --git a/frontends/php/include/classes/regexp/CGlobalRegexp.php b/ui/include/classes/regexp/CGlobalRegexp.php
index e80834bfe9b..e80834bfe9b 100644
--- a/frontends/php/include/classes/regexp/CGlobalRegexp.php
+++ b/ui/include/classes/regexp/CGlobalRegexp.php
diff --git a/frontends/php/include/classes/routing/CUrl.php b/ui/include/classes/routing/CUrl.php
index f9e4fa6a457..f9e4fa6a457 100644
--- a/frontends/php/include/classes/routing/CUrl.php
+++ b/ui/include/classes/routing/CUrl.php
diff --git a/frontends/php/include/classes/routing/CUrlFactory.php b/ui/include/classes/routing/CUrlFactory.php
index 0240eae26b7..0240eae26b7 100644
--- a/frontends/php/include/classes/routing/CUrlFactory.php
+++ b/ui/include/classes/routing/CUrlFactory.php
diff --git a/frontends/php/include/classes/screens/CScreenActions.php b/ui/include/classes/screens/CScreenActions.php
index 1106c71ed55..1106c71ed55 100644
--- a/frontends/php/include/classes/screens/CScreenActions.php
+++ b/ui/include/classes/screens/CScreenActions.php
diff --git a/frontends/php/include/classes/screens/CScreenBase.php b/ui/include/classes/screens/CScreenBase.php
index 2a33690bfe2..2a33690bfe2 100644
--- a/frontends/php/include/classes/screens/CScreenBase.php
+++ b/ui/include/classes/screens/CScreenBase.php
diff --git a/frontends/php/include/classes/screens/CScreenBuilder.php b/ui/include/classes/screens/CScreenBuilder.php
index f5a46447da1..f5a46447da1 100644
--- a/frontends/php/include/classes/screens/CScreenBuilder.php
+++ b/ui/include/classes/screens/CScreenBuilder.php
diff --git a/frontends/php/include/classes/screens/CScreenClock.php b/ui/include/classes/screens/CScreenClock.php
index c3f34520766..c3f34520766 100644
--- a/frontends/php/include/classes/screens/CScreenClock.php
+++ b/ui/include/classes/screens/CScreenClock.php
diff --git a/frontends/php/include/classes/screens/CScreenDataOverview.php b/ui/include/classes/screens/CScreenDataOverview.php
index 9e8b6ea3594..9e8b6ea3594 100644
--- a/frontends/php/include/classes/screens/CScreenDataOverview.php
+++ b/ui/include/classes/screens/CScreenDataOverview.php
diff --git a/frontends/php/include/classes/screens/CScreenDiscovery.php b/ui/include/classes/screens/CScreenDiscovery.php
index 54a641fba3d..54a641fba3d 100644
--- a/frontends/php/include/classes/screens/CScreenDiscovery.php
+++ b/ui/include/classes/screens/CScreenDiscovery.php
diff --git a/frontends/php/include/classes/screens/CScreenEvents.php b/ui/include/classes/screens/CScreenEvents.php
index 9cdecf7aed8..9cdecf7aed8 100644
--- a/frontends/php/include/classes/screens/CScreenEvents.php
+++ b/ui/include/classes/screens/CScreenEvents.php
diff --git a/frontends/php/include/classes/screens/CScreenGraph.php b/ui/include/classes/screens/CScreenGraph.php
index 9c7d8bd936a..9c7d8bd936a 100644
--- a/frontends/php/include/classes/screens/CScreenGraph.php
+++ b/ui/include/classes/screens/CScreenGraph.php
diff --git a/frontends/php/include/classes/screens/CScreenHistory.php b/ui/include/classes/screens/CScreenHistory.php
index b1558ea4a9e..b1558ea4a9e 100644
--- a/frontends/php/include/classes/screens/CScreenHistory.php
+++ b/ui/include/classes/screens/CScreenHistory.php
diff --git a/frontends/php/include/classes/screens/CScreenHostTriggers.php b/ui/include/classes/screens/CScreenHostTriggers.php
index f0018a11431..f0018a11431 100644
--- a/frontends/php/include/classes/screens/CScreenHostTriggers.php
+++ b/ui/include/classes/screens/CScreenHostTriggers.php
diff --git a/frontends/php/include/classes/screens/CScreenHostgroupTriggers.php b/ui/include/classes/screens/CScreenHostgroupTriggers.php
index c6389e4c128..c6389e4c128 100644
--- a/frontends/php/include/classes/screens/CScreenHostgroupTriggers.php
+++ b/ui/include/classes/screens/CScreenHostgroupTriggers.php
diff --git a/frontends/php/include/classes/screens/CScreenHostsInfo.php b/ui/include/classes/screens/CScreenHostsInfo.php
index 934ed1fe6aa..934ed1fe6aa 100644
--- a/frontends/php/include/classes/screens/CScreenHostsInfo.php
+++ b/ui/include/classes/screens/CScreenHostsInfo.php
diff --git a/frontends/php/include/classes/screens/CScreenHttpTest.php b/ui/include/classes/screens/CScreenHttpTest.php
index 7ad6397b539..7ad6397b539 100644
--- a/frontends/php/include/classes/screens/CScreenHttpTest.php
+++ b/ui/include/classes/screens/CScreenHttpTest.php
diff --git a/frontends/php/include/classes/screens/CScreenHttpTestDetails.php b/ui/include/classes/screens/CScreenHttpTestDetails.php
index bc77afb4f4d..bc77afb4f4d 100644
--- a/frontends/php/include/classes/screens/CScreenHttpTestDetails.php
+++ b/ui/include/classes/screens/CScreenHttpTestDetails.php
diff --git a/frontends/php/include/classes/screens/CScreenLldGraph.php b/ui/include/classes/screens/CScreenLldGraph.php
index f8ab231ab49..f8ab231ab49 100644
--- a/frontends/php/include/classes/screens/CScreenLldGraph.php
+++ b/ui/include/classes/screens/CScreenLldGraph.php
diff --git a/frontends/php/include/classes/screens/CScreenLldGraphBase.php b/ui/include/classes/screens/CScreenLldGraphBase.php
index 3991b40f641..3991b40f641 100644
--- a/frontends/php/include/classes/screens/CScreenLldGraphBase.php
+++ b/ui/include/classes/screens/CScreenLldGraphBase.php
diff --git a/frontends/php/include/classes/screens/CScreenLldSimpleGraph.php b/ui/include/classes/screens/CScreenLldSimpleGraph.php
index 8b53f9ae24b..8b53f9ae24b 100644
--- a/frontends/php/include/classes/screens/CScreenLldSimpleGraph.php
+++ b/ui/include/classes/screens/CScreenLldSimpleGraph.php
diff --git a/frontends/php/include/classes/screens/CScreenMap.php b/ui/include/classes/screens/CScreenMap.php
index 30eec66a5d6..30eec66a5d6 100644
--- a/frontends/php/include/classes/screens/CScreenMap.php
+++ b/ui/include/classes/screens/CScreenMap.php
diff --git a/frontends/php/include/classes/screens/CScreenPlainText.php b/ui/include/classes/screens/CScreenPlainText.php
index 285f8ae9328..285f8ae9328 100644
--- a/frontends/php/include/classes/screens/CScreenPlainText.php
+++ b/ui/include/classes/screens/CScreenPlainText.php
diff --git a/frontends/php/include/classes/screens/CScreenProblem.php b/ui/include/classes/screens/CScreenProblem.php
index e4a56d8f02d..e4a56d8f02d 100644
--- a/frontends/php/include/classes/screens/CScreenProblem.php
+++ b/ui/include/classes/screens/CScreenProblem.php
diff --git a/frontends/php/include/classes/screens/CScreenServerInfo.php b/ui/include/classes/screens/CScreenServerInfo.php
index 59a951c3f06..59a951c3f06 100644
--- a/frontends/php/include/classes/screens/CScreenServerInfo.php
+++ b/ui/include/classes/screens/CScreenServerInfo.php
diff --git a/frontends/php/include/classes/screens/CScreenSimpleGraph.php b/ui/include/classes/screens/CScreenSimpleGraph.php
index 389b0dcc558..389b0dcc558 100644
--- a/frontends/php/include/classes/screens/CScreenSimpleGraph.php
+++ b/ui/include/classes/screens/CScreenSimpleGraph.php
diff --git a/frontends/php/include/classes/screens/CScreenSystemStatus.php b/ui/include/classes/screens/CScreenSystemStatus.php
index 6bfead82217..6bfead82217 100644
--- a/frontends/php/include/classes/screens/CScreenSystemStatus.php
+++ b/ui/include/classes/screens/CScreenSystemStatus.php
diff --git a/frontends/php/include/classes/screens/CScreenTriggersInfo.php b/ui/include/classes/screens/CScreenTriggersInfo.php
index f9be9d4ff1a..f9be9d4ff1a 100644
--- a/frontends/php/include/classes/screens/CScreenTriggersInfo.php
+++ b/ui/include/classes/screens/CScreenTriggersInfo.php
diff --git a/frontends/php/include/classes/screens/CScreenTriggersOverview.php b/ui/include/classes/screens/CScreenTriggersOverview.php
index 8a438f0f590..8a438f0f590 100644
--- a/frontends/php/include/classes/screens/CScreenTriggersOverview.php
+++ b/ui/include/classes/screens/CScreenTriggersOverview.php
diff --git a/frontends/php/include/classes/screens/CScreenUrl.php b/ui/include/classes/screens/CScreenUrl.php
index 849c00106fc..849c00106fc 100644
--- a/frontends/php/include/classes/screens/CScreenUrl.php
+++ b/ui/include/classes/screens/CScreenUrl.php
diff --git a/frontends/php/include/classes/server/CZabbixServer.php b/ui/include/classes/server/CZabbixServer.php
index ef1de3fa15d..ef1de3fa15d 100644
--- a/frontends/php/include/classes/server/CZabbixServer.php
+++ b/ui/include/classes/server/CZabbixServer.php
diff --git a/frontends/php/include/classes/services/CServicesSlaCalculator.php b/ui/include/classes/services/CServicesSlaCalculator.php
index 1e2104556c0..1e2104556c0 100644
--- a/frontends/php/include/classes/services/CServicesSlaCalculator.php
+++ b/ui/include/classes/services/CServicesSlaCalculator.php
diff --git a/frontends/php/include/classes/setup/CFrontendSetup.php b/ui/include/classes/setup/CFrontendSetup.php
index 6699dc1e10b..6699dc1e10b 100644
--- a/frontends/php/include/classes/setup/CFrontendSetup.php
+++ b/ui/include/classes/setup/CFrontendSetup.php
diff --git a/frontends/php/include/classes/setup/CSetupWizard.php b/ui/include/classes/setup/CSetupWizard.php
index 53ba5c59d9a..53ba5c59d9a 100644
--- a/frontends/php/include/classes/setup/CSetupWizard.php
+++ b/ui/include/classes/setup/CSetupWizard.php
diff --git a/frontends/php/include/classes/tree/CServiceTree.php b/ui/include/classes/tree/CServiceTree.php
index e16bd644628..e16bd644628 100644
--- a/frontends/php/include/classes/tree/CServiceTree.php
+++ b/ui/include/classes/tree/CServiceTree.php
diff --git a/frontends/php/include/classes/tree/CTree.php b/ui/include/classes/tree/CTree.php
index ad6f469cc15..ad6f469cc15 100644
--- a/frontends/php/include/classes/tree/CTree.php
+++ b/ui/include/classes/tree/CTree.php
diff --git a/frontends/php/include/classes/triggers/CTextTriggerConstructor.php b/ui/include/classes/triggers/CTextTriggerConstructor.php
index 68c8ea3ab98..68c8ea3ab98 100644
--- a/frontends/php/include/classes/triggers/CTextTriggerConstructor.php
+++ b/ui/include/classes/triggers/CTextTriggerConstructor.php
diff --git a/frontends/php/include/classes/user/CFavorite.php b/ui/include/classes/user/CFavorite.php
index 15aff91e356..15aff91e356 100644
--- a/frontends/php/include/classes/user/CFavorite.php
+++ b/ui/include/classes/user/CFavorite.php
diff --git a/frontends/php/include/classes/user/CProfile.php b/ui/include/classes/user/CProfile.php
index 0336e518e83..0336e518e83 100644
--- a/frontends/php/include/classes/user/CProfile.php
+++ b/ui/include/classes/user/CProfile.php
diff --git a/frontends/php/include/classes/user/CWebUser.php b/ui/include/classes/user/CWebUser.php
index 6065bd5f580..6065bd5f580 100644
--- a/frontends/php/include/classes/user/CWebUser.php
+++ b/ui/include/classes/user/CWebUser.php
diff --git a/frontends/php/include/classes/validators/CActionCondValidator.php b/ui/include/classes/validators/CActionCondValidator.php
index af27a7a502c..af27a7a502c 100644
--- a/frontends/php/include/classes/validators/CActionCondValidator.php
+++ b/ui/include/classes/validators/CActionCondValidator.php
diff --git a/frontends/php/include/classes/validators/CApiInputValidator.php b/ui/include/classes/validators/CApiInputValidator.php
index 5e4debd85f4..5e4debd85f4 100644
--- a/frontends/php/include/classes/validators/CApiInputValidator.php
+++ b/ui/include/classes/validators/CApiInputValidator.php
diff --git a/frontends/php/include/classes/validators/CCollectionValidator.php b/ui/include/classes/validators/CCollectionValidator.php
index c5a06adaccc..c5a06adaccc 100644
--- a/frontends/php/include/classes/validators/CCollectionValidator.php
+++ b/ui/include/classes/validators/CCollectionValidator.php
diff --git a/frontends/php/include/classes/validators/CColorValidator.php b/ui/include/classes/validators/CColorValidator.php
index 9d18851a4ed..9d18851a4ed 100644
--- a/frontends/php/include/classes/validators/CColorValidator.php
+++ b/ui/include/classes/validators/CColorValidator.php
diff --git a/frontends/php/include/classes/validators/CEmailValidator.php b/ui/include/classes/validators/CEmailValidator.php
index 6730d7be88b..6730d7be88b 100644
--- a/frontends/php/include/classes/validators/CEmailValidator.php
+++ b/ui/include/classes/validators/CEmailValidator.php
diff --git a/frontends/php/include/classes/validators/CEventCorrCondValidator.php b/ui/include/classes/validators/CEventCorrCondValidator.php
index da9840f2867..da9840f2867 100644
--- a/frontends/php/include/classes/validators/CEventCorrCondValidator.php
+++ b/ui/include/classes/validators/CEventCorrCondValidator.php
diff --git a/frontends/php/include/classes/validators/CFunctionValidator.php b/ui/include/classes/validators/CFunctionValidator.php
index 2e3ee36a3d5..2e3ee36a3d5 100644
--- a/frontends/php/include/classes/validators/CFunctionValidator.php
+++ b/ui/include/classes/validators/CFunctionValidator.php
diff --git a/frontends/php/include/classes/validators/CHtmlUrlValidator.php b/ui/include/classes/validators/CHtmlUrlValidator.php
index 80d6623ebfa..80d6623ebfa 100644
--- a/frontends/php/include/classes/validators/CHtmlUrlValidator.php
+++ b/ui/include/classes/validators/CHtmlUrlValidator.php
diff --git a/frontends/php/include/classes/validators/CIdValidator.php b/ui/include/classes/validators/CIdValidator.php
index 7b465935f9c..7b465935f9c 100644
--- a/frontends/php/include/classes/validators/CIdValidator.php
+++ b/ui/include/classes/validators/CIdValidator.php
diff --git a/frontends/php/include/classes/validators/CLdapAuthValidator.php b/ui/include/classes/validators/CLdapAuthValidator.php
index 79e6b0cce69..79e6b0cce69 100644
--- a/frontends/php/include/classes/validators/CLdapAuthValidator.php
+++ b/ui/include/classes/validators/CLdapAuthValidator.php
diff --git a/frontends/php/include/classes/validators/CLimitedSetValidator.php b/ui/include/classes/validators/CLimitedSetValidator.php
index 44330a7fcfd..44330a7fcfd 100644
--- a/frontends/php/include/classes/validators/CLimitedSetValidator.php
+++ b/ui/include/classes/validators/CLimitedSetValidator.php
diff --git a/frontends/php/include/classes/validators/CNewValidator.php b/ui/include/classes/validators/CNewValidator.php
index 76fcf2c4abd..76fcf2c4abd 100644
--- a/frontends/php/include/classes/validators/CNewValidator.php
+++ b/ui/include/classes/validators/CNewValidator.php
diff --git a/frontends/php/include/classes/validators/CPartialValidatorInterface.php b/ui/include/classes/validators/CPartialValidatorInterface.php
index 16ad53d4570..16ad53d4570 100644
--- a/frontends/php/include/classes/validators/CPartialValidatorInterface.php
+++ b/ui/include/classes/validators/CPartialValidatorInterface.php
diff --git a/frontends/php/include/classes/validators/CRegexValidator.php b/ui/include/classes/validators/CRegexValidator.php
index 5e932db4b86..5e932db4b86 100644
--- a/frontends/php/include/classes/validators/CRegexValidator.php
+++ b/ui/include/classes/validators/CRegexValidator.php
diff --git a/frontends/php/include/classes/validators/CStringValidator.php b/ui/include/classes/validators/CStringValidator.php
index 8f5349c923d..8f5349c923d 100644
--- a/frontends/php/include/classes/validators/CStringValidator.php
+++ b/ui/include/classes/validators/CStringValidator.php
diff --git a/frontends/php/include/classes/validators/CValidator.php b/ui/include/classes/validators/CValidator.php
index 974193f8cac..974193f8cac 100644
--- a/frontends/php/include/classes/validators/CValidator.php
+++ b/ui/include/classes/validators/CValidator.php
diff --git a/frontends/php/include/classes/validators/event/CEventSourceObjectValidator.php b/ui/include/classes/validators/event/CEventSourceObjectValidator.php
index 3b27261e209..3b27261e209 100644
--- a/frontends/php/include/classes/validators/event/CEventSourceObjectValidator.php
+++ b/ui/include/classes/validators/event/CEventSourceObjectValidator.php
diff --git a/frontends/php/include/classes/validators/host/CHostNormalValidator.php b/ui/include/classes/validators/host/CHostNormalValidator.php
index 24b2a504357..24b2a504357 100644
--- a/frontends/php/include/classes/validators/host/CHostNormalValidator.php
+++ b/ui/include/classes/validators/host/CHostNormalValidator.php
diff --git a/frontends/php/include/classes/validators/object/CConditionValidator.php b/ui/include/classes/validators/object/CConditionValidator.php
index cb0726985cd..cb0726985cd 100644
--- a/frontends/php/include/classes/validators/object/CConditionValidator.php
+++ b/ui/include/classes/validators/object/CConditionValidator.php
diff --git a/frontends/php/include/classes/validators/object/CUpdateDiscoveredValidator.php b/ui/include/classes/validators/object/CUpdateDiscoveredValidator.php
index 22bd02d5567..22bd02d5567 100644
--- a/frontends/php/include/classes/validators/object/CUpdateDiscoveredValidator.php
+++ b/ui/include/classes/validators/object/CUpdateDiscoveredValidator.php
diff --git a/frontends/php/include/classes/validators/schema/CSchemaValidator.php b/ui/include/classes/validators/schema/CSchemaValidator.php
index c15de3a26d7..c15de3a26d7 100644
--- a/frontends/php/include/classes/validators/schema/CSchemaValidator.php
+++ b/ui/include/classes/validators/schema/CSchemaValidator.php
diff --git a/frontends/php/include/classes/widgets/CWidgetConfig.php b/ui/include/classes/widgets/CWidgetConfig.php
index d7ce9097d22..d7ce9097d22 100644
--- a/frontends/php/include/classes/widgets/CWidgetConfig.php
+++ b/ui/include/classes/widgets/CWidgetConfig.php
diff --git a/frontends/php/include/classes/widgets/CWidgetHelper.php b/ui/include/classes/widgets/CWidgetHelper.php
index 8ada2803170..8ada2803170 100644
--- a/frontends/php/include/classes/widgets/CWidgetHelper.php
+++ b/ui/include/classes/widgets/CWidgetHelper.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetField.php b/ui/include/classes/widgets/fields/CWidgetField.php
index 315961fd2d7..315961fd2d7 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetField.php
+++ b/ui/include/classes/widgets/fields/CWidgetField.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldApplication.php b/ui/include/classes/widgets/fields/CWidgetFieldApplication.php
index 18d8802992a..18d8802992a 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldApplication.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldApplication.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldCheckBox.php b/ui/include/classes/widgets/fields/CWidgetFieldCheckBox.php
index 2cab2c68cb2..2cab2c68cb2 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldCheckBox.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldCheckBox.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldCheckBoxList.php b/ui/include/classes/widgets/fields/CWidgetFieldCheckBoxList.php
index 54baa56b384..54baa56b384 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldCheckBoxList.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldCheckBoxList.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldComboBox.php b/ui/include/classes/widgets/fields/CWidgetFieldComboBox.php
index 94e4f5fae2c..94e4f5fae2c 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldComboBox.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldComboBox.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldDatePicker.php b/ui/include/classes/widgets/fields/CWidgetFieldDatePicker.php
index d6f894b0249..d6f894b0249 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldDatePicker.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldDatePicker.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldGraphDataSet.php b/ui/include/classes/widgets/fields/CWidgetFieldGraphDataSet.php
index b958854b8c4..b958854b8c4 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldGraphDataSet.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldGraphDataSet.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldGraphOverride.php b/ui/include/classes/widgets/fields/CWidgetFieldGraphOverride.php
index ba3d9e22a33..ba3d9e22a33 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldGraphOverride.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldGraphOverride.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldHidden.php b/ui/include/classes/widgets/fields/CWidgetFieldHidden.php
index 5adca06a700..5adca06a700 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldHidden.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldHidden.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldHostPatternSelect.php b/ui/include/classes/widgets/fields/CWidgetFieldHostPatternSelect.php
index d09c9f4437e..d09c9f4437e 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldHostPatternSelect.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldHostPatternSelect.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldIntegerBox.php b/ui/include/classes/widgets/fields/CWidgetFieldIntegerBox.php
index 0b544115fc0..0b544115fc0 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldIntegerBox.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldIntegerBox.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldMs.php b/ui/include/classes/widgets/fields/CWidgetFieldMs.php
index fe3bd7700ce..fe3bd7700ce 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldMs.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldMs.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldMsGraph.php b/ui/include/classes/widgets/fields/CWidgetFieldMsGraph.php
index 11ec034b0eb..11ec034b0eb 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldMsGraph.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldMsGraph.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldMsGraphPrototype.php b/ui/include/classes/widgets/fields/CWidgetFieldMsGraphPrototype.php
index b3db27bb67a..b3db27bb67a 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldMsGraphPrototype.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldMsGraphPrototype.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldMsGroup.php b/ui/include/classes/widgets/fields/CWidgetFieldMsGroup.php
index adc685c63a0..adc685c63a0 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldMsGroup.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldMsGroup.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldMsHost.php b/ui/include/classes/widgets/fields/CWidgetFieldMsHost.php
index 0317dc15a03..0317dc15a03 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldMsHost.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldMsHost.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldMsItem.php b/ui/include/classes/widgets/fields/CWidgetFieldMsItem.php
index 9b48980b1c0..9b48980b1c0 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldMsItem.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldMsItem.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldMsItemPrototype.php b/ui/include/classes/widgets/fields/CWidgetFieldMsItemPrototype.php
index 0a4678703ee..0a4678703ee 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldMsItemPrototype.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldMsItemPrototype.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldNavTree.php b/ui/include/classes/widgets/fields/CWidgetFieldNavTree.php
index d9b943f3556..d9b943f3556 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldNavTree.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldNavTree.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldNumericBox.php b/ui/include/classes/widgets/fields/CWidgetFieldNumericBox.php
index 03158f58e9f..03158f58e9f 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldNumericBox.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldNumericBox.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldRadioButtonList.php b/ui/include/classes/widgets/fields/CWidgetFieldRadioButtonList.php
index f792ce0ba08..f792ce0ba08 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldRadioButtonList.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldRadioButtonList.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldRangeControl.php b/ui/include/classes/widgets/fields/CWidgetFieldRangeControl.php
index f54fde754a9..f54fde754a9 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldRangeControl.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldRangeControl.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldReference.php b/ui/include/classes/widgets/fields/CWidgetFieldReference.php
index 9688a339120..9688a339120 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldReference.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldReference.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldSelectResource.php b/ui/include/classes/widgets/fields/CWidgetFieldSelectResource.php
index fb0258cb2c8..fb0258cb2c8 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldSelectResource.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldSelectResource.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldSeverities.php b/ui/include/classes/widgets/fields/CWidgetFieldSeverities.php
index 368d84202d1..368d84202d1 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldSeverities.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldSeverities.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldTags.php b/ui/include/classes/widgets/fields/CWidgetFieldTags.php
index c57e5a474e4..c57e5a474e4 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldTags.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldTags.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldTextBox.php b/ui/include/classes/widgets/fields/CWidgetFieldTextBox.php
index 024665d9264..024665d9264 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldTextBox.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldTextBox.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldUrl.php b/ui/include/classes/widgets/fields/CWidgetFieldUrl.php
index 739be868f82..739be868f82 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldUrl.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldUrl.php
diff --git a/frontends/php/include/classes/widgets/fields/CWidgetFieldWidgetListComboBox.php b/ui/include/classes/widgets/fields/CWidgetFieldWidgetListComboBox.php
index c5b4938972e..c5b4938972e 100644
--- a/frontends/php/include/classes/widgets/fields/CWidgetFieldWidgetListComboBox.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldWidgetListComboBox.php
diff --git a/frontends/php/include/classes/widgets/forms/CWidgetForm.php b/ui/include/classes/widgets/forms/CWidgetForm.php
index 2b91078244c..2b91078244c 100644
--- a/frontends/php/include/classes/widgets/forms/CWidgetForm.php
+++ b/ui/include/classes/widgets/forms/CWidgetForm.php
diff --git a/frontends/php/include/classes/widgets/forms/CWidgetFormActionLog.php b/ui/include/classes/widgets/forms/CWidgetFormActionLog.php
index e32c82efbe0..e32c82efbe0 100644
--- a/frontends/php/include/classes/widgets/forms/CWidgetFormActionLog.php
+++ b/ui/include/classes/widgets/forms/CWidgetFormActionLog.php
diff --git a/frontends/php/include/classes/widgets/forms/CWidgetFormClock.php b/ui/include/classes/widgets/forms/CWidgetFormClock.php
index 59071b442d4..59071b442d4 100644
--- a/frontends/php/include/classes/widgets/forms/CWidgetFormClock.php
+++ b/ui/include/classes/widgets/forms/CWidgetFormClock.php
diff --git a/frontends/php/include/classes/widgets/forms/CWidgetFormDataOver.php b/ui/include/classes/widgets/forms/CWidgetFormDataOver.php
index aa45af3c705..aa45af3c705 100644
--- a/frontends/php/include/classes/widgets/forms/CWidgetFormDataOver.php
+++ b/ui/include/classes/widgets/forms/CWidgetFormDataOver.php
diff --git a/frontends/php/include/classes/widgets/forms/CWidgetFormGraph.php b/ui/include/classes/widgets/forms/CWidgetFormGraph.php
index 7c140b8037d..7c140b8037d 100644
--- a/frontends/php/include/classes/widgets/forms/CWidgetFormGraph.php
+++ b/ui/include/classes/widgets/forms/CWidgetFormGraph.php
diff --git a/frontends/php/include/classes/widgets/forms/CWidgetFormGraphPrototype.php b/ui/include/classes/widgets/forms/CWidgetFormGraphPrototype.php
index 6733347c644..6733347c644 100644
--- a/frontends/php/include/classes/widgets/forms/CWidgetFormGraphPrototype.php
+++ b/ui/include/classes/widgets/forms/CWidgetFormGraphPrototype.php
diff --git a/frontends/php/include/classes/widgets/forms/CWidgetFormHostAvail.php b/ui/include/classes/widgets/forms/CWidgetFormHostAvail.php
index 9ff5bee4d79..9ff5bee4d79 100644
--- a/frontends/php/include/classes/widgets/forms/CWidgetFormHostAvail.php
+++ b/ui/include/classes/widgets/forms/CWidgetFormHostAvail.php
diff --git a/frontends/php/include/classes/widgets/forms/CWidgetFormMap.php b/ui/include/classes/widgets/forms/CWidgetFormMap.php
index 199d33d8c40..199d33d8c40 100644
--- a/frontends/php/include/classes/widgets/forms/CWidgetFormMap.php
+++ b/ui/include/classes/widgets/forms/CWidgetFormMap.php
diff --git a/frontends/php/include/classes/widgets/forms/CWidgetFormNavTree.php b/ui/include/classes/widgets/forms/CWidgetFormNavTree.php
index 8a3be674861..8a3be674861 100644
--- a/frontends/php/include/classes/widgets/forms/CWidgetFormNavTree.php
+++ b/ui/include/classes/widgets/forms/CWidgetFormNavTree.php
diff --git a/frontends/php/include/classes/widgets/forms/CWidgetFormPlainText.php b/ui/include/classes/widgets/forms/CWidgetFormPlainText.php
index 9a6607c2828..9a6607c2828 100644
--- a/frontends/php/include/classes/widgets/forms/CWidgetFormPlainText.php
+++ b/ui/include/classes/widgets/forms/CWidgetFormPlainText.php
diff --git a/frontends/php/include/classes/widgets/forms/CWidgetFormProblemHosts.php b/ui/include/classes/widgets/forms/CWidgetFormProblemHosts.php
index 11121236556..11121236556 100644
--- a/frontends/php/include/classes/widgets/forms/CWidgetFormProblemHosts.php
+++ b/ui/include/classes/widgets/forms/CWidgetFormProblemHosts.php
diff --git a/frontends/php/include/classes/widgets/forms/CWidgetFormProblems.php b/ui/include/classes/widgets/forms/CWidgetFormProblems.php
index 61e4e37eb19..61e4e37eb19 100644
--- a/frontends/php/include/classes/widgets/forms/CWidgetFormProblems.php
+++ b/ui/include/classes/widgets/forms/CWidgetFormProblems.php
diff --git a/frontends/php/include/classes/widgets/forms/CWidgetFormProblemsBySv.php b/ui/include/classes/widgets/forms/CWidgetFormProblemsBySv.php
index bdf84d83e78..bdf84d83e78 100644
--- a/frontends/php/include/classes/widgets/forms/CWidgetFormProblemsBySv.php
+++ b/ui/include/classes/widgets/forms/CWidgetFormProblemsBySv.php
diff --git a/frontends/php/include/classes/widgets/forms/CWidgetFormSvgGraph.php b/ui/include/classes/widgets/forms/CWidgetFormSvgGraph.php
index bca9c985139..bca9c985139 100644
--- a/frontends/php/include/classes/widgets/forms/CWidgetFormSvgGraph.php
+++ b/ui/include/classes/widgets/forms/CWidgetFormSvgGraph.php
diff --git a/frontends/php/include/classes/widgets/forms/CWidgetFormTrigOver.php b/ui/include/classes/widgets/forms/CWidgetFormTrigOver.php
index e10611bada5..e10611bada5 100644
--- a/frontends/php/include/classes/widgets/forms/CWidgetFormTrigOver.php
+++ b/ui/include/classes/widgets/forms/CWidgetFormTrigOver.php
diff --git a/frontends/php/include/classes/widgets/forms/CWidgetFormUrl.php b/ui/include/classes/widgets/forms/CWidgetFormUrl.php
index 26ef8a762d2..26ef8a762d2 100644
--- a/frontends/php/include/classes/widgets/forms/CWidgetFormUrl.php
+++ b/ui/include/classes/widgets/forms/CWidgetFormUrl.php
diff --git a/frontends/php/include/classes/widgets/forms/CWidgetFormWeb.php b/ui/include/classes/widgets/forms/CWidgetFormWeb.php
index 9aadcb30535..9aadcb30535 100644
--- a/frontends/php/include/classes/widgets/forms/CWidgetFormWeb.php
+++ b/ui/include/classes/widgets/forms/CWidgetFormWeb.php
diff --git a/frontends/php/include/classes/widgets/views/widget.actionlog.form.view.php b/ui/include/classes/widgets/views/widget.actionlog.form.view.php
index 43278692a69..43278692a69 100644
--- a/frontends/php/include/classes/widgets/views/widget.actionlog.form.view.php
+++ b/ui/include/classes/widgets/views/widget.actionlog.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.clock.form.view.php b/ui/include/classes/widgets/views/widget.clock.form.view.php
index 9f26164a744..9f26164a744 100644
--- a/frontends/php/include/classes/widgets/views/widget.clock.form.view.php
+++ b/ui/include/classes/widgets/views/widget.clock.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.dataover.form.view.php b/ui/include/classes/widgets/views/widget.dataover.form.view.php
index 04a79398126..04a79398126 100644
--- a/frontends/php/include/classes/widgets/views/widget.dataover.form.view.php
+++ b/ui/include/classes/widgets/views/widget.dataover.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.discovery.form.view.php b/ui/include/classes/widgets/views/widget.discovery.form.view.php
index 96f0d7b805d..96f0d7b805d 100644
--- a/frontends/php/include/classes/widgets/views/widget.discovery.form.view.php
+++ b/ui/include/classes/widgets/views/widget.discovery.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.favgraphs.form.view.php b/ui/include/classes/widgets/views/widget.favgraphs.form.view.php
index dfccdfbcf57..dfccdfbcf57 100644
--- a/frontends/php/include/classes/widgets/views/widget.favgraphs.form.view.php
+++ b/ui/include/classes/widgets/views/widget.favgraphs.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.favmaps.form.view.php b/ui/include/classes/widgets/views/widget.favmaps.form.view.php
index e0358888cb6..e0358888cb6 100644
--- a/frontends/php/include/classes/widgets/views/widget.favmaps.form.view.php
+++ b/ui/include/classes/widgets/views/widget.favmaps.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.favscreens.form.view.php b/ui/include/classes/widgets/views/widget.favscreens.form.view.php
index 0884198784f..0884198784f 100644
--- a/frontends/php/include/classes/widgets/views/widget.favscreens.form.view.php
+++ b/ui/include/classes/widgets/views/widget.favscreens.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.graph.form.view.php b/ui/include/classes/widgets/views/widget.graph.form.view.php
index 17198fad917..17198fad917 100644
--- a/frontends/php/include/classes/widgets/views/widget.graph.form.view.php
+++ b/ui/include/classes/widgets/views/widget.graph.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.graphprototype.form.view.php b/ui/include/classes/widgets/views/widget.graphprototype.form.view.php
index 241169a7cc4..241169a7cc4 100644
--- a/frontends/php/include/classes/widgets/views/widget.graphprototype.form.view.php
+++ b/ui/include/classes/widgets/views/widget.graphprototype.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.hostavail.form.view.php b/ui/include/classes/widgets/views/widget.hostavail.form.view.php
index 533f6f6ac60..533f6f6ac60 100644
--- a/frontends/php/include/classes/widgets/views/widget.hostavail.form.view.php
+++ b/ui/include/classes/widgets/views/widget.hostavail.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.map.form.view.php b/ui/include/classes/widgets/views/widget.map.form.view.php
index 266cba04e57..266cba04e57 100644
--- a/frontends/php/include/classes/widgets/views/widget.map.form.view.php
+++ b/ui/include/classes/widgets/views/widget.map.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.navtree.form.view.php b/ui/include/classes/widgets/views/widget.navtree.form.view.php
index 807fc83754b..807fc83754b 100644
--- a/frontends/php/include/classes/widgets/views/widget.navtree.form.view.php
+++ b/ui/include/classes/widgets/views/widget.navtree.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.plaintext.form.view.php b/ui/include/classes/widgets/views/widget.plaintext.form.view.php
index 6f6999dae47..6f6999dae47 100644
--- a/frontends/php/include/classes/widgets/views/widget.plaintext.form.view.php
+++ b/ui/include/classes/widgets/views/widget.plaintext.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.problemhosts.form.view.php b/ui/include/classes/widgets/views/widget.problemhosts.form.view.php
index 6db126b6709..6db126b6709 100644
--- a/frontends/php/include/classes/widgets/views/widget.problemhosts.form.view.php
+++ b/ui/include/classes/widgets/views/widget.problemhosts.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.problems.form.view.php b/ui/include/classes/widgets/views/widget.problems.form.view.php
index ea404f0e6b4..ea404f0e6b4 100644
--- a/frontends/php/include/classes/widgets/views/widget.problems.form.view.php
+++ b/ui/include/classes/widgets/views/widget.problems.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.problemsbysv.form.view.php b/ui/include/classes/widgets/views/widget.problemsbysv.form.view.php
index 93aef01510b..93aef01510b 100644
--- a/frontends/php/include/classes/widgets/views/widget.problemsbysv.form.view.php
+++ b/ui/include/classes/widgets/views/widget.problemsbysv.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.svggraph.form.view.php b/ui/include/classes/widgets/views/widget.svggraph.form.view.php
index 9153b3faaaa..9153b3faaaa 100644
--- a/frontends/php/include/classes/widgets/views/widget.svggraph.form.view.php
+++ b/ui/include/classes/widgets/views/widget.svggraph.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.systeminfo.form.view.php b/ui/include/classes/widgets/views/widget.systeminfo.form.view.php
index 810ef0b3c64..810ef0b3c64 100644
--- a/frontends/php/include/classes/widgets/views/widget.systeminfo.form.view.php
+++ b/ui/include/classes/widgets/views/widget.systeminfo.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.trigover.form.view.php b/ui/include/classes/widgets/views/widget.trigover.form.view.php
index b2bec74425f..b2bec74425f 100644
--- a/frontends/php/include/classes/widgets/views/widget.trigover.form.view.php
+++ b/ui/include/classes/widgets/views/widget.trigover.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.url.form.view.php b/ui/include/classes/widgets/views/widget.url.form.view.php
index c607a1c288c..c607a1c288c 100644
--- a/frontends/php/include/classes/widgets/views/widget.url.form.view.php
+++ b/ui/include/classes/widgets/views/widget.url.form.view.php
diff --git a/frontends/php/include/classes/widgets/views/widget.web.form.view.php b/ui/include/classes/widgets/views/widget.web.form.view.php
index 038223de8e0..038223de8e0 100644
--- a/frontends/php/include/classes/widgets/views/widget.web.form.view.php
+++ b/ui/include/classes/widgets/views/widget.web.form.view.php
diff --git a/frontends/php/include/classes/xml/CXmlConstantName.php b/ui/include/classes/xml/CXmlConstantName.php
index ea5ae4e79e9..ea5ae4e79e9 100644
--- a/frontends/php/include/classes/xml/CXmlConstantName.php
+++ b/ui/include/classes/xml/CXmlConstantName.php
diff --git a/frontends/php/include/classes/xml/CXmlConstantValue.php b/ui/include/classes/xml/CXmlConstantValue.php
index 58a9bcdd658..58a9bcdd658 100644
--- a/frontends/php/include/classes/xml/CXmlConstantValue.php
+++ b/ui/include/classes/xml/CXmlConstantValue.php
diff --git a/frontends/php/include/config.inc.php b/ui/include/config.inc.php
index a3781e0903b..a3781e0903b 100644
--- a/frontends/php/include/config.inc.php
+++ b/ui/include/config.inc.php
diff --git a/frontends/php/include/correlation.inc.php b/ui/include/correlation.inc.php
index 2179ab2903a..2179ab2903a 100644
--- a/frontends/php/include/correlation.inc.php
+++ b/ui/include/correlation.inc.php
diff --git a/frontends/php/include/db.inc.php b/ui/include/db.inc.php
index 3bb0473ea63..3bb0473ea63 100644
--- a/frontends/php/include/db.inc.php
+++ b/ui/include/db.inc.php
diff --git a/frontends/php/include/debug.inc.php b/ui/include/debug.inc.php
index 00fcf9ccef5..00fcf9ccef5 100644
--- a/frontends/php/include/debug.inc.php
+++ b/ui/include/debug.inc.php
diff --git a/frontends/php/include/defines.inc.php b/ui/include/defines.inc.php
index d1d1562f7fd..d1d1562f7fd 100644
--- a/frontends/php/include/defines.inc.php
+++ b/ui/include/defines.inc.php
diff --git a/frontends/php/include/discovery.inc.php b/ui/include/discovery.inc.php
index 597bb5ee31d..597bb5ee31d 100644
--- a/frontends/php/include/discovery.inc.php
+++ b/ui/include/discovery.inc.php
diff --git a/frontends/php/include/draw.inc.php b/ui/include/draw.inc.php
index ffd06a48200..ffd06a48200 100644
--- a/frontends/php/include/draw.inc.php
+++ b/ui/include/draw.inc.php
diff --git a/frontends/php/include/events.inc.php b/ui/include/events.inc.php
index fec2ba656c6..fec2ba656c6 100644
--- a/frontends/php/include/events.inc.php
+++ b/ui/include/events.inc.php
diff --git a/frontends/php/include/forms.inc.php b/ui/include/forms.inc.php
index 53b04026988..53b04026988 100644
--- a/frontends/php/include/forms.inc.php
+++ b/ui/include/forms.inc.php
diff --git a/frontends/php/include/func.inc.php b/ui/include/func.inc.php
index a9cbedd6b2e..a9cbedd6b2e 100644
--- a/frontends/php/include/func.inc.php
+++ b/ui/include/func.inc.php
diff --git a/frontends/php/include/gettextwrapper.inc.php b/ui/include/gettextwrapper.inc.php
index 145a0ee65df..145a0ee65df 100644
--- a/frontends/php/include/gettextwrapper.inc.php
+++ b/ui/include/gettextwrapper.inc.php
diff --git a/frontends/php/include/graphs.inc.php b/ui/include/graphs.inc.php
index 1526c28fd22..1526c28fd22 100644
--- a/frontends/php/include/graphs.inc.php
+++ b/ui/include/graphs.inc.php
diff --git a/frontends/php/include/hostgroups.inc.php b/ui/include/hostgroups.inc.php
index a4f0e54bee2..a4f0e54bee2 100644
--- a/frontends/php/include/hostgroups.inc.php
+++ b/ui/include/hostgroups.inc.php
diff --git a/frontends/php/include/hosts.inc.php b/ui/include/hosts.inc.php
index 65f406c7923..65f406c7923 100644
--- a/frontends/php/include/hosts.inc.php
+++ b/ui/include/hosts.inc.php
diff --git a/frontends/php/include/html.inc.php b/ui/include/html.inc.php
index e2c7f7612c4..e2c7f7612c4 100644
--- a/frontends/php/include/html.inc.php
+++ b/ui/include/html.inc.php
diff --git a/frontends/php/include/httptest.inc.php b/ui/include/httptest.inc.php
index e965b8bfe34..e965b8bfe34 100644
--- a/frontends/php/include/httptest.inc.php
+++ b/ui/include/httptest.inc.php
diff --git a/frontends/php/include/ident.inc.php b/ui/include/ident.inc.php
index d0668b39437..d0668b39437 100644
--- a/frontends/php/include/ident.inc.php
+++ b/ui/include/ident.inc.php
diff --git a/frontends/php/include/images.inc.php b/ui/include/images.inc.php
index 0697e0e825a..0697e0e825a 100644
--- a/frontends/php/include/images.inc.php
+++ b/ui/include/images.inc.php
diff --git a/frontends/php/include/items.inc.php b/ui/include/items.inc.php
index b47cee4ea0d..b47cee4ea0d 100644
--- a/frontends/php/include/items.inc.php
+++ b/ui/include/items.inc.php
diff --git a/frontends/php/include/js.inc.php b/ui/include/js.inc.php
index 425a58315ed..425a58315ed 100644
--- a/frontends/php/include/js.inc.php
+++ b/ui/include/js.inc.php
diff --git a/frontends/php/include/locales.inc.php b/ui/include/locales.inc.php
index d4170fce302..d4170fce302 100644
--- a/frontends/php/include/locales.inc.php
+++ b/ui/include/locales.inc.php
diff --git a/frontends/php/include/maintenances.inc.php b/ui/include/maintenances.inc.php
index c037eca0c6e..c037eca0c6e 100644
--- a/frontends/php/include/maintenances.inc.php
+++ b/ui/include/maintenances.inc.php
diff --git a/frontends/php/include/maps.inc.php b/ui/include/maps.inc.php
index b6453351b69..b6453351b69 100644
--- a/frontends/php/include/maps.inc.php
+++ b/ui/include/maps.inc.php
diff --git a/frontends/php/include/media.inc.php b/ui/include/media.inc.php
index 02957da8039..02957da8039 100644
--- a/frontends/php/include/media.inc.php
+++ b/ui/include/media.inc.php
diff --git a/frontends/php/include/menu.inc.php b/ui/include/menu.inc.php
index cac042a1052..cac042a1052 100644
--- a/frontends/php/include/menu.inc.php
+++ b/ui/include/menu.inc.php
diff --git a/frontends/php/include/page_footer.php b/ui/include/page_footer.php
index c44cc2e115b..c44cc2e115b 100644
--- a/frontends/php/include/page_footer.php
+++ b/ui/include/page_footer.php
diff --git a/frontends/php/include/page_header.php b/ui/include/page_header.php
index f9275281ac6..f9275281ac6 100644
--- a/frontends/php/include/page_header.php
+++ b/ui/include/page_header.php
diff --git a/frontends/php/include/perm.inc.php b/ui/include/perm.inc.php
index 6e8c01d2b1b..6e8c01d2b1b 100644
--- a/frontends/php/include/perm.inc.php
+++ b/ui/include/perm.inc.php
diff --git a/frontends/php/include/profiles.inc.php b/ui/include/profiles.inc.php
index 31a75c7c57a..31a75c7c57a 100644
--- a/frontends/php/include/profiles.inc.php
+++ b/ui/include/profiles.inc.php
diff --git a/frontends/php/include/regexp.inc.php b/ui/include/regexp.inc.php
index 608fcefa3a4..608fcefa3a4 100644
--- a/frontends/php/include/regexp.inc.php
+++ b/ui/include/regexp.inc.php
diff --git a/frontends/php/include/schema.inc.php b/ui/include/schema.inc.php
index 2ba8c8f90b9..2ba8c8f90b9 100644
--- a/frontends/php/include/schema.inc.php
+++ b/ui/include/schema.inc.php
diff --git a/frontends/php/include/screens.inc.php b/ui/include/screens.inc.php
index bf6aa7ec5ce..bf6aa7ec5ce 100644
--- a/frontends/php/include/screens.inc.php
+++ b/ui/include/screens.inc.php
diff --git a/frontends/php/include/services.inc.php b/ui/include/services.inc.php
index aba490c6605..aba490c6605 100644
--- a/frontends/php/include/services.inc.php
+++ b/ui/include/services.inc.php
diff --git a/frontends/php/include/sounds.inc.php b/ui/include/sounds.inc.php
index 698fafd8f2e..698fafd8f2e 100644
--- a/frontends/php/include/sounds.inc.php
+++ b/ui/include/sounds.inc.php
diff --git a/frontends/php/include/translateDefines.inc.php b/ui/include/translateDefines.inc.php
index ff4527fec5b..ff4527fec5b 100644
--- a/frontends/php/include/translateDefines.inc.php
+++ b/ui/include/translateDefines.inc.php
diff --git a/frontends/php/include/triggers.inc.php b/ui/include/triggers.inc.php
index 0c7a61851ae..0c7a61851ae 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/ui/include/triggers.inc.php
diff --git a/frontends/php/include/users.inc.php b/ui/include/users.inc.php
index 0a2f765864b..0a2f765864b 100644
--- a/frontends/php/include/users.inc.php
+++ b/ui/include/users.inc.php
diff --git a/frontends/php/include/validate.inc.php b/ui/include/validate.inc.php
index d4e0f49fe61..d4e0f49fe61 100644
--- a/frontends/php/include/validate.inc.php
+++ b/ui/include/validate.inc.php
diff --git a/frontends/php/include/valuemap.inc.php b/ui/include/valuemap.inc.php
index 7ae74fc93a8..7ae74fc93a8 100644
--- a/frontends/php/include/valuemap.inc.php
+++ b/ui/include/valuemap.inc.php
diff --git a/frontends/php/include/views/administration.auditacts.list.php b/ui/include/views/administration.auditacts.list.php
index 278588599ae..278588599ae 100644
--- a/frontends/php/include/views/administration.auditacts.list.php
+++ b/ui/include/views/administration.auditacts.list.php
diff --git a/frontends/php/include/views/conf.import.php b/ui/include/views/conf.import.php
index 59ea214bc06..59ea214bc06 100644
--- a/frontends/php/include/views/conf.import.php
+++ b/ui/include/views/conf.import.php
diff --git a/frontends/php/include/views/configuration.action.edit.php b/ui/include/views/configuration.action.edit.php
index 36a60c79219..36a60c79219 100644
--- a/frontends/php/include/views/configuration.action.edit.php
+++ b/ui/include/views/configuration.action.edit.php
diff --git a/frontends/php/include/views/configuration.action.list.php b/ui/include/views/configuration.action.list.php
index 8d6424b20de..8d6424b20de 100644
--- a/frontends/php/include/views/configuration.action.list.php
+++ b/ui/include/views/configuration.action.list.php
diff --git a/frontends/php/include/views/configuration.application.edit.php b/ui/include/views/configuration.application.edit.php
index 043ec385d68..043ec385d68 100644
--- a/frontends/php/include/views/configuration.application.edit.php
+++ b/ui/include/views/configuration.application.edit.php
diff --git a/frontends/php/include/views/configuration.application.list.php b/ui/include/views/configuration.application.list.php
index 8f01ec44fe2..8f01ec44fe2 100644
--- a/frontends/php/include/views/configuration.application.list.php
+++ b/ui/include/views/configuration.application.list.php
diff --git a/frontends/php/include/views/configuration.copy.elements.php b/ui/include/views/configuration.copy.elements.php
index d319d6e4ac0..d319d6e4ac0 100644
--- a/frontends/php/include/views/configuration.copy.elements.php
+++ b/ui/include/views/configuration.copy.elements.php
diff --git a/frontends/php/include/views/configuration.correlation.edit.php b/ui/include/views/configuration.correlation.edit.php
index 5a38b1fdb65..5a38b1fdb65 100644
--- a/frontends/php/include/views/configuration.correlation.edit.php
+++ b/ui/include/views/configuration.correlation.edit.php
diff --git a/frontends/php/include/views/configuration.correlation.list.php b/ui/include/views/configuration.correlation.list.php
index f568db014db..f568db014db 100644
--- a/frontends/php/include/views/configuration.correlation.list.php
+++ b/ui/include/views/configuration.correlation.list.php
diff --git a/frontends/php/include/views/configuration.discovery.edit.php b/ui/include/views/configuration.discovery.edit.php
index 584d5a35ecf..584d5a35ecf 100644
--- a/frontends/php/include/views/configuration.discovery.edit.php
+++ b/ui/include/views/configuration.discovery.edit.php
diff --git a/frontends/php/include/views/configuration.discovery.list.php b/ui/include/views/configuration.discovery.list.php
index d3222e3845e..d3222e3845e 100644
--- a/frontends/php/include/views/configuration.discovery.list.php
+++ b/ui/include/views/configuration.discovery.list.php
diff --git a/frontends/php/include/views/configuration.graph.edit.php b/ui/include/views/configuration.graph.edit.php
index 7d6e842a541..7d6e842a541 100644
--- a/frontends/php/include/views/configuration.graph.edit.php
+++ b/ui/include/views/configuration.graph.edit.php
diff --git a/frontends/php/include/views/configuration.graph.list.php b/ui/include/views/configuration.graph.list.php
index 2e4119bef81..2e4119bef81 100644
--- a/frontends/php/include/views/configuration.graph.list.php
+++ b/ui/include/views/configuration.graph.list.php
diff --git a/frontends/php/include/views/configuration.host.discovery.edit.php b/ui/include/views/configuration.host.discovery.edit.php
index a953e7b148e..a953e7b148e 100644
--- a/frontends/php/include/views/configuration.host.discovery.edit.php
+++ b/ui/include/views/configuration.host.discovery.edit.php
diff --git a/frontends/php/include/views/configuration.host.discovery.list.php b/ui/include/views/configuration.host.discovery.list.php
index 288e46af048..288e46af048 100644
--- a/frontends/php/include/views/configuration.host.discovery.list.php
+++ b/ui/include/views/configuration.host.discovery.list.php
diff --git a/frontends/php/include/views/configuration.host.edit.php b/ui/include/views/configuration.host.edit.php
index 03971600d27..03971600d27 100644
--- a/frontends/php/include/views/configuration.host.edit.php
+++ b/ui/include/views/configuration.host.edit.php
diff --git a/frontends/php/include/views/configuration.host.list.php b/ui/include/views/configuration.host.list.php
index c3e08f229de..c3e08f229de 100644
--- a/frontends/php/include/views/configuration.host.list.php
+++ b/ui/include/views/configuration.host.list.php
diff --git a/frontends/php/include/views/configuration.host.massupdate.php b/ui/include/views/configuration.host.massupdate.php
index b36333adb20..b36333adb20 100644
--- a/frontends/php/include/views/configuration.host.massupdate.php
+++ b/ui/include/views/configuration.host.massupdate.php
diff --git a/frontends/php/include/views/configuration.host.prototype.edit.php b/ui/include/views/configuration.host.prototype.edit.php
index a88f83c20c0..a88f83c20c0 100644
--- a/frontends/php/include/views/configuration.host.prototype.edit.php
+++ b/ui/include/views/configuration.host.prototype.edit.php
diff --git a/frontends/php/include/views/configuration.host.prototype.list.php b/ui/include/views/configuration.host.prototype.list.php
index 5538906c6cf..5538906c6cf 100644
--- a/frontends/php/include/views/configuration.host.prototype.list.php
+++ b/ui/include/views/configuration.host.prototype.list.php
diff --git a/frontends/php/include/views/configuration.hostgroups.edit.php b/ui/include/views/configuration.hostgroups.edit.php
index b4c8fe4d1cf..b4c8fe4d1cf 100644
--- a/frontends/php/include/views/configuration.hostgroups.edit.php
+++ b/ui/include/views/configuration.hostgroups.edit.php
diff --git a/frontends/php/include/views/configuration.hostgroups.list.php b/ui/include/views/configuration.hostgroups.list.php
index b2661c80b56..b2661c80b56 100644
--- a/frontends/php/include/views/configuration.hostgroups.list.php
+++ b/ui/include/views/configuration.hostgroups.list.php
diff --git a/frontends/php/include/views/configuration.httpconf.edit.php b/ui/include/views/configuration.httpconf.edit.php
index 94d0026bf6b..94d0026bf6b 100644
--- a/frontends/php/include/views/configuration.httpconf.edit.php
+++ b/ui/include/views/configuration.httpconf.edit.php
diff --git a/frontends/php/include/views/configuration.httpconf.list.php b/ui/include/views/configuration.httpconf.list.php
index 1ff8c78c407..1ff8c78c407 100644
--- a/frontends/php/include/views/configuration.httpconf.list.php
+++ b/ui/include/views/configuration.httpconf.list.php
diff --git a/frontends/php/include/views/configuration.item.edit.php b/ui/include/views/configuration.item.edit.php
index 7d152d673a4..7d152d673a4 100644
--- a/frontends/php/include/views/configuration.item.edit.php
+++ b/ui/include/views/configuration.item.edit.php
diff --git a/frontends/php/include/views/configuration.item.list.php b/ui/include/views/configuration.item.list.php
index 8ce820d4bc1..8ce820d4bc1 100644
--- a/frontends/php/include/views/configuration.item.list.php
+++ b/ui/include/views/configuration.item.list.php
diff --git a/frontends/php/include/views/configuration.item.massupdate.php b/ui/include/views/configuration.item.massupdate.php
index b0f96e1115b..b0f96e1115b 100644
--- a/frontends/php/include/views/configuration.item.massupdate.php
+++ b/ui/include/views/configuration.item.massupdate.php
diff --git a/frontends/php/include/views/configuration.item.prototype.edit.php b/ui/include/views/configuration.item.prototype.edit.php
index d45b9bb9379..d45b9bb9379 100644
--- a/frontends/php/include/views/configuration.item.prototype.edit.php
+++ b/ui/include/views/configuration.item.prototype.edit.php
diff --git a/frontends/php/include/views/configuration.item.prototype.list.php b/ui/include/views/configuration.item.prototype.list.php
index 468232ae514..468232ae514 100644
--- a/frontends/php/include/views/configuration.item.prototype.list.php
+++ b/ui/include/views/configuration.item.prototype.list.php
diff --git a/frontends/php/include/views/configuration.item.prototype.massupdate.php b/ui/include/views/configuration.item.prototype.massupdate.php
index 94630368312..94630368312 100644
--- a/frontends/php/include/views/configuration.item.prototype.massupdate.php
+++ b/ui/include/views/configuration.item.prototype.massupdate.php
diff --git a/frontends/php/include/views/configuration.maintenance.edit.php b/ui/include/views/configuration.maintenance.edit.php
index 0de0c7ff31d..0de0c7ff31d 100644
--- a/frontends/php/include/views/configuration.maintenance.edit.php
+++ b/ui/include/views/configuration.maintenance.edit.php
diff --git a/frontends/php/include/views/configuration.maintenance.list.php b/ui/include/views/configuration.maintenance.list.php
index 43910d33207..43910d33207 100644
--- a/frontends/php/include/views/configuration.maintenance.list.php
+++ b/ui/include/views/configuration.maintenance.list.php
diff --git a/frontends/php/include/views/configuration.services.edit.php b/ui/include/views/configuration.services.edit.php
index 92ec99bae4a..92ec99bae4a 100644
--- a/frontends/php/include/views/configuration.services.edit.php
+++ b/ui/include/views/configuration.services.edit.php
diff --git a/frontends/php/include/views/configuration.services.list.php b/ui/include/views/configuration.services.list.php
index c2645a63a59..c2645a63a59 100644
--- a/frontends/php/include/views/configuration.services.list.php
+++ b/ui/include/views/configuration.services.list.php
diff --git a/frontends/php/include/views/configuration.template.edit.php b/ui/include/views/configuration.template.edit.php
index 49fd2a0fe0a..49fd2a0fe0a 100644
--- a/frontends/php/include/views/configuration.template.edit.php
+++ b/ui/include/views/configuration.template.edit.php
diff --git a/frontends/php/include/views/configuration.template.list.php b/ui/include/views/configuration.template.list.php
index da7b56faf3e..da7b56faf3e 100644
--- a/frontends/php/include/views/configuration.template.list.php
+++ b/ui/include/views/configuration.template.list.php
diff --git a/frontends/php/include/views/configuration.template.massupdate.php b/ui/include/views/configuration.template.massupdate.php
index b332379e554..b332379e554 100644
--- a/frontends/php/include/views/configuration.template.massupdate.php
+++ b/ui/include/views/configuration.template.massupdate.php
diff --git a/frontends/php/include/views/configuration.trigger.prototype.edit.php b/ui/include/views/configuration.trigger.prototype.edit.php
index 291b38fa7d8..291b38fa7d8 100644
--- a/frontends/php/include/views/configuration.trigger.prototype.edit.php
+++ b/ui/include/views/configuration.trigger.prototype.edit.php
diff --git a/frontends/php/include/views/configuration.trigger.prototype.list.php b/ui/include/views/configuration.trigger.prototype.list.php
index 8c6e5db5e9e..8c6e5db5e9e 100644
--- a/frontends/php/include/views/configuration.trigger.prototype.list.php
+++ b/ui/include/views/configuration.trigger.prototype.list.php
diff --git a/frontends/php/include/views/configuration.trigger.prototype.massupdate.php b/ui/include/views/configuration.trigger.prototype.massupdate.php
index 02cb38ea978..02cb38ea978 100644
--- a/frontends/php/include/views/configuration.trigger.prototype.massupdate.php
+++ b/ui/include/views/configuration.trigger.prototype.massupdate.php
diff --git a/frontends/php/include/views/configuration.triggers.edit.php b/ui/include/views/configuration.triggers.edit.php
index 911864ff355..911864ff355 100644
--- a/frontends/php/include/views/configuration.triggers.edit.php
+++ b/ui/include/views/configuration.triggers.edit.php
diff --git a/frontends/php/include/views/configuration.triggers.list.php b/ui/include/views/configuration.triggers.list.php
index 96e75ebd9ed..96e75ebd9ed 100644
--- a/frontends/php/include/views/configuration.triggers.list.php
+++ b/ui/include/views/configuration.triggers.list.php
diff --git a/frontends/php/include/views/configuration.triggers.massupdate.php b/ui/include/views/configuration.triggers.massupdate.php
index b4ca3437063..b4ca3437063 100644
--- a/frontends/php/include/views/configuration.triggers.massupdate.php
+++ b/ui/include/views/configuration.triggers.massupdate.php
diff --git a/frontends/php/include/views/general.browserwarning.php b/ui/include/views/general.browserwarning.php
index 8f64455eeea..8f64455eeea 100644
--- a/frontends/php/include/views/general.browserwarning.php
+++ b/ui/include/views/general.browserwarning.php
diff --git a/frontends/php/include/views/general.login.php b/ui/include/views/general.login.php
index 06dd4a086b3..06dd4a086b3 100644
--- a/frontends/php/include/views/general.login.php
+++ b/ui/include/views/general.login.php
diff --git a/frontends/php/include/views/general.warning.php b/ui/include/views/general.warning.php
index b0dc61fca0e..b0dc61fca0e 100644
--- a/frontends/php/include/views/general.warning.php
+++ b/ui/include/views/general.warning.php
diff --git a/frontends/php/include/views/inventory.host.list.php b/ui/include/views/inventory.host.list.php
index a3b51781e30..a3b51781e30 100644
--- a/frontends/php/include/views/inventory.host.list.php
+++ b/ui/include/views/inventory.host.list.php
diff --git a/frontends/php/include/views/inventory.host.view.php b/ui/include/views/inventory.host.view.php
index 830f09b510d..830f09b510d 100644
--- a/frontends/php/include/views/inventory.host.view.php
+++ b/ui/include/views/inventory.host.view.php
diff --git a/frontends/php/include/views/js/common.init.js.php b/ui/include/views/js/common.init.js.php
index 44888808162..44888808162 100644
--- a/frontends/php/include/views/js/common.init.js.php
+++ b/ui/include/views/js/common.init.js.php
diff --git a/frontends/php/include/views/js/common.item.edit.js.php b/ui/include/views/js/common.item.edit.js.php
index dff0d4adaee..dff0d4adaee 100644
--- a/frontends/php/include/views/js/common.item.edit.js.php
+++ b/ui/include/views/js/common.item.edit.js.php
diff --git a/frontends/php/include/views/js/common.template.edit.js.php b/ui/include/views/js/common.template.edit.js.php
index eb40e2e6121..eb40e2e6121 100644
--- a/frontends/php/include/views/js/common.template.edit.js.php
+++ b/ui/include/views/js/common.template.edit.js.php
diff --git a/frontends/php/include/views/js/conf.import.js.php b/ui/include/views/js/conf.import.js.php
index dd0329ac625..dd0329ac625 100644
--- a/frontends/php/include/views/js/conf.import.js.php
+++ b/ui/include/views/js/conf.import.js.php
diff --git a/frontends/php/include/views/js/configuration.action.edit.js.php b/ui/include/views/js/configuration.action.edit.js.php
index dbc19ab8eb1..dbc19ab8eb1 100644
--- a/frontends/php/include/views/js/configuration.action.edit.js.php
+++ b/ui/include/views/js/configuration.action.edit.js.php
diff --git a/frontends/php/include/views/js/configuration.copy.elements.js.php b/ui/include/views/js/configuration.copy.elements.js.php
index a5957e97f7f..a5957e97f7f 100644
--- a/frontends/php/include/views/js/configuration.copy.elements.js.php
+++ b/ui/include/views/js/configuration.copy.elements.js.php
diff --git a/frontends/php/include/views/js/configuration.correlation.edit.js.php b/ui/include/views/js/configuration.correlation.edit.js.php
index 5f098d4cf12..5f098d4cf12 100644
--- a/frontends/php/include/views/js/configuration.correlation.edit.js.php
+++ b/ui/include/views/js/configuration.correlation.edit.js.php
diff --git a/frontends/php/include/views/js/configuration.discovery.edit.js.php b/ui/include/views/js/configuration.discovery.edit.js.php
index 99ccbb68c56..99ccbb68c56 100644
--- a/frontends/php/include/views/js/configuration.discovery.edit.js.php
+++ b/ui/include/views/js/configuration.discovery.edit.js.php
diff --git a/frontends/php/include/views/js/configuration.graph.edit.js.php b/ui/include/views/js/configuration.graph.edit.js.php
index c5d1f721e2e..c5d1f721e2e 100644
--- a/frontends/php/include/views/js/configuration.graph.edit.js.php
+++ b/ui/include/views/js/configuration.graph.edit.js.php
diff --git a/frontends/php/include/views/js/configuration.host.discovery.edit.js.php b/ui/include/views/js/configuration.host.discovery.edit.js.php
index 5a7d2251dcf..5a7d2251dcf 100644
--- a/frontends/php/include/views/js/configuration.host.discovery.edit.js.php
+++ b/ui/include/views/js/configuration.host.discovery.edit.js.php
diff --git a/frontends/php/include/views/js/configuration.host.discovery.list.js.php b/ui/include/views/js/configuration.host.discovery.list.js.php
index bb8f30857fb..bb8f30857fb 100644
--- a/frontends/php/include/views/js/configuration.host.discovery.list.js.php
+++ b/ui/include/views/js/configuration.host.discovery.list.js.php
diff --git a/frontends/php/include/views/js/configuration.host.edit.js.php b/ui/include/views/js/configuration.host.edit.js.php
index db08cf1b678..db08cf1b678 100644
--- a/frontends/php/include/views/js/configuration.host.edit.js.php
+++ b/ui/include/views/js/configuration.host.edit.js.php
diff --git a/frontends/php/include/views/js/configuration.host.list.js.php b/ui/include/views/js/configuration.host.list.js.php
index 18fa277af32..18fa277af32 100644
--- a/frontends/php/include/views/js/configuration.host.list.js.php
+++ b/ui/include/views/js/configuration.host.list.js.php
diff --git a/frontends/php/include/views/js/configuration.host.massupdate.js.php b/ui/include/views/js/configuration.host.massupdate.js.php
index 4c4bc78d519..4c4bc78d519 100644
--- a/frontends/php/include/views/js/configuration.host.massupdate.js.php
+++ b/ui/include/views/js/configuration.host.massupdate.js.php
diff --git a/frontends/php/include/views/js/configuration.host.prototype.edit.js.php b/ui/include/views/js/configuration.host.prototype.edit.js.php
index 92c5feeb7d1..92c5feeb7d1 100644
--- a/frontends/php/include/views/js/configuration.host.prototype.edit.js.php
+++ b/ui/include/views/js/configuration.host.prototype.edit.js.php
diff --git a/frontends/php/include/views/js/configuration.httpconf.edit.js.php b/ui/include/views/js/configuration.httpconf.edit.js.php
index ba402b7b8cd..ba402b7b8cd 100644
--- a/frontends/php/include/views/js/configuration.httpconf.edit.js.php
+++ b/ui/include/views/js/configuration.httpconf.edit.js.php
diff --git a/frontends/php/include/views/js/configuration.item.edit.js.php b/ui/include/views/js/configuration.item.edit.js.php
index 6239d2d6423..6239d2d6423 100644
--- a/frontends/php/include/views/js/configuration.item.edit.js.php
+++ b/ui/include/views/js/configuration.item.edit.js.php
diff --git a/frontends/php/include/views/js/configuration.item.list.js.php b/ui/include/views/js/configuration.item.list.js.php
index 9e05873996c..9e05873996c 100644
--- a/frontends/php/include/views/js/configuration.item.list.js.php
+++ b/ui/include/views/js/configuration.item.list.js.php
diff --git a/frontends/php/include/views/js/configuration.item.massupdate.js.php b/ui/include/views/js/configuration.item.massupdate.js.php
index 625bb882502..625bb882502 100644
--- a/frontends/php/include/views/js/configuration.item.massupdate.js.php
+++ b/ui/include/views/js/configuration.item.massupdate.js.php
diff --git a/frontends/php/include/views/js/configuration.item.prototype.edit.js.php b/ui/include/views/js/configuration.item.prototype.edit.js.php
index 416851262d3..416851262d3 100644
--- a/frontends/php/include/views/js/configuration.item.prototype.edit.js.php
+++ b/ui/include/views/js/configuration.item.prototype.edit.js.php
diff --git a/frontends/php/include/views/js/configuration.maintenance.edit.js.php b/ui/include/views/js/configuration.maintenance.edit.js.php
index 9be2648d311..9be2648d311 100644
--- a/frontends/php/include/views/js/configuration.maintenance.edit.js.php
+++ b/ui/include/views/js/configuration.maintenance.edit.js.php
diff --git a/frontends/php/include/views/js/configuration.services.edit.js.php b/ui/include/views/js/configuration.services.edit.js.php
index 965bee2cf5c..965bee2cf5c 100644
--- a/frontends/php/include/views/js/configuration.services.edit.js.php
+++ b/ui/include/views/js/configuration.services.edit.js.php
diff --git a/frontends/php/include/views/js/configuration.template.list.js.php b/ui/include/views/js/configuration.template.list.js.php
index bb4f7112dde..bb4f7112dde 100644
--- a/frontends/php/include/views/js/configuration.template.list.js.php
+++ b/ui/include/views/js/configuration.template.list.js.php
diff --git a/frontends/php/include/views/js/configuration.template.massupdate.js.php b/ui/include/views/js/configuration.template.massupdate.js.php
index ab7529790bf..ab7529790bf 100644
--- a/frontends/php/include/views/js/configuration.template.massupdate.js.php
+++ b/ui/include/views/js/configuration.template.massupdate.js.php
diff --git a/frontends/php/include/views/js/configuration.trigger.massupdate.js.php b/ui/include/views/js/configuration.trigger.massupdate.js.php
index 4f2917344b2..4f2917344b2 100644
--- a/frontends/php/include/views/js/configuration.trigger.massupdate.js.php
+++ b/ui/include/views/js/configuration.trigger.massupdate.js.php
diff --git a/frontends/php/include/views/js/configuration.triggers.edit.js.php b/ui/include/views/js/configuration.triggers.edit.js.php
index 9b99f78a174..9b99f78a174 100644
--- a/frontends/php/include/views/js/configuration.triggers.edit.js.php
+++ b/ui/include/views/js/configuration.triggers.edit.js.php
diff --git a/frontends/php/include/views/js/configuration.triggers.list.js.php b/ui/include/views/js/configuration.triggers.list.js.php
index 11fe3f89748..11fe3f89748 100644
--- a/frontends/php/include/views/js/configuration.triggers.list.js.php
+++ b/ui/include/views/js/configuration.triggers.list.js.php
diff --git a/frontends/php/include/views/js/editabletable.js.php b/ui/include/views/js/editabletable.js.php
index 4fc32862802..4fc32862802 100644
--- a/frontends/php/include/views/js/editabletable.js.php
+++ b/ui/include/views/js/editabletable.js.php
diff --git a/frontends/php/include/views/js/item.preprocessing.js.php b/ui/include/views/js/item.preprocessing.js.php
index 7e11e9d25d0..7e11e9d25d0 100644
--- a/frontends/php/include/views/js/item.preprocessing.js.php
+++ b/ui/include/views/js/item.preprocessing.js.php
diff --git a/frontends/php/include/views/js/itemtest.js.php b/ui/include/views/js/itemtest.js.php
index cbd3de38656..cbd3de38656 100644
--- a/frontends/php/include/views/js/itemtest.js.php
+++ b/ui/include/views/js/itemtest.js.php
diff --git a/frontends/php/include/views/js/monitoring.screen.edit.js.php b/ui/include/views/js/monitoring.screen.edit.js.php
index 202092608ec..202092608ec 100644
--- a/frontends/php/include/views/js/monitoring.screen.edit.js.php
+++ b/ui/include/views/js/monitoring.screen.edit.js.php
diff --git a/frontends/php/include/views/js/monitoring.screen.js.php b/ui/include/views/js/monitoring.screen.js.php
index ed387965f97..ed387965f97 100644
--- a/frontends/php/include/views/js/monitoring.screen.js.php
+++ b/ui/include/views/js/monitoring.screen.js.php
diff --git a/frontends/php/include/views/js/monitoring.slideconf.edit.js.php b/ui/include/views/js/monitoring.slideconf.edit.js.php
index 8ef5c20a64d..8ef5c20a64d 100644
--- a/frontends/php/include/views/js/monitoring.slideconf.edit.js.php
+++ b/ui/include/views/js/monitoring.slideconf.edit.js.php
diff --git a/frontends/php/include/views/js/monitoring.slides.js.php b/ui/include/views/js/monitoring.slides.js.php
index 7cc96bab722..7cc96bab722 100644
--- a/frontends/php/include/views/js/monitoring.slides.js.php
+++ b/ui/include/views/js/monitoring.slides.js.php
diff --git a/frontends/php/include/views/js/monitoring.sysmap.edit.js.php b/ui/include/views/js/monitoring.sysmap.edit.js.php
index b0c57809116..b0c57809116 100644
--- a/frontends/php/include/views/js/monitoring.sysmap.edit.js.php
+++ b/ui/include/views/js/monitoring.sysmap.edit.js.php
diff --git a/frontends/php/include/views/js/monitoring.sysmaps.js.php b/ui/include/views/js/monitoring.sysmaps.js.php
index 7c4052fd609..7c4052fd609 100644
--- a/frontends/php/include/views/js/monitoring.sysmaps.js.php
+++ b/ui/include/views/js/monitoring.sysmaps.js.php
diff --git a/frontends/php/include/views/monitoring.history.php b/ui/include/views/monitoring.history.php
index cf65362b9c6..cf65362b9c6 100644
--- a/frontends/php/include/views/monitoring.history.php
+++ b/ui/include/views/monitoring.history.php
diff --git a/frontends/php/include/views/monitoring.hostscreen.php b/ui/include/views/monitoring.hostscreen.php
index d4dfb786e91..d4dfb786e91 100644
--- a/frontends/php/include/views/monitoring.hostscreen.php
+++ b/ui/include/views/monitoring.hostscreen.php
diff --git a/frontends/php/include/views/monitoring.overview.items.php b/ui/include/views/monitoring.overview.items.php
index 60f8c600f41..60f8c600f41 100644
--- a/frontends/php/include/views/monitoring.overview.items.php
+++ b/ui/include/views/monitoring.overview.items.php
diff --git a/frontends/php/include/views/monitoring.overview.triggers.php b/ui/include/views/monitoring.overview.triggers.php
index 0a711fc9c04..0a711fc9c04 100644
--- a/frontends/php/include/views/monitoring.overview.triggers.php
+++ b/ui/include/views/monitoring.overview.triggers.php
diff --git a/frontends/php/include/views/monitoring.screen.constructor.edit.php b/ui/include/views/monitoring.screen.constructor.edit.php
index 027b4977309..027b4977309 100644
--- a/frontends/php/include/views/monitoring.screen.constructor.edit.php
+++ b/ui/include/views/monitoring.screen.constructor.edit.php
diff --git a/frontends/php/include/views/monitoring.screen.constructor.list.php b/ui/include/views/monitoring.screen.constructor.list.php
index 5a547b57f9a..5a547b57f9a 100644
--- a/frontends/php/include/views/monitoring.screen.constructor.list.php
+++ b/ui/include/views/monitoring.screen.constructor.list.php
diff --git a/frontends/php/include/views/monitoring.screen.edit.php b/ui/include/views/monitoring.screen.edit.php
index 848237fb92d..848237fb92d 100644
--- a/frontends/php/include/views/monitoring.screen.edit.php
+++ b/ui/include/views/monitoring.screen.edit.php
diff --git a/frontends/php/include/views/monitoring.screen.list.php b/ui/include/views/monitoring.screen.list.php
index 4d53f7359a6..4d53f7359a6 100644
--- a/frontends/php/include/views/monitoring.screen.list.php
+++ b/ui/include/views/monitoring.screen.list.php
diff --git a/frontends/php/include/views/monitoring.screen.php b/ui/include/views/monitoring.screen.php
index ed209fb458c..ed209fb458c 100644
--- a/frontends/php/include/views/monitoring.screen.php
+++ b/ui/include/views/monitoring.screen.php
diff --git a/frontends/php/include/views/monitoring.slideconf.edit.php b/ui/include/views/monitoring.slideconf.edit.php
index d75acd65b76..d75acd65b76 100644
--- a/frontends/php/include/views/monitoring.slideconf.edit.php
+++ b/ui/include/views/monitoring.slideconf.edit.php
diff --git a/frontends/php/include/views/monitoring.slideconf.list.php b/ui/include/views/monitoring.slideconf.list.php
index 7bb798c1d2d..7bb798c1d2d 100644
--- a/frontends/php/include/views/monitoring.slideconf.list.php
+++ b/ui/include/views/monitoring.slideconf.list.php
diff --git a/frontends/php/include/views/monitoring.slides.php b/ui/include/views/monitoring.slides.php
index e233f4fcac3..e233f4fcac3 100644
--- a/frontends/php/include/views/monitoring.slides.php
+++ b/ui/include/views/monitoring.slides.php
diff --git a/frontends/php/include/views/monitoring.sysmap.constructor.php b/ui/include/views/monitoring.sysmap.constructor.php
index f2e16f2dfc6..f2e16f2dfc6 100644
--- a/frontends/php/include/views/monitoring.sysmap.constructor.php
+++ b/ui/include/views/monitoring.sysmap.constructor.php
diff --git a/frontends/php/include/views/monitoring.sysmap.edit.php b/ui/include/views/monitoring.sysmap.edit.php
index b41beb5caa6..b41beb5caa6 100644
--- a/frontends/php/include/views/monitoring.sysmap.edit.php
+++ b/ui/include/views/monitoring.sysmap.edit.php
diff --git a/frontends/php/include/views/monitoring.sysmap.list.php b/ui/include/views/monitoring.sysmap.list.php
index f77680965ad..f77680965ad 100644
--- a/frontends/php/include/views/monitoring.sysmap.list.php
+++ b/ui/include/views/monitoring.sysmap.list.php
diff --git a/frontends/php/include/views/reports.toptriggers.php b/ui/include/views/reports.toptriggers.php
index 2f1c300919d..2f1c300919d 100644
--- a/frontends/php/include/views/reports.toptriggers.php
+++ b/ui/include/views/reports.toptriggers.php
diff --git a/frontends/php/index.php b/ui/index.php
index b7607a5d18a..b7607a5d18a 100644
--- a/frontends/php/index.php
+++ b/ui/index.php
diff --git a/frontends/php/index_http.php b/ui/index_http.php
index 73203a59aa9..73203a59aa9 100644
--- a/frontends/php/index_http.php
+++ b/ui/index_http.php
diff --git a/frontends/php/index_sso.php b/ui/index_sso.php
index 55a35fc7b9d..55a35fc7b9d 100644
--- a/frontends/php/index_sso.php
+++ b/ui/index_sso.php
diff --git a/frontends/php/items.php b/ui/items.php
index 11ff703232e..11ff703232e 100644
--- a/frontends/php/items.php
+++ b/ui/items.php
diff --git a/frontends/php/js/browsers.js b/ui/js/browsers.js
index 5df72655c50..5df72655c50 100644
--- a/frontends/php/js/browsers.js
+++ b/ui/js/browsers.js
diff --git a/frontends/php/js/chkbxrange.js b/ui/js/chkbxrange.js
index 053966f4761..053966f4761 100644
--- a/frontends/php/js/chkbxrange.js
+++ b/ui/js/chkbxrange.js
diff --git a/frontends/php/js/class.base-component.js b/ui/js/class.base-component.js
index 37aefaf1d85..37aefaf1d85 100644
--- a/frontends/php/js/class.base-component.js
+++ b/ui/js/class.base-component.js
diff --git a/frontends/php/js/class.bbcode.js b/ui/js/class.bbcode.js
index e757d6d8aa2..e757d6d8aa2 100644
--- a/frontends/php/js/class.bbcode.js
+++ b/ui/js/class.bbcode.js
diff --git a/frontends/php/js/class.browsertab.js b/ui/js/class.browsertab.js
index c5ff413703c..c5ff413703c 100644
--- a/frontends/php/js/class.browsertab.js
+++ b/ui/js/class.browsertab.js
diff --git a/frontends/php/js/class.calendar.js b/ui/js/class.calendar.js
index a7e646740a4..a7e646740a4 100644
--- a/frontends/php/js/class.calendar.js
+++ b/ui/js/class.calendar.js
diff --git a/frontends/php/js/class.cclock.js b/ui/js/class.cclock.js
index d38c2964bdb..d38c2964bdb 100644
--- a/frontends/php/js/class.cclock.js
+++ b/ui/js/class.cclock.js
diff --git a/frontends/php/js/class.cdate.js b/ui/js/class.cdate.js
index a30c6a70a28..a30c6a70a28 100644
--- a/frontends/php/js/class.cdate.js
+++ b/ui/js/class.cdate.js
diff --git a/frontends/php/js/class.cdebug.js b/ui/js/class.cdebug.js
index 3042ee5fb5b..3042ee5fb5b 100644
--- a/frontends/php/js/class.cdebug.js
+++ b/ui/js/class.cdebug.js
diff --git a/frontends/php/js/class.cmap.js b/ui/js/class.cmap.js
index d089fc49416..d089fc49416 100644
--- a/frontends/php/js/class.cmap.js
+++ b/ui/js/class.cmap.js
diff --git a/frontends/php/js/class.cnavtree.js b/ui/js/class.cnavtree.js
index 5ed44cafa32..5ed44cafa32 100644
--- a/frontends/php/js/class.cnavtree.js
+++ b/ui/js/class.cnavtree.js
diff --git a/frontends/php/js/class.cookie.js b/ui/js/class.cookie.js
index 93e436da5e2..93e436da5e2 100644
--- a/frontends/php/js/class.cookie.js
+++ b/ui/js/class.cookie.js
diff --git a/frontends/php/js/class.coverride.js b/ui/js/class.coverride.js
index e9649d3e7ab..e9649d3e7ab 100644
--- a/frontends/php/js/class.coverride.js
+++ b/ui/js/class.coverride.js
diff --git a/frontends/php/js/class.crangecontrol.js b/ui/js/class.crangecontrol.js
index 51499e6d5ea..51499e6d5ea 100644
--- a/frontends/php/js/class.crangecontrol.js
+++ b/ui/js/class.crangecontrol.js
diff --git a/frontends/php/js/class.cscreen.js b/ui/js/class.cscreen.js
index b6d3245db0b..b6d3245db0b 100644
--- a/frontends/php/js/class.cscreen.js
+++ b/ui/js/class.cscreen.js
diff --git a/frontends/php/js/class.csuggest.js b/ui/js/class.csuggest.js
index 35b629beddc..35b629beddc 100644
--- a/frontends/php/js/class.csuggest.js
+++ b/ui/js/class.csuggest.js
diff --git a/frontends/php/js/class.csvggraph.js b/ui/js/class.csvggraph.js
index e54cb023412..e54cb023412 100644
--- a/frontends/php/js/class.csvggraph.js
+++ b/ui/js/class.csvggraph.js
diff --git a/frontends/php/js/class.ctree.js b/ui/js/class.ctree.js
index ea49b385fdf..ea49b385fdf 100644
--- a/frontends/php/js/class.ctree.js
+++ b/ui/js/class.ctree.js
diff --git a/frontends/php/js/class.curl.js b/ui/js/class.curl.js
index bb1b40f0167..bb1b40f0167 100644
--- a/frontends/php/js/class.curl.js
+++ b/ui/js/class.curl.js
diff --git a/frontends/php/js/class.cverticalaccordion.js b/ui/js/class.cverticalaccordion.js
index a60b2da038e..a60b2da038e 100644
--- a/frontends/php/js/class.cverticalaccordion.js
+++ b/ui/js/class.cverticalaccordion.js
diff --git a/frontends/php/js/class.cviewswitcher.js b/ui/js/class.cviewswitcher.js
index cbf51a9c371..cbf51a9c371 100644
--- a/frontends/php/js/class.cviewswitcher.js
+++ b/ui/js/class.cviewswitcher.js
diff --git a/frontends/php/js/class.localstorage.js b/ui/js/class.localstorage.js
index 162e0af92cd..162e0af92cd 100644
--- a/frontends/php/js/class.localstorage.js
+++ b/ui/js/class.localstorage.js
diff --git a/frontends/php/js/class.mapWidget.js b/ui/js/class.mapWidget.js
index 43ac5b94272..43ac5b94272 100644
--- a/frontends/php/js/class.mapWidget.js
+++ b/ui/js/class.mapWidget.js
diff --git a/frontends/php/js/class.menu-item.js b/ui/js/class.menu-item.js
index 0776eca3a8d..0776eca3a8d 100644
--- a/frontends/php/js/class.menu-item.js
+++ b/ui/js/class.menu-item.js
diff --git a/frontends/php/js/class.menu.js b/ui/js/class.menu.js
index b9b20512f61..b9b20512f61 100644
--- a/frontends/php/js/class.menu.js
+++ b/ui/js/class.menu.js
diff --git a/frontends/php/js/class.notification.collection.js b/ui/js/class.notification.collection.js
index 4a4633c8eec..4a4633c8eec 100644
--- a/frontends/php/js/class.notification.collection.js
+++ b/ui/js/class.notification.collection.js
diff --git a/frontends/php/js/class.notification.js b/ui/js/class.notification.js
index ecc56326ae7..ecc56326ae7 100644
--- a/frontends/php/js/class.notification.js
+++ b/ui/js/class.notification.js
diff --git a/frontends/php/js/class.notifications.audio.js b/ui/js/class.notifications.audio.js
index 31f108dfc70..31f108dfc70 100644
--- a/frontends/php/js/class.notifications.audio.js
+++ b/ui/js/class.notifications.audio.js
diff --git a/frontends/php/js/class.notifications.js b/ui/js/class.notifications.js
index 3cedb881d9b..3cedb881d9b 100644
--- a/frontends/php/js/class.notifications.js
+++ b/ui/js/class.notifications.js
diff --git a/frontends/php/js/class.overlay.js b/ui/js/class.overlay.js
index 8a2e9c93e96..8a2e9c93e96 100644
--- a/frontends/php/js/class.overlay.js
+++ b/ui/js/class.overlay.js
diff --git a/frontends/php/js/class.overlaycollection.js b/ui/js/class.overlaycollection.js
index 75eb2ee2474..75eb2ee2474 100644
--- a/frontends/php/js/class.overlaycollection.js
+++ b/ui/js/class.overlaycollection.js
diff --git a/frontends/php/js/class.pmaster.js b/ui/js/class.pmaster.js
index dc3bd6faf7c..dc3bd6faf7c 100644
--- a/frontends/php/js/class.pmaster.js
+++ b/ui/js/class.pmaster.js
diff --git a/frontends/php/js/class.rpc.js b/ui/js/class.rpc.js
index c3527cc381a..c3527cc381a 100644
--- a/frontends/php/js/class.rpc.js
+++ b/ui/js/class.rpc.js
diff --git a/frontends/php/js/class.scrollable.js b/ui/js/class.scrollable.js
index 2b66e05cf5c..2b66e05cf5c 100644
--- a/frontends/php/js/class.scrollable.js
+++ b/ui/js/class.scrollable.js
diff --git a/frontends/php/js/class.sidebar.js b/ui/js/class.sidebar.js
index 350082fd458..350082fd458 100644
--- a/frontends/php/js/class.sidebar.js
+++ b/ui/js/class.sidebar.js
diff --git a/frontends/php/js/class.template.js b/ui/js/class.template.js
index 80d76427c56..80d76427c56 100644
--- a/frontends/php/js/class.template.js
+++ b/ui/js/class.template.js
diff --git a/frontends/php/js/colorpicker.js b/ui/js/colorpicker.js
index 87e8cac2d9b..87e8cac2d9b 100644
--- a/frontends/php/js/colorpicker.js
+++ b/ui/js/colorpicker.js
diff --git a/frontends/php/js/common.js b/ui/js/common.js
index 9d5960e1718..9d5960e1718 100644
--- a/frontends/php/js/common.js
+++ b/ui/js/common.js
diff --git a/frontends/php/js/csvggraphwidget.js b/ui/js/csvggraphwidget.js
index 13deae10a1c..13deae10a1c 100644
--- a/frontends/php/js/csvggraphwidget.js
+++ b/ui/js/csvggraphwidget.js
diff --git a/frontends/php/js/dashboard.grid.js b/ui/js/dashboard.grid.js
index d695f5a1f04..d695f5a1f04 100644
--- a/frontends/php/js/dashboard.grid.js
+++ b/ui/js/dashboard.grid.js
diff --git a/frontends/php/js/flickerfreescreen.js b/ui/js/flickerfreescreen.js
index 684193066e2..684193066e2 100644
--- a/frontends/php/js/flickerfreescreen.js
+++ b/ui/js/flickerfreescreen.js
diff --git a/frontends/php/js/functions.js b/ui/js/functions.js
index f06378058d2..f06378058d2 100644
--- a/frontends/php/js/functions.js
+++ b/ui/js/functions.js
diff --git a/frontends/php/js/gtlc.js b/ui/js/gtlc.js
index 9e12817c5a7..9e12817c5a7 100644
--- a/frontends/php/js/gtlc.js
+++ b/ui/js/gtlc.js
diff --git a/frontends/php/js/init.js b/ui/js/init.js
index 86b0136dc29..86b0136dc29 100644
--- a/frontends/php/js/init.js
+++ b/ui/js/init.js
diff --git a/frontends/php/js/inputsecret.js b/ui/js/inputsecret.js
index 12008f0895a..12008f0895a 100644
--- a/frontends/php/js/inputsecret.js
+++ b/ui/js/inputsecret.js
diff --git a/frontends/php/js/layout.mode.js b/ui/js/layout.mode.js
index 0e54d28b6bb..0e54d28b6bb 100644
--- a/frontends/php/js/layout.mode.js
+++ b/ui/js/layout.mode.js
diff --git a/frontends/php/js/macrovalue.js b/ui/js/macrovalue.js
index 34fd3a0c8b1..34fd3a0c8b1 100644
--- a/frontends/php/js/macrovalue.js
+++ b/ui/js/macrovalue.js
diff --git a/frontends/php/js/main.js b/ui/js/main.js
index 71c2734343b..71c2734343b 100644
--- a/frontends/php/js/main.js
+++ b/ui/js/main.js
diff --git a/frontends/php/js/menupopup.js b/ui/js/menupopup.js
index 6a814ab7fe1..6a814ab7fe1 100644
--- a/frontends/php/js/menupopup.js
+++ b/ui/js/menupopup.js
diff --git a/frontends/php/js/multilineinput.js b/ui/js/multilineinput.js
index 48c805a00f0..48c805a00f0 100644
--- a/frontends/php/js/multilineinput.js
+++ b/ui/js/multilineinput.js
diff --git a/frontends/php/js/multiselect.js b/ui/js/multiselect.js
index 03391ebac60..03391ebac60 100644
--- a/frontends/php/js/multiselect.js
+++ b/ui/js/multiselect.js
diff --git a/frontends/php/js/pages/items.js b/ui/js/pages/items.js
index 8847aecd306..8847aecd306 100644
--- a/frontends/php/js/pages/items.js
+++ b/ui/js/pages/items.js
diff --git a/frontends/php/js/pages/popup.condition.common.js b/ui/js/pages/popup.condition.common.js
index a3989ceaeaa..a3989ceaeaa 100644
--- a/frontends/php/js/pages/popup.condition.common.js
+++ b/ui/js/pages/popup.condition.common.js
diff --git a/frontends/php/js/pages/popup.operation.common.js b/ui/js/pages/popup.operation.common.js
index da4eeb887df..da4eeb887df 100644
--- a/frontends/php/js/pages/popup.operation.common.js
+++ b/ui/js/pages/popup.operation.common.js
diff --git a/frontends/php/js/servercheck.js b/ui/js/servercheck.js
index 89eac8f387d..89eac8f387d 100644
--- a/frontends/php/js/servercheck.js
+++ b/ui/js/servercheck.js
diff --git a/frontends/php/js/textareaflexible.js b/ui/js/textareaflexible.js
index 6e0eed51e39..6e0eed51e39 100644
--- a/frontends/php/js/textareaflexible.js
+++ b/ui/js/textareaflexible.js
diff --git a/frontends/php/js/vector/class.svg.canvas.js b/ui/js/vector/class.svg.canvas.js
index 81c81f1159b..81c81f1159b 100644
--- a/frontends/php/js/vector/class.svg.canvas.js
+++ b/ui/js/vector/class.svg.canvas.js
diff --git a/frontends/php/js/vector/class.svg.map.js b/ui/js/vector/class.svg.map.js
index e5f3a4f7d09..e5f3a4f7d09 100644
--- a/frontends/php/js/vector/class.svg.map.js
+++ b/ui/js/vector/class.svg.map.js
diff --git a/frontends/php/js/vendors/jquery-ui.js b/ui/js/vendors/jquery-ui.js
index eb0732c07a5..eb0732c07a5 100644
--- a/frontends/php/js/vendors/jquery-ui.js
+++ b/ui/js/vendors/jquery-ui.js
diff --git a/frontends/php/js/vendors/jquery.js b/ui/js/vendors/jquery.js
index 4d9b3a25875..4d9b3a25875 100644
--- a/frontends/php/js/vendors/jquery.js
+++ b/ui/js/vendors/jquery.js
diff --git a/frontends/php/jsLoader.php b/ui/jsLoader.php
index 684ea6ff73d..684ea6ff73d 100644
--- a/frontends/php/jsLoader.php
+++ b/ui/jsLoader.php
diff --git a/frontends/php/jsrpc.php b/ui/jsrpc.php
index 36218f904b4..36218f904b4 100644
--- a/frontends/php/jsrpc.php
+++ b/ui/jsrpc.php
diff --git a/frontends/php/local/.htaccess b/ui/local/.htaccess
index 2509de4fcf4..2509de4fcf4 100644
--- a/frontends/php/local/.htaccess
+++ b/ui/local/.htaccess
diff --git a/frontends/php/local/README b/ui/local/README
index 0e6c90a79b9..0e6c90a79b9 100644
--- a/frontends/php/local/README
+++ b/ui/local/README
diff --git a/frontends/php/local/app/controllers/.gitignore b/ui/local/app/controllers/.gitignore
index 5e7d2734cfc..5e7d2734cfc 100644
--- a/frontends/php/local/app/controllers/.gitignore
+++ b/ui/local/app/controllers/.gitignore
diff --git a/frontends/php/local/app/partials/.gitignore b/ui/local/app/partials/.gitignore
index 5e7d2734cfc..5e7d2734cfc 100644
--- a/frontends/php/local/app/partials/.gitignore
+++ b/ui/local/app/partials/.gitignore
diff --git a/frontends/php/local/app/views/.gitignore b/ui/local/app/views/.gitignore
index 5e7d2734cfc..5e7d2734cfc 100644
--- a/frontends/php/local/app/views/.gitignore
+++ b/ui/local/app/views/.gitignore
diff --git a/frontends/php/local/conf/.gitignore b/ui/local/conf/.gitignore
index 5e7d2734cfc..5e7d2734cfc 100644
--- a/frontends/php/local/conf/.gitignore
+++ b/ui/local/conf/.gitignore
diff --git a/frontends/php/locale/README b/ui/locale/README
index a4fab46a8f9..a4fab46a8f9 100644
--- a/frontends/php/locale/README
+++ b/ui/locale/README
diff --git a/frontends/php/locale/add_new_language.sh b/ui/locale/add_new_language.sh
index 29c9e346e90..29c9e346e90 100755
--- a/frontends/php/locale/add_new_language.sh
+++ b/ui/locale/add_new_language.sh
diff --git a/frontends/php/locale/bg/LC_MESSAGES/frontend.po b/ui/locale/bg/LC_MESSAGES/frontend.po
index 5ee9d9d6550..5ee9d9d6550 100644
--- a/frontends/php/locale/bg/LC_MESSAGES/frontend.po
+++ b/ui/locale/bg/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/ca/LC_MESSAGES/frontend.po b/ui/locale/ca/LC_MESSAGES/frontend.po
index 52259a28a64..52259a28a64 100644
--- a/frontends/php/locale/ca/LC_MESSAGES/frontend.po
+++ b/ui/locale/ca/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/cs/LC_MESSAGES/frontend.po b/ui/locale/cs/LC_MESSAGES/frontend.po
index 68872eaeecd..68872eaeecd 100644
--- a/frontends/php/locale/cs/LC_MESSAGES/frontend.po
+++ b/ui/locale/cs/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/de/LC_MESSAGES/frontend.po b/ui/locale/de/LC_MESSAGES/frontend.po
index 2624540d35c..2624540d35c 100644
--- a/frontends/php/locale/de/LC_MESSAGES/frontend.po
+++ b/ui/locale/de/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/el/LC_MESSAGES/frontend.po b/ui/locale/el/LC_MESSAGES/frontend.po
index c4d2f1a1730..c4d2f1a1730 100644
--- a/frontends/php/locale/el/LC_MESSAGES/frontend.po
+++ b/ui/locale/el/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/en_US/LC_MESSAGES/frontend.po b/ui/locale/en_US/LC_MESSAGES/frontend.po
index 31fda33812e..31fda33812e 100644
--- a/frontends/php/locale/en_US/LC_MESSAGES/frontend.po
+++ b/ui/locale/en_US/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/es/LC_MESSAGES/frontend.po b/ui/locale/es/LC_MESSAGES/frontend.po
index e9741c35c34..e9741c35c34 100644
--- a/frontends/php/locale/es/LC_MESSAGES/frontend.po
+++ b/ui/locale/es/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/fa/LC_MESSAGES/frontend.po b/ui/locale/fa/LC_MESSAGES/frontend.po
index 5abdd4e2b0b..5abdd4e2b0b 100644
--- a/frontends/php/locale/fa/LC_MESSAGES/frontend.po
+++ b/ui/locale/fa/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/fi/LC_MESSAGES/frontend.po b/ui/locale/fi/LC_MESSAGES/frontend.po
index 11a50ccf07d..11a50ccf07d 100644
--- a/frontends/php/locale/fi/LC_MESSAGES/frontend.po
+++ b/ui/locale/fi/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/fr/LC_MESSAGES/frontend.po b/ui/locale/fr/LC_MESSAGES/frontend.po
index 019731084c1..019731084c1 100644
--- a/frontends/php/locale/fr/LC_MESSAGES/frontend.po
+++ b/ui/locale/fr/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/he/LC_MESSAGES/frontend.po b/ui/locale/he/LC_MESSAGES/frontend.po
index 9202a9a3956..9202a9a3956 100644
--- a/frontends/php/locale/he/LC_MESSAGES/frontend.po
+++ b/ui/locale/he/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/hu/LC_MESSAGES/frontend.po b/ui/locale/hu/LC_MESSAGES/frontend.po
index b1ed82d228c..b1ed82d228c 100644
--- a/frontends/php/locale/hu/LC_MESSAGES/frontend.po
+++ b/ui/locale/hu/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/id/LC_MESSAGES/frontend.po b/ui/locale/id/LC_MESSAGES/frontend.po
index 4f7e0a6017b..4f7e0a6017b 100644
--- a/frontends/php/locale/id/LC_MESSAGES/frontend.po
+++ b/ui/locale/id/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/it/LC_MESSAGES/frontend.po b/ui/locale/it/LC_MESSAGES/frontend.po
index 4ff71cd1fe1..4ff71cd1fe1 100644
--- a/frontends/php/locale/it/LC_MESSAGES/frontend.po
+++ b/ui/locale/it/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/ja/LC_MESSAGES/frontend.po b/ui/locale/ja/LC_MESSAGES/frontend.po
index 91b9f141cc4..91b9f141cc4 100644
--- a/frontends/php/locale/ja/LC_MESSAGES/frontend.po
+++ b/ui/locale/ja/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/ka/LC_MESSAGES/frontend.po b/ui/locale/ka/LC_MESSAGES/frontend.po
index abaf78457fc..abaf78457fc 100644
--- a/frontends/php/locale/ka/LC_MESSAGES/frontend.po
+++ b/ui/locale/ka/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/ko/LC_MESSAGES/frontend.po b/ui/locale/ko/LC_MESSAGES/frontend.po
index d8046700cde..d8046700cde 100644
--- a/frontends/php/locale/ko/LC_MESSAGES/frontend.po
+++ b/ui/locale/ko/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/lt/LC_MESSAGES/frontend.po b/ui/locale/lt/LC_MESSAGES/frontend.po
index 1e6cf40562b..1e6cf40562b 100644
--- a/frontends/php/locale/lt/LC_MESSAGES/frontend.po
+++ b/ui/locale/lt/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/lv/LC_MESSAGES/frontend.po b/ui/locale/lv/LC_MESSAGES/frontend.po
index 9b7e72b0289..9b7e72b0289 100644
--- a/frontends/php/locale/lv/LC_MESSAGES/frontend.po
+++ b/ui/locale/lv/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/make_mo.sh b/ui/locale/make_mo.sh
index 15f61a95892..15f61a95892 100755
--- a/frontends/php/locale/make_mo.sh
+++ b/ui/locale/make_mo.sh
diff --git a/frontends/php/locale/nb/LC_MESSAGES/frontend.po b/ui/locale/nb/LC_MESSAGES/frontend.po
index 8c5d2ac93ab..8c5d2ac93ab 100644
--- a/frontends/php/locale/nb/LC_MESSAGES/frontend.po
+++ b/ui/locale/nb/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/nl/LC_MESSAGES/frontend.po b/ui/locale/nl/LC_MESSAGES/frontend.po
index 14b2704a434..14b2704a434 100644
--- a/frontends/php/locale/nl/LC_MESSAGES/frontend.po
+++ b/ui/locale/nl/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/pl/LC_MESSAGES/frontend.po b/ui/locale/pl/LC_MESSAGES/frontend.po
index 7862a8a94b7..7862a8a94b7 100644
--- a/frontends/php/locale/pl/LC_MESSAGES/frontend.po
+++ b/ui/locale/pl/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/pt_BR/LC_MESSAGES/frontend.po b/ui/locale/pt_BR/LC_MESSAGES/frontend.po
index 0c7e714071c..0c7e714071c 100644
--- a/frontends/php/locale/pt_BR/LC_MESSAGES/frontend.po
+++ b/ui/locale/pt_BR/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/pt_PT/LC_MESSAGES/frontend.po b/ui/locale/pt_PT/LC_MESSAGES/frontend.po
index 6eceb2e6b64..6eceb2e6b64 100644
--- a/frontends/php/locale/pt_PT/LC_MESSAGES/frontend.po
+++ b/ui/locale/pt_PT/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/ro/LC_MESSAGES/frontend.po b/ui/locale/ro/LC_MESSAGES/frontend.po
index 694c9e67969..694c9e67969 100644
--- a/frontends/php/locale/ro/LC_MESSAGES/frontend.po
+++ b/ui/locale/ro/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/ru/LC_MESSAGES/frontend.po b/ui/locale/ru/LC_MESSAGES/frontend.po
index c7d85f14787..c7d85f14787 100644
--- a/frontends/php/locale/ru/LC_MESSAGES/frontend.po
+++ b/ui/locale/ru/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/sk/LC_MESSAGES/frontend.po b/ui/locale/sk/LC_MESSAGES/frontend.po
index cb203a6b3b8..cb203a6b3b8 100644
--- a/frontends/php/locale/sk/LC_MESSAGES/frontend.po
+++ b/ui/locale/sk/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/sv/LC_MESSAGES/frontend.po b/ui/locale/sv/LC_MESSAGES/frontend.po
index 2b482701155..2b482701155 100644
--- a/frontends/php/locale/sv/LC_MESSAGES/frontend.po
+++ b/ui/locale/sv/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/tr/LC_MESSAGES/frontend.po b/ui/locale/tr/LC_MESSAGES/frontend.po
index 8188c065028..8188c065028 100644
--- a/frontends/php/locale/tr/LC_MESSAGES/frontend.po
+++ b/ui/locale/tr/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/uk/LC_MESSAGES/frontend.po b/ui/locale/uk/LC_MESSAGES/frontend.po
index 7b127a72bc6..7b127a72bc6 100644
--- a/frontends/php/locale/uk/LC_MESSAGES/frontend.po
+++ b/ui/locale/uk/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/update_po.sh b/ui/locale/update_po.sh
index 8deff9f8d31..8deff9f8d31 100755
--- a/frontends/php/locale/update_po.sh
+++ b/ui/locale/update_po.sh
diff --git a/frontends/php/locale/vi/LC_MESSAGES/frontend.po b/ui/locale/vi/LC_MESSAGES/frontend.po
index 2333983a561..2333983a561 100644
--- a/frontends/php/locale/vi/LC_MESSAGES/frontend.po
+++ b/ui/locale/vi/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/zh_CN/LC_MESSAGES/frontend.po b/ui/locale/zh_CN/LC_MESSAGES/frontend.po
index 5715bcd97dd..5715bcd97dd 100644
--- a/frontends/php/locale/zh_CN/LC_MESSAGES/frontend.po
+++ b/ui/locale/zh_CN/LC_MESSAGES/frontend.po
diff --git a/frontends/php/locale/zh_TW/LC_MESSAGES/frontend.po b/ui/locale/zh_TW/LC_MESSAGES/frontend.po
index 249a6fe6634..249a6fe6634 100644
--- a/frontends/php/locale/zh_TW/LC_MESSAGES/frontend.po
+++ b/ui/locale/zh_TW/LC_MESSAGES/frontend.po
diff --git a/frontends/php/maintenance.php b/ui/maintenance.php
index 024ac8855c5..024ac8855c5 100644
--- a/frontends/php/maintenance.php
+++ b/ui/maintenance.php
diff --git a/frontends/php/map.import.php b/ui/map.import.php
index 0348880d2cf..0348880d2cf 100644
--- a/frontends/php/map.import.php
+++ b/ui/map.import.php
diff --git a/frontends/php/map.php b/ui/map.php
index 5adfc42afc9..5adfc42afc9 100644
--- a/frontends/php/map.php
+++ b/ui/map.php
diff --git a/frontends/php/modules/.gitignore b/ui/modules/.gitignore
index 5e7d2734cfc..5e7d2734cfc 100644
--- a/frontends/php/modules/.gitignore
+++ b/ui/modules/.gitignore
diff --git a/frontends/php/overview.php b/ui/overview.php
index f4ba82fee08..f4ba82fee08 100644
--- a/frontends/php/overview.php
+++ b/ui/overview.php
diff --git a/frontends/php/queue.php b/ui/queue.php
index 87232b33707..87232b33707 100644
--- a/frontends/php/queue.php
+++ b/ui/queue.php
diff --git a/frontends/php/report2.php b/ui/report2.php
index b46143ad0da..b46143ad0da 100644
--- a/frontends/php/report2.php
+++ b/ui/report2.php
diff --git a/frontends/php/report4.php b/ui/report4.php
index 140ff17ae05..140ff17ae05 100644
--- a/frontends/php/report4.php
+++ b/ui/report4.php
diff --git a/frontends/php/robots.txt b/ui/robots.txt
index 5388916d3b3..5388916d3b3 100644
--- a/frontends/php/robots.txt
+++ b/ui/robots.txt
diff --git a/frontends/php/screen.import.php b/ui/screen.import.php
index 2e32b0a57aa..2e32b0a57aa 100644
--- a/frontends/php/screen.import.php
+++ b/ui/screen.import.php
diff --git a/frontends/php/screenconf.php b/ui/screenconf.php
index b624eb08454..b624eb08454 100644
--- a/frontends/php/screenconf.php
+++ b/ui/screenconf.php
diff --git a/frontends/php/screenedit.php b/ui/screenedit.php
index bef3604045e..bef3604045e 100644
--- a/frontends/php/screenedit.php
+++ b/ui/screenedit.php
diff --git a/frontends/php/screens.php b/ui/screens.php
index 08c0070a97b..08c0070a97b 100644
--- a/frontends/php/screens.php
+++ b/ui/screens.php
diff --git a/frontends/php/services.php b/ui/services.php
index 01e78ba2a2c..01e78ba2a2c 100644
--- a/frontends/php/services.php
+++ b/ui/services.php
diff --git a/frontends/php/setup.php b/ui/setup.php
index a33b7d45eed..a33b7d45eed 100644
--- a/frontends/php/setup.php
+++ b/ui/setup.php
diff --git a/frontends/php/slideconf.php b/ui/slideconf.php
index 4050a259ad0..4050a259ad0 100644
--- a/frontends/php/slideconf.php
+++ b/ui/slideconf.php
diff --git a/frontends/php/slides.php b/ui/slides.php
index e1e008e534f..e1e008e534f 100644
--- a/frontends/php/slides.php
+++ b/ui/slides.php
diff --git a/frontends/php/srv_status.php b/ui/srv_status.php
index 922659b5744..922659b5744 100644
--- a/frontends/php/srv_status.php
+++ b/ui/srv_status.php
diff --git a/frontends/php/sysmap.php b/ui/sysmap.php
index 891ff1480fa..891ff1480fa 100644
--- a/frontends/php/sysmap.php
+++ b/ui/sysmap.php
diff --git a/frontends/php/sysmaps.php b/ui/sysmaps.php
index 2eb0253da5d..2eb0253da5d 100644
--- a/frontends/php/sysmaps.php
+++ b/ui/sysmaps.php
diff --git a/frontends/php/templates.php b/ui/templates.php
index 738f5ebc784..738f5ebc784 100644
--- a/frontends/php/templates.php
+++ b/ui/templates.php
diff --git a/frontends/php/tests/agent.php b/ui/tests/agent.php
index f837441752a..f837441752a 100644
--- a/frontends/php/tests/agent.php
+++ b/ui/tests/agent.php
diff --git a/frontends/php/tests/agent/AgentTests.php b/ui/tests/agent/AgentTests.php
index 5c6d10939fd..5c6d10939fd 100644
--- a/frontends/php/tests/agent/AgentTests.php
+++ b/ui/tests/agent/AgentTests.php
diff --git a/frontends/php/tests/agent/testMetrics.php b/ui/tests/agent/testMetrics.php
index 458e57db03a..458e57db03a 100644
--- a/frontends/php/tests/agent/testMetrics.php
+++ b/ui/tests/agent/testMetrics.php
diff --git a/frontends/php/tests/api_json/ApiJsonTests.php b/ui/tests/api_json/ApiJsonTests.php
index 00b30e03c27..00b30e03c27 100644
--- a/frontends/php/tests/api_json/ApiJsonTests.php
+++ b/ui/tests/api_json/ApiJsonTests.php
diff --git a/frontends/php/tests/api_json/data/README b/ui/tests/api_json/data/README
index b52062185fb..b52062185fb 100644
--- a/frontends/php/tests/api_json/data/README
+++ b/ui/tests/api_json/data/README
diff --git a/frontends/php/tests/api_json/data/data_test.sql b/ui/tests/api_json/data/data_test.sql
index 4a036b85e19..4a036b85e19 100644
--- a/frontends/php/tests/api_json/data/data_test.sql
+++ b/ui/tests/api_json/data/data_test.sql
diff --git a/frontends/php/tests/api_json/testAPIInfo.php b/ui/tests/api_json/testAPIInfo.php
index 803081bb41b..803081bb41b 100644
--- a/frontends/php/tests/api_json/testAPIInfo.php
+++ b/ui/tests/api_json/testAPIInfo.php
diff --git a/frontends/php/tests/api_json/testAction.php b/ui/tests/api_json/testAction.php
index 5123f3ebc0f..5123f3ebc0f 100644
--- a/frontends/php/tests/api_json/testAction.php
+++ b/ui/tests/api_json/testAction.php
diff --git a/frontends/php/tests/api_json/testApplication.php b/ui/tests/api_json/testApplication.php
index ae507d36399..ae507d36399 100644
--- a/frontends/php/tests/api_json/testApplication.php
+++ b/ui/tests/api_json/testApplication.php
diff --git a/frontends/php/tests/api_json/testAuditLog.php b/ui/tests/api_json/testAuditLog.php
index 43f2336245d..43f2336245d 100644
--- a/frontends/php/tests/api_json/testAuditLog.php
+++ b/ui/tests/api_json/testAuditLog.php
diff --git a/frontends/php/tests/api_json/testConfiguration.php b/ui/tests/api_json/testConfiguration.php
index 615f02a9c0d..615f02a9c0d 100644
--- a/frontends/php/tests/api_json/testConfiguration.php
+++ b/ui/tests/api_json/testConfiguration.php
diff --git a/frontends/php/tests/api_json/testCorrelation.php b/ui/tests/api_json/testCorrelation.php
index f5c796dcd0d..f5c796dcd0d 100644
--- a/frontends/php/tests/api_json/testCorrelation.php
+++ b/ui/tests/api_json/testCorrelation.php
diff --git a/frontends/php/tests/api_json/testDRule.php b/ui/tests/api_json/testDRule.php
index b6aa6c71fc4..b6aa6c71fc4 100644
--- a/frontends/php/tests/api_json/testDRule.php
+++ b/ui/tests/api_json/testDRule.php
diff --git a/frontends/php/tests/api_json/testDependentItems.php b/ui/tests/api_json/testDependentItems.php
index bd6c7c5b7a5..bd6c7c5b7a5 100644
--- a/frontends/php/tests/api_json/testDependentItems.php
+++ b/ui/tests/api_json/testDependentItems.php
diff --git a/frontends/php/tests/api_json/testDiscoveryRule.php b/ui/tests/api_json/testDiscoveryRule.php
index d8eb7b5b65a..d8eb7b5b65a 100644
--- a/frontends/php/tests/api_json/testDiscoveryRule.php
+++ b/ui/tests/api_json/testDiscoveryRule.php
diff --git a/frontends/php/tests/api_json/testHistory.php b/ui/tests/api_json/testHistory.php
index 56ea4469c47..56ea4469c47 100644
--- a/frontends/php/tests/api_json/testHistory.php
+++ b/ui/tests/api_json/testHistory.php
diff --git a/frontends/php/tests/api_json/testHost.php b/ui/tests/api_json/testHost.php
index dd325898cac..dd325898cac 100644
--- a/frontends/php/tests/api_json/testHost.php
+++ b/ui/tests/api_json/testHost.php
diff --git a/frontends/php/tests/api_json/testHostGroup.php b/ui/tests/api_json/testHostGroup.php
index 36b4c08fbb0..36b4c08fbb0 100644
--- a/frontends/php/tests/api_json/testHostGroup.php
+++ b/ui/tests/api_json/testHostGroup.php
diff --git a/frontends/php/tests/api_json/testHostInventory.php b/ui/tests/api_json/testHostInventory.php
index 1e90435eb61..1e90435eb61 100644
--- a/frontends/php/tests/api_json/testHostInventory.php
+++ b/ui/tests/api_json/testHostInventory.php
diff --git a/frontends/php/tests/api_json/testHostPrototypeInventory.php b/ui/tests/api_json/testHostPrototypeInventory.php
index 6a871b50373..6a871b50373 100644
--- a/frontends/php/tests/api_json/testHostPrototypeInventory.php
+++ b/ui/tests/api_json/testHostPrototypeInventory.php
diff --git a/frontends/php/tests/api_json/testIconMap.php b/ui/tests/api_json/testIconMap.php
index 41f7e2491b5..41f7e2491b5 100644
--- a/frontends/php/tests/api_json/testIconMap.php
+++ b/ui/tests/api_json/testIconMap.php
diff --git a/frontends/php/tests/api_json/testItem.php b/ui/tests/api_json/testItem.php
index 69fafbddb3f..69fafbddb3f 100644
--- a/frontends/php/tests/api_json/testItem.php
+++ b/ui/tests/api_json/testItem.php
diff --git a/frontends/php/tests/api_json/testMaintenance.php b/ui/tests/api_json/testMaintenance.php
index 1419f54a649..1419f54a649 100644
--- a/frontends/php/tests/api_json/testMaintenance.php
+++ b/ui/tests/api_json/testMaintenance.php
diff --git a/frontends/php/tests/api_json/testMap.php b/ui/tests/api_json/testMap.php
index 3221d591186..3221d591186 100644
--- a/frontends/php/tests/api_json/testMap.php
+++ b/ui/tests/api_json/testMap.php
diff --git a/frontends/php/tests/api_json/testProxy.php b/ui/tests/api_json/testProxy.php
index 804476b0e61..804476b0e61 100644
--- a/frontends/php/tests/api_json/testProxy.php
+++ b/ui/tests/api_json/testProxy.php
diff --git a/frontends/php/tests/api_json/testScripts.php b/ui/tests/api_json/testScripts.php
index 2b99222e813..2b99222e813 100644
--- a/frontends/php/tests/api_json/testScripts.php
+++ b/ui/tests/api_json/testScripts.php
diff --git a/frontends/php/tests/api_json/testTaskCreate.php b/ui/tests/api_json/testTaskCreate.php
index d7379fca3fa..d7379fca3fa 100644
--- a/frontends/php/tests/api_json/testTaskCreate.php
+++ b/ui/tests/api_json/testTaskCreate.php
diff --git a/frontends/php/tests/api_json/testTemplateImport.php b/ui/tests/api_json/testTemplateImport.php
index 5a23dab68a2..5a23dab68a2 100644
--- a/frontends/php/tests/api_json/testTemplateImport.php
+++ b/ui/tests/api_json/testTemplateImport.php
diff --git a/frontends/php/tests/api_json/testTriggers.php b/ui/tests/api_json/testTriggers.php
index 8e21c12a116..8e21c12a116 100644
--- a/frontends/php/tests/api_json/testTriggers.php
+++ b/ui/tests/api_json/testTriggers.php
diff --git a/frontends/php/tests/api_json/testUserGroup.php b/ui/tests/api_json/testUserGroup.php
index 40ab7a956ed..40ab7a956ed 100644
--- a/frontends/php/tests/api_json/testUserGroup.php
+++ b/ui/tests/api_json/testUserGroup.php
diff --git a/frontends/php/tests/api_json/testUserMacro.php b/ui/tests/api_json/testUserMacro.php
index d868027d33b..d868027d33b 100644
--- a/frontends/php/tests/api_json/testUserMacro.php
+++ b/ui/tests/api_json/testUserMacro.php
diff --git a/frontends/php/tests/api_json/testUsers.php b/ui/tests/api_json/testUsers.php
index 5c036ee1342..5c036ee1342 100644
--- a/frontends/php/tests/api_json/testUsers.php
+++ b/ui/tests/api_json/testUsers.php
diff --git a/frontends/php/tests/api_json/testValuemap.php b/ui/tests/api_json/testValuemap.php
index 437fa66c3d5..437fa66c3d5 100644
--- a/frontends/php/tests/api_json/testValuemap.php
+++ b/ui/tests/api_json/testValuemap.php
diff --git a/frontends/php/tests/api_json/testWebScenario.php b/ui/tests/api_json/testWebScenario.php
index 6d0e2cc5c9b..6d0e2cc5c9b 100644
--- a/frontends/php/tests/api_json/testWebScenario.php
+++ b/ui/tests/api_json/testWebScenario.php
diff --git a/frontends/php/tests/api_json/xml/testDeleteMissingForLinkedTemplateApplication.xml b/ui/tests/api_json/xml/testDeleteMissingForLinkedTemplateApplication.xml
index c32fd0fdbe6..c32fd0fdbe6 100644
--- a/frontends/php/tests/api_json/xml/testDeleteMissingForLinkedTemplateApplication.xml
+++ b/ui/tests/api_json/xml/testDeleteMissingForLinkedTemplateApplication.xml
diff --git a/frontends/php/tests/bootstrap.php.template b/ui/tests/bootstrap.php.template
index 8badf87b0a3..19d0c73ed56 100644
--- a/frontends/php/tests/bootstrap.php.template
+++ b/ui/tests/bootstrap.php.template
@@ -2,7 +2,7 @@
 /**
  * Copy this file to bootstrap.php and replace URL parameter with
  * location of the front-end files. For example
- * http://127.0.0.1/trunk/frontends/php/
+ * http://127.0.0.1/trunk/ui/
  *
  * Note that file conf/zabbix.conf.php must exist and point to the same
  * database used by the front-end for successful testing.
diff --git a/frontends/php/tests/frontend.php b/ui/tests/frontend.php
index 11eeba0dc6e..11eeba0dc6e 100644
--- a/frontends/php/tests/frontend.php
+++ b/ui/tests/frontend.php
diff --git a/frontends/php/tests/general/GeneralTests.php b/ui/tests/general/GeneralTests.php
index 2f4a5b87f7e..2f4a5b87f7e 100644
--- a/frontends/php/tests/general/GeneralTests.php
+++ b/ui/tests/general/GeneralTests.php
diff --git a/frontends/php/tests/general/class_CDescription.php b/ui/tests/general/class_CDescription.php
index d63fa0bb8d0..d63fa0bb8d0 100644
--- a/frontends/php/tests/general/class_CDescription.php
+++ b/ui/tests/general/class_CDescription.php
diff --git a/frontends/php/tests/general/dbConditionIdTest.php b/ui/tests/general/dbConditionIdTest.php
index afd581ee673..afd581ee673 100644
--- a/frontends/php/tests/general/dbConditionIdTest.php
+++ b/ui/tests/general/dbConditionIdTest.php
diff --git a/frontends/php/tests/general/dbConditionIntTest.php b/ui/tests/general/dbConditionIntTest.php
index c6e5cbc68fa..c6e5cbc68fa 100644
--- a/frontends/php/tests/general/dbConditionIntTest.php
+++ b/ui/tests/general/dbConditionIntTest.php
diff --git a/frontends/php/tests/general/dbConditionStringTest.php b/ui/tests/general/dbConditionStringTest.php
index 563c71e6555..563c71e6555 100644
--- a/frontends/php/tests/general/dbConditionStringTest.php
+++ b/ui/tests/general/dbConditionStringTest.php
diff --git a/frontends/php/tests/general/function_DBclose.php b/ui/tests/general/function_DBclose.php
index f69c2c7146e..f69c2c7146e 100644
--- a/frontends/php/tests/general/function_DBclose.php
+++ b/ui/tests/general/function_DBclose.php
diff --git a/frontends/php/tests/general/function_DBconnect.php b/ui/tests/general/function_DBconnect.php
index 5bd542d9be4..5bd542d9be4 100644
--- a/frontends/php/tests/general/function_DBconnect.php
+++ b/ui/tests/general/function_DBconnect.php
diff --git a/frontends/php/tests/general/function_DBselect.php b/ui/tests/general/function_DBselect.php
index 11759132d23..11759132d23 100644
--- a/frontends/php/tests/general/function_DBselect.php
+++ b/ui/tests/general/function_DBselect.php
diff --git a/frontends/php/tests/general/makeSqlTest.php b/ui/tests/general/makeSqlTest.php
index e2680277678..e2680277678 100644
--- a/frontends/php/tests/general/makeSqlTest.php
+++ b/ui/tests/general/makeSqlTest.php
diff --git a/frontends/php/tests/general/testHistoryManager.php b/ui/tests/general/testHistoryManager.php
index a22f0f812cb..a22f0f812cb 100644
--- a/frontends/php/tests/general/testHistoryManager.php
+++ b/ui/tests/general/testHistoryManager.php
diff --git a/frontends/php/tests/general/urlParamTest.php b/ui/tests/general/urlParamTest.php
index 5dd1f6b2107..5dd1f6b2107 100644
--- a/frontends/php/tests/general/urlParamTest.php
+++ b/ui/tests/general/urlParamTest.php
diff --git a/frontends/php/tests/general/zbx_dbcast_2bigintTest.php b/ui/tests/general/zbx_dbcast_2bigintTest.php
index ca81512c1dd..ca81512c1dd 100644
--- a/frontends/php/tests/general/zbx_dbcast_2bigintTest.php
+++ b/ui/tests/general/zbx_dbcast_2bigintTest.php
diff --git a/frontends/php/tests/images/image.png b/ui/tests/images/image.png
index d31f311b461..d31f311b461 100644
--- a/frontends/php/tests/images/image.png
+++ b/ui/tests/images/image.png
diff --git a/frontends/php/tests/include/CAPITest.php b/ui/tests/include/CAPITest.php
index 56fdd6715ec..56fdd6715ec 100644
--- a/frontends/php/tests/include/CAPITest.php
+++ b/ui/tests/include/CAPITest.php
diff --git a/frontends/php/tests/include/CIntegrationTest.php b/ui/tests/include/CIntegrationTest.php
index 2ee7ebacc80..2ee7ebacc80 100644
--- a/frontends/php/tests/include/CIntegrationTest.php
+++ b/ui/tests/include/CIntegrationTest.php
diff --git a/frontends/php/tests/include/CLegacyWebTest.php b/ui/tests/include/CLegacyWebTest.php
index 38a50c22b7e..38a50c22b7e 100644
--- a/frontends/php/tests/include/CLegacyWebTest.php
+++ b/ui/tests/include/CLegacyWebTest.php
diff --git a/frontends/php/tests/include/CTest.php b/ui/tests/include/CTest.php
index f24afdc4221..f24afdc4221 100644
--- a/frontends/php/tests/include/CTest.php
+++ b/ui/tests/include/CTest.php
diff --git a/frontends/php/tests/include/CWebTest.php b/ui/tests/include/CWebTest.php
index 538f2b82f55..538f2b82f55 100644
--- a/frontends/php/tests/include/CWebTest.php
+++ b/ui/tests/include/CWebTest.php
diff --git a/frontends/php/tests/include/CZabbixClient.php b/ui/tests/include/CZabbixClient.php
index 13e2e4b553b..13e2e4b553b 100644
--- a/frontends/php/tests/include/CZabbixClient.php
+++ b/ui/tests/include/CZabbixClient.php
diff --git a/frontends/php/tests/include/helpers/CAPIHelper.php b/ui/tests/include/helpers/CAPIHelper.php
index 86691f56d5b..86691f56d5b 100644
--- a/frontends/php/tests/include/helpers/CAPIHelper.php
+++ b/ui/tests/include/helpers/CAPIHelper.php
diff --git a/frontends/php/tests/include/helpers/CDBHelper.php b/ui/tests/include/helpers/CDBHelper.php
index eaf8a99eaf4..eaf8a99eaf4 100644
--- a/frontends/php/tests/include/helpers/CDBHelper.php
+++ b/ui/tests/include/helpers/CDBHelper.php
diff --git a/frontends/php/tests/include/helpers/CExceptionHelper.php b/ui/tests/include/helpers/CExceptionHelper.php
index eaf349cdabc..eaf349cdabc 100644
--- a/frontends/php/tests/include/helpers/CExceptionHelper.php
+++ b/ui/tests/include/helpers/CExceptionHelper.php
diff --git a/frontends/php/tests/include/helpers/CImageHelper.php b/ui/tests/include/helpers/CImageHelper.php
index 3e44fe62fc5..3e44fe62fc5 100644
--- a/frontends/php/tests/include/helpers/CImageHelper.php
+++ b/ui/tests/include/helpers/CImageHelper.php
diff --git a/frontends/php/tests/include/helpers/CLogHelper.php b/ui/tests/include/helpers/CLogHelper.php
index 202057cf606..202057cf606 100644
--- a/frontends/php/tests/include/helpers/CLogHelper.php
+++ b/ui/tests/include/helpers/CLogHelper.php
diff --git a/frontends/php/tests/include/helpers/CTestArrayHelper.php b/ui/tests/include/helpers/CTestArrayHelper.php
index b454e0744ee..b454e0744ee 100644
--- a/frontends/php/tests/include/helpers/CTestArrayHelper.php
+++ b/ui/tests/include/helpers/CTestArrayHelper.php
diff --git a/frontends/php/tests/include/helpers/CXPathHelper.php b/ui/tests/include/helpers/CXPathHelper.php
index 783ce60aa2f..783ce60aa2f 100644
--- a/frontends/php/tests/include/helpers/CXPathHelper.php
+++ b/ui/tests/include/helpers/CXPathHelper.php
diff --git a/frontends/php/tests/include/web/CBaseElement.php b/ui/tests/include/web/CBaseElement.php
index 1e774b7912b..1e774b7912b 100644
--- a/frontends/php/tests/include/web/CBaseElement.php
+++ b/ui/tests/include/web/CBaseElement.php
diff --git a/frontends/php/tests/include/web/CElement.php b/ui/tests/include/web/CElement.php
index ea828118699..ea828118699 100644
--- a/frontends/php/tests/include/web/CElement.php
+++ b/ui/tests/include/web/CElement.php
diff --git a/frontends/php/tests/include/web/CElementCollection.php b/ui/tests/include/web/CElementCollection.php
index 9dc21a765f9..9dc21a765f9 100644
--- a/frontends/php/tests/include/web/CElementCollection.php
+++ b/ui/tests/include/web/CElementCollection.php
diff --git a/frontends/php/tests/include/web/CElementQuery.php b/ui/tests/include/web/CElementQuery.php
index 602d17b16d2..602d17b16d2 100644
--- a/frontends/php/tests/include/web/CElementQuery.php
+++ b/ui/tests/include/web/CElementQuery.php
diff --git a/frontends/php/tests/include/web/CPage.php b/ui/tests/include/web/CPage.php
index 8f975d71dfa..8f975d71dfa 100644
--- a/frontends/php/tests/include/web/CPage.php
+++ b/ui/tests/include/web/CPage.php
diff --git a/frontends/php/tests/include/web/CastableTrait.php b/ui/tests/include/web/CastableTrait.php
index 457f9fab336..457f9fab336 100644
--- a/frontends/php/tests/include/web/CastableTrait.php
+++ b/ui/tests/include/web/CastableTrait.php
diff --git a/frontends/php/tests/include/web/CommandExecutor.php b/ui/tests/include/web/CommandExecutor.php
index ea0bcb39a2b..ea0bcb39a2b 100644
--- a/frontends/php/tests/include/web/CommandExecutor.php
+++ b/ui/tests/include/web/CommandExecutor.php
diff --git a/frontends/php/tests/include/web/IWaitable.php b/ui/tests/include/web/IWaitable.php
index a847b8a95be..a847b8a95be 100644
--- a/frontends/php/tests/include/web/IWaitable.php
+++ b/ui/tests/include/web/IWaitable.php
diff --git a/frontends/php/tests/include/web/WaitableTrait.php b/ui/tests/include/web/WaitableTrait.php
index a287ce2e458..a287ce2e458 100644
--- a/frontends/php/tests/include/web/WaitableTrait.php
+++ b/ui/tests/include/web/WaitableTrait.php
diff --git a/frontends/php/tests/include/web/elements/CCheckboxElement.php b/ui/tests/include/web/elements/CCheckboxElement.php
index 7772b7b202b..7772b7b202b 100644
--- a/frontends/php/tests/include/web/elements/CCheckboxElement.php
+++ b/ui/tests/include/web/elements/CCheckboxElement.php
diff --git a/frontends/php/tests/include/web/elements/CCheckboxListElement.php b/ui/tests/include/web/elements/CCheckboxListElement.php
index 454d1a28030..454d1a28030 100644
--- a/frontends/php/tests/include/web/elements/CCheckboxListElement.php
+++ b/ui/tests/include/web/elements/CCheckboxListElement.php
diff --git a/frontends/php/tests/include/web/elements/CColorPickerElement.php b/ui/tests/include/web/elements/CColorPickerElement.php
index 42b7d8bc32b..42b7d8bc32b 100644
--- a/frontends/php/tests/include/web/elements/CColorPickerElement.php
+++ b/ui/tests/include/web/elements/CColorPickerElement.php
diff --git a/frontends/php/tests/include/web/elements/CCompositeInputElement.php b/ui/tests/include/web/elements/CCompositeInputElement.php
index cb8a5afed8d..cb8a5afed8d 100644
--- a/frontends/php/tests/include/web/elements/CCompositeInputElement.php
+++ b/ui/tests/include/web/elements/CCompositeInputElement.php
diff --git a/frontends/php/tests/include/web/elements/CDashboardElement.php b/ui/tests/include/web/elements/CDashboardElement.php
index 9b5d69b4645..9b5d69b4645 100644
--- a/frontends/php/tests/include/web/elements/CDashboardElement.php
+++ b/ui/tests/include/web/elements/CDashboardElement.php
diff --git a/frontends/php/tests/include/web/elements/CDropdownElement.php b/ui/tests/include/web/elements/CDropdownElement.php
index a6d33875573..a6d33875573 100644
--- a/frontends/php/tests/include/web/elements/CDropdownElement.php
+++ b/ui/tests/include/web/elements/CDropdownElement.php
diff --git a/frontends/php/tests/include/web/elements/CFormElement.php b/ui/tests/include/web/elements/CFormElement.php
index ab520f7111d..ab520f7111d 100644
--- a/frontends/php/tests/include/web/elements/CFormElement.php
+++ b/ui/tests/include/web/elements/CFormElement.php
diff --git a/frontends/php/tests/include/web/elements/CMessageElement.php b/ui/tests/include/web/elements/CMessageElement.php
index 0ef47a3a528..0ef47a3a528 100644
--- a/frontends/php/tests/include/web/elements/CMessageElement.php
+++ b/ui/tests/include/web/elements/CMessageElement.php
diff --git a/frontends/php/tests/include/web/elements/CMultifieldTableElement.php b/ui/tests/include/web/elements/CMultifieldTableElement.php
index 3a5b78a0270..3a5b78a0270 100644
--- a/frontends/php/tests/include/web/elements/CMultifieldTableElement.php
+++ b/ui/tests/include/web/elements/CMultifieldTableElement.php
diff --git a/frontends/php/tests/include/web/elements/CMultilineElement.php b/ui/tests/include/web/elements/CMultilineElement.php
index 97fbad8d0c1..97fbad8d0c1 100644
--- a/frontends/php/tests/include/web/elements/CMultilineElement.php
+++ b/ui/tests/include/web/elements/CMultilineElement.php
diff --git a/frontends/php/tests/include/web/elements/CMultiselectElement.php b/ui/tests/include/web/elements/CMultiselectElement.php
index ad4cf1ea0a7..ad4cf1ea0a7 100644
--- a/frontends/php/tests/include/web/elements/CMultiselectElement.php
+++ b/ui/tests/include/web/elements/CMultiselectElement.php
diff --git a/frontends/php/tests/include/web/elements/CNullElement.php b/ui/tests/include/web/elements/CNullElement.php
index 5155205abe4..5155205abe4 100644
--- a/frontends/php/tests/include/web/elements/CNullElement.php
+++ b/ui/tests/include/web/elements/CNullElement.php
diff --git a/frontends/php/tests/include/web/elements/COverlayDialogElement.php b/ui/tests/include/web/elements/COverlayDialogElement.php
index 5c293fe9fa1..5c293fe9fa1 100644
--- a/frontends/php/tests/include/web/elements/COverlayDialogElement.php
+++ b/ui/tests/include/web/elements/COverlayDialogElement.php
diff --git a/frontends/php/tests/include/web/elements/CPopupButtonElement.php b/ui/tests/include/web/elements/CPopupButtonElement.php
index 524738a8793..524738a8793 100644
--- a/frontends/php/tests/include/web/elements/CPopupButtonElement.php
+++ b/ui/tests/include/web/elements/CPopupButtonElement.php
diff --git a/frontends/php/tests/include/web/elements/CPopupMenuElement.php b/ui/tests/include/web/elements/CPopupMenuElement.php
index df40eef3bb4..df40eef3bb4 100644
--- a/frontends/php/tests/include/web/elements/CPopupMenuElement.php
+++ b/ui/tests/include/web/elements/CPopupMenuElement.php
diff --git a/frontends/php/tests/include/web/elements/CSegmentedRadioElement.php b/ui/tests/include/web/elements/CSegmentedRadioElement.php
index 437d7255fcb..437d7255fcb 100644
--- a/frontends/php/tests/include/web/elements/CSegmentedRadioElement.php
+++ b/ui/tests/include/web/elements/CSegmentedRadioElement.php
diff --git a/frontends/php/tests/include/web/elements/CTableElement.php b/ui/tests/include/web/elements/CTableElement.php
index 146901ab53d..146901ab53d 100644
--- a/frontends/php/tests/include/web/elements/CTableElement.php
+++ b/ui/tests/include/web/elements/CTableElement.php
diff --git a/frontends/php/tests/include/web/elements/CTableRowElement.php b/ui/tests/include/web/elements/CTableRowElement.php
index aa3da9d726f..aa3da9d726f 100644
--- a/frontends/php/tests/include/web/elements/CTableRowElement.php
+++ b/ui/tests/include/web/elements/CTableRowElement.php
diff --git a/frontends/php/tests/include/web/elements/CWidgetElement.php b/ui/tests/include/web/elements/CWidgetElement.php
index 27407122940..27407122940 100644
--- a/frontends/php/tests/include/web/elements/CWidgetElement.php
+++ b/ui/tests/include/web/elements/CWidgetElement.php
diff --git a/frontends/php/tests/integration/IntegrationTests.php b/ui/tests/integration/IntegrationTests.php
index cea94863836..cea94863836 100644
--- a/frontends/php/tests/integration/IntegrationTests.php
+++ b/ui/tests/integration/IntegrationTests.php
diff --git a/frontends/php/tests/integration/data/README b/ui/tests/integration/data/README
index b52062185fb..b52062185fb 100644
--- a/frontends/php/tests/integration/data/README
+++ b/ui/tests/integration/data/README
diff --git a/frontends/php/tests/integration/data/data_test.sql b/ui/tests/integration/data/data_test.sql
index 82ff41022c8..82ff41022c8 100644
--- a/frontends/php/tests/integration/data/data_test.sql
+++ b/ui/tests/integration/data/data_test.sql
diff --git a/frontends/php/tests/integration/testDataCollection.php b/ui/tests/integration/testDataCollection.php
index 7dc8b0e2b64..7dc8b0e2b64 100644
--- a/frontends/php/tests/integration/testDataCollection.php
+++ b/ui/tests/integration/testDataCollection.php
diff --git a/frontends/php/tests/integration/testGoAgentDataCollection.php b/ui/tests/integration/testGoAgentDataCollection.php
index b3b91895afb..b3b91895afb 100644
--- a/frontends/php/tests/integration/testGoAgentDataCollection.php
+++ b/ui/tests/integration/testGoAgentDataCollection.php
diff --git a/frontends/php/tests/integration/testItemState.php b/ui/tests/integration/testItemState.php
index c0d18477709..c0d18477709 100644
--- a/frontends/php/tests/integration/testItemState.php
+++ b/ui/tests/integration/testItemState.php
diff --git a/frontends/php/tests/integration/testLowLevelDiscovery.php b/ui/tests/integration/testLowLevelDiscovery.php
index e62d6213015..e62d6213015 100644
--- a/frontends/php/tests/integration/testLowLevelDiscovery.php
+++ b/ui/tests/integration/testLowLevelDiscovery.php
diff --git a/frontends/php/tests/selenium/SeleniumTests.php b/ui/tests/selenium/SeleniumTests.php
index 18983ed1346..18983ed1346 100644
--- a/frontends/php/tests/selenium/SeleniumTests.php
+++ b/ui/tests/selenium/SeleniumTests.php
diff --git a/frontends/php/tests/selenium/common/testFormItemTest.php b/ui/tests/selenium/common/testFormItemTest.php
index e78a7aa86a5..e78a7aa86a5 100644
--- a/frontends/php/tests/selenium/common/testFormItemTest.php
+++ b/ui/tests/selenium/common/testFormItemTest.php
diff --git a/frontends/php/tests/selenium/common/testFormMacros.php b/ui/tests/selenium/common/testFormMacros.php
index 3ea07146b77..3ea07146b77 100644
--- a/frontends/php/tests/selenium/common/testFormMacros.php
+++ b/ui/tests/selenium/common/testFormMacros.php
diff --git a/frontends/php/tests/selenium/common/testFormPreprocessing.php b/ui/tests/selenium/common/testFormPreprocessing.php
index 85cc5854ab7..85cc5854ab7 100644
--- a/frontends/php/tests/selenium/common/testFormPreprocessing.php
+++ b/ui/tests/selenium/common/testFormPreprocessing.php
diff --git a/frontends/php/tests/selenium/dashboard/testGraphWidget.php b/ui/tests/selenium/dashboard/testGraphWidget.php
index 5c35ea12447..5c35ea12447 100644
--- a/frontends/php/tests/selenium/dashboard/testGraphWidget.php
+++ b/ui/tests/selenium/dashboard/testGraphWidget.php
diff --git a/frontends/php/tests/selenium/dashboard/testHostAvailabilityWidget.php b/ui/tests/selenium/dashboard/testHostAvailabilityWidget.php
index 2af1b9b580c..2af1b9b580c 100644
--- a/frontends/php/tests/selenium/dashboard/testHostAvailabilityWidget.php
+++ b/ui/tests/selenium/dashboard/testHostAvailabilityWidget.php
diff --git a/frontends/php/tests/selenium/dashboard/testProblemsBySeverityWidget.php b/ui/tests/selenium/dashboard/testProblemsBySeverityWidget.php
index bd09c43b652..bd09c43b652 100644
--- a/frontends/php/tests/selenium/dashboard/testProblemsBySeverityWidget.php
+++ b/ui/tests/selenium/dashboard/testProblemsBySeverityWidget.php
diff --git a/frontends/php/tests/selenium/data/README b/ui/tests/selenium/data/README
index b52062185fb..b52062185fb 100644
--- a/frontends/php/tests/selenium/data/README
+++ b/ui/tests/selenium/data/README
diff --git a/frontends/php/tests/selenium/data/data_test.sql b/ui/tests/selenium/data/data_test.sql
index 52d8a6d97b0..52d8a6d97b0 100644
--- a/frontends/php/tests/selenium/data/data_test.sql
+++ b/ui/tests/selenium/data/data_test.sql
diff --git a/frontends/php/tests/selenium/templates/testPageSample.php b/ui/tests/selenium/templates/testPageSample.php
index e69de29bb2d..e69de29bb2d 100644
--- a/frontends/php/tests/selenium/templates/testPageSample.php
+++ b/ui/tests/selenium/templates/testPageSample.php
diff --git a/frontends/php/tests/selenium/testFormAction.php b/ui/tests/selenium/testFormAction.php
index e40b6fdf310..e40b6fdf310 100644
--- a/frontends/php/tests/selenium/testFormAction.php
+++ b/ui/tests/selenium/testFormAction.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationAuthenticationHttp.php b/ui/tests/selenium/testFormAdministrationAuthenticationHttp.php
index 4ad4c18cac0..d43110ec2d5 100644
--- a/frontends/php/tests/selenium/testFormAdministrationAuthenticationHttp.php
+++ b/ui/tests/selenium/testFormAdministrationAuthenticationHttp.php
@@ -564,21 +564,21 @@ class testFormAdministrationAuthenticationHttp extends CLegacyWebTest {
 	protected function createConfigurationFiles($data) {
 		switch (CTestArrayHelper::get($data, 'file')) {
 			case 'htaccess':
-				$this->assertTrue(file_put_contents(PHPUNIT_BASEDIR.'/frontends/php/.htaccess', 'SetEnv REMOTE_USER "'.
+				$this->assertTrue(file_put_contents(PHPUNIT_BASEDIR.'/ui/.htaccess', 'SetEnv REMOTE_USER "'.
 						$data['user'].'"') !== false);
 
 				break;
 
 			case 'pwfile':
-				$this->assertTrue(exec('htpasswd -c -b "'.PHPUNIT_BASEDIR.'/frontends/php/.pwd" "'.$data['user'].'" "'.
+				$this->assertTrue(exec('htpasswd -c -b "'.PHPUNIT_BASEDIR.'/ui/.pwd" "'.$data['user'].'" "'.
 						$data['password'].'" > /dev/null 2>&1') !== false);
 				$content = '<Files index_http.php>'."\n".
 						'	AuthType Basic'."\n".
 						'	AuthName "Password Required"'."\n".
-						'	AuthUserFile "'.PHPUNIT_BASEDIR.'/frontends/php/.pwd"'."\n".
+						'	AuthUserFile "'.PHPUNIT_BASEDIR.'/ui/.pwd"'."\n".
 						'	Require valid-user'."\n".
 						'</Files>';
-				$this->assertTrue(file_put_contents(PHPUNIT_BASEDIR.'/frontends/php/.htaccess', $content) !== false);
+				$this->assertTrue(file_put_contents(PHPUNIT_BASEDIR.'/ui/.htaccess', $content) !== false);
 
 				break;
 		}
@@ -665,12 +665,12 @@ class testFormAdministrationAuthenticationHttp extends CLegacyWebTest {
 	 * Remove file after every test case.
 	 */
 	public function removeConfigurationFiles() {
-		if (file_exists(PHPUNIT_BASEDIR.'/frontends/php/.htaccess')) {
-			unlink(PHPUNIT_BASEDIR.'/frontends/php/.htaccess');
+		if (file_exists(PHPUNIT_BASEDIR.'/ui/.htaccess')) {
+			unlink(PHPUNIT_BASEDIR.'/ui/.htaccess');
 		}
 
-		if (file_exists(PHPUNIT_BASEDIR.'/frontends/php/.pwd')) {
-			unlink(PHPUNIT_BASEDIR.'/frontends/php/.pwd');
+		if (file_exists(PHPUNIT_BASEDIR.'/ui/.pwd')) {
+			unlink(PHPUNIT_BASEDIR.'/ui/.pwd');
 		}
 
 		// Cleanup is required to avoid browser sending Basic auth header.
diff --git a/frontends/php/tests/selenium/testFormAdministrationAuthenticationLdap.php b/ui/tests/selenium/testFormAdministrationAuthenticationLdap.php
index 2b9e162e49d..2b9e162e49d 100644
--- a/frontends/php/tests/selenium/testFormAdministrationAuthenticationLdap.php
+++ b/ui/tests/selenium/testFormAdministrationAuthenticationLdap.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationDMProxies.php b/ui/tests/selenium/testFormAdministrationDMProxies.php
index 1b53149374d..1b53149374d 100644
--- a/frontends/php/tests/selenium/testFormAdministrationDMProxies.php
+++ b/ui/tests/selenium/testFormAdministrationDMProxies.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationGeneralAutoregistration.php b/ui/tests/selenium/testFormAdministrationGeneralAutoregistration.php
index 1bd9604e4f5..1bd9604e4f5 100644
--- a/frontends/php/tests/selenium/testFormAdministrationGeneralAutoregistration.php
+++ b/ui/tests/selenium/testFormAdministrationGeneralAutoregistration.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationGeneralGUI.php b/ui/tests/selenium/testFormAdministrationGeneralGUI.php
index 15174464785..15174464785 100644
--- a/frontends/php/tests/selenium/testFormAdministrationGeneralGUI.php
+++ b/ui/tests/selenium/testFormAdministrationGeneralGUI.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationGeneralHousekeeper.php b/ui/tests/selenium/testFormAdministrationGeneralHousekeeper.php
index d7949a27405..d7949a27405 100644
--- a/frontends/php/tests/selenium/testFormAdministrationGeneralHousekeeper.php
+++ b/ui/tests/selenium/testFormAdministrationGeneralHousekeeper.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationGeneralIconMapping.php b/ui/tests/selenium/testFormAdministrationGeneralIconMapping.php
index 7afb07aeaed..7afb07aeaed 100644
--- a/frontends/php/tests/selenium/testFormAdministrationGeneralIconMapping.php
+++ b/ui/tests/selenium/testFormAdministrationGeneralIconMapping.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationGeneralImages.php b/ui/tests/selenium/testFormAdministrationGeneralImages.php
index 497e1c9c0e2..ea35e6d82b0 100644
--- a/frontends/php/tests/selenium/testFormAdministrationGeneralImages.php
+++ b/ui/tests/selenium/testFormAdministrationGeneralImages.php
@@ -54,7 +54,7 @@ class testFormAdministrationGeneralImages extends CLegacyWebTest {
 
 		$this->zbxTestAssertElementPresentId('name');
 		$this->zbxTestInputType('name', $this->icon_image_name);
-		$this->zbxTestInputType('image', PHPUNIT_BASEDIR.'/frontends/php/tests/images/image.png');
+		$this->zbxTestInputType('image', PHPUNIT_BASEDIR.'/ui/tests/images/image.png');
 		$this->zbxTestClickButtonText('Add');
 		$this->zbxTestCheckTitle('Configuration of images');
 		$this->zbxTestCheckHeader('Images');
@@ -73,7 +73,7 @@ class testFormAdministrationGeneralImages extends CLegacyWebTest {
 		$this->zbxTestLogin('zabbix.php?action=image.list');
 		$this->zbxTestClickLinkText($this->icon_image_name);
 		$this->zbxTestInputTypeWait('name', $this->icon_image_name2);
-		$this->zbxTestInputTypeWait('image', PHPUNIT_BASEDIR.'/frontends/php/tests/images/image.png');
+		$this->zbxTestInputTypeWait('image', PHPUNIT_BASEDIR.'/ui/tests/images/image.png');
 		$this->zbxTestClickButtonText('Cancel');
 
 		// checking that image has not been changed after clicking on the "Cancel" button in the confirm dialog box
@@ -86,7 +86,7 @@ class testFormAdministrationGeneralImages extends CLegacyWebTest {
 		$this->zbxTestLogin('zabbix.php?action=image.list');
 		$this->zbxTestClickLinkText($this->icon_image_name);
 		$this->zbxTestInputTypeOverwrite('name', $this->icon_image_name2);
-		$this->zbxTestInputType('image', PHPUNIT_BASEDIR.'/frontends/php/tests/images/image.png');
+		$this->zbxTestInputType('image', PHPUNIT_BASEDIR.'/ui/tests/images/image.png');
 		$this->zbxTestClickButtonText('Update');
 		$this->zbxTestCheckTitle('Configuration of images');
 		$this->zbxTestWaitUntilMessageTextPresent('msg-good', 'Image updated');
@@ -115,7 +115,7 @@ class testFormAdministrationGeneralImages extends CLegacyWebTest {
 		$this->zbxTestDropdownSelectWait('imagetype', 'Background');
 		$this->zbxTestClickButtonText('Create background');
 		$this->zbxTestInputType('name', $this->bg_image_name);
-		$this->zbxTestInputType('image', PHPUNIT_BASEDIR.'/frontends/php/tests/images/image.png');
+		$this->zbxTestInputType('image', PHPUNIT_BASEDIR.'/ui/tests/images/image.png');
 		$this->zbxTestClickButtonText('Add');
 		$this->zbxTestCheckTitle('Configuration of images');
 		$this->zbxTestTextPresent(['Images', 'Type', 'Image added']);
@@ -132,7 +132,7 @@ class testFormAdministrationGeneralImages extends CLegacyWebTest {
 		$this->zbxTestWaitUntilElementVisible(WebdriverBy::xpath("//div[@class='cell']"));
 		$this->zbxTestClickLinkText($this->bg_image_name);
 		$this->zbxTestInputTypeOverwrite('name', $this->bg_image_name2);
-		$this->zbxTestInputTypeWait('image', PHPUNIT_BASEDIR.'/frontends/php/tests/images/image.png');
+		$this->zbxTestInputTypeWait('image', PHPUNIT_BASEDIR.'/ui/tests/images/image.png');
 		$this->zbxTestClickButtonText('Update');
 		$this->zbxTestCheckTitle('Configuration of images');
 		$this->zbxTestWaitUntilMessageTextPresent('msg-good', 'Image updated');
diff --git a/frontends/php/tests/selenium/testFormAdministrationGeneralInstallation.php b/ui/tests/selenium/testFormAdministrationGeneralInstallation.php
index 6546f148731..6546f148731 100644
--- a/frontends/php/tests/selenium/testFormAdministrationGeneralInstallation.php
+++ b/ui/tests/selenium/testFormAdministrationGeneralInstallation.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationGeneralMacro.php b/ui/tests/selenium/testFormAdministrationGeneralMacro.php
index 184b638c94a..184b638c94a 100644
--- a/frontends/php/tests/selenium/testFormAdministrationGeneralMacro.php
+++ b/ui/tests/selenium/testFormAdministrationGeneralMacro.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationGeneralOtherParams.php b/ui/tests/selenium/testFormAdministrationGeneralOtherParams.php
index 46832d777d7..46832d777d7 100644
--- a/frontends/php/tests/selenium/testFormAdministrationGeneralOtherParams.php
+++ b/ui/tests/selenium/testFormAdministrationGeneralOtherParams.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationGeneralRegexp.php b/ui/tests/selenium/testFormAdministrationGeneralRegexp.php
index 68687659bb7..68687659bb7 100644
--- a/frontends/php/tests/selenium/testFormAdministrationGeneralRegexp.php
+++ b/ui/tests/selenium/testFormAdministrationGeneralRegexp.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationGeneralTrigDisplOptions.php b/ui/tests/selenium/testFormAdministrationGeneralTrigDisplOptions.php
index 4ddbf695b1a..4ddbf695b1a 100644
--- a/frontends/php/tests/selenium/testFormAdministrationGeneralTrigDisplOptions.php
+++ b/ui/tests/selenium/testFormAdministrationGeneralTrigDisplOptions.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationGeneralTriggerSeverities.php b/ui/tests/selenium/testFormAdministrationGeneralTriggerSeverities.php
index 85edc7c0346..85edc7c0346 100644
--- a/frontends/php/tests/selenium/testFormAdministrationGeneralTriggerSeverities.php
+++ b/ui/tests/selenium/testFormAdministrationGeneralTriggerSeverities.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationGeneralValuemap.php b/ui/tests/selenium/testFormAdministrationGeneralValuemap.php
index 9b9ca5c03d4..9b9ca5c03d4 100644
--- a/frontends/php/tests/selenium/testFormAdministrationGeneralValuemap.php
+++ b/ui/tests/selenium/testFormAdministrationGeneralValuemap.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationGeneralWorkperiod.php b/ui/tests/selenium/testFormAdministrationGeneralWorkperiod.php
index cf827fa21e7..cf827fa21e7 100644
--- a/frontends/php/tests/selenium/testFormAdministrationGeneralWorkperiod.php
+++ b/ui/tests/selenium/testFormAdministrationGeneralWorkperiod.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationMediaTypeWebhook.php b/ui/tests/selenium/testFormAdministrationMediaTypeWebhook.php
index 8392e2b6516..8392e2b6516 100644
--- a/frontends/php/tests/selenium/testFormAdministrationMediaTypeWebhook.php
+++ b/ui/tests/selenium/testFormAdministrationMediaTypeWebhook.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationMediaTypes.php b/ui/tests/selenium/testFormAdministrationMediaTypes.php
index c99d0ae5916..c99d0ae5916 100644
--- a/frontends/php/tests/selenium/testFormAdministrationMediaTypes.php
+++ b/ui/tests/selenium/testFormAdministrationMediaTypes.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationScripts.php b/ui/tests/selenium/testFormAdministrationScripts.php
index be437a2deaf..be437a2deaf 100644
--- a/frontends/php/tests/selenium/testFormAdministrationScripts.php
+++ b/ui/tests/selenium/testFormAdministrationScripts.php
diff --git a/frontends/php/tests/selenium/testFormAdministrationUserGroups.php b/ui/tests/selenium/testFormAdministrationUserGroups.php
index 35b53e5edb2..35b53e5edb2 100644
--- a/frontends/php/tests/selenium/testFormAdministrationUserGroups.php
+++ b/ui/tests/selenium/testFormAdministrationUserGroups.php
diff --git a/frontends/php/tests/selenium/testFormApplication.php b/ui/tests/selenium/testFormApplication.php
index 3dbc90530de..3dbc90530de 100644
--- a/frontends/php/tests/selenium/testFormApplication.php
+++ b/ui/tests/selenium/testFormApplication.php
diff --git a/frontends/php/tests/selenium/testFormConfigTriggerSeverity.php b/ui/tests/selenium/testFormConfigTriggerSeverity.php
index 56aa4ba96e6..56aa4ba96e6 100644
--- a/frontends/php/tests/selenium/testFormConfigTriggerSeverity.php
+++ b/ui/tests/selenium/testFormConfigTriggerSeverity.php
diff --git a/frontends/php/tests/selenium/testFormEventCorrelation.php b/ui/tests/selenium/testFormEventCorrelation.php
index b69c571804e..b69c571804e 100644
--- a/frontends/php/tests/selenium/testFormEventCorrelation.php
+++ b/ui/tests/selenium/testFormEventCorrelation.php
diff --git a/frontends/php/tests/selenium/testFormGraph.php b/ui/tests/selenium/testFormGraph.php
index 42f04b49600..42f04b49600 100644
--- a/frontends/php/tests/selenium/testFormGraph.php
+++ b/ui/tests/selenium/testFormGraph.php
diff --git a/frontends/php/tests/selenium/testFormGraphPrototype.php b/ui/tests/selenium/testFormGraphPrototype.php
index beae0a52a2e..beae0a52a2e 100644
--- a/frontends/php/tests/selenium/testFormGraphPrototype.php
+++ b/ui/tests/selenium/testFormGraphPrototype.php
diff --git a/frontends/php/tests/selenium/testFormHost.php b/ui/tests/selenium/testFormHost.php
index 95d2f8b07f0..95d2f8b07f0 100644
--- a/frontends/php/tests/selenium/testFormHost.php
+++ b/ui/tests/selenium/testFormHost.php
diff --git a/frontends/php/tests/selenium/testFormHostGroup.php b/ui/tests/selenium/testFormHostGroup.php
index 41ec72644b2..41ec72644b2 100644
--- a/frontends/php/tests/selenium/testFormHostGroup.php
+++ b/ui/tests/selenium/testFormHostGroup.php
diff --git a/frontends/php/tests/selenium/testFormHostMacros.php b/ui/tests/selenium/testFormHostMacros.php
index 588f81149b1..588f81149b1 100644
--- a/frontends/php/tests/selenium/testFormHostMacros.php
+++ b/ui/tests/selenium/testFormHostMacros.php
diff --git a/frontends/php/tests/selenium/testFormHostPrototype.php b/ui/tests/selenium/testFormHostPrototype.php
index 39817cfe9fb..39817cfe9fb 100644
--- a/frontends/php/tests/selenium/testFormHostPrototype.php
+++ b/ui/tests/selenium/testFormHostPrototype.php
diff --git a/frontends/php/tests/selenium/testFormHostPrototypeMacros.php b/ui/tests/selenium/testFormHostPrototypeMacros.php
index 79f8b7931ef..79f8b7931ef 100644
--- a/frontends/php/tests/selenium/testFormHostPrototypeMacros.php
+++ b/ui/tests/selenium/testFormHostPrototypeMacros.php
diff --git a/frontends/php/tests/selenium/testFormHostTags.php b/ui/tests/selenium/testFormHostTags.php
index 9038eaff5ca..9038eaff5ca 100644
--- a/frontends/php/tests/selenium/testFormHostTags.php
+++ b/ui/tests/selenium/testFormHostTags.php
diff --git a/frontends/php/tests/selenium/testFormItem.php b/ui/tests/selenium/testFormItem.php
index f4fedb5a5b4..f4fedb5a5b4 100644
--- a/frontends/php/tests/selenium/testFormItem.php
+++ b/ui/tests/selenium/testFormItem.php
diff --git a/frontends/php/tests/selenium/testFormItemHttpAgent.php b/ui/tests/selenium/testFormItemHttpAgent.php
index 9c73bf0324a..9c73bf0324a 100644
--- a/frontends/php/tests/selenium/testFormItemHttpAgent.php
+++ b/ui/tests/selenium/testFormItemHttpAgent.php
diff --git a/frontends/php/tests/selenium/testFormItemPreprocessing.php b/ui/tests/selenium/testFormItemPreprocessing.php
index 0e75805da76..0e75805da76 100644
--- a/frontends/php/tests/selenium/testFormItemPreprocessing.php
+++ b/ui/tests/selenium/testFormItemPreprocessing.php
diff --git a/frontends/php/tests/selenium/testFormItemPreprocessingTest.php b/ui/tests/selenium/testFormItemPreprocessingTest.php
index 31e0c40ed72..31e0c40ed72 100644
--- a/frontends/php/tests/selenium/testFormItemPreprocessingTest.php
+++ b/ui/tests/selenium/testFormItemPreprocessingTest.php
diff --git a/frontends/php/tests/selenium/testFormItemPrototype.php b/ui/tests/selenium/testFormItemPrototype.php
index 91e54dbaaf3..91e54dbaaf3 100644
--- a/frontends/php/tests/selenium/testFormItemPrototype.php
+++ b/ui/tests/selenium/testFormItemPrototype.php
diff --git a/frontends/php/tests/selenium/testFormItemPrototypePreprocessing.php b/ui/tests/selenium/testFormItemPrototypePreprocessing.php
index 621ad570dd7..621ad570dd7 100644
--- a/frontends/php/tests/selenium/testFormItemPrototypePreprocessing.php
+++ b/ui/tests/selenium/testFormItemPrototypePreprocessing.php
diff --git a/frontends/php/tests/selenium/testFormItemTestHost.php b/ui/tests/selenium/testFormItemTestHost.php
index 3003fc40316..3003fc40316 100644
--- a/frontends/php/tests/selenium/testFormItemTestHost.php
+++ b/ui/tests/selenium/testFormItemTestHost.php
diff --git a/frontends/php/tests/selenium/testFormItemTestTemplate.php b/ui/tests/selenium/testFormItemTestTemplate.php
index 7eebc4bdc5d..7eebc4bdc5d 100644
--- a/frontends/php/tests/selenium/testFormItemTestTemplate.php
+++ b/ui/tests/selenium/testFormItemTestTemplate.php
diff --git a/frontends/php/tests/selenium/testFormLogin.php b/ui/tests/selenium/testFormLogin.php
index 6614f71d97f..6614f71d97f 100644
--- a/frontends/php/tests/selenium/testFormLogin.php
+++ b/ui/tests/selenium/testFormLogin.php
diff --git a/frontends/php/tests/selenium/testFormLowLevelDiscovery.php b/ui/tests/selenium/testFormLowLevelDiscovery.php
index c3ee3d10c57..c3ee3d10c57 100644
--- a/frontends/php/tests/selenium/testFormLowLevelDiscovery.php
+++ b/ui/tests/selenium/testFormLowLevelDiscovery.php
diff --git a/frontends/php/tests/selenium/testFormLowLevelDiscoveryPreprocessing.php b/ui/tests/selenium/testFormLowLevelDiscoveryPreprocessing.php
index 82cf259e7a7..82cf259e7a7 100644
--- a/frontends/php/tests/selenium/testFormLowLevelDiscoveryPreprocessing.php
+++ b/ui/tests/selenium/testFormLowLevelDiscoveryPreprocessing.php
diff --git a/frontends/php/tests/selenium/testFormMaintenance.php b/ui/tests/selenium/testFormMaintenance.php
index 1c1c10e1d2e..1c1c10e1d2e 100644
--- a/frontends/php/tests/selenium/testFormMaintenance.php
+++ b/ui/tests/selenium/testFormMaintenance.php
diff --git a/frontends/php/tests/selenium/testFormMap.php b/ui/tests/selenium/testFormMap.php
index 887d1e56600..887d1e56600 100644
--- a/frontends/php/tests/selenium/testFormMap.php
+++ b/ui/tests/selenium/testFormMap.php
diff --git a/frontends/php/tests/selenium/testFormNetworkDiscovery.php b/ui/tests/selenium/testFormNetworkDiscovery.php
index 5c30b87605a..5c30b87605a 100644
--- a/frontends/php/tests/selenium/testFormNetworkDiscovery.php
+++ b/ui/tests/selenium/testFormNetworkDiscovery.php
diff --git a/frontends/php/tests/selenium/testFormScreen.php b/ui/tests/selenium/testFormScreen.php
index 62ec4f2645a..62ec4f2645a 100644
--- a/frontends/php/tests/selenium/testFormScreen.php
+++ b/ui/tests/selenium/testFormScreen.php
diff --git a/frontends/php/tests/selenium/testFormSlideshow.php b/ui/tests/selenium/testFormSlideshow.php
index a9e82ae8002..a9e82ae8002 100644
--- a/frontends/php/tests/selenium/testFormSlideshow.php
+++ b/ui/tests/selenium/testFormSlideshow.php
diff --git a/frontends/php/tests/selenium/testFormSysmap.php b/ui/tests/selenium/testFormSysmap.php
index ef9b0325e11..ef9b0325e11 100644
--- a/frontends/php/tests/selenium/testFormSysmap.php
+++ b/ui/tests/selenium/testFormSysmap.php
diff --git a/frontends/php/tests/selenium/testFormTemplate.php b/ui/tests/selenium/testFormTemplate.php
index a27e3631578..a27e3631578 100644
--- a/frontends/php/tests/selenium/testFormTemplate.php
+++ b/ui/tests/selenium/testFormTemplate.php
diff --git a/frontends/php/tests/selenium/testFormTemplateMacros.php b/ui/tests/selenium/testFormTemplateMacros.php
index 1b4fbfd590f..1b4fbfd590f 100644
--- a/frontends/php/tests/selenium/testFormTemplateMacros.php
+++ b/ui/tests/selenium/testFormTemplateMacros.php
diff --git a/frontends/php/tests/selenium/testFormTemplateTags.php b/ui/tests/selenium/testFormTemplateTags.php
index d67c415d31f..d67c415d31f 100644
--- a/frontends/php/tests/selenium/testFormTemplateTags.php
+++ b/ui/tests/selenium/testFormTemplateTags.php
diff --git a/frontends/php/tests/selenium/testFormTrigger.php b/ui/tests/selenium/testFormTrigger.php
index 3558f28145a..3558f28145a 100644
--- a/frontends/php/tests/selenium/testFormTrigger.php
+++ b/ui/tests/selenium/testFormTrigger.php
diff --git a/frontends/php/tests/selenium/testFormTriggerPrototype.php b/ui/tests/selenium/testFormTriggerPrototype.php
index 36c03b7c177..36c03b7c177 100644
--- a/frontends/php/tests/selenium/testFormTriggerPrototype.php
+++ b/ui/tests/selenium/testFormTriggerPrototype.php
diff --git a/frontends/php/tests/selenium/testFormTriggerTags.php b/ui/tests/selenium/testFormTriggerTags.php
index bd4aaa63945..bd4aaa63945 100644
--- a/frontends/php/tests/selenium/testFormTriggerTags.php
+++ b/ui/tests/selenium/testFormTriggerTags.php
diff --git a/frontends/php/tests/selenium/testFormUser.php b/ui/tests/selenium/testFormUser.php
index d3674f93c8a..d3674f93c8a 100644
--- a/frontends/php/tests/selenium/testFormUser.php
+++ b/ui/tests/selenium/testFormUser.php
diff --git a/frontends/php/tests/selenium/testFormUserProfile.php b/ui/tests/selenium/testFormUserProfile.php
index b33e66ba684..b33e66ba684 100644
--- a/frontends/php/tests/selenium/testFormUserProfile.php
+++ b/ui/tests/selenium/testFormUserProfile.php
diff --git a/frontends/php/tests/selenium/testFormWeb.php b/ui/tests/selenium/testFormWeb.php
index 26e67abb9eb..26e67abb9eb 100644
--- a/frontends/php/tests/selenium/testFormWeb.php
+++ b/ui/tests/selenium/testFormWeb.php
diff --git a/frontends/php/tests/selenium/testFormWebStep.php b/ui/tests/selenium/testFormWebStep.php
index e37b32701e3..e37b32701e3 100644
--- a/frontends/php/tests/selenium/testFormWebStep.php
+++ b/ui/tests/selenium/testFormWebStep.php
diff --git a/frontends/php/tests/selenium/testGeneric.php b/ui/tests/selenium/testGeneric.php
index 268059a27a7..268059a27a7 100644
--- a/frontends/php/tests/selenium/testGeneric.php
+++ b/ui/tests/selenium/testGeneric.php
diff --git a/frontends/php/tests/selenium/testInheritanceApplication.php b/ui/tests/selenium/testInheritanceApplication.php
index f970d1773ac..f970d1773ac 100644
--- a/frontends/php/tests/selenium/testInheritanceApplication.php
+++ b/ui/tests/selenium/testInheritanceApplication.php
diff --git a/frontends/php/tests/selenium/testInheritanceDiscoveryRule.php b/ui/tests/selenium/testInheritanceDiscoveryRule.php
index 792a5ab663a..792a5ab663a 100644
--- a/frontends/php/tests/selenium/testInheritanceDiscoveryRule.php
+++ b/ui/tests/selenium/testInheritanceDiscoveryRule.php
diff --git a/frontends/php/tests/selenium/testInheritanceGraph.php b/ui/tests/selenium/testInheritanceGraph.php
index 17b7b2d78ab..17b7b2d78ab 100644
--- a/frontends/php/tests/selenium/testInheritanceGraph.php
+++ b/ui/tests/selenium/testInheritanceGraph.php
diff --git a/frontends/php/tests/selenium/testInheritanceGraphPrototype.php b/ui/tests/selenium/testInheritanceGraphPrototype.php
index 7a4d4d7365b..7a4d4d7365b 100644
--- a/frontends/php/tests/selenium/testInheritanceGraphPrototype.php
+++ b/ui/tests/selenium/testInheritanceGraphPrototype.php
diff --git a/frontends/php/tests/selenium/testInheritanceHostPrototype.php b/ui/tests/selenium/testInheritanceHostPrototype.php
index 3ce77855ffd..3ce77855ffd 100644
--- a/frontends/php/tests/selenium/testInheritanceHostPrototype.php
+++ b/ui/tests/selenium/testInheritanceHostPrototype.php
diff --git a/frontends/php/tests/selenium/testInheritanceItem.php b/ui/tests/selenium/testInheritanceItem.php
index 402f1895dea..402f1895dea 100644
--- a/frontends/php/tests/selenium/testInheritanceItem.php
+++ b/ui/tests/selenium/testInheritanceItem.php
diff --git a/frontends/php/tests/selenium/testInheritanceItemPrototype.php b/ui/tests/selenium/testInheritanceItemPrototype.php
index e2dccf2d838..e2dccf2d838 100644
--- a/frontends/php/tests/selenium/testInheritanceItemPrototype.php
+++ b/ui/tests/selenium/testInheritanceItemPrototype.php
diff --git a/frontends/php/tests/selenium/testInheritanceTrigger.php b/ui/tests/selenium/testInheritanceTrigger.php
index 95db061c31c..95db061c31c 100644
--- a/frontends/php/tests/selenium/testInheritanceTrigger.php
+++ b/ui/tests/selenium/testInheritanceTrigger.php
diff --git a/frontends/php/tests/selenium/testInheritanceTriggerPrototype.php b/ui/tests/selenium/testInheritanceTriggerPrototype.php
index 46c6248678d..46c6248678d 100644
--- a/frontends/php/tests/selenium/testInheritanceTriggerPrototype.php
+++ b/ui/tests/selenium/testInheritanceTriggerPrototype.php
diff --git a/frontends/php/tests/selenium/testInheritanceWeb.php b/ui/tests/selenium/testInheritanceWeb.php
index 5d3afd5e84b..5d3afd5e84b 100644
--- a/frontends/php/tests/selenium/testInheritanceWeb.php
+++ b/ui/tests/selenium/testInheritanceWeb.php
diff --git a/frontends/php/tests/selenium/testMultiselect.php b/ui/tests/selenium/testMultiselect.php
index bd6b2d5777d..bd6b2d5777d 100644
--- a/frontends/php/tests/selenium/testMultiselect.php
+++ b/ui/tests/selenium/testMultiselect.php
diff --git a/frontends/php/tests/selenium/testPageActions.php b/ui/tests/selenium/testPageActions.php
index ad0a5c12c16..ad0a5c12c16 100644
--- a/frontends/php/tests/selenium/testPageActions.php
+++ b/ui/tests/selenium/testPageActions.php
diff --git a/frontends/php/tests/selenium/testPageAdministrationDMProxies.php b/ui/tests/selenium/testPageAdministrationDMProxies.php
index e90a8b9b77a..e90a8b9b77a 100644
--- a/frontends/php/tests/selenium/testPageAdministrationDMProxies.php
+++ b/ui/tests/selenium/testPageAdministrationDMProxies.php
diff --git a/frontends/php/tests/selenium/testPageAdministrationGeneralIconMapping.php b/ui/tests/selenium/testPageAdministrationGeneralIconMapping.php
index eca5820ebc4..eca5820ebc4 100644
--- a/frontends/php/tests/selenium/testPageAdministrationGeneralIconMapping.php
+++ b/ui/tests/selenium/testPageAdministrationGeneralIconMapping.php
diff --git a/frontends/php/tests/selenium/testPageAdministrationGeneralImages.php b/ui/tests/selenium/testPageAdministrationGeneralImages.php
index 984068fbff3..984068fbff3 100644
--- a/frontends/php/tests/selenium/testPageAdministrationGeneralImages.php
+++ b/ui/tests/selenium/testPageAdministrationGeneralImages.php
diff --git a/frontends/php/tests/selenium/testPageAdministrationGeneralRegexp.php b/ui/tests/selenium/testPageAdministrationGeneralRegexp.php
index f557d6aa0a0..f557d6aa0a0 100644
--- a/frontends/php/tests/selenium/testPageAdministrationGeneralRegexp.php
+++ b/ui/tests/selenium/testPageAdministrationGeneralRegexp.php
diff --git a/frontends/php/tests/selenium/testPageAdministrationGeneralValuemap.php b/ui/tests/selenium/testPageAdministrationGeneralValuemap.php
index 6332f43b99f..6332f43b99f 100644
--- a/frontends/php/tests/selenium/testPageAdministrationGeneralValuemap.php
+++ b/ui/tests/selenium/testPageAdministrationGeneralValuemap.php
diff --git a/frontends/php/tests/selenium/testPageAdministrationMediaTypes.php b/ui/tests/selenium/testPageAdministrationMediaTypes.php
index 1d04a34ebaf..1d04a34ebaf 100644
--- a/frontends/php/tests/selenium/testPageAdministrationMediaTypes.php
+++ b/ui/tests/selenium/testPageAdministrationMediaTypes.php
diff --git a/frontends/php/tests/selenium/testPageAdministrationScripts.php b/ui/tests/selenium/testPageAdministrationScripts.php
index 337bdcb9909..337bdcb9909 100644
--- a/frontends/php/tests/selenium/testPageAdministrationScripts.php
+++ b/ui/tests/selenium/testPageAdministrationScripts.php
diff --git a/frontends/php/tests/selenium/testPageApplications.php b/ui/tests/selenium/testPageApplications.php
index a5dd6e432a4..a5dd6e432a4 100644
--- a/frontends/php/tests/selenium/testPageApplications.php
+++ b/ui/tests/selenium/testPageApplications.php
diff --git a/frontends/php/tests/selenium/testPageAvailabilityReport.php b/ui/tests/selenium/testPageAvailabilityReport.php
index 2e2f2c039d7..2e2f2c039d7 100644
--- a/frontends/php/tests/selenium/testPageAvailabilityReport.php
+++ b/ui/tests/selenium/testPageAvailabilityReport.php
diff --git a/frontends/php/tests/selenium/testPageBrowserWarning.php b/ui/tests/selenium/testPageBrowserWarning.php
index 19ef776c480..19ef776c480 100644
--- a/frontends/php/tests/selenium/testPageBrowserWarning.php
+++ b/ui/tests/selenium/testPageBrowserWarning.php
diff --git a/frontends/php/tests/selenium/testPageDashboard.php b/ui/tests/selenium/testPageDashboard.php
index 2896decbb43..2896decbb43 100644
--- a/frontends/php/tests/selenium/testPageDashboard.php
+++ b/ui/tests/selenium/testPageDashboard.php
diff --git a/frontends/php/tests/selenium/testPageDashboardWidgets.php b/ui/tests/selenium/testPageDashboardWidgets.php
index 1296e0b7f00..1296e0b7f00 100644
--- a/frontends/php/tests/selenium/testPageDashboardWidgets.php
+++ b/ui/tests/selenium/testPageDashboardWidgets.php
diff --git a/frontends/php/tests/selenium/testPageEventCorrelation.php b/ui/tests/selenium/testPageEventCorrelation.php
index 3204ed6b57c..3204ed6b57c 100644
--- a/frontends/php/tests/selenium/testPageEventCorrelation.php
+++ b/ui/tests/selenium/testPageEventCorrelation.php
diff --git a/frontends/php/tests/selenium/testPageGraphPrototypes.php b/ui/tests/selenium/testPageGraphPrototypes.php
index a35c9f3f13b..a35c9f3f13b 100644
--- a/frontends/php/tests/selenium/testPageGraphPrototypes.php
+++ b/ui/tests/selenium/testPageGraphPrototypes.php
diff --git a/frontends/php/tests/selenium/testPageHistory.php b/ui/tests/selenium/testPageHistory.php
index 40bdb65e96c..40bdb65e96c 100644
--- a/frontends/php/tests/selenium/testPageHistory.php
+++ b/ui/tests/selenium/testPageHistory.php
diff --git a/frontends/php/tests/selenium/testPageHostGraph.php b/ui/tests/selenium/testPageHostGraph.php
index 86ecb7be594..86ecb7be594 100644
--- a/frontends/php/tests/selenium/testPageHostGraph.php
+++ b/ui/tests/selenium/testPageHostGraph.php
diff --git a/frontends/php/tests/selenium/testPageHostPrototypes.php b/ui/tests/selenium/testPageHostPrototypes.php
index 4d2c81d98d1..4d2c81d98d1 100644
--- a/frontends/php/tests/selenium/testPageHostPrototypes.php
+++ b/ui/tests/selenium/testPageHostPrototypes.php
diff --git a/frontends/php/tests/selenium/testPageHosts.php b/ui/tests/selenium/testPageHosts.php
index 945685b33fd..945685b33fd 100644
--- a/frontends/php/tests/selenium/testPageHosts.php
+++ b/ui/tests/selenium/testPageHosts.php
diff --git a/frontends/php/tests/selenium/testPageInventory.php b/ui/tests/selenium/testPageInventory.php
index 642d27edb6c..642d27edb6c 100644
--- a/frontends/php/tests/selenium/testPageInventory.php
+++ b/ui/tests/selenium/testPageInventory.php
diff --git a/frontends/php/tests/selenium/testPageItemPrototypes.php b/ui/tests/selenium/testPageItemPrototypes.php
index af2856c03e8..af2856c03e8 100644
--- a/frontends/php/tests/selenium/testPageItemPrototypes.php
+++ b/ui/tests/selenium/testPageItemPrototypes.php
diff --git a/frontends/php/tests/selenium/testPageItems.php b/ui/tests/selenium/testPageItems.php
index 6d5a27947ff..6d5a27947ff 100644
--- a/frontends/php/tests/selenium/testPageItems.php
+++ b/ui/tests/selenium/testPageItems.php
diff --git a/frontends/php/tests/selenium/testPageLatestData.php b/ui/tests/selenium/testPageLatestData.php
index e5ad533da19..e5ad533da19 100644
--- a/frontends/php/tests/selenium/testPageLatestData.php
+++ b/ui/tests/selenium/testPageLatestData.php
diff --git a/frontends/php/tests/selenium/testPageLowLevelDiscovery.php b/ui/tests/selenium/testPageLowLevelDiscovery.php
index 77185edfa18..77185edfa18 100644
--- a/frontends/php/tests/selenium/testPageLowLevelDiscovery.php
+++ b/ui/tests/selenium/testPageLowLevelDiscovery.php
diff --git a/frontends/php/tests/selenium/testPageMaintenance.php b/ui/tests/selenium/testPageMaintenance.php
index bd9baae088d..bd9baae088d 100644
--- a/frontends/php/tests/selenium/testPageMaintenance.php
+++ b/ui/tests/selenium/testPageMaintenance.php
diff --git a/frontends/php/tests/selenium/testPageMaps.php b/ui/tests/selenium/testPageMaps.php
index aee9efc7e83..aee9efc7e83 100644
--- a/frontends/php/tests/selenium/testPageMaps.php
+++ b/ui/tests/selenium/testPageMaps.php
diff --git a/frontends/php/tests/selenium/testPageNetworkDiscovery.php b/ui/tests/selenium/testPageNetworkDiscovery.php
index 1f6939de07e..1f6939de07e 100644
--- a/frontends/php/tests/selenium/testPageNetworkDiscovery.php
+++ b/ui/tests/selenium/testPageNetworkDiscovery.php
diff --git a/frontends/php/tests/selenium/testPageOverview.php b/ui/tests/selenium/testPageOverview.php
index 51505ff3a31..51505ff3a31 100644
--- a/frontends/php/tests/selenium/testPageOverview.php
+++ b/ui/tests/selenium/testPageOverview.php
diff --git a/frontends/php/tests/selenium/testPageProblems.php b/ui/tests/selenium/testPageProblems.php
index df6328ee2e9..df6328ee2e9 100644
--- a/frontends/php/tests/selenium/testPageProblems.php
+++ b/ui/tests/selenium/testPageProblems.php
diff --git a/frontends/php/tests/selenium/testPageQueueDetails.php b/ui/tests/selenium/testPageQueueDetails.php
index 1f5fb3ef7e3..1f5fb3ef7e3 100644
--- a/frontends/php/tests/selenium/testPageQueueDetails.php
+++ b/ui/tests/selenium/testPageQueueDetails.php
diff --git a/frontends/php/tests/selenium/testPageQueueOverview.php b/ui/tests/selenium/testPageQueueOverview.php
index 0d8614c30d8..0d8614c30d8 100644
--- a/frontends/php/tests/selenium/testPageQueueOverview.php
+++ b/ui/tests/selenium/testPageQueueOverview.php
diff --git a/frontends/php/tests/selenium/testPageQueueOverviewByProxy.php b/ui/tests/selenium/testPageQueueOverviewByProxy.php
index bebbff5655f..bebbff5655f 100644
--- a/frontends/php/tests/selenium/testPageQueueOverviewByProxy.php
+++ b/ui/tests/selenium/testPageQueueOverviewByProxy.php
diff --git a/frontends/php/tests/selenium/testPageReportsActionLog.php b/ui/tests/selenium/testPageReportsActionLog.php
index 1b2f49c283a..1b2f49c283a 100644
--- a/frontends/php/tests/selenium/testPageReportsActionLog.php
+++ b/ui/tests/selenium/testPageReportsActionLog.php
diff --git a/frontends/php/tests/selenium/testPageReportsAudit.php b/ui/tests/selenium/testPageReportsAudit.php
index 7f3a9640ed0..7f3a9640ed0 100644
--- a/frontends/php/tests/selenium/testPageReportsAudit.php
+++ b/ui/tests/selenium/testPageReportsAudit.php
diff --git a/frontends/php/tests/selenium/testPageReportsNotifications.php b/ui/tests/selenium/testPageReportsNotifications.php
index ac3b4d4ce4c..ac3b4d4ce4c 100644
--- a/frontends/php/tests/selenium/testPageReportsNotifications.php
+++ b/ui/tests/selenium/testPageReportsNotifications.php
diff --git a/frontends/php/tests/selenium/testPageReportsTriggerTop.php b/ui/tests/selenium/testPageReportsTriggerTop.php
index 912bcb1f401..912bcb1f401 100644
--- a/frontends/php/tests/selenium/testPageReportsTriggerTop.php
+++ b/ui/tests/selenium/testPageReportsTriggerTop.php
diff --git a/frontends/php/tests/selenium/testPageScreens.php b/ui/tests/selenium/testPageScreens.php
index 34af1a0470f..34af1a0470f 100644
--- a/frontends/php/tests/selenium/testPageScreens.php
+++ b/ui/tests/selenium/testPageScreens.php
diff --git a/frontends/php/tests/selenium/testPageSearch.php b/ui/tests/selenium/testPageSearch.php
index 1d5658d59af..1d5658d59af 100644
--- a/frontends/php/tests/selenium/testPageSearch.php
+++ b/ui/tests/selenium/testPageSearch.php
diff --git a/frontends/php/tests/selenium/testPageSlideShows.php b/ui/tests/selenium/testPageSlideShows.php
index 519d4ddecb3..519d4ddecb3 100644
--- a/frontends/php/tests/selenium/testPageSlideShows.php
+++ b/ui/tests/selenium/testPageSlideShows.php
diff --git a/frontends/php/tests/selenium/testPageStatusOfZabbix.php b/ui/tests/selenium/testPageStatusOfZabbix.php
index df4e8561dbf..df4e8561dbf 100644
--- a/frontends/php/tests/selenium/testPageStatusOfZabbix.php
+++ b/ui/tests/selenium/testPageStatusOfZabbix.php
diff --git a/frontends/php/tests/selenium/testPageTemplates.php b/ui/tests/selenium/testPageTemplates.php
index e57c60c7394..e57c60c7394 100644
--- a/frontends/php/tests/selenium/testPageTemplates.php
+++ b/ui/tests/selenium/testPageTemplates.php
diff --git a/frontends/php/tests/selenium/testPageTriggerPrototypes.php b/ui/tests/selenium/testPageTriggerPrototypes.php
index 8ec527197b3..8ec527197b3 100644
--- a/frontends/php/tests/selenium/testPageTriggerPrototypes.php
+++ b/ui/tests/selenium/testPageTriggerPrototypes.php
diff --git a/frontends/php/tests/selenium/testPageTriggerUrl.php b/ui/tests/selenium/testPageTriggerUrl.php
index fcdb5474897..fcdb5474897 100644
--- a/frontends/php/tests/selenium/testPageTriggerUrl.php
+++ b/ui/tests/selenium/testPageTriggerUrl.php
diff --git a/frontends/php/tests/selenium/testPageTriggers.php b/ui/tests/selenium/testPageTriggers.php
index a58e87c73ee..a58e87c73ee 100644
--- a/frontends/php/tests/selenium/testPageTriggers.php
+++ b/ui/tests/selenium/testPageTriggers.php
diff --git a/frontends/php/tests/selenium/testPageUserGroups.php b/ui/tests/selenium/testPageUserGroups.php
index d8bfa8a7821..d8bfa8a7821 100644
--- a/frontends/php/tests/selenium/testPageUserGroups.php
+++ b/ui/tests/selenium/testPageUserGroups.php
diff --git a/frontends/php/tests/selenium/testPageUsers.php b/ui/tests/selenium/testPageUsers.php
index 9b51ed137e2..9b51ed137e2 100644
--- a/frontends/php/tests/selenium/testPageUsers.php
+++ b/ui/tests/selenium/testPageUsers.php
diff --git a/frontends/php/tests/selenium/testPageWeb.php b/ui/tests/selenium/testPageWeb.php
index db158c3587b..db158c3587b 100644
--- a/frontends/php/tests/selenium/testPageWeb.php
+++ b/ui/tests/selenium/testPageWeb.php
diff --git a/frontends/php/tests/selenium/testTagBasedPermissions.php b/ui/tests/selenium/testTagBasedPermissions.php
index 232bc4d02e3..232bc4d02e3 100644
--- a/frontends/php/tests/selenium/testTagBasedPermissions.php
+++ b/ui/tests/selenium/testTagBasedPermissions.php
diff --git a/frontends/php/tests/selenium/testTemplateInheritance.php b/ui/tests/selenium/testTemplateInheritance.php
index fc867145a81..fc867145a81 100644
--- a/frontends/php/tests/selenium/testTemplateInheritance.php
+++ b/ui/tests/selenium/testTemplateInheritance.php
diff --git a/frontends/php/tests/selenium/testTriggerDependencies.php b/ui/tests/selenium/testTriggerDependencies.php
index 93be76ca709..93be76ca709 100644
--- a/frontends/php/tests/selenium/testTriggerDependencies.php
+++ b/ui/tests/selenium/testTriggerDependencies.php
diff --git a/frontends/php/tests/selenium/testTriggerExpressions.php b/ui/tests/selenium/testTriggerExpressions.php
index 215ef2f29b6..215ef2f29b6 100644
--- a/frontends/php/tests/selenium/testTriggerExpressions.php
+++ b/ui/tests/selenium/testTriggerExpressions.php
diff --git a/frontends/php/tests/selenium/testUrlParameters.php b/ui/tests/selenium/testUrlParameters.php
index 65dde07de42..65dde07de42 100644
--- a/frontends/php/tests/selenium/testUrlParameters.php
+++ b/ui/tests/selenium/testUrlParameters.php
diff --git a/frontends/php/tests/selenium/testUrlUserPermissions.php b/ui/tests/selenium/testUrlUserPermissions.php
index 26d9eeaf003..26d9eeaf003 100644
--- a/frontends/php/tests/selenium/testUrlUserPermissions.php
+++ b/ui/tests/selenium/testUrlUserPermissions.php
diff --git a/frontends/php/tests/selenium/testZBX6339.php b/ui/tests/selenium/testZBX6339.php
index fea5c342803..fea5c342803 100644
--- a/frontends/php/tests/selenium/testZBX6339.php
+++ b/ui/tests/selenium/testZBX6339.php
diff --git a/frontends/php/tests/selenium/testZBX6648.php b/ui/tests/selenium/testZBX6648.php
index 7564ae01076..7564ae01076 100644
--- a/frontends/php/tests/selenium/testZBX6648.php
+++ b/ui/tests/selenium/testZBX6648.php
diff --git a/frontends/php/tests/selenium/testZBX6663.php b/ui/tests/selenium/testZBX6663.php
index feddf68a6e0..feddf68a6e0 100644
--- a/frontends/php/tests/selenium/testZBX6663.php
+++ b/ui/tests/selenium/testZBX6663.php
diff --git a/frontends/php/tests/selenium/traits/FilterTrait.php b/ui/tests/selenium/traits/FilterTrait.php
index f55c2f52f10..f55c2f52f10 100644
--- a/frontends/php/tests/selenium/traits/FilterTrait.php
+++ b/ui/tests/selenium/traits/FilterTrait.php
diff --git a/frontends/php/tests/selenium/traits/FormParametersTrait.php b/ui/tests/selenium/traits/FormParametersTrait.php
index 31d57ac2db1..31d57ac2db1 100644
--- a/frontends/php/tests/selenium/traits/FormParametersTrait.php
+++ b/ui/tests/selenium/traits/FormParametersTrait.php
diff --git a/frontends/php/tests/selenium/traits/MacrosTrait.php b/ui/tests/selenium/traits/MacrosTrait.php
index fb4daf8a5e0..fb4daf8a5e0 100644
--- a/frontends/php/tests/selenium/traits/MacrosTrait.php
+++ b/ui/tests/selenium/traits/MacrosTrait.php
diff --git a/frontends/php/tests/selenium/traits/PreprocessingTrait.php b/ui/tests/selenium/traits/PreprocessingTrait.php
index c4a2fa167da..c4a2fa167da 100644
--- a/frontends/php/tests/selenium/traits/PreprocessingTrait.php
+++ b/ui/tests/selenium/traits/PreprocessingTrait.php
diff --git a/frontends/php/tests/selenium/traits/TableTrait.php b/ui/tests/selenium/traits/TableTrait.php
index 3bb2f1c80b3..3bb2f1c80b3 100644
--- a/frontends/php/tests/selenium/traits/TableTrait.php
+++ b/ui/tests/selenium/traits/TableTrait.php
diff --git a/frontends/php/tests/selenium/traits/TagTrait.php b/ui/tests/selenium/traits/TagTrait.php
index 3fc5e2c2928..3fc5e2c2928 100644
--- a/frontends/php/tests/selenium/traits/TagTrait.php
+++ b/ui/tests/selenium/traits/TagTrait.php
diff --git a/frontends/php/tests/templates/zabbix.conf.php b/ui/tests/templates/zabbix.conf.php
index cdcfbd3665a..cdcfbd3665a 100644
--- a/frontends/php/tests/templates/zabbix.conf.php
+++ b/ui/tests/templates/zabbix.conf.php
diff --git a/frontends/php/tests/unit/bootstrap.php b/ui/tests/unit/bootstrap.php
index 47e5d63de9d..47e5d63de9d 100644
--- a/frontends/php/tests/unit/bootstrap.php
+++ b/ui/tests/unit/bootstrap.php
diff --git a/frontends/php/tests/unit/include/classes/api/APITest.php b/ui/tests/unit/include/classes/api/APITest.php
index 7327a390449..7327a390449 100644
--- a/frontends/php/tests/unit/include/classes/api/APITest.php
+++ b/ui/tests/unit/include/classes/api/APITest.php
diff --git a/frontends/php/tests/unit/include/classes/api/clients/CLocalApiClientTest.php b/ui/tests/unit/include/classes/api/clients/CLocalApiClientTest.php
index fce4b542866..fce4b542866 100644
--- a/frontends/php/tests/unit/include/classes/api/clients/CLocalApiClientTest.php
+++ b/ui/tests/unit/include/classes/api/clients/CLocalApiClientTest.php
diff --git a/frontends/php/tests/unit/include/classes/api/helpers/CApiTagHelperTest.php b/ui/tests/unit/include/classes/api/helpers/CApiTagHelperTest.php
index ffdf814fc21..ffdf814fc21 100644
--- a/frontends/php/tests/unit/include/classes/api/helpers/CApiTagHelperTest.php
+++ b/ui/tests/unit/include/classes/api/helpers/CApiTagHelperTest.php
diff --git a/frontends/php/tests/unit/include/classes/core/CGlobalRegexpTest.php b/ui/tests/unit/include/classes/core/CGlobalRegexpTest.php
index 17c43ee1d6b..17c43ee1d6b 100644
--- a/frontends/php/tests/unit/include/classes/core/CGlobalRegexpTest.php
+++ b/ui/tests/unit/include/classes/core/CGlobalRegexpTest.php
diff --git a/frontends/php/tests/unit/include/classes/core/CRegistryFactoryTest.php b/ui/tests/unit/include/classes/core/CRegistryFactoryTest.php
index 32f5702e908..32f5702e908 100644
--- a/frontends/php/tests/unit/include/classes/core/CRegistryFactoryTest.php
+++ b/ui/tests/unit/include/classes/core/CRegistryFactoryTest.php
diff --git a/frontends/php/tests/unit/include/classes/export/writers/CXmlExportWriterTest.php b/ui/tests/unit/include/classes/export/writers/CXmlExportWriterTest.php
index a153c00bbe3..a153c00bbe3 100644
--- a/frontends/php/tests/unit/include/classes/export/writers/CXmlExportWriterTest.php
+++ b/ui/tests/unit/include/classes/export/writers/CXmlExportWriterTest.php
diff --git a/frontends/php/tests/unit/include/classes/helpers/CConditionHelperTest.php b/ui/tests/unit/include/classes/helpers/CConditionHelperTest.php
index 0f69698ad02..0f69698ad02 100644
--- a/frontends/php/tests/unit/include/classes/helpers/CConditionHelperTest.php
+++ b/ui/tests/unit/include/classes/helpers/CConditionHelperTest.php
diff --git a/frontends/php/tests/unit/include/classes/helpers/CMathHelper.php b/ui/tests/unit/include/classes/helpers/CMathHelper.php
index c82e57bc7a8..c82e57bc7a8 100644
--- a/frontends/php/tests/unit/include/classes/helpers/CMathHelper.php
+++ b/ui/tests/unit/include/classes/helpers/CMathHelper.php
diff --git a/frontends/php/tests/unit/include/classes/html/CButtonTest.php b/ui/tests/unit/include/classes/html/CButtonTest.php
index f02c693e202..f02c693e202 100644
--- a/frontends/php/tests/unit/include/classes/html/CButtonTest.php
+++ b/ui/tests/unit/include/classes/html/CButtonTest.php
diff --git a/frontends/php/tests/unit/include/classes/html/CRedirectButtonTest.php b/ui/tests/unit/include/classes/html/CRedirectButtonTest.php
index f2fdb022034..f2fdb022034 100644
--- a/frontends/php/tests/unit/include/classes/html/CRedirectButtonTest.php
+++ b/ui/tests/unit/include/classes/html/CRedirectButtonTest.php
diff --git a/frontends/php/tests/unit/include/classes/html/CRowTest.php b/ui/tests/unit/include/classes/html/CRowTest.php
index 3271161a62d..3271161a62d 100644
--- a/frontends/php/tests/unit/include/classes/html/CRowTest.php
+++ b/ui/tests/unit/include/classes/html/CRowTest.php
diff --git a/frontends/php/tests/unit/include/classes/html/CSimpleButtonTest.php b/ui/tests/unit/include/classes/html/CSimpleButtonTest.php
index 484ea81e95f..484ea81e95f 100644
--- a/frontends/php/tests/unit/include/classes/html/CSimpleButtonTest.php
+++ b/ui/tests/unit/include/classes/html/CSimpleButtonTest.php
diff --git a/frontends/php/tests/unit/include/classes/html/CSubmitButtonTest.php b/ui/tests/unit/include/classes/html/CSubmitButtonTest.php
index 093cc6a9436..093cc6a9436 100644
--- a/frontends/php/tests/unit/include/classes/html/CSubmitButtonTest.php
+++ b/ui/tests/unit/include/classes/html/CSubmitButtonTest.php
diff --git a/frontends/php/tests/unit/include/classes/html/CSubmitTest.php b/ui/tests/unit/include/classes/html/CSubmitTest.php
index 85cc23ac37d..85cc23ac37d 100644
--- a/frontends/php/tests/unit/include/classes/html/CSubmitTest.php
+++ b/ui/tests/unit/include/classes/html/CSubmitTest.php
diff --git a/frontends/php/tests/unit/include/classes/html/CTagTest.php b/ui/tests/unit/include/classes/html/CTagTest.php
index eeb7b2e14a0..eeb7b2e14a0 100644
--- a/frontends/php/tests/unit/include/classes/html/CTagTest.php
+++ b/ui/tests/unit/include/classes/html/CTagTest.php
diff --git a/frontends/php/tests/unit/include/classes/import/CImportDataAdapterTest.php b/ui/tests/unit/include/classes/import/CImportDataAdapterTest.php
index 449c9191013..449c9191013 100644
--- a/frontends/php/tests/unit/include/classes/import/CImportDataAdapterTest.php
+++ b/ui/tests/unit/include/classes/import/CImportDataAdapterTest.php
diff --git a/frontends/php/tests/unit/include/classes/import/converters/C10ImportConverterTest.php b/ui/tests/unit/include/classes/import/converters/C10ImportConverterTest.php
index 5dd64d447c1..5dd64d447c1 100644
--- a/frontends/php/tests/unit/include/classes/import/converters/C10ImportConverterTest.php
+++ b/ui/tests/unit/include/classes/import/converters/C10ImportConverterTest.php
diff --git a/frontends/php/tests/unit/include/classes/import/converters/C10ItemKeyConverterTest.php b/ui/tests/unit/include/classes/import/converters/C10ItemKeyConverterTest.php
index b25550b7157..b25550b7157 100644
--- a/frontends/php/tests/unit/include/classes/import/converters/C10ItemKeyConverterTest.php
+++ b/ui/tests/unit/include/classes/import/converters/C10ItemKeyConverterTest.php
diff --git a/frontends/php/tests/unit/include/classes/import/converters/C10TriggerConverterTest.php b/ui/tests/unit/include/classes/import/converters/C10TriggerConverterTest.php
index 030e8db446b..030e8db446b 100644
--- a/frontends/php/tests/unit/include/classes/import/converters/C10TriggerConverterTest.php
+++ b/ui/tests/unit/include/classes/import/converters/C10TriggerConverterTest.php
diff --git a/frontends/php/tests/unit/include/classes/import/converters/C20ImportConverterTest.php b/ui/tests/unit/include/classes/import/converters/C20ImportConverterTest.php
index 61ef3b8a3c7..61ef3b8a3c7 100644
--- a/frontends/php/tests/unit/include/classes/import/converters/C20ImportConverterTest.php
+++ b/ui/tests/unit/include/classes/import/converters/C20ImportConverterTest.php
diff --git a/frontends/php/tests/unit/include/classes/import/converters/C20ItemKeyConverterTest.php b/ui/tests/unit/include/classes/import/converters/C20ItemKeyConverterTest.php
index 1146348053c..1146348053c 100644
--- a/frontends/php/tests/unit/include/classes/import/converters/C20ItemKeyConverterTest.php
+++ b/ui/tests/unit/include/classes/import/converters/C20ItemKeyConverterTest.php
diff --git a/frontends/php/tests/unit/include/classes/import/converters/C20TriggerConverterTest.php b/ui/tests/unit/include/classes/import/converters/C20TriggerConverterTest.php
index 00a09098c23..00a09098c23 100644
--- a/frontends/php/tests/unit/include/classes/import/converters/C20TriggerConverterTest.php
+++ b/ui/tests/unit/include/classes/import/converters/C20TriggerConverterTest.php
diff --git a/frontends/php/tests/unit/include/classes/import/converters/C30ImportConverterTest.php b/ui/tests/unit/include/classes/import/converters/C30ImportConverterTest.php
index 9fa1cc41e5e..9fa1cc41e5e 100644
--- a/frontends/php/tests/unit/include/classes/import/converters/C30ImportConverterTest.php
+++ b/ui/tests/unit/include/classes/import/converters/C30ImportConverterTest.php
diff --git a/frontends/php/tests/unit/include/classes/import/converters/C32ImportConverterTest.php b/ui/tests/unit/include/classes/import/converters/C32ImportConverterTest.php
index 6bfbbb38c69..6bfbbb38c69 100644
--- a/frontends/php/tests/unit/include/classes/import/converters/C32ImportConverterTest.php
+++ b/ui/tests/unit/include/classes/import/converters/C32ImportConverterTest.php
diff --git a/frontends/php/tests/unit/include/classes/import/converters/C34ImportConverterTest.php b/ui/tests/unit/include/classes/import/converters/C34ImportConverterTest.php
index d3b8776e098..d3b8776e098 100644
--- a/frontends/php/tests/unit/include/classes/import/converters/C34ImportConverterTest.php
+++ b/ui/tests/unit/include/classes/import/converters/C34ImportConverterTest.php
diff --git a/frontends/php/tests/unit/include/classes/import/converters/C40ImportConverterTest.php b/ui/tests/unit/include/classes/import/converters/C40ImportConverterTest.php
index b335e02e003..b335e02e003 100644
--- a/frontends/php/tests/unit/include/classes/import/converters/C40ImportConverterTest.php
+++ b/ui/tests/unit/include/classes/import/converters/C40ImportConverterTest.php
diff --git a/frontends/php/tests/unit/include/classes/import/converters/C42ImportConverterTest.php b/ui/tests/unit/include/classes/import/converters/C42ImportConverterTest.php
index ef45a7ea8b8..ef45a7ea8b8 100644
--- a/frontends/php/tests/unit/include/classes/import/converters/C42ImportConverterTest.php
+++ b/ui/tests/unit/include/classes/import/converters/C42ImportConverterTest.php
diff --git a/frontends/php/tests/unit/include/classes/import/converters/C44ImportConverterTest.php b/ui/tests/unit/include/classes/import/converters/C44ImportConverterTest.php
index ce10afee239..ce10afee239 100644
--- a/frontends/php/tests/unit/include/classes/import/converters/C44ImportConverterTest.php
+++ b/ui/tests/unit/include/classes/import/converters/C44ImportConverterTest.php
diff --git a/frontends/php/tests/unit/include/classes/import/converters/CImportConverterTest.php b/ui/tests/unit/include/classes/import/converters/CImportConverterTest.php
index 8e405414e0d..8e405414e0d 100644
--- a/frontends/php/tests/unit/include/classes/import/converters/CImportConverterTest.php
+++ b/ui/tests/unit/include/classes/import/converters/CImportConverterTest.php
diff --git a/frontends/php/tests/unit/include/classes/import/readers/CXmlImportReaderTest.php b/ui/tests/unit/include/classes/import/readers/CXmlImportReaderTest.php
index e6d3af2add8..e6d3af2add8 100644
--- a/frontends/php/tests/unit/include/classes/import/readers/CXmlImportReaderTest.php
+++ b/ui/tests/unit/include/classes/import/readers/CXmlImportReaderTest.php
diff --git a/frontends/php/tests/unit/include/classes/import/xml/SNMP_items_hosts.xml b/ui/tests/unit/include/classes/import/xml/SNMP_items_hosts.xml
index 4dd9949489e..4dd9949489e 100644
--- a/frontends/php/tests/unit/include/classes/import/xml/SNMP_items_hosts.xml
+++ b/ui/tests/unit/include/classes/import/xml/SNMP_items_hosts.xml
diff --git a/frontends/php/tests/unit/include/classes/import/xml/SNMP_items_templates.xml b/ui/tests/unit/include/classes/import/xml/SNMP_items_templates.xml
index f32aa29fee9..f32aa29fee9 100644
--- a/frontends/php/tests/unit/include/classes/import/xml/SNMP_items_templates.xml
+++ b/ui/tests/unit/include/classes/import/xml/SNMP_items_templates.xml
diff --git a/frontends/php/tests/unit/include/classes/import/xml/host18.xml b/ui/tests/unit/include/classes/import/xml/host18.xml
index e53cf718129..e53cf718129 100644
--- a/frontends/php/tests/unit/include/classes/import/xml/host18.xml
+++ b/ui/tests/unit/include/classes/import/xml/host18.xml
diff --git a/frontends/php/tests/unit/include/classes/import/xml/hostAndTemplate.xml b/ui/tests/unit/include/classes/import/xml/hostAndTemplate.xml
index 8fef0d5d430..8fef0d5d430 100644
--- a/frontends/php/tests/unit/include/classes/import/xml/hostAndTemplate.xml
+++ b/ui/tests/unit/include/classes/import/xml/hostAndTemplate.xml
diff --git a/frontends/php/tests/unit/include/classes/import/xml/map.xml b/ui/tests/unit/include/classes/import/xml/map.xml
index fb31398cfe0..fb31398cfe0 100644
--- a/frontends/php/tests/unit/include/classes/import/xml/map.xml
+++ b/ui/tests/unit/include/classes/import/xml/map.xml
diff --git a/frontends/php/tests/unit/include/classes/import/xml/mediatype.xml b/ui/tests/unit/include/classes/import/xml/mediatype.xml
index 48d4315f4e9..48d4315f4e9 100644
--- a/frontends/php/tests/unit/include/classes/import/xml/mediatype.xml
+++ b/ui/tests/unit/include/classes/import/xml/mediatype.xml
diff --git a/frontends/php/tests/unit/include/classes/import/xml/schema_1.0.xml b/ui/tests/unit/include/classes/import/xml/schema_1.0.xml
index 2269ef54b20..2269ef54b20 100644
--- a/frontends/php/tests/unit/include/classes/import/xml/schema_1.0.xml
+++ b/ui/tests/unit/include/classes/import/xml/schema_1.0.xml
diff --git a/frontends/php/tests/unit/include/classes/import/xml/screen.xml b/ui/tests/unit/include/classes/import/xml/screen.xml
index f33a7f4dc2c..f33a7f4dc2c 100644
--- a/frontends/php/tests/unit/include/classes/import/xml/screen.xml
+++ b/ui/tests/unit/include/classes/import/xml/screen.xml
diff --git a/frontends/php/tests/unit/include/classes/parsers/CADNameAttributeParserTest.php b/ui/tests/unit/include/classes/parsers/CADNameAttributeParserTest.php
index 909a87b56d9..909a87b56d9 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CADNameAttributeParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CADNameAttributeParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CAbsoluteTimeParserTest.php b/ui/tests/unit/include/classes/parsers/CAbsoluteTimeParserTest.php
index 0c535d03eec..0c535d03eec 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CAbsoluteTimeParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CAbsoluteTimeParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CConditionFormulaTest.php b/ui/tests/unit/include/classes/parsers/CConditionFormulaTest.php
index c1f7da215fb..c1f7da215fb 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CConditionFormulaTest.php
+++ b/ui/tests/unit/include/classes/parsers/CConditionFormulaTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CDnsParserTest.php b/ui/tests/unit/include/classes/parsers/CDnsParserTest.php
index e7705e33a07..e7705e33a07 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CDnsParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CDnsParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CFlexibleIntervalParserTest.php b/ui/tests/unit/include/classes/parsers/CFlexibleIntervalParserTest.php
index 965212e8b88..965212e8b88 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CFlexibleIntervalParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CFlexibleIntervalParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CFunctionIdParserTest.php b/ui/tests/unit/include/classes/parsers/CFunctionIdParserTest.php
index 889b6160b6f..889b6160b6f 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CFunctionIdParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CFunctionIdParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CFunctionMacroParserTest.php b/ui/tests/unit/include/classes/parsers/CFunctionMacroParserTest.php
index a8cf40732f6..a8cf40732f6 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CFunctionMacroParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CFunctionMacroParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CFunctionParserTest.php b/ui/tests/unit/include/classes/parsers/CFunctionParserTest.php
index a7d8fc05f22..a7d8fc05f22 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CFunctionParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CFunctionParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CHostGroupNameParserTest.php b/ui/tests/unit/include/classes/parsers/CHostGroupNameParserTest.php
index be45116fe7e..be45116fe7e 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CHostGroupNameParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CHostGroupNameParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CHostNameParserTest.php b/ui/tests/unit/include/classes/parsers/CHostNameParserTest.php
index ba94cc6117f..ba94cc6117f 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CHostNameParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CHostNameParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CIPParserTest.php b/ui/tests/unit/include/classes/parsers/CIPParserTest.php
index 57c32dad69c..57c32dad69c 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CIPParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CIPParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CIPRangeParserTest.php b/ui/tests/unit/include/classes/parsers/CIPRangeParserTest.php
index eeb1a3fc324..eeb1a3fc324 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CIPRangeParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CIPRangeParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CIPv4ParserTest.php b/ui/tests/unit/include/classes/parsers/CIPv4ParserTest.php
index e33a82abce3..e33a82abce3 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CIPv4ParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CIPv4ParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CIPv6ParserTest.php b/ui/tests/unit/include/classes/parsers/CIPv6ParserTest.php
index cef916d398b..cef916d398b 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CIPv6ParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CIPv6ParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CItemKeyTest.php b/ui/tests/unit/include/classes/parsers/CItemKeyTest.php
index 04fdaee9849..04fdaee9849 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CItemKeyTest.php
+++ b/ui/tests/unit/include/classes/parsers/CItemKeyTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CLLDMacroFunctionParserTest.php b/ui/tests/unit/include/classes/parsers/CLLDMacroFunctionParserTest.php
index 928fa1e4592..928fa1e4592 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CLLDMacroFunctionParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CLLDMacroFunctionParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CLLDMacroParserTest.php b/ui/tests/unit/include/classes/parsers/CLLDMacroParserTest.php
index d8a32f2862b..d8a32f2862b 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CLLDMacroParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CLLDMacroParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CMacroParserTest.php b/ui/tests/unit/include/classes/parsers/CMacroParserTest.php
index b0c26fa6677..b0c26fa6677 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CMacroParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CMacroParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CParserTest.php b/ui/tests/unit/include/classes/parsers/CParserTest.php
index 16578a41bfa..16578a41bfa 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CPrometheusOutputParserTest.php b/ui/tests/unit/include/classes/parsers/CPrometheusOutputParserTest.php
index 2b0405638d2..2b0405638d2 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CPrometheusOutputParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CPrometheusOutputParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CPrometheusPatternParserTest.php b/ui/tests/unit/include/classes/parsers/CPrometheusPatternParserTest.php
index 7b399893a00..7b399893a00 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CPrometheusPatternParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CPrometheusPatternParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CRangeParserTest.php b/ui/tests/unit/include/classes/parsers/CRangeParserTest.php
index aeeb1ba1de3..aeeb1ba1de3 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CRangeParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CRangeParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CRangeTimeParserTest.php b/ui/tests/unit/include/classes/parsers/CRangeTimeParserTest.php
index 4d97ac83799..4d97ac83799 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CRangeTimeParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CRangeTimeParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CRangesParserTest.php b/ui/tests/unit/include/classes/parsers/CRangesParserTest.php
index 87b676c1848..87b676c1848 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CRangesParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CRangesParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CReferenceParserTest.php b/ui/tests/unit/include/classes/parsers/CReferenceParserTest.php
index 1fa8515477f..1fa8515477f 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CReferenceParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CReferenceParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CRelativeTimeParserTest.php b/ui/tests/unit/include/classes/parsers/CRelativeTimeParserTest.php
index 801eff0a4e6..801eff0a4e6 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CRelativeTimeParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CRelativeTimeParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CReplacementParserTest.php b/ui/tests/unit/include/classes/parsers/CReplacementParserTest.php
index d3f903335cc..d3f903335cc 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CReplacementParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CReplacementParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CSchedulingIntervalParserTest.php b/ui/tests/unit/include/classes/parsers/CSchedulingIntervalParserTest.php
index 1ded5ca65c2..1ded5ca65c2 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CSchedulingIntervalParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CSchedulingIntervalParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CSetParserTest.php b/ui/tests/unit/include/classes/parsers/CSetParserTest.php
index 37f54bf7d1c..37f54bf7d1c 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CSetParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CSetParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CSimpleIntervalParserTest.php b/ui/tests/unit/include/classes/parsers/CSimpleIntervalParserTest.php
index 5cd8b17e910..5cd8b17e910 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CSimpleIntervalParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CSimpleIntervalParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CTimePeriodParserTest.php b/ui/tests/unit/include/classes/parsers/CTimePeriodParserTest.php
index 7b2dd3a58b2..7b2dd3a58b2 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CTimePeriodParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CTimePeriodParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CTimePeriodsParserTest.php b/ui/tests/unit/include/classes/parsers/CTimePeriodsParserTest.php
index f090ed8d7cf..f090ed8d7cf 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CTimePeriodsParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CTimePeriodsParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CTriggerExpressionTest.php b/ui/tests/unit/include/classes/parsers/CTriggerExpressionTest.php
index ea9a602f897..ea9a602f897 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CTriggerExpressionTest.php
+++ b/ui/tests/unit/include/classes/parsers/CTriggerExpressionTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CUpdateIntervalParserTest.php b/ui/tests/unit/include/classes/parsers/CUpdateIntervalParserTest.php
index 415aa290202..415aa290202 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CUpdateIntervalParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CUpdateIntervalParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CUserMacroParserTest.php b/ui/tests/unit/include/classes/parsers/CUserMacroParserTest.php
index 0be3c81e1dd..0be3c81e1dd 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CUserMacroParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CUserMacroParserTest.php
diff --git a/frontends/php/tests/unit/include/classes/parsers/CValidationRuleTest.php b/ui/tests/unit/include/classes/parsers/CValidationRuleTest.php
index 797bf190447..797bf190447 100644
--- a/frontends/php/tests/unit/include/classes/parsers/CValidationRuleTest.php
+++ b/ui/tests/unit/include/classes/parsers/CValidationRuleTest.php
diff --git a/frontends/php/tests/unit/include/classes/services/CServicesSlaCalculatorTest.php b/ui/tests/unit/include/classes/services/CServicesSlaCalculatorTest.php
index 526d8d6b47a..526d8d6b47a 100644
--- a/frontends/php/tests/unit/include/classes/services/CServicesSlaCalculatorTest.php
+++ b/ui/tests/unit/include/classes/services/CServicesSlaCalculatorTest.php
diff --git a/frontends/php/tests/unit/include/classes/triggers/CTextTriggerConstructorTest.php b/ui/tests/unit/include/classes/triggers/CTextTriggerConstructorTest.php
index 178363ed578..178363ed578 100644
--- a/frontends/php/tests/unit/include/classes/triggers/CTextTriggerConstructorTest.php
+++ b/ui/tests/unit/include/classes/triggers/CTextTriggerConstructorTest.php
diff --git a/frontends/php/tests/unit/include/classes/validators/CActionCondValidatorTest.php b/ui/tests/unit/include/classes/validators/CActionCondValidatorTest.php
index 4502c87a53b..4502c87a53b 100644
--- a/frontends/php/tests/unit/include/classes/validators/CActionCondValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CActionCondValidatorTest.php
diff --git a/frontends/php/tests/unit/include/classes/validators/CApiInputValidatorTest.php b/ui/tests/unit/include/classes/validators/CApiInputValidatorTest.php
index 8c6b6a9f842..8c6b6a9f842 100644
--- a/frontends/php/tests/unit/include/classes/validators/CApiInputValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CApiInputValidatorTest.php
diff --git a/frontends/php/tests/unit/include/classes/validators/CCollectionValidatorTest.php b/ui/tests/unit/include/classes/validators/CCollectionValidatorTest.php
index e6f39f361b9..e6f39f361b9 100644
--- a/frontends/php/tests/unit/include/classes/validators/CCollectionValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CCollectionValidatorTest.php
diff --git a/frontends/php/tests/unit/include/classes/validators/CColorValidatorTest.php b/ui/tests/unit/include/classes/validators/CColorValidatorTest.php
index 8d148a6abf9..8d148a6abf9 100644
--- a/frontends/php/tests/unit/include/classes/validators/CColorValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CColorValidatorTest.php
diff --git a/frontends/php/tests/unit/include/classes/validators/CConditionValidatorTest.php b/ui/tests/unit/include/classes/validators/CConditionValidatorTest.php
index ecfc51a28bd..ecfc51a28bd 100644
--- a/frontends/php/tests/unit/include/classes/validators/CConditionValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CConditionValidatorTest.php
diff --git a/frontends/php/tests/unit/include/classes/validators/CEmailValidatorTest.php b/ui/tests/unit/include/classes/validators/CEmailValidatorTest.php
index d82acd9bff1..d82acd9bff1 100644
--- a/frontends/php/tests/unit/include/classes/validators/CEmailValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CEmailValidatorTest.php
diff --git a/frontends/php/tests/unit/include/classes/validators/CEventCorrCondValidatorTest.php b/ui/tests/unit/include/classes/validators/CEventCorrCondValidatorTest.php
index 0ebd8021019..0ebd8021019 100644
--- a/frontends/php/tests/unit/include/classes/validators/CEventCorrCondValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CEventCorrCondValidatorTest.php
diff --git a/frontends/php/tests/unit/include/classes/validators/CFunctionValidatorTest.php b/ui/tests/unit/include/classes/validators/CFunctionValidatorTest.php
index deb33c09dd9..deb33c09dd9 100644
--- a/frontends/php/tests/unit/include/classes/validators/CFunctionValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CFunctionValidatorTest.php
diff --git a/frontends/php/tests/unit/include/classes/validators/CHtmlUrlValidatorTest.php b/ui/tests/unit/include/classes/validators/CHtmlUrlValidatorTest.php
index b6c6e7abc80..b6c6e7abc80 100644
--- a/frontends/php/tests/unit/include/classes/validators/CHtmlUrlValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CHtmlUrlValidatorTest.php
diff --git a/frontends/php/tests/unit/include/classes/validators/CIdValidatorTest.php b/ui/tests/unit/include/classes/validators/CIdValidatorTest.php
index 5c04dd37eaa..5c04dd37eaa 100644
--- a/frontends/php/tests/unit/include/classes/validators/CIdValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CIdValidatorTest.php
diff --git a/frontends/php/tests/unit/include/classes/validators/CLdapAuthValidatorTest.php b/ui/tests/unit/include/classes/validators/CLdapAuthValidatorTest.php
index 197cea9977c..197cea9977c 100644
--- a/frontends/php/tests/unit/include/classes/validators/CLdapAuthValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CLdapAuthValidatorTest.php
diff --git a/frontends/php/tests/unit/include/classes/validators/CLimitedSetValidatorTest.php b/ui/tests/unit/include/classes/validators/CLimitedSetValidatorTest.php
index d0528c0caf5..d0528c0caf5 100644
--- a/frontends/php/tests/unit/include/classes/validators/CLimitedSetValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CLimitedSetValidatorTest.php
diff --git a/frontends/php/tests/unit/include/classes/validators/CRegexValidatorTest.php b/ui/tests/unit/include/classes/validators/CRegexValidatorTest.php
index 0062edfc69d..0062edfc69d 100644
--- a/frontends/php/tests/unit/include/classes/validators/CRegexValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CRegexValidatorTest.php
diff --git a/frontends/php/tests/unit/include/classes/validators/CStringValidatorTest.php b/ui/tests/unit/include/classes/validators/CStringValidatorTest.php
index f1615f2a2fb..f1615f2a2fb 100644
--- a/frontends/php/tests/unit/include/classes/validators/CStringValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CStringValidatorTest.php
diff --git a/frontends/php/tests/unit/include/classes/validators/CValidatorTest.php b/ui/tests/unit/include/classes/validators/CValidatorTest.php
index 41b2d85391e..41b2d85391e 100644
--- a/frontends/php/tests/unit/include/classes/validators/CValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CValidatorTest.php
diff --git a/frontends/php/tests/unit/include/function_convertUnitsTest.php b/ui/tests/unit/include/function_convertUnitsTest.php
index f6f488dd446..f6f488dd446 100644
--- a/frontends/php/tests/unit/include/function_convertUnitsTest.php
+++ b/ui/tests/unit/include/function_convertUnitsTest.php
diff --git a/frontends/php/tests/unit/include/function_formatFloatTest.php b/ui/tests/unit/include/function_formatFloatTest.php
index 38d544fddd0..38d544fddd0 100644
--- a/frontends/php/tests/unit/include/function_formatFloatTest.php
+++ b/ui/tests/unit/include/function_formatFloatTest.php
diff --git a/frontends/php/tests/unit/include/function_relativeDateToTextTest.php b/ui/tests/unit/include/function_relativeDateToTextTest.php
index 4cca51fb2aa..4cca51fb2aa 100644
--- a/frontends/php/tests/unit/include/function_relativeDateToTextTest.php
+++ b/ui/tests/unit/include/function_relativeDateToTextTest.php
diff --git a/frontends/php/tests/unit/include/services/CalculateItServiceStatusByTriggerTest.php b/ui/tests/unit/include/services/CalculateItServiceStatusByTriggerTest.php
index f4f85452ed7..f4f85452ed7 100644
--- a/frontends/php/tests/unit/include/services/CalculateItServiceStatusByTriggerTest.php
+++ b/ui/tests/unit/include/services/CalculateItServiceStatusByTriggerTest.php
diff --git a/frontends/php/tests/unit/include/services/CalculateItServiceStatusTest.php b/ui/tests/unit/include/services/CalculateItServiceStatusTest.php
index c82f4df3d92..c82f4df3d92 100644
--- a/frontends/php/tests/unit/include/services/CalculateItServiceStatusTest.php
+++ b/ui/tests/unit/include/services/CalculateItServiceStatusTest.php
diff --git a/frontends/php/tests/unit/include/str2memTest.php b/ui/tests/unit/include/str2memTest.php
index a2b2e6ab2be..a2b2e6ab2be 100644
--- a/frontends/php/tests/unit/include/str2memTest.php
+++ b/ui/tests/unit/include/str2memTest.php
diff --git a/frontends/php/tests/unit/include/triggerExpressionReplaceHostTest.php b/ui/tests/unit/include/triggerExpressionReplaceHostTest.php
index de3fe0a8243..de3fe0a8243 100644
--- a/frontends/php/tests/unit/include/triggerExpressionReplaceHostTest.php
+++ b/ui/tests/unit/include/triggerExpressionReplaceHostTest.php
diff --git a/frontends/php/tests/unit/include/triggers/GetExpressionTreeTest.php b/ui/tests/unit/include/triggers/GetExpressionTreeTest.php
index 81a7faa15f8..81a7faa15f8 100644
--- a/frontends/php/tests/unit/include/triggers/GetExpressionTreeTest.php
+++ b/ui/tests/unit/include/triggers/GetExpressionTreeTest.php
diff --git a/frontends/php/tests/unit/include/zbxjsvalueTest.php b/ui/tests/unit/include/zbxjsvalueTest.php
index 8844004742b..8844004742b 100644
--- a/frontends/php/tests/unit/include/zbxjsvalueTest.php
+++ b/ui/tests/unit/include/zbxjsvalueTest.php
diff --git a/frontends/php/tests/unit/phpunit.xml b/ui/tests/unit/phpunit.xml
index 1e90fb970ae..1e90fb970ae 100644
--- a/frontends/php/tests/unit/phpunit.xml
+++ b/ui/tests/unit/phpunit.xml
diff --git a/frontends/php/toptriggers.php b/ui/toptriggers.php
index 88aec08b4cd..88aec08b4cd 100644
--- a/frontends/php/toptriggers.php
+++ b/ui/toptriggers.php
diff --git a/frontends/php/tr_events.php b/ui/tr_events.php
index 68e2e3dd147..68e2e3dd147 100644
--- a/frontends/php/tr_events.php
+++ b/ui/tr_events.php
diff --git a/frontends/php/trigger_prototypes.php b/ui/trigger_prototypes.php
index c38c0ca2675..c38c0ca2675 100644
--- a/frontends/php/trigger_prototypes.php
+++ b/ui/trigger_prototypes.php
diff --git a/frontends/php/triggers.php b/ui/triggers.php
index 2e38eea2250..2e38eea2250 100644
--- a/frontends/php/triggers.php
+++ b/ui/triggers.php
diff --git a/frontends/php/vendor/php-saml/CHANGELOG b/ui/vendor/php-saml/CHANGELOG
index 019196bdf67..019196bdf67 100644
--- a/frontends/php/vendor/php-saml/CHANGELOG
+++ b/ui/vendor/php-saml/CHANGELOG
diff --git a/frontends/php/vendor/php-saml/LICENSE b/ui/vendor/php-saml/LICENSE
index dbbca9c6cbc..dbbca9c6cbc 100644
--- a/frontends/php/vendor/php-saml/LICENSE
+++ b/ui/vendor/php-saml/LICENSE
diff --git a/frontends/php/vendor/php-saml/README.md b/ui/vendor/php-saml/README.md
index 7ad8b48e035..7ad8b48e035 100644
--- a/frontends/php/vendor/php-saml/README.md
+++ b/ui/vendor/php-saml/README.md
diff --git a/frontends/php/vendor/php-saml/_toolkit_loader.php b/ui/vendor/php-saml/_toolkit_loader.php
index c4649d76337..c4649d76337 100644
--- a/frontends/php/vendor/php-saml/_toolkit_loader.php
+++ b/ui/vendor/php-saml/_toolkit_loader.php
diff --git a/frontends/php/vendor/php-saml/advanced_settings_example.php b/ui/vendor/php-saml/advanced_settings_example.php
index 1d1552cece7..1d1552cece7 100644
--- a/frontends/php/vendor/php-saml/advanced_settings_example.php
+++ b/ui/vendor/php-saml/advanced_settings_example.php
diff --git a/frontends/php/vendor/php-saml/certs/README b/ui/vendor/php-saml/certs/README
index 1616ebda8a7..1616ebda8a7 100644
--- a/frontends/php/vendor/php-saml/certs/README
+++ b/ui/vendor/php-saml/certs/README
diff --git a/frontends/php/vendor/php-saml/composer.json b/ui/vendor/php-saml/composer.json
index 2cae8af8003..2cae8af8003 100644
--- a/frontends/php/vendor/php-saml/composer.json
+++ b/ui/vendor/php-saml/composer.json
diff --git a/frontends/php/vendor/php-saml/phpunit.xml b/ui/vendor/php-saml/phpunit.xml
index 3629f2741f3..3629f2741f3 100644
--- a/frontends/php/vendor/php-saml/phpunit.xml
+++ b/ui/vendor/php-saml/phpunit.xml
diff --git a/frontends/php/vendor/php-saml/settings_example.php b/ui/vendor/php-saml/settings_example.php
index 981a21a38c9..981a21a38c9 100644
--- a/frontends/php/vendor/php-saml/settings_example.php
+++ b/ui/vendor/php-saml/settings_example.php
diff --git a/frontends/php/vendor/php-saml/src/Saml2/Auth.php b/ui/vendor/php-saml/src/Saml2/Auth.php
index 5f603a17d76..5f603a17d76 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/Auth.php
+++ b/ui/vendor/php-saml/src/Saml2/Auth.php
diff --git a/frontends/php/vendor/php-saml/src/Saml2/AuthnRequest.php b/ui/vendor/php-saml/src/Saml2/AuthnRequest.php
index a1311f71ef9..a1311f71ef9 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/AuthnRequest.php
+++ b/ui/vendor/php-saml/src/Saml2/AuthnRequest.php
diff --git a/frontends/php/vendor/php-saml/src/Saml2/Constants.php b/ui/vendor/php-saml/src/Saml2/Constants.php
index 21261fb247a..21261fb247a 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/Constants.php
+++ b/ui/vendor/php-saml/src/Saml2/Constants.php
diff --git a/frontends/php/vendor/php-saml/src/Saml2/Error.php b/ui/vendor/php-saml/src/Saml2/Error.php
index 211acf48659..211acf48659 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/Error.php
+++ b/ui/vendor/php-saml/src/Saml2/Error.php
diff --git a/frontends/php/vendor/php-saml/src/Saml2/IdPMetadataParser.php b/ui/vendor/php-saml/src/Saml2/IdPMetadataParser.php
index 947d654887b..947d654887b 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/IdPMetadataParser.php
+++ b/ui/vendor/php-saml/src/Saml2/IdPMetadataParser.php
diff --git a/frontends/php/vendor/php-saml/src/Saml2/LogoutRequest.php b/ui/vendor/php-saml/src/Saml2/LogoutRequest.php
index d540c22e3e4..d540c22e3e4 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/LogoutRequest.php
+++ b/ui/vendor/php-saml/src/Saml2/LogoutRequest.php
diff --git a/frontends/php/vendor/php-saml/src/Saml2/LogoutResponse.php b/ui/vendor/php-saml/src/Saml2/LogoutResponse.php
index 700feb021f7..700feb021f7 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/LogoutResponse.php
+++ b/ui/vendor/php-saml/src/Saml2/LogoutResponse.php
diff --git a/frontends/php/vendor/php-saml/src/Saml2/Metadata.php b/ui/vendor/php-saml/src/Saml2/Metadata.php
index 922ad60baa4..922ad60baa4 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/Metadata.php
+++ b/ui/vendor/php-saml/src/Saml2/Metadata.php
diff --git a/frontends/php/vendor/php-saml/src/Saml2/Response.php b/ui/vendor/php-saml/src/Saml2/Response.php
index b34297f4258..b34297f4258 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/Response.php
+++ b/ui/vendor/php-saml/src/Saml2/Response.php
diff --git a/frontends/php/vendor/php-saml/src/Saml2/Settings.php b/ui/vendor/php-saml/src/Saml2/Settings.php
index 3c953fc91a2..3c953fc91a2 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/Settings.php
+++ b/ui/vendor/php-saml/src/Saml2/Settings.php
diff --git a/frontends/php/vendor/php-saml/src/Saml2/Utils.php b/ui/vendor/php-saml/src/Saml2/Utils.php
index 50d3d41b9ac..50d3d41b9ac 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/Utils.php
+++ b/ui/vendor/php-saml/src/Saml2/Utils.php
diff --git a/frontends/php/vendor/php-saml/src/Saml2/ValidationError.php b/ui/vendor/php-saml/src/Saml2/ValidationError.php
index 889f531caba..889f531caba 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/ValidationError.php
+++ b/ui/vendor/php-saml/src/Saml2/ValidationError.php
diff --git a/frontends/php/vendor/php-saml/src/Saml2/schemas/saml-schema-assertion-2.0.xsd b/ui/vendor/php-saml/src/Saml2/schemas/saml-schema-assertion-2.0.xsd
index 2b2f7b8018a..2b2f7b8018a 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/schemas/saml-schema-assertion-2.0.xsd
+++ b/ui/vendor/php-saml/src/Saml2/schemas/saml-schema-assertion-2.0.xsd
diff --git a/frontends/php/vendor/php-saml/src/Saml2/schemas/saml-schema-authn-context-2.0.xsd b/ui/vendor/php-saml/src/Saml2/schemas/saml-schema-authn-context-2.0.xsd
index e4754faf8c4..e4754faf8c4 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/schemas/saml-schema-authn-context-2.0.xsd
+++ b/ui/vendor/php-saml/src/Saml2/schemas/saml-schema-authn-context-2.0.xsd
diff --git a/frontends/php/vendor/php-saml/src/Saml2/schemas/saml-schema-authn-context-types-2.0.xsd b/ui/vendor/php-saml/src/Saml2/schemas/saml-schema-authn-context-types-2.0.xsd
index 8513959a5d5..8513959a5d5 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/schemas/saml-schema-authn-context-types-2.0.xsd
+++ b/ui/vendor/php-saml/src/Saml2/schemas/saml-schema-authn-context-types-2.0.xsd
diff --git a/frontends/php/vendor/php-saml/src/Saml2/schemas/saml-schema-metadata-2.0.xsd b/ui/vendor/php-saml/src/Saml2/schemas/saml-schema-metadata-2.0.xsd
index 86e58f9bb5d..86e58f9bb5d 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/schemas/saml-schema-metadata-2.0.xsd
+++ b/ui/vendor/php-saml/src/Saml2/schemas/saml-schema-metadata-2.0.xsd
diff --git a/frontends/php/vendor/php-saml/src/Saml2/schemas/saml-schema-protocol-2.0.xsd b/ui/vendor/php-saml/src/Saml2/schemas/saml-schema-protocol-2.0.xsd
index 7fa6f489d68..7fa6f489d68 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/schemas/saml-schema-protocol-2.0.xsd
+++ b/ui/vendor/php-saml/src/Saml2/schemas/saml-schema-protocol-2.0.xsd
diff --git a/frontends/php/vendor/php-saml/src/Saml2/schemas/sstc-metadata-attr.xsd b/ui/vendor/php-saml/src/Saml2/schemas/sstc-metadata-attr.xsd
index f23e462a5b1..f23e462a5b1 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/schemas/sstc-metadata-attr.xsd
+++ b/ui/vendor/php-saml/src/Saml2/schemas/sstc-metadata-attr.xsd
diff --git a/frontends/php/vendor/php-saml/src/Saml2/schemas/sstc-saml-attribute-ext.xsd b/ui/vendor/php-saml/src/Saml2/schemas/sstc-saml-attribute-ext.xsd
index ad309c14b2c..ad309c14b2c 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/schemas/sstc-saml-attribute-ext.xsd
+++ b/ui/vendor/php-saml/src/Saml2/schemas/sstc-saml-attribute-ext.xsd
diff --git a/frontends/php/vendor/php-saml/src/Saml2/schemas/sstc-saml-metadata-algsupport-v1.0.xsd b/ui/vendor/php-saml/src/Saml2/schemas/sstc-saml-metadata-algsupport-v1.0.xsd
index 3236ffcdce2..3236ffcdce2 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/schemas/sstc-saml-metadata-algsupport-v1.0.xsd
+++ b/ui/vendor/php-saml/src/Saml2/schemas/sstc-saml-metadata-algsupport-v1.0.xsd
diff --git a/frontends/php/vendor/php-saml/src/Saml2/schemas/sstc-saml-metadata-ui-v1.0.xsd b/ui/vendor/php-saml/src/Saml2/schemas/sstc-saml-metadata-ui-v1.0.xsd
index a9f718e2bbd..a9f718e2bbd 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/schemas/sstc-saml-metadata-ui-v1.0.xsd
+++ b/ui/vendor/php-saml/src/Saml2/schemas/sstc-saml-metadata-ui-v1.0.xsd
diff --git a/frontends/php/vendor/php-saml/src/Saml2/schemas/xenc-schema.xsd b/ui/vendor/php-saml/src/Saml2/schemas/xenc-schema.xsd
index d6d79103cea..d6d79103cea 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/schemas/xenc-schema.xsd
+++ b/ui/vendor/php-saml/src/Saml2/schemas/xenc-schema.xsd
diff --git a/frontends/php/vendor/php-saml/src/Saml2/schemas/xml.xsd b/ui/vendor/php-saml/src/Saml2/schemas/xml.xsd
index aea7d0db0a4..aea7d0db0a4 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/schemas/xml.xsd
+++ b/ui/vendor/php-saml/src/Saml2/schemas/xml.xsd
diff --git a/frontends/php/vendor/php-saml/src/Saml2/schemas/xmldsig-core-schema.xsd b/ui/vendor/php-saml/src/Saml2/schemas/xmldsig-core-schema.xsd
index 6f5acc75af7..6f5acc75af7 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/schemas/xmldsig-core-schema.xsd
+++ b/ui/vendor/php-saml/src/Saml2/schemas/xmldsig-core-schema.xsd
diff --git a/frontends/php/vendor/php-saml/src/Saml2/version.json b/ui/vendor/php-saml/src/Saml2/version.json
index 0fdfc333e3e..0fdfc333e3e 100644
--- a/frontends/php/vendor/php-saml/src/Saml2/version.json
+++ b/ui/vendor/php-saml/src/Saml2/version.json
diff --git a/frontends/php/vendor/xmlseclibs/CHANGELOG.txt b/ui/vendor/xmlseclibs/CHANGELOG.txt
index 07b30595ee6..07b30595ee6 100644
--- a/frontends/php/vendor/xmlseclibs/CHANGELOG.txt
+++ b/ui/vendor/xmlseclibs/CHANGELOG.txt
diff --git a/frontends/php/vendor/xmlseclibs/LICENSE b/ui/vendor/xmlseclibs/LICENSE
index 4fe5e5ffbdc..4fe5e5ffbdc 100644
--- a/frontends/php/vendor/xmlseclibs/LICENSE
+++ b/ui/vendor/xmlseclibs/LICENSE
diff --git a/frontends/php/vendor/xmlseclibs/README.md b/ui/vendor/xmlseclibs/README.md
index 1a83735ba5f..1a83735ba5f 100644
--- a/frontends/php/vendor/xmlseclibs/README.md
+++ b/ui/vendor/xmlseclibs/README.md
diff --git a/frontends/php/vendor/xmlseclibs/composer.json b/ui/vendor/xmlseclibs/composer.json
index 22ce7a3e1f9..22ce7a3e1f9 100644
--- a/frontends/php/vendor/xmlseclibs/composer.json
+++ b/ui/vendor/xmlseclibs/composer.json
diff --git a/frontends/php/vendor/xmlseclibs/src/Utils/XPath.php b/ui/vendor/xmlseclibs/src/Utils/XPath.php
index 8cdc48e1576..8cdc48e1576 100644
--- a/frontends/php/vendor/xmlseclibs/src/Utils/XPath.php
+++ b/ui/vendor/xmlseclibs/src/Utils/XPath.php
diff --git a/frontends/php/vendor/xmlseclibs/src/XMLSecEnc.php b/ui/vendor/xmlseclibs/src/XMLSecEnc.php
index ee8299e6301..ee8299e6301 100644
--- a/frontends/php/vendor/xmlseclibs/src/XMLSecEnc.php
+++ b/ui/vendor/xmlseclibs/src/XMLSecEnc.php
diff --git a/frontends/php/vendor/xmlseclibs/src/XMLSecurityDSig.php b/ui/vendor/xmlseclibs/src/XMLSecurityDSig.php
index d032b2647ac..d032b2647ac 100644
--- a/frontends/php/vendor/xmlseclibs/src/XMLSecurityDSig.php
+++ b/ui/vendor/xmlseclibs/src/XMLSecurityDSig.php
diff --git a/frontends/php/vendor/xmlseclibs/src/XMLSecurityKey.php b/ui/vendor/xmlseclibs/src/XMLSecurityKey.php
index 6c01f0cc7a7..6c01f0cc7a7 100644
--- a/frontends/php/vendor/xmlseclibs/src/XMLSecurityKey.php
+++ b/ui/vendor/xmlseclibs/src/XMLSecurityKey.php
diff --git a/frontends/php/vendor/xmlseclibs/xmlseclibs.php b/ui/vendor/xmlseclibs/xmlseclibs.php
index 3bc25eb9b2f..3bc25eb9b2f 100644
--- a/frontends/php/vendor/xmlseclibs/xmlseclibs.php
+++ b/ui/vendor/xmlseclibs/xmlseclibs.php
diff --git a/frontends/php/zabbix.php b/ui/zabbix.php
index 77dd91adae7..77dd91adae7 100644
--- a/frontends/php/zabbix.php
+++ b/ui/zabbix.php