From 85c93c26a90eda3cd091c7043e6c5ff53a34ee26 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 18 Apr 2018 09:27:54 +0200
Subject: [PATCH 1/5] Fix: dolibarrize

---
 htdocs/core/class/html.formticketsup.class.php | 13 +++++++------
 htdocs/ticketsup/list.php                      | 14 ++++++++------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/class/html.formticketsup.class.php b/htdocs/core/class/html.formticketsup.class.php
index 7248e2b9a8e..120d4c218be 100644
--- a/htdocs/core/class/html.formticketsup.class.php
+++ b/htdocs/core/class/html.formticketsup.class.php
@@ -148,7 +148,8 @@ class FormTicketsup
         }
         print '<input type="hidden" name="fk_user_create" value="' . $this->fk_user_create . '">';
 
-        print '<div class="">';
+        dol_fiche_head('');
+
         print '<table class="tableticket"  width="' . $width . '">';
 
 
@@ -181,7 +182,7 @@ class FormTicketsup
                 print '<tr><td class="titlefield">' . $langs->trans("ThirdParty") . '</td><td>';
                 $events = array();
                 $events[] = array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php', 1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
-                print $form->select_company($this->withfromsocid, 'socid', '', 1, 1, '', $events);
+                print $form->select_company($this->withfromsocid, 'socid', '', 1, 1, '', $events, 0, 'minwidth200');
                 print '</td></tr>';
                 if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) {
                     $htmlname = 'socid';
@@ -436,7 +437,7 @@ class FormTicketsup
 
         $ticketstat->loadCacheTypesTickets();
 
-        print '<select id="select' . $htmlname . '" class="flat select_tickettype'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">';
+        print '<select id="select' . $htmlname . '" class="flat minwidth200'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">';
         if ($empty) {
             print '<option value="">&nbsp;</option>';
         }
@@ -536,7 +537,7 @@ class FormTicketsup
 
         $ticketstat->loadCacheCategoriesTickets();
 
-        print '<select id="select' . $htmlname . '" class="flat select_ticketcategory'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">';
+        print '<select id="select' . $htmlname . '" class="flat minwidth150'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">';
         if ($empty) {
             print '<option value="">&nbsp;</option>';
         }
@@ -605,7 +606,7 @@ class FormTicketsup
             print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
         }
 
