--- smsdaemon/plugins/ShellExecPlugin.cpp	2008/06/19 14:47:52	107
+++ smsdaemon/plugins/ShellExecPlugin.cpp	2008/12/19 22:29:25	205
@@ -1,24 +1,36 @@
 #include "ShellExecPlugin.h"
-#include "IGsmModem.h"
+#include "ISmsTransceiver.h"
 #include "Sms.h"
 
-#include "util.h"
+#include "Util.h"
+#include "ConfigFile.h"
 
-ShellExecPlugin::ShellExecPlugin(std::string pluginCommand, std::string exeCommand, bool allowParameters, bool returnOutput)
-  : Plugin(pluginCommand, std::string("ShellExec: ")+exeCommand ),
-  _exeCommand(exeCommand),
-  _allowParameters(allowParameters),
-  _returnOutput(returnOutput)
+#include <stdexcept>
+
+ShellExecPlugin::ShellExecPlugin(std::map<std::string,std::string> args)
+		: Plugin("", "")
 {
+	_command = args["trigger"];
+	_exeCommand = args["cmd"];
+	_description = std::string("ShellExec: ")+_exeCommand;
+	std::string allowParms = args["allowparms"];
+	std::string returnOutput = args["returnoutput"];
+
+	if (_command == "" || _exeCommand == "" || allowParms == "" || returnOutput == "")
+		throw std::runtime_error("Usage: plugin = shellexec trigger=<trigger>; cmd=<command>; allowparms=<0|1>; returnoutput=<0|1>");
+
+
+	_allowParameters = ( ConfigHelper::StringToInt(allowParms) == 1);
+	_returnOutput = ( ConfigHelper::StringToInt(returnOutput) == 1);
 }
 
-void ShellExecPlugin::Execute(IGsmModem& modem, SMS& sms)
+void ShellExecPlugin::Execute(ISmsTransceiver& modem, SMS& sms)
 {
 	std::string command = _exeCommand;
 
 	if (_allowParameters)
 	{
-		std::string parameters = GetSmsData(sms);
+		std::string parameters = sms.ExtractParameters();
 
 		parameters = Util::str_replace(parameters, "||");
 		parameters = Util::str_replace(parameters, "&&");
@@ -47,6 +59,6 @@
 		else
 			message = "OK";
 	}
-	
-	modem.SendSms(sms.sender, message, false );
+
+	modem.SendSms(sms.GetSender(), message, false );
 }