Move op/deop/etc back to an actual command, its too hard to use cs_log with it as rewrites. Allow cs_log to work with either command names or service names.

2 files changed, 4 insertions, 2 deletions

diff --git a/include/logger.h b/include/logger.h
index b97839732..b24d7bbd6 100644
--- a/include/logger.h
+++ b/include/logger.h
@@ -55,14 +55,14 @@ class CoreExport Log
  public:
  	/* Bot that should log this message */
 	const BotInfo *bi;
-	/* For commands, the user executing the command */
-	Anope::string nick;
 	/* For commands, the user executing the command, but might not always exist */
 	const User *u;
 	/* For commands, the account executing teh command, but will not always exist */
 	const NickCore *nc;
 	/* For commands, the command being executed */
 	Command *c;
+	/* For commands, the command source */
+	CommandSource *source;
 	/* Used for LOG_CHANNEL */
 	Channel *chan;
 	/* For commands, the channel the command was executed on, will not always exist */
diff --git a/include/modules/cs_log.h b/include/modules/cs_log.h
index 555a44e50..de3a75aa8 100644
--- a/include/modules/cs_log.h
+++ b/include/modules/cs_log.h
@@ -22,6 +22,7 @@ struct LogSetting
 	Anope::string creator;
 	time_t created;
 
+	virtual ~LogSetting() { }
  protected:
 	LogSetting() { }
 };
@@ -36,6 +37,7 @@ struct LogSettings : Serialize::Checker<std::vector<LogSetting *> >
 	}
 
  public:
+ 	virtual ~LogSettings() { }
 	virtual LogSetting *Create() = 0;
 };