Changeset 5 for trunk/UMainForm.pas

Timestamp:

Nov 27, 2008, 12:46:04 PM (15 years ago)

Author:

george

Message:

• Odstraněno: Funkce a ovládací prvky související s vytáčením VPN.

Location:

trunk

Files:

• . (modified) (1 prop)
• UMainForm.pas (modified) (18 diffs)

trunk/UMainForm.pas

@@ -6 +6 @@
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, StdCtrls, ComCtrls, ShellApi, DosCommand, Registry, Menus,
-  CoolTrayIcon, ExtCtrls, XPMan, magrascon, magrasedt, magrasent, SHFolder,
-  ShlObj, magrasapi, Winsock, UTextFileStream;
+  CoolTrayIcon, ExtCtrls, XPMan, SHFolder,
+  ShlObj, Winsock, UTextFileStream;
 
 const
@@ -39 +39 @@
     Button1: TButton;
     Button2: TButton;
-    GroupBox1: TGroupBox;
-    CheckBox1: TCheckBox;
-    ComboBox1: TComboBox;
-    Label1: TLabel;
-    CheckBox2: TCheckBox;
     Bevel1: TBevel;
     CheckBox4: TCheckBox;
@@ -55 +50 @@
     XPManifest1: TXPManifest;
     CheckBox6: TCheckBox;
-    CheckBox7: TCheckBox;
-    CheckBox8: TCheckBox;
     Oprogramu1: TMenuItem;
     CheckBox9: TCheckBox;
     Zznamvyten1: TMenuItem;
-    Label2: TLabel;
     OpenDialog1: TOpenDialog;
-    GroupBox2: TGroupBox;
-    CheckBox10: TCheckBox;
-    Label3: TLabel;
-    Edit1: TEdit;
-    Button4: TButton;
-    MagRasCon1: TMagRasCon;
-    MagRasEdt1: TMagRasEdt;
-    CheckBox3: TCheckBox;
     VPNpipojen1: TMenuItem;
-    CheckBox11: TCheckBox;
     Spustit1: TMenuItem;
     Zasavit1: TMenuItem;
-    Label4: TLabel;
-    Edit2: TEdit;
     procedure FormShow(Sender: TObject);
     procedure Button2Click(Sender: TObject);
@@ -86 +67 @@
     procedure Button3Click(Sender: TObject);
     procedure Oprogramu1Click(Sender: TObject);
-    procedure Zznamvyten1Click(Sender: TObject);
-    procedure Button4Click(Sender: TObject);
-    procedure CheckBox10Click(Sender: TObject);
-    procedure Spustit1Click(Sender: TObject);
-    procedure Zasavit1Click(Sender: TObject);
   private
     procedure LoadOptions;
     procedure SaveOptions;
-    function GetLocalNetworkRouting: Boolean;
-    procedure SetLocalNetworkRouting(const Value: Boolean);
     function GetCentralaHomepage: Boolean;
     procedure SetCentralaHomepage(const Value: Boolean);
@@ -104 +78 @@
     function GetShareUnblockFirewall: Boolean;
     procedure SetShareUnblockFirewall(const Value: Boolean);
-    function GetZdechovNetConnection: Boolean;
-    procedure SetZdechovNetConnection(const Value: Boolean);
     function GetNetSharedFolder: Boolean;
     procedure SetNetSharedFolder(const Value: Boolean);
-    function GetLogFileEnabled: Boolean;
-    procedure SetLogFileEnabled(const Value: Boolean);
-    function GetLogFileName: string;
-    procedure SetLogFileName(const Value: string);
-    function GetConnectionName: string;
-    procedure SetConnectionName(const Value: string);
-    function GetLogClearOnStart: Boolean;
-    procedure SetLogClearOnStart(const Value: Boolean);
-    function GetVpnServiceEnabled: Boolean;
-    procedure SetVpnServiceEnabled(const Value: Boolean);
-    function GetVpnServiceRunning: Boolean;
-    procedure SetVpnServiceRunning(const Value: Boolean);
     function GetNetworkDomain: string;
-    function GetConditionNetworkDomain: string;
-    procedure SetConditionNetworkDomain(const Value: string);
   public
-    DefaultGateway: string;
     FirstStart: Boolean;
     HostFilterIndex: Integer;
     PingTimeout: Integer;
-    AutoDial: Boolean;
-    AutoRedial: Boolean;
     NetworkTestLastUpdate: TDateTime;
