Commit f58b558a46d95be91089f2c95d3a617dbda41800
1 parent
ad6e0404
Exists in
master
and in
7 other branches
Atualização de documentacao e banco de administracao
Showing
11 changed files
with
72 additions
and
44 deletions
Show diff stats
admin/admin.db
No preview for this file type
admin/php/criabanco.php
@@ -161,7 +161,7 @@ | @@ -161,7 +161,7 @@ | ||
161 | $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem editar dados geograficos',4,'editoresgeo')"); | 161 | $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem editar dados geograficos',4,'editoresgeo')"); |
162 | $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES ('Podem administrar o sistema METAESTAT','5', 'adminmetaestat')"); | 162 | $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES ('Podem administrar o sistema METAESTAT','5', 'adminmetaestat')"); |
163 | //usuarios - inclui apenas o admin | 163 | //usuarios - inclui apenas o admin |
164 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_usuarios VALUES(1,'','',1,'admin','admin','admin')"); | 164 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_usuarios VALUES(1,'','',0,'admingeral','admingeral','admingeral')"); |
165 | //papel do usuario | 165 | //papel do usuario |
166 | $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papelusuario VALUES(1,1)"); | 166 | $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papelusuario VALUES(1,1)"); |
167 | //operacoes controladas | 167 | //operacoes controladas |
admin/php/login.php
@@ -236,28 +236,50 @@ function validaSessao(){ | @@ -236,28 +236,50 @@ function validaSessao(){ | ||
236 | function autenticaUsuario($usuario,$senha){ | 236 | function autenticaUsuario($usuario,$senha){ |
237 | include(__DIR__."/conexao.php"); | 237 | include(__DIR__."/conexao.php"); |
238 | $senhamd5 = md5($senha); | 238 | $senhamd5 = md5($senha); |
239 | - $dados = pegaDados("select * from ".$esquemaadmin."i3geousr_usuarios where login = '$usuario' and (senha = '$senhamd5' or senha = '$senha') and ativo = 1",$locaplic); | ||
240 | - if(count($dados) > 0){ | ||
241 | - $pa = pegaDados("select * from ".$esquemaadmin."i3geousr_papelusuario where id_usuario = ".$dados[0]["id_usuario"],$locaplic); | ||
242 | - $op = pegadados("SELECT O.codigo, PU.id_usuario FROM ".$esquemaadmin."i3geousr_operacoes AS O JOIN ".$esquemaadmin."i3geousr_operacoespapeis AS OP ON O.id_operacao = OP.id_operacao JOIN ".$esquemaadmin."i3geousr_papelusuario AS PU ON OP.id_papel = PU.id_papel WHERE id_usuario = ".$dados[0]["id_usuario"],$locaplic); | ||
243 | - $gr = pegadados("SELECT * from ".$esquemaadmin."i3geousr_grupousuario where id_usuario = ".$dados[0]["id_usuario"]); | ||
244 | - $operacoes = array(); | ||
245 | - foreach($op as $o){ | ||
246 | - $operacoes[$o["codigo"]] = true; | ||
247 | - } | ||
248 | - $papeis = array(); | ||
249 | - foreach($pa as $p){ | ||
250 | - $papeis[] = $p["id_papel"]; | ||
251 | - } | ||
252 | - $gruposusr = array(); | ||
253 | - foreach($gr as $p){ | ||
254 | - $gruposusr[] = $p["id_grupo"]; | ||
255 | - } | ||
256 | - $r = array("usuario"=>$dados[0],"papeis"=>$papeis,"operacoes"=>$operacoes,"gruposusr"=>$gruposusr); | 239 | + //verifica se o usuario esta cadastrado no ms_configura.php em $i3geomaster |
240 | + if(verificaMaster($usuario,$senha) == true){ | ||
241 | + $pa = pegaDados("select * from ".$esquemaadmin."i3geousr_papelusuario ",$locaplic); | ||
242 | + $op = pegadados("SELECT O.codigo, PU.id_usuario FROM ".$esquemaadmin."i3geousr_operacoes AS O JOIN ".$esquemaadmin."i3geousr_operacoespapeis AS OP ON O.id_operacao = OP.id_operacao JOIN ".$esquemaadmin."i3geousr_papelusuario AS PU ON OP.id_papel = PU.id_papel ",$locaplic); | ||
243 | + $gr = pegadados("SELECT * from ".$esquemaadmin."i3geousr_grupousuario "); | ||
244 | + $operacoes = array(); | ||
245 | + foreach($op as $o){ | ||
246 | + $operacoes[$o["codigo"]] = true; | ||
247 | + } | ||
248 | + $papeis = array(); | ||
249 | + foreach($pa as $p){ | ||
250 | + $papeis[] = $p["id_papel"]; | ||
251 | + } | ||
252 | + $gruposusr = array(); | ||
253 | + foreach($gr as $p){ | ||
254 | + $gruposusr[] = $p["id_grupo"]; | ||
255 | + } | ||
256 | + $r = array("usuario"=>"master","papeis"=>$papeis,"operacoes"=>$operacoes,"gruposusr"=>$gruposusr); | ||
257 | return $r; | 257 | return $r; |
258 | } | 258 | } |
259 | else{ | 259 | else{ |
260 | - return false; | 260 | + $dados = pegaDados("select * from ".$esquemaadmin."i3geousr_usuarios where login = '$usuario' and (senha = '$senhamd5' or senha = '$senha') and ativo = 1",$locaplic); |
261 | + if(count($dados) > 0){ | ||
262 | + $pa = pegaDados("select * from ".$esquemaadmin."i3geousr_papelusuario where id_usuario = ".$dados[0]["id_usuario"],$locaplic); | ||
263 | + $op = pegadados("SELECT O.codigo, PU.id_usuario FROM ".$esquemaadmin."i3geousr_operacoes AS O JOIN ".$esquemaadmin."i3geousr_operacoespapeis AS OP ON O.id_operacao = OP.id_operacao JOIN ".$esquemaadmin."i3geousr_papelusuario AS PU ON OP.id_papel = PU.id_papel WHERE id_usuario = ".$dados[0]["id_usuario"],$locaplic); | ||
264 | + $gr = pegadados("SELECT * from ".$esquemaadmin."i3geousr_grupousuario where id_usuario = ".$dados[0]["id_usuario"]); | ||
265 | + $operacoes = array(); | ||
266 | + foreach($op as $o){ | ||
267 | + $operacoes[$o["codigo"]] = true; | ||
268 | + } | ||
269 | + $papeis = array(); | ||
270 | + foreach($pa as $p){ | ||
271 | + $papeis[] = $p["id_papel"]; | ||
272 | + } | ||
273 | + $gruposusr = array(); | ||
274 | + foreach($gr as $p){ | ||
275 | + $gruposusr[] = $p["id_grupo"]; | ||
276 | + } | ||
277 | + $r = array("usuario"=>$dados[0],"papeis"=>$papeis,"operacoes"=>$operacoes,"gruposusr"=>$gruposusr); | ||
278 | + return $r; | ||
279 | + } | ||
280 | + else{ | ||
281 | + return false; | ||
282 | + } | ||
261 | } | 283 | } |
262 | } | 284 | } |
263 | function logoutUsuario(){ | 285 | function logoutUsuario(){ |
admin/php/upgradebanco46_47.php
@@ -136,7 +136,7 @@ if(!in_array($teste,5)) | @@ -136,7 +136,7 @@ if(!in_array($teste,5)) | ||
136 | 136 | ||
137 | $teste = lista("select * from ".$esquemaadmin."i3geousr_usuarios","id_usuario"); | 137 | $teste = lista("select * from ".$esquemaadmin."i3geousr_usuarios","id_usuario"); |
138 | if(!in_array($teste,1)) | 138 | if(!in_array($teste,1)) |
139 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_usuarios VALUES(1,'','',1,'admin','admin','admin')"); | 139 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_usuarios VALUES(1,'','',0,'admingeral','admingeral','admingeral')"); |
140 | 140 | ||
141 | $teste = lista("select * from ".$esquemaadmin."i3geousr_papelusuario","id_usuario","id_papel"); | 141 | $teste = lista("select * from ".$esquemaadmin."i3geousr_papelusuario","id_usuario","id_papel"); |
142 | if(!in_array($teste,"1-1")) | 142 | if(!in_array($teste,"1-1")) |
admin/sql/usuarios_basededados.sql
1 | -- i3geousr_usuarios | 1 | -- i3geousr_usuarios |
2 | -INSERT INTO i3geousr_usuarios (id_usuario, ativo, data_cadastro, email, login, nome_usuario, senha) VALUES ('1', '1', '', '', 'admin', 'administrador do i3geo', 'admin'); | 2 | +INSERT INTO i3geousr_usuarios (id_usuario, ativo, data_cadastro, email, login, nome_usuario, senha) VALUES ('1', '0', '', '', 'admingeral', 'administrador do i3geo', 'admingeral'); |
3 | INSERT INTO i3geousr_usuarios (id_usuario, ativo, data_cadastro, email, login, nome_usuario, senha) VALUES ('2', '1', '', '', 'editor', 'teste de editor', 'editor'); | 3 | INSERT INTO i3geousr_usuarios (id_usuario, ativo, data_cadastro, email, login, nome_usuario, senha) VALUES ('2', '1', '', '', 'editor', 'teste de editor', 'editor'); |
4 | INSERT INTO i3geousr_usuarios (id_usuario, ativo, data_cadastro, email, login, nome_usuario, senha) VALUES ('3', '1', '', '', 'publicador', 'teste de publicador', 'publicador'); | 4 | INSERT INTO i3geousr_usuarios (id_usuario, ativo, data_cadastro, email, login, nome_usuario, senha) VALUES ('3', '1', '', '', 'publicador', 'teste de publicador', 'publicador'); |
5 | INSERT INTO i3geousr_usuarios (id_usuario, ativo, data_cadastro, email, login, nome_usuario, senha) VALUES ('4', '1', '', '', 'editorgeo', 'teste de editor geo', 'editorgeo'); | 5 | INSERT INTO i3geousr_usuarios (id_usuario, ativo, data_cadastro, email, login, nome_usuario, senha) VALUES ('4', '1', '', '', 'editorgeo', 'teste de editor geo', 'editorgeo'); |
documentacao/diagramas/cadastrodeusuarios.erm
@@ -110,7 +110,7 @@ | @@ -110,7 +110,7 @@ | ||
110 | </connections> | 110 | </connections> |
111 | <display>false</display> | 111 | <display>false</display> |
112 | <creation_date>2012-07-19 01:51:14</creation_date> | 112 | <creation_date>2012-07-19 01:51:14</creation_date> |
113 | - <updated_date>2012-11-28 09:04:26</updated_date> | 113 | + <updated_date>2012-11-28 13:56:34</updated_date> |
114 | <model_property> | 114 | <model_property> |
115 | <name>Project Name</name> | 115 | <name>Project Name</name> |
116 | <value></value> | 116 | <value></value> |
@@ -656,7 +656,7 @@ | @@ -656,7 +656,7 @@ | ||
656 | <connections> | 656 | <connections> |
657 | <relation> | 657 | <relation> |
658 | <id>0</id> | 658 | <id>0</id> |
659 | - <source>4</source> | 659 | + <source>1</source> |
660 | <target>2</target> | 660 | <target>2</target> |
661 | <child_cardinality>1..n</child_cardinality> | 661 | <child_cardinality>1..n</child_cardinality> |
662 | <parent_cardinality>1</parent_cardinality> | 662 | <parent_cardinality>1</parent_cardinality> |
@@ -673,7 +673,7 @@ | @@ -673,7 +673,7 @@ | ||
673 | </relation> | 673 | </relation> |
674 | <relation> | 674 | <relation> |
675 | <id>1</id> | 675 | <id>1</id> |
676 | - <source>1</source> | 676 | + <source>4</source> |
677 | <target>2</target> | 677 | <target>2</target> |
678 | <child_cardinality>1..n</child_cardinality> | 678 | <child_cardinality>1..n</child_cardinality> |
679 | <parent_cardinality>1</parent_cardinality> | 679 | <parent_cardinality>1</parent_cardinality> |
@@ -699,7 +699,7 @@ | @@ -699,7 +699,7 @@ | ||
699 | <normal_column> | 699 | <normal_column> |
700 | <id>7</id> | 700 | <id>7</id> |
701 | <referenced_column>0</referenced_column> | 701 | <referenced_column>0</referenced_column> |
702 | - <relation>1</relation> | 702 | + <relation>0</relation> |
703 | <description></description> | 703 | <description></description> |
704 | <unique_key_name></unique_key_name> | 704 | <unique_key_name></unique_key_name> |
705 | <logical_name></logical_name> | 705 | <logical_name></logical_name> |
@@ -732,7 +732,7 @@ | @@ -732,7 +732,7 @@ | ||
732 | <normal_column> | 732 | <normal_column> |
733 | <id>8</id> | 733 | <id>8</id> |
734 | <referenced_column>11</referenced_column> | 734 | <referenced_column>11</referenced_column> |
735 | - <relation>0</relation> | 735 | + <relation>1</relation> |
736 | <description></description> | 736 | <description></description> |
737 | <unique_key_name></unique_key_name> | 737 | <unique_key_name></unique_key_name> |
738 | <logical_name></logical_name> | 738 | <logical_name></logical_name> |
@@ -787,7 +787,7 @@ | @@ -787,7 +787,7 @@ | ||
787 | <connections> | 787 | <connections> |
788 | <relation> | 788 | <relation> |
789 | <id>2</id> | 789 | <id>2</id> |
790 | - <source>4</source> | 790 | + <source>6</source> |
791 | <target>3</target> | 791 | <target>3</target> |
792 | <child_cardinality>1..n</child_cardinality> | 792 | <child_cardinality>1..n</child_cardinality> |
793 | <parent_cardinality>1</parent_cardinality> | 793 | <parent_cardinality>1</parent_cardinality> |
@@ -804,7 +804,7 @@ | @@ -804,7 +804,7 @@ | ||
804 | </relation> | 804 | </relation> |
805 | <relation> | 805 | <relation> |
806 | <id>3</id> | 806 | <id>3</id> |
807 | - <source>6</source> | 807 | + <source>4</source> |
808 | <target>3</target> | 808 | <target>3</target> |
809 | <child_cardinality>1..n</child_cardinality> | 809 | <child_cardinality>1..n</child_cardinality> |
810 | <parent_cardinality>1</parent_cardinality> | 810 | <parent_cardinality>1</parent_cardinality> |
@@ -830,7 +830,7 @@ | @@ -830,7 +830,7 @@ | ||
830 | <normal_column> | 830 | <normal_column> |
831 | <id>9</id> | 831 | <id>9</id> |
832 | <referenced_column>16</referenced_column> | 832 | <referenced_column>16</referenced_column> |
833 | - <relation>3</relation> | 833 | + <relation>2</relation> |
834 | <description></description> | 834 | <description></description> |
835 | <unique_key_name></unique_key_name> | 835 | <unique_key_name></unique_key_name> |
836 | <logical_name></logical_name> | 836 | <logical_name></logical_name> |
@@ -863,7 +863,7 @@ | @@ -863,7 +863,7 @@ | ||
863 | <normal_column> | 863 | <normal_column> |
864 | <id>10</id> | 864 | <id>10</id> |
865 | <referenced_column>11</referenced_column> | 865 | <referenced_column>11</referenced_column> |
866 | - <relation>2</relation> | 866 | + <relation>3</relation> |
867 | <description></description> | 867 | <description></description> |
868 | <unique_key_name></unique_key_name> | 868 | <unique_key_name></unique_key_name> |
869 | <logical_name></logical_name> | 869 | <logical_name></logical_name> |
@@ -989,7 +989,7 @@ | @@ -989,7 +989,7 @@ | ||
989 | </sequence> | 989 | </sequence> |
990 | </normal_column> | 990 | </normal_column> |
991 | <normal_column> | 991 | <normal_column> |
992 | - <word_id>3</word_id> | 992 | + <word_id>4</word_id> |
993 | <id>13</id> | 993 | <id>13</id> |
994 | <description></description> | 994 | <description></description> |
995 | <unique_key_name></unique_key_name> | 995 | <unique_key_name></unique_key_name> |
@@ -1045,7 +1045,7 @@ | @@ -1045,7 +1045,7 @@ | ||
1045 | <connections> | 1045 | <connections> |
1046 | <relation> | 1046 | <relation> |
1047 | <id>4</id> | 1047 | <id>4</id> |
1048 | - <source>7</source> | 1048 | + <source>1</source> |
1049 | <target>5</target> | 1049 | <target>5</target> |
1050 | <child_cardinality>1..n</child_cardinality> | 1050 | <child_cardinality>1..n</child_cardinality> |
1051 | <parent_cardinality>1</parent_cardinality> | 1051 | <parent_cardinality>1</parent_cardinality> |
@@ -1062,7 +1062,7 @@ | @@ -1062,7 +1062,7 @@ | ||
1062 | </relation> | 1062 | </relation> |
1063 | <relation> | 1063 | <relation> |
1064 | <id>5</id> | 1064 | <id>5</id> |
1065 | - <source>1</source> | 1065 | + <source>7</source> |
1066 | <target>5</target> | 1066 | <target>5</target> |
1067 | <child_cardinality>1..n</child_cardinality> | 1067 | <child_cardinality>1..n</child_cardinality> |
1068 | <parent_cardinality>1</parent_cardinality> | 1068 | <parent_cardinality>1</parent_cardinality> |
@@ -1088,7 +1088,7 @@ | @@ -1088,7 +1088,7 @@ | ||
1088 | <normal_column> | 1088 | <normal_column> |
1089 | <id>14</id> | 1089 | <id>14</id> |
1090 | <referenced_column>0</referenced_column> | 1090 | <referenced_column>0</referenced_column> |
1091 | - <relation>5</relation> | 1091 | + <relation>4</relation> |
1092 | <description></description> | 1092 | <description></description> |
1093 | <unique_key_name></unique_key_name> | 1093 | <unique_key_name></unique_key_name> |
1094 | <logical_name></logical_name> | 1094 | <logical_name></logical_name> |
@@ -1121,7 +1121,7 @@ | @@ -1121,7 +1121,7 @@ | ||
1121 | <normal_column> | 1121 | <normal_column> |
1122 | <id>15</id> | 1122 | <id>15</id> |
1123 | <referenced_column>19</referenced_column> | 1123 | <referenced_column>19</referenced_column> |
1124 | - <relation>4</relation> | 1124 | + <relation>5</relation> |
1125 | <description></description> | 1125 | <description></description> |
1126 | <unique_key_name></unique_key_name> | 1126 | <unique_key_name></unique_key_name> |
1127 | <logical_name></logical_name> | 1127 | <logical_name></logical_name> |
@@ -1247,7 +1247,7 @@ | @@ -1247,7 +1247,7 @@ | ||
1247 | </sequence> | 1247 | </sequence> |
1248 | </normal_column> | 1248 | </normal_column> |
1249 | <normal_column> | 1249 | <normal_column> |
1250 | - <word_id>4</word_id> | 1250 | + <word_id>3</word_id> |
1251 | <id>18</id> | 1251 | <id>18</id> |
1252 | <description></description> | 1252 | <description></description> |
1253 | <unique_key_name></unique_key_name> | 1253 | <unique_key_name></unique_key_name> |
@@ -1544,7 +1544,7 @@ | @@ -1544,7 +1544,7 @@ | ||
1544 | </column_data> | 1544 | </column_data> |
1545 | <column_data> | 1545 | <column_data> |
1546 | <column_id>1</column_id> | 1546 | <column_id>1</column_id> |
1547 | - <value>1</value> | 1547 | + <value>0</value> |
1548 | </column_data> | 1548 | </column_data> |
1549 | <column_data> | 1549 | <column_data> |
1550 | <column_id>2</column_id> | 1550 | <column_id>2</column_id> |
@@ -1556,7 +1556,7 @@ | @@ -1556,7 +1556,7 @@ | ||
1556 | </column_data> | 1556 | </column_data> |
1557 | <column_data> | 1557 | <column_data> |
1558 | <column_id>4</column_id> | 1558 | <column_id>4</column_id> |
1559 | - <value>admin</value> | 1559 | + <value>admingeral</value> |
1560 | </column_data> | 1560 | </column_data> |
1561 | <column_data> | 1561 | <column_data> |
1562 | <column_id>5</column_id> | 1562 | <column_id>5</column_id> |
@@ -1564,7 +1564,7 @@ | @@ -1564,7 +1564,7 @@ | ||
1564 | </column_data> | 1564 | </column_data> |
1565 | <column_data> | 1565 | <column_data> |
1566 | <column_id>6</column_id> | 1566 | <column_id>6</column_id> |
1567 | - <value>admin</value> | 1567 | + <value>admingeral</value> |
1568 | </column_data> | 1568 | </column_data> |
1569 | </data> | 1569 | </data> |
1570 | <data> | 1570 | <data> |
documentacao/manual-admin-i3geo-4_7-pt.odt
No preview for this file type
documentacao/manual-admin-i3geo-4_7-pt.pdf
No preview for this file type
ferramentas/tabela/index.js
@@ -41,7 +41,7 @@ Free Software Foundation, Inc., no endere&ccedil;o | @@ -41,7 +41,7 @@ Free Software Foundation, Inc., no endere&ccedil;o | ||
41 | if(typeof(i3GEOF) === 'undefined'){ | 41 | if(typeof(i3GEOF) === 'undefined'){ |
42 | var i3GEOF = {}; | 42 | var i3GEOF = {}; |
43 | } | 43 | } |
44 | - | 44 | +//TODO documentar a opcao de relacionamento entre tabelas no manual de usuario |
45 | /* | 45 | /* |
46 | Classe: i3GEOF.tabela | 46 | Classe: i3GEOF.tabela |
47 | */ | 47 | */ |
init/dicionario.js
@@ -5,5 +5,12 @@ pt:"Remover essa tela de apresenta&ccedil;&atilde;o (depois voc&ecirc; poder&aac | @@ -5,5 +5,12 @@ pt:"Remover essa tela de apresenta&ccedil;&atilde;o (depois voc&ecirc; poder&aac | ||
5 | en:"", | 5 | en:"", |
6 | es:"", | 6 | es:"", |
7 | it:"" | 7 | it:"" |
8 | +}], | ||
9 | +2: [ | ||
10 | +{ | ||
11 | +pt:"Teste da instalação", | ||
12 | +en:"", | ||
13 | +es:"", | ||
14 | +it:"" | ||
8 | }] | 15 | }] |
9 | }; | 16 | }; |
10 | \ No newline at end of file | 17 | \ No newline at end of file |
init/index.php
@@ -72,14 +72,13 @@ h1{ | @@ -72,14 +72,13 @@ h1{ | ||
72 | <div id="bandeiras" ></div> | 72 | <div id="bandeiras" ></div> |
73 | <a href="remover.php" ><table class="r"> | 73 | <a href="remover.php" ><table class="r"> |
74 | <tr> | 74 | <tr> |
75 | - <td><img src="../imagens/oxygen/22x22/dialog-close" /><br><script>document.write($trad(1,g_traducao_init));</script></script></a></td> | 75 | + <td><img src="../imagens/oxygen/22x22/dialog-close" /><br><script>document.write($trad(1,g_traducao_init));</script></a></td> |
76 | </tr> | 76 | </tr> |
77 | </table></a> | 77 | </table></a> |
78 | 78 | ||
79 | <a href="testei3geo" ><table class="r"> | 79 | <a href="testei3geo" ><table class="r"> |
80 | <tr> | 80 | <tr> |
81 | - <td><img src="../imagens/i3geo1.png" /><br>Servidor | ||
82 | - de testes do i3Geo</a></td> | 81 | + <td><img src="../imagens/i3geo1.png" /><br><script>document.write($trad(2,g_traducao_init));</script></a></td> |
83 | </tr> | 82 | </tr> |
84 | </table></a> | 83 | </table></a> |
85 | </body> | 84 | </body> |