Commit 80b6f337f914c65f555160cfbd58ae67a2a41783

Authored by Edmar Moretti
1 parent b8ee6541

Separação dos templates mustache em pastas específicas

Showing 80 changed files with 404 additions and 378 deletions   Show diff stats
admin/admin.db
No preview for this file type
admin1/cadastros/identifica/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/cadastros/perfis/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/cadastros/servicos/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/cadastros/sistemas/funcoes/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../../.." );
  2 +define ( "ONDEI3GEO", "../../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../../head.php";
... ...
admin1/cadastros/sistemas/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/cadastros/tags/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/catalogo/atlas/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/catalogo/atlas/pranchas/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../../.." );
  2 +define ( "ONDEI3GEO", "../../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../../head.php";
... ...
admin1/catalogo/atlas/pranchas/temas/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../../../.." );
  2 +define ( "ONDEI3GEO", "../../../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../../../head.php";
... ...
admin1/catalogo/mapas/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/catalogo/mapfile/cdados/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../../.." );
  2 +define ( "ONDEI3GEO", "../../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../../head.php";
... ...
admin1/catalogo/mapfile/comportamento/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../../.." );
  2 +define ( "ONDEI3GEO", "../../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../../head.php";
... ...
admin1/catalogo/mapfile/conexao/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../../.." );
  2 +define ( "ONDEI3GEO", "../../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../../head.php";
... ...
admin1/catalogo/mapfile/disponibilidade/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../../.." );
  2 +define ( "ONDEI3GEO", "../../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../../head.php";
... ...
admin1/catalogo/mapfile/editavel/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../../.." );
  2 +define ( "ONDEI3GEO", "../../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../../head.php";
... ...
admin1/catalogo/mapfile/editor/index.php
... ... @@ -2,7 +2,7 @@
2 2 // TODO botoes de copiar, colar, limpar
3 3 // TODO editor de cores
4 4 //
5   -define ( ONDEI3GEO, "../../../.." );
  5 +define ( "ONDEI3GEO", "../../../.." );
6 6 include (dirname ( __FILE__ ) . "/../../../../ms_configura.php");
7 7 error_reporting ( 0 );
8 8 include "../../../head.php";
... ...
admin1/catalogo/mapfile/gruposusuarios/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../../.." );
  2 +define ( "ONDEI3GEO", "../../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../../head.php";
... ...
admin1/catalogo/mapfile/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/catalogo/mapfile/opcoes/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../../.." );
  2 +define ( "ONDEI3GEO", "../../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../../head.php";
... ...
admin1/catalogo/mapfile/renderizacao/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../../.." );
  2 +define ( "ONDEI3GEO", "../../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../../head.php";
... ...
admin1/catalogo/menus/grupos/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../../.." );
  2 +define ( "ONDEI3GEO", "../../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../../head.php";
... ...
admin1/catalogo/menus/grupos/listadegrupos/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../../../.." );
  2 +define ( "ONDEI3GEO", "../../../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../../../head.php";
... ...
admin1/catalogo/menus/grupos/subgrupos/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../../../.." );
  2 +define ( "ONDEI3GEO", "../../../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../../../head.php";
... ...
admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../../../../../" );
  2 +define ( "ONDEI3GEO", "../../../../../../" );
3 3 include (dirname ( __FILE__ ) . "/../../../../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../../../../head.php";
... ...
admin1/catalogo/menus/grupos/subgrupos/temas/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../../../../.." );
  2 +define ( "ONDEI3GEO", "../../../../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../../../../head.php";
... ...
admin1/catalogo/menus/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/ferramentas/banco/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 //verifica se o login pode ser realizado
5 5 if(isset($i3geoPermiteLogin) && $i3geoPermiteLogin == false){
... ...
admin1/ferramentas/criabanco/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 //verifica se o login pode ser realizado
5 5 if(isset($i3geoPermiteLogin) && $i3geoPermiteLogin == false){
... ...
admin1/ferramentas/estatisticas/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 //verifica se o login pode ser realizado
5 5 if(isset($i3geoPermiteLogin) && $i3geoPermiteLogin == false){
... ...
admin1/ferramentas/miniaturas/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 //verifica se o login pode ser realizado
5 5 if(isset($i3geoPermiteLogin) && $i3geoPermiteLogin == false){
... ...
admin1/headjs.php
1 1 <?php
2   -define ( ONDEI3GEO, dirname ( dirname ( __FILE__ ) ) );
  2 +define ( "ONDEI3GEO", dirname ( dirname ( __FILE__ ) ) );
3 3 if (extension_loaded ( 'zlib' )) {
4 4 ob_start ( 'ob_gzhandler' );
5 5 }
... ... @@ -40,8 +40,6 @@ include (ONDEI3GEO . &quot;/admin1/dicionario/core.js&quot;);
40 40 echo "\n";
41 41 include (ONDEI3GEO . "/admin1/dicionario/menup.js");
42 42 echo "\n";
43   -include (ONDEI3GEO . "/admin1/dicionario.js");
44   -echo "\n";
45 43  
46 44 if (extension_loaded ( 'zlib' )) {
47 45 ob_end_flush ();
... ...
admin1/index.php
1 1 <?php
2   -define ( ONDEI3GEO, ".." );
  2 +define ( "ONDEI3GEO", ".." );
3 3 include (dirname ( __FILE__ ) . "/../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "head.php";
... ...
admin1/metaestat/conexoes/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/metaestat/fontes/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/metaestat/mapas/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/metaestat/periodos/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/metaestat/regioes/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/metaestat/unidades/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/metaestat/variaveis/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/upload/arquivo/index.php
1 1 <?php
2 2 // TODO incluir icone para abrir o navegador de arquivos para encontrar a pasta no servidor
3   -define ( ONDEI3GEO, "../../.." );
  3 +define ( "ONDEI3GEO", "../../.." );
4 4 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
5 5 error_reporting ( 0 );
6 6 include "../../head.php";
... ...
admin1/upload/banco/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/upload/simbolo/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/usuarios/cadastro/exec.php
... ... @@ -34,11 +34,15 @@ if (verificaOperacaoSessao ( &quot;admin/html/usuarios&quot; ) === false) {
34 34 }
35 35  
36 36 include (dirname ( __FILE__ ) . "/../../../admin/php/conexao.php");
  37 +include ("funcoes.php");
37 38  
38   -$id_usuario = $_POST["id_usuario"];
39   -$id_papel = $_POST["id_papel"];
  39 +$id_usuario = $_POST ["id_usuario"];
  40 +$id_papel = $_POST ["id_papel"];
40 41  
41   -testaSafeNumerico([$id_usuario,$id_papel]);
  42 +testaSafeNumerico ( [
  43 + $id_usuario,
  44 + $id_papel
  45 +] );
42 46  
43 47 $funcao = strtoupper ( $funcao );
44 48 // converte os parametros de definicao dos papeis em um array
... ... @@ -46,215 +50,109 @@ if ($funcao == &quot;ADICIONAR&quot; || $funcao == &quot;ALTERAR&quot;) {
46 50 $papeis = array ();
47 51 foreach ( array_keys ( $_POST ) as $k ) {
48 52 $teste = explode ( "-", $k );
49   - if ($teste[0] == "id_papel") {
50   - $papeis[] = $teste[1] * 1;
  53 + if ($teste [0] == "id_papel") {
  54 + $papeis [] = $teste [1] * 1;
51 55 }
52 56 }
53 57 array_unique ( $papeis );
54 58 }
55 59 switch ($funcao) {
56 60 case "ADICIONAR" :
57   - $novo = adicionar( $_POST["ativo"], $_POST["data_cadastro"], $_POST["email"], $_POST["login"], $_POST["nome_usuario"], $_POST["senha"], $papeis, $dbhw );
  61 + $novo = \admin\usuarios\cadastro\adicionar ( $_POST ["ativo"], $_POST ["data_cadastro"], $_POST ["email"], $_POST ["login"], $_POST ["nome_usuario"], $_POST ["senha"], $papeis, $dbhw );
  62 + $dbhw = null;
  63 + $dbh = null;
58 64 if ($novo != false) {
59   - $sql = "SELECT id_usuario, ativo, data_cadastro, email, login, nome_usuario from " . $esquemaadmin . "i3geousr_usuarios WHERE id_usuario = " . $novo;
60   - $dados = pegaDados ( $sql, $dbh );
61   - if ($dados === false) {
62   - header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
63   - exit ();
64   - }
65   - if(strtolower($enviaSenha) == "on"){
66   - if($senha == "" || $email == ""){
67   - $dados = header ( "HTTP/1.1 500 para enviar a senha &eacute; necess&aacute;rio preencher o valor de senha e e-mail" );
  65 + if (strtolower ( $enviaSenha ) == "on") {
  66 + if ($senha == "" || $email == "") {
  67 + header ( "HTTP/1.1 500 para enviar a senha &eacute; necess&aacute;rio preencher o valor de senha e e-mail" );
68 68 } else {
69   - $dados = enviarSenha( $senha, $email );
  69 + $dados = \admin\usuarios\cadastro\enviarSenha ( $senha, $email );
70 70 }
71 71 }
72   - retornaJSON ( $dados );
73 72 } else {
74 73 header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
75   - exit ();
76 74 }
77   - exit ();
78 75 break;
79 76 case "ALTERAR" :
80   - $novo = alterar ( $id_usuario, $_POST["ativo"], $_POST["data_cadastro"], $_POST["email"], $_POST["login"], $_POST["nome_usuario"], $_POST["senha"], $papeis, $dbhw );
  77 + $novo = \admin\usuarios\cadastro\alterar ( $id_usuario, $_POST ["ativo"], $_POST ["data_cadastro"], $_POST ["email"], $_POST ["login"], $_POST ["nome_usuario"], $_POST ["senha"], $papeis, $dbhw );
  78 + $dbhw = null;
  79 + $dbh = null;
81 80 if ($novo === false) {
82 81 header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
83   - exit ();
84   - }
85   - $sql = "SELECT id_usuario,ativo,data_cadastro,email,login,nome_usuario from " . $esquemaadmin . "i3geousr_usuarios WHERE id_usuario = " . $novo;
86   - $dados = pegaDados ( $sql, $dbh );
87   - if ($dados === false) {
88   - header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
89   - exit ();
90   - }
91   - if(strtolower($enviaSenha) == "on"){
92   - if($senha == "" || $email == ""){
93   - $dados = header ( "HTTP/1.1 500 para enviar a senha &eacute; necess&aacute;rio preencher o valor de senha e e-mail" );
94   - } else {
95   - $dados = enviarSenha( $senha, $email );
  82 + } else {
  83 + if (strtolower ( $enviaSenha ) == "on") {
  84 + if ($senha == "" || $email == "") {
  85 + $dados = header ( "HTTP/1.1 500 para enviar a senha &eacute; necess&aacute;rio preencher o valor de senha e e-mail" );
  86 + } else {
  87 + $dados = \admin\usuarios\cadastro\enviarSenha ( $senha, $email );
  88 + }
96 89 }
97 90 }
98   - retornaJSON ( $dados );
99   - exit ();
100 91 break;
101   - case "LISTAUNICO" :
102   - $usuarios = pegaDados ( "SELECT id_usuario,ativo,data_cadastro,email,login,nome_usuario from " . $esquemaadmin . "i3geousr_usuarios WHERE id_usuario = $id_usuario order by nome_usuario", $dbh, false );
103   - $papeisusuario = pegaDados ( "SELECT P.id_papel, P.nome, P.descricao, UP.id_usuario FROM " . $esquemaadmin . "i3geousr_papelusuario AS UP JOIN " . $esquemaadmin . "i3geousr_papeis AS P ON UP.id_papel = P.id_papel WHERE UP.id_usuario = $id_usuario ", dbh, false );
104   - if ($usuarios === false || $papeis === false) {
105   - $dbhw = null;
106   - $dbh = null;
107   - header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
108   - exit ();
109   - }
110   - $usuario = $usuarios[0];
111   - //cria o indice do array conforme o id da operacao
112   - $o = array();
113   - foreach($papeisusuario as $op){
114   - $o[$op["id_papel"]] = $op;
115   - }
116   - $usuario["papeis"] = $o;
117   - //todos os papeis
118   - $papeis = pegaDados ( "SELECT * from " . $esquemaadmin . "i3geousr_papeis order by nome", $dbh );
119   - $dbhw = null;
120   - $dbh = null;
121   - if ($papeis === false) {
122   - header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
123   - exit();
124   - }
125   - retornaJSON ( array (
126   - "usuario" => $usuario,
127   - "papeis" => $papeis
128   - ) );
129   - break;
130   - case "LISTA" :
131   - $usuarios = pegaDados ( "SELECT id_usuario,nome_usuario from " . $esquemaadmin . "i3geousr_usuarios order by lower(nome_usuario)", $dbh, false );
132   - if ($usuarios === false) {
  92 + case "LISTAUNICO" :
  93 + $usuario = \admin\usuarios\cadastro\listar($dbh, $id_usuario);
  94 + if ($usuario === false) {
133 95 $dbhw = null;
134 96 $dbh = null;
135 97 header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
136 98 exit ();
137 99 }
138   - $papeis = pegaDados("SELECT * from ".$esquemaadmin."i3geousr_papeis order by nome",$dbh);
  100 +
  101 + $papeisusuario = \admin\usuarios\cadastro\listaPapeisUsuario($id_usuario,$dbh);
  102 + // cria o indice do array conforme o id da operacao
  103 + $o = array ();
  104 + foreach ( $papeisusuario as $op ) {
  105 + $o [$op ["id_papel"]] = $op;
  106 + }
  107 + $usuario ["papeis"] = $o;
  108 + // todos os papeis
  109 + $papeis = \admin\usuarios\cadastro\listaPapeis ( $dbh );
139 110 $dbhw = null;
140 111 $dbh = null;
141   - if ($papeis === false) {
142   - header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
143   - exit ();
144   - }
145 112 retornaJSON ( array (
146   - "usuarios" => $usuarios,
  113 + "usuario" => $usuario,
147 114 "papeis" => $papeis
148 115 ) );
149 116 break;
  117 + case "LISTA" :
  118 + $usuarios = \admin\usuarios\cadastro\listar ( $dbh );
  119 + if ($usuarios === false) {
  120 + $dbhw = null;
  121 + $dbh = null;
  122 + header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
  123 + } else {
  124 + $papeis = \admin\usuarios\cadastro\listaPapeis ( $dbh );
  125 + $dbhw = null;
  126 + $dbh = null;
  127 + retornaJSON ( array (
  128 + "usuarios" => $usuarios,
  129 + "papeis" => $papeis
  130 + ) );
  131 + }
  132 + break;
150 133 case "EXCLUIR" :
151   - $retorna = excluir ( $id_usuario, $dbhw );
  134 + $retorna = \admin\usuarios\cadastro\excluir ( $id_usuario, $dbhw );
152 135 $dbhw = null;
153 136 $dbh = null;
154 137 if ($retorna === false) {
155 138 header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
156 139 exit ();
157 140 }
158   - retornaJSON ( $id_usuario );
159   - exit ();
160 141 break;
161 142 case "ENVIARSENHA" :
162   - if($_POST["senha"] == "" || $_POST["email"] == ""){
  143 + if ($_POST ["senha"] == "" || $_POST ["email"] == "") {
163 144 header ( "HTTP/1.1 500 erro ao enviar e-mail. Prrencha o valor de e-mail e senha" );
164   - exit ();
165   - }
166   - $retorna = enviarSenha ( $_POST["senha"], $_POST["email"] );
167   - if ($retorna === false) {
168   - header ( "HTTP/1.1 500 erro ao enviar e-mail $email" );
169   - exit ();
170   - }
171   - retornaJSON ( true );
172   - exit ();
173   - break;
174   -}
175   -cpjson ( $retorno );
176   -
177   -function enviarSenha( $senha, $email ){
178   - $to = $email;
179   - $subject = 'senha i3geo criada em '. date('l jS \of F Y h:i:s A');
180   - $message = $senha;
181   - return mail($to, $subject, $message);
182   -}
183   -// $papeis deve ser um array
184   -function adicionar($ativo, $data_cadastro, $email, $login, $nome_usuario, $senha, $papeis, $dbhw) {
185   - global $esquemaadmin;
186   - try {
187   - $dataCol = array(
188   - "nome_usuario" => '',
189   - "login" => '',
190   - "email" => '',
191   - "ativo" => 0,
192   - "data_cadastro" => '',
193   - "senha" => ''
194   - );
195   - $id_usuario = i3GeoAdminInsertUnico ( $dbhw, "i3geousr_usuarios", $dataCol, "nome_usuario", "id_usuario" );
196   - $data_cadastro = date('l jS \of F Y h:i:s A');
197   - $retorna = alterar ( $id_usuario, $ativo, $data_cadastro, $email, $login, $nome_usuario, $senha, $papeis, $dbhw );
198   - return $retorna;
199   - } catch ( PDOException $e ) {
200   - return false;
201   - }
202   -}
203   -// $papeis deve ser um array
204   -function alterar($id_usuario, $ativo, $data_cadastro, $email, $login, $nome_usuario, $senha, $papeis, $dbhw) {
205   - global $convUTF, $esquemaadmin;
206   - if ($convUTF != true) {
207   - $nome_usuario = utf8_decode ( $nome_usuario );
208   - }
209   - $dataCol = array (
210   - "nome_usuario" => $nome_usuario,
211   - "login" => $login,
212   - "email" => $email,
213   - "ativo" => $ativo
214   - );
215   - // se a senha foi enviada, ela sera trocada
216   - if ($senha != "") {
217   - //$dataCol ["senha"] = md5 ( $senha );
218   - $dataCol["senha"] = password_hash($_GET["senha"], PASSWORD_DEFAULT);
219   - }
220   - $resultado = i3GeoAdminUpdate ( $dbhw, "i3geousr_usuarios", $dataCol, "WHERE id_usuario = $id_usuario" );
221   - if ($resultado === false) {
222   - return false;
223   - }
224   - // apaga todos os papeis
225   - $resultado = excluirPapeis ( $id_usuario, $dbhw );
226   - if ($resultado === false) {
227   - return false;
228   - }
229   - if (! empty ( $papeis )) {
230   - // atualiza papeis vinculados
231   - foreach ( $papeis as $p ) {
232   - $resultado = adicionaPapel ( $id_usuario, $p, $dbhw );
233   - if ($resultado === false) {
234   - return false;
  145 + } else {
  146 + $retorna = \admin\usuarios\cadastro\enviarSenha ( $_POST ["senha"], $_POST ["email"] );
  147 + if ($retorna === false) {
  148 + header ( "HTTP/1.1 500 erro ao enviar e-mail $email" );
  149 + } else {
  150 + retornaJSON ( true );
235 151 }
236 152 }
237   - }
238   - return $id_usuario;
239   -}
240   -function adicionaPapel($id_usuario, $id_papel, $dbhw) {
241   - global $esquemaadmin;
242   - $dataCol = array (
243   - "id_usuario" => $id_usuario,
244   - "id_papel" => $id_papel
245   - );
246   - $resultado = i3GeoAdminInsert ( $dbhw, "i3geousr_papelusuario", $dataCol );
247   - return $resultado;
248   -}
249   -function excluir($id_usuario, $dbhw) {
250   - global $esquemaadmin;
251   - $resultado = i3GeoAdminExclui ( $esquemaadmin . "i3geousr_usuarios", "id_usuario", $id_usuario, $dbhw, false );
252   - $resultado = excluirPapeis ( $id_usuario, $dbhw );
253   - return $resultado;
254   -}
255   -function excluirPapeis($id_usuario, $dbhw) {
256   - global $esquemaadmin;
257   - $resultado = i3GeoAdminExclui ( $esquemaadmin . "i3geousr_papelusuario", "id_usuario", $id_usuario, $dbhw, false );
258   - return $resultado;
  153 + break;
  154 + default :
  155 + header ( "HTTP/1.1 500 erro funcao nao existe" );
  156 + break;
259 157 }
260 158 -?>
  159 +?>
261 160 \ No newline at end of file
... ...
admin1/usuarios/cadastro/funcoes.php 0 → 100755
... ... @@ -0,0 +1,120 @@
  1 +<?php
  2 +namespace admin\usuarios\cadastro;
  3 +function listar($dbh, $id_usuario = ""){
  4 + global $esquemaadmin;
  5 + if($id_usuario != ""){
  6 + $dados = pegaDados ( "SELECT id_usuario,ativo,data_cadastro,email,login,nome_usuario from " . $esquemaadmin . "i3geousr_usuarios WHERE id_usuario = $id_usuario order by nome_usuario", $dbh, false );
  7 + $dados = $dados[0];
  8 + } else {
  9 + $dados = pegaDados ( "SELECT id_usuario,nome_usuario from " . $esquemaadmin . "i3geousr_usuarios order by lower(nome_usuario)", $dbh, false );
  10 + }
  11 + if ($dados === false) {
  12 + return false;
  13 + } else {
  14 + return $dados;
  15 + }
  16 +}
  17 +function listaPapeis($dbh){
  18 + global $esquemaadmin;
  19 + $dados = pegaDados ( "SELECT * from " . $esquemaadmin . "i3geousr_papeis order by nome", $dbh );
  20 + if ($dados === false) {
  21 + header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
  22 + exit ();
  23 + } else {
  24 + return $dados;
  25 + }
  26 +}
  27 +function listaPapeisUsuario($id_usuario,$dbh){
  28 + global $esquemaadmin;
  29 + $dados = pegaDados ( "SELECT P.id_papel, P.nome, P.descricao, UP.id_usuario FROM " . $esquemaadmin . "i3geousr_papelusuario AS UP JOIN " . $esquemaadmin . "i3geousr_papeis AS P ON UP.id_papel = P.id_papel WHERE UP.id_usuario = $id_usuario ", dbh, false );
  30 + if ($dados === false) {
  31 + header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
  32 + exit ();
  33 + } else {
  34 + return $dados;
  35 + }
  36 +}
  37 +function enviarSenha( $senha, $email ){
  38 + $to = $email;
  39 + $subject = 'senha i3geo criada em '. date('l jS \of F Y h:i:s A');
  40 + $message = $senha;
  41 + return mail($to, $subject, $message);
  42 +}
  43 +// $papeis deve ser um array
  44 +function adicionar($ativo, $data_cadastro, $email, $login, $nome_usuario, $senha, $papeis, $dbhw) {
  45 + global $esquemaadmin;
  46 + try {
  47 + $dataCol = array(
  48 + "nome_usuario" => '',
  49 + "login" => '',
  50 + "email" => '',
  51 + "ativo" => 0,
  52 + "data_cadastro" => '',
  53 + "senha" => ''
  54 + );
  55 + $id_usuario = i3GeoAdminInsertUnico ( $dbhw, "i3geousr_usuarios", $dataCol, "nome_usuario", "id_usuario" );
  56 + $data_cadastro = date('l jS \of F Y h:i:s A');
  57 + $retorna = \admin\usuarios\cadastro\alterar ( $id_usuario, $ativo, $data_cadastro, $email, $login, $nome_usuario, $senha, $papeis, $dbhw );
  58 + return $retorna;
  59 + } catch ( PDOException $e ) {
  60 + return false;
  61 + }
  62 +}
  63 +// $papeis deve ser um array
  64 +function alterar($id_usuario, $ativo, $data_cadastro, $email, $login, $nome_usuario, $senha, $papeis, $dbhw) {
  65 + global $convUTF, $esquemaadmin;
  66 + if ($convUTF != true) {
  67 + $nome_usuario = utf8_decode ( $nome_usuario );
  68 + }
  69 + $dataCol = array (
  70 + "nome_usuario" => $nome_usuario,
  71 + "login" => $login,
  72 + "email" => $email,
  73 + "ativo" => $ativo
  74 + );
  75 + // se a senha foi enviada, ela sera trocada
  76 + if ($senha != "") {
  77 + //$dataCol ["senha"] = md5 ( $senha );
  78 + $dataCol["senha"] = password_hash($_GET["senha"], PASSWORD_DEFAULT);
  79 + }
  80 + $resultado = i3GeoAdminUpdate ( $dbhw, "i3geousr_usuarios", $dataCol, "WHERE id_usuario = $id_usuario" );
  81 + if ($resultado === false) {
  82 + return false;
  83 + }
  84 + // apaga todos os papeis
  85 + $resultado = \admin\usuarios\cadastro\excluirPapeis ( $id_usuario, $dbhw );
  86 + if ($resultado === false) {
  87 + return false;
  88 + }
  89 + if (! empty ( $papeis )) {
  90 + // atualiza papeis vinculados
  91 + foreach ( $papeis as $p ) {
  92 + $resultado = \admin\usuarios\cadastro\adicionaPapel ( $id_usuario, $p, $dbhw );
  93 + if ($resultado === false) {
  94 + return false;
  95 + }
  96 + }
  97 + }
  98 + return $id_usuario;
  99 +}
  100 +function adicionaPapel($id_usuario, $id_papel, $dbhw) {
  101 + global $esquemaadmin;
  102 + $dataCol = array (
  103 + "id_usuario" => $id_usuario,
  104 + "id_papel" => $id_papel
  105 + );
  106 + $resultado = i3GeoAdminInsert ( $dbhw, "i3geousr_papelusuario", $dataCol );
  107 + return $resultado;
  108 +}
  109 +function excluir($id_usuario, $dbhw) {
  110 + global $esquemaadmin;
  111 + $resultado = i3GeoAdminExclui ( $esquemaadmin . "i3geousr_usuarios", "id_usuario", $id_usuario, $dbhw, false );
  112 + $resultado = \admin\usuarios\cadastro\excluirPapeis ( $id_usuario, $dbhw );
  113 + return $resultado;
  114 +}
  115 +function excluirPapeis($id_usuario, $dbhw) {
  116 + global $esquemaadmin;
  117 + $resultado = i3GeoAdminExclui ( $esquemaadmin . "i3geousr_papelusuario", "id_usuario", $id_usuario, $dbhw, false );
  118 + return $resultado;
  119 +}
  120 +?>
0 121 \ No newline at end of file
... ...
admin1/usuarios/cadastro/index.js
... ... @@ -235,8 +235,7 @@ Obt&amp;eacute;m a lista de usuarios
235 235 .done(
236 236 function(data, status){
237 237 i3GEOadmin.core.modalAguarde(false);
238   - var json = jQuery.parseJSON(data)*1;
239   - $("#form-" + json).remove();
  238 + i3GEOadmin.usuarios.lista();
240 239 }
241 240 )
242 241 .fail(
... ...
admin1/usuarios/cadastro/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/usuarios/cadastro/templates/templateFiltro.php 100644 → 100755
admin1/usuarios/cadastro/templates/templateFormLista.php 100644 → 100755
admin1/usuarios/cadastro/templates/templateInputPapeis.php 100644 → 100755
admin1/usuarios/cadastro/templates/templateLista.php 100644 → 100755
admin1/usuarios/grupos/exec.php
... ... @@ -34,10 +34,13 @@ if (verificaOperacaoSessao ( &quot;admin/html/usuarios&quot; ) === false) {
34 34 }
35 35  
36 36 include (dirname ( __FILE__ ) . "/../../../admin/php/conexao.php");
37   -
38   -$id_usuario = $_POST["id_usuario"];
39   -$id_grupo = $_POST["id_grupo"];
40   -testaSafeNumerico([$id_usuario,$id_grupo]);
  37 +include ("funcoes.php");
  38 +$id_usuario = $_POST ["id_usuario"];
  39 +$id_grupo = $_POST ["id_grupo"];
  40 +testaSafeNumerico ( [
  41 + $id_usuario,
  42 + $id_grupo
  43 +] );
41 44  
42 45 $funcao = strtoupper ( $funcao );
43 46 // converte os parametros de definicao dos papeis em um array
... ... @@ -45,173 +48,77 @@ if ($funcao == &quot;ADICIONAR&quot; || $funcao == &quot;ALTERAR&quot;) {
45 48 $usuarios = array ();
46 49 foreach ( array_keys ( $_POST ) as $k ) {
47 50 $teste = explode ( "-", $k );
48   - if ($teste[0] == "id_usuario") {
49   - $usuarios[] = $teste[1] * 1;
  51 + if ($teste [0] == "id_usuario") {
  52 + $usuarios [] = $teste [1] * 1;
50 53 }
51 54 }
52 55 array_unique ( $usuarios );
53 56 }
54 57 switch ($funcao) {
55 58 case "ADICIONAR" :
56   - $novo = adicionar( $_POST["nome"],$_POST["descricao"], $usuarios, $dbhw );
57   - if ($novo != false) {
58   - $sql = "SELECT * from " . $esquemaadmin . "i3geousr_grupos WHERE id_grupo = " . $novo;
59   - $dados = pegaDados ( $sql, $dbh );
60   - if ($dados === false) {
61   - header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
62   - exit ();
63   - }
64   - retornaJSON ( $dados );
65   - } else {
  59 + $novo = \admin\usuarios\grupos\adicionar ( $_POST ["nome"], $_POST ["descricao"], $usuarios, $dbhw );
  60 + $dbhw = null;
  61 + $dbh = null;
  62 + if ($novo === false) {
66 63 header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
67   - exit ();
68 64 }
69   - exit ();
70 65 break;
71 66 case "ALTERAR" :
72   - $novo = alterar ( $id_grupo, $_POST["nome"], $_POST["descricao"], $usuarios, $dbhw );
  67 + $novo = \admin\usuarios\grupos\alterar ( $id_grupo, $_POST ["nome"], $_POST ["descricao"], $usuarios, $dbhw );
  68 + $dbhw = null;
  69 + $dbh = null;
73 70 if ($novo === false) {
74 71 header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
75   - exit ();
76 72 }
77   - $sql = "SELECT * from " . $esquemaadmin . "i3geousr_grupos WHERE id_grupo = " . $novo;
78   - $dados = pegaDados ( $sql, $dbh );
79   - if ($dados === false) {
80   - header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
81   - exit ();
82   - }
83   - retornaJSON ( $dados );
84   - exit ();
85 73 break;
86   - case "LISTAUNICO" :
87   - $grupos = pegaDados ( "SELECT id_grupo,nome,descricao from ".$esquemaadmin."i3geousr_grupos WHERE id_grupo = $id_grupo", $dbh, false );
88   - $gruposusuarios = pegaDados ( "SELECT U.nome_usuario, U.id_usuario, UP.id_grupo FROM ".$esquemaadmin."i3geousr_grupousuario AS UP JOIN ".$esquemaadmin."i3geousr_usuarios AS U ON U.id_usuario = UP.id_usuario WHERE UP.id_grupo = $id_grupo", dbh, false );
89   - if ($gruposusuarios === false || $grupos === false) {
90   - $dbhw = null;
91   - $dbh = null;
92   - header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
93   - exit ();
94   - }
95   - $grupo = $grupos[0];
  74 + case "LISTAUNICO" :
  75 + $grupo = \admin\usuarios\grupos\listar($dbh, $id_grupo);
  76 + if ($grupo === false) {
  77 + $dbhw = null;
  78 + $dbh = null;
  79 + header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
  80 + } else {
  81 + $gruposusuarios = \admin\usuarios\grupos\listaGruposUsuario($id_grupo,$dbh);
96 82 $o = array ();
97 83 foreach ( $gruposusuarios as $gp ) {
98   - $o[$gp["id_usuario"]] = $gp;
  84 + $o [$gp ["id_usuario"]] = $gp;
99 85 }
100   - $grupo["usuarios"] = $o;
101   - $usuarios = pegaDados ( "SELECT id_usuario, login, nome_usuario from " . $esquemaadmin . "i3geousr_usuarios WHERE ativo = 1 order by login", $dbh );
  86 + $grupo ["usuarios"] = $o;
  87 + $usuarios = \admin\usuarios\grupos\listaUsuarios($dbh);
102 88 $dbhw = null;
103 89 $dbh = null;
104   - if ($usuarios === false) {
105   - header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
106   - exit();
107   - }
108 90 retornaJSON ( array (
109 91 "grupo" => $grupo,
110 92 "usuarios" => $usuarios
111 93 ) );
112   - break;
  94 + }
  95 + break;
113 96 case "LISTA" :
114   - $grupos = pegaDados ( "SELECT id_grupo,nome from ".$esquemaadmin."i3geousr_grupos order by lower(nome)", $dbh, false );
  97 + $grupos = \admin\usuarios\grupos\listar($dbh);
115 98 if ($grupos === false) {
116 99 $dbhw = null;
117 100 $dbh = null;
118 101 header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
119   - exit ();
120   - }
121   - $usuarios = pegaDados ( "SELECT id_usuario, nome_usuario FROM ".$esquemaadmin."i3geousr_usuarios WHERE ativo = 1 ORDER BY nome_usuario", dbh, false );
122   - $dbhw = null;
123   - $dbh = null;
124   - if ($usuarios === false) {
125   - header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
126   - exit ();
  102 + } else {
  103 + $usuarios = \admin\usuarios\grupos\listaUsuarios($dbh);
  104 + $dbhw = null;
  105 + $dbh = null;
  106 + retornaJSON ( array (
  107 + "grupos" => $grupos,
  108 + "usuarios" => $usuarios
  109 + ) );
127 110 }
128   -
129   - retornaJSON ( array (
130   - "grupos" => $grupos,
131   - "usuarios" => $usuarios
132   - ) );
133 111 break;
134 112 case "EXCLUIR" :
135   - $retorna = excluir ( $id_grupo, $dbhw );
  113 + $retorna = \admin\usuarios\grupos\excluir ( $id_grupo, $dbhw );
136 114 $dbhw = null;
137 115 $dbh = null;
138 116 if ($retorna === false) {
139 117 header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
140   - exit ();
141 118 }
142   - retornaJSON ( $id_grupo );
143   - exit ();
  119 + break;
  120 + default :
  121 + header ( "HTTP/1.1 500 erro funcao nao existe" );
144 122 break;
145 123 }
146   -cpjson ( $retorno );
147   -// $usuarios deve ser um array
148   -function adicionar($nome, $descricao, $usuarios, $dbhw) {
149   - global $esquemaadmin;
150   - try {
151   - $dataCol = array(
152   - "nome" => '',
153   - "descricao" => ''
154   - );
155   - $id_grupo = i3GeoAdminInsertUnico ( $dbhw, "i3geousr_grupos", $dataCol, "nome", "id_grupo" );
156   - $retorna = alterar ( $id_grupo, $nome, $descricao, $usuarios, $dbhw );
157   - return $retorna;
158   - } catch ( PDOException $e ) {
159   - return false;
160   - }
161   -}
162   -// $papeis deve ser um array
163   -function alterar($id_grupo, $nome, $descricao, $usuarios, $dbhw) {
164   - global $convUTF, $esquemaadmin;
165   - if ($convUTF != true) {
166   - $nome = utf8_decode ( $nome );
167   - $descricao = utf8_decode ( $descricao );
168   - }
169   - $dataCol = array (
170   - "nome" => $nome,
171   - "descricao" => $descricao
172   - );
173   -
174   - $resultado = i3GeoAdminUpdate ( $dbhw, "i3geousr_grupos", $dataCol, "WHERE id_grupo = $id_grupo" );
175   - if ($resultado === false) {
176   - return false;
177   - }
178   - // apaga todos os papeis
179   - $resultado = excluirUsuarios ( $id_grupo, $dbhw );
180   - if ($resultado === false) {
181   - return false;
182   - }
183   - if (! empty ( $usuarios )) {
184   - // atualiza papeis vinculados
185   - foreach ( $usuarios as $p ) {
186   - $resultado = adicionaUsuario ( $id_grupo, $p, $dbhw );
187   - if ($resultado === false) {
188   - return false;
189   - }
190   - }
191   - }
192   - return $id_grupo;
193   -}
194   -function adicionaUsuario($id_grupo, $id_usuario, $dbhw) {
195   - global $esquemaadmin;
196   - $dataCol = array (
197   - "id_usuario" => $id_usuario,
198   - "id_grupo" => $id_grupo
199   - );
200   - $resultado = i3GeoAdminInsert ( $dbhw, "i3geousr_grupousuario", $dataCol );
201   - return $resultado;
202   -}
203   -function excluir($id_grupo, $dbhw) {
204   - global $esquemaadmin;
205   - $resultado = i3GeoAdminExclui ( $esquemaadmin . "i3geousr_grupos", "id_grupo", $id_grupo, $dbhw, false );
206   - if ($resultado === false) {
207   - return false;
208   - }
209   - $resultado = excluirUsuarios ( $id_grupo, $dbhw );
210   - return $resultado;
211   -}
212   -function excluirUsuarios($id_grupo, $dbhw) {
213   - global $esquemaadmin;
214   - $resultado = i3GeoAdminExclui ( $esquemaadmin . "i3geousr_grupousuario", "id_grupo", $id_grupo, $dbhw, false );
215   - return $resultado;
216   -}
217   -?>
  124 +?>
218 125 \ No newline at end of file
... ...
admin1/usuarios/grupos/funcoes.php 0 → 100755
... ... @@ -0,0 +1,105 @@
  1 +<?php
  2 +namespace admin\usuarios\grupos;
  3 +function listar($dbh, $id_grupo = ""){
  4 + global $esquemaadmin;
  5 + if($id_grupo != ""){
  6 + $dados = pegaDados ( "SELECT id_grupo,nome,descricao from " . $esquemaadmin . "i3geousr_grupos WHERE id_grupo = $id_grupo", $dbh, false );
  7 + $dados = $dados[0];
  8 + } else {
  9 + $dados = pegaDados ( "SELECT id_grupo,nome from " . $esquemaadmin . "i3geousr_grupos order by lower(nome)", $dbh, false );
  10 + }
  11 + if ($dados === false) {
  12 + return false;
  13 + } else {
  14 + return $dados;
  15 + }
  16 +}
  17 +function listaUsuarios($dbh){
  18 + global $esquemaadmin;
  19 + $dados = pegaDados ( "SELECT id_usuario, nome_usuario FROM " . $esquemaadmin . "i3geousr_usuarios WHERE ativo = 1 ORDER BY nome_usuario", dbh, false );
  20 + if ($dados === false) {
  21 + header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
  22 + exit ();
  23 + } else {
  24 + return $dados;
  25 + }
  26 +}
  27 +function listaGruposUsuario($id_grupo,$dbh){
  28 + global $esquemaadmin;
  29 + $dados = pegaDados ( "SELECT U.nome_usuario, U.id_usuario, UP.id_grupo FROM " . $esquemaadmin . "i3geousr_grupousuario AS UP JOIN " . $esquemaadmin . "i3geousr_usuarios AS U ON U.id_usuario = UP.id_usuario WHERE UP.id_grupo = $id_grupo", dbh, false );
  30 + if ($dados === false) {
  31 + header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
  32 + exit ();
  33 + } else {
  34 + return $dados;
  35 + }
  36 +}
  37 +function adicionar($nome, $descricao, $usuarios, $dbhw) {
  38 + global $esquemaadmin;
  39 + try {
  40 + $dataCol = array (
  41 + "nome" => '',
  42 + "descricao" => ''
  43 + );
  44 + $id_grupo = i3GeoAdminInsertUnico ( $dbhw, "i3geousr_grupos", $dataCol, "nome", "id_grupo" );
  45 + $retorna = \admin\usuarios\grupos\alterar ( $id_grupo, $nome, $descricao, $usuarios, $dbhw );
  46 + return $retorna;
  47 + } catch ( PDOException $e ) {
  48 + return false;
  49 + }
  50 +}
  51 +function alterar($id_grupo, $nome, $descricao, $usuarios, $dbhw) {
  52 + global $convUTF, $esquemaadmin;
  53 + if ($convUTF != true) {
  54 + $nome = utf8_decode ( $nome );
  55 + $descricao = utf8_decode ( $descricao );
  56 + }
  57 + $dataCol = array (
  58 + "nome" => $nome,
  59 + "descricao" => $descricao
  60 + );
  61 +
  62 + $resultado = i3GeoAdminUpdate ( $dbhw, "i3geousr_grupos", $dataCol, "WHERE id_grupo = $id_grupo" );
  63 + if ($resultado === false) {
  64 + return false;
  65 + }
  66 + // apaga todos os papeis
  67 + $resultado = \admin\usuarios\grupos\excluirUsuarios ( $id_grupo, $dbhw );
  68 + if ($resultado === false) {
  69 + return false;
  70 + }
  71 + if (! empty ( $usuarios )) {
  72 + // atualiza papeis vinculados
  73 + foreach ( $usuarios as $p ) {
  74 + $resultado = \admin\usuarios\grupos\adicionaUsuario ( $id_grupo, $p, $dbhw );
  75 + if ($resultado === false) {
  76 + return false;
  77 + }
  78 + }
  79 + }
  80 + return $id_grupo;
  81 +}
  82 +function adicionaUsuario($id_grupo, $id_usuario, $dbhw) {
  83 + global $esquemaadmin;
  84 + $dataCol = array (
  85 + "id_usuario" => $id_usuario,
  86 + "id_grupo" => $id_grupo
  87 + );
  88 + $resultado = i3GeoAdminInsert ( $dbhw, "i3geousr_grupousuario", $dataCol );
  89 + return $resultado;
  90 +}
  91 +function excluir($id_grupo, $dbhw) {
  92 + global $esquemaadmin;
  93 + $resultado = i3GeoAdminExclui ( $esquemaadmin . "i3geousr_grupos", "id_grupo", $id_grupo, $dbhw, false );
  94 + if ($resultado === false) {
  95 + return false;
  96 + }
  97 + $resultado = \admin\usuarios\grupos\excluirUsuarios ( $id_grupo, $dbhw );
  98 + return $resultado;
  99 +}
  100 +function excluirUsuarios($id_grupo, $dbhw) {
  101 + global $esquemaadmin;
  102 + $resultado = i3GeoAdminExclui ( $esquemaadmin . "i3geousr_grupousuario", "id_grupo", $id_grupo, $dbhw, false );
  103 + return $resultado;
  104 +}
  105 +?>
0 106 \ No newline at end of file
... ...
admin1/usuarios/grupos/index.js
... ... @@ -236,8 +236,7 @@ Obt&amp;eacute;m a lista de grupos
236 236 .done(
237 237 function(data, status){
238 238 i3GEOadmin.core.modalAguarde(false);
239   - var json = jQuery.parseJSON(data)*1;
240   - $("#form-" + json).remove();
  239 + i3GEOadmin.gruposusuarios.lista();
241 240 }
242 241 )
243 242 .fail(
... ...
admin1/usuarios/grupos/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/usuarios/grupos/templates/templateFiltro.php 100644 → 100755
admin1/usuarios/grupos/templates/templateFormLista.php 100644 → 100755
admin1/usuarios/grupos/templates/templateInputUsuarios.php 100644 → 100755
admin1/usuarios/grupos/templates/templateLista.php 100644 → 100755
admin1/usuarios/operacoes/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../../head.php";
... ...
admin1/usuarios/operacoes/templates/templateFiltro.php 100644 → 100755
admin1/usuarios/operacoes/templates/templateFormLista.php 100644 → 100755
admin1/usuarios/operacoes/templates/templateInputPapeis.php 100644 → 100755
admin1/usuarios/operacoes/templates/templateLista.php 100644 → 100755
exemplos/index.php
1 1 <?php
2   -define ( ONDEI3GEO, ".." );
  2 +define ( "ONDEI3GEO", ".." );
3 3 include (dirname ( __FILE__ ) . "/../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../init/head.php";
... ...
init/headjs.php
1 1 <?php
2   -define ( ONDEI3GEO, dirname ( dirname ( __FILE__ ) ) );
  2 +define ( "ONDEI3GEO", dirname ( dirname ( __FILE__ ) ) );
3 3 if (extension_loaded ( 'zlib' )) {
4 4 ob_start ( 'ob_gzhandler' );
5 5 }
... ...
init/index.php
... ... @@ -13,7 +13,7 @@
13 13 /**
14 14 * Cria as pastas temporarias que o i3Geo precisa, caso nao existam
15 15 */
16   -define ( ONDEI3GEO, ".." );
  16 +define ( "ONDEI3GEO", ".." );
17 17 include (dirname ( __FILE__ ) . "/../ms_configura.php");
18 18 if(empty($dir_tmp)){
19 19 exit;
... ... @@ -193,7 +193,7 @@ include &quot;head.php&quot;;
193 193 <script>
194 194 $(document).ready(function(){
195 195 <?php
196   - if ($i3geomaster [0] ["usuario"] == "admin" && $i3geomaster [0] ["senha"] == "admin") {
  196 + if (!empty ($i3geomaster) && ($i3geomaster [0] ["usuario"] == "admin" && $i3geomaster [0] ["senha"] == "admin")) {
197 197 echo "var men = '<div class=\'alert alert-danger\' style=\'margin-bottom:0px;\' >' + $" . "trad(19,g_traducao_init) + '</div>';";
198 198 } else {
199 199 echo "var men = '';";
... ...
init/login.php
1 1 <?php
2   -define ( ONDEI3GEO, ".." );
  2 +define ( "ONDEI3GEO", ".." );
3 3 include_once (dirname(__FILE__)."/../classesphp/sani_request.php");
4 4 error_reporting ( 0 );
5 5 include "head.php";
... ... @@ -136,7 +136,7 @@ include &quot;head.php&quot;;
136 136 <script>
137 137 $(document).ready(function(){
138 138 <?php
139   - if ($i3geomaster [0] ["usuario"] == "admin" && $i3geomaster [0] ["senha"] == "admin") {
  139 + if (!empty ($i3geomaster) && ($i3geomaster [0] ["usuario"] == "admin" && $i3geomaster [0] ["senha"] == "admin")) {
140 140 echo "var men = '<div class=\'alert alert-danger\' style=\'margin-bottom:0px;\' >' + $" . "trad(19,g_traducao_init) + '</div>';";
141 141 } else {
142 142 echo "var men = '';";
... ...
mapas/index.php
1 1 <?php
2   -define ( ONDEI3GEO, ".." );
  2 +define ( "ONDEI3GEO", ".." );
3 3 include (dirname ( __FILE__ ) . "/../ms_configura.php");
4 4 if (! empty ( $_GET ["customDir"] )) {
5 5 $customDir = strip_tags ( $_GET ["customDir"] );
... ...
mashups/index.php
1 1 <?php
2   -define ( ONDEI3GEO, ".." );
  2 +define ( "ONDEI3GEO", ".." );
3 3 include (dirname ( __FILE__ ) . "/../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../init/head.php";
... ...
ogc/headjs.php
1 1 <?php
2   -define ( ONDEI3GEO, dirname ( dirname ( __FILE__ ) ) );
  2 +define ( "ONDEI3GEO", dirname ( dirname ( __FILE__ ) ) );
3 3 if (extension_loaded ( 'zlib' )) {
4 4 ob_start ( 'ob_gzhandler' );
5 5 }
... ...
ogc/index.php
1 1 <?php
2   -define ( ONDEI3GEO, ".." );
  2 +define ( "ONDEI3GEO", ".." );
3 3 include (dirname ( __FILE__ ) . "/../ms_configura.php");
4 4 include_once (dirname(__FILE__)."/../classesphp/sani_request.php");
5 5 error_reporting ( 0 );
... ...
ogc/menu/grupo/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../.." );
  2 +define ( "ONDEI3GEO", "../../.." );
3 3 include (dirname ( __FILE__ ) . "/../../../ms_configura.php");
4 4 include_once (dirname(__FILE__)."/../../../classesphp/sani_request.php");
5 5 $id_menu = filter_var ( $_GET ["id_menu"], FILTER_SANITIZE_NUMBER_INT );
... ...
ogc/menu/grupo/subgrupo/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../../../../" );
  2 +define ( "ONDEI3GEO", "../../../../" );
3 3 include (dirname ( __FILE__ ) . "/../../../../ms_configura.php");
4 4 include_once (dirname(__FILE__)."/../../../../classesphp/sani_request.php");
5 5 $id_menu = filter_var ( $_GET ["id_menu"], FILTER_SANITIZE_NUMBER_INT );
... ...
ogc/menu/index.php
1 1 <?php
2   -define ( ONDEI3GEO, "../.." );
  2 +define ( "ONDEI3GEO", "../.." );
3 3 include (dirname ( __FILE__ ) . "/../../ms_configura.php");
4 4 include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
5 5 $id_menu = filter_var ( $_GET ["id_menu"], FILTER_SANITIZE_NUMBER_INT );
... ...
pacotes/qrcode/php/qr_img.php
... ... @@ -70,11 +70,11 @@ $image_path=&quot;./../image&quot;; /* You must set path to QRcode frame images. */
70 70 $version_ul=40; /* upper limit for version */
71 71 /* ------ setting area end ------ */
72 72  
73   -if($_GET["d"]){
  73 +if(@$_GET["d"]){
74 74 $qrcode_data_string=@$_GET["d"];
75   - $qrcode_data_string .= "&temasa=".$_GET["temasa"]."&layers=".$_GET["layers"];
  75 + $qrcode_data_string .= "&temasa=".@$_GET["temasa"]."&layers=".@$_GET["layers"];
76 76 }
77   -if($_GET["u"]){
  77 +if(@$_GET["u"]){
78 78 $qrcode_data_string=@$_GET["u"];
79 79 }
80 80 $qrcode_error_correct=@$_GET["e"];
... ...
permlinks/index.php
1 1 <?php
2   -define ( ONDEI3GEO, ".." );
  2 +define ( "ONDEI3GEO", ".." );
3 3 include (dirname ( __FILE__ ) . "/../ms_configura.php");
4 4 include_once (dirname(__FILE__)."/../classesphp/sani_request.php");
5 5 if (! empty ( $_GET ["customDir"] )) {
... ...
social/index.php
1 1 <?php
2   -define ( ONDEI3GEO, ".." );
  2 +define ( "ONDEI3GEO", ".." );
3 3 include (dirname ( __FILE__ ) . "/../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../init/head.php";
... ...
testainstal/index.php
... ... @@ -13,7 +13,7 @@
13 13 /**
14 14 * Cria as pastas temporarias que o i3Geo precisa, caso nao existam
15 15 */
16   -define ( ONDEI3GEO, ".." );
  16 +define ( "ONDEI3GEO", ".." );
17 17 include "../init/head.php";
18 18 ?>
19 19 <body style="padding-top: 55px;" id="topo">
... ...
utilitarios/index.php
1 1 <?php
2   -define ( ONDEI3GEO, ".." );
  2 +define ( "ONDEI3GEO", ".." );
3 3 include (dirname ( __FILE__ ) . "/../ms_configura.php");
4 4 error_reporting ( 0 );
5 5 include "../init/head.php";
... ...