From 9257cb2cfe654295ae23950e3bc57900c154ea73 Mon Sep 17 00:00:00 2001
From: CJHarms <CJHarms@users.noreply.github.com>
Date: Fri, 16 Feb 2018 22:07:45 +0100
Subject: [PATCH] Convert alarmHeaders to OrderedDict

Used OrderedDict for the alarmHeaders to make sure the Dictionary Order is preserved to serve a correctly formated and ordered JSON when using Perl <3.6
---
 plugins/FFAgent/FFAgent.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/plugins/FFAgent/FFAgent.py b/plugins/FFAgent/FFAgent.py
index 561ca86..759ec19 100644
--- a/plugins/FFAgent/FFAgent.py
+++ b/plugins/FFAgent/FFAgent.py
@@ -18,6 +18,9 @@ from includes import globalVars  # Global variables
 #from includes.helper import timeHandler
 from includes.helper import configHandler
 
+# needed for Ordered Dictionaries to serve correctly ordered JSON
+from collections import OrderedDict
+
 ##
 #
 # onLoad (init) function of plugin
@@ -125,13 +128,13 @@ def run(typ,freq,data):
 				alarmData = json.dumps(alarmData)
 				logging.debug(alarmData)
 
-				alarmHeaders = {
-					"Content-Type": "application/json",
-					"webApiToken": webApiToken,
-					"accessToken": accessToken,
-					"selectiveCallCode": selectiveCallCode,
-					"hmac": hmac.new(webApiKey, webApiToken + selectiveCallCode + accessToken + alarmData, digestmod=hashlib.sha256).hexdigest()
-				}
+				alarmHeaders = OrderedDict([
+					("Content-Type", "application/json"),
+					("webApiToken", webApiToken),
+					("accessToken", accessToken),
+					("selectiveCallCode", selectiveCallCode),
+					("hmac", hmac.new(webApiKey, webApiToken + selectiveCallCode + accessToken + alarmData, digestmod=hashlib.sha256).hexdigest())
+				])
 				logging.debug(alarmHeaders)
 
 				if globalVars.config.get("FFAgent", "live") == "1":