diff --git a/configure.ac b/configure.ac index f49ad863..c5fb0140 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_DEFUN([AC_PROG_CC], [m4_errprint(__file__:__line__[: Something is trying to u dnl Needed for AC_PATH_PROGS_FEATURE_CHECK which was added in 2.62 AC_PREREQ([2.62]) dnl Keep the version number in sync with main.h! -AC_INIT([znc], [0.205]) +AC_INIT([znc], [0.207]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/znc.cpp]) AC_LANG([C++]) diff --git a/include/znc/Modules.h b/include/znc/Modules.h index db76738c..73f455ef 100644 --- a/include/znc/Modules.h +++ b/include/znc/Modules.h @@ -183,11 +183,13 @@ public: CModInfo() { m_fLoader = NULL; + m_bHasArgs = false; } CModInfo(const CString& sName, const CString& sPath, EModuleType eType) { m_sName = sName; m_sPath = sPath; m_fLoader = NULL; + m_bHasArgs = false; } ~CModInfo() {} diff --git a/include/znc/main.h b/include/znc/main.h index 3ac92305..b80b6034 100644 --- a/include/znc/main.h +++ b/include/znc/main.h @@ -13,7 +13,7 @@ // The following defines are for #if comparison (preprocessor only likes ints) #define VERSION_MAJOR 0 -#define VERSION_MINOR 205 +#define VERSION_MINOR 207 // This one is for display purpose #define VERSION (VERSION_MAJOR + VERSION_MINOR / 1000.0) diff --git a/include/znc/znc.h b/include/znc/znc.h index b663fc3f..43087c68 100644 --- a/include/znc/znc.h +++ b/include/znc/znc.h @@ -143,6 +143,8 @@ public: // Listener yummy CListener* FindListener(u_short uPort, const CString& BindHost, EAddrType eAddr); bool AddListener(CListener*); + bool AddListener(unsigned int uPort, const CString& sBindHost, bool bSSL, + EAddrType eAddr, CListener::EAcceptType eAccept, CString& sError); bool DelListener(CListener*); // Message of the Day @@ -178,8 +180,6 @@ private: CString MakeConfigHeader(); bool AddListener(const CString& sLine, CString& sError); bool AddListener(CConfig* pConfig, CString& sError); - bool AddListener(unsigned int uPort, const CString& sBindHost, bool bSSL, - EAddrType eAddr, CListener::EAcceptType eAccept, CString& sError); protected: time_t m_TimeStarted; diff --git a/modules/data/certauth/tmpl/index.tmpl b/modules/data/certauth/tmpl/index.tmpl index cd312471..a4a6af31 100644 --- a/modules/data/certauth/tmpl/index.tmpl +++ b/modules/data/certauth/tmpl/index.tmpl @@ -25,7 +25,7 @@
| + | Key | BufferCount | Options | ELSE ?> -<- Add a channel (opens in same page) | +<- Add a channel (opens in same page) | ENDIF ?> @@ -173,7 +160,13 @@ checked="checked" ENDIF ?> IF Disabled ?> disabled="disabled" ENDIF ?> />- IF Disabled ?> VAR Args ?> ELSE ?> ENDIF ?> + IF Disabled ?> + VAR Args ?> + ELSE ?> + disabled="disabled" ENDIF ?> + IF ArgsHelpText ?> title=" VAR ArgsHelpText ?>" ENDIF ?> /> + ENDIF ?> | VAR Description ?> | diff --git a/modules/data/webadmin/tmpl/add_edit_user.tmpl b/modules/data/webadmin/tmpl/add_edit_user.tmpl index 86a61781..b3670b78 100644 --- a/modules/data/webadmin/tmpl/add_edit_user.tmpl +++ b/modules/data/webadmin/tmpl/add_edit_user.tmpl @@ -82,27 +82,33 @@Name | ELSE ?> -<- Add a network (opens in same page) | +<- Add a network (opens in same page) | ENDIF ?> diff --git a/modules/data/webadmin/tmpl/settings.tmpl b/modules/data/webadmin/tmpl/settings.tmpl index bf9858bc..07b5ee00 100644 --- a/modules/data/webadmin/tmpl/settings.tmpl +++ b/modules/data/webadmin/tmpl/settings.tmpl @@ -9,36 +9,61 @@
| Port | -BindHost | -SSL | -IPv4 | -IPv6 | -IRC | -Web | -
| VAR Port ?> | -VAR BindHost DEFAULT=** ?> | -IF IsSSL ?>Yes ELSE ?>No ENDIF ?> | -IF IsIPV4 ?>Yes ELSE ?>No ENDIF ?> | -IF IsIPV6 ?>Yes ELSE ?>No ENDIF ?> | -IF IsIRC ?>Yes ELSE ?>No ENDIF ?> | -IF IsWeb ?>Yes ELSE ?>No ENDIF ?> | -
| t |