-    property LocalNetworkRouting: Boolean read GetLocalNetworkRouting
-      write SetLocalNetworkRouting;
     property CentralaHomepage: Boolean read GetCentralaHomepage
       write SetCentralaHomepage;
@@ -141 +94 @@
     property ShareUnblockFirewall: Boolean read GetShareUnblockFirewall
       write SetShareUnblockFirewall;
-    property ZdechovNetConnection: Boolean read GetZdechovNetConnection
-      write SetZdechovNetConnection;
     property NetSharedFolder: Boolean read GetNetSharedFolder
       write SetNetSharedFolder;
-    property LogFileEnabled: Boolean read GetLogFileEnabled
-      write SetLogFileEnabled;
-    property LogFileName: string read GetLogFileName
-      write SetLogFileName;
-    property LogClearOnStart: Boolean read GetLogClearOnStart
-      write SetLogClearOnStart;
-    property ConnectionName: string read GetConnectionName
-      write SetConnectionName;
-    property VpnServiceEnabled: Boolean read GetVpnServiceEnabled
-      write SetVpnServiceEnabled;
-    property VpnServiceRunning: Boolean read GetVpnServiceRunning
-      write SetVpnServiceRunning;
     property NetworkDomain: string read GetNetworkDomain;
-    property ConditionNetworkDomain: string read GetConditionNetworkDomain
-      write SetConditionNetworkDomain;
 
     procedure Init;
-    procedure AddConnection;
-    procedure DeleteConnection;
   end;
 
@@ -178 +113 @@
 
 uses UNetworkTest, UAboutWindow, ULogExceptions, DateUtils, Math,
-  UDialingLog, StrUtils, UServiceControl;
+  StrUtils, UServiceControl;
 
 {$R *.dfm}
@@ -260 +195 @@
 end;
 
-function TMainForm.GetLocalNetworkRouting: Boolean;
-var
-  Command: TDosCommand;
-  I: Integer;
-  Lines2: TStringList;
-begin
-  Lines2 := TStringList.Create;
-  Result := False;
-  Command := TDosCommand.Create(nil);
-  with Command do try
-    CommandLine := 'route print ' + LocalNetAddr + ' mask ' + LocalNetMask +
-      ' ' + DefaultGateway + ' metric 30';
-    OutputLines := Lines2;
-    Execute2;
-    for I := 0 to Lines2.Count - 1 do
-      if Pos(LocalNetMask, Lines2[I]) > 0 then Result := True;
-  finally
-    Free;
-    Lines2.Free;
-  end;
-end;
-
-procedure TMainForm.SetLocalNetworkRouting(const Value: Boolean);
-var
-  Command: TDosCommand;
-begin
-  Command := TDosCommand.Create(nil);
-  with Command do try
-    if Value then CommandLine := 'route -p add '+LocalNetAddr+' mask '+LocalNetMask+' '+DefaultGateway+' metric 30'
-      else CommandLine := 'route delete '+LocalNetAddr+' mask '+LocalNetMask+' '+DefaultGateway+' metric 30';
-    Execute2;
-  finally
-    Free;
-  end;
-end;
-
 function TMainForm.GetCentralaHomepage: Boolean;
 begin
@@ -327 +226 @@
   LogExceptions.NazevAplikace := ApplicationName + ' ' + Version;
 
-  CheckBox1.Checked := AutoRedial;
-  CheckBox2.Checked := LocalNetworkRouting;
-  CheckBox3.Checked := LogClearOnStart;
   CheckBox4.Checked := CentralaHomepage;
   CheckBox5.Checked := WorkgroupZdechov;
   CheckBox6.Checked := ShareUnblockFirewall;
-  CheckBox7.Checked := AutoDial;
-  CheckBox8.Checked := ZdechovNetConnection;
   CheckBox9.Checked := NetSharedFolder;
-
-        MagRasCon1.GetPhoneBookEntries;
-  ComboBox1.Items.Assign(MagRasCon1.PhoneBookEntries);
-  ComboBox1.ItemIndex := ComboBox1.Items.IndexOf(ConnectionName);
-  Edit2.Text := ConditionNetworkDomain;
-
-  CheckBox10.Checked := LogFileEnabled;
-  CheckBox11.Checked := VpnServiceEnabled;
-  Edit1.Text := LogFileName;
-  Edit1.Enabled := LogFileEnabled;
-  Button4.Enabled := LogFileEnabled;
-
-  Label2.Caption := 'Brána: ' + DefaultGateway;
 end;
 
@@ -358 +239 @@
 procedure TMainForm.Button1Click(Sender: TObject);
 begin
