lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug for php 8.1

Browse Source
This commit is contained in:
Laurent Destailleur 2022-05-08 18:25:22 +02:00
parent f52a7a26f6
commit 6592eb5d73
52 changed files with 519 additions and 445 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/accountancy/bookkeeping/list.php
View File

@ -304,7 +304,7 @@ if (empty($reshook)) {
$search_lettering_code = ''; $search_lettering_code = '';
$search_not_reconciled = ''; $search_not_reconciled = '';
$search_import_key = ''; $search_import_key = '';
$toselect = ''; $toselect = array();
} }
// Must be after the remove filter action, before the export. // Must be after the remove filter action, before the export.

2
htdocs/accountancy/bookkeeping/listbyaccount.php
View File

@ -259,7 +259,7 @@ if (empty($reshook)) {
$search_lettering_code = ''; $search_lettering_code = '';
$search_not_reconciled = ''; $search_not_reconciled = '';
$search_import_key = ''; $search_import_key = '';
$toselect = ''; $toselect = array();
} }
// Must be after the remove filter action, before the export. // Must be after the remove filter action, before the export.

2
htdocs/adherents/list.php
View File

@ -215,7 +215,7 @@ if (empty($reshook)) {
$search_status = ""; $search_status = "";
$catid = ""; $catid = "";
$sall = ""; $sall = "";
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }

2
htdocs/adherents/subscription/list.php
View File

@ -135,7 +135,7 @@ if (empty($reshook)) {
$search_note = ""; $search_note = "";
$search_amount = ""; $search_amount = "";
$search_account = ""; $search_account = "";
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
} }

2
htdocs/admin/defaultvalues.php
View File

@ -101,7 +101,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$defaulturl = ''; $defaulturl = '';
$defaultkey = ''; $defaultkey = '';
$defaultvalue = ''; $defaultvalue = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }

2
htdocs/admin/mails_senderprofile_list.php
View File

