Ticket #1480: FileZillaTrimSpaces.patch

source/SiteManager.cpp

@@ -42 +42 @@
     CMenuTree *mt = ( CMenuTree *)lpData;
 
     AppendMenu( ( HMENU)lpParent, MF_STRING, mt->m_CurrentItem, lpszName);
-    
+
     if (!site)
         EnableMenuItem( (HMENU)lpParent, mt->m_CurrentItem, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED);
 
@@ -104 +104 @@
 }
 
 /////////////////////////////////////////////////////////////////////////////
-// Dialogfeld CSiteManager 
+// Dialogfeld CSiteManager
 
 
 CSiteManager::CSiteManager(CWnd* pParent /*=NULL*/)
@@ -190 +190 @@
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
-// Behandlungsroutinen für Nachrichten CSiteManager 
+// Behandlungsroutinen für Nachrichten CSiteManager
 
 bool CSiteManager::ConnectSitePrepare(t_SiteManagerItem *site)
 {
@@ -237 +237 @@
     return false;
 }
 
-void CSiteManager::OnOK() 
+void CSiteManager::OnOK()
 {
     HTREEITEM item=m_cTree.GetSelectedItem();
     t_SiteManagerItem *site=0;
@@ -245 +245 @@
         site=(t_SiteManagerItem *)m_cTree.GetItemData(item);
     if (!site || site->NodeType != SITE)
         return;
-    
-    if (CheckValid())   
-    {   //If an item is selected and the current selection is valid, 
+
+    if (CheckValid())
+    {   //If an item is selected and the current selection is valid,
         //we can save the data and close the dialog
         //And don't forget to ask for the password first!
         t_SiteManagerItem site2 = *(t_SiteManagerItem *)m_cTree.GetItemData(item);
@@ -275 +275 @@
                 GssServers=GssServers.Mid(i+1);
             }
         }
-        
+
         if (!bUseGSS)
         {
             if (m_Logontype && (m_bPassDontSave || _ttoi(COptions::GetOption(OPTION_RUNINSECUREMODE))) )
@@ -286 +286 @@
                 site2.Pass = dlg.m_String;
             }
         }
-        
+
         SaveData();
         OnClose();
         m_LastSite = site2;