-  AutoRedial := CheckBox1.Checked;
-  LocalNetworkRouting := CheckBox2.Checked;
-  LogClearOnStart := CheckBox3.Checked;
   CentralaHomepage := CheckBox4.Checked;
   WorkgroupZdechov := CheckBox5.Checked;
   ShareUnblockFirewall := CheckBox6.Checked;
-  AutoDial := CheckBox7.Checked;
-  ZdechovNetConnection := CheckBox8.Checked;
   NetSharedFolder := CheckBox9.Checked;
-  LogFileEnabled := CheckBox10.Checked;
-  LogFileName := Edit1.Text;
-  VpnServiceEnabled := CheckBox11.Checked;
-
-  ConditionNetworkDomain := Edit2.Text;
-  ConnectionName := ComboBox1.Items.Strings[ComboBox1.ItemIndex];
+
   CoolTrayIcon1.HideMainForm;
   SaveOptions;
@@ -456 +327 @@
   LoadOptions;
   Application.ShowMainForm := not FirstStart;
-  VpnServiceRunning;
 end;
 
@@ -506 +376 @@
 end;
 
-procedure TMainForm.AddConnection;
-var
-  I: Integer;
-begin
-  if MagRasCon1.ValidateName(DefaultConnectionName) = 0 then
-  with MagRasEdt1 do begin
-    PPPDefault;
-    PhoneBookPath := '';  // 4.60
-    // telephone numbers
-    SetCanonical(ConnectionHost) ;
-
-    // dial params
-    UserName := LowerCase(GetComputerNetName);
-    Password := '';
-
-    bPreviewUserPw := True;
-    bShowDialingProgress := True;
-    bRequireCHAP := False;
-    bRequireMSEncryptedPassword := False;
-    bSoftwareCompression := True;
-    bCustom := True;
-
-    // device stuff
-    I := 0;
-    MagRasCon1.GetDeviceList;
-    while (I < MagRasCon1.DeviceNameList.Count) and
-      (Pos('PPTP', MagRasCon1.DeviceNameList[I]) = 0) do I := I + 1;
-    DeviceName := MagRasCon1.DeviceNameList[I];
-    DeviceType := MagRasCon1.DeviceTypeList[I] ;
-    if PutAllEntryProps(DefaultConnectionName) = 0 then
-      PutDialProps (DefaultConnectionName);
-  end;
-end;
-
-function TMainForm.GetZdechovNetConnection: Boolean;
-var
-  I: Integer;
-begin
-  MagRasGetEntryList('');
-  I := 0;
-  while (I < MagRasNumEntryRec) and
-    (MagRasEntryRecs[I].EntryName <> DefaultConnectionName) do I := I + 1;
-  Result := I < MagRasNumEntryRec;
-end;
-
-procedure TMainForm.SetZdechovNetConnection(const Value: Boolean);
-begin
-  if Value then AddConnection else DeleteConnection;
-end;
-
-procedure TMainForm.DeleteConnection;
-begin
-  with MagRasCon1 do begin
-    EntryName := DefaultConnectionName;
-    DeletePhonebook;
-  end;
-end;
-
 procedure TMainForm.Button3Click(Sender: TObject);
 begin
-  CheckBox1.Checked := True;
-  CheckBox2.Checked := True;
-  CheckBox3.Checked := True;
   CheckBox4.Checked := True;
   CheckBox5.Checked := True;
   CheckBox6.Checked := True;
-  CheckBox7.Checked := True;
-  CheckBox8.Checked := True;
   CheckBox9.Checked := True;
-  CheckBox11.Checked := True;
-  ComboBox1.ItemIndex := ComboBox1.Items.IndexOf(DefaultConnectionName);
 end;
 
@@ -618 +423 @@
 end;
 
-procedure TMainForm.Zznamvyten1Click(Sender: TObject);
-begin
-//  if not DialingLog.Visible then DialingLog.ShowModal;
-  ShellLaunch(LogFileName);
-end;
-
 procedure TMainForm.Init;
 var
-  WSAErr: string;
   Hostname: string;
 begin
   HostName := 'default';
-  GetIPFromHost(Hostname, DefaultGateway, WSAErr);
-  DefaultGateway := ReverseString(DefaultGateway);
-  DefaultGateway := '1'+Copy(DefaultGateway, Pos('.', DefaultGateway), 255);
-  DefaultGateway := ReverseString(DefaultGateway);
 
   //DefaultGateway := GetDefaultGateway;
