Fix generic mode support

4 files changed, 23 insertions, 23 deletions

diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp
index 6ff0211d4..0761f478c 100644
--- a/modules/protocol/inspircd11.cpp
+++ b/modules/protocol/inspircd11.cpp
@@ -401,7 +401,7 @@ struct IRCDMessageCapab : Message::Capab
 								ModeManager::AddChannelMode(new ChannelModeList("INVITEOVERRIDE", 'I'));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelModeList("END", modebuf[t]));
+								ModeManager::AddChannelMode(new ChannelModeList("", modebuf[t]));
 						}
 					}
 
@@ -414,7 +414,7 @@ struct IRCDMessageCapab : Message::Capab
 								ModeManager::AddChannelMode(new ChannelModeKey('k'));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelModeParam("END", modebuf[t]));
+								ModeManager::AddChannelMode(new ChannelModeParam("", modebuf[t]));
 						}
 					}
 
@@ -433,7 +433,7 @@ struct IRCDMessageCapab : Message::Capab
 								ModeManager::AddChannelMode(new ChannelModeParam("REDIRECT", 'L', true));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelModeParam("END", modebuf[t], true));
+								ModeManager::AddChannelMode(new ChannelModeParam("", modebuf[t], true));
 						}
 					}
 
@@ -503,7 +503,7 @@ struct IRCDMessageCapab : Message::Capab
 								ModeManager::AddChannelMode(new ChannelMode("NOINVITE", 'V'));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelMode("END", modebuf[t]));
+								ModeManager::AddChannelMode(new ChannelMode("", modebuf[t]));
 						}
 					}
 				}
@@ -533,7 +533,7 @@ struct IRCDMessageCapab : Message::Capab
 								ModeManager::AddChannelMode(new ChannelModeStatus("VOICE", 'v', '+', level--));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelModeStatus("END", modes[t], chars[t], level--));
+								ModeManager::AddChannelMode(new ChannelModeStatus("", modes[t], chars[t], level--));
 						}
 					}
 				}
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp
index d0253450a..a79edf291 100644
--- a/modules/protocol/inspircd12.cpp
+++ b/modules/protocol/inspircd12.cpp
@@ -498,7 +498,7 @@ struct IRCDMessageCapab : Message::Capab
 								ModeManager::AddChannelMode(new ChannelModeStatus("PROTECT" , 'a', '@'));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelModeList("END", modebuf[t]));
+								ModeManager::AddChannelMode(new ChannelModeList("", modebuf[t]));
 						}
 					}
 
@@ -511,7 +511,7 @@ struct IRCDMessageCapab : Message::Capab
 								ModeManager::AddChannelMode(new ChannelModeKey('k'));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelModeParam("END", modebuf[t]));
+								ModeManager::AddChannelMode(new ChannelModeParam("", modebuf[t]));
 						}
 					}
 
@@ -539,7 +539,7 @@ struct IRCDMessageCapab : Message::Capab
 								ModeManager::AddChannelMode(new ChannelModeParam("LIMIT", 'l', true));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelModeParam("END", modebuf[t], true));
+								ModeManager::AddChannelMode(new ChannelModeParam("", modebuf[t], true));
 						}
 					}
 
@@ -621,7 +621,7 @@ struct IRCDMessageCapab : Message::Capab
 								ModeManager::AddChannelMode(new ChannelMode("SSL", 'z'));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelMode("END", modebuf[t]));
+								ModeManager::AddChannelMode(new ChannelMode("", modebuf[t]));
 						}
 					}
 				}
@@ -692,7 +692,7 @@ struct IRCDMessageCapab : Message::Capab
 									ModeManager::AddUserMode(new UserMode("DEAF", 'd'));
 									continue;
 								default:
-									ModeManager::AddUserMode(new UserMode("END", modebuf[t]));
+									ModeManager::AddUserMode(new UserMode("", modebuf[t]));
 							}
 						}
 					}
@@ -723,7 +723,7 @@ struct IRCDMessageCapab : Message::Capab
 								ModeManager::AddChannelMode(new ChannelModeStatus("VOICE", 'v', chars[t], level--));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelModeStatus("END", modes[t], chars[t], level--));
+								ModeManager::AddChannelMode(new ChannelModeStatus("", modes[t], chars[t], level--));
 						}
 					}
 				}
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index 64c5f8f2e..2a21b9643 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -286,7 +286,7 @@ struct IRCDMessageCapab : Message::Capab
 					cm = new ChannelModeStatus("VOICE", modechar.length() > 1 ? modechar[1] : modechar[0], modechar.length() > 1 ? modechar[0] : 0);
 				/* Unknown status mode, (customprefix) - add it */
 				else if (modechar.length() == 2)
