Download as
Browse Code »

Commit 58563967ce8748daeaf44943dc8becf629821fff

Authored by Adriano Vieira
1 parent 287eb0ae
Exists in master and in 1 other branch 3.1

Gerente "trunk" atualizado 

- corrigido script do calendário
- corrigido inclusão de UO nivel 2 de etiqueta de patrimônio
- corrigido relatórios de compatilhamentos, componentes de computadores, alterações de máquinas
- melhorias ao apresentar ao usuário dados necessários a serem informados
- melhorias no instalador para atender ao Firefox3-beta5

git-svn-id: http://svn.softwarepublico.gov.br/svn/cacic/cacic/trunk/gerente@410 fecfc0c7-e812-0410-ae72-849f08638ee7
Showing 13 changed files with 54 additions and 34 deletions   Show diff stats
admin/patrimonio/nivel2/incluir_nivel2.php
  Diff comments   View file @5856396
@@ -42,7 +42,7 @@ if($_POST['gravainformacaoUON2']) { @@ -42,7 +42,7 @@ if($_POST['gravainformacaoUON2']) {
42 te_email_responsavel_uon2, 42 te_email_responsavel_uon2,
43 nu_tel1_responsavel_uon2, 43 nu_tel1_responsavel_uon2,
44 nu_tel2_responsavel_uon2, 44 nu_tel2_responsavel_uon2,
45 - id_unid_organizacional_nivel1, 45 + id_unid_organizacional_nivel1a,
46 id_local) 46 id_local)
47 VALUES ('". 47 VALUES ('".
48 $_POST['frm_nm_unid_organizacional_nivel2']."','". 48 $_POST['frm_nm_unid_organizacional_nivel2']."','".
admin/patrimonio/nivel2/index.php
  Diff comments   View file @5856396
@@ -81,7 +81,7 @@ $query = 'SELECT uo1.id_unid_organizacional_nivel1 as uo1_id_unid_organizaciona @@ -81,7 +81,7 @@ $query = 'SELECT uo1.id_unid_organizacional_nivel1 as uo1_id_unid_organizaciona
81 FROM unid_organizacional_nivel1 uo1, 81 FROM unid_organizacional_nivel1 uo1,
82 unid_organizacional_nivel2 uo2, 82 unid_organizacional_nivel2 uo2,
83 locais loc 83 locais loc
84 - WHERE uo2.id_unid_organizacional_nivel1 = uo1.id_unid_organizacional_nivel1 '.$where.' and 84 + WHERE uo2.id_unid_organizacional_nivel1a = uo1.id_unid_organizacional_nivel1 '.$where.' and
85 uo2.id_local = loc.id_local 85 uo2.id_local = loc.id_local
86 ORDER BY loc.sg_local, 86 ORDER BY loc.sg_local,
87 uo1_nm_unid_organizacional_nivel1, 87 uo1_nm_unid_organizacional_nivel1,
include/cacic.css
  Diff comments   View file @5856396
@@ -136,5 +136,13 @@ a.dcontexto:hover span @@ -136,5 +136,13 @@ a.dcontexto:hover span
136 #nav a.dcontexto:hover span 136 #nav a.dcontexto:hover span
137 { 137 {
138 visibility:visible!important; 138 visibility:visible!important;
139 - } 139 + }
  140 +
  141 +.necessario {
  142 + padding: 0px 02px 0px 0px;
  143 + color: red;
  144 + font-size: 10px;
  145 +}
  146 +
  147 +
140 </style> 148 </style>
include/dyncalendar.css
  Diff comments   View file @5856396
@@ -42,4 +42,12 @@ td.dynCalendar_today { @@ -42,4 +42,12 @@ td.dynCalendar_today {
42 border: 1px solid #c0c0c0; 42 border: 1px solid #c0c0c0;
43 font-family: Arial, Verdana, Helvetica, Sans-Serif; 43 font-family: Arial, Verdana, Helvetica, Sans-Serif;
44 font-size: 8pt; 44 font-size: 8pt;
  45 +}
  46 +
  47 +.dynCalendarImg {
  48 + background: url(../imgs/dyncalendar.gif) no-repeat scroll 100% 0pt;
  49 + width: 16;
  50 + height: 16;
  51 + padding: 5px 26px 10px 0px;
  52 + cursor: pointer;
45 } 53 }
46 \ No newline at end of file 54 \ No newline at end of file
include/dyncalendar.js
  Diff comments   View file @5856396
@@ -221,7 +221,7 @@ @@ -221,7 +221,7 @@
221 function dynCalendar_writeHTML() 221 function dynCalendar_writeHTML()
222 { 222 {
223 if (is_ie5up || is_nav6up || is_gecko) { 223 if (is_ie5up || is_nav6up || is_gecko) {
224 - document.write(sprintf('<a href="javascript: %s.show()"><img src="%sdynCalendar.gif" border="0" width="16" height="16" /></a>', this.objName, this.imagesPath)); 224 + document.write(sprintf('<a href="javascript: %s.show()"><span class="dynCalendarImg">&nbsp;</span></a>', this.objName, this.imagesPath));
225 document.write(sprintf('<div class="dynCalendar" id="%s" onmouseover="%s._mouseover(true)" onmouseout="%s._mouseover(false)"></div>', this.layerID, this.objName, this.objName)); 225 document.write(sprintf('<div class="dynCalendar" id="%s" onmouseover="%s._mouseover(true)" onmouseout="%s._mouseover(false)"></div>', this.layerID, this.objName, this.objName));
226 } 226 }
227 } 227 }
include/selecao_locais_inc.php
  Diff comments   View file @5856396
@@ -43,7 +43,7 @@ $result = mysql_query($query) or die(&#39;Ocorreu um erro durante a consulta à tabel @@ -43,7 +43,7 @@ $result = mysql_query($query) or die(&#39;Ocorreu um erro durante a consulta à tabel
43 <td>&nbsp;&nbsp;</td> 43 <td>&nbsp;&nbsp;</td>
44 <td width="40">&nbsp;</td> 44 <td width="40">&nbsp;</td>
45 <td nowrap>&nbsp;&nbsp;</td> 45 <td nowrap>&nbsp;&nbsp;</td>
46 - <td nowrap class="cabecalho_tabela">Selecionados:<br></td> 46 + <td nowrap class="cabecalho_tabela"><span class="necessario">*</span>Selecionados:<br></td>
47 <td nowrap>&nbsp;&nbsp;</td> 47 <td nowrap>&nbsp;&nbsp;</td>
48 </tr> 48 </tr>
49 <tr> 49 <tr>
include/selecao_so_inc.php
  Diff comments   View file @5856396
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 <td>&nbsp;&nbsp;</td> 27 <td>&nbsp;&nbsp;</td>
28 <td width="40">&nbsp;</td> 28 <td width="40">&nbsp;</td>
29 <td nowrap>&nbsp;&nbsp;</td> 29 <td nowrap>&nbsp;&nbsp;</td>
30 - <td nowrap class="cabecalho_tabela">Selecionados:</td> 30 + <td nowrap class="cabecalho_tabela"><span class="necessario">*</span>Selecionados:</td>
31 <td nowrap>&nbsp;&nbsp;</td> 31 <td nowrap>&nbsp;&nbsp;</td>
32 </tr> 32 </tr>
33 <tr> 33 <tr>
instalador/templates/install_navbar.tmpl
  Diff comments   View file @5856396
@@ -35,8 +35,8 @@ @@ -35,8 +35,8 @@
35 <tr class="navbar"> 35 <tr class="navbar">
36 <td colspan=2> 36 <td colspan=2>
37 <div class="navbar-btn"> 37 <div class="navbar-btn">
38 - <div class="navbar-btn-right"><div class="anterior"><a onclick="submitForm( installForm, 'preinstall' );" title="{KCIQ_PREVIOUS}">{KCIQ_PREVIOUS}</a></div></div>  
39 - <div class="navbar-btn-left"><div class="proximo"><a onclick="submitForm( installForm, 'checkinstall' );" title="{KCIQ_LICENSE_AGREE_MSG}">{KCIQ_LICENSE_AGREE}</a></div></div> 38 + <span class="navbar-btn-right"><span class="anterior"><a onclick="submitForm( installForm, 'preinstall' );" title="{KCIQ_PREVIOUS}">{KCIQ_PREVIOUS}</a></span></span>
  39 + <span class="navbar-btn-left"><span class="proximo"><a onclick="submitForm( installForm, 'checkinstall' );" title="{KCIQ_LICENSE_AGREE_MSG}">{KCIQ_LICENSE_AGREE}</a></span></span>
40 </div> 40 </div>
41 </td> 41 </td>
42 </tr> 42 </tr>
@@ -74,11 +74,11 @@ @@ -74,11 +74,11 @@
74 <tr class="navbar"> 74 <tr class="navbar">
75 <td colspan=2> 75 <td colspan=2>
76 <div class="navbar-btn"> 76 <div class="navbar-btn">
77 - <div class="navbar-btn-left"><div class="verificar"><a onclick="submitForm( installForm, 'checkinstall' );" title="{KCIQ_CHECK}">{KCIQ_CHECK}</a></div></div>  
78 - <div class="navbar-btn-right"><div class="anterior"><a onclick="submitForm( installForm, 'licenca' );" title="<cacicInstall:var name="copiedVar" copyFrom="tmplNavBarLicenca.KCIQ_PREVIOUS"/>"><cacicInstall:var name="copiedVar" copyFrom="tmplNavBarLicenca.KCIQ_PREVIOUS"/></a></div></div> 77 + <span class="navbar-btn-left"><span class="verificar"><a onclick="submitForm( installForm, 'checkinstall' );" title="{KCIQ_CHECK}">{KCIQ_CHECK}</a></span></span>
  78 + <span class="navbar-btn-right"><span class="anterior"><a onclick="submitForm( installForm, 'licenca' );" title="<cacicInstall:var name="copiedVar" copyFrom="tmplNavBarLicenca.KCIQ_PREVIOUS"/>"><cacicInstall:var name="copiedVar" copyFrom="tmplNavBarLicenca.KCIQ_PREVIOUS"/></a></span></span>
79 <cacicInstall:tmpl name="tmplNavBarCheckInstallContinue" type="condition" conditionvar="continuar"> 79 <cacicInstall:tmpl name="tmplNavBarCheckInstallContinue" type="condition" conditionvar="continuar">
80 <cacicInstall:sub condition="1"> 80 <cacicInstall:sub condition="1">
81 - <div class="navbar-btn-left"><div class="proximo"><a onclick="submitForm( installForm, 'configuration' );" title="<cacicInstall:var name="copiedVar" copyFrom="tmplNavBarPreInstall.KCIQ_NEXT"/>"><cacicInstall:var name="copiedVar" copyFrom="tmplNavBarPreInstall.KCIQ_NEXT"/></a></div></div> 81 + <span class="navbar-btn-left"><span class="proximo"><a onclick="submitForm( installForm, 'configuration' );" title="<cacicInstall:var name="copiedVar" copyFrom="tmplNavBarPreInstall.KCIQ_NEXT"/>"><cacicInstall:var name="copiedVar" copyFrom="tmplNavBarPreInstall.KCIQ_NEXT"/></a></span></span>
82 </cacicInstall:sub> 82 </cacicInstall:sub>
83 </cacicInstall:tmpl> 83 </cacicInstall:tmpl>
84 </div> 84 </div>
@@ -243,8 +243,8 @@ @@ -243,8 +243,8 @@
243 <tr class="navbar"> 243 <tr class="navbar">
244 <td colspan=2> 244 <td colspan=2>
245 <div class="navbar-btn"> 245 <div class="navbar-btn">
246 - <div class="navbar-btn-right"><div class="anterior"><a onclick="submitForm( installForm, 'checkinstall' );" title="{KCIQ_PREVIOUS}">{KCIQ_PREVIOUS}</a></div></div>  
247 - <div class="navbar-btn-left"><div class="proximo"><a onclick="submitForm( installForm, 'adminSetup' );" title="{KCIQ_NEXT}">{KCIQ_NEXT}</a></div></div> 246 + <span class="navbar-btn-right"><span class="anterior"><a onclick="submitForm( installForm, 'checkinstall' );" title="{KCIQ_PREVIOUS}">{KCIQ_PREVIOUS}</a></span></span>
  247 + <span class="navbar-btn-left"><span class="proximo"><a onclick="submitForm( installForm, 'adminSetup' );" title="{KCIQ_NEXT}">{KCIQ_NEXT}</a></span></span>
248 </div> 248 </div>
249 </td> 249 </td>
250 </tr> 250 </tr>
@@ -413,8 +413,8 @@ @@ -413,8 +413,8 @@
413 <tr class="navbar"> 413 <tr class="navbar">
414 <td colspan=2> 414 <td colspan=2>
415 <div class="navbar-btn"> 415 <div class="navbar-btn">
416 - <div class="navbar-btn-right"><div class="anterior"><a onclick="submitForm( installForm, 'configuration' );" title="{KCIQ_PREVIOUS}">{KCIQ_PREVIOUS}</a></div></div>  
417 - <div class="navbar-btn-left"><div class="proximo"><a onclick="submitForm( installForm, 'FtpVerify' );" title="{KCIQ_NEXT}">{KCIQ_NEXT}</a></div></div> 416 + <span class="navbar-btn-right"><span class="anterior"><a onclick="submitForm( installForm, 'configuration' );" title="{KCIQ_PREVIOUS}">{KCIQ_PREVIOUS}</a></span></span>
  417 + <span class="navbar-btn-left"><span class="proximo"><a onclick="submitForm( installForm, 'FtpVerify' );" title="{KCIQ_NEXT}">{KCIQ_NEXT}</a></span></span>
418 </div> 418 </div>
419 </td> 419 </td>
420 </tr> 420 </tr>
@@ -519,8 +519,8 @@ @@ -519,8 +519,8 @@
519 <tr class="navbar"> 519 <tr class="navbar">
520 <td colspan=2> 520 <td colspan=2>
521 <div class="navbar-btn"> 521 <div class="navbar-btn">
522 - <div class="navbar-btn-right"><div class="anterior"><a onclick="submitForm( installForm, 'FtpVerify' );" title="{KCIQ_PREVIOUS}">{KCIQ_PREVIOUS}</a></div></div>  
523 - <div class="navbar-btn-left"><div class="proximo"><a onclick="javascript:document.location.href='{CACIC_URL}';" title="{KCIQ_FINISH_TITLE}">{KCIQ_FINISH}</a></div></div> 522 + <span class="navbar-btn-right"><span class="anterior"><a onclick="submitForm( installForm, 'FtpVerify' );" title="{KCIQ_PREVIOUS}">{KCIQ_PREVIOUS}</a></span></span>
  523 + <span class="navbar-btn-left"><span class="proximo"><a onclick="javascript:document.location.href='{CACIC_URL}';" title="{KCIQ_FINISH_TITLE}">{KCIQ_FINISH}</a></span></span>
524 </div> 524 </div>
525 </td> 525 </td>
526 </tr> 526 </tr>
instalador/templates/install_navbarftpverify.tmpl
  Diff comments   View file @5856396
@@ -19,8 +19,8 @@ @@ -19,8 +19,8 @@
19 <tr class="navbar"> 19 <tr class="navbar">
20 <td colspan=2> 20 <td colspan=2>
21 <div class="navbar-btn"> 21 <div class="navbar-btn">
22 - <div class="navbar-btn-right"><div class="anterior"><a onclick="submitForm( installForm, 'adminSetup' );" title="{KCIQ_PREVIOUS}">{KCIQ_PREVIOUS}</a></div></div>  
23 - <div class="navbar-btn-left"><div class="proximo"><a onclick="submitForm( installForm, 'Finish' );" title="{KCIQ_NEXT}">{KCIQ_NEXT}</a></div></div> 22 + <span class="navbar-btn-right"><span class="anterior"><a onclick="submitForm( installForm, 'adminSetup' );" title="{KCIQ_PREVIOUS}">{KCIQ_PREVIOUS}</a></span></span>
  23 + <span class="navbar-btn-left"><span class="proximo"><a onclick="submitForm( installForm, 'Finish' );" title="{KCIQ_NEXT}">{KCIQ_NEXT}</a></span></span>
24 </div> 24 </div>
25 </td> 25 </td>
26 </tr> 26 </tr>
relatorios/alteracoes_hardware/index.php
  Diff comments   View file @5856396
@@ -27,7 +27,7 @@ else { // Inserir regras para outras verificações (ex: permissões do usuário)! @@ -27,7 +27,7 @@ else { // Inserir regras para outras verificações (ex: permissões do usuário)!
27 $id_acao = 'cs_coleta_hardware'; 27 $id_acao = 'cs_coleta_hardware';
28 require_once('../../include/inicio_relatorios_inc.php'); 28 require_once('../../include/inicio_relatorios_inc.php');
29 ?> 29 ?>
30 - <script src="../../sniffer.js" type="text/javascript" language="javascript"></script> 30 + <script src="../../include/sniffer.js" type="text/javascript" language="javascript"></script>
31 <script src="../../include/dyncalendar.js" type="text/javascript" language="javascript"></script> 31 <script src="../../include/dyncalendar.js" type="text/javascript" language="javascript"></script>
32 <link href="../../include/dyncalendar.css" media="screen" rel="stylesheet"> 32 <link href="../../include/dyncalendar.css" media="screen" rel="stylesheet">
33 33
@@ -48,7 +48,7 @@ require_once(&#39;../../include/inicio_relatorios_inc.php&#39;); @@ -48,7 +48,7 @@ require_once(&#39;../../include/inicio_relatorios_inc.php&#39;);
48 </td> 48 </td>
49 </tr> 49 </tr>
50 </table> 50 </table>
51 -<form action="rel_alteracoes_hardware.php" target="_blank" method="post" ENCTYPE="multipart/form-data" name="forma" onsubmit="return valida_form()"> 51 +<form action="rel_alteracoes_hardware.php" target="_blank" method="post" ENCTYPE="multipart/form-data" name="form1" onsubmit="return valida_form()">
52 <table width="90%" border="0" align="center" cellpadding="5" cellspacing="1"> 52 <table width="90%" border="0" align="center" cellpadding="5" cellspacing="1">
53 <tr> 53 <tr>
54 <? 54 <?
relatorios/compartilhamentos/rel_compartilhamentos.php
  Diff comments   View file @5856396
@@ -137,9 +137,10 @@ $query = &quot;SELECT DISTINCT compartilhamentos.id_so, @@ -137,9 +137,10 @@ $query = &quot;SELECT DISTINCT compartilhamentos.id_so,
137 compartilhamentos.id_so = computadores.id_so) AND 137 compartilhamentos.id_so = computadores.id_so) AND
138 compartilhamentos.id_so IN ($so_selecionados) AND 138 compartilhamentos.id_so IN ($so_selecionados) AND
139 nm_dir_compart <> '' 139 nm_dir_compart <> ''
140 - $query_redes 140 + $query_redes
  141 + GROUP BY compartilhamentos.id_so,compartilhamentos.te_node_address
141 ORDER BY computadores.te_nome_computador ASC "; 142 ORDER BY computadores.te_nome_computador ASC ";
142 -echo $query . '<br>'; 143 +
143 $resultado = mysql_query($query) or die('Erro no select '. mysql_error().' ou sua sessão expirou!'); 144 $resultado = mysql_query($query) or die('Erro no select '. mysql_error().' ou sua sessão expirou!');
144 145
145 while ($linha = mysql_fetch_array($resultado)) 146 while ($linha = mysql_fetch_array($resultado))
relatorios/hardware/index.php
  Diff comments   View file @5856396
@@ -33,7 +33,9 @@ @@ -33,7 +33,9 @@
33 </tr> 33 </tr>
34 <tr> 34 <tr>
35 <td> 35 <td>
36 - </td> 36 + <span class="necessario">*</span>
  37 + Campos obrigatórios
  38 + </td>
37 </tr> 39 </tr>
38 </table> 40 </table>
39 <form action="rel_hardware.php" target="_blank" method="post" ENCTYPE="multipart/form-data" name="forma" onsubmit="return valida_form()"> 41 <form action="rel_hardware.php" target="_blank" method="post" ENCTYPE="multipart/form-data" name="forma" onsubmit="return valida_form()">
@@ -112,8 +114,9 @@ @@ -112,8 +114,9 @@
112 ?> 114 ?>
113 <td valign="top"><table width="100%" border="0" cellpadding="0" cellspacing="1"> 115 <td valign="top"><table width="100%" border="0" cellpadding="0" cellspacing="1">
114 <tr> 116 <tr>
115 - <td class="label">Selecione  
116 - as configura&ccedil;&otilde;es de hardware que deseja exibir:</td> 117 + <td class="label">
  118 + Selecione as configura&ccedil;&otilde;es de hardware que deseja exibir:
  119 + </td>
117 </tr> 120 </tr>
118 <tr> 121 <tr>
119 <td height="1" bgcolor="#333333"></td> 122 <td height="1" bgcolor="#333333"></td>
@@ -126,7 +129,7 @@ @@ -126,7 +129,7 @@
126 <td>&nbsp;&nbsp;</td> 129 <td>&nbsp;&nbsp;</td>
127 <td width="40">&nbsp;</td> 130 <td width="40">&nbsp;</td>
128 <td nowrap>&nbsp;&nbsp;</td> 131 <td nowrap>&nbsp;&nbsp;</td>
129 - <td nowrap class="cabecalho_tabela">Selecionados:</td> 132 + <td nowrap class="cabecalho_tabela"><span class="necessario">*</span>Selecionados:</td>
130 <td nowrap>&nbsp;&nbsp;</td> 133 <td nowrap>&nbsp;&nbsp;</td>
131 </tr> 134 </tr>
132 <tr> 135 <tr>
relatorios/hardware/rel_hardware.php
  Diff comments   View file @5856396
@@ -103,9 +103,9 @@ else @@ -103,9 +103,9 @@ else
103 { 103 {
104 $locais_selecionados .= ",'" . $_SESSION["list12"][$i] . "'"; 104 $locais_selecionados .= ",'" . $_SESSION["list12"][$i] . "'";
105 } 105 }
106 - $query_redes = 'AND a.id_ip_rede = redes.id_ip_rede AND  
107 - redes.id_local IN ('. $locais_selecionados .') AND  
108 - redes.id_local = locais.id_local '; 106 + $query_redes = ' AND a.id_ip_rede = redes.id_ip_rede ';
  107 + $query_redes .= ' AND redes.id_local IN ('. $locais_selecionados .')';
  108 + $query_redes .= ' AND redes.id_local = locais.id_local ';
109 $select = ' ,sg_local as Local '; 109 $select = ' ,sg_local as Local ';
110 $from = ' ,redes,locais '; 110 $from = ' ,redes,locais ';
111 } 111 }
@@ -127,7 +127,6 @@ for( $i = 0; $i &lt; count($_SESSION[&quot;list6&quot;] ); $i++ ) @@ -127,7 +127,6 @@ for( $i = 0; $i &lt; count($_SESSION[&quot;list6&quot;] ); $i++ )
127 // Aqui substitui todas as strings \ por vazio que a variável $campos_hardware retorna 127 // Aqui substitui todas as strings \ por vazio que a variável $campos_hardware retorna
128 $campos_hardware = str_replace('\\', '', $campos_hardware); 128 $campos_hardware = str_replace('\\', '', $campos_hardware);
129 129
130 -echo $campos_hardware . '<br>';  
131 if ($_GET['orderby']) { $orderby = $_GET['orderby']; } 130 if ($_GET['orderby']) { $orderby = $_GET['orderby']; }
132 else { $orderby = '3'; } //por Nome Comp. 131 else { $orderby = '3'; } //por Nome Comp.
133 $query = ' SELECT distinct a.te_node_address, 132 $query = ' SELECT distinct a.te_node_address,
@@ -135,15 +134,16 @@ else { $orderby = &#39;3&#39;; } //por Nome Comp. @@ -135,15 +134,16 @@ else { $orderby = &#39;3&#39;; } //por Nome Comp.
135 a.te_nome_computador as "Nome Comp.", 134 a.te_nome_computador as "Nome Comp.",
136 sg_so as "S.O.", 135 sg_so as "S.O.",
137 a.te_ip as "IP"' . 136 a.te_ip as "IP"' .
138 - $select .' 137 + $select .
  138 + ($campos_hardware?','.$campos_hardware:"") .
  139 + '
139 FROM so LEFT JOIN computadores a ON (a.id_so = so.id_so) '. 140 FROM so LEFT JOIN computadores a ON (a.id_so = so.id_so) '.
140 $from . ' 141 $from . '
141 WHERE TRIM(a.te_nome_computador) <> "" AND 142 WHERE TRIM(a.te_nome_computador) <> "" AND
142 a.id_so IN ('. $so_selecionados .') '. 143 a.id_so IN ('. $so_selecionados .') '.
143 $query_redes .' 144 $query_redes .'
144 ORDER BY ' . $orderby; 145 ORDER BY ' . $orderby;
145 -// $campos_hardware .  
146 -echo $query . '<br>'; 146 +
147 $result = mysql_query($query) or die('Erro no select ou sua sessão expirou!'); 147 $result = mysql_query($query) or die('Erro no select ou sua sessão expirou!');
148 148
149 $cor = 0; 149 $cor = 0;