diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 677e1e1b906..1b0adea71dd 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -545,7 +545,7 @@ jQuery(document).ready(function () { '; - print ''."\n"; +print '
'."\n"; // Type if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) { @@ -564,9 +564,10 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) { $adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE); print ''; } - // Moral/Physic attribute - $morphys["phy"] = $langs->trans("Physical"); - $morphys["mor"] = $langs->trans("Moral"); + +// Moral/Physic attribute +$morphys["phy"] = $langs->trans("Physical"); +$morphys["mor"] = $langs->trans("Moral"); if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY)) { print ''."\n"; - // Lastname - print ''."\n"; - // Firstname - print ''."\n"; - // Gender - print ''; - print ''; - // Company - print ''."\n"; - // Address - print ''."\n"; - // Zip / Town - print ''; - // Country - print ''."\n"; +// Lastname +print ''."\n"; +// Firstname +print ''."\n"; +// Gender +print ''; +print ''; +// Company +print ''."\n"; +// Address +print ''."\n"; +// Zip / Town +print ''; +// Country +print ''; - // State +$country_code = getCountry($country_id, 2, $db, $langs); +print $form->select_country($country_id, 'country_id'); +print ''; +// State if (empty($conf->global->SOCIETE_DISABLE_STATE)) { print ''; } - // EMail - print ''."\n"; - // Login +// EMail +print ''."\n"; +// Login if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) { print ''."\n"; print ''."\n"; print ''."\n"; } - // Birthday - print ''."\n"; - // Photo - print ''."\n"; - // Public - print ''."\n"; - // Other attributes - $tpl_context = 'public'; // define template context to public - include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php'; - // Comments - print ''; - print ''; - print ''; - print ''."\n"; +// Birthday +print ''."\n"; +// Photo +print ''."\n"; +// Public +print ''."\n"; +// Other attributes +$tpl_context = 'public'; // define template context to public +include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php'; +// Comments +print ''; +print ''; +print ''; +print ''."\n"; // Add specific fields used by Dolibarr foundation for example if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) { @@ -719,24 +721,24 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER print ' '.$langs->trans("Currency".$conf->currency); print ''; } - print "
'.$langs->trans('MemberNature').' *'."\n"; print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1); @@ -575,33 +576,34 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY)) { print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY]; print ''; } - // Civility - print '
'.$langs->trans('UserTitle').''; - print $formcompany->select_civility(GETPOST('civility_id'), 'civility_id').'
'.$langs->trans("Lastname").' *
'.$langs->trans("Firstname").' *
'.$langs->trans("Gender").''; - $arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman")); - print $form->selectarray('gender', $arraygender, GETPOST('gender') ?GETPOST('gender') : $object->gender, 1); - print '
'.$langs->trans("Company").'
'.$langs->trans("Address").''."\n"; - print '
'.$langs->trans('Zip').' / '.$langs->trans('Town').''; - print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1); - print ' / '; - print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1); - print '
'.$langs->trans('Country').''; - $country_id = GETPOST('country_id'); + +// Civility +print '
'.$langs->trans('UserTitle').''; +print $formcompany->select_civility(GETPOST('civility_id'), 'civility_id').'
'.$langs->trans("Lastname").' *
'.$langs->trans("Firstname").' *
'.$langs->trans("Gender").''; +$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman")); +print $form->selectarray('gender', $arraygender, GETPOST('gender') ?GETPOST('gender') : $object->gender, 1); +print '
'.$langs->trans("Company").'
'.$langs->trans("Address").''."\n"; +print '
'.$langs->trans('Zip').' / '.$langs->trans('Town').''; +print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1); +print ' / '; +print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1); +print '
'.$langs->trans('Country').''; +$country_id = GETPOST('country_id'); if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) { $country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs); } @@ -616,10 +618,10 @@ if (!$country_id && !empty($conf->geoipmaxmind->enabled)) { } } } - $country_code = getCountry($country_id, 2, $db, $langs); - print $form->select_country($country_id, 'country_id'); - print '
'.$langs->trans('State').''; if ($country_code) { @@ -627,30 +629,30 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE)) { } print '
'.$langs->trans("Email").' *
'.$langs->trans("Email").' *
'.$langs->trans("Login").' *
'.$langs->trans("Password").' *
'.$langs->trans("PasswordAgain").' *
'.$langs->trans("DateOfBirth").''; - print $form->selectDate($birthday, 'birth', 0, 0, 1, "newmember", 1, 0); - print '
'.$langs->trans("URLPhoto").'
'.$langs->trans("Public").'
'.$langs->trans("Comments").'
'.$langs->trans("DateOfBirth").''; +print $form->selectDate($birthday, 'birth', 0, 0, 1, "newmember", 1, 0); +print '
'.$langs->trans("URLPhoto").'
'.$langs->trans("Public").'
'.$langs->trans("Comments").'
\n"; +print "\n"; - print dol_get_fiche_end(); +print dol_get_fiche_end(); - // Save - print '
'; - print ''; +// Save +print '
'; +print ''; if (!empty($backtopage)) { print '     '; } - print '
'; +print '
'; - print "\n"; - print "
"; - print ''; +print "\n"; +print "
"; +print ''; - llxFooterVierge(); +llxFooterVierge(); - $db->close(); +$db->close();