Ticket #4292: 4292.diff

src/interface/cmdline.h

@@ -17 +17 @@
     enum t_option
     {
         logontype,
-        site
+        site,
+        local
     };
 
     CCommandLine(int argc, wxChar** argv);

src/interface/Mainfrm.cpp

@@ -2506 +2506 @@
         return;
 
     wxString site;
+    wxString local;
     if (pCommandLine->HasSwitch(CCommandLine::sitemanager))
     {
         if (!COptions::Get()->GetOptionVal(OPTION_INTERFACE_SITEMANAGER_ON_STARTUP) != 0)
@@ -2529 +2530 @@
             delete pData;
         }
     }
+    else if ((local = pCommandLine->GetOption(CCommandLine::local)) != _T(""))
+    {
+        
+        if (!wxDir::Exists(local))
+        {
+            wxString str = _("Path not found:");
+            str += _T("\n") + local;
+            wxMessageBox(str, _("Syntax error in command line"));
+            return;
+        }
+        
+        CState *pState = CContextManager::Get()->GetCurrentContext();
+        if (!pState)
+            return;
+            
+        pState->SetLocalDir(local);
+    }   
+    
 
     wxString param = pCommandLine->GetParameter();
     if (param != _T(""))
@@ -2536 +2555 @@
         wxString error;
 
         CServer server;
-
+        
         wxString logontype = pCommandLine->GetOption(CCommandLine::logontype);
         if (logontype == _T("ask"))
             server.SetLogonType(ASK);

src/interface/cmdline.cpp

@@ -6 +6 @@
     m_parser.AddSwitch(_T("h"), _T("help"), _("Shows this help dialog"), wxCMD_LINE_OPTION_HELP);
     m_parser.AddSwitch(_T("s"), _T("site-manager"), _("Start with opened Site Manager"));
     m_parser.AddOption(_T("c"), _T("site"), _("Connect to specified Site Manager site"));
+    m_parser.AddOption(_T("a"), _T("local"), _("Starts the local site in the given path"));
 
     wxString desc = wxString::Format(_("Logontype, can only be used together with FTP URL. Argument has to be either '%s' or '%s'"), _T("ask"), _T("interactive"));
     m_parser.AddOption(_T("l"), _T("logontype"), desc);
@@ -55 +56 @@
         if (m_parser.Found(_T("l"), &value))
             return value;
         break;
+    case local:
+        if (m_parser.Found(_T("a"), &value))
+            return value;
+        break;      
     }
 
     return _T("");