@ -169,7 +169,7 @@ if (empty($reshook)) {
foreach ($object->fields as $key => $val) { foreach ($object->fields as $key => $val) {
$search[$key] = ''; $search[$key] = '';
} }
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')

838
htdocs/admin/mails_templates.php
View File

@ -66,10 +66,6 @@ $search_lang = GETPOST('search_lang', 'alpha');
$search_fk_user = GETPOST('search_fk_user', 'intcomma'); $search_fk_user = GETPOST('search_fk_user', 'intcomma');
$search_topic = GETPOST('search_topic', 'alpha'); $search_topic = GETPOST('search_topic', 'alpha');
if (!empty($user->socid)) {
accessforbidden();
}
$acts = array(); $acts = array();
$actl = array(); $actl = array();
$acts[0] = "activate"; $acts[0] = "activate";
@ -100,6 +96,7 @@ if (empty($sortorder)) {
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('emailtemplates')); $hookmanager->initHooks(array('emailtemplates'));
// Name of SQL tables of dictionaries // Name of SQL tables of dictionaries
$tabname = array(); $tabname = array();
$tabname[25] = MAIN_DB_PREFIX."c_email_templates"; $tabname[25] = MAIN_DB_PREFIX."c_email_templates";
@ -246,6 +243,12 @@ if ($reshook == 0) {
} }
} }
if (!empty($user->socid)) {
accessforbidden();
}
$permissiontoadd = 1; $permissiontoadd = 1;
//asort($elementList); //asort($elementList);
@ -273,6 +276,9 @@ if ($reshook < 0) {
} }
if (empty($reshook)) { if (empty($reshook)) {
// Selection of new fields
include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
// Purge search criteria // Purge search criteria
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { 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 // All tests are required to be compatible with all browsers
@ -281,7 +287,7 @@ if (empty($reshook)) {
$search_lang = ''; $search_lang = '';
$search_fk_user = ''; $search_fk_user = '';
$search_topic = ''; $search_topic = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
@ -395,7 +401,7 @@ if (empty($reshook)) {
} }
} elseif ($keycode == 'content') { } elseif ($keycode == 'content') {
$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'"; $sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
} elseif (in_array($keycode, array('joinfiles', 'private', 'position'))) { } elseif (in_array($keycode, array('joinfiles', 'private', 'position', 'entity'))) {
$sql .= (int) GETPOST($keycode, 'int'); $sql .= (int) GETPOST($keycode, 'int');
} else { } else {
$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'"; $sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
@ -502,9 +508,9 @@ if (empty($reshook)) {
if ($action == 'confirm_delete' && $confirm == 'yes') { // delete if ($action == 'confirm_delete' && $confirm == 'yes') { // delete
$rowidcol = "rowid"; $rowidcol = "rowid";
$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."=".((int) $rowid); $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = ".((int) $rowid);
if (!$user->admin) { // A non admin user can only edit its own template if (!$user->admin) { // A non admin user can only edit its own template
$sql .= " AND fk_user = ".((int) $user->id); $sql .= " AND fk_user = ".((int) $user->id);
} }
dol_syslog("delete", LOG_DEBUG); dol_syslog("delete", LOG_DEBUG);
$result = $db->query($sql); $result = $db->query($sql);
@ -548,47 +554,20 @@ if (empty($reshook)) {
*/ */
$form = new Form($db); $form = new Form($db);
$now = dol_now();
$formadmin = new FormAdmin($db); $formadmin = new FormAdmin($db);
//$help_url = "EN:Module_MyObject|FR:Module_MyObject_FR|ES:Módulo_MyObject";
$help_url = ''; $help_url = '';
if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) { if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
$title = $langs->trans("EMailsSetup"); $title = $langs->trans("EMailsSetup");
} else { } else {
$title = $langs->trans("EMailTemplates"); $title = $langs->trans("EMailTemplates");
} }
$morejs = array();
llxHeader('', $title, $help_url); $morecss = array();
$linkback = '';
$titlepicto = 'title_setup';
$url = DOL_URL_ROOT.'/admin/mails_templates.php?action=add';
$newcardbutton = dolGetButtonTitle($langs->trans('NewEMailTemplate'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
print load_fiche_titre($title, '', $titlepicto);
} else {
print load_fiche_titre($title, $newcardbutton, $titlepicto);
}
if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
$head = email_admin_prepare_head();
print dol_get_fiche_head($head, 'templates', '', -1);
if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
print load_fiche_titre('', $newcardbutton, '');
}
}
// Confirmation de la suppression de la ligne
if ($action == 'delete') {
print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
}
$sql = "SELECT rowid as rowid, module, label, type_template, lang, fk_user, private, position, topic, joinfiles, content_lines, content, enabled, active"; $sql = "SELECT rowid as rowid, module, label, type_template, lang, fk_user, private, position, topic, joinfiles, content_lines, content, enabled, active";
$sql .= " FROM ".MAIN_DB_PREFIX."c_email_templates"; $sql .= " FROM ".MAIN_DB_PREFIX."c_email_templates";
@ -623,6 +602,78 @@ $sql .= $db->order($sortfield, $sortorder);
$sql .= $db->plimit($listlimit + 1, $offset); $sql .= $db->plimit($listlimit + 1, $offset);
//print $sql; //print $sql;
// Output page
// --------------------------------------------------------------------
llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
$arrayofselected = is_array($toselect) ? $toselect : array();
$param = '';
if (!empty($mode)) {
$param .= '&mode='.urlencode($mode);
}
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
$param .= '&contextpage='.urlencode($contextpage);
}
if ($limit > 0 && $limit != $conf->liste_limit) {
$param .= '&limit='.urlencode($limit);
}
foreach ($search as $key => $val) {
if (is_array($search[$key]) && count($search[$key])) {
foreach ($search[$key] as $skey) {
if ($skey != '') {
$param .= '&search_'.$key.'[]='.urlencode($skey);
}
}
} elseif ($search[$key] != '') {
$param .= '&search_'.$key.'='.urlencode($search[$key]);
}
}
if ($optioncss != '') {
$param .= '&optioncss='.urlencode($optioncss);
}
// Add $param from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
// Add $param from hooks
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
$param .= $hookmanager->resPrint;
$linkback = '';
$titlepicto = 'title_setup';
$url = DOL_URL_ROOT.'/admin/mails_templates.php?action=add&token='.newToken();
$newcardbutton = dolGetButtonTitle($langs->trans('NewEMailTemplate'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
print load_fiche_titre($title, '', $titlepicto);
} else {
print load_fiche_titre($title, $newcardbutton, $titlepicto);
}
if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
$head = email_admin_prepare_head();
print dol_get_fiche_head($head, 'templates', '', -1);
if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
print load_fiche_titre('', $newcardbutton, '');
}
}
// Confirmation de la suppression de la ligne
if ($action == 'delete') {
print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
}
$fieldlist = explode(',', $tabfield[$id]); $fieldlist = explode(',', $tabfield[$id]);
if ($action == 'add') { if ($action == 'add') {
@ -681,7 +732,7 @@ if ($action == 'add') {
} }
if ($valuetoshow != '') { if ($valuetoshow != '') {
print '<td class="'.$align.'">'; print '<th class="'.$align.'">';
if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) { if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
print '<a href="'.$tabhelp[$id][$value].'" target="_blank" rel="noopener noreferrer">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>'; print '<a href="'.$tabhelp[$id][$value].'" target="_blank" rel="noopener noreferrer">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
} elseif (!empty($tabhelp[$id][$value])) { } elseif (!empty($tabhelp[$id][$value])) {
@ -693,12 +744,12 @@ if ($action == 'add') {
} else { } else {
print $valuetoshow; print $valuetoshow;
} }
print '</td>'; print '</th>';
} }
} }
print '<td>'; print '<th>';
print '<input type="hidden" name="id" value="'.$id.'">'; print '<input type="hidden" name="id" value="'.$id.'">';
print '</td>'; print '</th>';
print '</tr>'; print '</tr>';
$obj = new stdClass(); $obj = new stdClass();
@ -742,7 +793,7 @@ if ($action == 'add') {
$fieldsforcontent = array('topic', 'joinfiles', 'content', 'content_lines'); $fieldsforcontent = array('topic', 'joinfiles', 'content', 'content_lines');
} }
foreach ($fieldsforcontent as $tmpfieldlist) { foreach ($fieldsforcontent as $tmpfieldlist) {
print '<tr class="impair nodrag nodrop nohover"><td colspan="6" class="nobottom">'; print '<tr class="impair nodrag nodrop nohover"><td colspan="7" class="nobottom">';
// Label // Label
if ($tmpfieldlist == 'topic') { if ($tmpfieldlist == 'topic') {
@ -773,24 +824,33 @@ if ($action == 'add') {
print $doleditor->Create(1); print $doleditor->Create(1);
} }
print '</td>'; print '</td>';
if ($tmpfieldlist == 'topic') {
print '<td class="center" rowspan="'.(count($fieldsforcontent)).'">';
if ($action != 'edit') {
print '<input type="submit" class="button button-add" name="actionadd" value="'.$langs->trans("Add").'"><br>';
print '<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
}
print '</td>';
}
// else print '<td></td>';
print '</tr>'; print '</tr>';
} }
print '</table>'; print '</table>';
if ($action != 'edit') {
print '<center>';
print '<input type="submit" class="button button-add" name="actionadd" value="'.$langs->trans("Add").'"> ';
print '<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
print '</center>';
}
print '</div>'; print '</div>';
print '</form>'; print '</form>';
print '<br>'; print '<br><br>';
} // END IF not edit } // END IF not edit
// List of available record in database
dol_syslog("htdocs/admin/dict", LOG_DEBUG);
$resql = $db->query($sql);
if (!$resql) {
dol_print_error($db);
exit;
}
$num = $db->num_rows($resql);
print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'; print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">'; print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
@ -798,371 +858,375 @@ print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('fro
print '<div class="div-table-responsive-no-min">'; print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
// List of available record in database $i = 0;
dol_syslog("htdocs/admin/dict", LOG_DEBUG);
$resql = $db->query($sql);
if ($resql) {
$num = $db->num_rows($resql);
$i = 0;
$param = '&id='.$id; $param = '&id='.$id;
if ($search_label) { if ($search_label) {
$param .= '&search_label='.urlencode($search_label); $param .= '&search_label='.urlencode($search_label);
} }
if ($search_lang > 0) { if ($search_lang > 0) {
$param .= '&search_lang='.urlencode($search_lang); $param .= '&search_lang='.urlencode($search_lang);
} }
if ($search_type_template != '-1') { if ($search_type_template != '-1') {
$param .= '&search_type_template='.urlencode($search_type_template); $param .= '&search_type_template='.urlencode($search_type_template);
} }
if ($search_fk_user > 0) { if ($search_fk_user > 0) {
$param .= '&search_fk_user='.urlencode($search_fk_user); $param .= '&search_fk_user='.urlencode($search_fk_user);
} }
if ($search_topic) { if ($search_topic) {
$param .= '&search_topic='.urlencode($search_topic); $param .= '&search_topic='.urlencode($search_topic);
} }
$paramwithsearch = $param; $paramwithsearch = $param;
if ($sortorder) { if ($sortorder) {
$paramwithsearch .= '&sortorder='.urlencode($sortorder); $paramwithsearch .= '&sortorder='.urlencode($sortorder);
} }
if ($sortfield) { if ($sortfield) {
$paramwithsearch .= '&sortfield='.urlencode($sortfield); $paramwithsearch .= '&sortfield='.urlencode($sortfield);
} }
if (GETPOST('from', 'alpha')) { if (GETPOST('from', 'alpha')) {
$paramwithsearch .= '&from='.urlencode(GETPOST('from', 'alpha')); $paramwithsearch .= '&from='.urlencode(GETPOST('from', 'alpha'));
} }
// There is several pages // There is several pages
if ($num > $listlimit) { if ($num > $listlimit) {
print '<tr class="none"><td class="right" colspan="'.(3 + count($fieldlist)).'">'; print '<tr class="none"><td class="right" colspan="'.(3 + count($fieldlist)).'">';
print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>'); print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
print '</td></tr>'; print '</td></tr>';
} }
// Title line with search boxes // Title line with search boxes
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
foreach ($fieldlist as $field => $value) { foreach ($fieldlist as $field => $value) {
if ($value == 'label') { if ($value == 'label') {
print '<td class="liste_titre"><input type="text" name="search_label" class="maxwidth200" value="'.dol_escape_htmltag($search_label).'"></td>'; print '<td class="liste_titre"><input type="text" name="search_label" class="maxwidth200" value="'.dol_escape_htmltag($search_label).'"></td>';
} elseif ($value == 'lang') { } elseif ($value == 'lang') {
print '<td class="liste_titre">'; print '<td class="liste_titre">';
print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth150'); print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth150');
print '</td>'; print '</td>';
} elseif ($value == 'fk_user') { } elseif ($value == 'fk_user') {
print '<td class="liste_titre">'; print '<td class="liste_titre">';
print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 0, '', 0, '', 'maxwidth150'); print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 0, '', 0, '', 'maxwidth150');
print '</td>'; print '</td>';
} elseif ($value == 'topic') { } elseif ($value == 'topic') {
print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>'; print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
} elseif ($value == 'type_template') { } elseif ($value == 'type_template') {
print '<td class="liste_titre center">'; print '<td class="liste_titre center">';
print $form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'minwidth150', 1, '', 0, 1); print $form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'minwidth150', 1, '', 0, 1);
print '</td>'; print '</td>';
} elseif (!in_array($value, array('content', 'content_lines'))) { } elseif (!in_array($value, array('content', 'content_lines'))) {
print '<td class="liste_titre"></td>';
}
}
if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) {
print '<td class="liste_titre"></td>'; print '<td class="liste_titre"></td>';
} }
}
// Action column if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) {
print '<td class="liste_titre right" width="64">'; print '<td class="liste_titre"></td>';
$searchpicto = $form->showFilterButtons(); }
print $searchpicto;
print '</td>';
print '</tr>';
// Title of lines // Action column
print '<tr class="liste_titre">'; print '<td class="liste_titre right" width="64">';
foreach ($fieldlist as $field => $value) { $searchpicto = $form->showFilterButtons();
$showfield = 1; // By defaut print $searchpicto;
$align = "left"; print '</td>';
$sortable = 1; print '</tr>';
$valuetoshow = '';
$forcenowrap = 1;
/*
$tmparray=getLabelOfField($fieldlist[$field]);
$showfield=$tmp['showfield'];
$valuetoshow=$tmp['valuetoshow'];
$align=$tmp['align'];
$sortable=$tmp['sortable'];
*/
$valuetoshow = ucfirst($fieldlist[$field]); // By defaut
$valuetoshow = $langs->trans($valuetoshow); // try to translate
if ($fieldlist[$field] == 'fk_user') {
$valuetoshow = $langs->trans("Owner");
}
if ($fieldlist[$field] == 'lang') {
$valuetoshow = $langs->trans("Language");
}
if ($fieldlist[$field] == 'type') {
$valuetoshow = $langs->trans("Type");
}
if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
$valuetoshow = $langs->trans("Code");
}
if ($fieldlist[$field] == 'type_template') {
$align = 'center';
$valuetoshow = $langs->trans("TypeOfTemplate");
}
if ($fieldlist[$field] == 'private') {
$align = 'center';
}
if ($fieldlist[$field] == 'position') {
$align = 'center';
}
if ($fieldlist[$field] == 'joinfiles') { // Title of lines
$valuetoshow = $langs->trans("FilesAttachedToEmail"); $align = 'center'; $forcenowrap = 0; print '<tr class="liste_titre">';
} foreach ($fieldlist as $field => $value) {
if ($fieldlist[$field] == 'content') { $showfield = 1; // By defaut
$valuetoshow = $langs->trans("Content"); $showfield = 0; $align = "left";
} $sortable = 1;
if ($fieldlist[$field] == 'content_lines') { $valuetoshow = '';
$valuetoshow = $langs->trans("ContentForLines"); $showfield = 0; $forcenowrap = 1;
} /*
$tmparray=getLabelOfField($fieldlist[$field]);
// Show fields $showfield=$tmp['showfield'];
if ($showfield) { $valuetoshow=$tmp['valuetoshow'];
if (!empty($tabhelp[$id][$value])) { $align=$tmp['align'];
if (in_array($value, array('topic'))) { $sortable=$tmp['sortable'];
$valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltip'.$value, $forcenowrap); // Tooltip on click */
} else { $valuetoshow = ucfirst($fieldlist[$field]); // By defaut
$valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, '', $forcenowrap); // Tooltip on hover $valuetoshow = $langs->trans($valuetoshow); // try to translate
} if ($fieldlist[$field] == 'fk_user') {
} $valuetoshow = $langs->trans("Owner");
print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, "align=".$align, $sortfield, $sortorder); }
} if ($fieldlist[$field] == 'lang') {
$valuetoshow = $langs->trans("Language");
}
if ($fieldlist[$field] == 'type') {
$valuetoshow = $langs->trans("Type");
}
if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
$valuetoshow = $langs->trans("Code");
}
if ($fieldlist[$field] == 'type_template') {
$align = 'center';
$valuetoshow = $langs->trans("TypeOfTemplate");
}
if ($fieldlist[$field] == 'private') {
$align = 'center';
}
if ($fieldlist[$field] == 'position') {
$align = 'center';
} }
print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder); if ($fieldlist[$field] == 'joinfiles') {
print getTitleFieldOfList(''); $valuetoshow = $langs->trans("FilesAttachedToEmail"); $align = 'center'; $forcenowrap = 0;
print '</tr>'; }
if ($fieldlist[$field] == 'content') {
$valuetoshow = $langs->trans("Content"); $showfield = 0;
}
if ($fieldlist[$field] == 'content_lines') {
$valuetoshow = $langs->trans("ContentForLines"); $showfield = 0;
}
if ($num) { // Show fields
// Lines with values if ($showfield) {
while ($i < $num) { if (!empty($tabhelp[$id][$value])) {
$obj = $db->fetch_object($resql); if (in_array($value, array('topic'))) {
$valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltip'.$value, $forcenowrap); // Tooltip on click
} else {
$valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, '', $forcenowrap); // Tooltip on hover
}
}
print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, "align=".$align, $sortfield, $sortorder);
}
}
if ($obj) { print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code))) { print getTitleFieldOfList('');
print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">'; print '</tr>';
$tmpaction = 'edit'; if ($num) {
$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]); $nbqualified = 0;
$reshook = $hookmanager->executeHooks('editEmailTemplateFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
$error = $hookmanager->error; $errors = $hookmanager->errors;
// Show fields // Lines with values
if (empty($reshook)) { while ($i < $num) {
fieldList($fieldlist, $obj, $tabname[$id], 'edit'); $obj = $db->fetch_object($resql);
}
print '<td></td><td></td><td></td>'; if ($obj) {
print '<td class="center">'; if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code))) {
print '<input type="hidden" name="page" value="'.$page.'">'; print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
print '<input type="hidden" name="rowid" value="'.$rowid.'">';
print '<input type="submit" class="button buttongen button-save" name="actionmodify" value="'.$langs->trans("Modify").'">';
print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
print '<input type="submit" class="button buttongen button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
print '</td>';
$fieldsforcontent = array('topic', 'joinfiles', 'content'); $tmpaction = 'edit';
if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) { $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
$fieldsforcontent = array('topic', 'joinfiles', 'content', 'content_lines'); $reshook = $hookmanager->executeHooks('editEmailTemplateFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
} $error = $hookmanager->error; $errors = $hookmanager->errors;
foreach ($fieldsforcontent as $tmpfieldlist) {
$showfield = 1;
$align = "left";
$valuetoshow = $obj->{$tmpfieldlist};
$class = 'tddict'; // Show fields
// Show value for field if (empty($reshook)) {
if ($showfield) { fieldList($fieldlist, $obj, $tabname[$id], 'edit');
// Show line for topic, joinfiles and content }
print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$rowid.' ">';
print '<td colspan="8">'; print '<td></td><td></td><td></td>';
if ($tmpfieldlist == 'topic') { print '<td class="center">';
print '<strong>'.$form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> '; print '<input type="hidden" name="page" value="'.$page.'">';
print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'-'.$rowid.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">'; print '<input type="hidden" name="rowid" value="'.$rowid.'">';
} print '<input type="submit" class="button buttongen button-save" name="actionmodify" value="'.$langs->trans("Modify").'">';
if ($tmpfieldlist == 'joinfiles') { print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
print '<strong>'.$form->textwithpicto($langs->trans("FilesAttachedToEmail"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> '; print '<input type="submit" class="button buttongen button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'-'.$rowid.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">'; print '</td>';
}
if ($tmpfieldlist == 'content') { $fieldsforcontent = array('topic', 'joinfiles', 'content');
print $form->textwithpicto($langs->trans("Content"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>'; if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) {
$okforextended = true; $fieldsforcontent = array('topic', 'joinfiles', 'content', 'content_lines');
if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) { }
$okforextended = false; foreach ($fieldsforcontent as $tmpfieldlist) {
} $showfield = 1;
$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 500, 'dolibarr_mailings', 'In', 0, true, $okforextended, ROWS_6, '90%'); $align = "left";
print $doleditor->Create(1); $valuetoshow = $obj->{$tmpfieldlist};
}
if ($tmpfieldlist == 'content_lines') { $class = 'tddict';
print $form->textwithpicto($langs->trans("ContentForLines"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>'; // Show value for field
$okforextended = true; if ($showfield) {
if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) // Show line for topic, joinfiles and content
$okforextended = false; print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$rowid.' ">';
$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%'); print '<td colspan="8">';
print $doleditor->Create(1); if ($tmpfieldlist == 'topic') {
} print '<strong>'.$form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
print '</td>'; print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'-'.$rowid.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
print '<td></td>';
print '<td></td>';
} }
if ($tmpfieldlist == 'joinfiles') {
print '<strong>'.$form->textwithpicto($langs->trans("FilesAttachedToEmail"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'-'.$rowid.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
}
if ($tmpfieldlist == 'content') {
print $form->textwithpicto($langs->trans("Content"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>';
$okforextended = true;
if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
$okforextended = false;
}
$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 500, 'dolibarr_mailings', 'In', 0, true, $okforextended, ROWS_6, '90%');
print $doleditor->Create(1);
}
if ($tmpfieldlist == 'content_lines') {
print $form->textwithpicto($langs->trans("ContentForLines"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>';
$okforextended = true;
if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
$okforextended = false;
$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
print $doleditor->Create(1);
}
print '</td>';
print '<td></td>';
print '<td></td>';
} }
}
print "</tr>\n"; print "</tr>\n";
} else {
// If template is for a module, check module is enabled. $nbqualified++;
if ($obj->module) { } else {
$tempmodulekey = $obj->module; // If template is for a module, check module is enabled.
if (empty($conf->$tempmodulekey) || empty($conf->$tempmodulekey->enabled)) { if ($obj->module) {
$i++; $tempmodulekey = $obj->module;
if (empty($conf->$tempmodulekey) || empty($conf->$tempmodulekey->enabled)) {
$i++;
continue;
}
}
$keyforobj = 'type_template';
if (!in_array($obj->$keyforobj, array_keys($elementList))) {
$i++;
continue; // It means this is a type of template not into elementList (may be because enabled condition of this type is false because module is not enabled)
}
// Test on 'enabled'
if (!dol_eval($obj->enabled, 1, 1, '1')) {
$i++;
continue; // Email template not qualified
}
$nbqualified++;
print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
$tmpaction = 'view';
$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
$reshook = $hookmanager->executeHooks('viewEmailTemplateFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
$error = $hookmanager->error; $errors = $hookmanager->errors;
if (empty($reshook)) {
foreach ($fieldlist as $field => $value) {
if (in_array($fieldlist[$field], array('content', 'content_lines'))) {
continue; continue;
} }
} $showfield = 1;
$align = "";
$keyforobj = 'type_template'; $class = "tddict";
if (!in_array($obj->$keyforobj, array_keys($elementList))) { $title = '';
$i++; $valuetoshow = $obj->{$fieldlist[$field]};
continue; // It means this is a type of template not into elementList (may be because enabled condition of this type is false because module is not enabled) if ($value == 'label' || $value == 'topic') {
} if ($langs->trans($valuetoshow) != $valuetoshow) {
// Test on 'enabled' $valuetoshow = $langs->trans($valuetoshow);
if (!dol_eval($obj->enabled, 1, 1, '1')) {
$i++;
continue; // Email template not qualified
}
print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
$tmpaction = 'view';
$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
$reshook = $hookmanager->executeHooks('viewEmailTemplateFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
$error = $hookmanager->error; $errors = $hookmanager->errors;
if (empty($reshook)) {
foreach ($fieldlist as $field => $value) {
if (in_array($fieldlist[$field], array('content', 'content_lines'))) {
continue;
} }
$showfield = 1; $valuetoshow = dol_escape_htmltag($valuetoshow);
$align = ""; }
$class = "tddict"; if ($value == 'label') {
$title = ''; $class .= ' tdoverflowmax100';
$valuetoshow = $obj->{$fieldlist[$field]}; }
if ($value == 'label' || $value == 'topic') { if ($value == 'topic') {
if ($langs->trans($valuetoshow) != $valuetoshow) { $class .= 'tdoverflowmax200 small';
$valuetoshow = $langs->trans($valuetoshow); }
} if ($value == 'type_template') {
$valuetoshow = dol_escape_htmltag($valuetoshow); $valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
} $align = "center";
if ($value == 'label') { }
$class .= ' tdoverflowmax100'; if ($value == 'lang' && $valuetoshow) {
} $valuetoshow = $valuetoshow.' - '.$langs->trans("Language_".$valuetoshow);
if ($value == 'topic') { }
$class .= 'tdoverflowmax200 small'; if ($value == 'fk_user') {
} if ($valuetoshow > 0) {
if ($value == 'type_template') { $fuser = new User($db);
$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow; $fuser->fetch($valuetoshow);
$align = "center"; $valuetoshow = $fuser->getNomUrl(1);
}
if ($value == 'lang' && $valuetoshow) {
$valuetoshow = $valuetoshow.' - '.$langs->trans("Language_".$valuetoshow);
}
if ($value == 'fk_user') {
if ($valuetoshow > 0) {
$fuser = new User($db);
$fuser->fetch($valuetoshow);
$valuetoshow = $fuser->getNomUrl(1);
}
}
if ($value == 'private') {
$align = "center";
if ($valuetoshow) {
$valuetoshow = yn($valuetoshow);
} else {
$valuetoshow = '';
}
}
if ($value == 'position') {
$align = "center";
}
if ($value == 'joinfiles') {
$align = "center";
if ($valuetoshow) {
$valuetoshow = 1;
} else {
$valuetoshow = '';
}
}
if ($align) {
$class .= ' '.$align;
}
// Show value for field
if ($showfield) {
print '<!-- '.$fieldlist[$field].' -->';
print '<td class="'.$class.'"';
if (in_array($value, array('code', 'label', 'topic'))) {
print ' title="'.dol_escape_htmltag($valuetoshow).'"';
}
print '>';
print $valuetoshow;
print '</td>';
} }
} }
} if ($value == 'private') {
$align = "center";
if ($valuetoshow) {
$valuetoshow = yn($valuetoshow);
} else {
$valuetoshow = '';
}
}
if ($value == 'position') {
$align = "center";
}
if ($value == 'joinfiles') {
$align = "center";
if ($valuetoshow) {
$valuetoshow = 1;
} else {
$valuetoshow = '';
}
}
if ($align) {
$class .= ' '.$align;
}
// Can an entry be erased or disabled ? // Show value for field
$iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default if ($showfield) {
if (!$user->admin && $obj->fk_user != $user->id) { print '<!-- '.$fieldlist[$field].' -->';
$iserasable = 0; print '<td class="'.$class.'"';
$canbedisabled = 0; if (in_array($value, array('code', 'label', 'topic'))) {
$canbemodified = 0; print ' title="'.dol_escape_htmltag($valuetoshow).'"';
}
print '>';
print $valuetoshow;
print '</td>';
}
} }
$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
if ($param) {
$url .= '&'.$param;
}
// Status / Active
print '<td class="center nowrap">';
if ($canbedisabled) {
print '<a href="'.$url.'&action='.$acts[$obj->active].'&token='.newToken().'">'.$actl[$obj->active].'</a>';
} else {
print '<span class="opacitymedium">'.$actl[$obj->active].'</span>';
}
print "</td>";
// Modify link / Delete link
print '<td class="center nowraponall" width="64">';
if ($canbemodified) {
print '<a class="reposition editfielda" href="'.$url.'&action=edit&token='.newToken().'">'.img_edit().'</a>';
}
if ($iserasable) {
print '<a class="marginleftonly" href="'.$url.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
//else print '<a href="#">'.img_delete().'</a>'; // Some dictionary can be edited by other profile than admin
}
print '</td>';
print "</tr>\n";
} }
}
$i++; // Can an entry be erased or disabled ?
$iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
if (!$user->admin && $obj->fk_user != $user->id) {
$iserasable = 0;
$canbedisabled = 0;
$canbemodified = 0;
}
$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
if ($param) {
$url .= '&'.$param;
}
// Status / Active
print '<td class="center nowrap">';
if ($canbedisabled) {
print '<a href="'.$url.'&action='.$acts[$obj->active].'&token='.newToken().'">'.$actl[$obj->active].'</a>';
} else {
print '<span class="opacitymedium">'.$actl[$obj->active].'</span>';
}
print "</td>";
// Modify link / Delete link
print '<td class="center nowraponall" width="64">';
if ($canbemodified) {
print '<a class="reposition editfielda" href="'.$url.'&action=edit&token='.newToken().'">'.img_edit().'</a>';
}
if ($iserasable) {
print '<a class="marginleftonly" href="'.$url.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
//else print '<a href="#">'.img_delete().'</a>'; // Some dictionary can be edited by other profile than admin
}
print '</td>';
print "</tr>\n";
}
} }
$i++;
} }
} else { }
dol_print_error($db);
// If no record found
if ($nbqualified == 0) {
$colspan = 10;
print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
} }
print '</table>'; print '</table>';

