Another whitespace/tab mixup fix.

Hopefully the last one...
Again, no functional changes in this commit.

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1219 726aef4b-f618-498e-8847-2d620e286838

diff --git a/Chan.cpp b/Chan.cpp
index b18de7128c92aecf8be2ebc003fa276e495689dc..cb99141b4d00b16da156ca5ade685a4d2f65b772 100644 (file)
--- a/Chan.cpp
+++ b/Chan.cpp
@@ -191,9 +191,9 @@ CString CChan::GetModeForNames() const {
 
        for (map<unsigned char, CString>::const_iterator it = m_musModes.begin(); it != m_musModes.end(); it++) {
                if (it->first == 's') {
-                   sMode = "@";
+                       sMode = "@";
                } else if ((it->first == 'p') && sMode.empty()){
-                   sMode = "*";
+                       sMode = "*";
                }
        }
 

diff --git a/Client.cpp b/Client.cpp
index 8614941da2875966687ba2bfc0a273742f5c04a6..34ee53ad3a3a4a9e3a4f3665e5d2de3b2215118c 100644 (file)
--- a/Client.cpp
+++ b/Client.cpp
@@ -265,15 +265,15 @@ void CClient::ReadLine(const CString& sData) {
                CString sModes = sLine.Token(2, true);
 
                if (m_pUser && m_pUser->IsChan(sTarget)) {
-                   CChan *pChan = m_pUser->FindChan(sTarget);
+                       CChan *pChan = m_pUser->FindChan(sTarget);
 
-                   if (pChan && sModes.empty()) {
-                       PutClient(":" + m_pUser->GetIRCServer() + " 324 " + GetNick() + " " + sTarget + " " + pChan->GetModeString());
-                       if (pChan->GetCreationDate() > 0) {
-                           PutClient(":" + m_pUser->GetIRCServer() + " 329 " + GetNick() + " " + sTarget + " " + CString(pChan->GetCreationDate()));
-                       }
+                       if (pChan && sModes.empty()) {
+                               PutClient(":" + m_pUser->GetIRCServer() + " 324 " + GetNick() + " " + sTarget + " " + pChan->GetModeString());
+                               if (pChan->GetCreationDate() > 0) {
+                                       PutClient(":" + m_pUser->GetIRCServer() + " 329 " + GetNick() + " " + sTarget + " " + CString(pChan->GetCreationDate()));
+                               }
                        return;
-                   }
+                       }
                }
        } else if (sCommand.CaseCmp("QUIT") == 0) {
                if (m_pUser) {

diff --git a/main.cpp b/main.cpp
index d1f2f2806846300711d013590a9d9635dbe9b2ef..6245e465a0016a8d24730583bfb7b42f61374118 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -90,7 +90,7 @@ int main(int argc, char** argv) {
 #else
        while ((iArg = getopt_long(argc, argv, "hvnrcsd:", g_LongOpts, &iOptIndex)) != -1) {
 #endif /* HAVE_LIBSSL */
-           switch (iArg) {
+               switch (iArg) {
                case 'h':
                        GenerateHelp(argv[0]);
                        return 0;
@@ -124,7 +124,7 @@ int main(int argc, char** argv) {
                default:
                        GenerateHelp(argv[0]);
                        return 1;
-           }
+               }
        }
 
        if (optind < argc) {

diff --git a/modules/partyline.cpp b/modules/partyline.cpp
index 3435da4f83a983f50f960318ce3a1067b61967b5..19069720e32157825ceabdad3b8e20b21888a03c 100644 (file)
--- a/modules/partyline.cpp
+++ b/modules/partyline.cpp
@@ -252,7 +252,7 @@ public:
                                        }
                                }
                        } else {
-                           m_pUser->PutUser(":irc.znc.in 442 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :You're not on that channel");
+                               m_pUser->PutUser(":irc.znc.in 442 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :You're not on that channel");
                        }
                        return HALT;
                }

diff --git a/znc.cpp b/znc.cpp
index 3a1a7f92c3123baaa8dd67c6af5f5b08b1d744fb..befaa30f89bd3a006cf050854542657b8128faa9 100644 (file)
--- a/znc.cpp
+++ b/znc.cpp
@@ -431,9 +431,9 @@ void CZNC::InitDirs(const CString& sArgvPath, const CString& sDataDir) {
        }
 
        if (sDataDir.empty()) {
-           m_sZNCPath = m_sHomePath + "/.znc";
+               m_sZNCPath = m_sHomePath + "/.znc";
        } else {
-           m_sZNCPath = sDataDir;
+               m_sZNCPath = sDataDir;
        }
 
        // Other dirs that we use