Download as
Browse Code »

Commit 3ff1d34c97abe4dc7d2ed74a0877f76eff2ffb7d

Authored by Eric Menezes Noronha
1 parent 2c3f3123
Exists in master

-Adicionado condição de continuar a pesquisa apenas se for efetuado o login. 

-Build alterada para 2.8.1.6.
Showing 5 changed files with 10 additions and 30 deletions   Show diff stats
MapaTesteProj/MapaCACIC.dproj
  Diff comments   View file @3ff1d34
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <Borland.Personality>Delphi.Personality</Borland.Personality> 24 <Borland.Personality>Delphi.Personality</Borland.Personality>
25 <Borland.ProjectType /> 25 <Borland.ProjectType />
26 <BorlandProject> 26 <BorlandProject>
27 -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">5</VersionInfo><VersionInfo Name="Debug">True</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo para Verificação e Instalação de Estrutura Básica do Sistema CACIC</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.5</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">mapacacic.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> 27 +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">6</VersionInfo><VersionInfo Name="Debug">True</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev - Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo para Verificação e Instalação de Estrutura Básica do Sistema CACIC</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.6</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">mapacacic.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
28 </ProjectExtensions> 28 </ProjectExtensions>
29 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> 29 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
30 <ItemGroup> 30 <ItemGroup>
MapaTesteProj/MapaCACIC.identcache
View file @3ff1d34
No preview for this file type
MapaTesteProj/MapaCACIC.res
View file @3ff1d34
No preview for this file type
MapaTesteProj/MapaTeste.dcu
View file @3ff1d34
No preview for this file type
MapaTesteProj/MapaTeste.pas
  Diff comments   View file @3ff1d34
@@ -123,12 +123,7 @@ type @@ -123,12 +123,7 @@ type
123 strTeInfoPatrimonio6, 123 strTeInfoPatrimonio6,
124 strTeInfoPatrimonio7 : String; 124 strTeInfoPatrimonio7 : String;
125 formMonitor: TForm; 125 formMonitor: TForm;
126 - ldap: TLDAPsend;  
127 - getTimer: TTimer;  
128 126
129 - procedure WorkBegin(ASender: TObject; AWorkMode: TWorkMode; AWorkCountMax: Int64);  
130 - procedure WorkEnd(ASender: TObject; AWorkMode: TWorkMode);  
131 - procedure GetTimerTimer(Sender: TObject);  
132 procedure FormSetFocus(VerificaFoco: Boolean); 127 procedure FormSetFocus(VerificaFoco: Boolean);
133 procedure MontaInterface; 128 procedure MontaInterface;
134 procedure RecuperaValoresAnteriores; 129 procedure RecuperaValoresAnteriores;
@@ -809,33 +804,18 @@ begin @@ -809,33 +804,18 @@ begin
809 end; 804 end;
810 end; 805 end;
811 806
812 -procedure TfrmMapaCacic.WorkBegin(ASender: TObject; AWorkMode: TWorkMode; AWorkCountMax: Int64);  
813 -begin  
814 - getTimer.Enabled := True;  
815 -end;  
816 -procedure TfrmMapaCacic.WorkEnd(ASender: TObject; AWorkMode: TWorkMode);  
817 -begin  
818 - getTimer.Enabled := False;  
819 -end;  
820 -  
821 -procedure TfrmMapaCacic.GetTimerTimer(Sender: TObject);  
822 -begin  
823 - ldap.Logout;  
824 -end;  
825 -  
826 function TfrmMapaCacic.LDAPName: string; 807 function TfrmMapaCacic.LDAPName: string;
827 var 808 var
828 retorno: TStringList; 809 retorno: TStringList;
829 i: integer; 810 i: integer;
830 host, username, psswd, base, strDadosLDAP, aux, identificador : string; 811 host, username, psswd, base, strDadosLDAP, aux, identificador : string;
  812 + ldap: TLDAPsend;
831 813
832 begin 814 begin
833 result := ''; 815 result := '';
834 ldap := TLDAPsend.Create; 816 ldap := TLDAPsend.Create;
835 retorno := TStringList.Create; 817 retorno := TStringList.Create;
836 - getTimer := TTimer.create(nil);  
837 - getTimer.OnTimer := GetTimerTimer;  
838 - getTimer.Interval := 5000; 818 +
839 // PEGANDO OS DADOS DO POR MEIO DO GET/CONFIGS, ONDE SERÁ GRAVADO NO GERCOLS.INF 819 // PEGANDO OS DADOS DO POR MEIO DO GET/CONFIGS, ONDE SERÁ GRAVADO NO GERCOLS.INF
840 strDadosLDAP := objCacic.deCrypt(objCacic.getValueFromFile('Configs','servidor_autenticacao',strGerColsInfFileName)); 820 strDadosLDAP := objCacic.deCrypt(objCacic.getValueFromFile('Configs','servidor_autenticacao',strGerColsInfFileName));
841 host := objCacic.getValueFromTags('ip', strDadosLDAP); 821 host := objCacic.getValueFromTags('ip', strDadosLDAP);
@@ -852,20 +832,20 @@ begin @@ -852,20 +832,20 @@ begin
852 if (host<>'') or (base<>'') or (retorno.count=0) then 832 if (host<>'') or (base<>'') or (retorno.count=0) then
853 begin 833 begin
854 try 834 try
855 - getTimer.Enabled := true;  
856 try 835 try
857 ldap.TargetHost := host; 836 ldap.TargetHost := host;
858 ldap.UserName := username; 837 ldap.UserName := username;
859 ldap.Password := psswd; 838 ldap.Password := psswd;
860 - ldap.Login; //Loga no LDAP.  
861 - ldap.BindSasl; //Autentica no LDAP com Usuário e senha repassado. (BindSasl é mais seguro que Bind)  
862 - ldap.Search(base, False, identificador+ '=' + getUserLogon, retorno); //Faz a pesquisa, com o CPF repassado.  
863 - result := LDAPResultdump(ldap.SearchResult);  
864 - ldap.Logout; 839 + if ldap.Login then //Loga no LDAP.
  840 + begin
  841 + ldap.BindSasl; //Autentica no LDAP com Usuário e senha repassado. (BindSasl é mais seguro que Bind)
  842 + ldap.Search(base, False, identificador+ '=' + getUserLogon, retorno); //Faz a pesquisa, com o CPF repassado.
  843 + result := LDAPResultdump(ldap.SearchResult);
  844 + ldap.Logout;
  845 + end;
865 finally 846 finally
866 ldap.Free; 847 ldap.Free;
867 retorno.Free; 848 retorno.Free;
868 - getTimer.Free;  
869 end; 849 end;
870 Except 850 Except
871 on E:Exception do 851 on E:Exception do