2
htdocs/admin/translation.php
View File

@ -90,7 +90,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
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 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
$transkey = ''; $transkey = '';
$transvalue = ''; $transvalue = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }

2
htdocs/blockedlog/admin/blockedlog_list.php
View File

@ -118,7 +118,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$search_ref = ''; $search_ref = '';
$search_amount = ''; $search_amount = '';
$search_showonlyerrors = 0; $search_showonlyerrors = 0;
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }

2
htdocs/comm/action/list.php
View File

@ -217,7 +217,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$dateend_dtstart = ''; $dateend_dtstart = '';
$dateend_dtend = ''; $dateend_dtend = '';
$search_status = ''; $search_status = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }

2
htdocs/comm/mailing/list.php
View File

@ -103,7 +103,7 @@ if (empty($reshook)) {
}*/ }*/
$search_ref = ''; $search_ref = '';
$search_all = ''; $search_all = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')

2
htdocs/comm/propal/list.php
View File

@ -340,7 +340,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$search_availability = ''; $search_availability = '';
$search_status = ''; $search_status = '';
$object_statut = ''; $object_statut = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
$search_categ_cus = 0; $search_categ_cus = 0;
$search_fk_cond_reglement = ''; $search_fk_cond_reglement = '';

2
htdocs/commande/list.php
View File

