Merge pull request amousset#5 from peppelauro/patch-1

amousset · web-flow · commit 476d3a541caf · 2018-03-24T01:04:18.000+01:00
Allow the recognition of parametric keys
diff --git a/lib/datasources/WeatherMapDataSource_zabbix.php b/lib/datasources/WeatherMapDataSource_zabbix.php
@@ -18,7 +18,7 @@ function Init(&$map)
 
 	function Recognise($targetstring)
 	{
-		if(preg_match("/^zabbix:([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+)$/", $targetstring, $matches))
+		if(preg_match("/^zabbix:([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\],]+):([-a-zA-Z0-9_\.\/\[\],]+)$/", $targetstring, $matches))
 		{
 			return true;
 		}
@@ -34,7 +34,7 @@ function ReadData($targetstring, &$map, &$item)
 		$data[OUT] = null;
 		$data_time = 0;
 
-		if(preg_match("/^zabbix:([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+)$/", $targetstring, $matches))
+		if(preg_match("/^zabbix:([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\],]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\],]+)$/", $targetstring, $matches))
 		{
 			$zabbix_uri = $map->get_hint('zabbix_uri');
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ function Init(&$map)`
`18`	`18`
`19`	`19`	`function Recognise($targetstring)`
`20`	`20`	`{`
`21`		`- if(preg_match("/^zabbix:([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+)$/", $targetstring, $matches))`
	`21`	`+ if(preg_match("/^zabbix:([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\],]+):([-a-zA-Z0-9_\.\/\[\],]+)$/", $targetstring, $matches))`
`22`	`22`	`{`
`23`	`23`	`return true;`
`24`	`24`	`}`
`@@ -34,7 +34,7 @@ function ReadData($targetstring, &$map, &$item)`
`34`	`34`	`$data[OUT] = null;`
`35`	`35`	`$data_time = 0;`
`36`	`36`
`37`		`- if(preg_match("/^zabbix:([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+)$/", $targetstring, $matches))`
	`37`	`+ if(preg_match("/^zabbix:([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\],]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\],]+)$/", $targetstring, $matches))`
`38`	`38`	`{`
`39`	`39`	`$zabbix_uri = $map->get_hint('zabbix_uri');`
`40`	`40`