adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-08 01:43:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge some work by Jens-Andre Koch

Browse Source 
Only his changes to the core are presented here.
Unfortunately, the skin itself looks ugly on Opera,
and simply doesn't work on Firefox...

Merge branch 'master' into znc-ation

Conflicts:
	modules/data/lastseen/tmpl/lastseen_WebadminUser.tmpl
	modules/data/webadmin/tmpl/settings.tmpl
This commit is contained in:
Alexey Sokolov
2012-04-10 23:10:36 +07:00
parent 84d9377a4a 9b6ea8251c
commit 3e458a98e4
38 changed files with 272 additions and 1542 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/IRCSock.cpp
+8 -4
View File
@@ -330,10 +330,14 @@ void CIRCSock::ReadLine(const CString& sData) {
// The client doesn't support multi-prefix so we need to remove
// the other prefixes.
CString sNewLine = sServer + " 352 " + sLine.Token(2) + " " + \
sLine.Token(3) + " " + sIdent + " " + sHost + " " + \
sLine.Token(6) + " " + sNick[0] + \
sNick.substr(sNick.find_first_not_of(GetPerms())) + " " + \
CString sNewNick = sNick;
size_t pos = sNick.find_first_not_of(GetPerms());
if (pos >= 2 && pos != CString::npos) {
sNewNick = sNick[0] + sNick.substr(pos);
}
CString sNewLine = sServer + " 352 " + sLine.Token(2) + " " +
sLine.Token(3) + " " + sIdent + " " + sHost + " " +
sLine.Token(6) + " " + sNewNick + " " +
sLine.Token(8, true);
m_pNetwork->PutUser(sNewLine, pClient);
}
src/WebModules.cpp
+4 -3
View File
@@ -687,12 +687,13 @@ CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CS
break;
}
if (!pModule)
return PAGE_NOTFOUND;
m_Template["ModPath"] = pModule->GetWebPath();
m_Template["ModFilesPath"] = pModule->GetWebFilesPath();
if (!pModule) {
return PAGE_NOTFOUND;
} else if (pModule->WebRequiresLogin() && !ForceLogin()) {
if (pModule->WebRequiresLogin() && !ForceLogin()) {
return PAGE_PRINT;
} else if (pModule->WebRequiresAdmin() && !GetSession()->IsAdmin()) {
PrintErrorPage(403, "Forbidden", "You need to be an admin to access this module");