--- smsdaemon/PluginManager.cpp 2008/12/08 21:28:40 157 +++ smsdaemon/PluginManager.cpp 2008/12/19 07:03:34 203 @@ -1,4 +1,4 @@ - + #include "PluginManager.h" #include "Logger.h" @@ -10,13 +10,15 @@ #include "plugins/StatusPlugin.h" #include "plugins/ListPlugin.h" #include "plugins/HostStatusPlugin.h" +#include "plugins/WeatherPlugin.h" +#include "plugins/UrlTriggerPlugin.h" typedef std::map::iterator MapIterator; PluginManager::PluginManager() { } - + PluginManager::~PluginManager() { } @@ -26,12 +28,19 @@ { if (plugin != 0) { - std::string command = plugin->GetCommand(); - - if ( _plugins[ command ] == 0) - _plugins[ command ] = plugin; + if (plugin->IsHelper()) + { + _helper_plugins.push_back(plugin); + } else - Logger::logMessage( std::string("AddPlugin() -- already have a plugin called ") + command); + { + std::string command = plugin->GetCommand(); + + if ( _plugins[ command ] == 0) + _plugins[ command ] = plugin; + else + Logger::logMessage( std::string("AddPlugin() -- already have a plugin called ") + command); + } } else { @@ -45,7 +54,7 @@ static SpamPlugin spam; - static ShellExecPlugin wake("wake", "/home/torben/bin/wake", false, false); + static ShellExecPlugin wake("wake", "/usr/local/bin/wake", false, false); static ShellExecPlugin ping("ping", "nmap -sP 192.168.10.1-255 | grep appears | awk '{print $2}'", false,true); static TogPlugin tog; @@ -56,7 +65,11 @@ static HostStatusPlugin hoststatus; - for(MapIterator it = _plugins.begin(); it != _plugins.end(); ++it) + static WeatherPlugin weather; + + static UrlTriggerPlugin urltrigger("tou", "http://t-hoerup.dk/test.php"); + + for (MapIterator it = _plugins.begin(); it != _plugins.end(); ++it) { Plugin* pl = (*it).second; if (pl != 0)