From 70be160005454c047709b78b79b4bab2f5740c75 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Aug 2005 18:48:08 +0000 Subject: [PATCH] =?UTF-8?q?New:=20Ajoute=20fonction=20de=20personalisation?= =?UTF-8?q?=20des=20param=E8tres=20interface=20par=20utilisateur?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/user/addon.php | 183 ++++++++++++++------------- htdocs/user/clicktodial.php | 238 ++++++++++++++++++------------------ htdocs/user/fiche.php | 45 +++---- htdocs/user/group/fiche.php | 7 +- htdocs/user/home.php | 6 +- htdocs/user/perms.php | 4 + 6 files changed, 245 insertions(+), 238 deletions(-) diff --git a/htdocs/user/addon.php b/htdocs/user/addon.php index 0294b221104..18e3d72401e 100644 --- a/htdocs/user/addon.php +++ b/htdocs/user/addon.php @@ -35,14 +35,22 @@ $form = new Form($db); if ($_GET["action"] == 'create_bk4u_login') { - $edituser = new User($db, $_GET["id"]); - $edituser->fetch($_GET["id"]); - - $bk4u = new Bookmark4u($db); - $bk4u->get_bk4u_uid($fuser); - $bk4u->create_account_from_user($edituser); - - Header("Location: addon.php?id=".$_GET["id"]); + $edituser = new User($db, $_GET["id"]); + $edituser->fetch($_GET["id"]); + + $bk4u = new Bookmark4u($db); + $bk4u->get_bk4u_uid($fuser); + $result=$bk4u->create_account_from_user($edituser); + + if ($result > 0) + { + Header("Location: addon.php?id=".$_GET["id"]); + } + else + { + dolibarr_print_error($db,$bk4u->error); + exit; + } } llxHeader("","Addon Utilisateur"); @@ -56,109 +64,108 @@ llxHeader("","Addon Utilisateur"); if ($_GET["id"]) { - $fuser = new User($db, $_GET["id"]); - $fuser->fetch(); + $fuser = new User($db, $_GET["id"]); + $fuser->fetch(); - $bk4u = new Bookmark4u($db); - $bk4u->get_bk4u_uid($fuser); + $bk4u = new Bookmark4u($db); + $bk4u->get_bk4u_uid($fuser); - /* - * Affichage onglets - */ - - $h = 0; - - $head[$h][0] = DOL_URL_ROOT.'/user/fiche.php?id='.$fuser->id; - $head[$h][1] = $langs->trans("UserCard"); - $h++; + /* + * Affichage onglets + */ + + $h = 0; + + $head[$h][0] = DOL_URL_ROOT.'/user/fiche.php?id='.$fuser->id; + $head[$h][1] = $langs->trans("UserCard"); + $h++; - if ($user->admin) - { $head[$h][0] = DOL_URL_ROOT.'/user/perms.php?id='.$fuser->id; $head[$h][1] = $langs->trans("UserRights"); $h++; - } - if ($conf->bookmark4u->enabled) - { - $head[$h][0] = DOL_URL_ROOT.'/user/addon.php?id='.$fuser->id; - $head[$h][1] = $langs->trans("Bookmark4u"); - $hselected=$h; + $head[$h][0] = DOL_URL_ROOT.'/user/param_ihm.php?id='.$fuser->id; + $head[$h][1] = $langs->trans("UserGUISetup"); $h++; - } - if ($conf->clicktodial->enabled) + if ($conf->bookmark4u->enabled) { - $head[$h][0] = DOL_URL_ROOT.'/user/clicktodial.php?id='.$fuser->id; - $head[$h][1] = $langs->trans("ClickToDial"); - $h++; + $head[$h][0] = DOL_URL_ROOT.'/user/addon.php?id='.$fuser->id; + $head[$h][1] = $langs->trans("Bookmark4u"); + $hselected=$h; + $h++; } - dolibarr_fiche_head($head, $hselected, $langs->trans("User").": ".$fuser->fullname); - - /* - * Fiche en mode visu - */ - - print ''; - - print "".''; - print ''; - print ''; - print ''; - print "\n"; - - print "".''; - print ''; - print ''; - print ''; - print "\n"; - - - print "".''; - print ''; + print "\n"; + + + print "
'.$langs->trans("Lastname").''.$fuser->nom.''.$langs->trans("Firstname").''.$fuser->prenom.'
'.$langs->trans("Login").''.$fuser->login.''.$langs->trans("EMail").''.$fuser->email.'
'.$langs->trans("Login Boobkmark4u").''; - - if ($bk4u->uid == 0) + if ($conf->clicktodial->enabled) { - print $langs->trans("NoLogin"); + $head[$h][0] = DOL_URL_ROOT.'/user/clicktodial.php?id='.$fuser->id; + $head[$h][1] = $langs->trans("ClickToDial"); + $h++; } - else + + dolibarr_fiche_head($head, $hselected, $langs->trans("User").": ".$fuser->fullname); + + /* + * Fiche en mode visu + */ + + print ''; + + print ''; + print ''; + print ''; + print ''; + print "\n"; + + print ''; + print ''; + print ''; + print ''; + print "\n"; + + + print "".''; + print ''; - print ''; - print ''; - print "\n"; - - - print "
'.$langs->trans("Lastname").''.$fuser->nom.'
'.$langs->trans("Firstname").''.$fuser->prenom.'
'.$langs->trans("Login").''.$fuser->login.'
'.$langs->trans("EMail").''.$fuser->email.'
'.$langs->trans("Login Boobkmark4u").''; + + if ($bk4u->uid == 0) { - $bk4u->get_bk4u_login(); - print $bk4u->login; + print $langs->trans("NoLogin"); } - - print '  
\n"; - - print "\n"; - - - /* - * Barre d'actions - * - */ - print '
'; - - if ($user->admin) + else { - print ''.$langs->trans("Créer login Bookmark4u").''; + $bk4u->get_bk4u_login(); + print $bk4u->login; } - - print "
\n"; - print "
\n"; - + + print '
\n"; + + print "\n"; + + + /* + * Barre d'actions + * + */ + print '
'; + + if ($user->admin) + { + print ''.$langs->trans("Créer login Bookmark4u").''; + } + + print "
\n"; + print "
\n"; + } $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index 87d7232de2d..8385dd374bc 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -21,9 +21,9 @@ */ /** - \file htdocs/user/clicktodial.php - \brief Gestion des infos de click to dial - \version $Revision$ + \file htdocs/user/clicktodial.php + \brief Gestion des infos de click to dial + \version $Revision$ */ require("./pre.inc.php"); @@ -58,136 +58,138 @@ llxHeader("","Addon Utilisateur"); if ($_GET["id"]) { - $fuser = new User($db, $_GET["id"]); - $fuser->fetch(); - $fuser->fetch_clicktodial(); + $fuser = new User($db, $_GET["id"]); + $fuser->fetch(); + $fuser->fetch_clicktodial(); - $bk4u = new Bookmark4u($db); - $bk4u->get_bk4u_uid($fuser); + $bk4u = new Bookmark4u($db); + $bk4u->get_bk4u_uid($fuser); - /* - * Affichage onglets - */ - - $h = 0; - - $head[$h][0] = DOL_URL_ROOT.'/user/fiche.php?id='.$fuser->id; - $head[$h][1] = $langs->trans("UserCard"); - if ($_GET["action"] != 'perms') { $hselected=$h; } - $h++; - - $head[$h][0] = DOL_URL_ROOT.'/user/perms.php?id='.$fuser->id; - $head[$h][1] = $langs->trans("UserRights"); - $h++; - - if ($conf->bookmark4u->enabled) - { - $head[$h][0] = DOL_URL_ROOT.'/user/addon.php?id='.$fuser->id; - $head[$h][1] = $langs->trans("Bookmark4u"); + /* + * Affichage onglets + */ + + $h = 0; + + $head[$h][0] = DOL_URL_ROOT.'/user/fiche.php?id='.$fuser->id; + $head[$h][1] = $langs->trans("UserCard"); $h++; - } - - if ($conf->clicktodial->enabled) - { - $head[$h][0] = DOL_URL_ROOT.'/user/clicktodial.php?id='.$fuser->id; - $head[$h][1] = $langs->trans("ClickToDial"); - $hselected=$h; + + $head[$h][0] = DOL_URL_ROOT.'/user/perms.php?id='.$fuser->id; + $head[$h][1] = $langs->trans("UserRights"); $h++; - } - - dolibarr_fiche_head($head, $hselected, $langs->trans("User").": ".$fuser->fullname); - - /* - * Fiche en mode visu - */ - - print ''; - - print "".''; - print ''; - print ''; - print ''; - print "\n"; - - print "".''; - print ''; - print ''; - print ''; - print "\n"; - - print "
'.$langs->trans("LastName").''.$fuser->nom.''.$langs->trans("FirstName").''.$fuser->prenom.'
'.$langs->trans("Login").''.$fuser->login.''.$langs->trans("EMail").''.$fuser->email.'
\n"; - print "
\n"; - if ($_GET["action"] == 'edit') - { - print '
'; - print ''; - print ''; - print "".''; - print ''; - - print ''; - print ''; - print "\n"; - - print "".''; - print ''; - print ''; - print ''; - - print "\n"; - - print '
'.$langs->trans("Login").''; - print ''.$langs->trans("Password").''; - print '
Poste'; - print '  
'; - } - else - { + $head[$h][0] = DOL_URL_ROOT.'/user/param_ihm.php?id='.$fuser->id; + $head[$h][1] = $langs->trans("UserGUISetup"); + $h++; - print ''; - - print "".''; - print ''; - print ''; - print ''; - print "\n"; - - print "".''; - print ''; - print ''; - print ''; - - print "
'.$langs->trans("Login").''.$fuser->clicktodial_login.''.$langs->trans("Password").'XXXXXX
Poste'.$fuser->clicktodial_poste.'  
\n"; + if ($conf->bookmark4u->enabled) + { + $head[$h][0] = DOL_URL_ROOT.'/user/addon.php?id='.$fuser->id; + $head[$h][1] = $langs->trans("Bookmark4u"); + $h++; } - print "
\n"; - print "\n"; - - /* - * Barre d'actions - * - */ - print '
'; - - if ($user->admin && $_GET["action"] <> 'edit') + if ($conf->clicktodial->enabled) { - print ''.$langs->trans("Edit").''; - } - - if ($user->admin && $_GET["action"] == 'edit') - { - print ''.$langs->trans("Cancel").''; + $head[$h][0] = DOL_URL_ROOT.'/user/clicktodial.php?id='.$fuser->id; + $head[$h][1] = $langs->trans("ClickToDial"); + $hselected=$h; + $h++; } - print "
\n"; - print "
\n"; - + dolibarr_fiche_head($head, $hselected, $langs->trans("User").": ".$fuser->fullname); + + /* + * Fiche en mode visu + */ + + print ''; + + print "".''; + print ''; + print ''; + print ''; + print "\n"; + + print "".''; + print ''; + print ''; + print ''; + print "\n"; + + print "
'.$langs->trans("LastName").''.$fuser->nom.''.$langs->trans("FirstName").''.$fuser->prenom.'
'.$langs->trans("Login").''.$fuser->login.''.$langs->trans("EMail").''.$fuser->email.'
\n"; + print "
\n"; + + if ($_GET["action"] == 'edit') + { + print ''; + print ''; + print ''; + print "".''; + print ''; + + print ''; + print ''; + print "\n"; + + print "".''; + print ''; + print ''; + print ''; + + print "\n"; + + print '
'.$langs->trans("Login").''; + print ''.$langs->trans("Password").''; + print '
Poste'; + print '  
'; + } + else + { + + print ''; + + print "".''; + print ''; + print ''; + print ''; + print "\n"; + + print "".''; + print ''; + print ''; + print ''; + + print "
'.$langs->trans("Login").''.$fuser->clicktodial_login.''.$langs->trans("Password").'XXXXXX
Poste'.$fuser->clicktodial_poste.'  
\n"; + } + + print "
\n"; + print "\n"; + + /* + * Barre d'actions + */ + print '
'; + + if ($user->admin && $_GET["action"] <> 'edit') + { + print ''.$langs->trans("Edit").''; + } + + if ($user->admin && $_GET["action"] == 'edit') + { + print ''.$langs->trans("Cancel").''; + } + + print "
\n"; + print "
\n"; + } $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index a650ea5515d..22faddacd84 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -102,7 +102,6 @@ if ($_POST["action"] == 'add' && $user->admin) $edituser->email = trim($_POST["email"]); $edituser->admin = trim($_POST["admin"]); $edituser->webcal_login = trim($_POST["webcal_login"]); - $edituser->gui_lang = trim($_POST["gui_lang"]); $db->begin(); @@ -169,7 +168,6 @@ if ($_POST["action"] == 'update' && $user->admin) $edituser->email = $_POST["email"]; $edituser->admin = $_POST["admin"]; $edituser->webcal_login = $_POST["webcal_login"]; - $edituser->gui_lang = $_POST["gui_lang"]; $ret=$edituser->update(); if ($ret < 0) @@ -217,7 +215,7 @@ if ($_POST["action"] == 'update' && $user->admin) // Action modif mot de passe if ((($_POST["action"] == 'confirm_password' && $_POST["confirm"] == 'yes') - || $_GET["action"] == 'passwordsend') && $user->admin) + || $_GET["action"] == 'confirm_passwordsend') && $user->admin) { $edituser = new User($db, $_GET["id"]); $edituser->fetch(); @@ -231,7 +229,7 @@ if ((($_POST["action"] == 'confirm_password' && $_POST["confirm"] == 'yes') else { // Succes - if ($_GET["action"] == 'passwordsend') + if ($_GET["action"] == 'confirm_passwordsend') { if ($edituser->send_password($user,$newpassword) > 0) { @@ -303,15 +301,10 @@ if ($action == 'create') print "".''.$langs->trans("LoginWebcal").''; print ''; } - // Langue par defaut - print ''.$langs->trans("GuiLanguage").''; - $html=new Form($db); - $html->select_lang(MAIN_LANG_DEFAULT,'gui_lang'); - print ''; - print "".''; - print "
"; + print "".''; print "\n"; + print ""; } else { @@ -342,6 +335,10 @@ else $head[$h][1] = $langs->trans("UserRights"); $h++; + $head[$h][0] = DOL_URL_ROOT.'/user/param_ihm.php?id='.$fuser->id; + $head[$h][1] = $langs->trans("UserGUISetup"); + $h++; + if ($conf->bookmark4u->enabled) { $head[$h][0] = DOL_URL_ROOT.'/user/addon.php?id='.$fuser->id; @@ -360,7 +357,7 @@ else /* - * Confirmation modification mot depasse + * Confirmation réinitialisation mot de passe */ if ($action == 'password') { @@ -369,6 +366,16 @@ else print '
'; } + /* + * Confirmation envoi mot de passe + */ + if ($action == 'passwordsend') + { + $html = new Form($db); + $html->form_confirm("fiche.php?id=$fuser->id",$langs->trans("SendNewPassword"),$langs->trans("ConfirmSendNewPassword",$fuser->login),"confirm_passwordsend"); + print '
'; + } + /* * Confirmation désactivation */ @@ -475,13 +482,8 @@ else print ''.$fuser->webcal_login.' '; print "\n"; } - // Langue par defaut - print ''.$langs->trans("GuiLanguage").''; - print ''.$fuser->gui_lang.' '; - print "\n"; print "\n"; -// print "
\n"; print "\n"; @@ -526,8 +528,7 @@ else * Liste des groupes dans lequel est l'utilisateur */ - print_titre($langs->trans("ListOfGroupsForUser")); - print "
\n"; + print_fiche_titre($langs->trans("ListOfGroupsForUser")); // On sélectionne les groups $uss = array(); @@ -693,12 +694,6 @@ else print "".''.$langs->trans("LoginWebcal").''; print ''; - // Langue par defaut - print ''.$langs->trans("GuiLanguage").''; - $html=new Form($db); - $html->select_lang(MAIN_LANG_DEFAULT,'gui_lang'); - print ''; - print ''; print '
'; diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index 7861c7e8e86..f86c8e8a369 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -157,9 +157,9 @@ if ($action == 'create') print "\n"; - print "".''; - print ""; + print "".''; print "\n"; + print ""; } @@ -246,8 +246,7 @@ else * Liste des utilisateurs dans le groupe */ - print_titre($langs->trans("ListOfUsersInGroup")); - print "
\n"; + print_fiche_titre($langs->trans("ListOfUsersInGroup")); // On sélectionne les users qui ne sont pas déjà dans le groupe $uss = array(); diff --git a/htdocs/user/home.php b/htdocs/user/home.php index aa9974b7599..06f0250eb7d 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -40,9 +40,9 @@ if ($user->admin) $lien=''.img_p print_fiche_titre($langs->trans("MenuUsersAndGroups"),$lien); -print ''; +print '
'; -print '
'; +print '
'; @@ -69,7 +69,7 @@ print $langs->trans("Ref").' :

\n"; -print ''; +print ''; /* diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index e24b71e99a1..1e34391d034 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -86,6 +86,10 @@ if ($_GET["id"]) $hselected=$h; $h++; + $head[$h][0] = DOL_URL_ROOT.'/user/param_ihm.php?id='.$fuser->id; + $head[$h][1] = $langs->trans("UserGUISetup"); + $h++; + if ($conf->bookmark4u->enabled) { $head[$h][0] = DOL_URL_ROOT.'/user/addon.php?id='.$fuser->id;