@@ -302 +302 @@
     {
         unsigned char *buffer=new unsigned char[100];
         memset(buffer,0,100);
-    
+
         unsigned long tmp=100;
-        if (RegQueryValueEx(key,keyname,NULL,NULL,buffer,&tmp)!=ERROR_SUCCESS) 
+        if (RegQueryValueEx(key,keyname,NULL,NULL,buffer,&tmp)!=ERROR_SUCCESS)
         {
             RegCloseKey(key);
             delete [] buffer;
             return "";
         }
-        else 
+        else
         {
             RegCloseKey(key);
             CString res=(LPTSTR)buffer;
@@ -328 +328 @@
     LPCTSTR str=value;
     _tcscpy(tmp,str);
     HKEY key;
-    if (RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\FileZilla\\Site Manager\\" + subkey, 0, 0, REG_OPTION_NON_VOLATILE, KEY_WRITE, 0, &key, NULL)==ERROR_SUCCESS) 
+    if (RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\FileZilla\\Site Manager\\" + subkey, 0, 0, REG_OPTION_NON_VOLATILE, KEY_WRITE, 0, &key, NULL)==ERROR_SUCCESS)
     {
         RegSetValueEx(key,keyname,0,REG_SZ,(unsigned char *)tmp,(value.GetLength()+1)*sizeof(TCHAR));
         RegCloseKey(key);
@@ -336 +336 @@
     delete [] tmp;
 }
 
-BOOL CSiteManager::OnInitDialog() 
+BOOL CSiteManager::OnInitDialog()
 {
     CDialog::OnInitDialog();
-    
+
     SetCtrlState();
     m_DefaultSite=0;
     if (!m_ImageList.GetSafeHandle())
@@ -387 +387 @@
     }
 
     m_cTree.Expand(item, TVE_EXPAND);
-    
+
     if (!m_DefaultSite)
         m_DefaultSite=item;
     m_cTree.SelectItem(m_DefaultSite);
@@ -395 +395 @@
     if (m_DefaultSite)
         site=(t_SiteManagerItem *)m_cTree.GetItemData(m_DefaultSite);
     DisplaySite(site);
-    
+
     if (m_bAddServer)
     {
         CString str;
-        
+
         str.Format(IDS_SITEMANAGER_NEWFTPSITE);
         int i=2;
         HTREEITEM parent=m_cTree.GetRootItem();
@@ -421 +421 @@
 
         }
         HTREEITEM item=m_cTree.InsertItem(str,2,2,parent,TVI_SORT);
-                
+
         t_SiteManagerItem *site = new t_SiteManagerItem;
         site->name = str;
         site->Host = m_addserver.host;
@@ -449 +449 @@
         }
         else
             ASSERT(FALSE);
-        site->RemoteDir = m_addserver.path;     
+        site->RemoteDir = m_addserver.path;
         site->bFirewallBypass = m_addserver.fwbypass;
         site->nTimeZoneOffset = m_addserver.nTimeZoneOffset / 60;
         site->nTimeZoneOffset2 = m_addserver.nTimeZoneOffset % 60;
@@ -460 +460 @@
         DisplaySite(site);
         m_cTree.SetFocus();
         m_cTree.EditLabel(item);
-        
+
         m_bAddServer = FALSE;
     }
-    
+
     m_hcArrow = AfxGetApp()->LoadStandardCursor(IDC_ARROW);
     m_hcNo = AfxGetApp()->LoadStandardCursor(IDC_NO);
 
     if (m_FileToImport!="")
         Import(m_FileToImport);
-    
+
     return TRUE;  // return TRUE unless you set the focus to a control
                   // EXCEPTION: OCX-Eigenschaftenseiten sollten FALSE zurückgeben
 }
 
-void CSiteManager::OnNew() 
+void CSiteManager::OnNew()
 {
     if (!CheckValid())
         return;
@@ -484 +484 @@
     ASSERT(m_cTree.GetItemData(parent));
     if (((t_SiteManagerItem *)m_cTree.GetItemData(parent))->NodeType==SITE)
         parent=m_cTree.GetParentItem(parent);
-    
+
     ASSERT(m_cTree.GetItemData(parent) && ((t_SiteManagerItem *)m_cTree.GetItemData(parent))->NodeType==FOLDER);
-    
+
     CString name;
     name.Format(IDS_SITEMANAGER_NEWFTPSITE);
 
@@ -498 +498 @@
         name2.MakeLower();
         CString childstr=m_cTree.GetItemText(child);
         childstr.MakeLower();
-        if (childstr==name2)            
+        if (childstr==name2)
         {
             child=m_cTree.GetChildItem(parent);
             name.Format(IDS_SITEMANAGER_NEWFTPSITEWITHNUM,i);
@@ -507 +507 @@
         }
         child=m_cTree.GetNextItem(child,TVGN_NEXT);
     }
-    
+
     HTREEITEM item=m_cTree.InsertItem(name,2,2,parent,TVI_SORT);
     m_cTree.Expand(parent, TVE_EXPAND);
     t_SiteManagerItem *site=new t_SiteManagerItem;
@@ -532 +532 @@
 
     m_cTree.SelectItem(item);
     DisplaySite(site);
-    m_cTree.EditLabel(item);    
+    m_cTree.EditLabel(item);
 }
 
 /*
@@ -558 +558 @@
     {
         CString str;
         CString str2;
-        
+
         if (m_Host=="")
         {
             m_cTree.SelectItem(olditem);
@@ -598 +598 @@
                 m_UserCtrl.SetFocus();
                 return FALSE;
             }
-    
+
         /*  if (m_Pass=="")
             {
                 m_cTree.SelectItem(olditem);
@@ -610 +610 @@
         if (m_cServerType.GetCurSel()==CB_ERR)
             m_cServerType.SetCurSel(0);
         UpdateData(FALSE);
-            
+
         t_SiteManagerItem *site=(t_SiteManagerItem*)m_cTree.GetItemData(olditem);
         ASSERT(site);
         site->Host=m_Host;
@@ -623 +623 @@
         }
         site->bFirewallBypass=m_bFwBypass;
         site->bPassDontSave=m_bPassDontSave;
-        if (m_bPassDontSave) 
+        if (m_bPassDontSave)
             site->Pass=""; //Ensure that the pass doesn't get saved
         site->nServerType=m_cServerType.GetCurSel();
         CWnd *pComments = GetDlgItem(IDC_SITEMANAGER_COMMENTS);
@@ -631 +631 @@
             pComments->GetWindowText(site->Comments);
 
         if (!m_nDefault)
-            m_DefaultSite=olditem;      
+            m_DefaultSite=olditem;
     }
-    return TRUE;    
+    return TRUE;
 }
 
 t_SiteManagerItem *CSiteManager::GetData(HKEY hRootKey, CString Name)
@@ -726 +726 @@
         m_ConnectCtrl.EnableWindow(TRUE);
         m_FwBypassCtrl.EnableWindow(TRUE);
         m_UserCtrl.SetReadOnly(m_Logontype?FALSE:TRUE);
-        m_PassCtrl.SetReadOnly(m_Logontype?FALSE:TRUE); 
-        m_PassCtrl.EnableWindow((!m_bPassDontSave || !m_Logontype) && !_ttoi(COptions::GetOption(OPTION_RUNINSECUREMODE)));         
+        m_PassCtrl.SetReadOnly(m_Logontype?FALSE:TRUE);
+        m_PassCtrl.EnableWindow((!m_bPassDontSave || !m_Logontype) && !_ttoi(COptions::GetOption(OPTION_RUNINSECUREMODE)));
         m_cDefault.EnableWindow(TRUE);
         m_cPassDontSave.EnableWindow((m_Logontype && !_ttoi(COptions::GetOption(OPTION_RUNINSECUREMODE)))?TRUE:FALSE);
         m_cServerType.EnableWindow(TRUE);
@@ -747 +747 @@
         {
             m_DeleteCtrl.EnableWindow(FALSE);
             GetDlgItem(IDC_SITEMANAGER_RENAME)->EnableWindow(FALSE);
-        
+
         }
         m_HostCtrl.EnableWindow(FALSE);
         m_PortCtrl.EnableWindow(FALSE);
@@ -767 +767 @@
     }
 }
 
-void CSiteManager::OnDelete() 
+void CSiteManager::OnDelete()
 {
     HTREEITEM item=m_cTree.GetSelectedItem();
     if (!item)
@@ -783 +783 @@
     }
     path.TrimRight( _T("\\") );
     m_KeysToDelete.push_back(path);
-    
+
     item=m_cTree.GetSelectedItem();
     while(item!=parent)
     {
@@ -799 +799 @@
         if (m_DefaultSite==item)
             m_DefaultSite=m_cTree.GetRootItem();
         m_cTree.DeleteItem(item);
-        item=parent;        
+        item=parent;
     }
     m_cTree.SelectItem(parent);
 }
@@ -858 +858 @@
         pMarkup->AddChildElem( _T("Sites") );
 
     pMarkup->IntoElem();
-    
+
     //Only delete the old items that have been renamed or removed
     //Don't delete complete sitemanager key so that crashes while saving would not be fatal
     pMarkup->SavePos( _T("PREDELETE") );
@@ -872 +872 @@
                 current+="\\"+pMarkup->GetChildAttrib( _T("Name") );
             else
                 current=pMarkup->GetChildAttrib( _T("Name") );
-            
+
             if (m_KeysToDelete.empty())
                 break;
-            
+
             std::list<CString>::iterator iter;
             for (iter=m_KeysToDelete.begin(); iter!=m_KeysToDelete.end(); iter++)
                 if (*iter==current)
@@ -886 +886 @@
                 }
             if (m_KeysToDelete.empty())
                 break;
-            
+
             if (iter==m_KeysToDelete.end())
                 pMarkup->IntoElem();
             else
@@ -897 +897 @@
                 else
                     current=current.Left(pos);
             }
-            
+
             res=pMarkup->FindChildElem();
             while (!res && current!="")
             {
@@ -926 +926 @@
                 }
             if (m_KeysToDelete.empty())
                 break;
-            
+
             res=pMarkup->FindChildElem();
             while (!res && current!="")
             {
@@ -939 +939 @@
                 res=pMarkup->FindChildElem();
             }
         }
-        
+
     }
     VERIFY(pMarkup->RestorePos( _T("PREDELETE") ));
 
@@ -986 +986 @@
             }
 
             pMarkup->IntoElem();
-    
+
             if (path!="")
                 path+="/"+m_cTree.GetItemText(item);
             else
                 path=m_cTree.GetItemText(item);
             continue;
         }
-        
+
         HTREEITEM parent=m_cTree.GetParentItem(item);
         pSite = reinterpret_cast<t_SiteManagerItem *>(m_cTree.GetItemData(item));
         if (pSite)
@@ -1010 +1010 @@
     }
 }
 
-void CSiteManager::OnCancel() 
+void CSiteManager::OnCancel()
 {
     m_cTree.SetRedraw(FALSE);
     HTREEITEM item=m_cTree.GetChildItem(TVI_ROOT);
@@ -1026 +1026 @@
             delete site;
         HTREEITEM parent=m_cTree.GetParentItem(item);
         m_cTree.DeleteItem(item);
-        item=parent;        
+        item=parent;
     }
     m_cTree.SetRedraw(TRUE);
     CDialog::OnCancel();
 }
 
-void CSiteManager::OnRadio() 
+void CSiteManager::OnRadio()
 {
     UpdateData(TRUE);
     if (!m_Logontype)
@@ -1056 +1056 @@
     SetCtrlState();
 }
 
-void CSiteManager::OnExit() 
+void CSiteManager::OnExit()
 {
     m_cTree.SetRedraw(FALSE);
     if (CheckValid())
@@ -1068 +1068 @@
     m_cTree.SetRedraw(TRUE);
 }
 
-void CSiteManager::OnKillfocusHost() 
+void CSiteManager::OnKillfocusHost()
 {
     UpdateData(TRUE);
     t_SiteManagerItem *data=(t_SiteManagerItem *)m_cTree.GetItemData(m_cTree.GetSelectedItem());
@@ -1131 +1131 @@
         {
             return;
         }
-        
-        
+
+
     }
     pos=m_Host.ReverseFind('@');
     if (pos!=-1)
@@ -1145 +1145 @@
         }
         m_Host=m_Host.Right(m_Host.GetLength()-pos-1);
         m_User=tmp.Left(pos2);
-        m_Pass=tmp.Right(tmp.GetLength()-pos2-1);   
+        m_Pass=tmp.Right(tmp.GetLength()-pos2-1);
         m_Logontype=1;
         SetCtrlState();
     }
@@ -1159 +1159 @@
     UpdateData(FALSE);
 }
 
-void CSiteManager::OnSitemanagerSaveexit() 
+void CSiteManager::OnSitemanagerSaveexit()
 {
-    OnExit();   
+    OnExit();
 }
 
 BOOL ReadString(CArchive &ar,CString &str)
@@ -1176 +1176 @@
     return TRUE;
 }
 
-void CSiteManager::OnSitemanagerFileImport() 
+void CSiteManager::OnSitemanagerFileImport()
 {
     if (!CheckValid())
-        return; 
+        return;
     CString str;
     str.LoadString(IDS_SITEMANAGER_XMLFILES);
     CFileDialog dlg(TRUE, _T("xml"), _T("FTP Sites"), OFN_FILEMUSTEXIST, str);
@@ -1189 +1189 @@
     }
 }
 
-void CSiteManager::OnSitemanagerFileExportAsurllist() 
+void CSiteManager::OnSitemanagerFileExportAsurllist()
 {
     if (!CheckValid())
         return;
 
     USES_CONVERSION;
-    
+
     CString str;
     str.LoadString(IDS_SITEMANAGER_TEXTFILES);
     CFileDialog dlg(FALSE, _T("txt"), _T("FTP Sites"), OFN_OVERWRITEPROMPT, str);
@@ -1245 +1245 @@
     }
 }
 
-void CSiteManager::OnSitemanagerFileExportWithalldetails() 
+void CSiteManager::OnSitemanagerFileExportWithalldetails()
 {
     USES_CONVERSION;
-    
+
     if (!CheckValid())
-        return; 
+        return;
     CString str;
     str.LoadString(IDS_SITEMANAGER_XMLFILES);
     CFileDialog dlg(FALSE, _T("xml"), _T("FTP Sites"), OFN_OVERWRITEPROMPT, str);
@@ -1285 +1285 @@
             else
             {
                 markup.AddChildElem(  _T("Folder") );
-                markup.AddChildAttrib( _T("Name"), m_cTree.GetItemText(item));  
+                markup.AddChildAttrib( _T("Name"), m_cTree.GetItemText(item));
             }
 
             HTREEITEM item2=m_cTree.GetNextSiblingItem(item);
@@ -1347 +1347 @@
         if (str=="")
             continue;
         int pos;
-            
+
         if ((pos=str.Find( _T(": ") ))!=-1)
         { //Server list with details
             t_SiteManagerItem *pSite = new t_SiteManagerItem;
@@ -1355 +1355 @@
             pSite->nPort = 21;
             pSite->nLogonType = -1;
             CString folder;
-            
+
             do
             {
                 if (str=="")
@@ -1477 +1477 @@
                 name2.MakeLower();
                 CString childstr=m_cTree.GetItemText(child);
                 childstr.MakeLower();
-                if (childstr==name2)            
+                if (childstr==name2)
                 {
                     child=m_cTree.GetChildItem(hParent);
                     newname.Format(_T("%s (%d)"), pSite->name, i);
@@ -1499 +1499 @@
             pSite->nPort=0;
             pSite->bFirewallBypass=0;
             pSite->bPassDontSave=0;
-            
+
             pos=str.Find('/');
             if (pos!=-1)
             {
@@ -1532 +1532 @@
             {
                 pSite->nPort=_ttoi(str.Mid(pos+1));
                 str=str.Left(pos);
-                
+
             }
 
             if (!pSite->nPort)
@@ -1555 +1555 @@
                 name2.MakeLower();
                 CString childstr=m_cTree.GetItemText(child);
                 childstr.MakeLower();
-                if (childstr==name2)            
+                if (childstr==name2)
                 {
                     child=m_cTree.GetChildItem(hParent);
                     newname.Format(_T("%s (%d)"), pSite->name, i);
@@ -1594 +1594 @@
                 name2.MakeLower();
                 CString childstr=m_cTree.GetItemText(child);
                 childstr.MakeLower();
-                if (childstr==name2)            
+                if (childstr==name2)
                     break;
                 child=m_cTree.GetNextSiblingItem(child);
             }
@@ -1631 +1631 @@
                     name2.MakeLower();
                     CString childstr=m_cTree.GetItemText(child);
                     childstr.MakeLower();
-                    if (childstr==name2)            
+                    if (childstr==name2)
                     {
                         child=m_cTree.GetChildItem(parent);
                         newname.Format(_T("%s (%d)"), name, i);
@@ -1666 +1666 @@
     return DoModal();
 }
 
-void CSiteManager::OnClose() 
+void CSiteManager::OnClose()
 {
     HTREEITEM item=m_cTree.GetChildItem(TVI_ROOT);
     while(item)
@@ -1681 +1681 @@
             delete site;
         HTREEITEM parent=m_cTree.GetParentItem(item);
         m_cTree.DeleteItem(item);
-        item=parent;        
+        item=parent;
     }
     CDialog::OnClose();
 }
@@ -1741 +1741 @@
     pMarkup->AddChildAttrib( _T("UTF8"), site->nUTF8);
 }
 
-void CSiteManager::OnPassdontsave() 
+void CSiteManager::OnPassdontsave()
 {
     UpdateData(TRUE);
-    m_PassCtrl.EnableWindow(!m_bPassDontSave);          
+    m_PassCtrl.EnableWindow(!m_bPassDontSave);
     m_Pass="";
     UpdateData(FALSE);
 }
@@ -1758 +1758 @@
 //             Registry key are children.
 //
 void CSiteManager::ReadTree(CString substring, const LPVOID &parent, LPVOID lpData, LPVOID lpDefault,
-                            BUILDSITETREEPROC_NEW_ITEM NewItemProc, BUILDSITETREEPROC_NEW_FOLDER NewFolderProc, 
+                            BUILDSITETREEPROC_NEW_ITEM NewItemProc, BUILDSITETREEPROC_NEW_FOLDER NewFolderProc,
                             BUILDSITETREEPROC_AFTER AfterProc)
 {
     substring.TrimLeft( _T("\\") );
@@ -1771 +1771 @@
             return;
         hRootKey = HKEY_LOCAL_MACHINE;
     }
-    
+
     TCHAR buffer[1000];
     int index=0;
     unsigned char value[1000];
@@ -1864 +1864 @@
     }
 }
 
-void CSiteManager::OnSelchangingSitemanagertree(NMHDR* pNMHDR, LRESULT* pResult) 
+void CSiteManager::OnSelchangingSitemanagertree(NMHDR* pNMHDR, LRESULT* pResult)
 {
     NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
     if (!CheckValid())
@@ -1877 +1877 @@
     *pResult = 0;
 }
 
-void CSiteManager::OnSelchangedSitemanagertree(NMHDR* pNMHDR, LRESULT* pResult) 
+void CSiteManager::OnSelchangedSitemanagertree(NMHDR* pNMHDR, LRESULT* pResult)
 {
     NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
     t_SiteManagerItem *pSiteManagerItem = (t_SiteManagerItem *)pNMTreeView->itemNew.lParam;
@@ -1937 +1937 @@
     SetCtrlState();
 }
 
-void CSiteManager::OnItemexpandedSitemanagertree(NMHDR* pNMHDR, LRESULT* pResult) 
+void CSiteManager::OnItemexpandedSitemanagertree(NMHDR* pNMHDR, LRESULT* pResult)
 {
     NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
-    
+
     int image=(pNMTreeView->itemNew.state&TVIS_EXPANDED)?1:0;
     m_cTree.SetItemImage(pNMTreeView->itemNew.hItem,image,image);
     *pResult = 0;
 }
 
-BOOL CSiteManager::PreTranslateMessage(MSG* pMsg) 
+BOOL CSiteManager::PreTranslateMessage(MSG* pMsg)
 {
     if (pMsg->message==WM_KEYDOWN)
     {
@@ -1983 +1983 @@
             }
         }
     }
-    
+
     return CDialog::PreTranslateMessage(pMsg);
 }
 
-void CSiteManager::OnDblclkSitemanagertree(NMHDR* pNMHDR, LRESULT* pResult) 
+void CSiteManager::OnDblclkSitemanagertree(NMHDR* pNMHDR, LRESULT* pResult)
 {
     *pResult = 0;
     HTREEITEM item=m_cTree.GetSelectedItem();
@@ -1998 +1998 @@
     if (site->NodeType != SITE)
         return;
     *pResult = TRUE;
-    OnOK(); 
+    OnOK();
 }
 
 DWORD CSiteManager::RegDeleteKeyEx(CString subkey)
@@ -2022 +2022 @@
     return retval;
 }
 
-void CSiteManager::OnEndlabeleditSitemanagertree(NMHDR* pNMHDR, LRESULT* pResult) 
+void CSiteManager::OnEndlabeleditSitemanagertree(NMHDR* pNMHDR, LRESULT* pResult)
 {
     TV_DISPINFO* pTVDispInfo = (TV_DISPINFO*)pNMHDR;
     if (!pTVDispInfo->item.pszText)
@@ -2095 +2095 @@
     *pResult = TRUE;
 }
 
-void CSiteManager::OnSitemanagerNewfolder() 
+void CSiteManager::OnSitemanagerNewfolder()
 {
     if (!CheckValid())
         return;
@@ -2104 +2104 @@
         parent=m_cTree.GetRootItem();
     if (((t_SiteManagerItem *)m_cTree.GetItemData(parent))->NodeType == SITE)
         parent=m_cTree.GetParentItem(parent);
-    
+
     CString name;
     name.Format(IDS_SITEMANAGER_NEWFOLDER);
 
@@ -2116 +2116 @@
         name2.MakeLower();
         CString childstr=m_cTree.GetItemText(child);
         childstr.MakeLower();
-        if (childstr==name2)            
+        if (childstr==name2)
         {
             child=m_cTree.GetChildItem(parent);
             name.Format(IDS_SITEMANAGER_NEWFOLDERWITHNUM,i);
@@ -2125 +2125 @@
         }
         child=m_cTree.GetNextItem(child,TVGN_NEXT);
     }
-    
+
     HTREEITEM item=m_cTree.InsertItem(name,0,0,parent,TVI_SORT);
     t_SiteManagerItem *pFolder = new t_SiteManagerItem;
     pFolder->name=name;
@@ -2143 +2143 @@
 
     m_cTree.Expand(parent,TVE_EXPAND);m_cTree.SelectItem(item);
     DisplaySite(0);
-    m_cTree.EditLabel(item);    
+    m_cTree.EditLabel(item);
 }
 
 t_SiteManagerItem * CSiteManager::GetDefaultSite(CString substring)
@@ -2159 +2159 @@
                 pMarkup->IntoElem();
                 t_SiteManagerItem *pSite = GetDefaultSiteXML(pMarkup);
                 COptions::UnlockXML();
-                return pSite;   
+                return pSite;
             }
             COptions::UnlockXML();
         }
     }
-    
+
     HKEY key;
     HKEY hRootKey = HKEY_CURRENT_USER;
     if (RegOpenKey(HKEY_CURRENT_USER, "Software\\FileZilla\\Site Manager\\" + substring, &key) != ERROR_SUCCESS)
@@ -2196 +2196 @@
                 return site;
             index++;
             length=1000;
-        }   
+        }
     }
     else
     {
@@ -2205 +2205 @@
         {
             if (GetKey(hRootKey, substring,"Default Site")=="1")
                 return site;
-            else 
+            else
                 delete site;
         }
         index++;
         length=1000;
     }
     RegCloseKey(key);
-    
+
     return 0;
 }
 
@@ -2244 +2244 @@
     return 0;
 }
 
-void CSiteManager::OnBegindragSitemanagertree(NMHDR* pNMHDR, LRESULT* pResult) 
+void CSiteManager::OnBegindragSitemanagertree(NMHDR* pNMHDR, LRESULT* pResult)
 {
     NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR;
     // TODO: Code für die Behandlungsroutine der Steuerelement-Benachrichtigung hier einfügen
@@ -2261 +2261 @@
         return;
 
     m_cTree.EnsureVisible(pNMTreeView->itemNew.hItem);
-    
+
 
     m_pDragImage=m_cTree.CreateDragImage(pNMTreeView->itemNew.hItem);
     if (m_pDragImage == NULL)
@@ -2270 +2270 @@
     }
     m_hDragItem=pNMTreeView->itemNew.hItem;
 
-    CRect rect; 
-    ::GetWindowRect(m_cTree.m_hWnd, &rect); 
-    CPoint pt2 = pNMTreeView->ptDrag; 
+    CRect rect;
+    ::GetWindowRect(m_cTree.m_hWnd, &rect);
+    CPoint pt2 = pNMTreeView->ptDrag;
     pt2.Offset(rect.left, rect.top);
     m_pDragImage->BeginDrag(0, CPoint(0,0));
-    m_pDragImage->DragEnter(0, pt2); 
+    m_pDragImage->DragEnter(0, pt2);
 
     SetCapture();
 }
 
-void CSiteManager::OnMouseMove(UINT nFlags, CPoint point) 
-{   
+void CSiteManager::OnMouseMove(UINT nFlags, CPoint point)
+{
     if (m_pDragImage) // In Drag&Drop mode ?
     {
         CPoint ptDropPoint(point);
@@ -2289 +2289 @@
         CWnd* pDropWnd = CWnd::WindowFromPoint(ptDropPoint);
 
         m_pDragImage->DragMove(ptDropPoint);
-        
+
         //Scroll through tree
         RECT rect;
         m_cTree.GetWindowRect(&rect);
@@ -2300 +2300 @@
             {
                 if (!m_nDragScrollTimerID)
                 {
-                    
+
                     HTREEITEM hItem=m_cTree.GetFirstVisibleItem();
                     if (hItem)
                         hItem=m_cTree.GetNextItem(hItem, TVGN_PREVIOUSVISIBLE);
@@ -2321 +2321 @@
                     HTREEITEM hItem=m_cTree.GetFirstVisibleItem();
                     while(hItem)
                     {
-                        
+
                         RECT iRect;
                         m_cTree.GetItemRect(hItem, &iRect, TRUE);
                         if (iRect.bottom>=(rect.bottom-rect.top))
@@ -2353 +2353 @@
         if (hItem!=m_hDropItem)
         {
             m_pDragImage->DragShowNolock(FALSE);
-            m_cTree.SelectDropTarget(hItem); 
+            m_cTree.SelectDropTarget(hItem);
             m_pDragImage->DragShowNolock(TRUE);
             m_hDropItem=hItem;
         }
@@ -2388 +2388 @@
                     if (str==dragstr)
                         bError=TRUE;
                     else
-                        hChild=m_cTree.GetNextItem(hChild, TVGN_NEXT);              
+                        hChild=m_cTree.GetNextItem(hChild, TVGN_NEXT);
                 }
                 else
-                    hChild=m_cTree.GetNextItem(hChild, TVGN_NEXT);              
+                    hChild=m_cTree.GetNextItem(hChild, TVGN_NEXT);
             }
         }
 
@@ -2399 +2399 @@
 
         return;
     }
-        
+
     CDialog::OnMouseMove(nFlags, point);
 }
 
-void CSiteManager::OnLButtonUp(UINT nFlags, CPoint point) 
+void CSiteManager::OnLButtonUp(UINT nFlags, CPoint point)
 {
     if (m_pDragImage) // In Drag&Drop mode ?
     {
@@ -2422 +2422 @@
         ClientToScreen(&pt);
         CWnd* m_pDropWnd = WindowFromPoint(pt);
 
-        if (m_pDropWnd == &m_cTree) 
+        if (m_pDropWnd == &m_cTree)
         {
             BOOL nError=0;
             if (hDropItem==m_hDragItem || m_cTree.GetParentItem(m_hDragItem)==hDropItem)
@@ -2474 +2474 @@
                 }
                 path+=m_cTree.GetItemText(m_hDragItem);
                 m_KeysToDelete.push_back(path);
-                
+
                 HTREEITEM hDragTemp=m_hDragItem;
                 HTREEITEM hDropTemp=hDropItem;
                 TCHAR str[1000];
@@ -2584 +2584 @@
                 m_pDragImage->DragShowNolock(FALSE);
                 m_cTree.EnsureVisible(hItem);
                 m_cTree.RedrawWindow();
-                m_pDragImage->DragShowNolock(TRUE);             
+                m_pDragImage->DragShowNolock(TRUE);
             }
         }
         else if (m_CurPos.y>(rect.bottom-5))
@@ -2614 +2614 @@
         if (hItem!=m_hDropItem)
         {
             m_pDragImage->DragShowNolock(FALSE);
-            m_cTree.SelectDropTarget(hItem); 
+            m_cTree.SelectDropTarget(hItem);
             m_pDragImage->DragShowNolock(TRUE);
             m_hDropItem=hItem;
         }
     }
 }
 
-void CSiteManager::OnSelchangeServertype() 
+void CSiteManager::OnSelchangeServertype()
 {
     UpdateData();
 
@@ -2663 +2663 @@
     }
 }
 
-void CSiteManager::OnSitemanagerAdvanced() 
+void CSiteManager::OnSitemanagerAdvanced()
 {
     HTREEITEM item = m_cTree.GetSelectedItem();
     if (!item)
         return;
-    
+
     t_SiteManagerItem *site = (t_SiteManagerItem *)m_cTree.GetItemData(item);
     if (!site || site->NodeType != SITE)
         return;
 
     CSiteManagerAdvancedDlg dlg(site);
-    
+
     dlg.DoModal();
 }
 
@@ -2689 +2689 @@
     nUTF8 = 0;
 }
 
-void CSiteManager::OnSitemanagerCopy() 
+void CSiteManager::OnSitemanagerCopy()
 {
     if (!CheckValid())
         return;
@@ -2704 +2704 @@
     ASSERT(m_cTree.GetItemData(parent));
     if (((t_SiteManagerItem *)m_cTree.GetItemData(parent))->NodeType==SITE)
         return;
-    
+
     ASSERT(m_cTree.GetItemData(parent) && ((t_SiteManagerItem *)m_cTree.GetItemData(parent))->NodeType==FOLDER);
-    
+
     CString name = m_cTree.GetItemText(from);
 
     HTREEITEM child=m_cTree.GetChildItem(parent);
@@ -2717 +2717 @@
         name2.MakeLower();
         CString childstr=m_cTree.GetItemText(child);
         childstr.MakeLower();
-        if (childstr==name2)            
+        if (childstr==name2)
         {
             child=m_cTree.GetChildItem(parent);
             name.Format(m_cTree.GetItemText(from) + _T(" %d"), i);
@@ -2726 +2726 @@
         }
         child=m_cTree.GetNextItem(child,TVGN_NEXT);
     }
-    
+
     HTREEITEM item=m_cTree.InsertItem(name, 2, 2, parent, TVI_SORT);
     m_cTree.Expand(parent, TVE_EXPAND);
     t_SiteManagerItem *site=new t_SiteManagerItem;
@@ -2745 +2745 @@
 
     m_cTree.SelectItem(item);
     DisplaySite(site);
-    m_cTree.EditLabel(item);    
+    m_cTree.EditLabel(item);
 }
 
-void CSiteManager::OnSitemanagerRename() 
+void CSiteManager::OnSitemanagerRename()
 {
     HTREEITEM item=m_cTree.GetSelectedItem();
     if (!item)
@@ -2777 +2777 @@
             pMarkup->IntoElem();
             t_SiteManagerItem *pSite = GetSiteByNameXML(pMarkup, name);
             COptions::UnlockXML();
-            return pSite;   
+            return pSite;
         }
         COptions::UnlockXML();
     }
@@ -2827 +2827 @@
     };
 
     return GetDataXML(pMarkup);
-}
- No newline at end of file
+}

source/FileZilla.rc

@@ -52 +52 @@
     LTEXT           "&Host:",IDC_STATIC,148,52,18,8
     EDITTEXT        IDC_MANUALTRANSFER_HOST,148,61,127,14,ES_AUTOHSCROLL
     LTEXT           "&Port:",IDC_STATIC,281,52,16,8
-    EDITTEXT        IDC_MANUALTRANSFER_PORT,280,61,25,14,ES_AUTOHSCROLL | 
+    EDITTEXT        IDC_MANUALTRANSFER_PORT,280,61,25,14,ES_AUTOHSCROLL |
                     ES_NUMBER
     LTEXT           "&Servertype:",IDC_STATIC,148,80,37,8
     COMBOBOX        IDC_MANUALTRANSFER_SERVERTYPE,148,90,157,49,
@@ -68 +68 @@
     LTEXT           "Us&er:",IDC_STATIC,148,149,18,8
     EDITTEXT        IDC_MANUALTRANSFER_USER,148,158,157,14,ES_AUTOHSCROLL
     LTEXT           "Pass&word:",IDC_STATIC,148,176,34,8
-    EDITTEXT        IDC_MANUALTRANSFER_PASS,148,185,157,14,ES_PASSWORD | 
+    EDITTEXT        IDC_MANUALTRANSFER_PASS,148,185,157,14,ES_PASSWORD |
                     ES_AUTOHSCROLL
     DEFPUSHBUTTON   "OK",IDOK,15,191,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,75,191,50,14
@@ -77 +77 @@
 END
 
 IDD_ABOUTBOX DIALOGEX 0, 0, 235, 82
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU
 CAPTION "About FileZilla"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -91 +91 @@
                     IDC_HOMEPAGE,82,54,146,8
     LTEXT           "Tim Kosse",IDC_MAIL,82,40,34,8
     LTEXT           "Homepage:",IDC_STATIC,41,54,38,8
-    LTEXT           "Translated by:",IDC_TRANSLATEDBY,41,68,46,8,NOT 
+    LTEXT           "Translated by:",IDC_TRANSLATEDBY,41,68,46,8,NOT
                     WS_VISIBLE
-    LTEXT           "<your name> (<your e-mail>)",IDC_MAIL2,89,68,89,8,NOT 
+    LTEXT           "<your name> (<your e-mail>)",IDC_MAIL2,89,68,89,8,NOT
                     WS_VISIBLE
     CONTROL         "",IDC_DONATE,"Static",SS_BITMAP,182,28,15,13
 END
@@ -138 +138 @@
     CONTROL         "&Skip",IDC_FILEEXISTS_SKIP,"Button",BS_AUTORADIOBUTTON,
                     172,62,30,10
     CONTROL         "Always use this action when a file already exists",
-                    IDC_FILEEXISTS_ALWAYS,"Button",BS_AUTOCHECKBOX | 
+                    IDC_FILEEXISTS_ALWAYS,"Button",BS_AUTOCHECKBOX |
                     BS_VCENTER | BS_MULTILINE | WS_GROUP | WS_TABSTOP,170,83,
                     82,30
     DEFPUSHBUTTON   "OK",IDOK,105,103,50,14
@@ -152 +152 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL         "&Limit local ports used by FileZilla",
-                    IDC_OPTIONS_FIREWALL_LIMITPORTS,"Button",BS_AUTOCHECKBOX | 
+                    IDC_OPTIONS_FIREWALL_LIMITPORTS,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,7,116,10
     LTEXT           "By default FileZilla uses any available local port to establish connections and transfers. If you want FileZilla to use only a small range of ports, please enter the port range below.",
                     IDC_STATIC,19,17,260,24
@@ -227 +227 @@
 BEGIN
     LTEXT           "Please select the language, FileZilla should use:",
                     IDC_STATIC,7,7,152,8
-    LISTBOX         IDC_LANGUAGELIST,7,21,154,153,LBS_NOINTEGRALHEIGHT | 
+    LISTBOX         IDC_LANGUAGELIST,7,21,154,153,LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP
 END
 
@@ -243 +243 @@
                     13,29,137,10
     EDITTEXT        IDC_DEFAULTFOLDER,24,41,160,14,ES_AUTOHSCROLL | WS_GROUP
     CONTROL         "&Open Sitemanager each time FileZilla starts",
-                    IDC_SITEMANAGERONSTART,"Button",BS_AUTOCHECKBOX | 
+                    IDC_SITEMANAGERONSTART,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,13,77,151,10
     CONTROL         "Sort &folders first in Sitemanager",
-                    IDC_SITEMANAGERSORTFOLDERSFIRST,"Button",BS_AUTOCHECKBOX | 
+                    IDC_SITEMANAGERSORTFOLDERSFIRST,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,13,89,113,10
     CONTROL         "Don't &expand folders by default",
-                    IDC_SITEMANAGEREXPANDFOLDERS,"Button",BS_AUTOCHECKBOX | 
+                    IDC_SITEMANAGEREXPANDFOLDERS,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,13,101,113,10
     GROUPBOX        "Sitemanager Options",IDC_STATIC,7,66,272,49
 END
@@ -284 +284 @@
 END
 
 IDD_CHMOD DIALOGEX 0, 0, 199, 186
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU
 CAPTION "Change File Attributes"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT           "Text",IDC_TEXT,7,7,185,19
     GROUPBOX        "Owner permissions",IDC_STATIC,7,27,185,25
-    CONTROL         "&Read",IDC_OWNERREAD,"Button",BS_AUTO3STATE | 
+    CONTROL         "&Read",IDC_OWNERREAD,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,19,38,33,10
-    CONTROL         "&Write",IDC_OWNERWRITE,"Button",BS_AUTO3STATE | 
+    CONTROL         "&Write",IDC_OWNERWRITE,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,78,38,33,10
-    CONTROL         "&Execute",IDC_OWNEREXECUTE,"Button",BS_AUTO3STATE | 
+    CONTROL         "&Execute",IDC_OWNEREXECUTE,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,137,38,42,10
     GROUPBOX        "Group permissions",IDC_STATIC,7,58,185,25
-    CONTROL         "Re&ad",IDC_GROUPREAD,"Button",BS_AUTO3STATE | 
+    CONTROL         "Re&ad",IDC_GROUPREAD,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,19,69,33,10
-    CONTROL         "W&rite",IDC_GROUPWRITE,"Button",BS_AUTO3STATE | 
+    CONTROL         "W&rite",IDC_GROUPWRITE,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,78,69,33,10
-    CONTROL         "E&xecute",IDC_GROUPEXECUTE,"Button",BS_AUTO3STATE | 
+    CONTROL         "E&xecute",IDC_GROUPEXECUTE,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,137,69,42,10
     GROUPBOX        "Public permissions",IDC_STATIC,7,89,185,25
-    CONTROL         "Rea&d",IDC_PUBLICREAD,"Button",BS_AUTO3STATE | 
+    CONTROL         "Rea&d",IDC_PUBLICREAD,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,19,100,33,10
-    CONTROL         "Wr&ite",IDC_PUBLICWRITE,"Button",BS_AUTO3STATE | 
+    CONTROL         "Wr&ite",IDC_PUBLICWRITE,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,78,100,33,10
-    CONTROL         "Exec&ute",IDC_PUBLICEXECUTE,"Button",BS_AUTO3STATE | 
+    CONTROL         "Exec&ute",IDC_PUBLICEXECUTE,"Button",BS_AUTO3STATE |
                     WS_TABSTOP,137,100,42,10
     LTEXT           "Please note that not all servers understand this command. This command is mostly used by UNIX servers.",
                     IDC_STATIC,7,144,185,20
@@ -332 +332 @@
     EDITTEXT        IDC_USER,95,28,56,14,ES_AUTOHSCROLL
     LTEXT           "&Password:",IDC_STATIC,57,52,34,8
     EDITTEXT        IDC_PASS,95,50,56,14,ES_PASSWORD | ES_AUTOHSCROLL
-    CONTROL         "&Transfer now",IDC_TRANSFERNOW,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "&Transfer now",IDC_TRANSFERNOW,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,75,70,57,10
     DEFPUSHBUTTON   "&OK",IDOK,46,85,50,14
     PUSHBUTTON      "&Cancel",IDCANCEL,112,85,50,14
@@ -343 +343 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX        "Default transfer type",IDC_STATIC,7,7,272,47
-    CONTROL         "A&uto detect",IDC_TYPEMODE,"Button",BS_AUTORADIOBUTTON | 
+    CONTROL         "A&uto detect",IDC_TYPEMODE,"Button",BS_AUTORADIOBUTTON |
                     WS_GROUP,16,20,53,10
     CONTROL         "A&SCII",IDC_TYPEMODE2,"Button",BS_AUTORADIOBUTTON,16,30,
                     34,10
@@ -354 +354 @@
     GROUPBOX        "ASCII files",IDC_STATIC,7,61,272,140,WS_GROUP
     LTEXT           "If you have chosen autodetect, FileZilla will use ASCII transfer for the following file types:",
                     IDC_STATIC,14,76,256,16
-    LISTBOX         IDC_TYPELIST,13,98,87,95,LBS_SORT | LBS_NOINTEGRALHEIGHT | 
+    LISTBOX         IDC_TYPELIST,13,98,87,95,LBS_SORT | LBS_NOINTEGRALHEIGHT |
                     WS_VSCROLL | WS_TABSTOP
     EDITTEXT        IDC_TYPENAME,112,98,49,14,ES_AUTOHSCROLL
     PUSHBUTTON      "&Add",IDC_TYPEADD,111,117,50,14
@@ -370 +370 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "Tree1",IDC_SITEMANAGERTREE,"SysTreeView32",
-                    TVS_HASBUTTONS | TVS_HASLINES | TVS_EDITLABELS | 
+                    TVS_HASBUTTONS | TVS_HASLINES | TVS_EDITLABELS |
                     TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,4,160,204
     GROUPBOX        "Site details",IDC_STATIC,174,0,169,244
     LTEXT           "&Host:",IDC_STATIC,180,11,18,8
@@ -378 +378 @@
     LTEXT           "&Port:",IDC_STATIC,312,11,16,8
     EDITTEXT        IDC_PORT,312,20,25,14,ES_AUTOHSCROLL | ES_NUMBER
     LTEXT           "&Servertype:",IDC_STATIC,180,38,37,8
-    COMBOBOX        IDC_SERVERTYPE,180,48,157,49,CBS_DROPDOWNLIST | 
+    COMBOBOX        IDC_SERVERTYPE,180,48,157,49,CBS_DROPDOWNLIST |
                     WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Logontype",IDC_STATIC,180,66,157,38
-    CONTROL         "Anony&mous",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | 
+    CONTROL         "Anony&mous",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON |
                     WS_GROUP,189,77,53,10
     CONTROL         "Norma&l",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,259,77,
                     38,10
@@ -395 +395 @@
                     BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,180,162,86,
                     10
     LTEXT           "C&omments:",IDC_STATIC,180,177,36,8
-    EDITTEXT        IDC_SITEMANAGER_COMMENTS,180,188,157,28,ES_MULTILINE | 
+    EDITTEXT        IDC_SITEMANAGER_COMMENTS,180,188,157,28,ES_MULTILINE |
                     ES_AUTOVSCROLL | WS_VSCROLL
-    CONTROL         "De&fault site",IDC_DEFAULT,"Button",BS_AUTORADIOBUTTON | 
+    CONTROL         "De&fault site",IDC_DEFAULT,"Button",BS_AUTORADIOBUTTON |
                     WS_GROUP,180,226,51,10
     PUSHBUTTON      "&New Site",IDC_NEW,7,212,50,14,WS_GROUP
     PUSHBUTTON      "N&ew Folder",IDC_SITEMANAGER_NEWFOLDER,62,212,50,14,
@@ -429 +429 @@
     LTEXT           "Current configuration",IDC_STATIC,14,50,66,8
     LTEXT           "Show these parts of the GUI:",IDC_STATIC,27,62,39,28,
                     NOT WS_GROUP
-    CONTROL         "&Toolbar",IDC_SHOWTOOLBAR,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "&Toolbar",IDC_SHOWTOOLBAR,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,72,61,40,10
-    CONTROL         "&Statusbar",IDC_SHOWSTATUSBAR,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "&Statusbar",IDC_SHOWSTATUSBAR,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,138,61,46,10
     CONTROL         "&Quickconnect Bar",IDC_SHOWQUICKCONNECTBAR,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,203,61,73,10
@@ -447 +447 @@
     CONTROL         "Show &view labels",IDC_VIEWLABELS,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,13,123,71,10
     CONTROL         "Remember &window size and position of FileZilla",
-                    IDC_REMEMBERWINDOWPOS,"Button",BS_AUTOCHECKBOX | 
+                    IDC_REMEMBERWINDOWPOS,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,13,134,163,10
     CONTROL         "Mi&nimize to taskbar (default)",
                     IDC_OPTIONS_INTERFACE_MINIMIZETOTRAY,"Button",
@@ -466 +466 @@
 BEGIN
     CONTROL         "&Enable Kerberos GSS support",IDC_USEGSS,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,7,110,10
-    LISTBOX         IDC_SERVERLIST,15,64,108,129,LBS_SORT | 
+    LISTBOX         IDC_SERVERLIST,15,64,108,129,LBS_SORT |
                     LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     EDITTEXT        IDC_GSSSERVERNAME,129,64,49,14,ES_AUTOHSCROLL
     PUSHBUTTON      "&Add",IDC_SERVERADD,128,83,50,14
@@ -487 +487 @@
     LTEXT           "These settings are only for debug purposes. Normally you don't have to change them.\nBut if you encounter any problems in FileZilla you may enable the debug features. The additional output may help to fix the problem.",
                     IDC_STATIC,7,7,272,35
     CONTROL         "&Trace messages from the ftp engine",
-                    IDC_DEBUG_ENGINETRACE,"Button",BS_AUTOCHECKBOX | 
+                    IDC_DEBUG_ENGINETRACE,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,43,129,10
     CONTROL         "&Show raw directory listing",IDC_DEBUG_SHOWRAWLISTING,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,56,129,10
@@ -506 +506 @@
     LTEXT           "&User",IDC_STATIC,7,36,16,8
     EDITTEXT        IDC_EDIT7,7,47,40,14,ES_AUTOHSCROLL | WS_DISABLED
     LTEXT           "P&ass",IDC_STATIC,53,36,16,8
-    EDITTEXT        IDC_EDIT8,53,47,40,14,ES_PASSWORD | ES_AUTOHSCROLL | 
+    EDITTEXT        IDC_EDIT8,53,47,40,14,ES_PASSWORD | ES_AUTOHSCROLL |
                     WS_DISABLED
     GROUPBOX        "Proxy &type",IDC_STATIC,7,71,272,103
-    CONTROL         "None",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
+    CONTROL         "None",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON | WS_GROUP |
                     WS_TABSTOP,17,81,33,10
     CONTROL         "SITE hostname",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,
                     17,91,65,10
@@ -536 +536 @@
     LTEXT           "On this page you can configure the appearance of the local file list.",
                     IDC_STATIC,7,7,211,8
     CONTROL         "&Always use the following configuration:",
-                    IDC_OPTIONS_LOCALVIEW_ALWAYS,"Button",BS_AUTORADIOBUTTON | 
+                    IDC_OPTIONS_LOCALVIEW_ALWAYS,"Button",BS_AUTORADIOBUTTON |
                     WS_GROUP,7,20,137,10
-    LTEXT           "&Default list style:",IDC_STATIC,19,35,52,8,NOT 
+    LTEXT           "&Default list style:",IDC_STATIC,19,35,52,8,NOT
                     WS_GROUP
-    COMBOBOX        IDC_OPTIONS_LOCALVIEW_STYLE,73,34,72,76,CBS_DROPDOWNLIST | 
+    COMBOBOX        IDC_OPTIONS_LOCALVIEW_STYLE,73,34,72,76,CBS_DROPDOWNLIST |
                     WS_VSCROLL | WS_TABSTOP
     LTEXT           "Visible columns when using details style:",IDC_STATIC,
                     19,49,127,8,NOT WS_GROUP
@@ -587 +587 @@
     CONTROL         "&Always use the following configuration:",
                     IDC_OPTIONS_REMOTEVIEW_ALWAYS,"Button",
                     BS_AUTORADIOBUTTON | WS_GROUP,7,20,137,10
-    LTEXT           "D&efault list style:",IDC_STATIC,19,35,52,8,NOT 
+    LTEXT           "D&efault list style:",IDC_STATIC,19,35,52,8,NOT
                     WS_GROUP
     COMBOBOX        IDC_OPTIONS_REMOTEVIEW_STYLE,73,34,72,76,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -659 +659 @@
     LTEXT           "There are different types of directory caching available.",
                     IDC_STATIC,7,114,174,8,NOT WS_VISIBLE
     CONTROL         "Purge cache when FileZilla quits",
-                    IDC_OPTIONS_CACHE_CACHETYPE,"Button",BS_AUTORADIOBUTTON | 
+                    IDC_OPTIONS_CACHE_CACHETYPE,"Button",BS_AUTORADIOBUTTON |
                     NOT WS_VISIBLE,7,124,118,10
     CONTROL         "Use persistent cache",IDC_OPTIONS_CACHE_CACHETYPE2,
                     "Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,134,83,10
 END
 
 IDD_SERVER_CHANGEPASS DIALOGEX 0, 0, 186, 138
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
@@ -675 +675 @@
     LTEXT           "Please enter your old password for confirmation that you are allowed to change the password and enter the new password an confirm it.",
                     IDC_STATIC,7,33,172,24
     LTEXT           "&Old password:",IDC_STATIC,7,64,46,8
-    EDITTEXT        IDC_SERVER_CHANGEPASS_OLD,86,61,93,14,ES_PASSWORD | 
+    EDITTEXT        IDC_SERVER_CHANGEPASS_OLD,86,61,93,14,ES_PASSWORD |
                     ES_AUTOHSCROLL
     LTEXT           "&New password:",IDC_STATIC,7,83,50,8
-    EDITTEXT        IDC_SERVER_CHANGEPASS_NEW,86,80,93,14,ES_PASSWORD | 
+    EDITTEXT        IDC_SERVER_CHANGEPASS_NEW,86,80,93,14,ES_PASSWORD |
                     ES_AUTOHSCROLL
     LTEXT           "&Confirm new password:",IDC_STATIC,7,102,74,8
-    EDITTEXT        IDC_SERVER_CHANGEPASS_NEW2,86,99,93,14,ES_PASSWORD | 
+    EDITTEXT        IDC_SERVER_CHANGEPASS_NEW2,86,99,93,14,ES_PASSWORD |
                     ES_AUTOHSCROLL
     DEFPUSHBUTTON   "&OK",IDOK,35,117,50,14
     PUSHBUTTON      "&Cancel",IDCANCEL,99,117,50,14
@@ -803 +803 @@
     PUSHBUTTON      "&Browse",IDC_OPTIONS_VIEWEDIT_DEFAULT_BROWSE,229,31,50,
                     14
     LTEXT           "&Custom file associations:",IDC_STATIC,7,48,78,8
-    EDITTEXT        IDC_OPTIONS_VIEWEDIT_CUSTOM,7,58,272,99,ES_MULTILINE | 
-                    ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | 
+    EDITTEXT        IDC_OPTIONS_VIEWEDIT_CUSTOM,7,58,272,99,ES_MULTILINE |
+                    ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN |
                     WS_VSCROLL | WS_HSCROLL
     LTEXT           "Each line represents one file association. Every line begins with the file extension followed by a space. Then the program that will be used to view or edit the file follows. Quote extensions if they contain spaces itself. Invalid lines will be removed.",
                     IDC_STATIC,7,161,272,25
@@ -825 +825 @@
     LTEXT           "&System:",IDC_STATIC,177,41,26,8
     EDITTEXT        IDC_OPTIONS_IDENT_SYSTEM,206,38,73,14,ES_AUTOHSCROLL
     CONTROL         "Enable only when &connecting",
-                    IDC_OPTIONS_IDENT_IDENTCONNECT,"Button",BS_AUTOCHECKBOX | 
+                    IDC_OPTIONS_IDENT_IDENTCONNECT,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,58,109,10
     CONTROL         "Only accept requests from the same &IP",
-                    IDC_OPTIONS_IDENT_SAMEIP,"Button",BS_AUTOCHECKBOX | 
+                    IDC_OPTIONS_IDENT_SAMEIP,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,142,58,137,10
 END
 
@@ -848 +848 @@
                     ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
     LTEXT           "kB/s",IDC_STATIC,162,27,16,8
     LISTBOX         IDC_SPEEDLIMIT_DOWNLOAD_RULES_LIST,24,46,211,50,
-                    LBS_NOINTEGRALHEIGHT | WS_DISABLED | WS_VSCROLL | 
+                    LBS_NOINTEGRALHEIGHT | WS_DISABLED | WS_VSCROLL |
                     WS_GROUP | WS_TABSTOP
     PUSHBUTTON      "&Add",IDC_SPEEDLIMIT_DOWNLOAD_ADD,240,47,35,10,
                     WS_DISABLED
@@ -866 +866 @@
                     BS_AUTORADIOBUTTON,12,125,91,10
     CONTROL         "Us&e Speed Limit Rules:",IDC_SPEEDLIMIT_UPLOAD_RULES,
                     "Button",BS_AUTORADIOBUTTON,12,135,89,10
-    EDITTEXT        IDC_SPEEDLIMIT_UPLOAD_VALUE,105,122,55,14,ES_AUTOHSCROLL | 
+    EDITTEXT        IDC_SPEEDLIMIT_UPLOAD_VALUE,105,122,55,14,ES_AUTOHSCROLL |
                     ES_NUMBER | WS_DISABLED
     LTEXT           "kB/s",IDC_STATIC,163,125,16,8
     LISTBOX         IDC_SPEEDLIMIT_UPLOAD_RULES_LIST,24,146,211,50,
-                    LBS_NOINTEGRALHEIGHT | WS_DISABLED | WS_VSCROLL | 
+                    LBS_NOINTEGRALHEIGHT | WS_DISABLED | WS_VSCROLL |
                     WS_GROUP | WS_TABSTOP
     PUSHBUTTON      "A&dd",IDC_SPEEDLIMIT_UPLOAD_ADD,240,147,35,10,
                     WS_DISABLED
@@ -887 +887 @@
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX        "Criteria",IDC_STATIC,7,3,213,87
-    CONTROL         "&Date:",IDC_DATE_CHECK,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "&Date:",IDC_DATE_CHECK,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,15,18,33,10
     CONTROL         "DateTimePicker1",IDC_DATE_VALUE,"SysDateTimePick32",
-                    DTS_RIGHTALIGN | DTS_APPCANPARSE | DTS_LONGDATEFORMAT | 
+                    DTS_RIGHTALIGN | DTS_APPCANPARSE | DTS_LONGDATEFORMAT |
                     WS_TABSTOP,50,16,125,15
-    CONTROL         "&From:",IDC_FROM_CHECK,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "&From:",IDC_FROM_CHECK,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,15,39,33,10
     CONTROL         "DateTimePicker2",IDC_FROM_TIME,"SysDateTimePick32",
-                    DTS_RIGHTALIGN | DTS_UPDOWN | DTS_APPCANPARSE | 
+                    DTS_RIGHTALIGN | DTS_UPDOWN | DTS_APPCANPARSE |
                     WS_TABSTOP | 0x8,50,37,55,15
-    CONTROL         "T&o:",IDC_TO_CHECK,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "T&o:",IDC_TO_CHECK,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,117,39,27,10
     CONTROL         "DateTimePicker2",IDC_TO_TIME,"SysDateTimePick32",
-                    DTS_RIGHTALIGN | DTS_UPDOWN | DTS_APPCANPARSE | 
+                    DTS_RIGHTALIGN | DTS_UPDOWN | DTS_APPCANPARSE |
                     WS_TABSTOP | 0x8,145,37,55,15
-    CONTROL         "&Monday",IDC_CHECK_DAY1,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "&Monday",IDC_CHECK_DAY1,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,15,57,41,10
-    CONTROL         "&Tuesday",IDC_CHECK_DAY2,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "&Tuesday",IDC_CHECK_DAY2,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,61,57,43,10
-    CONTROL         "&Wednesday",IDC_CHECK_DAY3,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "&Wednesday",IDC_CHECK_DAY3,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,107,57,54,10
-    CONTROL         "T&hursday",IDC_CHECK_DAY4,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "T&hursday",IDC_CHECK_DAY4,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,165,57,45,10
-    CONTROL         "F&riday",IDC_CHECK_DAY5,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "F&riday",IDC_CHECK_DAY5,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,15,73,35,10
-    CONTROL         "&Saturday",IDC_CHECK_DAY6,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "&Saturday",IDC_CHECK_DAY6,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,61,73,44,10
-    CONTROL         "S&unday",IDC_CHECK_DAY7,"Button",BS_AUTOCHECKBOX | 
+    CONTROL         "S&unday",IDC_CHECK_DAY7,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,107,73,40,10
     LTEXT           "S&peed:",IDC_STATIC,7,99,24,8
     EDITTEXT        IDC_SPEED,34,96,50,14,ES_AUTOHSCROLL | ES_NUMBER
@@ -956 +956 @@
 END
 
 IDD_SITEMANAGER_ADVANCED DIALOGEX 0, 0, 239, 191
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
     WS_SYSMENU
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -980 +980 @@
     EDITTEXT        IDC_SITEMANAGER_ADVANCED_TZOFFSET,90,129,25,14,
                     ES_AUTOHSCROLL | ES_NUMBER
     CONTROL         "Spin1",IDC_SITEMANAGER_ADVANCED_TZSPIN,"msctls_updown32",
-                    UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | 
+                    UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
                     UDS_ARROWKEYS | UDS_NOTHOUSANDS,103,127,11,14
     LTEXT           "hours",IDC_STATIC,119,131,18,8
     EDITTEXT        IDC_SITEMANAGER_ADVANCED_TZOFFSET2,141,128,25,14,
                     ES_AUTOHSCROLL | ES_NUMBER
     CONTROL         "Spin1",IDC_SITEMANAGER_ADVANCED_TZSPIN2,"msctls_updown32",
-                    UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | 
+                    UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
                     UDS_ARROWKEYS | UDS_NOTHOUSANDS,151,126,11,14
     LTEXT           "minutes",IDC_STATIC,170,130,25,8
     LTEXT           "Use UTF8 on server if available:",IDC_STATIC,7,154,103,
@@ -1029 +1029 @@
 CAPTION "FileZilla Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "Tree1",IDC_PAGE_TREE,"SysTreeView32",TVS_HASBUTTONS | 
-                    TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | 
+    CONTROL         "Tree1",IDC_PAGE_TREE,"SysTreeView32",TVS_HASBUTTONS |
+                    TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP |
                     TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,4,5,113,174
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDFRAME,4,187,113,66
     DEFPUSHBUTTON   "OK",IDOK,12,194,97,14
@@ -1093 +1093 @@
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_MANUALTRANSFER, DIALOG
     BEGIN
@@ -1236 +1236 @@
 IDD_MANUALTRANSFER DLGINIT
 BEGIN
     IDC_MANUALTRANSFER_SERVERTYPE, 0x403, 4, 0
-0x5446, 0x0050, 
+0x5446, 0x0050,
     IDC_MANUALTRANSFER_SERVERTYPE, 0x403, 39, 0
-0x5446, 0x2050, 0x766f, 0x7265, 0x5320, 0x4c53, 0x542f, 0x534c, 0x2820, 
-0x6d69, 0x6c70, 0x6369, 0x7469, 0x6520, 0x636e, 0x7972, 0x7470, 0x6f69, 
-0x296e, "\000" 
+0x5446, 0x2050, 0x766f, 0x7265, 0x5320, 0x4c53, 0x542f, 0x534c, 0x2820,
+0x6d69, 0x6c70, 0x6369, 0x7469, 0x6520, 0x636e, 0x7972, 0x7470, 0x6f69,
+0x296e, "\000"
     IDC_MANUALTRANSFER_SERVERTYPE, 0x403, 35, 0
-0x5446, 0x2050, 0x766f, 0x7265, 0x5320, 0x4c53, 0x2820, 0x7865, 0x6c70, 
-0x6369, 0x7469, 0x6520, 0x636e, 0x7972, 0x7470, 0x6f69, 0x296e, "\000" 
+0x5446, 0x2050, 0x766f, 0x7265, 0x5320, 0x4c53, 0x2820, 0x7865, 0x6c70,
+0x6369, 0x7469, 0x6520, 0x636e, 0x7972, 0x7470, 0x6f69, 0x296e, "\000"
     IDC_MANUALTRANSFER_SERVERTYPE, 0x403, 16, 0
-0x4653, 0x5054, 0x7520, 0x6973, 0x676e, 0x5320, 0x4853, 0x0032, 
+0x4653, 0x5054, 0x7520, 0x6973, 0x676e, 0x5320, 0x4853, 0x0032,
     IDC_MANUALTRANSFER_SERVERTYPE, 0x403, 35, 0
-0x5446, 0x2050, 0x766f, 0x7265, 0x5420, 0x534c, 0x2820, 0x7865, 0x6c70, 
-0x6369, 0x7469, 0x6520, 0x636e, 0x7972, 0x7470, 0x6f69, 0x296e, "\000" 
+0x5446, 0x2050, 0x766f, 0x7265, 0x5420, 0x534c, 0x2820, 0x7865, 0x6c70,
+0x6369, 0x7469, 0x6520, 0x636e, 0x7972, 0x7470, 0x6f69, 0x296e, "\000"
     0
 END
 
 IDD_OPTIONS_LOCALVIEW DLGINIT
 BEGIN
     IDC_OPTIONS_LOCALVIEW_STYLE, 0x403, 8, 0
-0x6544, 0x6174, 0x6c69, 0x0073, 
+0x6544, 0x6174, 0x6c69, 0x0073,
     IDC_OPTIONS_LOCALVIEW_STYLE, 0x403, 5, 0
-0x694c, 0x7473, "\000" 
+0x694c, 0x7473, "\000"
     IDC_OPTIONS_LOCALVIEW_STYLE, 0x403, 12, 0
-0x614c, 0x6772, 0x2065, 0x6349, 0x6e6f, 0x0073, 
+0x614c, 0x6772, 0x2065, 0x6349, 0x6e6f, 0x0073,
     IDC_OPTIONS_LOCALVIEW_STYLE, 0x403, 12, 0
-0x6d53, 0x6c61, 0x206c, 0x6349, 0x6e6f, 0x0073, 
+0x6d53, 0x6c61, 0x206c, 0x6349, 0x6e6f, 0x0073,
     IDC_OPTIONS_LOCALVIEW_SIZEFORMAT, 0x403, 5, 0
-0x7541, 0x6f74, "\000" 
+0x7541, 0x6f74, "\000"
     IDC_OPTIONS_LOCALVIEW_SIZEFORMAT, 0x403, 6, 0
-0x7942, 0x6574, 0x0073, 
+0x7942, 0x6574, 0x0073,
     IDC_OPTIONS_LOCALVIEW_SIZEFORMAT, 0x403, 3, 0
-0x424b, "\000" 
+0x424b, "\000"
     IDC_OPTIONS_LOCALVIEW_SIZEFORMAT, 0x403, 3, 0
-0x424d, "\000" 
+0x424d, "\000"
     0
 END
 
 IDD_OPTIONS_REMOTEVIEW DLGINIT
 BEGIN
     IDC_OPTIONS_REMOTEVIEW_STYLE, 0x403, 8, 0
-0x6544, 0x6174, 0x6c69, 0x0073, 
+0x6544, 0x6174, 0x6c69, 0x0073,
     IDC_OPTIONS_REMOTEVIEW_STYLE, 0x403, 5, 0
-0x694c, 0x7473, "\000" 
+0x694c, 0x7473, "\000"
     IDC_OPTIONS_REMOTEVIEW_STYLE, 0x403, 12, 0
-0x614c, 0x6772, 0x2065, 0x6349, 0x6e6f, 0x0073, 
+0x614c, 0x6772, 0x2065, 0x6349, 0x6e6f, 0x0073,
     IDC_OPTIONS_REMOTEVIEW_STYLE, 0x403, 12, 0
-0x6d53, 0x6c61, 0x206c, 0x6349, 0x6e6f, 0x0073, 
+0x6d53, 0x6c61, 0x206c, 0x6349, 0x6e6f, 0x0073,
     IDC_OPTIONS_REMOTEVIEW_SIZEFORMAT, 0x403, 5, 0
-0x7541, 0x6f74, "\000" 
+0x7541, 0x6f74, "\000"
     IDC_OPTIONS_REMOTEVIEW_SIZEFORMAT, 0x403, 6, 0
-0x7942, 0x6574, 0x0073, 
+0x7942, 0x6574, 0x0073,
     IDC_OPTIONS_REMOTEVIEW_SIZEFORMAT, 0x403, 3, 0
-0x424b, "\000" 
+0x424b, "\000"
     IDC_OPTIONS_REMOTEVIEW_SIZEFORMAT, 0x403, 3, 0
-0x424d, "\000" 
+0x424d, "\000"
     0
 END
 
 IDD_SITEMANAGER DLGINIT
 BEGIN
     IDC_SERVERTYPE, 0x403, 4, 0
-0x5446, 0x0050, 
+0x5446, 0x0050,
     IDC_SERVERTYPE, 0x403, 39, 0
-0x5446, 0x2050, 0x766f, 0x7265, 0x5320, 0x4c53, 0x542f, 0x534c, 0x2820, 
-0x6d69, 0x6c70, 0x6369, 0x7469, 0x6520, 0x636e, 0x7972, 0x7470, 0x6f69, 
-0x296e, "\000" 
+0x5446, 0x2050, 0x766f, 0x7265, 0x5320, 0x4c53, 0x542f, 0x534c, 0x2820,
+0x6d69, 0x6c70, 0x6369, 0x7469, 0x6520, 0x636e, 0x7972, 0x7470, 0x6f69,
+0x296e, "\000"
     IDC_SERVERTYPE, 0x403, 35, 0
-0x5446, 0x2050, 0x766f, 0x7265, 0x5320, 0x4c53, 0x2820, 0x7865, 0x6c70, 
-0x6369, 0x7469, 0x6520, 0x636e, 0x7972, 0x7470, 0x6f69, 0x296e, "\000" 
+0x5446, 0x2050, 0x766f, 0x7265, 0x5320, 0x4c53, 0x2820, 0x7865, 0x6c70,
+0x6369, 0x7469, 0x6520, 0x636e, 0x7972, 0x7470, 0x6f69, 0x296e, "\000"
     IDC_SERVERTYPE, 0x403, 16, 0
-0x4653, 0x5054, 0x7520, 0x6973, 0x676e, 0x5320, 0x4853, 0x0032, 
+0x4653, 0x5054, 0x7520, 0x6973, 0x676e, 0x5320, 0x4853, 0x0032,
     IDC_SERVERTYPE, 0x403, 35, 0
-0x5446, 0x2050, 0x766f, 0x7265, 0x5420, 0x534c, 0x2820, 0x7865, 0x6c70, 
-0x6369, 0x7469, 0x6520, 0x636e, 0x7972, 0x7470, 0x6f69, 0x296e, "\000" 
+0x5446, 0x2050, 0x766f, 0x7265, 0x5420, 0x534c, 0x2820, 0x7865, 0x6c70,
+0x6369, 0x7469, 0x6520, 0x636e, 0x7972, 0x7470, 0x6f69, 0x296e, "\000"
     0
 END
 
 IDD_SITEMANAGER_ADVANCED DLGINIT
 BEGIN
     IDC_SITEMANAGER_ADVANCED_UTF8, 0x403, 5, 0
-0x7541, 0x6f74, "\000" 
+0x7541, 0x6f74, "\000"
     IDC_SITEMANAGER_ADVANCED_UTF8, 0x403, 6, 0
-0x6f46, 0x6372, 0x0065, 
+0x6f46, 0x6372, 0x0065,
     IDC_SITEMANAGER_ADVANCED_UTF8, 0x403, 6, 0
-0x654e, 0x6576, 0x0072, 
+0x654e, 0x6576, 0x0072,
     0
 END
 
@@ -1331 +1331 @@
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE 
+1 TEXTINCLUDE
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE 
+2 TEXTINCLUDE
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE 
+3 TEXTINCLUDE
 BEGIN
     "#define _AFX_NO_OLE_RESOURCES\r\n"
     "#define _AFX_NO_TRACKER_RESOURCES\r\n"
@@ -1418 +1418 @@
 // Menu
 //
 
-IDR_MAINFRAME MENU 
+IDR_MAINFRAME MENU
 BEGIN
     POPUP "&File"
     BEGIN
@@ -1562 +1562 @@
     POPUP "&Server"
     BEGIN
         MENUITEM "&Change password...",         ID_MENU_SERVER_CHANGEPASS
-        MENUITEM "&Enter raw FTP command...\tCtrl+F", 
+        MENUITEM "&Enter raw FTP command...\tCtrl+F",
                                                 ID_MENU_SERVER_ENTERRAWCOMMAND
 
         MENUITEM "Copy &URL to clipboard",      ID_MENU_SERVER_COPYURLTOCLIPBOARD
@@ -1578 +1578 @@
     END
 END
 
-IDR_OUTPUTCONTEXT MENU 
+IDR_OUTPUTCONTEXT MENU
 BEGIN
     POPUP "OutputContext"
     BEGIN
@@ -1591 +1591 @@
     END
 END
 
-IDR_FTPCONTEXTMENU MENU 
+IDR_FTPCONTEXTMENU MENU
 BEGIN
     POPUP "FtpContext"
     BEGIN
@@ -1608 +1608 @@
     END
 END
 
-IDR_LOCALCONTEXTMENU MENU 
+IDR_LOCALCONTEXTMENU MENU
 BEGIN
     POPUP "LocalContext"
     BEGIN
@@ -1627 +1627 @@
     END
 END
 
-IDR_QUEUECONTEXTMENU MENU 
+IDR_QUEUECONTEXTMENU MENU
 BEGIN
     POPUP "QueueContext"
     BEGIN
@@ -1647 +1647 @@
     END
 END
 
-IDR_SITEMANAGER MENU 
+IDR_SITEMANAGER MENU
 BEGIN
     POPUP "&File"
     BEGIN
@@ -1664 +1664 @@
     END
 END
 
-IDR_LOCALTREECONTEXTMENU MENU 
+IDR_LOCALTREECONTEXTMENU MENU
 BEGIN
     POPUP "LocalTreeContext"
     BEGIN
@@ -1678 +1678 @@
     END
 END
 
-IDR_SYSTRAY_MENU MENU 
+IDR_SYSTRAY_MENU MENU
 BEGIN
     POPUP "POPUP"
     BEGIN
@@ -1694 +1694 @@
 // Accelerator
 //
 
-IDR_MAINFRAME ACCELERATORS 
+IDR_MAINFRAME ACCELERATORS
 BEGIN
     "D",            ID_TOOLBAR_DISCONNECT,  VIRTKEY, CONTROL, NOINVERT
-    "F",            ID_MENU_SERVER_ENTERRAWCOMMAND, VIRTKEY, CONTROL, 
+    "F",            ID_MENU_SERVER_ENTERRAWCOMMAND, VIRTKEY, CONTROL,
                                                     NOINVERT
     "Q",            IDOK,                   VIRTKEY, CONTROL, NOINVERT
     "R",            ID_TOOLBAR_RECONNECT,   VIRTKEY, CONTROL, NOINVERT
@@ -1759 +1759 @@
 // String Table
 //
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     AFX_IDS_APP_TITLE       "FileZilla"
     AFX_IDS_IDLEMESSAGE     "Ready"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_APP_ABOUT            "About FileZilla"
     ID_APP_EXIT             "Quit FileZilla"
     ID_HELP                 "Displays the contents of the help"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Show or hide the toolbar"
     ID_VIEW_STATUS_BAR      "Show or hide the status bar"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     AFX_IDS_SCCLOSE         "Quit FileZilla"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDP_SOCKETS_INIT_FAILED "Sockets initialization failed"
     IDS_BROWSEFORFOLDER     "Please select local folder."
@@ -1795 +1795 @@
     IDS_CERT_ERR_CERT_UNTRUSTED "Certificate not trusted."
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_REMOTELIST_EMPTY    "<Empty directory listing>"
     IDS_SITEMANAGER_NEWFOLDER "New folder"
@@ -1815 +1815 @@
     IDS_TITLE_CONNECTING    "Connecting to %s"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_TOOLBAR_SITEDROPDOWN_EMPTYFOLDER "Empty folder"
     IDS_VIEWLABEL_LOCAL     "Local Site:"
@@ -1824 +1824 @@
     IDS_DIRINFO_FILES       "%d files with %I64d bytes."
     IDS_DIRINFO_DIRSANDFILES "%d folders and %d files with %I64d bytes."
     IDS_DIRINFO_FILESMIN    "%d files with at least %I64d bytes."
-    IDS_DIRINFO_DIRSANDFILESMIN 
+    IDS_DIRINFO_DIRSANDFILESMIN
                             "%d folders and %d files with at least %I64d bytes."
     IDS_DIRINFO_SELECTED_FILES "Selected %d files with %I64d bytes."
     IDS_DIRINFO_SELECTED_DIRS "Selected %d folders."
-    IDS_DIRINFO_SELECTED_DIRSANDFILES 
+    IDS_DIRINFO_SELECTED_DIRSANDFILES
                             "Selected %d folders and %d files with %I64d bytes."
-    IDS_DIRINFO_SELECTED_FILESMIN 
+    IDS_DIRINFO_SELECTED_FILESMIN
                             "Selected %d files with at least %I64d bytes."
-    IDS_DIRINFO_SELECTED_DIRSANDFILESMIN 
+    IDS_DIRINFO_SELECTED_DIRSANDFILESMIN
                             "Selected %d folders and %d files with at least %I64d bytes"
     IDS_DIRINFO_FILE        "1 file with %I64d bytes."
     IDS_DIRINFO_DIR         "1 folder."
     IDS_DIRINFO_DIRANDFILES "1 folder and %d files with %I64d bytes."
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
-    IDS_CHANGEDIALOG_DIRECTORY 
+    IDS_CHANGEDIALOG_DIRECTORY
                             "Please select the new attributes for the directory ""%s"""
     IDS_CHANGEDIALOG_FILE   "Please select the new attributes for the file ""%s"""
-    IDS_CHANGEDIALOG_MULTIPLEFILES 
+    IDS_CHANGEDIALOG_MULTIPLEFILES
                             "Please select the new attributes for all selected files and folders"
     IDS_HEADER_DATE         "Date"
     IDS_HEADER_DIRECTION    "Direction"
@@ -1861 +1861 @@
     IDS_HEADER_STATUS       "Status"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_HEADER_TIME         "Time"
     IDS_MANUALTRANSFER_HOST "Please enter a valid host"
-    IDS_MANUALTRANSFER_LOCALFILE 
+    IDS_MANUALTRANSFER_LOCALFILE
                             "Please enter the path and name of the local file"
     IDS_MANUALTRANSFER_PORT "Please enter a valid server port"
-    IDS_MANUALTRANSFER_REMOTEFILE 
+    IDS_MANUALTRANSFER_REMOTEFILE
                             "Please enter the path and name of the remote file"
     IDS_MANUALTRANSFER_USER "Please enter a username"
     IDS_QUEUESTATUS_ABORTED "Transfer aborted"
@@ -1883 +1883 @@
     IDS_QUICKCONN_USER      "User:"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_ERRORMSG_INTERRUPTED "Interrupted by user!"
     IDS_ERRORMSG_INVALIDPORT "You have to specify a valid port!"
-    IDS_ERRORMSG_LANGUAGEDLLNOTFOUND 
+    IDS_ERRORMSG_LANGUAGEDLLNOTFOUND
                             "Error! The language DLL for the language ""%s"" could not be found!"
-    IDS_ERRORMSG_LANGUAGEDLLVERSIONINVALID 
+    IDS_ERRORMSG_LANGUAGEDLLVERSIONINVALID
                             "Error! The language DLL was written for an older version of FileZilla and is not compatible with this version.\nPlease download a newer version of this language DLL from http://sourceforge.net/projects/filezilla"
     IDS_ERRORMSG_NAMEINUSE  "Please enter a different filename!"
     IDS_ERRORMSG_PATHNOTFOUND "The path you entered could not be found!"
@@ -1897 +1897 @@
     IDS_ERRORMSG_PREFIX     "Error:"
     IDS_ERRORMSG_PROXY_AUTHFAILED "Authentication failed"
     IDS_ERRORMSG_PROXY_AUTHNOLOGON "Proxy requires authentication"
-    IDS_ERRORMSG_PROXY_AUTHTYPEUNKNOWN 
+    IDS_ERRORMSG_PROXY_AUTHTYPEUNKNOWN
                             "Required authtype reported by proxy server is unknown or not supported"
     IDS_ERRORMSG_PROXY_CANTRESOLVEHOST "Can't resolve host of proxy server"
     IDS_ERRORMSG_PROXY_NOCONN "Can't connect to proxy server"
-    IDS_ERRORMSG_PROXY_REQUESTFAILED 
+    IDS_ERRORMSG_PROXY_REQUESTFAILED
                             "Proxy request failed, can't connect through proxy server"
-    IDS_ERRORMSG_SETTINGS_XMLFILE_INVALID 
+    IDS_ERRORMSG_SETTINGS_XMLFILE_INVALID
                             "Error, can't parse 'FileZilla.xml', the file may be corrupt.\nFor this session, the registry will be used to store the settings."
-    IDS_ERRORMSG_SFTP_CANTCREATESFTPIPC 
+    IDS_ERRORMSG_SFTP_CANTCREATESFTPIPC
                             "Can't initialize CSFtpIpC. Please make sure that enough system resources are available!"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
-    IDS_ERRORMSG_SFTP_CANTCREATESFTPPROCESS 
+    IDS_ERRORMSG_SFTP_CANTCREATESFTPPROCESS
                             "Can't start SFTP process. Please ensure that the file 'FzSFtp.exe' is in the same folder as 'FileZilla.exe'"
     IDS_ERRORMSG_SFTP_CLOSED "FzSFtp.exe was closed, terminating connection."
-    IDS_ERRORMSG_SFTP_INVALIDDATA 
+    IDS_ERRORMSG_SFTP_INVALIDDATA
                             "Invalid data was found in the SFtp data channel, terminating connection."
-    IDS_ERRORMSG_SFTP_NORESPONSE 
+    IDS_ERRORMSG_SFTP_NORESPONSE
                             "FzSFtp.exe did not respond, terminating connection."
-    IDS_ERRORMSG_SITEMANAGERNAMEINUSE 
+    IDS_ERRORMSG_SITEMANAGERNAMEINUSE
                             "That name already exists! Please choose a different one!"
     IDS_ERRORMSG_SITEMANAGERNEEDLOGONTYPE "Please select the logon type!"
     IDS_ERRORMSG_SITEMANAGERNEEDNAME "Please enter a name for the FTP Site!"
@@ -1927 +1927 @@
     IDS_ERRORMSG_TIMEOUT    "Timeout detected!"
     IDS_ERRORMSG_UPLOADABORTED "Upload aborted"
     IDS_ERRORMSG_UPLOADFAILED "Upload failed"
-    IDS_ERRORMSG_URLSYNTAXINVALID 
+    IDS_ERRORMSG_URLSYNTAXINVALID
                             "Invalid address syntax. Should be [ftp://][User:Pass@]Host[:Port][/Path]\nParameters surrounded by [ ] are optional.\r\nsftp:// and ftps:// are also valid protocols."
     IDS_ERRORMSG_VIEWEDIT_CANTOPENFILE "Unable to open ""%s"""
-    IDS_ERRORMSG_VIEWEDIT_CANTSTARTPROGRAM 
+    IDS_ERRORMSG_VIEWEDIT_CANTSTARTPROGRAM
                             "Unable to start ""%s"" to view / edit ""%s"". Please check your file associations."
     IDS_ERRORMSG_VIEWEDIT_NODEFPROG "Error, no default program specified"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
-    IDS_ERRORMSG_CANTOPENTRANSFERCHANNEL 
+    IDS_ERRORMSG_CANTOPENTRANSFERCHANNEL
                             "Transfer channel can't be opened. Reason: %s"
     IDS_ERRORMSG_CANTPARSECMDLINE "Can't parse command line."
     IDS_ERRORMSG_CANTRESOLVEHOST "Can't resolve host name"
     IDS_ERRORMSG_CANTRESUME "Resume command not supported by server, overwriting file."
-    IDS_ERRORMSG_CANTRESUME_FINISH 
+    IDS_ERRORMSG_CANTRESUME_FINISH
                             "Resume command not supported by server, but local and remote filesize are equal."
     IDS_ERRORMSG_CANTSENDCOMMAND "Unable to send command! Logging off server!"
-    IDS_ERRORMSG_CANTWRITETOFILE 
+    IDS_ERRORMSG_CANTWRITETOFILE
                             "Can't write into the file ""%s"". Reason: %s"
     IDS_ERRORMSG_CERTREJECTED "Peer certificate rejected"
-    IDS_ERRORMSG_CRITICALINTERRUPTED 
+    IDS_ERRORMSG_CRITICALINTERRUPTED
                             "Interrupted by user! Logging off server.."
     IDS_ERRORMSG_DOWNLOADABORTED "Download aborted"
     IDS_ERRORMSG_DOWNLOADFAILED "Download failed"
     IDS_ERRORMSG_ENTERSTRING "You have to enter a string!"
-    IDS_ERRORMSG_FILENAMEINVALID 
+    IDS_ERRORMSG_FILENAMEINVALID
                             "A filename can't contain one of the following characters:\n/ \\ : * ? "" < > |"
     IDS_ERRORMSG_FILEOPENFAILED "Could not open the local file %s"
     IDS_ERRORMSG_HOSTNEEDED "Please enter a host!"
     IDS_ERRORMSG_IDENT_CANTSTART "Error starting Ident server"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_INDICATOR_SECURESERVER "    "
     ID_INDICATOR_ELAPSEDTIME "                             "
     ID_INDICATOR_TIMELEFT   "                         "
-    ID_INDICATOR_PROGRESS_PANE 
+    ID_INDICATOR_PROGRESS_PANE
                             "                                               "
     ID_INDICATOR_BYTES      "                                                 "
     ID_INDICATOR_QUEUESIZE  "Queue: %I64d %s"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_INDICATOR_RECVLED    "    "
     ID_INDICATOR_SENDLED    "    "
     IDS_DIRINFO_DIRS        "%d folders."
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_INPUTDIALOGTITLE_CREATEDIR "Enter directory name"
-    IDS_INPUTDIALOGTEXT_CREATEDIR 
+    IDS_INPUTDIALOGTEXT_CREATEDIR
                             "Please enter the name of the new directory:"
     IDS_INPUTDIALOGTITLE_FTPCOMMAND "Enter FTP command"
-    IDS_INPUTDIALOGTEXT_FTPCOMMAND 
+    IDS_INPUTDIALOGTEXT_FTPCOMMAND
                             "Please enter the command that will be executed on the server:"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_INPUTDIALOGTITLE_INPUTPASSWORD "Enter your password"
-    IDS_INPUTDIALOGTEXT_INPUTPASSWORD 
+    IDS_INPUTDIALOGTEXT_INPUTPASSWORD
                             "Please enter the password that will be used to connect to the server:"
     IDS_INPUTDIALOGTITLE_RENAME "Enter new filename"
-    IDS_INPUTDIALOGTEXT_RENAME 
+    IDS_INPUTDIALOGTEXT_RENAME
                             "Please enter the name under which the file will be stored:"
-    IDS_INPUTDIALOGTITLE_KEYBOARDINTERACTIVE 
+    IDS_INPUTDIALOGTITLE_KEYBOARDINTERACTIVE
                             "Keyboard-interactive authentication"
     IDS_INPUTDIALOGTITLE_INPUTUSER "Enter your username"
-    IDS_INPUTDIALOGTEXT_INPUTUSER 
+    IDS_INPUTDIALOGTEXT_INPUTUSER
                             "Please enter the username that will be used to connect to the server:"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_OPTIONSPAGE_CONNECTION "Connection"
     IDS_OPTIONSPAGE_DEBUG   "Debug"
@@ -2023 +2023 @@
     IDS_OPTIONSPAGE_TYPE    "ASCII/Binary"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_OPTIONSPAGE_VIEWEDIT "File viewing / editing"
     IDS_OPTIONSPAGE_SSH     "SFTP settings"
@@ -2032 +2032 @@
     IDS_OPTIONSPAGE_TRANSFER_COMPRESSION "Compression"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_COMMANDMSG_PREFIX   "Command:"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_RESPONSEMSG_PREFIX  "Response:"
     IDS_TRACEMSG_TRACE      "Trace:"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_ERRORMSG_CANTCONNECT "Unable to connect!"
-    IDS_ERRORMSG_CANTCREATEDUETOPORTRANGE 
+    IDS_ERRORMSG_CANTCREATEDUETOPORTRANGE
                             "Could not create socket in the specified port range."
     IDS_ERRORMSG_CANTCREATEFILE "Failed to create the output file!"
     IDS_ERRORMSG_CANTESTABLISHSSLCONNECTION "Can't establish SSL connection"
@@ -2055 +2055 @@
     IDS_ERRORMSG_CANTGETRESPONSE "Can't receive response!"
     IDS_ERRORMSG_CANTIMPORTFILE "Error importing the file!"
     IDS_ERRORMSG_CANTINITSSL "Can't initialize SSL library"
-    IDS_ERRORMSG_CANTLOADSSLDLLS 
+    IDS_ERRORMSG_CANTLOADSSLDLLS
                             "Can't load SSL libraries. Please make sure the files ""ssleay32.dll"" and ""libeay32.dll"" are in the same folder as FileZilla."
     IDS_ERRORMSG_CANTOPENFILE "Can't open the input file!"
-    IDS_ERRORMSG_CANTOPENLOGFILE 
+    IDS_ERRORMSG_CANTOPENLOGFILE
                             "The log file ""%s"" can't be opened. Logging to file will be disabled for this session."
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_STATUSMSG_CONNECTED "Connected"
-    IDS_STATUSMSG_CONNECTEDWITH 
+    IDS_STATUSMSG_CONNECTEDWITH
                             "Connected with %s. Waiting for welcome message..."
-    IDS_STATUSMSG_CONNECTEDWITHSFTP 
+    IDS_STATUSMSG_CONNECTEDWITHSFTP
                             "Connected with %s, initializing SFTP connection..."
-    IDS_STATUSMSG_CONNECTEDWITHSSL 
+    IDS_STATUSMSG_CONNECTEDWITHSSL
                             "Connected with %s, negotiating SSL connection..."
     IDS_STATUSMSG_CONNECTING "Connecting to %s ..."
     IDS_STATUSMSG_DIRLISTSUCCESSFUL "Directory listing successful"
@@ -2082 +2082 @@
     IDS_STATUSMSG_IDENT_REQUEST "Ident request from: %s"
     IDS_STATUSMSG_IDENT_START "Ident server started"
     IDS_STATUSMSG_IDENT_STOP "Ident server stopped"
-    IDS_STATUSMSG_LANGUAGEVERSIONDIFFERENT 
+    IDS_STATUSMSG_LANGUAGEVERSIONDIFFERENT
                             "Warning! The language DLL was written for a previous version of FileZilla. Some strings may not be translated. Please download a newer version of the language DLL!"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_STATUSMSG_PREFIX    "Status:"
     IDS_STATUSMSG_RECONNECTWAIT "Waiting to reconnect..."
     IDS_STATUSMSG_RETRIEVINGDIRLIST "Retrieving directory listing..."
-    IDS_STATUSMSG_SSLESTABLISHED 
+    IDS_STATUSMSG_SSLESTABLISHED
                             "SSL connection established. Waiting for welcome message..."
     IDS_STATUSMSG_SSLESTABLISHEDTRANSFER "SSL connection established"
     IDS_STATUSMSG_UPLOADSTART "Starting upload of %s"
@@ -2100 +2100 @@
     IDS_STATUSMSG_WAITINGTORETRY_LEFT "Waiting to retry... (%d retries left)"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_QUESTION_BREAKCONNECTION "Break current connection?"
     IDS_QUESTION_CANCELOPERATION "Really cancel current operation?"
@@ -2109 +2109 @@
     IDS_QUESTION_DELETEFILES "Really delete %d files?"
     IDS_QUESTION_DELETEFILESANDDIRS "Really delete %d files and directories?"
     IDS_QUESTION_FILEEXISTS "The file ""%s"" (%d bytes) already exists. Overwrite with ""%s"" (%d bytes)?"
-    IDS_QUESTION_OPTIONS_FIRSTSTART 
+    IDS_QUESTION_OPTIONS_FIRSTSTART
                             "You are starting this version of FileZilla for the first time or your settings got deleted.\nFileZilla can store its settings in the registry or in an XML file.\nDo you want FileZilla to use the registry?\nIt is recommended to use the registry if you are in a multi-user environment\nSelect 'No' to use the XML file, which is recommended for most users.\nIf you chose no and there are settings in the registry, they will be imported into the XML file.\n\nDo you want to use the registry instead of an XML file?"
-    IDS_QUESTION_SFTP_CHANGEDHOSTKEY 
+    IDS_QUESTION_SFTP_CHANGEDHOSTKEY
                             "WARNING - POTENTIAL SECURITY BREACH!\nThe server's host key does not match the one previously\ncached in the registry. This means that either the\nserver administrator has changed the host key, or you\nhave actually connected to another computer pretending\nto be the server.\nThe new key fingerprint is:\n%s\nIf you were expecting this change and trust the new key,\nselect 'Yes' to update the cache and continue connecting.\nIf you want to carry on connecting but without updating\nthe cache, select 'No'.\nIf you want to abandon the connection completely, click on\n'Cancel'. Selecting 'Cancel' is the ONLY guaranteed\nsafe choice.\nUpdate cached key?"
-    IDS_QUESTION_SFTP_NEWHOSTKEY 
+    IDS_QUESTION_SFTP_NEWHOSTKEY
                             "The server's host key is not cached in the registry. You\nhave no guarantee that the server is the computer you\nthink it is.\n\nThe server's key fingerprint is:\n%s\n\nIf you trust this host, select 'Yes' to add the key to\nthe cache and carry on connecting.\nIf you want to carry on connecting just once, without\nadding the key to the cache, select 'No'.\nIf you do not trust this host, select 'Cancel' to abandon the\nconnection.\n\nStore key in cache?"
     IDS_QUESTION_SITEMANAGERDELETE "Really delete ""%s""?"
-    IDS_QUESTION_TRANSFER_USEPRIMARY 
+    IDS_QUESTION_TRANSFER_USEPRIMARY
                             "Problem while transferring '%s'\nNo additional connection can be established to the server for the file transfer. Your server may not support multilple connections.\nShould FileZilla use the primary connection for the transfer since you are already connected to this server?"
-    IDS_QUESTION_VIEWEDIT_MODIFIED 
+    IDS_QUESTION_VIEWEDIT_MODIFIED
                             """%s"" has been modified.\nDo you want to upload it back to the server?"
     IDS_QUESTION_VIEWEDIT_MODIFIED_CAPTION "File has been modified"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_OPTIONS_EXPORTOK    "The settings have been successfully exported. \nIf you put the created .xml file into the same folder as FileZilla under the name 'filezilla.xml', it will be used directly to store the settings instead of the registry."
     IDS_OPTIONS_IDENTSYSTEM "Please enter an operating system ID !"
     IDS_OPTIONS_IDENTUSERID "Please enter a UserID !"
     IDS_OPTIONS_IMPORTFAILURE "Error! Failed to import settings from '%s'"
     IDS_OPTIONS_IMPORTOK    "The settings have been successfully imported."
-    IDS_OPTIONS_KEEPALIVEBORDERDIFF 
+    IDS_OPTIONS_KEEPALIVEBORDERDIFF
                             "The upper border of the Keep Alive interval must be higher than the lower border!"
-    IDS_OPTIONS_KEEPALIVEBORDERHIGH 
+    IDS_OPTIONS_KEEPALIVEBORDERHIGH
                             "The upper border of the Keep Alive interval must be between %d and %d seconds!"
-    IDS_OPTIONS_KEEPALIVEBORDERLOW 
+    IDS_OPTIONS_KEEPALIVEBORDERLOW
                             "The lower border of the Keep Alive interval must be between %d and %d seconds!"
-    IDS_OPTIONS_LIMITPORTRANGEDIFF 
+    IDS_OPTIONS_LIMITPORTRANGEDIFF
                             "The upper border of the port range must be higher than the lower border!"
-    IDS_OPTIONS_LIMITPORTRANGEHIGH 
+    IDS_OPTIONS_LIMITPORTRANGEHIGH
                             "The upper border of the port range must be between %d and %d!"
-    IDS_OPTIONS_LIMITPORTRANGELOW 
+    IDS_OPTIONS_LIMITPORTRANGELOW
                             "The lower border of the port range must be between %d and %d!"
     IDS_OPTIONS_NUMRETRIES  "Please enter a value between %d and %d for the maximum number of retries!"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_OPTIONS_PROXYHOST   "Please enter a host for the proxy!"
     IDS_OPTIONS_PROXYPORT   "Please enter a valid port for the proxy!"
@@ -2153 +2153 @@
     IDS_OPTIONS_TIMEOUT     "Please enter a value between %d and %d for the timeout detection"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_GSSERROR_AUTHFAILED "Authentication failed, often this means that\nyou do not have a Kerberos version 5 ticket.\nConsider running Leash32 first.\nDo you wish to send all data in the clear,\nand potentially expose your password to hundreds\nof people?"
     IDS_GSSERROR_CANTLOADDLL "Can't find or load %s"
-    IDS_GSSERROR_CANTLOADGSSAPI 
+    IDS_GSSERROR_CANTLOADGSSAPI
                             "One or more of the GSS-API's haven't been loaded!"
-    IDS_GSSERROR_CANTLOADKERBEROSAPI 
+    IDS_GSSERROR_CANTLOADKERBEROSAPI
                             "The following API's couldn't be loaded from Kerberos 5 DLL!"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_CERT_ERR_DEPTH_ZERO_SELF_SIGNED_CERT "Self signed certificate."
-    IDS_CERT_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD 
+    IDS_CERT_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD
                             "Format error in certificate's valid until field."
-    IDS_CERT_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD 
+    IDS_CERT_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD
                             "Format error in certificate's valid fom field."
     IDS_CERT_ERR_INVALID_CA "Invalid CA certificate."
     IDS_CERT_ERR_INVALID_PURPOSE "Unsupported certificate purpose."
-    IDS_CERT_ERR_KEYUSAGE_NO_CERTSIGN 
+    IDS_CERT_ERR_KEYUSAGE_NO_CERTSIGN
                             "Key usage does not include certificate signing."
     IDS_CERT_ERR_PATH_LENGTH_EXCEEDED "Path length constraint exceeded."
-    IDS_CERT_ERR_SELF_SIGNED_CERT_IN_CHAIN 
+    IDS_CERT_ERR_SELF_SIGNED_CERT_IN_CHAIN
                             "Self signed certificate in certificate chain."
-    IDS_CERT_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY 
+    IDS_CERT_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY
                             "Unable to decode issuer public key."
-    IDS_CERT_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE 
+    IDS_CERT_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE
                             "Unable to decrypt certificate signature."
     IDS_CERT_ERR_UNABLE_TO_GET_ISSUER_CERT "Unable to get issuer certificate."
-    IDS_CERT_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY 
+    IDS_CERT_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY
                             "Unable to get local issuer certificate."
-    IDS_CERT_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE 
+    IDS_CERT_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE
                             "Unable to verify the first certifcate."
     IDS_CERT_ERR_UNKNOWN    "Unknown certificate verification error."
     IDS_CERT_ERRDEPTH       "The error occured at a depth of %d in the certificate chain."
     IDS_CERT_OK             "The certificate seems to be valid."
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_QUICKCONNECTBAR_MENU_BYPASS "Connect and &bypass proxy settings"
     ID_QUICKCONNECTBAR_MENU_CLEAR "&Clear"
@@ -2199 +2199 @@
     ID_REMOTELISTSTYLE_LIST "Shows objects as list"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_REMOTELISTSTYLE_REPORT "Shows objects with details"
     ID_REMOTELISTSTYLE_SMALLICON "Shows objects with small icons"
@@ -2214 +2214 @@
     ID_TOOLBAR_REFRESH      "Refresh all views"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_VIEW_LOCALLISTVIEW_FILESIZE "Show filesize"
     ID_VIEW_LOCALLISTVIEW_FILETYPE "Show filetype"
-    ID_VIEW_LOCALLISTVIEW_LASTMODIFIEDTIME 
+    ID_VIEW_LOCALLISTVIEW_LASTMODIFIEDTIME
                             "Show the date and time when the file was modified last"
     ID_VIEW_MESSAGELOG      "Show or hide the message log"
     ID_VIEW_QUICKCONNECT_BAR "Show or hide the Quick Connect bar"
@@ -2226 +2226 @@
     ID_VIEW_REMOTELISTVIEW_FILESIZE "Show the filesize"
     ID_VIEW_REMOTELISTVIEW_PERMISSIONS "Show the file permissions"
     ID_VIEW_REMOTELISTVIEW_TIME "Show the time of the file"
-    ID_MENU_VIEW_LOCALLISTVIEW_STATUSBAR 
+    ID_MENU_VIEW_LOCALLISTVIEW_STATUSBAR
                             "Toggles the statusbar below the local file list which displays useful information about (selected) files and folders"
-    ID_MENU_VIEW_REMOTELISTVIEW_STATUSBAR 
+    ID_MENU_VIEW_REMOTELISTVIEW_STATUSBAR
                             "Toggles the statusbar below the remote file list which displays useful information about (selected) files and folders"
     ID_QUEUECONTEXT_ABORT   "Aborts selected transfers and removes them from the queue"
     ID_QUEUECONTEXT_PAUSE   "Pauses selected transfers"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_LOCALLISTSTYLE_SMALLICON "Shows objects with small icons"
     ID_MENU_QUEUE_EXPORT    "Exports all items in the queue"
     ID_MENU_QUEUE_IMPORT    "Imports queue entries from an external file"
     ID_MENU_QUEUE_PROCESSNOW "Starts processing the queue"
-    ID_MENU_QUEUE_USEMULTIPLE 
+    ID_MENU_QUEUE_USEMULTIPLE
                             "When enabled, FileZilla can transfer several files at the same time"
-    ID_MENU_SERVER_CHANGEPASS 
+    ID_MENU_SERVER_CHANGEPASS
                             "Changes the password of the site. Only few ftp servers support this."
-    ID_MENU_SERVER_COPYURLTOCLIPBOARD 
+    ID_MENU_SERVER_COPYURLTOCLIPBOARD
                             "Copies to URL of the current server including the path to the clipboard"
-    ID_MENU_SERVER_ENTERRAWCOMMAND 
+    ID_MENU_SERVER_ENTERRAWCOMMAND
                             "Allows you to send raw FTP commands to the server"
     ID_MENU_TRANSFER_MANUALTRANSFER "Set up a manual transfer"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_CANCELBUTTON         "Cancel current operation"
     ID_COPYTOSITEMANAGER    "Copies the current connection into a new entry in the Site Manager"
     ID_EDIT_EXPORTSETTINGS  "Export settings into a file"
     ID_EDIT_IMPORTSETTINGS  "Import settings from a file"
     ID_EDIT_SETTINGS        "Enter the options Dialog of FileZilla"
-    ID_FILE_CONNECTTODEFAULTSITE 
+    ID_FILE_CONNECTTODEFAULTSITE
                             "Connects to the default site in the Site Manager"
-    ID_FILE_EXPORT_ASURLLIST 
+    ID_FILE_EXPORT_ASURLLIST
                             "Export all FTP sites into a textfile as URL list"
-    ID_FILE_EXPORT_WITHALLDETAILS 
+    ID_FILE_EXPORT_WITHALLDETAILS
                             "Export all FTP sites into a textfile with all details"
     ID_FTPCONTEXT_CREATEDIR "Create a directory on the ftp server"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_HELPMENU_CONTENTS    "Displays the table of contents of the help file"
     ID_HELPMENU_INDEX       "Displays the index of the help file"
@@ -2277 +2277 @@
     ID_LOCALLISTSTYLE_REPORT "Shows objects with details"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_MENU_VIEW_SHOWHIDDEN "When checked, FileZilla tries to show hidden files on the server."
     ID_OVERWRITEMENU_ASK    "FileZilla will ask you what to do when a file already exists"
     ID_OVERWRITEMENU_OVERWRITE "Always overwrite the file"
-    ID_OVERWRITEMENU_OVERWRITEIFNEWER 
+    ID_OVERWRITEMENU_OVERWRITEIFNEWER
                             "Overwrite the old file if the new file is newer"
     ID_OVERWRITEMENU_RENAME "Asks for a new filename"
     ID_OVERWRITEMENU_RESUME "Resume the transfer if possible"
@@ -2290 +2290 @@
     ID_PROCESS_QUEUE        "Process the queue"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_DIRINFO_FILEMIN     "1 file with at least %I64d bytes."
-    IDS_DIRINFO_DIRANDFILESMIN 
+    IDS_DIRINFO_DIRANDFILESMIN
                             "1 folder and %d files with at least %I64d bytes."
     IDS_DIRINFO_DIRANDFILE  "1 folder and 1 file with %I64d bytes."
     IDS_DIRINFO_DIRSANDFILE "%d folders and 1 file with %I64d bytes."
     IDS_DIRINFO_DIRANDFILEMIN "1 folder and 1 file with at least %I64d bytes."
-    IDS_DIRINFO_DIRSANDFILEMIN 
+    IDS_DIRINFO_DIRSANDFILEMIN
                             "%d folders and 1 file with at least %I64d bytes."
     IDS_DIRINFO_SELECTED_FILE "Selected 1 file with %I64d bytes."
     IDS_DIRINFO_SELECTED_DIR "Selected 1 folder."
-    IDS_DIRINFO_SELECTED_DIRANDFILES 
+    IDS_DIRINFO_SELECTED_DIRANDFILES
                             "Selected 1 folder and %d files with %I64d bytes."
     IDS_DIRINFO_SELECTED_FILEMIN "Selected 1 file with at least %I64d bytes."
-    IDS_DIRINFO_SELECTED_DIRANDFILESMIN 
+    IDS_DIRINFO_SELECTED_DIRANDFILESMIN
                             "Selected 1 folder and %d files with at least %I64d bytes"
-    IDS_DIRINFO_SELECTED_DIRANDFILE 
+    IDS_DIRINFO_SELECTED_DIRANDFILE
                             "Selected 1 folder and 1 file with %I64d bytes."
-    IDS_DIRINFO_SELECTED_DIRANDFILEMIN 
+    IDS_DIRINFO_SELECTED_DIRANDFILEMIN
                             "Selected 1 folder and 1 file with at least %I64d bytes"
-    IDS_DIRINFO_SELECTED_DIRSANDFILE 
+    IDS_DIRINFO_SELECTED_DIRSANDFILE
                             "Selected %d folders and 1 file with %I64d bytes."
-    IDS_DIRINFO_SELECTED_DIRSANDFILEMIN 
+    IDS_DIRINFO_SELECTED_DIRSANDFILEMIN
                             "Selected %d folders and 1 file with at least %I64d bytes"
     IDS_QUEUESTATUS_PAUSED  "Paused"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_QUEUECONTEXT_RESUME  "Resumes paused transfers"
     ID_VIEW_REMOTELISTVIEW_FILETYPE "Show the filetype"
-    ID_MENU_VIEW_REMOTELISTVIEW_SORTBY_FILENAME 
+    ID_MENU_VIEW_REMOTELISTVIEW_SORTBY_FILENAME
                             "Sort remote filelist by filename"
-    ID_MENU_VIEW_REMOTELISTVIEW_SORTBY_FILESIZE 
+    ID_MENU_VIEW_REMOTELISTVIEW_SORTBY_FILESIZE
                             "Sort remote filelist by filesize"
-    ID_MENU_VIEW_REMOTELISTVIEW_SORTBY_FILETYPE 
+    ID_MENU_VIEW_REMOTELISTVIEW_SORTBY_FILETYPE
                             "Sort remote filelist by filetype"
-    ID_MENU_VIEW_REMOTELISTVIEW_SORTBY_DATETIME 
+    ID_MENU_VIEW_REMOTELISTVIEW_SORTBY_DATETIME
                             "Sort remote filelist by the date/time of the file"
-    ID_MENU_VIEW_REMOTELISTVIEW_SORTBY_ASCENDING 
+    ID_MENU_VIEW_REMOTELISTVIEW_SORTBY_ASCENDING
                             "Sort remote filelist in ascending order"
-    ID_MENU_VIEW_REMOTELISTVIEW_SORTBY_DESCENDING 
+    ID_MENU_VIEW_REMOTELISTVIEW_SORTBY_DESCENDING
                             "Sort remote filelist in descending order"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_ERRORMSG_SETFILEPOINTER "Could not set file pointer"
     IDS_ERRORMSG_UNKNOWNSSLERROR "Unknown error in SSL layer"
     IDS_ERRORMSG_SSLCERTIFICATEERROR "Could not verify SSL certificate"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
-    ID_MENU_VIEW_LOCALLISTVIEW_SORTBY_FILENAME 
+    ID_MENU_VIEW_LOCALLISTVIEW_SORTBY_FILENAME
                             "Sort local filelist by filename"
-    ID_MENU_VIEW_LOCALLISTVIEW_SORTBY_FILESIZE 
+    ID_MENU_VIEW_LOCALLISTVIEW_SORTBY_FILESIZE
                             "Sort local filelist by filesize"
-    ID_MENU_VIEW_LOCALLISTVIEW_SORTBY_FILETYPE 
+    ID_MENU_VIEW_LOCALLISTVIEW_SORTBY_FILETYPE
                             "Sort local filelist by filetype"
-    ID_MENU_VIEW_LOCALLISTVIEW_SORTBY_LASTMODIFIED 
+    ID_MENU_VIEW_LOCALLISTVIEW_SORTBY_LASTMODIFIED
                             "Sort local filelist by the date/time the files have been modified last"
     ID_MENU_VIEW_LOCALLISTVIEW_SORTBY_ASCENDING 
                             "Sort local file list in ascending order"
-    ID_MENU_VIEW_LOCALLISTVIEW_SORTBY_DESCENDING 
+    ID_MENU_VIEW_LOCALLISTVIEW_SORTBY_DESCENDING
                             "Sort local file list in descending order"
 END
 
@@ -2382 +2382 @@
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
-

source/FtpControlSocket.cpp

@@ -40 +40 @@
 class CFtpControlSocket::CFileTransferData : public CFtpControlSocket::t_operation::COpData
 {
 public:
-    CFileTransferData() 
+    CFileTransferData()
     {
         pDirectoryListing=0;
         nGotTransferEndReply=0;
@@ -52 +52 @@
         bTriedPortPasvOnce = FALSE;
         askOnResumeFail = false;
     };
-    ~CFileTransferData() 
+    ~CFileTransferData()
     {
         if (pDirectoryListing)
             delete pDirectoryListing;
@@ -84 +84 @@
 class CFtpControlSocket::CListData:public CFtpControlSocket::t_operation::COpData
 {
 public:
-    CListData() 
+    CListData()
     {
         pDirectoryListing = 0;
         bTriedPortPasvOnce = FALSE;
         lastCmdSentCDUP = false;
     }
-    virtual ~CListData() 
+    virtual ~CListData()
     {
         if (pDirectoryListing)
             delete pDirectoryListing;
@@ -178 +178 @@
 }
 
 /////////////////////////////////////////////////////////////////////////////
-// Member-Funktion CFtpControlSocket 
+// Member-Funktion CFtpControlSocket
 #define CONNECT_INIT -1
 #define CONNECT_GSS_INIT -2
 #define CONNECT_GSS_AUTHDONE -3
@@ -280 +280 @@
     }
 
     m_Operation.nOpMode=CSMODE_CONNECT;
-    
+
     BOOL bUseGSS = FALSE;
     if (COptions::GetOptionVal(OPTION_USEGSS) && !m_pSslLayer)
     {
@@ -351 +351 @@
     CString buf,temp;
     if (server.fwbypass)
         logontype=0;
-    
+
     // are we connecting directly to the host (logon type 0) or via a firewall? (logon type>0)
     CString fwhost;
     int fwport;
@@ -366 +366 @@
         fwport=COptions::GetOptionVal(OPTION_FWPORT);
         temp=fwhost;
         port=fwport;
-        if(fwport!=21) 
+        if(fwport!=21)
             fwhost.Format( _T("%s:%d"), fwhost, fwport); // add port to fwhost (only if port is not 21)
     }
     m_CurrentServer = server;
-    
+
     CString hostname = server.host;
-    if(server.port!=21) 
+    if(server.port!=21)
         hostname.Format( _T("%s:%d"), hostname, server.port); // add port to hostname (only if port is not 21)
     CString str;
     str.Format(IDS_STATUSMSG_CONNECTING, hostname);
     ShowStatus(str, 0);
-    
+
     if ((server.nServerType & FZ_SERVERTYPE_LAYERMASK) & (FZ_SERVERTYPE_LAYER_SSL_EXPLICIT | FZ_SERVERTYPE_LAYER_TLS_EXPLICIT))
         m_Operation.nOpState = CONNECT_SSL_INIT;
-    
+
     if (!CControlSocket::Connect(temp, port))
     {
         if (WSAGetLastError() != WSAEWOULDBLOCK)
@@ -391 +391 @@
     }
     m_ServerName = logontype?fwhost:hostname;
     m_LastRecvTime = m_LastSendTime = CTime::GetCurrentTime();
-    
+
 }
 
 void CFtpControlSocket::LogOnToServer(BOOL bSkipReply /*=FALSE*/)
