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

Admin: Some minor cleanup

Browse Source 
Move some code from GetUser()'s callers into GetUser() itself.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1539 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2009-06-10 11:40:14 +00:00
parent f7a3c42969
commit 062989595c
1 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/admin.cpp
+15 -36
View File
@@ -108,7 +108,16 @@ class CAdminMod : public CModule {
CUser* GetUser(const CString& username) {
if (username.Equals("$me"))
return m_pUser;
return CZNC::Get().FindUser(username);
CUser *pUser = CZNC::Get().FindUser(username);
if (!pUser) {
PutModule("Error: User not found: " + username);
return NULL;
}
if (user != m_pUser && !m_pUser->IsAdmin()) {
PutModule("Error: You need to have admin rights to modify other users!");
return NULL;
}
return pUser;
}
void Get(const CString& sLine) {
@@ -124,14 +133,8 @@ class CAdminMod : public CModule {
}
CUser* user = GetUser(username);
if (!user) {
PutModule("Error: User not found: " + username);
if (!user)
return;
}
if (user != m_pUser && !m_pUser->IsAdmin()) {
PutModule("Error: You need to have admin rights to modify other users!");
return;
}
if (var == "nick")
PutModule("Nick = " + user->GetNick());
@@ -179,14 +182,8 @@ class CAdminMod : public CModule {
}
CUser* user = GetUser(username);
if (!user) {
PutModule("Error: User not found: " + username);
if (!user)
return;
}
if (user != m_pUser && !m_pUser->IsAdmin()) {
PutModule("Error: You need to have admin rights to modify other users!");
return;
}
if (var == "nick") {
user->SetNick(value);
@@ -274,14 +271,8 @@ class CAdminMod : public CModule {
}
CUser* user = GetUser(username);
if (!user) {
PutModule("Error: User not found: " + username);
if (!user)
return;
}
if (user != m_pUser && !m_pUser->IsAdmin()) {
PutModule("Error: You need to have admin rights to modify other users!");
return;
}
CChan* pChan = user->FindChan(chan);
if (!pChan) {
@@ -321,14 +312,8 @@ class CAdminMod : public CModule {
}
CUser* user = GetUser(username);
if (!user) {
PutModule("Error: User not found: " + username);
if (!user)
return;
}
if (user != m_pUser && !m_pUser->IsAdmin()) {
PutModule("Error: You need to have admin rights to modify other users!");
return;
}
CChan* pChan = user->FindChan(chan);
if (!pChan) {
@@ -522,14 +507,8 @@ class CAdminMod : public CModule {
}
CUser* user = GetUser(username);
if (!user) {
PutModule("Error: User not found: " + username);
if (!user)
return;
}
if (user != m_pUser && !m_pUser->IsAdmin()) {
PutModule("Error: You need to have admin rights to modify other users!");
return;
}
user->AddServer(server);
PutModule("Added IRC Server: " + server);