--- smsdaemon/plugins/ShellExecPlugin.cpp 2008/06/19 14:47:52 107 +++ smsdaemon/plugins/ShellExecPlugin.cpp 2008/12/08 21:49:49 158 @@ -1,8 +1,8 @@ #include "ShellExecPlugin.h" -#include "IGsmModem.h" +#include "ISmsTransceiver.h" #include "Sms.h" -#include "util.h" +#include "Util.h" ShellExecPlugin::ShellExecPlugin(std::string pluginCommand, std::string exeCommand, bool allowParameters, bool returnOutput) : Plugin(pluginCommand, std::string("ShellExec: ")+exeCommand ), @@ -12,13 +12,13 @@ { } -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, "&&"); @@ -48,5 +48,5 @@ message = "OK"; } - modem.SendSms(sms.sender, message, false ); + modem.SendSms(sms.GetSender(), message, false ); }