--- smsdaemon/plugins/ShellExecPlugin.cpp	2008/06/16 10:21:02	90
+++ smsdaemon/plugins/ShellExecPlugin.cpp	2008/12/19 22:29:25	205
@@ -1,23 +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)
-  : Plugin(pluginCommand, std::string("ShellExec: ")+exeCommand ),
-  _exeCommand(exeCommand),
-  _allowParameters(allowParameters)
+#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, "&&");
@@ -28,13 +41,24 @@
 		command += " ";
 		command	+= parameters;
 	}
-	int retval = Util::my_system( command.c_str()  );
+	std::string output;
+	std::string* out_p = 0;
+
+	if (_returnOutput)
+		out_p = &output;
+
+	int retval = Util::my_system( command.c_str(), out_p );
 
 	std::string message;
 	if (retval == -1)
 		message = "Error";
 	else
-		message = "OK";
-	
-	modem.SendSms(sms.sender, message, false );
+	{
+		if (_returnOutput)
+			message = output;
+		else
+			message = "OK";
+	}
+
+	modem.SendSms(sms.GetSender(), message, false );
 }