Download as
Browse Code »

Commit 47e76e77d249229b601c12838f1753bfacf99c40

Authored by Eric Menezes Noronha
1 parent 7988bea7
Exists in master

-Realizada limpeza no código. 

-Modificado konami code, lol.
Showing 6 changed files with 331 additions and 231 deletions   Show diff stats
MapaTesteProj/MapaCACIC.dproj
  Diff comments   View file @47e76e7
... ... @@ -24,7 +24,7 @@
24 24 <Borland.Personality>Delphi.Personality</Borland.Personality>
25 25 <Borland.ProjectType />
26 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">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>
  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>
28 28 </ProjectExtensions>
29 29 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
30 30 <ItemGroup>
... ...
MapaTesteProj/MapaCACIC.identcache
View file @47e76e7
No preview for this file type
MapaTesteProj/MapaCACIC.res
View file @47e76e7
No preview for this file type
MapaTesteProj/MapaTeste.dcu
View file @47e76e7
No preview for this file type
MapaTesteProj/MapaTeste.dfm
  Diff comments   View file @47e76e7
1 1 object frmMapaCacic: TfrmMapaCacic
2   - Left = 0
3   - Top = -55
  2 + Left = 274
  3 + Top = 200
4 4 Caption = 'Mapa Cacic PGFN'
5 5 ClientHeight = 448
6 6 ClientWidth = 789
... ... @@ -84,6 +84,7 @@ object frmMapaCacic: TfrmMapaCacic
84 84 0007F000000FF800001FF000000FF0000007F000000FF000000FFFFFFFFF}
85 85 OldCreateOrder = False
86 86 PopupMode = pmAuto
  87 + Position = poDesigned
87 88 ScreenSnap = True
88 89 OnActivate = FormActivate
89 90 OnClose = FormClose
... ... @@ -154,15 +155,16 @@ object frmMapaCacic: TfrmMapaCacic
154 155 Font.Name = 'MS Sans Serif'
155 156 Font.Style = [fsBold]
156 157 ParentFont = False
157   - TabOrder = 2
  158 + TabOrder = 1
158 159 DesignSize = (
159 160 780
160 161 361)
161   - object lbEtiqueta5: TLabel
  162 + object lbEtiqueta3: TLabel
162 163 Left = 107
163 164 Top = 82
164 165 Width = 250
165 166 Height = 13
  167 + Hint = 'Insira o n'#250'mero do patrim'#244'nio do monitor, se o tiver.'
166 168 AutoSize = False
167 169 Caption = 'Monitor 1'
168 170 Font.Charset = DEFAULT_CHARSET
... ... @@ -171,13 +173,16 @@ object frmMapaCacic: TfrmMapaCacic
171 173 Font.Name = 'MS Sans Serif'
172 174 Font.Style = []
173 175 ParentFont = False
  176 + ParentShowHint = False
  177 + ShowHint = True
174 178 Visible = False
175 179 end
176   - object lbEtiqueta6: TLabel
  180 + object lbEtiqueta4: TLabel
177 181 Left = 420
178 182 Top = 82
179 183 Width = 250
180 184 Height = 13
  185 + Hint = 'Insira o n'#250'mero do patrim'#244'nio do segundo monitor, se o tiver.'
181 186 AutoSize = False
182 187 Caption = 'Monitor 2'
183 188 Font.Charset = DEFAULT_CHARSET
... ... @@ -186,13 +191,16 @@ object frmMapaCacic: TfrmMapaCacic
186 191 Font.Name = 'MS Sans Serif'
187 192 Font.Style = []
188 193 ParentFont = False
  194 + ParentShowHint = False
  195 + ShowHint = True
189 196 Visible = False
190 197 end
191   - object lbEtiquetaUserLogado: TLabel
  198 + object lbEtiqueta2: TLabel
192 199 Left = 420
193 200 Top = 33
194 201 Width = 250
195 202 Height = 13
  203 + Hint = 'Este '#233' o usu'#225'rio logado atualmente'
196 204 AutoSize = False
197 205 Caption = 'Usu'#225'rio Logado'
198 206 Font.Charset = DEFAULT_CHARSET
... ... @@ -201,9 +209,11 @@ object frmMapaCacic: TfrmMapaCacic
201 209 Font.Name = 'MS Sans Serif'
202 210 Font.Style = []
203 211 ParentFont = False
  212 + ParentShowHint = False
  213 + ShowHint = True
204 214 Visible = False
205 215 end
206   - object lbEtiquetaNomeComputador: TLabel
  216 + object lbEtiqueta8: TLabel
207 217 Left = 107
208 218 Top = 182
209 219 Width = 250
... ... @@ -218,9 +228,9 @@ object frmMapaCacic: TfrmMapaCacic
218 228 ParentFont = False
219 229 Visible = False
220 230 end
221   - object lbEtiquetaIpComputador: TLabel
  231 + object lbEtiqueta9: TLabel
222 232 Left = 420
223   - Top = 129
  233 + Top = 182
224 234 Width = 250
225 235 Height = 13
226 236 AutoSize = False
... ... @@ -233,11 +243,15 @@ object frmMapaCacic: TfrmMapaCacic
233 243 ParentFont = False
234 244 Visible = False
235 245 end
236   - object lbEtiquetaPatrimonioPc: TLabel
  246 + object lbEtiqueta1: TLabel
237 247 Left = 107
238 248 Top = 33
239 249 Width = 250
240 250 Height = 13
  251 + Hint =
  252 + 'Patrim'#244'nio do Computador. Gentileza procure o n'#250'mero que se enco' +
  253 + 'ntra no mesmo.'
  254 + HelpContext = 1
241 255 AutoSize = False
242 256 Caption = 'Patrim'#244'nio'
243 257 Font.Charset = DEFAULT_CHARSET
... ... @@ -246,9 +260,11 @@ object frmMapaCacic: TfrmMapaCacic
246 260 Font.Name = 'MS Sans Serif'
247 261 Font.Style = []
248 262 ParentFont = False
  263 + ParentShowHint = False
  264 + ShowHint = True
