From 62a55e10b7c818ea431470eec8cecbd564917117 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 22 Jun 2018 15:26:07 +0200 Subject: [PATCH] Fix: remove not used list template --- htdocs/core/class/canvas.class.php | 4 +- .../product/canvas/product/tpl/list.tpl.php | 108 ------------------ .../product/canvas/service/tpl/list.tpl.php | 107 ----------------- 3 files changed, 2 insertions(+), 217 deletions(-) delete mode 100644 htdocs/product/canvas/product/tpl/list.tpl.php delete mode 100644 htdocs/product/canvas/service/tpl/list.tpl.php diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php index 942123966fa..d9c496add4f 100644 --- a/htdocs/core/class/canvas.class.php +++ b/htdocs/core/class/canvas.class.php @@ -145,7 +145,7 @@ class Canvas { if (empty($this->template_dir)) return 0; - if (file_exists($this->template_dir.((!empty($this->card) && $this->card != 'list')?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) return 1; + if (file_exists($this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) return 1; else return 0; } @@ -161,7 +161,7 @@ class Canvas global $db, $conf, $langs, $user, $canvas; global $form, $formfile; - include $this->template_dir.((!empty($this->card) && $this->card != 'list')?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php'; // Include native PHP template + include $this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php'; // Include native PHP template } diff --git a/htdocs/product/canvas/product/tpl/list.tpl.php b/htdocs/product/canvas/product/tpl/list.tpl.php deleted file mode 100644 index e5c315e8148..00000000000 --- a/htdocs/product/canvas/product/tpl/list.tpl.php +++ /dev/null @@ -1,108 +0,0 @@ - - * - * 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 . - */ - -// Protection to avoid direct call of template -if (empty($conf) || ! is_object($conf)) -{ - print "Error, template page can't be called as URL"; - exit; -} - -?> - - - - - - - - -
- - -
-
- -
" method="post" name="formulaire"> - - - - - - - - - - - - - - - - - - - - - - - $searchfield) { - if ($searchfield['enabled']) { - if ($searchfield['search']) { ?> - - '; - $searchpicto=$form->showFilterAndCheckAddButtons(0); - print $searchpicto; - print ''; - } else { ?> - - - - - - - - > - $value) { - foreach($fieldlist as $field) { - if ($field['alias'] == $key) { ?> - - - - - -
- ?sortfield=&sortorder=asc&begin=&tosell=&canvas=default&fourn_id=&snom=&sref="> - A-Z - - ?sortfield=&sortorder=desc&begin=&tosell=&canvas=default&fourn_id=&snom=&sref="> - Z-A - -
 
-
- - \ No newline at end of file diff --git a/htdocs/product/canvas/service/tpl/list.tpl.php b/htdocs/product/canvas/service/tpl/list.tpl.php deleted file mode 100644 index ef6d461fc5c..00000000000 --- a/htdocs/product/canvas/service/tpl/list.tpl.php +++ /dev/null @@ -1,107 +0,0 @@ - - * - * 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 . - */ - -// Protection to avoid direct call of template -if (empty($conf) || ! is_object($conf)) -{ - print "Error, template page can't be called as URL"; - exit; -} - -?> - - - - - - - - -
- - -
-
- -
" method="post" name="formulaire"> - - - - - - - - - - - - - - - - - - - - - - - $searchfield) { - if ($searchfield['enabled']) { - if ($searchfield['search']) { ?> - - '; - $searchpicto=$form->showFilterAndCheckAddButtons(0); - print $searchpicto; - print ''; - } else { ?> - - - - - - - - - $value) { - foreach($fieldlist as $field) { - if ($field['alias'] == $key) { ?> - - - - - -
- ?sortfield=&sortorder=asc&begin=&tosell=&canvas=default&fourn_id=&snom=&sref="> - A-Z - - ?sortfield=&sortorder=desc&begin=&tosell=&canvas=default&fourn_id=&snom=&sref="> - Z-A - -
 
-
- - \ No newline at end of file