diff --git a/modules/admin.cpp b/modules/admin.cpp index 41ff92bb..71ac1181 100644 --- a/modules/admin.cpp +++ b/modules/admin.cpp @@ -16,13 +16,12 @@ public: CAdminSock(CAdminMod* pModule, const CString& sHostname, unsigned short uPort, int iTimeout = 60); virtual ~CAdminSock(); - bool OnPageRequest(const CString& sURI, CString& sPageRet); - + virtual bool OnPageRequest(const CString& sURI, CString& sPageRet); virtual bool OnLogin(const CString& sUser, const CString& sPass); CString Header(const CString& sTitle) { return "\r\n" + sTitle + "\r\n" - "\r\n" + "\r\n" "

" + sTitle + "

\r\n"; } @@ -254,7 +253,7 @@ bool CAdminSock::UserPage(CString& sPageRet, CUser* pUser) { sPageRet += "
\r\n" "\r\n" - "
Authentication\r\n" + "
Authentication
\r\n" "
Username:
\r\n"; if (pUser) { @@ -267,9 +266,9 @@ bool CAdminSock::UserPage(CString& sPageRet, CUser* pUser) { sPageRet += "Password:

\r\n" "Confirm Password:
\r\n" "
Allowed IPs:
\r\n" - "

\r\n" + "


\r\n" - "
IRC Information\r\n" + "
IRC Information
\r\n" "
Nick:
\r\n" "
\r\n" "
AltNick:
\r\n" @@ -288,9 +287,9 @@ bool CAdminSock::UserPage(CString& sPageRet, CUser* pUser) { "

\r\n" "
Servers:
\r\n" "
\r\n" - "

\r\n" + "


\r\n" - "
Modules\r\n"; + "
Modules
\r\n"; set ssUserMods; m_pModule->GetZNC()->GetModules().GetAvailableMods(ssUserMods, m_pModule->GetZNC()); @@ -302,15 +301,15 @@ bool CAdminSock::UserPage(CString& sPageRet, CUser* pUser) { " (" + Info.GetDescription().Escape_n(CString::EHTML) + ")
"; } - sPageRet += "

\r\n" - "
Channels\r\n" + sPageRet += "


\r\n" + "
Channels
\r\n" "Default Modes:
\r\n" "

\r\n" "
Channels:
\r\n" "
\r\n" - "

\r\n" + "


\r\n" - "
ZNC Behavior\r\n" + "
ZNC Behavior
\r\n" "Playback Buffer Size:
\r\n" "

\r\n" "Options:
\r\n" @@ -321,8 +320,9 @@ bool CAdminSock::UserPage(CString& sPageRet, CUser* pUser) { "  \r\n" "  \r\n" "

" - "CTCP Replies:
\r\n" - "

\r\n" + "
CTCP Replies:
" + "
\r\n" + "


\r\n" "\r\n" "
\r\n"; @@ -331,19 +331,19 @@ bool CAdminSock::UserPage(CString& sPageRet, CUser* pUser) { return true; } - // Add User Submission if (!pUser) { + // Add User Submission if (AddNewUser(sPageRet)) { return true; } - - Redirect("/listusers"); - return false; + } else { + // Edit User Submission + GetErrorPage(sPageRet, "Sorry... the editing of users has not been implemented yet."); + return true; } - // Edit User Submission - GetErrorPage(sPageRet, "Sorry... the editing of users has not been implemented yet."); - return true; + Redirect("/listusers"); + return false; } bool CAdminSock::AddNewUser(CString& sPageRet) {