249 265 Visible = False
250 266 end
251   - object lbEtiquetaNome: TLabel
  267 + object lbEtiqueta5: TLabel
252 268 Left = 107
253 269 Top = 129
254 270 Width = 250
... ... @@ -263,7 +279,45 @@ object frmMapaCacic: TfrmMapaCacic
263 279 ParentFont = False
264 280 Visible = False
265 281 end
266   - object edTeInfoPatrimonio5: TEdit
  282 + object lbEtiqueta6: TLabel
  283 + Left = 420
  284 + Top = 129
  285 + Width = 69
  286 + Height = 13
  287 + Hint = 'Digite a sala em que se encontra, se existente.'
  288 + AutoSize = False
  289 + Caption = 'Sala'
  290 + Font.Charset = DEFAULT_CHARSET
  291 + Font.Color = clWindowText
  292 + Font.Height = -11
  293 + Font.Name = 'MS Sans Serif'
  294 + Font.Style = []
  295 + ParentFont = False
  296 + ParentShowHint = False
  297 + ShowHint = True
  298 + Visible = False
  299 + end
  300 + object lbEtiqueta7: TLabel
  301 + Left = 495
  302 + Top = 129
  303 + Width = 175
  304 + Height = 13
  305 + Hint =
  306 + 'Digite a Coordena'#231#227'o e/ou Setor em que se encontra, se existente' +
  307 + '.'
  308 + AutoSize = False
  309 + Caption = 'Coordena'#231#227'o/Setor'
  310 + Font.Charset = DEFAULT_CHARSET
  311 + Font.Color = clWindowText
  312 + Font.Height = -11
  313 + Font.Name = 'MS Sans Serif'
  314 + Font.Style = []
  315 + ParentFont = False
  316 + ParentShowHint = False
  317 + ShowHint = True
  318 + Visible = False
  319 + end
  320 + object edTeInfoPatrimonio3: TEdit
267 321 Left = 107
268 322 Top = 101
269 323 Width = 250
... ... @@ -277,10 +331,10 @@ object frmMapaCacic: TfrmMapaCacic
277 331 ParentFont = False
278 332 ParentShowHint = False
279 333 ShowHint = True
280   - TabOrder = 1
  334 + TabOrder = 2
281 335 Visible = False
282 336 end
283   - object edTeInfoPatrimonio6: TEdit
  337 + object edTeInfoPatrimonio4: TEdit
284 338 Left = 420
285 339 Top = 99
286 340 Width = 250
... ... @@ -294,7 +348,7 @@ object frmMapaCacic: TfrmMapaCacic
294 348 ParentFont = False
295 349 ParentShowHint = False
296 350 ShowHint = True
297   - TabOrder = 2
  351 + TabOrder = 3
298 352 Visible = False
299 353 end
300 354 object btCombosUpdate: TButton
... ... @@ -304,10 +358,10 @@ object frmMapaCacic: TfrmMapaCacic
304 358 Height = 20
305 359 Caption = 'Recarregar'
306 360 Enabled = False
307   - TabOrder = 6
  361 + TabOrder = 11
308 362 OnClick = btCombosUpdateClick
309 363 end
310   - object edTeInfoUserLogado: TEdit
  364 + object edTeInfoPatrimonio2: TEdit
311 365 Left = 420
312 366 Top = 52
313 367 Width = 250
... ... @@ -322,10 +376,10 @@ object frmMapaCacic: TfrmMapaCacic
322 376 ParentFont = False
323 377 ParentShowHint = False
324 378 ShowHint = True
325   - TabOrder = 7
  379 + TabOrder = 1
326 380 Visible = False
327 381 end
328   - object edTeInfoNomeComputador: TEdit
  382 + object edTeInfoPatrimonio8: TEdit
329 383 Left = 107
330 384 Top = 201
331 385 Width = 250
... ... @@ -340,12 +394,12 @@ object frmMapaCacic: TfrmMapaCacic
340 394 ParentFont = False
341 395 ParentShowHint = False
342 396 ShowHint = True
343   - TabOrder = 8
  397 + TabOrder = 7
344 398 Visible = False
345 399 end
346   - object edTeInfoIpComputador: TEdit
  400 + object edTeInfoPatrimonio9: TEdit
347 401 Left = 420
348   - Top = 148
  402 + Top = 201
349 403 Width = 250
350 404 Height = 24
351 405 Enabled = False
... ... @@ -358,10 +412,10 @@ object frmMapaCacic: TfrmMapaCacic
358 412 ParentFont = False
359 413 ParentShowHint = False
360 414 ShowHint = True
361   - TabOrder = 9
  415 + TabOrder = 8
362 416 Visible = False
363 417 end
364   - object edTePatrimonioPc: TEdit
  418 + object edTeInfoPatrimonio1: TEdit
365 419 Left = 107
366 420 Top = 52
367 421 Width = 250
... ... @@ -378,7 +432,7 @@ object frmMapaCacic: TfrmMapaCacic
378 432 TabOrder = 0
379 433 Visible = False
380 434 end
381   - object edTeInfoNome: TEdit
  435 + object edTeInfoPatrimonio5: TEdit
382 436 Left = 107
383 437 Top = 148
384 438 Width = 250
... ... @@ -393,16 +447,16 @@ object frmMapaCacic: TfrmMapaCacic
393 447 ParentFont = False
394 448 ParentShowHint = False
395 449 ShowHint = True
396   - TabOrder = 3
  450 + TabOrder = 4
397 451 Visible = False
398 452 end
399 453 object bgTermoResponsabilidade: TGroupBox
400   - Left = 10
  454 + Left = 3
401 455 Top = 231
402   - Width = 767
  456 + Width = 774
403 457 Height = 58
404 458 Caption = 'Termo de Responsabilidade'
405   - TabOrder = 4
  459 + TabOrder = 9
