From fb93b179c1c31689008fe37e57d7adb0b54cbf6e Mon Sep 17 00:00:00 2001 From: "Sekan, Tobias" Date: Mon, 7 Sep 2020 12:09:58 +0200 Subject: [PATCH 1/3] Show ids on user/group rights (only admin) --- htdocs/user/group/perms.php | 445 ++++++++++++++++++------------------ htdocs/user/perms.php | 205 +++++++++-------- 2 files changed, 334 insertions(+), 316 deletions(-) diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index 71f8f5b0ebd..d34f05fa361 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -1,9 +1,10 @@ - * Copyright (C) 2002-2003 Jean-Louis Bergamo - * Copyright (C) 2004-2020 Laurent Destailleur - * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2017 Regis Houssin +/* Copyright (C) 2002-2005 Rodolphe Quiedeville + * Copyright (C) 2002-2003 Jean-Louis Bergamo + * Copyright (C) 2004-2020 Laurent Destailleur + * Copyright (C) 2004 Eric Seigne + * Copyright (C) 2005-2017 Regis Houssin + * Copyright (C) 2020 Tobias Sekan * * 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 @@ -20,8 +21,8 @@ */ /** - * \file htdocs/user/group/perms.php - * \brief Onglet user et permissions de la fiche utilisateur + * \file htdocs/user/group/perms.php + * \brief Onglet user et permissions de la fiche utilisateur */ require '../../main.inc.php'; @@ -48,9 +49,9 @@ $caneditperms = ($user->admin || $user->rights->user->user->creer); $advancedpermsactive = false; if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) { - $advancedpermsactive = true; - $canreadperms = ($user->admin || ($user->rights->user->group_advance->read && $user->rights->user->group_advance->readperms)); - $caneditperms = ($user->admin || $user->rights->user->group_advance->write); + $advancedpermsactive = true; + $canreadperms = ($user->admin || ($user->rights->user->group_advance->read && $user->rights->user->group_advance->readperms)); + $caneditperms = ($user->admin || $user->rights->user->group_advance->write); } if (!$canreadperms) accessforbidden(); @@ -112,251 +113,259 @@ llxHeader('', $langs->trans("Permissions")); if ($object->id > 0) { /* - * Affichage onglets - */ + * Affichage onglets + */ $object->getrights(); // Reload permission - $head = group_prepare_head($object); - $title = $langs->trans("Group"); - dol_fiche_head($head, 'rights', $title, -1, 'group'); + $head = group_prepare_head($object); + $title = $langs->trans("Group"); + dol_fiche_head($head, 'rights', $title, -1, 'group'); - // Charge les modules soumis a permissions - $modules = array(); - $modulesdir = dolGetModulesDirs(); + // Charge les modules soumis a permissions + $modules = array(); + $modulesdir = dolGetModulesDirs(); - $db->begin(); + $db->begin(); - foreach ($modulesdir as $dir) - { - $handle = @opendir(dol_osencode($dir)); - if (is_resource($handle)) - { - while (($file = readdir($handle)) !== false) - { - if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') - { - $modName = substr($file, 0, dol_strlen($file) - 10); + foreach ($modulesdir as $dir) + { + $handle = @opendir(dol_osencode($dir)); + if (is_resource($handle)) + { + while (($file = readdir($handle)) !== false) + { + if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') + { + $modName = substr($file, 0, dol_strlen($file) - 10); - if ($modName) - { - include_once $dir.$file; - $objMod = new $modName($db); - // Load all lang files of module - if (isset($objMod->langfiles) && is_array($objMod->langfiles)) - { - foreach ($objMod->langfiles as $domain) - { - $langs->load($domain); - } - } - // Load all permissions - if ($objMod->rights_class) - { - $ret = $objMod->insert_permissions(0, $entity); - $modules[$objMod->rights_class] = $objMod; - } - } - } - } - } - } + if ($modName) + { + include_once $dir.$file; + $objMod = new $modName($db); + // Load all lang files of module + if (isset($objMod->langfiles) && is_array($objMod->langfiles)) + { + foreach ($objMod->langfiles as $domain) + { + $langs->load($domain); + } + } + // Load all permissions + if ($objMod->rights_class) + { + $ret = $objMod->insert_permissions(0, $entity); + $modules[$objMod->rights_class] = $objMod; + } + } + } + } + } + } - $db->commit(); + $db->commit(); - // Read permissions of group - $permsgroupbyentity = array(); + // Read permissions of group + $permsgroupbyentity = array(); - $sql = "SELECT DISTINCT r.id, r.libelle, r.module, gr.entity"; - $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r,"; - $sql .= " ".MAIN_DB_PREFIX."usergroup_rights as gr"; - $sql .= " WHERE gr.fk_id = r.id"; - $sql .= " AND gr.entity = ".$entity; - $sql .= " AND gr.fk_usergroup = ".$object->id; + $sql = "SELECT DISTINCT r.id, r.libelle, r.module, gr.entity"; + $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r,"; + $sql .= " ".MAIN_DB_PREFIX."usergroup_rights as gr"; + $sql .= " WHERE gr.fk_id = r.id"; + $sql .= " AND gr.entity = ".$entity; + $sql .= " AND gr.fk_usergroup = ".$object->id; - dol_syslog("get user perms", LOG_DEBUG); - $result = $db->query($sql); - if ($result) - { - $num = $db->num_rows($result); - $i = 0; - while ($i < $num) - { - $obj = $db->fetch_object($result); - if (!isset($permsgroupbyentity[$obj->entity])) - $permsgroupbyentity[$obj->entity] = array(); - array_push($permsgroupbyentity[$obj->entity], $obj->id); - $i++; - } - $db->free($result); - } else { - dol_print_error($db); - } + dol_syslog("get user perms", LOG_DEBUG); + $result = $db->query($sql); + if ($result) + { + $num = $db->num_rows($result); + $i = 0; + while ($i < $num) + { + $obj = $db->fetch_object($result); + if (!isset($permsgroupbyentity[$obj->entity])) + $permsgroupbyentity[$obj->entity] = array(); + array_push($permsgroupbyentity[$obj->entity], $obj->id); + $i++; + } + $db->free($result); + } else { + dol_print_error($db); + } - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; - dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin); + dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin); - print '
'; - print '
'; + print '
'; + print '
'; - /* - * Ecran ajout/suppression permission - */ + /* + * Ecran ajout/suppression permission + */ - print ''; + print '
'; - // Name (already in dol_banner, we keep it to have the GlobalGroup picto, but we should move it in dol_banner) - if (!empty($conf->mutlicompany->enabled)) - { - print ''; - print '\n"; - } + // Name (already in dol_banner, we keep it to have the GlobalGroup picto, but we should move it in dol_banner) + if (!empty($conf->mutlicompany->enabled)) + { + print ''; + print '\n"; + } - // Note - print ''; - print ''; - print "\n"; + // Note + print ''; + print ''; + print "\n"; - print '
'.$langs->trans("Name").''.$object->name.''; - if (!$object->entity) - { - print img_picto($langs->trans("GlobalGroup"), 'redstar'); - } - print "
'.$langs->trans("Name").''.$object->name.''; + if (!$object->entity) + { + print img_picto($langs->trans("GlobalGroup"), 'redstar'); + } + print "
'.$langs->trans("Description").''; - print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note)); - print '
'.$langs->trans("Description").''; + print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note)); + print '