@@ -401 +401 @@
     CString buf, temp;
     const int NUMLOGIN = 9; // currently supports 9 different login sequences
     int logonseq[NUMLOGIN][20] = {
-        // this array stores all of the logon sequences for the various firewalls 
+        // this array stores all of the logon sequences for the various firewalls
         // in blocks of 3 nums. 1st num is command to send, 2nd num is next point in logon sequence array
         // if 200 series response is rec'd from server as the result of the command, 3rd num is next
         // point in logon sequence if 300 series rec'd
@@ -417 +417 @@
     };
     if (m_CurrentServer.fwbypass)
         logontype = 0;
-    
+
     if (m_Operation.nOpState == CONNECT_SSL_INIT)
     {
         if (m_CurrentServer.nServerType & FZ_SERVERTYPE_LAYER_SSL_EXPLICIT)
@@ -505 +505 @@
             // Some servers refuse to enable UTF8 if client does not send CLNT command
             // to fix compatibility with Internet Explorer, but in the process breaking
             // compatibility with other clients.
-            // Rather than forcing MS to fix Internet Explorer, letting other clients 
+            // Rather than forcing MS to fix Internet Explorer, letting other clients
             // suffer is a questionable decision in my opinion.
             if (Send("CLNT FileZilla"))
                 m_Operation.nOpState = CONNECT_CLNT;
@@ -550 +550 @@
         if ((m_CurrentServer.nServerType & FZ_SERVERTYPE_LAYERMASK) & (FZ_SERVERTYPE_LAYER_SSL_IMPLICIT | FZ_SERVERTYPE_LAYER_SSL_EXPLICIT | FZ_SERVERTYPE_LAYER_TLS_EXPLICIT))
         {
             m_Operation.nOpState = CONNECT_SSL_PBSZ;
-            Send("PBSZ 0");         
+            Send("PBSZ 0");
             return;
         }
 
@@ -569 +569 @@
                 nError|=FZ_REPLY_CRITICALERROR;
 
             DoClose(nError);
-            return; 
+            return;
         }
     }
     CString hostname = m_CurrentServer.host;
