Download as
Browse Code »

Commit 69284e76fe8e48ccba819ff81e505a82e4e13b36

Authored by Edmar Moretti
1 parent cd642b5a
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

Melhoria da interface de upgrade do banco de dados de administração

Showing 3 changed files with 70 additions and 65 deletions   Show diff stats
admin/admin.db
View file @69284e7
No preview for this file type
admin/php/admin.php
  Diff comments   View file @69284e7
... ... @@ -413,7 +413,7 @@ Parametros:
413 413 action {string} - php que será executado no submit do formulário
414 414 */
415 415 function formularioLoginMaster($action){
416   - echo "<form method=post action=$action >";
  416 + echo "<form id=formularioLoginMaster method=post action=$action >";
417 417 echo "<br>Essa conex&atilde;o pode n&atilde;o ser segura e os dados de usu&aacute;rio/senha podem ser descobertos<br><br>";
418 418 echo "Nome do usu&aacute;rio master cadastrado em ms_configura.php:<br> <input type=text name=usuario /><br>";
419 419 echo "Senha:<br> <input type=password name=senha /><br>";
... ...
admin/php/upgradebanco46_47.php
  Diff comments   View file @69284e7
... ... @@ -54,7 +54,8 @@ include_once(&quot;admin.php&quot;);
54 54 include_once("conexao.php");
55 55  
56 56 if(empty($_POST["senha"]) || empty($_POST["usuario"])){
57   - formularioLoginMaster("upgradebanco46_47.php");
  57 + formularioLoginMaster("upgradebanco46_47.php");
  58 + echo "<br><input type=checkbox name=mostraSoSQL /> Mostra apenas o SQL";
58 59 exit;
59 60 }
60 61 else{
... ... @@ -94,118 +95,122 @@ $tabelas = array(
94 95 "create table ".$esquemaadmin."i3geoestat_mapa_tema (id_mapa_tema integer not null unique primary key autoincrement,id_mapa_grupo integer,titulo text,id_medida_variavel integer,foreign key (id_mapa_grupo) references i3geoestat_mapa_grupo (id_mapa_grupo),foreign key (id_medida_variavel) references i3geoestat_medida_variavel (id_medida_variavel))"
95 96 );
96 97 $drivename = $dbhw->getAttribute(PDO::ATTR_DRIVER_NAME);
97   -foreach($tabelas as $tabela)
98   -{
99   - if($drivename == "pgsql")
100   - {
  98 +foreach($tabelas as $tabela){
  99 + if($drivename == "pgsql"){
101 100 $tabela = str_replace("INTEGER PRIMARY KEY","SERIAL PRIMARY KEY NOT NULL",$tabela);
102 101 }
103   - $q = $dbhw->query($tabela);
104   - if($q)
105   - {
106   - echo "<br>Feito!!!<pre>";
107   - var_dump($tabelas);
108   - }
109   - else
110   - {
111   - echo "<pre>Ocorreu algum problema na criação das tabelas. Tabelas que deveriam ter sido criadas:\n";
112   -
113   - //$e = $dbhw->errorInfo();
114   - //throw new Exception($e[2]);
115   - }
  102 + if($_POST["mostraSoSQL"] != "on"){
  103 + $q = $dbhw->query($tabela);
  104 + if($q){
  105 + echo "<br>Feito!!!<pre><br>";
  106 + }
  107 + else{
  108 + echo "<pre>Ocorreu algum problema na criação das tabelas. Tabelas que deveriam ter sido criadas:\n";
  109 + }
  110 + }
  111 +}
  112 +foreach($tabelas as $tabela){
  113 + if($drivename == "pgsql"){
  114 + $tabela = str_replace("INTEGER PRIMARY KEY","SERIAL PRIMARY KEY NOT NULL",$tabela);
  115 + }
  116 + echo "Tabelas:\n";
  117 + echo $tabela.";<br>";
116 118 }
117   -echo "Tabelas:\n";
118   -var_dump($tabelas);
119   -echo "Inserindo os registros default\n";
  119 +//var_dump($tabelas);
  120 +echo "<br><br>Inserindo os registros default\n";
120 121 $teste = lista("select * from ".$esquemaadmin."i3geousr_papeis","id_papel");
  122 +$sql = array();
121 123 if(!in_array($teste,1))
122   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem executar qualquer tarefa, inclusive cadastrar novos administradores',1,'admin')");
  124 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem executar qualquer tarefa, inclusive cadastrar novos administradores',1,'admin')"];
123 125 if(!in_array($teste,2))
124   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem criar/editar qualquer tema (mapfile) mas nao podem editar a arvore do catalogo de temas',2,'editores')");
  126 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem criar/editar qualquer tema (mapfile) mas nao podem editar a arvore do catalogo de temas',2,'editores')"];
125 127 if(!in_array($teste,3))
126   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem alterar a arvore do catalogo e dos atlas',3,'publicadores')");
  128 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem alterar a arvore do catalogo e dos atlas',3,'publicadores')"];
127 129 if(!in_array($teste,4))
128   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem editar dados geograficos',4,'editoresgeo')");
  130 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem editar dados geograficos',4,'editoresgeo')"];
129 131 if(!in_array($teste,5))
130   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES ('Podem administrar o sistema METAESTAT','5', 'adminmetaestat')");
131   -
132   -
133   -
  132 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES ('Podem administrar o sistema METAESTAT','5', 'adminmetaestat')"];
134 133 $teste = lista("select * from ".$esquemaadmin."i3geousr_usuarios","id_usuario");
135 134 if(!in_array($teste,1))
136   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_usuarios VALUES(1,'','',0,'admingeral','admingeral','admingeral')");
  135 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_usuarios VALUES(1,'','',0,'admingeral','admingeral','admingeral')"];
137 136  
138 137 $teste = lista("select * from ".$esquemaadmin."i3geousr_papelusuario","id_usuario","id_papel");
139 138 if(!in_array($teste,"1-1"))
140   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papelusuario VALUES(1,1)");
  139 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_papelusuario VALUES(1,1)"];
141 140  
142 141 $teste = lista("select * from ".$esquemaadmin."i3geousr_operacoes","id_operacao");
143 142 if(!in_array($teste,1))
144   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(1,'admin/html/editormapfile','editor de mapfiles do sistema de administracao')");
  143 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(1,'admin/html/editormapfile','editor de mapfiles do sistema de administracao')"];
145 144 if(!in_array($teste,2))
146   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(2,'admin/html/operacoes','abre o editor de operacoes')");
  145 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(2,'admin/html/operacoes','abre o editor de operacoes')"];
147 146 if(!in_array($teste,3))
148   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(3,'teste/','teste')");
  147 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(3,'teste/','teste')"];
149 148 if(!in_array($teste,4))
150   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(4,'admin/html/arvore','edicao da arvore do catalogo de temas')");
  149 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(4,'admin/html/arvore','edicao da arvore do catalogo de temas')"];
151 150 if(!in_array($teste,5))
152   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(5,'admin/html/menus','edicao da lista de menus')");
  151 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(5,'admin/html/menus','edicao da lista de menus')"];
153 152 if(!in_array($teste,6))
154   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(6,'admin/html/ogcws','edicao das preferencias do servico WMS')");
  153 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(6,'admin/html/ogcws','edicao das preferencias do servico WMS')"];
155 154 if(!in_array($teste,7))
156   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(7,'admin/html/atlas','edicao de atlas')");
  155 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(7,'admin/html/atlas','edicao de atlas')"];
157 156 if(!in_array($teste,8))
158   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(8,'admin/html/identifica','lista de sistemas incluidos na ferramenta de identificacao')");
  157 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(8,'admin/html/identifica','lista de sistemas incluidos na ferramenta de identificacao')"];
159 158 if(!in_array($teste,9))
160   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(9,'admin/html/incluimap','adapta mapfiles antigos para versoes novas do Mapserver')");
  159 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(9,'admin/html/incluimap','adapta mapfiles antigos para versoes novas do Mapserver')"];
161 160 if(!in_array($teste,10))
162   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(10,'admin/html/mapas','lista de links para mapas')");
  161 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(10,'admin/html/mapas','lista de links para mapas')"];
163 162 if(!in_array($teste,11))
164   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(11,'admin/html/perfis','lista controlada de perfis')");
  163 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(11,'admin/html/perfis','lista controlada de perfis')"];
165 164 if(!in_array($teste,12))
166   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(12,'admin/html/sistemas','lista de sistemas complementares que sao mostrados no catalogo')");
  165 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(12,'admin/html/sistemas','lista de sistemas complementares que sao mostrados no catalogo')"];
167 166 if(!in_array($teste,13))
168   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(13,'admin/html/subirshapefile','upload de shapefile para uma pasta especifica no servidor')");
  167 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(13,'admin/html/subirshapefile','upload de shapefile para uma pasta especifica no servidor')"];
169 168 if(!in_array($teste,14))
170   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(14,'admin/html/tags','edicao da lista controlada de tags')");
  169 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(14,'admin/html/tags','edicao da lista controlada de tags')"];
171 170 if(!in_array($teste,15))
172   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(15,'admin/html/webservices','cadastro de links para webservices')");
  171 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(15,'admin/html/webservices','cadastro de links para webservices')"];
173 172 if(!in_array($teste,16))
174   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(16,'admin/php/editortexto','editor de texto para mapfiles')");
  173 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(16,'admin/php/editortexto','editor de texto para mapfiles')"];
175 174 if(!in_array($teste,17))
176   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES('17', 'admin/html/usuarios', 'cadastro de usuarios')");
  175 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES('17', 'admin/html/usuarios', 'cadastro de usuarios')"];
177 176 if(!in_array($teste,18))
178   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES('18', 'admin/metaestat/geral', 'permite edicoes mais comuns do sistema de metadados estatisticos')");
  177 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES('18', 'admin/metaestat/geral', 'permite edicoes mais comuns do sistema de metadados estatisticos')"];
179 178 if(!in_array($teste,19))
180   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES('19', 'admin/metaestat/editorbanco', 'permite gerenciar as tabelas do banco')");
181   -
182   -
  179 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES('19', 'admin/metaestat/editorbanco', 'permite gerenciar as tabelas do banco')"];
183 180  
184 181 $teste = lista("select * from ".$esquemaadmin."i3geousr_operacoes","id_operacao","id_papel");
185 182 if(!in_array($teste,'1-2'))
186   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(1,2)");
  183 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(1,2)"];
187 184 if(!in_array($teste,'1-3'))
188   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(1,3)");
  185 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(1,3)"];
189 186 if(!in_array($teste,'4-3'))
190   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(4,3)");
  187 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(4,3)"];
191 188 if(!in_array($teste,'5-3'))
192   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(5,3)");
  189 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(5,3)"];
193 190 if(!in_array($teste,'7-3'))
194   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(7,3)");
  191 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(7,3)"];
195 192 if(!in_array($teste,'10-3'))
196   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(10,3)");
  193 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(10,3)"];
197 194 if(!in_array($teste,'13-2'))
198   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(13,2)");
  195 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(13,2)"];
199 196 if(!in_array($teste,'13-4'))
200   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(13,4)");
  197 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(13,4)"];
201 198 if(!in_array($teste,'15-3'))
202   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(15,3)");
  199 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(15,3)"];
203 200 if(!in_array($teste,'16-2'))
204   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(16,2)");
  201 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(16,2)"];
205 202 if(!in_array($teste,'18-1'))
206   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(18,1)");
  203 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(18,1)"];
207 204 if(!in_array($teste,'18-5'))
208   - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES (18,5)");
  205 + $sql["INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES (18,5)"];
  206 +
  207 +echo "<br>Inserts:<br>";
  208 +foreach($sql as $s){
  209 + if($_POST["mostraSoSQL"] != "on"){
  210 + $dbhw->query($s);
  211 + }
  212 + echo $s.";<br>";
  213 +}
209 214 //cria o banco de dados de metadados estatisticos
210 215 if(file_exists("../../admin/metaestat.db")) {
211 216 echo "<br>Arquivo admin/metaestat.db ja existe. Vc deve apag&aacute;-lo para poder cri&aacute;-lo novamente caso precise";
... ...