@ -267,7 +267,7 @@ if (empty($reshook)) {
$search_project = ''; $search_project = '';
$search_status = ''; $search_status = '';
$search_billed = ''; $search_billed = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
$search_categ_cus = 0; $search_categ_cus = 0;
$search_datecloture_start = ''; $search_datecloture_start = '';

2
htdocs/compta/bank/bankentries_list.php
View File

@ -214,7 +214,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$search_thirdparty_user = ''; $search_thirdparty_user = '';
$search_num_releve = ''; $search_num_releve = '';
$search_conciliated = ''; $search_conciliated = '';
$toselect = ''; $toselect = array();
$search_account = ""; $search_account = "";
if ($id > 0 || !empty($ref)) { if ($id > 0 || !empty($ref)) {

2
htdocs/compta/cashcontrol/cashcontrol_list.php
View File

@ -165,7 +165,7 @@ if (empty($reshook)) {
$search[$key.'_dtend'] = ''; $search[$key.'_dtend'] = '';
} }
} }
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')

2
htdocs/compta/facture/list.php
View File

@ -366,7 +366,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
$search_fac_rec_source_title = ''; $search_fac_rec_source_title = '';
$option = ''; $option = '';
$filter = ''; $filter = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
$search_categ_cus = 0; $search_categ_cus = 0;
} }