@@ -636 +636 @@
             //GSS authentication complete but we still have to go through the standard logon procedure
             m_Operation.nOpState = CONNECT_INIT;
     }
-    
+
     if (m_Operation.nOpState==CONNECT_INIT)
     {
         if (logontype)
         {
-        
+
             CString str;
             str.Format(IDS_STATUSMSG_FWCONNECT,hostname);
             ShowStatus(str,0);
@@ -662 +662 @@
             return;
         }
     }
-        
+
     // go through appropriate logon procedure
     int i = logonseq[logontype][m_Operation.nOpState];
     if (m_pGssLayer)
@@ -696 +696 @@
             return;
         }
     }
-    switch(logonseq[logontype][m_Operation.nOpState]) 
+    switch(logonseq[logontype][m_Operation.nOpState])
     {
         case 0:
             temp="USER "+m_CurrentServer.user;
@@ -741 +741 @@
 }
 
 #define BUFFERSIZE 4096
-void CFtpControlSocket::OnReceive(int nErrorCode) 
+void CFtpControlSocket::OnReceive(int nErrorCode)
 {
     LogMessage(__FILE__, __LINE__, this,FZ_LOG_DEBUG, _T("OnReceive(%d)  OpMode=%d OpState=%d"), nErrorCode, m_Operation.nOpMode, m_Operation.nOpState);
 
@@ -918 +918 @@
         m_RecvBuffer.pop_front();
 }
 
-void CFtpControlSocket::OnConnect(int nErrorCode) 
+void CFtpControlSocket::OnConnect(int nErrorCode)
 {
     LogMessage(__FILE__, __LINE__, this,FZ_LOG_DEBUG, _T("OnConnect(%d)  OpMode=%d OpState=%d"), nErrorCode, m_Operation.nOpMode, m_Operation.nOpState);
 
@@ -950 +950 @@
 BOOL CFtpControlSocket::Send(CString str)
 {
     USES_CONVERSION;
-    
+
     ShowStatus(str, 2);
     str += "\r\n";
     int res = 0;
@@ -1004 +1004 @@
     else
     {
         LPCSTR lpszAsciiSend = T2CA(str);
-        
+
         int sendLen = strlen(lpszAsciiSend);
         if (!m_awaitsReply && !m_sendBuffer)
             res = CAsyncSocketEx::Send(lpszAsciiSend, strlen(lpszAsciiSend));
@@ -1060 +1060 @@
 void CFtpControlSocket::DoClose(int nError /*=0*/)
 {
     LogMessage(__FILE__, __LINE__, this,FZ_LOG_DEBUG, _T("DoClose(%d)  OpMode=%d OpState=%d"), nError, m_Operation.nOpMode, m_Operation.nOpState);
-    
+
     m_bCheckForTimeout=TRUE;
     m_pOwner->SetConnected(FALSE);
     m_bKeepAliveActive=FALSE;
@@ -1096 +1096 @@
     ASSERT(!m_Operation.nOpMode);
     m_Operation.nOpMode=CSMODE_DISCONNECT;
     DoClose();
-    ShowStatus(IDS_STATUSMSG_DISCONNECTED,0); //Send the disconnected message to the message log        
+    ShowStatus(IDS_STATUSMSG_DISCONNECTED,0); //Send the disconnected message to the message log
 }
 
 void CFtpControlSocket::CheckForTimeout()
@@ -1112 +1112 @@
         if (res)
             return;
     }
-    CTimeSpan span=CTime::GetCurrentTime()-m_LastRecvTime;             
+    CTimeSpan span=CTime::GetCurrentTime()-m_LastRecvTime;
     if (span.GetTotalSeconds()>=delay)
     {
         ShowStatus(IDS_ERRORMSG_TIMEOUT, 1);
@@ -1148 +1148 @@
     #define LIST_WAITFINISH 10
 
     ASSERT(!m_Operation.nOpMode || m_Operation.nOpMode&CSMODE_LIST);
-    
+
     m_Operation.nOpMode|=CSMODE_LIST;
 
     if (!m_pOwner->IsConnected())
@@ -1160 +1160 @@
     if (bFinish || nError)
         if (m_Operation.nOpMode!=CSMODE_LIST)
             return; //Old message coming in
-    
+
     if (nError)
     {
         delete m_pTransferSocket;
@@ -1181 +1181 @@
             delete m_pDirectoryListing;
             m_pDirectoryListing=0;
             delete m_pTransferSocket;
-            m_pTransferSocket=0;            
+            m_pTransferSocket=0;
             ResetOperation(FZ_REPLY_ERROR);
             return;
         }
@@ -1214 +1214 @@
         }
         else
             pData->pDirectoryListing->path = pData->realpath;
-        
+
         if (m_Operation.nOpState!=LIST_WAITFINISH)
             return;
         else
@@ -1223 +1223 @@
             m_pTransferSocket=0;
         }
     }
-    
+
     if (m_Operation.nOpState==LIST_WAITFINISH)
     {
         if (!bFinish)
@@ -1270 +1270 @@
             }
             cache.Unlock();
             SetDirectoryListing(pData->pDirectoryListing);
-            ResetOperation(FZ_REPLY_OK);            
+            ResetOperation(FZ_REPLY_OK);
             return;
         }
         return;
@@ -1467 +1467 @@
         default:
             error = TRUE;
         }
-        
+
         if (error)
         {
             ResetOperation(FZ_REPLY_ERROR);
             return;
-        }               
+        }
     }
     if (m_Operation.nOpState==LIST_INIT)
     { //Initialize some variables
@@ -1488 +1488 @@
             delete m_pDirectoryListing;
             m_pDirectoryListing=0;
         }
-        
+
         if (COptions::GetOptionVal(OPTION_PROXYTYPE)!=PROXYTYPE_NOPROXY && !m_CurrentServer.fwbypass)
             pData->bPasv = TRUE;
         else if (m_CurrentServer.nPasv == 1)
@@ -1623 +1623 @@
         if (m_pGssLayer && m_pGssLayer->AuthSuccessful())
             m_pTransferSocket->UseGSS(m_pGssLayer);
         m_pTransferSocket->SetFamily(GetFamily());
-        if (!m_pTransferSocket->Create(m_pSslLayer && m_bProtP) || 
+        if (!m_pTransferSocket->Create(m_pSslLayer && m_bProtP) ||
             !m_pTransferSocket->AsyncSelect())
         {
             ResetOperation(FZ_REPLY_ERROR);
@@ -1644 +1644 @@
                 return;
             }
         else
-        { 
+        {
             m_pTransferSocket->m_bListening=TRUE;
             if (m_pProxyLayer)
             {
@@ -1666 +1666 @@
                 //Set up an active file transfer
                 CString tempHostname;
                 UINT nPort;
-                
+
                 if (// create listen socket (let MFC choose the port) & start the socket listening
-                    !m_pTransferSocket->Listen() || 
+                    !m_pTransferSocket->Listen() ||
                     !m_pTransferSocket->GetSockName(tempHostname, nPort))
                 {
                     ResetOperation(FZ_REPLY_ERROR);
                     return;
                 }
-        
+
                 CString host;
                 bool bError = false;
 
@@ -1710 +1710 @@
 
                         host.Replace('.', ',');
                     }
-                    
+
                     if (!bError)
                     {
                         host.Format(host+",%d,%d", nPort/256, nPort%256);
@@ -1775 +1775 @@
         }
 
         m_pTransferSocket->SetActive();
-        
+
         cmd = _T("LIST");
         if (m_pOwner->GetOption(FZAPI_OPTION_SHOWHIDDEN) && !(m_CurrentServer.nServerType & (FZ_SERVERTYPE_SUB_FTP_MVS | FZ_SERVERTYPE_SUB_FTP_VMS)))
             cmd += _T(" -a");
-        
+
         if (!Send(cmd))
             return;
-    
+
         pData->ListStartTime=CTime::GetCurrentTime();
 
-        if (pData->bPasv) 
+        if (pData->bPasv)
         {
             // if PASV create the socket & initiate outbound data channel connection
             if (!m_pTransferSocket->Connect(pData->host,pData->port))
@@ -1819 +1819 @@
         List(TRUE,nMode&(CSMODE_TRANSFERERROR|CSMODE_TRANSFERTIMEOUT));
 }
 
-void CFtpControlSocket::OnClose(int nErrorCode) 
+void CFtpControlSocket::OnClose(int nErrorCode)
 {
     LogMessage(__FILE__, __LINE__, this,FZ_LOG_DEBUG, _T("OnClose(%d)  OpMode=%d OpState=%d"), nErrorCode, m_Operation.nOpMode, m_Operation.nOpState);
     ShowStatus(IDS_STATUSMSG_DISCONNECTED, 1);
@@ -1844 +1844 @@
     LogMessage(__FILE__, __LINE__, this,FZ_LOG_DEBUG, _T("FileTransfer(%d, %s, %d)  OpMode=%d OpState=%d"), transferfile,bFinish?_T("TRUE"):_T("FALSE"), nError, m_Operation.nOpMode, m_Operation.nOpState);
 
     USES_CONVERSION;
-    
+
     #define FILETRANSFER_INIT           -1 //Opt: LIST TYPE
     #define FILETRANSFER_CWD            0 //PWD
     #define FILETRANSFER_MKD            1
@@ -1953 +1953 @@
     //         +----------+
     //         |WAITFINISH|
     //         +----------+
-    
+
     ASSERT(!m_Operation.nOpMode || m_Operation.nOpMode&CSMODE_TRANSFER);
     if (!m_pOwner->IsConnected())
     {
@@ -1972 +1972 @@
         // APPE failed, ignore this reply
         if (m_Operation.nOpMode == FILETRANSFER_WAIT && bFinish)
             return;
-        
+
         if (!(m_Operation.nOpMode&CSMODE_TRANSFER))
             return;
-        
+
         if (nError)
         {
             if (m_Operation.nOpState == FILETRANSFER_LIST_LIST && nError & CSMODE_TRANSFERERROR)
@@ -2005 +2005 @@
                 ResetOperation(FZ_REPLY_ERROR);
                 return;
             }
-        
+
             int num=0;
             pData->pDirectoryListing=new t_directory;
             if (COptions::GetOptionVal(OPTION_DEBUGSHOWLISTING))
@@ -2014 +2014 @@
             pData->pDirectoryListing->num=num;
             if (m_pTransferSocket->m_pListResult->m_server.nServerType&FZ_SERVERTYPE_SUB_FTP_VMS && m_CurrentServer.nServerType&FZ_SERVERTYPE_FTP)
                 m_CurrentServer.nServerType |= FZ_SERVERTYPE_SUB_FTP_VMS;
-            pData->pDirectoryListing->server = m_CurrentServer; 
+            pData->pDirectoryListing->server = m_CurrentServer;
             pData->pDirectoryListing->path.SetServer(m_CurrentServer);
             pData->pDirectoryListing->path = pData->transferfile.remotepath;
             if (pData->rawpwd!="")
@@ -2031 +2031 @@
             }
             else
                 pData->pDirectoryListing->path=pData->transferfile.remotepath;
-            
+
             if (m_Operation.nOpState!=FILETRANSFER_LIST_WAITFINISH)
                 return;
         }
@@ -2069 +2069 @@
         ASSERT(!m_Operation.pData);
 
         CString str;
-        str.Format(transferfile->get?IDS_STATUSMSG_DOWNLOADSTART:IDS_STATUSMSG_UPLOADSTART, 
+        str.Format(transferfile->get?IDS_STATUSMSG_DOWNLOADSTART:IDS_STATUSMSG_UPLOADSTART,
                     transferfile->get ? transferfile->remotepath.AppendFilename(transferfile->remotefile) : transferfile->localfile);
         ShowStatus(str,0);
-        
+
         m_Operation.nOpMode=CSMODE_TRANSFER|(transferfile->get?CSMODE_DOWNLOAD:CSMODE_UPLOAD);
 
         m_Operation.pData=new CFileTransferData;
@@ -2098 +2098 @@
         pData->transferdata.transferleft=pData->transferfile.size;
         pData->transferdata.bResume = FALSE;
         pData->transferdata.bType = (pData->transferfile.nType == 1) ? TRUE : FALSE;
-        
+
         CServerPath path;
         VERIFY (m_pOwner->GetCurrentPath(path));
         if (path==pData->transferfile.remotepath)
@@ -2118 +2118 @@
                         m_Operation.nOpState = NeedModeCommand() ? FILETRANSFER_LIST_MODE : (NeedOptsCommand() ? FILETRANSFER_LIST_OPTS : FILETRANSFER_LIST_TYPE);
                         break;
                     }
-                }               
+                }
                 if (m_pDirectoryListing && i==m_pDirectoryListing->num)
                 {
                     nReplyError = CheckOverwriteFile();
@@ -2236 +2236 @@
                             if (res)
                                 SetDirectoryListing(&dir);
                         }
-                            
+
                         pData->nMKDOpState=MKD_CHANGETOSUBDIR;
                         pData->MKDCurrent.AddSubdir(pData->MKDSegments.front());
                         CString Segment=pData->MKDSegments.front();
@@ -2253 +2253 @@
                             pData->MKDSegments.push_front(pData->MKDCurrent.GetLastSegment());
                             pData->MKDCurrent=pData->MKDCurrent.GetParent();
                             if (!Send("CWD "+pData->MKDCurrent.GetPath()))
-                                return;     
+                                return;
                         }
                     }
                 }
@@ -2315 +2315 @@
                                 dir.path=path2;
                                 dir.server=m_CurrentServer;
                             }
-                    
+
                             int i;
                             for (i=0; i<dir.num; i++)
                                 if (dir.direntry[i].name == name)
@@ -2366 +2366 @@
                             pData->nMKDOpState=MKD_MAKESUBDIRS;
                         else
                             return;
-                    }       
+                    }
                 }
                 break;
-            default: 
+            default:
                 ASSERT(FALSE);
             }
-            
+
             break;
         case FILETRANSFER_CWD2:
             if (GetReplyCode()!=2 && GetReplyCode()!=3)
@@ -2401 +2401 @@
                         nReplyError = FZ_REPLY_ERROR;
                         break;
                     }
-                    
+
                     pos2 = reply.Find(' ', pos1 + 1);
                     if (pos2 == -1)
                         pos2 = reply.GetLength();
@@ -2504 +2504 @@
                     nReplyError=FZ_REPLY_ERROR;
                 break;
             }
-            
+
             if (pData->bPasv)
             {
                 CString reply = GetReply();
@@ -2522 +2522 @@
                         nReplyError = FZ_REPLY_ERROR;
                     break;
                 }
-                    
+
                 CString temp;
                 temp = reply.Mid(i+1,(j-i)-1);
 
@@ -2599 +2599 @@
                     nReplyError = FZ_REPLY_ERROR;
                     break;
                 }
-                
+
                 VERIFY(m_pTransferSocket->AsyncSelect());
             }
             m_Operation.nOpState=FILETRANSFER_LIST_LIST;
@@ -2635 +2635 @@
                 cache.Store(listing);
                 cache.Unlock();
                 SetDirectoryListing(&listing);
-                
+
                 m_Operation.nOpState = FILETRANSFER_TYPE;
                 delete m_pTransferSocket;
                 m_pTransferSocket = 0;
-                
+
                 nReplyError = CheckOverwriteFile();
                 if (!nReplyError)
                 {
@@ -2913 +2913 @@
                         break;
                     }
 
-                    VERIFY(m_pTransferSocket->AsyncSelect());                   
+                    VERIFY(m_pTransferSocket->AsyncSelect());
                 }
 
                 if (pData->transferdata.bResume && pData->transferfile.get)
@@ -2947 +2947 @@
                     nReplyError=FZ_REPLY_ERROR;
                     break;
                 }
-                
+
                 m_pTransferSocket->m_pFile = m_pDataFile;
                 if (!pData->transferfile.get)
                 {
@@ -3018 +3018 @@
                                     }
                                     END_CATCH_ALL;
                                 }
-                                    
+
                                 pData->transferdata.transfersize=m_pDirectoryListing->direntry[i].size;
                             }
                         }
@@ -3065 +3065 @@
                                 return;
                             }
                         }
-                        
+
                         ShowStatus(IDS_ERRORMSG_CANTRESUME, 1);
                         pData->transferdata.transferleft=pData->transferdata.transfersize;
                         pData->transferdata.bResume=FALSE;
@@ -3080 +3080 @@
             // A '1xy opening data connection' reply is expected if RETR/STOR/APPE
             // is successful.
             // On failure, it's a 4xy or 5xy reply.
-            // However, some servers send a 2xy transfer complete reply without opening a data 
+            // However, some servers send a 2xy transfer complete reply without opening a data
             // connection if there's no data to send.
             if (GetReplyCode()==2)
             {
@@ -3110 +3110 @@
             else
             {
                 m_Operation.nOpState=FILETRANSFER_WAITFINISH;
-                
+
                 //Look if we can find any information about the resume offset
                 if (!pData->transferfile.get && pData->transferdata.bResume)
                 {
@@ -3157 +3157 @@
                 }
                 else if (pData->bPasv)
                     m_pTransferSocket->SetActive();
-                
+
             }
             break;
         case FILETRANSFER_WAITFINISH:
@@ -3198 +3198 @@
             break;
         }
         if (nReplyError)