406 460 object rdConcordaTermos: TRadioButton
407 461 Left = 24
408 462 Top = 24
... ... @@ -429,10 +483,44 @@ object frmMapaCacic: TfrmMapaCacic
429 483 Font.Name = 'Arial'
430 484 Font.Style = [fsBold]
431 485 ParentFont = False
432   - TabOrder = 5
  486 + TabOrder = 10
433 487 Visible = False
434 488 OnClick = AtualizaPatrimonio
435 489 end
  490 + object edTeInfoPatrimonio6: TEdit
  491 + Left = 420
  492 + Top = 148
  493 + Width = 69
  494 + Height = 24
  495 + Font.Charset = DEFAULT_CHARSET
  496 + Font.Color = clWindowText
  497 + Font.Height = -13
  498 + Font.Name = 'MS Sans Serif'
  499 + Font.Style = []
  500 + MaxLength = 20
  501 + ParentFont = False
  502 + ParentShowHint = False
  503 + ShowHint = True
  504 + TabOrder = 5
  505 + Visible = False
  506 + end
  507 + object edTeInfoPatrimonio7: TEdit
  508 + Left = 495
  509 + Top = 148
  510 + Width = 175
  511 + Height = 24
  512 + Font.Charset = DEFAULT_CHARSET
  513 + Font.Color = clWindowText
  514 + Font.Height = -13
  515 + Font.Name = 'MS Sans Serif'
  516 + Font.Style = []
  517 + MaxLength = 20
  518 + ParentFont = False
  519 + ParentShowHint = False
  520 + ShowHint = True
  521 + TabOrder = 6
  522 + Visible = False
  523 + end
436 524 end
437 525 object gbLeiaComAtencao: TGroupBox
438 526 Left = 0
... ... @@ -449,7 +537,7 @@ object frmMapaCacic: TfrmMapaCacic
449 537 Font.Style = [fsBold]
450 538 ParentColor = False
451 539 ParentFont = False
452   - TabOrder = 3
  540 + TabOrder = 2
453 541 DesignSize = (
454 542 780
455 543 53)
... ... @@ -462,7 +550,7 @@ object frmMapaCacic: TfrmMapaCacic
462 550 AutoSize = False
463 551 Caption =
464 552 'O preenchimento correto dos campos abaixo define a exatid'#227'o do c' +
465   - 'ontrole de patrim'#244'nio e localiza'#231#227'o f'#237'sica do equipamento.'
  553 + 'ontrole de patrim'#244'nio e localiza'#231#227'o f'#237'sica do equipamento. '
466 554 Font.Charset = DEFAULT_CHARSET
467 555 Font.Color = clBlack
468 556 Font.Height = -13
... ... @@ -472,43 +560,25 @@ object frmMapaCacic: TfrmMapaCacic
472 560 WordWrap = True
473 561 end
474 562 end
475   - object pnMessageBox: TPanel
476   - Left = 1
477   - Top = 243
478   - Width = 780
479   - Height = 45
480   - BevelInner = bvLowered
481   - Color = clInactiveBorder
  563 + object btKonamiCode: TPanel
  564 + Left = 736
  565 + Top = 0
  566 + Width = 40
  567 + Height = 20
  568 + BevelWidth = 2
  569 + Caption = 'X'
  570 + Color = clRed
  571 + Enabled = False
482 572 Font.Charset = DEFAULT_CHARSET
483   - Font.Color = clMenuHighlight
484   - Font.Height = -13
485   - Font.Name = 'Arial'
  573 + Font.Color = clInfoBk
  574 + Font.Height = 20
  575 + Font.Name = 'Arial Black'
486 576 Font.Style = []
487 577 ParentBackground = False
488 578 ParentFont = False
489   - TabOrder = 1
  579 + TabOrder = 3
490 580 Visible = False
491   - object lbMensagens: TLabel
492   - Left = 2
493   - Top = 2
494   - Width = 776
495   - Height = 41
496   - Align = alClient
497   - Alignment = taCenter
498   - AutoSize = False
499   - Color = clInactiveBorder
500   - Font.Charset = DEFAULT_CHARSET
501   - Font.Color = clWindowText
502   - Font.Height = -13
503   - Font.Name = 'MS Sans Serif'
504   - Font.Style = []
505   - ParentColor = False
506   - ParentFont = False
507   - Transparent = True
508   - Layout = tlCenter
509   - ExplicitLeft = -22
510   - ExplicitTop = 10
511   - end
  581 + OnClick = btKonamiCodeClick
512 582 end
513 583 object timerMessageBoxShowOrHide: TTimer
514 584 Enabled = False
... ... @@ -529,11 +599,4 @@ object frmMapaCacic: TfrmMapaCacic
529 599 Left = 82
530 600 Top = 377
531 601 end
532   - object IdIPWatch1: TIdIPWatch
533   - Active = False
534   - HistoryEnabled = False
535   - HistoryFilename = 'iphist.dat'
536   - Left = 112
537   - Top = 376
538   - end
539 602 end
... ...
MapaTesteProj/MapaTeste.pas
  Diff comments   View file @47e76e7
... ... @@ -71,30 +71,32 @@ type
71 71 timerMessageBoxShowOrHide: TTimer;
72 72 timerMessageShowTime: TTimer;
73 73 timerProcessos: TTimer;
74   - IdIPWatch1: TIdIPWatch;
75   - pnMessageBox: TPanel;
76   - lbMensagens: TLabel;
77 74 gbLeiaComAtencao: TGroupBox;
78 75 lbLeiaComAtencao: TLabel;
79 76 gbInformacoesSobreComputador: TGroupBox;
  77 + lbEtiqueta3: TLabel;
  78 + lbEtiqueta4: TLabel;
  79 + lbEtiqueta2: TLabel;
  80 + lbEtiqueta8: TLabel;
  81 + lbEtiqueta9: TLabel;
  82 + lbEtiqueta1: TLabel;
