diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index 7aaaebbac3e..10e61f24129 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -73,49 +73,24 @@ llxHeader("","ClickToDial"); if ($id > 0) { - $fuser = new User($db); - $fuser->fetch($id); - $fuser->fetch_clicktodial(); + $object = new User($db); + $object->fetch($id); + $object->fetch_clicktodial(); - /* - * Affichage onglets - */ - $head = user_prepare_head($fuser); + $head = user_prepare_head($object); $title = $langs->trans("User"); dol_fiche_head($head, 'clicktodial', $title, 0, 'user'); - /* - * Fiche en mode visu - */ - - print ''; - - // Ref - print ''; - print ''; - print ''; - - // Name - print ''; - print ''; - print "\n"; - - // Firstname - print ''; - print ''; - print "\n"; - - print "
'.$langs->trans("Ref").''; - print $form->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user->admin); - print '
'.$langs->trans("Lastname").''.$fuser->lastname.'
'.$langs->trans("Firstname").''.$fuser->firstname.'
\n"; - print "
\n"; - - // Edit mode + dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin); + + print '
'; + + // Edit mode if ($action == 'edit') { - print '
'; + print ''; print ''; print ''; print ''; @@ -124,8 +99,8 @@ if ($id > 0) { print ''; print ''; } - print ''; + print ''; print ''; + print ''; print "\n"; - print ''; + print ''; print ''; + print ''; print ''; - print ''; + print ''; print ''; + print ''; print "\n"; print '
ClickToDial URL'; - print ''; - if (empty($conf->global->CLICKTODIAL_URL) && empty($fuser->clicktodial_url)) + print ''; + if (empty($conf->global->CLICKTODIAL_URL) && empty($object->clicktodial_url)) { $langs->load("errors"); print ''.$langs->trans("ErrorModuleSetupNotComplete").''; @@ -138,19 +113,19 @@ if ($id > 0) print '
ClickToDial '.$langs->trans("IdPhoneCaller").'
ClickToDial '.$langs->trans("IdPhoneCaller").''; - print '
ClickToDial '.$langs->trans("Login").'
ClickToDial '.$langs->trans("Login").''; - print '
ClickToDial '.$langs->trans("Password").'
ClickToDial '.$langs->trans("Password").''; - print '
'; @@ -169,10 +144,10 @@ if ($id > 0) if (! empty($user->admin)) { - print "".'ClickToDial URL'; + print 'ClickToDial URL'; print ''; $url=$conf->global->CLICKTODIAL_URL; - if (! empty($fuser->clicktodial_url)) $url=$fuser->clicktodial_url; + if (! empty($object->clicktodial_url)) $url=$object->clicktodial_url; if (empty($url)) { $langs->load("errors"); @@ -180,28 +155,29 @@ if ($id > 0) } else { - print $form->textwithpicto((empty($fuser->clicktodial_url)?$langs->trans("DefaultLink").': ':'').$url,$langs->trans("ClickToDialUrlDesc")); + print $form->textwithpicto((empty($object->clicktodial_url)?$langs->trans("DefaultLink").': ':'').$url,$langs->trans("ClickToDialUrlDesc")); } print ''; print ''; } - print 'ClickToDial '.$langs->trans("IdPhoneCaller").''; - print ''.(! empty($fuser->clicktodial_poste)?$fuser->clicktodial_poste:'').''; + print 'ClickToDial '.$langs->trans("IdPhoneCaller").''; + print ''.(! empty($object->clicktodial_poste)?$object->clicktodial_poste:'').''; print ""; - print 'ClickToDial '.$langs->trans("Login").''; - print ''.(! empty($fuser->clicktodial_login)?$fuser->clicktodial_login:'').''; + print 'ClickToDial '.$langs->trans("Login").''; + print ''.(! empty($object->clicktodial_login)?$object->clicktodial_login:'').''; print ''; - print 'ClickToDial '.$langs->trans("Password").''; - print ''.preg_replace('/./','*',(! empty($fuser->clicktodial_password)?$fuser->clicktodial_password:'')).''; + print 'ClickToDial '.$langs->trans("Password").''; + print ''.preg_replace('/./','*',(! empty($object->clicktodial_password)?$object->clicktodial_password:'')).''; print "\n"; print "\n"; } - print "\n"; + dol_fiche_end(); + /* * Barre d'actions @@ -210,11 +186,10 @@ if ($id > 0) if (! empty($user->admin) && $action <> 'edit') { - print ''.$langs->trans("Modify").''; + print ''.$langs->trans("Modify").''; } print "\n"; - print "
\n"; } diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index 0ee41812c29..3445ab44959 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -89,27 +89,14 @@ $head = user_prepare_head($object); $title = $langs->trans("User"); dol_fiche_head($head, 'ldap', $title, 0, 'user'); +dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin); + +print '
'; + print ''; -// Ref -print ''; -print ''; -print ''; - -// Lastname -print ''; -print ''; -print "\n"; - -// Firstname -print ''; -print ''; -print "\n"; - // Login -print ''; +print ''; if ($object->ldap_sid) { print '';
'.$langs->trans("Ref").''; -print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin); -print '
'.$langs->trans("Lastname").''.$object->lastname.'
'.$langs->trans("Firstname").''.$object->firstname.'
'.$langs->trans("Login").'
'.$langs->trans("Login").''.$langs->trans("LoginAccountDisableInDolibarr").'