Commit 5d6489ce96c831b31867a38426b1f71c79a39331

Authored by Adriano Vieira
1 parent 89a68baf
Exists in master and in 1 other branch 3.1

- merge de branch (2.4) revisão [622]


git-svn-id: http://svn.softwarepublico.gov.br/svn/cacic/cacic/trunk/gerente@623 fecfc0c7-e812-0410-ae72-849f08638ee7
relatorios/computador/cria_informacoes_computadores.php
... ... @@ -61,7 +61,7 @@ if ($_POST['submit_cond'])
61 61 a.te_versao_gercols,
62 62 a.dt_hr_ult_acesso,
63 63 a.dt_hr_inclusao,
64   - b.sg_so
  64 + b.te_desc_so
65 65 FROM computadores a,
66 66 so b '.
67 67 $from . '
... ... @@ -111,8 +111,8 @@ if ($_POST['submit_cond'])
111 111 </script>
112 112 </head>
113 113  
114   - <body background="../imgs/linha_v.gif">
115   - <script language="JavaScript" type="text/javascript" src="../include/cacic.js"></script>
  114 + <body background="../../imgs/linha_v.gif">
  115 + <script language="JavaScript" type="text/javascript" src="../../include/cacic.js"></script>
116 116 <form name="form1" method="post">
117 117 <table width="95%" border="0" align="center">
118 118 <tr>
... ... @@ -165,24 +165,24 @@ if ($_POST[&#39;submit_cond&#39;])
165 165 <td align="center" nowrap>&nbsp;</td>
166 166 <td align="center" nowrap>&nbsp;</td>
167 167 <td align="center" nowrap>&nbsp;</td>
168   - <td align="center" nowrap><img src="../imgs/comp.gif" width="23" height="23"></td>
169   - <td align="center" nowrap><img src="../imgs/tree_vertline.gif" width="10" height="18"></td>
  168 + <td align="center" nowrap><img src="../../imgs/comp.gif" width="23" height="23"></td>
  169 + <td align="center" nowrap><img src="../../imgs/tree_vertline.gif" width="10" height="18"></td>
170 170 <td align="center" nowrap class="cabecalho_tabela"><div align="left">Nome
171 171 da M&aacute;quina</div></td>
172   - <td nowrap ><img src="../imgs/tree_vertline.gif" width="10" height="18"></td>
  172 + <td nowrap ><img src="../../imgs/tree_vertline.gif" width="10" height="18"></td>
173 173 <td nowrap class="cabecalho_tabela"><div align="center">IP</div></td>
174   - <td nowrap ><img src="../imgs/tree_vertline.gif" width="10" height="18"></td>
  174 + <td nowrap ><img src="../../imgs/tree_vertline.gif" width="10" height="18"></td>
175 175 <td nowrap class="cabecalho_tabela"><div align="center">Endereço MAC</div></td>
176   - <td nowrap ><img src="../imgs/tree_vertline.gif" width="10" height="18"></td>
  176 + <td nowrap ><img src="../../imgs/tree_vertline.gif" width="10" height="18"></td>
177 177 <td nowrap class="cabecalho_tabela"><div align="center">S.O.</div></td>
178   - <td nowrap ><img src="../imgs/tree_vertline.gif" width="10" height="18"></td>
  178 + <td nowrap ><img src="../../imgs/tree_vertline.gif" width="10" height="18"></td>
179 179 <td nowrap class="cabecalho_tabela"><div align="center"> Cacic2</div></td>
180   - <td nowrap ><img src="../imgs/tree_vertline.gif" width="10" height="18"></td>
  180 + <td nowrap ><img src="../../imgs/tree_vertline.gif" width="10" height="18"></td>
181 181 <td nowrap class="cabecalho_tabela"> GerCols</td>
182   - <td nowrap class="cabecalho_tabela"><img src="../imgs/tree_vertline.gif" width="10" height="18"></td>
  182 + <td nowrap class="cabecalho_tabela"><img src="../../imgs/tree_vertline.gif" width="10" height="18"></td>
183 183 <td nowrap class="cabecalho_tabela"><div align="center">&Uacute;lt.
184 184 Acesso</div></td>
185   - <td nowrap class="cabecalho_tabela"><img src="../imgs/tree_vertline.gif" width="10" height="18"></td>
  185 + <td nowrap class="cabecalho_tabela"><img src="../../imgs/tree_vertline.gif" width="10" height="18"></td>
186 186 <td nowrap class="cabecalho_tabela"><div align="center">Inclusão</div></td>
187 187 <td nowrap >&nbsp;</td>
188 188 </tr>
... ... @@ -202,21 +202,21 @@ if ($_POST[&#39;submit_cond&#39;])
202 202 <td nowrap>&nbsp;</td>
203 203 <td nowrap><input type="checkbox" name="chk_<? echo $row['te_node_address'].'#'. $row['id_so']; ?>" value="1" checked onClick="Verifica_Check_Cria();"></td>
204 204 <td nowrap>&nbsp;</td>
205   - <td nowrap><div align="left"><a href="../relatorios/computador/computador.php?te_node_address=<? echo $row['te_node_address'];?>&id_so=<? echo $row['id_so'];?>" target="_blank"><? echo $row['te_nome_computador']; ?></a></div></td>
  205 + <td nowrap><div align="left"><a href="computador.php?te_node_address=<? echo $row['te_node_address'];?>&id_so=<? echo $row['id_so'];?>" target="_blank"><? echo $row['te_nome_computador']; ?></a></div></td>
206 206 <td nowrap>&nbsp;</td>
207   - <td nowrap><div align="left"><a href="../relatorios/computador/computador.php?te_node_address=<? echo $row['te_node_address'];?>&id_so=<? echo $row['id_so'];?>" target="_blank"><? echo $row['te_ip']; ?></a></div></td>
  207 + <td nowrap><div align="left"><a href="computador.php?te_node_address=<? echo $row['te_node_address'];?>&id_so=<? echo $row['id_so'];?>" target="_blank"><? echo $row['te_ip']; ?></a></div></td>
208 208 <td nowrap>&nbsp;</td>
209   - <td nowrap><div align="left"><a href="../relatorios/computador/computador.php?te_node_address=<? echo $row['te_node_address'];?>&id_so=<? echo $row['id_so'];?>" target="_blank"><? echo $row['te_node_address'];?></a></div></td>
  209 + <td nowrap><div align="left"><a href="computador.php?te_node_address=<? echo $row['te_node_address'];?>&id_so=<? echo $row['id_so'];?>" target="_blank"><? echo $row['te_node_address'];?></a></div></td>
210 210 <td nowrap>&nbsp;</td>
211   - <td nowrap><div align="center"><a href="../relatorios/computador/computador.php?te_node_address=<? echo $row['te_node_address'];?>&id_so=<? echo $row['id_so'];?>" target="_blank"><? echo $row['sg_so']; ?></a></div></td>
  211 + <td nowrap><div align="center"><a href="computador.php?te_node_address=<? echo $row['te_node_address'];?>&id_so=<? echo $row['id_so'];?>" target="_blank"><? echo $row['te_desc_so']; ?></a></div></td>
212 212 <td nowrap>&nbsp;</td>
213   - <td nowrap><div align="left"><a href="../relatorios/computador/computador.php?te_node_address=<? echo $row['te_node_address'];?>&id_so=<? echo $row['id_so'];?>" target="_blank"><? echo $row['te_versao_cacic']; ?></a></div></td>
  213 + <td nowrap><div align="left"><a href="computador.php?te_node_address=<? echo $row['te_node_address'];?>&id_so=<? echo $row['id_so'];?>" target="_blank"><? echo $row['te_versao_cacic']; ?></a></div></td>
214 214 <td nowrap>&nbsp;</td>
215   - <td nowrap><div align="left"><a href="../relatorios/computador/computador.php?te_node_address=<? echo $row['te_node_address'];?>&id_so=<? echo $row['id_so'];?>" target="_blank"><? echo $row['te_versao_gercols']; ?></a></div></td>
  215 + <td nowrap><div align="left"><a href="computador.php?te_node_address=<? echo $row['te_node_address'];?>&id_so=<? echo $row['id_so'];?>" target="_blank"><? echo $row['te_versao_gercols']; ?></a></div></td>
216 216 <td nowrap>&nbsp;</td>
217   - <td nowrap><div align="right"><a href="../relatorios/computador/computador.php?te_node_address=<? echo $row['te_node_address'];?>&id_so=<? echo $row['id_so'];?>" target="_blank"><? echo date("d/m/y H:i", strtotime( $row['dt_hr_ult_acesso'] )); ?></a></div></td>
  217 + <td nowrap><div align="right"><a href="computador.php?te_node_address=<? echo $row['te_node_address'];?>&id_so=<? echo $row['id_so'];?>" target="_blank"><? echo date("d/m/y H:i", strtotime( $row['dt_hr_ult_acesso'] )); ?></a></div></td>
218 218 <td nowrap>&nbsp;</td>
219   - <td nowrap><div align="right"><a href="../relatorios/computador/computador.php?te_node_address=<? echo $row['te_node_address'];?>&id_so=<? echo $row['id_so'];?>" target="_blank"><? echo date("d/m/y H:i", strtotime( $row['dt_hr_inclusao'] )); ?></a></div></td>
  219 + <td nowrap><div align="right"><a href="computador.php?te_node_address=<? echo $row['te_node_address'];?>&id_so=<? echo $row['id_so'];?>" target="_blank"><? echo date("d/m/y H:i", strtotime( $row['dt_hr_inclusao'] )); ?></a></div></td>
220 220 <td nowrap>&nbsp;</td>
221 221 </tr>
222 222 <?
... ... @@ -316,21 +316,32 @@ else
316 316  
317 317  
318 318 }
319   - }
320   - $nome_arquivo='relatorio_' .$_SESSION['id_usuario'] . time(). '.csv';
321   - $v_query_cria = 'SELECT a.id_so,
322   - a.te_node_address,
323   - a.te_nome_computador,
324   - a.te_ip,
325   - a.te_versao_cacic,
326   - a.te_versao_gercols,
327   - a.dt_hr_ult_acesso,
328   - a.dt_hr_inclusao,
329   - b.sg_so
330   - into outfile \'/var/www/html/cacic2/exportado/' . $nome_arquivo . '\' fields terminated by \',\' lines terminated by \'\n\' from computadores a, so b WHERE '.$where;
331   -
332   - $cria = @mysql_query($v_query_cria); //Neste caso, o "@" inibe qualquer mensagem de erro retornada pela função MYSQL_QUERY()
333   - GravaLog('CRIA',$_SERVER['SCRIPT_NAME'],'computadores');
  319 + }
  320 + $file_dir = '/tmp/';
  321 + $nome_arquivo='relatorio_' .$_SESSION['id_usuario']. '_' . time(). '.csv';
  322 + $v_query_cria = 'SELECT b.te_desc_so,
  323 + a.te_node_address,
  324 + a.te_nome_computador,
  325 + a.te_ip,
  326 + a.te_versao_cacic,
  327 + a.te_versao_gercols,
  328 + a.dt_hr_ult_acesso,
  329 + a.dt_hr_inclusao
  330 + INTO OUTFILE \''. $file_dir . $nome_arquivo .
  331 + '\' fields terminated by \',\' lines terminated by \'\n\'
  332 + FROM computadores a, so b
  333 + WHERE '.$where;
  334 +
  335 + $cria = @mysql_query($v_query_cria) or die( @mysql_error() . "<br>Erro no SQL: $v_query_cria" );
  336 + header("Content-type: application/vnd.ms-excel");
  337 + header("Content-disposition: csv" . date("Y-m-d") . ".xls");
  338 + header( "Content-disposition: filename=$nome_arquivo");
  339 + // Cabeçalho do arquivo
  340 + echo 'S.O.,Endereco MAC,Nome da maquina,IP,Cacic2,GerCols,Ultimo acesso,Inclusao'."\n";
  341 + readfile($file_dir.$nome_arquivo);
  342 + flush();
  343 + GravaLog('CRIA',$_SERVER['SCRIPT_NAME'],'computadores');
  344 + exit();
334 345 }
335 346 ?>
336 347 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
... ... @@ -341,7 +352,7 @@ else
341 352  
342 353 <link href="../../include/cacic.css" rel="stylesheet" type="text/css">
343 354 <SCRIPT>
344   - <?isset($nome_arquivo) and printf("window.open('../exportado/%s');", $nome_arquivo); ?>
  355 + <?isset($nome_arquivo) and printf("window.open('%s');", $nome_arquivo); ?>
345 356 function Preenche_Condicao_VAZIO(p_campo)
346 357 {
347 358 for (i=0;i<window.document.forms.length;i++)
... ... @@ -419,8 +430,8 @@ else
419 430 </SCRIPT>
420 431 </head>
421 432  
422   - <body background="../imgs/linha_v.gif">
423   - <script language="JavaScript" type="text/javascript" src="../include/cacic.js"></script>
  433 + <body background="../../imgs/linha_v.gif">
  434 + <script language="JavaScript" type="text/javascript" src="../../include/cacic.js"></script>
424 435 <form name="form1" method="post">
425 436 <table width="90%" align="center" border="0" cellpadding="0" cellspacing="0">
426 437 <tr>
... ... @@ -455,7 +466,7 @@ else
455 466  
456 467 <?
457 468 $cor = 0;
458   - require_once('../include/library.php');
  469 + require_once('../../include/library.php');
459 470 conecta_bd_cacic();
460 471 $res_fields = mysql_query("SHOW COLUMNS FROM computadores");
461 472 $v_arr_nomes_campos = array();
... ...