@@ -644 +438 @@
   PName = ^Name;
 var 
-  HEnt: pHostEnt; 
+  HEnt: pHostEnt;
   HName: PName; 
   WSAData: TWSAData; 
   i: Integer; 
 begin 
-  Result := False;     
+  Result := False;
   if WSAStartup($0101, WSAData) <> 0 then begin 
     WSAErr := 'Winsock is not responding."'; 
@@ -678 +472 @@
 end;
 
-procedure TMainForm.Button4Click(Sender: TObject);
-begin
-  OpenDialog1.FileName := Edit1.Text;
-  if OpenDialog1.Execute then begin
-    Edit1.Text := OpenDialog1.FileName;
-  end;
-end;
-
-procedure TMainForm.CheckBox10Click(Sender: TObject);
-begin
-  Edit1.Enabled := CheckBox10.Checked;
-  Button4.Enabled := CheckBox10.Checked;
-end;
-
-function TMainForm.GetLogFileEnabled: Boolean;
-begin
-  with TRegistry.Create do
-  try
-    RootKey := HKEY_LOCAL_MACHINE;
-    OpenKey(RegistryPath, True);
-    if ValueExists('LogFileEnabled') then Result := ReadBool('LogFileEnabled')
-      else Result := False;
-  finally
-    Free;
-  end;
-end;
-
-procedure TMainForm.SetLogFileEnabled(const Value: Boolean);
-begin
-  with TRegistry.Create do
-  try
-    RootKey := HKEY_LOCAL_MACHINE;
-    OpenKey(RegistryPath, True);
-    WriteBool('LogFileEnabled', Value)
-  finally
-    Free;
-  end;
-end;
-
-function TMainForm.GetLogFileName: string;
-begin
-  with TRegistry.Create do
-  try
-    RootKey := HKEY_LOCAL_MACHINE;
-    OpenKey(RegistryPath, True);
-    if ValueExists('LogFileName') then Result := ReadString('LogFileName')
-      else Result := ApplicationDataFolder + '\' + DefaultLogFileName;
-  finally
-    Free;
-  end;
-end;
-
-procedure TMainForm.SetLogFileName(const Value: string);
-begin
-  with TRegistry.Create do
-  try
-    RootKey := HKEY_LOCAL_MACHINE;
-    OpenKey(RegistryPath, True);
-    WriteString('LogFileName', Value)
-  finally
-    Free;
-  end;
-end;
-
 procedure TMainForm.LoadOptions;
 begin
@@ -750 +480 @@
       if ValueExists('FirstStart') then FirstStart := ReadBool('FirstStart')
         else FirstStart := False;
-      if ValueExists('AutoDial') then AutoDial := ReadBool('AutoDial');
-      if ValueExists('AutoRedial') then AutoRedial := ReadBool('AutoRedial');
-      if ValueExists('ConnectionName') then ConnectionName := ReadString('ConnectionName');
       if ValueExists('NetworkTestLastUpdate') then NetworkTestLastUpdate := StrToDate(ReadString('NetworkTestLastUpdate'));
       if ValueExists('PingTimeout') then PingTimeout := ReadInteger('PingTimeout')
         else PingTimeout := 200;
-      if ValueExists('LogFileEnabled') then LogFileEnabled := ReadBool('LogFileEnabled')
-        else LogFileEnabled := False;
-      if ValueExists('LogFileName') then LogFileName := ReadString('LogFileName')
-        else LogFileName := ApplicationDataFolder + '\' + DefaultLogFileName;
     finally
       Free;
@@ -772 +495 @@
       OpenKey(RegistryPath, True);
       WriteBool('FirstStart', True);
-      WriteBool('AutoDial', AutoDial);
-      WriteBool('AutoRedial', AutoRedial);
-      WriteString('ConnectionName', ConnectionName);
       WriteString('NetworkTestLastUpdate', DateToStr(NetworkTestLastUpdate));
       WriteInteger('PingTimeout', PingTimeout);
-      WriteBool('LogFileEnabled', LogFileEnabled);
-      WriteString('LogFileName', LogFileName);
     finally
       Free;
     end;
