summaryrefslogtreecommitdiff
path: root/modules/webcpanel
diff options
context:
space:
mode:
authorRobby <robby@chatbelgie.be>2017-01-17 05:03:25 +0100
committerRobby <robby@chatbelgie.be>2017-01-17 05:03:25 +0100
commit76ce8ece1a4803c98bfe9460f40bf8e0fbc409e6 (patch)
tree26e6da47f20de64ef76fe4afc459bbb7889bd417 /modules/webcpanel
parent464093d36e87f3df999145e42ed30fc0dfc55c52 (diff)
Cleanup some excess whitespaces and tabs, and fix a few typos along the way.
Diffstat (limited to 'modules/webcpanel')
-rw-r--r--modules/webcpanel/CMakeLists.txt1
-rw-r--r--modules/webcpanel/pages/chanserv/access.cpp1
-rw-r--r--modules/webcpanel/pages/chanserv/access.h1
-rw-r--r--modules/webcpanel/pages/chanserv/akick.cpp1
-rw-r--r--modules/webcpanel/pages/chanserv/akick.h1
-rw-r--r--modules/webcpanel/pages/chanserv/info.cpp1
-rw-r--r--modules/webcpanel/pages/chanserv/info.h1
-rw-r--r--modules/webcpanel/pages/chanserv/modes.cpp1
-rw-r--r--modules/webcpanel/pages/chanserv/modes.h1
-rw-r--r--modules/webcpanel/pages/chanserv/set.cpp1
-rw-r--r--modules/webcpanel/pages/chanserv/set.h1
-rw-r--r--modules/webcpanel/pages/chanserv/utils.cpp1
-rw-r--r--modules/webcpanel/pages/chanserv/utils.h1
-rw-r--r--modules/webcpanel/pages/confirm.cpp1
-rw-r--r--modules/webcpanel/pages/confirm.h1
-rw-r--r--modules/webcpanel/pages/hostserv/request.cpp4
-rw-r--r--modules/webcpanel/pages/index.cpp3
-rw-r--r--modules/webcpanel/pages/index.h1
-rw-r--r--modules/webcpanel/pages/logout.cpp1
-rw-r--r--modules/webcpanel/pages/logout.h1
-rw-r--r--modules/webcpanel/pages/memoserv/memos.cpp1
-rw-r--r--modules/webcpanel/pages/memoserv/memos.h1
-rw-r--r--modules/webcpanel/pages/nickserv/access.cpp1
-rw-r--r--modules/webcpanel/pages/nickserv/access.h1
-rw-r--r--modules/webcpanel/pages/nickserv/alist.cpp3
-rw-r--r--modules/webcpanel/pages/nickserv/alist.h1
-rw-r--r--modules/webcpanel/pages/nickserv/cert.cpp1
-rw-r--r--modules/webcpanel/pages/nickserv/cert.h1
-rw-r--r--modules/webcpanel/pages/nickserv/info.cpp3
-rw-r--r--modules/webcpanel/pages/nickserv/info.h1
-rw-r--r--modules/webcpanel/pages/operserv/akill.cpp1
-rw-r--r--modules/webcpanel/pages/operserv/akill.h1
-rw-r--r--modules/webcpanel/pages/register.cpp1
-rw-r--r--modules/webcpanel/pages/register.h1
-rw-r--r--modules/webcpanel/static_fileserver.cpp3
-rw-r--r--modules/webcpanel/static_fileserver.h1
-rw-r--r--modules/webcpanel/template_fileserver.cpp9
-rw-r--r--modules/webcpanel/template_fileserver.h1
-rw-r--r--modules/webcpanel/webcpanel.cpp2
39 files changed, 11 insertions, 48 deletions
diff --git a/modules/webcpanel/CMakeLists.txt b/modules/webcpanel/CMakeLists.txt
index 247973f61..ea5a03b35 100644
--- a/modules/webcpanel/CMakeLists.txt
+++ b/modules/webcpanel/CMakeLists.txt
@@ -3,4 +3,3 @@ build_subdir(${CMAKE_CURRENT_SOURCE_DIR})
install(DIRECTORY templates
DESTINATION "${DB_DIR}/modules/webcpanel"
)
-
diff --git a/modules/webcpanel/pages/chanserv/access.cpp b/modules/webcpanel/pages/chanserv/access.cpp
index 68235035b..38d1c4bd5 100644
--- a/modules/webcpanel/pages/chanserv/access.cpp
+++ b/modules/webcpanel/pages/chanserv/access.cpp
@@ -125,4 +125,3 @@ std::set<Anope::string> WebCPanel::ChanServ::Access::GetData()
v.insert("channel");
return v;
}
-
diff --git a/modules/webcpanel/pages/chanserv/access.h b/modules/webcpanel/pages/chanserv/access.h
index 76efc3609..61fe3904f 100644
--- a/modules/webcpanel/pages/chanserv/access.h
+++ b/modules/webcpanel/pages/chanserv/access.h
@@ -24,4 +24,3 @@ class Access : public WebPanelProtectedPage
}
}
-
diff --git a/modules/webcpanel/pages/chanserv/akick.cpp b/modules/webcpanel/pages/chanserv/akick.cpp
index a402fb014..4c9614fe7 100644
--- a/modules/webcpanel/pages/chanserv/akick.cpp
+++ b/modules/webcpanel/pages/chanserv/akick.cpp
@@ -91,4 +91,3 @@ std::set<Anope::string> WebCPanel::ChanServ::Akick::GetData()
v.insert("channel");
return v;
}
-
diff --git a/modules/webcpanel/pages/chanserv/akick.h b/modules/webcpanel/pages/chanserv/akick.h
index 1b3d0bc72..81391fc3e 100644
--- a/modules/webcpanel/pages/chanserv/akick.h
+++ b/modules/webcpanel/pages/chanserv/akick.h
@@ -24,4 +24,3 @@ class Akick : public WebPanelProtectedPage
}
}
-
diff --git a/modules/webcpanel/pages/chanserv/info.cpp b/modules/webcpanel/pages/chanserv/info.cpp
index 917836107..6143f8421 100644
--- a/modules/webcpanel/pages/chanserv/info.cpp
+++ b/modules/webcpanel/pages/chanserv/info.cpp
@@ -25,4 +25,3 @@ bool WebCPanel::ChanServ::Info::OnRequest(HTTPProvider *server, const Anope::str
page.Serve(server, page_name, client, message, reply, replacements);
return true;
}
-
diff --git a/modules/webcpanel/pages/chanserv/info.h b/modules/webcpanel/pages/chanserv/info.h
index 0e4888586..70523848d 100644
--- a/modules/webcpanel/pages/chanserv/info.h
+++ b/modules/webcpanel/pages/chanserv/info.h
@@ -22,4 +22,3 @@ class Info : public WebPanelProtectedPage
}
}
-
diff --git a/modules/webcpanel/pages/chanserv/modes.cpp b/modules/webcpanel/pages/chanserv/modes.cpp
index a3b8791e4..1d37d2135 100644
--- a/modules/webcpanel/pages/chanserv/modes.cpp
+++ b/modules/webcpanel/pages/chanserv/modes.cpp
@@ -109,4 +109,3 @@ std::set<Anope::string> WebCPanel::ChanServ::Modes::GetData()
v.insert("channel");
return v;
}
-
diff --git a/modules/webcpanel/pages/chanserv/modes.h b/modules/webcpanel/pages/chanserv/modes.h
index 66588632c..2f076ed3d 100644
--- a/modules/webcpanel/pages/chanserv/modes.h
+++ b/modules/webcpanel/pages/chanserv/modes.h
@@ -24,4 +24,3 @@ class Modes : public WebPanelProtectedPage
}
}
-
diff --git a/modules/webcpanel/pages/chanserv/set.cpp b/modules/webcpanel/pages/chanserv/set.cpp
index 7834c23c2..c0d4121fa 100644
--- a/modules/webcpanel/pages/chanserv/set.cpp
+++ b/modules/webcpanel/pages/chanserv/set.cpp
@@ -152,4 +152,3 @@ std::set<Anope::string> WebCPanel::ChanServ::Set::GetData()
v.insert("channel");
return v;
}
-
diff --git a/modules/webcpanel/pages/chanserv/set.h b/modules/webcpanel/pages/chanserv/set.h
index 60b84b94e..6c59ccbf9 100644
--- a/modules/webcpanel/pages/chanserv/set.h
+++ b/modules/webcpanel/pages/chanserv/set.h
@@ -24,4 +24,3 @@ class Set : public WebPanelProtectedPage
}
}
-
diff --git a/modules/webcpanel/pages/chanserv/utils.cpp b/modules/webcpanel/pages/chanserv/utils.cpp
index c5ad6daf4..dbb384a04 100644
--- a/modules/webcpanel/pages/chanserv/utils.cpp
+++ b/modules/webcpanel/pages/chanserv/utils.cpp
@@ -42,4 +42,3 @@ void BuildChanList(NickAlias *na, TemplateFileServer::Replacements &replacements
}
}
-
diff --git a/modules/webcpanel/pages/chanserv/utils.h b/modules/webcpanel/pages/chanserv/utils.h
index 928cb2709..e39b12ec9 100644
--- a/modules/webcpanel/pages/chanserv/utils.h
+++ b/modules/webcpanel/pages/chanserv/utils.h
@@ -16,4 +16,3 @@ extern void BuildChanList(NickAlias *, TemplateFileServer::Replacements &);
}
}
-
diff --git a/modules/webcpanel/pages/confirm.cpp b/modules/webcpanel/pages/confirm.cpp
index ccf0fc6d3..c976adfa0 100644
--- a/modules/webcpanel/pages/confirm.cpp
+++ b/modules/webcpanel/pages/confirm.cpp
@@ -29,4 +29,3 @@ bool WebCPanel::Confirm::OnRequest(HTTPProvider *server, const Anope::string &pa
page.Serve(server, page_name, client, message, reply, replacements);
return true;
}
-
diff --git a/modules/webcpanel/pages/confirm.h b/modules/webcpanel/pages/confirm.h
index 6994d1a67..ef1ce6998 100644
--- a/modules/webcpanel/pages/confirm.h
+++ b/modules/webcpanel/pages/confirm.h
@@ -19,4 +19,3 @@ class Confirm : public WebPanelPage
};
}
-
diff --git a/modules/webcpanel/pages/hostserv/request.cpp b/modules/webcpanel/pages/hostserv/request.cpp
index d66af9339..d26bb4323 100644
--- a/modules/webcpanel/pages/hostserv/request.cpp
+++ b/modules/webcpanel/pages/hostserv/request.cpp
@@ -7,11 +7,11 @@
#include "../../webcpanel.h"
-WebCPanel::HostServ::Request::Request(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage (cat, u)
+WebCPanel::HostServ::Request::Request(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage (cat, u)
{
}
-bool WebCPanel::HostServ::Request::OnRequest(HTTPProvider *server, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
+bool WebCPanel::HostServ::Request::OnRequest(HTTPProvider *server, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
{
if (message.post_data.count("req") > 0)
{
diff --git a/modules/webcpanel/pages/index.cpp b/modules/webcpanel/pages/index.cpp
index 1ef1e8942..8fdd11352 100644
--- a/modules/webcpanel/pages/index.cpp
+++ b/modules/webcpanel/pages/index.cpp
@@ -56,7 +56,7 @@ class WebpanelRequest : public IdentifyRequest
reply.cookies.push_back(c);
}
- {
+ {
HTTPReply::cookie c;
c.push_back(std::make_pair("id", id));
c.push_back(std::make_pair("Path", "/"));
@@ -102,4 +102,3 @@ bool WebCPanel::Index::OnRequest(HTTPProvider *server, const Anope::string &page
page.Serve(server, page_name, client, message, reply, replacements);
return true;
}
-
diff --git a/modules/webcpanel/pages/index.h b/modules/webcpanel/pages/index.h
index 153a41256..76e3d12a1 100644
--- a/modules/webcpanel/pages/index.h
+++ b/modules/webcpanel/pages/index.h
@@ -19,4 +19,3 @@ class Index : public WebPanelPage
};
}
-
diff --git a/modules/webcpanel/pages/logout.cpp b/modules/webcpanel/pages/logout.cpp
index 3c73bf2c8..1039252cc 100644
--- a/modules/webcpanel/pages/logout.cpp
+++ b/modules/webcpanel/pages/logout.cpp
@@ -20,4 +20,3 @@ bool WebCPanel::Logout::OnRequest(HTTPProvider *server, const Anope::string &pag
reply.headers["Location"] = Anope::string("http") + (server->IsSSL() ? "s" : "") + "://" + message.headers["Host"] + "/";
return true;
}
-
diff --git a/modules/webcpanel/pages/logout.h b/modules/webcpanel/pages/logout.h
index 42764cc00..96395302f 100644
--- a/modules/webcpanel/pages/logout.h
+++ b/modules/webcpanel/pages/logout.h
@@ -17,4 +17,3 @@ class Logout : public WebPanelProtectedPage
};
}
-
diff --git a/modules/webcpanel/pages/memoserv/memos.cpp b/modules/webcpanel/pages/memoserv/memos.cpp
index 648bdee6d..b833fc0a1 100644
--- a/modules/webcpanel/pages/memoserv/memos.cpp
+++ b/modules/webcpanel/pages/memoserv/memos.cpp
@@ -112,4 +112,3 @@ bool WebCPanel::MemoServ::Memos::OnRequest(HTTPProvider *server, const Anope::st
page.Serve(server, page_name, client, message, reply, replacements);
return true;
}
-
diff --git a/modules/webcpanel/pages/memoserv/memos.h b/modules/webcpanel/pages/memoserv/memos.h
index c0f7bb800..bf3700c4e 100644
--- a/modules/webcpanel/pages/memoserv/memos.h
+++ b/modules/webcpanel/pages/memoserv/memos.h
@@ -22,4 +22,3 @@ class Memos : public WebPanelProtectedPage
}
}
-
diff --git a/modules/webcpanel/pages/nickserv/access.cpp b/modules/webcpanel/pages/nickserv/access.cpp
index 791798eb3..cb272d3bd 100644
--- a/modules/webcpanel/pages/nickserv/access.cpp
+++ b/modules/webcpanel/pages/nickserv/access.cpp
@@ -37,4 +37,3 @@ bool WebCPanel::NickServ::Access::OnRequest(HTTPProvider *server, const Anope::s
page.Serve(server, page_name, client, message, reply, replacements);
return true;
}
-
diff --git a/modules/webcpanel/pages/nickserv/access.h b/modules/webcpanel/pages/nickserv/access.h
index 2aa4e6d8f..fb3968ea6 100644
--- a/modules/webcpanel/pages/nickserv/access.h
+++ b/modules/webcpanel/pages/nickserv/access.h
@@ -22,4 +22,3 @@ class Access : public WebPanelProtectedPage
}
}
-
diff --git a/modules/webcpanel/pages/nickserv/alist.cpp b/modules/webcpanel/pages/nickserv/alist.cpp
index 237cc4a86..7722ce1ae 100644
--- a/modules/webcpanel/pages/nickserv/alist.cpp
+++ b/modules/webcpanel/pages/nickserv/alist.cpp
@@ -41,7 +41,7 @@ bool WebCPanel::NickServ::Alist::OnRequest(HTTPProvider *server, const Anope::st
AccessGroup access = ci->AccessFor(na->nc);
if (access.empty())
continue;
-
+
++chan_count;
replacements["NUMBERS"] = stringify(chan_count);
@@ -55,4 +55,3 @@ bool WebCPanel::NickServ::Alist::OnRequest(HTTPProvider *server, const Anope::st
page.Serve(server, page_name, client, message, reply, replacements);
return true;
}
-
diff --git a/modules/webcpanel/pages/nickserv/alist.h b/modules/webcpanel/pages/nickserv/alist.h
index 33adec160..18f11272e 100644
--- a/modules/webcpanel/pages/nickserv/alist.h
+++ b/modules/webcpanel/pages/nickserv/alist.h
@@ -22,4 +22,3 @@ class Alist : public WebPanelProtectedPage
}
}
-
diff --git a/modules/webcpanel/pages/nickserv/cert.cpp b/modules/webcpanel/pages/nickserv/cert.cpp
index 856c1f5bb..f8195e0e1 100644
--- a/modules/webcpanel/pages/nickserv/cert.cpp
+++ b/modules/webcpanel/pages/nickserv/cert.cpp
@@ -40,4 +40,3 @@ bool WebCPanel::NickServ::Cert::OnRequest(HTTPProvider *server, const Anope::str
page.Serve(server, page_name, client, message, reply, replacements);
return true;
}
-
diff --git a/modules/webcpanel/pages/nickserv/cert.h b/modules/webcpanel/pages/nickserv/cert.h
index 49d1477c5..0979b5faf 100644
--- a/modules/webcpanel/pages/nickserv/cert.h
+++ b/modules/webcpanel/pages/nickserv/cert.h
@@ -22,4 +22,3 @@ class Cert : public WebPanelProtectedPage
}
}
-
diff --git a/modules/webcpanel/pages/nickserv/info.cpp b/modules/webcpanel/pages/nickserv/info.cpp
index 9fae771d9..441bfca66 100644
--- a/modules/webcpanel/pages/nickserv/info.cpp
+++ b/modules/webcpanel/pages/nickserv/info.cpp
@@ -110,9 +110,8 @@ bool WebCPanel::NickServ::Info::OnRequest(HTTPProvider *server, const Anope::str
replacements["KILL_QUICK"];
if (!na->nc->HasExt("KILLPROTECT") && !na->nc->HasExt("KILL_QUICK"))
replacements["KILL_OFF"];
-
+
TemplateFileServer page("nickserv/info.html");
page.Serve(server, page_name, client, message, reply, replacements);
return true;
}
-
diff --git a/modules/webcpanel/pages/nickserv/info.h b/modules/webcpanel/pages/nickserv/info.h
index 117f2bd8e..b18555826 100644
--- a/modules/webcpanel/pages/nickserv/info.h
+++ b/modules/webcpanel/pages/nickserv/info.h
@@ -22,4 +22,3 @@ class Info : public WebPanelProtectedPage
}
}
-
diff --git a/modules/webcpanel/pages/operserv/akill.cpp b/modules/webcpanel/pages/operserv/akill.cpp
index 1a45a6d82..c71dc1f49 100644
--- a/modules/webcpanel/pages/operserv/akill.cpp
+++ b/modules/webcpanel/pages/operserv/akill.cpp
@@ -61,4 +61,3 @@ bool WebCPanel::OperServ::Akill::OnRequest(HTTPProvider *server, const Anope::st
page.Serve(server, page_name, client, message, reply, replacements);
return true;
}
-
diff --git a/modules/webcpanel/pages/operserv/akill.h b/modules/webcpanel/pages/operserv/akill.h
index 518f5e13d..543c06396 100644
--- a/modules/webcpanel/pages/operserv/akill.h
+++ b/modules/webcpanel/pages/operserv/akill.h
@@ -22,4 +22,3 @@ class Akill : public WebPanelProtectedPage
}
}
-
diff --git a/modules/webcpanel/pages/register.cpp b/modules/webcpanel/pages/register.cpp
index e91405128..4d945aa15 100644
--- a/modules/webcpanel/pages/register.cpp
+++ b/modules/webcpanel/pages/register.cpp
@@ -21,4 +21,3 @@ bool WebCPanel::Register::OnRequest(HTTPProvider *server, const Anope::string &p
page.Serve(server, page_name, client, message, reply, replacements);
return true;
}
-
diff --git a/modules/webcpanel/pages/register.h b/modules/webcpanel/pages/register.h
index 4280a34c2..1d573bb30 100644
--- a/modules/webcpanel/pages/register.h
+++ b/modules/webcpanel/pages/register.h
@@ -19,4 +19,3 @@ class Register : public WebPanelPage
};
}
-
diff --git a/modules/webcpanel/static_fileserver.cpp b/modules/webcpanel/static_fileserver.cpp
index 2e91f77e4..396ffc8fc 100644
--- a/modules/webcpanel/static_fileserver.cpp
+++ b/modules/webcpanel/static_fileserver.cpp
@@ -35,8 +35,7 @@ bool StaticFileServer::OnRequest(HTTPProvider *server, const Anope::string &page
char buffer[BUFSIZE];
while ((i = read(fd, buffer, sizeof(buffer))) > 0)
reply.Write(buffer, i);
-
+
close(fd);
return true;
}
-
diff --git a/modules/webcpanel/static_fileserver.h b/modules/webcpanel/static_fileserver.h
index a5874c166..7ce9609aa 100644
--- a/modules/webcpanel/static_fileserver.h
+++ b/modules/webcpanel/static_fileserver.h
@@ -16,4 +16,3 @@ class StaticFileServer : public HTTPPage
bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &) anope_override;
};
-
diff --git a/modules/webcpanel/template_fileserver.cpp b/modules/webcpanel/template_fileserver.cpp
index 3a8f96725..341058659 100644
--- a/modules/webcpanel/template_fileserver.cpp
+++ b/modules/webcpanel/template_fileserver.cpp
@@ -79,7 +79,7 @@ static Anope::string FindReplacement(const TemplateFileServer::Replacements &r,
}
}
}
-
+
TemplateFileServer::Replacements::const_iterator it = r.find(key);
if (it != r.end())
return it->second;
@@ -110,7 +110,7 @@ void TemplateFileServer::Serve(HTTPProvider *server, const Anope::string &page_n
buffer[i] = 0;
buf += buffer;
}
-
+
close(fd);
Anope::string finished;
@@ -235,7 +235,7 @@ void TemplateFileServer::Serve(HTTPProvider *server, const Anope::string &page_n
// If the if stack is empty or we are in a true statement
bool ifok = IfStack.empty() || IfStack.top();
bool forok = ForLoop::Stack.empty() || !ForLoop::Stack.back().finished(r);
-
+
if (ifok && forok)
{
const Anope::string &replacement = FindReplacement(r, content.substr(0, f - 1));
@@ -252,7 +252,7 @@ void TemplateFileServer::Serve(HTTPProvider *server, const Anope::string &page_n
// If the if stack is empty or we are in a true statement
bool ifok = IfStack.empty() || IfStack.top();
bool forok = ForLoop::Stack.empty() || !ForLoop::Stack.back().finished(r);
-
+
if (ifok && forok)
finished += buf[j];
}
@@ -261,4 +261,3 @@ void TemplateFileServer::Serve(HTTPProvider *server, const Anope::string &page_n
if (!finished.empty())
reply.Write(finished);
}
-
diff --git a/modules/webcpanel/template_fileserver.h b/modules/webcpanel/template_fileserver.h
index 8b78a7ebb..b5c29cfd2 100644
--- a/modules/webcpanel/template_fileserver.h
+++ b/modules/webcpanel/template_fileserver.h
@@ -24,4 +24,3 @@ class TemplateFileServer
void Serve(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, Replacements &);
};
-
diff --git a/modules/webcpanel/webcpanel.cpp b/modules/webcpanel/webcpanel.cpp
index 73558dd73..947248cb8 100644
--- a/modules/webcpanel/webcpanel.cpp
+++ b/modules/webcpanel/webcpanel.cpp
@@ -221,7 +221,7 @@ class ModuleWebCPanel : public Module
provider->UnregisterPage(&this->chanserv_drop);
provider->UnregisterPage(&this->memoserv_memos);
-
+
provider->UnregisterPage(&this->hostserv_request);
provider->UnregisterPage(&this->operserv_akill);