Fix a bug in AMI message parsing

Ivan Poddubny · Ivan Poddubny · commit ddbbee68db96 · 2013-11-21T19:04:42.000+04:00
Correctly handle messages containing
 * "A:B" (without a space after semicolon)
 * "A:" (like VarSet, where Value is empty)
diff --git a/phpagi-asmanager.php b/phpagi-asmanager.php
@@ -195,9 +195,12 @@ function read_one_msg($allow_timeout = false)
       }
 
       foreach ($msgarr as $num=>$str) {
-        $kv = explode(': ', $str);
-        $key = $kv[0];
-        $val = $kv[1];
+        $kv = explode(':', $str, 2);
+        if (!isset($kv[1])) {
+          $kv[1] = "";
+        }
+        $key = trim($kv[0]);
+        $val = trim($kv[1]);
         $parameters[$key] = $val;
       }
 

Original file line number	Diff line number	Diff line change
`@@ -195,9 +195,12 @@ function read_one_msg($allow_timeout = false)`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`foreach ($msgarr as $num=>$str) {`
`198`		`- $kv = explode(': ', $str);`
`199`		`- $key = $kv[0];`
`200`		`- $val = $kv[1];`
	`198`	`+ $kv = explode(':', $str, 2);`
	`199`	`+ if (!isset($kv[1])) {`
	`200`	`+ $kv[1] = "";`
	`201`	`+ }`
	`202`	`+ $key = trim($kv[0]);`
	`203`	`+ $val = trim($kv[1]);`
`201`	`204`	`$parameters[$key] = $val;`
`202`	`205`	`}`
`203`	`206`