From 369aa14f9eb341454c6929fb4014ae63faae4845 Mon Sep 17 00:00:00 2001 From: Caroline Salib Date: Fri, 21 Apr 2017 22:01:03 -0300 Subject: [PATCH] Corrigido código errado de encode nos arquivos xml; portabilis/ieducar#167 --- ieducar/intranet/educar_acervo_colecao_xml.php | 4 ++-- ieducar/intranet/educar_acervo_editora_xml.php | 4 ++-- ieducar/intranet/educar_aluno_cad_xml.php | 4 ++-- ieducar/intranet/educar_alunos_beneficios_xml.php | 4 ++-- ieducar/intranet/educar_ano_letivo_modulo_xml.php | 4 ++-- ieducar/intranet/educar_biblioteca_xml.php | 4 ++-- ieducar/intranet/educar_colecao_xml.php | 4 ++-- ieducar/intranet/educar_curso_matricula_xml.php | 4 ++-- ieducar/intranet/educar_curso_serie_xml.php | 4 ++-- ieducar/intranet/educar_curso_xml.php | 4 ++-- ieducar/intranet/educar_curso_xml2.php | 4 ---- ieducar/intranet/educar_disciplina_xml.php | 4 ++-- ieducar/intranet/educar_editora_xml.php | 4 ++-- ieducar/intranet/educar_escola_ano_letivo_xml.php | 4 ++-- ieducar/intranet/educar_escola_comodo_xml.php | 4 ++-- ieducar/intranet/educar_escola_curso_serie_xml.php | 4 ++-- ieducar/intranet/educar_escola_localizacao_xml.php | 4 ++-- ieducar/intranet/educar_escola_rede_ensino_xml.php | 4 ++-- ieducar/intranet/educar_escola_serie_hora_xml.php | 4 ++-- ieducar/intranet/educar_escola_xml.php | 4 ++-- ieducar/intranet/educar_exemplar_tipo_xml.php | 2 +- ieducar/intranet/educar_fonte_xml.php | 4 ++-- ieducar/intranet/educar_funcao_xml.php | 4 ++-- ieducar/intranet/educar_habilitacao_xml.php | 4 ++-- ieducar/intranet/educar_idioma_xml.php | 4 ++-- ieducar/intranet/educar_infra_comodo_funcao_xml.php | 4 ++-- ieducar/intranet/educar_infra_predio_xml.php | 4 ++-- ieducar/intranet/educar_material_tipo_xml.php | 4 ++-- ieducar/intranet/educar_matricula_turma_xml.php | 4 ++-- ieducar/intranet/educar_modulo_instituicao_xml.php | 4 ++-- ieducar/intranet/educar_niveis_servidor_xml.php | 4 ++-- ieducar/intranet/educar_nivel_ensino_xml.php | 4 ++-- ieducar/intranet/educar_sequencia_serie_curso_xml.php | 4 ++-- ieducar/intranet/educar_sequencia_serie_xml.php | 4 ++-- ieducar/intranet/educar_serie_not_escola_xml.php | 4 ++-- ieducar/intranet/educar_serie_regra_xml.php | 4 ++-- ieducar/intranet/educar_serie_xml.php | 2 +- ieducar/intranet/educar_servidor_horas_alocadas_xml.php | 4 ++-- ieducar/intranet/educar_situacao_xml.php | 4 ++-- ieducar/intranet/educar_subniveis_servidor_xml.php | 4 ++-- ieducar/intranet/educar_tipo_ensino_xml.php | 4 ++-- ieducar/intranet/educar_tipo_regime_xml.php | 4 ++-- ieducar/intranet/educar_tipo_turma_xml.php | 4 ++-- ieducar/intranet/educar_turma_sala_xml.php | 4 ++-- ieducar/intranet/educar_turma_xml.php | 4 ++-- ieducar/intranet/educar_usuario_xml.php | 4 ++-- ieducar/intranet/xml_acervo_geral.php | 4 ++-- ieducar/intranet/xml_diaria_sugestao.php | 4 ++-- ieducar/intranet/xml_escola.php | 4 ++-- ieducar/intranet/xml_oprot_setor.php | 4 ++-- ieducar/intranet/xml_oprot_setor_not_in.php | 4 ++-- ieducar/lib/Portabilis/Utils/DeprecatedXmlApi.php | 2 +- ieducar/modules/TabelaArredondamento/Views/TabelaTipoNotaAjax.php | 2 +- vendor/symfony/yaml/Tests/ParserTest.php | 4 ++-- 54 files changed, 102 insertions(+), 106 deletions(-) diff --git a/ieducar/intranet/educar_acervo_colecao_xml.php b/ieducar/intranet/educar_acervo_colecao_xml.php index ab35b62..f549823 100644 --- a/ieducar/intranet/educar_acervo_colecao_xml.php +++ b/ieducar/intranet/educar_acervo_colecao_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["bib"] ) ) { @@ -56,4 +56,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_acervo_editora_xml.php b/ieducar/intranet/educar_acervo_editora_xml.php index fbe7d1a..6c6b3c2 100644 --- a/ieducar/intranet/educar_acervo_editora_xml.php +++ b/ieducar/intranet/educar_acervo_editora_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["bib"] ) ) { @@ -56,4 +56,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_aluno_cad_xml.php b/ieducar/intranet/educar_aluno_cad_xml.php index da6159f..122e87e 100644 --- a/ieducar/intranet/educar_aluno_cad_xml.php +++ b/ieducar/intranet/educar_aluno_cad_xml.php @@ -38,7 +38,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); if ($_GET['cpf'] || $_GET['idpes']) { - $xml = '' . PHP_EOL; + $xml = '' . PHP_EOL; $xml .= '' . PHP_EOL; $xml .= '' . PHP_EOL; @@ -462,4 +462,4 @@ if ($_GET['cpf'] || $_GET['idpes']) { $xml .= ''; echo $xml; -} \ No newline at end of file +} diff --git a/ieducar/intranet/educar_alunos_beneficios_xml.php b/ieducar/intranet/educar_alunos_beneficios_xml.php index a102121..e432093 100644 --- a/ieducar/intranet/educar_alunos_beneficios_xml.php +++ b/ieducar/intranet/educar_alunos_beneficios_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["inst"] ) ) { @@ -82,4 +82,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_ano_letivo_modulo_xml.php b/ieducar/intranet/educar_ano_letivo_modulo_xml.php index 57061dc..53befba 100644 --- a/ieducar/intranet/educar_ano_letivo_modulo_xml.php +++ b/ieducar/intranet/educar_ano_letivo_modulo_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["esc"] ) ) { @@ -66,4 +66,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_biblioteca_xml.php b/ieducar/intranet/educar_biblioteca_xml.php index f6b30b7..73fcc61 100644 --- a/ieducar/intranet/educar_biblioteca_xml.php +++ b/ieducar/intranet/educar_biblioteca_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["ins"] ) ) { @@ -109,4 +109,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_colecao_xml.php b/ieducar/intranet/educar_colecao_xml.php index 79b6f91..e00fc8b 100644 --- a/ieducar/intranet/educar_colecao_xml.php +++ b/ieducar/intranet/educar_colecao_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn($xmlns = 'colecoes'); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["bib"] ) ) { @@ -61,4 +61,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_curso_matricula_xml.php b/ieducar/intranet/educar_curso_matricula_xml.php index a62806e..ab79b7f 100644 --- a/ieducar/intranet/educar_curso_matricula_xml.php +++ b/ieducar/intranet/educar_curso_matricula_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["alu"] ) && is_numeric( $_GET["ins"] ) ) { @@ -149,4 +149,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_curso_serie_xml.php b/ieducar/intranet/educar_curso_serie_xml.php index 5b0dbde..b9031c4 100644 --- a/ieducar/intranet/educar_curso_serie_xml.php +++ b/ieducar/intranet/educar_curso_serie_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["esc"] ) && is_numeric( $_GET["cur"] ) ) { $db = new clsBanco(); @@ -45,4 +45,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_curso_xml.php b/ieducar/intranet/educar_curso_xml.php index e34ed05..ea0e5f2 100644 --- a/ieducar/intranet/educar_curso_xml.php +++ b/ieducar/intranet/educar_curso_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["ins"] ) && ( $_GET["sem"] == "true" ) ) { $db = new clsBanco(); @@ -97,4 +97,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_curso_xml2.php b/ieducar/intranet/educar_curso_xml2.php index ebb263a..52db821 100644 --- a/ieducar/intranet/educar_curso_xml2.php +++ b/ieducar/intranet/educar_curso_xml2.php @@ -32,11 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); -<<<<<<< HEAD - echo "\n\n"; -======= echo "\n\n"; ->>>>>>> 89ed328... Corrigido problema ao selecionar curso no cadastro de escola; if( is_numeric( $_GET["ins"] ) ) { diff --git a/ieducar/intranet/educar_disciplina_xml.php b/ieducar/intranet/educar_disciplina_xml.php index 0221e54..0e23d36 100644 --- a/ieducar/intranet/educar_disciplina_xml.php +++ b/ieducar/intranet/educar_disciplina_xml.php @@ -36,7 +36,7 @@ require_once 'include/funcoes.inc.php'; require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); -echo "\n\n"; +echo "\n\n"; $componentes = array(); @@ -71,4 +71,4 @@ foreach ($componentes as $componente) { $componente->id, $componente->cargaHoraria, $componente, PHP_EOL); } -echo ""; \ No newline at end of file +echo ""; diff --git a/ieducar/intranet/educar_editora_xml.php b/ieducar/intranet/educar_editora_xml.php index aa93524..846068a 100644 --- a/ieducar/intranet/educar_editora_xml.php +++ b/ieducar/intranet/educar_editora_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn('colecoes'); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["bib"] ) ) { @@ -61,4 +61,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_escola_ano_letivo_xml.php b/ieducar/intranet/educar_escola_ano_letivo_xml.php index cc4094c..a893cc5 100644 --- a/ieducar/intranet/educar_escola_ano_letivo_xml.php +++ b/ieducar/intranet/educar_escola_ano_letivo_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["esc"] ) ) { @@ -62,4 +62,4 @@ } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_escola_comodo_xml.php b/ieducar/intranet/educar_escola_comodo_xml.php index e9e89c1..70736f2 100644 --- a/ieducar/intranet/educar_escola_comodo_xml.php +++ b/ieducar/intranet/educar_escola_comodo_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["esc"] ) ) { $db = new clsBanco(); @@ -58,4 +58,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_escola_curso_serie_xml.php b/ieducar/intranet/educar_escola_curso_serie_xml.php index 997f27a..fa86f24 100644 --- a/ieducar/intranet/educar_escola_curso_serie_xml.php +++ b/ieducar/intranet/educar_escola_curso_serie_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["esc"] ) && is_numeric( $_GET["cur"] ) ) { $db = new clsBanco(); @@ -58,4 +58,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_escola_localizacao_xml.php b/ieducar/intranet/educar_escola_localizacao_xml.php index c28e9a7..f1379de 100644 --- a/ieducar/intranet/educar_escola_localizacao_xml.php +++ b/ieducar/intranet/educar_escola_localizacao_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["ins"] ) ) { @@ -62,4 +62,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_escola_rede_ensino_xml.php b/ieducar/intranet/educar_escola_rede_ensino_xml.php index 7d41991..f5b47d5 100644 --- a/ieducar/intranet/educar_escola_rede_ensino_xml.php +++ b/ieducar/intranet/educar_escola_rede_ensino_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["ins"] ) ) { @@ -62,4 +62,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_escola_serie_hora_xml.php b/ieducar/intranet/educar_escola_serie_hora_xml.php index 36bb28b..d33d7ad 100644 --- a/ieducar/intranet/educar_escola_serie_hora_xml.php +++ b/ieducar/intranet/educar_escola_serie_hora_xml.php @@ -36,7 +36,7 @@ require_once 'include/funcoes.inc.php'; require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); -echo "\n\n"; +echo "\n\n"; if (is_numeric($_GET["esc"]) && is_numeric($_GET["ser"])) { $db = new clsBanco(); @@ -55,4 +55,4 @@ if (is_numeric($_GET["esc"]) && is_numeric($_GET["ser"])) { echo " {$hora_fim_intervalo}\n"; } } -echo ""; \ No newline at end of file +echo ""; diff --git a/ieducar/intranet/educar_escola_xml.php b/ieducar/intranet/educar_escola_xml.php index 5d4a451..c66b5a7 100644 --- a/ieducar/intranet/educar_escola_xml.php +++ b/ieducar/intranet/educar_escola_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["ins"] ) ) { $db = new clsBanco(); @@ -58,4 +58,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_exemplar_tipo_xml.php b/ieducar/intranet/educar_exemplar_tipo_xml.php index b20a1b8..9d1eee6 100644 --- a/ieducar/intranet/educar_exemplar_tipo_xml.php +++ b/ieducar/intranet/educar_exemplar_tipo_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["bib"] ) ) { diff --git a/ieducar/intranet/educar_fonte_xml.php b/ieducar/intranet/educar_fonte_xml.php index a9bee4b..d3e5398 100644 --- a/ieducar/intranet/educar_fonte_xml.php +++ b/ieducar/intranet/educar_fonte_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["bib"] ) ) { @@ -62,4 +62,4 @@ } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_funcao_xml.php b/ieducar/intranet/educar_funcao_xml.php index f20bbda..920ec53 100644 --- a/ieducar/intranet/educar_funcao_xml.php +++ b/ieducar/intranet/educar_funcao_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["ins"] ) ) { $db = new clsBanco(); @@ -47,4 +47,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_habilitacao_xml.php b/ieducar/intranet/educar_habilitacao_xml.php index 2880a94..272350c 100644 --- a/ieducar/intranet/educar_habilitacao_xml.php +++ b/ieducar/intranet/educar_habilitacao_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["ins"] ) ) { @@ -60,4 +60,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_idioma_xml.php b/ieducar/intranet/educar_idioma_xml.php index 66e18d0..b161988 100644 --- a/ieducar/intranet/educar_idioma_xml.php +++ b/ieducar/intranet/educar_idioma_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["bib"] ) ) { @@ -61,4 +61,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_infra_comodo_funcao_xml.php b/ieducar/intranet/educar_infra_comodo_funcao_xml.php index beaead4..42e0ed2 100644 --- a/ieducar/intranet/educar_infra_comodo_funcao_xml.php +++ b/ieducar/intranet/educar_infra_comodo_funcao_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["esc"] ) ) { @@ -62,4 +62,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_infra_predio_xml.php b/ieducar/intranet/educar_infra_predio_xml.php index 20940c7..94284b6 100644 --- a/ieducar/intranet/educar_infra_predio_xml.php +++ b/ieducar/intranet/educar_infra_predio_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["esc"] ) ) { @@ -62,4 +62,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_material_tipo_xml.php b/ieducar/intranet/educar_material_tipo_xml.php index 48dbabf..38a0b47 100644 --- a/ieducar/intranet/educar_material_tipo_xml.php +++ b/ieducar/intranet/educar_material_tipo_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["ins"] ) ) { @@ -60,4 +60,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_matricula_turma_xml.php b/ieducar/intranet/educar_matricula_turma_xml.php index 6ac05a9..e142da8 100644 --- a/ieducar/intranet/educar_matricula_turma_xml.php +++ b/ieducar/intranet/educar_matricula_turma_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["tur"] ) ) { @@ -70,4 +70,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_modulo_instituicao_xml.php b/ieducar/intranet/educar_modulo_instituicao_xml.php index df9bcf8..1d2d053 100644 --- a/ieducar/intranet/educar_modulo_instituicao_xml.php +++ b/ieducar/intranet/educar_modulo_instituicao_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["inst"] ) ) { $db = new clsBanco(); @@ -54,4 +54,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_niveis_servidor_xml.php b/ieducar/intranet/educar_niveis_servidor_xml.php index cb576df..608158f 100644 --- a/ieducar/intranet/educar_niveis_servidor_xml.php +++ b/ieducar/intranet/educar_niveis_servidor_xml.php @@ -33,7 +33,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["cod_cat"] ) ) { @@ -49,4 +49,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_nivel_ensino_xml.php b/ieducar/intranet/educar_nivel_ensino_xml.php index 95f32ed..56a5545 100644 --- a/ieducar/intranet/educar_nivel_ensino_xml.php +++ b/ieducar/intranet/educar_nivel_ensino_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["ins"] ) ) { @@ -60,4 +60,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_sequencia_serie_curso_xml.php b/ieducar/intranet/educar_sequencia_serie_curso_xml.php index b61582b..afcdd2e 100644 --- a/ieducar/intranet/educar_sequencia_serie_curso_xml.php +++ b/ieducar/intranet/educar_sequencia_serie_curso_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["cur"] ) ) { $db = new clsBanco(); @@ -56,4 +56,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_sequencia_serie_xml.php b/ieducar/intranet/educar_sequencia_serie_xml.php index 381ce4c..abd1f67 100644 --- a/ieducar/intranet/educar_sequencia_serie_xml.php +++ b/ieducar/intranet/educar_sequencia_serie_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["cur"] ) ) { $db = new clsBanco(); @@ -56,4 +56,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_serie_not_escola_xml.php b/ieducar/intranet/educar_serie_not_escola_xml.php index ee556c7..b7acb26 100644 --- a/ieducar/intranet/educar_serie_not_escola_xml.php +++ b/ieducar/intranet/educar_serie_not_escola_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["esc"] ) && is_numeric( $_GET["cur"] ) ) { $db = new clsBanco(); @@ -62,4 +62,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_serie_regra_xml.php b/ieducar/intranet/educar_serie_regra_xml.php index 34cea48..16aeb64 100644 --- a/ieducar/intranet/educar_serie_regra_xml.php +++ b/ieducar/intranet/educar_serie_regra_xml.php @@ -41,7 +41,7 @@ require_once 'RegraAvaliacao/Model/RegraDataMapper.php'; require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); -print "\n\n"; +print "\n\n"; if (isset($_GET['ins']) && is_numeric($_GET['ins'])) { $mapper = new RegraAvaliacao_Model_RegraDataMapper(); @@ -55,4 +55,4 @@ if (isset($_GET['ins']) && is_numeric($_GET['ins'])) { print sprintf(' %s%s', $regra->id, $regra->nome, PHP_EOL); } } -print ''; \ No newline at end of file +print ''; diff --git a/ieducar/intranet/educar_serie_xml.php b/ieducar/intranet/educar_serie_xml.php index ef5a46f..ee331f6 100644 --- a/ieducar/intranet/educar_serie_xml.php +++ b/ieducar/intranet/educar_serie_xml.php @@ -36,7 +36,7 @@ require_once 'include/funcoes.inc.php'; require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); -echo "\n\n"; +echo "\n\n"; if (isset($_GET['cur']) && is_numeric($_GET['cur'])) { diff --git a/ieducar/intranet/educar_servidor_horas_alocadas_xml.php b/ieducar/intranet/educar_servidor_horas_alocadas_xml.php index 8ada670..8984204 100644 --- a/ieducar/intranet/educar_servidor_horas_alocadas_xml.php +++ b/ieducar/intranet/educar_servidor_horas_alocadas_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["ser"] ) ) { $db = new clsBanco(); @@ -56,4 +56,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_situacao_xml.php b/ieducar/intranet/educar_situacao_xml.php index 21dcaca..4b3904a 100644 --- a/ieducar/intranet/educar_situacao_xml.php +++ b/ieducar/intranet/educar_situacao_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["bib"] ) ) { @@ -65,4 +65,4 @@ } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_subniveis_servidor_xml.php b/ieducar/intranet/educar_subniveis_servidor_xml.php index ef4996c..537710f 100644 --- a/ieducar/intranet/educar_subniveis_servidor_xml.php +++ b/ieducar/intranet/educar_subniveis_servidor_xml.php @@ -33,7 +33,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["cod_nivel"] ) ) { @@ -48,4 +48,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_tipo_ensino_xml.php b/ieducar/intranet/educar_tipo_ensino_xml.php index 250942b..ebff961 100644 --- a/ieducar/intranet/educar_tipo_ensino_xml.php +++ b/ieducar/intranet/educar_tipo_ensino_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["ins"] ) ) { @@ -60,4 +60,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_tipo_regime_xml.php b/ieducar/intranet/educar_tipo_regime_xml.php index 87b2dcd..479588f 100644 --- a/ieducar/intranet/educar_tipo_regime_xml.php +++ b/ieducar/intranet/educar_tipo_regime_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["ins"] ) ) { @@ -60,4 +60,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_tipo_turma_xml.php b/ieducar/intranet/educar_tipo_turma_xml.php index 779662d..0108d44 100644 --- a/ieducar/intranet/educar_tipo_turma_xml.php +++ b/ieducar/intranet/educar_tipo_turma_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["ins"] ) ) { $db = new clsBanco(); @@ -45,4 +45,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_turma_sala_xml.php b/ieducar/intranet/educar_turma_sala_xml.php index 3697129..8098996 100644 --- a/ieducar/intranet/educar_turma_sala_xml.php +++ b/ieducar/intranet/educar_turma_sala_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["inst"] ) && is_numeric( $_GET["esc"] ) && is_numeric( $_GET["com"]) && is_numeric( $_GET['cur'])&& is_numeric( $_GET['ser']) ) { if(is_numeric( $_GET["not_tur"])) @@ -62,4 +62,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_turma_xml.php b/ieducar/intranet/educar_turma_xml.php index a96a39b..962414b 100644 --- a/ieducar/intranet/educar_turma_xml.php +++ b/ieducar/intranet/educar_turma_xml.php @@ -34,7 +34,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["esc"] ) && is_numeric( $_GET["ser"] ) ) { $db = new clsBanco(); @@ -56,4 +56,4 @@ } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/educar_usuario_xml.php b/ieducar/intranet/educar_usuario_xml.php index f7de845..b5926a0 100644 --- a/ieducar/intranet/educar_usuario_xml.php +++ b/ieducar/intranet/educar_usuario_xml.php @@ -32,7 +32,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( is_numeric( $_GET["ins"] ) ) { $db = new clsBanco(); @@ -142,4 +142,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/xml_acervo_geral.php b/ieducar/intranet/xml_acervo_geral.php index 5b15f84..16093a9 100644 --- a/ieducar/intranet/xml_acervo_geral.php +++ b/ieducar/intranet/xml_acervo_geral.php @@ -30,7 +30,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryForDisabledApi(); - echo "\n\n"; + echo "\n\n"; require_once ("include/clsBanco.inc.php"); require_once ("include/pmiacervo/geral.inc.php"); @@ -90,4 +90,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/xml_diaria_sugestao.php b/ieducar/intranet/xml_diaria_sugestao.php index 4b7c07a..21885f6 100755 --- a/ieducar/intranet/xml_diaria_sugestao.php +++ b/ieducar/intranet/xml_diaria_sugestao.php @@ -31,7 +31,7 @@ Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryForDisabledApi(); require_once( "include/clsBanco.inc.php" ); - echo "\n\n"; + echo "\n\n"; if( isset( $_GET["dp"] ) && isset( $_GET["hp"] ) && isset( $_GET["dc"] ) && isset( $_GET["hc"] ) && isset( $_GET["grupo"] ) && isset( $_GET["est"] ) ) { $result_100 = 0; @@ -177,4 +177,4 @@ echo " erro!\n erro!\n erro!\n erro!\n"; } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/xml_escola.php b/ieducar/intranet/xml_escola.php index 7f95a10..0ee5e4a 100644 --- a/ieducar/intranet/xml_escola.php +++ b/ieducar/intranet/xml_escola.php @@ -31,7 +31,7 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); - echo "\n\n"; + echo "\n\n"; if( isset( $_GET["cod_instituicao"] ) ) { // Seleciona Filas de atendimento da instituicao @@ -46,4 +46,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/intranet/xml_oprot_setor.php b/ieducar/intranet/xml_oprot_setor.php index d2a1b0d..026dc9b 100755 --- a/ieducar/intranet/xml_oprot_setor.php +++ b/ieducar/intranet/xml_oprot_setor.php @@ -35,7 +35,7 @@ require_once 'include/pmidrh/geral.inc.php'; require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); -echo '' . "\n"; +echo '' . "\n"; echo '' . "\n"; if (isset($_GET['setor_pai'])) { @@ -50,4 +50,4 @@ if (isset($_GET['setor_pai'])) { } } -echo ''; \ No newline at end of file +echo ''; diff --git a/ieducar/intranet/xml_oprot_setor_not_in.php b/ieducar/intranet/xml_oprot_setor_not_in.php index d14975b..50965a1 100755 --- a/ieducar/intranet/xml_oprot_setor_not_in.php +++ b/ieducar/intranet/xml_oprot_setor_not_in.php @@ -32,7 +32,7 @@ require_once( "include/protocol/geral.inc.php" ); - echo "\n\n"; + echo "\n\n"; if( isset( $_GET["setor_pai"] ) ) { // Seleciona Filas de atendimento da instituicao @@ -49,4 +49,4 @@ } } echo ""; -?> \ No newline at end of file +?> diff --git a/ieducar/lib/Portabilis/Utils/DeprecatedXmlApi.php b/ieducar/lib/Portabilis/Utils/DeprecatedXmlApi.php index 2504c63..a17615e 100644 --- a/ieducar/lib/Portabilis/Utils/DeprecatedXmlApi.php +++ b/ieducar/lib/Portabilis/Utils/DeprecatedXmlApi.php @@ -55,7 +55,7 @@ class Portabilis_Utils_DeprecatedXmlApi { } public static function returnEmptyQuery($xmlns = 'sugestoes', $rootNodeName = 'query', $comment = ''){ - $emptyQuery = "" . + $emptyQuery = "" . "" . "<$rootNodeName xmlns='$xmlns'>"; diff --git a/ieducar/modules/TabelaArredondamento/Views/TabelaTipoNotaAjax.php b/ieducar/modules/TabelaArredondamento/Views/TabelaTipoNotaAjax.php index ac1bb8a..65757b9 100644 --- a/ieducar/modules/TabelaArredondamento/Views/TabelaTipoNotaAjax.php +++ b/ieducar/modules/TabelaArredondamento/Views/TabelaTipoNotaAjax.php @@ -42,7 +42,7 @@ if (isset($_GET['tipoNota'])) { header('Content-type: text/xml'); -echo "\n\n"; +echo "\n\n"; foreach ($tabelas as $tabela) { echo sprintf('%s', $tabela->id, $tabela->nome); diff --git a/vendor/symfony/yaml/Tests/ParserTest.php b/vendor/symfony/yaml/Tests/ParserTest.php index f434d55..6e22767 100644 --- a/vendor/symfony/yaml/Tests/ParserTest.php +++ b/vendor/symfony/yaml/Tests/ParserTest.php @@ -455,8 +455,8 @@ EOF; } $yamls = array( - iconv('UTF-8', 'ISO-8859-1', "foo: 'äöüß'"), - iconv('UTF-8', 'ISO-8859-15', "euro: '€'"), + iconv('UTF-8', 'UTF-8', "foo: 'äöüß'"), + iconv('UTF-8', 'UTF-8', "euro: '€'"), iconv('UTF-8', 'CP1252', "cp1252: '©ÉÇáñ'"), ); -- libgit2 0.21.2