From 9ce6d87b83c48b00803c6c85fddbab8a55580ee3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Nov 2020 15:04:58 +0100 Subject: [PATCH] Clean code --- htdocs/core/boxes/intracommreport_box.php | 88 ----------------------- htdocs/core/boxes/modules_boxes.php | 2 +- 2 files changed, 1 insertion(+), 89 deletions(-) delete mode 100644 htdocs/core/boxes/intracommreport_box.php diff --git a/htdocs/core/boxes/intracommreport_box.php b/htdocs/core/boxes/intracommreport_box.php deleted file mode 100644 index d7c383138b6..00000000000 --- a/htdocs/core/boxes/intracommreport_box.php +++ /dev/null @@ -1,88 +0,0 @@ - - * Copyright (C) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file core/boxes/mybox.php - * \ingroup intracommreport - * \brief This file is a sample box definition file - * Put some comments here - */ -include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"; - -/** - * Class to manage the box - */ -class intracommreportbox extends ModeleBoxes -{ - - public $boxcode = "mybox"; - public $boximg = "intracommreport"; - public $boxlabel; - public $depends = array("intracommreport"); - public $db; - public $param; - public $info_box_head = array(); - public $info_box_contents = array(); - - /** - * Constructor - */ - public function __construct() - { - global $langs; - $langs->load("boxes"); - - $this->boxlabel = $langs->transnoentitiesnoconv("MyBox"); - } - - /** - * Load data into info_box_contents array to show array later. - * - * @param int $max Maximum number of records to load - * @return void - */ - public function loadBox($max = 5) - { - global $conf, $user, $langs, $db; - - $this->max = $max; - - //include_once DOL_DOCUMENT_ROOT . "/intracommreport/class/intracommreport.class.php"; - - $text = $langs->trans("MyBoxDescription", $max); - $this->info_box_head = array( - 'text' => $text, - 'limit' => dol_strlen($text) - ); - - $this->info_box_contents[0][0] = array('td' => 'align="left"', - 'text' => $langs->trans("MyBoxContent")); - } - - /** - * Method to show box - * - * @param array $head Array with properties of box title - * @param array $contents Array with properties of box lines - * @return void - */ - public function showBox($head = null, $contents = null) - { - parent::showBox($this->info_box_head, $this->info_box_contents); - } -} diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php index 2ac7ee05c6b..1e32a28f25c 100644 --- a/htdocs/core/boxes/modules_boxes.php +++ b/htdocs/core/boxes/modules_boxes.php @@ -277,7 +277,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box for ($j = 0; $j < $nbcolthisline; $j++) { // Define tdparam $tdparam = ''; - if (isset($contents[$i][$j]['td'])) $tdparam .= ' '.$contents[$i][$j]['td']; + if (!empty($contents[$i][$j]['td'])) $tdparam .= ' '.$contents[$i][$j]['td']; $text = isset($contents[$i][$j]['text']) ? $contents[$i][$j]['text'] : ''; $textwithnotags = preg_replace('/<([^>]+)>/i', '', $text);