-        { //Error transferring the file 
+        { //Error transferring the file
             ResetOperation(nReplyError);
             return;
         }
@@ -3298 +3298 @@
                     ShowStatus(IDS_ERRORMSG_CANTGETLIST,1);
                     bError=TRUE;
                 }
-                //Don't send PORT command yet, params are unknown. 
+                //Don't send PORT command yet, params are unknown.
                 //will be sent in TransfersocketListenFinished
             }
             else
@@ -3351 +3351 @@
 
                         host.Replace('.', ',');
                     }
-                    
+
                     if (!bError)
                     {
                         host.Format(host+",%d,%d", nPort/256, nPort%256);
@@ -3422 +3422 @@
                 cmd += " -a";
             if(!Send(cmd))
                 bError=TRUE;
-            else if(pData->bPasv) 
+            else if(pData->bPasv)
             {
                 // if PASV create the socket & initiate outbound data channel connection
                 if (!m_pTransferSocket->Connect(pData->host,pData->port))
@@ -3448 +3448 @@
             }
             else
                 command += pData->transferfile.remotepath.AppendFilename(pData->transferfile.remotefile);
-        
+
             if (!Send(command))
                 bError=TRUE;
         }
@@ -3465 +3465 @@
             }
             else
                 command += pData->transferfile.remotepath.AppendFilename(pData->transferfile.remotefile);
-        
+
             if (!Send(command))
                 bError=TRUE;
         }
@@ -3539 +3539 @@
                     ShowStatus(IDS_ERRORMSG_CANTGETLIST,1);
                     bError=TRUE;
                 }
-                //Don't send PORT command yet, params are unknown. 
+                //Don't send PORT command yet, params are unknown.
                 //will be sent in TransfersocketListenFinished
             }
             else
             {
                 //Set up an active file transfer
-                
+
                 CString temp;
                 UINT nPort;
                 if (//create listen socket (let Windows choose the port) & start listening
@@ -3589 +3589 @@
 
                         host.Replace('.', ',');
                     }
-                    
+
                     if (!bError)
                     {
                         host.Format(host+",%d,%d", nPort/256, nPort%256);
@@ -3681 +3681 @@
             bError = TRUE;
         else
         {
-            if (pData->bPasv) 
+            if (pData->bPasv)
             {// if PASV create the socket & initiate outbound data channel connection
                 if (!m_pTransferSocket->Connect(pData->host,pData->port))
                 {
@@ -3693 +3693 @@
         break;
     }
     if (bError)
-    { //Error transferring the file 
+    { //Error transferring the file
         ResetOperation(FZ_REPLY_ERROR);
         return;
     }
-}       
+}
 
 void CFtpControlSocket::Cancel(BOOL bQuit/*=FALSE*/)
 {
     LogMessage(__FILE__, __LINE__, this,FZ_LOG_DEBUG, _T("Cancel(%s)  OpMode=%d OpState=%d"), bQuit?_T("TRUE"):_T("FALSE"), m_Operation.nOpMode, m_Operation.nOpState);
-    
+
     const int nOpMode = m_Operation.nOpMode;
     if (nOpMode==CSMODE_CONNECT)
         DoClose(FZ_REPLY_CANCEL);
@@ -3720 +3720 @@
     }
     else if (nOpMode != CSMODE_NONE)
         ResetOperation(FZ_REPLY_ERROR | FZ_REPLY_CANCEL);
-        
+
     if (nOpMode != CSMODE_NONE && !bQuit)
         ShowStatus(IDS_ERRORMSG_INTERRUPTED, 1);
 
@@ -3799 +3799 @@
     if (m_pDataFile)
         delete m_pDataFile;
     m_pDataFile=0;
-    
+
     if (m_Operation.nOpMode)
-    {   
+    {
         //Unset busy attribute so that new commands can be executed
         m_pOwner->SetBusy(FALSE);
-        
+
         if (m_Operation.nOpMode&CSMODE_CONNECT && nSuccessful&FZ_REPLY_ERROR)
         {
             nSuccessful|=FZ_REPLY_DISCONNECTED;
             ShowStatus(IDS_ERRORMSG_CANTCONNECT, 1);
         }
-        
+
         if (m_Operation.nOpMode & (CSMODE_LIST|CSMODE_TRANSFER) && nSuccessful==FZ_REPLY_OK)
             m_LastSendTime=CTime::GetCurrentTime();
-    
+
         //Update remote file entry
-        if (m_Operation.pData && 
-            m_Operation.nOpMode&CSMODE_TRANSFER && 
-            (!((CFileTransferData*)m_Operation.pData)->transferfile.get) && 
+        if (m_Operation.pData &&
+            m_Operation.nOpMode&CSMODE_TRANSFER &&
+            (!((CFileTransferData*)m_Operation.pData)->transferfile.get) &&
             m_pDirectoryListing &&
             m_Operation.nOpState>=FILETRANSFER_RETRSTOR)
         {
@@ -3883 +3883 @@
                         entries[i].bUnsure=FALSE;
                     else
                         entries[i].bUnsure=TRUE;
-                    
+
                     delete [] dir.direntry;
                     dir.direntry=entries;
                     dir.num++;
@@ -3904 +3904 @@
             }
             cache.Unlock();
         }
-        
+
         if (m_Operation.pData && nSuccessful&FZ_REPLY_ERROR)
         {
             if (m_Operation.nOpMode&CSMODE_TRANSFER)
@@ -3926 +3926 @@
         if (!nSuccessful)
             ASSERT(FALSE);
     }
-    
+
     if (nSuccessful&FZ_REPLY_DISCONNECTED)
         m_pOwner->SetWorkingDir(0); //Disconnected, reset working dir
-    
+
     if (m_Operation.nOpMode)
         PostMessage(m_pOwner->m_hOwnerWnd, m_pOwner->m_nReplyMessageID, FZ_MSG_MAKEMSG(FZ_MSG_REPLY, m_pOwner->m_LastCommand.id), nSuccessful);
     else
@@ -3946 +3946 @@
 void CFtpControlSocket::Delete(CString filename, const CServerPath &path)
 {
     LogMessage(__FILE__, __LINE__, this,FZ_LOG_DEBUG, _T("Delete(\"%s\", \"%s\")  OpMode=%d OpState=%d"), filename, path.GetPath(), m_Operation.nOpMode, m_Operation.nOpState);
-    
+
     class CDeleteData : public CFtpControlSocket::t_operation::COpData
     {
 public:
@@ -4054 +4054 @@
 void CFtpControlSocket::RemoveDir(CString dirname, const CServerPath &path)
 {
     LogMessage(__FILE__, __LINE__, this,FZ_LOG_DEBUG, _T("RemoveDir(\"%s\", \"%s\")  OpMode=%d OpState=%d"), dirname, path.GetPath(), m_Operation.nOpMode, m_Operation.nOpState);
-    
+
     class CRemoveDirData : public CFtpControlSocket::t_operation::COpData
     {
 public:
@@ -4175 +4175 @@
         return FZ_REPLY_ERROR;
 
     CFileTransferData *pData = reinterpret_cast<CFileTransferData *>(m_Operation.pData);
-    
+
     int nReplyError = 0;
     CFileStatus64 status;
     BOOL res = GetStatus64(pData->transferfile.localfile, status);
@@ -4189 +4189 @@
         if (status.m_attribute & 0x10)
             nReplyError = FZ_REPLY_CRITICALERROR; //Can't transfer to/from dirs
         else
-        {           
+        {
             _int64 localsize;
             if (!GetLength64(pData->transferfile.localfile, localsize))
                 if (!pData->transferfile.get)
@@ -4197 +4197 @@
                 else
                     m_Operation.nOpState = FILETRANSFER_TYPE;
 
-            
+
             CTime *localtime = NULL;
             TRY
             {
@@ -4267 +4267 @@
                 *remotetime = *pData->pFileTime;
                 bRemoteFileExists = TRUE;
             }
-            
+
             if (bRemoteFileExists || pData->transferfile.get )
             {
                 COverwriteRequestData *pOverwriteData = new COverwriteRequestData;
@@ -4298 +4298 @@
                     pOverwriteData->size1 = remotesize;
                     pOverwriteData->size2 = localsize;
                     pOverwriteData->time1 = remotetime;
-                    pOverwriteData->time2 = localtime;                              
+                    pOverwriteData->time2 = localtime;
                 }
                 pOverwriteData->nRequestID = m_pOwner->GetNextAsyncRequestID();
                 if (!PostMessage(m_pOwner->m_hOwnerWnd, m_pOwner->m_nReplyMessageID, FZ_MSG_MAKEMSG(FZ_MSG_ASYNCREQUEST, FZ_ASYNCREQUEST_OVERWRITE), (LPARAM)pOverwriteData))
@@ -4373 +4373 @@
                 for (int i = (pos+1); i < pTransferData->transferfile.localfile.GetLength(); i++)
                     if (pTransferData->transferfile.localfile[i] == ':')
                         pTransferData->transferfile.localfile.SetAt(i, '_');
-                    
+
                 pTransferData->nWaitNextOpState=  FILETRANSFER_TYPE;
-            }                       
+            }
         }
         else
         {
@@ -4429 +4429 @@
     //Directory creation works like this:
     //Find existing parent and create subdirs one by one
     LogMessage(__FILE__, __LINE__, this, FZ_LOG_DEBUG, _T("MakeDir(\"%s\")  OpMode=%d OpState=%d"), path.GetPath(), m_Operation.nOpMode, m_Operation.nOpState);
-    
+
     if (m_Operation.nOpState == MKD_INIT)
     {
         ASSERT(!path.IsEmpty());
@@ -4474 +4474 @@
                 pData->Segments.push_front(pData->Current.GetLastSegment());
                 pData->Current=pData->Current.GetParent();
                 if (!Send("CWD "+pData->Current.GetPath()))
-                    return;     
+                    return;
             }
         }
     }
@@ -4488 +4488 @@
             ASSERT(!pData->Segments.empty());
 
             m_pOwner->SetCurrentPath(pData->Current);
-            
+
             pData->Current.AddSubdir(pData->Segments.front());
             CString Segment=pData->Segments.front();
             pData->Segments.pop_front();
@@ -4579 +4579 @@
                             m_pOwner->SetWorkingDir(&dir);
                         }
                 }
-                
+
                 cache.Unlock();
             }
         }
@@ -4593 +4593 @@
                 m_Operation.nOpState=MKD_MAKESUBDIRS;
             else
                 return;
-        }               
+        }
     }
-    else 
+    else
         ASSERT(FALSE);
 }
 
@@ -4636 +4636 @@
         ASSERT(m_Operation.nOpMode == CSMODE_RENAME);
         ASSERT(m_Operation.pData);
         CRenameData *pData = reinterpret_cast<CRenameData *>(m_Operation.pData);
-        
+
         if (m_Operation.nOpState == -1)
         {
             int res = GetReplyCode();
@@ -4661 +4661 @@
             if (res == 2 || res == 3)
             { //Rename entry in cached directory
                 CRenameData *pData = reinterpret_cast<CRenameData *>(m_Operation.pData);
-                
+
                 CDirectoryCache cache;
 
                 cache.Lock();
-                
+
                 //Rename all references to the directory in the cache
                 if (pData->newPath.IsEmpty())
                     cache.Rename(pData->path, pData->oldName, pData->newName, m_CurrentServer);
-                
+
                 BOOL bCached = TRUE;
                 t_directory dir;
                 BOOL res = cache.Lookup(pData->path, m_CurrentServer, dir);
@@ -4728 +4728 @@
                                 dir.num--;
 
                                 cache.Store(dir, bCached);
-                                
+
                                 // If directory, delete old directory from cache
                                 t_directory olddir;
                                 res = cache.Lookup(pData->path, pData->oldName, m_CurrentServer, olddir);
@@ -4752 +4752 @@
                                         updated = TRUE;
                                         m_pOwner->SetWorkingDir(&dir);
                                     }
-                                                                    
+
                                 BOOL bCached = TRUE;
                                 BOOL res = cache.Lookup(pData->newPath, m_CurrentServer, dir);
                                 if (!res)
@@ -4785 +4785 @@
                                     dir.num++;
                                     delete [] dir.direntry;
                                     dir.direntry = direntry;
-                                    
+
                                     cache.Store(dir, bCached);
                                     BOOL updated = FALSE;
                                     if (m_pDirectoryListing && m_pDirectoryListing->path == dir.path)
@@ -4836 +4836 @@
             //Getting intervals for the Keep Alive feature
             int low=COptions::GetOptionVal(OPTION_INTERVALLOW);
             int diff=COptions::GetOptionVal(OPTION_INTERVALHIGH)-low;
-            
+
             //Choose a new delay
             static int delay=low+(rand()*diff)/RAND_MAX;
-            
+
             CTimeSpan span=CTime::GetCurrentTime()-m_LastSendTime;
             if (span.GetTotalSeconds()>=delay)
                 SendKeepAliveCommand();
@@ -4876 +4876 @@
         if (!m_RecvBuffer.empty() && m_RecvBuffer.front() != "")
         {
             DoClose();
-            break; 
+            break;
         }
         if (!nAction)
         {
@@ -4894 +4894 @@
         if (!m_RecvBuffer.empty() && m_RecvBuffer.front() != "")
         {
             DoClose();
-            break; 
+            break;
         }
         if (!nAction)
         {
@@ -4916 +4916 @@
         if (!m_RecvBuffer.empty() && m_RecvBuffer.front() != "")
         {
             DoClose();
-            break; 
+            break;
         }
         if (!nAction)
         {
@@ -5181 +5181 @@
             if (m_RecvBuffer.empty())
                 m_RecvBuffer.push_back("");
             return "";
-        }           
+        }
         else
         {
             LPWSTR p1 = new WCHAR[len + 1];

source/MainFrm.cpp

@@ -221 +221 @@
 
 CMainFrame::CMainFrame()
 {
-    nTrayNotificationMsg_ = RegisterWindowMessage( _T("FileZilla Tray Notification Message") ); 
+    nTrayNotificationMsg_ = RegisterWindowMessage( _T("FileZilla Tray Notification Message") );
     initialized = FALSE;
     m_nTransferType = COptions::GetOptionVal(OPTION_TRANSFERMODE);
     m_nLocalListViewStyle = m_nRemoteListViewStyle = 0;
@@ -236 +236 @@
 
     m_pLocalViewHeader = NULL;
     m_pRemoteViewHeader = NULL;
-    
+
     m_pWndReBar = NULL;
     m_pWndDlgBar = NULL;
     m_pWndToolBar = NULL;
-    
+
     m_pMinTrayBtn = NULL;
 
     m_nLocalTreeViewLocation = COptions::GetOptionVal(OPTION_LOCALTREEVIEWLOCATION);
@@ -281 +281 @@
         return -1;
 
     SetupTrayIcon();
-    
+
     SetWindowText(GetVersionString());
-    
+
     if (!CreateToolbars())
         return -1;
 
@@ -327 +327 @@
                 }
                 else if (server.port!=21)
                     tmp.Format(_T("%d"), server.port);
-                
+
                 if (tmp!="")
                     str+=_T(":")+tmp;
-                
+
                 if (!m_RecentQuickconnectServers.size())
                     m_wndQuickconnectButton.AddMenuItem(0, MF_SEPARATOR);
                 m_RecentQuickconnectServers.push_front(server);
@@ -373 +373 @@
                     }
                     else if (server.port!=21)
                         tmp.Format(_T("%d"), server.port);
-                
+
                     if (tmp!="")
                         str+=_T(":")+tmp;
-                
+
                     if (!m_RecentQuickconnectServers.size())
                         m_wndQuickconnectButton.AddMenuItem(0, MF_SEPARATOR);
                     m_RecentQuickconnectServers.push_front(server);
@@ -392 +392 @@
             }
         }
     }
-    
+
     if (!m_wndStatusBar.Create(this) ||
         !m_wndStatusBar.SetIndicators(indicators,
           sizeof(indicators)/sizeof(UINT)))
@@ -402 +402 @@
     }
 
     RECT MyRect;
-    m_wndStatusBar.GetItemRect(m_wndStatusBar.CommandToIndex(ID_INDICATOR_PROGRESS_PANE), &MyRect);  
+    m_wndStatusBar.GetItemRect(m_wndStatusBar.CommandToIndex(ID_INDICATOR_PROGRESS_PANE), &MyRect);
 
     //Create the progress control
-    m_ProgressCtrl.Create(WS_VISIBLE|WS_CHILD, MyRect, &m_wndStatusBar, m_wndStatusBar.CommandToIndex(ID_INDICATOR_PROGRESS_PANE)); 
+    m_ProgressCtrl.Create(WS_VISIBLE|WS_CHILD, MyRect, &m_wndStatusBar, m_wndStatusBar.CommandToIndex(ID_INDICATOR_PROGRESS_PANE));
     m_ProgressCtrl.SetRange(0,100); //Set the range to between 0 and 100
     m_ProgressCtrl.SetStep(1); // Set the step amount
     m_ProgressCtrl.ShowWindow(SW_HIDE);
 
-    m_wndStatusBar.GetItemRect(m_wndStatusBar.CommandToIndex(ID_INDICATOR_RECVLED), &MyRect);  
+    m_wndStatusBar.GetItemRect(m_wndStatusBar.CommandToIndex(ID_INDICATOR_RECVLED), &MyRect);
 
     RECT rc;
     m_wndStatusBar.GetItemRect(m_wndStatusBar.CommandToIndex(ID_INDICATOR_PROGRESS_PANE), &rc);
@@ -420 +420 @@
     m_ProgressCtrl.SetShowText(TRUE);
 
     //Create the first LED control
-    m_RecvLed.Create(_T(""), WS_VISIBLE|WS_CHILD, MyRect, &m_wndStatusBar, m_wndStatusBar.CommandToIndex(ID_INDICATOR_RECVLED)); 
+    m_RecvLed.Create(_T(""), WS_VISIBLE|WS_CHILD, MyRect, &m_wndStatusBar, m_wndStatusBar.CommandToIndex(ID_INDICATOR_RECVLED));
     m_RecvLed.SetLed( CLed::LED_COLOR_GREEN, CLed::LED_OFF, CLed::LED_ROUND);
 
-    
+
     m_wndStatusBar.GetItemRect(m_wndStatusBar.CommandToIndex(ID_INDICATOR_RECVLED), &rc);
     // Reposition the first LED correctly!
     m_RecvLed.SetWindowPos(&wndTop, rc.left, rc.top, rc.right - rc.left,
         rc.bottom - rc.top, 0);
 
     //Create the second LED control
-    m_SendLed.Create(_T(""), WS_VISIBLE|WS_CHILD, MyRect, &m_wndStatusBar, m_wndStatusBar.CommandToIndex(ID_INDICATOR_SENDLED)); 
+    m_SendLed.Create(_T(""), WS_VISIBLE|WS_CHILD, MyRect, &m_wndStatusBar, m_wndStatusBar.CommandToIndex(ID_INDICATOR_SENDLED));
     m_SendLed.SetLed( CLed::LED_COLOR_RED, CLed::LED_OFF, CLed::LED_ROUND);
 
-    
+
     m_wndStatusBar.GetItemRect(m_wndStatusBar.CommandToIndex(ID_INDICATOR_SENDLED), &rc);
     // Reposition the second LED correctly!
     m_SendLed.SetWindowPos(&wndTop, rc.left, rc.top, rc.right - rc.left,
         rc.bottom - rc.top, 0);
 
-    
+
     m_wndStatusBar.SetPaneInfo(0,m_wndStatusBar.GetItemID(0),SBPS_STRETCH|SBPS_NOBORDERS,200);
     m_wndStatusBar.SetPaneInfo(m_wndStatusBar.CommandToIndex(ID_INDICATOR_PROGRESS_PANE),ID_INDICATOR_PROGRESS_PANE,SBPS_NORMAL,100);
 
@@ -457 +457 @@
     m_bShowHiddenFiles=COptions::GetOptionVal(OPTION_ALWAYSSHOWHIDDEN);
     if (m_pFileZillaApi)
         m_pFileZillaApi->SetOption(FZAPI_OPTION_SHOWHIDDEN, m_bShowHiddenFiles);
-    
+
     m_pCommandQueue=new CCommandQueue(m_pFileZillaApi);
-    
+
     m_bShowTree=TRUE;
     m_bShowRemoteTree=TRUE;
     m_bShowQueue=1;
@@ -495 +495 @@
             m_wndLocalSplitter.RecalcLayout();
         }
     }
-    
+
     if (!m_nRemoteTreeViewLocation)
     {
         m_wndRemoteSplitter.GetRowInfo(1, s2, temp);
@@ -520 +520 @@
     //Load the icon which indicates secure sites
     m_pSecureIconCtrl->Create(_T(""), WS_CHILD|SS_ICON,CRect(0,0,16,16),&m_wndStatusBar,m_wndStatusBar.CommandToIndex(ID_INDICATOR_SECURESERVER));
     m_pSecureIconCtrl->SetIcon( ::LoadIcon(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_SECURE)));
-    
+
 
     int cx,cx2;
     m_wndMainSplitter.GetColumnInfo(0,cx,temp);
@@ -544 +544 @@
         OnShowremotetree();
     if (COptions::GetOptionVal(OPTION_SHOWNOQUEUE))
         OnShowqueue();
-        
+
     m_nSecTimerID=SetTimer(1, 1000, 0);
-        
+
     CString folder=COptions::GetOption(OPTION_DEFAULTFOLDER);
     CFileStatus64 status;
     if (folder!="")
@@ -558 +558 @@
         folder+="\\";
     }
     SetLocalFolder(folder);
-    
+
     if (COptions::GetOptionVal(OPTION_ENABLEDEBUGMENU))
     {
         CMenu *pMenu=GetMenu();
@@ -659 +659 @@
         TRACE0("Failed to create nested splitter\n");
         return FALSE;
     }
-    
+
     // add the second splitter pane - which is a nested splitter with 2 rows
     numrows = 2 - m_nRemoteTreeViewLocation;
     numcols = 1 + m_nRemoteTreeViewLocation;
@@ -682 +682 @@
     m_pLocalViewHeader->m_pEdit = new CLocalComboCompletion;
     m_pLocalViewHeader->m_pEdit->Create(CBS_AUTOHSCROLL|WS_CHILD|WS_VISIBLE|WS_VSCROLL|CBS_DROPDOWN|CBS_SORT, CRect(0,0,100,200), this, 0);
     m_pLocalViewHeader->m_pEdit->InitStorage(10,1000);
-    
+
     HFONT hFont = ( HFONT )GetStockObject(DEFAULT_GUI_FONT);
     CFont *font=CFont::FromHandle(hFont);
     m_pLocalViewHeader->m_pEdit->SetFont(font);
 
     m_pLocalViewHeader->m_pLabelBackground=new CStatic;
     m_pLocalViewHeader->m_pLabelBackground->Create(_T(""), WS_CHILD|WS_VISIBLE, CRect(1, 1, 0, 0), this);
-        
+
     CString str;
     str.LoadString(IDS_VIEWLABEL_LOCAL);
     str="  " + str + " ";
@@ -698 +698 @@
     m_pLocalViewHeader->m_pLabel->SetFont(font);
     m_pLocalViewHeader->m_LabelTextSize.cx=m_pLocalViewHeader->m_LabelTextSize.cy=-1;
     CDC *pDC=m_pLocalViewHeader->m_pLabel->GetDC();
-    
+
     CFont *pOldFont=pDC->SelectObject(font);
     GetTextExtentPoint32( pDC->GetSafeHdc(), str, str.GetLength(), &m_pLocalViewHeader->m_LabelTextSize );
     pDC->SelectObject(pOldFont);
-    
+
     m_pLocalViewHeader->m_pLabel->ReleaseDC(pDC);
-        
+
     //Create the remote view header
     m_pRemoteViewHeader=new t_RemoteViewHeader;
     memset(m_pRemoteViewHeader, 0, sizeof(t_RemoteViewHeader));
@@ -719 +719 @@
 
     m_pRemoteViewHeader->m_pLabelBackground=new CStatic;
     m_pRemoteViewHeader->m_pLabelBackground->Create(_T(""),WS_CHILD|WS_VISIBLE,CRect(1, 1, 0, 0), this);
-        
+
     str.LoadString(IDS_VIEWLABEL_REMOTE);
     str="  " + str + " ";
     m_pRemoteViewHeader->m_pLabel=new CStatic;
@@ -727 +727 @@
     m_pRemoteViewHeader->m_pLabel->SetFont(font);
     m_pRemoteViewHeader->m_LabelTextSize.cx=m_pRemoteViewHeader->m_LabelTextSize.cy=-1;
     pDC=m_pRemoteViewHeader->m_pLabel->GetDC();
-    
+
     pOldFont=pDC->SelectObject(font);
     GetTextExtentPoint32( pDC->GetSafeHdc(), str, str.GetLength(), &m_pRemoteViewHeader->m_LabelTextSize );
     pDC->SelectObject(pOldFont);
-    
+
     m_pRemoteViewHeader->m_pLabel->ReleaseDC(pDC);
-    
+
     // now create the two views inside the nested splitter
-    
+
     if (!m_wndLocalSplitter.CreateView(0, 0,
         RUNTIME_CLASS(CLocalView), CSize(300, 145), pContext))
     {
         TRACE0("Failed to create third pane\n");
         return FALSE;
     }
-    
+
     int row = 1 - m_nLocalTreeViewLocation;
     int col = m_nLocalTreeViewLocation;
     if (!m_wndLocalSplitter.CreateView(row, col,
@@ -753 +753 @@
     }
 
 
-    
+
     //Now create the ftp view
 
     if (!m_wndRemoteSplitter.CreateView(0, 0,
@@ -774 +774 @@
 
     GetLocalPane()->m_pOwner=this;
     GetLocalPane2()->m_pOwner=this;
-        
+
     initialized=1;
-    
+
     PostMessage(WM_FILEZILLA_PROCESSCMDLINE);
 
     m_nLocalListViewStyle=COptions::GetOptionVal(OPTION_LOCALLISTVIEWSTYLE);
     m_nRemoteListViewStyle=COptions::GetOptionVal(OPTION_REMOTELISTVIEWSTYLE);
     GetFtpPane()->m_pListCtrl->SetListStyle(m_nRemoteListViewStyle);
-    GetLocalPane2()->m_pListCtrl->SetListStyle(m_nLocalListViewStyle);  
+    GetLocalPane2()->m_pListCtrl->SetListStyle(m_nLocalListViewStyle);
     m_nHideLocalColumns=COptions::GetOptionVal(OPTION_HIDELOCALCOLUMNS);
     GetLocalPane2()->m_pListCtrl->UpdateColumns(m_nHideLocalColumns);
     m_nHideRemoteColumns=COptions::GetOptionVal(OPTION_HIDEREMOTECOLUMNS);
@@ -793 +793 @@
 
 //////////////////
 // Helper function to register a new window class based on an already
-// existing window class, but with a different name and icon. 
+// existing window class, but with a different name and icon.
 // Returns new name if successful; otherwise NULL.
 //
 static LPCTSTR RegisterSimilarClass(LPCTSTR lpszNewClassName,
@@ -821 +821 @@
 
 // Static class member holds window class name
 // (NULL if not registered yet).
-// 
+//
 LPCTSTR CMainFrame::s_winClassName = NULL;
 
 BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
 {
     if( !CFrameWnd::PreCreateWindow(cs) )
         return FALSE;
-    
+
     cs.lpszClass = AfxRegisterWndClass(0);
-    
+
     //Change the window class name
-    if (s_winClassName==NULL) 
+    if (s_winClassName==NULL)
     {
         // One-time initialization: register the class
         //
-        s_winClassName = RegisterSimilarClass(_T("FileZilla Main Window"), 
+        s_winClassName = RegisterSimilarClass(_T("FileZilla Main Window"),
                         cs.lpszClass, IDR_MAINFRAME);
         if (!s_winClassName)
             return FALSE;
@@ -865 +865 @@
 /////////////////////////////////////////////////////////////////////////////
 // CMainFrame Nachrichten-Handler
 
-void CMainFrame::OnQuickConnect() 
+void CMainFrame::OnQuickConnect()
 {
     ProcessQuickconnect(FALSE);
 }
@@ -966 +966 @@
     }
 }
 
-void CMainFrame::OnSize(UINT nType, int cx, int cy) 
+void CMainFrame::OnSize(UINT nType, int cx, int cy)
 {
     if (m_wndStatusBar.GetSafeHwnd())
     {
@@ -1000 +1000 @@
 
         // Reposition the progress control correctly!
         m_ProgressCtrl.SetWindowPos(&wndTop, rc.left, rc.top, rc.right - rc.left,
-            rc.bottom - rc.top, 0); 
+            rc.bottom - rc.top, 0);
 
         m_wndStatusBar.GetItemRect(m_wndStatusBar.CommandToIndex(ID_INDICATOR_RECVLED), &rc);
 
         // Reposition the first LED correctly!
         m_RecvLed.SetWindowPos(&wndTop, rc.left, rc.top+1, rc.right - rc.left,
-            rc.bottom - rc.top, 0); 
+            rc.bottom - rc.top, 0);
 
         m_wndStatusBar.GetItemRect(m_wndStatusBar.CommandToIndex(ID_INDICATOR_SENDLED), &rc);
-    
+
         // Reposition the second LED correctly!
         m_SendLed.SetWindowPos(&wndTop, rc.left, rc.top+1, rc.right - rc.left+15,
-                rc.bottom - rc.top, SWP_SHOWWINDOW); 
-        
+                rc.bottom - rc.top, SWP_SHOWWINDOW);
+
         if (m_pSecureIconCtrl)
         {
             m_wndStatusBar.GetItemRect(m_wndStatusBar.CommandToIndex(ID_INDICATOR_SECURESERVER), &rc);
             rc.left=rc.right-16;
-            
+
             m_pSecureIconCtrl->MoveWindow(&rc);
         }
     }
-    
+
 }
 
 void CMainFrame::SetStatusbarText(int nIndex,CString str)
@@ -1030 +1030 @@
     m_wndStatusBar.GetStatusBarCtrl().SetText(str,nIndex,0);
     HFONT hFont = (HFONT)m_wndStatusBar.SendMessage(WM_GETFONT);
     if (str=="")
-        str.LoadString(m_wndStatusBar.GetItemID(nIndex));       
+        str.LoadString(m_wndStatusBar.GetItemID(nIndex));
     CClientDC dcScreen(NULL);
     HGDIOBJ hOldFont = NULL;
     if (hFont != NULL)
@@ -1044 +1044 @@
         //m_wndStatusBar.SetPaneInfo(nIndex,nID,nStyle,cx);
         RECT rc;
         m_wndStatusBar.GetItemRect(m_wndStatusBar.CommandToIndex(ID_INDICATOR_PROGRESS_PANE), &rc);
-    
+
         // Reposition the progress control correctly!
         m_ProgressCtrl.SetWindowPos(&wndTop, rc.left, rc.top, rc.right - rc.left,
-            rc.bottom - rc.top, 0); 
+            rc.bottom - rc.top, 0);
     }
     if (hOldFont != NULL)
         dcScreen.SelectObject(hOldFont);
@@ -1071 +1071 @@
         str2.Format(_T("%d:%02d:%02d"), status->timeelapsed/3600, (status->timeelapsed/60)%60, status->timeelapsed%60);
         str.Format(IDS_STATUSBAR_ELAPSED,str2);
         SetStatusbarText(m_wndStatusBar.CommandToIndex(ID_INDICATOR_ELAPSEDTIME),str);
-        
+
         if (status->timeleft!=-1)
         {
             str2.Format(_T("%d:%02d:%02d"), status->timeleft/3600, (status->timeleft/60)%60, status->timeleft%60);
             str.Format(IDS_STATUSBAR_LEFT,str2);
-            SetStatusbarText(m_wndStatusBar.CommandToIndex(ID_INDICATOR_TIMELEFT),str);         
+            SetStatusbarText(m_wndStatusBar.CommandToIndex(ID_INDICATOR_TIMELEFT),str);
         }
         else
             SetStatusbarText(m_wndStatusBar.CommandToIndex(ID_INDICATOR_TIMELEFT),"");
@@ -1144 +1144 @@
     }
     else
         transferfile.nType = m_nTransferType;
-    
+
     localdir.TrimRight( _T("\\") );
     if (!nOpen)
     {
@@ -1186 +1186 @@
             transferfile.remotepath = ((CFtpListCtrl *)GetFtpPane()->GetListCtrl())->GetCurrentDirectory();
         transferfile.remotepath.AddSubdirs(subdir);
     }
-    
+
     transferfile.get = get;
     if (GetFtpPane()->GetTransferfile(transferfile))
     {
@@ -1194 +1194 @@
         {
             CFileStatus64 status;
             BOOL res = GetStatus64(transferfile.localfile, status);
-    
+
             if (!GetLength64(transferfile.localfile, transferfile.size))
                 return;
         }
@@ -1233 +1233 @@
     }
 }
 