2
htdocs/compta/paiement/list.php
View File

@ -148,7 +148,7 @@ if (empty($reshook)) {
$search_company = ''; $search_company = '';
$search_status = ''; $search_status = '';
$option = ''; $option = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
} }

2
htdocs/compta/sociales/payments.php
View File

@ -80,7 +80,7 @@ $result = restrictedArea($user, 'tax', '', 'chargesociales', 'charges');
// Purge search criteria // 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 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_sc_type = ''; $search_sc_type = '';
//$toselect = ''; //$toselect = array();
//$search_array_options = array(); //$search_array_options = array();
} }

2
htdocs/contrat/list.php
View File

@ -203,7 +203,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$search_date_end = ''; $search_date_end = '';
$sall = ""; $sall = "";
$search_status = ""; $search_status = "";
$toselect = ''; $toselect = array();
$search_type_thirdparty = ''; $search_type_thirdparty = '';
$search_array_options = array(); $search_array_options = array();
} }

2
htdocs/contrat/services_list.php
View File

@ -201,7 +201,7 @@ if (empty($reshook)) {
$filter_opcloture = ""; $filter_opcloture = "";
$mode = ''; $mode = '';
$filter = ''; $filter = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
} }

2
htdocs/core/class/ldap.class.php
View File

@ -234,7 +234,7 @@ class Ldap
} }
} }
if (is_resource($this->connection)) { if (is_resource($this->connection) || is_object($this->connection)) {
// Upgrade connexion to TLS, if requested by the configuration // Upgrade connexion to TLS, if requested by the configuration
if (!empty($conf->global->LDAP_SERVER_USE_TLS)) { if (!empty($conf->global->LDAP_SERVER_USE_TLS)) {
// For test/debug // For test/debug

4
htdocs/core/db/Database.interface.php
View File

@ -502,8 +502,8 @@ interface Database
/** /**
* Returns the current line (as an object) for the resultset cursor * Returns the current line (as an object) for the resultset cursor
* *
* @param resource $resultset Cursor of the desired request * @param resource|Connection $resultset Handler of the desired request
* @return Object Object result line or false if KO or end of cursor * @return Object Object result line or false if KO or end of cursor
*/ */
public function fetch_object($resultset); public function fetch_object($resultset);
// phpcs:enable // phpcs:enable

14
htdocs/core/db/pgsql.class.php
View File

@ -584,7 +584,7 @@ class DoliDBPgsql extends DoliDB
{ {
// phpcs:enable // phpcs:enable
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (!is_resource($resultset)) { if (!is_resource($resultset) && !is_object($resultset)) {
$resultset = $this->_results; $resultset = $this->_results;
} }
return pg_fetch_object($resultset); return pg_fetch_object($resultset);
@ -601,7 +601,7 @@ class DoliDBPgsql extends DoliDB
{ {
// phpcs:enable // phpcs:enable
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (!is_resource($resultset)) { if (!is_resource($resultset) && !is_object($resultset)) {
$resultset = $this->_results; $resultset = $this->_results;
} }
return pg_fetch_array($resultset); return pg_fetch_array($resultset);
@ -618,7 +618,7 @@ class DoliDBPgsql extends DoliDB
{ {
// phpcs:enable // phpcs:enable
// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
if (!is_resource($resultset)) { if (!is_resource($resultset) && !is_object($resultset)) {
$resultset = $this->_results; $resultset = $this->_results;
} }
return pg_fetch_row($resultset); return pg_fetch_row($resultset);
@ -636,7 +636,7 @@ class DoliDBPgsql extends DoliDB
{ {
// phpcs:enable // phpcs:enable
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (!is_resource($resultset)) { if (!is_resource($resultset) && !is_object($resultset)) {
$resultset = $this->_results; $resultset = $this->_results;
} }
return pg_num_rows($resultset); return pg_num_rows($resultset);
@ -654,7 +654,7 @@ class DoliDBPgsql extends DoliDB
{ {
// phpcs:enable // phpcs:enable
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (!is_resource($resultset)) { if (!is_resource($resultset) && !is_object($resultset)) {
$resultset = $this->_results; $resultset = $this->_results;
} }
// pgsql necessite un resultset pour cette fonction contrairement // pgsql necessite un resultset pour cette fonction contrairement
@ -672,11 +672,11 @@ class DoliDBPgsql extends DoliDB
public function free($resultset = null) public function free($resultset = null)
{ {
// If resultset not provided, we take the last used by connexion // If resultset not provided, we take the last used by connexion
if (!is_resource($resultset)) { if (!is_resource($resultset) && !is_object($resultset)) {
$resultset = $this->_results; $resultset = $this->_results;
} }
// Si resultset en est un, on libere la memoire // Si resultset en est un, on libere la memoire
if (is_resource($resultset)) { if (is_resource($resultset) || is_object($resultset)) {
pg_free_result($resultset); pg_free_result($resultset);
} }
} }

2
htdocs/core/login/functions_ldap.php
View File

@ -260,7 +260,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
** 53 - Account inactive (manually locked out by administrator) ** 53 - Account inactive (manually locked out by administrator)
*/ */
dol_syslog("functions_ldap::check_user_password_ldap Authentication KO failed to connect to LDAP for '".$usertotest."'", LOG_NOTICE); dol_syslog("functions_ldap::check_user_password_ldap Authentication KO failed to connect to LDAP for '".$usertotest."'", LOG_NOTICE);
if (is_resource($ldap->connection)) { // If connection ok but bind ko if (is_resource($ldap->connection) || is_object($ldap->connection)) { // If connection ok but bind ko
$ldap->ldapErrorCode = ldap_errno($ldap->connection); $ldap->ldapErrorCode = ldap_errno($ldap->connection);
$ldap->ldapErrorText = ldap_error($ldap->connection); $ldap->ldapErrorText = ldap_error($ldap->connection);
dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText); dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);

2
htdocs/cron/list.php
View File

@ -115,7 +115,7 @@ if (empty($reshook)) {
$search_label = ''; $search_label = '';
$search_status = -1; $search_status = -1;
$search_lastresult = ''; $search_lastresult = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')

6
htdocs/debugbar/class/TraceableDB.php
View File

@ -684,10 +684,10 @@ class TraceableDB extends DoliDB
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Renvoie la ligne courante (comme un objet) pour le curseur resultset * Returns the current line (as an object) for the resultset cursor
* *
* @param resource $resultset Curseur de la requete voulue * @param resource|Connection $resultset Handler of the desired SQL request
* @return Object Object result line or false if KO or end of cursor * @return Object Object result line or false if KO or end of cursor
*/ */
public function fetch_object($resultset) public function fetch_object($resultset)
{ {

2
htdocs/eventorganization/conferenceorbooth_list.php
View File

@ -205,7 +205,7 @@ if (empty($reshook)) {
$search[$key.'_dtend'] = ''; $search[$key.'_dtend'] = '';
} }
} }
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')

2
htdocs/eventorganization/conferenceorboothattendee_list.php
View File

@ -206,7 +206,7 @@ if (empty($reshook)) {
$search[$key.'_dtend'] = ''; $search[$key.'_dtend'] = '';
} }
} }
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')

2
htdocs/expedition/list.php
View File

@ -196,7 +196,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$search_datereceipt_start = ''; $search_datereceipt_start = '';
$search_datereceipt_end = ''; $search_datereceipt_end = '';
$search_status = ''; $search_status = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
$search_categ_cus = 0; $search_categ_cus = 0;
} }

2
htdocs/expensereport/list.php
View File

@ -224,7 +224,7 @@ if (empty($reshook)) {
$search_date_endendyear = ''; $search_date_endendyear = '';
$search_date_end = ''; $search_date_end = '';
$search_date_endend = ''; $search_date_endend = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')

2
htdocs/fichinter/list.php
View File

@ -171,7 +171,7 @@ if (empty($reshook)) {
$search_contrat_ref = ""; $search_contrat_ref = "";
$search_desc = ""; $search_desc = "";
$search_status = ""; $search_status = "";
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }

2
htdocs/fourn/commande/list.php
View File

@ -291,7 +291,7 @@ if (empty($reshook)) {
$search_date_approve_end = ''; $search_date_approve_end = '';
$billed = ''; $billed = '';
$search_billed = ''; $search_billed = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')

2
htdocs/fourn/facture/list.php
View File

@ -290,7 +290,7 @@ if (empty($reshook)) {
$search_datelimit_endyear = ''; $search_datelimit_endyear = '';
$search_datelimit_start = ''; $search_datelimit_start = '';
$search_datelimit_end = ''; $search_datelimit_end = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
$filter = ''; $filter = '';
$option = ''; $option = '';

2
htdocs/fourn/product/list.php
View File

@ -108,7 +108,7 @@ if (empty($reshook)) {
$search_field2 = ''; $search_field2 = '';
$search_date_creation = ''; $search_date_creation = '';
$search_date_update = ''; $search_date_update = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
} }

2
htdocs/holiday/define_holiday.php
View File

@ -111,7 +111,7 @@ if (empty($reshook)) {
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 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_name = ''; $search_name = '';
$search_supervisor = ''; $search_supervisor = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }

2
htdocs/holiday/list.php
View File

@ -200,7 +200,7 @@ if (empty($reshook)) {
$search_valideur = ""; $search_valideur = "";
$search_status = ""; $search_status = "";
$search_type = ''; $search_type = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')

2
htdocs/holiday/month_report.php
View File

@ -95,7 +95,7 @@ if (empty($reshook)) {
$search_employee = ''; $search_employee = '';
$search_type = ''; $search_type = '';
$search_description = ''; $search_description = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }

2
htdocs/holiday/view_log.php
View File

@ -133,7 +133,7 @@ if (empty($reshook)) {
$search_type = ''; $search_type = '';
$search_prev_solde = ''; $search_prev_solde = '';
$search_new_solde = ''; $search_new_solde = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }

6
htdocs/install/mysql/migration/15.0.0-16.0.0.sql
View File

@ -346,3 +346,9 @@ ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD COLUMN firstname
ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD COLUMN lastname varchar(100); ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD COLUMN lastname varchar(100);
ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD COLUMN email_company varchar(128) after email; ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD COLUMN email_company varchar(128) after email;
ALTER TABLE llx_c_email_template ADD COLUMN email_from varchar(255);
ALTER TABLE llx_c_email_template ADD COLUMN email_to varchar(255);
ALTER TABLE llx_c_email_template ADD COLUMN email_tocc varchar(255);
ALTER TABLE llx_c_email_template ADD COLUMN email_tobcc varchar(255);

4
htdocs/install/mysql/tables/llx_c_email_templates.sql
View File

@ -32,6 +32,10 @@ create table llx_c_email_templates
position smallint, -- Position position smallint, -- Position
enabled varchar(255) DEFAULT '1', -- Condition to have this module visible enabled varchar(255) DEFAULT '1', -- Condition to have this module visible
active tinyint DEFAULT 1 NOT NULL, active tinyint DEFAULT 1 NOT NULL,
email_from varchar(255), -- default email from
email_to varchar(255), -- default email to
email_tocc varchar(255), -- default email to cc
email_tobcc varchar(255), -- default email to bcc
topic text, -- Predefined topic topic text, -- Predefined topic
joinfiles text, -- Files to attach joinfiles text, -- Files to attach
content mediumtext, -- Predefined text content mediumtext, -- Predefined text

2
htdocs/knowledgemanagement/knowledgerecord_list.php
View File

@ -189,7 +189,7 @@ if (empty($reshook)) {
$search[$key.'_dtend'] = ''; $search[$key.'_dtend'] = '';
} }
} }
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')

2
htdocs/mrp/mo_movements.php
View File

@ -193,7 +193,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$search_batch = ""; $search_batch = "";
$search_qty = ''; $search_qty = '';
$sall = ""; $sall = "";
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }

2
htdocs/opensurvey/list.php
View File

@ -137,7 +137,7 @@ if (empty($reshook)) {
$search_status = ''; $search_status = '';
$search_title = ''; $search_title = '';
$search_ref = ''; $search_ref = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')

2
htdocs/partnership/partnership_list.php
View File

@ -185,7 +185,7 @@ if (empty($reshook)) {
$search[$key.'_dtend'] = ''; $search[$key.'_dtend'] = '';
} }
} }
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
$search_filter = ""; $search_filter = "";
} }

2
htdocs/product/stock/movement_card.php
View File

@ -161,7 +161,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$search_batch = ""; $search_batch = "";
$search_qty = ''; $search_qty = '';
$sall = ""; $sall = "";
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }

2
htdocs/product/stock/movement_list.php
View File

@ -223,7 +223,7 @@ if (empty($reshook)) {
$search_qty = ''; $search_qty = '';
$search_fk_projet=0; $search_fk_projet=0;
$sall = ""; $sall = "";
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')

2
htdocs/product/stock/productlot_list.php
View File

@ -168,7 +168,7 @@ if (empty($reshook)) {
foreach ($object->fields as $key => $val) { foreach ($object->fields as $key => $val) {
$search[$key] = ''; $search[$key] = '';
} }
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')

2
htdocs/projet/list.php
View File

@ -285,7 +285,7 @@ if (empty($reshook)) {
$search_accept_booth_suggestions = ''; $search_accept_booth_suggestions = '';
$search_price_registration = ''; $search_price_registration = '';
$search_price_booth = ''; $search_price_booth = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
$search_category_array = array(); $search_category_array = array();
} }

2
htdocs/projet/tasks.php
View File

@ -209,7 +209,7 @@ if (empty($reshook)) {
$search_progresscalc = ''; $search_progresscalc = '';
$search_progressdeclare = ''; $search_progressdeclare = '';
$search_task_budget_amount = ''; $search_task_budget_amount = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
$search_date_start_startmonth = ""; $search_date_start_startmonth = "";
$search_date_start_startyear = ""; $search_date_start_startyear = "";

2
htdocs/projet/tasks/time.php
View File

@ -164,7 +164,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$search_task_label = ''; $search_task_label = '';
$search_user = 0; $search_user = 0;
$search_valuebilled = ''; $search_valuebilled = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
$action = ''; $action = '';
} }

2
htdocs/societe/list.php
View File

@ -365,7 +365,7 @@ if (empty($reshook)) {
$search_level = ''; $search_level = '';
$search_parent_name = ''; $search_parent_name = '';
$search_import_key = ''; $search_import_key = '';
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }

2
htdocs/societe/website.php
View File

@ -144,7 +144,7 @@ if (empty($reshook)) {
foreach ($objectwebsiteaccount->fields as $key => $val) { foreach ($objectwebsiteaccount->fields as $key => $val) {
$search[$key] = ''; $search[$key] = '';
} }
$toselect = ''; $toselect = array();
$search_array_options = array(); $search_array_options = array();
} }
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')