#1714 [Hook] fix: saturnepublicinterface for logo in public interface

Evarisk · Feb 19, 2024 · 6981561 · 6981561
1 parent eef5cee
commit 6981561
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 40 deletions.
diff --git a/class/actions_digiquali.class.php b/class/actions_digiquali.class.php
@@ -245,7 +245,7 @@ public function printCommonFooter($parameters)
      * @param object $object     Object
      * @return void
      */
-    public function formObjectOptions(array $parameters, object $object) {
+    public function formObjectOptions(array $parameters, $object) {
         if (strpos($parameters['context'], 'productlotcard') !== false) {
             $objectData = ['type' => $object->element, 'id' => $object->id];
 
@@ -311,42 +311,6 @@ public function saturneBannerTab(array $parameters, CommonObject $object): int
         return 0; // or return 1 to replace standard code.
     }
 
-    /**
-     * Overloading the printMainArea function : replacing the parent's function with the one below.
-     *
-     * @param  array $parameters Hook metadatas (context, etc...).
-     * @return int               0 < on error, 0 on success, 1 to replace standard code.
-     */
-    public function printMainArea(array $parameters): int
-    {
-        global $conf, $mysoc;
-
-        // Do something only for the current context.
-        if (preg_match('/publiccontrol|publicsurvey|publicanswer|publiccontrolhistory/', $parameters['context'])) {
-            if (!empty($conf->global->SATURNE_SHOW_COMPANY_LOGO)) {
-                // Define logo and logoSmall.
-                $logoSmall = $mysoc->logo_small;
-                $logo      = $mysoc->logo;
-                // Define urlLogo.
-                $urlLogo = '';
-                if (!empty($logoSmall) && is_readable($conf->mycompany->dir_output . '/logos/thumbs/' . $logoSmall)) {
-                    $urlLogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&entity=' . $conf->entity . '&file=' . urlencode('logos/thumbs/' . $logoSmall);
-                } elseif (!empty($logo) && is_readable($conf->mycompany->dir_output . '/logos/' . $logo)) {
-                    $urlLogo = DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&entity=' . $conf->entity . '&file=' . urlencode('logos/' . $logo);
-                }
-                // Output html code for logo.
-                if ($urlLogo) {
-                    print '<div class="center signature-logo">';
-                    print '<img src="' . $urlLogo . '">';
-                    print '</div>';
-                }
-                print '<div class="underbanner clearboth"></div>';
-            }
-        }
-
-        return 0; // or return 1 to replace standard code.
-    }
-
     /**
      * Overloading the saturneAdminDocumentData function : replacing the parent's function with the one below.
      *

diff --git a/public/control/public_control.php b/public/control/public_control.php
@@ -79,7 +79,7 @@
 $object = new Control($db);
 $sheet  = new Sheet($db);
 
-$hookmanager->initHooks(['publiccontrol']); // Note that conf->hooks_modules contains array.
+$hookmanager->initHooks(['publiccontrol', 'saturnepublicinterface']); // Note that conf->hooks_modules contains array.
 
 if (!isModEnabled('multicompany')) {
     $entity = $conf->entity;

diff --git a/public/control/public_control_history.php b/public/control/public_control_history.php
@@ -84,7 +84,7 @@
 $project = new Project($db);
 $user    = new User($db);
 
-$hookmanager->initHooks(['publiccontrolhistory']); // Note that conf->hooks_modules contains array.
+$hookmanager->initHooks(['publiccontrolhistory', 'saturnepublicinterface']); // Note that conf->hooks_modules contains array.
 
 if (!isModEnabled('multicompany')) {
     $entity = $conf->entity;

diff --git a/public/survey/public_survey.php b/public/survey/public_survey.php
@@ -71,7 +71,7 @@
 // Initialize technical objects
 $object = new Survey($db);
 
-$hookmanager->initHooks(['publicsurvey']); // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(['publicsurvey', 'saturnepublicinterface']); // Note that conf->hooks_modules contains array
 
 if (!isModEnabled('multicompany')) {
     $entity = $conf->entity;