Ticket #1480: CustomAnonPwd.patch
File CustomAnonPwd.patch, 14.0 KB (added by , 19 years ago) |
---|
-
source/FileZilla.rc
RCS file: /cvsroot/filezilla/FileZilla/source/FileZilla.rc,v retrieving revision 1.205 diff -u -r1.205 FileZilla.rc
177 177 ES_AUTOHSCROLL 178 178 END 179 179 180 IDD_CONNECTION2 DIALOGEX 0, 0, 28 6, 208180 IDD_CONNECTION2 DIALOGEX 0, 0, 284, 212 181 181 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD 182 182 FONT 8, "MS Shell Dlg", 0, 0, 0x0 183 183 BEGIN 184 GROUPBOX "Keep Alive Settings",IDC_STATIC, 7,6,272,62184 GROUPBOX "Keep Alive Settings",IDC_STATIC,6,42,270,62 185 185 CONTROL "&Enable the Keep Alive system",IDC_CHECK1,"Button", 186 BS_AUTOCHECKBOX | WS_TABSTOP,1 3,18,109,10186 BS_AUTOCHECKBOX | WS_TABSTOP,12,54,109,10 187 187 LTEXT "Send Keep Alive commands like ""PWD"", ""REST 0"", ""TYPE A"", ""TYPE I"" at random intervals between", 188 IDC_STATIC, 13,32,223,17189 EDITTEXT IDC_INTERVALLOW, 16,50,24,14,ES_AUTOHSCROLL190 LTEXT "and",IDC_STATIC, 44,53,13,8191 EDITTEXT IDC_INTERVALHIGH, 61,50,23,14,ES_AUTOHSCROLL192 LTEXT "seconds.",IDC_STATIC, 89,53,30,8193 GROUPBOX "&Timeout Detection",IDC_STATIC, 7,73,272,40194 LTEXT "If zero bytes are transfer red within",IDC_STATIC,14,85,195 11 4,8196 EDITTEXT IDC_TIMEOUT,12 9,81,26,14,ES_AUTOHSCROLL197 LTEXT "seconds,",IDC_STATIC,15 9,84,30,8188 IDC_STATIC,24,66,223,17 189 EDITTEXT IDC_INTERVALLOW,24,84,24,14,ES_AUTOHSCROLL 190 LTEXT "and",IDC_STATIC,54,87,13,8 191 EDITTEXT IDC_INTERVALHIGH,72,84,23,14,ES_AUTOHSCROLL 192 LTEXT "seconds.",IDC_STATIC,102,87,30,8 193 GROUPBOX "&Timeout Detection",IDC_STATIC,6,108,270,36 194 LTEXT "If zero bytes are transfered within",IDC_STATIC,12,120, 195 113,8 196 EDITTEXT IDC_TIMEOUT,126,117,26,14,ES_AUTOHSCROLL 197 LTEXT "seconds,",IDC_STATIC,156,120,30,8 198 198 LTEXT "assume that the connection timed out and disconnect.", 199 IDC_STATIC,1 4,96,172,8200 GROUPBOX "Retry Settings",IDC_STATIC, 7,124,272,58199 IDC_STATIC,12,132,173,8 200 GROUPBOX "Retry Settings",IDC_STATIC,6,150,272,44 201 201 LTEXT "When disconnected from server during transfer, wait ", 202 IDC_STATIC,1 3,137,234,8203 EDITTEXT IDC_DELAY,1 5,147,17,14,ES_AUTOHSCROLL202 IDC_STATIC,12,162,174,8 203 EDITTEXT IDC_DELAY,12,174,17,14,ES_AUTOHSCROLL 204 204 LTEXT "seconds between login attempts and try again up to", 205 IDC_STATIC,3 8,150,168,8206 EDITTEXT IDC_NUMRETRY,2 07,147,20,14,ES_AUTOHSCROLL207 LTEXT "times ",IDC_STATIC,231,150,17,8205 IDC_STATIC,36,177,168,8 206 EDITTEXT IDC_NUMRETRY,210,174,20,14,ES_AUTOHSCROLL 207 LTEXT "times.",IDC_STATIC,234,177,18,8 208 208 CONTROL "Enable IPv6 support (works only under Windows XP / 2003 Server or newer)", 209 209 IDC_OPTIONS_CONNECTION2_ENABLEIPV6,"Button", 210 BS_AUTOCHECKBOX | WS_TABSTOP,7,189,260,10 210 BS_AUTOCHECKBOX | WS_TABSTOP,6,198,260,10 211 GROUPBOX "Default Anonymous Password",IDC_STATIC,6,6,270,30 212 EDITTEXT IDC_ANONPWD,12,18,258,12,ES_AUTOHSCROLL 211 213 END 212 214 213 215 IDD_ENTERSOMETHING DIALOG 0, 0, 186, 68 -
source/FtpControlSocket.cpp
RCS file: /cvsroot/filezilla/FileZilla/source/FtpControlSocket.cpp,v retrieving revision 1.117 diff -u -r1.117 FtpControlSocket.cpp
685 685 return; 686 686 } 687 687 } 688 else if ((i == 1 || i == 11) && (m_CurrentServer.pass == "anon@"|| m_CurrentServer.pass == ""))688 else if ((i == 1 || i == 11) && (m_CurrentServer.pass == COptions::GetOption(OPTION_ANONPWD) || m_CurrentServer.pass == "")) 689 689 { 690 690 CGssNeedPassRequestData *pData=new CGssNeedPassRequestData; 691 691 pData->nRequestID=m_pOwner->GetNextAsyncRequestID(); -
source/MainFrm.cpp
RCS file: /cvsroot/filezilla/FileZilla/source/MainFrm.cpp,v retrieving revision 1.196 diff -u -r1.196 MainFrm.cpp
2296 2296 if (!bUseGSS) 2297 2297 { 2298 2298 server.user="anonymous"; 2299 server.pass= "anon@";2299 server.pass=COptions::GetOption(OPTION_ANONPWD); 2300 2300 } 2301 2301 else 2302 2302 { … … 3971 3971 if (site.nLogonType == 0) 3972 3972 { 3973 3973 User = "anonymous"; 3974 Pass = "anon@";3974 Pass = COptions::GetOption(OPTION_ANONPWD); 3975 3975 } 3976 3976 3977 3977 if (Host=="") … … 4058 4058 if (User == "") 4059 4059 { 4060 4060 User="anonymous"; 4061 Pass= "anon@";4061 Pass=COptions::GetOption(OPTION_ANONPWD); 4062 4062 } 4063 4063 4064 4064 t_server server; … … 4453 4453 if (!bUseGSS) 4454 4454 { 4455 4455 m_User="anonymous"; 4456 m_Pass= "anon@";4456 m_Pass=COptions::GetOption(OPTION_ANONPWD); 4457 4457 } 4458 4458 else 4459 4459 { -
source/ManualTransferDlg.cpp
RCS file: /cvsroot/filezilla/FileZilla/source/ManualTransferDlg.cpp,v retrieving revision 1.8 diff -u -r1.8 ManualTransferDlg.cpp
325 325 else 326 326 { 327 327 m_Transferfile.server.user="anonymous"; 328 m_Transferfile.server.pass= "anon@";328 m_Transferfile.server.pass=COptions::GetOption(OPTION_ANONPWD); 329 329 } 330 330 331 331 switch (m_ServerType.GetCurSel()) -
source/Options.cpp
RCS file: /cvsroot/filezilla/FileZilla/source/Options.cpp,v retrieving revision 1.113 diff -u -r1.113 Options.cpp
93 93 AddPage(m_OptionsLoggingPage, IDS_OPTIONSPAGE_LOGGING, &m_OptionsInterfacePage); 94 94 AddPage(m_OptionsDebugPage, IDS_OPTIONSPAGE_DEBUG); 95 95 96 97 96 SetConstantText("FileZilla"); 98 97 99 98 m_OptionsFtpProxyPage.m_logontype=GetOptionVal(OPTION_LOGONTYPE); … … 102 101 m_OptionsFtpProxyPage.m_fwuser=GetOption(OPTION_FWUSER); 103 102 m_OptionsFtpProxyPage.m_fwpass=CCrypt::decrypt(GetOption(OPTION_FWPASS)); 104 103 m_OptionsPage2.m_Timeout=GetOptionVal(OPTION_TIMEOUTLENGTH); 104 m_OptionsPage2.m_AnonPwd=GetOption(OPTION_ANONPWD); 105 105 m_OptionsPage2.m_UseKeepAlive=GetOptionVal(OPTION_KEEPALIVE); 106 106 m_OptionsPage2.m_IntervalLow.Format(_T("%d"), GetOptionVal(OPTION_INTERVALLOW)); 107 107 m_OptionsPage2.m_IntervalHigh.Format(_T("%d"), GetOptionVal(OPTION_INTERVALHIGH)); … … 245 245 m_OptionsTransferCompressionPage.m_useCompression = GetOptionVal(OPTION_MODEZ_USE); 246 246 247 247 InitLanguagePage(); 248 248 249 //Show the dialog 249 250 BOOL res = DoModal(); 250 251 if (res != IDOK) … … 256 257 SetOption(OPTION_FWUSER,m_OptionsFtpProxyPage.m_fwuser); 257 258 SetOption(OPTION_FWPASS,CCrypt::encrypt(m_OptionsFtpProxyPage.m_fwpass)); 258 259 SetOption(OPTION_TIMEOUTLENGTH,m_OptionsPage2.m_Timeout); 260 261 SetOption(OPTION_ANONPWD,m_OptionsPage2.m_AnonPwd); 259 262 SetOption(OPTION_KEEPALIVE,m_OptionsPage2.m_UseKeepAlive); 260 263 261 264 if (m_OptionsPage2.m_UseKeepAlive) … … 678 681 res = "mit.edu;"; 679 682 else if (nOptionID == OPTION_IDENTSYSTEM) 680 683 res = _T("UNIX"); 684 else if (nOptionID == OPTION_ANONPWD) 685 res = _T("anon@"); 681 686 } 682 687 if (!m_OptionsCache[nOptionID-1].bCached) 683 688 { -
source/Options.h
RCS file: /cvsroot/filezilla/FileZilla/source/Options.h,v retrieving revision 1.66 diff -u -r1.66 Options.h
22 22 #if _MSC_VER > 1000 23 23 #pragma once 24 24 #endif // _MSC_VER > 1000 25 // Options.h : Header-Datei26 //27 25 28 26 #include "FzApiStructures.h" 29 27 #include "SpeedLimit.h" … … 52 50 53 51 #include "misc\MarkupSTL.h" 54 52 55 #define OPTIONS_NUM 11 653 #define OPTIONS_NUM 117 56 54 57 55 ///////////////////////////////////////////////////////////////////////////// 58 56 // Dialogfeld COptions … … 281 279 #define OPTION_LOGTIMESTAMPS 114 282 280 #define OPTION_VMSALLREVISIONS 115 283 281 #define OPTION_LASTSERVERUTF8 116 282 #define OPTION_ANONPWD 117 284 283 285 284 //{{AFX_INSERT_LOCATION}} 286 285 // Microsoft Visual C++ fügt unmittelbar vor der vorhergehenden Zeile zusätzliche Deklarationen ein. -
source/OptionsConnection2.cpp
RCS file: /cvsroot/filezilla/FileZilla/source/OptionsConnection2.cpp,v retrieving revision 1.6 diff -u -r1.6 OptionsConnection2.cpp
29 29 , m_bEnableIPV6(FALSE) 30 30 { 31 31 //{{AFX_DATA_INIT(COptionsConnection2) 32 m_Timeout = 0;33 32 m_UseKeepAlive = FALSE; 34 m_IntervalHigh = _T("");35 33 m_IntervalLow = _T(""); 34 m_IntervalHigh = _T(""); 35 m_Timeout = 0; 36 36 m_Delay = _T(""); 37 37 m_NumRetries = _T(""); 38 38 //}}AFX_DATA_INIT … … 46 46 { 47 47 CSAPrefsSubDlg::DoDataExchange(pDX); 48 48 //{{AFX_DATA_MAP(COptionsConnection2) 49 DDX_Control(pDX, IDC_ANONPWD, m_AnonPwdCtrl); 50 DDX_Text(pDX, IDC_ANONPWD, m_AnonPwd); 51 52 DDX_Check(pDX, IDC_CHECK1, m_UseKeepAlive); 53 49 54 DDX_Control(pDX, IDC_INTERVALLOW, m_IntervalLowCtrl); 55 DDX_Text(pDX, IDC_INTERVALLOW, m_IntervalLow); 56 50 57 DDX_Control(pDX, IDC_INTERVALHIGH, m_IntervalHighCtrl); 51 DDX_Text(pDX, IDC_TIMEOUT, m_Timeout);52 DDX_Check(pDX, IDC_CHECK1, m_UseKeepAlive);53 58 DDX_Text(pDX, IDC_INTERVALHIGH, m_IntervalHigh); 54 DDX_Text(pDX, IDC_INTERVALLOW, m_IntervalLow); 59 60 DDX_Text(pDX, IDC_TIMEOUT, m_Timeout); 61 55 62 DDX_Text(pDX, IDC_DELAY, m_Delay); 56 63 DDX_Text(pDX, IDC_NUMRETRY, m_NumRetries); 57 64 //}}AFX_DATA_MAP 65 58 66 DDX_Check(pDX, IDC_OPTIONS_CONNECTION2_ENABLEIPV6, m_bEnableIPV6); 59 67 } 60 68 61 62 69 BEGIN_MESSAGE_MAP(COptionsConnection2, CSAPrefsSubDlg) 63 70 //{{AFX_MSG_MAP(COptionsConnection2) 64 ON_BN_CLICKED(IDC_CHECK1, OnCheck 1)71 ON_BN_CLICKED(IDC_CHECK1, OnCheckKeepAlive) 65 72 ON_WM_CLOSE() 66 73 //}}AFX_MSG_MAP 67 74 END_MESSAGE_MAP() 68 75 69 void COptionsConnection2::OnCheck1()76 BOOL COptionsConnection2::OnInitDialog() 70 77 { 71 UpdateData(TRUE); 78 CSAPrefsSubDlg::OnInitDialog(); 79 72 80 m_IntervalHighCtrl.EnableWindow(m_UseKeepAlive); 73 81 m_IntervalLowCtrl.EnableWindow(m_UseKeepAlive); 82 83 // Return TRUE unless you set the focus to a control. 84 return TRUE; 74 85 } 75 86 76 BOOL COptionsConnection2::OnInitDialog()87 void COptionsConnection2::OnCheckKeepAlive() 77 88 { 78 CSAPrefsSubDlg::OnInitDialog(); 79 80 m_IntervalHighCtrl.EnableWindow(m_UseKeepAlive); 89 UpdateData(TRUE); 81 90 m_IntervalLowCtrl.EnableWindow(m_UseKeepAlive); 82 return TRUE; // return TRUE unless you set the focus to a control 83 // EXCEPTION: OCX-Eigenschaftenseiten sollten FALSE zurückgeben 91 m_IntervalHighCtrl.EnableWindow(m_UseKeepAlive); 84 92 } -
source/OptionsConnection2.h
RCS file: /cvsroot/filezilla/FileZilla/source/OptionsConnection2.h,v retrieving revision 1.5 diff -u -r1.5 OptionsConnection2.h
33 33 // Dialogfelddaten 34 34 //{{AFX_DATA(COptionsConnection2) 35 35 enum { IDD = IDD_CONNECTION2 }; 36 37 CEdit m_AnonPwdCtrl; 38 CString m_AnonPwd; 39 40 BOOL m_UseKeepAlive; 41 36 42 CEdit m_IntervalLowCtrl; 43 CString m_IntervalLow; 44 37 45 CEdit m_IntervalHighCtrl; 38 UINT m_Timeout;39 BOOL m_UseKeepAlive;40 46 CString m_IntervalHigh; 41 CString m_IntervalLow; 47 48 UINT m_Timeout; 49 42 50 CString m_Delay; 43 51 CString m_NumRetries; 44 52 //}}AFX_DATA … … 56 64 protected: 57 65 // Generierte Nachrichtenzuordnungsfunktionen 58 66 //{{AFX_MSG(COptionsConnection2) 59 afx_msg void OnCheck1();60 67 virtual BOOL OnInitDialog(); 68 afx_msg void OnCheckKeepAlive(); 61 69 //}}AFX_MSG 62 70 DECLARE_MESSAGE_MAP() 63 71 -
source/SiteManager.cpp
RCS file: /cvsroot/filezilla/FileZilla/source/SiteManager.cpp,v retrieving revision 1.64 diff -u -r1.64 SiteManager.cpp
1038 1038 if (!m_Logontype) 1039 1039 { 1040 1040 m_User="anonymous"; 1041 m_Pass= "anon@";1041 m_Pass=COptions::GetOption(OPTION_ANONPWD); 1042 1042 } 1043 1043 else 1044 1044 { … … 1908 1908 else 1909 1909 { 1910 1910 m_User="anonymous"; 1911 m_Pass= "anon@";1911 m_Pass=COptions::GetOption(OPTION_ANONPWD); 1912 1912 } 1913 1913 m_bFwBypass=site->bFirewallBypass; 1914 1914 m_bPassDontSave=site->bPassDontSave; -
source/resource.h
RCS file: /cvsroot/filezilla/FileZilla/source/resource.h,v retrieving revision 1.117 diff -u -r1.117 resource.h
351 351 #define IDC_OPTIONS_CONNECTION2_ENABLEIPV6 1287 352 352 #define IDC_COMBO1 1288 353 353 #define IDC_SITEMANAGER_ADVANCED_UTF8 1288 354 #define IDC_ANONPWD 1289 354 355 #define IDS_STATUSMSG_CONNECTED 2000 355 356 #define IDS_STATUSMSG_CONNECTEDWITH 2001 356 357 #define IDS_STATUSMSG_CONNECTEDWITHSFTP 2002 … … 758 759 #define _APS_3D_CONTROLS 1 759 760 #define _APS_NEXT_RESOURCE_VALUE 3106 760 761 #define _APS_NEXT_COMMAND_VALUE 32902 761 #define _APS_NEXT_CONTROL_VALUE 12 89762 #define _APS_NEXT_CONTROL_VALUE 1290 762 763 #define _APS_NEXT_SYMED_VALUE 3205 763 764 #endif 764 765 #endif