--- smsdaemon/plugins/SpamPlugin.cpp	2008/06/09 20:56:03	28
+++ smsdaemon/plugins/oldSpamPlugin.cpp	2010/04/27 21:06:53	678
@@ -1,38 +1,40 @@
 #include "SpamPlugin.h"
-#include "GsmModem.h"
+#include "ISmsTransceiver.h"
+#include "Sms.h"
 
-#include "util.h"
-#include "common.h"
+#include "Util.h"
+#include "Logger.h"
 #include <sstream>
+#include <stdlib.h>
 
 
 using namespace std;
 
 
 SpamPlugin::SpamPlugin()
-: Plugin("spam", "Sends a number of messages to a given phone nr")
+		: Plugin("spam", "Sends a number of messages to a given phone nr")
 {
 }
 
 const string USAGE = "Usage: spam <recipient> <nr> message";
 
-void SpamPlugin::Execute(GsmModem& modem, SMS& sms)
+void SpamPlugin::Execute(ISmsTransceiver& modem, SMS& sms)
 {
-	string cmd = GetSmsData(sms);
+	string cmd = sms.ExtractParameters();
 
 
 	if (cmd == "")
 	{
-		modem.SendSms(sms.sender, USAGE);
+		modem.SendSms(sms.GetSender(), USAGE, false);
 		return;
 	}
-	
+
 	vector<string> parts = Util::str_split(cmd," ");
 
 
 	if (parts.size() < 2 )
 	{
-		modem.SendSms(sms.sender, USAGE);
+		modem.SendSms(sms.GetSender(), USAGE, false);
 		return;
 	}
 
@@ -40,10 +42,12 @@
 	unsigned int count = atoi(parts[1].c_str());
 	if (count > 25)
 		count = 25;
-	
+
 	ostringstream os;
 	os << "Spamming " << nr << " " << count << " times.";
-	Common::instance()->logMessage(os.str());
+	modem.SendSms(sms.GetSender(), os.str(), false);
+
+	Logger::logMessage(os.str());
 
 	string message;
 	for (unsigned i=2; i<parts.size(); ++i)
@@ -55,7 +59,7 @@
 
 	for (unsigned i=0; i<count; ++i)
 	{
-		modem.SendSms(nr,message);
+		modem.SendSms(nr,message, false);
 	}
 }