summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/extra/m_chanstats.cpp2
-rw-r--r--modules/extra/m_httpd.cpp4
-rw-r--r--modules/extra/m_ldap.cpp2
-rw-r--r--modules/extra/m_ldap_authentication.cpp3
-rw-r--r--modules/extra/m_ldap_oper.cpp2
-rw-r--r--modules/extra/m_mysql.cpp2
-rw-r--r--modules/extra/m_sql_authentication.cpp5
-rw-r--r--modules/extra/m_sql_oper.cpp2
-rw-r--r--modules/extra/m_sqlite.cpp2
-rw-r--r--modules/extra/m_ssl.cpp2
-rw-r--r--modules/extra/m_xmlrpc.cpp4
-rw-r--r--modules/extra/m_xmlrpc_main.cpp2
-rw-r--r--modules/extra/webcpanel/pages/confirm.h2
-rw-r--r--modules/extra/webcpanel/pages/index.h2
-rw-r--r--modules/extra/webcpanel/pages/register.h2
-rw-r--r--modules/extra/webcpanel/static_fileserver.h2
-rw-r--r--modules/extra/webcpanel/template_fileserver.h2
-rw-r--r--modules/extra/webcpanel/webcpanel.h2
18 files changed, 21 insertions, 23 deletions
diff --git a/modules/extra/m_chanstats.cpp b/modules/extra/m_chanstats.cpp
index 65e71a5c0..3d3430752 100644
--- a/modules/extra/m_chanstats.cpp
+++ b/modules/extra/m_chanstats.cpp
@@ -1,5 +1,5 @@
#include "module.h"
-#include "sql.h"
+#include "modules/sql.h"
class MySQLInterface : public SQL::Interface
{
diff --git a/modules/extra/m_httpd.cpp b/modules/extra/m_httpd.cpp
index 1941985d1..5a4260149 100644
--- a/modules/extra/m_httpd.cpp
+++ b/modules/extra/m_httpd.cpp
@@ -6,8 +6,8 @@
*/
#include "module.h"
-#include "httpd.h"
-#include "ssl.h"
+#include "modules/httpd.h"
+#include "modules/ssl.h"
static Anope::string BuildDate()
{
diff --git a/modules/extra/m_ldap.cpp b/modules/extra/m_ldap.cpp
index 7ded21d6f..4168193a3 100644
--- a/modules/extra/m_ldap.cpp
+++ b/modules/extra/m_ldap.cpp
@@ -1,7 +1,7 @@
/* RequiredLibraries: ldap,lber */
#include "module.h"
-#include "ldapapi.h"
+#include "modules/ldap.h"
#include <ldap.h>
static Pipe *me;
diff --git a/modules/extra/m_ldap_authentication.cpp b/modules/extra/m_ldap_authentication.cpp
index 8238082a5..4bd76ff09 100644
--- a/modules/extra/m_ldap_authentication.cpp
+++ b/modules/extra/m_ldap_authentication.cpp
@@ -1,6 +1,5 @@
#include "module.h"
-#include "nickserv.h"
-#include "ldapapi.h"
+#include "modules/ldap.h"
static Module *me;
diff --git a/modules/extra/m_ldap_oper.cpp b/modules/extra/m_ldap_oper.cpp
index a54556c80..43ee81408 100644
--- a/modules/extra/m_ldap_oper.cpp
+++ b/modules/extra/m_ldap_oper.cpp
@@ -1,5 +1,5 @@
#include "module.h"
-#include "ldapapi.h"
+#include "modules/ldap.h"
static std::set<Oper *> my_opers;
static Anope::string opertype_attribute;
diff --git a/modules/extra/m_mysql.cpp b/modules/extra/m_mysql.cpp
index b8270b91f..a61f11e8b 100644
--- a/modules/extra/m_mysql.cpp
+++ b/modules/extra/m_mysql.cpp
@@ -1,9 +1,9 @@
/* RequiredLibraries: mysqlclient */
#include "module.h"
+#include "modules/sql.h"
#define NO_CLIENT_LONG_LONG
#include <mysql/mysql.h>
-#include "sql.h"
using namespace SQL;
diff --git a/modules/extra/m_sql_authentication.cpp b/modules/extra/m_sql_authentication.cpp
index 693f06b33..ecc8700f6 100644
--- a/modules/extra/m_sql_authentication.cpp
+++ b/modules/extra/m_sql_authentication.cpp
@@ -1,8 +1,7 @@
#include "module.h"
-#include "sql.h"
+#include "modules/sql.h"
static Module *me;
-static ServiceReference<NickServService> nickserv("NickServService", "NickServ");
class SQLAuthenticationResult : public SQL::Interface
{
@@ -43,7 +42,7 @@ class SQLAuthenticationResult : public SQL::Interface
{
na = new NickAlias(req->GetAccount(), new NickCore(req->GetAccount()));
FOREACH_MOD(I_OnNickRegister, OnNickRegister(user, na));
- if (user && nickserv)
+ if (user && NickServ)
user->SendMessage(NickServ, _("Your account \002%s\002 has been successfully created."), na->nick.c_str());
}
diff --git a/modules/extra/m_sql_oper.cpp b/modules/extra/m_sql_oper.cpp
index a45001835..0289e9a22 100644
--- a/modules/extra/m_sql_oper.cpp
+++ b/modules/extra/m_sql_oper.cpp
@@ -1,5 +1,5 @@
#include "module.h"
-#include "sql.h"
+#include "modules/sql.h"
class SQLOperResult : public SQL::Interface
{
diff --git a/modules/extra/m_sqlite.cpp b/modules/extra/m_sqlite.cpp
index 91bdd4e64..bea4d8d95 100644
--- a/modules/extra/m_sqlite.cpp
+++ b/modules/extra/m_sqlite.cpp
@@ -1,8 +1,8 @@
/* RequiredLibraries: sqlite3 */
#include "module.h"
+#include "modules/sql.h"
#include <sqlite3.h>
-#include "sql.h"
using namespace SQL;
diff --git a/modules/extra/m_ssl.cpp b/modules/extra/m_ssl.cpp
index bc29b783f..19b0aaf8f 100644
--- a/modules/extra/m_ssl.cpp
+++ b/modules/extra/m_ssl.cpp
@@ -1,7 +1,7 @@
/* RequiredLibraries: ssl,crypto */
#include "module.h"
-#include "ssl.h"
+#include "modules/ssl.h"
#define OPENSSL_NO_SHA512
#include <openssl/bio.h>
diff --git a/modules/extra/m_xmlrpc.cpp b/modules/extra/m_xmlrpc.cpp
index cac848c69..c1a9bc1d5 100644
--- a/modules/extra/m_xmlrpc.cpp
+++ b/modules/extra/m_xmlrpc.cpp
@@ -1,7 +1,7 @@
#include "module.h"
-#include "xmlrpc.h"
-#include "httpd.h"
+#include "modules/xmlrpc.h"
+#include "modules/httpd.h"
class MyXMLRPCServiceInterface : public XMLRPCServiceInterface, public HTTPPage
{
diff --git a/modules/extra/m_xmlrpc_main.cpp b/modules/extra/m_xmlrpc_main.cpp
index 8016d620e..b6b47c6f4 100644
--- a/modules/extra/m_xmlrpc_main.cpp
+++ b/modules/extra/m_xmlrpc_main.cpp
@@ -1,5 +1,5 @@
#include "module.h"
-#include "xmlrpc.h"
+#include "modules/xmlrpc.h"
static Module *me;
diff --git a/modules/extra/webcpanel/pages/confirm.h b/modules/extra/webcpanel/pages/confirm.h
index e0966fce3..e2bbf8d88 100644
--- a/modules/extra/webcpanel/pages/confirm.h
+++ b/modules/extra/webcpanel/pages/confirm.h
@@ -5,7 +5,7 @@
* Please read COPYING and README for further details.
*/
-#include "../../httpd.h"
+#include "modules/httpd.h"
namespace WebCPanel
{
diff --git a/modules/extra/webcpanel/pages/index.h b/modules/extra/webcpanel/pages/index.h
index 201b12a78..cd6372ed7 100644
--- a/modules/extra/webcpanel/pages/index.h
+++ b/modules/extra/webcpanel/pages/index.h
@@ -5,7 +5,7 @@
* Please read COPYING and README for further details.
*/
-#include "../../httpd.h"
+#include "modules/httpd.h"
namespace WebCPanel
{
diff --git a/modules/extra/webcpanel/pages/register.h b/modules/extra/webcpanel/pages/register.h
index 35e373a9a..855d4bbc0 100644
--- a/modules/extra/webcpanel/pages/register.h
+++ b/modules/extra/webcpanel/pages/register.h
@@ -5,7 +5,7 @@
* Please read COPYING and README for further details.
*/
-#include "../../httpd.h"
+#include "modules/httpd.h"
namespace WebCPanel
{
diff --git a/modules/extra/webcpanel/static_fileserver.h b/modules/extra/webcpanel/static_fileserver.h
index 9bb274f5e..d2aabde8e 100644
--- a/modules/extra/webcpanel/static_fileserver.h
+++ b/modules/extra/webcpanel/static_fileserver.h
@@ -5,7 +5,7 @@
* Please read COPYING and README for further details.
*/
-#include "../httpd.h"
+#include "modules/httpd.h"
/* A basic file server. Used for serving static content on disk. */
class StaticFileServer : public HTTPPage
diff --git a/modules/extra/webcpanel/template_fileserver.h b/modules/extra/webcpanel/template_fileserver.h
index 44e2fe708..4f94ddce2 100644
--- a/modules/extra/webcpanel/template_fileserver.h
+++ b/modules/extra/webcpanel/template_fileserver.h
@@ -5,7 +5,7 @@
* Please read COPYING and README for further details.
*/
-#include "../httpd.h"
+#include "modules/httpd.h"
/* A basic file server. Used for serving non-static non-binary content on disk. */
class TemplateFileServer
diff --git a/modules/extra/webcpanel/webcpanel.h b/modules/extra/webcpanel/webcpanel.h
index 74a8805d4..359bde32b 100644
--- a/modules/extra/webcpanel/webcpanel.h
+++ b/modules/extra/webcpanel/webcpanel.h
@@ -6,7 +6,7 @@
*/
#include "module.h"
-#include "../httpd.h"
+#include "modules/httpd.h"
#include "static_fileserver.h"
#include "template_fileserver.h"