iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-08 22:34:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change a bunch of tabs into spaces

Browse Source 
At the beginning of lines, one uses tabs for indenting. In the middle of the
line, you use spaces. If you want two different lines to line up with each
other, you start them with the same number of tabs and use spaces for the rest
of the indenting in the "other" line.

Really, that's how one does it!


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1963 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2010-05-01 20:15:01 +00:00
parent 729299eb67
commit eee34d359b
23 changed files with 306 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Buffer.h
+4 -4
View File
@@ -30,9 +30,9 @@ public:
private:
protected:
CString m_sPre;
CString m_sPost;
bool m_bIncNick;
CString m_sPre;
CString m_sPost;
bool m_bIncNick;
};
class CBuffer : private deque<CBufLine> {
@@ -59,7 +59,7 @@ public:
// !Getters
private:
protected:
unsigned int m_uLineCount;
unsigned int m_uLineCount;
};
#endif // !_BUFFER_H
Chan.h
+36 -36
View File
@@ -28,26 +28,26 @@ class CClient;
class CChan {
public:
typedef enum {
Voice = '+',
HalfOp = '%',
Op = '@',
Admin = '!',
Owner = '*'
Voice = '+',
HalfOp = '%',
Op = '@',
Admin = '!',
Owner = '*'
} EUserPerms;
typedef enum {
M_Private = 'p',
M_Secret = 's',
M_Moderated = 'm',
M_InviteOnly = 'i',
M_NoMessages = 'n',
M_OpTopic = 't',
M_Limit = 'l',
M_Key = 'k',
M_Op = 'o',
M_Voice = 'v',
M_Ban = 'b',
M_Except = 'e'
M_Private = 'p',
M_Secret = 's',
M_Moderated = 'm',
M_InviteOnly = 'i',
M_NoMessages = 'n',
M_OpTopic = 't',
M_Limit = 'l',
M_Key = 'k',
M_Op = 'o',
M_Voice = 'v',
M_Ban = 'b',
M_Except = 'e'
} EModes;
CChan(const CString& sName, CUser* pUser, bool bInConfig);
@@ -141,26 +141,26 @@ public:
// !Getters
private:
protected:
bool m_bDetached;
bool m_bIsOn;
bool m_bKeepBuffer;
bool m_bInConfig;
bool m_bDisabled;
CString m_sName;
CString m_sKey;
CString m_sTopic;
CString m_sTopicOwner;
unsigned long m_ulTopicDate;
unsigned long m_ulCreationDate;
CUser* m_pUser;
CNick m_Nick;
unsigned int m_uJoinTries;
CString m_sDefaultModes;
map<CString,CNick*> m_msNicks; // Todo: make this caseless (irc style)
unsigned int m_uBufferCount;
vector<CString> m_vsBuffer;
bool m_bDetached;
bool m_bIsOn;
bool m_bKeepBuffer;
bool m_bInConfig;
bool m_bDisabled;
CString m_sName;
CString m_sKey;
CString m_sTopic;
CString m_sTopicOwner;
unsigned long m_ulTopicDate;
unsigned long m_ulCreationDate;
CUser* m_pUser;
CNick m_Nick;
unsigned int m_uJoinTries;
CString m_sDefaultModes;
map<CString,CNick*> m_msNicks; // Todo: make this caseless (irc style)
unsigned int m_uBufferCount;
vector<CString> m_vsBuffer;
map<unsigned char, CString> m_musModes;
map<unsigned char, CString> m_musModes;
};
#endif // !_CHAN_H
Client.h
+14 -14
View File
@@ -52,9 +52,9 @@ protected:
virtual void RefusedLogin(const CString& sReason) = 0;
private:
CString m_sUsername;
CString m_sPassword;
Csock* m_pSock;
CString m_sUsername;
CString m_sPassword;
Csock* m_pSock;
};
@@ -68,7 +68,7 @@ public:
void RefusedLogin(const CString& sReason);
private:
protected:
CClient* m_pClient;
CClient* m_pClient;
};
class CClient : public CZNCSock {
@@ -128,16 +128,16 @@ public:
private:
protected:
bool m_bGotPass;
bool m_bGotNick;
bool m_bGotUser;
bool m_bNamesx;
bool m_bUHNames;
CUser* m_pUser;
CString m_sNick;
CString m_sPass;
CString m_sUser;
CSmartPtr<CAuthBase> m_spAuth;
bool m_bGotPass;
bool m_bGotNick;
bool m_bGotUser;
bool m_bNamesx;
bool m_bUHNames;
CUser* m_pUser;
CString m_sNick;
CString m_sPass;
CString m_sUser;
CSmartPtr<CAuthBase> m_spAuth;
};
#endif // !_CLIENT_H
DCCBounce.h
+12 -12
View File
@@ -57,19 +57,19 @@ public:
// !Getters
private:
protected:
CString m_sRemoteNick;
CString m_sRemoteIP;
CString m_sConnectIP;
CString m_sLocalIP;
CString m_sFileName;
CUser* m_pUser;
CDCCBounce* m_pPeer;
unsigned short m_uRemotePort;
bool m_bIsChat;
bool m_bIsRemote;
CString m_sRemoteNick;
CString m_sRemoteIP;
CString m_sConnectIP;
CString m_sLocalIP;
CString m_sFileName;
CUser* m_pUser;
CDCCBounce* m_pPeer;
unsigned short m_uRemotePort;
bool m_bIsChat;
bool m_bIsRemote;
static const unsigned int m_uiMaxDCCBuffer;
static const unsigned int m_uiMinDCCBuffer;
static const unsigned int m_uiMaxDCCBuffer;
static const unsigned int m_uiMinDCCBuffer;
};
#endif // !_DCCBOUNCE_H
DCCSock.h
+13 -13
View File
@@ -60,19 +60,19 @@ public:
// !Getters
private:
protected:
CString m_sRemoteNick;
CString m_sRemoteIP;
CString m_sFileName;
CString m_sLocalFile;
CString m_sSendBuf;
CString m_sModuleName;
unsigned short m_uRemotePort;
unsigned long m_uFileSize;
unsigned long m_uBytesSoFar;
bool m_bSend;
bool m_bNoDelFile;
CFile* m_pFile;
CUser* m_pUser;
CString m_sRemoteNick;
CString m_sRemoteIP;
CString m_sFileName;
CString m_sLocalFile;
CString m_sSendBuf;
CString m_sModuleName;
unsigned short m_uRemotePort;
unsigned long m_uFileSize;
unsigned long m_uBytesSoFar;
bool m_bSend;
bool m_bNoDelFile;
CFile* m_pFile;
CUser* m_pUser;
};
#endif // !_DCCSOCK_H
FileUtils.h
+7 -7
View File
@@ -122,12 +122,12 @@ private:
// flock() wrapper
bool Lock(int iOperation);
CString m_sBuffer;
int m_iFD;
CString m_sBuffer;
int m_iFD;
protected:
CString m_sLongName; //!< Absolute filename (m_sPath + "/" + m_sShortName)
CString m_sShortName; //!< Filename alone, without path
CString m_sLongName; //!< Absolute filename (m_sPath + "/" + m_sShortName)
CString m_sShortName; //!< Filename alone, without path
};
class CDir : public vector<CFile*> {
@@ -282,8 +282,8 @@ public:
private:
protected:
CFile::EFileAttr m_eSortAttr;
bool m_bDesc;
CFile::EFileAttr m_eSortAttr;
bool m_bDesc;
};
//! @author imaginos@imaginos.net
@@ -316,6 +316,6 @@ public:
void close2(int iPid, int iReadFD, int iWriteFD);
private:
int m_iPid;
int m_iPid;
};
#endif // !_FILEUTILS_H
HTTPSock.h
+19 -19
View File
@@ -91,25 +91,25 @@ protected:
void PrintPage(const CString& sPage);
void Init();
bool m_bSentHeader;
bool m_bGotHeader;
bool m_bLoggedIn;
bool m_bPost;
bool m_bDone;
unsigned long m_uPostLen;
CString m_sPostData;
CString m_sURI;
CString m_sUser;
CString m_sPass;
CString m_sContentType;
CString m_sDocRoot;
map<CString, VCString> m_msvsPOSTParams;
map<CString, VCString> m_msvsGETParams;
MCString m_msHeaders;
bool m_bHTTP10Client;
CString m_sIfNoneMatch;
MCString m_msRequestCookies;
MCString m_msResponseCookies;
bool m_bSentHeader;
bool m_bGotHeader;
bool m_bLoggedIn;
bool m_bPost;
bool m_bDone;
unsigned long m_uPostLen;
CString m_sPostData;
CString m_sURI;
CString m_sUser;
CString m_sPass;
CString m_sContentType;
CString m_sDocRoot;
map<CString, VCString> m_msvsPOSTParams;
map<CString, VCString> m_msvsGETParams;
MCString m_msHeaders;
bool m_bHTTP10Client;
CString m_sIfNoneMatch;
MCString m_msRequestCookies;
MCString m_msResponseCookies;
};
#endif // !_HTTPSOCK_H
IRCSock.h
+18 -17
View File
@@ -24,10 +24,11 @@ public:
virtual ~CIRCSock();
typedef enum {
ListArg = 0, // These values must line up with their position in the CHANMODE argument to raw 005
HasArg = 1,
ArgWhenSet = 2,
NoArg = 3
// These values must line up with their position in the CHANMODE argument to raw 005
ListArg = 0,
HasArg = 1,
ArgWhenSet = 2,
NoArg = 3
} EChanModeArgs;
// Message Handlers
@@ -86,19 +87,19 @@ private:
// This is called when we connect and the nick we want is already taken
void SendAltNick(const CString& sBadNick);
protected:
bool m_bISpoofReleased;
bool m_bAuthed;
bool m_bNamesx;
bool m_bUHNames;
CString m_sPerms;
CString m_sPermModes;
set<unsigned char> m_scUserModes;
map<unsigned char, EChanModeArgs> m_mueChanModes;
CUser* m_pUser;
CNick m_Nick;
CString m_sPass;
map<CString, CChan*> m_msChans;
unsigned int m_uMaxNickLen;
bool m_bISpoofReleased;
bool m_bAuthed;
bool m_bNamesx;
bool m_bUHNames;
CString m_sPerms;
CString m_sPermModes;
set<unsigned char> m_scUserModes;
map<unsigned char, EChanModeArgs> m_mueChanModes;
CUser* m_pUser;
CNick m_Nick;
CString m_sPass;
map<CString, CChan*> m_msChans;
unsigned int m_uMaxNickLen;
};
#endif // !_IRCSOCK_H
Listener.h
+7 -7
View File
@@ -56,12 +56,12 @@ public:
private:
protected:
bool m_bSSL;
EAddrType m_eAddr;
unsigned short m_uPort;
CString m_sBindHost;
CRealListener* m_pListener;
AcceptType m_eAcceptType;
bool m_bSSL;
EAddrType m_eAddr;
unsigned short m_uPort;
CString m_sBindHost;
CRealListener* m_pListener;
AcceptType m_eAcceptType;
};
class CRealListener : public CZNCSock {
@@ -84,7 +84,7 @@ public:
virtual void ReadLine(const CString& sData);
private:
CListener::AcceptType m_eAcceptType;
CListener::AcceptType m_eAcceptType;
};
#endif // !_LISTENER_H
Modules.h
+31 -31
View File
@@ -136,8 +136,8 @@ public:
// !Getters
private:
protected:
CModule* m_pModule;
CString m_sDescription;
CModule* m_pModule;
CString m_sDescription;
};
typedef void (*FPTimer_t)(CModule *, CFPTimer *);
@@ -161,7 +161,7 @@ protected:
}
private:
FPTimer_t m_pFBCallback;
FPTimer_t m_pFBCallback;
};
class CModInfo {
@@ -193,10 +193,10 @@ public:
// !Setters
private:
protected:
bool m_bGlobal;
CString m_sName;
CString m_sPath;
CString m_sDescription;
bool m_bGlobal;
CString m_sName;
CString m_sPath;
CString m_sDescription;
};
/** The base class for your own ZNC modules.
@@ -227,20 +227,20 @@ public:
/** ZNC will continue event processing normally. This is what
* you should return normally.
*/
CONTINUE = 1,
CONTINUE = 1,
/** This is the same as both CModule::HALTMODS and
* CModule::HALTCORE together.
*/
HALT = 2,
HALT = 2,
/** Stop sending this even to other modules which were not
* called yet. Internally, the event is handled normally.
*/
HALTMODS = 3,
HALTMODS = 3,
/** Continue calling other modules. When done, ignore the event
* in the ZNC core. (For most module hooks this means that a
* given event won't be forwarded to the connected users)
*/
HALTCORE = 4
HALTCORE = 4
} EModRet;
typedef enum {
@@ -779,23 +779,23 @@ public:
// !Getters
protected:
bool m_bFake;
bool m_bGlobal;
CString m_sDescription;
set<CTimer*> m_sTimers;
set<CSocket*> m_sSockets;
ModHandle m_pDLL;
CSockManager* m_pManager;
CUser* m_pUser;
CClient* m_pClient;
CString m_sModName;
CString m_sDataDir;
CString m_sSavePath;
CString m_sArgs;
CString m_sModPath;
bool m_bFake;
bool m_bGlobal;
CString m_sDescription;
set<CTimer*> m_sTimers;
set<CSocket*> m_sSockets;
ModHandle m_pDLL;
CSockManager* m_pManager;
CUser* m_pUser;
CClient* m_pClient;
CString m_sModName;
CString m_sDataDir;
CString m_sSavePath;
CString m_sArgs;
CString m_sModPath;
private:
MCString m_mssRegistry; //!< way to save name/value pairs. Note there is no encryption involved in this
VWebSubPages m_vSubPages;
MCString m_mssRegistry; //!< way to save name/value pairs. Note there is no encryption involved in this
VWebSubPages m_vSubPages;
};
class CModules : public vector<CModule*> {
@@ -810,7 +810,7 @@ public:
void UnloadAll();
bool OnBoot(); // Return false to abort
bool OnBoot();
bool OnPreRehash();
bool OnPostRehash();
bool OnIRCDisconnected();
@@ -899,8 +899,8 @@ private:
bool &bVersionMismatch, bool &bIsGlobal, CString& sDesc, CString& sRetMsg);
protected:
CUser* m_pUser;
CClient* m_pClient;
CUser* m_pUser;
CClient* m_pClient;
};
/** Base class for global modules. If you want to write a global module, your
@@ -929,7 +929,7 @@ public:
/** This module hook is called when a user is being added.
* @param User The user which will be added.
* @param sErrorRet A message that may be displayed to the user if
* the module stops adding the user.
* the module stops adding the user.
* @return See CModule::EModRet.
*/
virtual EModRet OnAddUser(CUser& User, CString& sErrorRet);
Nick.h
+5 -5
View File
@@ -55,11 +55,11 @@ public:
void Clone(const CNick& SourceNick);
private:
protected:
CString m_sChanPerms;
CUser* m_pUser;
CString m_sNick;
CString m_sIdent;
CString m_sHost;
CString m_sChanPerms;
CUser* m_pUser;
CString m_sNick;
CString m_sIdent;
CString m_sHost;
};
#endif // !_NICK_H
Server.h
+4 -4
View File
@@ -24,10 +24,10 @@ public:
static bool IsValidHostName(const CString& sHostName);
private:
protected:
CString m_sName;
unsigned short m_uPort;
CString m_sPass;
bool m_bSSL;
CString m_sName;
unsigned short m_uPort;
CString m_sPass;
bool m_bSSL;
};
#endif // !_SERVER_H
Socket.h
+1 -1
View File
@@ -142,7 +142,7 @@ public:
// !Getters
private:
protected:
CModule* m_pModule;
CModule* m_pModule;
};
#endif /* SOCKET_H */
Template.cpp
+1 -1
View File
@@ -278,7 +278,7 @@ bool CTemplate::Print(const CString& sFileName, ostream& oOut) {
}
CString sLine;
CString sSetBlockVar;
CString sSetBlockVar;
bool bValidLastIf = false;
bool bInSetBlock = false;
unsigned long uFilePos = 0;
Template.h
+15 -15
View File
@@ -58,8 +58,8 @@ public:
CString::EEscape GetEscapeTo() const { return m_eEscapeTo; }
// !Getters
private:
CString::EEscape m_eEscapeFrom;
CString::EEscape m_eEscapeTo;
CString::EEscape m_eEscapeFrom;
CString::EEscape m_eEscapeTo;
};
@@ -99,12 +99,12 @@ public:
CString GetValue(const CString& sName, bool bFromIf = false);
// !Getters
private:
bool m_bReverse; //!< Iterate through this loop in reverse order
bool m_bHasData; //!< Tells whether this loop has real data or not
CString m_sName; //!< The name portion of the <?LOOP name?> tag
unsigned int m_uRowIndex; //!< The index of the current row we're on
unsigned long m_uFilePosition; //!< The file position of the opening <?LOOP?> tag
vector<CTemplate*>* m_pvRows; //!< This holds pointers to the templates associated with this loop
bool m_bReverse; //!< Iterate through this loop in reverse order
bool m_bHasData; //!< Tells whether this loop has real data or not
CString m_sName; //!< The name portion of the <?LOOP name?> tag
unsigned int m_uRowIndex; //!< The index of the current row we're on
unsigned long m_uFilePosition; //!< The file position of the opening <?LOOP?> tag
vector<CTemplate*>* m_pvRows; //!< This holds pointers to the templates associated with this loop
};
@@ -172,13 +172,13 @@ public:
const CString& GetFileName() const { return m_sFileName; }
// !Getters
private:
CTemplate* m_pParent;
CString m_sFileName;
list<pair<CString, bool> > m_lsbPaths;
map<CString, vector<CTemplate*> > m_mvLoops;
vector<CTemplateLoopContext*> m_vLoopContexts;
CSmartPtr<CTemplateOptions> m_spOptions;
vector<CSmartPtr<CTemplateTagHandler> > m_vspTagHandlers;
CTemplate* m_pParent;
CString m_sFileName;
list<pair<CString, bool> > m_lsbPaths;
map<CString, vector<CTemplate*> > m_mvLoops;
vector<CTemplateLoopContext*> m_vLoopContexts;
CSmartPtr<CTemplateOptions> m_spOptions;
vector<CSmartPtr<CTemplateTagHandler> > m_vspTagHandlers;
};
#endif // !_TEMPLATE_H
User.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ protected:
}
}
CUser* m_pUser;
CUser* m_pUser;
};
CUser::CUser(const CString& sUserName) {
User.h
+54 -54
View File
@@ -225,67 +225,67 @@ public:
// !Getters
private:
protected:
time_t m_uConnectTime;
CString m_sUserName;
CString m_sCleanUserName;
CString m_sNick;
CString m_sAltNick;
CString m_sIdent;
CString m_sRealName;
CString m_sVHost;
CString m_sDCCVHost;
CString m_sPass;
CString m_sPassSalt;
CString m_sStatusPrefix;
CString m_sDefaultChanModes;
CString m_sChanPrefixes;
CNick m_IRCNick;
bool m_bIRCAway;
CString m_sIRCServer;
CString m_sQuitMsg;
MCString m_mssCTCPReplies;
CString m_sTimestampFormat;
float m_fTimezoneOffset;
eHashType m_eHashType;
time_t m_uConnectTime;
CString m_sUserName;
CString m_sCleanUserName;
CString m_sNick;
CString m_sAltNick;
CString m_sIdent;
CString m_sRealName;
CString m_sVHost;
CString m_sDCCVHost;
CString m_sPass;
CString m_sPassSalt;
CString m_sStatusPrefix;
CString m_sDefaultChanModes;
CString m_sChanPrefixes;
CNick m_IRCNick;
bool m_bIRCAway;
CString m_sIRCServer;
CString m_sQuitMsg;
MCString m_mssCTCPReplies;
CString m_sTimestampFormat;
float m_fTimezoneOffset;
eHashType m_eHashType;
// Paths
CString m_sUserPath;
CString m_sDLPath;
CString m_sUserPath;
CString m_sDLPath;
// !Paths
CBuffer m_RawBuffer;
CBuffer m_MotdBuffer;
CBuffer m_QueryBuffer;
bool m_bMultiClients;
bool m_bBounceDCCs;
bool m_bUseClientIP;
bool m_bDenyLoadMod;
bool m_bAdmin;
bool m_bDenySetVHost;
bool m_bKeepBuffer;
bool m_bBeingDeleted;
bool m_bAppendTimestamp;
bool m_bPrependTimestamp;
bool m_bIRCConnectEnabled;
CIRCSock* m_pIRCSock;
CBuffer m_RawBuffer;
CBuffer m_MotdBuffer;
CBuffer m_QueryBuffer;
bool m_bMultiClients;
bool m_bBounceDCCs;
bool m_bUseClientIP;
bool m_bDenyLoadMod;
bool m_bAdmin;
bool m_bDenySetVHost;
bool m_bKeepBuffer;
bool m_bBeingDeleted;
bool m_bAppendTimestamp;
bool m_bPrependTimestamp;
bool m_bIRCConnectEnabled;
CIRCSock* m_pIRCSock;
CUserTimer* m_pUserTimer;
CUserTimer* m_pUserTimer;
vector<CServer*> m_vServers;
vector<CChan*> m_vChans;
vector<CClient*> m_vClients;
set<CDCCBounce*> m_sDCCBounces;
set<CDCCSock*> m_sDCCSocks;
set<CString> m_ssAllowedHosts;
unsigned int m_uServerIdx; ///< Index in m_vServers of our current server + 1
unsigned int m_uBufferCount;
unsigned long long m_uBytesRead;
unsigned long long m_uBytesWritten;
unsigned int m_uMaxJoinTries;
unsigned int m_uMaxJoins;
CString m_sSkinName;
vector<CServer*> m_vServers;
vector<CChan*> m_vChans;
vector<CClient*> m_vClients;
set<CDCCBounce*> m_sDCCBounces;
set<CDCCSock*> m_sDCCSocks;
set<CString> m_ssAllowedHosts;
unsigned int m_uServerIdx; ///< Index in m_vServers of our current server + 1
unsigned int m_uBufferCount;
unsigned long long m_uBytesRead;
unsigned long long m_uBytesWritten;
unsigned int m_uMaxJoinTries;
unsigned int m_uMaxJoins;
CString m_sSkinName;
CModules* m_pModules;
CModules* m_pModules;
};
#endif // !_USER_H
Utils.h
+10 -10
View File
@@ -117,7 +117,7 @@ public:
EType GetType() const { return m_eType; }
private:
protected:
EType m_eType;
EType m_eType;
};
@@ -198,8 +198,8 @@ private:
unsigned int GetColumnIndex(const CString& sName) const;
protected:
vector<CString> m_vsHeaders;
map<CString, unsigned int> m_msuWidths; // Used to cache the width of a column
vector<CString> m_vsHeaders;
map<CString, unsigned int> m_msuWidths; // Used to cache the width of a column
};
@@ -231,9 +231,9 @@ public:
CString Crypt(const CString & sData);
private:
unsigned char *m_ivec;
BF_KEY m_bkey;
int m_iEncrypt, m_num;
unsigned char *m_ivec;
BF_KEY m_bkey;
int m_iEncrypt, m_num;
};
#endif /* HAVE_LIBSSL */
@@ -361,8 +361,8 @@ public:
protected:
typedef pair<unsigned long long, V> value;
typedef typename map<K, value>::iterator iterator;
map<K, value> m_mItems; //!< Map of cached items. The value portion of the map is for the expire time
unsigned int m_uTTL; //!< Default time-to-live duration
map<K, value> m_mItems; //!< Map of cached items. The value portion of the map is for the expire time
unsigned int m_uTTL; //!< Default time-to-live duration
};
/**
@@ -502,8 +502,8 @@ public:
unsigned int GetCount() const { return (m_puCount) ? *m_puCount : 0; }
// !Getters
private:
T* m_pType; //!< Raw pointer to the class being referenced
unsigned int* m_puCount; //!< Counter of how many CSmartPtr's are referencing the same raw pointer
T* m_pType; //!< Raw pointer to the class being referenced
unsigned int* m_puCount; //!< Counter of how many CSmartPtr's are referencing the same raw pointer
};
template<typename T>
WebModules.h
+14 -14
View File
@@ -49,10 +49,10 @@ public:
size_t AddError(const CString& sMessage);
size_t AddSuccess(const CString& sMessage);
private:
CString m_sId;
CUser* m_pUser;
VCString m_vsErrorMsgs;
VCString m_vsSuccessMsgs;
CString m_sId;
CUser* m_pUser;
VCString m_vsErrorMsgs;
VCString m_vsSuccessMsgs;
};
@@ -82,10 +82,10 @@ public:
const CString& GetTitle() const { return m_sTitle; }
const VPair& GetParams() const { return m_vParams; }
private:
unsigned int m_uFlags;
CString m_sName;
CString m_sTitle;
VPair m_vParams;
unsigned int m_uFlags;
CString m_sName;
CString m_sTitle;
VPair m_vParams;
};
class CWebAuth : public CAuthBase {
@@ -99,7 +99,7 @@ public:
void Invalidate();
private:
protected:
CWebSock* m_pWebSock;
CWebSock* m_pWebSock;
};
class CWebSessionMap : public TCacheMap<CString, CSmartPtr<CWebSession> > {
@@ -166,16 +166,16 @@ public:
private:
EPageReqResult OnPageRequestInternal(const CString& sURI, CString& sPageRet);
bool m_bPathsSet;
CTemplate m_Template;
CSmartPtr<CAuthBase> m_spAuth;
bool m_bPathsSet;
CTemplate m_Template;
CSmartPtr<CAuthBase> m_spAuth;
CString m_sForceUser; // Gets filled by ResolveModule()
CString m_sModName; // Gets filled by ResolveModule()
CString m_sPath; // Gets filled by ResolveModule()
CString m_sPage; // Gets filled by ResolveModule()
CSmartPtr<CWebSession> m_spSession;
CSmartPtr<CWebSession> m_spSession;
static CWebSessionMap m_mspSessions;
static CWebSessionMap m_mspSessions;
};
#endif // !_WEBMODULES_H
ZNCString.h
+5 -5
View File
@@ -191,11 +191,11 @@ public:
enum
{
MCS_SUCCESS = 0,
MCS_EOPEN = 1,
MCS_EWRITE = 2,
MCS_EWRITEFIL = 3,
MCS_EREADFIL = 4
MCS_SUCCESS = 0,
MCS_EOPEN = 1,
MCS_EWRITE = 2,
MCS_EWRITEFIL = 3,
MCS_EREADFIL = 4
};
int WriteToDisk(const CString& sPath, mode_t iMode = 0644);
main.h
+3 -3
View File
@@ -10,10 +10,10 @@
#define _MAIN_H
// The following defines are for #if comparison (preprocessor only likes ints)
#define VERSION_MAJOR 0
#define VERSION_MINOR 89
#define VERSION_MAJOR 0
#define VERSION_MINOR 89
// This one is for display purpose
#define VERSION (VERSION_MAJOR + VERSION_MINOR / 1000.0)
#define VERSION (VERSION_MAJOR + VERSION_MINOR / 1000.0)
// You can add -DVERSION_EXTRA="stuff" to your CXXFLAGS!
#ifndef VERSION_EXTRA
znc.cpp
+5 -5
View File
@@ -19,10 +19,10 @@ namespace
{ // private namespace for local things
struct CGlobalModuleConfigLine
{
CString m_sName;
CString m_sValue;
CUser *m_pUser;
CChan *m_pChan;
CString m_sName;
CString m_sValue;
CUser *m_pUser;
CChan *m_pChan;
};
}
@@ -2024,7 +2024,7 @@ protected:
}
private:
size_t m_uiPosNextUser;
size_t m_uiPosNextUser;
};
void CZNC::EnableConnectUser() {
znc.h
+27 -27
View File
@@ -147,36 +147,36 @@ private:
bool HandleUserDeletion();
protected:
time_t m_TimeStarted;
time_t m_TimeStarted;
enum ConfigState m_eConfigState;
vector<CListener*> m_vpListeners;
map<CString,CUser*> m_msUsers;
map<CString,CUser*> m_msDelUsers;
CSockManager m_Manager;
enum ConfigState m_eConfigState;
vector<CListener*> m_vpListeners;
map<CString,CUser*> m_msUsers;
map<CString,CUser*> m_msDelUsers;
CSockManager m_Manager;
CString m_sCurPath;
CString m_sHomePath;
CString m_sZNCPath;
CString m_sCurPath;
CString m_sHomePath;
CString m_sZNCPath;
CString m_sConfigFile;
CString m_sSkinName;
CString m_sStatusPrefix;
CString m_sISpoofFile;
CString m_sOrigISpoof;
CString m_sISpoofFormat;
CString m_sPidFile;
VCString m_vsVHosts;
VCString m_vsMotd;
CFile m_LockFile;
CFile* m_pISpoofLockFile;
unsigned int m_uiConnectDelay;
unsigned int m_uiAnonIPLimit;
CGlobalModules* m_pModules;
unsigned long long m_uBytesRead;
unsigned long long m_uBytesWritten;
CConnectUserTimer *m_pConnectUserTimer;
TCacheMap<CString> m_sConnectThrottle;
CString m_sConfigFile;
CString m_sSkinName;
CString m_sStatusPrefix;
CString m_sISpoofFile;
CString m_sOrigISpoof;
CString m_sISpoofFormat;
CString m_sPidFile;
VCString m_vsVHosts;
VCString m_vsMotd;
CFile m_LockFile;
CFile* m_pISpoofLockFile;
unsigned int m_uiConnectDelay;
unsigned int m_uiAnonIPLimit;
CGlobalModules* m_pModules;
unsigned long long m_uBytesRead;
unsigned long long m_uBytesWritten;
CConnectUserTimer *m_pConnectUserTimer;
TCacheMap<CString> m_sConnectThrottle;
};
#endif // !_ZNC_H