'; + print '
'; - if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules")); + if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules")); - $parameters = array(); - $reshook = $hookmanager->executeHooks('insertExtraHeader', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks - if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + $parameters = array(); + $reshook = $hookmanager->executeHooks('insertExtraHeader', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - print "\n"; - print '
'; - print ''; - print ''; - print ''; - if ($caneditperms) - { - print ''; - } - print ''; - print ''; - print ''."\n"; + print "\n"; + print '
'; + print '
'.$langs->trans("Module").''; - print ''.$langs->trans("All").""; - print '/'; - print ''.$langs->trans("None").""; - print ' '.$langs->trans("Permissions").'
'; + print ''; + print ''; + if ($caneditperms) + { + print ''; + } + print ''; + print ''; + if ($user->admin) print ''; + print ''."\n"; - $sql = "SELECT r.id, r.libelle as label, r.module"; - $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r"; - $sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous" - $sql .= " AND r.entity = ".$entity; - if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is disable - $sql .= " ORDER BY r.module, r.id"; + $sql = "SELECT r.id, r.libelle as label, r.module"; + $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r"; + $sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous" + $sql .= " AND r.entity = ".$entity; + if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is disable + $sql .= " ORDER BY r.module, r.id"; - $result = $db->query($sql); - if ($result) - { - $num = $db->num_rows($result); - $i = 0; - $oldmod = ''; + $result = $db->query($sql); + if ($result) + { + $num = $db->num_rows($result); + $i = 0; + $oldmod = ''; - while ($i < $num) - { - $obj = $db->fetch_object($result); + while ($i < $num) + { + $obj = $db->fetch_object($result); - // If line is for a module that doe snot existe anymore (absent of includes/module), we ignore it - if (empty($modules[$obj->module])) - { - $i++; - continue; - } + // If line is for a module that doe snot existe anymore (absent of includes/module), we ignore it + if (empty($modules[$obj->module])) + { + $i++; + continue; + } - if ($oldmod <> $obj->module) - { - $oldmod = $obj->module; + if ($oldmod <> $obj->module) + { + $oldmod = $obj->module; - // Break detected, we get objMod - $objMod = $modules[$obj->module]; - $picto = ($objMod->picto ? $objMod->picto : 'generic'); + // Break detected, we get objMod + $objMod = $modules[$obj->module]; + $picto = ($objMod->picto ? $objMod->picto : 'generic'); - // Show break line - print ''; - print ''; - if ($caneditperms) - { - print ''; - } else { - print ''; - } - print ''; - print ''; - } + // Show break line + print ''; + print ''; + if ($caneditperms) + { + print ''; + } else { + print ''; + } + print ''; - print ''."\n"; - print ''; + // Module id + if ($user->admin) print ''; - // Picto and label of module - print ''; + print ''; + } + + print ''."\n"; + print ''; + + // Picto and label of module + print ''; - if (is_array($permsgroupbyentity[$entity])) - { - if (in_array($obj->id, $permsgroupbyentity[$entity])) - { - // Own permission by group - if ($caneditperms) - { - print ''; - } - print ''; - } else { - // Do not own permission - if ($caneditperms) - { - print ''; - } - print ''; - } - } else { - // Do not own permission - if ($caneditperms) - { - print ''; - } - print ''; - } + if (is_array($permsgroupbyentity[$entity])) + { + if (in_array($obj->id, $permsgroupbyentity[$entity])) + { + // Own permission by group + if ($caneditperms) + { + print ''; + } + print ''; + } else { + // Do not own permission + if ($caneditperms) + { + print ''; + } + print ''; + } + } else { + // Do not own permission + if ($caneditperms) + { + print ''; + } + print ''; + } - $permlabel = ($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $langs->trans($obj->label))); - print ''; + $permlabel = ($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $langs->trans($obj->label))); + print ''; - print ''."\n"; + // Permission id + if ($user->admin) print ''; - $i++; - } - } - print '
'.$langs->trans("Module").''; + print ''.$langs->trans("All").""; + print '/'; + print ''.$langs->trans("None").""; + print ' '.$langs->trans("Permissions").''.$langs->trans("ID").'
'; - print img_object('', $picto, 'class="pictoobjectwidth paddingright"').' '.$objMod->getName(); - print ''; - print ''; - print 'module.'">'.$langs->trans("All").""; - print '/'; - print 'module.'">'.$langs->trans("None").""; - print '  
'; + print img_object('', $picto, 'class="pictoobjectwidth paddingright"').' '.$objMod->getName(); + print ''; + print ''; + print 'module.'">'.$langs->trans("All").""; + print '/'; + print 'module.'">'.$langs->trans("None").""; + print '  
'. $objMod->numero.''; - //print img_object('', $picto, 'class="inline-block pictoobjectwidth"').' '.$objMod->getName(); - print '
'; + //print img_object('', $picto, 'class="inline-block pictoobjectwidth"').' '.$objMod->getName(); + print 'id.'">'.img_edit_remove($langs->trans("Remove")).''; - print img_picto($langs->trans("Active"), 'tick'); - print 'id.'">'.img_edit_add($langs->trans("Add")).' id.'">'.img_edit_add($langs->trans("Add")).' id.'">'.img_edit_remove($langs->trans("Remove")).''; + print img_picto($langs->trans("Active"), 'tick'); + print 'id.'">'.img_edit_add($langs->trans("Add")).' id.'">'.img_edit_add($langs->trans("Add")).' '.$permlabel.''.$permlabel.'
'.$obj->id.'
'; - print '
'; + print ''."\n"; - print '
'; + $i++; + } + } + print ''; + print '
'; - $parameters = array(); - $reshook = $hookmanager->executeHooks('insertExtraFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks - if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + print ''; - dol_fiche_end(); + $parameters = array(); + $reshook = $hookmanager->executeHooks('insertExtraFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks + if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + + dol_fiche_end(); } // End of page diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index 606380acd7c..4b99cfb7e18 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -5,6 +5,7 @@ * Copyright (C) 2004 Eric Seigne * Copyright (C) 2005-2017 Regis Houssin * Copyright (C) 2012 Juanjo Menent + * Copyright (C) 2020 Tobias Sekan * * 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,8 +22,8 @@ */ /** - * \file htdocs/user/perms.php - * \brief Onglet user et permissions de la fiche utilisateur + * \file htdocs/user/perms.php + * \brief Onglet user et permissions de la fiche utilisateur */ require '../main.inc.php'; @@ -164,25 +165,25 @@ foreach ($modulesdir as $dir) include_once $dir.$file; $objMod = new $modName($db); - // Load all lang files of module - if (isset($objMod->langfiles) && is_array($objMod->langfiles)) - { - foreach ($objMod->langfiles as $domain) - { - $langs->load($domain); - } - } - // Load all permissions - if ($objMod->rights_class) - { - $ret = $objMod->insert_permissions(0, $entity); - $modules[$objMod->rights_class] = $objMod; - //print "modules[".$objMod->rights_class."]=$objMod;"; - } - } - } - } - } + // Load all lang files of module + if (isset($objMod->langfiles) && is_array($objMod->langfiles)) + { + foreach ($objMod->langfiles as $domain) + { + $langs->load($domain); + } + } + // Load all permissions + if ($objMod->rights_class) + { + $ret = $objMod->insert_permissions(0, $entity); + $modules[$objMod->rights_class] = $objMod; + //print "modules[".$objMod->rights_class."]=$objMod;"; + } + } + } + } + } } $db->commit(); @@ -285,6 +286,7 @@ if (($caneditperms && empty($objMod->rights_admin_allowed)) || empty($object->ad print ' '; } print ''.$langs->trans("Permissions").''; +if ($user->admin) print ''.$langs->trans("ID").''; print ''."\n"; //print "xx".$conf->global->MAIN_USE_ADVANCED_PERMS; @@ -336,35 +338,39 @@ if ($result) $objMod = $modules[$obj->module]; $picto = ($objMod->picto ? $objMod->picto : 'generic'); - // Show break line - print ''; - print ''; - print img_object('', $picto, 'class="pictoobjectwidth paddingright"').' '.$objMod->getName(); - print ''; - print ''; - if (($caneditperms && empty($objMod->rights_admin_allowed)) || empty($object->admin)) - { - if ($caneditperms) - { - print ''; - print 'module.'">'.$langs->trans("All").""; - print ' / '; - print 'module.'">'.$langs->trans("None").""; - print ''; - } - print ' '; - } else { - if ($caneditperms) - { - print ' '; - } - print ' '; - } - print ' '; - print ''."\n"; - } + // Show break line + print ''; + print ''; + print img_object('', $picto, 'class="pictoobjectwidth paddingright"').' '.$objMod->getName(); + print ''; + print ''; + if (($caneditperms && empty($objMod->rights_admin_allowed)) || empty($object->admin)) + { + if ($caneditperms) + { + print ''; + print 'module.'">'.$langs->trans("All").""; + print ' / '; + print 'module.'">'.$langs->trans("None").""; + print ''; + } + print ' '; + } else { + if ($caneditperms) + { + print ' '; + } + print ' '; + } + print ' '; - print ''."\n"; + // Module Id + if ($user->admin) print ''. $objMod->numero.''; + + print ''."\n"; + } + + print ''."\n"; print ''; // Picto and label of module @@ -372,59 +378,62 @@ if ($result) //print img_object('', $picto, 'class="pictoobjectwidth"').' '.$objMod->getName(); print ''; - // Permission and tick - if (!empty($object->admin) && !empty($objMod->rights_admin_allowed)) // Permission granted because admin - { - if ($caneditperms) - { - print ''.img_picto($langs->trans("Administrator"), 'star').''; - } - print ''; - print img_picto($langs->trans("Active"), 'tick'); - print ''; - } elseif (in_array($obj->id, $permsuser)) // Permission granted by user - { - if ($caneditperms) - { - print 'id.'">'.img_edit_remove($langs->trans("Remove")).''; - } - print ''; - print img_picto($langs->trans("Active"), 'tick'); - print ''; - } elseif (is_array($permsgroupbyentity[$entity])) - { - if (in_array($obj->id, $permsgroupbyentity[$entity])) // Permission granted by group - { - if ($caneditperms) - { - print ''; - print $form->textwithtooltip($langs->trans("Inherited"), $langs->trans("PermissionInheritedFromAGroup")); - print ''; - } - print ''; - print img_picto($langs->trans("Active"), 'tick'); - print ''; - } else { - // Do not own permission - if ($caneditperms) - { - print 'id.'">'.img_edit_add($langs->trans("Add")).''; - } - print ' '; - } - } else { - // Do not own permission - if ($caneditperms) - { - print 'id.'">'.img_edit_add($langs->trans("Add")).''; - } - print ' '; - } + // Permission and tick + if (!empty($object->admin) && !empty($objMod->rights_admin_allowed)) // Permission granted because admin + { + if ($caneditperms) + { + print ''.img_picto($langs->trans("Administrator"), 'star').''; + } + print ''; + print img_picto($langs->trans("Active"), 'tick'); + print ''; + } elseif (in_array($obj->id, $permsuser)) // Permission granted by user + { + if ($caneditperms) + { + print 'id.'">'.img_edit_remove($langs->trans("Remove")).''; + } + print ''; + print img_picto($langs->trans("Active"), 'tick'); + print ''; + } elseif (is_array($permsgroupbyentity[$entity])) + { + if (in_array($obj->id, $permsgroupbyentity[$entity])) // Permission granted by group + { + if ($caneditperms) + { + print ''; + print $form->textwithtooltip($langs->trans("Inherited"), $langs->trans("PermissionInheritedFromAGroup")); + print ''; + } + print ''; + print img_picto($langs->trans("Active"), 'tick'); + print ''; + } else { + // Do not own permission + if ($caneditperms) + { + print 'id.'">'.img_edit_add($langs->trans("Add")).''; + } + print ' '; + } + } else { + // Do not own permission + if ($caneditperms) + { + print 'id.'">'.img_edit_add($langs->trans("Add")).''; + } + print ' '; + } - // Label + // Label $permlabel = ($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $langs->trans($obj->label))); print ''.$permlabel.''; + // Permission id + if ($user->admin) print ''.$obj->id.''; + print ''."\n"; $i++; From 84ccc91a9c967ac448046d7fcb46f4e7dd754cf7 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Mon, 7 Sep 2020 10:23:15 +0000 Subject: [PATCH 2/3] Fixing style errors. --- htdocs/user/group/perms.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index d34f05fa361..d8d6c74f00b 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -307,10 +307,10 @@ if ($object->id > 0) print ''; } - + print ''."\n"; print ''; - + // Picto and label of module print ''; //print img_object('', $picto, 'class="inline-block pictoobjectwidth"').' '.$objMod->getName(); From 8aceab802f362400fcb95d1807ceb15f0e76ddbe Mon Sep 17 00:00:00 2001 From: Scrutinizer Auto-Fixer Date: Mon, 7 Sep 2020 10:29:37 +0000 Subject: [PATCH 3/3] Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com --- htdocs/public/ticket/create_ticket.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php index 329c557e2f8..bc91273816b 100644 --- a/htdocs/public/ticket/create_ticket.php +++ b/htdocs/public/ticket/create_ticket.php @@ -208,12 +208,12 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) { // Send email to customer $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubject', $object->ref, $object->track_id); - $message = ($conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody')) . '