-void CMainFrame::OnUpdateShowtree(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateShowtree(CCmdUI* pCmdUI)
 {
     pCmdUI->SetCheck(m_bShowTree);
 }
 
-void CMainFrame::OnShowtree() 
+void CMainFrame::OnShowtree()
 {
     if (!m_bShowTree)
     {
@@ -1247 +1247 @@
             m_wndLocalSplitter.ShowCol(0);
         else
             m_wndLocalSplitter.ShowRow(0);
-        
+
         m_bShowTree=TRUE;
         m_pLocalViewHeader->bTreeHidden=FALSE;
     }
@@ -1264 +1264 @@
     GetLocalPane2()->UpdateViewHeader();
 }
 
-void CMainFrame::OnEditSettings() 
+void CMainFrame::OnEditSettings()
 {
     if (COptions::GetOptionVal(OPTION_REMEMBERVIEWS))
     {
@@ -1320 +1320 @@
     m_nHideRemoteColumns=COptions::GetOptionVal(OPTION_HIDEREMOTECOLUMNS);
     GetFtpPane()->m_pListCtrl->UpdateColumns(m_nHideRemoteColumns);
     GetFtpPane()->EnableStatusbar(COptions::GetOptionVal(OPTION_SHOWREMOTESTATUSBAR));
-    
-    
+
+
     if (m_bShowTree)
         GetLocalPane()->UpdateViewHeader();
     GetLocalPane2()->UpdateViewHeader();
-    
+
     if (m_bShowRemoteTree)
         GetFtpTreePane()->UpdateViewHeader();
     GetFtpPane()->UpdateViewHeader();
-    
+
     CMenu *menu2=GetMenu();
     CMenu *pMenu=new CMenu;
     if (menu2->m_hMenu!=m_hMenuDefault)
@@ -1379 +1379 @@
             pMenu->RemoveMenu(ID_MENU_DEBUG, MF_BYCOMMAND);
         }
     }
-    
+
     SetMenu(pMenu);
-    
+
     CString str;
-    
+
     m_wndQuickconnectButton.ShowWindow(SW_HIDE);
     m_wndQuickconnectButton.SetParent(this);
     delete m_pWndReBar;
@@ -1391 +1391 @@
     delete m_pWndToolBar;
     VERIFY(CreateToolbars());
     m_wndQuickconnectButton.SetParent(m_pWndDlgBar);
-    
+
     m_wndQuickconnectButton.SetDlgCtrlID(IDCANCEL);
     CString title = "Quick&connect";
-    
+
     CWnd *pDlgItem = m_pWndDlgBar->GetDlgItem(IDOK);
     if (pDlgItem)
         pDlgItem->GetWindowText(title);
@@ -1407 +1407 @@
     m_wndQuickconnectButton.MoveWindow(rect);
     m_wndQuickconnectButton.SetDlgCtrlID(IDOK);
     m_wndQuickconnectButton.ShowWindow(SW_SHOW);
-    
+
     VERIFY(m_wndQuickconnectButton.RemoveMenuItem(1));
     VERIFY(m_wndQuickconnectButton.RemoveMenuItem(0));
     VERIFY(m_wndQuickconnectButton.InsertMenuItem(0, ID_QUICKCONNECTBAR_MENU_BYPASS, 0));
@@ -1497 +1497 @@
         CFileExistsDlg::SetOverwriteSettings(COptions::GetOptionVal(OPTION_FILEEXISTSACTION) - 1);
 }
 
-void CMainFrame::OnSitemanager() 
+void CMainFrame::OnSitemanager()
 {
     CSiteManager dlg;
     int res = dlg.DoModal();
@@ -1505 +1505 @@
         ParseSite(dlg.m_LastSite);
 }
 
-void CMainFrame::OnCancel() 
+void CMainFrame::OnCancel()
 {
     int res=AfxMessageBox(IDS_QUESTION_CANCELOPERATION,MB_YESNO|MB_ICONQUESTION);
     if (res==IDYES)
         m_pCommandQueue->Cancel();
 }
 
