Download as
Browse Code »

Commit 435013ece54009a1baf87d51d77e93aced1a2479

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

--no commit message

Showing 3 changed files with 105 additions and 428 deletions   Show diff stats
classesphp/classe_menutemas.php
  Diff comments   View file @435013e
@@ -154,25 +154,25 @@ array @@ -154,25 +154,25 @@ array
154 foreach($this->xml->TEMA as $temar) 154 foreach($this->xml->TEMA as $temar)
155 { 155 {
156 $down = "nao"; 156 $down = "nao";
157 - if (($temar->DOWNLOAD == "sim") || ($temar->DOWNLOAD == "SIM")) 157 + $temp = mb_convert_encoding($temar->DOWNLOAD,"HTML-ENTITIES","auto");
  158 + if (($temp == "sim") || ($temp == "SIM"))
158 {$down = "sim";} 159 {$down = "sim";}
159 $link = " "; 160 $link = " ";
160 - if ($temar->TLINK != "")  
161 - {$link = mb_convert_encoding($temar->TLINK,"HTML-ENTITIES","auto");} 161 + $temp = mb_convert_encoding($temar->TLINK,"HTML-ENTITIES","auto");
  162 + if ($temp != "")
  163 + {$link = $temp;}
162 $tid = mb_convert_encoding($temar->TID,"HTML-ENTITIES","auto"); 164 $tid = mb_convert_encoding($temar->TID,"HTML-ENTITIES","auto");
163 - if (function_exists("mb_convert_encoding"))  
164 - {$nome = mb_convert_encoding($temar->TNOME,"HTML-ENTITIES","auto");}  
165 - else  
166 - {$nome = $temar->TNOME;} 165 + $nome = mb_convert_encoding($temar->TNOME,"HTML-ENTITIES","auto");
167 $temasraiz[] = array("tid"=>$tid,"nome"=>$nome,"link"=>$link,"down"=>$down); 166 $temasraiz[] = array("tid"=>$tid,"nome"=>$nome,"link"=>$link,"down"=>$down);
168 } 167 }
169 foreach($this->xml->GRUPO as $grupo) 168 foreach($this->xml->GRUPO as $grupo)
170 { 169 {
171 $incluigrupo = TRUE; 170 $incluigrupo = TRUE;
172 - if ($grupo->PERFIL != "") 171 + $temp = mb_convert_encoding($grupo->PERFIL,"HTML-ENTITIES","auto");
  172 + if ($temp != "")
173 { 173 {
174 $incluigrupo = FALSE; 174 $incluigrupo = FALSE;
175 - $perfis = explode(",",$grupo->PERFIL); 175 + $perfis = explode(",",$temp);
176 if (in_array($this->perfil,$perfis)) 176 if (in_array($this->perfil,$perfis))
177 {$incluigrupo = TRUE;} 177 {$incluigrupo = TRUE;}
178 } 178 }
@@ -183,26 +183,26 @@ array @@ -183,26 +183,26 @@ array
183 foreach($grupo->TEMA as $temar) 183 foreach($grupo->TEMA as $temar)
184 { 184 {
185 $down = "nao"; 185 $down = "nao";
186 - if (($temar->DOWNLOAD == "sim") || ($temar->DOWNLOAD == "SIM")) 186 + $temp = mb_convert_encoding($temar->DOWNLOAD,"HTML-ENTITIES","auto");
  187 + if (($temp == "sim") || ($temp == "SIM"))
187 {$down = "sim";} 188 {$down = "sim";}
188 $link = " "; 189 $link = " ";
189 - if ($temar->TLINK != "")  
190 - {$link = mb_convert_encoding($temar->TLINK,"HTML-ENTITIES","auto");} 190 + $temp = mb_convert_encoding($temar->TLINK,"HTML-ENTITIES","auto");
  191 + if ($temp != "")
  192 + {$link = $temp;}
191 $tid = mb_convert_encoding($temar->TID,"HTML-ENTITIES","auto"); 193 $tid = mb_convert_encoding($temar->TID,"HTML-ENTITIES","auto");
192 - if (function_exists("mb_convert_encoding"))  
193 - {$nome = mb_convert_encoding($temar->TNOME,"HTML-ENTITIES","auto");}  
194 - else  
195 - {$nome = $temar->TNOME;} 194 + $nome = mb_convert_encoding($temar->TNOME,"HTML-ENTITIES","auto");
196 $temas[] = array("tid"=>$tid,"nome"=>$nome,"link"=>$link,"down"=>$down); 195 $temas[] = array("tid"=>$tid,"nome"=>$nome,"link"=>$link,"down"=>$down);
197 } 196 }
198 $subgrupos = array(); 197 $subgrupos = array();
199 foreach($grupo->SGRUPO as $sgrupo) 198 foreach($grupo->SGRUPO as $sgrupo)
200 { 199 {
201 $incluisgrupo = TRUE; 200 $incluisgrupo = TRUE;
202 - if ($sgrupo->PERFIL != "") 201 + $temp = mb_convert_encoding($sgrupo->PERFIL,"HTML-ENTITIES","auto");
  202 + if ($temp != "")
203 { 203 {
204 $incluisgrupo = FALSE; 204 $incluisgrupo = FALSE;
205 - $perfis = explode(",",$sgrupo->PERFIL); 205 + $perfis = explode(",",$temp);
206 if (in_array($this->perfil,$perfis)) 206 if (in_array($this->perfil,$perfis))
207 {$incluisgrupo = TRUE;} 207 {$incluisgrupo = TRUE;}
208 } 208 }
@@ -212,13 +212,11 @@ array @@ -212,13 +212,11 @@ array
212 $down = "nao"; 212 $down = "nao";
213 foreach($sgrupo->TEMA as $tema) 213 foreach($sgrupo->TEMA as $tema)
214 { 214 {
215 - if (($tema->DOWNLOAD == "sim") || ($tema->DOWNLOAD == "SIM")) 215 + $temp = mb_convert_encoding($tema->DOWNLOAD,"HTML-ENTITIES","auto");
  216 + if (($temp == "sim") || ($temp == "SIM"))
216 {$down = "sim";} 217 {$down = "sim";}
217 } 218 }
218 - if (function_exists("mb_convert_encoding"))  
219 - {$nome = mb_convert_encoding($sgrupo->SDTIPO,"HTML-ENTITIES","auto");}  
220 - else  
221 - {$nome = $sgrupo->SDTIPO;} 219 + $nome = mb_convert_encoding($sgrupo->SDTIPO,"HTML-ENTITIES","auto");
222 $subgrupos[] = array("nome"=>$nome,"download"=>$down); 220 $subgrupos[] = array("nome"=>$nome,"download"=>$down);
223 } 221 }
224 } 222 }
symbols/simbolos.sym
  Diff comments   View file @435013e
