diff --git a/lib/Utils.php b/lib/Utils.php index e29e92a..b973f9e 100644 --- a/lib/Utils.php +++ b/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 */ diff --git a/www/admin/generer_activites.php b/www/admin/generer_activites.php index d298eae..566a82d 100644 --- a/www/admin/generer_activites.php +++ b/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')) - ? - \Garradin\Files\Files::get($plugin->getConfig('signature'))->fullpath() - : + (null !== $plugin->getConfig('signature')) ? + Files::get($plugin->getConfig('signature'))->fullpath() : ""; // logo $logo_file = Files::get(File::CONTEXT_CONFIG . '/logo.png'); $logoAsso = - (null !== $logo_file) - ? - Files::get($logo_file->path)->fullpath() - : + (null !== $logo_file) ? + Files::get($logo_file->path)->fullpath() : ""; // articles du CGI