From db9694836e212049ee9a2030c378bc4e0655339d Mon Sep 17 00:00:00 2001 From: psychon Date: Wed, 19 Dec 2007 20:53:03 +0000 Subject: [PATCH] Commit patches from x-x which split up long lines git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@903 726aef4b-f618-498e-8847-2d620e286838 --- Client.cpp | 181 ++++++++++++++++++++++++++++++++++-------- modules/partyline.cpp | 35 ++++++-- 2 files changed, 179 insertions(+), 37 deletions(-) diff --git a/Client.cpp b/Client.cpp index f8c95676..bcb59918 100644 --- a/Client.cpp +++ b/Client.cpp @@ -1469,47 +1469,166 @@ void CClient::HelpUser() { Table.AddColumn("Arguments"); Table.AddColumn("Description"); - Table.AddRow(); Table.SetCell("Command", "Version"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "Prints which version of znc this is"); - Table.AddRow(); Table.SetCell("Command", "ListDCCs"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "List all active DCCs"); - Table.AddRow(); Table.SetCell("Command", "ListMods"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "List all loaded modules"); - Table.AddRow(); Table.SetCell("Command", "ListChans"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "List all channels"); - Table.AddRow(); Table.SetCell("Command", "ListNicks"); Table.SetCell("Arguments", "<#chan>"); Table.SetCell("Description", "List all nicks on a channel"); + Table.AddRow(); + Table.SetCell("Command", "Version"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Prints which version of znc this is"); + + Table.AddRow(); + Table.SetCell("Command", "ListDCCs"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "List all active DCCs"); + + Table.AddRow(); + Table.SetCell("Command", "ListMods"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "List all loaded modules"); + + Table.AddRow(); + Table.SetCell("Command", "ListChans"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "List all channels"); + + Table.AddRow(); + Table.SetCell("Command", "ListNicks"); + Table.SetCell("Arguments", "<#chan>"); + Table.SetCell("Description", "List all nicks on a channel"); if (!m_pUser->IsAdmin()) { // If they are an admin we will add this command below with an argument - Table.AddRow(); Table.SetCell("Command", "ListClients");Table.SetCell("Arguments", ""); Table.SetCell("Description", "List all clients connected to your znc user"); + Table.AddRow(); + Table.SetCell("Command", "ListClients"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "List all clients connected to your znc user"); } - Table.AddRow(); Table.SetCell("Command", "ListServers");Table.SetCell("Arguments", ""); Table.SetCell("Description", "List all servers"); - Table.AddRow(); Table.SetCell("Command", "AddServer"); Table.SetCell("Arguments", " [[+]port] [pass]"); Table.SetCell("Description", "Add a server to the list"); - Table.AddRow(); Table.SetCell("Command", "RemServer"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "Remove a server from the list"); - Table.AddRow(); Table.SetCell("Command", "Topics"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "Show topics in all channels"); - Table.AddRow(); Table.SetCell("Command", "PlayBuffer"); Table.SetCell("Arguments", "<#chan>"); Table.SetCell("Description", "Play back the buffer for a given channel"); - Table.AddRow(); Table.SetCell("Command", "ClearBuffer");Table.SetCell("Arguments", "<#chan>"); Table.SetCell("Description", "Clear the buffer for a given channel"); - Table.AddRow(); Table.SetCell("Command", "ClearAllChannelBuffers");Table.SetCell("Arguments", ""); Table.SetCell("Description", "Clear the channel buffers"); - Table.AddRow(); Table.SetCell("Command", "SetBuffer"); Table.SetCell("Arguments", "<#chan> [linecount]"); Table.SetCell("Description", "Set the buffer count for a channel"); - Table.AddRow(); Table.SetCell("Command", "SetVHost"); Table.SetCell("Arguments", "");Table.SetCell("Description", "Set the VHost for this connection"); - Table.AddRow(); Table.SetCell("Command", "Jump"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "Jump to the next server in the list"); - Table.AddRow(); Table.SetCell("Command", "Disconnect"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "Disconnect from IRC"); - Table.AddRow(); Table.SetCell("Command", "Connect"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "Reconnect to IRC"); - Table.AddRow(); Table.SetCell("Command", "Send"); Table.SetCell("Arguments", " "); Table.SetCell("Description", "Send a shell file to a nick on IRC"); - Table.AddRow(); Table.SetCell("Command", "Get"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "Send a shell file to yourself"); + Table.AddRow(); + Table.SetCell("Command", "ListServers"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "List all servers"); + + Table.AddRow(); + Table.SetCell("Command", "AddServer"); + Table.SetCell("Arguments", " [[+]port] [pass]"); + Table.SetCell("Description", "Add a server to the list"); + + Table.AddRow(); + Table.SetCell("Command", "RemServer"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Remove a server from the list"); + + Table.AddRow(); + Table.SetCell("Command", "Topics"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Show topics in all channels"); + + Table.AddRow(); + Table.SetCell("Command", "PlayBuffer"); + Table.SetCell("Arguments", "<#chan>"); + Table.SetCell("Description", "Play back the buffer for a given channel"); + + Table.AddRow(); + Table.SetCell("Command", "ClearBuffer"); + Table.SetCell("Arguments", "<#chan>"); + Table.SetCell("Description", "Clear the buffer for a given channel"); + + Table.AddRow(); + Table.SetCell("Command", "ClearAllChannelBuffers"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Clear the channel buffers"); + + Table.AddRow(); + Table.SetCell("Command", "SetBuffer"); + Table.SetCell("Arguments", "<#chan> [linecount]"); + Table.SetCell("Description", "Set the buffer count for a channel"); + + Table.AddRow(); + Table.SetCell("Command", "SetVHost"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Set the VHost for this connection"); + + Table.AddRow(); + Table.SetCell("Command", "Jump"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Jump to the next server in the list"); + + Table.AddRow(); + Table.SetCell("Command", "Disconnect"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Disconnect from IRC"); + + Table.AddRow(); + Table.SetCell("Command", "Connect"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Reconnect to IRC"); + + Table.AddRow(); + Table.SetCell("Command", "Send"); + Table.SetCell("Arguments", " "); + Table.SetCell("Description", "Send a shell file to a nick on IRC"); + + Table.AddRow(); + Table.SetCell("Command", "Get"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Send a shell file to yourself"); if (m_pUser) { if (!m_pUser->DenyLoadMod()) { - Table.AddRow(); Table.SetCell("Command", "LoadMod"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "Load a module"); - Table.AddRow(); Table.SetCell("Command", "UnloadMod"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "Unload a module"); - Table.AddRow(); Table.SetCell("Command", "ReloadMod"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "Reload a module"); + Table.AddRow(); + Table.SetCell("Command", "LoadMod"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Load a module"); + + Table.AddRow(); + Table.SetCell("Command", "UnloadMod"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Unload a module"); + + Table.AddRow(); + Table.SetCell("Command", "ReloadMod"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Reload a module"); } if (m_pUser->IsAdmin()) { - Table.AddRow(); Table.SetCell("Command", "SaveConfig"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "Save the current settings to disk"); - Table.AddRow(); Table.SetCell("Command", "ListUsers"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "List all users/clients connected to znc"); - Table.AddRow(); Table.SetCell("Command", "ListClients");Table.SetCell("Arguments", "[User]"); Table.SetCell("Description", "List all clients connected to your znc user"); - Table.AddRow(); Table.SetCell("Command", "SetMOTD"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "Set the message of the day"); - Table.AddRow(); Table.SetCell("Command", "AddMOTD"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "Append to MOTD"); - Table.AddRow(); Table.SetCell("Command", "ClearMOTD"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "Clear the MOTD"); - Table.AddRow(); Table.SetCell("Command", "Broadcast"); Table.SetCell("Arguments", "[message]"); Table.SetCell("Description", "Broadcast a message to all users"); - Table.AddRow(); Table.SetCell("Command", "Shutdown"); Table.SetCell("Arguments", "[message]"); Table.SetCell("Description", "Shutdown znc completely"); + Table.AddRow(); + Table.SetCell("Command", "SaveConfig"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Save the current settings to disk"); + + Table.AddRow(); + Table.SetCell("Command", "ListUsers"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "List all users/clients connected to znc"); + + Table.AddRow(); + Table.SetCell("Command", "ListClients"); + Table.SetCell("Arguments", "[User]"); + Table.SetCell("Description", "List all clients connected to your znc user"); + + Table.AddRow(); + Table.SetCell("Command", "SetMOTD"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Set the message of the day"); + + Table.AddRow(); + Table.SetCell("Command", "AddMOTD"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Append to MOTD"); + + Table.AddRow(); + Table.SetCell("Command", "ClearMOTD"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Clear the MOTD"); + + Table.AddRow(); + Table.SetCell("Command", "Broadcast"); + Table.SetCell("Arguments", "[message]"); + Table.SetCell("Description", "Broadcast a message to all users"); + + Table.AddRow(); + Table.SetCell("Command", "Shutdown"); + Table.SetCell("Arguments", "[message]"); + Table.SetCell("Description", "Shutdown znc completely"); } } diff --git a/modules/partyline.cpp b/modules/partyline.cpp index fafba634..3def6c42 100644 --- a/modules/partyline.cpp +++ b/modules/partyline.cpp @@ -395,12 +395,35 @@ public: Table.AddColumn("Arguments"); Table.AddColumn("Description"); - Table.AddRow(); Table.SetCell("Command", "Help"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "List all partyline commands"); - Table.AddRow(); Table.SetCell("Command", "List"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "List all open channels"); - Table.AddRow(); Table.SetCell("Command", "AddFixChan"); Table.SetCell("Arguments", " "); Table.SetCell("Description", "Force a user into a channel which he cant part"); - Table.AddRow(); Table.SetCell("Command", "DelFixChan"); Table.SetCell("Arguments", " "); Table.SetCell("Description", "Remove a user from such a channel"); - Table.AddRow(); Table.SetCell("Command", "ListFixChans"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "Show which channels a user can not part"); - Table.AddRow(); Table.SetCell("Command", "ListFixUsers"); Table.SetCell("Arguments", ""); Table.SetCell("Description", "Show which users can not part this channel"); + Table.AddRow(); + Table.SetCell("Command", "Help"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "List all partyline commands"); + + Table.AddRow(); + Table.SetCell("Command", "List"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "List all open channels"); + + Table.AddRow(); + Table.SetCell("Command", "AddFixChan"); + Table.SetCell("Arguments", " "); + Table.SetCell("Description", "Force a user into a channel which he cant part"); + + Table.AddRow(); + Table.SetCell("Command", "DelFixChan"); + Table.SetCell("Arguments", " "); + Table.SetCell("Description", "Remove a user from such a channel"); + + Table.AddRow(); + Table.SetCell("Command", "ListFixChans"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Show which channels a user can not part"); + + Table.AddRow(); + Table.SetCell("Command", "ListFixUsers"); + Table.SetCell("Arguments", ""); + Table.SetCell("Description", "Show which users can not part this channel"); unsigned int uTableIdx = 0; CString sLine;