diff --git a/htdocs/ticketsup/card.php b/htdocs/ticketsup/card.php index 5d005063b8b..cdf026a9a0a 100644 --- a/htdocs/ticketsup/card.php +++ b/htdocs/ticketsup/card.php @@ -224,7 +224,7 @@ if ($action == 'view' || $action == 'add_message' || $action == 'close' || $acti $object->dao->label .= $object->dao->origin_email . ' (' . $langs->trans("TicketEmailOriginIssuer") . ')'; } $linkback = '' . $langs->trans("BackToList") . ' '; - $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 '
'; print '
'; diff --git a/htdocs/ticketsup/class/actions_ticketsup.class.php b/htdocs/ticketsup/class/actions_ticketsup.class.php index bc532619ce5..c5ddadf6a54 100644 --- a/htdocs/ticketsup/class/actions_ticketsup.class.php +++ b/htdocs/ticketsup/class/actions_ticketsup.class.php @@ -475,7 +475,7 @@ class ActionsTicketsup // Set parent company if ($action == 'set_thirdparty' && $user->rights->societe->creer) { if ($this->fetch(GETPOST('id', 'int'), GETPOST('track_id', 'alpha')) >= 0) { - $result = $this->dao->set_customer(GETPOST('editcustomer', 'int')); + $result = $this->dao->setCustomer(GETPOST('editcustomer', 'int')); $url = 'card.php?action=view&track_id=' . GETPOST('track_id', 'alpha'); header("Location: " . $url); exit(); @@ -1329,7 +1329,7 @@ class ActionsTicketsup * @param int $fieldid Id * @return int 0 */ - public function load_previous_next_ref($filter, $fieldid) + function load_previous_next_ref($filter, $fieldid) { $this->getInstanceDao(); return $this->dao->load_previous_next_ref($filter, $fieldid); diff --git a/htdocs/ticketsup/class/ticketsup.class.php b/htdocs/ticketsup/class/ticketsup.class.php index 531ebec308a..ae3a6c67fc1 100644 --- a/htdocs/ticketsup/class/ticketsup.class.php +++ b/htdocs/ticketsup/class/ticketsup.class.php @@ -1052,7 +1052,7 @@ class Ticketsup extends CommonObject * * @return int Nb lignes chargees, 0 si deja chargees, <0 si ko */ - public function load_cache_categories_tickets() + function load_cache_categories_tickets() { global $langs; @@ -1129,9 +1129,10 @@ class Ticketsup extends CommonObject } /** - * \brief 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 + * 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 */ public function getLibStatut($mode = 0) { @@ -1139,10 +1140,11 @@ class Ticketsup extends CommonObject } /** - * \brief Return status label of object - * \param statut id statut - * \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 + * 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) { @@ -1324,12 +1326,13 @@ class Ticketsup extends CommonObject return $result; } - + /** * Mark a message as read * - * @param User $user Object user - * @return int <0 if KO, >0 if OK + * @param User $user Object user + * @param int $notrigger No trigger + * @return int <0 if KO, >0 if OK */ public function markAsRead($user, $notrigger = 0) { @@ -1337,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; @@ -1914,13 +1917,13 @@ class Ticketsup extends CommonObject * @param int $id Id of thirdparty to set or '' to remove * @return int <0 if KO, >0 if OK */ - public function set_customer($id) + public function setCustomer($id) { if ($this->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; @@ -2077,7 +2080,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 for tickets */ public function getTicketAllContacts() { @@ -2236,10 +2239,10 @@ 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 + * @return array Array of contacts */ public function liste_contact($statut = -1, $source = 'external', $list = 0, $code = '') { @@ -2393,7 +2396,7 @@ class Ticketsup extends CommonObject * @param string $morehtmlright More html code to show before navigation arrows * @return void */ - public 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 index 0a04c8ce509..72b72ac0e57 100644 --- a/htdocs/ticketsup/contacts.php +++ b/htdocs/ticketsup/contacts.php @@ -155,7 +155,7 @@ if ($id > 0 || !empty($track_id) || !empty($ref)) { $object->label .= $fuser->getNomUrl(0); } $linkback = '' . $langs->trans("BackToList") . ' '; - $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 '
'; diff --git a/htdocs/ticketsup/document.php b/htdocs/ticketsup/document.php index ee1fc47f5d3..f9d96beaf1f 100644 --- a/htdocs/ticketsup/document.php +++ b/htdocs/ticketsup/document.php @@ -133,7 +133,7 @@ if ($object->id) { $object->label .= $fuser->getNomUrl(0); } $linkback = '' . $langs->trans("BackToList") . ' '; - $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 index fe0194e759c..48ba39a2b02 100644 --- a/htdocs/ticketsup/history.php +++ b/htdocs/ticketsup/history.php @@ -113,7 +113,7 @@ if ($action == 'view') { $object->dao->label .= $fuser->getNomUrl(0); } $linkback = '' . $langs->trans("BackToList") . ' '; - $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();