-        print ajax_combobox('select'.$htmlname);
+        print ajax_combobox('select'.$htmlname,'',0,0,'off');
     }
 
     /**
@@ -637,7 +638,7 @@ class FormTicketsup
 
         $ticketstat->loadCacheSeveritiesTickets();
 
-        print '<select id="select' . $htmlname . '" class="flat select_ticketseverity'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">';
+        print '<select id="select' . $htmlname . '" class="flat minwidth150'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">';
         if ($empty) {
             print '<option value="">&nbsp;</option>';
         }
diff --git a/htdocs/ticketsup/list.php b/htdocs/ticketsup/list.php
index a5552d854b1..61dcf45ba83 100644
--- a/htdocs/ticketsup/list.php
+++ b/htdocs/ticketsup/list.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2013-2018    Jean-François FERRY <hello@librethic.io>
- * Copyright (C) 2016         Christophe Battarel <christophe@altairis.fr>
+/* Copyright (C) 2013-2018	Jean-François FERRY	<hello@librethic.io>
+ * Copyright (C) 2016		Christophe Battarel	<christophe@altairis.fr>
+ * Copyright (C) 2018		Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * 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
@@ -580,12 +581,13 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine=0;
-foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val)
-{
-	if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+if (! empty($extrafields->attributes[$object->table_element]['computed'])) {
+	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val)
+	{
+		if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+	}
 }
 
-
 // Loop on record
 // --------------------------------------------------------------------
 $i=0;

From d841abd55ade6792f00448abed6e2401dfdfa5e8 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 18 Apr 2018 09:37:29 +0200
Subject: [PATCH 2/5] Fix: missing value when reload

---
 htdocs/core/class/html.formticketsup.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formticketsup.class.php b/htdocs/core/class/html.formticketsup.class.php
index 120d4c218be..9cc9a09dbc6 100644
--- a/htdocs/core/class/html.formticketsup.class.php
+++ b/htdocs/core/class/html.formticketsup.class.php
@@ -299,7 +299,7 @@ class FormTicketsup
 
         // Notify thirdparty at creation
         print '<tr><td><label for="notify_tiers_at_create">' . $langs->trans("TicketNotifyTiersAtCreation") . '</label></td><td>';
-        print '<input type="checkbox" id="notify_tiers_at_create" name="notify_tiers_at_create"'.($this->withnotifytiersatcreate?' checked="checked"':'').'>';
+        print '<input type="checkbox" id="notify_tiers_at_create" name="notify_tiers_at_create"'.((GETPOST('notify_tiers_at_create') ? ' checked="checked"' : $this->withnotifytiersatcreate?' checked="checked"':'')).'>';
         print '</td></tr>';
 
         // TITLE

From d6680b982a8ca775b295fa4fd70aeb5e415a8c1e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 18 Apr 2018 09:42:29 +0200
Subject: [PATCH 3/5] Fix: file not physically removed

---
 htdocs/public/ticketsup/create_ticket.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/htdocs/public/ticketsup/create_ticket.php b/htdocs/public/ticketsup/create_ticket.php
index 8c8a0dd2f60..56c81a8a530 100644
--- a/htdocs/public/ticketsup/create_ticket.php
+++ b/htdocs/public/ticketsup/create_ticket.php
@@ -93,9 +93,7 @@ if (GETPOST('addfile') && !GETPOST('add_ticket')) {
 
 // Remove file
 if (GETPOST('removedfile') && !GETPOST('add_ticket')) {
-    ////$res = $object->fetch('',GETPOST('track_id'));
-    ////if($res > 0)
-    ////{
+
     include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
     // Set tmp directory
@@ -103,9 +101,8 @@ if (GETPOST('removedfile') && !GETPOST('add_ticket')) {
     $upload_dir_tmp = $vardir . '/temp';
 
     // TODO Delete only files that was uploaded from email form
-    dol_remove_file_process($_POST['removedfile'], 0);
+    dol_remove_file_process($_POST['removedfile'], 0, 0);
     $action = 'create_ticket';
-    ////}
 }
 if ($action == 'create_ticket' && GETPOST('add_ticket')) {
     $error = 0;

From ff76e60c49685c71d034f2739609bdb8d08e615c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 18 Apr 2018 10:13:20 +0200
Subject: [PATCH 4/5] Fix: some bugs and warnings

---
 htdocs/core/class/commonobject.class.php      | 27 ++++++++++---------
 .../core/class/html.formticketsup.class.php   |  4 +--
 htdocs/ticketsup/card.php                     | 11 +++++---
 htdocs/ticketsup/class/ticketsup.class.php    |  4 +--
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 70342919792..1b750e59503 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3923,23 +3923,26 @@ abstract class CommonObject
 		$var = true;
 		$i	 = 0;
 
-		foreach ($this->lines as $line)
+		if (! empty($this->lines))
 		{
-			if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
+			foreach ($this->lines as $line)
 			{
-				if (empty($line->fk_parent_line))
+				if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
 				{
-					$parameters=array('line'=>$line,'var'=>$var,'i'=>$i);
-					$action='';
-					$hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+					if (empty($line->fk_parent_line))
+					{
+						$parameters=array('line'=>$line,'var'=>$var,'i'=>$i);
+						$action='';
+						$hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+					}
+				}
+				else
+				{
+					$this->printOriginLine($line, $var, $restrictlist);
 				}
-			}
-			else
-			{
-				$this->printOriginLine($line, $var, $restrictlist);
-			}
 
-			$i++;
+				$i++;
+			}
 		}
 	}
 
diff --git a/htdocs/core/class/html.formticketsup.class.php b/htdocs/core/class/html.formticketsup.class.php
index 9cc9a09dbc6..a7f1b7a8d34 100644
--- a/htdocs/core/class/html.formticketsup.class.php
+++ b/htdocs/core/class/html.formticketsup.class.php
@@ -858,7 +858,7 @@ class FormTicketsup
             // Destinataires
             print '<tr class="email_line"><td>' . $langs->trans('MailRecipients') . '</td><td colspan="2">';
             $ticketstat = new Ticketsup($this->db);
-            $res = $ticketstat->fetch('', $this->track_id);
+            $res = $ticketstat->fetch('', '', $this->track_id);
             if ($res) {
                 // Retrieve email of all contacts (internal and external)
                 $contacts = $ticketstat->getInfosTicketInternalContact();
@@ -881,7 +881,7 @@ class FormTicketsup
                     $ticketstat->socid = $ticketstat->fk_soc;
                     $ticketstat->fetch_thirdparty();
 
-                    if (!in_array($ticketstat->thirdparty->email, $sendto)) {
+                    if (is_array($ticketstat->thirdparty->email) && !in_array($ticketstat->thirdparty->email, $sendto)) {
                         $sendto[] = $ticketstat->thirdparty->email . '(' . $langs->trans('Customer') . ')';
                     }
                 }
diff --git a/htdocs/ticketsup/card.php b/htdocs/ticketsup/card.php
index 6d33a5cd9be..b85d53763bf 100644
--- a/htdocs/ticketsup/card.php
+++ b/htdocs/ticketsup/card.php
@@ -134,7 +134,10 @@ include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';        // Must be inc
 $userstat = new User($db);
 $form = new Form($db);
 $formticket = new FormTicketsup($db);
-$formproject = new FormProjets($db);
+
+if (! empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 if ($action == 'view' || $action == 'add_message' || $action == 'close' || $action == 'delete' || $action == 'editcustomer' || $action == 'progression' || $action == 'reopen'
 	|| $action == 'editsubject' || $action == 'edit_extras' || $action == 'update_extras' || $action == 'edit_extrafields' || $action == 'set_extrafields' || $action == 'classify' || $action == 'sel_contract' || $action == 'edit_message_init' || $action == 'set_status' || $action == 'dellink')
@@ -631,15 +634,15 @@ if ($action == 'view' || $action == 'add_message' || $action == 'close' || $acti
 
 	                print '<div class="tagtd">';
 
-	                print dol_print_phone($tab[$i]['phone'], '', '', '', AC_TEL).'<br>';
+	                print dol_print_phone($tab[$i]['phone'], '', '', '', 'AC_TEL').'<br>';
 
 	                if (! empty($tab[$i]['phone_perso'])) {
 	                    //print img_picto($langs->trans('PhonePerso'),'object_phoning.png','',0,0,0).' ';
-	                    print '<br>'.dol_print_phone($tab[$i]['phone_perso'], '', '', '', AC_TEL).'<br>';
+	                    print '<br>'.dol_print_phone($tab[$i]['phone_perso'], '', '', '', 'AC_TEL').'<br>';
 	                }
 	                if (! empty($tab[$i]['phone_mobile'])) {
 	                    //print img_picto($langs->trans('PhoneMobile'),'object_phoning.png','',0,0,0).' ';
-	                    print dol_print_phone($tab[$i]['phone_mobile'], '', '', '', AC_TEL).'<br>';
+	                    print dol_print_phone($tab[$i]['phone_mobile'], '', '', '', 'AC_TEL').'<br>';
 	                }
 	                print '</div>';
 
diff --git a/htdocs/ticketsup/class/ticketsup.class.php b/htdocs/ticketsup/class/ticketsup.class.php
index 5a4f71e81e3..8f967ecb09f 100644
--- a/htdocs/ticketsup/class/ticketsup.class.php
+++ b/htdocs/ticketsup/class/ticketsup.class.php
@@ -1639,7 +1639,7 @@ class Ticketsup extends CommonObject
     {
         global $langs;
 
-        if (count($this->cache_logs_ticket)) {
+        if (is_array($this->cache_logs_ticket) && count($this->cache_logs_ticket)) {
             return 0;
         }
         // Cache deja charge
@@ -1751,7 +1751,7 @@ class Ticketsup extends CommonObject
     {
         global $langs;
 
-        if (count($this->cache_msgs_ticket)) {
+        if (is_array($this->cache_msgs_ticket) && count($this->cache_msgs_ticket)) {
             return 0;
         }
         // Cache deja charge

From a4cd087df0121f9a4bc4a265f4303a1ad1ad3501 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 18 Apr 2018 10:30:03 +0200
Subject: [PATCH 5/5] Fix: some bugs

---
 htdocs/public/ticketsup/list.php | 6 ++----
 htdocs/public/ticketsup/view.php | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/htdocs/public/ticketsup/list.php b/htdocs/public/ticketsup/list.php
index 2b8f3d821d2..a071344fcb1 100644
--- a/htdocs/public/ticketsup/list.php
+++ b/htdocs/public/ticketsup/list.php
@@ -82,7 +82,7 @@ if ($action == "view_ticketlist") {
     }
 
     if (!$error) {
-        $ret = $object->fetch('', $track_id);
+        $ret = $object->fetch('', '', $track_id);
         if ($ret && $object->dao->id > 0) {
             // vérifie si l'adresse email est bien dans les contacts du ticket
             $contacts = $object->dao->liste_contact(-1, 'external');
@@ -263,9 +263,7 @@ if ($action == "view_ticketlist") {
         $limit = $conf->liste_limit;
 
         $page = GETPOST("page", 'int');
-        if ($page == -1) {
-            $page = 0;
-        }
+        if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
         $offset = $limit * $page;
         $pageprev = $page - 1;
         $pagenext = $page + 1;
diff --git a/htdocs/public/ticketsup/view.php b/htdocs/public/ticketsup/view.php
index 3302c749e33..0a21402d0ed 100644
--- a/htdocs/public/ticketsup/view.php
+++ b/htdocs/public/ticketsup/view.php
@@ -80,7 +80,7 @@ if ($action == "view_ticket" || $action == "add_message" || $action == "close" |
     }
 
     if (!$error) {
-        $ret = $object->fetch('', $track_id);
+        $ret = $object->fetch('', '', $track_id);
         if ($ret && $object->dao->id > 0) {
             // vérifie si l'adresse email est bien dans les contacts du ticket
             $contacts = $object->dao->liste_contact(-1, 'external');
@@ -253,7 +253,7 @@ if ($action == "view_ticket" || $action == "add_message" || $action == "close" |
             $formticket->withfile = 2;
             $formticket->showMessageForm('100%');
         } else {
-            print '<form method="post" id="form_view_ticket_list" name="form_view_ticket_list" enctype="multipart/form-data" action="' . dol_buildpath('/ticketsup/public/list.php', 1) . '">';
+            print '<form method="post" id="form_view_ticket_list" name="form_view_ticket_list" enctype="multipart/form-data" action="' . dol_buildpath('/public/ticketsup/list.php', 1) . '">';
             print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
             print '<input type="hidden" name="action" value="view_ticketlist">';
             print '<input type="hidden" name="track_id" value="'.$object->dao->track_id.'">';