diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php index 7eb57e71018..4076217cf88 100644 --- a/htdocs/comm/mailing/advtargetemailing.php +++ b/htdocs/comm/mailing/advtargetemailing.php @@ -570,7 +570,7 @@ if ($object->fetch($id) >= 0) { print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing'); } print '' . "\n"; - print $formadvtargetemaling->multiselect_country('cust_country', $array_query['cust_country']); + print $formadvtargetemaling->multiselectCountry('cust_country', $array_query['cust_country']); print '' . "\n"; print '' . "\n"; @@ -621,7 +621,7 @@ if ($object->fetch($id) >= 0) { print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing'); } print ''; - print $formadvtargetemaling->multiselect_prospection_status($array_query['cust_prospect_status'], 'cust_prospect_status', 1); + print $formadvtargetemaling->multiselectProspectionStatus($array_query['cust_prospect_status'], 'cust_prospect_status', 1); print '' . "\n"; print '' . "\n"; @@ -661,7 +661,7 @@ if ($object->fetch($id) >= 0) { print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing'); } print '' . "\n"; - print $formadvtargetemaling->multiselectselect_salesrepresentatives('cust_saleman', $array_query['cust_saleman'], $user); + print $formadvtargetemaling->multiselectselectSalesRepresentatives('cust_saleman', $array_query['cust_saleman'], $user); print '' . "\n"; print '' . "\n"; @@ -673,7 +673,7 @@ if ($object->fetch($id) >= 0) { print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing'); } print '' . "\n"; - print $formadvtargetemaling->multiselectselect_language('cust_language', $array_query['cust_language']); + print $formadvtargetemaling->multiselectselectLanguage('cust_language', $array_query['cust_language']); print '' . "\n"; print '' . "\n"; } @@ -685,7 +685,7 @@ if ($object->fetch($id) >= 0) { print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing'); } print '' . "\n"; - print $formadvtargetemaling->multiselect_customercategories('cust_categ', $array_query['cust_categ']); + print $formadvtargetemaling->multiselectCustomerCategories('cust_categ', $array_query['cust_categ']); print '' . "\n"; print '' . "\n"; } @@ -733,7 +733,7 @@ if ($object->fetch($id) >= 0) { print $formadvtargetemaling->advMultiselectarray('options_' . $key, $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key]); print '' . "\n"; } elseif (($extrafields->attribute_type[$key] == 'sellist')) { - print $formadvtargetemaling->advMultiselectarray_selllist('options_' . $key, $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key]); + print $formadvtargetemaling->advMultiselectarraySelllist('options_' . $key, $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key]); print '' . "\n"; } else { @@ -789,7 +789,7 @@ if ($object->fetch($id) >= 0) { print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing'); } print ''; - print $formadvtargetemaling->multiselect_civility('contact_civility', $array_query['contact_civility']); + print $formadvtargetemaling->multiselectCivility('contact_civility', $array_query['contact_civility']); print ''; // contact name @@ -814,7 +814,7 @@ if ($object->fetch($id) >= 0) { print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing'); } print '' . "\n"; - print $formadvtargetemaling->multiselect_country('contact_country', $array_query['contact_country']); + print $formadvtargetemaling->multiselectCountry('contact_country', $array_query['contact_country']); print '' . "\n"; print '' . "\n"; @@ -869,7 +869,7 @@ if ($object->fetch($id) >= 0) { print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing'); } print '' . "\n"; - print $formadvtargetemaling->multiselect_contactcategories('contact_categ', $array_query['contact_categ']); + print $formadvtargetemaling->multiselectContactCategories('contact_categ', $array_query['contact_categ']); print '' . "\n"; print '' . "\n"; } @@ -917,7 +917,7 @@ if ($object->fetch($id) >= 0) { print $formadvtargetemaling->advMultiselectarray('options_' . $key . '_cnct', $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key . '_cnct']); print '' . "\n"; } elseif (($extrafields->attribute_type[$key] == 'sellist')) { - print $formadvtargetemaling->advMultiselectarray_selllist('options_' . $key . '_cnct', $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key . '_cnct']); + print $formadvtargetemaling->advMultiselectarraySelllist('options_' . $key . '_cnct', $extrafields->attribute_param[$key]['options'], $array_query['options_' . $key . '_cnct']); print '' . "\n"; } else { diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php index fe65efc4fd2..9c340e1e33b 100644 --- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php +++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php @@ -49,7 +49,7 @@ class FormAdvTargetEmailing extends Form * @param string $htmlname select field * @return string select field */ - function multiselect_prospection_status($selected_array = array(), $htmlname = 'cust_prospect_status') { + function multiselectProspectionStatus($selected_array = array(), $htmlname = 'cust_prospect_status') { global $conf, $langs; $options_array = array (); @@ -57,7 +57,7 @@ class FormAdvTargetEmailing extends Form $sql .= " FROM " . MAIN_DB_PREFIX . "c_prospectlevel"; $sql .= " WHERE active > 0"; $sql .= " ORDER BY sortorder"; - dol_syslog ( get_class ( $this ) . '::multiselect_prospection_status sql=' . $sql, LOG_DEBUG ); + dol_syslog ( get_class ( $this ) . '::multiselectProspectionStatus sql=' . $sql, LOG_DEBUG ); $resql = $this->db->query ( $sql ); if ($resql) { $num = $this->db->num_rows ( $resql ); @@ -85,7 +85,7 @@ class FormAdvTargetEmailing extends Form * @param array $selected_array or Code or Label of preselected country * @return string HTML string with select */ - function multiselect_country($htmlname = 'country_id', $selected_array=array()) { + function multiselectCountry($htmlname = 'country_id', $selected_array=array()) { global $conf, $langs; $langs->load ( "dict" ); @@ -144,7 +144,7 @@ class FormAdvTargetEmailing extends Form * @param User $user User action * @return string combo list code */ - function multiselectselect_salesrepresentatives($htmlname, $selected_array, $user) { + function multiselectselectSalesRepresentatives($htmlname, $selected_array, $user) { global $conf; @@ -185,7 +185,7 @@ class FormAdvTargetEmailing extends Form * @param array $selected_array selected array * @return string combo list code */ - function multiselectselect_language($htmlname='', $selected_array=array()) { + function multiselectselectLanguage($htmlname='', $selected_array=array()) { global $conf,$langs; @@ -211,7 +211,7 @@ class FormAdvTargetEmailing extends Form * * @return string HTML combo */ - function advMultiselectarray_selllist($htmlname, $sqlqueryparam = array(), $selected_array = array()) { + function advMultiselectarraySelllist($htmlname, $sqlqueryparam = array(), $selected_array = array()) { if (is_array ( $sqlqueryparam )) { $options_array=array(); @@ -279,7 +279,7 @@ class FormAdvTargetEmailing extends Form * @param array $selected_array array * @return string HTML combo */ - function multiselect_civility($htmlname='civilite_id',$selected_array = array()) + function multiselectCivility($htmlname='civilite_id',$selected_array = array()) { global $conf,$langs,$user; $langs->load("dict"); @@ -386,9 +386,9 @@ class FormAdvTargetEmailing extends Form * @param array $selected_array value selected * @return string HTML combo */ - function multiselect_customercategories($htmlname='cust_cat',$selected_array = array()) + function multiselectCustomerCategories($htmlname='cust_cat',$selected_array = array()) { - return $this->multiselect_categories($htmlname,$selected_array,2); + return $this->multiselectCategories($htmlname,$selected_array,2); } /** @@ -398,9 +398,9 @@ class FormAdvTargetEmailing extends Form * @param array $selected_array value selected * @return string HTML combo */ - function multiselect_contactcategories($htmlname='contact_cat',$selected_array = array()) + function multiselectContactCategories($htmlname='contact_cat',$selected_array = array()) { - return $this->multiselect_categories($htmlname,$selected_array,4); + return $this->multiselectCategories($htmlname,$selected_array,4); } /** @@ -411,7 +411,7 @@ class FormAdvTargetEmailing extends Form * @param int $type type * @return string HTML combo */ - public function multiselect_categories($htmlname='',$selected_array = array(), $type=0) + public function multiselectCategories($htmlname='',$selected_array = array(), $type=0) { global $conf,$langs,$user; $langs->load("dict");