From 923bad4da68e20fafdd2b41001182f3378f38ee8 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Sat, 10 Mar 2018 23:59:34 +0100
Subject: [PATCH 1/7] add sql log on install debug

new global variable INSTALL_DISPLAY_SQL_LOG to display sql log on module install
---
 htdocs/core/modules/DolibarrModules.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index eaf674d5eea..5eb049f8323 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1049,7 +1049,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 					{
 						if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data')
 						{
-							$result=run_sql($dir.$file,1,'',1);
+							$result=run_sql($dir.$file, $conf->global->INSTALL_DISPLAY_SQL_LOG, '', 1);
 							if ($result <= 0) $error++;
 						}
 					}
@@ -1067,7 +1067,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 					{
 						if (preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data')
 						{
-							$result=run_sql($dir.$file,1,'',1);
+							$result=run_sql($dir.$file, $conf->global->INSTALL_DISPLAY_SQL_LOG, '', 1);
 							if ($result <= 0) $error++;
 						}
 					}
@@ -1085,7 +1085,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 					{
 						if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'data')
 						{
-							$result=run_sql($dir.$file,1,'',1);
+							$result=run_sql($dir.$file, $conf->global->INSTALL_DISPLAY_SQL_LOG, '', 1);
 							if ($result <= 0) $error++;
 						}
 					}
@@ -1103,7 +1103,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 					{
 						if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,6) == 'update')
 						{
-							$result=run_sql($dir.$file,1,'',1);
+							$result=run_sql($dir.$file, $conf->global->INSTALL_DISPLAY_SQL_LOG, '', 1);
 							if ($result <= 0) $error++;
 						}
 					}

From bfaffe6692edb2a80e07bc333462c76be9ba0c41 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <charles.fr@benke.fr>
Date: Sun, 11 Mar 2018 10:51:05 +0100
Subject: [PATCH 2/7] Changes Done

---
 htdocs/core/modules/DolibarrModules.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 5eb049f8323..c1c570e8269 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1049,7 +1049,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 					{
 						if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data')
 						{
-							$result=run_sql($dir.$file, $conf->global->INSTALL_DISPLAY_SQL_LOG, '', 1);
+							$result=run_sql($dir.$file, empty($conf->global->INSTALL_DISPLAY_SQL_LOG)?0:1, '', 1);
 							if ($result <= 0) $error++;
 						}
 					}
@@ -1067,7 +1067,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 					{
 						if (preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data')
 						{
-							$result=run_sql($dir.$file, $conf->global->INSTALL_DISPLAY_SQL_LOG, '', 1);
+							$result=run_sql($dir.$file, empty($conf->global->INSTALL_DISPLAY_SQL_LOG)?0:1, '', 1);
 							if ($result <= 0) $error++;
 						}
 					}
@@ -1085,7 +1085,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 					{
 						if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'data')
 						{
-							$result=run_sql($dir.$file, $conf->global->INSTALL_DISPLAY_SQL_LOG, '', 1);
+							$result=run_sql($dir.$file, empty($conf->global->INSTALL_DISPLAY_SQL_LOG)?0:1, '', 1);
 							if ($result <= 0) $error++;
 						}
 					}
@@ -1103,7 +1103,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 					{
 						if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,6) == 'update')
 						{
-							$result=run_sql($dir.$file, $conf->global->INSTALL_DISPLAY_SQL_LOG, '', 1);
+							$result=run_sql($dir.$file, empty($conf->global->INSTALL_DISPLAY_SQL_LOG)?0:1, '', 1);
 							if ($result <= 0) $error++;
 						}
 					}

From 26dbd4f3a1199fb673b00588e0ba9f4e1e01588a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 11 Mar 2018 11:43:12 +0100
Subject: [PATCH 3/7] Update linkedobjectblock.tpl.php

---
 htdocs/ticketsup/tpl/linkedobjectblock.tpl.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/ticketsup/tpl/linkedobjectblock.tpl.php b/htdocs/ticketsup/tpl/linkedobjectblock.tpl.php
index cd23471129e..4c1a00c3d82 100644
--- a/htdocs/ticketsup/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/ticketsup/tpl/linkedobjectblock.tpl.php
@@ -16,6 +16,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+// Protection to avoid direct call of template
+if (empty($conf) || ! is_object($conf))
+{
+	print "Error, template page can't be called as URL";
+	exit;
+}
 ?>
 
 <!-- BEGIN PHP TEMPLATE -->