@@ -34,29 +34,6 @@ SYMBOLSET @@ -34,29 +34,6 @@ SYMBOLSET
34 END 34 END
35 END 35 END
36 36
37 -Symbol  
38 - Name 'ferrovia-line1'  
39 - Type ELLIPSE  
40 - Points  
41 - 1 1  
42 - END  
43 - FILLED TRUE  
44 -END  
45 -  
46 -Symbol  
47 - Name 'ferrovia-line2'  
48 - Type VECTOR  
49 - Points  
50 - 0 0  
51 - 1 0  
52 - 1 0  
53 - 0 0  
54 - END  
55 - FILLED TRUE  
56 - STYLE  
57 - 5 13 5 13  
58 - END  
59 -END  
60 Symbol 37 Symbol
61 Name "p3" 38 Name "p3"
62 Type VECTOR 39 Type VECTOR
@@ -160,53 +137,6 @@ END @@ -160,53 +137,6 @@ END
160 Transparent 0 137 Transparent 0
161 END 138 END
162 139
163 - Symbol  
164 - Name "linha"  
165 - Type ELLIPSE  
166 - POINTS 1 1 END  
167 - Transparent 0  
168 - END  
169 -  
170 - Symbol  
171 - Name "linha1"  
172 - Type ELLIPSE  
173 - POINTS 1 1 END  
174 - STYLE 1 4 1 END  
175 - Transparent 0  
176 - END  
177 -  
178 - Symbol  
179 - name "dashed"  
180 - Type ELLIPSE  
181 - FILLED true  
182 - POINTS  
183 - 1 1  
184 - END  
185 - STYLE  
186 - 8 3  
187 - END  
188 - END  
189 -  
190 - Symbol  
191 - name "dashed1"  
192 - Type ELLIPSE  
193 - FILLED true  
194 - POINTS  
195 - 1 1  
196 - END  
197 - STYLE  
198 - 8 8 1 8  
199 - END  
200 - END  
201 -  
202 - Symbol  
203 - name "dashed2"  
204 - Type ELLIPSE  
205 - FILLED true  
206 - POINTS  
207 - 2 0  
208 - END  
209 - END  
210 140
211 Symbol 141 Symbol
212 Name "aviao" 142 Name "aviao"
@@ -518,6 +448,33 @@ Symbol @@ -518,6 +448,33 @@ Symbol
518 1 1 448 1 1
519 END 449 END
520 END 450 END
  451 +
  452 +SYMBOLSET
  453 +Symbol
  454 + Name 'ferrovia-line1'
  455 + Type ELLIPSE
  456 + Points
  457 + 1 1
  458 + END
  459 + FILLED TRUE
  460 + STYLE
  461 + 1 13 1 13
  462 + END
  463 +END
  464 +Symbol
  465 + Name 'ferrovia-line2'
  466 + Type VECTOR
  467 + Points
  468 + 0 0
  469 + 1 0
  470 + 1 0
  471 + 0 0
  472 + END
  473 + FILLED TRUE
  474 + STYLE
  475 + 5 13 5 13
  476 + END
  477 +END
