Fix various notices

diff --git a/galette/lib/Galette/Controllers/GaletteController.php b/galette/lib/Galette/Controllers/GaletteController.php
index 6ebb580ec3b4990ec303ba76e29b200cf3cd017a..d5bcafa757f22158457b6ac70d95ce8103ee362d 100644 (file)
--- a/galette/lib/Galette/Controllers/GaletteController.php
+++ b/galette/lib/Galette/Controllers/GaletteController.php
@@ -145,7 +145,7 @@ class GaletteController extends AbstractController
             $params['registered'] = $telemetry->isRegistered();
 
             $hide_telemetry = $telemetry->isSent() && $telemetry->isRegistered()
-                || $_COOKIE['hide_galette_telemetry'];
+                || isset($_COOKIE['hide_galette_telemetry']) && $_COOKIE['hide_galette_telemetry'];
         }
         $params['hide_telemetry'] = $hide_telemetry;
 

diff --git a/galette/lib/Galette/Controllers/PdfController.php b/galette/lib/Galette/Controllers/PdfController.php
index 659728ca4d74f48880908eabb4d5fae1b8f321c7..1ae062a969757158782a408d46730fb67d7f0c1a 100644 (file)
--- a/galette/lib/Galette/Controllers/PdfController.php
+++ b/galette/lib/Galette/Controllers/PdfController.php
@@ -282,7 +282,7 @@ class PdfController extends AbstractController
      */
     public function adhesionForm(Request $request, Response $response, array $args = []) :Response
     {
-        $id_adh = (int)$args[Adherent::PK] ?? null;
+        $id_adh = isset($args[Adherent::PK]) ? (int)$args[Adherent::PK] : null;
         $adh = new Adherent($this->zdb, $id_adh, ['dynamics' => true]);
 
         if ($id_adh !== null && !$adh->canEdit($this->login)) {
@@ -520,7 +520,7 @@ class PdfController extends AbstractController
         $id = 1;
         if (isset($_POST[PdfModel::PK])) {
             $id = (int)$_POST[PdfModel::PK];
-        } elseif ($args['id']) {
+        } elseif (isset($args['id'])) {
             $id = (int)$args['id'];
         }
 

diff --git a/galette/lib/Galette/Entity/Adherent.php b/galette/lib/Galette/Entity/Adherent.php
index 76feaae2bb1a2fe9f7b25be5f141878f3a82deb7..61a4db097ac230dae2a747dfe183f092fb27b302 100644 (file)
--- a/galette/lib/Galette/Entity/Adherent.php
+++ b/galette/lib/Galette/Entity/Adherent.php
@@ -666,10 +666,12 @@ class Adherent
     public function hasChildren()
     {
         if ($this->_children === null) {
-            Analog::log(
-                'Children has not been loaded!',
-                Analog::WARNING
-            );
+            if ($this->id) {
+                Analog::log(
+                    'Children has not been loaded!',
+                    Analog::WARNING
+                );
+            }
             return false;
         } else {
             return count($this->_children) > 0;
@@ -1536,7 +1538,7 @@ class Adherent
         $virtuals = array(
             'sadmin', 'sstaff', 'sdue_free', 'sappears_in_list', 'sactive',
             'stitle', 'sstatus', 'sfullname', 'sname', 'rowclass', 'saddress',
-            'rbirthdate', 'sgender'
+            'rbirthdate', 'sgender', 'contribstatus'
         );
 
         if (in_array($name, $forbidden)) {
@@ -1617,6 +1619,9 @@ class Adherent
                                 return __('Unspecified');
                         }
                         break;
+                    case 'contribstatus':
+                        return $this->getDues();
+                        break;
                 }
             } else {
                 if (substr($name, 0, 1) !== '_') {

diff --git a/galette/templates/default/gestion_adherents.tpl b/galette/templates/default/gestion_adherents.tpl
index df81f6330670975ab04e0f4d0473c779a1070119..e9e0287563910cc833a6d08bf8f2453186b48882 100644 (file)
--- a/galette/templates/default/gestion_adherents.tpl
+++ b/galette/templates/default/gestion_adherents.tpl
@@ -236,8 +236,6 @@ We have to use a template file, so Smarty will do its work (like replacing varia
             {elseif $column->field_id eq 'id_statut'}
                 {assign var="lrclass" value="$rclass nowrap"}
                 {assign var=value value={statusLabel id=$member->$propname}}
-            {elseif $column->field_id eq 'list_adh_contribstatus'}
-                {assign var=value value=$member->getDues()}
             {elseif $column->field_id eq 'titre_adh'}
                 {if is_object($member->title)}
                     {assign var=value value=$member->title->long}

diff --git a/galette/templates/default/gestion_contributions.tpl b/galette/templates/default/gestion_contributions.tpl
index ea839fce14d9e620bcedaec123726241f115ec8f..4463455b2661b19c03d04fff47228953a5e4eee0 100644 (file)
--- a/galette/templates/default/gestion_contributions.tpl
+++ b/galette/templates/default/gestion_contributions.tpl
@@ -222,7 +222,7 @@
                     <td class="{$cclass} nowrap" data-title="{_T string="End"}">{$contribution->end_date}</td>
     {if ($login->isAdmin() or $login->isStaff()) && !isset($member)}
                     <td class="{$cclass}" data-title="{_T string="Member"}">
-        {if $contribution->filtre_cotis_adh eq ""}
+        {if $filters->filtre_cotis_adh eq ""}
                         <a href="{path_for name="contributions" data=["type" => "contributions", "option" => "member", "value" => $mid]}">{if isset($member)}{$member->sname}{else}{memberName id="$mid"}{/if}</a>
         {else}
                         <a href="{path_for name="member" data=["id" => $mid]}">{if isset($member)}{$member->sname}{else}{memberName id="$mid"}{/if}</a>

diff --git a/galette/templates/default/trombinoscope.tpl b/galette/templates/default/trombinoscope.tpl
index 889f1b6b03af808ed7cbb9a5c42385f4ac938859..672ae3db53509481fdb08bdd7035a39c3252880e 100644 (file)
--- a/galette/templates/default/trombinoscope.tpl
+++ b/galette/templates/default/trombinoscope.tpl
@@ -19,7 +19,7 @@
     {foreach from=$members item=member}
         <div class="trombino">
             {assign var="mid" value=$member->id}
-            <img src="{path_for name="photo" data=["id" => $mid, "rand" => $time]}" height="{$member->picture->getOptimalHeight()}" width="{$member->picture->getOptimalWidth()}" alt="{$member->sfullname}{if $member->nickname ne ''} ({$member->nickname|htmlspecialchars}){/if}"/>
+            <img src="{path_for name="photo" data=["id" => $mid]}" height="{$member->picture->getOptimalHeight()}" width="{$member->picture->getOptimalWidth()}" alt="{$member->sfullname}{if $member->nickname ne ''} ({$member->nickname|htmlspecialchars}){/if}"/>
             <br/>{$member->sfullname}{if $member->nickname ne ''} ({$member->nickname|htmlspecialchars}){/if}
         </div>
     {/foreach}