-void CMainFrame::OnUpdateCancelbutton(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateCancelbutton(CCmdUI* pCmdUI)
 {
     pCmdUI->Enable(m_pCommandQueue->IsBusy());
 }
 
-void CMainFrame::OnShowqueue() 
+void CMainFrame::OnShowqueue()
 {
     if (!m_bShowQueue)
     {
         m_bShowQueue=TRUE;
-        m_wndVertSplitter.ShowRow(2);       
+        m_wndVertSplitter.ShowRow(2);
     }
     else
     {
@@ -1530 +1530 @@
         m_bShowQueue=FALSE;
         m_wndVertSplitter.HideRow(2,1);
     }
-    
+
 }
 
-void CMainFrame::OnUpdateShowqueue(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateShowqueue(CCmdUI* pCmdUI)
 {
     pCmdUI->SetCheck(m_bShowQueue);
 }
 
-void CMainFrame::OnClose() 
+void CMainFrame::OnClose()
 {
     ShowWindow(SW_HIDE);
     if (!m_bQuit)
     {
         if (!GetQueuePane()->GetListCtrl()->DoClose())
             return;
-    
+
         m_bQuit=TRUE;
 
         m_pFileZillaApi->Destroy();
@@ -1608 +1608 @@
             m_wndRemoteSplitter.GetColumnInfoEx(0,cy4,tmp);
         else
             m_wndRemoteSplitter.GetRowInfoEx(0,cy4,tmp);
-        m_wndMainSplitter.GetColumnInfo(m_bSwitchPaneLayout?1:0, cx, tmp);      
+        m_wndMainSplitter.GetColumnInfo(m_bSwitchPaneLayout?1:0, cx, tmp);
         str.Format(_T("%d %d %d %d %d"), cy1, cy2, cy3, cy4, cx);
         COptions::SetOption(OPTION_LASTSPLITTERSIZE, str);
     }
@@ -1625 +1625 @@
     delete m_pMinTrayBtn;
     m_pMinTrayBtn = NULL;
     CFrameWnd::OnClose();
-    
+
 }
 
-void CMainFrame::OnProcessQueue() 
+void CMainFrame::OnProcessQueue()
 {
     if (GetQueuePane()->GetListCtrl()->DoProcessQueue())
         GetQueuePane()->GetListCtrl()->StopProcessing();
@@ -1636 +1636 @@
         TransferQueue(1);
 }
 
-void CMainFrame::OnUpdateProcessQueue(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateProcessQueue(CCmdUI* pCmdUI)
 {
     pCmdUI->Enable(!((CQueueCtrl *)GetQueuePane()->GetListCtrl())->IsQueueEmpty());
     pCmdUI->SetCheck(((CQueueCtrl *)GetQueuePane()->GetListCtrl())->DoProcessQueue()?1:0);
@@ -1648 +1648 @@
     ((CQueueCtrl *)GetQueuePane()->GetListCtrl())->TransferQueue(nPriority);
 }
 
-void CMainFrame::OnToolbarDisconnect() 
+void CMainFrame::OnToolbarDisconnect()
 {
     m_pCommandQueue->Cancel();
     m_pCommandQueue->Disconnect();
 }
 
-void CMainFrame::OnUpdateToolbarDisconnect(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateToolbarDisconnect(CCmdUI* pCmdUI)
 {
-    pCmdUI->Enable(m_pCommandQueue->IsConnected() && !m_pCommandQueue->IsBusy());   
+    pCmdUI->Enable(m_pCommandQueue->IsConnected() && !m_pCommandQueue->IsBusy());
 }
 
-void CMainFrame::OnToolbarRefresh() 
+void CMainFrame::OnToolbarRefresh()
 {
     RefreshViews();
 }
@@ -1670 +1670 @@
     {
         if (!m_pCommandQueue->IsBusy() && m_pCommandQueue->IsConnected())
             ((CFtpListCtrl *)GetFtpPane()->GetListCtrl())->Refresh();
-        
+
     }
     if (side!=2)
     {
@@ -1681 +1681 @@
     }
 }
 
-void CMainFrame::OnToolbarReconnect() 
+void CMainFrame::OnToolbarReconnect()
 {
     if (m_pCommandQueue->IsBusy() || m_pCommandQueue->IsConnected())
         return;
-    
+
     t_server server;
     CServerPath path;
     if (m_pCommandQueue->GetLastServer(server, path))
@@ -1698 +1698 @@
     }
 }
 
-void CMainFrame::OnUpdateToolbarReconnect(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateToolbarReconnect(CCmdUI* pCmdUI)
 {
     BOOL enable = FALSE;
     if (m_pCommandQueue->IsConnected() || m_pCommandQueue->IsBusy())
@@ -1710 +1710 @@
         host = COptions::GetOption(OPTION_LASTSERVERHOST);
         port = COptions::GetOptionVal(OPTION_LASTSERVERPORT);
         user = COptions::GetOption(OPTION_LASTSERVERUSER);
-        //pass=crypt.decrypt(COptions::GetOption(OPTION_LASTSERVERPASS));       
+        //pass=crypt.decrypt(COptions::GetOption(OPTION_LASTSERVERPASS));
         if ((host != "")&&(port != 0))//&&(user!=""))
             enable = TRUE;
-        
+
         pCmdUI->Enable(enable);
     }
-    
+
 }
 
 CImageList* CMainFrame::CreateDragImageEx(CListCtrl *pList, LPPOINT lpPoint)
@@ -1744 +1744 @@
     while ((nIndex = pList->GetNextItem(nIndex, LVNI_SELECTED)) != -1)
     {
         if (nIndex > nBottomIndex)
-            break; 
+            break;
 
         CRect rectItem;
         pList->GetItemRect(nIndex, rectItem, LVIR_BOUNDS);
 
-        if (rectItem.left < 0) 
+        if (rectItem.left < 0)
             rectItem.left = 0;
 
         if (rectItem.right > nWidth)
@@ -1757 +1757 @@
 
         rectComplete.UnionRect(rectComplete, rectItem);
     }
-        
+
     // Create memory device context
     CClientDC dcClient(this);
     CDC dcMem;
@@ -1786 +1786 @@
     // Paint each DragImage in the DC
     nIndex = pList->GetTopIndex() - 1;
     while ((nIndex = pList->GetNextItem(nIndex, LVNI_SELECTED)) != -1)
-    {   
+    {
         if (nIndex > nBottomIndex)
             break;
 
@@ -1798 +1798 @@
         item.cchTextMax = 999;
 
         pList->GetItem(&item);
-        
+
         // Draw the icon
         CImageList* pSingleImageList = pList->GetImageList((dwStyle == LVS_ICON)?LVSIL_NORMAL:LVSIL_SMALL);
         if (pSingleImageList)
@@ -1808 +1808 @@
 
             IMAGEINFO info;
             pSingleImageList->GetImageInfo(item.iImage, &info);
-            CPoint p((rectIcon.left - rectComplete.left + rectIcon.right - rectComplete.left) / 2 - (info.rcImage.right - info.rcImage.left) / 2, 
+            CPoint p((rectIcon.left - rectComplete.left + rectIcon.right - rectComplete.left) / 2 - (info.rcImage.right - info.rcImage.left) / 2,
                 (rectIcon.top - rectComplete.top + rectIcon.bottom - rectComplete.top) / 2 - (info.rcImage.bottom - info.rcImage.top) / 2 + ((dwStyle == LVS_ICON)?2:0));
 
-            pSingleImageList->Draw( &dcMem, item.iImage, 
+            pSingleImageList->Draw( &dcMem, item.iImage,
                                     p,
                                     ILD_TRANSPARENT);
         }
@@ -1825 +1825 @@
         textRect.bottom -= rectComplete.top + 1;
         textRect.left -= rectComplete.left - 2;
         textRect.right -= rectComplete.left;
-        
+
         DWORD flags = DT_END_ELLIPSIS | DT_MODIFYSTRING;
         if (dwStyle == LVS_ICON)
             flags |= DT_CENTER | DT_WORDBREAK;
@@ -1854 +1854 @@
 CImageList* CMainFrame::CreateDragImageEx(CTreeCtrl *pTree, LPPOINT lpPoint)
 {
     HTREEITEM hItem;
-    
+
     if (pTree == GetLocalPane()->GetTreeCtrl())
         hItem = reinterpret_cast<CDirTreeCtrl *>(pTree)->m_hDragSource;
     else
@@ -1873 +1873 @@
     CRect rectItem;
     pTree->GetItemRect(hItem, rectItem, FALSE);
 
-    if (rectItem.left < 0) 
+    if (rectItem.left < 0)
         rectItem.left = 0;
 
     if (rectItem.right > (nWidth + 50))
         rectItem.right = nWidth + 50;
     rectComplete.UnionRect(rectComplete, rectItem);
 
-        
+
     // Create memory device context
     CClientDC dcClient(this);
     CDC dcMem;
@@ -1914 +1914 @@
     tvItem.cchTextMax = 999;
 
     pTree->GetItem(&tvItem);
-    
+
     // Draw the icon
     CImageList* pSingleImageList = pTree->GetImageList(TVSIL_NORMAL);
     if (pSingleImageList)
@@ -1924 +1924 @@
 
         IMAGEINFO info;
         pSingleImageList->GetImageInfo(tvItem.iImage, &info);
-        CPoint p(rectIcon.left - rectComplete.left - (info.rcImage.right - info.rcImage.left) - 3, 
+        CPoint p(rectIcon.left - rectComplete.left - (info.rcImage.right - info.rcImage.left) - 3,
                 rectIcon.top - rectComplete.top);
-        pSingleImageList->Draw( &dcMem, tvItem.iImage, 
+        pSingleImageList->Draw( &dcMem, tvItem.iImage,
                                 p,
                                 ILD_TRANSPARENT);
     }
@@ -1940 +1940 @@
     textRect.bottom -= rectComplete.top + 1;
     textRect.left -= rectComplete.left - 2;
     textRect.right -= rectComplete.left;
-        
+
     DWORD flags = DT_END_ELLIPSIS | DT_MODIFYSTRING;
     dcMem.DrawText(text, -1, textRect, flags);
-    
+
     dcMem.SelectObject(oldFont);
 
     dcMem.SelectObject(pOldMemDCBitmap);
@@ -1963 +1963 @@
     return pCompleteImageList;
 }
 
-void CMainFrame::OnBegindrag(CWnd *pDragWnd, CPoint point) 
+void CMainFrame::OnBegindrag(CWnd *pDragWnd, CPoint point)
 {
     POINT pt = {0};
     if (pDragWnd == GetLocalPane2()->GetListCtrl() ||
@@ -1987 +1987 @@
     CPoint ptStart = point;
     ptStart -= pt;
     m_pDragImage->BeginDrag(0, ptStart);
-    CRect rect; 
-    ::GetWindowRect(pDragWnd->m_hWnd, &rect); 
+    CRect rect;
+    ::GetWindowRect(pDragWnd->m_hWnd, &rect);
     CPoint pt2 = point;
-    pt2.Offset(rect.left+8, rect.top+8); 
-    m_pDragImage->DragEnter(NULL, pt2); 
+    pt2.Offset(rect.left+8, rect.top+8);
+    m_pDragImage->DragEnter(NULL, pt2);
     SetCapture();
 }
 
-void CMainFrame::OnMouseMove(UINT nFlags, CPoint point) 
+void CMainFrame::OnMouseMove(UINT nFlags, CPoint point)
 {
     if (m_pDragImage && m_pDragWnd) // In Drag&Drop mode ?
     {
@@ -2074 +2074 @@
     CFrameWnd::OnMouseMove(nFlags, point);
 }
 
-void CMainFrame::OnLButtonUp(UINT nFlags, CPoint point) 
+void CMainFrame::OnLButtonUp(UINT nFlags, CPoint point)
 {
     if (m_pDragImage && m_pDragWnd) // In Drag&Drop mode ?
     {
@@ -2085 +2085 @@
         CPoint pt(point);
         ClientToScreen(&pt);
         CWnd* m_pDropWnd = WindowFromPoint(pt);
-        
-        if (m_pDragWnd == GetLocalPane2()->GetListCtrl()) 
+
+        if (m_pDragWnd == GetLocalPane2()->GetListCtrl())
         {
             if (m_pDropWnd == GetFtpPane()->GetListCtrl())
             {
@@ -2114 +2114 @@
                 ((CLocalFileListCtrl*)GetLocalPane2()->GetListCtrl())->OnDragEnd(3, pt);
             }
         }
-        else if (m_pDragWnd == GetLocalPane()->GetTreeCtrl()) 
+        else if (m_pDragWnd == GetLocalPane()->GetTreeCtrl())
         {
             if (m_pDropWnd == GetFtpPane()->GetListCtrl())
             {
@@ -2160 +2160 @@
         else if (m_pDragWnd == GetFtpTreePane()->GetTreeCtrl())
         {
             if (m_pDropWnd == GetFtpTreePane()->GetTreeCtrl())
-                reinterpret_cast<CFtpTreeCtrl *>(GetFtpTreePane()->GetTreeCtrl())->OnDragEnd(0, pt);    
+                reinterpret_cast<CFtpTreeCtrl *>(GetFtpTreePane()->GetTreeCtrl())->OnDragEnd(0, pt);
         }
-        
+
         reinterpret_cast<CFtpListCtrl *>(GetFtpPane()->GetListCtrl())->DragLeave(NULL);
-        reinterpret_cast<CFtpTreeCtrl *>(GetFtpTreePane()->GetTreeCtrl())->DragLeave(NULL);     
+        reinterpret_cast<CFtpTreeCtrl *>(GetFtpTreePane()->GetTreeCtrl())->DragLeave(NULL);
         reinterpret_cast<CDirTreeCtrl *>(GetLocalPane()->GetTreeCtrl())->DragLeave(m_pDragImage);
         reinterpret_cast<CLocalFileListCtrl *>(GetLocalPane2()->GetListCtrl())->DragLeave(m_pDragImage);
 
@@ -2174 +2174 @@
         m_pDragWnd = NULL;
         m_DropTarget = _T("");
     }
-    
+
     CFrameWnd::OnLButtonUp(nFlags, point);
 }
 
@@ -2184 +2184 @@
     server.fwbypass=0;
     server.bDontRememberPass = FALSE;
     server.nServerType=0;
-    if (remote=="") 
+    if (remote=="")
     {
         remote.LoadString(IDS_ERRORMSG_HOSTNEEDED);
         return FALSE;
@@ -2219 +2219 @@
     }
     else
         pos=0;
-    
+
     pos=remote.Find('/',pos);
     CString rawpath;
     if (pos!=-1)
@@ -2266 +2266 @@
 
     if (!server.port)
         server.port=21;
-    
+
     if (server.user=="")
     {
         BOOL bUseGSS=FALSE;
         if (COptions::GetOptionVal(OPTION_USEGSS))
         {
             USES_CONVERSION;
-            
+
             CString GssServers=COptions::GetOption(OPTION_GSSSERVERS);
             hostent *fullname=gethostbyname(T2CA(remote));
             CString host;
@@ -2322 +2322 @@
         path.SetPath("/");
     server.host = remote;
     remote = rawpath;
-    
+
     return TRUE;
 }
 
@@ -2338 +2338 @@
             if (cmdline[0]=='\"')
             {
                 cmdline=cmdline.Mid(1);
-                int quote=cmdline.Find(_T("\""));   
+                int quote=cmdline.Find(_T("\""));
                 if (quote==-1)
                 {
                     ArgList.push_back(cmdline);
@@ -2382 +2382 @@
                     AfxMessageBox(IDS_ERRORMSG_CANTPARSECMDLINE);
                     return 0;
                 }
-            
+
                 if (server.bDontRememberPass)
                 {
                     CEnterSomething dlg(IDS_INPUTDIALOGTITLE_INPUTPASSWORD, IDS_INPUTDIALOGTEXT_INPUTPASSWORD, '*');
@@ -2434 +2434 @@
 
                     arg = ArgList.front();
                     ArgList.pop_front();
-                    
+
                     CSiteManager dlg;
                     if (dlg.ImportAndShow(arg)==IDOK)
                     {
@@ -2474 +2474 @@
                             AfxMessageBox(IDS_ERRORMSG_CANTPARSECMDLINE);
                             return 0;
                         }
-            
+
                         t_transferfile transferfile;
                         transferfile.get=FALSE;
                         transferfile.localfile=localpath+"\\"+localfile;
@@ -2519 +2519 @@
                                 transferfile.remotefile = arg;
                             }
                         }
-    
+
                         if (transferfile.server.bDontRememberPass)
                         {
                             CEnterSomething dlg(IDS_INPUTDIALOGTITLE_INPUTPASSWORD, IDS_INPUTDIALOGTEXT_INPUTPASSWORD, '*');
@@ -2528 +2528 @@
                             transferfile.server.bDontRememberPass = FALSE;
                             transferfile.server.pass = dlg.m_String;
                         }
-                        
+
                         GetQueuePane()->AddItem(transferfile, TRUE, 0);
-    
+
                         TransferQueue(2);
                     }
                 }
@@ -2546 +2546 @@
                     CString localpath=ArgList.front();
                     ArgList.pop_front();
                     localpath.TrimRight( _T("\\") );
-    
+
                     t_server server;
                     CServerPath remotepath;
-                        
+
                     if (!ParseURL(remotefile, server, remotepath, TRUE))
                     {
                         AfxMessageBox(IDS_ERRORMSG_CANTPARSECMDLINE);
                         return 0;
                     }
-                    
+
                     __int64 size=-1;
-                    
+
                     t_transferfile transferfile;
                     transferfile.get=TRUE;
                     transferfile.localfile=localpath+"\\"+remotefile;
@@ -2565 +2565 @@
                     transferfile.remotepath=remotepath;
                     transferfile.server=server;
                     transferfile.size=size;
-                    
+
                     transferfile.nType=m_nTransferType;
                     if (!m_nTransferType)
                     {
@@ -2584 +2584 @@
                             AsciiFiles = AsciiFiles.Mid(i + 1);
                         }
                     }
-                    
+
                     if (!ArgList.empty())
                     {
                         CString arg=ArgList.front();
@@ -2603 +2603 @@
                             transferfile.localfile = localpath + _T("\\") + arg;
                         }
                     }
-                            
+
                     if (transferfile.server.bDontRememberPass)
                     {
                         CEnterSomething dlg(IDS_INPUTDIALOGTITLE_INPUTPASSWORD, IDS_INPUTDIALOGTEXT_INPUTPASSWORD, '*');
@@ -2612 +2612 @@
                         transferfile.server.bDontRememberPass = FALSE;
                         transferfile.server.pass = dlg.m_String;
                     }
-                
+
                     GetQueuePane()->AddItem(transferfile, TRUE, 0);
-                        
+
                     TransferQueue(2);
                 }
                 else if (arg==_T("-close"))
@@ -2639 +2639 @@
     return 0;
 }
 
-void CMainFrame::OnCopytositemanager() 
+void CMainFrame::OnCopytositemanager()
 {
     t_server server;
     if (m_pFileZillaApi->GetCurrentServer(server)==FZ_REPLY_OK)
@@ -2649 +2649 @@
         int res=dlg.AddAndShow(server);
         if (res==IDOK)
             ParseSite(dlg.m_LastSite);
-    }   
+    }
 }
 
-void CMainFrame::OnUpdateCopytositemanager(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateCopytositemanager(CCmdUI* pCmdUI)
 {
-    pCmdUI->Enable(m_pCommandQueue->IsConnected()); 
+    pCmdUI->Enable(m_pCommandQueue->IsConnected());
 }
 
 void CMainFrame::OnUpdateFileConnecttodefaultsite(CCmdUI* pCmdUI)
@@ -2665 +2665 @@
         delete site;
 }
 
-void CMainFrame::OnTypemenuAscii() 
+void CMainFrame::OnTypemenuAscii()
 {
-    m_nTransferType=1;  
+    m_nTransferType=1;
 }
 
-void CMainFrame::OnUpdateTypemenuAscii(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateTypemenuAscii(CCmdUI* pCmdUI)
 {
     pCmdUI->SetCheck(m_nTransferType==1);
 }
 
-void CMainFrame::OnTypemenuBinary() 
+void CMainFrame::OnTypemenuBinary()
 {
-    m_nTransferType=2;      
+    m_nTransferType=2;
 }
 
-void CMainFrame::OnUpdateTypemenuBinary(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateTypemenuBinary(CCmdUI* pCmdUI)
 {
     pCmdUI->SetCheck(m_nTransferType==2);
 }
 
-void CMainFrame::OnTypemenuDetect() 
+void CMainFrame::OnTypemenuDetect()
 {
-    m_nTransferType=0;  
+    m_nTransferType=0;
 }
 
-void CMainFrame::OnUpdateTypemenuDetect(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateTypemenuDetect(CCmdUI* pCmdUI)
 {
-    pCmdUI->SetCheck(m_nTransferType==0);   
+    pCmdUI->SetCheck(m_nTransferType==0);
 }
 
-void CMainFrame::OnDestroy() 
+void CMainFrame::OnDestroy()
 {
     if (m_pSecureIconCtrl->GetSafeHwnd() && m_pSecureIconCtrl->GetIcon())
         DestroyIcon(m_pSecureIconCtrl->GetIcon());
     delete m_pSecureIconCtrl;
     m_pSecureIconCtrl=0;
-    
+
     CFrameWnd::OnDestroy();
-    
+
     if (m_pLocalViewHeader)
     {
         delete m_pLocalViewHeader->m_pEdit;
@@ -2712 +2712 @@
         delete m_pLocalViewHeader;
         m_pLocalViewHeader=0;
     }
-    
+
     if (m_pRemoteViewHeader)
     {
         delete m_pRemoteViewHeader->m_pEdit;
@@ -2728 +2728 @@
         pXML->ResetPos();
         while (pXML->FindChildElem( _T("RecentServers") ))
             pXML->RemoveChildElem();
-            
+
         pXML->AddChildElem( _T("RecentServers") );
         pXML->IntoElem();
         for (std::list<t_server>::reverse_iterator iter=m_RecentQuickconnectServers.rbegin(); iter!=m_RecentQuickconnectServers.rend(); iter++)
@@ -2737 +2737 @@
                 iter->pass = "";
             COptions::SaveServer(pXML, *iter);
         }
-        
+
         pXML->OutOfElem();
 
         COptions::UnlockXML();
@@ -2776 +2776 @@
     }
 }
 
-void CMainFrame::OnViewQuickconnectBar() 
+void CMainFrame::OnViewQuickconnectBar()
 {
     m_bShowQuickconnect = !m_bShowQuickconnect;
     if (m_bShowQuickconnect)
@@ -2792 +2792 @@
         }
         m_pWndDlgBar->ShowWindow(SW_HIDE);
     }
-    RecalcLayout(); 
+    RecalcLayout();
 }
 
-void CMainFrame::OnUpdateViewQuickconnectBar(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewQuickconnectBar(CCmdUI* pCmdUI)
 {
-    pCmdUI->SetCheck(m_bShowQuickconnect);  
+    pCmdUI->SetCheck(m_bShowQuickconnect);
 }
 
-void CMainFrame::OnViewMessagelog() 
+void CMainFrame::OnViewMessagelog()
 {
     m_bShowMessageLog = !m_bShowMessageLog;
     if (m_bShowMessageLog)
         m_wndVertSplitter.ShowRow(0);
     else
         m_wndVertSplitter.HideRow(0,1);
-    RecalcLayout();     
+    RecalcLayout();
 }
 
-void CMainFrame::OnUpdateViewMessagelog(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewMessagelog(CCmdUI* pCmdUI)
 {
-    pCmdUI->SetCheck(m_bShowMessageLog);    
+    pCmdUI->SetCheck(m_bShowMessageLog);
 }
 
-void CMainFrame::OnViewStatusBar() 
+void CMainFrame::OnViewStatusBar()
 {
     m_wndStatusBar.ShowWindow(m_wndStatusBar.IsVisible()?SW_HIDE:SW_SHOW);
     RecalcLayout();
 }
 
-void CMainFrame::OnViewToolbar() 
+void CMainFrame::OnViewToolbar()
 {
     m_pWndToolBar->ShowWindow(m_pWndToolBar->IsVisible()?SW_HIDE:SW_SHOW);
     RecalcLayout();
 }
 
-void CMainFrame::OnEditExportsettings() 
+void CMainFrame::OnEditExportsettings()
 {
-    COptions::Export(); 
+    COptions::Export();
 }
 
-void CMainFrame::OnEditImportsettings() 
+void CMainFrame::OnEditImportsettings()
 {
-    COptions::Import(); 
+    COptions::Import();
 }
 
 //*****************************************
 //Code to change the local list view styles
 //*****************************************
 
-void CMainFrame::OnLocalliststyleIcon() 
+void CMainFrame::OnLocalliststyleIcon()
 {
     m_nLocalListViewStyle=2;
     GetLocalPane2()->m_pListCtrl->SetListStyle(m_nLocalListViewStyle);
 }
 
-void CMainFrame::OnUpdateLocalliststyleIcon(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateLocalliststyleIcon(CCmdUI* pCmdUI)
 {
-    pCmdUI->SetCheck(m_nLocalListViewStyle==2); 
+    pCmdUI->SetCheck(m_nLocalListViewStyle==2);
 }
 
-void CMainFrame::OnLocalliststyleList() 
+void CMainFrame::OnLocalliststyleList()
 {
     m_nLocalListViewStyle=1;
     GetLocalPane2()->m_pListCtrl->SetListStyle(m_nLocalListViewStyle);
 }
 
-void CMainFrame::OnUpdateLocalliststyleList(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateLocalliststyleList(CCmdUI* pCmdUI)
 {
-    pCmdUI->SetCheck(m_nLocalListViewStyle==1); 
+    pCmdUI->SetCheck(m_nLocalListViewStyle==1);
 }
 
-void CMainFrame::OnLocalliststyleReport() 
+void CMainFrame::OnLocalliststyleReport()
 {
     m_nLocalListViewStyle=0;
     GetLocalPane2()->m_pListCtrl->SetListStyle(m_nLocalListViewStyle);
 }
 
-void CMainFrame::OnUpdateLocalliststyleReport(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateLocalliststyleReport(CCmdUI* pCmdUI)
 {
-    pCmdUI->SetCheck(m_nLocalListViewStyle==0); 
+    pCmdUI->SetCheck(m_nLocalListViewStyle==0);
 }
 
-void CMainFrame::OnLocalliststyleSmallicon() 
+void CMainFrame::OnLocalliststyleSmallicon()
 {
     m_nLocalListViewStyle=3;
     GetLocalPane2()->m_pListCtrl->SetListStyle(m_nLocalListViewStyle);
 }
 
-void CMainFrame::OnUpdateLocalliststyleSmallicon(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateLocalliststyleSmallicon(CCmdUI* pCmdUI)
 {
-    pCmdUI->SetCheck(m_nLocalListViewStyle==3); 
+    pCmdUI->SetCheck(m_nLocalListViewStyle==3);
 }
 
-void CMainFrame::OnViewLocallistviewFilesize() 
+void CMainFrame::OnViewLocallistviewFilesize()
 {
     m_nHideLocalColumns^=1;
     GetLocalPane2()->m_pListCtrl->UpdateColumns(m_nHideLocalColumns);
 }
 
-void CMainFrame::OnUpdateViewLocallistviewFilesize(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewLocallistviewFilesize(CCmdUI* pCmdUI)
 {
     pCmdUI->Enable(!m_nLocalListViewStyle);
     pCmdUI->SetCheck(!(m_nHideLocalColumns&1));
 }
 
-void CMainFrame::OnViewLocallistviewFiletype() 
+void CMainFrame::OnViewLocallistviewFiletype()
 {
     m_nHideLocalColumns^=2;
-    GetLocalPane2()->m_pListCtrl->UpdateColumns(m_nHideLocalColumns);   
+    GetLocalPane2()->m_pListCtrl->UpdateColumns(m_nHideLocalColumns);
 }
 
-void CMainFrame::OnUpdateViewLocallistviewFiletype(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewLocallistviewFiletype(CCmdUI* pCmdUI)
 {
     pCmdUI->Enable(!m_nLocalListViewStyle);
     pCmdUI->SetCheck(!(m_nHideLocalColumns&2));
 }
 
-void CMainFrame::OnViewLocallistviewLastmodifiedtime() 
+void CMainFrame::OnViewLocallistviewLastmodifiedtime()
 {
     m_nHideLocalColumns^=4;
-    GetLocalPane2()->m_pListCtrl->UpdateColumns(m_nHideLocalColumns);   
+    GetLocalPane2()->m_pListCtrl->UpdateColumns(m_nHideLocalColumns);
 }
 
-void CMainFrame::OnUpdateViewLocallistviewLastmodifiedtime(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewLocallistviewLastmodifiedtime(CCmdUI* pCmdUI)
 {
     pCmdUI->Enable(!m_nLocalListViewStyle);
     pCmdUI->SetCheck(!(m_nHideLocalColumns&4));
@@ -2925 +2925 @@
 //Code to change the remote list view styles
 //******************************************
 
-void CMainFrame::OnRemoteliststyleIcon() 
+void CMainFrame::OnRemoteliststyleIcon()
 {
     m_nRemoteListViewStyle=2;
     GetFtpPane()->m_pListCtrl->SetListStyle(m_nRemoteListViewStyle);
 }
 
-void CMainFrame::OnUpdateRemoteliststyleIcon(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateRemoteliststyleIcon(CCmdUI* pCmdUI)
 {
-    pCmdUI->SetCheck(m_nRemoteListViewStyle==2);    
+    pCmdUI->SetCheck(m_nRemoteListViewStyle==2);
 }
 
-void CMainFrame::OnRemoteliststyleList() 
+void CMainFrame::OnRemoteliststyleList()
 {
     m_nRemoteListViewStyle=1;
     GetFtpPane()->m_pListCtrl->SetListStyle(m_nRemoteListViewStyle);
 }
 
-void CMainFrame::OnUpdateRemoteliststyleList(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateRemoteliststyleList(CCmdUI* pCmdUI)
 {
     pCmdUI->SetCheck(m_nRemoteListViewStyle==1);
 }
 
-void CMainFrame::OnRemoteliststyleReport() 
+void CMainFrame::OnRemoteliststyleReport()
 {
     m_nRemoteListViewStyle=0;
     GetFtpPane()->m_pListCtrl->SetListStyle(m_nRemoteListViewStyle);
 }
 
-void CMainFrame::OnUpdateRemoteliststyleReport(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateRemoteliststyleReport(CCmdUI* pCmdUI)
 {
-    pCmdUI->SetCheck(m_nRemoteListViewStyle==0);    
+    pCmdUI->SetCheck(m_nRemoteListViewStyle==0);
 }
 
-void CMainFrame::OnRemoteliststyleSmallicon() 
+void CMainFrame::OnRemoteliststyleSmallicon()
 {
     m_nRemoteListViewStyle=3;
     GetFtpPane()->m_pListCtrl->SetListStyle(m_nRemoteListViewStyle);
 }
 
-void CMainFrame::OnUpdateRemoteliststyleSmallicon(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateRemoteliststyleSmallicon(CCmdUI* pCmdUI)
 {
-    pCmdUI->SetCheck(m_nRemoteListViewStyle==3);    
+    pCmdUI->SetCheck(m_nRemoteListViewStyle==3);
 }
 
-void CMainFrame::OnViewRemotelistviewFilesize() 
+void CMainFrame::OnViewRemotelistviewFilesize()
 {
     m_nHideRemoteColumns ^= 1;
-    GetFtpPane()->m_pListCtrl->UpdateColumns(m_nHideRemoteColumns); 
+    GetFtpPane()->m_pListCtrl->UpdateColumns(m_nHideRemoteColumns);
 }
 
-void CMainFrame::OnUpdateViewRemotelistviewFilesize(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewRemotelistviewFilesize(CCmdUI* pCmdUI)
 {
     pCmdUI->Enable(!m_nRemoteListViewStyle);
     pCmdUI->SetCheck(!(m_nHideRemoteColumns&1));
 }
 
-void CMainFrame::OnViewRemotelistviewFiletype() 
+void CMainFrame::OnViewRemotelistviewFiletype()
 {
     m_nHideRemoteColumns ^= 2;
-    GetFtpPane()->m_pListCtrl->UpdateColumns(m_nHideRemoteColumns); 
+    GetFtpPane()->m_pListCtrl->UpdateColumns(m_nHideRemoteColumns);
 }
 
-void CMainFrame::OnUpdateViewRemotelistviewFiletype(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewRemotelistviewFiletype(CCmdUI* pCmdUI)
 {
     pCmdUI->Enable(!m_nRemoteListViewStyle);
     pCmdUI->SetCheck(!(m_nHideRemoteColumns&2));
 }
 
-void CMainFrame::OnViewRemotelistviewDate() 
+void CMainFrame::OnViewRemotelistviewDate()
 {
     m_nHideRemoteColumns ^= 4;
-    GetFtpPane()->m_pListCtrl->UpdateColumns(m_nHideRemoteColumns); 
+    GetFtpPane()->m_pListCtrl->UpdateColumns(m_nHideRemoteColumns);
 }
 
-void CMainFrame::OnUpdateViewRemotelistviewDate(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewRemotelistviewDate(CCmdUI* pCmdUI)
 {
     pCmdUI->Enable(!m_nRemoteListViewStyle);
     pCmdUI->SetCheck(!(m_nHideRemoteColumns&4));
 }
 
-void CMainFrame::OnViewRemotelistviewTime() 
+void CMainFrame::OnViewRemotelistviewTime()
 {
     m_nHideRemoteColumns ^= 8;
-    GetFtpPane()->m_pListCtrl->UpdateColumns(m_nHideRemoteColumns); 
+    GetFtpPane()->m_pListCtrl->UpdateColumns(m_nHideRemoteColumns);
 }
 
-void CMainFrame::OnUpdateViewRemotelistviewTime(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewRemotelistviewTime(CCmdUI* pCmdUI)
 {
     pCmdUI->Enable(!m_nRemoteListViewStyle);
     pCmdUI->SetCheck(!(m_nHideRemoteColumns&8));
 }
 
-void CMainFrame::OnViewRemotelistviewPermissions() 
+void CMainFrame::OnViewRemotelistviewPermissions()
 {
     m_nHideRemoteColumns ^= 0x10;
-    GetFtpPane()->m_pListCtrl->UpdateColumns(m_nHideRemoteColumns); 
+    GetFtpPane()->m_pListCtrl->UpdateColumns(m_nHideRemoteColumns);
 }
 
-void CMainFrame::OnUpdateViewRemotelistviewPermissions(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewRemotelistviewPermissions(CCmdUI* pCmdUI)
 {
     pCmdUI->Enable(!m_nRemoteListViewStyle);
     pCmdUI->SetCheck(!(m_nHideRemoteColumns&0x10));
 }
 
-void CMainFrame::OnFileConnecttodefaultsite() 
+void CMainFrame::OnFileConnecttodefaultsite()
 {
     t_SiteManagerItem *site=CSiteManager::GetDefaultSite();
     if (!site)
         return;
-    
+
     ParseSite(*site);
     delete site;
     return;
 }
 
-void CMainFrame::OnHelpmenuContents() 
+void CMainFrame::OnHelpmenuContents()
 {
     HINSTANCE hDLL=LoadLibrary( _T("hhctrl.ocx") );
     if (hDLL)
@@ -3056 +3056 @@
     }
 }
 
-void CMainFrame::OnHelpmenuIndex() 
+void CMainFrame::OnHelpmenuIndex()
 {
     HINSTANCE hDLL=LoadLibrary( _T("hhctrl.ocx") );
     if (hDLL)
@@ -3072 +3072 @@
     }
 }
 
-void CMainFrame::OnHelpmenuSearch() 
+void CMainFrame::OnHelpmenuSearch()
 {
     HH_FTS_QUERY q;
     memset(&q,0,sizeof(q));
@@ -3089 +3089 @@
 
         if (pHtmlHelp)
             pHtmlHelp(m_hWnd, AfxGetApp()->m_pszHelpFilePath, HH_DISPLAY_SEARCH, (DWORD)&q);
-    }   
+    }
 }
 
-void CMainFrame::WinHelp(DWORD dwData, UINT nCmd) 
+void CMainFrame::WinHelp(DWORD dwData, UINT nCmd)
 {
     HINSTANCE hDLL=LoadLibrary( _T("hhctrl.ocx") );
     if (hDLL)
@@ -3104 +3104 @@
         #endif
 
         if (pHtmlHelp)
-            pHtmlHelp(m_hWnd, AfxGetApp()->m_pszHelpFilePath, HH_HELP_CONTEXT, nCmd == HELP_CONTEXT ? dwData : 0);  
+            pHtmlHelp(m_hWnd, AfxGetApp()->m_pszHelpFilePath, HH_HELP_CONTEXT, nCmd == HELP_CONTEXT ? dwData : 0);
     }
 }
 
-void CMainFrame::OnOverwritemenuAsk() 
+void CMainFrame::OnOverwritemenuAsk()
 {
     CFileExistsDlg::SetOverwriteSettings(FILEEXISTS_ASK);
 }
 
-void CMainFrame::OnOverwritemenuOverwrite() 
+void CMainFrame::OnOverwritemenuOverwrite()
 {
     CFileExistsDlg::SetOverwriteSettings(FILEEXISTS_OVERWRITE);
 }
 
-void CMainFrame::OnOverwritemenuOverwriteifnewer() 
+void CMainFrame::OnOverwritemenuOverwriteifnewer()
 {
     CFileExistsDlg::SetOverwriteSettings(FILEEXISTS_OVERWRITEIFNEWER);
 }
 
-void CMainFrame::OnOverwritemenuResume() 
+void CMainFrame::OnOverwritemenuResume()
 {
     CFileExistsDlg::SetOverwriteSettings(FILEEXISTS_RESUME);
 }
 
-void CMainFrame::OnOverwritemenuRename() 
+void CMainFrame::OnOverwritemenuRename()
 {
     CFileExistsDlg::SetOverwriteSettings(FILEEXISTS_RENAME);
 }
 
-void CMainFrame::OnOverwritemenuSkip() 
+void CMainFrame::OnOverwritemenuSkip()
 {
     CFileExistsDlg::SetOverwriteSettings(FILEEXISTS_SKIP);
 }
 
-void CMainFrame::OnUpdateOverwritemenuAsk(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateOverwritemenuAsk(CCmdUI* pCmdUI)
 {
     pCmdUI->SetCheck(!CFileExistsDlg::Always());
 }
 
-void CMainFrame::OnUpdateOverwritemenuOverwrite(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateOverwritemenuOverwrite(CCmdUI* pCmdUI)
 {
     pCmdUI->SetCheck(CFileExistsDlg::Always()?(CFileExistsDlg::GetAction()==FILEEXISTS_OVERWRITE):FALSE);
 }
 
-void CMainFrame::OnUpdateOverwritemenuOverwriteifnewer(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateOverwritemenuOverwriteifnewer(CCmdUI* pCmdUI)
 {
     pCmdUI->SetCheck(CFileExistsDlg::Always()?(CFileExistsDlg::GetAction()==FILEEXISTS_OVERWRITEIFNEWER):FALSE);
 }
 
-void CMainFrame::OnUpdateOverwritemenuResume(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateOverwritemenuResume(CCmdUI* pCmdUI)
 {
     pCmdUI->SetCheck(CFileExistsDlg::Always()?(CFileExistsDlg::GetAction()==FILEEXISTS_RESUME):FALSE);
 }
 
-void CMainFrame::OnUpdateOverwritemenuRename(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateOverwritemenuRename(CCmdUI* pCmdUI)
 {
     pCmdUI->SetCheck(CFileExistsDlg::Always()?(CFileExistsDlg::GetAction()==FILEEXISTS_RENAME):FALSE);
 }
 
-void CMainFrame::OnUpdateOverwritemenuSkip(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateOverwritemenuSkip(CCmdUI* pCmdUI)
 {
     pCmdUI->SetCheck(CFileExistsDlg::Always()?(CFileExistsDlg::GetAction()==FILEEXISTS_SKIP):FALSE);
 }
@@ -3179 +3179 @@
     CString str=COptions::GetOption(OPTION_LASTWINDOWPOS);
     WINDOWPLACEMENT placement;
     placement.length=sizeof(placement);
-    
+
     int pos;
     pos=str.Find( _T(" ") );
     if (pos==-1)
@@ -3189 +3189 @@
     }
     m_PosData.state=_ttoi(str.Left(pos));
     str=str.Mid(pos+1);
-    
+
     pos=str.Find( _T(" ") );
     if (pos==-1)
     {
@@ -3198 +3198 @@
     }
     m_PosData.NormalRect.left=_ttoi(str.Left(pos));
     str=str.Mid(pos+1);
-    
+
     pos=str.Find( _T(" ") );
     if (pos==-1)
     {
@@ -3207 +3207 @@
     }
     m_PosData.NormalRect.top=_ttoi(str.Left(pos));
     str=str.Mid(pos+1);
-    
+
     pos=str.Find( _T(" ") );
     if (pos==-1)
     {
@@ -3216 +3216 @@
     }
     m_PosData.NormalRect.right=_ttoi(str.Left(pos));
     str=str.Mid(pos+1);
-    
+
     if (str=="")
     {
         CenterWindow();
         return FALSE;
     }
     m_PosData.NormalRect.bottom=_ttoi(str);
-    
+
     str=COptions::GetOption(OPTION_LASTSPLITTERSIZE);
-    
+
     pos=str.Find( _T(" ") );
     if (pos==-1)
     {
@@ -3234 +3234 @@
     }
     m_PosData.cy1=_ttoi(str.Left(pos));
     str=str.Mid(pos+1);
-    
+
     pos=str.Find( _T(" ") );
     if (pos==-1)
     {
@@ -3243 +3243 @@
     }
     m_PosData.cy2=_ttoi(str.Left(pos));
     str=str.Mid(pos+1);
-    
+
     pos=str.Find( _T(" ") );
     if (pos==-1)
     {
@@ -3252 +3252 @@
     }
     m_PosData.cy3=_ttoi(str.Left(pos));
     str=str.Mid(pos+1);
-    
+
     pos=str.Find( _T(" ") );
     if (pos==-1)
     {
@@ -3261 +3261 @@
     }
     m_PosData.cy4=_ttoi(str.Left(pos));
     str=str.Mid(pos+1);
-    
+
     if (str=="")
     {
         CenterWindow();
         return FALSE;
     }
     m_PosData.cx=_ttoi(str);
-    
-    
-        
+
+
+
 /* //Todo: Coordinate checking which is compatible with multi monitor systems
     if (placement.rcNormalPosition.left<0)
     {
@@ -3312 +3312 @@
         m_wndMainSplitter.SetColumnInfo(0, m_PosData.cx, 0);
     m_wndMainSplitter.RecalcLayout();
     m_wndVertSplitter.RecalcLayout();
-    
+
     return TRUE;
 }
 
@@ -3324 +3324 @@
 #define VK_X        88
 #define VK_Z        90
 
-BOOL CMainFrame::PreTranslateMessage(MSG* pMsg) 
+BOOL CMainFrame::PreTranslateMessage(MSG* pMsg)
 {
     if ( pMsg->message == WM_KEYDOWN )
     {
@@ -3353 +3353 @@
                     m_pLocalViewHeader->m_pEdit->SetFocus();
                 //Local edit field has focus
                 //Ftp combo box has focus
-                else if (pCurrent==m_pLocalViewHeader->m_pEdit|| pCurrent->GetParent()==m_pLocalViewHeader->m_pEdit)                
+                else if (pCurrent==m_pLocalViewHeader->m_pEdit|| pCurrent->GetParent()==m_pLocalViewHeader->m_pEdit)
                     if (m_bShowTree)
                         GetLocalPane()->GetTreeCtrl()->SetFocus();
                     else
@@ -3488 +3488 @@
                 else if (pCurrent==GetLocalPane()->GetTreeCtrl())
                     m_pLocalViewHeader->m_pEdit->SetFocus();
                 //Local edit field has focus
-                else if (pCurrent==m_pLocalViewHeader->m_pEdit|| pCurrent->GetParent()==m_pLocalViewHeader->m_pEdit)                
+                else if (pCurrent==m_pLocalViewHeader->m_pEdit|| pCurrent->GetParent()==m_pLocalViewHeader->m_pEdit)
                     if (m_bShowMessageLog)
                         GetStatusPane()->SetFocus();
                     else
@@ -3524 +3524 @@
                         else
                             GetLocalPane2()->GetListCtrl()->SetFocus();
                 else if (pCurrent->GetParent()==m_pWndDlgBar)
-                    return CFrameWnd::PreTranslateMessage(pMsg);            
-            
+                    return CFrameWnd::PreTranslateMessage(pMsg);
+
 
                 //No known window has focus
                 else
@@ -3546 +3546 @@
         }
         return CFrameWnd::PreTranslateMessage(pMsg);
     }
-        
+
     return CFrameWnd::PreTranslateMessage(pMsg);
 }
 
-void CMainFrame::OnMenuQueueExport() 
+void CMainFrame::OnMenuQueueExport()
 {
     ((CQueueCtrl *)GetQueuePane()->GetListCtrl())->Export();
 }
 
-void CMainFrame::OnUpdateMenuQueueExport(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateMenuQueueExport(CCmdUI* pCmdUI)
 {
     pCmdUI->Enable(!((CQueueCtrl *)GetQueuePane()->GetListCtrl())->IsQueueEmpty());
 }
 
-void CMainFrame::OnMenuQueueImport() 
+void CMainFrame::OnMenuQueueImport()
 {
-    ((CQueueCtrl *)GetQueuePane()->GetListCtrl())->Import();    
+    ((CQueueCtrl *)GetQueuePane()->GetListCtrl())->Import();
 }
 
-void CMainFrame::OnUpdateMenuQueueProcessnow(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateMenuQueueProcessnow(CCmdUI* pCmdUI)
 {
     pCmdUI->SetCheck(((CQueueCtrl *)GetQueuePane()->GetListCtrl())->DoProcessQueue());
     pCmdUI->Enable(!((CQueueCtrl *)GetQueuePane()->GetListCtrl())->IsQueueEmpty());
 }
 
-void CMainFrame::OnMenuQueueUseMultiple() 
+void CMainFrame::OnMenuQueueUseMultiple()
 {
-    ((CQueueCtrl *)GetQueuePane()->GetListCtrl())->ToggleUseMultiple(); 
+    ((CQueueCtrl *)GetQueuePane()->GetListCtrl())->ToggleUseMultiple();
 }
 
-void CMainFrame::OnUpdateMenuQueueUseMultiple(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateMenuQueueUseMultiple(CCmdUI* pCmdUI)
 {
     pCmdUI->SetCheck(((CQueueCtrl *)GetQueuePane()->GetListCtrl())->DoUseMultiple());
 }
 
-void CMainFrame::OnMenuQueueProcessnow() 
+void CMainFrame::OnMenuQueueProcessnow()
 {
     if (((CQueueCtrl *)GetQueuePane()->GetListCtrl())->DoProcessQueue())
         ((CQueueCtrl *)GetQueuePane()->GetListCtrl())->StopProcessing();
@@ -3589 +3589 @@
         TransferQueue(1);
 }
 
-void CMainFrame::OnMenuTransferManualtransfer() 
+void CMainFrame::OnMenuTransferManualtransfer()
 {
     CManualTransferDlg dlg;
     t_transferfile transferfile;
@@ -3597 +3597 @@
     t_server server;
     if (m_pFileZillaApi->GetCurrentServer(server)==FZ_REPLY_OK)
         pServer=&server;
-    
+
     int res=dlg.Show(transferfile, pServer, GetLocalPane2()->GetLocalFolder(), ((CFtpListCtrl *)GetFtpPane()->GetListCtrl())->GetCurrentDirectory());
     if (res)
     {
@@ -3623 +3623 @@
         if (res==2)
             TransferQueue(2);
     }
-    
+
 }
 
-void CMainFrame::OnSysCommand( UINT nID, LPARAM lParam ) 
+void CMainFrame::OnSysCommand( UINT nID, LPARAM lParam )
 {
     if ((nID&0xFFF0)==SC_RESTORE && m_PosData.state)
     {
@@ -3673 +3673 @@
     }
 }
 
-LRESULT CMainFrame::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam) 
+LRESULT CMainFrame::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
 {
     if (m_pFileZillaApi && message==m_nFileZillaApiMessageID)
     {
@@ -3790 +3790 @@
         CString caption;
         caption.LoadString(IDS_QUESTION_VIEWEDIT_MODIFIED_CAPTION);
         if (MessageBox(text, caption, MB_YESNO | MB_ICONQUESTION)==IDYES)
-        {       
+        {
             GetQueuePane()->AddItem(pQueueData->transferFile, TRUE, 3);
             TransferQueue(2);
         }
@@ -3800 +3800 @@
     return CFrameWnd::DefWindowProc(message, wParam, lParam);
 }
 
-void CMainFrame::OnTimer(UINT_PTR nIDEvent) 
+void CMainFrame::OnTimer(UINT_PTR nIDEvent)
 {
     if (nIDEvent==m_nSecTimerID)
     {
@@ -3819 +3819 @@
     CFrameWnd::OnTimer(nIDEvent);
 }
 
-void CMainFrame::OnMenuSiteChangepass() 
+void CMainFrame::OnMenuSiteChangepass()
 {
     CServerChangePass dlg;
     if (dlg.DoModal()==IDOK)
@@ -3827 +3827 @@
         if (!m_pCommandQueue->Command("SITE PSWD \""+dlg.m_Old+"\" \""+dlg.m_New+"\""))
             MessageBeep(MB_ICONEXCLAMATION);
     }
-    
+
 }
 
-void CMainFrame::OnUpdateMenuSiteChangepass(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateMenuSiteChangepass(CCmdUI* pCmdUI)
 {
     pCmdUI->Enable( m_pCommandQueue->IsConnected() && !m_pCommandQueue->IsBusy() );
 }
@@ -3851 +3851 @@
 // Show or hide the taskbar button for this app, depending on whether
 // we're minimized right now or not.
 
-void CMainFrame::OnTrayExit() 
+void CMainFrame::OnTrayExit()
 {
     if (!m_bQuit)
-        OnClose();  
+        OnClose();
 }
 
-void CMainFrame::OnTrayRestore() 
+void CMainFrame::OnTrayRestore()
 {
     ShowWindow(SW_RESTORE);
     if (m_bMaxBeforeTray)
@@ -3867 +3867 @@
     m_TrayIcon.HideIcon();
 }
 
-void CMainFrame::OnMenuViewShowhidden() 
+void CMainFrame::OnMenuViewShowhidden()
 {
     m_bShowHiddenFiles=!m_bShowHiddenFiles;
     if (m_pFileZillaApi)
@@ -3876 +3876 @@
         RefreshViews(2);
 }
 
-void CMainFrame::OnUpdateMenuViewShowhidden(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateMenuViewShowhidden(CCmdUI* pCmdUI)
 {
     pCmdUI->SetCheck(m_bShowHiddenFiles);
-    
+
 }
 
-void CMainFrame::OnShowremotetree() 
+void CMainFrame::OnShowremotetree()
 {
     if (!m_bShowRemoteTree)
     {
@@ -3907 +3907 @@
         GetFtpTreePane()->EnableTree(FALSE);
     }
     GetFtpTreePane()->UpdateViewHeader();
-    GetFtpPane()->UpdateViewHeader();   
+    GetFtpPane()->UpdateViewHeader();
 }
 
-void CMainFrame::OnUpdateShowremotetree(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateShowremotetree(CCmdUI* pCmdUI)
 {
-    pCmdUI->SetCheck(m_bShowRemoteTree);    
+    pCmdUI->SetCheck(m_bShowRemoteTree);
 }
 
 void CMainFrame::OnMenuDebugDumpDirectoryCache()
@@ -3929 +3929 @@
     *p= 0; //Boom!
 }
 
-void CMainFrame::OnMenuServerEnterrawcommand() 
+void CMainFrame::OnMenuServerEnterrawcommand()
 {
     if (!m_pCommandQueue->IsConnected())
         return;
@@ -3942 +3942 @@
         CMainFrame *pOwner=DYNAMIC_DOWNCAST(CMainFrame,pWnd);
         if (!m_pCommandQueue->Command(command))
             MessageBeep(MB_ICONEXCLAMATION);
-    }   
+    }
 }
 
-void CMainFrame::OnUpdateMenuServerEnterrawcommand(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateMenuServerEnterrawcommand(CCmdUI* pCmdUI)
 {
     if (m_pCommandQueue->IsConnected())
     {
@@ -3967 +3967 @@
     nPort.Format( _T("%d"), site.nPort);
     User=site.User;
     Pass=site.Pass;
-    
+
     if (site.nLogonType == 0)
     {
         User = "anonymous";
         Pass = "anon@";
     }
-    
-    if (Host=="") 
+
+    if (Host=="")
     {
         AfxMessageBox(IDS_ERRORMSG_HOSTNEEDED, MB_ICONEXCLAMATION);
         return;
     }
-    
+
     int pos=Host.Find(':');
     if (pos!=-1)
     {
@@ -4018 +4018 @@
             return;
         }
     }
-    
+
     pos=Host.ReverseFind('@');
     if (pos!=-1)
-    {   
+    {
         CString tmp=Host.Left(pos);
         int pos2=tmp.Find(':');
         if (pos2==-1)
@@ -4032 +4032 @@
         Host=Host.Right(Host.GetLength()-pos-1);
         User=tmp.Left(pos2);
         Pass=tmp.Right(tmp.GetLength()-pos2-1);
-        
+
     }
 
     int pos2 = Host.ReverseFind(']');
@@ -4093 +4093 @@
     default:
         server.nServerType = FZ_SERVERTYPE_FTP;
     }
-    
+
     t_server currentserver;
-    if (site.RemoteDir!="" && m_pFileZillaApi->GetCurrentServer(currentserver) == FZ_REPLY_OK && 
+    if (site.RemoteDir!="" && m_pFileZillaApi->GetCurrentServer(currentserver) == FZ_REPLY_OK &&
         server==currentserver && !m_pCommandQueue->IsBusy())
     {
         if (m_pCommandQueue->List(site.RemoteDir, FZ_LIST_USECACHE))
@@ -4113 +4113 @@
         m_pCommandQueue->Cancel();
         m_pCommandQueue->Disconnect();
     }
-        
+
     if (site.LocalDir!="")
         SetLocalFolder(site.LocalDir);
     m_pCommandQueue->Connect(server);
@@ -4137 +4137 @@
     ProcessQuickconnect(TRUE);
 }
 
-BOOL CMainFrame::OnCommand(WPARAM wParam, LPARAM lParam) 
+BOOL CMainFrame::OnCommand(WPARAM wParam, LPARAM lParam)
 {
     if (LOWORD(wParam)>=ID_QUICKCONNECTBAR_MENU_HISTORY1 && LOWORD(wParam)<=ID_QUICKCONNECTBAR_MENU_HISTORY10)
     {
@@ -4181 +4181 @@
         }
         return TRUE;
     }
-    
+
     return CFrameWnd::OnCommand(wParam, lParam);
 }
 
-void CMainFrame::OnMenuServerCopyurltoclipboard() 
+void CMainFrame::OnMenuServerCopyurltoclipboard()
 {
     t_server server;
     if (m_pFileZillaApi->GetCurrentServer(server)==FZ_REPLY_OK)
@@ -4208 +4208 @@
         }
         else if (server.port!=21)
             tmp.Format(_T("%d"), server.port);
-        
+
         if (tmp!="")
             str+=_T(":")+tmp;
         CString path=((CFtpListCtrl *)GetFtpPane()->GetListCtrl())->GetCurrentDirectory().GetPath();
@@ -4216 +4216 @@
             str+=_T("/");
         str+=path;
 
-        OpenClipboard();    
+        OpenClipboard();
         EmptyClipboard();
         HGLOBAL hData;
 
@@ -4227 +4227 @@
         GlobalUnlock(hData);
         SetClipboardData(CF_TEXT,hData);
         CloseClipboard();
-    }       
+    }
 }
 
-void CMainFrame::OnUpdateMenuServerCopyurltoclipboard(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateMenuServerCopyurltoclipboard(CCmdUI* pCmdUI)
 {
-    pCmdUI->Enable(m_pCommandQueue->IsConnected()); 
+    pCmdUI->Enable(m_pCommandQueue->IsConnected());
 }
 
 
@@ -4271 +4271 @@
     //CSiteManager::ReadTree( _T(""), menu.m_hMenu, ( LPVOID)&mt, NULL, NewItem_Menu, NewFolder_Menu, After_Menu);
     CMenu* pPopup = &menu;//.GetSubMenu(0);
     ASSERT(pPopup);
-    
+
     CRect rc;
     pWnd->SendMessage(TB_GETRECT, nmtb->iItem, (LPARAM)&rc);
     pWnd->ClientToScreen(&rc);
-    
+
     UINT res = pPopup->TrackPopupMenu( TPM_LEFTALIGN | TPM_LEFTBUTTON | TPM_VERTICAL | TPM_RETURNCMD | TPM_NONOTIFY,
         rc.left, rc.bottom, this, &rc);
 
     if ( res > 0)
     {
         t_SiteManagerItem *site;
-        
+
         int i;
         std::list<t_SiteManagerItem *>::iterator iter=mt.m_Sites.begin();
         for (i=(res-10); i>0; i--)
             iter++;
 
         site=*iter;
-        
+
         if (site)
         {
             CSiteManager::ConnectSitePrepare(site);
-            
+
             ParseSite(*site);
         }
     }
@@ -4311 +4311 @@
     m_Host.TrimLeft(_T(" "));
     t_server server;
     server.nServerType=0;
-    if (m_Host=="") 
+    if (m_Host=="")
     {
         m_pWndDlgBar->RedrawWindow();
         AfxMessageBox(IDS_ERRORMSG_HOSTNEEDED,MB_ICONEXCLAMATION);
@@ -4363 +4363 @@
     {
         if ( m_Host.GetLength()>(pos+1) && m_Host[pos+1]==' ')
             path=m_Host.Right(m_Host.GetLength()-pos);
-        else 
+        else
             path=m_Host.Right(m_Host.GetLength()-pos-1);
         m_Host=m_Host.Left(pos);
         if (m_Host=="")
@@ -4393 +4393 @@
         m_pWndDlgBar->SetDlgItemText(IDC_USER,m_User);
         m_pWndDlgBar->SetDlgItemText(IDC_PASS,m_Pass);
         m_pWndDlgBar->SetDlgItemText(IDC_HOST,ServerPrefix+m_Host);
-            
+
     }
 
     int pos2 = m_Host.ReverseFind(']');
@@ -4403 +4403 @@
         m_Port=m_Host.Right(m_Host.GetLength()-pos-1);
         m_pWndDlgBar->SetDlgItemText(IDC_PORT,m_Port);
         m_Host=m_Host.Left(pos);
-        m_pWndDlgBar->SetDlgItemText(IDC_HOST,ServerPrefix+m_Host);     
+        m_pWndDlgBar->SetDlgItemText(IDC_HOST,ServerPrefix+m_Host);
     }
 
     if (m_Port=="")
@@ -4430 +4430 @@
         if (COptions::GetOptionVal(OPTION_USEGSS))
         {
             USES_CONVERSION;
-            
+
             CString GssServers=COptions::GetOption(OPTION_GSSSERVERS);
             hostent *fullname=gethostbyname(T2CA(m_Host));
             CString host;
@@ -4462 +4462 @@
         }
         m_pWndDlgBar->SetDlgItemText(IDC_USER,m_User);
         m_pWndDlgBar->SetDlgItemText(IDC_PASS,m_Pass);
-            
+
     }
     if (!server.nServerType)
     {
@@ -4490 +4490 @@
     m_pCommandQueue->Connect(server);
     if (path!="")
         m_pCommandQueue->List(path,FZ_LIST_USECACHE,TRUE);
-    else 
+    else
         m_pCommandQueue->List(FZ_LIST_USECACHE,TRUE);
 
     m_pWndDlgBar->RedrawWindow();
@@ -4513 +4513 @@
     }
     else if (server.port!=21)
         tmp.Format(_T("%d"), server.port);
-        
+
     if (tmp!="")
         str+=_T(":")+tmp;
 
@@ -4537 +4537 @@
         }
         else if (iter->port!=21)
             tmp.Format(_T("%d"), iter->port);
-        
+
         if (tmp!="")
             str2+=_T(":")+tmp;
 
@@ -4559 +4559 @@
     m_nRecentQuickconnectCommandOffset%=10;
 }
 
-void CMainFrame::OnMenuViewRemotelistviewStatusbar() 
+void CMainFrame::OnMenuViewRemotelistviewStatusbar()
 {
     GetFtpPane()->EnableStatusbar(!GetFtpPane()->IsStatusbarEnabled());
 }
 
-void CMainFrame::OnMenuViewLocallistviewStatusbar() 
+void CMainFrame::OnMenuViewLocallistviewStatusbar()
 {
     GetLocalPane2()->EnableStatusbar(!GetLocalPane2()->IsStatusbarEnabled());
 }
 
-void CMainFrame::OnUpdateMenuViewRemotelistviewStatusbar(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateMenuViewRemotelistviewStatusbar(CCmdUI* pCmdUI)
 {
-    pCmdUI->SetCheck(GetFtpPane()->IsStatusbarEnabled());   
+    pCmdUI->SetCheck(GetFtpPane()->IsStatusbarEnabled());
 }
 
-void CMainFrame::OnUpdateMenuViewLocallistviewStatusbar(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateMenuViewLocallistviewStatusbar(CCmdUI* pCmdUI)
 {
-    pCmdUI->SetCheck(GetLocalPane2()->IsStatusbarEnabled());    
+    pCmdUI->SetCheck(GetLocalPane2()->IsStatusbarEnabled());
 }
 
-void CMainFrame::OnViewRemotelistviewOwnergroup() 
+void CMainFrame::OnViewRemotelistviewOwnergroup()
 {
     m_nHideRemoteColumns ^= 0x20;
-    GetFtpPane()->m_pListCtrl->UpdateColumns(m_nHideRemoteColumns); 
+    GetFtpPane()->m_pListCtrl->UpdateColumns(m_nHideRemoteColumns);
 }
 
-void CMainFrame::OnUpdateViewRemotelistviewOwnergroup(CCmdUI* pCmdUI) 
+void CMainFrame::OnUpdateViewRemotelistviewOwnergroup(CCmdUI* pCmdUI)
 {
     pCmdUI->Enable(!m_nRemoteListViewStyle);
     pCmdUI->SetCheck(!(m_nHideRemoteColumns&0x20));
@@ -4610 +4610 @@
         ID_HELPMENU_CONTENTS
     };
     m_pWndToolBar = new CToolBar;
-    
+
     if (!m_pWndToolBar->CreateEx(this, 0, WS_CHILD|WS_VISIBLE|CBRS_ALIGN_TOP, CRect(2, 2, 0, 0)))
     {
         TRACE0("Symbolleiste konnte nicht erstellt werden\n");
@@ -4628 +4628 @@
         TRACE0("Symbolleiste konnte nicht erstellt werden\n");
         return FALSE;      // Fehler bei Erstellung
     }
-    
+
     int style = TBSTYLE_FLAT;
     CVisualStylesXP xp;
     if (xp.IsAppThemed())
@@ -4640 +4640 @@
     m_pWndToolBar->SetButtonStyle(m_pWndToolBar->CommandToIndex(ID_SITEMANAGER), dwStyle);
 
     m_pWndDlgBar = new CTransparentDialogBar;
-    if (!m_pWndDlgBar->Create(this, IDR_MAINFRAME, 
+    if (!m_pWndDlgBar->Create(this, IDR_MAINFRAME,
         CBRS_ALIGN_TOP, AFX_IDW_DIALOGBAR))
     {
         TRACE0("Dialogleiste konnte nicht erstellt werden\n");
@@ -4665 +4665 @@
     return TRUE;
 }
 
-void CMainFrame::OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized) 
+void CMainFrame::OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized)
 {
     CFrameWnd::OnActivate(nState, pWndOther, bMinimized);
 

source/ManualTransferDlg.cpp

@@ -30 +30 @@
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
-// Dialogfeld CManualTransferDlg 
+// Dialogfeld CManualTransferDlg
 
 
 CManualTransferDlg::CManualTransferDlg(CWnd* pParent /*=NULL*/)
@@ -82 +82 @@
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
-// Behandlungsroutinen für Nachrichten CManualTransferDlg 
+// Behandlungsroutinen für Nachrichten CManualTransferDlg
 
 int CManualTransferDlg::Show(t_transferfile &transferfile, t_server *pServer, CString LocalPath, CServerPath RemotePath)
 {
@@ -99 +99 @@
     return 0;
 }
 
-void CManualTransferDlg::OnOK() 
+void CManualTransferDlg::OnOK()
 {
     UpdateData(TRUE);
 
@@ -142 +142 @@
         AfxMessageBox(IDS_MANUALTRANSFER_LOCALFILE);
         return;
     }
-    
+
     CServerPath path=m_RemotePath;
     if (m_pServer)
         path.SetServer(*m_pServer);
@@ -198 +198 @@
         m_Transferfile.server=*m_pServer;
     else
     {
-        if (m_Host=="") 
+        if (m_Host=="")
         {
             GetDlgItem(IDC_MANUALTRANSFER_HOST)->SetFocus();
             AfxMessageBox(IDS_MANUALTRANSFER_HOST, MB_ICONEXCLAMATION);
@@ -261 +261 @@
             m_Host=m_Host.Left(pos);
         }
         m_Transferfile.server.host=m_Host;
-        
+
         if (m_Port=="")
             m_Port="21";
-        
+
         int nPort=_ttoi(m_Port);
         if (nPort<1 || nPort>65535)
         {
             GetDlgItem(IDC_MANUALTRANSFER_PORT)->SetFocus();
             AfxMessageBox(IDS_MANUALTRANSFER_PORT,MB_ICONEXCLAMATION);
             return;
-        }   
+        }
         m_Transferfile.server.port=nPort;
-        
+
         if (m_nLogontype)
         {
             if (m_User=="")
@@ -282 +282 @@
                 if (COptions::GetOptionVal(OPTION_USEGSS))
                 {
                     USES_CONVERSION;
-                    
+
                     CString GssServers=COptions::GetOption(OPTION_GSSSERVERS);
                     hostent *fullname=gethostbyname(T2CA(m_Host));
                     CString host;
@@ -356 +356 @@
     CDialog::OnOK();
 }
 
-BOOL CManualTransferDlg::OnInitDialog() 
+BOOL CManualTransferDlg::OnInitDialog()
 {
     CDialog::OnInitDialog();
 
@@ -374 +374 @@
 
     UpdateData(FALSE);
     SetCtrlState();
-    
+
     return TRUE;  // return TRUE unless you set the focus to a control
                   // EXCEPTION: OCX-Eigenschaftenseiten sollten FALSE zurückgeben
 }
@@ -415 +415 @@
 
 }
 
-void CManualTransferDlg::OnManualtransferServer() 
+void CManualTransferDlg::OnManualtransferServer()
 {
-    SetCtrlState(); 
+    SetCtrlState();
 }
 
-void CManualTransferDlg::OnManualtransferLogontype() 
+void CManualTransferDlg::OnManualtransferLogontype()
 {
-    SetCtrlState(); 
+    SetCtrlState();
 }

source/Options.cpp

@@ -41 +41 @@
 CString COptions::m_sConfigFile;
 
 /////////////////////////////////////////////////////////////////////////////
-// Dialogfeld COptions 
+// Dialogfeld COptions
 
 COptions::COptions(CWnd* pParent /*=NULL*/)
     //: CSAPrefsDialog(pParent)
@@ -67 +67 @@
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
-// Behandlungsroutinen für Nachrichten COptions 
+// Behandlungsroutinen für Nachrichten COptions
 
 BOOL COptions::Show()
 {
@@ -92 +92 @@
         AddPage(m_OptionsPaneLayoutPage, IDS_OPTIONSPAGE_PANELAYOUT, &m_OptionsInterfacePage);
         AddPage(m_OptionsLoggingPage, IDS_OPTIONSPAGE_LOGGING, &m_OptionsInterfacePage);
     AddPage(m_OptionsDebugPage, IDS_OPTIONSPAGE_DEBUG);
-        
-    
+
+
     SetConstantText("FileZilla");
 
     m_OptionsFtpProxyPage.m_logontype=GetOptionVal(OPTION_LOGONTYPE);
@@ -118 +118 @@
     //Init type page
     m_OptionsTypePage.m_nTypeMode = GetOptionVal(OPTION_TRANSFERMODE);
     m_OptionsTypePage.m_AsciiFiles = GetOption(OPTION_ASCIIFILES);
-    
+
     //Init misc page
     m_OptionsMiscPage.m_nFolderType = GetOptionVal(OPTION_DEFAULTFOLDERTYPE);
     m_OptionsMiscPage.m_DefaultFolder = GetOption(OPTION_DEFAULTFOLDER);
@@ -151 +151 @@
     m_OptionsLocalViewPage.m_bShowStatusBar = GetOptionVal(OPTION_SHOWLOCALSTATUSBAR);
     m_OptionsLocalViewPage.m_bRememberColumnSort = GetOptionVal(OPTION_LOCALCOLUMNSORT) ? TRUE : FALSE;
     m_OptionsLocalViewPage.m_nDoubleclickAction = GetOptionVal(OPTION_LOCAL_DOUBLECLICK_ACTION);
-    
+
     //Init remote view page
     m_OptionsRemoteViewPage.m_nViewMode = GetOptionVal(OPTION_REMEMBERREMOTEVIEW);
     m_OptionsRemoteViewPage.m_nRemoteStyle = GetOptionVal(OPTION_REMOTELISTVIEWSTYLE);
@@ -168 +168 @@
     m_OptionsRemoteViewPage.m_bShowStatusBar = GetOptionVal(OPTION_SHOWREMOTESTATUSBAR);
     m_OptionsRemoteViewPage.m_bRememberColumnSort = GetOptionVal(OPTION_REMOTECOLUMNSORT) ? TRUE : FALSE;
     m_OptionsRemoteViewPage.m_nDoubleclickAction = GetOptionVal(OPTION_REMOTE_DOUBLECLICK_ACTION);
-    
+
     //Init GSS Page
     m_OptionsGssPage.m_bUseGSS=GetOptionVal(OPTION_USEGSS);
-    m_OptionsGssPage.m_GssServers=GetOption(OPTION_GSSSERVERS); 
+    m_OptionsGssPage.m_GssServers=GetOption(OPTION_GSSSERVERS);
 
     //Init Debug Page
     m_OptionsDebugPage.m_bEngineTrace=GetOptionVal(OPTION_DEBUGTRACE);
@@ -187 +187 @@
     m_OptionsFirewallPage.m_TransferIP = GetOption(OPTION_TRANSFERIP);
     m_OptionsFirewallPage.m_bUseTransferIP6 = (GetOption(OPTION_TRANSFERIP6)!="") ? TRUE : FALSE;
     m_OptionsFirewallPage.m_TransferIP6 = GetOption(OPTION_TRANSFERIP6);
-    
+
     //Init Directory Cache page
     m_OptionsDirCachePage.m_bUseCache=GetOptionVal(OPTION_USECACHE)?1:0;
     m_OptionsDirCachePage.m_nHours=GetOptionVal(OPTION_MAXCACHETIME)/3600;
@@ -249 +249 @@
     BOOL res = DoModal();
     if (res != IDOK)
         return FALSE;
-    
+
     SetOption(OPTION_LOGONTYPE,m_OptionsFtpProxyPage.m_logontype);
     SetOption(OPTION_FWHOST,m_OptionsFtpProxyPage.m_fwhost);
     SetOption(OPTION_FWPORT,m_OptionsFtpProxyPage.m_fwport);
@@ -257 +257 @@
     SetOption(OPTION_FWPASS,CCrypt::encrypt(m_OptionsFtpProxyPage.m_fwpass));
     SetOption(OPTION_TIMEOUTLENGTH,m_OptionsPage2.m_Timeout);
     SetOption(OPTION_KEEPALIVE,m_OptionsPage2.m_UseKeepAlive);
-    
+
     if (m_OptionsPage2.m_UseKeepAlive)
     {
         SetOption(OPTION_INTERVALLOW,_ttoi(m_OptionsPage2.m_IntervalLow));
@@ -292 +292 @@
     SetOption(OPTION_SHOWNOSTATUSBAR,!m_OptionsInterfacePage.m_bShowStatusBar);
     SetOption(OPTION_SHOWNOMESSAGELOG,!m_OptionsInterfacePage.m_bShowMessageLog);
     SetOption(OPTION_SHOWNOTREEVIEW,!m_OptionsInterfacePage.m_bShowLocalTree);
-    SetOption(OPTION_SHOWREMOTETREEVIEW, m_OptionsInterfacePage.m_bShowRemoteTree); 
+    SetOption(OPTION_SHOWREMOTETREEVIEW, m_OptionsInterfacePage.m_bShowRemoteTree);
     SetOption(OPTION_SHOWNOQUEUE,!m_OptionsInterfacePage.m_bShowQueue);
     SetOption(OPTION_SHOWNOLABEL,!m_OptionsInterfacePage.m_bShowViewLabels);
     SetOption(OPTION_REMEMBERVIEWS,m_OptionsInterfacePage.m_nViewMode);
     SetOption(OPTION_REMEMBERLASTWINDOWPOS,m_OptionsInterfacePage.m_bRememberWindowPos);
     SetOption(OPTION_MINIMIZETOTRAY, m_OptionsInterfacePage.m_nMinimize);
-    
+
     //Store local view page
     SetOption(OPTION_REMEMBERLOCALVIEW,m_OptionsLocalViewPage.m_nViewMode);
     SetOption(OPTION_LOCALLISTVIEWSTYLE,m_OptionsLocalViewPage.m_nLocalStyle);
-    
+
     nLocalHide=0;
     if (!m_OptionsLocalViewPage.m_bSize)
         nLocalHide|=1;
@@ -319 +319 @@
     else if (!m_OptionsLocalViewPage.m_bRememberColumnSort && GetOptionVal(OPTION_LOCALCOLUMNSORT))
         SetOption(OPTION_LOCALCOLUMNSORT, 0);
     SetOption(OPTION_LOCAL_DOUBLECLICK_ACTION, m_OptionsLocalViewPage.m_nDoubleclickAction);
-    
+
     //Store remote view page
     SetOption(OPTION_REMEMBERREMOTEVIEW, m_OptionsRemoteViewPage.m_nViewMode);
     SetOption(OPTION_REMOTELISTVIEWSTYLE, m_OptionsRemoteViewPage.m_nRemoteStyle);
-    
+
     nRemoteHide = 0;
     if (!m_OptionsRemoteViewPage.m_bSize)
         nRemoteHide |= 1;
@@ -347 +347 @@
     else if (!m_OptionsRemoteViewPage.m_bRememberColumnSort && GetOptionVal(OPTION_REMOTECOLUMNSORT))
         SetOption(OPTION_REMOTECOLUMNSORT, 0);
     SetOption(OPTION_REMOTE_DOUBLECLICK_ACTION, m_OptionsRemoteViewPage.m_nDoubleclickAction);
-    
+
     //Store the GSS settings
     SetOption(OPTION_USEGSS,m_OptionsGssPage.m_bUseGSS);
     SetOption(OPTION_GSSSERVERS,m_OptionsGssPage.m_GssServers);
@@ -368 +368 @@
     //Store Directory Cache settings
     SetOption(OPTION_USECACHE,m_OptionsDirCachePage.m_bUseCache);
     SetOption(OPTION_MAXCACHETIME,m_OptionsDirCachePage.m_nHours*3600+m_OptionsDirCachePage.m_nMinutes*60+m_OptionsDirCachePage.m_nSeconds);
-    
+
     //Store Transfer page
     SetOption(OPTION_PRESERVEDOWNLOADFILETIME, m_OptionsTransferPage.m_bPreserveTime);
     int value=_ttoi(m_OptionsTransferPage.m_MaxPrimarySize);
@@ -436 +436 @@
     return TRUE;
 }
 
-BOOL COptions::OnInitDialog() 
+BOOL COptions::OnInitDialog()
 {
     CSAPrefsDialog::OnInitDialog();
-        
+
     return TRUE;  // return TRUE unless you set the focus to a control
                   // EXCEPTION: OCX-Eigenschaftenseiten sollten FALSE zurückgeben
 }
@@ -557 +557 @@
         unsigned char tmp[4];
         memcpy(tmp,&value,4);
         HKEY key;
-        if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\FileZilla"), 0, 0, REG_OPTION_NON_VOLATILE, KEY_WRITE, 0, &key, NULL)==ERROR_SUCCESS) 
+        if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\FileZilla"), 0, 0, REG_OPTION_NON_VOLATILE, KEY_WRITE, 0, &key, NULL)==ERROR_SUCCESS)
         {
             RegSetValueEx(key, options[nOptionID-1].name, 0, REG_DWORD, tmp, 4);
             RegCloseKey(key);
@@ -576 +576 @@
     m_OptionsCache[nOptionID-1].createtime=CTime::GetCurrentTime();
     m_OptionsCache[nOptionID-1].str=value;
     m_OptionsCache[nOptionID-1].nType=0;
-        
+
     if (m_bUseXML)
     {
         m_markup.ResetPos();
         if (!m_markup.FindChildElem( _T("Settings") ))
             m_markup.AddChildElem( _T("Settings") );
-        
+
         CString str;
         m_markup.IntoElem();
         str=m_markup.GetTagName();
@@ -613 +613 @@
         LPCTSTR str=value;
         _tcscpy(tmp,str);
         HKEY key;
-        if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\FileZilla"), 0, 0, REG_OPTION_NON_VOLATILE, KEY_WRITE, 0, &key, NULL)==ERROR_SUCCESS) 
+        if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\FileZilla"), 0, 0, REG_OPTION_NON_VOLATILE, KEY_WRITE, 0, &key, NULL)==ERROR_SUCCESS)
         {
             RegSetValueEx(key, options[nOptionID-1].name, 0, REG_SZ, (unsigned char *)tmp, (_tcslen(tmp)+1)*sizeof(TCHAR) );
             RegCloseKey(key);
@@ -625 +625 @@
 CString COptions::GetOption(int nOptionID)
 {
     ASSERT(!options[nOptionID-1].nType);
-    
+
     Init();
     CSingleLock lock(&m_Sync, TRUE);
 
@@ -634 +634 @@
     {
         ASSERT(!m_OptionsCache[nOptionID-1].nType);
         CTimeSpan span=CTime::GetCurrentTime()-m_OptionsCache[nOptionID-1].createtime;
-        if (span.GetTotalSeconds()<120 || m_bUseXML)    
+        if (span.GetTotalSeconds()<120 || m_bUseXML)
             res=m_OptionsCache[nOptionID-1].str;
         else
             m_OptionsCache[nOptionID-1].bCached=FALSE;
@@ -645 +645 @@
         unsigned long tmp=2000;
         unsigned char *buffer=new unsigned char[2000];
         BOOL exists = FALSE;
-        
+
         if (RegOpenKey(HKEY_CURRENT_USER, _T("Software\\FileZilla"), &key)==ERROR_SUCCESS)
         {
             memset(buffer, 0, 2000);
-            
-            if (RegQueryValueEx(key, options[nOptionID-1].name, NULL, NULL, buffer, &tmp)==ERROR_SUCCESS) 
+
+            if (RegQueryValueEx(key, options[nOptionID-1].name, NULL, NULL, buffer, &tmp)==ERROR_SUCCESS)
             {
                 exists=TRUE;
                 res=(LPTSTR)buffer;
             }
             RegCloseKey(key);
         }
-        
+
         if (!exists || (!_ttoi(res) && nOptionID==OPTION_RUNINSECUREMODE))
         {
             memset(buffer, 0, 2000);
@@ -713 +713 @@
         HKEY key;
         unsigned char *buffer = new unsigned char[200];
         unsigned long tmp=100;
-                
+
         if (RegOpenKey(HKEY_CURRENT_USER, _T("Software\\FileZilla") ,&key)==ERROR_SUCCESS)
         {
             DWORD type;
-            if (RegQueryValueEx(key, options[nOptionID-1].name, NULL, &type, buffer, &tmp)==ERROR_SUCCESS) 
+            if (RegQueryValueEx(key, options[nOptionID-1].name, NULL, &type, buffer, &tmp)==ERROR_SUCCESS)
             {
                 if (type == REG_DWORD)
                 {
-                    if (tmp<=4) 
+                    if (tmp<=4)
                     {
                         memcpy(&val,buffer,tmp);
                         error=0;
@@ -745 +745 @@
             }
             RegCloseKey(key);
         }
-        
+
         if (error)
         {
             memset(buffer,0,100);
@@ -756 +756 @@
                 {
                     if (type == REG_DWORD)
                     {
-                        if (tmp<=4) 
+                        if (tmp<=4)
                         {
                             memcpy(&val,buffer,tmp);
                             error=0;
@@ -773 +773 @@
                         }
                         if (i == 100)
                             str[99] = 0;
-                        
+
                         val = _ttoi(str);
                         error = 0;
                     }
@@ -782 +782 @@
             }
         }
         delete [] buffer;
-    }   
+    }
     switch (nOptionID)
     {
         case OPTION_KEEPALIVE:
@@ -800 +800 @@
                 val=30;
             else if (val<15)
                 val=30;
-            break;          
+            break;
         case OPTION_TIMEOUTLENGTH:
             if (val<30)
                 val=30;
@@ -932 +932 @@
     return val;
 }
 
-void COptions::OnOK() 
+void COptions::OnOK()
 {
     if (!UpdateData(true))
         return;
@@ -981 +981 @@
         CString str;
         str.Format(IDS_OPTIONS_TIMEOUT, 0, 999);
         AfxMessageBox(str, MB_ICONEXCLAMATION);
-        return;         
+        return;
     }
-    
-    
+
+
     int val=_ttoi(m_OptionsPage2.m_NumRetries);
     if ((val<0)||(val>999))
     {
@@ -994 +994 @@
         str.Format(IDS_OPTIONS_NUMRETRIES,0,999);
         AfxMessageBox(str,MB_ICONEXCLAMATION);
         return;
-            
+
     }
-    
+
     val=_ttoi(m_OptionsPage2.m_Delay);
     if ((val<0)||(val>999))
     {
@@ -1006 +1006 @@
         str.Format(IDS_OPTIONS_RETRYDELAY,0,999);
         AfxMessageBox(str,MB_ICONEXCLAMATION);
         return;
-            
+
     }
-    
+
     if (m_OptionsProxyPage.m_Type)
     {
         if (m_OptionsProxyPage.m_Host=="")
@@ -1027 +1027 @@
             return;
         }
     }
-    
+
     if (m_OptionsTypePage.m_AsciiFiles=="")
     {
         m_OptionsTypePage.m_AsciiFiles="";
@@ -1040 +1040 @@
         m_OptionsTypePage.m_AsciiFiles.TrimRight( _T(";") );
         m_OptionsTypePage.m_AsciiFiles+=";";
     }
-    
+
     if (m_OptionsGssPage.m_GssServers=="")
     {
         m_OptionsGssPage.m_GssServers="";
@@ -1097 +1097 @@
             if (i!=str.GetLength())
             {
                 line=str.Left(i);
-            
+
                 str=str.Mid(i+1);
                 i=-1;
             }
@@ -1133 +1133 @@
             qpos=line.Find( _T("\"") );
             if (qpos==-1)
                 continue;
-            
+
             ext=line.Left(qpos);
             ext.TrimLeft( _T(" ") );
             ext.TrimRight( _T(" ") );
@@ -1159 +1159 @@
             AfxMessageBox(IDS_OPTIONS_IDENTUSERID, MB_ICONEXCLAMATION);
             return;
         }
-        
+
         if(m_OptionsIdentPage.m_System.IsEmpty())
         {
             ShowPage(&m_OptionsIdentPage);
@@ -1192 +1192 @@
             {
                 LPVOID ptr=0;
                 UINT ptrlen;
-    
+
                 TCHAR SubBlock[50];
-                
+
                 // Structure used to store enumerated languages and code pages.
                 struct LANGANDCODEPAGE {
                 WORD wLanguage;
                 WORD wCodePage;
                 } *lpTranslate;
-    
+
                 UINT cbTranslate;
-                
+
                 // Read the list of languages and code pages.
-                if (VerQueryValue(pBlock, 
+                if (VerQueryValue(pBlock,
                             TEXT("\\VarFileInfo\\Translation"),
                             (LPVOID*)&lpTranslate,
                             &cbTranslate))
                 {
                     // Read the file description for each language and code page.
-                
-                    _stprintf( SubBlock, 
+
+                    _stprintf( SubBlock,
                         _T("\\StringFileInfo\\%04x%04x\\ProductName"),
                         lpTranslate[0].wLanguage,
                         lpTranslate[0].wCodePage);
-                    // Retrieve file description for language and code page "0". 
-                    if (VerQueryValue(pBlock, 
-                            SubBlock, 
-                            &ptr, 
+                    // Retrieve file description for language and code page "0".
+                    if (VerQueryValue(pBlock,
+                            SubBlock,
+                            &ptr,
                                 &ptrlen))
                     {
                         LPTSTR pname=(LPTSTR)ptr;
                         CString productname=pname;
                         if ( productname==_T("FileZilla Language DLL") )
                         {
-                            _stprintf( SubBlock, 
+                            _stprintf( SubBlock,
                             _T("\\StringFileInfo\\%04x%04x\\Comments"),
                             lpTranslate[0].wLanguage,
                             lpTranslate[0].wCodePage);
-                    
-                            if (VerQueryValue(pBlock, 
-                                SubBlock, 
-                                &ptr, 
+
+                            if (VerQueryValue(pBlock,
+                                SubBlock,
+                                &ptr,
                                 &ptrlen))
                             {
                                 LPTSTR comment=(LPTSTR)ptr;
                                 if (m_OptionsLanguagePage.m_LanguageStringList.find(comment)==m_OptionsLanguagePage.m_LanguageStringList.end())
-                                    m_OptionsLanguagePage.m_LanguageStringList.insert(comment);         
+                                    m_OptionsLanguagePage.m_LanguageStringList.insert(comment);
                             }
                         }
                     }
-                    
+
                 }
             }
             delete [] str;
@@ -1300 +1300 @@
                 UINT cbTranslate;
 
                 // Read the list of languages and code pages.
-                if (VerQueryValue(pBlock, 
+                if (VerQueryValue(pBlock,
                             TEXT("\\VarFileInfo\\Translation"),
                             (LPVOID*)&lpTranslate,
                             &cbTranslate))
                 {
                     // Read the file description for each language and code page.
 
-                    _stprintf( SubBlock, 
+                    _stprintf( SubBlock,
                            _T("\\StringFileInfo\\%04x%04x\\ProductName"),
                            lpTranslate[0].wLanguage,
                            lpTranslate[0].wCodePage);
-                    // Retrieve file description for language and code page "0". 
-                    if (VerQueryValue(pBlock, 
-                        SubBlock, 
-                        &ptr, 
+                    // Retrieve file description for language and code page "0".
+                    if (VerQueryValue(pBlock,
+                        SubBlock,
+                        &ptr,
                             &ptrlen))
                     {
                         LPTSTR pname=(LPTSTR)ptr;
                         CString productname=pname;
                         if ( productname==("FileZilla Language DLL") )
                         {
-                            _stprintf( SubBlock, 
+                            _stprintf( SubBlock,
                             _T("\\StringFileInfo\\%04x%04x\\Comments"),
                             lpTranslate[0].wLanguage,
                             lpTranslate[0].wCodePage);
-    
-                            if (VerQueryValue(pBlock, 
-                                SubBlock, 
-                                &ptr, 
+
+                            if (VerQueryValue(pBlock,
+                                SubBlock,
+                                &ptr,
                                 &ptrlen))
                             {
                                 LPTSTR comment=(LPTSTR)ptr;
@@ -1350 +1350 @@
                                                 if (((CFileZillaApp *)AfxGetApp())->m_bLangSet)
                                                     FreeLibrary(AfxGetResourceHandle());
                                                 ((CFileZillaApp *)AfxGetApp())->m_bLangSet=TRUE;
-        
+
                                                 HINSTANCE dll=LoadLibrary(fn);
                                                 if (dll)
                                                     AfxSetResourceHandle(dll);
@@ -1444 +1444 @@
     }
 }
 
-void COptions::OnPhelp() 
+void COptions::OnPhelp()
 {
     CString help=AfxGetApp()->m_pszHelpFilePath;
     help+="::/configuration.htm";
@@ -1458 +1458 @@
         #endif
 
         if (pHtmlHelp)
-            pHtmlHelp(m_hWnd, help,HH_DISPLAY_TOC,0);   
+            pHtmlHelp(m_hWnd, help,HH_DISPLAY_TOC,0);
     }
 }
 
@@ -1480 +1480 @@
         return;
     else if (status.m_attribute&FILE_ATTRIBUTE_DIRECTORY)
         return;
-    
+
     if (!status.m_size)
     {
         m_bUseXML = TRUE;
@@ -1494 +1494 @@
         {
             if (!m_markup.FindChildElem( _T("Settings") ))
                 m_markup.AddChildElem( _T("Settings") );
-            
+
             CString str;
             m_markup.IntoElem();
             str=m_markup.GetTagName();
@@ -1573 +1573 @@
             {
                 if (!m_markup.FindChildElem( _T("Settings") ))
                     m_markup.AddChildElem( _T("Settings") );
-                
+
                 CString str;
                 m_markup.IntoElem();
                 str=m_markup.GetTagName();
@@ -1701 +1701 @@
         else
             return TRUE;
     }
-    else 
+    else
         return FALSE;
 }
 
 void COptions::GetKey(HKEY key, CString keyname, CString &value)
 {
     unsigned char *buffer=new unsigned char[1000];
-    
+
     unsigned long tmp=1000;
-    if (RegQueryValueEx(key, keyname, NULL, NULL, buffer, &tmp)!=ERROR_SUCCESS) 
+    if (RegQueryValueEx(key, keyname, NULL, NULL, buffer, &tmp)!=ERROR_SUCCESS)
         value="";
-    else 
+    else
         value=(LPTSTR)buffer;
     delete [] buffer;
     return;
@@ -1728 +1728 @@
 void COptions::GetKey(HKEY key, CString keyname, __int64 &value)
 {
     unsigned char *buffer=new unsigned char[1000];
-    
+
     unsigned long tmp=1000;
     if (RegQueryValueEx(key,keyname,NULL,NULL,buffer,&tmp)!=ERROR_SUCCESS)
         value=0;
-    else 
+    else
     {
         if (_tcslen((LPTSTR)buffer)>20)
             value=0;
@@ -1788 +1788 @@
 {
     if (!pXML->FindChildElem( _T("Server") ))
         return FALSE;
-    
+
     server.host = pXML->GetChildAttrib( _T("Host") );
     server.port = _ttoi(pXML->GetChildAttrib( _T("Port") ));
     server.user = pXML->GetChildAttrib( _T("User") );
@@ -1849 +1849 @@
         return m_sConfigFile;
     else
         return ((CFileZillaApp *)AfxGetApp())->m_appPath + _T("FileZilla.xml");
-}
- No newline at end of file
+}

source/Options.h

@@ -55 +55 @@
 #define OPTIONS_NUM 116
 
 /////////////////////////////////////////////////////////////////////////////
-// Dialogfeld COptions 
+// Dialogfeld COptions
 class COptions : protected CSAPrefsDialog
 {
 // Konstruktion
@@ -87 +87 @@
     static void GetKey(HKEY key, CString keyname, int &value);
 
     static void SetConfig(LPCTSTR pConfigFile);
-    
+
     COptions(CWnd* pParent = NULL);   // Standardkonstruktor
     COptionsConnection m_OptionsFtpProxyPage;
     COptionsConnection2 m_OptionsPage2;
@@ -115 +115 @@
 
 protected:
     static CString GetSpeedLimitsString(SPEEDLIMITSLIST &list);
-    static void FillSpeedLimitsListFromString(SPEEDLIMITSLIST &list, CString str);  
+    static void FillSpeedLimitsListFromString(SPEEDLIMITSLIST &list, CString str);
     static CMarkupSTL m_markup;
     static void Init();
     static BOOL m_bInitialized;
@@ -139 +139 @@
     static CString GetXmlFileName();
 
     static CString m_sConfigFile;
-    
+
 // Dialogfelddaten
     //{{AFX_DATA(COptions)
     enum { IDD = IDD_SAPREFS };

source/OptionsConnection2.cpp

@@ -21 +21 @@
 #include "OptionsConnection2.h"
 
 /////////////////////////////////////////////////////////////////////////////
-// Eigenschaftenseite COptionsConnection2 
+// Eigenschaftenseite COptionsConnection2
 
 IMPLEMENT_DYNCREATE(COptionsConnection2, CSAPrefsSubDlg)
 
@@ -66 +66 @@
     //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-void COptionsConnection2::OnCheck1() 
+void COptionsConnection2::OnCheck1()
 {
     UpdateData(TRUE);
     m_IntervalHighCtrl.EnableWindow(m_UseKeepAlive);
     m_IntervalLowCtrl.EnableWindow(m_UseKeepAlive);
 }
 
-BOOL COptionsConnection2::OnInitDialog() 
+BOOL COptionsConnection2::OnInitDialog()
 {
     CSAPrefsSubDlg::OnInitDialog();
-    
+
     m_IntervalHighCtrl.EnableWindow(m_UseKeepAlive);
-    m_IntervalLowCtrl.EnableWindow(m_UseKeepAlive); 
+    m_IntervalLowCtrl.EnableWindow(m_UseKeepAlive);
     return TRUE;  // return TRUE unless you set the focus to a control
                   // EXCEPTION: OCX-Eigenschaftenseiten sollten FALSE zurückgeben
 }

source/OptionsConnection2.h

@@ -17 +17 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /////////////////////////////////////////////////////////////////////////////
-// Dialogfeld COptionsConnection2 
+// Dialogfeld COptionsConnection2
 
 #pragma once
 

source/resource.h

@@ -752 +752 @@
 #define AFX_IDS_SCCLOSE                 0xEF06
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1