Fixes from scrutinizer errors

diff --git a/galette/includes/routes/management.routes.php b/galette/includes/routes/management.routes.php
index 85ce5e06b3f8035f201aeaf82cf7112a30e39943..7f441a07bb6b3d27eaf6194af0ff52206266cb8d 100644 (file)
--- a/galette/includes/routes/management.routes.php
+++ b/galette/includes/routes/management.routes.php
@@ -128,7 +128,7 @@ $app->post(
 
 $app->get(
     '/logs/flush',
-    function ($request, $response, $args) {
+    function ($request, $response) {
         return $response
             ->withStatus(302)
             ->withHeader(

diff --git a/galette/lib/Galette/Controllers/AuthController.php b/galette/lib/Galette/Controllers/AuthController.php
index 6bef8cfdcaeb1420714a00697e8b44358d9e51a4..458ecc38860fb1ebd3431b03ad8e5e46c09934e7 100644 (file)
--- a/galette/lib/Galette/Controllers/AuthController.php
+++ b/galette/lib/Galette/Controllers/AuthController.php
@@ -333,7 +333,6 @@ class AuthController extends AbstractController
                             'login_adh'         => custom_html_entity_decode($adh->login, ENT_QUOTES)
                         )
                     );
-                    $mtxt = $texts->getTexts('pwd', $adh->language);
 
                     $mail = new GaletteMail($this->preferences);
                     $mail->setSubject($texts->getSubject());

diff --git a/galette/lib/Galette/Controllers/Crud/ContributionsController.php b/galette/lib/Galette/Controllers/Crud/ContributionsController.php
index 8f7dd4732a80bf7ca1040fa0f1a3c0e128a4619d..61367f2df40870df1ba38b73549818929bb2fcd2 100644 (file)
--- a/galette/lib/Galette/Controllers/Crud/ContributionsController.php
+++ b/galette/lib/Galette/Controllers/Crud/ContributionsController.php
@@ -565,11 +565,6 @@ class ContributionsController extends CrudController
 
         if (count($error_detected) == 0) {
             //all goes well, we can proceed
-            $new = false;
-            if ($contrib->id == '') {
-                $new = true;
-            }
-
             if (count($error_detected) == 0) {
                 // send email to member
                 if (isset($post['mail_confirm']) && $post['mail_confirm'] == '1') {

diff --git a/galette/lib/Galette/Controllers/Crud/EntitledsController.php b/galette/lib/Galette/Controllers/Crud/EntitledsController.php
index 4c6ae2b4dd953f72ebc4539dbfada0433136d05d..db1620effcd40eaebc8f3ff2e80d8f18d067cd02 100644 (file)
--- a/galette/lib/Galette/Controllers/Crud/EntitledsController.php
+++ b/galette/lib/Galette/Controllers/Crud/EntitledsController.php
@@ -130,7 +130,12 @@ class EntitledsController extends CrudController
         $params['entries'] = $list;
 
         if (count($class->errors) > 0) {
-            $error_detected = array_merge($error_detected, $class->errors);
+            foreach ($class->errors as $error) {
+                $this->flash->addMessage(
+                    'error_detected',
+                    $error
+                );
+            }
         }
 
         // display page

diff --git a/galette/lib/Galette/Controllers/Crud/GroupsController.php b/galette/lib/Galette/Controllers/Crud/GroupsController.php
index a62372107591b0d4ab6454a8d25b1fb053236532..ef1240b915968d5736f7de84a7f3b52687d59613 100644 (file)
--- a/galette/lib/Galette/Controllers/Crud/GroupsController.php
+++ b/galette/lib/Galette/Controllers/Crud/GroupsController.php
@@ -334,7 +334,6 @@ class GroupsController extends CrudController
     {
         $post = $request->getParsedBody();
         $group = new Group((int)$args['id']);
-        $error = false;
 
         $group->setName($post['group_name']);
         try {

diff --git a/galette/lib/Galette/Controllers/Crud/MailingsController.php b/galette/lib/Galette/Controllers/Crud/MailingsController.php
index a963c6b43f90b69f3abe4b02b90be7334d74322f..1f15e6664d57417e94c5f57307f5b25d0c7bf4fa 100644 (file)
--- a/galette/lib/Galette/Controllers/Crud/MailingsController.php
+++ b/galette/lib/Galette/Controllers/Crud/MailingsController.php
@@ -252,8 +252,6 @@ class MailingsController extends CrudController
                 ->withHeader('Location', $redirect_url);
         }
 
-        $params = array();
-
         if (
             $this->preferences->pref_mail_method == Mailing::METHOD_DISABLED
             && !GALETTE_MODE === 'DEMO'
@@ -781,7 +779,6 @@ class MailingsController extends CrudController
         $attachment = $attachments[$args['pos']];
         $filepath = $attachment->getDestDir() . $attachment->getFileName();
 
-        $ext = pathinfo($attachment->getFileName())['extension'];
         $response = $response->withHeader('Content-type', $attachment->getMimeType($filepath));
 
         $body = $response->getBody();

diff --git a/galette/lib/Galette/Controllers/Crud/MembersController.php b/galette/lib/Galette/Controllers/Crud/MembersController.php
index 5bb5bfb56eb5e8e9a43772ad0cff52003ad52db8..fbe42f6bd81ecd753757684b3d35cc002744bce2 100644 (file)
--- a/galette/lib/Galette/Controllers/Crud/MembersController.php
+++ b/galette/lib/Galette/Controllers/Crud/MembersController.php
@@ -925,7 +925,6 @@ class MembersController extends CrudController
                                 Analog::ERROR
                             );
                             throw new \Exception('Unknown mode.');
-                            exit(0);
                         }
                     } else {
                         $m = new Members();
@@ -940,7 +939,6 @@ class MembersController extends CrudController
                         throw new \RuntimeException(
                             'Current selected member must be excluded while attaching!'
                         );
-                        exit(0);
                     }
                     break;
             }
@@ -1629,14 +1627,10 @@ class MembersController extends CrudController
                     }
 
                     //store requested groups
-                    $add_groups = null;
-                    $groups_adh = null;
-                    $managed_groups_adh = null;
+                    $groups_adh = $post['groups_adh'] ?? null;
+                    $managed_groups_adh = $post['groups_managed_adh'] ?? null;
 
                     //add/remove user from groups
-                    if (isset($post['groups_adh'])) {
-                        $groups_adh = $post['groups_adh'];
-                    }
                     $add_groups = Groups::addMemberToGroups(
                         $member,
                         $groups_adh
@@ -1647,9 +1641,6 @@ class MembersController extends CrudController
                     }
 
                     //add/remove manager from groups
-                    if (isset($post['groups_managed_adh'])) {
-                        $managed_groups_adh = $post['groups_managed_adh'];
-                    }
                     $add_groups = Groups::addMemberToGroups(
                         $member,
                         $managed_groups_adh,

diff --git a/galette/lib/Galette/Controllers/Crud/TransactionsController.php b/galette/lib/Galette/Controllers/Crud/TransactionsController.php
index eaad177bf40e09f97e7476e596b70c3397a4ac3b..0f07954ff048f32b28cc00f0b58350438170bf05 100644 (file)
--- a/galette/lib/Galette/Controllers/Crud/TransactionsController.php
+++ b/galette/lib/Galette/Controllers/Crud/TransactionsController.php
@@ -140,7 +140,6 @@ class TransactionsController extends ContributionsController
             'trans_desc'    =>  1,
             'id_adh'        =>  1
         );
-        $disabled = array();
 
         if ($action === 'edit') {
             // initialize transactions structure with database values

diff --git a/galette/lib/Galette/Core/MailingHistory.php b/galette/lib/Galette/Core/MailingHistory.php
index 62f587c39d4e1799b5de0bddd6e36675ec3b8107..465aa3e418a62c3e20f22f438c31e7a98ecaa8ef 100644 (file)
--- a/galette/lib/Galette/Core/MailingHistory.php
+++ b/galette/lib/Galette/Core/MailingHistory.php
@@ -524,14 +524,13 @@ class MailingHistory extends History
     /**
      * Remove specified entries
      *
-     * @param integer|array $ids Mailing history entries identifiers
+     * @param integer|array $ids  Mailing history entries identifiers
+     * @param History       $hist History instance
      *
      * @return boolean
      */
-    public function removeEntries($ids)
+    public function removeEntries($ids, History $hist)
     {
-        global $hist, $preferences;
-
         $list = array();
         if (is_numeric($ids)) {
             //we've got only one identifier
@@ -543,7 +542,7 @@ class MailingHistory extends History
         if (is_array($list)) {
             try {
                 foreach ($list as $id) {
-                    $mailing = new Mailing($preferences, [], $id);
+                    $mailing = new Mailing($this->preferences, [], $id);
                     $mailing->removeAttachments();
                 }