Merge branch 'develop' into ticketsup_core

Dolibarr · Mar 11, 2018 · 2464fad · 2464fad
2 parents 5656e17 + e393621
commit 2464fad
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/htdocs/ticketsup/card.php b/htdocs/ticketsup/card.php
@@ -224,7 +224,7 @@
             $object->dao->label .= $object->dao->origin_email . ' <small>(' . $langs->trans("TicketEmailOriginIssuer") . ')</small>';
         }
         $linkback = '<a href="' . dol_buildpath('/ticketsup/list.php', 1) . '"><strong>' . $langs->trans("BackToList") . '</strong></a> ';
-        $object->dao->ticketsup_banner_tab('ref', '', ($user->societe_id ? 0 : 1), 'ref', 'subject', '', '', '', $morehtmlleft, $linkback);
+        $object->dao->ticketsupBannerTab('ref', '', ($user->societe_id ? 0 : 1), 'ref', 'subject', '', '', '', $morehtmlleft, $linkback);
 
         print '<div class="fichecenter"><div class="fichehalfleft">';
         print '<div class="underbanner clearboth"></div>';

diff --git a/htdocs/ticketsup/class/ticketsup.class.php b/htdocs/ticketsup/class/ticketsup.class.php
@@ -1328,7 +1328,7 @@ public function getNomUrl($withpicto = 0, $option = '')
 
         return $result;
     }
-
+    
     /**
      * Mark a message as read
      * 
@@ -1342,7 +1342,7 @@ public function markAsRead($user, $notrigger = 0)
 
         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;
@@ -1925,7 +1925,7 @@ public function setCustomer($id)
             $sql = "UPDATE " . MAIN_DB_PREFIX . "ticketsup";
             $sql .= " SET fk_soc = " . ($id > 0 ? $id : "null");
             $sql .= " WHERE rowid = " . $this->id;
-            dol_syslog(get_class($this) . '::set_customer sql=' . $sql);
+            dol_syslog(get_class($this) . '::setCustomer sql=' . $sql);
             $resql = $this->db->query($sql);
             if ($resql) {
                 return 1;
@@ -2082,6 +2082,7 @@ public function getIdTicketCustomerInvolvedContact()
     /**
      * Return id of all contacts for ticket
      *
+     * @return	array		Array of contacts for tickets
      */
     public function getTicketAllContacts()
     {
@@ -2238,10 +2239,10 @@ public function messageSend($subject, $texte)
      *    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
+     *    @return array          	Array of contacts
      */
     public function listeContact($statut = -1, $source = 'external', $list = 0)
     {
@@ -2394,7 +2395,7 @@ public function getDefaultRef($thirdparty = '')
 	 *  @param  string $morehtmlright More html code to show before navigation arrows
 	 *  @return void
 	 */
-    function ticketsup_banner_tab($paramid, $morehtml = '', $shownav = 1, $fieldid = 'id', $fieldref = 'ref', $morehtmlref = '', $moreparam = '', $nodbprefix = 0, $morehtmlleft = '', $morehtmlright = '')
+    public function ticketsupBannerTab($paramid, $morehtml = '', $shownav = 1, $fieldid = 'id', $fieldref = 'ref', $morehtmlref = '', $moreparam = '', $nodbprefix = 0, $morehtmlleft = '', $morehtmlright = '')
     {
         global $conf, $form, $user, $langs;
 

diff --git a/htdocs/ticketsup/contacts.php b/htdocs/ticketsup/contacts.php
@@ -155,7 +155,7 @@
             $object->label .= $fuser->getNomUrl(0);
         }
         $linkback = '<a href="' . dol_buildpath('/ticketsup/list.php', 1) . '"><strong>' . $langs->trans("BackToList") . '</strong></a> ';
-        $object->ticketsup_banner_tab('ref', '', ($user->societe_id ? 0 : 1), 'ref', 'subject', '', '', '', $morehtmlleft, $linkback);
+        $object->ticketsupBannerTab('ref', '', ($user->societe_id ? 0 : 1), 'ref', 'subject', '', '', '', $morehtmlleft, $linkback);
 
         dol_fiche_end();
         print '<br>';

diff --git a/htdocs/ticketsup/document.php b/htdocs/ticketsup/document.php
@@ -133,7 +133,7 @@
         $object->label .= $fuser->getNomUrl(0);
     }
     $linkback = '<a href="' . dol_buildpath('/ticketsup/list.php', 1) . '"><strong>' . $langs->trans("BackToList") . '</strong></a> ';
-    $object->ticketsup_banner_tab('ref', '', ($user->societe_id ? 0 : 1), 'ref', 'subject', '', '', '', $morehtmlleft, $linkback);
+    $object->ticketsupBannerTab('ref', '', ($user->societe_id ? 0 : 1), 'ref', 'subject', '', '', '', $morehtmlleft, $linkback);
 
     dol_fiche_end();
 

diff --git a/htdocs/ticketsup/history.php b/htdocs/ticketsup/history.php
@@ -113,7 +113,7 @@
             $object->dao->label .= $fuser->getNomUrl(0);
         }
         $linkback = '<a href="' . dol_buildpath('/ticketsup/list.php', 1) . '"><strong>' . $langs->trans("BackToList") . '</strong></a> ';
-        $object->dao->ticketsup_banner_tab('ref', '', ($user->societe_id ? 0 : 1), 'ref', 'subject', '', '', '', $morehtmlleft, $linkback);
+        $object->dao->ticketsupBannerTab('ref', '', ($user->societe_id ? 0 : 1), 'ref', 'subject', '', '', '', $morehtmlleft, $linkback);
 
         dol_fiche_end();