';
print $out;
print '
';
}
@@ -278,7 +278,7 @@ class FormFile
}
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Show the box with list of available documents for object
*
@@ -303,7 +303,7 @@ class FormFile
*/
public function show_documents($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed = 0, $modelselected = '', $allowgenifempty = 1, $forcenomultilang = 0, $iconPDF = 0, $notused = 0, $noform = 0, $param = '', $title = '', $buttonlabel = '', $codelang = '')
{
- // phpcs:enable
+ // phpcs:enable
$this->numoffiles = 0;
print $this->showdocuments($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed, $modelselected, $allowgenifempty, $forcenomultilang, $iconPDF, $notused, $noform, $param, $title, $buttonlabel, $codelang);
return $this->numoffiles;
@@ -454,13 +454,13 @@ class FormFile
$modellist = ModelePDFExpedition::liste_modeles($this->db);
}
} elseif ($modulepart == 'reception')
- {
- if (is_array($genallowed)) $modellist = $genallowed;
- else {
+ {
+ if (is_array($genallowed)) $modellist = $genallowed;
+ else {
include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
$modellist = ModelePdfReception::liste_modeles($this->db);
}
- } elseif ($modulepart == 'livraison')
+ } elseif ($modulepart == 'livraison')
{
if (is_array($genallowed)) $modellist = $genallowed;
else {
@@ -611,16 +611,16 @@ class FormFile
$modellist = ModelePDFUserGroup::liste_modeles($this->db);
}
} else {
- $submodulepart = $modulepart;
+ $submodulepart = $modulepart;
- // modulepart = 'nameofmodule' or 'nameofmodule:NameOfObject'
- $tmp = explode(':', $modulepart);
- if (!empty($tmp[1])) {
- $modulepart = $tmp[0];
- $submodulepart = $tmp[1];
- }
+ // modulepart = 'nameofmodule' or 'nameofmodule:NameOfObject'
+ $tmp = explode(':', $modulepart);
+ if (!empty($tmp[1])) {
+ $modulepart = $tmp[0];
+ $submodulepart = $tmp[1];
+ }
- // For normalized standard modules
+ // For normalized standard modules
$file = dol_buildpath('/core/modules/'.$modulepart.'/modules_'.strtolower($submodulepart).'.php', 0);
if (file_exists($file))
{
@@ -628,7 +628,7 @@ class FormFile
}
// For normalized external modules.
else {
- $file = dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.strtolower($submodulepart).'.php', 0);
+ $file = dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.strtolower($submodulepart).'.php', 0);
$res = include_once $file;
}
@@ -992,7 +992,7 @@ class FormFile
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Show list of documents in $filearray (may be they are all in same directory but may not)
* This also sync database if $upload_dir is defined.
@@ -1027,7 +1027,7 @@ class FormFile
*/
public function list_of_documents($filearray, $object, $modulepart, $param = '', $forcedownload = 0, $relativepath = '', $permonobject = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $title = '', $url = '', $showrelpart = 0, $permtoeditline = -1, $upload_dir = '', $sortfield = '', $sortorder = 'ASC', $disablemove = 1, $addfilterfields = 0, $disablecrop = -1)
{
- // phpcs:enable
+ // phpcs:enable
global $user, $conf, $langs, $hookmanager;
global $sortfield, $sortorder, $maxheightmini;
global $dolibarr_main_url_root;
@@ -1049,7 +1049,7 @@ class FormFile
// For backward compatiblity, we detect file stored into an old path
if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $filearray[0]['level1name'] == 'photos')
{
- $relativepath = preg_replace('/^.*\/produit\//', '', $filearray[0]['path']).'/';
+ $relativepath = preg_replace('/^.*\/produit\//', '', $filearray[0]['path']).'/';
}
// Defined relative dir to DOL_DATA_ROOT
$relativedir = '';
@@ -1233,13 +1233,13 @@ class FormFile
print ''; $urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity)); @@ -1353,7 +1353,7 @@ class FormFile print '
| '.$langs->trans("Ref").' | '; - print ''.$langs->trans("Name").' | '; - print ''.$langs->trans("DateStart").' | '; - print ''.$langs->trans("DateEnd").' | '; - print ''.$langs->trans("OpportunityAmountShort").' | '; - print ''.$langs->trans("OpportunityStatusShort").' | '; - print ''.$langs->trans("OpportunityProbabilityShort").' | '; - print ''.$langs->trans("Status").' | '; - print '||||||||
| '.$langs->trans("Ref").' | '; + print ''.$langs->trans("Name").' | '; + print ''.$langs->trans("DateStart").' | '; + print ''.$langs->trans("DateEnd").' | '; + print ''.$langs->trans("OpportunityAmountShort").' | '; + print ''.$langs->trans("OpportunityStatusShort").' | '; + print ''.$langs->trans("OpportunityProbabilityShort").' | '; + print ''.$langs->trans("Status").' | '; + print '||||||||
| '; - print $projecttmp->getNomUrl(1); - print ' | '; + // Ref + print ''; + print $projecttmp->getNomUrl(1); + print ' | '; - // Label - print ''.$obj->title.' | '; - // Date start - print ''.dol_print_date($db->jdate($obj->do), "day").' | '; - // Date end - print ''.dol_print_date($db->jdate($obj->de), "day").' | '; - // Opp amount - print ''; - if ($obj->opp_status_code) - { - print price($obj->opp_amount, 1, '', 1, -1, -1, ''); - } - print ' | '; - // Opp status - print ''; - if ($obj->opp_status_code) print $langs->trans("OppStatus".$obj->opp_status_code); - print ' | '; - // Opp percent - print ''; - if ($obj->opp_percent) print price($obj->opp_percent, 1, '', 1, 0).'%'; - print ' | '; - // Status - print ''.$projecttmp->getLibStatut(5).' | '; + // Label + print ''.$obj->title.' | '; + // Date start + print ''.dol_print_date($db->jdate($obj->do), "day").' | '; + // Date end + print ''.dol_print_date($db->jdate($obj->de), "day").' | '; + // Opp amount + print ''; + if ($obj->opp_status_code) + { + print price($obj->opp_amount, 1, '', 1, -1, -1, ''); + } + print ' | '; + // Opp status + print ''; + if ($obj->opp_status_code) print $langs->trans("OppStatus".$obj->opp_status_code); + print ' | '; + // Opp percent + print ''; + if ($obj->opp_percent) print price($obj->opp_percent, 1, '', 1, 0).'%'; + print ' | '; + // Status + print ''.$projecttmp->getLibStatut(5).' | '; - print '
| '.$langs->trans("None").' | |||||||||||||||
\n"; - } + print "
\n"; + } - return $i; + return $i; } @@ -845,386 +845,386 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '') require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; $formcompany = new FormCompany($db); - $form = new Form($db); + $form = new Form($db); - $optioncss = GETPOST('optioncss', 'alpha'); - $sortfield = GETPOST("sortfield", 'alpha'); - $sortorder = GETPOST("sortorder", 'alpha'); - $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); + $optioncss = GETPOST('optioncss', 'alpha'); + $sortfield = GETPOST("sortfield", 'alpha'); + $sortorder = GETPOST("sortorder", 'alpha'); + $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); - $search_status = GETPOST("search_status", 'int'); - if ($search_status == '') $search_status = 1; // always display active customer first + $search_status = GETPOST("search_status", 'int'); + if ($search_status == '') $search_status = 1; // always display active customer first - $search_name = GETPOST("search_name", 'alpha'); - $search_address = GETPOST("search_address", 'alpha'); - $search_poste = GETPOST("search_poste", 'alpha'); + $search_name = GETPOST("search_name", 'alpha'); + $search_address = GETPOST("search_address", 'alpha'); + $search_poste = GETPOST("search_poste", 'alpha'); $search_roles = GETPOST("search_roles", 'array'); - $socialnetworks = getArrayOfSocialNetworks(); + $socialnetworks = getArrayOfSocialNetworks(); - $searchAddressPhoneDBFields = array( - //Address - 't.address', - 't.zip', - 't.town', + $searchAddressPhoneDBFields = array( + //Address + 't.address', + 't.zip', + 't.town', - //Phone - 't.phone', - 't.phone_perso', - 't.phone_mobile', + //Phone + 't.phone', + 't.phone_perso', + 't.phone_mobile', - //Fax - 't.fax', + //Fax + 't.fax', - //E-mail - 't.email', - ); - //Social media - foreach ($socialnetworks as $key => $value) { - if ($value['active']) { - $searchAddressPhoneDBFields['t.'.$key] = "t.socialnetworks->'$.".$key."'"; - } - } + //E-mail + 't.email', + ); + //Social media + foreach ($socialnetworks as $key => $value) { + if ($value['active']) { + $searchAddressPhoneDBFields['t.'.$key] = "t.socialnetworks->'$.".$key."'"; + } + } - if (!$sortorder) $sortorder = "ASC"; - if (!$sortfield) $sortfield = "t.lastname"; + if (!$sortorder) $sortorder = "ASC"; + if (!$sortfield) $sortfield = "t.lastname"; - if (!empty($conf->clicktodial->enabled)) - { - $user->fetch_clicktodial(); // lecture des infos de clicktodial du user - } + if (!empty($conf->clicktodial->enabled)) + { + $user->fetch_clicktodial(); // lecture des infos de clicktodial du user + } - $contactstatic = new Contact($db); + $contactstatic = new Contact($db); - $extrafields->fetch_name_optionals_label($contactstatic->table_element); + $extrafields->fetch_name_optionals_label($contactstatic->table_element); - $contactstatic->fields = array( - 'name' =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1), - 'poste' =>array('type'=>'varchar(128)', 'label'=>'PostOrFunction', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20), - 'address' =>array('type'=>'varchar(128)', 'label'=>'Address', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>30), - 'role' =>array('type'=>'checkbox', 'label'=>'Role', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>40), - 'statut' =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'default'=>0, 'index'=>1, 'position'=>50, 'arrayofkeyval'=>array(0=>$contactstatic->LibStatut(0, 1), 1=>$contactstatic->LibStatut(1, 1))), - ); + $contactstatic->fields = array( + 'name' =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1), + 'poste' =>array('type'=>'varchar(128)', 'label'=>'PostOrFunction', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20), + 'address' =>array('type'=>'varchar(128)', 'label'=>'Address', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>30), + 'role' =>array('type'=>'checkbox', 'label'=>'Role', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>40), + 'statut' =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'default'=>0, 'index'=>1, 'position'=>50, 'arrayofkeyval'=>array(0=>$contactstatic->LibStatut(0, 1), 1=>$contactstatic->LibStatut(1, 1))), + ); - // Definition of fields for list - $arrayfields = array( - 't.rowid'=>array('label'=>"TechnicalID", 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0), 'position'=>1), - 't.name'=>array('label'=>"Name", 'checked'=>1, 'position'=>10), - 't.poste'=>array('label'=>"PostOrFunction", 'checked'=>1, 'position'=>20), - 't.address'=>array('label'=>(empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked'=>1, 'position'=>30), - 'sc.role'=>array('label'=>"ContactByDefaultFor", 'checked'=>1, 'position'=>40), - 't.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>50, 'class'=>'center'), - ); - // Extra fields - if (is_array($extrafields->attributes[$contactstatic->table_element]['label']) && count($extrafields->attributes[$contactstatic->table_element]['label'])) - { - foreach ($extrafields->attributes[$contactstatic->table_element]['label'] as $key => $val) - { - if (!empty($extrafields->attributes[$contactstatic->table_element]['list'][$key])) { + // Definition of fields for list + $arrayfields = array( + 't.rowid'=>array('label'=>"TechnicalID", 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0), 'position'=>1), + 't.name'=>array('label'=>"Name", 'checked'=>1, 'position'=>10), + 't.poste'=>array('label'=>"PostOrFunction", 'checked'=>1, 'position'=>20), + 't.address'=>array('label'=>(empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked'=>1, 'position'=>30), + 'sc.role'=>array('label'=>"ContactByDefaultFor", 'checked'=>1, 'position'=>40), + 't.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>50, 'class'=>'center'), + ); + // Extra fields + if (is_array($extrafields->attributes[$contactstatic->table_element]['label']) && count($extrafields->attributes[$contactstatic->table_element]['label'])) + { + foreach ($extrafields->attributes[$contactstatic->table_element]['label'] as $key => $val) + { + if (!empty($extrafields->attributes[$contactstatic->table_element]['list'][$key])) { $arrayfields["ef.".$key] = array( 'label'=>$extrafields->attributes[$contactstatic->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$contactstatic->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>1000 + $extrafields->attributes[$contactstatic->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$contactstatic->table_element]['list'][$key]) != 3 && $extrafields->attributes[$contactstatic->table_element]['perms'][$key])); } - } - } + } + } - // Initialize array of search criterias - $search = array(); - foreach ($arrayfields as $key => $val) - { - $queryName = 'search_'.substr($key, 2); - if (GETPOST($queryName, 'alpha')) { - $search[substr($key, 2)] = GETPOST($queryName, 'alpha'); - } - } - $search_array_options = $extrafields->getOptionalsFromPost($contactstatic->table_element, '', 'search_'); + // Initialize array of search criterias + $search = array(); + foreach ($arrayfields as $key => $val) + { + $queryName = 'search_'.substr($key, 2); + if (GETPOST($queryName, 'alpha')) { + $search[substr($key, 2)] = GETPOST($queryName, 'alpha'); + } + } + $search_array_options = $extrafields->getOptionalsFromPost($contactstatic->table_element, '', 'search_'); - // Purge search criteria - if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers - { - $search_status = ''; - $search_name = ''; - $search_roles = array(); - $search_address = ''; - $search_poste = ''; - $search = array(); - $search_array_options = array(); + // Purge search criteria + if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers + { + $search_status = ''; + $search_name = ''; + $search_roles = array(); + $search_address = ''; + $search_poste = ''; + $search = array(); + $search_array_options = array(); - foreach ($contactstatic->fields as $key => $val) + foreach ($contactstatic->fields as $key => $val) { $search[$key] = ''; } - } + } - $contactstatic->fields = dol_sort_array($contactstatic->fields, 'position'); - $arrayfields = dol_sort_array($arrayfields, 'position'); + $contactstatic->fields = dol_sort_array($contactstatic->fields, 'position'); + $arrayfields = dol_sort_array($arrayfields, 'position'); - $newcardbutton = ''; - if ($user->rights->societe->contact->creer) - { - $addcontact = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress")); - $newcardbutton .= dolGetButtonTitle($addcontact, '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?socid='.$object->id.'&action=create&backtopage='.urlencode($backtopage)); - } + $newcardbutton = ''; + if ($user->rights->societe->contact->creer) + { + $addcontact = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress")); + $newcardbutton .= dolGetButtonTitle($addcontact, '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?socid='.$object->id.'&action=create&backtopage='.urlencode($backtopage)); + } - print "\n"; + print "\n"; - $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ContactsForCompany") : $langs->trans("ContactsAddressesForCompany")); - print load_fiche_titre($title, $newcardbutton, ''); + $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ContactsForCompany") : $langs->trans("ContactsAddressesForCompany")); + print load_fiche_titre($title, $newcardbutton, ''); - print ''."\n"; + print ''."\n"; - return $i; + return $i; } @@ -1242,12 +1242,12 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '') */ function show_actions_todo($conf, $langs, $db, $filterobj, $objcon = '', $noprint = 0, $actioncode = '') { - global $user, $conf; + global $user, $conf; - $out = show_actions_done($conf, $langs, $db, $filterobj, $objcon, 1, $actioncode, 'todo'); + $out = show_actions_done($conf, $langs, $db, $filterobj, $objcon, 1, $actioncode, 'todo'); - if ($noprint) return $out; - else print $out; + if ($noprint) return $out; + else print $out; } /** @@ -1270,333 +1270,333 @@ function show_actions_todo($conf, $langs, $db, $filterobj, $objcon = '', $noprin */ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprint = 0, $actioncode = '', $donetodo = 'done', $filters = array(), $sortfield = 'a.datep,a.id', $sortorder = 'DESC', $module = '') { - global $user, $conf; - global $form; + global $user, $conf; + global $form; - global $param, $massactionbutton; - $start_year = GETPOST('dateevent_startyear'); - $start_month = GETPOST('dateevent_startmonth'); - $start_day = GETPOST('dateevent_startday'); - $end_year = GETPOST('dateevent_endyear'); - $end_month = GETPOST('dateevent_endmonth'); - $end_day = GETPOST('dateevent_endday'); - if (!empty($start_year) && !empty($start_month) && !empty($start_day)) { - $search_start = $start_year.'-'.$start_month.'-'.$start_day; - $tms_start = strtotime($search_start); - } - if (!empty($end_year) && !empty($end_month) && !empty($end_day)) { - $search_end = $end_year.'-'.$end_month.'-'.$end_day.' 23:59:59'; - $tms_end = strtotime($search_end); - } - if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers - { - $search_start = ''; - $tms_start = ''; - $search_end = ''; - $tms_end = ''; - } - dol_include_once('/comm/action/class/actioncomm.class.php'); + global $param, $massactionbutton; + $start_year = GETPOST('dateevent_startyear'); + $start_month = GETPOST('dateevent_startmonth'); + $start_day = GETPOST('dateevent_startday'); + $end_year = GETPOST('dateevent_endyear'); + $end_month = GETPOST('dateevent_endmonth'); + $end_day = GETPOST('dateevent_endday'); + if (!empty($start_year) && !empty($start_month) && !empty($start_day)) { + $search_start = $start_year.'-'.$start_month.'-'.$start_day; + $tms_start = strtotime($search_start); + } + if (!empty($end_year) && !empty($end_month) && !empty($end_day)) { + $search_end = $end_year.'-'.$end_month.'-'.$end_day.' 23:59:59'; + $tms_end = strtotime($search_end); + } + if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers + { + $search_start = ''; + $tms_start = ''; + $search_end = ''; + $tms_end = ''; + } + dol_include_once('/comm/action/class/actioncomm.class.php'); - // Check parameters - if (!is_object($filterobj) && !is_object($objcon)) dol_print_error('', 'BadParameter'); + // Check parameters + if (!is_object($filterobj) && !is_object($objcon)) dol_print_error('', 'BadParameter'); - $out = ''; - $histo = array(); - $numaction = 0; - $now = dol_now('tzuser'); + $out = ''; + $histo = array(); + $numaction = 0; + $now = dol_now('tzuser'); - // Open DSI -- Fix order by -- Begin - $sortfield_list = explode(',', $sortfield); - $sortfield_label_list = array('a.id' => 'id', 'a.datep' => 'dp', 'a.percent' => 'percent'); - $sortfield_new_list = array(); - foreach ($sortfield_list as $sortfield_value) { - $sortfield_new_list[] = $sortfield_label_list[trim($sortfield_value)]; - } - $sortfield_new = implode(',', $sortfield_new_list); + // Open DSI -- Fix order by -- Begin + $sortfield_list = explode(',', $sortfield); + $sortfield_label_list = array('a.id' => 'id', 'a.datep' => 'dp', 'a.percent' => 'percent'); + $sortfield_new_list = array(); + foreach ($sortfield_list as $sortfield_value) { + $sortfield_new_list[] = $sortfield_label_list[trim($sortfield_value)]; + } + $sortfield_new = implode(',', $sortfield_new_list); - $sql = ''; + $sql = ''; - if (!empty($conf->agenda->enabled)) - { - // Recherche histo sur actioncomm - if (is_object($objcon) && $objcon->id > 0) { - $sql = "SELECT DISTINCT a.id, a.label as label,"; - } else { - $sql = "SELECT a.id, a.label as label,"; - } - $sql .= " a.datep as dp,"; - $sql .= " a.datep2 as dp2,"; - $sql .= " a.percent as percent, 'action' as type,"; - $sql .= " a.fk_element, a.elementtype,"; - $sql .= " a.fk_contact,"; - $sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,"; - $sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; - if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur'))) $sql .= ", sp.lastname, sp.firstname"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ } elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ } elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname"; - elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", o.ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", o.ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", o.ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", o.ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", o.ref"; - elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) $sql .= ", o.ref"; + if (!empty($conf->agenda->enabled)) + { + // Recherche histo sur actioncomm + if (is_object($objcon) && $objcon->id > 0) { + $sql = "SELECT DISTINCT a.id, a.label as label,"; + } else { + $sql = "SELECT a.id, a.label as label,"; + } + $sql .= " a.datep as dp,"; + $sql .= " a.datep2 as dp2,"; + $sql .= " a.percent as percent, 'action' as type,"; + $sql .= " a.fk_element, a.elementtype,"; + $sql .= " a.fk_contact,"; + $sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,"; + $sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; + if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur'))) $sql .= ", sp.lastname, sp.firstname"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ } elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ } elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname"; + elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", o.ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", o.ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", o.ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", o.ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", o.ref"; + elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) $sql .= ", o.ref"; - $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id"; + $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id"; - $force_filter_contact = false; - if (is_object($objcon) && $objcon->id > 0) { - $force_filter_contact = true; - $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm"; - $sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id; - } + $force_filter_contact = false; + if (is_object($objcon) && $objcon->id > 0) { + $force_filter_contact = true; + $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm"; + $sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id; + } - if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur'))) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { - $sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er"; - $sql .= " ON er.resource_type = 'dolresource'"; - $sql .= " AND er.element_id = a.id"; - $sql .= " AND er.resource_id = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ } elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m"; - elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o"; - elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", ".MAIN_DB_PREFIX."bom_bom as o"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", ".MAIN_DB_PREFIX."contrat as o"; - elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) $sql .= ", ".MAIN_DB_PREFIX.$filterobj->table_element." as o"; + if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur'))) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { + $sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er"; + $sql .= " ON er.resource_type = 'dolresource'"; + $sql .= " AND er.element_id = a.id"; + $sql .= " AND er.resource_id = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ } elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m"; + elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o"; + elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", ".MAIN_DB_PREFIX."bom_bom as o"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", ".MAIN_DB_PREFIX."contrat as o"; + elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) $sql .= ", ".MAIN_DB_PREFIX.$filterobj->table_element." as o"; - $sql .= " WHERE a.entity IN (".getEntity('agenda').")"; - if ($force_filter_contact === false) { - if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) $sql .= " AND a.fk_soc = ".$filterobj->id; - elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ } - elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id; - elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') - { - $sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') - { - $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'Product') - { - $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') - { - $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') - { - $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') - { - $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) - { - // Generic case - $sql .= " AND a.fk_element = o.rowid AND a.elementtype = '".$db->escape($filterobj->element).($module ? '@'.$module : '')."'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } - } + $sql .= " WHERE a.entity IN (".getEntity('agenda').")"; + if ($force_filter_contact === false) { + if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) $sql .= " AND a.fk_soc = ".$filterobj->id; + elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ } + elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id; + elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') + { + $sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') + { + $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'Product') + { + $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') + { + $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') + { + $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') + { + $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) + { + // Generic case + $sql .= " AND a.fk_element = o.rowid AND a.elementtype = '".$db->escape($filterobj->element).($module ? '@'.$module : '')."'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } + } - if (! empty($search_start) && ! empty($search_end)) { - $sql .= " AND ((a.datep BETWEEN '$search_start' AND '$search_end') OR (a.datep2 BETWEEN '$search_start' AND '$search_end'))"; - } - elseif (empty($search_start) && ! empty($search_end)) { - $sql .= " AND ((a.datep <= '$search_end') OR (a.datep2 <= '$search_end'))"; - } - elseif (! empty($search_start) && empty($search_end)) { - $sql .= " AND ((a.datep >= '$search_start') OR (a.datep2 >= '$search_start'))"; - } + if (! empty($search_start) && ! empty($search_end)) { + $sql .= " AND ((a.datep BETWEEN '$search_start' AND '$search_end') OR (a.datep2 BETWEEN '$search_start' AND '$search_end'))"; + } + elseif (empty($search_start) && ! empty($search_end)) { + $sql .= " AND ((a.datep <= '$search_end') OR (a.datep2 <= '$search_end'))"; + } + elseif (! empty($search_start) && empty($search_end)) { + $sql .= " AND ((a.datep >= '$search_start') OR (a.datep2 >= '$search_start'))"; + } - if (is_array($actioncode) && ! empty($actioncode)) { - $sql .= ' AND ('; - foreach ($actioncode as $key => $code) { - if ($key != 0) $sql .= "OR ("; - if (! empty($code)) addEventTypeSQL($sql, $code, $donetodo, $now, $filters, ""); - if ($key != 0) $sql .= ")"; - } - $sql .= ')'; - } - elseif (! empty($actioncode)) addEventTypeSQL($sql, $actioncode, $donetodo, $now, $filters); + if (is_array($actioncode) && ! empty($actioncode)) { + $sql .= ' AND ('; + foreach ($actioncode as $key => $code) { + if ($key != 0) $sql .= "OR ("; + if (! empty($code)) addEventTypeSQL($sql, $code, $donetodo, $now, $filters, ""); + if ($key != 0) $sql .= ")"; + } + $sql .= ')'; + } + elseif (! empty($actioncode)) addEventTypeSQL($sql, $actioncode, $donetodo, $now, $filters); - if (is_array($actioncode)) { - foreach ($actioncode as $code) { - $sql2 = addMailingEventTypeSQL($code, $objcon, $filterobj); - if (! empty($sql2)) { - if (! empty($sql)) $sql = $sql." UNION ".$sql2; - elseif (empty($sql)) $sql = $sql2; - break; - } - } - } - else { - $sql2 = addMailingEventTypeSQL($actioncode, $objcon, $filterobj); - if (! empty($sql) && ! empty($sql2)) { - $sql = $sql." UNION ".$sql2; - } - elseif (empty($sql) && ! empty($sql2)) { - $sql = $sql2; - } - } - } + if (is_array($actioncode)) { + foreach ($actioncode as $code) { + $sql2 = addMailingEventTypeSQL($code, $objcon, $filterobj); + if (! empty($sql2)) { + if (! empty($sql)) $sql = $sql." UNION ".$sql2; + elseif (empty($sql)) $sql = $sql2; + break; + } + } + } + else { + $sql2 = addMailingEventTypeSQL($actioncode, $objcon, $filterobj); + if (! empty($sql) && ! empty($sql2)) { + $sql = $sql." UNION ".$sql2; + } + elseif (empty($sql) && ! empty($sql2)) { + $sql = $sql2; + } + } + } - //TODO Add limit in nb of results - if ($sql) - { - $sql .= $db->order($sortfield_new, $sortorder); - dol_syslog("company.lib::show_actions_done", LOG_DEBUG); - $resql = $db->query($sql); - if ($resql) - { - $i = 0; - $num = $db->num_rows($resql); + //TODO Add limit in nb of results + if ($sql) + { + $sql .= $db->order($sortfield_new, $sortorder); + dol_syslog("company.lib::show_actions_done", LOG_DEBUG); + $resql = $db->query($sql); + if ($resql) + { + $i = 0; + $num = $db->num_rows($resql); - while ($i < $num) - { - $obj = $db->fetch_object($resql); + while ($i < $num) + { + $obj = $db->fetch_object($resql); - if ($obj->type == 'action') { - $contactaction = new ActionComm($db); - $contactaction->id = $obj->id; - $result = $contactaction->fetchResources(); - if ($result < 0) { - dol_print_error($db); - setEventMessage("company.lib::show_actions_done Error fetch ressource", 'errors'); - } + if ($obj->type == 'action') { + $contactaction = new ActionComm($db); + $contactaction->id = $obj->id; + $result = $contactaction->fetchResources(); + if ($result < 0) { + dol_print_error($db); + setEventMessage("company.lib::show_actions_done Error fetch ressource", 'errors'); + } - //if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))"; - //elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))"; - $tododone = ''; - if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) $tododone = 'todo'; + //if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))"; + //elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))"; + $tododone = ''; + if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) $tododone = 'todo'; - $histo[$numaction] = array( - 'type'=>$obj->type, - 'tododone'=>$tododone, - 'id'=>$obj->id, - 'datestart'=>$db->jdate($obj->dp), - 'dateend'=>$db->jdate($obj->dp2), - 'note'=>$obj->label, - 'percent'=>$obj->percent, + $histo[$numaction] = array( + 'type'=>$obj->type, + 'tododone'=>$tododone, + 'id'=>$obj->id, + 'datestart'=>$db->jdate($obj->dp), + 'dateend'=>$db->jdate($obj->dp2), + 'note'=>$obj->label, + 'percent'=>$obj->percent, - 'userid'=>$obj->user_id, - 'login'=>$obj->user_login, - 'userfirstname'=>$obj->user_firstname, - 'userlastname'=>$obj->user_lastname, - 'userphoto'=>$obj->user_photo, + 'userid'=>$obj->user_id, + 'login'=>$obj->user_login, + 'userfirstname'=>$obj->user_firstname, + 'userlastname'=>$obj->user_lastname, + 'userphoto'=>$obj->user_photo, - 'contact_id'=>$obj->fk_contact, - 'socpeopleassigned' => $contactaction->socpeopleassigned, - 'lastname'=>$obj->lastname, - 'firstname'=>$obj->firstname, - 'fk_element'=>$obj->fk_element, - 'elementtype'=>$obj->elementtype, - // Type of event - 'acode'=>$obj->acode, - 'alabel'=>$obj->alabel, - 'libelle'=>$obj->alabel, // deprecated - 'apicto'=>$obj->apicto - ); - } else { - $histo[$numaction] = array( - 'type'=>$obj->type, - 'tododone'=>'done', - 'id'=>$obj->id, - 'datestart'=>$db->jdate($obj->dp), - 'dateend'=>$db->jdate($obj->dp2), - 'note'=>$obj->label, - 'percent'=>$obj->percent, - 'acode'=>$obj->acode, + 'contact_id'=>$obj->fk_contact, + 'socpeopleassigned' => $contactaction->socpeopleassigned, + 'lastname'=>$obj->lastname, + 'firstname'=>$obj->firstname, + 'fk_element'=>$obj->fk_element, + 'elementtype'=>$obj->elementtype, + // Type of event + 'acode'=>$obj->acode, + 'alabel'=>$obj->alabel, + 'libelle'=>$obj->alabel, // deprecated + 'apicto'=>$obj->apicto + ); + } else { + $histo[$numaction] = array( + 'type'=>$obj->type, + 'tododone'=>'done', + 'id'=>$obj->id, + 'datestart'=>$db->jdate($obj->dp), + 'dateend'=>$db->jdate($obj->dp2), + 'note'=>$obj->label, + 'percent'=>$obj->percent, + 'acode'=>$obj->acode, - 'userid'=>$obj->user_id, - 'login'=>$obj->user_login, - 'userfirstname'=>$obj->user_firstname, - 'userlastname'=>$obj->user_lastname, - 'userphoto'=>$obj->user_photo - ); - } + 'userid'=>$obj->user_id, + 'login'=>$obj->user_login, + 'userfirstname'=>$obj->user_firstname, + 'userlastname'=>$obj->user_lastname, + 'userphoto'=>$obj->user_photo + ); + } - $numaction++; - $i++; - } - } else { - dol_print_error($db); - } - } + $numaction++; + $i++; + } + } else { + dol_print_error($db); + } + } - if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email))) - { - $delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60; + if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email))) + { + $delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60; - require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; - include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; - require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; + require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; + require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; - $formactions = new FormActions($db); + $formactions = new FormActions($db); - $actionstatic = new ActionComm($db); - $userstatic = new User($db); - $contactstatic = new Contact($db); + $actionstatic = new ActionComm($db); + $userstatic = new User($db); + $contactstatic = new Contact($db); - $out .= ''; - } + $out .= ''; + } - if ($noprint) return $out; - else print $out; + if ($noprint) return $out; + else print $out; } /** @@ -1869,11 +1869,11 @@ function show_subsidiaries($conf, $langs, $db, $object) */ function addEventTypeSQL(&$sql, $actioncode, $donetodo, $now, $filters, $sqlANDOR = "AND") { - global $conf, $db; - // Condition on actioncode + global $conf, $db; + // Condition on actioncode if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) - { + { if ($actioncode == 'AC_NON_AUTO') $sql .= " $sqlANDOR c.type != 'systemauto'"; elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " $sqlANDOR c.type = 'systemauto'"; else { @@ -1887,11 +1887,11 @@ function addEventTypeSQL(&$sql, $actioncode, $donetodo, $now, $filters, $sqlANDO else $sql .= " $sqlANDOR c.code = '".$db->escape($actioncode)."'"; } - if ($donetodo == 'todo') $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))"; - elseif ($donetodo == 'done') $sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))"; - if (is_array($filters) && $filters['search_agenda_label']) $sql .= natural_search('a.label', $filters['search_agenda_label']); + if ($donetodo == 'todo') $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))"; + elseif ($donetodo == 'done') $sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))"; + if (is_array($filters) && $filters['search_agenda_label']) $sql .= natural_search('a.label', $filters['search_agenda_label']); - return $sql; + return $sql; } /** @@ -1904,26 +1904,26 @@ function addEventTypeSQL(&$sql, $actioncode, $donetodo, $now, $filters, $sqlANDO */ function addMailingEventTypeSQL($actioncode, $objcon, $filterobj) { - global $conf, $langs, $db; - // Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing. - if (!empty($conf->mailing->enabled) && !empty($objcon->email) - && (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING')) { - $langs->load("mails"); + global $conf, $langs, $db; + // Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing. + if (!empty($conf->mailing->enabled) && !empty($objcon->email) + && (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING')) { + $langs->load("mails"); - $sql2 = "SELECT m.rowid as id, m.titre as label, mc.date_envoi as dp, mc.date_envoi as dp2, '100' as percent, 'mailing' as type"; - $sql2 .= ", '' as fk_element, '' as elementtype, '' as contact_id"; - $sql2 .= ", 'AC_EMAILING' as acode, '' as alabel, '' as apicto"; - $sql2 .= ", u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; // User that valid action - if (is_object($filterobj) && get_class($filterobj) == 'Societe') $sql2 .= ", '' as lastname, '' as firstname"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql2 .= ", '' as lastname, '' as firstname"; - elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql2 .= ", '' as ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql2 .= ", '' as ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql2 .= ", '' as ref"; - $sql2 .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u"; - $sql2 .= " WHERE mc.email = '".$db->escape($objcon->email)."'"; // Search is done on email. - $sql2 .= " AND mc.statut = 1"; - $sql2 .= " AND u.rowid = m.fk_user_valid"; - $sql2 .= " AND mc.fk_mailing=m.rowid"; - return $sql2; - } + $sql2 = "SELECT m.rowid as id, m.titre as label, mc.date_envoi as dp, mc.date_envoi as dp2, '100' as percent, 'mailing' as type"; + $sql2 .= ", '' as fk_element, '' as elementtype, '' as contact_id"; + $sql2 .= ", 'AC_EMAILING' as acode, '' as alabel, '' as apicto"; + $sql2 .= ", u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; // User that valid action + if (is_object($filterobj) && get_class($filterobj) == 'Societe') $sql2 .= ", '' as lastname, '' as firstname"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql2 .= ", '' as lastname, '' as firstname"; + elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql2 .= ", '' as ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql2 .= ", '' as ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql2 .= ", '' as ref"; + $sql2 .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u"; + $sql2 .= " WHERE mc.email = '".$db->escape($objcon->email)."'"; // Search is done on email. + $sql2 .= " AND mc.statut = 1"; + $sql2 .= " AND u.rowid = m.fk_user_valid"; + $sql2 .= " AND mc.fk_mailing=m.rowid"; + return $sql2; + } } diff --git a/htdocs/core/lib/expedition.lib.php b/htdocs/core/lib/expedition.lib.php index ef687ef1131..b575247e84b 100644 --- a/htdocs/core/lib/expedition.lib.php +++ b/htdocs/core/lib/expedition.lib.php @@ -60,9 +60,9 @@ function expedition_prepare_head(Expedition $object) complete_head_from_modules($conf, $langs, $object, $head, $h, 'order'); - complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove'); + complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove'); - return $head; + return $head; } /** @@ -95,18 +95,18 @@ function expedition_admin_prepare_head() if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION)) { - $head[$h][0] = DOL_URL_ROOT.'/admin/expedition_extrafields.php'; - $head[$h][1] = $langs->trans("ExtraFields"); - $head[$h][2] = 'attributes_shipment'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/admin/expedition_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFields"); + $head[$h][2] = 'attributes_shipment'; + $h++; } if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION)) { - $head[$h][0] = DOL_URL_ROOT.'/admin/expeditiondet_extrafields.php'; - $head[$h][1] = $langs->trans("ExtraFieldsLines"); - $head[$h][2] = 'attributeslines_shipment'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/admin/expeditiondet_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFieldsLines"); + $head[$h][2] = 'attributeslines_shipment'; + $h++; } if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON)) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 596a38346ae..fb6f25eee4b 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -958,11 +958,11 @@ function dolCheckVirus($src_file) if (!class_exists('AntiVir')) { require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php'; } - $antivir=new AntiVir($db); + $antivir = new AntiVir($db); $result = $antivir->dol_avscan_file($src_file); if ($result < 0) // If virus or error, we stop here { - $reterrors=$antivir->errors; + $reterrors = $antivir->errors; return $reterrors; } } @@ -1049,7 +1049,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable { // $upload_dir ends with a slash, so be must be sure the medias dir to compare to ends with slash too. $publicmediasdirwithslash = $conf->medias->multidir_output[$conf->entity]; - if (! preg_match('/\/$/', $publicmediasdirwithslash)) $publicmediasdirwithslash.='/'; + if (!preg_match('/\/$/', $publicmediasdirwithslash)) $publicmediasdirwithslash .= '/'; if (strpos($upload_dir, $publicmediasdirwithslash) !== 0) { // We never add .noexe on files into media directory $file_name .= '.noexe'; @@ -2771,7 +2771,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity, if (preg_match('/^specimen/i', $original_file)) $accessallowed = 1; // If link to a file called specimen. Test must be done before changing $original_file int full path. if ($fuser->admin) $accessallowed = 1; // If user is admin $tmpmodulepart = explode('-', $modulepart); - if (! empty($tmpmodulepart[1])) { + if (!empty($tmpmodulepart[1])) { $modulepart = $tmpmodulepart[0]; $original_file = $tmpmodulepart[1].'/'.$original_file; } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 563a30dbbeb..5d96b31488b 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -357,7 +357,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null } if (!empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) { - if (!empty($_GET['action']) && (preg_match('/^create/', $_GET['action']) || preg_match('/^presend/', $_GET['action'])) && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) + if (!empty($_GET['action']) && (preg_match('/^create/', $_GET['action']) || preg_match('/^presend/', $_GET['action'])) && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) { // Now search in setup to overwrite default values if (!empty($user->default_values)) // $user->default_values defined from menu 'Setup - Default values' @@ -629,22 +629,22 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null if (!function_exists('dol_getprefix')) { - /** - * Return a prefix to use for this Dolibarr instance, for session/cookie names or email id. - * The prefix is unique for instance and avoid conflict between multi-instances, even when having two instances with same root dir - * or two instances in same virtual servers. - * - * @param string $mode '' (prefix for session name) or 'email' (prefix for email id) - * @return string A calculated prefix - */ - function dol_getprefix($mode = '') - { - global $conf; + /** + * Return a prefix to use for this Dolibarr instance, for session/cookie names or email id. + * The prefix is unique for instance and avoid conflict between multi-instances, even when having two instances with same root dir + * or two instances in same virtual servers. + * + * @param string $mode '' (prefix for session name) or 'email' (prefix for email id) + * @return string A calculated prefix + */ + function dol_getprefix($mode = '') + { + global $conf; // If prefix is for email if ($mode == 'email') { - if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) // If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended) + if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) // If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended) { if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID; elseif (isset($_SERVER["SERVER_NAME"])) return $_SERVER["SERVER_NAME"]; @@ -907,7 +907,7 @@ function dol_string_unaccent($str) return rawurldecode($string); } else { // See http://www.ascii-code.com/ - $string = strtr( + $string = strtr( $str, "\xC0\xC1\xC2\xC3\xC4\xC5\xC7 \xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1 @@ -1057,7 +1057,7 @@ function dol_strtoupper($utf8_string) */ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename = '', $restricttologhandler = '', $logcontext = null) { - global $conf, $user, $debugbar; + global $conf, $user, $debugbar; // If syslog module enabled if (empty($conf->syslog->enabled)) return; @@ -1091,9 +1091,9 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename = // If adding log inside HTML page is required if ((!empty($_REQUEST['logtohtml']) && !empty($conf->global->MAIN_ENABLE_LOG_TO_HTML)) - || (!empty($user->rights->debugbar->read) && is_object($debugbar))) + || (!empty($user->rights->debugbar->read) && is_object($debugbar))) { - $conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S")." ".$logLevels[$level]." ".$message; + $conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S")." ".$logLevels[$level]." ".$message; } //TODO: Remove this. MAIN_ENABLE_LOG_INLINE_HTML should be deprecated and use a log handler dedicated to HTML output @@ -1523,7 +1523,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi if (!$phototoshow) // Show No photo link (picto of object) { - $morehtmlleft .= '
';
+ $morehtmlleft .= '
';
if ($object->element == 'action')
{
$width = 80;
@@ -1872,23 +1872,23 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
$reg = array();
if (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg)) // Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
{
- dol_print_error("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"]);
- return '';
+ dol_print_error("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"]);
+ return '';
} elseif (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg)) // Still available to solve problems in extrafields of type date
{
- // This part of code should not be used.
- dol_syslog("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"], LOG_WARNING);
- //if (function_exists('debug_print_backtrace')) debug_print_backtrace();
- // Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
- $syear = (!empty($reg[1]) ? $reg[1] : '');
- $smonth = (!empty($reg[2]) ? $reg[2] : '');
- $sday = (!empty($reg[3]) ? $reg[3] : '');
- $shour = (!empty($reg[4]) ? $reg[4] : '');
- $smin = (!empty($reg[5]) ? $reg[5] : '');
- $ssec = (!empty($reg[6]) ? $reg[6] : '');
+ // This part of code should not be used.
+ dol_syslog("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"], LOG_WARNING);
+ //if (function_exists('debug_print_backtrace')) debug_print_backtrace();
+ // Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
+ $syear = (!empty($reg[1]) ? $reg[1] : '');
+ $smonth = (!empty($reg[2]) ? $reg[2] : '');
+ $sday = (!empty($reg[3]) ? $reg[3] : '');
+ $shour = (!empty($reg[4]) ? $reg[4] : '');
+ $smin = (!empty($reg[5]) ? $reg[5] : '');
+ $ssec = (!empty($reg[6]) ? $reg[6] : '');
- $time = dol_mktime($shour, $smin, $ssec, $smonth, $sday, $syear, true);
- $ret = adodb_strftime($format, $time + $offsettz + $offsetdst, $to_gmt);
+ $time = dol_mktime($shour, $smin, $ssec, $smonth, $sday, $syear, true);
+ $ret = adodb_strftime($format, $time + $offsettz + $offsetdst, $to_gmt);
} else {
// Date is a timestamps
if ($time < 100000000000) // Protection against bad date values
@@ -2233,23 +2233,23 @@ function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64,
*/
function getArrayOfSocialNetworks()
{
- global $conf, $db;
- $sql = "SELECT rowid, code, label, url, icon, active FROM ".MAIN_DB_PREFIX."c_socialnetworks";
- $sql .= " WHERE entity=".$conf->entity;
- $socialnetworks = array();
- $resql = $db->query($sql);
- if ($resql) {
- while ($obj = $db->fetch_object($resql)) {
- $socialnetworks[$obj->code] = array(
- 'rowid' => $obj->rowid,
- 'label' => $obj->label,
- 'url' => $obj->url,
- 'icon' => $obj->icon,
- 'active' => $obj->active,
- );
- }
- }
- return $socialnetworks;
+ global $conf, $db;
+ $sql = "SELECT rowid, code, label, url, icon, active FROM ".MAIN_DB_PREFIX."c_socialnetworks";
+ $sql .= " WHERE entity=".$conf->entity;
+ $socialnetworks = array();
+ $resql = $db->query($sql);
+ if ($resql) {
+ while ($obj = $db->fetch_object($resql)) {
+ $socialnetworks[$obj->code] = array(
+ 'rowid' => $obj->rowid,
+ 'label' => $obj->label,
+ 'url' => $obj->url,
+ 'icon' => $obj->icon,
+ 'active' => $obj->active,
+ );
+ }
+ }
+ return $socialnetworks;
}
/**
@@ -2436,7 +2436,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
}
} elseif (strtoupper($countrycode) == "MU")
{
- //Maurice
+ //Maurice
if (dol_strlen($phone) == 11)
{//ex: +230_ABC_DE_FG
$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
@@ -2566,10 +2566,10 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
}
} elseif (strtoupper($countrycode) == "AU")
{
- //Australie
+ //Australie
if (dol_strlen($phone) == 12)
{
- //ex: +61_A_BCDE_FGHI
+ //ex: +61_A_BCDE_FGHI
$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 4);
}
}
@@ -3004,39 +3004,39 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$fullpathpicto = $picto;
$reg = array();
if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {
- $morecss .= ($morecss ? ' ' : '').$reg[1];
- $moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);
+ $morecss .= ($morecss ? ' ' : '').$reg[1];
+ $moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);
}
} else {
$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
if (empty($srconly) && in_array($pictowithouttext, array(
- '1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
- 'accountancy', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'bookmark', 'bom', 'building',
- 'cash-register', 'category', 'check', 'clock', 'close_title', 'company', 'contact', 'contract', 'cubes',
- 'delete', 'dolly', 'dollyrevert', 'edit', 'ellipsis-h', 'email', 'external-link-alt', 'external-link-square-alt',
- 'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'help',
- 'intervention', 'label', 'language', 'list', 'listlight', 'lot',
- 'map-marker-alt', 'money-bill-alt', 'mrp', 'note',
- 'object_accounting', 'object_action', 'object_account', 'object_barcode', 'object_bill', 'object_billa', 'object_billd', 'object_bom',
- 'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
- 'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
- 'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_donation', 'object_dynamicprice',
- 'object_globe', 'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_label',
- 'object_margin', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
- 'object_lot', 'object_mrp', 'object_payment', 'object_product', 'object_propal',
- 'object_other', 'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
- 'object_recruitmentjobposition', 'object_recruitmentcandidature',
- 'object_shipment', 'object_share-alt', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
- 'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member',
- 'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website',
- 'off', 'on', 'order',
- 'paiment', 'play', 'playdisabled', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip',
+ '1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
+ 'accountancy', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'bookmark', 'bom', 'building',
+ 'cash-register', 'category', 'check', 'clock', 'close_title', 'company', 'contact', 'contract', 'cubes',
+ 'delete', 'dolly', 'dollyrevert', 'edit', 'ellipsis-h', 'email', 'external-link-alt', 'external-link-square-alt',
+ 'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'help',
+ 'intervention', 'label', 'language', 'list', 'listlight', 'lot',
+ 'map-marker-alt', 'money-bill-alt', 'mrp', 'note',
+ 'object_accounting', 'object_action', 'object_account', 'object_barcode', 'object_bill', 'object_billa', 'object_billd', 'object_bom',
+ 'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
+ 'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
+ 'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_donation', 'object_dynamicprice',
+ 'object_globe', 'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_label',
+ 'object_margin', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
+ 'object_lot', 'object_mrp', 'object_payment', 'object_product', 'object_propal',
+ 'object_other', 'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
+ 'object_recruitmentjobposition', 'object_recruitmentcandidature',
+ 'object_shipment', 'object_share-alt', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
+ 'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member',
+ 'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website',
+ 'off', 'on', 'order',
+ 'paiment', 'play', 'playdisabled', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip',
'setup', 'share-alt', 'sign-out', 'split', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
- 'home', 'hrm', 'companies', 'products', 'commercial', 'invoicing', 'pencil-ruler', 'preview', 'project', 'projectpub', 'supplier_invoice', 'members', 'ticket', 'generic',
- 'error', 'warning', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
- 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda'
+ 'home', 'hrm', 'companies', 'products', 'commercial', 'invoicing', 'pencil-ruler', 'preview', 'project', 'projectpub', 'supplier_invoice', 'members', 'ticket', 'generic',
+ 'error', 'warning', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
+ 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda'
)
)) {
$fakey = $pictowithouttext;
@@ -3051,41 +3051,41 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$pictowithouttext = str_replace('object_', '', $pictowithouttext);
- $arrayconvpictotofa = array(
- 'account'=>'university', 'accountancy'=>'money-check-alt', 'action'=>'calendar-alt', 'address'=> 'address-book',
- 'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'supplier_invoicea'=>'file-excel', 'billd'=>'file-medical', 'supplier_invoiced'=>'file-medical', 'bom'=>'cubes',
- 'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'conversation'=>'comments', 'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',
- 'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins',
- 'accounting'=>'chart-line', 'category'=>'tag', 'dollyrevert'=>'dolly',
- 'hrm'=>'user-tie', 'margin'=>'calculator', 'members'=>'users', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',
- 'email'=>'at',
- 'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',
- 'generic'=>'file', 'holiday'=>'umbrella-beach', 'label'=>'layer-group',
- 'member'=>'users', 'mrp'=>'cubes', 'trip'=>'wallet', 'group'=>'users',
- 'sign-out'=>'sign-out-alt',
- 'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star',
- 'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter',
- 'list-alt'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
- 'intervention'=>'ambulance', 'invoice'=>'file-invoice-dollar', 'multicurrency'=>'dollar-sign', 'order'=>'file-invoice',
- 'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
- 'other'=>'square',
- 'playdisabled'=>'play', 'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
- 'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',
- 'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
- 'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
- 'resource'=>'laptop-house',
- 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
- 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
- 'title_agenda'=>'calendar-alt',
- 'uparrow'=>'mail-forward', 'vcard'=>'address-card',
- 'jabber'=>'comment-o',
- 'website'=>'globe-americas'
- );
+ $arrayconvpictotofa = array(
+ 'account'=>'university', 'accountancy'=>'money-check-alt', 'action'=>'calendar-alt', 'address'=> 'address-book',
+ 'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'supplier_invoicea'=>'file-excel', 'billd'=>'file-medical', 'supplier_invoiced'=>'file-medical', 'bom'=>'cubes',
+ 'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'conversation'=>'comments', 'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',
+ 'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins',
+ 'accounting'=>'chart-line', 'category'=>'tag', 'dollyrevert'=>'dolly',
+ 'hrm'=>'user-tie', 'margin'=>'calculator', 'members'=>'users', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',
+ 'email'=>'at',
+ 'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',
+ 'generic'=>'file', 'holiday'=>'umbrella-beach', 'label'=>'layer-group',
+ 'member'=>'users', 'mrp'=>'cubes', 'trip'=>'wallet', 'group'=>'users',
+ 'sign-out'=>'sign-out-alt',
+ 'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star',
+ 'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter',
+ 'list-alt'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
+ 'intervention'=>'ambulance', 'invoice'=>'file-invoice-dollar', 'multicurrency'=>'dollar-sign', 'order'=>'file-invoice',
+ 'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
+ 'other'=>'square',
+ 'playdisabled'=>'play', 'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
+ 'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',
+ 'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
+ 'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
+ 'resource'=>'laptop-house',
+ 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
+ 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
+ 'title_agenda'=>'calendar-alt',
+ 'uparrow'=>'mail-forward', 'vcard'=>'address-card',
+ 'jabber'=>'comment-o',
+ 'website'=>'globe-americas'
+ );
if ($pictowithouttext == 'off') {
- $fakey = 'fa-square';
+ $fakey = 'fa-square';
$fasize = '1.3em';
} elseif ($pictowithouttext == 'on') {
- $fakey = 'fa-check-square';
+ $fakey = 'fa-check-square';
$fasize = '1.3em';
} elseif ($pictowithouttext == 'listlight') {
$fakey = 'fa-download';
@@ -3094,12 +3094,12 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$fakey = 'fa-print';
$fasize = '1.2em';
} elseif ($pictowithouttext == 'note') {
- $fakey = 'fa-sticky-note';
+ $fakey = 'fa-sticky-note';
$marginleftonlyshort = 1;
} elseif (in_array($pictowithouttext, array('1uparrow', '1downarrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected'))) {
- $convertarray = array('1uparrow'=>'caret-up', '1downarrow'=>'caret-down', '1leftarrow'=>'caret-left', '1rightarrow'=>'caret-right', '1uparrow_selected'=>'caret-up', '1downarrow_selected'=>'caret-down', '1leftarrow_selected'=>'caret-left', '1rightarrow_selected'=>'caret-right');
- $fakey = 'fa-'.$convertarray[$pictowithouttext];
- if (preg_match('/selected/', $pictowithouttext)) $facolor = '#888';
+ $convertarray = array('1uparrow'=>'caret-up', '1downarrow'=>'caret-down', '1leftarrow'=>'caret-left', '1rightarrow'=>'caret-right', '1uparrow_selected'=>'caret-up', '1downarrow_selected'=>'caret-down', '1leftarrow_selected'=>'caret-left', '1rightarrow_selected'=>'caret-right');
+ $fakey = 'fa-'.$convertarray[$pictowithouttext];
+ if (preg_match('/selected/', $pictowithouttext)) $facolor = '#888';
$marginleftonlyshort = 1;
} elseif (!empty($arrayconvpictotofa[$pictowithouttext]))
{
@@ -3162,20 +3162,20 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
}
// This snippet only needed since function img_edit accepts only one additional parameter: no separate one for css only.
- // class/style need to be extracted to avoid duplicate class/style validation errors when $moreatt is added to the end of the attributes.
- $reg = array();
+ // class/style need to be extracted to avoid duplicate class/style validation errors when $moreatt is added to the end of the attributes.
+ $reg = array();
if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {
- $morecss .= ($morecss ? ' ' : '').$reg[1];
- $moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);
- }
- if (preg_match('/style="([^"]+)"/', $moreatt, $reg)) {
- $morestyle = ' '.$reg[1];
- $moreatt = str_replace('style="'.$reg[1].'"', '', $moreatt);
- }
- $moreatt = trim($moreatt);
+ $morecss .= ($morecss ? ' ' : '').$reg[1];
+ $moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);
+ }
+ if (preg_match('/style="([^"]+)"/', $moreatt, $reg)) {
+ $morestyle = ' '.$reg[1];
+ $moreatt = str_replace('style="'.$reg[1].'"', '', $moreatt);
+ }
+ $moreatt = trim($moreatt);
- $enabledisablehtml = '';
+ $enabledisablehtml = '';
if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
$enabledisablehtml .= $titlealt;
}
@@ -3224,7 +3224,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
return $fullpathpicto;
}
// tag title is used for tooltip on , tag alt can be used with very simple text on image for blind people
- return '
'; // Alt is used for accessibility, title for popup
+ return ''; // Alt is used for accessibility, title for popup
}
/**
@@ -3832,7 +3832,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
$langs->load("main");
}
// Load translation files required by the page
- $langs->loadLangs(array('main', 'errors'));
+ $langs->loadLangs(array('main', 'errors'));
if ($_SERVER['DOCUMENT_ROOT']) // Mode web
{
@@ -3868,7 +3868,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
if (!empty($conf->modules))
{
- $out .= "".$langs->trans("Modules").": ".join(', ', $conf->modules)."
\n"; + $out .= "".$langs->trans("Modules").": ".join(', ', $conf->modules)."
\n"; } if (is_object($db)) @@ -4542,7 +4542,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $ $listoflanguagesbefore = array('nl_NL'); if (in_array($currency_code, $listofcurrenciesbefore) || in_array($outlangs->defaultlang, $listoflanguagesbefore)) { - $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code); + $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code); } else { $tmpcur = $outlangs->getCurrencySymbol($currency_code); $cursymbolafter .= ($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur); @@ -5368,7 +5368,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart) // We will enhance here a common way of forging path for document storage // Here, object->id, object->ref and modulepart are required. //var_dump($modulepart); - if (in_array($modulepart, array('thirdparty', 'contact', 'member', 'propal', 'proposal', 'commande', 'order', 'facture', 'invoice', + if (in_array($modulepart, array('thirdparty', 'contact', 'member', 'propal', 'proposal', 'commande', 'order', 'facture', 'invoice', 'supplier_order', 'supplier_proposal', 'shipment', 'contract', 'expensereport', 'ficheinter'))) { $path = ($object->ref ? $object->ref : $object->id); @@ -5875,18 +5875,18 @@ function dol_textishtml($msg, $option = 0) */ function dol_concatdesc($text1, $text2, $forxml = false, $invert = false) { - if (!empty($invert)) - { - $tmp = $text1; - $text1 = $text2; - $text2 = $tmp; - } + if (!empty($invert)) + { + $tmp = $text1; + $text1 = $text2; + $text2 = $tmp; + } - $ret = ''; - $ret .= (!dol_textishtml($text1) && dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text1, 0, 1, '', 1), 0, $forxml) : $text1; - $ret .= (!empty($text1) && !empty($text2)) ? ((dol_textishtml($text1) || dol_textishtml($text2)) ? ($forxml ? "
\n" : "
\n") : "\n") : ""; - $ret .= (dol_textishtml($text1) && !dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text2, 0, 1, '', 1), 0, $forxml) : $text2; - return $ret; + $ret = ''; + $ret .= (!dol_textishtml($text1) && dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text1, 0, 1, '', 1), 0, $forxml) : $text1; + $ret .= (!empty($text1) && !empty($text2)) ? ((dol_textishtml($text1) || dol_textishtml($text2)) ? ($forxml ? "
\n" : "
\n") : "\n") : ""; + $ret .= (dol_textishtml($text1) && !dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text2, 0, 1, '', 1), 0, $forxml) : $text2; + return $ret; } @@ -5917,11 +5917,11 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, ) ); - $substitutionarray = array_merge($substitutionarray, array( + $substitutionarray = array_merge($substitutionarray, array( '__USER_ID__' => (string) $user->id, '__USER_LOGIN__' => (string) $user->login, - '__USER_EMAIL__' => (string) $user->email, - '__USER_LASTNAME__' => (string) $user->lastname, + '__USER_EMAIL__' => (string) $user->email, + '__USER_LASTNAME__' => (string) $user->lastname, '__USER_FIRSTNAME__' => (string) $user->firstname, '__USER_FULLNAME__' => (string) $user->getFullName($outputlangs), '__USER_SUPERVISOR_ID__' => (string) ($user->fk_user ? $user->fk_user : '0'), @@ -5931,7 +5931,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, } if ((empty($exclude) || !in_array('mycompany', $exclude)) && is_object($mysoc)) { - $substitutionarray = array_merge($substitutionarray, array( + $substitutionarray = array_merge($substitutionarray, array( '__MYCOMPANY_NAME__' => $mysoc->name, '__MYCOMPANY_EMAIL__' => $mysoc->email, '__MYCOMPANY_PROFID1__' => $mysoc->idprof1, @@ -5947,8 +5947,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, '__MYCOMPANY_TOWN__' => $mysoc->town, '__MYCOMPANY_COUNTRY__' => $mysoc->country, '__MYCOMPANY_COUNTRY_ID__' => $mysoc->country_id, - '__MYCOMPANY_COUNTRY_CODE__' => $mysoc->country_code, - '__MYCOMPANY_CURRENCY_CODE__' => $conf->currency + '__MYCOMPANY_COUNTRY_CODE__' => $mysoc->country_code, + '__MYCOMPANY_CURRENCY_CODE__' => $conf->currency )); } @@ -6031,7 +6031,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, if (!empty($conf->expedition->enabled) && (!is_object($object) || $object->element == 'shipping')) { - $substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tacking number'; + $substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tacking number'; $substitutionarray['__SHIPPINGTRACKNUMURL__'] = 'Shipping tracking url'; } } else { @@ -6286,7 +6286,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, $tmp4 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $tmp5 = dol_get_next_month($tmp['mon'], $tmp['year']); - $substitutionarray = array_merge($substitutionarray, array( + $substitutionarray = array_merge($substitutionarray, array( '__DAY__' => (string) $tmp['mday'], '__DAY_TEXT__' => $outputlangs->trans('Day'.$tmp['wday']), // Monday '__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'].'Min'), // Mon @@ -6515,11 +6515,11 @@ function dolGetFirstLastname($firstname, $lastname, $nameorder = -1) $ret .= $lastname; } elseif ($nameorder == 2 || $nameorder == 3) { - $ret .= $firstname; - if (empty($ret) && $nameorder == 3) - { - $ret .= $lastname; - } + $ret .= $firstname; + if (empty($ret) && $nameorder == 3) + { + $ret .= $lastname; + } } else { $ret .= $lastname; if ($firstname && $lastname) $ret .= ' '; @@ -6821,12 +6821,12 @@ function dol_sort_array(&$array, $index, $order = 'asc', $natsort = 0, $case_sen } } - if (!$natsort) { - ($order == 'asc') ? asort($temp) : arsort($temp); - } else { - ($case_sensitive) ? natsort($temp) : natcasesort($temp); - if ($order != 'asc') $temp = array_reverse($temp, true); - } + if (!$natsort) { + ($order == 'asc') ? asort($temp) : arsort($temp); + } else { + ($case_sensitive) ? natsort($temp) : natcasesort($temp); + if ($order != 'asc') $temp = array_reverse($temp, true); + } $sorted = array(); @@ -7256,18 +7256,18 @@ function getLanguageCodeFromCountryCode($countrycode) if (function_exists('locale_get_primary_language') && function_exists('locale_get_region')) // Need extension php-intl { - foreach ($locales as $locale) - { - $locale_language = locale_get_primary_language($locale); - $locale_region = locale_get_region($locale); - if (strtoupper($countrycode) == $locale_region) - { - //var_dump($locale.'-'.$locale_language.'-'.$locale_region); - return strtolower($locale_language).'_'.strtoupper($locale_region); - } - } + foreach ($locales as $locale) + { + $locale_language = locale_get_primary_language($locale); + $locale_region = locale_get_region($locale); + if (strtoupper($countrycode) == $locale_region) + { + //var_dump($locale.'-'.$locale_language.'-'.$locale_region); + return strtolower($locale_language).'_'.strtoupper($locale_region); + } + } } else { - dol_syslog("Warning Exention php-intl is not available", LOG_WARNING); + dol_syslog("Warning Exention php-intl is not available", LOG_WARNING); } return null; @@ -7377,7 +7377,7 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type, if ($reshook > 0) { $head = $hookmanager->resArray; - $h = count($head); + $h = count($head); } } } @@ -7560,15 +7560,15 @@ function printCommonFooter($zone = 'private') // Add Xdebug coverage of code if (defined('XDEBUGCOVERAGE')) { - print_r(xdebug_get_code_coverage()); + print_r(xdebug_get_code_coverage()); } // Add DebugBar data - if (!empty($user->rights->debugbar->read) && is_object($debugbar)) - { - $debugbar['time']->stopMeasure('pageaftermaster'); - print ''."\n"; - print $debugbar->getRenderer()->render(); + if (!empty($user->rights->debugbar->read) && is_object($debugbar)) + { + $debugbar['time']->stopMeasure('pageaftermaster'); + print ''."\n"; + print $debugbar->getRenderer()->render(); } elseif (count($conf->logbuffer)) // If there is some logs in buffer to show { print "\n"; @@ -7736,30 +7736,30 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0) if ($mode == -3) $newres .= ' OR '.$field.' IS NULL'; } elseif ($mode == 4) { - $tmparray = explode(',', trim($crit)); - if (count($tmparray)) - { - $listofcodes = ''; - foreach ($tmparray as $val) - { - if ($val) - { - $newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape(trim($val)).',%\''; - $newres .= ' OR '.$field.' = \''.$db->escape(trim($val)).'\''; - $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).'\''; - $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).',%\''; - $newres .= ')'; - $i2++; - } - } - } + $tmparray = explode(',', trim($crit)); + if (count($tmparray)) + { + $listofcodes = ''; + foreach ($tmparray as $val) + { + if ($val) + { + $newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape(trim($val)).',%\''; + $newres .= ' OR '.$field.' = \''.$db->escape(trim($val)).'\''; + $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).'\''; + $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).',%\''; + $newres .= ')'; + $i2++; + } + } + } } else // $mode=0 { $tmpcrits = explode('|', $crit); $i3 = 0; foreach ($tmpcrits as $tmpcrit) { - if ($tmpcrit !== '0' && empty($tmpcrit)) continue; + if ($tmpcrit !== '0' && empty($tmpcrit)) continue; $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : ''); @@ -7937,19 +7937,19 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0) if (preg_match('/\.tsv$/i', $tmpfile)) { $mime = 'text/tab-separated-values'; $imgmime = 'text.png'; $famime = 'file-text-o'; } if (preg_match('/\.(cf|conf|log)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o'; } if (preg_match('/\.ini$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'ini'; $famime = 'file-text-o'; } - if (preg_match('/\.md$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'md'; $famime = 'file-text-o'; } + if (preg_match('/\.md$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'md'; $famime = 'file-text-o'; } if (preg_match('/\.css$/i', $tmpfile)) { $mime = 'text/css'; $imgmime = 'css.png'; $srclang = 'css'; $famime = 'file-text-o'; } // Certificate files if (preg_match('/\.(crt|cer|key|pub)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o'; } // XML based (HTML/XML/XAML) if (preg_match('/\.(html|htm|shtml)$/i', $tmpfile)) { $mime = 'text/html'; $imgmime = 'html.png'; $srclang = 'html'; $famime = 'file-text-o'; } if (preg_match('/\.(xml|xhtml)$/i', $tmpfile)) { $mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xml'; $famime = 'file-text-o'; } - if (preg_match('/\.xaml$/i', $tmpfile)) { $mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xaml'; $famime = 'file-text-o'; } + if (preg_match('/\.xaml$/i', $tmpfile)) { $mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xaml'; $famime = 'file-text-o'; } // Languages if (preg_match('/\.bas$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'bas'; $famime = 'file-code-o'; } if (preg_match('/\.(c)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'c'; $famime = 'file-code-o'; } if (preg_match('/\.(cpp)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cpp'; $famime = 'file-code-o'; } - if (preg_match('/\.cs$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cs'; $famime = 'file-code-o'; } + if (preg_match('/\.cs$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cs'; $famime = 'file-code-o'; } if (preg_match('/\.(h)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'h'; $famime = 'file-code-o'; } if (preg_match('/\.(java|jsp)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'java'; $famime = 'file-code-o'; } if (preg_match('/\.php([0-9]{1})?$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'php.png'; $srclang = 'php'; $famime = 'file-code-o'; } @@ -8079,7 +8079,7 @@ function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield */ function colorIsLight($stringcolor) { - $stringcolor = str_replace('#', '', $stringcolor); + $stringcolor = str_replace('#', '', $stringcolor); $res = -1; if (!empty($stringcolor)) { @@ -8162,28 +8162,28 @@ function roundUpToNextMultiple($n, $x = 5) */ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '', $params = array()) { - $attr = array( - 'class'=>'badge '.(!empty($mode) ? ' badge-'.$mode : '').(!empty($type) ? ' badge-'.$type : '').(empty($params['css']) ? '' : ' '.$params['css']) - ); + $attr = array( + 'class'=>'badge '.(!empty($mode) ? ' badge-'.$mode : '').(!empty($type) ? ' badge-'.$type : '').(empty($params['css']) ? '' : ' '.$params['css']) + ); - if (empty($html)) { - $html = $label; - } + if (empty($html)) { + $html = $label; + } - if (!empty($url)) { - $attr['href'] = $url; - } + if (!empty($url)) { + $attr['href'] = $url; + } - if ($mode === 'dot') { - $attr['class'] .= ' classfortooltip'; - $attr['title'] = $html; - $attr['aria-label'] = $label; - $html = ''; - } + if ($mode === 'dot') { + $attr['class'] .= ' classfortooltip'; + $attr['title'] = $html; + $attr['aria-label'] = $label; + $html = ''; + } - // Override attr - if (!empty($params['attr']) && is_array($params['attr'])) { - foreach ($params['attr']as $key => $value) { + // Override attr + if (!empty($params['attr']) && is_array($params['attr'])) { + foreach ($params['attr']as $key => $value) { if ($key == 'class') { $attr['class'] .= ' '.$value; } elseif ($key == 'classOverride') { @@ -8191,24 +8191,24 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = ' } else { $attr[$key] = $value; } - } - } + } + } - // TODO: add hook + // TODO: add hook - // escape all attribute - $attr = array_map('dol_escape_htmltag', $attr); + // escape all attribute + $attr = array_map('dol_escape_htmltag', $attr); - $TCompiledAttr = array(); - foreach ($attr as $key => $value) { - $TCompiledAttr[] = $key.'="'.$value.'"'; - } + $TCompiledAttr = array(); + foreach ($attr as $key => $value) { + $TCompiledAttr[] = $key.'="'.$value.'"'; + } - $compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : ''; + $compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : ''; - $tag = !empty($url) ? 'a' : 'span'; + $tag = !empty($url) ? 'a' : 'span'; - return '<'.$tag.' '.$compiledAttributes.'>'.$html.''; + return '<'.$tag.' '.$compiledAttributes.'>'.$html.''; } @@ -8226,82 +8226,82 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = ' */ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $statusType = 'status0', $displayMode = 0, $url = '', $params = array()) { - global $conf; + global $conf; - $return = ''; - $dolGetBadgeParams = array(); + $return = ''; + $dolGetBadgeParams = array(); - if (!empty($params['badgeParams'])) { - $dolGetBadgeParams = $params['badgeParams']; - } + if (!empty($params['badgeParams'])) { + $dolGetBadgeParams = $params['badgeParams']; + } - // TODO : add a hook - if ($displayMode == 0) { - $return = !empty($html) ? $html : (empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)); - } elseif ($displayMode == 1) { - $return = !empty($html) ? $html : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort); - } // Use status with images (for backward compatibility) - elseif (!empty($conf->global->MAIN_STATUS_USES_IMAGES)) { - $return = ''; - $htmlLabel = (in_array($displayMode, array(1, 2, 5)) ? '' : '').(!empty($html) ? $html : $statusLabel).(in_array($displayMode, array(1, 2, 5)) ? '' : ''); - $htmlLabelShort = (in_array($displayMode, array(1, 2, 5)) ? '' : '').(!empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel)).(in_array($displayMode, array(1, 2, 5)) ? '' : ''); + // TODO : add a hook + if ($displayMode == 0) { + $return = !empty($html) ? $html : (empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)); + } elseif ($displayMode == 1) { + $return = !empty($html) ? $html : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort); + } // Use status with images (for backward compatibility) + elseif (!empty($conf->global->MAIN_STATUS_USES_IMAGES)) { + $return = ''; + $htmlLabel = (in_array($displayMode, array(1, 2, 5)) ? '' : '').(!empty($html) ? $html : $statusLabel).(in_array($displayMode, array(1, 2, 5)) ? '' : ''); + $htmlLabelShort = (in_array($displayMode, array(1, 2, 5)) ? '' : '').(!empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel)).(in_array($displayMode, array(1, 2, 5)) ? '' : ''); - // For small screen, we always use the short label instead of long label. - if (!empty($conf->dol_optimize_smallscreen)) - { - if ($displayMode == 0) $displayMode = 1; - elseif ($displayMode == 4) $displayMode = 2; - elseif ($displayMode == 6) $displayMode = 5; - } + // For small screen, we always use the short label instead of long label. + if (!empty($conf->dol_optimize_smallscreen)) + { + if ($displayMode == 0) $displayMode = 1; + elseif ($displayMode == 4) $displayMode = 2; + elseif ($displayMode == 6) $displayMode = 5; + } - // For backward compatibility. Image's filename are still in French, so we use this array to convert - $statusImg = array( - 'status0' => 'statut0', - 'status1' => 'statut1', - 'status2' => 'statut2', - 'status3' => 'statut3', - 'status4' => 'statut4', - 'status5' => 'statut5', - 'status6' => 'statut6', - 'status7' => 'statut7', - 'status8' => 'statut8', - 'status9' => 'statut9' - ); + // For backward compatibility. Image's filename are still in French, so we use this array to convert + $statusImg = array( + 'status0' => 'statut0', + 'status1' => 'statut1', + 'status2' => 'statut2', + 'status3' => 'statut3', + 'status4' => 'statut4', + 'status5' => 'statut5', + 'status6' => 'statut6', + 'status7' => 'statut7', + 'status8' => 'statut8', + 'status9' => 'statut9' + ); - if (!empty($statusImg[$statusType])) { - $htmlImg = img_picto($statusLabel, $statusImg[$statusType]); - } else { - $htmlImg = img_picto($statusLabel, $statusType); - } + if (!empty($statusImg[$statusType])) { + $htmlImg = img_picto($statusLabel, $statusImg[$statusType]); + } else { + $htmlImg = img_picto($statusLabel, $statusType); + } - if ($displayMode === 2) { - $return = $htmlImg.' '.$htmlLabelShort; - } elseif ($displayMode === 3) { - $return = $htmlImg; - } elseif ($displayMode === 4) { - $return = $htmlImg.' '.$htmlLabel; - } elseif ($displayMode === 5) { - $return = $htmlLabelShort.' '.$htmlImg; - } else { // $displayMode >= 6 - $return = $htmlLabel.' '.$htmlImg; - } - } // Use new badge - elseif (empty($conf->global->MAIN_STATUS_USES_IMAGES) && !empty($displayMode)) { - $statusLabelShort = (empty($statusLabelShort) ? $statusLabel : $statusLabelShort); + if ($displayMode === 2) { + $return = $htmlImg.' '.$htmlLabelShort; + } elseif ($displayMode === 3) { + $return = $htmlImg; + } elseif ($displayMode === 4) { + $return = $htmlImg.' '.$htmlLabel; + } elseif ($displayMode === 5) { + $return = $htmlLabelShort.' '.$htmlImg; + } else { // $displayMode >= 6 + $return = $htmlLabel.' '.$htmlImg; + } + } // Use new badge + elseif (empty($conf->global->MAIN_STATUS_USES_IMAGES) && !empty($displayMode)) { + $statusLabelShort = (empty($statusLabelShort) ? $statusLabel : $statusLabelShort); $dolGetBadgeParams['attr']['class'] = 'badge-status'; $dolGetBadgeParams['attr']['title'] = $statusLabel; - if ($displayMode == 3) { - $return = dolGetBadge((empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)), '', $statusType, 'dot', $url, $dolGetBadgeParams); - } elseif ($displayMode === 5) { - $return = dolGetBadge($statusLabelShort, $html, $statusType, '', $url, $dolGetBadgeParams); - } else { - $return = dolGetBadge((empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)), $html, $statusType, '', $url, $dolGetBadgeParams); - } - } + if ($displayMode == 3) { + $return = dolGetBadge((empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)), '', $statusType, 'dot', $url, $dolGetBadgeParams); + } elseif ($displayMode === 5) { + $return = dolGetBadge($statusLabelShort, $html, $statusType, '', $url, $dolGetBadgeParams); + } else { + $return = dolGetBadge((empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)), $html, $statusType, '', $url, $dolGetBadgeParams); + } + } - return $return; + return $return; } @@ -8319,63 +8319,63 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st */ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params = array()) { - $class = 'butAction'; - if ($actionType == 'danger' || $actionType == 'delete') { - $class = 'butActionDelete'; - } + $class = 'butAction'; + if ($actionType == 'danger' || $actionType == 'delete') { + $class = 'butActionDelete'; + } - $attr = array( - 'class' => $class - ,'href' => empty($url) ? '' : $url - ); + $attr = array( + 'class' => $class + ,'href' => empty($url) ? '' : $url + ); - if (empty($html)) { - $html = $label; - } else { - $attr['aria-label'] = $label; - } + if (empty($html)) { + $html = $label; + } else { + $attr['aria-label'] = $label; + } - if (empty($userRight)) { - $attr['class'] = 'butActionRefused'; - $attr['href'] = ''; - } + if (empty($userRight)) { + $attr['class'] = 'butActionRefused'; + $attr['href'] = ''; + } - if (!empty($id)) { - $attr['id'] = $id; - } + if (!empty($id)) { + $attr['id'] = $id; + } - // Override attr - if (!empty($params['attr']) && is_array($params['attr'])) { - foreach ($params['attr'] as $key => $value) { - if ($key == 'class') { - $attr['class'] .= ' '.$value; - } elseif ($key == 'classOverride') { - $attr['class'] = $value; - } else { - $attr[$key] = $value; - } - } - } + // Override attr + if (!empty($params['attr']) && is_array($params['attr'])) { + foreach ($params['attr'] as $key => $value) { + if ($key == 'class') { + $attr['class'] .= ' '.$value; + } elseif ($key == 'classOverride') { + $attr['class'] = $value; + } else { + $attr[$key] = $value; + } + } + } - if (isset($attr['href']) && empty($attr['href'])) { - unset($attr['href']); - } + if (isset($attr['href']) && empty($attr['href'])) { + unset($attr['href']); + } - // TODO : add a hook + // TODO : add a hook - // escape all attribute - $attr = array_map('dol_escape_htmltag', $attr); + // escape all attribute + $attr = array_map('dol_escape_htmltag', $attr); - $TCompiledAttr = array(); - foreach ($attr as $key => $value) { - $TCompiledAttr[] = $key.'="'.$value.'"'; - } + $TCompiledAttr = array(); + foreach ($attr as $key => $value) { + $TCompiledAttr[] = $key.'="'.$value.'"'; + } - $compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : ''; + $compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : ''; - $tag = !empty($attr['href']) ? 'a' : 'span'; + $tag = !empty($attr['href']) ? 'a' : 'span'; - return '';
+ if ($usetable) print '';
- // Import key
- if (!empty($object->import_key))
- {
- if ($usetable) print '
';
+ if ($usetable) print '
';
}
@@ -489,8 +489,8 @@ function dolAddEmailTrackId($email, $trackingid)
*/
function isValidMailDomain($mail)
{
- list($user, $domain) = explode("@", $mail, 2);
- return checkdnsrr($domain, "MX");
+ list($user, $domain) = explode("@", $mail, 2);
+ return checkdnsrr($domain, "MX");
}
/**
@@ -508,38 +508,38 @@ function isValidMailDomain($mail)
*/
function isValidUrl($url, $http = 0, $pass = 0, $port = 0, $path = 0, $query = 0, $anchor = 0)
{
- $ValidUrl = 0;
- $urlregex = '';
+ $ValidUrl = 0;
+ $urlregex = '';
- // SCHEME
- if ($http) $urlregex .= "^(http:\/\/|https:\/\/)";
+ // SCHEME
+ if ($http) $urlregex .= "^(http:\/\/|https:\/\/)";
- // USER AND PASS
- if ($pass) $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
+ // USER AND PASS
+ if ($pass) $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
- // HOSTNAME OR IP
- //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*"; // x allowed (ex. http://localhost, http://routerlogin)
- //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)+"; // x.x
- $urlregex .= "([a-z0-9+\$_\\\:-])+(\.[a-z0-9+\$_-][a-z0-9+\$_-]+)*"; // x ou x.xx (2 x ou plus)
- //use only one of the above
+ // HOSTNAME OR IP
+ //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*"; // x allowed (ex. http://localhost, http://routerlogin)
+ //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)+"; // x.x
+ $urlregex .= "([a-z0-9+\$_\\\:-])+(\.[a-z0-9+\$_-][a-z0-9+\$_-]+)*"; // x ou x.xx (2 x ou plus)
+ //use only one of the above
- // PORT
- if ($port) $urlregex .= "(\:[0-9]{2,5})";
- // PATH
- if ($path) $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";
- // GET Query
- if ($query) $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";
- // ANCHOR
- if ($anchor) $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";
+ // PORT
+ if ($port) $urlregex .= "(\:[0-9]{2,5})";
+ // PATH
+ if ($path) $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";
+ // GET Query
+ if ($query) $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";
+ // ANCHOR
+ if ($anchor) $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";
- // check
- if (preg_match('/'.$urlregex.'/i', $url))
- {
- $ValidUrl = 1;
- }
- //print $urlregex.' - '.$url.' - '.$ValidUrl;
+ // check
+ if (preg_match('/'.$urlregex.'/i', $url))
+ {
+ $ValidUrl = 1;
+ }
+ //print $urlregex.' - '.$url.' - '.$ValidUrl;
- return $ValidUrl;
+ return $ValidUrl;
}
/**
@@ -550,21 +550,21 @@ function isValidUrl($url, $http = 0, $pass = 0, $port = 0, $path = 0, $query = 0
*/
function isValidVATID($company)
{
- if ($company->isInEEC()) // Syntax check rules for EEC countries
- {
- /* Disabled because some companies can have an address in Irland and a vat number in France.
+ if ($company->isInEEC()) // Syntax check rules for EEC countries
+ {
+ /* Disabled because some companies can have an address in Irland and a vat number in France.
$vatprefix = $company->country_code;
if ($vatprefix == 'GR') $vatprefix = '(EL|GR)';
elseif ($vatprefix == 'MC') $vatprefix = 'FR'; // Monaco is using french VAT numbers
else $vatprefix = preg_quote($vatprefix, '/');*/
- $vatprefix = '[a-zA-Z][a-zA-Z]';
- if (!preg_match('/^'.$vatprefix.'[a-zA-Z0-9\-\.]{5,14}$/i', str_replace(' ', '', $company->tva_intra)))
- {
- return 0;
- }
- }
+ $vatprefix = '[a-zA-Z][a-zA-Z]';
+ if (!preg_match('/^'.$vatprefix.'[a-zA-Z0-9\-\.]{5,14}$/i', str_replace(' ', '', $company->tva_intra)))
+ {
+ return 0;
+ }
+ }
- return 1;
+ return 1;
}
/**
@@ -576,34 +576,34 @@ function isValidVATID($company)
*/
function clean_url($url, $http = 1)
{
- // Fixed by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-cleaning-url.html)
- // To include the minus sign in a char class, we must not escape it but put it at the end of the class
- // Also, there's no need of escape a dot sign in a class
- if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i', $url, $regs))
- {
- $proto = $regs[1];
- $domain = $regs[2];
- $port = isset($regs[3]) ? $regs[3] : '';
- //print $url." -> ".$proto." - ".$domain." - ".$port;
- //$url = dol_string_nospecial(trim($url));
- $url = trim($url);
+ // Fixed by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-cleaning-url.html)
+ // To include the minus sign in a char class, we must not escape it but put it at the end of the class
+ // Also, there's no need of escape a dot sign in a class
+ if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i', $url, $regs))
+ {
+ $proto = $regs[1];
+ $domain = $regs[2];
+ $port = isset($regs[3]) ? $regs[3] : '';
+ //print $url." -> ".$proto." - ".$domain." - ".$port;
+ //$url = dol_string_nospecial(trim($url));
+ $url = trim($url);
- // Si http: defini on supprime le http (Si https on ne supprime pas)
- $newproto = $proto;
- if ($http == 0)
- {
- if (preg_match('/^http:[\\/]+/i', $url))
- {
- $url = preg_replace('/^http:[\\/]+/i', '', $url);
- $newproto = '';
- }
- }
+ // Si http: defini on supprime le http (Si https on ne supprime pas)
+ $newproto = $proto;
+ if ($http == 0)
+ {
+ if (preg_match('/^http:[\\/]+/i', $url))
+ {
+ $url = preg_replace('/^http:[\\/]+/i', '', $url);
+ $newproto = '';
+ }
+ }
- // On passe le nom de domaine en minuscule
- $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain, '/').'/i', $newproto.strtolower($domain), $url);
+ // On passe le nom de domaine en minuscule
+ $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain, '/').'/i', $newproto.strtolower($domain), $url);
- return $CleanUrl;
- } else return $url;
+ return $CleanUrl;
+ } else return $url;
}
@@ -662,12 +662,12 @@ function dolObfuscateEmail($mail, $replace = "*", $nbreplace = 8, $nbdisplaymail
*/
function array2tr($data, $troptions = '', $tdoptions = '')
{
- $text = '';
- foreach ($data as $key => $item) {
- $text .= ''.$item.' ';
- }
- $text .= ' ';
- return $text;
+ $text = '';
+ foreach ($data as $key => $item) {
+ $text .= ''.$item.' ';
+ }
+ $text .= ' ';
+ return $text;
}
/**
@@ -682,20 +682,20 @@ function array2tr($data, $troptions = '', $tdoptions = '')
*/
function array2table($data, $tableMarkup = 1, $tableoptions = '', $troptions = '', $tdoptions = '')
{
- $text = '';
- if ($tableMarkup) $text = '';
- foreach ($data as $key => $item) {
- if (is_array($item)) {
- $text .= array2tr($item, $troptions, $tdoptions);
- } else {
- $text .= '
';
- return $text;
+ $text = '';
+ if ($tableMarkup) $text = '';
+ foreach ($data as $key => $item) {
+ if (is_array($item)) {
+ $text .= array2tr($item, $troptions, $tdoptions);
+ } else {
+ $text .= '
';
+ return $text;
}
/**
@@ -716,434 +716,434 @@ function array2table($data, $tableMarkup = 1, $tableoptions = '', $troptions = '
*/
function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $date = '', $mode = 'next', $bentityon = true, $objuser = null, $forceentity = null)
{
- global $conf, $user;
+ global $conf, $user;
- if (!is_object($objsoc)) $valueforccc = $objsoc;
- elseif ($table == "commande_fournisseur" || $table == "facture_fourn") $valueforccc = dol_string_unaccent($objsoc->code_fournisseur);
- else $valueforccc = dol_string_unaccent($objsoc->code_client);
+ if (!is_object($objsoc)) $valueforccc = $objsoc;
+ elseif ($table == "commande_fournisseur" || $table == "facture_fourn") $valueforccc = dol_string_unaccent($objsoc->code_fournisseur);
+ else $valueforccc = dol_string_unaccent($objsoc->code_client);
- $sharetable = $table;
- if ($table == 'facture' || $table == 'invoice') $sharetable = 'invoicenumber'; // for getEntity function
+ $sharetable = $table;
+ if ($table == 'facture' || $table == 'invoice') $sharetable = 'invoicenumber'; // for getEntity function
- // Clean parameters
- if ($date == '') $date = dol_now(); // We use local year and month of PHP server to search numbers
- // but we should use local year and month of user
+ // Clean parameters
+ if ($date == '') $date = dol_now(); // We use local year and month of PHP server to search numbers
+ // but we should use local year and month of user
- // For debugging
- //dol_syslog("mask=".$mask, LOG_DEBUG);
- //include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php');
- //$mask='FA{yy}{mm}-{0000@99}';
- //$date=dol_mktime(12, 0, 0, 1, 1, 1900);
- //$date=dol_stringtotime('20130101');
+ // For debugging
+ //dol_syslog("mask=".$mask, LOG_DEBUG);
+ //include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php');
+ //$mask='FA{yy}{mm}-{0000@99}';
+ //$date=dol_mktime(12, 0, 0, 1, 1, 1900);
+ //$date=dol_stringtotime('20130101');
- $hasglobalcounter = false;
- // Extract value for mask counter, mask raz and mask offset
- if (preg_match('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $mask, $reg))
- {
- $masktri = $reg[1].(!empty($reg[2]) ? $reg[2] : '').(!empty($reg[3]) ? $reg[3] : '');
- $maskcounter = $reg[1];
- $hasglobalcounter = true;
- } else {
- // setting some defaults so the rest of the code won't fail if there is a third party counter
- $masktri = '00000';
- $maskcounter = '00000';
- }
+ $hasglobalcounter = false;
+ // Extract value for mask counter, mask raz and mask offset
+ if (preg_match('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $mask, $reg))
+ {
+ $masktri = $reg[1].(!empty($reg[2]) ? $reg[2] : '').(!empty($reg[3]) ? $reg[3] : '');
+ $maskcounter = $reg[1];
+ $hasglobalcounter = true;
+ } else {
+ // setting some defaults so the rest of the code won't fail if there is a third party counter
+ $masktri = '00000';
+ $maskcounter = '00000';
+ }
- $maskraz = -1;
- $maskoffset = 0;
- $resetEveryMonth = false;
- if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) return 'ErrorCounterMustHaveMoreThan3Digits';
+ $maskraz = -1;
+ $maskoffset = 0;
+ $resetEveryMonth = false;
+ if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) return 'ErrorCounterMustHaveMoreThan3Digits';
- // Extract value for third party mask counter
- if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))
- {
- $maskrefclient = $regClientRef[1].$regClientRef[2];
- $maskrefclient_maskclientcode = $regClientRef[1];
- $maskrefclient_maskcounter = $regClientRef[2];
- $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset
- $maskrefclient_clientcode = substr($valueforccc, 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code where n is length in mask
- $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
- $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like
- if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
- } else $maskrefclient = '';
+ // Extract value for third party mask counter
+ if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))
+ {
+ $maskrefclient = $regClientRef[1].$regClientRef[2];
+ $maskrefclient_maskclientcode = $regClientRef[1];
+ $maskrefclient_maskcounter = $regClientRef[2];
+ $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset
+ $maskrefclient_clientcode = substr($valueforccc, 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code where n is length in mask
+ $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
+ $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like
+ if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
+ } else $maskrefclient = '';
- // fail if there is neither a global nor a third party counter
- if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))
- {
- return 'ErrorBadMask';
- }
+ // fail if there is neither a global nor a third party counter
+ if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))
+ {
+ return 'ErrorBadMask';
+ }
- // Extract value for third party type
- if (preg_match('/\{(t+)\}/i', $mask, $regType))
- {
- $masktype = $regType[1];
- $masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdpaty typent_code (where n is length in mask)
- $masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
- } else {
- $masktype = '';
- $masktype_value = '';
- }
+ // Extract value for third party type
+ if (preg_match('/\{(t+)\}/i', $mask, $regType))
+ {
+ $masktype = $regType[1];
+ $masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdpaty typent_code (where n is length in mask)
+ $masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
+ } else {
+ $masktype = '';
+ $masktype_value = '';
+ }
- // Extract value for user
- if (preg_match('/\{(u+)\}/i', $mask, $regType))
- {
- $lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
- if (is_object($objuser)) $lastname = $objuser->lastname;
+ // Extract value for user
+ if (preg_match('/\{(u+)\}/i', $mask, $regType))
+ {
+ $lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
+ if (is_object($objuser)) $lastname = $objuser->lastname;
- $maskuser = $regType[1];
- $maskuser_value = substr($lastname, 0, dol_strlen($regType[1])); // get n first characters of user firstname (where n is length in mask)
- $maskuser_value = str_pad($maskuser_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
- } else {
- $maskuser = '';
- $maskuser_value = '';
- }
+ $maskuser = $regType[1];
+ $maskuser_value = substr($lastname, 0, dol_strlen($regType[1])); // get n first characters of user firstname (where n is length in mask)
+ $maskuser_value = str_pad($maskuser_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
+ } else {
+ $maskuser = '';
+ $maskuser_value = '';
+ }
- // Personalized field {XXX-1} Ã {XXX-9}
- $maskperso = array();
- $maskpersonew = array();
- $tmpmask = $mask;
- while (preg_match('/\{([A-Z]+)\-([1-9])\}/', $tmpmask, $regKey))
- {
- $maskperso[$regKey[1]] = '{'.$regKey[1].'-'.$regKey[2].'}';
- $maskpersonew[$regKey[1]] = str_pad('', $regKey[2], '_', STR_PAD_RIGHT);
- $tmpmask = preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);
- }
+ // Personalized field {XXX-1} Ã {XXX-9}
+ $maskperso = array();
+ $maskpersonew = array();
+ $tmpmask = $mask;
+ while (preg_match('/\{([A-Z]+)\-([1-9])\}/', $tmpmask, $regKey))
+ {
+ $maskperso[$regKey[1]] = '{'.$regKey[1].'-'.$regKey[2].'}';
+ $maskpersonew[$regKey[1]] = str_pad('', $regKey[2], '_', STR_PAD_RIGHT);
+ $tmpmask = preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);
+ }
- if (strstr($mask, 'user_extra_'))
- {
+ if (strstr($mask, 'user_extra_'))
+ {
$start = "{user_extra_";
$end = "\}";
$extra = get_string_between($mask, "user_extra_", "}");
if (!empty($user->array_options['options_'.$extra])) {
$mask = preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
}
- }
- $maskwithonlyymcode = $mask;
- $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $maskcounter, $maskwithonlyymcode);
- $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);
- $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);
- $maskwithonlyymcode = preg_replace('/\{(t+)\}/i', $masktype_value, $maskwithonlyymcode);
- $maskwithonlyymcode = preg_replace('/\{(u+)\}/i', $maskuser_value, $maskwithonlyymcode);
- foreach ($maskperso as $key => $val)
- {
- $maskwithonlyymcode = preg_replace('/'.preg_quote($val, '/').'/i', $maskpersonew[$key], $maskwithonlyymcode);
- }
- $maskwithnocode = $maskwithonlyymcode;
- $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);
- $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);
- $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);
- $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);
- // Now maskwithnocode = 0000ddmmyyyyccc for example
- // and maskcounter = 0000 for example
- //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n
"; - //var_dump($reg); + } + $maskwithonlyymcode = $mask; + $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $maskcounter, $maskwithonlyymcode); + $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode); + $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode); + $maskwithonlyymcode = preg_replace('/\{(t+)\}/i', $masktype_value, $maskwithonlyymcode); + $maskwithonlyymcode = preg_replace('/\{(u+)\}/i', $maskuser_value, $maskwithonlyymcode); + foreach ($maskperso as $key => $val) + { + $maskwithonlyymcode = preg_replace('/'.preg_quote($val, '/').'/i', $maskpersonew[$key], $maskwithonlyymcode); + } + $maskwithnocode = $maskwithonlyymcode; + $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode); + $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode); + $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode); + $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode); + // Now maskwithnocode = 0000ddmmyyyyccc for example + // and maskcounter = 0000 for example + //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n
"; + //var_dump($reg); - // If an offset is asked - if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]); - if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]); + // If an offset is asked + if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]); + if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]); - // Define $sqlwhere - $sqlwhere = ''; - $yearoffset = 0; // Use year of current $date by default - $yearoffsettype = false; // false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x + // Define $sqlwhere + $sqlwhere = ''; + $yearoffset = 0; // Use year of current $date by default + $yearoffsettype = false; // false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x - // If a restore to zero after a month is asked we check if there is already a value for this year. - if (!empty($reg[2]) && preg_match('/^@/', $reg[2])) $yearoffsettype = preg_replace('/^@/', '', $reg[2]); - if (!empty($reg[3]) && preg_match('/^@/', $reg[3])) $yearoffsettype = preg_replace('/^@/', '', $reg[3]); + // If a restore to zero after a month is asked we check if there is already a value for this year. + if (!empty($reg[2]) && preg_match('/^@/', $reg[2])) $yearoffsettype = preg_replace('/^@/', '', $reg[2]); + if (!empty($reg[3]) && preg_match('/^@/', $reg[3])) $yearoffsettype = preg_replace('/^@/', '', $reg[3]); - //print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype; - if (is_numeric($yearoffsettype) && $yearoffsettype >= 1) - $maskraz = $yearoffsettype; // For backward compatibility - elseif ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1)) - $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START; - //print "maskraz=".$maskraz; // -1=no reset + //print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype; + if (is_numeric($yearoffsettype) && $yearoffsettype >= 1) + $maskraz = $yearoffsettype; // For backward compatibility + elseif ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1)) + $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START; + //print "maskraz=".$maskraz; // -1=no reset - if ($maskraz > 0) { // A reset is required - if ($maskraz == 99) { - $maskraz = date('m', $date); - $resetEveryMonth = true; - } - if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth'; + if ($maskraz > 0) { // A reset is required + if ($maskraz == 99) { + $maskraz = date('m', $date); + $resetEveryMonth = true; + } + if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth'; - // Define posy, posm and reg - if ($maskraz > 1) // if reset is not first month, we need month and year into mask - { - if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; } elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; } else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask'; + // Define posy, posm and reg + if ($maskraz > 1) // if reset is not first month, we need month and year into mask + { + if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; } elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; } else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask'; - if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit'; - } else // if reset is for a specific month in year, we need year - { - if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; } elseif (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; } elseif (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 0; } else return 'ErrorCantUseRazIfNoYearInMask'; - } - // Define length - $yearlen = $posy ?dol_strlen($reg[$posy]) : 0; - $monthlen = $posm ?dol_strlen($reg[$posm]) : 0; - // Define pos - $yearpos = (dol_strlen($reg[1]) + 1); - $monthpos = ($yearpos + $yearlen); - if ($posy == 3 && $posm == 2) { // if month is before year - $monthpos = (dol_strlen($reg[1]) + 1); - $yearpos = ($monthpos + $monthlen); - } - //print "xxx ".$maskwithonlyymcode." maskraz=".$maskraz." posy=".$posy." yearlen=".$yearlen." yearpos=".$yearpos." posm=".$posm." monthlen=".$monthlen." monthpos=".$monthpos." yearoffsettype=".$yearoffsettype." resetEveryMonth=".$resetEveryMonth."\n"; + if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit'; + } else // if reset is for a specific month in year, we need year + { + if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; } elseif (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; } elseif (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 0; } else return 'ErrorCantUseRazIfNoYearInMask'; + } + // Define length + $yearlen = $posy ?dol_strlen($reg[$posy]) : 0; + $monthlen = $posm ?dol_strlen($reg[$posm]) : 0; + // Define pos + $yearpos = (dol_strlen($reg[1]) + 1); + $monthpos = ($yearpos + $yearlen); + if ($posy == 3 && $posm == 2) { // if month is before year + $monthpos = (dol_strlen($reg[1]) + 1); + $yearpos = ($monthpos + $monthlen); + } + //print "xxx ".$maskwithonlyymcode." maskraz=".$maskraz." posy=".$posy." yearlen=".$yearlen." yearpos=".$yearpos." posm=".$posm." monthlen=".$monthlen." monthpos=".$monthpos." yearoffsettype=".$yearoffsettype." resetEveryMonth=".$resetEveryMonth."\n"; - // Define $yearcomp and $monthcomp (that will be use in the select where to search max number) - $monthcomp = $maskraz; - $yearcomp = 0; + // Define $yearcomp and $monthcomp (that will be use in the select where to search max number) + $monthcomp = $maskraz; + $yearcomp = 0; - if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=') // $yearoffsettype is - or + - { - $currentyear = date("Y", $date); - $fiscaldate = dol_mktime('0', '0', '0', $maskraz, '1', $currentyear); - $newyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear); - $nextnewyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear + 1); - //echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'
'; + if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=') // $yearoffsettype is - or + + { + $currentyear = date("Y", $date); + $fiscaldate = dol_mktime('0', '0', '0', $maskraz, '1', $currentyear); + $newyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear); + $nextnewyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear + 1); + //echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'
'; - // If after or equal of current fiscal date - if ($date >= $fiscaldate) - { - // If before of next new year date - if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset = 1; - } // If after or equal of current new year date - elseif ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset = -1; - } // For backward compatibility - elseif (date("m", $date) < $maskraz && empty($resetEveryMonth)) { $yearoffset = -1; } // If current month lower that month of return to zero, year is previous year + // If after or equal of current fiscal date + if ($date >= $fiscaldate) + { + // If before of next new year date + if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset = 1; + } // If after or equal of current new year date + elseif ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset = -1; + } // For backward compatibility + elseif (date("m", $date) < $maskraz && empty($resetEveryMonth)) { $yearoffset = -1; } // If current month lower that month of return to zero, year is previous year - if ($yearlen == 4) $yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset); - elseif ($yearlen == 2) $yearcomp = sprintf("%02d", date("y", $date) + $yearoffset); - elseif ($yearlen == 1) $yearcomp = substr(date("y", $date), 2, 1) + $yearoffset; - if ($monthcomp > 1 && empty($resetEveryMonth)) // Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0) - { - if ($yearlen == 4) $yearcomp1 = sprintf("%04d", date("Y", $date) + $yearoffset + 1); - elseif ($yearlen == 2) $yearcomp1 = sprintf("%02d", date("y", $date) + $yearoffset + 1); + if ($yearlen == 4) $yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset); + elseif ($yearlen == 2) $yearcomp = sprintf("%02d", date("y", $date) + $yearoffset); + elseif ($yearlen == 1) $yearcomp = substr(date("y", $date), 2, 1) + $yearoffset; + if ($monthcomp > 1 && empty($resetEveryMonth)) // Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0) + { + if ($yearlen == 4) $yearcomp1 = sprintf("%04d", date("Y", $date) + $yearoffset + 1); + elseif ($yearlen == 2) $yearcomp1 = sprintf("%02d", date("y", $date) + $yearoffset + 1); - $sqlwhere .= "("; - $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'"; - $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") >= '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')"; - $sqlwhere .= " OR"; - $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'"; - $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') "; - $sqlwhere .= ')'; - } elseif ($resetEveryMonth) + $sqlwhere .= "("; + $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'"; + $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") >= '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')"; + $sqlwhere .= " OR"; + $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'"; + $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') "; + $sqlwhere .= ')'; + } elseif ($resetEveryMonth) { $sqlwhere .= "(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'"; - $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')"; + $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')"; } else // reset is done on january - { - $sqlwhere .= '(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')"; - } - } - //print "sqlwhere=".$sqlwhere." yearcomp=".$yearcomp."
\n"; // sqlwhere and yearcomp defined only if we ask a reset - //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."
\n"; + { + $sqlwhere .= '(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')"; + } + } + //print "sqlwhere=".$sqlwhere." yearcomp=".$yearcomp."
\n"; // sqlwhere and yearcomp defined only if we ask a reset + //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."
\n"; - // Define $sqlstring - if (function_exists('mb_strrpos')) - { - $posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8'); + // Define $sqlstring + if (function_exists('mb_strrpos')) + { + $posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8'); } else { - $posnumstart = strrpos($maskwithnocode, $maskcounter); + $posnumstart = strrpos($maskwithnocode, $maskcounter); } // Pos of counter in final string (from 0 to ...) - if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence'; - $sqlstring = 'SUBSTRING('.$field.', '.($posnumstart + 1).', '.dol_strlen($maskcounter).')'; + if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence'; + $sqlstring = 'SUBSTRING('.$field.', '.($posnumstart + 1).', '.dol_strlen($maskcounter).')'; - // Define $maskLike - $maskLike = dol_string_nospecial($mask); - $maskLike = str_replace("%", "_", $maskLike); + // Define $maskLike + $maskLike = dol_string_nospecial($mask); + $maskLike = str_replace("%", "_", $maskLike); - // Replace protected special codes with matching number of _ as wild card caracter - $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike); - $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike); - $maskLike = preg_replace('/\{y\}/i', '_', $maskLike); - $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike); - $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike); - $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskLike); - if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike); - if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike); - if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike); - foreach ($maskperso as $key => $val) - { - $maskLike = str_replace(dol_string_nospecial($maskperso[$key]), $maskpersonew[$key], $maskLike); - } + // Replace protected special codes with matching number of _ as wild card caracter + $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike); + $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike); + $maskLike = preg_replace('/\{y\}/i', '_', $maskLike); + $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike); + $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike); + $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskLike); + if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike); + if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike); + if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike); + foreach ($maskperso as $key => $val) + { + $maskLike = str_replace(dol_string_nospecial($maskperso[$key]), $maskpersonew[$key], $maskLike); + } - // Get counter in database - $counter = 0; - $sql = "SELECT MAX(".$sqlstring.") as val"; - $sql .= " FROM ".MAIN_DB_PREFIX.$table; - $sql .= " WHERE ".$field." LIKE '".$maskLike."'"; + // Get counter in database + $counter = 0; + $sql = "SELECT MAX(".$sqlstring.") as val"; + $sql .= " FROM ".MAIN_DB_PREFIX.$table; + $sql .= " WHERE ".$field." LIKE '".$maskLike."'"; $sql .= " AND ".$field." NOT LIKE '(PROV%)'"; - if ($bentityon) // only if entity enable - $sql .= " AND entity IN (".getEntity($sharetable).")"; - elseif (!empty($forceentity)) - $sql .= " AND entity IN (".$forceentity.")"; - if ($where) $sql .= $where; - if ($sqlwhere) $sql .= ' AND '.$sqlwhere; + if ($bentityon) // only if entity enable + $sql .= " AND entity IN (".getEntity($sharetable).")"; + elseif (!empty($forceentity)) + $sql .= " AND entity IN (".$forceentity.")"; + if ($where) $sql .= $where; + if ($sqlwhere) $sql .= ' AND '.$sqlwhere; - //print $sql.'
'; - dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG); - $resql = $db->query($sql); - if ($resql) - { - $obj = $db->fetch_object($resql); - $counter = $obj->val; - } else dol_print_error($db); + //print $sql.'
'; + dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG); + $resql = $db->query($sql); + if ($resql) + { + $obj = $db->fetch_object($resql); + $counter = $obj->val; + } else dol_print_error($db); - // Check if we must force counter to maskoffset - if (empty($counter)) $counter = $maskoffset; - elseif (preg_match('/[^0-9]/i', $counter)) - { - $counter = 0; - dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR); - } elseif ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter = $maskoffset; + // Check if we must force counter to maskoffset + if (empty($counter)) $counter = $maskoffset; + elseif (preg_match('/[^0-9]/i', $counter)) + { + $counter = 0; + dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR); + } elseif ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter = $maskoffset; - if ($mode == 'last') // We found value for counter = last counter value. Now need to get corresponding ref of invoice. - { - $counterpadded = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT); + if ($mode == 'last') // We found value for counter = last counter value. Now need to get corresponding ref of invoice. + { + $counterpadded = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT); - // Define $maskLike - $maskLike = dol_string_nospecial($mask); - $maskLike = str_replace("%", "_", $maskLike); - // Replace protected special codes with matching number of _ as wild card caracter - $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike); - $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike); - $maskLike = preg_replace('/\{y\}/i', '_', $maskLike); - $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike); - $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike); - $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), $counterpadded, $maskLike); - if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike); - if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike); - if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike); + // Define $maskLike + $maskLike = dol_string_nospecial($mask); + $maskLike = str_replace("%", "_", $maskLike); + // Replace protected special codes with matching number of _ as wild card caracter + $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike); + $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike); + $maskLike = preg_replace('/\{y\}/i', '_', $maskLike); + $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike); + $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike); + $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), $counterpadded, $maskLike); + if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike); + if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike); + if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike); - $ref = ''; - $sql = "SELECT ".$field." as ref"; - $sql .= " FROM ".MAIN_DB_PREFIX.$table; - $sql .= " WHERE ".$field." LIKE '".$maskLike."'"; - $sql .= " AND ".$field." NOT LIKE '%PROV%'"; - if ($bentityon) // only if entity enable - $sql .= " AND entity IN (".getEntity($sharetable).")"; - elseif (!empty($forceentity)) - $sql .= " AND entity IN (".$forceentity.")"; - if ($where) $sql .= $where; - if ($sqlwhere) $sql .= ' AND '.$sqlwhere; + $ref = ''; + $sql = "SELECT ".$field." as ref"; + $sql .= " FROM ".MAIN_DB_PREFIX.$table; + $sql .= " WHERE ".$field." LIKE '".$maskLike."'"; + $sql .= " AND ".$field." NOT LIKE '%PROV%'"; + if ($bentityon) // only if entity enable + $sql .= " AND entity IN (".getEntity($sharetable).")"; + elseif (!empty($forceentity)) + $sql .= " AND entity IN (".$forceentity.")"; + if ($where) $sql .= $where; + if ($sqlwhere) $sql .= ' AND '.$sqlwhere; - dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG); - $resql = $db->query($sql); - if ($resql) - { - $obj = $db->fetch_object($resql); - if ($obj) $ref = $obj->ref; - } else dol_print_error($db); + dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG); + $resql = $db->query($sql); + if ($resql) + { + $obj = $db->fetch_object($resql); + if ($obj) $ref = $obj->ref; + } else dol_print_error($db); - $numFinal = $ref; - } elseif ($mode == 'next') - { - $counter++; + $numFinal = $ref; + } elseif ($mode == 'next') + { + $counter++; - // If value for $counter has a length higher than $maskcounter chars - if ($counter >= pow(10, dol_strlen($maskcounter))) - { - $counter = 'ErrorMaxNumberReachForThisMask'; - } + // If value for $counter has a length higher than $maskcounter chars + if ($counter >= pow(10, dol_strlen($maskcounter))) + { + $counter = 'ErrorMaxNumberReachForThisMask'; + } - if (!empty($maskrefclient_maskcounter)) - { - //print "maskrefclient_maskcounter=".$maskrefclient_maskcounter." maskwithnocode=".$maskwithnocode." maskrefclient=".$maskrefclient."\n
"; + if (!empty($maskrefclient_maskcounter)) + { + //print "maskrefclient_maskcounter=".$maskrefclient_maskcounter." maskwithnocode=".$maskwithnocode." maskrefclient=".$maskrefclient."\n
"; - // Define $sqlstring - $maskrefclient_posnumstart = strpos($maskwithnocode, $maskrefclient_maskcounter, strpos($maskwithnocode, $maskrefclient)); // Pos of counter in final string (from 0 to ...) - if ($maskrefclient_posnumstart <= 0) return 'ErrorBadMask'; - $maskrefclient_sqlstring = 'SUBSTRING('.$field.', '.($maskrefclient_posnumstart + 1).', '.dol_strlen($maskrefclient_maskcounter).')'; - //print "x".$sqlstring; + // Define $sqlstring + $maskrefclient_posnumstart = strpos($maskwithnocode, $maskrefclient_maskcounter, strpos($maskwithnocode, $maskrefclient)); // Pos of counter in final string (from 0 to ...) + if ($maskrefclient_posnumstart <= 0) return 'ErrorBadMask'; + $maskrefclient_sqlstring = 'SUBSTRING('.$field.', '.($maskrefclient_posnumstart + 1).', '.dol_strlen($maskrefclient_maskcounter).')'; + //print "x".$sqlstring; - // Define $maskrefclient_maskLike - $maskrefclient_maskLike = dol_string_nospecial($mask); - $maskrefclient_maskLike = str_replace("%", "_", $maskrefclient_maskLike); - // Replace protected special codes with matching number of _ as wild card caracter - $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yyyy}'), '____', $maskrefclient_maskLike); - $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yy}'), '__', $maskrefclient_maskLike); - $maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'), '_', $maskrefclient_maskLike); - $maskrefclient_maskLike = str_replace(dol_string_nospecial('{mm}'), '__', $maskrefclient_maskLike); - $maskrefclient_maskLike = str_replace(dol_string_nospecial('{dd}'), '__', $maskrefclient_maskLike); - $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskrefclient_maskLike); - $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), $maskrefclient_clientcode.str_pad("", dol_strlen($maskrefclient_maskcounter), "_"), $maskrefclient_maskLike); + // Define $maskrefclient_maskLike + $maskrefclient_maskLike = dol_string_nospecial($mask); + $maskrefclient_maskLike = str_replace("%", "_", $maskrefclient_maskLike); + // Replace protected special codes with matching number of _ as wild card caracter + $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yyyy}'), '____', $maskrefclient_maskLike); + $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yy}'), '__', $maskrefclient_maskLike); + $maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'), '_', $maskrefclient_maskLike); + $maskrefclient_maskLike = str_replace(dol_string_nospecial('{mm}'), '__', $maskrefclient_maskLike); + $maskrefclient_maskLike = str_replace(dol_string_nospecial('{dd}'), '__', $maskrefclient_maskLike); + $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskrefclient_maskLike); + $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), $maskrefclient_clientcode.str_pad("", dol_strlen($maskrefclient_maskcounter), "_"), $maskrefclient_maskLike); - // Get counter in database - $maskrefclient_counter = 0; - $maskrefclient_sql = "SELECT MAX(".$maskrefclient_sqlstring.") as val"; - $maskrefclient_sql .= " FROM ".MAIN_DB_PREFIX.$table; - //$sql.= " WHERE ".$field." not like '(%'"; - $maskrefclient_sql .= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'"; - if ($bentityon) // only if entity enable - $maskrefclient_sql .= " AND entity IN (".getEntity($sharetable).")"; - elseif (!empty($forceentity)) - $sql .= " AND entity IN (".$forceentity.")"; - if ($where) $maskrefclient_sql .= $where; //use the same optional where as general mask - if ($sqlwhere) $maskrefclient_sql .= ' AND '.$sqlwhere; //use the same sqlwhere as general mask - $maskrefclient_sql .= ' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode, $maskrefclient) + 1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')"; + // Get counter in database + $maskrefclient_counter = 0; + $maskrefclient_sql = "SELECT MAX(".$maskrefclient_sqlstring.") as val"; + $maskrefclient_sql .= " FROM ".MAIN_DB_PREFIX.$table; + //$sql.= " WHERE ".$field." not like '(%'"; + $maskrefclient_sql .= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'"; + if ($bentityon) // only if entity enable + $maskrefclient_sql .= " AND entity IN (".getEntity($sharetable).")"; + elseif (!empty($forceentity)) + $sql .= " AND entity IN (".$forceentity.")"; + if ($where) $maskrefclient_sql .= $where; //use the same optional where as general mask + if ($sqlwhere) $maskrefclient_sql .= ' AND '.$sqlwhere; //use the same sqlwhere as general mask + $maskrefclient_sql .= ' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode, $maskrefclient) + 1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')"; - dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG); - $maskrefclient_resql = $db->query($maskrefclient_sql); - if ($maskrefclient_resql) - { - $maskrefclient_obj = $db->fetch_object($maskrefclient_resql); - $maskrefclient_counter = $maskrefclient_obj->val; - } else dol_print_error($db); + dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG); + $maskrefclient_resql = $db->query($maskrefclient_sql); + if ($maskrefclient_resql) + { + $maskrefclient_obj = $db->fetch_object($maskrefclient_resql); + $maskrefclient_counter = $maskrefclient_obj->val; + } else dol_print_error($db); - if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i', $maskrefclient_counter)) $maskrefclient_counter = $maskrefclient_maskoffset; + if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i', $maskrefclient_counter)) $maskrefclient_counter = $maskrefclient_maskoffset; $maskrefclient_counter++; - } + } - // Build numFinal - $numFinal = $mask; + // Build numFinal + $numFinal = $mask; - // We replace special codes except refclient + // We replace special codes except refclient if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=') // yearoffsettype is - or +, so we don't want current year { - $numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date) + $yearoffset, $numFinal); - $numFinal = preg_replace('/\{yy\}/i', date("y", $date) + $yearoffset, $numFinal); - $numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1) + $yearoffset, $numFinal); + $numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date) + $yearoffset, $numFinal); + $numFinal = preg_replace('/\{yy\}/i', date("y", $date) + $yearoffset, $numFinal); + $numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1) + $yearoffset, $numFinal); } else // we want yyyy to be current year { - $numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date), $numFinal); - $numFinal = preg_replace('/\{yy\}/i', date("y", $date), $numFinal); - $numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1), $numFinal); + $numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date), $numFinal); + $numFinal = preg_replace('/\{yy\}/i', date("y", $date), $numFinal); + $numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1), $numFinal); } - $numFinal = preg_replace('/\{mm\}/i', date("m", $date), $numFinal); - $numFinal = preg_replace('/\{dd\}/i', date("d", $date), $numFinal); + $numFinal = preg_replace('/\{mm\}/i', date("m", $date), $numFinal); + $numFinal = preg_replace('/\{dd\}/i', date("d", $date), $numFinal); - // Now we replace the counter - $maskbefore = '{'.$masktri.'}'; - $maskafter = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT); - //print 'x'.$maskbefore.'-'.$maskafter.'y'; - $numFinal = str_replace($maskbefore, $maskafter, $numFinal); + // Now we replace the counter + $maskbefore = '{'.$masktri.'}'; + $maskafter = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT); + //print 'x'.$maskbefore.'-'.$maskafter.'y'; + $numFinal = str_replace($maskbefore, $maskafter, $numFinal); - // Now we replace the refclient - if ($maskrefclient) - { - //print "maskrefclient=".$maskrefclient." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode." maskrefclient_clientcode=".$maskrefclient_clientcode."\n
";exit; - $maskrefclient_maskbefore = '{'.$maskrefclient.'}'; - $maskrefclient_maskafter = $maskrefclient_clientcode.str_pad($maskrefclient_counter, dol_strlen($maskrefclient_maskcounter), "0", STR_PAD_LEFT); - $numFinal = str_replace($maskrefclient_maskbefore, $maskrefclient_maskafter, $numFinal); - } + // Now we replace the refclient + if ($maskrefclient) + { + //print "maskrefclient=".$maskrefclient." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode." maskrefclient_clientcode=".$maskrefclient_clientcode."\n
";exit; + $maskrefclient_maskbefore = '{'.$maskrefclient.'}'; + $maskrefclient_maskafter = $maskrefclient_clientcode.str_pad($maskrefclient_counter, dol_strlen($maskrefclient_maskcounter), "0", STR_PAD_LEFT); + $numFinal = str_replace($maskrefclient_maskbefore, $maskrefclient_maskafter, $numFinal); + } - // Now we replace the type - if ($masktype) - { - $masktype_maskbefore = '{'.$masktype.'}'; - $masktype_maskafter = $masktype_value; - $numFinal = str_replace($masktype_maskbefore, $masktype_maskafter, $numFinal); - } + // Now we replace the type + if ($masktype) + { + $masktype_maskbefore = '{'.$masktype.'}'; + $masktype_maskafter = $masktype_value; + $numFinal = str_replace($masktype_maskbefore, $masktype_maskafter, $numFinal); + } - // Now we replace the user - if ($maskuser) - { - $maskuser_maskbefore = '{'.$maskuser.'}'; - $maskuser_maskafter = $maskuser_value; - $numFinal = str_replace($maskuser_maskbefore, $maskuser_maskafter, $numFinal); - } - } + // Now we replace the user + if ($maskuser) + { + $maskuser_maskbefore = '{'.$maskuser.'}'; + $maskuser_maskafter = $maskuser_value; + $numFinal = str_replace($maskuser_maskbefore, $maskuser_maskafter, $numFinal); + } + } - dol_syslog("functions2::get_next_value return ".$numFinal, LOG_DEBUG); - return $numFinal; + dol_syslog("functions2::get_next_value return ".$numFinal, LOG_DEBUG); + return $numFinal; } /** @@ -1156,12 +1156,12 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $ */ function get_string_between($string, $start, $end) { - $string = " ".$string; - $ini = strpos($string, $start); - if ($ini == 0) return ""; - $ini += strlen($start); - $len = strpos($string, $end, $ini) - $ini; - return substr($string, $ini, $len); + $string = " ".$string; + $ini = strpos($string, $start); + if ($ini == 0) return ""; + $ini += strlen($start); + $len = strpos($string, $end, $ini) - $ini; + return substr($string, $ini, $len); } /** @@ -1173,90 +1173,90 @@ function get_string_between($string, $start, $end) */ function check_value($mask, $value) { - $result = 0; + $result = 0; - $hasglobalcounter = false; - // Extract value for mask counter, mask raz and mask offset - if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg)) - { - $masktri = $reg[1].(isset($reg[2]) ? $reg[2] : '').(isset($reg[3]) ? $reg[3] : ''); - $maskcounter = $reg[1]; - $hasglobalcounter = true; - } else { - // setting some defaults so the rest of the code won't fail if there is a third party counter - $masktri = '00000'; - $maskcounter = '00000'; - } + $hasglobalcounter = false; + // Extract value for mask counter, mask raz and mask offset + if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg)) + { + $masktri = $reg[1].(isset($reg[2]) ? $reg[2] : '').(isset($reg[3]) ? $reg[3] : ''); + $maskcounter = $reg[1]; + $hasglobalcounter = true; + } else { + // setting some defaults so the rest of the code won't fail if there is a third party counter + $masktri = '00000'; + $maskcounter = '00000'; + } - $maskraz = -1; - $maskoffset = 0; - if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits'; + $maskraz = -1; + $maskoffset = 0; + if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits'; - // Extract value for third party mask counter - if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef)) - { - $maskrefclient = $regClientRef[1].$regClientRef[2]; - $maskrefclient_maskclientcode = $regClientRef[1]; - $maskrefclient_maskcounter = $regClientRef[2]; - $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset - $maskrefclient_clientcode = substr('', 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code to form maskrefclient_clientcode - $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode - $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like - if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits'; - } else $maskrefclient = ''; + // Extract value for third party mask counter + if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef)) + { + $maskrefclient = $regClientRef[1].$regClientRef[2]; + $maskrefclient_maskclientcode = $regClientRef[1]; + $maskrefclient_maskcounter = $regClientRef[2]; + $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset + $maskrefclient_clientcode = substr('', 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code to form maskrefclient_clientcode + $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode + $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like + if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits'; + } else $maskrefclient = ''; - // fail if there is neither a global nor a third party counter - if (!$hasglobalcounter && ($maskrefclient_maskcounter == '')) - { - return 'ErrorBadMask'; - } + // fail if there is neither a global nor a third party counter + if (!$hasglobalcounter && ($maskrefclient_maskcounter == '')) + { + return 'ErrorBadMask'; + } - $maskwithonlyymcode = $mask; - $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $maskcounter, $maskwithonlyymcode); - $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode); - $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode); - $maskwithnocode = $maskwithonlyymcode; - $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode); - $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode); - $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode); - $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode); - // Now maskwithnocode = 0000ddmmyyyyccc for example - // and maskcounter = 0000 for example - //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n
"; + $maskwithonlyymcode = $mask; + $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $maskcounter, $maskwithonlyymcode); + $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode); + $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode); + $maskwithnocode = $maskwithonlyymcode; + $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode); + $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode); + $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode); + $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode); + // Now maskwithnocode = 0000ddmmyyyyccc for example + // and maskcounter = 0000 for example + //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n
"; - // If an offset is asked - if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]); - if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]); + // If an offset is asked + if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]); + if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]); - // Define $sqlwhere + // Define $sqlwhere - // If a restore to zero after a month is asked we check if there is already a value for this year. - if (!empty($reg[2]) && preg_match('/^@/', $reg[2])) $maskraz = preg_replace('/^@/', '', $reg[2]); - if (!empty($reg[3]) && preg_match('/^@/', $reg[3])) $maskraz = preg_replace('/^@/', '', $reg[3]); - if ($maskraz >= 0) - { - if ($maskraz == 99) { - $maskraz = date('m'); - $resetEveryMonth = true; - } - if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth'; + // If a restore to zero after a month is asked we check if there is already a value for this year. + if (!empty($reg[2]) && preg_match('/^@/', $reg[2])) $maskraz = preg_replace('/^@/', '', $reg[2]); + if (!empty($reg[3]) && preg_match('/^@/', $reg[3])) $maskraz = preg_replace('/^@/', '', $reg[3]); + if ($maskraz >= 0) + { + if ($maskraz == 99) { + $maskraz = date('m'); + $resetEveryMonth = true; + } + if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth'; - // Define reg - if ($maskraz > 1 && !preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask'; - if ($maskraz <= 1 && !preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazIfNoYearInMask'; - //print "x".$maskwithonlyymcode." ".$maskraz; - } - //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."
\n"; + // Define reg + if ($maskraz > 1 && !preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask'; + if ($maskraz <= 1 && !preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazIfNoYearInMask'; + //print "x".$maskwithonlyymcode." ".$maskraz; + } + //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."
\n"; - // Check we have a number in ($posnumstart+1).', '.dol_strlen($maskcounter) - // + // Check we have a number in ($posnumstart+1).', '.dol_strlen($maskcounter) + // - // Check length - $len = dol_strlen($maskwithnocode); - if (dol_strlen($value) != $len) $result = -1; + // Check length + $len = dol_strlen($maskwithnocode); + if (dol_strlen($value) != $len) $result = -1; - // Define $maskLike - /* seems not used + // Define $maskLike + /* seems not used $maskLike = dol_string_nospecial($mask); $maskLike = str_replace("%","_",$maskLike); // Replace protected special codes with matching number of _ as wild card caracter @@ -1269,8 +1269,8 @@ function check_value($mask, $value) if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",strlen($maskrefclient),"_"),$maskLike); */ - dol_syslog("functions2::check_value result=".$result, LOG_DEBUG); - return $result; + dol_syslog("functions2::check_value result=".$result, LOG_DEBUG); + return $result; } /** @@ -1283,12 +1283,12 @@ function check_value($mask, $value) */ function binhex($bin, $pad = false, $upper = false) { - $last = dol_strlen($bin) - 1; - for ($i = 0; $i <= $last; $i++) { $x += $bin[$last - $i] * pow(2, $i); } - $x = dechex($x); - if ($pad) { while (dol_strlen($x) < intval(dol_strlen($bin)) / 4) { $x = "0$x"; } } - if ($upper) { $x = strtoupper($x); } - return $x; + $last = dol_strlen($bin) - 1; + for ($i = 0; $i <= $last; $i++) { $x += $bin[$last - $i] * pow(2, $i); } + $x = dechex($x); + if ($pad) { while (dol_strlen($x) < intval(dol_strlen($bin)) / 4) { $x = "0$x"; } } + if ($upper) { $x = strtoupper($x); } + return $x; } /** @@ -1299,13 +1299,13 @@ function binhex($bin, $pad = false, $upper = false) */ function hexbin($hexa) { - $bin = ''; - $strLength = dol_strlen($hexa); - for ($i = 0; $i < $strLength; $i++) - { - $bin .= str_pad(decbin(hexdec($hexa[$i])), 4, '0', STR_PAD_LEFT); - } - return $bin; + $bin = ''; + $strLength = dol_strlen($hexa); + for ($i = 0; $i < $strLength; $i++) + { + $bin .= str_pad(decbin(hexdec($hexa[$i])), 4, '0', STR_PAD_LEFT); + } + return $bin; } /** @@ -1316,72 +1316,72 @@ function hexbin($hexa) */ function numero_semaine($time) { - $stime = strftime('%Y-%m-%d', $time); + $stime = strftime('%Y-%m-%d', $time); - if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i', $stime, $reg)) - { - // Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS' - $annee = $reg[1]; - $mois = $reg[2]; - $jour = $reg[3]; - } + if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i', $stime, $reg)) + { + // Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS' + $annee = $reg[1]; + $mois = $reg[2]; + $jour = $reg[3]; + } - /* + /* * Norme ISO-8601: * - La semaine 1 de toute annee est celle qui contient le 4 janvier ou que la semaine 1 de toute annee est celle qui contient le 1er jeudi de janvier. * - La majorite des annees ont 52 semaines mais les annees qui commence un jeudi et les annees bissextiles commencant un mercredi en possede 53. * - Le 1er jour de la semaine est le Lundi */ - // Definition du Jeudi de la semaine - if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) // Dimanche - $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - 3 * 24 * 60 * 60; - elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) < 4) // du Lundi au Mercredi - $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60; - elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) // du Vendredi au Samedi - $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60; - else // Jeudi - $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee); + // Definition du Jeudi de la semaine + if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) // Dimanche + $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - 3 * 24 * 60 * 60; + elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) < 4) // du Lundi au Mercredi + $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60; + elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) // du Vendredi au Samedi + $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60; + else // Jeudi + $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee); - // Definition du premier Jeudi de l'annee - if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 0) // Dimanche - { - $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60; - } elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) // du Lundi au Mercredi - { - $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (4 - date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)))) * 24 * 60 * 60; - } elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) // du Vendredi au Samedi - { - $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (7 - (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60; - } else // Jeudi - { - $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)); - } + // Definition du premier Jeudi de l'annee + if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 0) // Dimanche + { + $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60; + } elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) // du Lundi au Mercredi + { + $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (4 - date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)))) * 24 * 60 * 60; + } elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) // du Vendredi au Samedi + { + $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (7 - (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60; + } else // Jeudi + { + $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)); + } - // Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine"; - $numeroSemaine = ( - ( - date("z", mktime(12, 0, 0, date("m", $jeudiSemaine), date("d", $jeudiSemaine), date("Y", $jeudiSemaine))) - - - date("z", mktime(12, 0, 0, date("m", $premierJeudiAnnee), date("d", $premierJeudiAnnee), date("Y", $premierJeudiAnnee))) - ) / 7 - ) + 1; + // Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine"; + $numeroSemaine = ( + ( + date("z", mktime(12, 0, 0, date("m", $jeudiSemaine), date("d", $jeudiSemaine), date("Y", $jeudiSemaine))) + - + date("z", mktime(12, 0, 0, date("m", $premierJeudiAnnee), date("d", $premierJeudiAnnee), date("Y", $premierJeudiAnnee))) + ) / 7 + ) + 1; - // Cas particulier de la semaine 53 - if ($numeroSemaine == 53) - { - // Les annees qui commence un Jeudi et les annees bissextiles commencant un Mercredi en possede 53 - if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 4 || (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 3 && date("z", mktime(12, 0, 0, 12, 31, date("Y", $jeudiSemaine))) == 365)) - { - $numeroSemaine = 53; - } else { - $numeroSemaine = 1; - } - } + // Cas particulier de la semaine 53 + if ($numeroSemaine == 53) + { + // Les annees qui commence un Jeudi et les annees bissextiles commencant un Mercredi en possede 53 + if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 4 || (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 3 && date("z", mktime(12, 0, 0, 12, 31, date("Y", $jeudiSemaine))) == 365)) + { + $numeroSemaine = 53; + } else { + $numeroSemaine = 1; + } + } - //echo $jour."-".$mois."-".$annee." (".date("d-m-Y",$premierJeudiAnnee)." - ".date("d-m-Y",$jeudiSemaine).") -> ".$numeroSemaine."
"; + //echo $jour."-".$mois."-".$annee." (".date("d-m-Y",$premierJeudiAnnee)." - ".date("d-m-Y",$jeudiSemaine).") -> ".$numeroSemaine."
"; - return sprintf("%02d", $numeroSemaine); + return sprintf("%02d", $numeroSemaine); } /** @@ -1394,28 +1394,28 @@ function numero_semaine($time) */ function weight_convert($weight, &$from_unit, $to_unit) { - /* Pour convertire 320 gr en Kg appeler + /* Pour convertire 320 gr en Kg appeler * $f = -3 * weigh_convert(320, $f, 0) retournera 0.32 * */ - while ($from_unit <> $to_unit) - { - if ($from_unit > $to_unit) - { - $weight = $weight * 10; - $from_unit = $from_unit - 1; - $weight = weight_convert($weight, $from_unit, $to_unit); - } - if ($from_unit < $to_unit) - { - $weight = $weight / 10; - $from_unit = $from_unit + 1; - $weight = weight_convert($weight, $from_unit, $to_unit); - } - } + while ($from_unit <> $to_unit) + { + if ($from_unit > $to_unit) + { + $weight = $weight * 10; + $from_unit = $from_unit - 1; + $weight = weight_convert($weight, $from_unit, $to_unit); + } + if ($from_unit < $to_unit) + { + $weight = $weight / 10; + $from_unit = $from_unit + 1; + $weight = weight_convert($weight, $from_unit, $to_unit); + } + } - return $weight; + return $weight; } /** @@ -1431,60 +1431,60 @@ function weight_convert($weight, &$from_unit, $to_unit) */ function dol_set_user_param($db, $conf, &$user, $tab) { - // Verification parametres - if (count($tab) < 1) return -1; + // Verification parametres + if (count($tab) < 1) return -1; - $db->begin(); + $db->begin(); - // We remove old parameters for all keys in $tab - $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param"; - $sql .= " WHERE fk_user = ".$user->id; - $sql .= " AND entity = ".$conf->entity; - $sql .= " AND param in ("; - $i = 0; - foreach ($tab as $key => $value) - { - if ($i > 0) $sql .= ','; - $sql .= "'".$db->escape($key)."'"; - $i++; - } - $sql .= ")"; - dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG); + // We remove old parameters for all keys in $tab + $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param"; + $sql .= " WHERE fk_user = ".$user->id; + $sql .= " AND entity = ".$conf->entity; + $sql .= " AND param in ("; + $i = 0; + foreach ($tab as $key => $value) + { + if ($i > 0) $sql .= ','; + $sql .= "'".$db->escape($key)."'"; + $i++; + } + $sql .= ")"; + dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG); - $resql = $db->query($sql); - if (!$resql) - { - dol_print_error($db); - $db->rollback(); - return -1; - } + $resql = $db->query($sql); + if (!$resql) + { + dol_print_error($db); + $db->rollback(); + return -1; + } - foreach ($tab as $key => $value) - { - // Set new parameters - if ($value) - { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)"; - $sql .= " VALUES (".$user->id.",".$conf->entity.","; - $sql .= " '".$db->escape($key)."','".$db->escape($value)."')"; + foreach ($tab as $key => $value) + { + // Set new parameters + if ($value) + { + $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)"; + $sql .= " VALUES (".$user->id.",".$conf->entity.","; + $sql .= " '".$db->escape($key)."','".$db->escape($value)."')"; - dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG); - $result = $db->query($sql); - if (!$result) - { - dol_print_error($db); - $db->rollback(); - return -1; - } - $user->conf->$key = $value; - //print "key=".$key." user->conf->key=".$user->conf->$key; - } else { - unset($user->conf->$key); - } - } + dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG); + $result = $db->query($sql); + if (!$result) + { + dol_print_error($db); + $db->rollback(); + return -1; + } + $user->conf->$key = $value; + //print "key=".$key." user->conf->key=".$user->conf->$key; + } else { + unset($user->conf->$key); + } + } - $db->commit(); - return 1; + $db->commit(); + return 1; } /** @@ -1496,15 +1496,15 @@ function dol_set_user_param($db, $conf, &$user, $tab) */ function dol_print_reduction($reduction, $langs) { - $string = ''; - if ($reduction == 100) - { - $string = $langs->transnoentities("Offered"); - } else { - $string = vatrate($reduction, true); - } + $string = ''; + if ($reduction == 100) + { + $string = $langs->transnoentities("Offered"); + } else { + $string = vatrate($reduction, true); + } - return $string; + return $string; } /** @@ -1518,7 +1518,7 @@ function version_os($option = '') { if ($option == 'smr') $osversion = php_uname('s').' '.php_uname('m').' '.php_uname('r'); else $osversion = php_uname(); - return $osversion; + return $osversion; } /** @@ -1529,7 +1529,7 @@ function version_os($option = '') */ function version_php() { - return phpversion(); + return phpversion(); } /** @@ -1540,7 +1540,7 @@ function version_php() */ function version_dolibarr() { - return DOL_VERSION; + return DOL_VERSION; } /** @@ -1550,7 +1550,7 @@ function version_dolibarr() */ function version_webserver() { - return $_SERVER["SERVER_SOFTWARE"]; + return $_SERVER["SERVER_SOFTWARE"]; } /** @@ -1563,89 +1563,89 @@ function version_webserver() */ function getListOfModels($db, $type, $maxfilenamelength = 0) { - global $conf, $langs; - $liste = array(); - $found = 0; - $dirtoscan = ''; + global $conf, $langs; + $liste = array(); + $found = 0; + $dirtoscan = ''; - $sql = "SELECT nom as id, nom as doc_template_name, libelle as label, description as description"; - $sql .= " FROM ".MAIN_DB_PREFIX."document_model"; - $sql .= " WHERE type = '".$db->escape($type)."'"; - $sql .= " AND entity IN (0,".$conf->entity.")"; - $sql .= " ORDER BY description DESC"; + $sql = "SELECT nom as id, nom as doc_template_name, libelle as label, description as description"; + $sql .= " FROM ".MAIN_DB_PREFIX."document_model"; + $sql .= " WHERE type = '".$db->escape($type)."'"; + $sql .= " AND entity IN (0,".$conf->entity.")"; + $sql .= " ORDER BY description DESC"; - dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG); - $resql = $db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - $i = 0; - while ($i < $num) - { - $found = 1; + dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG); + $resql = $db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; + while ($i < $num) + { + $found = 1; - $obj = $db->fetch_object($resql); + $obj = $db->fetch_object($resql); - // If this generation module needs to scan a directory, then description field is filled - // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...). - if (!empty($obj->description)) // A list of directories to scan is defined - { - include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + // If this generation module needs to scan a directory, then description field is filled + // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...). + if (!empty($obj->description)) // A list of directories to scan is defined + { + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $const = $obj->description; - //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const)); - $dirtoscan = preg_replace('/[\r\n]+/', ',', trim($conf->global->$const)); + $const = $obj->description; + //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const)); + $dirtoscan = preg_replace('/[\r\n]+/', ',', trim($conf->global->$const)); - $listoffiles = array(); + $listoffiles = array(); - // Now we add models found in directories scanned - $listofdir = explode(',', $dirtoscan); - foreach ($listofdir as $key=>$tmpdir) - { - $tmpdir = trim($tmpdir); - $tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir); - if (!$tmpdir) { unset($listofdir[$key]); continue; } - if (is_dir($tmpdir)) - { - // all type of template is allowed - $tmpfiles = dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0); - if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles); - } - } + // Now we add models found in directories scanned + $listofdir = explode(',', $dirtoscan); + foreach ($listofdir as $key=>$tmpdir) + { + $tmpdir = trim($tmpdir); + $tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir); + if (!$tmpdir) { unset($listofdir[$key]); continue; } + if (is_dir($tmpdir)) + { + // all type of template is allowed + $tmpfiles = dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0); + if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles); + } + } - if (count($listoffiles)) - { - foreach ($listoffiles as $record) - { - $max = ($maxfilenamelength ? $maxfilenamelength : 28); - $liste[$obj->id.':'.$record['fullname']] = dol_trunc($record['name'], $max, 'middle'); - } - } else { - $liste[0] = $obj->label.': '.$langs->trans("None"); - } - } else { - if ($type == 'member' && $obj->doc_template_name == 'standard') // Special case, if member template, we add variant per format - { - global $_Avery_Labels; - include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'; - foreach ($_Avery_Labels as $key => $val) - { - $liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->doc_template_name).' '.$val['name']; - } - } else // Common usage - { - $liste[$obj->id] = $obj->label ? $obj->label : $obj->doc_template_name; - } - } - $i++; - } - } else { - dol_print_error($db); - return -1; - } + if (count($listoffiles)) + { + foreach ($listoffiles as $record) + { + $max = ($maxfilenamelength ? $maxfilenamelength : 28); + $liste[$obj->id.':'.$record['fullname']] = dol_trunc($record['name'], $max, 'middle'); + } + } else { + $liste[0] = $obj->label.': '.$langs->trans("None"); + } + } else { + if ($type == 'member' && $obj->doc_template_name == 'standard') // Special case, if member template, we add variant per format + { + global $_Avery_Labels; + include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'; + foreach ($_Avery_Labels as $key => $val) + { + $liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->doc_template_name).' '.$val['name']; + } + } else // Common usage + { + $liste[$obj->id] = $obj->label ? $obj->label : $obj->doc_template_name; + } + } + $i++; + } + } else { + dol_print_error($db); + return -1; + } - if ($found) return $liste; - else return 0; + if ($found) return $liste; + else return 0; } /** @@ -1680,11 +1680,11 @@ function is_ip($ip) */ function dol_buildlogin($lastname, $firstname) { - $login = strtolower(dol_string_unaccent($firstname)); - $login .= ($login ? '.' : ''); - $login .= strtolower(dol_string_unaccent($lastname)); - $login = dol_string_nospecial($login, ''); // For special names - return $login; + $login = strtolower(dol_string_unaccent($firstname)); + $login .= ($login ? '.' : ''); + $login .= strtolower(dol_string_unaccent($lastname)); + $login = dol_string_nospecial($login, ''); // For special names + return $login; } /** @@ -1694,40 +1694,40 @@ function dol_buildlogin($lastname, $firstname) */ function getSoapParams() { - global $conf; + global $conf; - $params = array(); - $proxyuse = (empty($conf->global->MAIN_PROXY_USE) ?false:true); - $proxyhost = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_HOST); - $proxyport = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PORT); - $proxyuser = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_USER); - $proxypass = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PASS); - $timeout = (empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT); // Connection timeout - $response_timeout = (empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT); // Response timeout - //print extension_loaded('soap'); - if ($proxyuse) - { - $params = array('connection_timeout'=>$timeout, - 'response_timeout'=>$response_timeout, - 'proxy_use' => 1, - 'proxy_host' => $proxyhost, - 'proxy_port' => $proxyport, - 'proxy_login' => $proxyuser, - 'proxy_password' => $proxypass, - 'trace' => 1 - ); - } else { - $params = array('connection_timeout'=>$timeout, - 'response_timeout'=>$response_timeout, - 'proxy_use' => 0, - 'proxy_host' => false, - 'proxy_port' => false, - 'proxy_login' => false, - 'proxy_password' => false, - 'trace' => 1 - ); - } - return $params; + $params = array(); + $proxyuse = (empty($conf->global->MAIN_PROXY_USE) ?false:true); + $proxyhost = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_HOST); + $proxyport = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PORT); + $proxyuser = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_USER); + $proxypass = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PASS); + $timeout = (empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT); // Connection timeout + $response_timeout = (empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT); // Response timeout + //print extension_loaded('soap'); + if ($proxyuse) + { + $params = array('connection_timeout'=>$timeout, + 'response_timeout'=>$response_timeout, + 'proxy_use' => 1, + 'proxy_host' => $proxyhost, + 'proxy_port' => $proxyport, + 'proxy_login' => $proxyuser, + 'proxy_password' => $proxypass, + 'trace' => 1 + ); + } else { + $params = array('connection_timeout'=>$timeout, + 'response_timeout'=>$response_timeout, + 'proxy_use' => 0, + 'proxy_host' => false, + 'proxy_port' => false, + 'proxy_login' => false, + 'proxy_password' => false, + 'trace' => 1 + ); + } + return $params; } @@ -2027,13 +2027,13 @@ function colorStringToArray($stringcolor, $colorifnotfound = array(88, 88, 88)) */ function colorValidateHex($color, $allow_white = true) { - if (!$allow_white && ($color === '#fff' || $color === '#ffffff')) return false; + if (!$allow_white && ($color === '#fff' || $color === '#ffffff')) return false; - if (preg_match('/^#[a-f0-9]{6}$/i', $color)) //hex color is valid - { - return true; - } - return false; + if (preg_match('/^#[a-f0-9]{6}$/i', $color)) //hex color is valid + { + return true; + } + return false; } /** @@ -2096,26 +2096,26 @@ function colorAgressiveness($hex, $ratio = -50, $brightness = 0) */ function colorAdjustBrightness($hex, $steps) { - // Steps should be between -255 and 255. Negative = darker, positive = lighter - $steps = max(-255, min(255, $steps)); + // Steps should be between -255 and 255. Negative = darker, positive = lighter + $steps = max(-255, min(255, $steps)); - // Normalize into a six character long hex string - $hex = str_replace('#', '', $hex); - if (strlen($hex) == 3) { - $hex = str_repeat(substr($hex, 0, 1), 2).str_repeat(substr($hex, 1, 1), 2).str_repeat(substr($hex, 2, 1), 2); - } + // Normalize into a six character long hex string + $hex = str_replace('#', '', $hex); + if (strlen($hex) == 3) { + $hex = str_repeat(substr($hex, 0, 1), 2).str_repeat(substr($hex, 1, 1), 2).str_repeat(substr($hex, 2, 1), 2); + } - // Split into three parts: R, G and B - $color_parts = str_split($hex, 2); - $return = '#'; + // Split into three parts: R, G and B + $color_parts = str_split($hex, 2); + $return = '#'; - foreach ($color_parts as $color) { - $color = hexdec($color); // Convert to decimal - $color = max(0, min(255, $color + $steps)); // Adjust color - $return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code - } + foreach ($color_parts as $color) { + $color = hexdec($color); // Convert to decimal + $color = max(0, min(255, $color + $steps)); // Adjust color + $return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code + } - return $return; + return $return; } /** @@ -2125,8 +2125,8 @@ function colorAdjustBrightness($hex, $steps) */ function colorDarker($hex, $percent) { - $steps = intval(255 * $percent / 100) * -1; - return colorAdjustBrightness($hex, $steps); + $steps = intval(255 * $percent / 100) * -1; + return colorAdjustBrightness($hex, $steps); } /** @@ -2136,8 +2136,8 @@ function colorDarker($hex, $percent) */ function colorLighten($hex, $percent) { - $steps = intval(255 * $percent / 100); - return colorAdjustBrightness($hex, $steps); + $steps = intval(255 * $percent / 100); + return colorAdjustBrightness($hex, $steps); } @@ -2149,25 +2149,25 @@ function colorLighten($hex, $percent) */ function colorHexToRgb($hex, $alpha = false, $returnArray = false) { - $string = ''; - $hex = str_replace('#', '', $hex); - $length = strlen($hex); - $rgb = array(); - $rgb['r'] = hexdec($length == 6 ? substr($hex, 0, 2) : ($length == 3 ? str_repeat(substr($hex, 0, 1), 2) : 0)); - $rgb['g'] = hexdec($length == 6 ? substr($hex, 2, 2) : ($length == 3 ? str_repeat(substr($hex, 1, 1), 2) : 0)); - $rgb['b'] = hexdec($length == 6 ? substr($hex, 4, 2) : ($length == 3 ? str_repeat(substr($hex, 2, 1), 2) : 0)); - if ($alpha !== false) { - $rgb['a'] = floatval($alpha); - $string = 'rgba('.implode(',', $rgb).')'; - } else { - $string = 'rgb('.implode(',', $rgb).')'; - } + $string = ''; + $hex = str_replace('#', '', $hex); + $length = strlen($hex); + $rgb = array(); + $rgb['r'] = hexdec($length == 6 ? substr($hex, 0, 2) : ($length == 3 ? str_repeat(substr($hex, 0, 1), 2) : 0)); + $rgb['g'] = hexdec($length == 6 ? substr($hex, 2, 2) : ($length == 3 ? str_repeat(substr($hex, 1, 1), 2) : 0)); + $rgb['b'] = hexdec($length == 6 ? substr($hex, 4, 2) : ($length == 3 ? str_repeat(substr($hex, 2, 1), 2) : 0)); + if ($alpha !== false) { + $rgb['a'] = floatval($alpha); + $string = 'rgba('.implode(',', $rgb).')'; + } else { + $string = 'rgb('.implode(',', $rgb).')'; + } - if ($returnArray) { - return $rgb; - } else { - return $string; - } + if ($returnArray) { + return $rgb; + } else { + return $string; + } } @@ -2180,25 +2180,25 @@ function colorHexToRgb($hex, $alpha = false, $returnArray = false) */ function cartesianArray(array $input) { - // filter out empty values - $input = array_filter($input); + // filter out empty values + $input = array_filter($input); - $result = array(array()); + $result = array(array()); - foreach ($input as $key => $values) { - $append = array(); + foreach ($input as $key => $values) { + $append = array(); - foreach ($result as $product) { - foreach ($values as $item) { - $product[$key] = $item; - $append[] = $product; - } - } + foreach ($result as $product) { + foreach ($values as $item) { + $product[$key] = $item; + $append[] = $product; + } + } - $result = $append; - } + $result = $append; + } - return $result; + return $result; } @@ -2210,50 +2210,50 @@ function cartesianArray(array $input) */ function getModuleDirForApiClass($moduleobject) { - $moduledirforclass = $moduleobject; - if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i', '', $moduledirforclass); + $moduledirforclass = $moduleobject; + if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i', '', $moduledirforclass); - if ($moduleobject == 'contracts') { - $moduledirforclass = 'contrat'; - } elseif (in_array($moduleobject, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) { - $moduledirforclass = 'api'; - } elseif ($moduleobject == 'contact' || $moduleobject == 'contacts' || $moduleobject == 'customer' || $moduleobject == 'thirdparty' || $moduleobject == 'thirdparties') { - $moduledirforclass = 'societe'; - } elseif ($moduleobject == 'propale' || $moduleobject == 'proposals') { - $moduledirforclass = 'comm/propal'; - } elseif ($moduleobject == 'agenda' || $moduleobject == 'agendaevents') { - $moduledirforclass = 'comm/action'; - } elseif ($moduleobject == 'adherent' || $moduleobject == 'members' || $moduleobject == 'memberstypes' || $moduleobject == 'subscriptions') { - $moduledirforclass = 'adherents'; - } elseif ($moduleobject == 'don' || $moduleobject == 'donations') { - $moduledirforclass = 'don'; - } elseif ($moduleobject == 'banque' || $moduleobject == 'bankaccounts') { - $moduledirforclass = 'compta/bank'; - } elseif ($moduleobject == 'category' || $moduleobject == 'categorie') { - $moduledirforclass = 'categories'; - } elseif ($moduleobject == 'order' || $moduleobject == 'orders') { - $moduledirforclass = 'commande'; - } elseif ($moduleobject == 'shipments') { - $moduledirforclass = 'expedition'; - } elseif ($moduleobject == 'facture' || $moduleobject == 'invoice' || $moduleobject == 'invoices') { - $moduledirforclass = 'compta/facture'; - } elseif ($moduleobject == 'project' || $moduleobject == 'projects' || $moduleobject == 'task' || $moduleobject == 'tasks') { - $moduledirforclass = 'projet'; - } elseif ($moduleobject == 'stock' || $moduleobject == 'stockmovements' || $moduleobject == 'warehouses') { - $moduledirforclass = 'product/stock'; - } elseif ($moduleobject == 'supplierproposals' || $moduleobject == 'supplierproposal' || $moduleobject == 'supplier_proposal') { - $moduledirforclass = 'supplier_proposal'; - } elseif ($moduleobject == 'fournisseur' || $moduleobject == 'supplierinvoices' || $moduleobject == 'supplierorders') { - $moduledirforclass = 'fourn'; - } elseif ($moduleobject == 'ficheinter' || $moduleobject == 'interventions') { - $moduledirforclass = 'fichinter'; - } elseif ($moduleobject == 'mos') { - $moduledirforclass = 'mrp'; - } elseif (in_array($moduleobject, array('products', 'expensereports', 'users', 'tickets', 'boms'))) { - $moduledirforclass = preg_replace('/s$/', '', $moduleobject); - } + if ($moduleobject == 'contracts') { + $moduledirforclass = 'contrat'; + } elseif (in_array($moduleobject, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) { + $moduledirforclass = 'api'; + } elseif ($moduleobject == 'contact' || $moduleobject == 'contacts' || $moduleobject == 'customer' || $moduleobject == 'thirdparty' || $moduleobject == 'thirdparties') { + $moduledirforclass = 'societe'; + } elseif ($moduleobject == 'propale' || $moduleobject == 'proposals') { + $moduledirforclass = 'comm/propal'; + } elseif ($moduleobject == 'agenda' || $moduleobject == 'agendaevents') { + $moduledirforclass = 'comm/action'; + } elseif ($moduleobject == 'adherent' || $moduleobject == 'members' || $moduleobject == 'memberstypes' || $moduleobject == 'subscriptions') { + $moduledirforclass = 'adherents'; + } elseif ($moduleobject == 'don' || $moduleobject == 'donations') { + $moduledirforclass = 'don'; + } elseif ($moduleobject == 'banque' || $moduleobject == 'bankaccounts') { + $moduledirforclass = 'compta/bank'; + } elseif ($moduleobject == 'category' || $moduleobject == 'categorie') { + $moduledirforclass = 'categories'; + } elseif ($moduleobject == 'order' || $moduleobject == 'orders') { + $moduledirforclass = 'commande'; + } elseif ($moduleobject == 'shipments') { + $moduledirforclass = 'expedition'; + } elseif ($moduleobject == 'facture' || $moduleobject == 'invoice' || $moduleobject == 'invoices') { + $moduledirforclass = 'compta/facture'; + } elseif ($moduleobject == 'project' || $moduleobject == 'projects' || $moduleobject == 'task' || $moduleobject == 'tasks') { + $moduledirforclass = 'projet'; + } elseif ($moduleobject == 'stock' || $moduleobject == 'stockmovements' || $moduleobject == 'warehouses') { + $moduledirforclass = 'product/stock'; + } elseif ($moduleobject == 'supplierproposals' || $moduleobject == 'supplierproposal' || $moduleobject == 'supplier_proposal') { + $moduledirforclass = 'supplier_proposal'; + } elseif ($moduleobject == 'fournisseur' || $moduleobject == 'supplierinvoices' || $moduleobject == 'supplierorders') { + $moduledirforclass = 'fourn'; + } elseif ($moduleobject == 'ficheinter' || $moduleobject == 'interventions') { + $moduledirforclass = 'fichinter'; + } elseif ($moduleobject == 'mos') { + $moduledirforclass = 'mrp'; + } elseif (in_array($moduleobject, array('products', 'expensereports', 'users', 'tickets', 'boms'))) { + $moduledirforclass = preg_replace('/s$/', '', $moduleobject); + } - return $moduledirforclass; + return $moduledirforclass; } /** @@ -2265,7 +2265,7 @@ function getModuleDirForApiClass($moduleobject) */ function randomColorPart($min = 0, $max = 255) { - return str_pad(dechex(mt_rand($min, $max)), 2, '0', STR_PAD_LEFT); + return str_pad(dechex(mt_rand($min, $max)), 2, '0', STR_PAD_LEFT); } /** @@ -2277,22 +2277,22 @@ function randomColorPart($min = 0, $max = 255) */ function randomColor($min = 0, $max = 255) { - return randomColorPart($min, $max).randomColorPart($min, $max).randomColorPart($min, $max); + return randomColorPart($min, $max).randomColorPart($min, $max).randomColorPart($min, $max); } if (!function_exists('dolEscapeXML')) { - /** - * Encode string for xml usage - * - * @param string $string String to encode - * @return string String encoded - */ - function dolEscapeXML($string) - { - return strtr($string, array('\''=>''', '"'=>'"', '&'=>'&', '<'=>'<', '>'=>'>')); - } + /** + * Encode string for xml usage + * + * @param string $string String to encode + * @return string String encoded + */ + function dolEscapeXML($string) + { + return strtr($string, array('\''=>''', '"'=>'"', '&'=>'&', '<'=>'<', '>'=>'>')); + } } @@ -2306,28 +2306,28 @@ if (!function_exists('dolEscapeXML')) */ function autoOrManual($automaticmanual, $case = 1, $color = 0) { - global $langs; - $result = 'unknown'; $classname = ''; - if ($automaticmanual == 1 || strtolower($automaticmanual) == 'automatic' || strtolower($automaticmanual) == 'true') // A mettre avant test sur no a cause du == 0 - { - $result = $langs->trans('automatic'); - if ($case == 1 || $case == 3) $result = $langs->trans("Automatic"); - if ($case == 2) $result = ''; - if ($case == 3) $result = ' '.$result; + global $langs; + $result = 'unknown'; $classname = ''; + if ($automaticmanual == 1 || strtolower($automaticmanual) == 'automatic' || strtolower($automaticmanual) == 'true') // A mettre avant test sur no a cause du == 0 + { + $result = $langs->trans('automatic'); + if ($case == 1 || $case == 3) $result = $langs->trans("Automatic"); + if ($case == 2) $result = ''; + if ($case == 3) $result = ' '.$result; - $classname = 'ok'; - } elseif ($automaticmanual == 0 || strtolower($automaticmanual) == 'manual' || strtolower($automaticmanual) == 'false') - { - $result = $langs->trans("manual"); - if ($case == 1 || $case == 3) $result = $langs->trans("Manual"); - if ($case == 2) $result = ''; - if ($case == 3) $result = ' '.$result; + $classname = 'ok'; + } elseif ($automaticmanual == 0 || strtolower($automaticmanual) == 'manual' || strtolower($automaticmanual) == 'false') + { + $result = $langs->trans("manual"); + if ($case == 1 || $case == 3) $result = $langs->trans("Manual"); + if ($case == 2) $result = ''; + if ($case == 3) $result = ' '.$result; - if ($color == 2) $classname = 'ok'; - else $classname = 'error'; - } - if ($color) return ''.$result.''; - return $result; + if ($color == 2) $classname = 'ok'; + else $classname = 'error'; + } + if ($color) return ''.$result.''; + return $result; } @@ -2339,13 +2339,13 @@ function autoOrManual($automaticmanual, $case = 1, $color = 0) */ function convertBackOfficeMediasLinksToPublicLinks($notetoshow) { - global $dolibarr_main_url_root; - // Define $urlwithroot - $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); - $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file - //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current - $notetoshow = preg_replace('/src="[a-zA-Z0-9_\/\-\.]*(viewimage\.php\?modulepart=medias[^"]*)"/', 'src="'.$urlwithroot.'/\1"', $notetoshow); - return $notetoshow; + global $dolibarr_main_url_root; + // Define $urlwithroot + $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); + $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file + //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current + $notetoshow = preg_replace('/src="[a-zA-Z0-9_\/\-\.]*(viewimage\.php\?modulepart=medias[^"]*)"/', 'src="'.$urlwithroot.'/\1"', $notetoshow); + return $notetoshow; } /** diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php index 36d0fb0c80d..ae9401b7954 100644 --- a/htdocs/core/lib/functionsnumtoword.lib.php +++ b/htdocs/core/lib/functionsnumtoword.lib.php @@ -259,7 +259,7 @@ function hundreds2text($hundreds, $tens, $units) $decenas = array("", "", "TREINTA ", "CUARENTA ", "CINCUENTA ", "SESENTA ", "SETENTA ", "OCHENTA ", "NOVENTA "); $veintis = array("VEINTE", "VEINTIUN", "VEINTIDÓS", "VEINTITRÉS", "VEINTICUATRO", "VEINTICINCO", "VEINTISÉIS", "VEINTISIETE", "VEINTIOCHO", "VEINTINUEVE"); $diecis = array("DIEZ", "ONCE", "DOCE", "TRECE", "CATORCE", "QUINCE", "DIECISÉIS", "DIECISIETE", "DIECIOCHO", "DIECINUEVE"); - $unidades = array("UN", "DOS", "TRES", "CUATRO", "CINCO", "SEIS", "SIETE", "OCHO", "NUEVE"); + $unidades = array("UN", "DOS", "TRES", "CUATRO", "CINCO", "SEIS", "SIETE", "OCHO", "NUEVE"); $entexto = ""; if ($hundreds != 0) { $entexto .= $centenas[$hundreds - 1]; diff --git a/htdocs/core/lib/hrm.lib.php b/htdocs/core/lib/hrm.lib.php index 1ea359f6f0b..e24c503f449 100644 --- a/htdocs/core/lib/hrm.lib.php +++ b/htdocs/core/lib/hrm.lib.php @@ -43,8 +43,8 @@ function establishment_prepare_head($object) // Show more tabs from modules // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab - // $this->tabs = array('entity:-tabname); to remove a tab + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf, $langs, $object, $head, $h, 'establishment'); $head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/info.php?id='.$object->id; @@ -64,30 +64,30 @@ function establishment_prepare_head($object) */ function hrm_admin_prepare_head() { - global $langs, $conf, $user; + global $langs, $conf, $user; - $langs->load('hrm'); + $langs->load('hrm'); - $h = 0; - $head = array(); + $h = 0; + $head = array(); $head[$h][0] = DOL_URL_ROOT.'/hrm/admin/admin_hrm.php'; - $head[$h][1] = $langs->trans("Parameters"); - $head[$h][2] = 'parameters'; - $h++; + $head[$h][1] = $langs->trans("Parameters"); + $head[$h][2] = 'parameters'; + $h++; $head[$h][0] = DOL_URL_ROOT.'/hrm/admin/admin_establishment.php'; - $head[$h][1] = $langs->trans("Establishments"); - $head[$h][2] = 'establishments'; - $h++; + $head[$h][1] = $langs->trans("Establishments"); + $head[$h][2] = 'establishments'; + $h++; - // Show more tabs from modules - // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab - // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab - complete_head_from_modules($conf, $langs, null, $head, $h, 'hrm_admin'); + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab + complete_head_from_modules($conf, $langs, null, $head, $h, 'hrm_admin'); - complete_head_from_modules($conf, $langs, null, $head, $h, 'hrm_admin', 'remove'); + complete_head_from_modules($conf, $langs, null, $head, $h, 'hrm_admin', 'remove'); - return $head; + return $head; } diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php index 4cca58d5c2a..20a97c7ff90 100644 --- a/htdocs/core/lib/images.lib.php +++ b/htdocs/core/lib/images.lib.php @@ -40,39 +40,39 @@ function image_format_supported($file, $acceptsvg = 0) { global $conf; - $regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.webp|\.xpm|\.xbm'; // See also into product.class.php - if ($acceptsvg || ! empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)) { - $regeximgext .= '|\.svg'; // Not allowed by default. SVG can contains javascript - } + $regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.webp|\.xpm|\.xbm'; // See also into product.class.php + if ($acceptsvg || ! empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)) { + $regeximgext .= '|\.svg'; // Not allowed by default. SVG can contains javascript + } - // Case filename is not a format image - $reg = array(); - if (!preg_match('/('.$regeximgext.')$/i', $file, $reg)) return -1; + // Case filename is not a format image + $reg = array(); + if (!preg_match('/('.$regeximgext.')$/i', $file, $reg)) return -1; - // Case filename is a format image but not supported by this PHP - $imgfonction = ''; - if (strtolower($reg[1]) == '.gif') $imgfonction = 'imagecreatefromgif'; - if (strtolower($reg[1]) == '.jpg') $imgfonction = 'imagecreatefromjpeg'; - if (strtolower($reg[1]) == '.jpeg') $imgfonction = 'imagecreatefromjpeg'; - if (strtolower($reg[1]) == '.png') $imgfonction = 'imagecreatefrompng'; - if (strtolower($reg[1]) == '.bmp') $imgfonction = 'imagecreatefromwbmp'; - if (strtolower($reg[1]) == '.webp') $imgfonction = 'imagecreatefromwebp'; - if (strtolower($reg[1]) == '.xpm') $imgfonction = 'imagecreatefromxpm'; - if (strtolower($reg[1]) == '.xbm') $imgfonction = 'imagecreatefromxbm'; - if (strtolower($reg[1]) == '.svg') $imgfonction = 'imagecreatefromsvg'; // Never available - if ($imgfonction) - { - if (!function_exists($imgfonction)) - { - // Fonctions of conversion not available in this PHP - return 0; - } + // Case filename is a format image but not supported by this PHP + $imgfonction = ''; + if (strtolower($reg[1]) == '.gif') $imgfonction = 'imagecreatefromgif'; + if (strtolower($reg[1]) == '.jpg') $imgfonction = 'imagecreatefromjpeg'; + if (strtolower($reg[1]) == '.jpeg') $imgfonction = 'imagecreatefromjpeg'; + if (strtolower($reg[1]) == '.png') $imgfonction = 'imagecreatefrompng'; + if (strtolower($reg[1]) == '.bmp') $imgfonction = 'imagecreatefromwbmp'; + if (strtolower($reg[1]) == '.webp') $imgfonction = 'imagecreatefromwebp'; + if (strtolower($reg[1]) == '.xpm') $imgfonction = 'imagecreatefromxpm'; + if (strtolower($reg[1]) == '.xbm') $imgfonction = 'imagecreatefromxbm'; + if (strtolower($reg[1]) == '.svg') $imgfonction = 'imagecreatefromsvg'; // Never available + if ($imgfonction) + { + if (!function_exists($imgfonction)) + { + // Fonctions of conversion not available in this PHP + return 0; + } - // Filename is a format image and supported for conversion by this PHP - return 1; - } + // Filename is a format image and supported for conversion by this PHP + return 1; + } - return 0; + return 0; } @@ -97,9 +97,9 @@ function dol_getImageSize($file, $url = false) if ($filetoread) { - $infoImg = getimagesize($filetoread); // Recuperation des infos de l'image - $ret['width'] = $infoImg[0]; // Largeur de l'image - $ret['height'] = $infoImg[1]; // Hauteur de l'image + $infoImg = getimagesize($filetoread); // Recuperation des infos de l'image + $ret['width'] = $infoImg[0]; // Largeur de l'image + $ret['height'] = $infoImg[1]; // Hauteur de l'image } return $ret; @@ -305,7 +305,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0, if (!empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK)); // Free memory. This does not delete image. - imagedestroy($img); + imagedestroy($img); imagedestroy($imgThumb); clearstatcache(); // File was replaced by a modified one, so we clear file caches. @@ -441,20 +441,20 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', } elseif (!file_exists($file)) { // Si le fichier passe en parametre n'existe pas - dol_syslog($langs->trans("ErrorFileNotFound", $file), LOG_ERR); - return $langs->trans("ErrorFileNotFound", $file); + dol_syslog($langs->trans("ErrorFileNotFound", $file), LOG_ERR); + return $langs->trans("ErrorFileNotFound", $file); } elseif (image_format_supported($file) < 0) { - dol_syslog('This file '.$file.' does not seem to be an image format file name.', LOG_WARNING); - return 'ErrorBadImageFormat'; + dol_syslog('This file '.$file.' does not seem to be an image format file name.', LOG_WARNING); + return 'ErrorBadImageFormat'; } elseif (!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1) { // Si la largeur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0) - dol_syslog('Wrong value for parameter maxWidth', LOG_ERR); - return 'Error: Wrong value for parameter maxWidth'; + dol_syslog('Wrong value for parameter maxWidth', LOG_ERR); + return 'Error: Wrong value for parameter maxWidth'; } elseif (!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1) { // Si la hauteur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0) - dol_syslog('Wrong value for parameter maxHeight', LOG_ERR); - return 'Error: Wrong value for parameter maxHeight'; + dol_syslog('Wrong value for parameter maxHeight', LOG_ERR); + return 'Error: Wrong value for parameter maxHeight'; } $filetoread = realpath(dol_osencode($file)); // Chemin canonique absolu de l'image @@ -495,7 +495,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', $imgfonction = 'imagecreatefrompng'; break; case IMAGETYPE_BMP: // 6 - // Not supported by PHP GD + // Not supported by PHP GD break; case IMAGETYPE_WBMP: // 15 $imgfonction = 'imagecreatefromwbmp'; @@ -531,7 +531,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', $extImg = '.png'; break; case IMAGETYPE_BMP: // 6 - // Not supported by PHP GD + // Not supported by PHP GD $extImg = '.bmp'; break; case IMAGETYPE_WBMP: // 15 @@ -540,14 +540,14 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', break; } - if (!is_resource($img)) - { - dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING); - return 0; - } + if (!is_resource($img)) + { + dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING); + return 0; + } $exifAngle = false; - if ($ort && !empty($conf->global->MAIN_USE_EXIF_ROTATION)) { + if ($ort && !empty($conf->global->MAIN_USE_EXIF_ROTATION)) { switch ($ort) { case 3: // 180 rotate left @@ -568,12 +568,12 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', } } - if ($exifAngle) - { + if ($exifAngle) + { $rotated = false; - if ($infoImg[2] === 'IMAGETYPE_PNG') // In fact there is no exif on PNG but just in case - { + if ($infoImg[2] === 'IMAGETYPE_PNG') // In fact there is no exif on PNG but just in case + { imagealphablending($img, false); imagesavealpha($img, true); $rotated = imagerotate($img, $exifAngle, imageColorAllocateAlpha($img, 0, 0, 0, 127)); @@ -583,9 +583,9 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', $rotated = imagerotate($img, $exifAngle, 0); } - // replace image with good orientation - if (!empty($rotated)) { - $img = $rotated; + // replace image with good orientation + if (!empty($rotated)) { + $img = $rotated; $imgWidth = $trueImgWidth; $imgHeight = $trueImgHeight; } @@ -612,8 +612,8 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', $thumbHeight = round($thumbHeight); $thumbWidth = round($thumbWidth); - // Define target format - if (empty($targetformat)) $targetformat = $infoImg[2]; + // Define target format + if (empty($targetformat)) $targetformat = $infoImg[2]; // Create empty image if ($targetformat == IMAGETYPE_GIF) @@ -643,31 +643,31 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', case IMAGETYPE_GIF: // 1 $trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF imagecolortransparent($imgThumb, $trans_colour); - $extImgTarget = '.gif'; - $newquality = 'NU'; - break; + $extImgTarget = '.gif'; + $newquality = 'NU'; + break; case IMAGETYPE_JPEG: // 2 - $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0); - $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '.jpg'); - $newquality = $quality; - break; + $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0); + $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '.jpg'); + $newquality = $quality; + break; case IMAGETYPE_PNG: // 3 imagealphablending($imgThumb, false); // Pour compatibilite sur certain systeme $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127); // Keep transparent channel - $extImgTarget = '.png'; - $newquality = $quality - 100; - $newquality = round(abs($quality - 100) * 9 / 100); - break; + $extImgTarget = '.png'; + $newquality = $quality - 100; + $newquality = round(abs($quality - 100) * 9 / 100); + break; case IMAGETYPE_BMP: // 6 - // Not supported by PHP GD - $extImgTarget = '.bmp'; - $newquality = 'NU'; - break; + // Not supported by PHP GD + $extImgTarget = '.bmp'; + $newquality = 'NU'; + break; case IMAGETYPE_WBMP: // 15 $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0); - $extImgTarget = '.bmp'; - $newquality = 'NU'; - break; + $extImgTarget = '.bmp'; + $newquality = 'NU'; + break; } if (function_exists("imagefill")) imagefill($imgThumb, 0, 0, $trans_colour); @@ -698,7 +698,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', imagepng($imgThumb, $imgThumbName, $newquality); break; case IMAGETYPE_BMP: // 6 - // Not supported by PHP GD + // Not supported by PHP GD break; case IMAGETYPE_WBMP: // 15 imagewbmp($imgThumb, $imgThumbName); @@ -708,9 +708,9 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', // Set permissions on file if (!empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK)); - // Free memory. This does not delete image. - imagedestroy($img); - imagedestroy($imgThumb); + // Free memory. This does not delete image. + imagedestroy($img); + imagedestroy($imgThumb); return $imgThumbName; } diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php index a59aa3e6301..50330686805 100644 --- a/htdocs/core/lib/member.lib.php +++ b/htdocs/core/lib/member.lib.php @@ -63,46 +63,46 @@ function member_prepare_head(Adherent $object) $h++; } - // Show more tabs from modules - // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab - // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab - complete_head_from_modules($conf, $langs, $object, $head, $h, 'member'); + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab + complete_head_from_modules($conf, $langs, $object, $head, $h, 'member'); - $nbNote = 0; - if (!empty($object->note)) $nbNote++; - if (!empty($object->note_private)) $nbNote++; - if (!empty($object->note_public)) $nbNote++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id; + $nbNote = 0; + if (!empty($object->note)) $nbNote++; + if (!empty($object->note_private)) $nbNote++; + if (!empty($object->note_public)) $nbNote++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id; $head[$h][1] = $langs->trans("Note"); $head[$h][2] = 'note'; - if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.''; + if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.''; $h++; - // Attachments - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php'; - $upload_dir = $conf->adherent->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'member'); - $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$')); - $nbLinks = Link::count($db, $object->element, $object->id); - $head[$h][0] = DOL_URL_ROOT.'/adherents/document.php?id='.$object->id; - $head[$h][1] = $langs->trans('Documents'); - if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).''; - $head[$h][2] = 'document'; - $h++; + // Attachments + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php'; + $upload_dir = $conf->adherent->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'member'); + $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$')); + $nbLinks = Link::count($db, $object->element, $object->id); + $head[$h][0] = DOL_URL_ROOT.'/adherents/document.php?id='.$object->id; + $head[$h][1] = $langs->trans('Documents'); + if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).''; + $head[$h][2] = 'document'; + $h++; // Show agenda tab if (!empty($conf->agenda->enabled)) { - $head[$h][0] = DOL_URL_ROOT."/adherents/agenda.php?id=".$object->id; - $head[$h][1] = $langs->trans("Events"); - if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) - { - $head[$h][1] .= '/'; - $head[$h][1] .= $langs->trans("Agenda"); - } - $head[$h][2] = 'agenda'; - $h++; + $head[$h][0] = DOL_URL_ROOT."/adherents/agenda.php?id=".$object->id; + $head[$h][1] = $langs->trans("Events"); + if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) + { + $head[$h][1] .= '/'; + $head[$h][1] .= $langs->trans("Agenda"); + } + $head[$h][2] = 'agenda'; + $h++; } complete_head_from_modules($conf, $langs, $object, $head, $h, 'member', 'remove'); @@ -148,11 +148,11 @@ function member_type_prepare_head(AdherentType $object) $h++; } - // Show more tabs from modules - // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab - // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab - complete_head_from_modules($conf, $langs, $object, $head, $h, 'membertype'); + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab + complete_head_from_modules($conf, $langs, $object, $head, $h, 'membertype'); complete_head_from_modules($conf, $langs, $object, $head, $h, 'membertype', 'remove'); @@ -166,45 +166,45 @@ function member_type_prepare_head(AdherentType $object) */ function member_admin_prepare_head() { - global $langs, $conf, $user; + global $langs, $conf, $user; - $h = 0; - $head = array(); + $h = 0; + $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent.php'; - $head[$h][1] = $langs->trans("Miscellaneous"); - $head[$h][2] = 'general'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent.php'; + $head[$h][1] = $langs->trans("Miscellaneous"); + $head[$h][2] = 'general'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_emails.php'; - $head[$h][1] = $langs->trans("EMails"); - $head[$h][2] = 'emails'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_emails.php'; + $head[$h][1] = $langs->trans("EMails"); + $head[$h][2] = 'emails'; + $h++; - // Show more tabs from modules - // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab - // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab - complete_head_from_modules($conf, $langs, null, $head, $h, 'member_admin'); + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab + complete_head_from_modules($conf, $langs, null, $head, $h, 'member_admin'); - $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_extrafields.php'; - $head[$h][1] = $langs->trans("ExtraFieldsMember"); - $head[$h][2] = 'attributes'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFieldsMember"); + $head[$h][2] = 'attributes'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_type_extrafields.php'; - $head[$h][1] = $langs->trans("ExtraFieldsMemberType"); - $head[$h][2] = 'attributes_type'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_type_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFieldsMemberType"); + $head[$h][2] = 'attributes_type'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/website.php'; - $head[$h][1] = $langs->trans("BlankSubscriptionForm"); - $head[$h][2] = 'website'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/website.php'; + $head[$h][1] = $langs->trans("BlankSubscriptionForm"); + $head[$h][2] = 'website'; + $h++; - complete_head_from_modules($conf, $langs, null, $head, $h, 'member_admin', 'remove'); + complete_head_from_modules($conf, $langs, null, $head, $h, 'member_admin', 'remove'); - return $head; + return $head; } @@ -216,50 +216,50 @@ function member_admin_prepare_head() */ function member_stats_prepare_head($object) { - global $langs, $conf, $user; + global $langs, $conf, $user; - $h = 0; - $head = array(); + $h = 0; + $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/index.php'; - $head[$h][1] = $langs->trans("Subscriptions"); - $head[$h][2] = 'statssubscription'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/index.php'; + $head[$h][1] = $langs->trans("Subscriptions"); + $head[$h][2] = 'statssubscription'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbycountry'; - $head[$h][1] = $langs->trans("Country"); - $head[$h][2] = 'statscountry'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbycountry'; + $head[$h][1] = $langs->trans("Country"); + $head[$h][2] = 'statscountry'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbyregion'; - $head[$h][1] = $langs->trans("Region"); - $head[$h][2] = 'statsregion'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbyregion'; + $head[$h][1] = $langs->trans("Region"); + $head[$h][2] = 'statsregion'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbystate'; - $head[$h][1] = $langs->trans("State"); - $head[$h][2] = 'statsstate'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbystate'; + $head[$h][1] = $langs->trans("State"); + $head[$h][2] = 'statsstate'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbytown'; - $head[$h][1] = $langs->trans('Town'); - $head[$h][2] = 'statstown'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbytown'; + $head[$h][1] = $langs->trans('Town'); + $head[$h][2] = 'statstown'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/byproperties.php'; - $head[$h][1] = $langs->trans('ByProperties'); - $head[$h][2] = 'statsbyproperties'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/byproperties.php'; + $head[$h][1] = $langs->trans('ByProperties'); + $head[$h][2] = 'statsbyproperties'; + $h++; - // Show more tabs from modules - // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab - // $this->tabs = array('entity:-tabname); to remove a tab - complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats'); + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname); to remove a tab + complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats'); - complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats', 'remove'); + complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats', 'remove'); - return $head; + return $head; } /** diff --git a/htdocs/core/lib/multicurrency.lib.php b/htdocs/core/lib/multicurrency.lib.php index 94947e5c4b4..065b4dfc886 100644 --- a/htdocs/core/lib/multicurrency.lib.php +++ b/htdocs/core/lib/multicurrency.lib.php @@ -30,21 +30,21 @@ */ function multicurrencyAdminPrepareHead() { - global $langs, $conf; + global $langs, $conf; - $h = 0; - $head = array(); + $h = 0; + $head = array(); - $head[$h][0] = dol_buildpath("/admin/multicurrency.php", 1); - $head[$h][1] = $langs->trans("Parameters"); - $head[$h][2] = 'settings'; - $h++; + $head[$h][0] = dol_buildpath("/admin/multicurrency.php", 1); + $head[$h][1] = $langs->trans("Parameters"); + $head[$h][2] = 'settings'; + $h++; - complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency'); + complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency'); complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency', 'remove'); - return $head; + return $head; } /** diff --git a/htdocs/core/lib/reception.lib.php b/htdocs/core/lib/reception.lib.php index caa08228803..f36295e31f3 100644 --- a/htdocs/core/lib/reception.lib.php +++ b/htdocs/core/lib/reception.lib.php @@ -49,18 +49,18 @@ function reception_prepare_head(Reception $object) if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) { - $objectsrc = $object; - if ($object->origin == 'commande' && $object->origin_id > 0) - { - $objectsrc = new Commande($db); - $objectsrc->fetch($object->origin_id); - } - $nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external')); - $head[$h][0] = DOL_URL_ROOT."/reception/contact.php?id=".$object->id; - $head[$h][1] = $langs->trans("ContactsAddresses"); + $objectsrc = $object; + if ($object->origin == 'commande' && $object->origin_id > 0) + { + $objectsrc = new Commande($db); + $objectsrc->fetch($object->origin_id); + } + $nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external')); + $head[$h][0] = DOL_URL_ROOT."/reception/contact.php?id=".$object->id; + $head[$h][1] = $langs->trans("ContactsAddresses"); if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.''; - $head[$h][2] = 'contact'; - $h++; + $head[$h][2] = 'contact'; + $h++; } // Show more tabs from modules @@ -69,18 +69,18 @@ function reception_prepare_head(Reception $object) // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf, $langs, $object, $head, $h, 'reception'); - $nbNote = 0; - if (!empty($object->note_private)) $nbNote++; - if (!empty($object->note_public)) $nbNote++; + $nbNote = 0; + if (!empty($object->note_private)) $nbNote++; + if (!empty($object->note_public)) $nbNote++; $head[$h][0] = DOL_URL_ROOT."/reception/note.php?id=".$object->id; $head[$h][1] = $langs->trans("Notes"); if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.''; $head[$h][2] = 'note'; $h++; - complete_head_from_modules($conf, $langs, $object, $head, $h, 'reception', 'remove'); + complete_head_from_modules($conf, $langs, $object, $head, $h, 'reception', 'remove'); - return $head; + return $head; } /** @@ -105,18 +105,18 @@ function reception_admin_prepare_head() if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION)) { - $head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php'; - $head[$h][1] = $langs->trans("ExtraFields"); - $head[$h][2] = 'attributes_reception'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFields"); + $head[$h][2] = 'attributes_reception'; + $h++; } if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION)) { - $head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php'; - $head[$h][1] = $langs->trans("ExtraFieldsLines"); - $head[$h][2] = 'attributeslines_reception'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFieldsLines"); + $head[$h][2] = 'attributeslines_reception'; + $h++; } complete_head_from_modules($conf, $langs, null, $head, $h, 'reception_admin', 'remove'); diff --git a/htdocs/core/lib/resource.lib.php b/htdocs/core/lib/resource.lib.php index 3222c1c5768..a4ba796078f 100644 --- a/htdocs/core/lib/resource.lib.php +++ b/htdocs/core/lib/resource.lib.php @@ -37,13 +37,13 @@ function resource_prepare_head($object) $head[$h][0] = dol_buildpath('/resource/card.php', 1).'?id='.$object->id; $head[$h][1] = $langs->trans("ResourceCard"); - $head[$h][2] = 'resource'; + $head[$h][2] = 'resource'; $h++; if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && (empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER) || empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_THIPARTY))) { - $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external')); - $head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id; + $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external')); + $head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id; $head[$h][1] = $langs->trans('ContactsAddresses'); if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.''; $head[$h][2] = 'contact'; diff --git a/htdocs/core/lib/salaries.lib.php b/htdocs/core/lib/salaries.lib.php index a3df043d4c4..c11e37b7aaa 100644 --- a/htdocs/core/lib/salaries.lib.php +++ b/htdocs/core/lib/salaries.lib.php @@ -27,41 +27,41 @@ */ function salaries_prepare_head($object) { - global $db, $langs, $conf; + global $db, $langs, $conf; - $h = 0; - $head = array(); + $h = 0; + $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/salaries/card.php?id='.$object->id; - $head[$h][1] = $langs->trans("SalaryPayment"); - $head[$h][2] = 'card'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/salaries/card.php?id='.$object->id; + $head[$h][1] = $langs->trans("SalaryPayment"); + $head[$h][2] = 'card'; + $h++; - // Show more tabs from modules - // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab - // $this->tabs = array('entity:-tabname); to remove a tab - complete_head_from_modules($conf, $langs, $object, $head, $h, 'salaries'); + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname); to remove a tab + complete_head_from_modules($conf, $langs, $object, $head, $h, 'salaries'); - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php'; - $upload_dir = $conf->salaries->dir_output."/".dol_sanitizeFileName($object->ref); - $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$')); - $nbLinks = Link::count($db, $object->element, $object->id); - $head[$h][0] = DOL_URL_ROOT.'/salaries/document.php?id='.$object->id; - $head[$h][1] = $langs->trans('Documents'); - if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).''; - $head[$h][2] = 'documents'; - $h++; + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php'; + $upload_dir = $conf->salaries->dir_output."/".dol_sanitizeFileName($object->ref); + $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$')); + $nbLinks = Link::count($db, $object->element, $object->id); + $head[$h][0] = DOL_URL_ROOT.'/salaries/document.php?id='.$object->id; + $head[$h][1] = $langs->trans('Documents'); + if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).''; + $head[$h][2] = 'documents'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/salaries/info.php?id='.$object->id; - $head[$h][1] = $langs->trans("Info"); - $head[$h][2] = 'info'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/salaries/info.php?id='.$object->id; + $head[$h][1] = $langs->trans("Info"); + $head[$h][2] = 'info'; + $h++; - complete_head_from_modules($conf, $langs, $object, $head, $h, 'salaries', 'remove'); + complete_head_from_modules($conf, $langs, $object, $head, $h, 'salaries', 'remove'); - return $head; + return $head; } /** @@ -71,28 +71,28 @@ function salaries_prepare_head($object) */ function salaries_admin_prepare_head() { - global $langs, $conf, $user; + global $langs, $conf, $user; - $h = 0; - $head = array(); + $h = 0; + $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/salaries/admin/salaries.php'; - $head[$h][1] = $langs->trans("Miscellaneous"); - $head[$h][2] = 'general'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/salaries/admin/salaries.php'; + $head[$h][1] = $langs->trans("Miscellaneous"); + $head[$h][2] = 'general'; + $h++; - // Show more tabs from modules - // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab - // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab - complete_head_from_modules($conf, $langs, null, $head, $h, 'salaries_admin'); + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab + complete_head_from_modules($conf, $langs, null, $head, $h, 'salaries_admin'); - $head[$h][0] = DOL_URL_ROOT.'/salaries/admin/salaries_extrafields.php'; - $head[$h][1] = $langs->trans("ExtraFieldsSalaries"); - $head[$h][2] = 'attributes'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/salaries/admin/salaries_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFieldsSalaries"); + $head[$h][2] = 'attributes'; + $h++; - complete_head_from_modules($conf, $langs, null, $head, $h, 'salaries_admin', 'remove'); + complete_head_from_modules($conf, $langs, null, $head, $h, 'salaries_admin', 'remove'); - return $head; + return $head; } diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index 9a36c0bb269..d4bb4584e26 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -309,7 +309,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f break; } } - } elseif (!empty($feature)) { // This is for permissions on 2 levels ('creer' or 'write') + } elseif (!empty($feature)) { // This is for permissions on 2 levels ('creer' or 'write') //print '
feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write; exit; if (empty($user->rights->$feature->creer) && empty($user->rights->$feature->write) @@ -541,7 +541,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand if ($feature == 'agenda')// Also check owner or attendee for users without allactions->read { if ($objectid > 0 && empty($user->rights->agenda->allactions->read)) { - require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php'; + require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; $action = new ActionComm($db); $action->fetch($objectid); if ($action->authorid != $user->id && $action->userownerid != $user->id && !(array_key_exists($user->id, $action->userassigned))) { diff --git a/htdocs/core/lib/takepos.lib.php b/htdocs/core/lib/takepos.lib.php index a651e1d76e0..dfddc95d733 100644 --- a/htdocs/core/lib/takepos.lib.php +++ b/htdocs/core/lib/takepos.lib.php @@ -71,5 +71,5 @@ function takepos_admin_prepare_head() complete_head_from_modules($conf, $langs, null, $head, $h, 'takepos_admin', 'remove'); - return $head; + return $head; } diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php index d47bfb2cab2..5558274710f 100644 --- a/htdocs/core/lib/ticket.lib.php +++ b/htdocs/core/lib/ticket.lib.php @@ -30,41 +30,41 @@ */ function ticketAdminPrepareHead() { - global $langs, $conf; + global $langs, $conf; - $langs->load("ticket"); + $langs->load("ticket"); - $h = 0; - $head = array(); + $h = 0; + $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/admin/ticket.php'; - $head[$h][1] = $langs->trans("TicketSettings"); - $head[$h][2] = 'settings'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/admin/ticket.php'; + $head[$h][1] = $langs->trans("TicketSettings"); + $head[$h][2] = 'settings'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/admin/ticket_extrafields.php'; - $head[$h][1] = $langs->trans("ExtraFieldsTicket"); - $head[$h][2] = 'attributes'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/admin/ticket_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFieldsTicket"); + $head[$h][2] = 'attributes'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/admin/ticket_public.php'; - $head[$h][1] = $langs->trans("PublicInterface"); - $head[$h][2] = 'public'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/admin/ticket_public.php'; + $head[$h][1] = $langs->trans("PublicInterface"); + $head[$h][2] = 'public'; + $h++; - // Show more tabs from modules - // Entries must be declared in modules descriptor with line - //$this->tabs = array( - // 'entity:+tabname:Title:@ticket:/ticket/mypage.php?id=__ID__' - //); // to add new tab - //$this->tabs = array( - // 'entity:-tabname:Title:@ticket:/ticket/mypage.php?id=__ID__' - //); // to remove a tab - complete_head_from_modules($conf, $langs, null, $head, $h, 'ticketadmin'); + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + //$this->tabs = array( + // 'entity:+tabname:Title:@ticket:/ticket/mypage.php?id=__ID__' + //); // to add new tab + //$this->tabs = array( + // 'entity:-tabname:Title:@ticket:/ticket/mypage.php?id=__ID__' + //); // to remove a tab + complete_head_from_modules($conf, $langs, null, $head, $h, 'ticketadmin'); complete_head_from_modules($conf, $langs, null, $head, $h, 'ticketadmin', 'remove'); - return $head; + return $head; } /** @@ -75,42 +75,42 @@ function ticketAdminPrepareHead() */ function ticket_prepare_head($object) { - global $db, $langs, $conf, $user; + global $db, $langs, $conf, $user; - $h = 0; - $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/ticket/card.php?action=view&track_id='.$object->track_id; - $head[$h][1] = $langs->trans("Ticket"); - $head[$h][2] = 'tabTicket'; - $h++; + $h = 0; + $head = array(); + $head[$h][0] = DOL_URL_ROOT.'/ticket/card.php?action=view&track_id='.$object->track_id; + $head[$h][1] = $langs->trans("Ticket"); + $head[$h][2] = 'tabTicket'; + $h++; - if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid)) - { - $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external')); - $head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id; - $head[$h][1] = $langs->trans('ContactsAddresses'); - if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.''; - $head[$h][2] = 'contact'; - $h++; - } + if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid)) + { + $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external')); + $head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id; + $head[$h][1] = $langs->trans('ContactsAddresses'); + if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.''; + $head[$h][2] = 'contact'; + $h++; + } - complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket'); + complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket'); - // Attached files - include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $upload_dir = $conf->ticket->dir_output."/".$object->ref; - $nbFiles = count(dol_dir_list($upload_dir, 'files')); - $head[$h][0] = dol_buildpath('/ticket/document.php', 1).'?id='.$object->id; - $head[$h][1] = $langs->trans("Documents"); - if ($nbFiles > 0) { - $head[$h][1] .= ''.$nbFiles.''; - } + // Attached files + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + $upload_dir = $conf->ticket->dir_output."/".$object->ref; + $nbFiles = count(dol_dir_list($upload_dir, 'files')); + $head[$h][0] = dol_buildpath('/ticket/document.php', 1).'?id='.$object->id; + $head[$h][1] = $langs->trans("Documents"); + if ($nbFiles > 0) { + $head[$h][1] .= ''.$nbFiles.''; + } - $head[$h][2] = 'tabTicketDocument'; - $h++; + $head[$h][2] = 'tabTicketDocument'; + $h++; - // History + // History $ticketViewType = "messaging"; if (empty($_SESSION['ticket-view-type'])) { $_SESSION['ticket-view-type'] = $ticketViewType; @@ -124,20 +124,20 @@ function ticket_prepare_head($object) // $ticketViewType == "list" $head[$h][0] = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id; } - $head[$h][1] = $langs->trans('Events'); - if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) - { - $head[$h][1] .= '/'; - $head[$h][1] .= $langs->trans("Agenda"); - } - $head[$h][2] = 'tabTicketLogs'; - $h++; + $head[$h][1] = $langs->trans('Events'); + if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) + { + $head[$h][1] .= '/'; + $head[$h][1] .= $langs->trans("Agenda"); + } + $head[$h][2] = 'tabTicketLogs'; + $h++; - complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket', 'remove'); + complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket', 'remove'); - return $head; + return $head; } /** @@ -184,13 +184,13 @@ function showDirectPublicLink($object) */ function generate_random_id($car = 16) { - $string = ""; - $chaine = "abcdefghijklmnopqrstuvwxyz123456789"; - srand((double) microtime() * 1000000); - for ($i = 0; $i < $car; $i++) { - $string .= $chaine[rand() % strlen($chaine)]; - } - return $string; + $string = ""; + $chaine = "abcdefghijklmnopqrstuvwxyz123456789"; + srand((double) microtime() * 1000000); + for ($i = 0; $i < $car; $i++) { + $string .= $chaine[rand() % strlen($chaine)]; + } + return $string; } /** @@ -277,255 +277,255 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $ */ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $noprint = 0, $actioncode = '', $donetodo = 'done', $filters = array(), $sortfield = 'a.datep,a.id', $sortorder = 'DESC') { - global $user, $conf; - global $form; + global $user, $conf; + global $form; - global $param, $massactionbutton; + global $param, $massactionbutton; - dol_include_once('/comm/action/class/actioncomm.class.php'); + dol_include_once('/comm/action/class/actioncomm.class.php'); - // Check parameters - if (!is_object($filterobj) && !is_object($objcon)) dol_print_error('', 'BadParameter'); + // Check parameters + if (!is_object($filterobj) && !is_object($objcon)) dol_print_error('', 'BadParameter'); - $out = ''; - $histo = array(); - $numaction = 0; - $now = dol_now('tzuser'); + $out = ''; + $histo = array(); + $numaction = 0; + $now = dol_now('tzuser'); - // Open DSI -- Fix order by -- Begin - $sortfield_list = explode(',', $sortfield); - $sortfield_label_list = array('a.id' => 'id', 'a.datep' => 'dp', 'a.percent' => 'percent'); - $sortfield_new_list = array(); - foreach ($sortfield_list as $sortfield_value) { - $sortfield_new_list[] = $sortfield_label_list[trim($sortfield_value)]; - } - $sortfield_new = implode(',', $sortfield_new_list); + // Open DSI -- Fix order by -- Begin + $sortfield_list = explode(',', $sortfield); + $sortfield_label_list = array('a.id' => 'id', 'a.datep' => 'dp', 'a.percent' => 'percent'); + $sortfield_new_list = array(); + foreach ($sortfield_list as $sortfield_value) { + $sortfield_new_list[] = $sortfield_label_list[trim($sortfield_value)]; + } + $sortfield_new = implode(',', $sortfield_new_list); - if (!empty($conf->agenda->enabled)) - { - // Recherche histo sur actioncomm - if (is_object($objcon) && $objcon->id > 0) { - $sql = "SELECT DISTINCT a.id, a.label as label,"; - } else { - $sql = "SELECT a.id, a.label as label,"; - } - $sql .= " a.datep as dp,"; - $sql .= " a.note as message,"; - $sql .= " a.datep2 as dp2,"; - $sql .= " a.percent as percent, 'action' as type,"; - $sql .= " a.fk_element, a.elementtype,"; - $sql .= " a.fk_contact,"; - $sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,"; - $sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; - if (is_object($filterobj) && get_class($filterobj) == 'Societe') $sql .= ", sp.lastname, sp.firstname"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname"; - elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", o.ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", o.ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", o.ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", o.ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", o.ref"; - $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id"; + if (!empty($conf->agenda->enabled)) + { + // Recherche histo sur actioncomm + if (is_object($objcon) && $objcon->id > 0) { + $sql = "SELECT DISTINCT a.id, a.label as label,"; + } else { + $sql = "SELECT a.id, a.label as label,"; + } + $sql .= " a.datep as dp,"; + $sql .= " a.note as message,"; + $sql .= " a.datep2 as dp2,"; + $sql .= " a.percent as percent, 'action' as type,"; + $sql .= " a.fk_element, a.elementtype,"; + $sql .= " a.fk_contact,"; + $sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,"; + $sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; + if (is_object($filterobj) && get_class($filterobj) == 'Societe') $sql .= ", sp.lastname, sp.firstname"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname"; + elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", o.ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", o.ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", o.ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", o.ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", o.ref"; + $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id"; - $force_filter_contact = false; - if (is_object($objcon) && $objcon->id > 0) { - $force_filter_contact = true; - $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm"; - $sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id; - } + $force_filter_contact = false; + if (is_object($objcon) && $objcon->id > 0) { + $force_filter_contact = true; + $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm"; + $sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id; + } - if (is_object($filterobj) && get_class($filterobj) == 'Societe') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { - $sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er"; - $sql .= " ON er.resource_type = 'dolresource'"; - $sql .= " AND er.element_id = a.id"; - $sql .= " AND er.resource_id = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m"; - elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o"; - elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", ".MAIN_DB_PREFIX."bom_bom as o"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", ".MAIN_DB_PREFIX."contrat as o"; + if (is_object($filterobj) && get_class($filterobj) == 'Societe') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { + $sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er"; + $sql .= " ON er.resource_type = 'dolresource'"; + $sql .= " AND er.element_id = a.id"; + $sql .= " AND er.resource_id = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m"; + elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o"; + elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", ".MAIN_DB_PREFIX."bom_bom as o"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", ".MAIN_DB_PREFIX."contrat as o"; - $sql .= " WHERE a.entity IN (".getEntity('agenda').")"; - if ($force_filter_contact === false) { - if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) $sql .= " AND a.fk_soc = ".$filterobj->id; - elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id; - elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') - { - $sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') - { - $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'Product') - { - $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') - { - $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') - { - $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') - { - $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } - } + $sql .= " WHERE a.entity IN (".getEntity('agenda').")"; + if ($force_filter_contact === false) { + if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) $sql .= " AND a.fk_soc = ".$filterobj->id; + elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id; + elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') + { + $sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') + { + $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'Product') + { + $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') + { + $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') + { + $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') + { + $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } + } - // Condition on actioncode - if (!empty($actioncode)) - { - if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) - { - if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'"; - elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'"; - else { - if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'"; - elseif ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'"; - } - } else { - if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'"; - elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'"; - else $sql .= " AND c.code = '".$db->escape($actioncode)."'"; - } - } - if ($donetodo == 'todo') $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))"; - elseif ($donetodo == 'done') $sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))"; - if (is_array($filters) && $filters['search_agenda_label']) $sql .= natural_search('a.label', $filters['search_agenda_label']); - } + // Condition on actioncode + if (!empty($actioncode)) + { + if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) + { + if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'"; + elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'"; + else { + if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'"; + elseif ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'"; + } + } else { + if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'"; + elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'"; + else $sql .= " AND c.code = '".$db->escape($actioncode)."'"; + } + } + if ($donetodo == 'todo') $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))"; + elseif ($donetodo == 'done') $sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))"; + if (is_array($filters) && $filters['search_agenda_label']) $sql .= natural_search('a.label', $filters['search_agenda_label']); + } - // Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing. - if (!empty($conf->mailing->enabled) && !empty($objcon->email) - && (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING')) - { - $langs->load("mails"); + // Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing. + if (!empty($conf->mailing->enabled) && !empty($objcon->email) + && (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING')) + { + $langs->load("mails"); - $sql2 = "SELECT m.rowid as id, m.titre as label, mc.date_envoi as dp, mc.date_envoi as dp2, '100' as percent, 'mailing' as type"; - $sql2 .= ", null as fk_element, '' as elementtype, null as contact_id"; - $sql2 .= ", 'AC_EMAILING' as acode, '' as alabel, '' as apicto"; - $sql2 .= ", u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; // User that valid action - if (is_object($filterobj) && get_class($filterobj) == 'Societe') $sql2 .= ", '' as lastname, '' as firstname"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql2 .= ", '' as lastname, '' as firstname"; - elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql2 .= ", '' as ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql2 .= ", '' as ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql2 .= ", '' as ref"; - $sql2 .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u"; - $sql2 .= " WHERE mc.email = '".$db->escape($objcon->email)."'"; // Search is done on email. - $sql2 .= " AND mc.statut = 1"; - $sql2 .= " AND u.rowid = m.fk_user_valid"; - $sql2 .= " AND mc.fk_mailing=m.rowid"; - } + $sql2 = "SELECT m.rowid as id, m.titre as label, mc.date_envoi as dp, mc.date_envoi as dp2, '100' as percent, 'mailing' as type"; + $sql2 .= ", null as fk_element, '' as elementtype, null as contact_id"; + $sql2 .= ", 'AC_EMAILING' as acode, '' as alabel, '' as apicto"; + $sql2 .= ", u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; // User that valid action + if (is_object($filterobj) && get_class($filterobj) == 'Societe') $sql2 .= ", '' as lastname, '' as firstname"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql2 .= ", '' as lastname, '' as firstname"; + elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql2 .= ", '' as ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql2 .= ", '' as ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql2 .= ", '' as ref"; + $sql2 .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u"; + $sql2 .= " WHERE mc.email = '".$db->escape($objcon->email)."'"; // Search is done on email. + $sql2 .= " AND mc.statut = 1"; + $sql2 .= " AND u.rowid = m.fk_user_valid"; + $sql2 .= " AND mc.fk_mailing=m.rowid"; + } - if (!empty($sql) && !empty($sql2)) { - $sql = $sql." UNION ".$sql2; - } elseif (empty($sql) && !empty($sql2)) { - $sql = $sql2; - } + if (!empty($sql) && !empty($sql2)) { + $sql = $sql." UNION ".$sql2; + } elseif (empty($sql) && !empty($sql2)) { + $sql = $sql2; + } - //TODO Add limit in nb of results - $sql .= $db->order($sortfield_new, $sortorder); - dol_syslog("company.lib::show_actions_done", LOG_DEBUG); - $resql = $db->query($sql); - if ($resql) - { - $i = 0; - $num = $db->num_rows($resql); + //TODO Add limit in nb of results + $sql .= $db->order($sortfield_new, $sortorder); + dol_syslog("company.lib::show_actions_done", LOG_DEBUG); + $resql = $db->query($sql); + if ($resql) + { + $i = 0; + $num = $db->num_rows($resql); - while ($i < $num) - { - $obj = $db->fetch_object($resql); + while ($i < $num) + { + $obj = $db->fetch_object($resql); - if ($obj->type == 'action') { - $contactaction = new ActionComm($db); - $contactaction->id = $obj->id; - $result = $contactaction->fetchResources(); - if ($result < 0) { - dol_print_error($db); - setEventMessage("company.lib::show_actions_done Error fetch ressource", 'errors'); - } + if ($obj->type == 'action') { + $contactaction = new ActionComm($db); + $contactaction->id = $obj->id; + $result = $contactaction->fetchResources(); + if ($result < 0) { + dol_print_error($db); + setEventMessage("company.lib::show_actions_done Error fetch ressource", 'errors'); + } - //if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))"; - //elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))"; - $tododone = ''; - if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) $tododone = 'todo'; + //if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))"; + //elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))"; + $tododone = ''; + if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) $tododone = 'todo'; - $histo[$numaction] = array( - 'type'=>$obj->type, - 'tododone'=>$tododone, - 'id'=>$obj->id, - 'datestart'=>$db->jdate($obj->dp), - 'dateend'=>$db->jdate($obj->dp2), - 'note'=>$obj->label, - 'message'=>$obj->message, - 'percent'=>$obj->percent, + $histo[$numaction] = array( + 'type'=>$obj->type, + 'tododone'=>$tododone, + 'id'=>$obj->id, + 'datestart'=>$db->jdate($obj->dp), + 'dateend'=>$db->jdate($obj->dp2), + 'note'=>$obj->label, + 'message'=>$obj->message, + 'percent'=>$obj->percent, - 'userid'=>$obj->user_id, - 'login'=>$obj->user_login, - 'userfirstname'=>$obj->user_firstname, - 'userlastname'=>$obj->user_lastname, - 'userphoto'=>$obj->user_photo, + 'userid'=>$obj->user_id, + 'login'=>$obj->user_login, + 'userfirstname'=>$obj->user_firstname, + 'userlastname'=>$obj->user_lastname, + 'userphoto'=>$obj->user_photo, - 'contact_id'=>$obj->fk_contact, - 'socpeopleassigned' => $contactaction->socpeopleassigned, - 'lastname'=>$obj->lastname, - 'firstname'=>$obj->firstname, - 'fk_element'=>$obj->fk_element, - 'elementtype'=>$obj->elementtype, - // Type of event - 'acode'=>$obj->acode, - 'alabel'=>$obj->alabel, - 'libelle'=>$obj->alabel, // deprecated - 'apicto'=>$obj->apicto - ); - } else { - $histo[$numaction] = array( - 'type'=>$obj->type, - 'tododone'=>'done', - 'id'=>$obj->id, - 'datestart'=>$db->jdate($obj->dp), - 'dateend'=>$db->jdate($obj->dp2), - 'note'=>$obj->label, - 'message'=>$obj->message, - 'percent'=>$obj->percent, - 'acode'=>$obj->acode, + 'contact_id'=>$obj->fk_contact, + 'socpeopleassigned' => $contactaction->socpeopleassigned, + 'lastname'=>$obj->lastname, + 'firstname'=>$obj->firstname, + 'fk_element'=>$obj->fk_element, + 'elementtype'=>$obj->elementtype, + // Type of event + 'acode'=>$obj->acode, + 'alabel'=>$obj->alabel, + 'libelle'=>$obj->alabel, // deprecated + 'apicto'=>$obj->apicto + ); + } else { + $histo[$numaction] = array( + 'type'=>$obj->type, + 'tododone'=>'done', + 'id'=>$obj->id, + 'datestart'=>$db->jdate($obj->dp), + 'dateend'=>$db->jdate($obj->dp2), + 'note'=>$obj->label, + 'message'=>$obj->message, + 'percent'=>$obj->percent, + 'acode'=>$obj->acode, - 'userid'=>$obj->user_id, - 'login'=>$obj->user_login, - 'userfirstname'=>$obj->user_firstname, - 'userlastname'=>$obj->user_lastname, - 'userphoto'=>$obj->user_photo - ); - } + 'userid'=>$obj->user_id, + 'login'=>$obj->user_login, + 'userfirstname'=>$obj->user_firstname, + 'userlastname'=>$obj->user_lastname, + 'userphoto'=>$obj->user_photo + ); + } - $numaction++; - $i++; - } - } else { - dol_print_error($db); - } + $numaction++; + $i++; + } + } else { + dol_print_error($db); + } - if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email))) - { - $delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60; + if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email))) + { + $delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60; - require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; - include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; - require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; + require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; + require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; - $formactions = new FormActions($db); + $formactions = new FormActions($db); - $actionstatic = new ActionComm($db); - $userstatic = new User($db); - $contactstatic = new Contact($db); - $userGetNomUrlCache = array(); + $actionstatic = new ActionComm($db); + $userstatic = new User($db); + $contactstatic = new Contact($db); + $userGetNomUrlCache = array(); $out .= '
\n"; + $out .= "".$langs->trans("Modules").": ".join(', ', $conf->modules)."
\n"; } if (is_object($db)) @@ -4542,7 +4542,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $ $listoflanguagesbefore = array('nl_NL'); if (in_array($currency_code, $listofcurrenciesbefore) || in_array($outlangs->defaultlang, $listoflanguagesbefore)) { - $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code); + $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code); } else { $tmpcur = $outlangs->getCurrencySymbol($currency_code); $cursymbolafter .= ($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur); @@ -5368,7 +5368,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart) // We will enhance here a common way of forging path for document storage // Here, object->id, object->ref and modulepart are required. //var_dump($modulepart); - if (in_array($modulepart, array('thirdparty', 'contact', 'member', 'propal', 'proposal', 'commande', 'order', 'facture', 'invoice', + if (in_array($modulepart, array('thirdparty', 'contact', 'member', 'propal', 'proposal', 'commande', 'order', 'facture', 'invoice', 'supplier_order', 'supplier_proposal', 'shipment', 'contract', 'expensereport', 'ficheinter'))) { $path = ($object->ref ? $object->ref : $object->id); @@ -5875,18 +5875,18 @@ function dol_textishtml($msg, $option = 0) */ function dol_concatdesc($text1, $text2, $forxml = false, $invert = false) { - if (!empty($invert)) - { - $tmp = $text1; - $text1 = $text2; - $text2 = $tmp; - } + if (!empty($invert)) + { + $tmp = $text1; + $text1 = $text2; + $text2 = $tmp; + } - $ret = ''; - $ret .= (!dol_textishtml($text1) && dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text1, 0, 1, '', 1), 0, $forxml) : $text1; - $ret .= (!empty($text1) && !empty($text2)) ? ((dol_textishtml($text1) || dol_textishtml($text2)) ? ($forxml ? "
\n" : "
\n") : "\n") : ""; - $ret .= (dol_textishtml($text1) && !dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text2, 0, 1, '', 1), 0, $forxml) : $text2; - return $ret; + $ret = ''; + $ret .= (!dol_textishtml($text1) && dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text1, 0, 1, '', 1), 0, $forxml) : $text1; + $ret .= (!empty($text1) && !empty($text2)) ? ((dol_textishtml($text1) || dol_textishtml($text2)) ? ($forxml ? "
\n" : "
\n") : "\n") : ""; + $ret .= (dol_textishtml($text1) && !dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text2, 0, 1, '', 1), 0, $forxml) : $text2; + return $ret; } @@ -5917,11 +5917,11 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, ) ); - $substitutionarray = array_merge($substitutionarray, array( + $substitutionarray = array_merge($substitutionarray, array( '__USER_ID__' => (string) $user->id, '__USER_LOGIN__' => (string) $user->login, - '__USER_EMAIL__' => (string) $user->email, - '__USER_LASTNAME__' => (string) $user->lastname, + '__USER_EMAIL__' => (string) $user->email, + '__USER_LASTNAME__' => (string) $user->lastname, '__USER_FIRSTNAME__' => (string) $user->firstname, '__USER_FULLNAME__' => (string) $user->getFullName($outputlangs), '__USER_SUPERVISOR_ID__' => (string) ($user->fk_user ? $user->fk_user : '0'), @@ -5931,7 +5931,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, } if ((empty($exclude) || !in_array('mycompany', $exclude)) && is_object($mysoc)) { - $substitutionarray = array_merge($substitutionarray, array( + $substitutionarray = array_merge($substitutionarray, array( '__MYCOMPANY_NAME__' => $mysoc->name, '__MYCOMPANY_EMAIL__' => $mysoc->email, '__MYCOMPANY_PROFID1__' => $mysoc->idprof1, @@ -5947,8 +5947,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, '__MYCOMPANY_TOWN__' => $mysoc->town, '__MYCOMPANY_COUNTRY__' => $mysoc->country, '__MYCOMPANY_COUNTRY_ID__' => $mysoc->country_id, - '__MYCOMPANY_COUNTRY_CODE__' => $mysoc->country_code, - '__MYCOMPANY_CURRENCY_CODE__' => $conf->currency + '__MYCOMPANY_COUNTRY_CODE__' => $mysoc->country_code, + '__MYCOMPANY_CURRENCY_CODE__' => $conf->currency )); } @@ -6031,7 +6031,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, if (!empty($conf->expedition->enabled) && (!is_object($object) || $object->element == 'shipping')) { - $substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tacking number'; + $substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tacking number'; $substitutionarray['__SHIPPINGTRACKNUMURL__'] = 'Shipping tracking url'; } } else { @@ -6286,7 +6286,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, $tmp4 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $tmp5 = dol_get_next_month($tmp['mon'], $tmp['year']); - $substitutionarray = array_merge($substitutionarray, array( + $substitutionarray = array_merge($substitutionarray, array( '__DAY__' => (string) $tmp['mday'], '__DAY_TEXT__' => $outputlangs->trans('Day'.$tmp['wday']), // Monday '__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'].'Min'), // Mon @@ -6515,11 +6515,11 @@ function dolGetFirstLastname($firstname, $lastname, $nameorder = -1) $ret .= $lastname; } elseif ($nameorder == 2 || $nameorder == 3) { - $ret .= $firstname; - if (empty($ret) && $nameorder == 3) - { - $ret .= $lastname; - } + $ret .= $firstname; + if (empty($ret) && $nameorder == 3) + { + $ret .= $lastname; + } } else { $ret .= $lastname; if ($firstname && $lastname) $ret .= ' '; @@ -6821,12 +6821,12 @@ function dol_sort_array(&$array, $index, $order = 'asc', $natsort = 0, $case_sen } } - if (!$natsort) { - ($order == 'asc') ? asort($temp) : arsort($temp); - } else { - ($case_sensitive) ? natsort($temp) : natcasesort($temp); - if ($order != 'asc') $temp = array_reverse($temp, true); - } + if (!$natsort) { + ($order == 'asc') ? asort($temp) : arsort($temp); + } else { + ($case_sensitive) ? natsort($temp) : natcasesort($temp); + if ($order != 'asc') $temp = array_reverse($temp, true); + } $sorted = array(); @@ -7256,18 +7256,18 @@ function getLanguageCodeFromCountryCode($countrycode) if (function_exists('locale_get_primary_language') && function_exists('locale_get_region')) // Need extension php-intl { - foreach ($locales as $locale) - { - $locale_language = locale_get_primary_language($locale); - $locale_region = locale_get_region($locale); - if (strtoupper($countrycode) == $locale_region) - { - //var_dump($locale.'-'.$locale_language.'-'.$locale_region); - return strtolower($locale_language).'_'.strtoupper($locale_region); - } - } + foreach ($locales as $locale) + { + $locale_language = locale_get_primary_language($locale); + $locale_region = locale_get_region($locale); + if (strtoupper($countrycode) == $locale_region) + { + //var_dump($locale.'-'.$locale_language.'-'.$locale_region); + return strtolower($locale_language).'_'.strtoupper($locale_region); + } + } } else { - dol_syslog("Warning Exention php-intl is not available", LOG_WARNING); + dol_syslog("Warning Exention php-intl is not available", LOG_WARNING); } return null; @@ -7377,7 +7377,7 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type, if ($reshook > 0) { $head = $hookmanager->resArray; - $h = count($head); + $h = count($head); } } } @@ -7560,15 +7560,15 @@ function printCommonFooter($zone = 'private') // Add Xdebug coverage of code if (defined('XDEBUGCOVERAGE')) { - print_r(xdebug_get_code_coverage()); + print_r(xdebug_get_code_coverage()); } // Add DebugBar data - if (!empty($user->rights->debugbar->read) && is_object($debugbar)) - { - $debugbar['time']->stopMeasure('pageaftermaster'); - print ''."\n"; - print $debugbar->getRenderer()->render(); + if (!empty($user->rights->debugbar->read) && is_object($debugbar)) + { + $debugbar['time']->stopMeasure('pageaftermaster'); + print ''."\n"; + print $debugbar->getRenderer()->render(); } elseif (count($conf->logbuffer)) // If there is some logs in buffer to show { print "\n"; @@ -7736,30 +7736,30 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0) if ($mode == -3) $newres .= ' OR '.$field.' IS NULL'; } elseif ($mode == 4) { - $tmparray = explode(',', trim($crit)); - if (count($tmparray)) - { - $listofcodes = ''; - foreach ($tmparray as $val) - { - if ($val) - { - $newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape(trim($val)).',%\''; - $newres .= ' OR '.$field.' = \''.$db->escape(trim($val)).'\''; - $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).'\''; - $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).',%\''; - $newres .= ')'; - $i2++; - } - } - } + $tmparray = explode(',', trim($crit)); + if (count($tmparray)) + { + $listofcodes = ''; + foreach ($tmparray as $val) + { + if ($val) + { + $newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape(trim($val)).',%\''; + $newres .= ' OR '.$field.' = \''.$db->escape(trim($val)).'\''; + $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).'\''; + $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).',%\''; + $newres .= ')'; + $i2++; + } + } + } } else // $mode=0 { $tmpcrits = explode('|', $crit); $i3 = 0; foreach ($tmpcrits as $tmpcrit) { - if ($tmpcrit !== '0' && empty($tmpcrit)) continue; + if ($tmpcrit !== '0' && empty($tmpcrit)) continue; $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : ''); @@ -7937,19 +7937,19 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0) if (preg_match('/\.tsv$/i', $tmpfile)) { $mime = 'text/tab-separated-values'; $imgmime = 'text.png'; $famime = 'file-text-o'; } if (preg_match('/\.(cf|conf|log)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o'; } if (preg_match('/\.ini$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'ini'; $famime = 'file-text-o'; } - if (preg_match('/\.md$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'md'; $famime = 'file-text-o'; } + if (preg_match('/\.md$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'md'; $famime = 'file-text-o'; } if (preg_match('/\.css$/i', $tmpfile)) { $mime = 'text/css'; $imgmime = 'css.png'; $srclang = 'css'; $famime = 'file-text-o'; } // Certificate files if (preg_match('/\.(crt|cer|key|pub)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o'; } // XML based (HTML/XML/XAML) if (preg_match('/\.(html|htm|shtml)$/i', $tmpfile)) { $mime = 'text/html'; $imgmime = 'html.png'; $srclang = 'html'; $famime = 'file-text-o'; } if (preg_match('/\.(xml|xhtml)$/i', $tmpfile)) { $mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xml'; $famime = 'file-text-o'; } - if (preg_match('/\.xaml$/i', $tmpfile)) { $mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xaml'; $famime = 'file-text-o'; } + if (preg_match('/\.xaml$/i', $tmpfile)) { $mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xaml'; $famime = 'file-text-o'; } // Languages if (preg_match('/\.bas$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'bas'; $famime = 'file-code-o'; } if (preg_match('/\.(c)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'c'; $famime = 'file-code-o'; } if (preg_match('/\.(cpp)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cpp'; $famime = 'file-code-o'; } - if (preg_match('/\.cs$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cs'; $famime = 'file-code-o'; } + if (preg_match('/\.cs$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cs'; $famime = 'file-code-o'; } if (preg_match('/\.(h)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'h'; $famime = 'file-code-o'; } if (preg_match('/\.(java|jsp)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'java'; $famime = 'file-code-o'; } if (preg_match('/\.php([0-9]{1})?$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'php.png'; $srclang = 'php'; $famime = 'file-code-o'; } @@ -8079,7 +8079,7 @@ function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield */ function colorIsLight($stringcolor) { - $stringcolor = str_replace('#', '', $stringcolor); + $stringcolor = str_replace('#', '', $stringcolor); $res = -1; if (!empty($stringcolor)) { @@ -8162,28 +8162,28 @@ function roundUpToNextMultiple($n, $x = 5) */ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '', $params = array()) { - $attr = array( - 'class'=>'badge '.(!empty($mode) ? ' badge-'.$mode : '').(!empty($type) ? ' badge-'.$type : '').(empty($params['css']) ? '' : ' '.$params['css']) - ); + $attr = array( + 'class'=>'badge '.(!empty($mode) ? ' badge-'.$mode : '').(!empty($type) ? ' badge-'.$type : '').(empty($params['css']) ? '' : ' '.$params['css']) + ); - if (empty($html)) { - $html = $label; - } + if (empty($html)) { + $html = $label; + } - if (!empty($url)) { - $attr['href'] = $url; - } + if (!empty($url)) { + $attr['href'] = $url; + } - if ($mode === 'dot') { - $attr['class'] .= ' classfortooltip'; - $attr['title'] = $html; - $attr['aria-label'] = $label; - $html = ''; - } + if ($mode === 'dot') { + $attr['class'] .= ' classfortooltip'; + $attr['title'] = $html; + $attr['aria-label'] = $label; + $html = ''; + } - // Override attr - if (!empty($params['attr']) && is_array($params['attr'])) { - foreach ($params['attr']as $key => $value) { + // Override attr + if (!empty($params['attr']) && is_array($params['attr'])) { + foreach ($params['attr']as $key => $value) { if ($key == 'class') { $attr['class'] .= ' '.$value; } elseif ($key == 'classOverride') { @@ -8191,24 +8191,24 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = ' } else { $attr[$key] = $value; } - } - } + } + } - // TODO: add hook + // TODO: add hook - // escape all attribute - $attr = array_map('dol_escape_htmltag', $attr); + // escape all attribute + $attr = array_map('dol_escape_htmltag', $attr); - $TCompiledAttr = array(); - foreach ($attr as $key => $value) { - $TCompiledAttr[] = $key.'="'.$value.'"'; - } + $TCompiledAttr = array(); + foreach ($attr as $key => $value) { + $TCompiledAttr[] = $key.'="'.$value.'"'; + } - $compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : ''; + $compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : ''; - $tag = !empty($url) ? 'a' : 'span'; + $tag = !empty($url) ? 'a' : 'span'; - return '<'.$tag.' '.$compiledAttributes.'>'.$html.''; + return '<'.$tag.' '.$compiledAttributes.'>'.$html.''; } @@ -8226,82 +8226,82 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = ' */ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $statusType = 'status0', $displayMode = 0, $url = '', $params = array()) { - global $conf; + global $conf; - $return = ''; - $dolGetBadgeParams = array(); + $return = ''; + $dolGetBadgeParams = array(); - if (!empty($params['badgeParams'])) { - $dolGetBadgeParams = $params['badgeParams']; - } + if (!empty($params['badgeParams'])) { + $dolGetBadgeParams = $params['badgeParams']; + } - // TODO : add a hook - if ($displayMode == 0) { - $return = !empty($html) ? $html : (empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)); - } elseif ($displayMode == 1) { - $return = !empty($html) ? $html : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort); - } // Use status with images (for backward compatibility) - elseif (!empty($conf->global->MAIN_STATUS_USES_IMAGES)) { - $return = ''; - $htmlLabel = (in_array($displayMode, array(1, 2, 5)) ? '' : '').(!empty($html) ? $html : $statusLabel).(in_array($displayMode, array(1, 2, 5)) ? '' : ''); - $htmlLabelShort = (in_array($displayMode, array(1, 2, 5)) ? '' : '').(!empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel)).(in_array($displayMode, array(1, 2, 5)) ? '' : ''); + // TODO : add a hook + if ($displayMode == 0) { + $return = !empty($html) ? $html : (empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)); + } elseif ($displayMode == 1) { + $return = !empty($html) ? $html : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort); + } // Use status with images (for backward compatibility) + elseif (!empty($conf->global->MAIN_STATUS_USES_IMAGES)) { + $return = ''; + $htmlLabel = (in_array($displayMode, array(1, 2, 5)) ? '' : '').(!empty($html) ? $html : $statusLabel).(in_array($displayMode, array(1, 2, 5)) ? '' : ''); + $htmlLabelShort = (in_array($displayMode, array(1, 2, 5)) ? '' : '').(!empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel)).(in_array($displayMode, array(1, 2, 5)) ? '' : ''); - // For small screen, we always use the short label instead of long label. - if (!empty($conf->dol_optimize_smallscreen)) - { - if ($displayMode == 0) $displayMode = 1; - elseif ($displayMode == 4) $displayMode = 2; - elseif ($displayMode == 6) $displayMode = 5; - } + // For small screen, we always use the short label instead of long label. + if (!empty($conf->dol_optimize_smallscreen)) + { + if ($displayMode == 0) $displayMode = 1; + elseif ($displayMode == 4) $displayMode = 2; + elseif ($displayMode == 6) $displayMode = 5; + } - // For backward compatibility. Image's filename are still in French, so we use this array to convert - $statusImg = array( - 'status0' => 'statut0', - 'status1' => 'statut1', - 'status2' => 'statut2', - 'status3' => 'statut3', - 'status4' => 'statut4', - 'status5' => 'statut5', - 'status6' => 'statut6', - 'status7' => 'statut7', - 'status8' => 'statut8', - 'status9' => 'statut9' - ); + // For backward compatibility. Image's filename are still in French, so we use this array to convert + $statusImg = array( + 'status0' => 'statut0', + 'status1' => 'statut1', + 'status2' => 'statut2', + 'status3' => 'statut3', + 'status4' => 'statut4', + 'status5' => 'statut5', + 'status6' => 'statut6', + 'status7' => 'statut7', + 'status8' => 'statut8', + 'status9' => 'statut9' + ); - if (!empty($statusImg[$statusType])) { - $htmlImg = img_picto($statusLabel, $statusImg[$statusType]); - } else { - $htmlImg = img_picto($statusLabel, $statusType); - } + if (!empty($statusImg[$statusType])) { + $htmlImg = img_picto($statusLabel, $statusImg[$statusType]); + } else { + $htmlImg = img_picto($statusLabel, $statusType); + } - if ($displayMode === 2) { - $return = $htmlImg.' '.$htmlLabelShort; - } elseif ($displayMode === 3) { - $return = $htmlImg; - } elseif ($displayMode === 4) { - $return = $htmlImg.' '.$htmlLabel; - } elseif ($displayMode === 5) { - $return = $htmlLabelShort.' '.$htmlImg; - } else { // $displayMode >= 6 - $return = $htmlLabel.' '.$htmlImg; - } - } // Use new badge - elseif (empty($conf->global->MAIN_STATUS_USES_IMAGES) && !empty($displayMode)) { - $statusLabelShort = (empty($statusLabelShort) ? $statusLabel : $statusLabelShort); + if ($displayMode === 2) { + $return = $htmlImg.' '.$htmlLabelShort; + } elseif ($displayMode === 3) { + $return = $htmlImg; + } elseif ($displayMode === 4) { + $return = $htmlImg.' '.$htmlLabel; + } elseif ($displayMode === 5) { + $return = $htmlLabelShort.' '.$htmlImg; + } else { // $displayMode >= 6 + $return = $htmlLabel.' '.$htmlImg; + } + } // Use new badge + elseif (empty($conf->global->MAIN_STATUS_USES_IMAGES) && !empty($displayMode)) { + $statusLabelShort = (empty($statusLabelShort) ? $statusLabel : $statusLabelShort); $dolGetBadgeParams['attr']['class'] = 'badge-status'; $dolGetBadgeParams['attr']['title'] = $statusLabel; - if ($displayMode == 3) { - $return = dolGetBadge((empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)), '', $statusType, 'dot', $url, $dolGetBadgeParams); - } elseif ($displayMode === 5) { - $return = dolGetBadge($statusLabelShort, $html, $statusType, '', $url, $dolGetBadgeParams); - } else { - $return = dolGetBadge((empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)), $html, $statusType, '', $url, $dolGetBadgeParams); - } - } + if ($displayMode == 3) { + $return = dolGetBadge((empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)), '', $statusType, 'dot', $url, $dolGetBadgeParams); + } elseif ($displayMode === 5) { + $return = dolGetBadge($statusLabelShort, $html, $statusType, '', $url, $dolGetBadgeParams); + } else { + $return = dolGetBadge((empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)), $html, $statusType, '', $url, $dolGetBadgeParams); + } + } - return $return; + return $return; } @@ -8319,63 +8319,63 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st */ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params = array()) { - $class = 'butAction'; - if ($actionType == 'danger' || $actionType == 'delete') { - $class = 'butActionDelete'; - } + $class = 'butAction'; + if ($actionType == 'danger' || $actionType == 'delete') { + $class = 'butActionDelete'; + } - $attr = array( - 'class' => $class - ,'href' => empty($url) ? '' : $url - ); + $attr = array( + 'class' => $class + ,'href' => empty($url) ? '' : $url + ); - if (empty($html)) { - $html = $label; - } else { - $attr['aria-label'] = $label; - } + if (empty($html)) { + $html = $label; + } else { + $attr['aria-label'] = $label; + } - if (empty($userRight)) { - $attr['class'] = 'butActionRefused'; - $attr['href'] = ''; - } + if (empty($userRight)) { + $attr['class'] = 'butActionRefused'; + $attr['href'] = ''; + } - if (!empty($id)) { - $attr['id'] = $id; - } + if (!empty($id)) { + $attr['id'] = $id; + } - // Override attr - if (!empty($params['attr']) && is_array($params['attr'])) { - foreach ($params['attr'] as $key => $value) { - if ($key == 'class') { - $attr['class'] .= ' '.$value; - } elseif ($key == 'classOverride') { - $attr['class'] = $value; - } else { - $attr[$key] = $value; - } - } - } + // Override attr + if (!empty($params['attr']) && is_array($params['attr'])) { + foreach ($params['attr'] as $key => $value) { + if ($key == 'class') { + $attr['class'] .= ' '.$value; + } elseif ($key == 'classOverride') { + $attr['class'] = $value; + } else { + $attr[$key] = $value; + } + } + } - if (isset($attr['href']) && empty($attr['href'])) { - unset($attr['href']); - } + if (isset($attr['href']) && empty($attr['href'])) { + unset($attr['href']); + } - // TODO : add a hook + // TODO : add a hook - // escape all attribute - $attr = array_map('dol_escape_htmltag', $attr); + // escape all attribute + $attr = array_map('dol_escape_htmltag', $attr); - $TCompiledAttr = array(); - foreach ($attr as $key => $value) { - $TCompiledAttr[] = $key.'="'.$value.'"'; - } + $TCompiledAttr = array(); + foreach ($attr as $key => $value) { + $TCompiledAttr[] = $key.'="'.$value.'"'; + } - $compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : ''; + $compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : ''; - $tag = !empty($attr['href']) ? 'a' : 'span'; + $tag = !empty($attr['href']) ? 'a' : 'span'; - return '
<'.$tag.' '.$compiledAttributes.'>'.$html.'
';
+ return '<'.$tag.' '.$compiledAttributes.'>'.$html.'
';
}
/**
@@ -8392,85 +8392,85 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
*/
function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $url = '', $id = '', $status = 1, $params = array())
{
- global $langs, $conf, $user;
+ global $langs, $conf, $user;
- // Actually this conf is used in css too for external module compatibility and smooth transition to this function
- if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin) && $status <= 0) {
- return '';
- }
+ // Actually this conf is used in css too for external module compatibility and smooth transition to this function
+ if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin) && $status <= 0) {
+ return '';
+ }
- $class = 'btnTitle';
- if ($iconClass == 'fa fa-plus-circle') $class .= ' btnTitlePlus';
+ $class = 'btnTitle';
+ if ($iconClass == 'fa fa-plus-circle') $class .= ' btnTitlePlus';
- if (!empty($params['morecss'])) $class .= ' '.$params['morecss'];
+ if (!empty($params['morecss'])) $class .= ' '.$params['morecss'];
- $attr = array(
- 'class' => $class
- ,'href' => empty($url) ? '' : $url
- );
+ $attr = array(
+ 'class' => $class
+ ,'href' => empty($url) ? '' : $url
+ );
- if (!empty($helpText)) {
- $attr['title'] = dol_escape_htmltag($helpText);
- }
+ if (!empty($helpText)) {
+ $attr['title'] = dol_escape_htmltag($helpText);
+ }
- if ($status <= 0) {
- $attr['class'] .= ' refused';
+ if ($status <= 0) {
+ $attr['class'] .= ' refused';
- $attr['href'] = '';
+ $attr['href'] = '';
- if ($status == -1) { // disable
- $attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("FeatureDisabled"));
- } elseif ($status == 0) { // Not enough permissions
- $attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions"));
- }
- }
+ if ($status == -1) { // disable
+ $attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("FeatureDisabled"));
+ } elseif ($status == 0) { // Not enough permissions
+ $attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions"));
+ }
+ }
- if (!empty($attr['title'])) {
- $attr['class'] .= ' classfortooltip';
- }
+ if (!empty($attr['title'])) {
+ $attr['class'] .= ' classfortooltip';
+ }
- if (!empty($id)) {
- $attr['id'] = $id;
- }
+ if (!empty($id)) {
+ $attr['id'] = $id;
+ }
- // Override attr
- if (!empty($params['attr']) && is_array($params['attr'])) {
- foreach ($params['attr'] as $key => $value) {
- if ($key == 'class') {
- $attr['class'] .= ' '.$value;
- } elseif ($key == 'classOverride') {
- $attr['class'] = $value;
- } else {
- $attr[$key] = $value;
- }
- }
- }
+ // Override attr
+ if (!empty($params['attr']) && is_array($params['attr'])) {
+ foreach ($params['attr'] as $key => $value) {
+ if ($key == 'class') {
+ $attr['class'] .= ' '.$value;
+ } elseif ($key == 'classOverride') {
+ $attr['class'] = $value;
+ } else {
+ $attr[$key] = $value;
+ }
+ }
+ }
- if (isset($attr['href']) && empty($attr['href'])) {
- unset($attr['href']);
- }
+ if (isset($attr['href']) && empty($attr['href'])) {
+ unset($attr['href']);
+ }
- // TODO : add a hook
+ // TODO : add a hook
- // escape all attribute
- $attr = array_map('dol_escape_htmltag', $attr);
+ // escape all attribute
+ $attr = array_map('dol_escape_htmltag', $attr);
- $TCompiledAttr = array();
- foreach ($attr as $key => $value) {
- $TCompiledAttr[] = $key.'="'.$value.'"';
- }
+ $TCompiledAttr = array();
+ foreach ($attr as $key => $value) {
+ $TCompiledAttr[] = $key.'="'.$value.'"';
+ }
- $compiledAttributes = (empty($TCompiledAttr) ? '' : implode(' ', $TCompiledAttr));
+ $compiledAttributes = (empty($TCompiledAttr) ? '' : implode(' ', $TCompiledAttr));
- $tag = (empty($attr['href']) ? 'span' : 'a');
+ $tag = (empty($attr['href']) ? 'span' : 'a');
- $button = '';
- $button .= '<'.$tag.' '.$compiledAttributes.' >';
- $button .= '';
- $button .= '';
- $button .= '';
+ $button = '';
+ $button .= '<'.$tag.' '.$compiledAttributes.' >';
+ $button .= '';
+ $button .= '';
+ $button .= '';
- return $button;
+ return $button;
}
/**
@@ -8635,12 +8635,12 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '')
*/
function isAFileWithExecutableContent($filename)
{
- if (preg_match('/\.(htm|html|js|phar|php|php\d+|phtml|pht|pl|py|cgi|ksh|sh|shtml|bash|bat|cmd|wpk|exe|dmg)$/i', $filename))
- {
- return true;
- }
+ if (preg_match('/\.(htm|html|js|phar|php|php\d+|phtml|pht|pl|py|cgi|ksh|sh|shtml|bash|bat|cmd|wpk|exe|dmg)$/i', $filename))
+ {
+ return true;
+ }
- return false;
+ return false;
}
/**
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 787a5471b18..ddeb4df4dea 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -39,34 +39,34 @@
*/
function jsUnEscape($source)
{
- $decodedStr = "";
- $pos = 0;
- $len = strlen($source);
- while ($pos < $len) {
- $charAt = substr($source, $pos, 1);
- if ($charAt == '%') {
- $pos++;
- $charAt = substr($source, $pos, 1);
- if ($charAt == 'u') {
- // we got a unicode character
- $pos++;
- $unicodeHexVal = substr($source, $pos, 4);
- $unicode = hexdec($unicodeHexVal);
- $entity = "&#".$unicode.';';
- $decodedStr .= utf8_encode($entity);
- $pos += 4;
- } else {
- // we have an escaped ascii character
- $hexVal = substr($source, $pos, 2);
- $decodedStr .= chr(hexdec($hexVal));
- $pos += 2;
- }
- } else {
- $decodedStr .= $charAt;
- $pos++;
- }
- }
- return dol_html_entity_decode($decodedStr, ENT_COMPAT);
+ $decodedStr = "";
+ $pos = 0;
+ $len = strlen($source);
+ while ($pos < $len) {
+ $charAt = substr($source, $pos, 1);
+ if ($charAt == '%') {
+ $pos++;
+ $charAt = substr($source, $pos, 1);
+ if ($charAt == 'u') {
+ // we got a unicode character
+ $pos++;
+ $unicodeHexVal = substr($source, $pos, 4);
+ $unicode = hexdec($unicodeHexVal);
+ $entity = "&#".$unicode.';';
+ $decodedStr .= utf8_encode($entity);
+ $pos += 4;
+ } else {
+ // we have an escaped ascii character
+ $hexVal = substr($source, $pos, 2);
+ $decodedStr .= chr(hexdec($hexVal));
+ $pos += 2;
+ }
+ } else {
+ $decodedStr .= $charAt;
+ $pos++;
+ }
+ }
+ return dol_html_entity_decode($decodedStr, ENT_COMPAT);
}
@@ -79,37 +79,37 @@ function jsUnEscape($source)
*/
function dolGetModulesDirs($subdir = '')
{
- global $conf;
+ global $conf;
- $modulesdir = array();
+ $modulesdir = array();
- foreach ($conf->file->dol_document_root as $type => $dirroot)
- {
- // Default core/modules dir
- if ($type === 'main') {
- $modulesdir[$dirroot.'/core/modules'.$subdir.'/'] = $dirroot.'/core/modules'.$subdir.'/';
- }
+ foreach ($conf->file->dol_document_root as $type => $dirroot)
+ {
+ // Default core/modules dir
+ if ($type === 'main') {
+ $modulesdir[$dirroot.'/core/modules'.$subdir.'/'] = $dirroot.'/core/modules'.$subdir.'/';
+ }
- // Scan dir from external modules
- $handle = @opendir($dirroot);
- if (is_resource($handle))
- {
- while (($file = readdir($handle)) !== false)
- {
- if (preg_match('/disabled/', $file)) continue; // We discard module if it contains disabled into name.
+ // Scan dir from external modules
+ $handle = @opendir($dirroot);
+ if (is_resource($handle))
+ {
+ while (($file = readdir($handle)) !== false)
+ {
+ if (preg_match('/disabled/', $file)) continue; // We discard module if it contains disabled into name.
- if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
- {
- if (is_dir($dirroot.'/'.$file.'/core/modules'.$subdir.'/'))
- {
- $modulesdir[$dirroot.'/'.$file.'/core/modules'.$subdir.'/'] = $dirroot.'/'.$file.'/core/modules'.$subdir.'/';
- }
- }
- }
- closedir($handle);
- }
- }
- return $modulesdir;
+ if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
+ {
+ if (is_dir($dirroot.'/'.$file.'/core/modules'.$subdir.'/'))
+ {
+ $modulesdir[$dirroot.'/'.$file.'/core/modules'.$subdir.'/'] = $dirroot.'/'.$file.'/core/modules'.$subdir.'/';
+ }
+ }
+ }
+ closedir($handle);
+ }
+ }
+ return $modulesdir;
}
@@ -121,16 +121,16 @@ function dolGetModulesDirs($subdir = '')
*/
function dol_getDefaultFormat(Translate $outputlangs = null)
{
- global $langs;
+ global $langs;
- $selected = 'EUA4';
- if (!$outputlangs) {
- $outputlangs = $langs;
- }
+ $selected = 'EUA4';
+ if (!$outputlangs) {
+ $outputlangs = $langs;
+ }
- if ($outputlangs->defaultlang == 'ca_CA') $selected = 'CAP4'; // Canada
- if ($outputlangs->defaultlang == 'en_US') $selected = 'USLetter'; // US
- return $selected;
+ if ($outputlangs->defaultlang == 'ca_CA') $selected = 'CAP4'; // Canada
+ if ($outputlangs->defaultlang == 'en_US') $selected = 'USLetter'; // US
+ return $selected;
}
/**
@@ -143,42 +143,42 @@ function dol_getDefaultFormat(Translate $outputlangs = null)
*/
function dol_print_file($langs, $filename, $searchalt = 0)
{
- global $conf;
+ global $conf;
- // Test if file is in lang directory
- foreach ($langs->dir as $searchdir)
- {
- $formfile = ($searchdir."/langs/".$langs->defaultlang."/".$filename);
- dol_syslog('functions2::dol_print_file search file '.$formfile, LOG_DEBUG);
- if (is_readable($formfile))
- {
- $content = file_get_contents($formfile);
- $isutf8 = utf8_check($content);
- if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
- elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
- else print $content;
- return true;
- } else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+ // Test if file is in lang directory
+ foreach ($langs->dir as $searchdir)
+ {
+ $formfile = ($searchdir."/langs/".$langs->defaultlang."/".$filename);
+ dol_syslog('functions2::dol_print_file search file '.$formfile, LOG_DEBUG);
+ if (is_readable($formfile))
+ {
+ $content = file_get_contents($formfile);
+ $isutf8 = utf8_check($content);
+ if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
+ elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
+ else print $content;
+ return true;
+ } else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
- if ($searchalt) {
- // Test si fichier dans repertoire de la langue alternative
- if ($langs->defaultlang != "en_US") $formfilealt = $searchdir."/langs/en_US/".$filename;
- else $formfilealt = $searchdir."/langs/fr_FR/".$filename;
- dol_syslog('functions2::dol_print_file search alt file '.$formfilealt, LOG_DEBUG);
- //print 'getcwd='.getcwd().' htmlfilealt='.$formfilealt.' X '.file_exists(getcwd().'/'.$formfilealt);
- if (is_readable($formfilealt))
- {
- $content = file_get_contents($formfilealt);
- $isutf8 = utf8_check($content);
- if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
- elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
- else print $content;
- return true;
- } else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
- }
- }
+ if ($searchalt) {
+ // Test si fichier dans repertoire de la langue alternative
+ if ($langs->defaultlang != "en_US") $formfilealt = $searchdir."/langs/en_US/".$filename;
+ else $formfilealt = $searchdir."/langs/fr_FR/".$filename;
+ dol_syslog('functions2::dol_print_file search alt file '.$formfilealt, LOG_DEBUG);
+ //print 'getcwd='.getcwd().' htmlfilealt='.$formfilealt.' X '.file_exists(getcwd().'/'.$formfilealt);
+ if (is_readable($formfilealt))
+ {
+ $content = file_get_contents($formfilealt);
+ $isutf8 = utf8_check($content);
+ if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
+ elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
+ else print $content;
+ return true;
+ } else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+ }
+ }
- return false;
+ return false;
}
/**
@@ -191,279 +191,279 @@ function dol_print_file($langs, $filename, $searchalt = 0)
*/
function dol_print_object_info($object, $usetable = 0)
{
- global $langs, $db;
+ global $langs, $db;
- // Load translation files required by the page
- $langs->loadLangs(array('other', 'admin'));
+ // Load translation files required by the page
+ $langs->loadLangs(array('other', 'admin'));
- include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
- $deltadateforserver = getServerTimeZoneInt('now');
- $deltadateforclient = ((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
- //$deltadateforcompany=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
- $deltadateforuser = round($deltadateforclient - $deltadateforserver);
- //print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;
+ $deltadateforserver = getServerTimeZoneInt('now');
+ $deltadateforclient = ((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
+ //$deltadateforcompany=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
+ $deltadateforuser = round($deltadateforclient - $deltadateforserver);
+ //print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;
- if ($usetable) print '| '; - print $langs->trans("ImportedWithSet"); - if ($usetable) print ' | '; - else print ': '; - print $object->import_key; - if ($usetable) print ' |
| '; + print $langs->trans("ImportedWithSet"); + if ($usetable) print ' | '; + else print ': '; + print $object->import_key; + if ($usetable) print ' |
| '; - print $langs->trans("CreatedBy"); - if ($usetable) print ' | '; - else print ': '; - if (is_object($object->user_creation)) - { - if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0); - else print $langs->trans("Unknown"); - } else { - $userstatic = new User($db); - $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation); - if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0); - else print $langs->trans("Unknown"); - } - if ($usetable) print ' |
| '; - print $langs->trans("DateCreation"); - if ($usetable) print ' | '; - else print ': '; - print dol_print_date($object->date_creation, 'dayhour'); - if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_creation + ($deltadateforuser * 3600), "dayhour").' '.$langs->trans("ClientHour"); - if ($usetable) print ' |
| '; - print $langs->trans("ModifiedBy"); - if ($usetable) print ' | '; - else print ': '; - if (is_object($object->user_modification)) - { - if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0); - else print $langs->trans("Unknown"); - } else { - $userstatic = new User($db); - $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification); - if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0); - else print $langs->trans("Unknown"); - } - if ($usetable) print ' |
| '; - print $langs->trans("DateLastModification"); - if ($usetable) print ' | '; - else print ': '; - print dol_print_date($object->date_modification, 'dayhour'); - if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_modification + ($deltadateforuser * 3600), "dayhour").' '.$langs->trans("ClientHour"); - if ($usetable) print ' |
| '; - print $langs->trans("ValidatedBy"); - if ($usetable) print ' | '; - else print ': '; - if (is_object($object->user_validation)) - { - if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0); - else print $langs->trans("Unknown"); - } else { - $userstatic = new User($db); - $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation); + // User creation (old method using already loaded object and not id is kept for backward compatibility) + if (!empty($object->user_creation) || !empty($object->user_creation_id)) + { + if ($usetable) print ' |
| '; + print $langs->trans("CreatedBy"); + if ($usetable) print ' | '; + else print ': '; + if (is_object($object->user_creation)) + { + if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0); + else print $langs->trans("Unknown"); + } else { + $userstatic = new User($db); + $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation); if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0); - else print $langs->trans("Unknown"); - } - if ($usetable) print ' |
| '; - print $langs->trans("DateValidation"); - if ($usetable) print ' | '; - else print ': '; - print dol_print_date($object->date_validation, 'dayhour'); - if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_validation + ($deltadateforuser * 3600), "dayhour").' '.$langs->trans("ClientHour"); - if ($usetable) print ' |
| '; + print $langs->trans("DateCreation"); + if ($usetable) print ' | '; + else print ': '; + print dol_print_date($object->date_creation, 'dayhour'); + if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_creation + ($deltadateforuser * 3600), "dayhour").' '.$langs->trans("ClientHour"); + if ($usetable) print ' |
| '; - print $langs->trans("ApprovedBy"); - if ($usetable) print ' | '; - else print ': '; - if (is_object($object->user_approve)) - { - if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0); - else print $langs->trans("Unknown"); - } else { - $userstatic = new User($db); - $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve); + // User change (old method using already loaded object and not id is kept for backward compatibility) + if (!empty($object->user_modification) || !empty($object->user_modification_id)) + { + if ($usetable) print ' |
| '; + print $langs->trans("ModifiedBy"); + if ($usetable) print ' | '; + else print ': '; + if (is_object($object->user_modification)) + { + if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0); + else print $langs->trans("Unknown"); + } else { + $userstatic = new User($db); + $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification); if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0); - else print $langs->trans("Unknown"); - } - if ($usetable) print ' |
| '; - print $langs->trans("DateApprove"); - if ($usetable) print ' | '; - else print ': '; - print dol_print_date($object->date_approve, 'dayhour'); - if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_approve + ($deltadateforuser * 3600), "dayhour").' '.$langs->trans("ClientHour"); - if ($usetable) print ' |
| '; + print $langs->trans("DateLastModification"); + if ($usetable) print ' | '; + else print ': '; + print dol_print_date($object->date_modification, 'dayhour'); + if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_modification + ($deltadateforuser * 3600), "dayhour").' '.$langs->trans("ClientHour"); + if ($usetable) print ' |
| '; - print $langs->trans("ApprovedBy"); - if ($usetable) print ' | '; - else print ': '; - $userstatic = new User($db); - $userstatic->fetch($object->user_approve_id2); - if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0); - else print $langs->trans("Unknown"); - if ($usetable) print ' |
| '; + print $langs->trans("ValidatedBy"); + if ($usetable) print ' | '; + else print ': '; + if (is_object($object->user_validation)) + { + if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0); + else print $langs->trans("Unknown"); + } else { + $userstatic = new User($db); + $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation); + if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0); + else print $langs->trans("Unknown"); + } + if ($usetable) print ' |
| '; - print $langs->trans("DateApprove2"); - if ($usetable) print ' | '; - else print ': '; - print dol_print_date($object->date_approve2, 'dayhour'); - if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_approve2 + ($deltadateforuser * 3600), "dayhour").' '.$langs->trans("ClientHour"); - if ($usetable) print ' |
| '; + print $langs->trans("DateValidation"); + if ($usetable) print ' | '; + else print ': '; + print dol_print_date($object->date_validation, 'dayhour'); + if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_validation + ($deltadateforuser * 3600), "dayhour").' '.$langs->trans("ClientHour"); + if ($usetable) print ' |
| '; - print $langs->trans("ClosedBy"); - if ($usetable) print ' | '; - else print ': '; - if (is_object($object->user_cloture)) - { + // User approve (old method using already loaded object and not id is kept for backward compatibility) + if (!empty($object->user_approve) || !empty($object->user_approve_id)) + { + if ($usetable) print ' |
| '; + print $langs->trans("ApprovedBy"); + if ($usetable) print ' | '; + else print ': '; + if (is_object($object->user_approve)) + { + if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0); + else print $langs->trans("Unknown"); + } else { + $userstatic = new User($db); + $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve); + if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0); + else print $langs->trans("Unknown"); + } + if ($usetable) print ' |
| '; + print $langs->trans("DateApprove"); + if ($usetable) print ' | '; + else print ': '; + print dol_print_date($object->date_approve, 'dayhour'); + if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_approve + ($deltadateforuser * 3600), "dayhour").' '.$langs->trans("ClientHour"); + if ($usetable) print ' |
| '; + print $langs->trans("ApprovedBy"); + if ($usetable) print ' | '; + else print ': '; + $userstatic = new User($db); + $userstatic->fetch($object->user_approve_id2); + if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0); + else print $langs->trans("Unknown"); + if ($usetable) print ' |
| '; + print $langs->trans("DateApprove2"); + if ($usetable) print ' | '; + else print ': '; + print dol_print_date($object->date_approve2, 'dayhour'); + if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_approve2 + ($deltadateforuser * 3600), "dayhour").' '.$langs->trans("ClientHour"); + if ($usetable) print ' |
| '; + print $langs->trans("ClosedBy"); + if ($usetable) print ' | '; + else print ': '; + if (is_object($object->user_cloture)) + { if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0); - else print $langs->trans("Unknown"); - } else { - $userstatic = new User($db); - $userstatic->fetch($object->user_cloture); + else print $langs->trans("Unknown"); + } else { + $userstatic = new User($db); + $userstatic->fetch($object->user_cloture); if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0); - else print $langs->trans("Unknown"); - } - if ($usetable) print ' |
| '; - print $langs->trans("DateClosing"); - if ($usetable) print ' | '; - else print ': '; - print dol_print_date($object->date_cloture, 'dayhour'); - if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_cloture + ($deltadateforuser * 3600), "dayhour").' '.$langs->trans("ClientHour"); - if ($usetable) print ' |
| '; + print $langs->trans("DateClosing"); + if ($usetable) print ' | '; + else print ': '; + print dol_print_date($object->date_cloture, 'dayhour'); + if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_cloture + ($deltadateforuser * 3600), "dayhour").' '.$langs->trans("ClientHour"); + if ($usetable) print ' |
| '; - print $langs->trans("ConciliatedBy"); - if ($usetable) print ' | '; - else print ': '; - if (is_object($object->user_rappro)) - { + // User conciliate + if (!empty($object->user_rappro)) + { + if ($usetable) print ' |
| '; + print $langs->trans("ConciliatedBy"); + if ($usetable) print ' | '; + else print ': '; + if (is_object($object->user_rappro)) + { if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0); - else print $langs->trans("Unknown"); - } else { - $userstatic = new User($db); - $userstatic->fetch($object->user_rappro); + else print $langs->trans("Unknown"); + } else { + $userstatic = new User($db); + $userstatic->fetch($object->user_rappro); if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0); - else print $langs->trans("Unknown"); - } - if ($usetable) print ' |
| '; - print $langs->trans("DateConciliating"); - if ($usetable) print ' | '; - else print ': '; - print dol_print_date($object->date_rappro, 'dayhour'); - if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_rappro + ($deltadateforuser * 3600), "dayhour").' '.$langs->trans("ClientHour"); - if ($usetable) print ' |
| '; + print $langs->trans("DateConciliating"); + if ($usetable) print ' | '; + else print ': '; + print dol_print_date($object->date_rappro, 'dayhour'); + if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_rappro + ($deltadateforuser * 3600), "dayhour").' '.$langs->trans("ClientHour"); + if ($usetable) print ' |
| '; - print $langs->trans("DateLastSend"); - if ($usetable) print ' | '; - else print ': '; - print dol_print_date($object->date_envoi, 'dayhour'); - if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_envoi + ($deltadateforuser * 3600), "dayhour").' '.$langs->trans("ClientHour"); - if ($usetable) print ' |
| '; + print $langs->trans("DateLastSend"); + if ($usetable) print ' | '; + else print ': '; + print dol_print_date($object->date_envoi, 'dayhour'); + if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' / '.dol_print_date($object->date_envoi + ($deltadateforuser * 3600), "dayhour").' '.$langs->trans("ClientHour"); + if ($usetable) print ' |
| '.$key.' | '; - $text .= ''.$item.' | '; - $text .= '
| '.$key.' | '; + $text .= ''.$item.' | '; + $text .= '
"; - //var_dump($reg); + } + $maskwithonlyymcode = $mask; + $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $maskcounter, $maskwithonlyymcode); + $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode); + $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode); + $maskwithonlyymcode = preg_replace('/\{(t+)\}/i', $masktype_value, $maskwithonlyymcode); + $maskwithonlyymcode = preg_replace('/\{(u+)\}/i', $maskuser_value, $maskwithonlyymcode); + foreach ($maskperso as $key => $val) + { + $maskwithonlyymcode = preg_replace('/'.preg_quote($val, '/').'/i', $maskpersonew[$key], $maskwithonlyymcode); + } + $maskwithnocode = $maskwithonlyymcode; + $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode); + $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode); + $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode); + $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode); + // Now maskwithnocode = 0000ddmmyyyyccc for example + // and maskcounter = 0000 for example + //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n
"; + //var_dump($reg); - // If an offset is asked - if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]); - if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]); + // If an offset is asked + if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]); + if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]); - // Define $sqlwhere - $sqlwhere = ''; - $yearoffset = 0; // Use year of current $date by default - $yearoffsettype = false; // false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x + // Define $sqlwhere + $sqlwhere = ''; + $yearoffset = 0; // Use year of current $date by default + $yearoffsettype = false; // false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x - // If a restore to zero after a month is asked we check if there is already a value for this year. - if (!empty($reg[2]) && preg_match('/^@/', $reg[2])) $yearoffsettype = preg_replace('/^@/', '', $reg[2]); - if (!empty($reg[3]) && preg_match('/^@/', $reg[3])) $yearoffsettype = preg_replace('/^@/', '', $reg[3]); + // If a restore to zero after a month is asked we check if there is already a value for this year. + if (!empty($reg[2]) && preg_match('/^@/', $reg[2])) $yearoffsettype = preg_replace('/^@/', '', $reg[2]); + if (!empty($reg[3]) && preg_match('/^@/', $reg[3])) $yearoffsettype = preg_replace('/^@/', '', $reg[3]); - //print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype; - if (is_numeric($yearoffsettype) && $yearoffsettype >= 1) - $maskraz = $yearoffsettype; // For backward compatibility - elseif ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1)) - $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START; - //print "maskraz=".$maskraz; // -1=no reset + //print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype; + if (is_numeric($yearoffsettype) && $yearoffsettype >= 1) + $maskraz = $yearoffsettype; // For backward compatibility + elseif ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1)) + $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START; + //print "maskraz=".$maskraz; // -1=no reset - if ($maskraz > 0) { // A reset is required - if ($maskraz == 99) { - $maskraz = date('m', $date); - $resetEveryMonth = true; - } - if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth'; + if ($maskraz > 0) { // A reset is required + if ($maskraz == 99) { + $maskraz = date('m', $date); + $resetEveryMonth = true; + } + if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth'; - // Define posy, posm and reg - if ($maskraz > 1) // if reset is not first month, we need month and year into mask - { - if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; } elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; } else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask'; + // Define posy, posm and reg + if ($maskraz > 1) // if reset is not first month, we need month and year into mask + { + if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; } elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; } else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask'; - if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit'; - } else // if reset is for a specific month in year, we need year - { - if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; } elseif (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; } elseif (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 0; } else return 'ErrorCantUseRazIfNoYearInMask'; - } - // Define length - $yearlen = $posy ?dol_strlen($reg[$posy]) : 0; - $monthlen = $posm ?dol_strlen($reg[$posm]) : 0; - // Define pos - $yearpos = (dol_strlen($reg[1]) + 1); - $monthpos = ($yearpos + $yearlen); - if ($posy == 3 && $posm == 2) { // if month is before year - $monthpos = (dol_strlen($reg[1]) + 1); - $yearpos = ($monthpos + $monthlen); - } - //print "xxx ".$maskwithonlyymcode." maskraz=".$maskraz." posy=".$posy." yearlen=".$yearlen." yearpos=".$yearpos." posm=".$posm." monthlen=".$monthlen." monthpos=".$monthpos." yearoffsettype=".$yearoffsettype." resetEveryMonth=".$resetEveryMonth."\n"; + if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit'; + } else // if reset is for a specific month in year, we need year + { + if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; } elseif (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; } elseif (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 0; } else return 'ErrorCantUseRazIfNoYearInMask'; + } + // Define length + $yearlen = $posy ?dol_strlen($reg[$posy]) : 0; + $monthlen = $posm ?dol_strlen($reg[$posm]) : 0; + // Define pos + $yearpos = (dol_strlen($reg[1]) + 1); + $monthpos = ($yearpos + $yearlen); + if ($posy == 3 && $posm == 2) { // if month is before year + $monthpos = (dol_strlen($reg[1]) + 1); + $yearpos = ($monthpos + $monthlen); + } + //print "xxx ".$maskwithonlyymcode." maskraz=".$maskraz." posy=".$posy." yearlen=".$yearlen." yearpos=".$yearpos." posm=".$posm." monthlen=".$monthlen." monthpos=".$monthpos." yearoffsettype=".$yearoffsettype." resetEveryMonth=".$resetEveryMonth."\n"; - // Define $yearcomp and $monthcomp (that will be use in the select where to search max number) - $monthcomp = $maskraz; - $yearcomp = 0; + // Define $yearcomp and $monthcomp (that will be use in the select where to search max number) + $monthcomp = $maskraz; + $yearcomp = 0; - if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=') // $yearoffsettype is - or + - { - $currentyear = date("Y", $date); - $fiscaldate = dol_mktime('0', '0', '0', $maskraz, '1', $currentyear); - $newyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear); - $nextnewyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear + 1); - //echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'
'; + if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=') // $yearoffsettype is - or + + { + $currentyear = date("Y", $date); + $fiscaldate = dol_mktime('0', '0', '0', $maskraz, '1', $currentyear); + $newyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear); + $nextnewyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear + 1); + //echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'
'; - // If after or equal of current fiscal date - if ($date >= $fiscaldate) - { - // If before of next new year date - if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset = 1; - } // If after or equal of current new year date - elseif ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset = -1; - } // For backward compatibility - elseif (date("m", $date) < $maskraz && empty($resetEveryMonth)) { $yearoffset = -1; } // If current month lower that month of return to zero, year is previous year + // If after or equal of current fiscal date + if ($date >= $fiscaldate) + { + // If before of next new year date + if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset = 1; + } // If after or equal of current new year date + elseif ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset = -1; + } // For backward compatibility + elseif (date("m", $date) < $maskraz && empty($resetEveryMonth)) { $yearoffset = -1; } // If current month lower that month of return to zero, year is previous year - if ($yearlen == 4) $yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset); - elseif ($yearlen == 2) $yearcomp = sprintf("%02d", date("y", $date) + $yearoffset); - elseif ($yearlen == 1) $yearcomp = substr(date("y", $date), 2, 1) + $yearoffset; - if ($monthcomp > 1 && empty($resetEveryMonth)) // Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0) - { - if ($yearlen == 4) $yearcomp1 = sprintf("%04d", date("Y", $date) + $yearoffset + 1); - elseif ($yearlen == 2) $yearcomp1 = sprintf("%02d", date("y", $date) + $yearoffset + 1); + if ($yearlen == 4) $yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset); + elseif ($yearlen == 2) $yearcomp = sprintf("%02d", date("y", $date) + $yearoffset); + elseif ($yearlen == 1) $yearcomp = substr(date("y", $date), 2, 1) + $yearoffset; + if ($monthcomp > 1 && empty($resetEveryMonth)) // Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0) + { + if ($yearlen == 4) $yearcomp1 = sprintf("%04d", date("Y", $date) + $yearoffset + 1); + elseif ($yearlen == 2) $yearcomp1 = sprintf("%02d", date("y", $date) + $yearoffset + 1); - $sqlwhere .= "("; - $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'"; - $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") >= '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')"; - $sqlwhere .= " OR"; - $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'"; - $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') "; - $sqlwhere .= ')'; - } elseif ($resetEveryMonth) + $sqlwhere .= "("; + $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'"; + $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") >= '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')"; + $sqlwhere .= " OR"; + $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'"; + $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') "; + $sqlwhere .= ')'; + } elseif ($resetEveryMonth) { $sqlwhere .= "(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'"; - $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')"; + $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')"; } else // reset is done on january - { - $sqlwhere .= '(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')"; - } - } - //print "sqlwhere=".$sqlwhere." yearcomp=".$yearcomp."
\n"; // sqlwhere and yearcomp defined only if we ask a reset - //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."
\n"; + { + $sqlwhere .= '(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')"; + } + } + //print "sqlwhere=".$sqlwhere." yearcomp=".$yearcomp."
\n"; // sqlwhere and yearcomp defined only if we ask a reset + //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."
\n"; - // Define $sqlstring - if (function_exists('mb_strrpos')) - { - $posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8'); + // Define $sqlstring + if (function_exists('mb_strrpos')) + { + $posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8'); } else { - $posnumstart = strrpos($maskwithnocode, $maskcounter); + $posnumstart = strrpos($maskwithnocode, $maskcounter); } // Pos of counter in final string (from 0 to ...) - if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence'; - $sqlstring = 'SUBSTRING('.$field.', '.($posnumstart + 1).', '.dol_strlen($maskcounter).')'; + if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence'; + $sqlstring = 'SUBSTRING('.$field.', '.($posnumstart + 1).', '.dol_strlen($maskcounter).')'; - // Define $maskLike - $maskLike = dol_string_nospecial($mask); - $maskLike = str_replace("%", "_", $maskLike); + // Define $maskLike + $maskLike = dol_string_nospecial($mask); + $maskLike = str_replace("%", "_", $maskLike); - // Replace protected special codes with matching number of _ as wild card caracter - $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike); - $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike); - $maskLike = preg_replace('/\{y\}/i', '_', $maskLike); - $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike); - $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike); - $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskLike); - if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike); - if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike); - if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike); - foreach ($maskperso as $key => $val) - { - $maskLike = str_replace(dol_string_nospecial($maskperso[$key]), $maskpersonew[$key], $maskLike); - } + // Replace protected special codes with matching number of _ as wild card caracter + $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike); + $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike); + $maskLike = preg_replace('/\{y\}/i', '_', $maskLike); + $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike); + $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike); + $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskLike); + if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike); + if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike); + if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike); + foreach ($maskperso as $key => $val) + { + $maskLike = str_replace(dol_string_nospecial($maskperso[$key]), $maskpersonew[$key], $maskLike); + } - // Get counter in database - $counter = 0; - $sql = "SELECT MAX(".$sqlstring.") as val"; - $sql .= " FROM ".MAIN_DB_PREFIX.$table; - $sql .= " WHERE ".$field." LIKE '".$maskLike."'"; + // Get counter in database + $counter = 0; + $sql = "SELECT MAX(".$sqlstring.") as val"; + $sql .= " FROM ".MAIN_DB_PREFIX.$table; + $sql .= " WHERE ".$field." LIKE '".$maskLike."'"; $sql .= " AND ".$field." NOT LIKE '(PROV%)'"; - if ($bentityon) // only if entity enable - $sql .= " AND entity IN (".getEntity($sharetable).")"; - elseif (!empty($forceentity)) - $sql .= " AND entity IN (".$forceentity.")"; - if ($where) $sql .= $where; - if ($sqlwhere) $sql .= ' AND '.$sqlwhere; + if ($bentityon) // only if entity enable + $sql .= " AND entity IN (".getEntity($sharetable).")"; + elseif (!empty($forceentity)) + $sql .= " AND entity IN (".$forceentity.")"; + if ($where) $sql .= $where; + if ($sqlwhere) $sql .= ' AND '.$sqlwhere; - //print $sql.'
'; - dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG); - $resql = $db->query($sql); - if ($resql) - { - $obj = $db->fetch_object($resql); - $counter = $obj->val; - } else dol_print_error($db); + //print $sql.'
'; + dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG); + $resql = $db->query($sql); + if ($resql) + { + $obj = $db->fetch_object($resql); + $counter = $obj->val; + } else dol_print_error($db); - // Check if we must force counter to maskoffset - if (empty($counter)) $counter = $maskoffset; - elseif (preg_match('/[^0-9]/i', $counter)) - { - $counter = 0; - dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR); - } elseif ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter = $maskoffset; + // Check if we must force counter to maskoffset + if (empty($counter)) $counter = $maskoffset; + elseif (preg_match('/[^0-9]/i', $counter)) + { + $counter = 0; + dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR); + } elseif ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter = $maskoffset; - if ($mode == 'last') // We found value for counter = last counter value. Now need to get corresponding ref of invoice. - { - $counterpadded = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT); + if ($mode == 'last') // We found value for counter = last counter value. Now need to get corresponding ref of invoice. + { + $counterpadded = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT); - // Define $maskLike - $maskLike = dol_string_nospecial($mask); - $maskLike = str_replace("%", "_", $maskLike); - // Replace protected special codes with matching number of _ as wild card caracter - $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike); - $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike); - $maskLike = preg_replace('/\{y\}/i', '_', $maskLike); - $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike); - $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike); - $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), $counterpadded, $maskLike); - if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike); - if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike); - if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike); + // Define $maskLike + $maskLike = dol_string_nospecial($mask); + $maskLike = str_replace("%", "_", $maskLike); + // Replace protected special codes with matching number of _ as wild card caracter + $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike); + $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike); + $maskLike = preg_replace('/\{y\}/i', '_', $maskLike); + $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike); + $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike); + $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), $counterpadded, $maskLike); + if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike); + if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike); + if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike); - $ref = ''; - $sql = "SELECT ".$field." as ref"; - $sql .= " FROM ".MAIN_DB_PREFIX.$table; - $sql .= " WHERE ".$field." LIKE '".$maskLike."'"; - $sql .= " AND ".$field." NOT LIKE '%PROV%'"; - if ($bentityon) // only if entity enable - $sql .= " AND entity IN (".getEntity($sharetable).")"; - elseif (!empty($forceentity)) - $sql .= " AND entity IN (".$forceentity.")"; - if ($where) $sql .= $where; - if ($sqlwhere) $sql .= ' AND '.$sqlwhere; + $ref = ''; + $sql = "SELECT ".$field." as ref"; + $sql .= " FROM ".MAIN_DB_PREFIX.$table; + $sql .= " WHERE ".$field." LIKE '".$maskLike."'"; + $sql .= " AND ".$field." NOT LIKE '%PROV%'"; + if ($bentityon) // only if entity enable + $sql .= " AND entity IN (".getEntity($sharetable).")"; + elseif (!empty($forceentity)) + $sql .= " AND entity IN (".$forceentity.")"; + if ($where) $sql .= $where; + if ($sqlwhere) $sql .= ' AND '.$sqlwhere; - dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG); - $resql = $db->query($sql); - if ($resql) - { - $obj = $db->fetch_object($resql); - if ($obj) $ref = $obj->ref; - } else dol_print_error($db); + dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG); + $resql = $db->query($sql); + if ($resql) + { + $obj = $db->fetch_object($resql); + if ($obj) $ref = $obj->ref; + } else dol_print_error($db); - $numFinal = $ref; - } elseif ($mode == 'next') - { - $counter++; + $numFinal = $ref; + } elseif ($mode == 'next') + { + $counter++; - // If value for $counter has a length higher than $maskcounter chars - if ($counter >= pow(10, dol_strlen($maskcounter))) - { - $counter = 'ErrorMaxNumberReachForThisMask'; - } + // If value for $counter has a length higher than $maskcounter chars + if ($counter >= pow(10, dol_strlen($maskcounter))) + { + $counter = 'ErrorMaxNumberReachForThisMask'; + } - if (!empty($maskrefclient_maskcounter)) - { - //print "maskrefclient_maskcounter=".$maskrefclient_maskcounter." maskwithnocode=".$maskwithnocode." maskrefclient=".$maskrefclient."\n
"; + if (!empty($maskrefclient_maskcounter)) + { + //print "maskrefclient_maskcounter=".$maskrefclient_maskcounter." maskwithnocode=".$maskwithnocode." maskrefclient=".$maskrefclient."\n
"; - // Define $sqlstring - $maskrefclient_posnumstart = strpos($maskwithnocode, $maskrefclient_maskcounter, strpos($maskwithnocode, $maskrefclient)); // Pos of counter in final string (from 0 to ...) - if ($maskrefclient_posnumstart <= 0) return 'ErrorBadMask'; - $maskrefclient_sqlstring = 'SUBSTRING('.$field.', '.($maskrefclient_posnumstart + 1).', '.dol_strlen($maskrefclient_maskcounter).')'; - //print "x".$sqlstring; + // Define $sqlstring + $maskrefclient_posnumstart = strpos($maskwithnocode, $maskrefclient_maskcounter, strpos($maskwithnocode, $maskrefclient)); // Pos of counter in final string (from 0 to ...) + if ($maskrefclient_posnumstart <= 0) return 'ErrorBadMask'; + $maskrefclient_sqlstring = 'SUBSTRING('.$field.', '.($maskrefclient_posnumstart + 1).', '.dol_strlen($maskrefclient_maskcounter).')'; + //print "x".$sqlstring; - // Define $maskrefclient_maskLike - $maskrefclient_maskLike = dol_string_nospecial($mask); - $maskrefclient_maskLike = str_replace("%", "_", $maskrefclient_maskLike); - // Replace protected special codes with matching number of _ as wild card caracter - $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yyyy}'), '____', $maskrefclient_maskLike); - $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yy}'), '__', $maskrefclient_maskLike); - $maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'), '_', $maskrefclient_maskLike); - $maskrefclient_maskLike = str_replace(dol_string_nospecial('{mm}'), '__', $maskrefclient_maskLike); - $maskrefclient_maskLike = str_replace(dol_string_nospecial('{dd}'), '__', $maskrefclient_maskLike); - $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskrefclient_maskLike); - $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), $maskrefclient_clientcode.str_pad("", dol_strlen($maskrefclient_maskcounter), "_"), $maskrefclient_maskLike); + // Define $maskrefclient_maskLike + $maskrefclient_maskLike = dol_string_nospecial($mask); + $maskrefclient_maskLike = str_replace("%", "_", $maskrefclient_maskLike); + // Replace protected special codes with matching number of _ as wild card caracter + $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yyyy}'), '____', $maskrefclient_maskLike); + $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yy}'), '__', $maskrefclient_maskLike); + $maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'), '_', $maskrefclient_maskLike); + $maskrefclient_maskLike = str_replace(dol_string_nospecial('{mm}'), '__', $maskrefclient_maskLike); + $maskrefclient_maskLike = str_replace(dol_string_nospecial('{dd}'), '__', $maskrefclient_maskLike); + $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskrefclient_maskLike); + $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), $maskrefclient_clientcode.str_pad("", dol_strlen($maskrefclient_maskcounter), "_"), $maskrefclient_maskLike); - // Get counter in database - $maskrefclient_counter = 0; - $maskrefclient_sql = "SELECT MAX(".$maskrefclient_sqlstring.") as val"; - $maskrefclient_sql .= " FROM ".MAIN_DB_PREFIX.$table; - //$sql.= " WHERE ".$field." not like '(%'"; - $maskrefclient_sql .= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'"; - if ($bentityon) // only if entity enable - $maskrefclient_sql .= " AND entity IN (".getEntity($sharetable).")"; - elseif (!empty($forceentity)) - $sql .= " AND entity IN (".$forceentity.")"; - if ($where) $maskrefclient_sql .= $where; //use the same optional where as general mask - if ($sqlwhere) $maskrefclient_sql .= ' AND '.$sqlwhere; //use the same sqlwhere as general mask - $maskrefclient_sql .= ' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode, $maskrefclient) + 1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')"; + // Get counter in database + $maskrefclient_counter = 0; + $maskrefclient_sql = "SELECT MAX(".$maskrefclient_sqlstring.") as val"; + $maskrefclient_sql .= " FROM ".MAIN_DB_PREFIX.$table; + //$sql.= " WHERE ".$field." not like '(%'"; + $maskrefclient_sql .= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'"; + if ($bentityon) // only if entity enable + $maskrefclient_sql .= " AND entity IN (".getEntity($sharetable).")"; + elseif (!empty($forceentity)) + $sql .= " AND entity IN (".$forceentity.")"; + if ($where) $maskrefclient_sql .= $where; //use the same optional where as general mask + if ($sqlwhere) $maskrefclient_sql .= ' AND '.$sqlwhere; //use the same sqlwhere as general mask + $maskrefclient_sql .= ' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode, $maskrefclient) + 1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')"; - dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG); - $maskrefclient_resql = $db->query($maskrefclient_sql); - if ($maskrefclient_resql) - { - $maskrefclient_obj = $db->fetch_object($maskrefclient_resql); - $maskrefclient_counter = $maskrefclient_obj->val; - } else dol_print_error($db); + dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG); + $maskrefclient_resql = $db->query($maskrefclient_sql); + if ($maskrefclient_resql) + { + $maskrefclient_obj = $db->fetch_object($maskrefclient_resql); + $maskrefclient_counter = $maskrefclient_obj->val; + } else dol_print_error($db); - if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i', $maskrefclient_counter)) $maskrefclient_counter = $maskrefclient_maskoffset; + if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i', $maskrefclient_counter)) $maskrefclient_counter = $maskrefclient_maskoffset; $maskrefclient_counter++; - } + } - // Build numFinal - $numFinal = $mask; + // Build numFinal + $numFinal = $mask; - // We replace special codes except refclient + // We replace special codes except refclient if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=') // yearoffsettype is - or +, so we don't want current year { - $numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date) + $yearoffset, $numFinal); - $numFinal = preg_replace('/\{yy\}/i', date("y", $date) + $yearoffset, $numFinal); - $numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1) + $yearoffset, $numFinal); + $numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date) + $yearoffset, $numFinal); + $numFinal = preg_replace('/\{yy\}/i', date("y", $date) + $yearoffset, $numFinal); + $numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1) + $yearoffset, $numFinal); } else // we want yyyy to be current year { - $numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date), $numFinal); - $numFinal = preg_replace('/\{yy\}/i', date("y", $date), $numFinal); - $numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1), $numFinal); + $numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date), $numFinal); + $numFinal = preg_replace('/\{yy\}/i', date("y", $date), $numFinal); + $numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1), $numFinal); } - $numFinal = preg_replace('/\{mm\}/i', date("m", $date), $numFinal); - $numFinal = preg_replace('/\{dd\}/i', date("d", $date), $numFinal); + $numFinal = preg_replace('/\{mm\}/i', date("m", $date), $numFinal); + $numFinal = preg_replace('/\{dd\}/i', date("d", $date), $numFinal); - // Now we replace the counter - $maskbefore = '{'.$masktri.'}'; - $maskafter = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT); - //print 'x'.$maskbefore.'-'.$maskafter.'y'; - $numFinal = str_replace($maskbefore, $maskafter, $numFinal); + // Now we replace the counter + $maskbefore = '{'.$masktri.'}'; + $maskafter = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT); + //print 'x'.$maskbefore.'-'.$maskafter.'y'; + $numFinal = str_replace($maskbefore, $maskafter, $numFinal); - // Now we replace the refclient - if ($maskrefclient) - { - //print "maskrefclient=".$maskrefclient." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode." maskrefclient_clientcode=".$maskrefclient_clientcode."\n
";exit; - $maskrefclient_maskbefore = '{'.$maskrefclient.'}'; - $maskrefclient_maskafter = $maskrefclient_clientcode.str_pad($maskrefclient_counter, dol_strlen($maskrefclient_maskcounter), "0", STR_PAD_LEFT); - $numFinal = str_replace($maskrefclient_maskbefore, $maskrefclient_maskafter, $numFinal); - } + // Now we replace the refclient + if ($maskrefclient) + { + //print "maskrefclient=".$maskrefclient." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode." maskrefclient_clientcode=".$maskrefclient_clientcode."\n
";exit; + $maskrefclient_maskbefore = '{'.$maskrefclient.'}'; + $maskrefclient_maskafter = $maskrefclient_clientcode.str_pad($maskrefclient_counter, dol_strlen($maskrefclient_maskcounter), "0", STR_PAD_LEFT); + $numFinal = str_replace($maskrefclient_maskbefore, $maskrefclient_maskafter, $numFinal); + } - // Now we replace the type - if ($masktype) - { - $masktype_maskbefore = '{'.$masktype.'}'; - $masktype_maskafter = $masktype_value; - $numFinal = str_replace($masktype_maskbefore, $masktype_maskafter, $numFinal); - } + // Now we replace the type + if ($masktype) + { + $masktype_maskbefore = '{'.$masktype.'}'; + $masktype_maskafter = $masktype_value; + $numFinal = str_replace($masktype_maskbefore, $masktype_maskafter, $numFinal); + } - // Now we replace the user - if ($maskuser) - { - $maskuser_maskbefore = '{'.$maskuser.'}'; - $maskuser_maskafter = $maskuser_value; - $numFinal = str_replace($maskuser_maskbefore, $maskuser_maskafter, $numFinal); - } - } + // Now we replace the user + if ($maskuser) + { + $maskuser_maskbefore = '{'.$maskuser.'}'; + $maskuser_maskafter = $maskuser_value; + $numFinal = str_replace($maskuser_maskbefore, $maskuser_maskafter, $numFinal); + } + } - dol_syslog("functions2::get_next_value return ".$numFinal, LOG_DEBUG); - return $numFinal; + dol_syslog("functions2::get_next_value return ".$numFinal, LOG_DEBUG); + return $numFinal; } /** @@ -1156,12 +1156,12 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $ */ function get_string_between($string, $start, $end) { - $string = " ".$string; - $ini = strpos($string, $start); - if ($ini == 0) return ""; - $ini += strlen($start); - $len = strpos($string, $end, $ini) - $ini; - return substr($string, $ini, $len); + $string = " ".$string; + $ini = strpos($string, $start); + if ($ini == 0) return ""; + $ini += strlen($start); + $len = strpos($string, $end, $ini) - $ini; + return substr($string, $ini, $len); } /** @@ -1173,90 +1173,90 @@ function get_string_between($string, $start, $end) */ function check_value($mask, $value) { - $result = 0; + $result = 0; - $hasglobalcounter = false; - // Extract value for mask counter, mask raz and mask offset - if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg)) - { - $masktri = $reg[1].(isset($reg[2]) ? $reg[2] : '').(isset($reg[3]) ? $reg[3] : ''); - $maskcounter = $reg[1]; - $hasglobalcounter = true; - } else { - // setting some defaults so the rest of the code won't fail if there is a third party counter - $masktri = '00000'; - $maskcounter = '00000'; - } + $hasglobalcounter = false; + // Extract value for mask counter, mask raz and mask offset + if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg)) + { + $masktri = $reg[1].(isset($reg[2]) ? $reg[2] : '').(isset($reg[3]) ? $reg[3] : ''); + $maskcounter = $reg[1]; + $hasglobalcounter = true; + } else { + // setting some defaults so the rest of the code won't fail if there is a third party counter + $masktri = '00000'; + $maskcounter = '00000'; + } - $maskraz = -1; - $maskoffset = 0; - if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits'; + $maskraz = -1; + $maskoffset = 0; + if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits'; - // Extract value for third party mask counter - if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef)) - { - $maskrefclient = $regClientRef[1].$regClientRef[2]; - $maskrefclient_maskclientcode = $regClientRef[1]; - $maskrefclient_maskcounter = $regClientRef[2]; - $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset - $maskrefclient_clientcode = substr('', 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code to form maskrefclient_clientcode - $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode - $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like - if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits'; - } else $maskrefclient = ''; + // Extract value for third party mask counter + if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef)) + { + $maskrefclient = $regClientRef[1].$regClientRef[2]; + $maskrefclient_maskclientcode = $regClientRef[1]; + $maskrefclient_maskcounter = $regClientRef[2]; + $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset + $maskrefclient_clientcode = substr('', 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code to form maskrefclient_clientcode + $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode + $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like + if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits'; + } else $maskrefclient = ''; - // fail if there is neither a global nor a third party counter - if (!$hasglobalcounter && ($maskrefclient_maskcounter == '')) - { - return 'ErrorBadMask'; - } + // fail if there is neither a global nor a third party counter + if (!$hasglobalcounter && ($maskrefclient_maskcounter == '')) + { + return 'ErrorBadMask'; + } - $maskwithonlyymcode = $mask; - $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $maskcounter, $maskwithonlyymcode); - $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode); - $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode); - $maskwithnocode = $maskwithonlyymcode; - $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode); - $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode); - $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode); - $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode); - // Now maskwithnocode = 0000ddmmyyyyccc for example - // and maskcounter = 0000 for example - //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n
"; + $maskwithonlyymcode = $mask; + $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $maskcounter, $maskwithonlyymcode); + $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode); + $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode); + $maskwithnocode = $maskwithonlyymcode; + $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode); + $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode); + $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode); + $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode); + // Now maskwithnocode = 0000ddmmyyyyccc for example + // and maskcounter = 0000 for example + //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n
"; - // If an offset is asked - if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]); - if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]); + // If an offset is asked + if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]); + if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]); - // Define $sqlwhere + // Define $sqlwhere - // If a restore to zero after a month is asked we check if there is already a value for this year. - if (!empty($reg[2]) && preg_match('/^@/', $reg[2])) $maskraz = preg_replace('/^@/', '', $reg[2]); - if (!empty($reg[3]) && preg_match('/^@/', $reg[3])) $maskraz = preg_replace('/^@/', '', $reg[3]); - if ($maskraz >= 0) - { - if ($maskraz == 99) { - $maskraz = date('m'); - $resetEveryMonth = true; - } - if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth'; + // If a restore to zero after a month is asked we check if there is already a value for this year. + if (!empty($reg[2]) && preg_match('/^@/', $reg[2])) $maskraz = preg_replace('/^@/', '', $reg[2]); + if (!empty($reg[3]) && preg_match('/^@/', $reg[3])) $maskraz = preg_replace('/^@/', '', $reg[3]); + if ($maskraz >= 0) + { + if ($maskraz == 99) { + $maskraz = date('m'); + $resetEveryMonth = true; + } + if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth'; - // Define reg - if ($maskraz > 1 && !preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask'; - if ($maskraz <= 1 && !preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazIfNoYearInMask'; - //print "x".$maskwithonlyymcode." ".$maskraz; - } - //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."
\n"; + // Define reg + if ($maskraz > 1 && !preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask'; + if ($maskraz <= 1 && !preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazIfNoYearInMask'; + //print "x".$maskwithonlyymcode." ".$maskraz; + } + //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."
\n"; - // Check we have a number in ($posnumstart+1).', '.dol_strlen($maskcounter) - // + // Check we have a number in ($posnumstart+1).', '.dol_strlen($maskcounter) + // - // Check length - $len = dol_strlen($maskwithnocode); - if (dol_strlen($value) != $len) $result = -1; + // Check length + $len = dol_strlen($maskwithnocode); + if (dol_strlen($value) != $len) $result = -1; - // Define $maskLike - /* seems not used + // Define $maskLike + /* seems not used $maskLike = dol_string_nospecial($mask); $maskLike = str_replace("%","_",$maskLike); // Replace protected special codes with matching number of _ as wild card caracter @@ -1269,8 +1269,8 @@ function check_value($mask, $value) if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",strlen($maskrefclient),"_"),$maskLike); */ - dol_syslog("functions2::check_value result=".$result, LOG_DEBUG); - return $result; + dol_syslog("functions2::check_value result=".$result, LOG_DEBUG); + return $result; } /** @@ -1283,12 +1283,12 @@ function check_value($mask, $value) */ function binhex($bin, $pad = false, $upper = false) { - $last = dol_strlen($bin) - 1; - for ($i = 0; $i <= $last; $i++) { $x += $bin[$last - $i] * pow(2, $i); } - $x = dechex($x); - if ($pad) { while (dol_strlen($x) < intval(dol_strlen($bin)) / 4) { $x = "0$x"; } } - if ($upper) { $x = strtoupper($x); } - return $x; + $last = dol_strlen($bin) - 1; + for ($i = 0; $i <= $last; $i++) { $x += $bin[$last - $i] * pow(2, $i); } + $x = dechex($x); + if ($pad) { while (dol_strlen($x) < intval(dol_strlen($bin)) / 4) { $x = "0$x"; } } + if ($upper) { $x = strtoupper($x); } + return $x; } /** @@ -1299,13 +1299,13 @@ function binhex($bin, $pad = false, $upper = false) */ function hexbin($hexa) { - $bin = ''; - $strLength = dol_strlen($hexa); - for ($i = 0; $i < $strLength; $i++) - { - $bin .= str_pad(decbin(hexdec($hexa[$i])), 4, '0', STR_PAD_LEFT); - } - return $bin; + $bin = ''; + $strLength = dol_strlen($hexa); + for ($i = 0; $i < $strLength; $i++) + { + $bin .= str_pad(decbin(hexdec($hexa[$i])), 4, '0', STR_PAD_LEFT); + } + return $bin; } /** @@ -1316,72 +1316,72 @@ function hexbin($hexa) */ function numero_semaine($time) { - $stime = strftime('%Y-%m-%d', $time); + $stime = strftime('%Y-%m-%d', $time); - if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i', $stime, $reg)) - { - // Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS' - $annee = $reg[1]; - $mois = $reg[2]; - $jour = $reg[3]; - } + if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i', $stime, $reg)) + { + // Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS' + $annee = $reg[1]; + $mois = $reg[2]; + $jour = $reg[3]; + } - /* + /* * Norme ISO-8601: * - La semaine 1 de toute annee est celle qui contient le 4 janvier ou que la semaine 1 de toute annee est celle qui contient le 1er jeudi de janvier. * - La majorite des annees ont 52 semaines mais les annees qui commence un jeudi et les annees bissextiles commencant un mercredi en possede 53. * - Le 1er jour de la semaine est le Lundi */ - // Definition du Jeudi de la semaine - if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) // Dimanche - $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - 3 * 24 * 60 * 60; - elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) < 4) // du Lundi au Mercredi - $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60; - elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) // du Vendredi au Samedi - $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60; - else // Jeudi - $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee); + // Definition du Jeudi de la semaine + if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) // Dimanche + $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - 3 * 24 * 60 * 60; + elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) < 4) // du Lundi au Mercredi + $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60; + elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) // du Vendredi au Samedi + $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60; + else // Jeudi + $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee); - // Definition du premier Jeudi de l'annee - if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 0) // Dimanche - { - $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60; - } elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) // du Lundi au Mercredi - { - $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (4 - date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)))) * 24 * 60 * 60; - } elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) // du Vendredi au Samedi - { - $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (7 - (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60; - } else // Jeudi - { - $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)); - } + // Definition du premier Jeudi de l'annee + if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 0) // Dimanche + { + $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60; + } elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) // du Lundi au Mercredi + { + $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (4 - date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)))) * 24 * 60 * 60; + } elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) // du Vendredi au Samedi + { + $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (7 - (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60; + } else // Jeudi + { + $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)); + } - // Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine"; - $numeroSemaine = ( - ( - date("z", mktime(12, 0, 0, date("m", $jeudiSemaine), date("d", $jeudiSemaine), date("Y", $jeudiSemaine))) - - - date("z", mktime(12, 0, 0, date("m", $premierJeudiAnnee), date("d", $premierJeudiAnnee), date("Y", $premierJeudiAnnee))) - ) / 7 - ) + 1; + // Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine"; + $numeroSemaine = ( + ( + date("z", mktime(12, 0, 0, date("m", $jeudiSemaine), date("d", $jeudiSemaine), date("Y", $jeudiSemaine))) + - + date("z", mktime(12, 0, 0, date("m", $premierJeudiAnnee), date("d", $premierJeudiAnnee), date("Y", $premierJeudiAnnee))) + ) / 7 + ) + 1; - // Cas particulier de la semaine 53 - if ($numeroSemaine == 53) - { - // Les annees qui commence un Jeudi et les annees bissextiles commencant un Mercredi en possede 53 - if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 4 || (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 3 && date("z", mktime(12, 0, 0, 12, 31, date("Y", $jeudiSemaine))) == 365)) - { - $numeroSemaine = 53; - } else { - $numeroSemaine = 1; - } - } + // Cas particulier de la semaine 53 + if ($numeroSemaine == 53) + { + // Les annees qui commence un Jeudi et les annees bissextiles commencant un Mercredi en possede 53 + if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 4 || (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 3 && date("z", mktime(12, 0, 0, 12, 31, date("Y", $jeudiSemaine))) == 365)) + { + $numeroSemaine = 53; + } else { + $numeroSemaine = 1; + } + } - //echo $jour."-".$mois."-".$annee." (".date("d-m-Y",$premierJeudiAnnee)." - ".date("d-m-Y",$jeudiSemaine).") -> ".$numeroSemaine."
"; + //echo $jour."-".$mois."-".$annee." (".date("d-m-Y",$premierJeudiAnnee)." - ".date("d-m-Y",$jeudiSemaine).") -> ".$numeroSemaine."
"; - return sprintf("%02d", $numeroSemaine); + return sprintf("%02d", $numeroSemaine); } /** @@ -1394,28 +1394,28 @@ function numero_semaine($time) */ function weight_convert($weight, &$from_unit, $to_unit) { - /* Pour convertire 320 gr en Kg appeler + /* Pour convertire 320 gr en Kg appeler * $f = -3 * weigh_convert(320, $f, 0) retournera 0.32 * */ - while ($from_unit <> $to_unit) - { - if ($from_unit > $to_unit) - { - $weight = $weight * 10; - $from_unit = $from_unit - 1; - $weight = weight_convert($weight, $from_unit, $to_unit); - } - if ($from_unit < $to_unit) - { - $weight = $weight / 10; - $from_unit = $from_unit + 1; - $weight = weight_convert($weight, $from_unit, $to_unit); - } - } + while ($from_unit <> $to_unit) + { + if ($from_unit > $to_unit) + { + $weight = $weight * 10; + $from_unit = $from_unit - 1; + $weight = weight_convert($weight, $from_unit, $to_unit); + } + if ($from_unit < $to_unit) + { + $weight = $weight / 10; + $from_unit = $from_unit + 1; + $weight = weight_convert($weight, $from_unit, $to_unit); + } + } - return $weight; + return $weight; } /** @@ -1431,60 +1431,60 @@ function weight_convert($weight, &$from_unit, $to_unit) */ function dol_set_user_param($db, $conf, &$user, $tab) { - // Verification parametres - if (count($tab) < 1) return -1; + // Verification parametres + if (count($tab) < 1) return -1; - $db->begin(); + $db->begin(); - // We remove old parameters for all keys in $tab - $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param"; - $sql .= " WHERE fk_user = ".$user->id; - $sql .= " AND entity = ".$conf->entity; - $sql .= " AND param in ("; - $i = 0; - foreach ($tab as $key => $value) - { - if ($i > 0) $sql .= ','; - $sql .= "'".$db->escape($key)."'"; - $i++; - } - $sql .= ")"; - dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG); + // We remove old parameters for all keys in $tab + $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param"; + $sql .= " WHERE fk_user = ".$user->id; + $sql .= " AND entity = ".$conf->entity; + $sql .= " AND param in ("; + $i = 0; + foreach ($tab as $key => $value) + { + if ($i > 0) $sql .= ','; + $sql .= "'".$db->escape($key)."'"; + $i++; + } + $sql .= ")"; + dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG); - $resql = $db->query($sql); - if (!$resql) - { - dol_print_error($db); - $db->rollback(); - return -1; - } + $resql = $db->query($sql); + if (!$resql) + { + dol_print_error($db); + $db->rollback(); + return -1; + } - foreach ($tab as $key => $value) - { - // Set new parameters - if ($value) - { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)"; - $sql .= " VALUES (".$user->id.",".$conf->entity.","; - $sql .= " '".$db->escape($key)."','".$db->escape($value)."')"; + foreach ($tab as $key => $value) + { + // Set new parameters + if ($value) + { + $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)"; + $sql .= " VALUES (".$user->id.",".$conf->entity.","; + $sql .= " '".$db->escape($key)."','".$db->escape($value)."')"; - dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG); - $result = $db->query($sql); - if (!$result) - { - dol_print_error($db); - $db->rollback(); - return -1; - } - $user->conf->$key = $value; - //print "key=".$key." user->conf->key=".$user->conf->$key; - } else { - unset($user->conf->$key); - } - } + dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG); + $result = $db->query($sql); + if (!$result) + { + dol_print_error($db); + $db->rollback(); + return -1; + } + $user->conf->$key = $value; + //print "key=".$key." user->conf->key=".$user->conf->$key; + } else { + unset($user->conf->$key); + } + } - $db->commit(); - return 1; + $db->commit(); + return 1; } /** @@ -1496,15 +1496,15 @@ function dol_set_user_param($db, $conf, &$user, $tab) */ function dol_print_reduction($reduction, $langs) { - $string = ''; - if ($reduction == 100) - { - $string = $langs->transnoentities("Offered"); - } else { - $string = vatrate($reduction, true); - } + $string = ''; + if ($reduction == 100) + { + $string = $langs->transnoentities("Offered"); + } else { + $string = vatrate($reduction, true); + } - return $string; + return $string; } /** @@ -1518,7 +1518,7 @@ function version_os($option = '') { if ($option == 'smr') $osversion = php_uname('s').' '.php_uname('m').' '.php_uname('r'); else $osversion = php_uname(); - return $osversion; + return $osversion; } /** @@ -1529,7 +1529,7 @@ function version_os($option = '') */ function version_php() { - return phpversion(); + return phpversion(); } /** @@ -1540,7 +1540,7 @@ function version_php() */ function version_dolibarr() { - return DOL_VERSION; + return DOL_VERSION; } /** @@ -1550,7 +1550,7 @@ function version_dolibarr() */ function version_webserver() { - return $_SERVER["SERVER_SOFTWARE"]; + return $_SERVER["SERVER_SOFTWARE"]; } /** @@ -1563,89 +1563,89 @@ function version_webserver() */ function getListOfModels($db, $type, $maxfilenamelength = 0) { - global $conf, $langs; - $liste = array(); - $found = 0; - $dirtoscan = ''; + global $conf, $langs; + $liste = array(); + $found = 0; + $dirtoscan = ''; - $sql = "SELECT nom as id, nom as doc_template_name, libelle as label, description as description"; - $sql .= " FROM ".MAIN_DB_PREFIX."document_model"; - $sql .= " WHERE type = '".$db->escape($type)."'"; - $sql .= " AND entity IN (0,".$conf->entity.")"; - $sql .= " ORDER BY description DESC"; + $sql = "SELECT nom as id, nom as doc_template_name, libelle as label, description as description"; + $sql .= " FROM ".MAIN_DB_PREFIX."document_model"; + $sql .= " WHERE type = '".$db->escape($type)."'"; + $sql .= " AND entity IN (0,".$conf->entity.")"; + $sql .= " ORDER BY description DESC"; - dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG); - $resql = $db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - $i = 0; - while ($i < $num) - { - $found = 1; + dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG); + $resql = $db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; + while ($i < $num) + { + $found = 1; - $obj = $db->fetch_object($resql); + $obj = $db->fetch_object($resql); - // If this generation module needs to scan a directory, then description field is filled - // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...). - if (!empty($obj->description)) // A list of directories to scan is defined - { - include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + // If this generation module needs to scan a directory, then description field is filled + // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...). + if (!empty($obj->description)) // A list of directories to scan is defined + { + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $const = $obj->description; - //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const)); - $dirtoscan = preg_replace('/[\r\n]+/', ',', trim($conf->global->$const)); + $const = $obj->description; + //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const)); + $dirtoscan = preg_replace('/[\r\n]+/', ',', trim($conf->global->$const)); - $listoffiles = array(); + $listoffiles = array(); - // Now we add models found in directories scanned - $listofdir = explode(',', $dirtoscan); - foreach ($listofdir as $key=>$tmpdir) - { - $tmpdir = trim($tmpdir); - $tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir); - if (!$tmpdir) { unset($listofdir[$key]); continue; } - if (is_dir($tmpdir)) - { - // all type of template is allowed - $tmpfiles = dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0); - if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles); - } - } + // Now we add models found in directories scanned + $listofdir = explode(',', $dirtoscan); + foreach ($listofdir as $key=>$tmpdir) + { + $tmpdir = trim($tmpdir); + $tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir); + if (!$tmpdir) { unset($listofdir[$key]); continue; } + if (is_dir($tmpdir)) + { + // all type of template is allowed + $tmpfiles = dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0); + if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles); + } + } - if (count($listoffiles)) - { - foreach ($listoffiles as $record) - { - $max = ($maxfilenamelength ? $maxfilenamelength : 28); - $liste[$obj->id.':'.$record['fullname']] = dol_trunc($record['name'], $max, 'middle'); - } - } else { - $liste[0] = $obj->label.': '.$langs->trans("None"); - } - } else { - if ($type == 'member' && $obj->doc_template_name == 'standard') // Special case, if member template, we add variant per format - { - global $_Avery_Labels; - include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'; - foreach ($_Avery_Labels as $key => $val) - { - $liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->doc_template_name).' '.$val['name']; - } - } else // Common usage - { - $liste[$obj->id] = $obj->label ? $obj->label : $obj->doc_template_name; - } - } - $i++; - } - } else { - dol_print_error($db); - return -1; - } + if (count($listoffiles)) + { + foreach ($listoffiles as $record) + { + $max = ($maxfilenamelength ? $maxfilenamelength : 28); + $liste[$obj->id.':'.$record['fullname']] = dol_trunc($record['name'], $max, 'middle'); + } + } else { + $liste[0] = $obj->label.': '.$langs->trans("None"); + } + } else { + if ($type == 'member' && $obj->doc_template_name == 'standard') // Special case, if member template, we add variant per format + { + global $_Avery_Labels; + include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php'; + foreach ($_Avery_Labels as $key => $val) + { + $liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->doc_template_name).' '.$val['name']; + } + } else // Common usage + { + $liste[$obj->id] = $obj->label ? $obj->label : $obj->doc_template_name; + } + } + $i++; + } + } else { + dol_print_error($db); + return -1; + } - if ($found) return $liste; - else return 0; + if ($found) return $liste; + else return 0; } /** @@ -1680,11 +1680,11 @@ function is_ip($ip) */ function dol_buildlogin($lastname, $firstname) { - $login = strtolower(dol_string_unaccent($firstname)); - $login .= ($login ? '.' : ''); - $login .= strtolower(dol_string_unaccent($lastname)); - $login = dol_string_nospecial($login, ''); // For special names - return $login; + $login = strtolower(dol_string_unaccent($firstname)); + $login .= ($login ? '.' : ''); + $login .= strtolower(dol_string_unaccent($lastname)); + $login = dol_string_nospecial($login, ''); // For special names + return $login; } /** @@ -1694,40 +1694,40 @@ function dol_buildlogin($lastname, $firstname) */ function getSoapParams() { - global $conf; + global $conf; - $params = array(); - $proxyuse = (empty($conf->global->MAIN_PROXY_USE) ?false:true); - $proxyhost = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_HOST); - $proxyport = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PORT); - $proxyuser = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_USER); - $proxypass = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PASS); - $timeout = (empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT); // Connection timeout - $response_timeout = (empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT); // Response timeout - //print extension_loaded('soap'); - if ($proxyuse) - { - $params = array('connection_timeout'=>$timeout, - 'response_timeout'=>$response_timeout, - 'proxy_use' => 1, - 'proxy_host' => $proxyhost, - 'proxy_port' => $proxyport, - 'proxy_login' => $proxyuser, - 'proxy_password' => $proxypass, - 'trace' => 1 - ); - } else { - $params = array('connection_timeout'=>$timeout, - 'response_timeout'=>$response_timeout, - 'proxy_use' => 0, - 'proxy_host' => false, - 'proxy_port' => false, - 'proxy_login' => false, - 'proxy_password' => false, - 'trace' => 1 - ); - } - return $params; + $params = array(); + $proxyuse = (empty($conf->global->MAIN_PROXY_USE) ?false:true); + $proxyhost = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_HOST); + $proxyport = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PORT); + $proxyuser = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_USER); + $proxypass = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PASS); + $timeout = (empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT); // Connection timeout + $response_timeout = (empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT); // Response timeout + //print extension_loaded('soap'); + if ($proxyuse) + { + $params = array('connection_timeout'=>$timeout, + 'response_timeout'=>$response_timeout, + 'proxy_use' => 1, + 'proxy_host' => $proxyhost, + 'proxy_port' => $proxyport, + 'proxy_login' => $proxyuser, + 'proxy_password' => $proxypass, + 'trace' => 1 + ); + } else { + $params = array('connection_timeout'=>$timeout, + 'response_timeout'=>$response_timeout, + 'proxy_use' => 0, + 'proxy_host' => false, + 'proxy_port' => false, + 'proxy_login' => false, + 'proxy_password' => false, + 'trace' => 1 + ); + } + return $params; } @@ -2027,13 +2027,13 @@ function colorStringToArray($stringcolor, $colorifnotfound = array(88, 88, 88)) */ function colorValidateHex($color, $allow_white = true) { - if (!$allow_white && ($color === '#fff' || $color === '#ffffff')) return false; + if (!$allow_white && ($color === '#fff' || $color === '#ffffff')) return false; - if (preg_match('/^#[a-f0-9]{6}$/i', $color)) //hex color is valid - { - return true; - } - return false; + if (preg_match('/^#[a-f0-9]{6}$/i', $color)) //hex color is valid + { + return true; + } + return false; } /** @@ -2096,26 +2096,26 @@ function colorAgressiveness($hex, $ratio = -50, $brightness = 0) */ function colorAdjustBrightness($hex, $steps) { - // Steps should be between -255 and 255. Negative = darker, positive = lighter - $steps = max(-255, min(255, $steps)); + // Steps should be between -255 and 255. Negative = darker, positive = lighter + $steps = max(-255, min(255, $steps)); - // Normalize into a six character long hex string - $hex = str_replace('#', '', $hex); - if (strlen($hex) == 3) { - $hex = str_repeat(substr($hex, 0, 1), 2).str_repeat(substr($hex, 1, 1), 2).str_repeat(substr($hex, 2, 1), 2); - } + // Normalize into a six character long hex string + $hex = str_replace('#', '', $hex); + if (strlen($hex) == 3) { + $hex = str_repeat(substr($hex, 0, 1), 2).str_repeat(substr($hex, 1, 1), 2).str_repeat(substr($hex, 2, 1), 2); + } - // Split into three parts: R, G and B - $color_parts = str_split($hex, 2); - $return = '#'; + // Split into three parts: R, G and B + $color_parts = str_split($hex, 2); + $return = '#'; - foreach ($color_parts as $color) { - $color = hexdec($color); // Convert to decimal - $color = max(0, min(255, $color + $steps)); // Adjust color - $return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code - } + foreach ($color_parts as $color) { + $color = hexdec($color); // Convert to decimal + $color = max(0, min(255, $color + $steps)); // Adjust color + $return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code + } - return $return; + return $return; } /** @@ -2125,8 +2125,8 @@ function colorAdjustBrightness($hex, $steps) */ function colorDarker($hex, $percent) { - $steps = intval(255 * $percent / 100) * -1; - return colorAdjustBrightness($hex, $steps); + $steps = intval(255 * $percent / 100) * -1; + return colorAdjustBrightness($hex, $steps); } /** @@ -2136,8 +2136,8 @@ function colorDarker($hex, $percent) */ function colorLighten($hex, $percent) { - $steps = intval(255 * $percent / 100); - return colorAdjustBrightness($hex, $steps); + $steps = intval(255 * $percent / 100); + return colorAdjustBrightness($hex, $steps); } @@ -2149,25 +2149,25 @@ function colorLighten($hex, $percent) */ function colorHexToRgb($hex, $alpha = false, $returnArray = false) { - $string = ''; - $hex = str_replace('#', '', $hex); - $length = strlen($hex); - $rgb = array(); - $rgb['r'] = hexdec($length == 6 ? substr($hex, 0, 2) : ($length == 3 ? str_repeat(substr($hex, 0, 1), 2) : 0)); - $rgb['g'] = hexdec($length == 6 ? substr($hex, 2, 2) : ($length == 3 ? str_repeat(substr($hex, 1, 1), 2) : 0)); - $rgb['b'] = hexdec($length == 6 ? substr($hex, 4, 2) : ($length == 3 ? str_repeat(substr($hex, 2, 1), 2) : 0)); - if ($alpha !== false) { - $rgb['a'] = floatval($alpha); - $string = 'rgba('.implode(',', $rgb).')'; - } else { - $string = 'rgb('.implode(',', $rgb).')'; - } + $string = ''; + $hex = str_replace('#', '', $hex); + $length = strlen($hex); + $rgb = array(); + $rgb['r'] = hexdec($length == 6 ? substr($hex, 0, 2) : ($length == 3 ? str_repeat(substr($hex, 0, 1), 2) : 0)); + $rgb['g'] = hexdec($length == 6 ? substr($hex, 2, 2) : ($length == 3 ? str_repeat(substr($hex, 1, 1), 2) : 0)); + $rgb['b'] = hexdec($length == 6 ? substr($hex, 4, 2) : ($length == 3 ? str_repeat(substr($hex, 2, 1), 2) : 0)); + if ($alpha !== false) { + $rgb['a'] = floatval($alpha); + $string = 'rgba('.implode(',', $rgb).')'; + } else { + $string = 'rgb('.implode(',', $rgb).')'; + } - if ($returnArray) { - return $rgb; - } else { - return $string; - } + if ($returnArray) { + return $rgb; + } else { + return $string; + } } @@ -2180,25 +2180,25 @@ function colorHexToRgb($hex, $alpha = false, $returnArray = false) */ function cartesianArray(array $input) { - // filter out empty values - $input = array_filter($input); + // filter out empty values + $input = array_filter($input); - $result = array(array()); + $result = array(array()); - foreach ($input as $key => $values) { - $append = array(); + foreach ($input as $key => $values) { + $append = array(); - foreach ($result as $product) { - foreach ($values as $item) { - $product[$key] = $item; - $append[] = $product; - } - } + foreach ($result as $product) { + foreach ($values as $item) { + $product[$key] = $item; + $append[] = $product; + } + } - $result = $append; - } + $result = $append; + } - return $result; + return $result; } @@ -2210,50 +2210,50 @@ function cartesianArray(array $input) */ function getModuleDirForApiClass($moduleobject) { - $moduledirforclass = $moduleobject; - if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i', '', $moduledirforclass); + $moduledirforclass = $moduleobject; + if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i', '', $moduledirforclass); - if ($moduleobject == 'contracts') { - $moduledirforclass = 'contrat'; - } elseif (in_array($moduleobject, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) { - $moduledirforclass = 'api'; - } elseif ($moduleobject == 'contact' || $moduleobject == 'contacts' || $moduleobject == 'customer' || $moduleobject == 'thirdparty' || $moduleobject == 'thirdparties') { - $moduledirforclass = 'societe'; - } elseif ($moduleobject == 'propale' || $moduleobject == 'proposals') { - $moduledirforclass = 'comm/propal'; - } elseif ($moduleobject == 'agenda' || $moduleobject == 'agendaevents') { - $moduledirforclass = 'comm/action'; - } elseif ($moduleobject == 'adherent' || $moduleobject == 'members' || $moduleobject == 'memberstypes' || $moduleobject == 'subscriptions') { - $moduledirforclass = 'adherents'; - } elseif ($moduleobject == 'don' || $moduleobject == 'donations') { - $moduledirforclass = 'don'; - } elseif ($moduleobject == 'banque' || $moduleobject == 'bankaccounts') { - $moduledirforclass = 'compta/bank'; - } elseif ($moduleobject == 'category' || $moduleobject == 'categorie') { - $moduledirforclass = 'categories'; - } elseif ($moduleobject == 'order' || $moduleobject == 'orders') { - $moduledirforclass = 'commande'; - } elseif ($moduleobject == 'shipments') { - $moduledirforclass = 'expedition'; - } elseif ($moduleobject == 'facture' || $moduleobject == 'invoice' || $moduleobject == 'invoices') { - $moduledirforclass = 'compta/facture'; - } elseif ($moduleobject == 'project' || $moduleobject == 'projects' || $moduleobject == 'task' || $moduleobject == 'tasks') { - $moduledirforclass = 'projet'; - } elseif ($moduleobject == 'stock' || $moduleobject == 'stockmovements' || $moduleobject == 'warehouses') { - $moduledirforclass = 'product/stock'; - } elseif ($moduleobject == 'supplierproposals' || $moduleobject == 'supplierproposal' || $moduleobject == 'supplier_proposal') { - $moduledirforclass = 'supplier_proposal'; - } elseif ($moduleobject == 'fournisseur' || $moduleobject == 'supplierinvoices' || $moduleobject == 'supplierorders') { - $moduledirforclass = 'fourn'; - } elseif ($moduleobject == 'ficheinter' || $moduleobject == 'interventions') { - $moduledirforclass = 'fichinter'; - } elseif ($moduleobject == 'mos') { - $moduledirforclass = 'mrp'; - } elseif (in_array($moduleobject, array('products', 'expensereports', 'users', 'tickets', 'boms'))) { - $moduledirforclass = preg_replace('/s$/', '', $moduleobject); - } + if ($moduleobject == 'contracts') { + $moduledirforclass = 'contrat'; + } elseif (in_array($moduleobject, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) { + $moduledirforclass = 'api'; + } elseif ($moduleobject == 'contact' || $moduleobject == 'contacts' || $moduleobject == 'customer' || $moduleobject == 'thirdparty' || $moduleobject == 'thirdparties') { + $moduledirforclass = 'societe'; + } elseif ($moduleobject == 'propale' || $moduleobject == 'proposals') { + $moduledirforclass = 'comm/propal'; + } elseif ($moduleobject == 'agenda' || $moduleobject == 'agendaevents') { + $moduledirforclass = 'comm/action'; + } elseif ($moduleobject == 'adherent' || $moduleobject == 'members' || $moduleobject == 'memberstypes' || $moduleobject == 'subscriptions') { + $moduledirforclass = 'adherents'; + } elseif ($moduleobject == 'don' || $moduleobject == 'donations') { + $moduledirforclass = 'don'; + } elseif ($moduleobject == 'banque' || $moduleobject == 'bankaccounts') { + $moduledirforclass = 'compta/bank'; + } elseif ($moduleobject == 'category' || $moduleobject == 'categorie') { + $moduledirforclass = 'categories'; + } elseif ($moduleobject == 'order' || $moduleobject == 'orders') { + $moduledirforclass = 'commande'; + } elseif ($moduleobject == 'shipments') { + $moduledirforclass = 'expedition'; + } elseif ($moduleobject == 'facture' || $moduleobject == 'invoice' || $moduleobject == 'invoices') { + $moduledirforclass = 'compta/facture'; + } elseif ($moduleobject == 'project' || $moduleobject == 'projects' || $moduleobject == 'task' || $moduleobject == 'tasks') { + $moduledirforclass = 'projet'; + } elseif ($moduleobject == 'stock' || $moduleobject == 'stockmovements' || $moduleobject == 'warehouses') { + $moduledirforclass = 'product/stock'; + } elseif ($moduleobject == 'supplierproposals' || $moduleobject == 'supplierproposal' || $moduleobject == 'supplier_proposal') { + $moduledirforclass = 'supplier_proposal'; + } elseif ($moduleobject == 'fournisseur' || $moduleobject == 'supplierinvoices' || $moduleobject == 'supplierorders') { + $moduledirforclass = 'fourn'; + } elseif ($moduleobject == 'ficheinter' || $moduleobject == 'interventions') { + $moduledirforclass = 'fichinter'; + } elseif ($moduleobject == 'mos') { + $moduledirforclass = 'mrp'; + } elseif (in_array($moduleobject, array('products', 'expensereports', 'users', 'tickets', 'boms'))) { + $moduledirforclass = preg_replace('/s$/', '', $moduleobject); + } - return $moduledirforclass; + return $moduledirforclass; } /** @@ -2265,7 +2265,7 @@ function getModuleDirForApiClass($moduleobject) */ function randomColorPart($min = 0, $max = 255) { - return str_pad(dechex(mt_rand($min, $max)), 2, '0', STR_PAD_LEFT); + return str_pad(dechex(mt_rand($min, $max)), 2, '0', STR_PAD_LEFT); } /** @@ -2277,22 +2277,22 @@ function randomColorPart($min = 0, $max = 255) */ function randomColor($min = 0, $max = 255) { - return randomColorPart($min, $max).randomColorPart($min, $max).randomColorPart($min, $max); + return randomColorPart($min, $max).randomColorPart($min, $max).randomColorPart($min, $max); } if (!function_exists('dolEscapeXML')) { - /** - * Encode string for xml usage - * - * @param string $string String to encode - * @return string String encoded - */ - function dolEscapeXML($string) - { - return strtr($string, array('\''=>''', '"'=>'"', '&'=>'&', '<'=>'<', '>'=>'>')); - } + /** + * Encode string for xml usage + * + * @param string $string String to encode + * @return string String encoded + */ + function dolEscapeXML($string) + { + return strtr($string, array('\''=>''', '"'=>'"', '&'=>'&', '<'=>'<', '>'=>'>')); + } } @@ -2306,28 +2306,28 @@ if (!function_exists('dolEscapeXML')) */ function autoOrManual($automaticmanual, $case = 1, $color = 0) { - global $langs; - $result = 'unknown'; $classname = ''; - if ($automaticmanual == 1 || strtolower($automaticmanual) == 'automatic' || strtolower($automaticmanual) == 'true') // A mettre avant test sur no a cause du == 0 - { - $result = $langs->trans('automatic'); - if ($case == 1 || $case == 3) $result = $langs->trans("Automatic"); - if ($case == 2) $result = ''; - if ($case == 3) $result = ' '.$result; + global $langs; + $result = 'unknown'; $classname = ''; + if ($automaticmanual == 1 || strtolower($automaticmanual) == 'automatic' || strtolower($automaticmanual) == 'true') // A mettre avant test sur no a cause du == 0 + { + $result = $langs->trans('automatic'); + if ($case == 1 || $case == 3) $result = $langs->trans("Automatic"); + if ($case == 2) $result = ''; + if ($case == 3) $result = ' '.$result; - $classname = 'ok'; - } elseif ($automaticmanual == 0 || strtolower($automaticmanual) == 'manual' || strtolower($automaticmanual) == 'false') - { - $result = $langs->trans("manual"); - if ($case == 1 || $case == 3) $result = $langs->trans("Manual"); - if ($case == 2) $result = ''; - if ($case == 3) $result = ' '.$result; + $classname = 'ok'; + } elseif ($automaticmanual == 0 || strtolower($automaticmanual) == 'manual' || strtolower($automaticmanual) == 'false') + { + $result = $langs->trans("manual"); + if ($case == 1 || $case == 3) $result = $langs->trans("Manual"); + if ($case == 2) $result = ''; + if ($case == 3) $result = ' '.$result; - if ($color == 2) $classname = 'ok'; - else $classname = 'error'; - } - if ($color) return ''.$result.''; - return $result; + if ($color == 2) $classname = 'ok'; + else $classname = 'error'; + } + if ($color) return ''.$result.''; + return $result; } @@ -2339,13 +2339,13 @@ function autoOrManual($automaticmanual, $case = 1, $color = 0) */ function convertBackOfficeMediasLinksToPublicLinks($notetoshow) { - global $dolibarr_main_url_root; - // Define $urlwithroot - $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); - $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file - //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current - $notetoshow = preg_replace('/src="[a-zA-Z0-9_\/\-\.]*(viewimage\.php\?modulepart=medias[^"]*)"/', 'src="'.$urlwithroot.'/\1"', $notetoshow); - return $notetoshow; + global $dolibarr_main_url_root; + // Define $urlwithroot + $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); + $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file + //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current + $notetoshow = preg_replace('/src="[a-zA-Z0-9_\/\-\.]*(viewimage\.php\?modulepart=medias[^"]*)"/', 'src="'.$urlwithroot.'/\1"', $notetoshow); + return $notetoshow; } /** diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php index 36d0fb0c80d..ae9401b7954 100644 --- a/htdocs/core/lib/functionsnumtoword.lib.php +++ b/htdocs/core/lib/functionsnumtoword.lib.php @@ -259,7 +259,7 @@ function hundreds2text($hundreds, $tens, $units) $decenas = array("", "", "TREINTA ", "CUARENTA ", "CINCUENTA ", "SESENTA ", "SETENTA ", "OCHENTA ", "NOVENTA "); $veintis = array("VEINTE", "VEINTIUN", "VEINTIDÓS", "VEINTITRÉS", "VEINTICUATRO", "VEINTICINCO", "VEINTISÉIS", "VEINTISIETE", "VEINTIOCHO", "VEINTINUEVE"); $diecis = array("DIEZ", "ONCE", "DOCE", "TRECE", "CATORCE", "QUINCE", "DIECISÉIS", "DIECISIETE", "DIECIOCHO", "DIECINUEVE"); - $unidades = array("UN", "DOS", "TRES", "CUATRO", "CINCO", "SEIS", "SIETE", "OCHO", "NUEVE"); + $unidades = array("UN", "DOS", "TRES", "CUATRO", "CINCO", "SEIS", "SIETE", "OCHO", "NUEVE"); $entexto = ""; if ($hundreds != 0) { $entexto .= $centenas[$hundreds - 1]; diff --git a/htdocs/core/lib/hrm.lib.php b/htdocs/core/lib/hrm.lib.php index 1ea359f6f0b..e24c503f449 100644 --- a/htdocs/core/lib/hrm.lib.php +++ b/htdocs/core/lib/hrm.lib.php @@ -43,8 +43,8 @@ function establishment_prepare_head($object) // Show more tabs from modules // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab - // $this->tabs = array('entity:-tabname); to remove a tab + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf, $langs, $object, $head, $h, 'establishment'); $head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/info.php?id='.$object->id; @@ -64,30 +64,30 @@ function establishment_prepare_head($object) */ function hrm_admin_prepare_head() { - global $langs, $conf, $user; + global $langs, $conf, $user; - $langs->load('hrm'); + $langs->load('hrm'); - $h = 0; - $head = array(); + $h = 0; + $head = array(); $head[$h][0] = DOL_URL_ROOT.'/hrm/admin/admin_hrm.php'; - $head[$h][1] = $langs->trans("Parameters"); - $head[$h][2] = 'parameters'; - $h++; + $head[$h][1] = $langs->trans("Parameters"); + $head[$h][2] = 'parameters'; + $h++; $head[$h][0] = DOL_URL_ROOT.'/hrm/admin/admin_establishment.php'; - $head[$h][1] = $langs->trans("Establishments"); - $head[$h][2] = 'establishments'; - $h++; + $head[$h][1] = $langs->trans("Establishments"); + $head[$h][2] = 'establishments'; + $h++; - // Show more tabs from modules - // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab - // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab - complete_head_from_modules($conf, $langs, null, $head, $h, 'hrm_admin'); + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab + complete_head_from_modules($conf, $langs, null, $head, $h, 'hrm_admin'); - complete_head_from_modules($conf, $langs, null, $head, $h, 'hrm_admin', 'remove'); + complete_head_from_modules($conf, $langs, null, $head, $h, 'hrm_admin', 'remove'); - return $head; + return $head; } diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php index 4cca58d5c2a..20a97c7ff90 100644 --- a/htdocs/core/lib/images.lib.php +++ b/htdocs/core/lib/images.lib.php @@ -40,39 +40,39 @@ function image_format_supported($file, $acceptsvg = 0) { global $conf; - $regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.webp|\.xpm|\.xbm'; // See also into product.class.php - if ($acceptsvg || ! empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)) { - $regeximgext .= '|\.svg'; // Not allowed by default. SVG can contains javascript - } + $regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.webp|\.xpm|\.xbm'; // See also into product.class.php + if ($acceptsvg || ! empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)) { + $regeximgext .= '|\.svg'; // Not allowed by default. SVG can contains javascript + } - // Case filename is not a format image - $reg = array(); - if (!preg_match('/('.$regeximgext.')$/i', $file, $reg)) return -1; + // Case filename is not a format image + $reg = array(); + if (!preg_match('/('.$regeximgext.')$/i', $file, $reg)) return -1; - // Case filename is a format image but not supported by this PHP - $imgfonction = ''; - if (strtolower($reg[1]) == '.gif') $imgfonction = 'imagecreatefromgif'; - if (strtolower($reg[1]) == '.jpg') $imgfonction = 'imagecreatefromjpeg'; - if (strtolower($reg[1]) == '.jpeg') $imgfonction = 'imagecreatefromjpeg'; - if (strtolower($reg[1]) == '.png') $imgfonction = 'imagecreatefrompng'; - if (strtolower($reg[1]) == '.bmp') $imgfonction = 'imagecreatefromwbmp'; - if (strtolower($reg[1]) == '.webp') $imgfonction = 'imagecreatefromwebp'; - if (strtolower($reg[1]) == '.xpm') $imgfonction = 'imagecreatefromxpm'; - if (strtolower($reg[1]) == '.xbm') $imgfonction = 'imagecreatefromxbm'; - if (strtolower($reg[1]) == '.svg') $imgfonction = 'imagecreatefromsvg'; // Never available - if ($imgfonction) - { - if (!function_exists($imgfonction)) - { - // Fonctions of conversion not available in this PHP - return 0; - } + // Case filename is a format image but not supported by this PHP + $imgfonction = ''; + if (strtolower($reg[1]) == '.gif') $imgfonction = 'imagecreatefromgif'; + if (strtolower($reg[1]) == '.jpg') $imgfonction = 'imagecreatefromjpeg'; + if (strtolower($reg[1]) == '.jpeg') $imgfonction = 'imagecreatefromjpeg'; + if (strtolower($reg[1]) == '.png') $imgfonction = 'imagecreatefrompng'; + if (strtolower($reg[1]) == '.bmp') $imgfonction = 'imagecreatefromwbmp'; + if (strtolower($reg[1]) == '.webp') $imgfonction = 'imagecreatefromwebp'; + if (strtolower($reg[1]) == '.xpm') $imgfonction = 'imagecreatefromxpm'; + if (strtolower($reg[1]) == '.xbm') $imgfonction = 'imagecreatefromxbm'; + if (strtolower($reg[1]) == '.svg') $imgfonction = 'imagecreatefromsvg'; // Never available + if ($imgfonction) + { + if (!function_exists($imgfonction)) + { + // Fonctions of conversion not available in this PHP + return 0; + } - // Filename is a format image and supported for conversion by this PHP - return 1; - } + // Filename is a format image and supported for conversion by this PHP + return 1; + } - return 0; + return 0; } @@ -97,9 +97,9 @@ function dol_getImageSize($file, $url = false) if ($filetoread) { - $infoImg = getimagesize($filetoread); // Recuperation des infos de l'image - $ret['width'] = $infoImg[0]; // Largeur de l'image - $ret['height'] = $infoImg[1]; // Hauteur de l'image + $infoImg = getimagesize($filetoread); // Recuperation des infos de l'image + $ret['width'] = $infoImg[0]; // Largeur de l'image + $ret['height'] = $infoImg[1]; // Hauteur de l'image } return $ret; @@ -305,7 +305,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0, if (!empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK)); // Free memory. This does not delete image. - imagedestroy($img); + imagedestroy($img); imagedestroy($imgThumb); clearstatcache(); // File was replaced by a modified one, so we clear file caches. @@ -441,20 +441,20 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', } elseif (!file_exists($file)) { // Si le fichier passe en parametre n'existe pas - dol_syslog($langs->trans("ErrorFileNotFound", $file), LOG_ERR); - return $langs->trans("ErrorFileNotFound", $file); + dol_syslog($langs->trans("ErrorFileNotFound", $file), LOG_ERR); + return $langs->trans("ErrorFileNotFound", $file); } elseif (image_format_supported($file) < 0) { - dol_syslog('This file '.$file.' does not seem to be an image format file name.', LOG_WARNING); - return 'ErrorBadImageFormat'; + dol_syslog('This file '.$file.' does not seem to be an image format file name.', LOG_WARNING); + return 'ErrorBadImageFormat'; } elseif (!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1) { // Si la largeur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0) - dol_syslog('Wrong value for parameter maxWidth', LOG_ERR); - return 'Error: Wrong value for parameter maxWidth'; + dol_syslog('Wrong value for parameter maxWidth', LOG_ERR); + return 'Error: Wrong value for parameter maxWidth'; } elseif (!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1) { // Si la hauteur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0) - dol_syslog('Wrong value for parameter maxHeight', LOG_ERR); - return 'Error: Wrong value for parameter maxHeight'; + dol_syslog('Wrong value for parameter maxHeight', LOG_ERR); + return 'Error: Wrong value for parameter maxHeight'; } $filetoread = realpath(dol_osencode($file)); // Chemin canonique absolu de l'image @@ -495,7 +495,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', $imgfonction = 'imagecreatefrompng'; break; case IMAGETYPE_BMP: // 6 - // Not supported by PHP GD + // Not supported by PHP GD break; case IMAGETYPE_WBMP: // 15 $imgfonction = 'imagecreatefromwbmp'; @@ -531,7 +531,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', $extImg = '.png'; break; case IMAGETYPE_BMP: // 6 - // Not supported by PHP GD + // Not supported by PHP GD $extImg = '.bmp'; break; case IMAGETYPE_WBMP: // 15 @@ -540,14 +540,14 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', break; } - if (!is_resource($img)) - { - dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING); - return 0; - } + if (!is_resource($img)) + { + dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING); + return 0; + } $exifAngle = false; - if ($ort && !empty($conf->global->MAIN_USE_EXIF_ROTATION)) { + if ($ort && !empty($conf->global->MAIN_USE_EXIF_ROTATION)) { switch ($ort) { case 3: // 180 rotate left @@ -568,12 +568,12 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', } } - if ($exifAngle) - { + if ($exifAngle) + { $rotated = false; - if ($infoImg[2] === 'IMAGETYPE_PNG') // In fact there is no exif on PNG but just in case - { + if ($infoImg[2] === 'IMAGETYPE_PNG') // In fact there is no exif on PNG but just in case + { imagealphablending($img, false); imagesavealpha($img, true); $rotated = imagerotate($img, $exifAngle, imageColorAllocateAlpha($img, 0, 0, 0, 127)); @@ -583,9 +583,9 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', $rotated = imagerotate($img, $exifAngle, 0); } - // replace image with good orientation - if (!empty($rotated)) { - $img = $rotated; + // replace image with good orientation + if (!empty($rotated)) { + $img = $rotated; $imgWidth = $trueImgWidth; $imgHeight = $trueImgHeight; } @@ -612,8 +612,8 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', $thumbHeight = round($thumbHeight); $thumbWidth = round($thumbWidth); - // Define target format - if (empty($targetformat)) $targetformat = $infoImg[2]; + // Define target format + if (empty($targetformat)) $targetformat = $infoImg[2]; // Create empty image if ($targetformat == IMAGETYPE_GIF) @@ -643,31 +643,31 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', case IMAGETYPE_GIF: // 1 $trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF imagecolortransparent($imgThumb, $trans_colour); - $extImgTarget = '.gif'; - $newquality = 'NU'; - break; + $extImgTarget = '.gif'; + $newquality = 'NU'; + break; case IMAGETYPE_JPEG: // 2 - $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0); - $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '.jpg'); - $newquality = $quality; - break; + $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0); + $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '.jpg'); + $newquality = $quality; + break; case IMAGETYPE_PNG: // 3 imagealphablending($imgThumb, false); // Pour compatibilite sur certain systeme $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127); // Keep transparent channel - $extImgTarget = '.png'; - $newquality = $quality - 100; - $newquality = round(abs($quality - 100) * 9 / 100); - break; + $extImgTarget = '.png'; + $newquality = $quality - 100; + $newquality = round(abs($quality - 100) * 9 / 100); + break; case IMAGETYPE_BMP: // 6 - // Not supported by PHP GD - $extImgTarget = '.bmp'; - $newquality = 'NU'; - break; + // Not supported by PHP GD + $extImgTarget = '.bmp'; + $newquality = 'NU'; + break; case IMAGETYPE_WBMP: // 15 $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0); - $extImgTarget = '.bmp'; - $newquality = 'NU'; - break; + $extImgTarget = '.bmp'; + $newquality = 'NU'; + break; } if (function_exists("imagefill")) imagefill($imgThumb, 0, 0, $trans_colour); @@ -698,7 +698,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', imagepng($imgThumb, $imgThumbName, $newquality); break; case IMAGETYPE_BMP: // 6 - // Not supported by PHP GD + // Not supported by PHP GD break; case IMAGETYPE_WBMP: // 15 imagewbmp($imgThumb, $imgThumbName); @@ -708,9 +708,9 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small', // Set permissions on file if (!empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK)); - // Free memory. This does not delete image. - imagedestroy($img); - imagedestroy($imgThumb); + // Free memory. This does not delete image. + imagedestroy($img); + imagedestroy($imgThumb); return $imgThumbName; } diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php index a59aa3e6301..50330686805 100644 --- a/htdocs/core/lib/member.lib.php +++ b/htdocs/core/lib/member.lib.php @@ -63,46 +63,46 @@ function member_prepare_head(Adherent $object) $h++; } - // Show more tabs from modules - // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab - // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab - complete_head_from_modules($conf, $langs, $object, $head, $h, 'member'); + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab + complete_head_from_modules($conf, $langs, $object, $head, $h, 'member'); - $nbNote = 0; - if (!empty($object->note)) $nbNote++; - if (!empty($object->note_private)) $nbNote++; - if (!empty($object->note_public)) $nbNote++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id; + $nbNote = 0; + if (!empty($object->note)) $nbNote++; + if (!empty($object->note_private)) $nbNote++; + if (!empty($object->note_public)) $nbNote++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id; $head[$h][1] = $langs->trans("Note"); $head[$h][2] = 'note'; - if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.''; + if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.''; $h++; - // Attachments - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php'; - $upload_dir = $conf->adherent->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'member'); - $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$')); - $nbLinks = Link::count($db, $object->element, $object->id); - $head[$h][0] = DOL_URL_ROOT.'/adherents/document.php?id='.$object->id; - $head[$h][1] = $langs->trans('Documents'); - if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).''; - $head[$h][2] = 'document'; - $h++; + // Attachments + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php'; + $upload_dir = $conf->adherent->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'member'); + $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$')); + $nbLinks = Link::count($db, $object->element, $object->id); + $head[$h][0] = DOL_URL_ROOT.'/adherents/document.php?id='.$object->id; + $head[$h][1] = $langs->trans('Documents'); + if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).''; + $head[$h][2] = 'document'; + $h++; // Show agenda tab if (!empty($conf->agenda->enabled)) { - $head[$h][0] = DOL_URL_ROOT."/adherents/agenda.php?id=".$object->id; - $head[$h][1] = $langs->trans("Events"); - if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) - { - $head[$h][1] .= '/'; - $head[$h][1] .= $langs->trans("Agenda"); - } - $head[$h][2] = 'agenda'; - $h++; + $head[$h][0] = DOL_URL_ROOT."/adherents/agenda.php?id=".$object->id; + $head[$h][1] = $langs->trans("Events"); + if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) + { + $head[$h][1] .= '/'; + $head[$h][1] .= $langs->trans("Agenda"); + } + $head[$h][2] = 'agenda'; + $h++; } complete_head_from_modules($conf, $langs, $object, $head, $h, 'member', 'remove'); @@ -148,11 +148,11 @@ function member_type_prepare_head(AdherentType $object) $h++; } - // Show more tabs from modules - // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab - // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab - complete_head_from_modules($conf, $langs, $object, $head, $h, 'membertype'); + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab + complete_head_from_modules($conf, $langs, $object, $head, $h, 'membertype'); complete_head_from_modules($conf, $langs, $object, $head, $h, 'membertype', 'remove'); @@ -166,45 +166,45 @@ function member_type_prepare_head(AdherentType $object) */ function member_admin_prepare_head() { - global $langs, $conf, $user; + global $langs, $conf, $user; - $h = 0; - $head = array(); + $h = 0; + $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent.php'; - $head[$h][1] = $langs->trans("Miscellaneous"); - $head[$h][2] = 'general'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent.php'; + $head[$h][1] = $langs->trans("Miscellaneous"); + $head[$h][2] = 'general'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_emails.php'; - $head[$h][1] = $langs->trans("EMails"); - $head[$h][2] = 'emails'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_emails.php'; + $head[$h][1] = $langs->trans("EMails"); + $head[$h][2] = 'emails'; + $h++; - // Show more tabs from modules - // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab - // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab - complete_head_from_modules($conf, $langs, null, $head, $h, 'member_admin'); + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab + complete_head_from_modules($conf, $langs, null, $head, $h, 'member_admin'); - $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_extrafields.php'; - $head[$h][1] = $langs->trans("ExtraFieldsMember"); - $head[$h][2] = 'attributes'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFieldsMember"); + $head[$h][2] = 'attributes'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_type_extrafields.php'; - $head[$h][1] = $langs->trans("ExtraFieldsMemberType"); - $head[$h][2] = 'attributes_type'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_type_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFieldsMemberType"); + $head[$h][2] = 'attributes_type'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/website.php'; - $head[$h][1] = $langs->trans("BlankSubscriptionForm"); - $head[$h][2] = 'website'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/website.php'; + $head[$h][1] = $langs->trans("BlankSubscriptionForm"); + $head[$h][2] = 'website'; + $h++; - complete_head_from_modules($conf, $langs, null, $head, $h, 'member_admin', 'remove'); + complete_head_from_modules($conf, $langs, null, $head, $h, 'member_admin', 'remove'); - return $head; + return $head; } @@ -216,50 +216,50 @@ function member_admin_prepare_head() */ function member_stats_prepare_head($object) { - global $langs, $conf, $user; + global $langs, $conf, $user; - $h = 0; - $head = array(); + $h = 0; + $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/index.php'; - $head[$h][1] = $langs->trans("Subscriptions"); - $head[$h][2] = 'statssubscription'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/index.php'; + $head[$h][1] = $langs->trans("Subscriptions"); + $head[$h][2] = 'statssubscription'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbycountry'; - $head[$h][1] = $langs->trans("Country"); - $head[$h][2] = 'statscountry'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbycountry'; + $head[$h][1] = $langs->trans("Country"); + $head[$h][2] = 'statscountry'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbyregion'; - $head[$h][1] = $langs->trans("Region"); - $head[$h][2] = 'statsregion'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbyregion'; + $head[$h][1] = $langs->trans("Region"); + $head[$h][2] = 'statsregion'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbystate'; - $head[$h][1] = $langs->trans("State"); - $head[$h][2] = 'statsstate'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbystate'; + $head[$h][1] = $langs->trans("State"); + $head[$h][2] = 'statsstate'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbytown'; - $head[$h][1] = $langs->trans('Town'); - $head[$h][2] = 'statstown'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbytown'; + $head[$h][1] = $langs->trans('Town'); + $head[$h][2] = 'statstown'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/byproperties.php'; - $head[$h][1] = $langs->trans('ByProperties'); - $head[$h][2] = 'statsbyproperties'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/byproperties.php'; + $head[$h][1] = $langs->trans('ByProperties'); + $head[$h][2] = 'statsbyproperties'; + $h++; - // Show more tabs from modules - // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab - // $this->tabs = array('entity:-tabname); to remove a tab - complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats'); + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname); to remove a tab + complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats'); - complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats', 'remove'); + complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats', 'remove'); - return $head; + return $head; } /** diff --git a/htdocs/core/lib/multicurrency.lib.php b/htdocs/core/lib/multicurrency.lib.php index 94947e5c4b4..065b4dfc886 100644 --- a/htdocs/core/lib/multicurrency.lib.php +++ b/htdocs/core/lib/multicurrency.lib.php @@ -30,21 +30,21 @@ */ function multicurrencyAdminPrepareHead() { - global $langs, $conf; + global $langs, $conf; - $h = 0; - $head = array(); + $h = 0; + $head = array(); - $head[$h][0] = dol_buildpath("/admin/multicurrency.php", 1); - $head[$h][1] = $langs->trans("Parameters"); - $head[$h][2] = 'settings'; - $h++; + $head[$h][0] = dol_buildpath("/admin/multicurrency.php", 1); + $head[$h][1] = $langs->trans("Parameters"); + $head[$h][2] = 'settings'; + $h++; - complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency'); + complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency'); complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency', 'remove'); - return $head; + return $head; } /** diff --git a/htdocs/core/lib/reception.lib.php b/htdocs/core/lib/reception.lib.php index caa08228803..f36295e31f3 100644 --- a/htdocs/core/lib/reception.lib.php +++ b/htdocs/core/lib/reception.lib.php @@ -49,18 +49,18 @@ function reception_prepare_head(Reception $object) if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) { - $objectsrc = $object; - if ($object->origin == 'commande' && $object->origin_id > 0) - { - $objectsrc = new Commande($db); - $objectsrc->fetch($object->origin_id); - } - $nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external')); - $head[$h][0] = DOL_URL_ROOT."/reception/contact.php?id=".$object->id; - $head[$h][1] = $langs->trans("ContactsAddresses"); + $objectsrc = $object; + if ($object->origin == 'commande' && $object->origin_id > 0) + { + $objectsrc = new Commande($db); + $objectsrc->fetch($object->origin_id); + } + $nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external')); + $head[$h][0] = DOL_URL_ROOT."/reception/contact.php?id=".$object->id; + $head[$h][1] = $langs->trans("ContactsAddresses"); if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.''; - $head[$h][2] = 'contact'; - $h++; + $head[$h][2] = 'contact'; + $h++; } // Show more tabs from modules @@ -69,18 +69,18 @@ function reception_prepare_head(Reception $object) // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf, $langs, $object, $head, $h, 'reception'); - $nbNote = 0; - if (!empty($object->note_private)) $nbNote++; - if (!empty($object->note_public)) $nbNote++; + $nbNote = 0; + if (!empty($object->note_private)) $nbNote++; + if (!empty($object->note_public)) $nbNote++; $head[$h][0] = DOL_URL_ROOT."/reception/note.php?id=".$object->id; $head[$h][1] = $langs->trans("Notes"); if ($nbNote > 0) $head[$h][1] .= ''.$nbNote.''; $head[$h][2] = 'note'; $h++; - complete_head_from_modules($conf, $langs, $object, $head, $h, 'reception', 'remove'); + complete_head_from_modules($conf, $langs, $object, $head, $h, 'reception', 'remove'); - return $head; + return $head; } /** @@ -105,18 +105,18 @@ function reception_admin_prepare_head() if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION)) { - $head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php'; - $head[$h][1] = $langs->trans("ExtraFields"); - $head[$h][2] = 'attributes_reception'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFields"); + $head[$h][2] = 'attributes_reception'; + $h++; } if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION)) { - $head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php'; - $head[$h][1] = $langs->trans("ExtraFieldsLines"); - $head[$h][2] = 'attributeslines_reception'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFieldsLines"); + $head[$h][2] = 'attributeslines_reception'; + $h++; } complete_head_from_modules($conf, $langs, null, $head, $h, 'reception_admin', 'remove'); diff --git a/htdocs/core/lib/resource.lib.php b/htdocs/core/lib/resource.lib.php index 3222c1c5768..a4ba796078f 100644 --- a/htdocs/core/lib/resource.lib.php +++ b/htdocs/core/lib/resource.lib.php @@ -37,13 +37,13 @@ function resource_prepare_head($object) $head[$h][0] = dol_buildpath('/resource/card.php', 1).'?id='.$object->id; $head[$h][1] = $langs->trans("ResourceCard"); - $head[$h][2] = 'resource'; + $head[$h][2] = 'resource'; $h++; if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && (empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER) || empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_THIPARTY))) { - $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external')); - $head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id; + $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external')); + $head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id; $head[$h][1] = $langs->trans('ContactsAddresses'); if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.''; $head[$h][2] = 'contact'; diff --git a/htdocs/core/lib/salaries.lib.php b/htdocs/core/lib/salaries.lib.php index a3df043d4c4..c11e37b7aaa 100644 --- a/htdocs/core/lib/salaries.lib.php +++ b/htdocs/core/lib/salaries.lib.php @@ -27,41 +27,41 @@ */ function salaries_prepare_head($object) { - global $db, $langs, $conf; + global $db, $langs, $conf; - $h = 0; - $head = array(); + $h = 0; + $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/salaries/card.php?id='.$object->id; - $head[$h][1] = $langs->trans("SalaryPayment"); - $head[$h][2] = 'card'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/salaries/card.php?id='.$object->id; + $head[$h][1] = $langs->trans("SalaryPayment"); + $head[$h][2] = 'card'; + $h++; - // Show more tabs from modules - // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab - // $this->tabs = array('entity:-tabname); to remove a tab - complete_head_from_modules($conf, $langs, $object, $head, $h, 'salaries'); + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname); to remove a tab + complete_head_from_modules($conf, $langs, $object, $head, $h, 'salaries'); - require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php'; - $upload_dir = $conf->salaries->dir_output."/".dol_sanitizeFileName($object->ref); - $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$')); - $nbLinks = Link::count($db, $object->element, $object->id); - $head[$h][0] = DOL_URL_ROOT.'/salaries/document.php?id='.$object->id; - $head[$h][1] = $langs->trans('Documents'); - if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).''; - $head[$h][2] = 'documents'; - $h++; + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php'; + $upload_dir = $conf->salaries->dir_output."/".dol_sanitizeFileName($object->ref); + $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$')); + $nbLinks = Link::count($db, $object->element, $object->id); + $head[$h][0] = DOL_URL_ROOT.'/salaries/document.php?id='.$object->id; + $head[$h][1] = $langs->trans('Documents'); + if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= ''.($nbFiles + $nbLinks).''; + $head[$h][2] = 'documents'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/salaries/info.php?id='.$object->id; - $head[$h][1] = $langs->trans("Info"); - $head[$h][2] = 'info'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/salaries/info.php?id='.$object->id; + $head[$h][1] = $langs->trans("Info"); + $head[$h][2] = 'info'; + $h++; - complete_head_from_modules($conf, $langs, $object, $head, $h, 'salaries', 'remove'); + complete_head_from_modules($conf, $langs, $object, $head, $h, 'salaries', 'remove'); - return $head; + return $head; } /** @@ -71,28 +71,28 @@ function salaries_prepare_head($object) */ function salaries_admin_prepare_head() { - global $langs, $conf, $user; + global $langs, $conf, $user; - $h = 0; - $head = array(); + $h = 0; + $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/salaries/admin/salaries.php'; - $head[$h][1] = $langs->trans("Miscellaneous"); - $head[$h][2] = 'general'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/salaries/admin/salaries.php'; + $head[$h][1] = $langs->trans("Miscellaneous"); + $head[$h][2] = 'general'; + $h++; - // Show more tabs from modules - // Entries must be declared in modules descriptor with line - // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab - // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab - complete_head_from_modules($conf, $langs, null, $head, $h, 'salaries_admin'); + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab + complete_head_from_modules($conf, $langs, null, $head, $h, 'salaries_admin'); - $head[$h][0] = DOL_URL_ROOT.'/salaries/admin/salaries_extrafields.php'; - $head[$h][1] = $langs->trans("ExtraFieldsSalaries"); - $head[$h][2] = 'attributes'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/salaries/admin/salaries_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFieldsSalaries"); + $head[$h][2] = 'attributes'; + $h++; - complete_head_from_modules($conf, $langs, null, $head, $h, 'salaries_admin', 'remove'); + complete_head_from_modules($conf, $langs, null, $head, $h, 'salaries_admin', 'remove'); - return $head; + return $head; } diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index 9a36c0bb269..d4bb4584e26 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -309,7 +309,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f break; } } - } elseif (!empty($feature)) { // This is for permissions on 2 levels ('creer' or 'write') + } elseif (!empty($feature)) { // This is for permissions on 2 levels ('creer' or 'write') //print '
feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write; exit; if (empty($user->rights->$feature->creer) && empty($user->rights->$feature->write) @@ -541,7 +541,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand if ($feature == 'agenda')// Also check owner or attendee for users without allactions->read { if ($objectid > 0 && empty($user->rights->agenda->allactions->read)) { - require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php'; + require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; $action = new ActionComm($db); $action->fetch($objectid); if ($action->authorid != $user->id && $action->userownerid != $user->id && !(array_key_exists($user->id, $action->userassigned))) { diff --git a/htdocs/core/lib/takepos.lib.php b/htdocs/core/lib/takepos.lib.php index a651e1d76e0..dfddc95d733 100644 --- a/htdocs/core/lib/takepos.lib.php +++ b/htdocs/core/lib/takepos.lib.php @@ -71,5 +71,5 @@ function takepos_admin_prepare_head() complete_head_from_modules($conf, $langs, null, $head, $h, 'takepos_admin', 'remove'); - return $head; + return $head; } diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php index d47bfb2cab2..5558274710f 100644 --- a/htdocs/core/lib/ticket.lib.php +++ b/htdocs/core/lib/ticket.lib.php @@ -30,41 +30,41 @@ */ function ticketAdminPrepareHead() { - global $langs, $conf; + global $langs, $conf; - $langs->load("ticket"); + $langs->load("ticket"); - $h = 0; - $head = array(); + $h = 0; + $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/admin/ticket.php'; - $head[$h][1] = $langs->trans("TicketSettings"); - $head[$h][2] = 'settings'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/admin/ticket.php'; + $head[$h][1] = $langs->trans("TicketSettings"); + $head[$h][2] = 'settings'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/admin/ticket_extrafields.php'; - $head[$h][1] = $langs->trans("ExtraFieldsTicket"); - $head[$h][2] = 'attributes'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/admin/ticket_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFieldsTicket"); + $head[$h][2] = 'attributes'; + $h++; - $head[$h][0] = DOL_URL_ROOT.'/admin/ticket_public.php'; - $head[$h][1] = $langs->trans("PublicInterface"); - $head[$h][2] = 'public'; - $h++; + $head[$h][0] = DOL_URL_ROOT.'/admin/ticket_public.php'; + $head[$h][1] = $langs->trans("PublicInterface"); + $head[$h][2] = 'public'; + $h++; - // Show more tabs from modules - // Entries must be declared in modules descriptor with line - //$this->tabs = array( - // 'entity:+tabname:Title:@ticket:/ticket/mypage.php?id=__ID__' - //); // to add new tab - //$this->tabs = array( - // 'entity:-tabname:Title:@ticket:/ticket/mypage.php?id=__ID__' - //); // to remove a tab - complete_head_from_modules($conf, $langs, null, $head, $h, 'ticketadmin'); + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + //$this->tabs = array( + // 'entity:+tabname:Title:@ticket:/ticket/mypage.php?id=__ID__' + //); // to add new tab + //$this->tabs = array( + // 'entity:-tabname:Title:@ticket:/ticket/mypage.php?id=__ID__' + //); // to remove a tab + complete_head_from_modules($conf, $langs, null, $head, $h, 'ticketadmin'); complete_head_from_modules($conf, $langs, null, $head, $h, 'ticketadmin', 'remove'); - return $head; + return $head; } /** @@ -75,42 +75,42 @@ function ticketAdminPrepareHead() */ function ticket_prepare_head($object) { - global $db, $langs, $conf, $user; + global $db, $langs, $conf, $user; - $h = 0; - $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/ticket/card.php?action=view&track_id='.$object->track_id; - $head[$h][1] = $langs->trans("Ticket"); - $head[$h][2] = 'tabTicket'; - $h++; + $h = 0; + $head = array(); + $head[$h][0] = DOL_URL_ROOT.'/ticket/card.php?action=view&track_id='.$object->track_id; + $head[$h][1] = $langs->trans("Ticket"); + $head[$h][2] = 'tabTicket'; + $h++; - if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid)) - { - $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external')); - $head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id; - $head[$h][1] = $langs->trans('ContactsAddresses'); - if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.''; - $head[$h][2] = 'contact'; - $h++; - } + if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid)) + { + $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external')); + $head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id; + $head[$h][1] = $langs->trans('ContactsAddresses'); + if ($nbContact > 0) $head[$h][1] .= ''.$nbContact.''; + $head[$h][2] = 'contact'; + $h++; + } - complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket'); + complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket'); - // Attached files - include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - $upload_dir = $conf->ticket->dir_output."/".$object->ref; - $nbFiles = count(dol_dir_list($upload_dir, 'files')); - $head[$h][0] = dol_buildpath('/ticket/document.php', 1).'?id='.$object->id; - $head[$h][1] = $langs->trans("Documents"); - if ($nbFiles > 0) { - $head[$h][1] .= ''.$nbFiles.''; - } + // Attached files + include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + $upload_dir = $conf->ticket->dir_output."/".$object->ref; + $nbFiles = count(dol_dir_list($upload_dir, 'files')); + $head[$h][0] = dol_buildpath('/ticket/document.php', 1).'?id='.$object->id; + $head[$h][1] = $langs->trans("Documents"); + if ($nbFiles > 0) { + $head[$h][1] .= ''.$nbFiles.''; + } - $head[$h][2] = 'tabTicketDocument'; - $h++; + $head[$h][2] = 'tabTicketDocument'; + $h++; - // History + // History $ticketViewType = "messaging"; if (empty($_SESSION['ticket-view-type'])) { $_SESSION['ticket-view-type'] = $ticketViewType; @@ -124,20 +124,20 @@ function ticket_prepare_head($object) // $ticketViewType == "list" $head[$h][0] = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id; } - $head[$h][1] = $langs->trans('Events'); - if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) - { - $head[$h][1] .= '/'; - $head[$h][1] .= $langs->trans("Agenda"); - } - $head[$h][2] = 'tabTicketLogs'; - $h++; + $head[$h][1] = $langs->trans('Events'); + if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) + { + $head[$h][1] .= '/'; + $head[$h][1] .= $langs->trans("Agenda"); + } + $head[$h][2] = 'tabTicketLogs'; + $h++; - complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket', 'remove'); + complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket', 'remove'); - return $head; + return $head; } /** @@ -184,13 +184,13 @@ function showDirectPublicLink($object) */ function generate_random_id($car = 16) { - $string = ""; - $chaine = "abcdefghijklmnopqrstuvwxyz123456789"; - srand((double) microtime() * 1000000); - for ($i = 0; $i < $car; $i++) { - $string .= $chaine[rand() % strlen($chaine)]; - } - return $string; + $string = ""; + $chaine = "abcdefghijklmnopqrstuvwxyz123456789"; + srand((double) microtime() * 1000000); + for ($i = 0; $i < $car; $i++) { + $string .= $chaine[rand() % strlen($chaine)]; + } + return $string; } /** @@ -277,255 +277,255 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $ */ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $noprint = 0, $actioncode = '', $donetodo = 'done', $filters = array(), $sortfield = 'a.datep,a.id', $sortorder = 'DESC') { - global $user, $conf; - global $form; + global $user, $conf; + global $form; - global $param, $massactionbutton; + global $param, $massactionbutton; - dol_include_once('/comm/action/class/actioncomm.class.php'); + dol_include_once('/comm/action/class/actioncomm.class.php'); - // Check parameters - if (!is_object($filterobj) && !is_object($objcon)) dol_print_error('', 'BadParameter'); + // Check parameters + if (!is_object($filterobj) && !is_object($objcon)) dol_print_error('', 'BadParameter'); - $out = ''; - $histo = array(); - $numaction = 0; - $now = dol_now('tzuser'); + $out = ''; + $histo = array(); + $numaction = 0; + $now = dol_now('tzuser'); - // Open DSI -- Fix order by -- Begin - $sortfield_list = explode(',', $sortfield); - $sortfield_label_list = array('a.id' => 'id', 'a.datep' => 'dp', 'a.percent' => 'percent'); - $sortfield_new_list = array(); - foreach ($sortfield_list as $sortfield_value) { - $sortfield_new_list[] = $sortfield_label_list[trim($sortfield_value)]; - } - $sortfield_new = implode(',', $sortfield_new_list); + // Open DSI -- Fix order by -- Begin + $sortfield_list = explode(',', $sortfield); + $sortfield_label_list = array('a.id' => 'id', 'a.datep' => 'dp', 'a.percent' => 'percent'); + $sortfield_new_list = array(); + foreach ($sortfield_list as $sortfield_value) { + $sortfield_new_list[] = $sortfield_label_list[trim($sortfield_value)]; + } + $sortfield_new = implode(',', $sortfield_new_list); - if (!empty($conf->agenda->enabled)) - { - // Recherche histo sur actioncomm - if (is_object($objcon) && $objcon->id > 0) { - $sql = "SELECT DISTINCT a.id, a.label as label,"; - } else { - $sql = "SELECT a.id, a.label as label,"; - } - $sql .= " a.datep as dp,"; - $sql .= " a.note as message,"; - $sql .= " a.datep2 as dp2,"; - $sql .= " a.percent as percent, 'action' as type,"; - $sql .= " a.fk_element, a.elementtype,"; - $sql .= " a.fk_contact,"; - $sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,"; - $sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; - if (is_object($filterobj) && get_class($filterobj) == 'Societe') $sql .= ", sp.lastname, sp.firstname"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname"; - elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", o.ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", o.ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", o.ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", o.ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", o.ref"; - $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id"; + if (!empty($conf->agenda->enabled)) + { + // Recherche histo sur actioncomm + if (is_object($objcon) && $objcon->id > 0) { + $sql = "SELECT DISTINCT a.id, a.label as label,"; + } else { + $sql = "SELECT a.id, a.label as label,"; + } + $sql .= " a.datep as dp,"; + $sql .= " a.note as message,"; + $sql .= " a.datep2 as dp2,"; + $sql .= " a.percent as percent, 'action' as type,"; + $sql .= " a.fk_element, a.elementtype,"; + $sql .= " a.fk_contact,"; + $sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,"; + $sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; + if (is_object($filterobj) && get_class($filterobj) == 'Societe') $sql .= ", sp.lastname, sp.firstname"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname"; + elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", o.ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", o.ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", o.ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", o.ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", o.ref"; + $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action"; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id"; - $force_filter_contact = false; - if (is_object($objcon) && $objcon->id > 0) { - $force_filter_contact = true; - $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm"; - $sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id; - } + $force_filter_contact = false; + if (is_object($objcon) && $objcon->id > 0) { + $force_filter_contact = true; + $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm"; + $sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id; + } - if (is_object($filterobj) && get_class($filterobj) == 'Societe') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { - $sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er"; - $sql .= " ON er.resource_type = 'dolresource'"; - $sql .= " AND er.element_id = a.id"; - $sql .= " AND er.resource_id = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m"; - elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o"; - elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", ".MAIN_DB_PREFIX."bom_bom as o"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", ".MAIN_DB_PREFIX."contrat as o"; + if (is_object($filterobj) && get_class($filterobj) == 'Societe') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { + $sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er"; + $sql .= " ON er.resource_type = 'dolresource'"; + $sql .= " AND er.element_id = a.id"; + $sql .= " AND er.resource_id = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m"; + elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o"; + elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", ".MAIN_DB_PREFIX."bom_bom as o"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", ".MAIN_DB_PREFIX."contrat as o"; - $sql .= " WHERE a.entity IN (".getEntity('agenda').")"; - if ($force_filter_contact === false) { - if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) $sql .= " AND a.fk_soc = ".$filterobj->id; - elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id; - elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') - { - $sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') - { - $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'Product') - { - $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') - { - $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') - { - $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') - { - $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'"; - if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; - } - } + $sql .= " WHERE a.entity IN (".getEntity('agenda').")"; + if ($force_filter_contact === false) { + if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) $sql .= " AND a.fk_soc = ".$filterobj->id; + elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id; + elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') + { + $sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') + { + $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'Product') + { + $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') + { + $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') + { + $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') + { + $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'"; + if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id; + } + } - // Condition on actioncode - if (!empty($actioncode)) - { - if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) - { - if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'"; - elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'"; - else { - if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'"; - elseif ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'"; - } - } else { - if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'"; - elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'"; - else $sql .= " AND c.code = '".$db->escape($actioncode)."'"; - } - } - if ($donetodo == 'todo') $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))"; - elseif ($donetodo == 'done') $sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))"; - if (is_array($filters) && $filters['search_agenda_label']) $sql .= natural_search('a.label', $filters['search_agenda_label']); - } + // Condition on actioncode + if (!empty($actioncode)) + { + if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) + { + if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'"; + elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'"; + else { + if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'"; + elseif ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'"; + } + } else { + if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'"; + elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'"; + else $sql .= " AND c.code = '".$db->escape($actioncode)."'"; + } + } + if ($donetodo == 'todo') $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))"; + elseif ($donetodo == 'done') $sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))"; + if (is_array($filters) && $filters['search_agenda_label']) $sql .= natural_search('a.label', $filters['search_agenda_label']); + } - // Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing. - if (!empty($conf->mailing->enabled) && !empty($objcon->email) - && (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING')) - { - $langs->load("mails"); + // Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing. + if (!empty($conf->mailing->enabled) && !empty($objcon->email) + && (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING')) + { + $langs->load("mails"); - $sql2 = "SELECT m.rowid as id, m.titre as label, mc.date_envoi as dp, mc.date_envoi as dp2, '100' as percent, 'mailing' as type"; - $sql2 .= ", null as fk_element, '' as elementtype, null as contact_id"; - $sql2 .= ", 'AC_EMAILING' as acode, '' as alabel, '' as apicto"; - $sql2 .= ", u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; // User that valid action - if (is_object($filterobj) && get_class($filterobj) == 'Societe') $sql2 .= ", '' as lastname, '' as firstname"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql2 .= ", '' as lastname, '' as firstname"; - elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql2 .= ", '' as ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql2 .= ", '' as ref"; - elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql2 .= ", '' as ref"; - $sql2 .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u"; - $sql2 .= " WHERE mc.email = '".$db->escape($objcon->email)."'"; // Search is done on email. - $sql2 .= " AND mc.statut = 1"; - $sql2 .= " AND u.rowid = m.fk_user_valid"; - $sql2 .= " AND mc.fk_mailing=m.rowid"; - } + $sql2 = "SELECT m.rowid as id, m.titre as label, mc.date_envoi as dp, mc.date_envoi as dp2, '100' as percent, 'mailing' as type"; + $sql2 .= ", null as fk_element, '' as elementtype, null as contact_id"; + $sql2 .= ", 'AC_EMAILING' as acode, '' as alabel, '' as apicto"; + $sql2 .= ", u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; // User that valid action + if (is_object($filterobj) && get_class($filterobj) == 'Societe') $sql2 .= ", '' as lastname, '' as firstname"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql2 .= ", '' as lastname, '' as firstname"; + elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql2 .= ", '' as ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql2 .= ", '' as ref"; + elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql2 .= ", '' as ref"; + $sql2 .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u"; + $sql2 .= " WHERE mc.email = '".$db->escape($objcon->email)."'"; // Search is done on email. + $sql2 .= " AND mc.statut = 1"; + $sql2 .= " AND u.rowid = m.fk_user_valid"; + $sql2 .= " AND mc.fk_mailing=m.rowid"; + } - if (!empty($sql) && !empty($sql2)) { - $sql = $sql." UNION ".$sql2; - } elseif (empty($sql) && !empty($sql2)) { - $sql = $sql2; - } + if (!empty($sql) && !empty($sql2)) { + $sql = $sql." UNION ".$sql2; + } elseif (empty($sql) && !empty($sql2)) { + $sql = $sql2; + } - //TODO Add limit in nb of results - $sql .= $db->order($sortfield_new, $sortorder); - dol_syslog("company.lib::show_actions_done", LOG_DEBUG); - $resql = $db->query($sql); - if ($resql) - { - $i = 0; - $num = $db->num_rows($resql); + //TODO Add limit in nb of results + $sql .= $db->order($sortfield_new, $sortorder); + dol_syslog("company.lib::show_actions_done", LOG_DEBUG); + $resql = $db->query($sql); + if ($resql) + { + $i = 0; + $num = $db->num_rows($resql); - while ($i < $num) - { - $obj = $db->fetch_object($resql); + while ($i < $num) + { + $obj = $db->fetch_object($resql); - if ($obj->type == 'action') { - $contactaction = new ActionComm($db); - $contactaction->id = $obj->id; - $result = $contactaction->fetchResources(); - if ($result < 0) { - dol_print_error($db); - setEventMessage("company.lib::show_actions_done Error fetch ressource", 'errors'); - } + if ($obj->type == 'action') { + $contactaction = new ActionComm($db); + $contactaction->id = $obj->id; + $result = $contactaction->fetchResources(); + if ($result < 0) { + dol_print_error($db); + setEventMessage("company.lib::show_actions_done Error fetch ressource", 'errors'); + } - //if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))"; - //elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))"; - $tododone = ''; - if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) $tododone = 'todo'; + //if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))"; + //elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))"; + $tododone = ''; + if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) $tododone = 'todo'; - $histo[$numaction] = array( - 'type'=>$obj->type, - 'tododone'=>$tododone, - 'id'=>$obj->id, - 'datestart'=>$db->jdate($obj->dp), - 'dateend'=>$db->jdate($obj->dp2), - 'note'=>$obj->label, - 'message'=>$obj->message, - 'percent'=>$obj->percent, + $histo[$numaction] = array( + 'type'=>$obj->type, + 'tododone'=>$tododone, + 'id'=>$obj->id, + 'datestart'=>$db->jdate($obj->dp), + 'dateend'=>$db->jdate($obj->dp2), + 'note'=>$obj->label, + 'message'=>$obj->message, + 'percent'=>$obj->percent, - 'userid'=>$obj->user_id, - 'login'=>$obj->user_login, - 'userfirstname'=>$obj->user_firstname, - 'userlastname'=>$obj->user_lastname, - 'userphoto'=>$obj->user_photo, + 'userid'=>$obj->user_id, + 'login'=>$obj->user_login, + 'userfirstname'=>$obj->user_firstname, + 'userlastname'=>$obj->user_lastname, + 'userphoto'=>$obj->user_photo, - 'contact_id'=>$obj->fk_contact, - 'socpeopleassigned' => $contactaction->socpeopleassigned, - 'lastname'=>$obj->lastname, - 'firstname'=>$obj->firstname, - 'fk_element'=>$obj->fk_element, - 'elementtype'=>$obj->elementtype, - // Type of event - 'acode'=>$obj->acode, - 'alabel'=>$obj->alabel, - 'libelle'=>$obj->alabel, // deprecated - 'apicto'=>$obj->apicto - ); - } else { - $histo[$numaction] = array( - 'type'=>$obj->type, - 'tododone'=>'done', - 'id'=>$obj->id, - 'datestart'=>$db->jdate($obj->dp), - 'dateend'=>$db->jdate($obj->dp2), - 'note'=>$obj->label, - 'message'=>$obj->message, - 'percent'=>$obj->percent, - 'acode'=>$obj->acode, + 'contact_id'=>$obj->fk_contact, + 'socpeopleassigned' => $contactaction->socpeopleassigned, + 'lastname'=>$obj->lastname, + 'firstname'=>$obj->firstname, + 'fk_element'=>$obj->fk_element, + 'elementtype'=>$obj->elementtype, + // Type of event + 'acode'=>$obj->acode, + 'alabel'=>$obj->alabel, + 'libelle'=>$obj->alabel, // deprecated + 'apicto'=>$obj->apicto + ); + } else { + $histo[$numaction] = array( + 'type'=>$obj->type, + 'tododone'=>'done', + 'id'=>$obj->id, + 'datestart'=>$db->jdate($obj->dp), + 'dateend'=>$db->jdate($obj->dp2), + 'note'=>$obj->label, + 'message'=>$obj->message, + 'percent'=>$obj->percent, + 'acode'=>$obj->acode, - 'userid'=>$obj->user_id, - 'login'=>$obj->user_login, - 'userfirstname'=>$obj->user_firstname, - 'userlastname'=>$obj->user_lastname, - 'userphoto'=>$obj->user_photo - ); - } + 'userid'=>$obj->user_id, + 'login'=>$obj->user_login, + 'userfirstname'=>$obj->user_firstname, + 'userlastname'=>$obj->user_lastname, + 'userphoto'=>$obj->user_photo + ); + } - $numaction++; - $i++; - } - } else { - dol_print_error($db); - } + $numaction++; + $i++; + } + } else { + dol_print_error($db); + } - if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email))) - { - $delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60; + if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email))) + { + $delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60; - require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; - include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; - require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; + require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; + require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; - $formactions = new FormActions($db); + $formactions = new FormActions($db); - $actionstatic = new ActionComm($db); - $userstatic = new User($db); - $contactstatic = new Contact($db); - $userGetNomUrlCache = array(); + $actionstatic = new ActionComm($db); + $userstatic = new User($db); + $contactstatic = new Contact($db); + $userGetNomUrlCache = array(); $out .= '
';
$out .= '
- ';
+ $out .= '
- '; - $out .= ''; - $out .= dol_print_date($histo[$key]['datestart'], 'daytext', 'tzserver', $langs); - $out .= ''; - $out .= ' '; - $out .= ''; - } + $tmpa = dol_getdate($histo[$key]['datestart'], false); + if ($actualCycleDate !== $tmpa['year'].'-'.$tmpa['yday']) { + $actualCycleDate = $tmpa['year'].'-'.$tmpa['yday']; + $out .= ''; + $out .= '
- '; + $out .= ''; + $out .= dol_print_date($histo[$key]['datestart'], 'daytext', 'tzserver', $langs); + $out .= ''; + $out .= ' '; + $out .= ''; + } - $out .= ''."\n"; - $out .= '
- '; + $out .= ''."\n"; + $out .= '
- ';
- $out .= ''."\n";
- $iconClass = 'fa fa-comments';
- $img_picto = '';
- $colorClass = '';
- $pictoTitle = '';
+ $out .= ''."\n";
+ $iconClass = 'fa fa-comments';
+ $img_picto = '';
+ $colorClass = '';
+ $pictoTitle = '';
- if ($histo[$key]['percent'] == -1) {
- $colorClass = 'timeline-icon-not-applicble';
- $pictoTitle = $langs->trans('StatusNotApplicable');
- } elseif ($histo[$key]['percent'] == 0) {
- $colorClass = 'timeline-icon-todo';
- $pictoTitle = $langs->trans('StatusActionToDo').' (0%)';
- } elseif ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100) {
- $colorClass = 'timeline-icon-in-progress';
- $pictoTitle = $langs->trans('StatusActionInProcess').' ('.$histo[$key]['percent'].'%)';
- } elseif ($histo[$key]['percent'] >= 100) {
- $colorClass = 'timeline-icon-done';
- $pictoTitle = $langs->trans('StatusActionDone').' (100%)';
- }
+ if ($histo[$key]['percent'] == -1) {
+ $colorClass = 'timeline-icon-not-applicble';
+ $pictoTitle = $langs->trans('StatusNotApplicable');
+ } elseif ($histo[$key]['percent'] == 0) {
+ $colorClass = 'timeline-icon-todo';
+ $pictoTitle = $langs->trans('StatusActionToDo').' (0%)';
+ } elseif ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100) {
+ $colorClass = 'timeline-icon-in-progress';
+ $pictoTitle = $langs->trans('StatusActionInProcess').' ('.$histo[$key]['percent'].'%)';
+ } elseif ($histo[$key]['percent'] >= 100) {
+ $colorClass = 'timeline-icon-done';
+ $pictoTitle = $langs->trans('StatusActionDone').' (100%)';
+ }
- if ($actionstatic->code == 'AC_TICKET_CREATE') {
- $iconClass = 'fa fa-ticket';
- } elseif ($actionstatic->code == 'AC_TICKET_MODIFY') {
- $iconClass = 'fa fa-pencil';
- } elseif ($actionstatic->code == 'TICKET_MSG') {
- $iconClass = 'fa fa-comments';
- } elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
- $iconClass = 'fa fa-mask';
- } elseif (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
- {
- if ($actionstatic->type_picto) $img_picto = img_picto('', $actionstatic->type_picto);
- else {
- if ($actionstatic->type_code == 'AC_RDV') $iconClass = 'fa fa-handshake';
- elseif ($actionstatic->type_code == 'AC_TEL') $iconClass = 'fa fa-phone';
- elseif ($actionstatic->type_code == 'AC_FAX') $iconClass = 'fa fa-fax';
- elseif ($actionstatic->type_code == 'AC_EMAIL') $iconClass = 'fa fa-envelope';
- elseif ($actionstatic->type_code == 'AC_INT') $iconClass = 'fa fa-shipping-fast';
- elseif ($actionstatic->type_code == 'AC_OTH_AUTO') $iconClass = 'fa fa-robot';
- elseif (!preg_match('/_AUTO/', $actionstatic->type_code)) $iconClass = 'fa fa-robot';
- }
- }
+ if ($actionstatic->code == 'AC_TICKET_CREATE') {
+ $iconClass = 'fa fa-ticket';
+ } elseif ($actionstatic->code == 'AC_TICKET_MODIFY') {
+ $iconClass = 'fa fa-pencil';
+ } elseif ($actionstatic->code == 'TICKET_MSG') {
+ $iconClass = 'fa fa-comments';
+ } elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
+ $iconClass = 'fa fa-mask';
+ } elseif (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
+ {
+ if ($actionstatic->type_picto) $img_picto = img_picto('', $actionstatic->type_picto);
+ else {
+ if ($actionstatic->type_code == 'AC_RDV') $iconClass = 'fa fa-handshake';
+ elseif ($actionstatic->type_code == 'AC_TEL') $iconClass = 'fa fa-phone';
+ elseif ($actionstatic->type_code == 'AC_FAX') $iconClass = 'fa fa-fax';
+ elseif ($actionstatic->type_code == 'AC_EMAIL') $iconClass = 'fa fa-envelope';
+ elseif ($actionstatic->type_code == 'AC_INT') $iconClass = 'fa fa-shipping-fast';
+ elseif ($actionstatic->type_code == 'AC_OTH_AUTO') $iconClass = 'fa fa-robot';
+ elseif (!preg_match('/_AUTO/', $actionstatic->type_code)) $iconClass = 'fa fa-robot';
+ }
+ }
- $out .= ''.$img_picto.''."\n";
+ $out .= ''.$img_picto.''."\n";
- $out .= ''."\n"; + $out .= ''."\n"; - $out .= ''; + $out .= ''; if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing') { $out .= ''.img_object($langs->trans("ShowEMailing"), "email").' '; @@ -682,135 +682,135 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no $out .= $actionstatic->getNomUrl(1, -1, 'valignmiddle').' '; } - //if ($user->rights->agenda->allactions->read || $actionstatic->authorid == $user->id) - //{ - // $out.=''.$langs->trans('Show').''; - //} + //if ($user->rights->agenda->allactions->read || $actionstatic->authorid == $user->id) + //{ + // $out.=''.$langs->trans('Show').''; + //} - if ($user->rights->agenda->allactions->create || - (($actionstatic->authorid == $user->id || $actionstatic->userownerid == $user->id) && $user->rights->agenda->myactions->create)) - { - $out .= ''; - } + if ($user->rights->agenda->allactions->create || + (($actionstatic->authorid == $user->id || $actionstatic->userownerid == $user->id) && $user->rights->agenda->myactions->create)) + { + $out .= ''; + } - $out .= ''; - // Date - $out .= ' '; - $out .= dol_print_date($histo[$key]['datestart'], 'dayhour'); - if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart']) - { - $tmpa = dol_getdate($histo[$key]['datestart'], true); - $tmpb = dol_getdate($histo[$key]['dateend'], true); - if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour'); - else $out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour'); - } - $late = 0; - if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1; - if ($histo[$key]['percent'] == 0 && !$histo[$key]['datestart'] && $histo[$key]['dateend'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1; - if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && $histo[$key]['dateend'] && $histo[$key]['dateend'] < ($now - $delay_warning)) $late = 1; - if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && !$histo[$key]['dateend'] && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1; - if ($late) $out .= img_warning($langs->trans("Late")).' '; - $out .= "\n"; + $out .= ''; + // Date + $out .= ' '; + $out .= dol_print_date($histo[$key]['datestart'], 'dayhour'); + if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart']) + { + $tmpa = dol_getdate($histo[$key]['datestart'], true); + $tmpb = dol_getdate($histo[$key]['dateend'], true); + if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour'); + else $out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour'); + } + $late = 0; + if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1; + if ($histo[$key]['percent'] == 0 && !$histo[$key]['datestart'] && $histo[$key]['dateend'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1; + if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && $histo[$key]['dateend'] && $histo[$key]['dateend'] < ($now - $delay_warning)) $late = 1; + if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && !$histo[$key]['dateend'] && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1; + if ($late) $out .= img_warning($langs->trans("Late")).' '; + $out .= "\n"; - // Ref - $out .= ''."\n"; // end timeline-item - $out .= ''; - $out .= ''; + $out .= ''; + $out .= ''; - $i++; - } - $out .= "\n"; - } + $i++; + } + $out .= "\n"; + } - if ($noprint) return $out; - else print $out; + if ($noprint) return $out; + else print $out; } diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index f70fdf03d1b..b7e67a14f0b 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -56,19 +56,19 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = if (empty($noout)) print_start_menu_array(); - $usemenuhider = 1; + $usemenuhider = 1; // Show/Hide vertical menu. The hamburger icon for .menuhider action. if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { - $showmode = 1; - $classname = 'class="tmenu menuhider"'; - $idsel = 'menu'; + $showmode = 1; + $classname = 'class="tmenu menuhider"'; + $idsel = 'menu'; - $menu->add('#', (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? '' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname); + $menu->add('#', (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? '' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname); } - $menu_arr = array(); + $menu_arr = array(); // Home $menu_arr[] = array( @@ -92,9 +92,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = // Members $tmpentry = array( - 'enabled' => (!empty($conf->adherent->enabled)), - 'perms' => (!empty($user->rights->adherent->lire)), - 'module' => 'adherent' + 'enabled' => (!empty($conf->adherent->enabled)), + 'perms' => (!empty($user->rights->adherent->lire)), + 'module' => 'adherent' ); $menu_arr[] = array( 'name' => 'Members', @@ -117,13 +117,13 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = // Third parties $tmpentry = array( - 'enabled'=> ((!empty($conf->societe->enabled) && - (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) - ) - || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) - ), - 'perms'=> (!empty($user->rights->societe->lire) || !empty($user->rights->fournisseur->lire)), - 'module'=>'societe|fournisseur' + 'enabled'=> ((!empty($conf->societe->enabled) && + (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) + ) + || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) + ), + 'perms'=> (!empty($user->rights->societe->lire) || !empty($user->rights->fournisseur->lire)), + 'module'=>'societe|fournisseur' ); $menu_arr[] = array( 'name' => 'Companies', @@ -148,7 +148,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = $tmpentry = array( 'enabled'=> (!empty($conf->product->enabled) || !empty($conf->service->enabled) || !empty($conf->expedition->enabled)), 'perms'=> (!empty($user->rights->produit->lire) || !empty($user->rights->service->lire) || !empty($user->rights->expedition->lire)), - 'module'=>'product|service' + 'module'=>'product|service' ); $menu_arr[] = array( 'name' => 'Products', @@ -157,7 +157,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = ? (array("TMenuProducts", " | ", "TMenuServices")) : (!empty($conf->product->enabled) ? "TMenuProducts" : "TMenuServices"), 'level' => 0, - 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), + 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), 'target' => $atarget, 'mainmenu' => "products", 'leftmenu' => '', @@ -173,34 +173,34 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = // MRP $tmpentry = array( - 'enabled'=>(!empty($conf->bom->enabled) || !empty($conf->mrp->enabled)), - 'perms'=>(!empty($user->rights->bom->read) || !empty($user->rights->mrp->read)), - 'module'=>'bom|mrp' + 'enabled'=>(!empty($conf->bom->enabled) || !empty($conf->mrp->enabled)), + 'perms'=>(!empty($user->rights->bom->read) || !empty($user->rights->mrp->read)), + 'module'=>'bom|mrp' ); $menu_arr[] = array( - 'name' => 'TMenuMRP', - 'link' => '/mrp/index.php?mainmenu=mrp&leftmenu=', - 'title' => "TMenuMRP", - 'level' => 0, - 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), - 'target' => $atarget, - 'mainmenu' => "mrp", - 'leftmenu' => '', - 'position' => 30, - 'id' => $id, - 'idsel' => 'mrp', - 'classname' => $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 'class="tmenusel"' : 'class="tmenu"', - 'prefix' => '', - 'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 0 : 1), - 'loadLangs' => array("mrp"), - 'submenus' => array(), + 'name' => 'TMenuMRP', + 'link' => '/mrp/index.php?mainmenu=mrp&leftmenu=', + 'title' => "TMenuMRP", + 'level' => 0, + 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), + 'target' => $atarget, + 'mainmenu' => "mrp", + 'leftmenu' => '', + 'position' => 30, + 'id' => $id, + 'idsel' => 'mrp', + 'classname' => $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 'class="tmenusel"' : 'class="tmenu"', + 'prefix' => '', + 'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 0 : 1), + 'loadLangs' => array("mrp"), + 'submenus' => array(), ); // Projects $tmpentry = array( - 'enabled'=> (!empty($conf->projet->enabled) ? 1 : 0), - 'perms'=> (!empty($user->rights->projet->lire) ? 1 : 0), - 'module'=>'projet' + 'enabled'=> (!empty($conf->projet->enabled) ? 1 : 0), + 'perms'=> (!empty($user->rights->projet->lire) ? 1 : 0), + 'module'=>'projet' ); $menu_arr[] = array( 'name' => 'Projet', @@ -209,7 +209,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = ? (($conf->global->PROJECT_USE_OPPORTUNITIES == 2) ? "Leads" : "Projects") : "Projects", 'level' => 0, - 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), + 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), 'target' => $atarget, 'mainmenu' => "project", 'leftmenu' => '', @@ -225,14 +225,14 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = // Commercial $tmpentry = array( - 'enabled'=>(!empty($conf->propal->enabled) || - !empty($conf->commande->enabled) || - !empty($conf->fournisseur->enabled) || - !empty($conf->supplier_proposal->enabled) || - !empty($conf->supplier_order->enabled) || - !empty($conf->contrat->enabled) || - !empty($conf->ficheinter->enabled) - ) ? 1 : 0, + 'enabled'=>(!empty($conf->propal->enabled) || + !empty($conf->commande->enabled) || + !empty($conf->fournisseur->enabled) || + !empty($conf->supplier_proposal->enabled) || + !empty($conf->supplier_order->enabled) || + !empty($conf->contrat->enabled) || + !empty($conf->ficheinter->enabled) + ) ? 1 : 0, 'perms'=>(!empty($user->rights->propal->lire) || !empty($user->rights->commande->lire) || !empty($user->rights->fournisseur->lire) || @@ -243,7 +243,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = !empty($user->rights->supplier_order->lire) || !empty($user->rights->fournisseur->commande->lire) ), - 'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter' + 'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter' ); $onlysupplierorder = !empty($user->rights->fournisseur->commande->lire) && @@ -259,7 +259,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = 'link' => ($onlysupplierorder ? '/fourn/commande/index.php?mainmenu=commercial&leftmenu=' : '/comm/index.php?mainmenu=commercial&leftmenu='), 'title' => "Commercial", 'level' => 0, - 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), + 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), 'target' => $atarget, 'mainmenu' => "commercial", 'leftmenu' => '', @@ -275,25 +275,25 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = // Billing - Financial $tmpentry = array( - 'enabled'=>(!empty($conf->facture->enabled) || - !empty($conf->don->enabled) || - !empty($conf->tax->enabled) || - !empty($conf->salaries->enabled) || - !empty($conf->supplier_invoice->enabled) || - !empty($conf->loan->enabled) || - !empty($conf->margins->enabled) - ) ? 1 : 0, - 'perms'=>(!empty($user->rights->facture->lire) || !empty($user->rights->don->contact->lire) - || !empty($user->rights->tax->charges->lire) || !empty($user->rights->salaries->read) - || !empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->loan->read) || !empty($user->rights->margins->liretous)), - 'module'=>'facture|supplier_invoice|don|tax|salaries|loan' + 'enabled'=>(!empty($conf->facture->enabled) || + !empty($conf->don->enabled) || + !empty($conf->tax->enabled) || + !empty($conf->salaries->enabled) || + !empty($conf->supplier_invoice->enabled) || + !empty($conf->loan->enabled) || + !empty($conf->margins->enabled) + ) ? 1 : 0, + 'perms'=>(!empty($user->rights->facture->lire) || !empty($user->rights->don->contact->lire) + || !empty($user->rights->tax->charges->lire) || !empty($user->rights->salaries->read) + || !empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->loan->read) || !empty($user->rights->margins->liretous)), + 'module'=>'facture|supplier_invoice|don|tax|salaries|loan' ); $menu_arr[] = array( 'name' => 'Compta', 'link' => '/compta/index.php?mainmenu=billing&leftmenu=', 'title' => "MenuFinancial", 'level' => 0, - 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), + 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), 'target' => $atarget, 'mainmenu' => "billing", 'leftmenu' => '', @@ -309,16 +309,16 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = // Bank $tmpentry = array( - 'enabled'=>(!empty($conf->banque->enabled) || !empty($conf->prelevement->enabled)), + 'enabled'=>(!empty($conf->banque->enabled) || !empty($conf->prelevement->enabled)), 'perms'=>(!empty($user->rights->banque->lire) || !empty($user->rights->prelevement->lire) || !empty($user->rights->paymentbybanktransfer->read)), - 'module'=>'banque|prelevement|paymentbybanktransfer' + 'module'=>'banque|prelevement|paymentbybanktransfer' ); $menu_arr[] = array( 'name' => 'Bank', 'link' => '/compta/bank/list.php?mainmenu=bank&leftmenu=', 'title' => "MenuBankCash", 'level' => 0, - 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), + 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), 'target' => $atarget, 'mainmenu' => "bank", 'leftmenu' => '', @@ -336,16 +336,16 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = // Accounting $tmpentry = array( - 'enabled'=>(!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled) || !empty($conf->asset->enabled)), - 'perms'=>(!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read)), - 'module'=>'comptabilite|accounting|asset' + 'enabled'=>(!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled) || !empty($conf->asset->enabled)), + 'perms'=>(!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read)), + 'module'=>'comptabilite|accounting|asset' ); $menu_arr[] = array( 'name' => 'Accounting', 'link' => '/accountancy/index.php?mainmenu=accountancy&leftmenu=', 'title' => "MenuAccountancy", 'level' => 0, - 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), + 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), 'target' => $atarget, 'mainmenu' => "accountancy", 'leftmenu' => '', @@ -365,14 +365,14 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = $tmpentry = array( 'enabled'=>(!empty($conf->hrm->enabled) || !empty($conf->holiday->enabled) || !empty($conf->deplacement->enabled) || !empty($conf->expensereport->enabled) || !empty($conf->recruitment->enabled)), 'perms'=>(!empty($user->rights->hrm->employee->read) || !empty($user->rights->holiday->write) || !empty($user->rights->deplacement->lire) || !empty($user->rights->expensereport->lire) || !empty($user->rights->recruitment->recruitmentjobposition->read)), - 'module'=>'hrm|holiday|deplacement|expensereport|recruitment' + 'module'=>'hrm|holiday|deplacement|expensereport|recruitment' ); $menu_arr[] = array( 'name' => 'HRM', 'link' => '/hrm/index.php?mainmenu=hrm&leftmenu=', 'title' => "HRM", 'level' => 0, - 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), + 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), 'target' => $atarget, 'mainmenu' => "hrm", 'leftmenu' => '', @@ -390,16 +390,16 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = // Tools $tmpentry = array( - 'enabled'=>1, - 'perms'=>1, - 'module'=>'' + 'enabled'=>1, + 'perms'=>1, + 'module'=>'' ); $menu_arr[] = array( 'name' => 'Tools', 'link' => '/core/tools.php?mainmenu=tools&leftmenu=', 'title' => "Tools", 'level' => 0, - 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), + 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal), 'target' => $atarget, 'mainmenu' => "tools", 'leftmenu' => '', @@ -464,7 +464,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = { $newTabMenu[$i]['url'] = make_substitutions($newTabMenu[$i]['url'], $substitarray); - // url = url from host, shorturl = relative path into dolibarr sources + // url = url from host, shorturl = relative path into dolibarr sources $url = $shorturl = $newTabMenu[$i]['url']; if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url'])) // Do not change url content for external links { @@ -476,7 +476,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad $url = dol_buildpath($url, 1).($param ? '?'.$param : ''); //$shorturl = $shorturl.($param?'?'.$param:''); - $shorturl = $url; + $shorturl = $url; if (DOL_URL_ROOT) $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl); } @@ -492,7 +492,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = // Sort on position $menu->liste = dol_sort_array($menu->liste, 'position'); - // Output menu entries + // Output menu entries // Show logo company if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && !empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { @@ -527,20 +527,20 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = print_end_menu_entry(4); } - if (empty($noout)) { - foreach ($menu->liste as $menuval) { - print_start_menu_entry($menuval['idsel'], $menuval['classname'], $menuval['enabled']); - print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget)); - print_end_menu_entry($menuval['enabled']); - } - } + if (empty($noout)) { + foreach ($menu->liste as $menuval) { + print_start_menu_entry($menuval['idsel'], $menuval['classname'], $menuval['enabled']); + print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget)); + print_end_menu_entry($menuval['enabled']); + } + } $showmode = 1; - if (empty($noout)) { - print_start_menu_entry('', 'class="tmenuend"', $showmode); - print_end_menu_entry($showmode); - print_end_menu_array(); - } + if (empty($noout)) { + print_start_menu_entry('', 'class="tmenuend"', $showmode); + print_end_menu_entry($showmode); + print_end_menu_array(); + } return 0; } @@ -553,7 +553,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = */ function print_start_menu_array() { - global $conf; + global $conf; print '
'; + // Ref + $out .= '
'; - if (!empty($histo[$key]['message']) - && $actionstatic->code != 'AC_TICKET_CREATE' - && $actionstatic->code != 'AC_TICKET_MODIFY' - ) - { - $out .= ''; - // Author of event - $out .= ''; + // Author of event + $out .= ''; - // Title - $out .= ' '; + // Title + $out .= ' '; if ($actionstatic->code == 'TICKET_MSG') { $out .= $langs->trans('TicketNewMessage'); } elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') { $out .= $langs->trans('TicketNewMessage').' ('.$langs->trans('Private').')'; } else { - if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'action') { - $transcode = $langs->trans("Action".$histo[$key]['acode']); - $libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : $histo[$key]['alabel']); - $libelle = $histo[$key]['note']; - $actionstatic->id = $histo[$key]['id']; - $out .= dol_trunc($libelle, 120); - } - if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing') { - $out .= ''.img_object($langs->trans("ShowEMailing"), "email").' '; - $transcode = $langs->trans("Action".$histo[$key]['acode']); - $libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : 'Send mass mailing'); - $out .= dol_trunc($libelle, 120); - } - } + if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'action') { + $transcode = $langs->trans("Action".$histo[$key]['acode']); + $libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : $histo[$key]['alabel']); + $libelle = $histo[$key]['note']; + $actionstatic->id = $histo[$key]['id']; + $out .= dol_trunc($libelle, 120); + } + if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing') { + $out .= ''.img_object($langs->trans("ShowEMailing"), "email").' '; + $transcode = $langs->trans("Action".$histo[$key]['acode']); + $libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : 'Send mass mailing'); + $out .= dol_trunc($libelle, 120); + } + } - $out .= ''; + $out .= ''; - $out .= '
'; + $out .= ''; - $out .= $histo[$key]['message']; - $out .= ''; - } + if (!empty($histo[$key]['message']) + && $actionstatic->code != 'AC_TICKET_CREATE' + && $actionstatic->code != 'AC_TICKET_MODIFY' + ) + { + $out .= ''; + $out .= $histo[$key]['message']; + $out .= ''; + } - // Timeline footer - $footer = ''; + // Timeline footer + $footer = ''; - // Contact for this action - if (isset($histo[$key]['socpeopleassigned']) && is_array($histo[$key]['socpeopleassigned']) && count($histo[$key]['socpeopleassigned']) > 0) { - $contactList = ''; - foreach ($histo[$key]['socpeopleassigned'] as $cid => $Tab) { - $contact = new Contact($db); - $result = $contact->fetch($cid); + // Contact for this action + if (isset($histo[$key]['socpeopleassigned']) && is_array($histo[$key]['socpeopleassigned']) && count($histo[$key]['socpeopleassigned']) > 0) { + $contactList = ''; + foreach ($histo[$key]['socpeopleassigned'] as $cid => $Tab) { + $contact = new Contact($db); + $result = $contact->fetch($cid); - if ($result < 0) - dol_print_error($db, $contact->error); + if ($result < 0) + dol_print_error($db, $contact->error); - if ($result > 0) { - $contactList .= !empty($contactList) ? ', ' : ''; - $contactList .= $contact->getNomUrl(1); - if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') { - if (!empty($contact->phone_pro)) - $contactList .= '('.dol_print_phone($contact->phone_pro).')'; - } - } - } + if ($result > 0) { + $contactList .= !empty($contactList) ? ', ' : ''; + $contactList .= $contact->getNomUrl(1); + if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') { + if (!empty($contact->phone_pro)) + $contactList .= '('.dol_print_phone($contact->phone_pro).')'; + } + } + } - $footer .= $langs->trans('ActionOnContact').' : '.$contactList; - } elseif (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0) - { - $contact = new Contact($db); - $result = $contact->fetch($histo[$key]['contact_id']); + $footer .= $langs->trans('ActionOnContact').' : '.$contactList; + } elseif (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0) + { + $contact = new Contact($db); + $result = $contact->fetch($histo[$key]['contact_id']); - if ($result < 0) - dol_print_error($db, $contact->error); + if ($result < 0) + dol_print_error($db, $contact->error); - if ($result > 0) { - $footer .= $contact->getNomUrl(1); - if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') { - if (!empty($contact->phone_pro)) - $footer .= '('.dol_print_phone($contact->phone_pro).')'; - } - } - } + if ($result > 0) { + $footer .= $contact->getNomUrl(1); + if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') { + if (!empty($contact->phone_pro)) + $footer .= '('.dol_print_phone($contact->phone_pro).')'; + } + } + } $documents = getTicketActionCommEcmList($actionstatic); - if (!empty($documents)) + if (!empty($documents)) { $footer .= ''; foreach ($documents as $doc) @@ -849,24 +849,24 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no - if (!empty($footer)) { - $out .= ''; - } + if (!empty($footer)) { + $out .= ''; + } - $out .= ''."\n"; // end timeline-item + $out .= '
- ';
- if ($donetodo)
- {
- $tmp = '';
- if (get_class($filterobj) == 'Societe') $tmp .= '';
- $tmp .= ($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
- $tmp .= ($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
- $tmp .= ($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');
- //$out.=$langs->trans("ActionsToDoShort").' / '.$langs->trans("ActionsDoneShort");
- if (get_class($filterobj) == 'Societe') $tmp .= '';
- $out .= getTitleFieldOfList($tmp);
- }
+ if ($donetodo)
+ {
+ $tmp = '';
+ if (get_class($filterobj) == 'Societe') $tmp .= '';
+ $tmp .= ($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
+ $tmp .= ($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
+ $tmp .= ($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');
+ //$out.=$langs->trans("ActionsToDoShort").' / '.$langs->trans("ActionsDoneShort");
+ if (get_class($filterobj) == 'Societe') $tmp .= '';
+ $out .= getTitleFieldOfList($tmp);
+ }
- //require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
- //$caction=new CActionComm($db);
- //$arraylist=$caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:0), '', 1);
+ //require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
+ //$caction=new CActionComm($db);
+ //$arraylist=$caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:0), '', 1);
- $actualCycleDate = false;
+ $actualCycleDate = false;
- foreach ($histo as $key=>$value)
- {
- $actionstatic->fetch($histo[$key]['id']); // TODO Do we need this, we already have a lot of data of line into $histo
+ foreach ($histo as $key=>$value)
+ {
+ $actionstatic->fetch($histo[$key]['id']); // TODO Do we need this, we already have a lot of data of line into $histo
- $actionstatic->type_picto = $histo[$key]['apicto'];
- $actionstatic->type_code = $histo[$key]['acode'];
+ $actionstatic->type_picto = $histo[$key]['apicto'];
+ $actionstatic->type_code = $histo[$key]['acode'];
- $url = DOL_URL_ROOT.'/comm/action/card.php?id='.$histo[$key]['id'];
+ $url = DOL_URL_ROOT.'/comm/action/card.php?id='.$histo[$key]['id'];
- $tmpa = dol_getdate($histo[$key]['datestart'], false);
- if ($actualCycleDate !== $tmpa['year'].'-'.$tmpa['yday']) {
- $actualCycleDate = $tmpa['year'].'-'.$tmpa['yday'];
- $out .= '';
- $out .= '
*** Rebuild product thumbs
'; + print '
*** Rebuild product thumbs
'; - $sql = "SELECT s.rowid, s.ref FROM ".MAIN_DB_PREFIX."product as s ORDER BY s.ref"; - $resql = $db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - $i = 0; + $sql = "SELECT s.rowid, s.ref FROM ".MAIN_DB_PREFIX."product as s ORDER BY s.ref"; + $resql = $db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; - while ($i < $num) - { - $obj = $db->fetch_object($resql); + while ($i < $num) + { + $obj = $db->fetch_object($resql); - if (!empty($obj->ref)) - { - $files = dol_dir_list($dolibarr_main_data_root.'/produit/'.$obj->ref, 'files', 0); - foreach ($files as $file) - { + if (!empty($obj->ref)) + { + $files = dol_dir_list($dolibarr_main_data_root.'/produit/'.$obj->ref, 'files', 0); + foreach ($files as $file) + { // Generate thumbs. if (image_format_supported($file['fullname']) == 1) { - $imgThumbSmall = 'notbuild'; - if (GETPOST('rebuild_product_thumbs', 'alpha') == 'confirmed') - { - // Used on logon for example - $imgThumbSmall = vignette($file['fullname'], $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs"); - } - print 'Check product '.$obj->rowid.", file ".$file['fullname']." -> ".$imgThumbSmall." maxwidthsmall=".$maxwidthsmall." maxheightsmall=".$maxheightsmall."
\n"; - $imgThumbMini = 'notbuild'; - if (GETPOST('rebuild_product_thumbs', 'alpha') == 'confirmed') - { - // Create mini thumbs for image (Ratio is near 16/9) - // Used on menu or for setup page for example - $imgThumbMini = vignette($file['fullname'], $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs"); - } - print 'Check product '.$obj->rowid.", file ".$file['fullname']." -> ".$imgThumbMini." maxwidthmini=".$maxwidthmini." maxheightmini=".$maxheightmini."
\n"; + $imgThumbSmall = 'notbuild'; + if (GETPOST('rebuild_product_thumbs', 'alpha') == 'confirmed') + { + // Used on logon for example + $imgThumbSmall = vignette($file['fullname'], $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs"); + } + print 'Check product '.$obj->rowid.", file ".$file['fullname']." -> ".$imgThumbSmall." maxwidthsmall=".$maxwidthsmall." maxheightsmall=".$maxheightsmall."
\n"; + $imgThumbMini = 'notbuild'; + if (GETPOST('rebuild_product_thumbs', 'alpha') == 'confirmed') + { + // Create mini thumbs for image (Ratio is near 16/9) + // Used on menu or for setup page for example + $imgThumbMini = vignette($file['fullname'], $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs"); + } + print 'Check product '.$obj->rowid.", file ".$file['fullname']." -> ".$imgThumbMini." maxwidthmini=".$maxwidthmini." maxheightmini=".$maxheightmini."
\n"; } - } - } + } + } - $i++; - } - } else { - $ok = 0; - dol_print_error($db); - } + $i++; + } + } else { + $ok = 0; + dol_print_error($db); + } - print '
*** Check table of linked elements and delete orphelins links
*** Check table of linked elements and delete orphelins links
*** Clean orphelins files into files '.$upload_dir.'
*** Clean orphelins files into files '.$upload_dir.'
'; - $result = $object_instance->fetch($id, $ref); - //print $result.'
'; - if ($result == 0) // Not found but no error - { - // Clean of orphelins directories are done into repair.php - print '
'; - if (GETPOST('clean_orphelin_dir', 'alpha') == 'confirmed') - { - dol_delete_file($file['fullname'], 1, 1, 1); - dol_delete_dir(dirname($file['fullname']), 1); - } - print "
'; - } - } - } - } + if ($id || $ref) + { + //print 'Fetch '.$id.' or '.$ref.'
'; + $result = $object_instance->fetch($id, $ref); + //print $result.'
'; + if ($result == 0) // Not found but no error + { + // Clean of orphelins directories are done into repair.php + print '
'; + if (GETPOST('clean_orphelin_dir', 'alpha') == 'confirmed') + { + dol_delete_file($file['fullname'], 1, 1, 1); + dol_delete_dir(dirname($file['fullname']), 1); + } + print "
'; + } + } + } + } } // clean_linked_elements: Check and clean linked elements if ($ok && GETPOST('clean_product_stock_batch', 'alpha')) { - $methodtofix = GETPOST('methodtofix', 'alpha') ?GETPOST('methodtofix', 'alpha') : 'updatestock'; + $methodtofix = GETPOST('methodtofix', 'alpha') ?GETPOST('methodtofix', 'alpha') : 'updatestock'; - print '
*** Clean table product_batch, methodtofix='.$methodtofix.' (possible values: updatestock or updatebatch)
*** Clean table product_batch, methodtofix='.$methodtofix.' (possible values: updatestock or updatebatch)
Clean table product_batch, methodtofix='.$methodtofix.' (possible values: updatestock or updatebatch)
Clean table product_batch, methodtofix='.$methodtofix.' (possible values: updatestock or updatebatch)
*** Set value of time spent without amount
*** Set value of time spent without amount
*** Force modules not found physicaly to be disabled (only modules adding js, css or hooks can be detected as removed physicaly)
*** Force modules not found physicaly to be disabled (only modules adding js, css or hooks can be detected as removed physicaly)
*** Force page code and collation of tables into utf8/utf8_unicode_ci (for mysql/mariadb only)
*** Force page code and collation of tables into utf8/utf8_unicode_ci (for mysql/mariadb only)
SQL queries with errors:
SQL queries with errors:
'.$langs->trans("ErrorWrongParameters").'
';
+ print ''.$langs->trans("ErrorWrongParameters").'
';
}
if ($oneoptionset)
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 90db6718a3b..0e656c7514b 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -646,7 +646,7 @@ if (!defined('NOLOGIN'))
exit;
} else {
// User is loaded, we may need to change language for him according to its choice
- if (! empty($user->conf->MAIN_LANG_DEFAULT)) {
+ if (!empty($user->conf->MAIN_LANG_DEFAULT)) {
$langs->setDefaultLang($user->conf->MAIN_LANG_DEFAULT);
}
}
@@ -1879,14 +1879,14 @@ function top_menu_quickadd()
$html = '';
// Define $dropDownQuickAddHtml
$dropDownQuickAddHtml = '';
- $dropDownQuickAddHtml.= $langs->trans('QuickAdd');
- $dropDownQuickAddHtml.= '
';
+ $dropDownQuickAddHtml .= $langs->trans('QuickAdd');
+ $dropDownQuickAddHtml .= '