iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-07 22:04:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move dcc file transfers to their own module

Browse Source
This commit is contained in:
Kyle Fuller
2011-05-30 22:24:40 +01:00
parent 8f508cb4a5
commit 16047eaf81
9 changed files with 479 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ClientCommand.cpp
-103
View File
@@ -8,7 +8,6 @@
#include "Client.h"
#include "Chan.h"
#include "DCCSock.h"
#include "FileUtils.h"
#include "IRCSock.h"
#include "Listener.h"
@@ -469,94 +468,6 @@ void CClient::UserCommand(CString& sLine) {
}
PutStatus(Table);
} else if (sCommand.Equals("SEND")) {
CString sToNick = sLine.Token(1);
CString sFile = sLine.Token(2);
CString sAllowedPath = m_pUser->GetDLPath();
CString sAbsolutePath;
if ((sToNick.empty()) || (sFile.empty())) {
PutStatus("Usage: Send <nick> <file>");
return;
}
sAbsolutePath = CDir::CheckPathPrefix(sAllowedPath, sFile);
if (sAbsolutePath.empty()) {
PutStatus("Illegal path.");
return;
}
m_pUser->SendFile(sToNick, sFile);
} else if (sCommand.Equals("GET")) {
CString sFile = sLine.Token(1);
CString sAllowedPath = m_pUser->GetDLPath();
CString sAbsolutePath;
if (sFile.empty()) {
PutStatus("Usage: Get <file>");
return;
}
sAbsolutePath = CDir::CheckPathPrefix(sAllowedPath, sFile);
if (sAbsolutePath.empty()) {
PutStatus("Illegal path.");
return;
}
m_pUser->SendFile(GetNick(), sFile);
} else if (sCommand.Equals("LISTDCCS")) {
CSockManager& Manager = CZNC::Get().GetManager();
CTable Table;
Table.AddColumn("Type");
Table.AddColumn("State");
Table.AddColumn("Speed");
Table.AddColumn("Nick");
Table.AddColumn("IP");
Table.AddColumn("File");
for (unsigned int a = 0; a < Manager.size(); a++) {
CString sSockName = Manager[a]->GetSockName();
if (sSockName.TrimPrefix("DCC::")) {
if (sSockName.Equals("SEND", false, 4)) {
CDCCSock* pSock = (CDCCSock*) Manager[a];
Table.AddRow();
Table.SetCell("Type", "Sending");
Table.SetCell("State", CString::ToPercent(pSock->GetProgress()));
Table.SetCell("Speed", CString((int)(pSock->GetAvgWrite() / 1024.0)) + " KiB/s");
Table.SetCell("Nick", pSock->GetRemoteNick());
Table.SetCell("IP", pSock->GetRemoteIP());
Table.SetCell("File", pSock->GetFileName());
} else if (sSockName.Equals("GET", false, 3)) {
CDCCSock* pSock = (CDCCSock*) Manager[a];
Table.AddRow();
Table.SetCell("Type", "Getting");
Table.SetCell("State", CString::ToPercent(pSock->GetProgress()));
Table.SetCell("Speed", CString((int)(pSock->GetAvgRead() / 1024.0)) + " KiB/s");
Table.SetCell("Nick", pSock->GetRemoteNick());
Table.SetCell("IP", pSock->GetRemoteIP());
Table.SetCell("File", pSock->GetFileName());
} else if (sSockName.Equals("LISTEN", false, 6)) {
CDCCSock* pSock = (CDCCSock*) Manager[a];
Table.AddRow();
Table.SetCell("Type", "Sending");
Table.SetCell("State", "Waiting");
Table.SetCell("Nick", pSock->GetRemoteNick());
Table.SetCell("IP", pSock->GetRemoteIP());
Table.SetCell("File", pSock->GetFileName());
}
}
}
if (PutStatus(Table) == 0) {
PutStatus("You have no active DCCs.");
}
} else if (sCommand.Equals("LISTMODS") || sCommand.Equals("LISTMODULES")) {
if (m_pUser->IsAdmin()) {
CModules& GModules = CZNC::Get().GetModules();
@@ -1107,10 +1018,6 @@ void CClient::HelpUser() {
Table.SetCell("Command", "Version");
Table.SetCell("Description", "Print which version of ZNC this is");
Table.AddRow();
Table.SetCell("Command", "ListDCCs");
Table.SetCell("Description", "List all active DCCs");
Table.AddRow();
Table.SetCell("Command", "ListMods");
Table.SetCell("Description", "List all loaded modules");
@@ -1223,16 +1130,6 @@ void CClient::HelpUser() {
Table.SetCell("Command", "Connect");
Table.SetCell("Description", "Reconnect to IRC");
Table.AddRow();
Table.SetCell("Command", "Send");
Table.SetCell("Arguments", "<nick> <file>");
Table.SetCell("Description", "Send a shell file to a nick on IRC");
Table.AddRow();
Table.SetCell("Command", "Get");
Table.SetCell("Arguments", "<file>");
Table.SetCell("Description", "Send a shell file to yourself");
Table.AddRow();
Table.SetCell("Command", "Uptime");
Table.SetCell("Description", "Show for how long ZNC has been running");