@@ -55,4 +61,4 @@ foreach ($linkedObjectBlock as $object) {
 <?php } ?>
 </table>
 
-<!-- END PHP TEMPLATE -->
\ No newline at end of file
+<!-- END PHP TEMPLATE -->

From 7ffce2a28f99df117c269e3389c2128d7803061d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Mar 2018 16:48:44 +0100
Subject: [PATCH 4/7] Dolibarize

---
 htdocs/core/class/html.formticketsup.class.php | 2 +-
 htdocs/ticketsup/class/ticketsup.class.php     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.formticketsup.class.php b/htdocs/core/class/html.formticketsup.class.php
index 0c10c256e83..329d23a7c51 100644
--- a/htdocs/core/class/html.formticketsup.class.php
+++ b/htdocs/core/class/html.formticketsup.class.php
@@ -624,7 +624,7 @@ class FormTicketsup
             $filterarray = explode(',', $filtertype);
         }
 
-        $ticketstat->load_cache_severities_tickets();
+        $ticketstat->loadCacheSeveritiesTickets();
 
         print '<select id="select' . $htmlname . '" class="flat select_ticketseverity" name="' . $htmlname . '">';
         if ($empty) {
diff --git a/htdocs/ticketsup/class/ticketsup.class.php b/htdocs/ticketsup/class/ticketsup.class.php
index ae3a6c67fc1..50bac5cbed8 100644
--- a/htdocs/ticketsup/class/ticketsup.class.php
+++ b/htdocs/ticketsup/class/ticketsup.class.php
@@ -1092,7 +1092,7 @@ class Ticketsup extends CommonObject
      *
      *      @return int             Nb lignes chargees, 0 si deja chargees, <0 si ko
      */
-    public function load_cache_severities_tickets()
+    public function loadCacheSeveritiesTickets()
     {
         global $langs;
 
@@ -1105,7 +1105,7 @@ class Ticketsup extends CommonObject
         $sql .= " FROM " . MAIN_DB_PREFIX . "c_ticketsup_severity";
         $sql .= " WHERE active > 0";
         $sql .= " ORDER BY pos";
-        dol_syslog(get_class($this) . "::load_cache_severities_tickets sql=" . $sql, LOG_DEBUG);
+        dol_syslog(get_class($this) . "::loadCacheSeveritiesTickets sql=" . $sql, LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);

From 435a04996004309bed90c321a8a52483403a42e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 11 Mar 2018 17:35:00 +0100
Subject: [PATCH 5/7] Create index.html

---
 htdocs/ticketsup/tpl/index.html | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 htdocs/ticketsup/tpl/index.html

diff --git a/htdocs/ticketsup/tpl/index.html b/htdocs/ticketsup/tpl/index.html
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/htdocs/ticketsup/tpl/index.html
@@ -0,0 +1 @@
+

From f0a0c8c3e5c35ad41f81b2c9e96bd2fda7d0ae32 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Mar 2018 17:57:58 +0100
Subject: [PATCH 6/7] Fix phpcs

---
 htdocs/ticketsup/class/ticketsup.class.php | 72 +++++++++++-----------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/htdocs/ticketsup/class/ticketsup.class.php b/htdocs/ticketsup/class/ticketsup.class.php
index 50bac5cbed8..d01ca904a06 100644
--- a/htdocs/ticketsup/class/ticketsup.class.php
+++ b/htdocs/ticketsup/class/ticketsup.class.php
@@ -54,8 +54,8 @@ class Ticketsup extends CommonObject
      * @var string String with name of icon for ticketsupcore. Must be the part after the 'object_' into object_ticketsupcore.png
      */
     public $picto = 'ticketsup@ticketsup';
-    
-    
+
+
     /**
      * @var string Hash to identify ticket
      */
@@ -192,9 +192,9 @@ class Ticketsup extends CommonObject
         'date_read' => array('type'=>'datetime', 'label'=>'TicketReadOn', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1),
         'date_close' => array('type'=>'datetime', 'label'=>'TicketCloseOn', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1),
         'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-2, 'enabled'=>1, 'position'=>501, 'notnull'=>1)
-      
+
     );
-    
+
     /**
      *  Constructor
      *
@@ -1002,7 +1002,7 @@ class Ticketsup extends CommonObject
         $this->tms = '';
     }
 
-    
+
     public function printSelectStatus($selected = "")
     {
         print Form::selectarray('search_fk_statut', $this->statuts_short, $selected, $show_empty = 1, $key_in_label = 0, $value_as_key = 0, $option = '', $translate = 1, $maxlen = 0, $disabled = 0, $sort = '', $morecss = '');
@@ -1130,9 +1130,9 @@ class Ticketsup extends CommonObject
 
     /**
      *    Return status label of object
-     *    
-     *    @param      mode        0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
-     *    @return     string      Label
+     *
+     *    @param      int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+     *    @return     string    			Label
      */
     public function getLibStatut($mode = 0)
     {
@@ -1141,12 +1141,12 @@ class Ticketsup extends CommonObject
 
     /**
      *    Return status label of object
-     *    
+     *
      *    @param      string 	$statut      id statut
      *    @param      int		$mode        0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
      *    @return     string     			 Label
      */
-    public function LibStatut($statut, $mode = 0)
+    function LibStatut($statut, $mode = 0)
     {
         global $langs;
 
@@ -1292,7 +1292,7 @@ class Ticketsup extends CommonObject
 
     /**
      *     Renvoie nom clicable (avec eventuellement le picto)
-     *     
+     *
      *     @param        int		$withpicto        0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
      *     @param        string		$option           Sur quoi pointe le lien
      *     @return       string     			      Chaine avec URL
@@ -1326,10 +1326,10 @@ class Ticketsup extends CommonObject
 
         return $result;
     }
-    
+
     /**
      *    Mark a message as read
-     *    
+     *
      *    @param    User		$user			Object user
      *    @param	int			$notrigger		No trigger
      *    @return   int							<0 if KO, >0 if OK
@@ -1340,7 +1340,7 @@ class Ticketsup extends CommonObject
 
         if ($this->statut != 9) { // no closed
             $this->db->begin();
-	
+
             $sql = "UPDATE " . MAIN_DB_PREFIX . "ticketsup";
             $sql .= " SET fk_statut = 1, date_read='" . $this->db->idate(dol_now()) . "'";
             $sql .= " WHERE rowid = " . $this->id;
@@ -1378,7 +1378,7 @@ class Ticketsup extends CommonObject
 
     /**
      *    Mark a message as read
-     *    
+     *
      *    @param    User	$user				Object user
      *    @param    int 	$id_assign_user		ID of user assigned
      *    @param    int 	$notrigger        	Disable trigger
@@ -1486,11 +1486,11 @@ class Ticketsup extends CommonObject
     }
 
     /**
-     *     Send notification of changes by email
+     *  Send notification of changes by email
      *
-     * @param  User   $user    		User that create
-     * @param  string $message 		Log message
-     * @return int                 	<0 if KO, >0 if OK (number of emails sent)
+     * 	@param  User   $user    		User that create
+     * 	@param  string $log_message 		Log message
+     * 	@return int                 	<0 if KO, >0 if OK (number of emails sent)
      */
     private function sendLogByEmail($user, $log_message)
     {
@@ -1733,7 +1733,7 @@ class Ticketsup extends CommonObject
 
     /**
      *    Close a ticket
-     *    
+     *
      *    @return     int		<0 if KO, >0 if OK
      */
     public function close()
@@ -2099,7 +2099,7 @@ class Ticketsup extends CommonObject
     /**
      * Return id of all contacts for ticket
      *
-     * @param int $exclude_self exclude_self    Exclude current user form list
+     * @return	array		Array of contacts
      */
     public function getTicketAllCustomerContacts()
     {
@@ -2114,9 +2114,9 @@ class Ticketsup extends CommonObject
     /**
      *  Check if contact are linked to the ticket. If yes, send mail and save trace into llx_notify.
      *
-     *     @param  string $subject	  Subject
-     *     @param  string $texte      Message to send
-     *     @return int                <0 if KO, or number of changes if OK
+     *  @param  string $subject	  Subject
+     *  @param  string $texte      Message to send
+     *  @return int                <0 if KO, or number of changes if OK
      */
     public function messageSend($subject, $texte)
     {
@@ -2138,7 +2138,8 @@ class Ticketsup extends CommonObject
                 $sendto = $obj->firstname . " " . $obj->lastname . " <" . $obj->email . ">";
                 $actiondefid = $obj->adid;
 
-                if (dol_strlen($sendto)) {
+                if (dol_strlen($sendto))
+                {
                     include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
                     $application = ($conf->global->MAIN_APPLICATION_TITLE ? $conf->global->MAIN_APPLICATION_TITLE : 'Dolibarr ERP/CRM');
 
@@ -2239,12 +2240,13 @@ class Ticketsup extends CommonObject
      *    Get array of all contacts for a ticket
      *    Override method of file commonobject.class.php to add phone number
      *
-     *    @param  int    $statut 	Status of lines to get (-1=all)
-     *    @param  string $source 	Source of contact: external or thirdparty (llx_socpeople) or internal (llx_user)
-     *    @param  int    $list   	0:Return array contains all properties, 1:Return array contains just id
-     *    @return array          	Array of contacts
+     *    @param	int    	$statut 	Status of lines to get (-1=all)
+     *    @param	string 	$source 	Source of contact: external or thirdparty (llx_socpeople) or internal (llx_user)
+     *    @param	int    	$list   	0:Return array contains all properties, 1:Return array contains just id
+     *    @param	string	$code		Code
+     *    @return 	array          		Array of contacts
      */
-    public function liste_contact($statut = -1, $source = 'external', $list = 0, $code = '')
+    function liste_contact($statut = -1, $source = 'external', $list = 0, $code = '')
     {
         global $langs;
 
@@ -2454,12 +2456,12 @@ class Ticketsup extends CommonObject
     }
 
     /**
-	 *  Affiche la premiere photo du ticket
+	 *  Return if at least one photo is available
 	 *
-	 *  @param  string 	$sdir 		Repertoire a scanner
-	 *  @return boolean             true si photo dispo, false sinon
+	 *  @param      string		$sdir       Directory to scan
+	 *  @return     boolean     			True if at least one photo is available, False if not
 	 */
-    public function is_photo_available($sdir)
+    function is_photo_available($sdir)
     {
         include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
@@ -2501,7 +2503,7 @@ class Ticketsup extends CommonObject
      *  @param 	int    $nolink       Do not add a href link to view enlarged imaged into a new tab
      *  @return string                    Html code to show photo. Number of photos shown is saved in this->nbphoto
      */
-    public function show_photos($sdir, $size = 0, $nbmax = 0, $nbbyrow = 5, $showfilename = 0, $showaction = 0, $maxHeight = 120, $maxWidth = 160, $nolink = 0)
+    function show_photos($sdir, $size = 0, $nbmax = 0, $nbbyrow = 5, $showfilename = 0, $showaction = 0, $maxHeight = 120, $maxWidth = 160, $nolink = 0)
     {
         global $conf, $user, $langs;
 

From dea80eba4ebfd5f64386ba11e3badb13b10046ff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Mar 2018 18:06:08 +0100
Subject: [PATCH 7/7] Use a constant name starting with MAIN

---
 htdocs/core/modules/DolibarrModules.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index c1c570e8269..160499d3a45 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1049,7 +1049,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 					{
 						if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data')
 						{
-							$result=run_sql($dir.$file, empty($conf->global->INSTALL_DISPLAY_SQL_LOG)?0:1, '', 1);
+							$result=run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG)?0:1, '', 1);
 							if ($result <= 0) $error++;
 						}
 					}
@@ -1067,7 +1067,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 					{
 						if (preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data')
 						{
-							$result=run_sql($dir.$file, empty($conf->global->INSTALL_DISPLAY_SQL_LOG)?0:1, '', 1);
+							$result=run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG)?0:1, '', 1);
 							if ($result <= 0) $error++;
 						}
 					}
@@ -1085,7 +1085,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 					{
 						if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'data')
 						{
-							$result=run_sql($dir.$file, empty($conf->global->INSTALL_DISPLAY_SQL_LOG)?0:1, '', 1);
+							$result=run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG)?0:1, '', 1);
 							if ($result <= 0) $error++;
 						}
 					}
@@ -1103,7 +1103,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 					{
 						if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,6) == 'update')
 						{
-							$result=run_sql($dir.$file, empty($conf->global->INSTALL_DISPLAY_SQL_LOG)?0:1, '', 1);
+							$result=run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG)?0:1, '', 1);
 							if ($result <= 0) $error++;
 						}
 					}