Download as
Browse Code »

Commit 5e46d3be4de4650626ccd84145475709c47e6f35

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

Corrige a chamada do parser mustache

Showing 5 changed files with 85 additions and 52 deletions   Show diff stats
admin/admin.db
View file @5e46d3b
No preview for this file type
admin/html/menus.html
  Diff comments   View file @5e46d3b
@@ -104,7 +104,7 @@ body { @@ -104,7 +104,7 @@ body {
104 i3GEO.configura = { 104 i3GEO.configura = {
105 locaplic : "../.." 105 locaplic : "../.."
106 }; 106 };
107 - core_parseMustacheBody(i3GEOadmin.menus.dicionario); 107 + core_parseMustacheBody(i3GEOadmin.listamenu.dicionario);
108 cabecalhoGeral("cabecalhoPrincipal", "menus"); 108 cabecalhoGeral("cabecalhoPrincipal", "menus");
109 temp = function() { 109 temp = function() {
110 document.getElementById("formulario").style.display = "block"; 110 document.getElementById("formulario").style.display = "block";
admin/php/menutemas.php
  Diff comments   View file @5e46d3b
@@ -631,76 +631,95 @@ function excluiPerfil($id) @@ -631,76 +631,95 @@ function excluiPerfil($id)
631 global $esquemaadmin; 631 global $esquemaadmin;
632 require_once("conexao.php"); 632 require_once("conexao.php");
633 $perfil = ""; 633 $perfil = "";
634 - foreach($dbh->query("select * from ".$esquemaadmin."i3geoadmin_perfis where perfil = '$id'") as $row)  
635 - { 634 + foreach($dbh->query("select * from ".$esquemaadmin."i3geoadmin_perfis where perfil = '$id'") as $row){
636 $perfil = $row["perfil"]; 635 $perfil = $row["perfil"];
637 } 636 }
638 - if($perfil == "")  
639 - { 637 + if($perfil == ""){
640 return; 638 return;
641 } 639 }
642 $q = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_mapas"); 640 $q = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_mapas");
643 - foreach($q as $row)  
644 - { 641 + foreach($q as $row){
645 $t = $row['perfil_mapa']; 642 $t = $row['perfil_mapa'];
646 $i = $row['id_mapa']; 643 $i = $row['id_mapa'];
647 $ts = str_replace($perfil,"",$t); 644 $ts = str_replace($perfil,"",$t);
648 - if($t != $ts)  
649 - $dbhw->query("UPDATE ".$esquemaadmin."i3geoadmin_mapas SET perfil_mapa = '$ts' WHERE id_mapa = $i"); 645 + if($t != $ts){
  646 + $dataCol = array(
  647 + "perfil_mapa" => $ts
  648 + );
  649 + i3GeoAdminUpdate($dbhw,"i3geoadmin_mapas",$dataCol,"WHERE id_mapa = $i");
  650 + }
650 } 651 }
651 $q = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_menus"); 652 $q = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_menus");
652 - foreach($q as $row)  
653 - { 653 + foreach($q as $row){
654 $t = $row['perfil_menu']; 654 $t = $row['perfil_menu'];
655 $i = $row['id_menu']; 655 $i = $row['id_menu'];
656 $ts = str_replace($perfil,"",$t); 656 $ts = str_replace($perfil,"",$t);
657 - if($t != $ts)  
658 - $dbhw->query("UPDATE ".$esquemaadmin."i3geoadmin_menus SET perfil_menu = '$ts' WHERE id_menu = $i"); 657 + if($t != $ts){
  658 + $dataCol = array(
  659 + "perfil_menu" => $ts
  660 + );
  661 + i3GeoAdminUpdate($dbhw,"i3geoadmin_menus",$dataCol,"WHERE id_menu = $i");
  662 + }
659 } 663 }
660 $q = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_n1"); 664 $q = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_n1");
661 - foreach($q as $row)  
662 - { 665 + foreach($q as $row){
663 $t = $row['perfil_n1']; 666 $t = $row['perfil_n1'];
664 $i = $row['id_n1']; 667 $i = $row['id_n1'];
665 $ts = str_replace($perfil,"",$t); 668 $ts = str_replace($perfil,"",$t);
666 - if($t != $ts)  
667 - $dbhw->query("UPDATE ".$esquemaadmin."i3geoadmin_n1 SET perfil_n1 = '$ts' WHERE id_n1 = $i"); 669 + if($t != $ts){
  670 + $dataCol = array(
  671 + "perfil_n1" => $ts
  672 + );
  673 + i3GeoAdminUpdate($dbhw,"i3geoadmin_n1",$dataCol,"WHERE id_n1 = $i");
  674 + }
668 } 675 }
669 $q = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_n2"); 676 $q = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_n2");
670 - foreach($q as $row)  
671 - { 677 + foreach($q as $row){
672 $t = $row['perfil_n2']; 678 $t = $row['perfil_n2'];
673 $i = $row['id_n2']; 679 $i = $row['id_n2'];
674 $ts = str_replace($perfil,"",$t); 680 $ts = str_replace($perfil,"",$t);
675 - if($t != $ts)  
676 - $dbhw->query("UPDATE ".$esquemaadmin."i3geoadmin_n2 SET perfil_n2 = '$ts' WHERE id_n2 = $i"); 681 + if($t != $ts){
  682 + $dataCol = array(
  683 + "perfil_n2" => $ts
  684 + );
  685 + i3GeoAdminUpdate($dbhw,"i3geoadmin_n2",$dataCol,"WHERE id_n2 = $i");
  686 + }
677 } 687 }
678 $q = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_n3"); 688 $q = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_n3");
679 - foreach($q as $row)  
680 - { 689 + foreach($q as $row){
681 $t = $row['perfil_n3']; 690 $t = $row['perfil_n3'];
682 $i = $row['id_n3']; 691 $i = $row['id_n3'];
683 $ts = str_replace($perfil,"",$t); 692 $ts = str_replace($perfil,"",$t);
684 - if($t != $ts)  
685 - $dbhw->query("UPDATE ".$esquemaadmin."i3geoadmin_n3 SET perfil_n3 = '$ts' WHERE id_n3 = $i"); 693 + if($t != $ts){
  694 + $dataCol = array(
  695 + "perfil_n3" => $ts
  696 + );
  697 + i3GeoAdminUpdate($dbhw,"i3geoadmin_n3",$dataCol,"WHERE id_n3 = $i");
  698 + }
686 } 699 }
687 $q = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_raiz"); 700 $q = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_raiz");
688 - foreach($q as $row)  
689 - { 701 + foreach($q as $row){
690 $t = $row['perfil']; 702 $t = $row['perfil'];
691 $i = $row['id_raiz']; 703 $i = $row['id_raiz'];
692 $ts = str_replace($perfil,"",$t); 704 $ts = str_replace($perfil,"",$t);
693 - if($t != $ts)  
694 - $dbhw->query("UPDATE ".$esquemaadmin."i3geoadmin_raiz SET perfil = '$ts' WHERE id_raiz = $i"); 705 + if($t != $ts){
  706 + $dataCol = array(
  707 + "perfil" => $ts
  708 + );
  709 + i3GeoAdminUpdate($dbhw,"i3geoadmin_raiz",$dataCol,"WHERE id_raiz = $i");
  710 + }
695 } 711 }
696 $q = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_sistemasf"); 712 $q = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_sistemasf");
697 - foreach($q as $row)  
698 - { 713 + foreach($q as $row){
699 $t = $row['perfil_funcao']; 714 $t = $row['perfil_funcao'];
700 $i = $row['id_funcao']; 715 $i = $row['id_funcao'];
701 $ts = str_replace($perfil,"",$t); 716 $ts = str_replace($perfil,"",$t);
702 - if($t != $ts)  
703 - $dbhw->query("UPDATE ".$esquemaadmin."i3geoadmin_sistemasf SET perfil_funcao = '$ts' WHERE id_funcao = $i"); 717 + if($t != $ts){
  718 + $dataCol = array(
  719 + "perfil_funcao" => $ts
  720 + );
  721 + i3GeoAdminUpdate($dbhw,"i3geoadmin_sistemasf",$dataCol,"WHERE id_funcao = $i");
  722 + }
704 } 723 }
705 } 724 }
706 function excluiTagTemas($id) 725 function excluiTagTemas($id)
@@ -708,21 +727,23 @@ function excluiTagTemas($id) @@ -708,21 +727,23 @@ function excluiTagTemas($id)
708 global $esquemaadmin; 727 global $esquemaadmin;
709 require_once("conexao.php"); 728 require_once("conexao.php");
710 $q1 = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_tags where id_tag = $id"); 729 $q1 = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_tags where id_tag = $id");
711 - foreach($q1 as $row)  
712 - { 730 + foreach($q1 as $row){
713 $nometag = $row["nome"]; 731 $nometag = $row["nome"];
714 } 732 }
715 if($nometag == ""){ 733 if($nometag == ""){
716 return; 734 return;
717 } 735 }
718 $q = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_temas"); 736 $q = $dbh->query("select * from ".$esquemaadmin."i3geoadmin_temas");
719 - foreach($q as $row)  
720 - { 737 + foreach($q as $row){
721 $t = $row['tags_tema']; 738 $t = $row['tags_tema'];
722 $i = $row['id_tema']; 739 $i = $row['id_tema'];
723 $ts = str_replace($nometag,"",$t); 740 $ts = str_replace($nometag,"",$t);
724 - if($t != $ts)  
725 - $dbhw->query("UPDATE ".$esquemaadmin."i3geoadmin_temas SET tags_tema = '$ts' WHERE id_tema = $i"); 741 + if($t != $ts){
  742 + $dataCol = array(
  743 + "tags_tema" => $ts
  744 + );
  745 + i3GeoAdminUpdate($dbhw,"i3geoadmin_temas",$dataCol,"WHERE id_tema = $i");
  746 + }
726 } 747 }
727 } 748 }
728 /* 749 /*
@@ -838,28 +859,40 @@ function alteraMenus() @@ -838,28 +859,40 @@ function alteraMenus()
838 { 859 {
839 $retorna = ""; 860 $retorna = "";
840 include("conexao.php"); 861 include("conexao.php");
841 - if($convUTF)  
842 - { 862 + if($convUTF){
843 $nome_menu = utf8_encode($nome_menu); 863 $nome_menu = utf8_encode($nome_menu);
844 $desc_menu = utf8_encode($desc_menu); 864 $desc_menu = utf8_encode($desc_menu);
845 $en = utf8_encode($en); 865 $en = utf8_encode($en);
846 $es = utf8_encode($es); 866 $es = utf8_encode($es);
847 $it = utf8_encode($it); 867 $it = utf8_encode($it);
848 } 868 }
849 - if($id_menu != "")  
850 - {  
851 - $dbhw->query("UPDATE ".$esquemaadmin."i3geoadmin_menus SET en = '$en', es = '$es', it = '$it', publicado_menu = '$publicado_menu',aberto = '$aberto', nome_menu = '$nome_menu', desc_menu = '$desc_menu', perfil_menu = '$perfil_mennu' WHERE id_menu = $id_menu"); 869 + if($id_menu != ""){
  870 + $dataCol = array(
  871 + "en" => $en,
  872 + "es" => $es,
  873 + "it" => $it,
  874 + "publicado_menu" => $publicado_menu,
  875 + "aberto" => $aberto,
  876 + "nome_menu" => $nome_menu,
  877 + "desc_menu" => $desc_menu,
  878 + "perfil_menu" => $perfil_menu
  879 + );
  880 + i3GeoAdminUpdate($dbhw,"i3geoadmin_menus",$dataCol,"WHERE id_menu = $id_menu");
852 $retorna = "ok"; 881 $retorna = "ok";
853 } 882 }
854 else 883 else
855 { 884 {
856 - $id_temp = (rand (9000,10000)) * -1;  
857 - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geoadmin_menus (it,es,en,publicado_menu, nome_menu, desc_menu, aberto, perfil_menu) VALUES ('','','','','$id_temp', '','SIM','')");  
858 - $id = $dbh->query("SELECT * FROM ".$esquemaadmin."i3geoadmin_menus WHERE nome_menu = '$id_temp'");  
859 - $id = $id->fetchAll();  
860 - $id = $id[0]['id_menu'];  
861 - $dbhw->query("UPDATE ".$esquemaadmin."i3geoadmin_menus SET nome_menu = '' WHERE id_menu = $id AND nome_menu = '$id_temp'");  
862 - $retorna = $id; 885 + $dataCol = array(
  886 + "en" => "",
  887 + "es" => "",
  888 + "it" => "",
  889 + "publicado_menu" => "",
  890 + "aberto" => "SIM",
  891 + "nome_menu" => "",
  892 + "desc_menu" => "",
  893 + "perfil_menu" => ""
  894 + );
  895 + $retorna = i3GeoAdminInsertUnico($dbhw,"i3geoadmin_menus",$dataCol,"nome_menu","id_menu");
863 } 896 }
864 $dbhw = null; 897 $dbhw = null;
865 $dbh = null; 898 $dbh = null;
favicon.ico 100644 → 100755
View file @5e46d3b
No preview for this file type
ms_configura.php
  Diff comments   View file @5e46d3b
@@ -75,7 +75,7 @@ Default: @@ -75,7 +75,7 @@ Default:
75 false 75 false
76 76
77 */ 77 */
78 -$logTransacoes = false; 78 +$logTransacoes = true;
79 /* 79 /*
80 Variable: $i3GeoProjDefault 80 Variable: $i3GeoProjDefault
81 81