Merge pull request #8947 from portabilis/community-patch-2022-06-27

Community patch 27/06/2022
accerq · Jul 10, 2022 · 79a7e41 · 79a7e41
2 parents 2b00283 + e6d5ae3
commit 79a7e41
Show file tree

Hide file tree

Showing 210 changed files with 263 additions and 13,063 deletions.
diff --git a/app/Http/Controllers/Api/PostalCodeController.php b/app/Http/Controllers/Api/PostalCodeController.php
@@ -28,6 +28,8 @@ protected function notFound()
      */
     public function search(Client $http, $postalCode)
     {
+        $postalCode = intval($postalCode);
+
         try {
             $response = $http->get("https://viacep.com.br/ws/{$postalCode}/json/");
         } catch (Throwable $throwable) {

diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
@@ -44,6 +44,8 @@ private function registerGates()
             if ($user->isAdmin()) {
                 return true;
             }
+
+            return null;
         });
 
         Gate::define('view', ProcessPolicy::class . '@view');

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "Software livre de gestão escolar",
     "type": "project",
     "license": "GPL-2.0-or-later",
-    "version": "2.7.1",
+    "version": "2.7.2",
     "keywords": [
         "Portabilis",
         "i-Educar"

diff --git a/composer.lock b/composer.lock
diff --git a/database/migrations/2021_01_01_000000_populate_settings_table.php b/database/migrations/2021_01_01_000000_populate_settings_table.php
@@ -22,11 +22,11 @@ public function up()
             'legacy.apis.educacao_token_key' => null,
             'legacy.app.name' => 'i-Educar',
             'legacy.app.diario.nomenclatura_exame' => '0',
-            'legacy.app.database.hostname' => '********',
-            'legacy.app.database.port' => '********',
-            'legacy.app.database.dbname' => '********',
-            'legacy.app.database.username' => '********',
-            'legacy.app.database.password' => '********',
+            'legacy.app.database.hostname' => 'localhost',
+            'legacy.app.database.port' => '5432',
+            'legacy.app.database.dbname' => 'ieducar',
+            'legacy.app.database.username' => 'ieducar',
+            'legacy.app.database.password' => 'ieducar',
             'legacy.app.administrative_pending.exist' => null,
             'legacy.app.administrative_pending.msg' => '<p>Identificamos pendências administrativas da sua instituição para utilização do sistema. Sendo assim, pedimos que o responsável pelo sistema entre em contato com o Administrador do sistema o mais breve.</p><br/><b>Telefone:</b> (xx) xxxx-xxxx <br/> <b>E-mail:</b> [email protected]',
             'legacy.app.aws.bucketname' => null,

diff --git a/ieducar/intranet/atendidos_cad.php b/ieducar/intranet/atendidos_cad.php
@@ -1089,8 +1089,6 @@ protected function validatePhoto()
 
                 return false;
             }
-
-            return false;
         } else {
             $this->objPhoto = null;
 

diff --git a/ieducar/intranet/conexoes_lst.php b/ieducar/intranet/conexoes_lst.php
diff --git a/ieducar/intranet/conexoes_todos_lst.php b/ieducar/intranet/conexoes_todos_lst.php
diff --git a/ieducar/intranet/educar_acervo_det.php b/ieducar/intranet/educar_acervo_det.php
@@ -181,6 +181,7 @@ public function Gerar()
         $obj = new clsPmieducarAcervoAssunto();
         $obj = $obj->listaAssuntosPorObra($this->cod_acervo);
         if (is_array($obj) && count($obj)) {
+            $assuntos = '';
             foreach ($obj as $reg) {
                 $assuntos.= '<span style="background-color: #ccdce6; padding: 4px 20px;"><b>'.$reg['nome'].'</b></span>&nbsp; ';
             }
@@ -192,6 +193,7 @@ public function Gerar()
         $obj_categoria = new clsPmieducarCategoriaAcervo();
         $obj_categoria = $obj_categoria->listaCategoriasPorObra($this->cod_acervo);
         if (is_array($obj_categoria) && count($obj_categoria)) {
+            $categorias = '';
             foreach ($obj_categoria as $obj_cat) {
                 $categorias.= '<span style="background-color: #ccdce6; padding: 4px 20px;"><b>'.$obj_cat['descricao'].'</b></span>&nbsp; ';
             }