-end;
-
-function TMainForm.GetConnectionName: string;
-begin
-  with TRegistry.Create do
-  try
-    RootKey := HKEY_LOCAL_MACHINE;
-    OpenKey(RegistryPath, True);
-    if ValueExists('ConnectionName') then Result := ReadString('ConnectionName')
-      else Result := '';
-  finally
-    Free;
-  end;
-end;
-
-procedure TMainForm.SetConnectionName(const Value: string);
-begin
-  with TRegistry.Create do
-  try
-    RootKey := HKEY_LOCAL_MACHINE;
-    OpenKey(RegistryPath, True);
-    WriteString('ConnectionName', Value)
-  finally
-    Free;
-  end;
-end;
-
-function TMainForm.GetLogClearOnStart: Boolean;
-begin
-  with TRegistry.Create do
-  try
-    RootKey := HKEY_LOCAL_MACHINE;
-    OpenKey(RegistryPath, True);
-    if ValueExists('LogClearOnStart') then Result := ReadBool('LogClearOnStart')
-      else Result := False;
-  finally
-    Free;
-  end;
-end;
-
-procedure TMainForm.SetLogClearOnStart(const Value: Boolean);
-begin
-  with TRegistry.Create do
-  try
-    RootKey := HKEY_LOCAL_MACHINE;
-    OpenKey(RegistryPath, True);
-    WriteBool('LogClearOnStart', Value)
-  finally
-    Free;
-  end;
-end;
-
-function TMainForm.GetVpnServiceEnabled: Boolean;
-var
-  ServiceControl: TServiceControl;
-begin
-  ServiceControl := TServiceControl.Create;
-  with ServiceControl do begin
-    ReadServicesList;
-    try
-      Result := True;
-      IndexByName(DiallingServiceName);
-    except
-      Result := False;
-    end;
-  end;
-  ServiceControl.Free;
-end;
-
-procedure TMainForm.SetVpnServiceEnabled(const Value: Boolean);
-var
-  Command: TDosCommand;
-begin
-  Command := TDosCommand.Create(nil);
-  with Command do try
-    if Value and not VpnServiceEnabled then begin
-      CommandLine := ExtractFileDir(Application.ExeName)+'\DiallingService.exe /install /silent';
-      Execute2;
-    end;
-    if not Value and VpnServiceEnabled then begin
-        VpnServiceRunning := False;
-        CommandLine := ExtractFileDir(Application.ExeName)+'\DiallingService.exe /uninstall /silent';
-        Execute2;
-      end;
-  finally
-    Free;
-  end;
-  GetVpnServiceRunning;
-end;
-
-function TMainForm.GetVpnServiceRunning: Boolean;
-var
-  ServiceControl: TServiceControl;
-begin
-  Result := False;
-  Spustit1.Enabled := False;
-  Zasavit1.Enabled := False;
-  ServiceControl := TServiceControl.Create;
-  with ServiceControl do begin
-    ReadServicesList;
-    try
-      with Services[IndexByName(DiallingServiceName)] do begin
-        Result := State = ssRunning;
-        Spustit1.Enabled := (State = ssStopped) or (State = ssStopPending);
-        Zasavit1.Enabled := (State = ssRunning) or (State = ssStartPending);
-      end;
-    except
-    end;
-  end;
-  ServiceControl.Free;
-end;
-
-procedure TMainForm.SetVpnServiceRunning(const Value: Boolean);
-var
-  ServiceControl: TServiceControl;
-begin
-  ServiceControl := TServiceControl.Create;
-  with ServiceControl do begin
-    ReadServicesList;
-    try
-      if Value then Services[IndexByName(DiallingServiceName)].Start
-        else Services[IndexByName(DiallingServiceName)].Stop;
-    except
-    end;
-  end;
-  ServiceControl.Free;
-  GetVpnServiceRunning;
-end;
-
-procedure TMainForm.Spustit1Click(Sender: TObject);
-begin
-  VpnServiceRunning := True;
-end;
-
-procedure TMainForm.Zasavit1Click(Sender: TObject);
-begin
-  VpnServiceRunning := False;
 end;
 
@@ -943 +524 @@
 end;
 
-function TMainForm.GetConditionNetworkDomain: string;
-begin
-  with TRegistry.Create do
-  try
-    RootKey := HKEY_LOCAL_MACHINE;
-    OpenKey(RegistryPath, True);
-    if ValueExists('ConditionNetworkDomain') then Result := ReadString('ConditionNetworkDomain')
-      else Result := 'zdechov.net';
-  finally
-    Free;
-  end;
-end;
-
-procedure TMainForm.SetConditionNetworkDomain(const Value: string);
-begin
-  with TRegistry.Create do
-  try
-    RootKey := HKEY_LOCAL_MACHINE;
-    OpenKey(RegistryPath, True);
-    WriteString('ConditionNetworkDomain', Value);
-  finally
-    Free;
-  end;
-end;
-
 end.