Bug #1354 - Allow mode chars to be used for channel prefixs in services.conf

data/botserv.example.conf

@@ -44,6 +44,8 @@ service
 	 * An optional comma separated list of channels this service should join. Outside
 	 * of log channels this is not very useful, as the service will just idle in the
 	 * specified channels, and will not accept any types of commands.
+	 *
+	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
 	 */
 	#channels = "@#services,#mychan"
 }

data/chanserv.example.conf

@@ -44,6 +44,8 @@ service
 	 * An optional comma separated list of channels this service should join. Outside
 	 * of log channels this is not very useful, as the service will just idle in the
 	 * specified channels, and will not accept any types of commands.
+	 *
+	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
 	 */
 	#channels = "@#services,#mychan"
 }

data/global.example.conf

@@ -44,6 +44,8 @@ service
 	 * An optional comma separated list of channels this service should join. Outside
 	 * of log channels this is not very useful, as the service will just idle in the
 	 * specified channels, and will not accept any types of commands.
+	 *
+	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
 	 */
 	#channels = "@#services,#mychan"
 }

data/hostserv.example.conf

@@ -44,6 +44,8 @@ service
 	 * An optional comma separated list of channels this service should join. Outside
 	 * of log channels this is not very useful, as the service will just idle in the
 	 * specified channels, and will not accept any types of commands.
+	 *
+	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
 	 */
 	#channels = "@#services,#mychan"
 }

data/memoserv.example.conf

@@ -44,6 +44,8 @@ service
 	 * An optional comma separated list of channels this service should join. Outside
 	 * of log channels this is not very useful, as the service will just idle in the
 	 * specified channels, and will not accept any types of commands.
+	 *
+	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
 	 */
 	#channels = "@#services,#mychan"
 }

data/nickserv.example.conf

@@ -44,6 +44,8 @@ service
 	 * An optional comma separated list of channels this service should join. Outside
 	 * of log channels this is not very useful, as the service will just idle in the
 	 * specified channels, and will not accept any types of commands.
+	 *
+	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
 	 */
 	#channels = "@#services,#mychan"
 }

data/operserv.example.conf

@@ -44,6 +44,8 @@ service
 	 * An optional comma separated list of channels this service should join. Outside
 	 * of log channels this is not very useful, as the service will just idle in the
 	 * specified channels, and will not accept any types of commands.
+	 *
+	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
 	 */
 	#channels = "@#services,#mychan"
 }

src/config.cpp

@@ -972,7 +972,9 @@ static bool DoServices(ServerConfig *config, const Anope::string &, const Anope:
 		/* Set the new modes */
 		for (unsigned j = 0; j < want_modes.length(); ++j)
 		{
-			ChannelMode *cm = ModeManager::FindChannelModeByChar(ModeManager::GetStatusChar(want_modes[j]));
+			ChannelMode *cm = ModeManager::FindChannelModeByChar(want_modes[j]);
+			if (cm == NULL)
+				cm = ModeManager::FindChannelModeByChar(ModeManager::GetStatusChar(want_modes[j]));
 			if (cm && cm->Type == MODE_STATUS)
 				c->SetMode(bi, cm, bi->nick);
 		}

src/servers.cpp

@@ -70,7 +70,9 @@ Server::Server(Server *uplink, const Anope::string &name, unsigned hops, const A
 						Anope::string want_modes = bi->botchannels[i].substr(0, h);
 						for (unsigned j = 0; j < want_modes.length(); ++j)
 						{
-							ChannelMode *cm = ModeManager::FindChannelModeByChar(ModeManager::GetStatusChar(want_modes[j]));
+							ChannelMode *cm = ModeManager::FindChannelModeByChar(want_modes[j]);
+							if (cm == NULL)
+								cm = ModeManager::FindChannelModeByChar(ModeManager::GetStatusChar(want_modes[j]));
 							if (cm && cm->Type == MODE_STATUS)
 								c->SetModeInternal(cm, bi->nick);
 						}