521 Symbol 478 Symbol
522 Name "pt1l" 479 Name "pt1l"
523 Type VECTOR 480 Type VECTOR
@@ -550,116 +507,78 @@ END @@ -550,116 +507,78 @@ END
550 1 13 1 13 507 1 13 1 13
551 END 508 END
552 END 509 END
553 - Symbol  
554 - Name "setal"  
555 - Type PIXMAP  
556 - Image "seta.png"  
557 - STYLE  
558 - 1 13 1 13  
559 - END  
560 - END  
561 -  
562 - Symbol  
563 - Name "sedel"  
564 - Type PIXMAP  
565 - Image "sede.png"  
566 - Transparent 1  
567 - STYLE  
568 - 1 13 1 13  
569 - END  
570 -  
571 - END  
572 -  
573 - Symbol  
574 - Name "cidmunl"  
575 - Type PIXMAP  
576 - Image "cidmun.png"  
577 - STYLE  
578 - 1 13 1 13  
579 - END  
580 -  
581 - END  
582 510
583 Symbol 511 Symbol
584 - Name "capitall"  
585 - Type PIXMAP  
586 - Image "capital.png"  
587 - STYLE  
588 - 1 13 1 13  
589 - END  
590 -  
591 - END  
592 -  
593 - Symbol  
594 - Name "cidadel"  
595 - Type PIXMAP  
596 - Image "cidade.png"  
597 - STYLE  
598 - 1 13 1 13  
599 - END  
600 - 512 + Name "linha"
  513 + Type ELLIPSE
  514 + POINTS 1 1 END
  515 + Transparent 0
601 END 516 END
602 517
603 Symbol 518 Symbol
604 - Name "vilal"  
605 - Type PIXMAP  
606 - Image "vila.png" 519 + Name "linha1"
  520 + Type ELLIPSE
  521 + POINTS 1 1 END
  522 + STYLE 1 4 1 END
  523 + Transparent 0
607 STYLE 524 STYLE
608 - 1 13 1 13 525 + 10 20 10 20
609 END 526 END
610 -  
611 - END  
612 -  
613 - Symbol  
614 - Name "xyl"  
615 - Type PIXMAP  
616 - Image "xy.png"  
617 - STYLE  
618 - 1 13 1 13  
619 END 527 END
620 528
  529 + Symbol
  530 + name "dashed"
  531 + Type ELLIPSE
  532 + FILLED true
  533 + POINTS
  534 + 1 1
  535 + END
  536 + STYLE
  537 + 8 3
  538 + END
621 END 539 END
622 540
623 - Symbol  
624 - Name "xyrl"  
625 - Type PIXMAP  
626 - Image "xyr.png"  
627 - STYLE  
628 - 1 13 1 13  
629 - END 541 + Symbol
  542 + name "dashed1"
  543 + Type ELLIPSE
  544 + FILLED true
  545 + POINTS
  546 + 1 1
  547 + END
  548 + STYLE
  549 + 8 8 1 8
  550 + END
  551 + END