80 83 lbEtiqueta5: TLabel;
81   - lbEtiqueta6: TLabel;
82   - lbEtiquetaUserLogado: TLabel;
83   - lbEtiquetaNomeComputador: TLabel;
84   - lbEtiquetaIpComputador: TLabel;
85   - lbEtiquetaPatrimonioPc: TLabel;
86   - lbEtiquetaNome: TLabel;
87   - edTeInfoPatrimonio5: TEdit;
88   - edTeInfoPatrimonio6: TEdit;
  84 + edTeInfoPatrimonio3: TEdit;
  85 + edTeInfoPatrimonio4: TEdit;
89 86 btCombosUpdate: TButton;
90   - edTeInfoUserLogado: TEdit;
91   - edTeInfoNomeComputador: TEdit;
92   - edTeInfoIpComputador: TEdit;
93   - edTePatrimonioPc: TEdit;
94   - edTeInfoNome: TEdit;
  87 + edTeInfoPatrimonio2: TEdit;
  88 + edTeInfoPatrimonio8: TEdit;
  89 + edTeInfoPatrimonio9: TEdit;
  90 + edTeInfoPatrimonio1: TEdit;
  91 + edTeInfoPatrimonio5: TEdit;
95 92 bgTermoResponsabilidade: TGroupBox;
96 93 rdConcordaTermos: TRadioButton;
97 94 btGravarInformacoes: TButton;
  95 + lbEtiqueta6: TLabel;
  96 + edTeInfoPatrimonio6: TEdit;
  97 + lbEtiqueta7: TLabel;
  98 + edTeInfoPatrimonio7: TEdit;
  99 + btKonamiCode: TPanel;
98 100  
99 101 procedure FormCreate(Sender: TObject);
100 102 procedure AtualizaPatrimonio(Sender: TObject);
... ... @@ -110,10 +112,11 @@ type
110 112 function LDAPName: string;
111 113 function NomeComputador : String;
112 114 function getConfigs : String;
113   - function SetCpfUser : String;
114   - function SetPatrimonioPC : String;
115   - function FormatarCpf(strCpfUser : String) : String;
  115 +// function SetCpfUser : String;
  116 +// function SetPatrimonioPC : String;
  117 +// function FormatarCpf(strCpfUser : String) : String;
116 118 procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
  119 + procedure btKonamiCodeClick(Sender: TObject);
117 120  
118 121  
119 122 private
... ... @@ -123,7 +126,9 @@ type
123 126 strTeInfoPatrimonio4,
124 127 strTeInfoPatrimonio5,
125 128 strTeInfoPatrimonio6,
126   - strTeInfoPatrimonio7 : String;
  129 + strTeInfoPatrimonio7,
  130 + strTeInfoPatrimonio8,
  131 + strTeInfoPatrimonio9 : String;
127 132 psswd : String;
128 133 foco : boolean;
129 134  
... ... @@ -142,7 +147,7 @@ type
142 147  
143 148 end;
144 149  
145   -const SENHA = 'uuddlrlrab';
  150 +const SENHA = 'uuddlrlrba';
146 151  
147 152 var frmMapaCacic: TfrmMapaCacic;
148 153  
... ... @@ -153,7 +158,6 @@ implementation
153 158  
154 159 procedure TfrmMapaCacic.Sair;
155 160 Begin
156   - EstadoBarraTarefa(TRUE);
157 161 Application.Terminate;
158 162 End;
159 163  
... ... @@ -192,55 +196,55 @@ end;
192 196 //----------------------FUNÇÃO PARA RETORNAR O PATRIMONIO-----------------------
193 197 //------------------------------------------------------------------------------
194 198  
195   -function TfrmMapaCacic.SetPatrimonioPC : String;
196   -var
197   - strPatrimonioPc,
198   - strNomePC : String;
199   -begin
200   - Result:='';
201   - strNomePC:=NomeComputador;
202   -
203   - if (pos('-',strNomePC) > 0) then
204   - strPatrimonioPc:=copy(strNomePC, 0, (pos('-', strNomePC)-1));
205   - Result:=strPatrimonioPC;
206   -end;
  199 +//function TfrmMapaCacic.SetPatrimonioPC : String;
  200 +//var
  201 +// strPatrimonioPc,
  202 +// strNomePC : String;
  203 +//begin
  204 +// Result:='';
  205 +// strNomePC:=NomeComputador;
  206 +//
  207 +// if (pos('-',strNomePC) > 0) then
  208 +// strPatrimonioPc:=copy(strNomePC, 0, (pos('-', strNomePC)-1));
  209 +// Result:=strPatrimonioPC;
  210 +//end;
207 211  
208 212 //------------------------------------------------------------------------------
209 213 //--------------------FUNÇÃO PARA FORMATAR O CPF--------------------------------
210 214 //------------------------------------------------------------------------------
211 215  
212   -function TfrmMapaCacic.FormatarCpf(strCpfUser : String) : String;
213   -var
214   - strCpfFormatado : String;
215   -begin
216   - Result:='';
217   - strCpfFormatado:= Copy(strCpfUser, 1,3)
218   -
219   - + '.' + Copy(strCpfUser, 4,3)
220   -
221   - + '.' + Copy(strCpfUser, 7,3)
222   -
223   - + '-' + Copy(strCpfUser, 10,2);
224   - Result:=strCpfFormatado;
225   -
226   -end;
  216 +//function TfrmMapaCacic.FormatarCpf(strCpfUser : String) : String;
  217 +//var
  218 +// strCpfFormatado : String;
  219 +//begin
  220 +// Result:='';
  221 +// strCpfFormatado:= Copy(strCpfUser, 1,3)
  222 +//
  223 +// + '.' + Copy(strCpfUser, 4,3)
  224 +//
  225 +// + '.' + Copy(strCpfUser, 7,3)
  226 +//
  227 +// + '-' + Copy(strCpfUser, 10,2);
  228 +// Result:=strCpfFormatado;
  229 +//
  230 +//end;
