Download as
Browse Code »

Commit 1fbdbcb867ec677d5928771ad646fedf85b55299

Authored by anderson.peterle@previdencia.gov.br
1 parent 12e4db00
Exists in master and in 1 other branch 3.1

Em Computadores-Navegacao, exibir icone de servidor de dominio e title onMouserO… 

…ver quando a subrede tiver sido associada.

git-svn-id: http://svn.softwarepublico.gov.br/svn/cacic/cacic/trunk/gerente@625 fecfc0c7-e812-0410-ae72-849f08638ee7
Showing 2 changed files with 21 additions and 9 deletions   Show diff stats
imgs/domain.gif 0 → 100755
View file @1fbdbcb

1.09 KB
relatorios/navegacao.php
  Diff comments   View file @1fbdbcb
... ... @@ -108,11 +108,13 @@ if ($_REQUEST['p']=='' && $_REQUEST['consultar'] == '')
108 108 compartilhamentos.nm_compartilhamento,
109 109 redes.id_local,
110 110 sg_local,
111   - nm_local
  111 + nm_local,
  112 + dominios.nm_dominio
112 113 FROM computadores
113   - LEFT JOIN redes ON (computadores.id_ip_rede = redes.id_ip_rede)
  114 + LEFT JOIN redes ON (computadores.id_ip_rede = redes.id_ip_rede)
114 115 LEFT JOIN compartilhamentos ON (computadores.id_so=compartilhamentos.id_so and computadores.te_node_address=compartilhamentos.te_node_address and compartilhamentos.cs_tipo_compart='I')
115   - LEFT JOIN locais ON (redes.id_local = locais.id_local)
  116 + LEFT JOIN locais ON (redes.id_local = locais.id_local)
  117 + LEFT JOIN dominios ON (redes.id_dominio = dominios.id_dominio)
116 118 WHERE ".$where.$where1."
117 119 GROUP BY sg_local,
118 120 computadores.id_ip_rede,
... ... @@ -159,7 +161,9 @@ if ($_REQUEST['p']=='' && $_REQUEST['consultar'] == '')
159 161 $nm_rede = 'SubRede Não Cadastrada';
160 162 }
161 163  
162   - $_SESSION['Tripa'] .= '..' . $row["id_ip_rede"] . ' (' . $nm_rede . ')|'.$row["sg_local"] . ' (' . $row['nm_local'] . ')#';
  164 + $_SESSION['Tripa'] .= '..' . $row["id_ip_rede"] . ' (' . $nm_rede . ')|'.$row["sg_local"] . ' (' . $row['nm_local'] . ')|'.$row["nm_dominio"].'#';
  165 +
  166 +
163 167 $RedeAnt = $row["id_ip_rede"];
164 168 }
165 169  
... ... @@ -247,7 +251,8 @@ if ($_REQUEST['p']=='' && $_REQUEST['consultar'] == '')
247 251 $generic_imgs_path = "../imgs/";
248 252 $img_totals = $generic_imgs_path . "totals.gif";
249 253 $img_details = $generic_imgs_path . "details.gif";
250   - $img_compart_print = $generic_imgs_path . "compart_print.gif";
  254 + $img_compart_print = $generic_imgs_path . "compart_print.gif";
  255 + $img_domain = $generic_imgs_path . "domain.gif";
251 256  
252 257 $img_os_win95 = "<B>95</B>";
253 258 $img_os_win95_osr2 = "<B>95 OSR2</B>";
... ... @@ -308,7 +313,8 @@ if ($_REQUEST[&#39;p&#39;]==&#39;&#39; &amp;&amp; $_REQUEST[&#39;consultar&#39;] == &#39;&#39;)
308 313 $monta = 1;
309 314 }
310 315  
311   - $Arvore = explode('#',$_SESSION['Tripa']);
  316 + $Arvore = explode('#',$_SESSION['Tripa']);
  317 +
312 318 $TamanhoArvore = count($Arvore)-2;
313 319  
314 320 while ($cnt <= $TamanhoArvore)
... ... @@ -337,6 +343,7 @@ if ($_REQUEST[&#39;p&#39;]==&#39;&#39; &amp;&amp; $_REQUEST[&#39;consultar&#39;] == &#39;&#39;)
337 343 $tree[$cnt][18] = '' ; // Localization name to general use
338 344 $tree[$cnt][19] = '' ; // SubNet name to general use
339 345 $tree[$cnt][20] = '' ; // WorkGroup name to general use
  346 + $tree[$cnt][21] = '' ; // Domain Name
340 347  
341 348  
342 349 if ($tree[$cnt][0] > $maxlevel) $maxlevel=$tree[$cnt][0];
... ... @@ -368,7 +375,8 @@ if ($_REQUEST[&#39;p&#39;]==&#39;&#39; &amp;&amp; $_REQUEST[&#39;consultar&#39;] == &#39;&#39;)
368 375 $id_ip_rede_atual = substr($tree[$cnt][1],0,strpos($tree[$cnt][1], " "));
369 376 $cnt_aux_rede = $cnt;
370 377 $v_SubNetName = $tree[$cnt][1];
371   - $tree[$cnt][19] = $v_SubNetName;
  378 + $tree[$cnt][19] = $v_SubNetName;
  379 + $tree[$cnt][21] = $node[2];
372 380 }
373 381  
374 382 $tree[$cnt][6]=$id_ip_rede_atual;
... ... @@ -751,9 +759,13 @@ if ($_REQUEST[&#39;p&#39;]==&#39;&#39; &amp;&amp; $_REQUEST[&#39;consultar&#39;] == &#39;&#39;)
751 759 }
752 760  
753 761 // Atenção: foi necessário usar a condição "id_grupo_usuarios" abaixo devido ao "cs_nivel_administracao" == 0
754   - if ($tree[$cnt][0]==2 && ($_SESSION["cs_nivel_administracao"] <> 0 || $_SESSION["id_grupo_usuarios"] == 7))
  762 + if ($tree[$cnt][0]==2)
755 763 {
756   - echo "<a href=../admin/redes/detalhes_rede.php?id_ip_rede=".$tree[$cnt][6]."&id_local=".$tree[$cnt][17]." target='_blank'><img src=\"".$img_details."\" border=no width=16 height=16 Title='Detalhes da SubRede'></a>";
  764 + if ($_SESSION["cs_nivel_administracao"] <> 0 || $_SESSION["id_grupo_usuarios"] == 7)
  765 + echo "<a href=../admin/redes/detalhes_rede.php?id_ip_rede=".$tree[$cnt][6]."&id_local=".$tree[$cnt][17]." target='_blank'><img src=\"".$img_details."\" border=no width=16 height=16 Title='Detalhes da SubRede'></a>";
  766 +
  767 + if ($tree[$cnt][21])
  768 + echo "<img src=\"".$img_domain."\" border=no width=16 height=16 Title='Sub-Rede Associada ao Domínio \"".$tree[$cnt][21]."\"'>";
757 769 }
758 770  
759 771 }
... ...