630 552
631 - END  
632 -  
633 - Symbol  
634 - Name "portol"  
635 - Type PIXMAP  
636 - Image "porto.png"  
637 - STYLE  
638 - 1 13 1 13  
639 - END 553 + Symbol
  554 + name "dashed2"
  555 + Type ELLIPSE
  556 + FILLED true
  557 + POINTS
  558 + 2 0
  559 + END
  560 + END
640 561
641 - END  
642 -  
643 Symbol 562 Symbol
644 - Name "refl" 563 + Name "setal"
645 Type PIXMAP 564 Type PIXMAP
646 - Image "ref.png" 565 + Image "seta.png"
647 STYLE 566 STYLE
648 1 13 1 13 567 1 13 1 13
649 END 568 END
650 -  
651 END 569 END
652 570
653 Symbol 571 Symbol
654 - Name "marcal" 572 + Name "sedel"
655 Type PIXMAP 573 Type PIXMAP
656 - Image "marca.png" 574 + Image "sede.png"
  575 + Transparent 1
657 STYLE 576 STYLE
658 1 13 1 13 577 1 13 1 13
659 END 578 END
660 579
661 END 580 END
662 - 581 +
663 582
664 Symbol 583 Symbol
665 Name "pontol" 584 Name "pontol"
@@ -732,87 +651,8 @@ END @@ -732,87 +651,8 @@ END
732 651
733 END 652 END
734 653
735 - SYMBOL  
736 - NAME 'industrial'  
737 - TYPE VECTOR  
738 - FILLED TRUE  
739 - POINTS  
740 - 0 2  
741 - 0 5  
742 - 4 5  
743 - 4 0  
744 - 3 0  
745 - 3 2  
746 - 0 2  
747 - END  
748 - STYLE  
749 - 1 13 1 13  
750 - END  
751 -  
752 - END  
753 654
754 - SYMBOL  
755 - NAME 'torrel'  
756 - TYPE VECTOR  
757 - FILLED FALSE  
758 - POINTS  
759 - 2 0  
760 - 3 4  
761 - 4 4  
762 - 4 5  
763 - 0 5  
764 - 0 4  
765 - 1 4  
766 - 2 0  
767 - END  
768 - STYLE  
769 - 1 13 1 13  
770 - END  
771 -  
772 - END  
773 655
774 - SYMBOL  
775 - NAME 'mineracaol'  
776 - TYPE VECTOR  
777 - FILLED FALSE  
778 - POINTS  
779 - 0 0  
780 - 5 5  
781 - 4 6  
782 - 3 7  
783 - 2 6  
784 - 0 5  
785 - 5 0  
786 - END  
787 - STYLE  
788 - 1 13 1 13  
789 - END  
790 -  
791 - END  
792 - SYMBOL  
793 - NAME 'cruzl'  
794 - TYPE VECTOR  
795 - FILLED TRUE  
796 - POINTS  
797 - 2 0  
798 - 3 0  
799 - 3 1  
800 - 5 1  
801 - 5 2  
802 - 3 2  
803 - 3 7  
804 - 2 7  
805 - 2 2  
806 - 0 2  
807 - 0 1  
808 - 2 1  
809 - 2 0  
810 - END  
811 - STYLE  
812 - 1 13 1 13  
813 - END  
814 -  
815 - END  
816 656
817 Symbol 657 Symbol
818 name "circlel" 658 name "circlel"
@@ -830,3 +670,5 @@ END @@ -830,3 +670,5 @@ END
830 670
831 671
832 672
  673 +
  674 +
symbols/simboloslin.sym
  Diff comments   View file @435013e
  1 +Symbol
  2 + name "circle"
  3 + Type ELLIPSE
  4 + Filled true
  5 + POINTS
  6 + 1 1
  7 + END
  8 +END
  9 +
