From 7c3984c9dbf70cfe42ca073f93aa5af47f20857e Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 11 Mar 2018 18:54:38 +0100 Subject: [PATCH 1/3] Fix: dolibarrizzzz --- htdocs/admin/ticketsup_extrafields.php | 14 +++----------- htdocs/core/lib/ticketsup.lib.php | 9 ++++----- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/htdocs/admin/ticketsup_extrafields.php b/htdocs/admin/ticketsup_extrafields.php index 9084cac2ac1..6a6a36a3bf8 100644 --- a/htdocs/admin/ticketsup_extrafields.php +++ b/htdocs/admin/ticketsup_extrafields.php @@ -1,6 +1,5 @@ +/* Copyright (C) 2013-2016 Jean-François FERRY * * 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 @@ -21,15 +20,8 @@ * \ingroup ticketsup * \brief Page to setup extra fields of ticket */ -$res = ''; -if (file_exists("../../main.inc.php")) { - $res = include "../../main.inc.php"; // From htdocs directory -} elseif (!$res && file_exists("../../../main.inc.php")) { - $res = include "../../../main.inc.php"; // From "custom" directory -} else { - die("Include of main fails"); -} -// Libraries + +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT."/core/lib/ticketsup.lib.php"; require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; diff --git a/htdocs/core/lib/ticketsup.lib.php b/htdocs/core/lib/ticketsup.lib.php index d44ca92f68d..7394ddeba24 100644 --- a/htdocs/core/lib/ticketsup.lib.php +++ b/htdocs/core/lib/ticketsup.lib.php @@ -1,7 +1,6 @@ - * 2016 Christophe Battarel +/* Copyright (C) 2013-2016 Jean-François FERRY + * Copyright (C) 2016 Christophe Battarel * * 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 @@ -25,7 +24,7 @@ /** * Build tabs for admin page - * + * * @return array */ function ticketsupAdminPrepareHead() @@ -37,7 +36,7 @@ function ticketsupAdminPrepareHead() $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/admin/admin_ticketsup.php'; + $head[$h][0] = DOL_URL_ROOT.'/admin/ticketsup.php'; $head[$h][1] = $langs->trans("TicketSupSettings"); $head[$h][2] = 'settings'; $h++; From ecb44e2f531279cc8d47dc910932286b3fd15f07 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 11 Mar 2018 18:57:36 +0100 Subject: [PATCH 2/3] Fix: wrong copy/paste --- htdocs/admin/ticketsup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/ticketsup.php b/htdocs/admin/ticketsup.php index 9c587ea8264..be1a3d2f8bf 100644 --- a/htdocs/admin/ticketsup.php +++ b/htdocs/admin/ticketsup.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2013-2018 Jean-François FERRY * Copyright (C) 2016 Christophe Battarel * * This program is free software: you can redistribute it and/or modify From a09bad6d6917526251ffb65cc0560329f405d3bb Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 11 Mar 2018 18:59:45 +0100 Subject: [PATCH 3/3] Fix: wrong year --- htdocs/core/lib/ticketsup.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/ticketsup.lib.php b/htdocs/core/lib/ticketsup.lib.php index 7394ddeba24..b25f3d1a4cd 100644 --- a/htdocs/core/lib/ticketsup.lib.php +++ b/htdocs/core/lib/ticketsup.lib.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2013-2018 Jean-François FERRY * Copyright (C) 2016 Christophe Battarel * * This program is free software: you can redistribute it and/or modify