-					cm = new ChannelModeStatus("END", modechar[1], modechar[0]);
+					cm = new ChannelModeStatus("", modechar[1], modechar[0]);
 				/* else don't do anything here, we will get it in CAPAB CAPABILITIES */
 
 				if (cm)
@@ -403,7 +403,7 @@ struct IRCDMessageCapab : Message::Capab
 					{
 						if (ModeManager::FindChannelModeByChar(modebuf[t]))
 							continue;
-						ModeManager::AddChannelMode(new ChannelModeList("END", modebuf[t]));
+						ModeManager::AddChannelMode(new ChannelModeList("", modebuf[t]));
 					}
 
 					sep.GetToken(modebuf);
@@ -411,7 +411,7 @@ struct IRCDMessageCapab : Message::Capab
 					{
 						if (ModeManager::FindChannelModeByChar(modebuf[t]))
 							continue;
-						ModeManager::AddChannelMode(new ChannelModeParam("END", modebuf[t]));
+						ModeManager::AddChannelMode(new ChannelModeParam("", modebuf[t]));
 					}
 
 					sep.GetToken(modebuf);
@@ -419,7 +419,7 @@ struct IRCDMessageCapab : Message::Capab
 					{
 						if (ModeManager::FindChannelModeByChar(modebuf[t]))
 							continue;
-						ModeManager::AddChannelMode(new ChannelModeParam("END", true));
+						ModeManager::AddChannelMode(new ChannelModeParam("", modebuf[t], true));
 					}
 
 					sep.GetToken(modebuf);
@@ -427,7 +427,7 @@ struct IRCDMessageCapab : Message::Capab
 					{
 						if (ModeManager::FindChannelModeByChar(modebuf[t]))
 							continue;
-						ModeManager::AddChannelMode(new ChannelMode("END", modebuf[t]));
+						ModeManager::AddChannelMode(new ChannelMode("", modebuf[t]));
 					}
 				}
 				else if (capab.find("USERMODES") != Anope::string::npos)
@@ -441,11 +441,11 @@ struct IRCDMessageCapab : Message::Capab
 
 					if (sep.GetToken(modebuf))
 						for (size_t t = 0, end = modebuf.length(); t < end; ++t)
-							ModeManager::AddUserMode(new UserModeParam("END", modebuf[t]));
+							ModeManager::AddUserMode(new UserModeParam("", modebuf[t]));
 
 					if (sep.GetToken(modebuf))
 						for (size_t t = 0, end = modebuf.length(); t < end; ++t)
-							ModeManager::AddUserMode(new UserMode("END", modebuf[t]));
+							ModeManager::AddUserMode(new UserMode("", modebuf[t]));
 				}
 				else if (capab.find("MAXMODES=") != Anope::string::npos)
 				{
diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp
index 4bfc8e3fb..984277c14 100644
--- a/modules/protocol/unreal.cpp
+++ b/modules/protocol/unreal.cpp
@@ -538,7 +538,7 @@ struct IRCDMessageCapab : Message::Capab
 							ModeManager::AddChannelMode(new UnrealExtBan("INVITEOVERRIDE", 'I'));
 							continue;
 						default:
-							ModeManager::AddChannelMode(new ChannelModeList("END", modebuf[t]));
+							ModeManager::AddChannelMode(new ChannelModeList("", modebuf[t]));
 					}
 				}
 
@@ -557,7 +557,7 @@ struct IRCDMessageCapab : Message::Capab
 							ModeManager::AddChannelMode(new ChannelModeParam("REDIRECT", 'L'));
 							continue;
 						default:
-							ModeManager::AddChannelMode(new ChannelModeParam("END", modebuf[t]));
+							ModeManager::AddChannelMode(new ChannelModeParam("", modebuf[t]));
 					}
 				}
 
@@ -573,7 +573,7 @@ struct IRCDMessageCapab : Message::Capab
 							ModeManager::AddChannelMode(new ChannelModeParam("JOINFLOOD", 'j', true));
 							continue;
 						default:
-							ModeManager::AddChannelMode(new ChannelModeParam("END", modebuf[t], true));
+							ModeManager::AddChannelMode(new ChannelModeParam("", modebuf[t], true));
 					}
 				}
 
@@ -649,10 +649,10 @@ struct IRCDMessageCapab : Message::Capab
 							ModeManager::AddChannelMode(new ChannelMode("FILTER", 'G'));
 							continue;
 						case 'Z':
-							ModeManager::AddChannelMode(new ChannelModeUnrealSSL("END", 'Z'));
+							ModeManager::AddChannelMode(new ChannelModeUnrealSSL("", 'Z'));
 							continue;
 						default:
-							ModeManager::AddChannelMode(new ChannelMode("END", modebuf[t]));
+							ModeManager::AddChannelMode(new ChannelMode("", modebuf[t]));
 					}
 				}
 			}