1 SYMBOLSET 10 SYMBOLSET
2 Symbol 11 Symbol
3 Name 'ferrovia-line1' 12 Name 'ferrovia-line1'
@@ -127,97 +136,7 @@ END @@ -127,97 +136,7 @@ END
127 END 136 END
128 137
129 END 138 END
130 -  
131 - Symbol  
132 - Name "cidmunl"  
133 - Type PIXMAP  
134 - Image "cidmun.png"  
135 - STYLE  
136 - 1 13 1 13  
137 - END  
138 -  
139 - END  
140 -  
141 - Symbol  
142 - Name "capitall"  
143 - Type PIXMAP  
144 - Image "capital.png"  
145 - STYLE  
146 - 1 13 1 13  
147 - END  
148 -  
149 - END  
150 -  
151 - Symbol  
152 - Name "cidadel"  
153 - Type PIXMAP  
154 - Image "cidade.png"  
155 - STYLE  
156 - 1 13 1 13  
157 - END  
158 -  
159 - END  
160 -  
161 - Symbol  
162 - Name "vilal"  
163 - Type PIXMAP  
164 - Image "vila.png"  
165 - STYLE  
166 - 1 13 1 13  
167 - END  
168 -  
169 - END  
170 -  
171 - Symbol  
172 - Name "xyl"  
173 - Type PIXMAP  
174 - Image "xy.png"  
175 - STYLE  
176 - 1 13 1 13  
177 - END  
178 -  
179 - END  
180 -  
181 - Symbol  
182 - Name "xyrl"  
183 - Type PIXMAP  
184 - Image "xyr.png"  
185 - STYLE  
186 - 1 13 1 13  
187 - END  
188 -  
189 - END  
190 -  
191 - Symbol  
192 - Name "portol"  
193 - Type PIXMAP  
194 - Image "porto.png"  
195 - STYLE  
196 - 1 13 1 13  
197 - END  
198 -  
199 - END  
200 -  
201 - Symbol  
202 - Name "refl"  
203 - Type PIXMAP  
204 - Image "ref.png"  
205 - STYLE  
206 - 1 13 1 13  
207 - END  
208 -  
209 - END  
210 -  
211 - Symbol  
212 - Name "marcal"  
213 - Type PIXMAP  
214 - Image "marca.png"  
215 - STYLE  
216 - 1 13 1 13  
217 - END  
218 -  
219 - END  
220 - 139 +
221 140
222 Symbol 141 Symbol
223 Name "pontol" 142 Name "pontol"
@@ -290,87 +209,8 @@ END @@ -290,87 +209,8 @@ END
290 209
291 END 210 END
292 211
293 - SYMBOL  
294 - NAME 'industrial'  
295 - TYPE VECTOR  
296 - FILLED TRUE  
297 - POINTS  
298 - 0 2  
299 - 0 5  
300 - 4 5  
301 - 4 0  
302 - 3 0  
303 - 3 2  
304 - 0 2  
305 - END  
306 - STYLE  
307 - 1 13 1 13  
308 - END  
309 -  
310 - END  
311 212
312 - SYMBOL  
313 - NAME 'torrel'  
314 - TYPE VECTOR  
315 - FILLED FALSE  
316 - POINTS  
317 - 2 0  
318 - 3 4  
319 - 4 4  
320 - 4 5  
321 - 0 5  
322 - 0 4  
323 - 1 4  
324 - 2 0  
325 - END  
326 - STYLE  
327 - 1 13 1 13  
328 - END  
329 -  
330 - END  
331 213
332 - SYMBOL  
333 - NAME 'mineracaol'  
334 - TYPE VECTOR  
335 - FILLED FALSE  
336 - POINTS  
337 - 0 0  
338 - 5 5  
339 - 4 6  
340 - 3 7  
341 - 2 6  
342 - 0 5  
343 - 5 0  
344 - END  
345 - STYLE  
346 - 1 13 1 13  
347 - END  
348 -  
349 - END  
350 - SYMBOL  
351 - NAME 'cruzl'  
352 - TYPE VECTOR  
353 - FILLED TRUE  
354 - POINTS  
355 - 2 0  
356 - 3 0  
357 - 3 1  
358 - 5 1  
359 - 5 2  
360 - 3 2  
361 - 3 7  
362 - 2 7  
363 - 2 2  
364 - 0 2  
365 - 0 1  
366 - 2 1  
367 - 2 0  
368 - END  
369 - STYLE  
370 - 1 13 1 13  
371 - END  
372 -  
373 - END  
374 214
375 Symbol 215 Symbol
376 name "circlel" 216 name "circlel"
@@ -384,6 +224,3 @@ Symbol @@ -384,6 +224,3 @@ Symbol
384 END 224 END
385 225
386 END 226 END
387 -  
388 -  
389 -