Fixed Notification Settings test button

Author: gizmocuz

notifications/NotificationNma.cpp

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "NotificationNma.h"
 #include "../httpclient/HTTPClient.h"
+#include "../main/Logger.h"
 
 CNotificationNma::CNotificationNma() : CNotificationBase(std::string("nma"), OPTIONS_URL_SUBJECT | OPTIONS_URL_BODY | OPTIONS_URL_PARAMS)
 {
@@ -21,8 +22,11 @@ bool CNotificationNma::SendMessageImplementation(const std::string &Subject, con
 	sPostData << "apikey=" << _apikey << "&application=Domoticz&event=" << Subject << "&description=" << Text << "&priority=" << Priority;
 	std::vector<std::string> ExtraHeaders;
 	bRet = HTTPClient::POST("https://www.notifymyandroid.com/publicapi/notify",sPostData.str(),ExtraHeaders,sResult);
-	/* todo: parse result */
-	return bRet;
+
+	bool bSuccess = (sResult.find("success code=\"200\"") != std::string::npos);
+	if (!bSuccess)
+		_log.Log(LOG_ERROR, "NMA: %s", sResult.c_str());
+	return (bRet && bSuccess);	return bRet;
 }
 
 bool CNotificationNma::IsConfigured()

notifications/NotificationProwl.cpp

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "NotificationProwl.h"
 #include "../httpclient/HTTPClient.h"
+#include "../main/Logger.h"
 
 CNotificationProwl::CNotificationProwl() : CNotificationBase(std::string("prowl"), OPTIONS_URL_SUBJECT | OPTIONS_URL_BODY | OPTIONS_URL_PARAMS)
 {
@@ -21,8 +22,10 @@ bool CNotificationProwl::SendMessageImplementation(const std::string &Subject, c
 	sPostData << "apikey=" << _apikey << "&application=Domoticz&event=" << Subject << "&description=" << Text << "&priority=" << Priority;
 	std::vector<std::string> ExtraHeaders;
 	bRet = HTTPClient::POST("https://api.prowlapp.com/publicapi/add",sPostData.str(),ExtraHeaders,sResult);
-	/* todo: parse result */
-	return bRet;
+	bool bSuccess = (sResult.find("success code=\"200\"") != std::string::npos);
+	if (!bSuccess)
+		_log.Log(LOG_ERROR, "NMA: %s", sResult.c_str());
+	return (bRet && bSuccess);	return bRet;
 }
 
 bool CNotificationProwl::IsConfigured()

www/app/SetupController.js

@@ -57,23 +57,23 @@ define(['app'], function (app) {
 				extraparams = "HTTPField1=" + HTTPField1 + "&HTTPField2=" + HTTPField2 + "&HTTPField3=" + HTTPField3 + "&HTTPField4=" + HTTPField4 + "&HTTPTo=" + HTTPTo + "&HTTPURL=" + HTTPURL;
 				break;
 			case "prowl":
-				var ProwlAPI=encodeURIComponent($("#prowltable #apikey").val());
+				var ProwlAPI=encodeURIComponent($("#prowltable #ProwlAPI").val());
 				if (ProwlAPI=="") {
 					ShowNotify($.t('Please enter the API key!...'), 3500, true);
 					return;
 				}
 				extraparams = "ProwlAPI=" + ProwlAPI;
 				break;
 			case "nma":
-				var NMAAPI=encodeURIComponent($("#nmatable #apikey").val());
+				var NMAAPI=encodeURIComponent($("#nmatable #NMAAPI").val());
 				if (NMAAPI=="") {
 					ShowNotify($.t('Please enter the API key!...'), 3500, true);
 					return;
 				}
 				extraparams = "NMAAPI=" + NMAAPI;
 				break;
 			case "pushover":
-				var POAPI=encodeURIComponent($("#pushovertable #apikey").val());
+				var POAPI=encodeURIComponent($("#pushovertable #PushoverAPI").val());
 				if (POAPI=="") {
 					ShowNotify($.t('Please enter the API key!...'), 3500, true);
 					return;
@@ -86,7 +86,7 @@ define(['app'], function (app) {
 				extraparams = "POAPI=" + POAPI + "&POUSERID=" + POUSERID;
 				break;
 			case "pushalot":
-				var PushAlotAPI=encodeURIComponent($("#pushalottable #palapikey").val());
+				var PushAlotAPI=encodeURIComponent($("#pushalottable #PushALotAPI").val());
 				if (PushAlotAPI=="") {
 					ShowNotify($.t('Please enter the API key!...'), 3500, true);
 					return;

www/html5.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# ref 924
+# ref 925
 
 CACHE:
 # CSS