227 231 //------------------------------------------------------------------------------
228 232 //--------------------FUNÇÃO PARA RETORNAR O CPF DO USUARIO---------------------
229 233 //------------------------------------------------------------------------------
230 234  
231   -function TfrmMapaCacic.SetCpfUser : String;
232   -var
233   - strCpfUser,
234   - strUser : String;
235   -begin
236   - Result:='';
237   - strUser:=strTeInfoPatrimonio3;
238   -
239   - if (pos('-',strUser) > 0) then
240   - strCpfUser:=copy(strUser, 0, (pos('-', strUser)-1));
241   -
242   - Result:=strCpfUser;
243   -end;
  235 +//function TfrmMapaCacic.SetCpfUser : String;
  236 +//var
  237 +// strCpfUser,
  238 +// strUser : String;
  239 +//begin
  240 +// Result:='';
  241 +// strUser:=strTeInfoPatrimonio3;
  242 +//
  243 +// if (pos('-',strUser) > 0) then
  244 +// strCpfUser:=copy(strUser, 0, (pos('-', strUser)-1));
  245 +//
  246 +// Result:=strCpfUser;
  247 +//end;
244 248  
245 249 //------------------------------------------------------------------------------
246 250 //--------------------FUNÇÃO PARA RETORNAR O ULTIMO VALOR-----------------------
... ... @@ -303,7 +307,6 @@ Begin
303 307 objCacic.setValueToFile('Configs' ,'servidor_autenticacao', objCacic.getValueFromTags('dados_ldap' , Result), strGerColsInfFileName);
304 308 objCacic.setValueToFile('Configs' ,'Patrimonio_Combos' , objCacic.getValueFromTags('Configs_Patrimonio_Combos' , Result), strGerColsInfFileName);
305 309 objCacic.setValueToFile('Configs' ,'Patrimonio_Interface' , objCacic.getValueFromTags('Configs_Patrimonio_Interface', Result), strGerColsInfFileName);
306   - //objCacic.setValueToFile('Collects','col_patr_last' , objCacic.getValueFromTags('Collects_Patrimonio_Last' , Result), strGerColsInfFileName);
307 310 End
308 311 else
309 312 begin
... ... @@ -335,19 +338,25 @@ begin
335 338 strTeInfoPatrimonio2 := objCacic.getValueFromTags('UserLogado',
336 339 strCollectsPatrimonioLast);
337 340 if (strTeInfoPatrimonio3='') then
338   - strTeInfoPatrimonio3 := objCacic.getValueFromTags('UserNameLDAP',
  341 + strTeInfoPatrimonio3 := objCacic.getValueFromTags('PatrimonioMonitor1',
339 342 strCollectsPatrimonioLast);
340 343 if (strTeInfoPatrimonio4='') then
341   - strTeInfoPatrimonio4 := objCacic.getValueFromTags('IPComputer',
  344 + strTeInfoPatrimonio4 := objCacic.getValueFromTags('PatrimonioMonitor2',
342 345 strCollectsPatrimonioLast);
343 346 if (strTeInfoPatrimonio5='') then
344   - strTeInfoPatrimonio5 := objCacic.getValueFromTags('ComputerName',
  347 + strTeInfoPatrimonio5 := objCacic.getValueFromTags('UserName',
345 348 strCollectsPatrimonioLast);
346 349 if (strTeInfoPatrimonio6='') then
347   - strTeInfoPatrimonio6 := objCacic.getValueFromTags('PatrimonioMonitor1',
  350 + strTeInfoPatrimonio6 := objCacic.getValueFromTags('Sala',
348 351 strCollectsPatrimonioLast);
349 352 if (strTeInfoPatrimonio7='') then
350   - strTeInfoPatrimonio7 := objCacic.getValueFromTags('PatrimonioMonitor2',
  353 + strTeInfoPatrimonio7 := objCacic.getValueFromTags('Coordenacao_Setor',
  354 + strCollectsPatrimonioLast);
  355 + if (strTeInfoPatrimonio8='') then
  356 + strTeInfoPatrimonio8 := objCacic.getValueFromTags('ComputerName',
  357 + strCollectsPatrimonioLast);
  358 + if (strTeInfoPatrimonio9='') then
  359 + strTeInfoPatrimonio9 := objCacic.getValueFromTags('IPComputer',
351 360 strCollectsPatrimonioLast);
352 361 End;
353 362 btCombosUpdate.Enabled := true;
... ... @@ -358,19 +367,21 @@ procedure TfrmMapaCacic.AtualizaPatrimonio(Sender: TObject);
358 367 var strColetaAtual,
359 368 strRetorno: String;
360 369 begin
361   -if edTeInfoNome.text <> '' then
  370 +if edTeInfoPatrimonio5.text <> '' then
362 371 begin
363 372 btGravarInformacoes.Enabled := false;
364 373 btGravarInformacoes.Caption := 'Enviando informações...';
365 374 strFieldsAndValuesToRequest := 'CollectType=' + objCacic.replaceInvalidHTTPChars(objCacic.enCrypt('col_patr')) ;
366 375  
367   - strColetaAtual := StringReplace('[IDPatrimonio]' + edTePatrimonioPc.Text + '[/IDPatrimonio]' +
368   - '[UserLogado]' + edTeInfoUserLogado.Text + '[/UserLogado]' +
369   - '[UserName]' + edTeInfoNome.Text + '[/UserName]' +
370   - '[IPComputer]' + edTeInfoIpComputador.Text + '[/IPComputer]' +
371   - '[ComputerName]' + edTeInfoNomeComputador.Text+ '[/ComputerName]' +
372   - '[PatrimonioMonitor1]' + edTeInfoPatrimonio5.Text + '[/PatrimonioMonitor1]' +
373   - '[PatrimonioMonitor2]' + edTeInfoPatrimonio6.Text + '[/PatrimonioMonitor2]'
  376 + strColetaAtual := StringReplace('[IDPatrimonio]' + edTeInfoPatrimonio1.Text + '[/IDPatrimonio]' +
  377 + '[UserLogado]' + edTeInfoPatrimonio2.Text + '[/UserLogado]' +
  378 + '[PatrimonioMonitor1]' + edTeInfoPatrimonio3.Text + '[/PatrimonioMonitor1]' +
  379 + '[PatrimonioMonitor2]' + edTeInfoPatrimonio4.Text + '[/PatrimonioMonitor2]' +
  380 + '[UserName]' + edTeInfoPatrimonio5.Text + '[/UserName]' +
  381 + '[Sala]' + edTeInfoPatrimonio6.Text + '[/Sala]' +
  382 + '[Coordenacao_Setor]' + edTeInfoPatrimonio7.Text + '[/Coordenacao_Setor]' +
  383 + '[ComputerName]' + edTeInfoPatrimonio8.text + '[/ComputerName]' +
  384 + '[IPComputer]' + edTeInfoPatrimonio9.text + '[/IPComputer]'
374 385 , ',','[[COMMA]]',[rfReplaceAll]);
375 386  
376 387 strFieldsAndValuesToRequest := strFieldsAndValuesToRequest + ',Patrimonio=' +
... ... @@ -401,8 +412,8 @@ if edTeInfoNome.text &lt;&gt; &#39;&#39; then
401 412 Finalizar(true);
402 413 end
403 414 else
404   - MessageDLG(#13#10+'Atenção!'+ #13#10 + 'É necessário digitar seu nome.'
405   - + #13#10,mtError,[mbOK],0);
  415 + ShowMessage(#13#10+'Atenção!'+ #13#10 + 'É necessário digitar seu nome.'
  416 + + #13#10);
406 417 end;
407 418  
408 419  
... ... @@ -412,89 +423,82 @@ var strConfigsPatrimonioInterface,
412 423 Begin
413 424 btCombosUpdate.Enabled := false;
414 425  
415   -//- ----------------------NOME DO COMPUTADOR PARA O EDTEXT-----------------------
416   - edTeInfoNomeComputador.Text := NomeComputador;
417   - if edTeInfoNomeComputador.Text <> '' then
418   - begin
419   - lbEtiquetaNomeComputador.Visible := true;
420   - edTeInfoNomeComputador.Visible := true;
421   - end;
422   - lbEtiquetaNomeComputador.Visible := true;
423   - edTeInfonomeComputador.Visible := true;
  426 + strConfigsPatrimonioInterface := objCacic.deCrypt(objCacic.getValueFromFile
  427 + ('Configs','Patrimonio_Interface',
  428 + strGerColsInfFileName));
  429 +
  430 +//-------------------------PATRIMONIO DA MAQUINA--------------------------------
  431 +{ edTePatrimonioPc.Text := SetPatrimonioPc;
  432 + if edTePatrimonioPc.Text <> '' then
  433 + Begin
  434 + lbEtiquetaPatrimonioPc.Visible := true;
  435 + edTePatrimonioPc.Visible := true;
  436 + end;}
  437 + edTeInfoPatrimonio1.Text := strTeInfoPatrimonio1;
  438 + edTeInfoPatrimonio1.Visible := true;
  439 + lbEtiqueta1.Visible := true;
424 440  
425 441 //-----------------------------USUARIO LOGADO-----------------------------------
426 442  
427 443 // edTeInfoUserLogado.Text := getUserLogon;
428   - strTeInfoPatrimonio3:=objCACIC.getValueFromTags('UserName',fetchWMIvalues('Win32_ComputerSystem',objCACIC.getLocalFolderName,'UserName'));
429   - strTeInfoPatrimonio3:=copy(strTeInfoPatrimonio3, pos('\', strTeInfoPatrimonio3)+1, length(strTeInfoPatrimonio3));
430   - edTeInfoUserLogado.Text:=strTeInfoPatrimonio3;
431   - if edTeInfoUserLogado.Text <> '' then
  444 + strTeInfoPatrimonio2:=objCACIC.getValueFromTags('UserName',fetchWMIvalues('Win32_ComputerSystem',objCACIC.getLocalFolderName,'UserName'));
  445 + strTeInfoPatrimonio2:=copy(strTeInfoPatrimonio2, pos('\', strTeInfoPatrimonio2)+1, length(strTeInfoPatrimonio2));
  446 + edTeInfoPatrimonio2.Text:=strTeInfoPatrimonio2;
  447 + if edTeInfoPatrimonio2.Text <> '' then
432 448 begin
433   - lbEtiquetaUserLogado.Visible := true;
434   - edTeInfoUserLogado.Visible := true;
  449 + lbEtiqueta2.Visible := true;
  450 + edTeInfoPatrimonio2.Visible := true;
435 451 end;
436 452  
  453 +// objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta3 -> "' +
  454 +// objCacic.getValueFromTags('in_exibir_etiqueta3',
  455 +// strConfigsPatrimonioInterface)+'"');
  456 +
  457 +// if (trim(objCacic.getValueFromTags('in_exibir_etiqueta3', strConfigsPatrimonioInterface)) = 'S') then
  458 +// begin
  459 + //lbEtiqueta3.Caption := objCacic.getValueFromTags('te_etiqueta3', strConfigsPatrimonioInterface);
  460 + lbEtiqueta3.Visible := true;
  461 + edTeInfoPatrimonio3.Hint := objCacic.getValueFromTags('te_help_etiqueta3', strConfigsPatrimonioInterface);
  462 + edTeInfoPatrimonio3.Text := strTeInfoPatrimonio3;
  463 + edTeInfoPatrimonio3.visible := True;
  464 +// end;
  465 +
  466 +// objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta4 -> "' +
  467 +// objCacic.getValueFromTags('in_exibir_etiqueta4',
  468 +// strConfigsPatrimonioInterface)+'"');
  469 +
  470 +// if (trim(objCacic.getValueFromTags('in_exibir_etiqueta4', strConfigsPatrimonioInterface)) = 'S') then
  471 +// begin
  472 + //lbEtiqueta4.Caption := objCacic.getValueFromTags('te_etiqueta4', strConfigsPatrimonioInterface);
  473 + lbEtiqueta4.Visible := true;
  474 + edTeInfoPatrimonio4.Hint := objCacic.getValueFromTags('te_help_etiqueta4', strConfigsPatrimonioInterface);
  475 + edTeInfoPatrimonio4.Text := strTeInfoPatrimonio4;
  476 + edTeInfoPatrimonio4.visible := True;
  477 +// end;
  478 +
437 479 //-------------------------------NOME USUARIO-----------------------------------
  480 + strNomeLDAP := LDAPName;
438 481 strNomeLDAP := getLastValue(LDAPName, 'Attribute:', 'cn'+#$D#$A);
439 482  
440 483  
441 484 if (strNomeLDAP <> '') and (strNomeLDAP <> 'Results: 0') then
442 485 begin
443   - edTeInfoNome.Text := strNomeLDAP;
444   - edTeInfoNome.Visible := true;
445   - lbEtiquetaNome.Visible := true;
  486 + edTeInfoPatrimonio5.Text := strNomeLDAP;
  487 + edTeInfoPatrimonio5.Visible := true;
  488 + lbEtiqueta5.Visible := true;
  489 + lbEtiqueta5.ShowHint := true;
  490 + lbEtiqueta5.hint := 'Nome do usuário logado.';
446 491 end
447 492 else
448 493 begin
449   - edTeInfoNome.Visible := true;
450   - edTeInfoNome.Enabled := true;
451   - lbEtiquetaNome.Visible := true;
  494 + edTeInfoPatrimonio5.Visible := true;
  495 + edTeInfoPatrimonio5.Enabled := true;
  496 + lbEtiqueta5.Visible := true;
  497 + lbEtiqueta5.ShowHint := true;
  498 + lbEtiqueta5.hint := 'Digite seu nome, não foi possível recuperá-lo.';
452 499 end;
453   -
454   -//-------------------------------CPF USUARIO------------------------------------
455   -
456   -{ edTeInfoCpfUser.Text := FormatarCpf(SetCpfUser);
457   - if edTeInfoCpfUser.Text <> '' then
458   - begin
459   - lbEtiquetaCpfUser.Visible := true;
460   - edTeInfoCpfUser.Visible := true;
461   - end;}
462   -
463   -//-----------------------PUXA O IP DA MÁQUINA PARA O EDTEXT-------------------------------------
464   - edTeInfoIpComputador.Text := idipwatch1.LocalIP;
465   - if edTeInfoIpComputador.Text <> '' then
466   - begin
467   - lbEtiquetaIpComputador.Visible := true;
468   - edTeInfoIpComputador.Visible := true;
469   - end;
470   -
471   -//-------------------------PATRIMONIO DA MAQUINA--------------------------------
472   -{ edTePatrimonioPc.Text := SetPatrimonioPc;
473   - if edTePatrimonioPc.Text <> '' then
474   - Begin
475   - lbEtiquetaPatrimonioPc.Visible := true;
476   - edTePatrimonioPc.Visible := true;
477   - end;}
478   - edTePatrimonioPc.Text := strTeInfoPatrimonio1;
479   - edTePatrimonioPc.Visible := true;
480   - lbEtiquetaPatrimonioPc.Visible := true;
481   -
482   -
483   - strConfigsPatrimonioInterface := objCacic.deCrypt(objCacic.getValueFromFile('Configs','Patrimonio_Interface',strGerColsInfFileName));
484   -
485   -
486   -// objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta5 -> "' +
487   -// objCacic.getValueFromTags('in_exibir_etiqueta5',
488   -// strConfigsPatrimonioInterface)+'"');
489 500  
490   -// if (trim(objCacic.getValueFromTags('in_exibir_etiqueta5', strConfigsPatrimonioInterface)) = 'S') then
491   -// begin
492   - //lbEtiqueta5.Caption := objCacic.getValueFromTags('te_etiqueta5', strConfigsPatrimonioInterface);
493   - lbEtiqueta5.Visible := true;
494   - edTeInfoPatrimonio5.Hint := objCacic.getValueFromTags('te_help_etiqueta5', strConfigsPatrimonioInterface);
495   - edTeInfoPatrimonio5.Text := strTeInfoPatrimonio6;
496   - edTeInfoPatrimonio5.visible := True;
497   -// end;
  501 +//---------------------------------PATRIMONIO MONITORES------------------------------
498 502  
499 503 // objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta6 -> "' +
500 504 // objCacic.getValueFromTags('in_exibir_etiqueta6',
... ... @@ -503,12 +507,43 @@ Begin
503 507 // if (trim(objCacic.getValueFromTags('in_exibir_etiqueta6', strConfigsPatrimonioInterface)) = 'S') then
504 508 // begin
505 509 //lbEtiqueta6.Caption := objCacic.getValueFromTags('te_etiqueta6', strConfigsPatrimonioInterface);
506   - lbEtiqueta6.Visible := true;
507   - edTeInfoPatrimonio6.Hint := objCacic.getValueFromTags('te_help_etiqueta6', strConfigsPatrimonioInterface);
508   - edTeInfoPatrimonio6.Text := strTeInfoPatrimonio7;
509   - edTeInfoPatrimonio6.visible := True;
  510 + lbEtiqueta6.Visible := true;
  511 + edTeInfoPatrimonio6.Hint := objCacic.getValueFromTags('te_help_etiqueta6', strConfigsPatrimonioInterface);
  512 + edTeInfoPatrimonio6.Text := strTeInfoPatrimonio6;
  513 + edTeInfoPatrimonio6.visible := True;
510 514 // end;
511 515  
  516 +// objCacic.writeDebugLog('MontaInterface: in_exibir_etiqueta7 -> "' +
  517 +// objCacic.getValueFromTags('in_exibir_etiqueta7',
  518 +// strConfigsPatrimonioInterface)+'"');
  519 +
  520 +// if (trim(objCacic.getValueFromTags('in_exibir_etiqueta7', strConfigsPatrimonioInterface)) = 'S') then
  521 +// begin
  522 + //lbEtiqueta7.Caption := objCacic.getValueFromTags('te_etiqueta7', strConfigsPatrimonioInterface);
  523 + lbEtiqueta7.Visible := true;
  524 + edTeInfoPatrimonio7.Hint := objCacic.getValueFromTags('te_help_etiqueta7', strConfigsPatrimonioInterface);
  525 + edTeInfoPatrimonio7.Text := strTeInfoPatrimonio7;
  526 + edTeInfoPatrimonio7.visible := True;
  527 +// end;
  528 +
  529 +//-----------------------NOME DO COMPUTADOR PARA O EDTEXT-----------------------
  530 + edTeInfoPatrimonio8.Text := NomeComputador;
  531 + if edTeInfoPatrimonio8.Text <> '' then
  532 + begin
  533 + lbEtiqueta8.Visible := true;
  534 + edTeInfoPatrimonio8.Visible := true;
  535 + end;
  536 + lbEtiqueta8.Visible := true;
  537 + edTeInfoPatrimonio8.Visible := true;
  538 +
  539 +//-----------------------PUXA O IP DA MÁQUINA PARA O EDTEXT-------------------------------------
  540 + strTeInfoPatrimonio9 := fetchWMIvalues('Win32_NetworkAdapterConfiguration', objCACIC.getLocalFolderName);
  541 + edTeInfoPatrimonio9.Text := objCACIC.getValueFromTags('IPAddress',strTeInfoPatrimonio9);
  542 + if edTeInfoPatrimonio9.Text <> '' then
  543 + begin
  544 + lbEtiqueta9.Visible := true;
  545 + edTeInfoPatrimonio9.Visible := true;
  546 + end;
512 547  
513 548 btGravarInformacoes.Visible := true;
514 549 btCombosUpdate.Enabled := true;
... ... @@ -607,18 +642,13 @@ begin
607 642  
608 643 frmMapaCacic.edWebManagerAddress.Caption := objCacic.GetValueFromFile('Configs','WebManagerAddress', strChkSisInfFileName);
609 644  
610   - frmMapaCacic.lbMensagens.Caption := 'Entrada de Dados para Autenticação no Módulo Gerente WEB Cacic';
611 645 objCacic.writeDebugLog('FormActivate: Versão do MapaCacic...: ' +
612 646 pnVersao.Caption);
613 647 ObjCacic.writeDebugLog('FormActivate: Hash-Code do MapaCacic: ' +
614 648 objCacic.getFileHash(ParamStr(0)));
615 649  
616   -
617   - pnMessageBox.Visible := true;
618   -
619 650 // Povoamento com dados de configurações da interface patrimonial
620 651 // Solicita ao servidor as configurações para a Coleta de Informações de Patrimônio
621   - pnMessageBox.Visible := false;
622 652 objCacic.writeDebugLog('FormActivate: Requisitando informações de patrimônio da estação...');
623 653  
624 654 if getConfigs <> '0' then
... ... @@ -668,13 +698,17 @@ begin
668 698  
669 699 end;
670 700  
  701 +procedure TfrmMapaCacic.btKonamiCodeClick(Sender: TObject);
  702 +begin
  703 + sair;
  704 +end;
  705 +
671 706 //------------------------------------------------------------------------------
672 707 //PROCEDURE CRIADO PARA DEIXAR O FORM FULLSCREEN E FOCADO, SEM QUE SEJA POSSÍVEL
673 708 //FECHAR OU ALTERNAR ENTRE OUTRAS JANELAS ATÉ QUE ATUALIZE O PATRIMONIO.
674 709 procedure TfrmMapaCacic.FormSetFocus(VerificaFoco: Boolean);
675 710 var
676 711 r : TRect;
677   - H : HWnd;
678 712 begin
679 713 if VerificaFoco then
680 714 begin
... ... @@ -686,7 +720,6 @@ begin
686 720 timerProcessos.Enabled := True;
687 721 SystemParametersInfo(SPI_GETWORKAREA, 0, @r,0);
688 722 SetBounds(r.Left, r.Top, r.Right-r.Left, r.Bottom-r.Top);
689   - Screen.WorkAreaRect;
690 723 Top := Screen.WorkAreaTop;
691 724 Left := Screen.WorkAreaLeft;
692 725 Width := Screen.WorkAreaWidth;
... ... @@ -730,9 +763,13 @@ begin
730 763 else
731 764 psswd:='';
732 765 end;
733   - if psswd = SENHA then
734   - sair;
735   -
  766 + if psswd = SENHA then begin
  767 + FormStyle := fsNormal;
  768 + MessageDlg('KONAMICODE ACTIVATED!',mtWarning, [mbOK], 0);
  769 + btKonamiCode.Left := width-btKonamiCode.Width;
  770 + btKonamiCode.visible := true;
  771 + btKonamiCode.enabled := true;
  772 + end;
736 773 end;
737 774  
738 775  
... ... @@ -862,9 +899,9 @@ begin
862 899 ldap.UserName := username;
863 900 ldap.Password := psswd;
864 901 ldap.Timeout := 5000;
865   - if ldap.Login and ldap.BindSasl then //Loga no LDAP e autentica no LDAP com Usuário e senha repassado. (BindSasl é mais seguro que Bind)
  902 + if ldap.Login and ldap.Bind then //Loga no LDAP e autentica no LDAP com Usuário e senha repassado. (BindSasl é mais seguro que Bind)
866 903 begin
867   - ldap.Search(base, False, identificador+ '=' + strTeInfoPatrimonio3, retorno); //Faz a pesquisa, com o CPF repassado.
  904 + ldap.Search(base, False, identificador+ '=' + strTeInfoPatrimonio2, retorno); //Faz a pesquisa, com o CPF repassado.
868 905 result := LDAPResultdump(ldap.SearchResult);
869 906 ldap.Logout;
870 907 end;
... ...