'; - $message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket') . '
'; + $message = ($conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody')).'

'; + $message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket').'
'; $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id; - $infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', ''.$object->track_id.'') . '
'; - $infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl') . '

'; + $infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', ''.$object->track_id.'').'
'; + $infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl').'

'; $message .= $infos_new_ticket; $message .= $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE ? $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE : $langs->transnoentities('TicketMessageMailSignatureText'); @@ -245,7 +245,7 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) { if ($sendto) { $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin', $object->ref, $object->track_id); - $message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id) . '

'; + $message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id).'

'; $message_admin .= '
  • '.$langs->trans('Title').' : '.$object->subject.'
    • '; $message_admin .= '
  • '.$langs->trans('Type').' : '.$object->type_label.'
    • '; $message_admin .= '
  • '.$langs->trans('Category').' : '.$object->category_label.'
    • '; @@ -256,7 +256,7 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) { if (is_array($object->array_options) && count($object->array_options) > 0) { foreach ($object->array_options as $key => $value) { $key = substr($key, 8); // remove "options_" - $message_admin .= '
  • ' . $langs->trans($extrafields->attributes[$object->element]['label'][$key]) . ' : ' . $extrafields->showOutputField($key, $value) . '
    • '; + $message_admin .= '
  • '.$langs->trans($extrafields->attributes[$object->element]['label'][$key]).' : '.$extrafields->showOutputField($key, $value).'
    • '; } } $message_admin .= '
';