diff options
| -rw-r--r-- | src/InspIRCd.layout | 26 | ||||
| -rw-r--r-- | src/modules/m_filter.cpp | 44 |
2 files changed, 24 insertions, 46 deletions
diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout index 7b1852057..9ab7de4cb 100644 --- a/src/InspIRCd.layout +++ b/src/InspIRCd.layout @@ -1,5 +1,5 @@ [Editors] -Focused=2 +Focused=-1 Order=7,3,2,6,25,24,4,5,-1,1,0 [Editor_0] @@ -20,9 +20,9 @@ LeftChar=1 [Editor_2] Open=1 -Top=1 -CursorCol=23 -CursorRow=109 +Top=0 +CursorCol=5 +CursorRow=113 TopLine=101 LeftChar=1 @@ -141,16 +141,16 @@ LeftChar=1 [Editor_17] Open=1 Top=0 -CursorCol=23 -CursorRow=70 -TopLine=48 +CursorCol=18 +CursorRow=75 +TopLine=59 LeftChar=1 [Editor_18] Open=1 Top=0 CursorCol=5 -CursorRow=26 +CursorRow=22 TopLine=1 LeftChar=1 @@ -258,8 +258,8 @@ Open=0 Top=0 [Editor_34] Open=1 -Top=0 -CursorCol=29 -CursorRow=139 -TopLine=128 -LeftChar=1 +Top=1 +CursorCol=45 +CursorRow=97 +TopLine=50 +LeftChar=4 diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index 3bda79022..eaa07c7c3 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -56,14 +56,11 @@ class ModuleFilter : public Module { std::string target = ""; std::string reason = MyConf->ReadValue("keyword","reason",index); - std::string action = MyConf->ReadValue("keyword","action",index); - std::string operaction = MyConf->ReadValue("keyword","operaction",index); - std::string do_action = "none"; + std::string do_action = MyConf->ReadValue("keyword","action",index); + + if (do_action == "") + do_action = "none"; - if (action == "") - action = "none"; - if (operaction == "") - operaction = "none"; if (target_type == TYPE_USER) { userrec* t = (userrec*)dest; @@ -74,14 +71,6 @@ class ModuleFilter : public Module chanrec* t = (chanrec*)dest; target = std::string(t->name); } - if (strchr(user->modes,'o')) - { - do_action = operaction; - } - else - { - do_action = action; - } if (do_action == "block") { Srv->SendOpers(std::string("FILTER: ")+std::string(user->nick)+ @@ -94,7 +83,7 @@ class ModuleFilter : public Module Srv->Log(DEFAULT,std::string("FILTER: ")+std::string(user->nick)+ std::string(" had their message filtered, target was ")+ - target+": "+reason); + target+": "+reason+" Action: "+do_action); if (do_action == "kill") { @@ -116,14 +105,11 @@ class ModuleFilter : public Module { std::string target = ""; std::string reason = MyConf->ReadValue("keyword","reason",index); - std::string action = MyConf->ReadValue("keyword","action",index); - std::string operaction = MyConf->ReadValue("keyword","operaction",index); - std::string do_action = "none"; + std::string do_action = MyConf->ReadValue("keyword","action",index); - if (action == "") - action = "none"; - if (operaction == "") - operaction = "none"; + if (do_action == "") + do_action = "none"; + if (target_type == TYPE_USER) { userrec* t = (userrec*)dest; @@ -134,25 +120,17 @@ class ModuleFilter : public Module chanrec* t = (chanrec*)dest; target = std::string(t->name); } - if (strchr(user->modes,'o')) - { - do_action = operaction; - } - else - { - do_action = action; - } if (do_action == "block") { Srv->SendOpers(std::string("FILTER: ")+std::string(user->nick)+ std::string(" had their notice filtered, target was ")+ - target+": "+MyConf->ReadValue("keyword","reason",index)); + target+": "+reason); Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+ " :Your notice has been filtered and opers notified: "+reason); } Srv->Log(DEFAULT,std::string("FILTER: ")+std::string(user->nick)+ std::string(" had their notice filtered, target was ")+ - target+": "+MyConf->ReadValue("keyword","reason",index)); + target+": "+reason+" Action: "+do_action); if (do_action == "kill") { |