suppression fonctions inutiles et simplification

FossilOrigin-Name: 7c7598c1fc713bdd0a5dfdf5d8e68372a97a22f4c5f535eff57ba02bfee3ca4b

lib/Utils.php

@@ -286,28 +286,6 @@ class Utils
         );
     }
 
-    /**
-     * @return nom de l'association
-     */
-    public static function getNomAsso() {
-        return DB::getInstance()->first(
-            "SELECT value
-             FROM config
-             WHERE key = 'nom_asso'"
-        )->value;
-    }
-
-    /**
-     * @return adresse de l'association
-     */
-    public static function getAdresseAsso() {
-        return DB::getInstance()->first(
-            "SELECT value
-             FROM config
-             WHERE key = 'adresse_asso'"
-        )->value;
-    }
-
     /**
      * @return liste des années fiscales
      */

www/admin/generer_activites.php

@@ -25,19 +25,15 @@ $totalPersonnes = cumulerVersements($versementsSelectionnes);
 $nomAsso = $config->get('nom_asso');
 $adresseAsso = $config->get('adresse_asso');
 $signature =
-           (null !== $plugin->getConfig('signature'))
+           (null !== $plugin->getConfig('signature')) ?
-           ?
+           Files::get($plugin->getConfig('signature'))->fullpath() :
-           \Garradin\Files\Files::get($plugin->getConfig('signature'))->fullpath()
-           :
            "";
 
 // logo
 $logo_file = Files::get(File::CONTEXT_CONFIG . '/logo.png');
 $logoAsso =
-          (null !== $logo_file)
+          (null !== $logo_file) ?
-          ?
+          Files::get($logo_file->path)->fullpath() :
-          Files::get($logo_file->path)->fullpath()
-          :
           "";
 
 // articles du CGI