summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2013-03-02 21:44:52 -0500
committerAdam <Adam@anope.org>2013-03-02 23:42:00 -0500
commit367b662c8344c6cd2f7f3da0760de0f032b54171 (patch)
treec0f683bb0cf739223f95663f05bde59e9e8eb0b0
parent75999e05b9878784ee942f5b2e9909397be0c28c (diff)
Fix compile warning in webcpanel/memos
-rw-r--r--modules/extra/webcpanel/pages/memoserv/memos.cpp23
1 files changed, 10 insertions, 13 deletions
diff --git a/modules/extra/webcpanel/pages/memoserv/memos.cpp b/modules/extra/webcpanel/pages/memoserv/memos.cpp
index db4fcfc1b..671820ced 100644
--- a/modules/extra/webcpanel/pages/memoserv/memos.cpp
+++ b/modules/extra/webcpanel/pages/memoserv/memos.cpp
@@ -71,8 +71,7 @@ bool WebCPanel::MemoServ::Memos::OnRequest(HTTPProvider *server, const Anope::st
if (message.get_data.count("read") > 0 && message.get_data.count("number") > 0)
{
std::vector<Anope::string> params;
- int number;
- bool error = false;
+ int number = -1;
try
{
@@ -81,21 +80,19 @@ bool WebCPanel::MemoServ::Memos::OnRequest(HTTPProvider *server, const Anope::st
catch (const ConvertException &ex)
{
replacements["MESSAGES"] = "ERROR - invalid parameter for NUMBER";
- error = true;
}
- m = mi->GetMemo(number-1);
-
- if (!error && !m)
+ if (number > 0)
{
- replacements["MESSAGES"] = "ERROR - invalid memo number.";
- error = true;
+ m = mi->GetMemo(number-1);
+
+ if (!m)
+ replacements["MESSAGES"] = "ERROR - invalid memo number.";
+ else if (message.get_data["read"] == "1")
+ m->unread = false;
+ else if (message.get_data["read"] == "2")
+ m->unread = true;
}
-
- if (!error && message.get_data["read"] == "1")
- m->unread = false;
- else if (!error && message.get_data["read"] == "2")
- m->unread = true;
}
for (unsigned i = 0; i < mi->memos->size(); ++i)