diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php index 255b476eb61..5b9e62c21df 100644 --- a/htdocs/user/agenda_extsites.php +++ b/htdocs/user/agenda_extsites.php @@ -68,7 +68,8 @@ if (($object->id != $user->id) && (! $user->rights->user->user->lire)) accessforbidden(); // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context -$hookmanager->initHooks(array('usercard','globalcard')); +$contextpage=array('usercard','useragenda','globalcard'); +$hookmanager->initHooks($contextpage); /* * Actions diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 09b2fb5b12c..5532bb8137b 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -48,19 +48,13 @@ if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherent if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $id = GETPOST('id','int'); -$action = GETPOST('action','alpha'); +$action = GETPOST('action','aZ09'); $mode = GETPOST('mode','alpha'); $confirm = GETPOST('confirm','alpha'); $subaction = GETPOST('subaction','alpha'); $group = GETPOST("group","int",3); $cancel = GETPOST('cancel','alpha'); -// Users/Groups management only in master entity if transverse mode -if (($action == 'create' || $action == 'adduserldap') && ! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) -{ - accessforbidden(); -} - // Define value to know what current user can do on users $canadduser=(! empty($user->admin) || $user->rights->user->user->creer); $canreaduser=(! empty($user->admin) || $user->rights->user->user->lire); @@ -106,7 +100,8 @@ $extrafields = new ExtraFields($db); $extralabels=$extrafields->fetch_name_optionals_label($object->table_element); // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array -$hookmanager->initHooks(array('usercard','globalcard')); +$contextpage=array('usercard','globalcard'); +$hookmanager->initHooks($contextpage); @@ -114,7 +109,7 @@ $hookmanager->initHooks(array('usercard','globalcard')); * Actions */ -$parameters=array('id'=>$socid); +$parameters=array('id' => $id, 'socid' => $socid, 'group' => $group, 'caneditgroup' => $caneditgroup); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); @@ -279,7 +274,7 @@ if (empty($reshook)) { } // Action add usergroup - if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield) + if (($action == 'addgroup' || $action == 'removegroup') && $caneditgroup) { if ($group) { @@ -289,10 +284,10 @@ if (empty($reshook)) { $object->fetch($id); if ($action == 'addgroup') { - $result = $object->SetInGroup($group, (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? GETPOST('entity', 'int') : $editgroup->entity)); + $result = $object->SetInGroup($group, $editgroup->entity); } if ($action == 'removegroup') { - $result = $object->RemoveFromGroup($group, (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? GETPOST('entity', 'int') : $editgroup->entity)); + $result = $object->RemoveFromGroup($group, $editgroup->entity); } if ($result > 0) { @@ -1706,7 +1701,7 @@ else include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php'; - if (GETPOST('action','aZ09') != 'presend' && GETPOST('action','aZ09') != 'send') + if ($action != 'presend' && $action != 'send') { /* * List of groups of user @@ -1724,12 +1719,9 @@ else if (! empty($groupslist)) { - if (! (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))) + foreach($groupslist as $groupforuser) { - foreach($groupslist as $groupforuser) - { - $exclude[]=$groupforuser->id; - } + $exclude[]=$groupforuser->id; } } @@ -1741,99 +1733,61 @@ else } print ''."\n"; - print ''."\n"; - if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) + + // Other form for add user to group + $parameters=array('caneditgroup' => $caneditgroup, 'groupslist' => $groupslist, 'exclude' => $exclude); + $reshook=$hookmanager->executeHooks('formAddUserToGroup',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + print $hookmanager->resPrint; + + if (empty($reshook)) { - print ''."\n"; + print ''."\n"; + + /* + * Groups assigned to user + */ + if (! empty($groupslist)) + { + foreach($groupslist as $group) { - if ($conf->entity == 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) + print ''; + print ''; - print "'."\n"; - - /* - * Groups assigned to user - */ - if (! empty($groupslist)) - { - foreach($groupslist as $group) - { - - - print ''; - print ''; - if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) - { - print ''; + print '\n"; } - print '\n"; } - } - else - { - print ''; + else + { + print ''; + } } print "
'.$langs->trans("Groups").''.$langs->trans("Entity").''; - } - print ''; - if ($caneditgroup) - { - // Users/Groups management only in master entity if transverse mode - if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) - { - // nothing - } - else + print '
'.$langs->trans("Groups").''; + if ($caneditgroup) { print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity); print '   '; - // Multicompany - if (! empty($conf->multicompany->enabled)) + print ''; + print ''; + } + print '
'; + if ($caneditgroup) { - print ''.$langs->trans("Entity").'".$mc->select_entities($conf->entity); + print ''.img_object($langs->trans("ShowGroup"),"group").' '.$group->name.''; } else { - print ''; + print img_object($langs->trans("ShowGroup"),"group").' '.$group->name; } - } - else - { - print ''; - } - print ''; - } - } - print '
'; - if ($caneditgroup) - { - print ''.img_object($langs->trans("ShowGroup"),"group").' '.$group->name.''; - } - else - { - print img_object($langs->trans("ShowGroup"),"group").' '.$group->name; - } - print ''; - if (! empty($group->usergroup_entity)) + print ''; + if ($caneditgroup) { - $nb=0; - foreach($group->usergroup_entity as $group_entity) - { - $mc->getInfo($group_entity); - print ($nb > 0 ? ', ' : '').$mc->label; - print ''; - print img_delete($langs->trans("RemoveFromGroup")); - print ''; - $nb++; - } + print ''; + print img_delete($langs->trans("RemoveFromGroup")); + print ''; } + else + { + print " "; + } + print "
'; - if ($caneditgroup && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) - { - print ''; - print img_delete($langs->trans("RemoveFromGroup")); - print ''; - } - else - { - print " "; - } - print "
'.$langs->trans("None").'
'.$langs->trans("None").'
"; diff --git a/htdocs/user/document.php b/htdocs/user/document.php index bc4727feaa8..27cf4eb757a 100644 --- a/htdocs/user/document.php +++ b/htdocs/user/document.php @@ -94,7 +94,8 @@ if ($id > 0 || ! empty($ref)) } // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context -$hookmanager->initHooks(array('usercard','globalcard')); +$contextpage=array('usercard','userdoc','globalcard'); +$hookmanager->initHooks($contextpage); /* @@ -135,7 +136,7 @@ if ($object->id) if ($user->rights->user->user->lire || $user->admin) { $linkback = ''.$langs->trans("BackToList").''; } - + dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin); print '
'; @@ -163,7 +164,7 @@ if ($object->id) print ''; print '
'; - + dol_fiche_end(); diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index a54c29ca8d7..0e2d77f749e 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -65,159 +65,167 @@ $extrafields = new ExtraFields($db); // fetch optionals attributes and labels $extralabels=$extrafields->fetch_name_optionals_label($object->table_element); -$hookmanager->initHooks(array('groupcard','globalcard')); +// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array +$contextpage=array('groupcard','globalcard'); +$hookmanager->initHooks($contextpage); /** - * Action remove group + * Actions */ -if ($action == 'confirm_delete' && $confirm == "yes") -{ - if ($caneditperms) - { - $object->fetch($id); - $object->delete(); - header("Location: index.php"); - exit; - } - else - { - $langs->load("errors"); - setEventMessages($langs->trans('ErrorForbidden'), null, 'errors'); - } -} -/** - * Action add group - */ -if ($action == 'add') -{ - if ($caneditperms) - { - if (! $_POST["nom"]) { - setEventMessages($langs->trans("NameNotDefined"), null, 'errors'); - $action="create"; // Go back to create page - } else { - $object->nom = trim($_POST["nom"]); // For backward compatibility - $object->name = trim($_POST["nom"]); - $object->note = trim($_POST["note"]); +$parameters=array('id' => $id, 'userid' => $userid, 'caneditperms' => $caneditperms); +$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - // Fill array 'array_options' with data from add form - $ret = $extrafields->setOptionalsFromPost($extralabels,$object); - if ($ret < 0) $error++; +if (empty($reshook)) { - if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $object->entity = 0; - else $object->entity = $_POST["entity"]; + // Action remove group + if ($action == 'confirm_delete' && $confirm == "yes") + { + if ($caneditperms) + { + $object->fetch($id); + $object->delete(); + header("Location: index.php"); + exit; + } + else + { + $langs->load("errors"); + setEventMessages($langs->trans('ErrorForbidden'), null, 'errors'); + } + } - $db->begin(); + // Action add group + if ($action == 'add') + { + if ($caneditperms) + { + if (! $_POST["nom"]) { + setEventMessages($langs->trans("NameNotDefined"), null, 'errors'); + $action="create"; // Go back to create page + } else { + $object->nom = trim($_POST["nom"]); // For backward compatibility + $object->name = trim($_POST["nom"]); + $object->note = trim($_POST["note"]); - $id = $object->create(); + // Fill array 'array_options' with data from add form + $ret = $extrafields->setOptionalsFromPost($extralabels,$object); + if ($ret < 0) $error++; - if ($id > 0) - { - $db->commit(); + if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $object->entity = 0; + else $object->entity = $_POST["entity"]; - header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); - exit; - } - else - { - $db->rollback(); + $db->begin(); - $langs->load("errors"); - setEventMessages($langs->trans("ErrorGroupAlreadyExists",$object->name), null, 'errors'); - $action="create"; // Go back to create page - } - } - } - else - { - $langs->load("errors"); - setEventMessages($langs->trans('ErrorForbidden'), null, 'errors'); - } -} + $id = $object->create(); + + if ($id > 0) + { + $db->commit(); + + header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); + exit; + } + else + { + $db->rollback(); + + $langs->load("errors"); + setEventMessages($langs->trans("ErrorGroupAlreadyExists",$object->name), null, 'errors'); + $action="create"; // Go back to create page + } + } + } + else + { + $langs->load("errors"); + setEventMessages($langs->trans('ErrorForbidden'), null, 'errors'); + } + } + + // Add/Remove user into group + if ($action == 'adduser' || $action =='removeuser') + { + if ($caneditperms) + { + if ($userid > 0) + { + $object->fetch($id); + $object->oldcopy = clone $object; + + $edituser = new User($db); + $edituser->fetch($userid); + if ($action == 'adduser') $result=$edituser->SetInGroup($object->id,$object->entity); + if ($action == 'removeuser') $result=$edituser->RemoveFromGroup($object->id,$object->entity); + + if ($result > 0) + { + header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); + exit; + } + else + { + setEventMessages($edituser->error, $edituser->errors, 'errors'); + } + } + } + else + { + $langs->load("errors"); + setEventMessages($langs->trans('ErrorForbidden'), null, 'errors'); + } + } + + + if ($action == 'update') + { + if ($caneditperms) + { + $db->begin(); + + $object->fetch($id); -// Add/Remove user into group -if ($action == 'adduser' || $action =='removeuser') -{ - if ($caneditperms) - { - if ($userid > 0) - { - $object->fetch($id); $object->oldcopy = clone $object; - $edituser = new User($db); - $edituser->fetch($userid); - if ($action == 'adduser') $result=$edituser->SetInGroup($object->id,(! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)?GETPOST('entity','int'):$object->entity)); - if ($action == 'removeuser') $result=$edituser->RemoveFromGroup($object->id,(! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)?GETPOST('entity','int'):$object->entity)); + $object->name = trim($_POST["group"]); + $object->nom = $object->name; // For backward compatibility + $object->note = dol_htmlcleanlastbr($_POST["note"]); - if ($result > 0) - { - header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); - exit; - } - else - { - setEventMessages($edituser->error, $edituser->errors, 'errors'); - } - } - } - else - { - $langs->load("errors"); - setEventMessages($langs->trans('ErrorForbidden'), null, 'errors'); - } + // Fill array 'array_options' with data from add form + $ret = $extrafields->setOptionalsFromPost($extralabels,$object); + if ($ret < 0) $error++; + + if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $object->entity = 0; + else $object->entity = $_POST["entity"]; + + $ret=$object->update(); + + if ($ret >= 0 && ! count($object->errors)) + { + setEventMessages($langs->trans("GroupModified"), null, 'mesgs'); + $db->commit(); + } + else + { + setEventMessages($object->error, $object->errors, 'errors'); + $db->rollback(); + } + } + else + { + $langs->load("errors"); + setEventMessages($langs->trans('ErrorForbidden'), null, 'mesgs'); + } + } + + // Actions to build doc + $upload_dir = $conf->usergroup->dir_output; + $permissioncreate=$user->rights->user->user->creer; + include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; } -if ($action == 'update') -{ - if ($caneditperms) - { - $db->begin(); - - $object->fetch($id); - - $object->oldcopy = clone $object; - - $object->name = trim($_POST["group"]); - $object->nom = $object->name; // For backward compatibility - $object->note = dol_htmlcleanlastbr($_POST["note"]); - - // Fill array 'array_options' with data from add form - $ret = $extrafields->setOptionalsFromPost($extralabels,$object); - if ($ret < 0) $error++; - - if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $object->entity = 0; - else $object->entity = $_POST["entity"]; - - $ret=$object->update(); - - if ($ret >= 0 && ! count($object->errors)) - { - setEventMessages($langs->trans("GroupModified"), null, 'mesgs'); - $db->commit(); - } - else - { - setEventMessages($object->error, $object->errors, 'errors'); - $db->rollback(); - } - } - else - { - $langs->load("errors"); - setEventMessages($langs->trans('ErrorForbidden'), null, 'mesgs'); - } -} - -// Actions to build doc -$upload_dir = $conf->usergroup->dir_output; -$permissioncreate=$user->rights->user->user->creer; -include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php'; - - - /* * View */ @@ -384,117 +392,87 @@ else // On selectionne les users qui ne sont pas deja dans le groupe $exclude = array(); - if (! empty($object->members)) - { - if (! (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))) - { - foreach($object->members as $useringroup) - { - $exclude[]=$useringroup->id; - } - } - } - - if ($caneditperms) - { - print '
'."\n"; - print ''; - print ''; - print ''."\n"; - print ''."\n"; - print ''; - print "'."\n"; - print '
'.$langs->trans("NonAffectedUsers").''; - print $form->select_dolusers('', 'user', 1, $exclude, 0, '', '', $object->entity, 0, 0, '', 0, '', 'maxwidth300'); - print '   '; - // Multicompany - if (! empty($conf->multicompany->enabled) && is_object($mc)) - { - if ($conf->entity == 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) - { - print ''.$langs->trans("Entity").'".$mc->select_entities($conf->entity); - } - else - { - print ''; - } - } - else - { - print ''; - } - print ''; - print '
'."\n"; - print '
'; - } - - /* - * Group members - */ - print ''; - print ''; - print ''; - print ''; - print ''; - if (! empty($conf->multicompany->enabled) && $conf->entity == 1) - { - print ''; - } - print ''; - print ''; - print "\n"; - if (! empty($object->members)) { foreach($object->members as $useringroup) { - print ''; - print ''; - print ''; - print ''; - if (! empty($conf->multicompany->enabled) && is_object($mc) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && ! $user->entity) - { - print ''; - } - print ''; - print '\n"; + $exclude[]=$useringroup->id; } - } - else - { - print ''; - } - print "
'.$langs->trans("Login").''.$langs->trans("Lastname").''.$langs->trans("Firstname").''.$langs->trans("Entity").''.$langs->trans("Status").' 
'; - print $useringroup->getNomUrl(-1, '', 0, 0, 24, 0, 'login'); - if ($useringroup->admin && ! $useringroup->entity) print img_picto($langs->trans("SuperAdministrator"),'redstar'); - else if ($useringroup->admin) print img_picto($langs->trans("Administrator"),'star'); - print ''.$useringroup->lastname.''.$useringroup->firstname.''; - if (! empty($useringroup->usergroup_entity)) - { - $nb=0; - foreach($useringroup->usergroup_entity as $group_entity) - { - $mc->getInfo($group_entity); - print ($nb > 0 ? ', ' : '').$mc->label; - print ''; - print img_delete($langs->trans("RemoveFromGroup")); - print ''; - $nb++; - } - } - print ''.$useringroup->getLibStatut(3).''; - if (! empty($user->admin) && empty($conf->multicompany->enabled)) - { - print ''; - print img_delete($langs->trans("RemoveFromGroup")); - print ''; - } - else - { - print "-"; - } - print "
'.$langs->trans("None").'
"; - print "
"; + } + + // Other form for add user to group + $parameters=array('caneditperms' => $caneditperms, 'exclude' => $exclude); + $reshook=$hookmanager->executeHooks('formAddUserToGroup',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + print $hookmanager->resPrint; + + if (empty($reshook)) + { + if ($caneditperms) + { + print '
'."\n"; + print ''; + print ''; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print '
'.$langs->trans("NonAffectedUsers").''; + print $form->select_dolusers('', 'user', 1, $exclude, 0, '', '', $object->entity, 0, 0, '', 0, '', 'maxwidth300'); + print '   '; + print ''; + print ''; + print '
'."\n"; + print '
'; + } + + /* + * Group members + */ + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print "\n"; + + if (! empty($object->members)) + { + foreach($object->members as $useringroup) + { + print ''; + print ''; + print ''; + print ''; + print ''; + print '\n"; + } + } + else + { + print ''; + } + print "
'.$langs->trans("Login").''.$langs->trans("Lastname").''.$langs->trans("Firstname").''.$langs->trans("Status").' 
'; + print $useringroup->getNomUrl(-1, '', 0, 0, 24, 0, 'login'); + if ($useringroup->admin && ! $useringroup->entity) print img_picto($langs->trans("SuperAdministrator"),'redstar'); + else if ($useringroup->admin) print img_picto($langs->trans("Administrator"),'star'); + print ''.$useringroup->lastname.''.$useringroup->firstname.''.$useringroup->getLibStatut(3).''; + if (! empty($user->admin)) + { + print ''; + print img_delete($langs->trans("RemoveFromGroup")); + print ''; + } + else + { + print "-"; + } + print "
'.$langs->trans("None").'
"; + } + + print "
"; + + print '
'; /* * Documents generes diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index 250c721f0fb..1b5f7c77b78 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -46,7 +46,9 @@ $object->fetch($id, '', '', 1); $object->getrights(); // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context -$hookmanager->initHooks(array('usercard','globalcard')); +$contextpage=array('usercard','userldap','globalcard'); +$hookmanager->initHooks($contextpage); + /* * Actions diff --git a/htdocs/user/note.php b/htdocs/user/note.php index 78fe25adfe9..55dd46e1129 100644 --- a/htdocs/user/note.php +++ b/htdocs/user/note.php @@ -50,7 +50,8 @@ if ($user->id == $id) $feature2=''; // A user can always read its own card $result = restrictedArea($user, 'user', $id, 'user&user', $feature2); // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context -$hookmanager->initHooks(array('usercard','globalcard')); +$contextpage=array('usercard','usernote','globalcard'); +$hookmanager->initHooks($contextpage); /* @@ -96,11 +97,11 @@ if ($id) if ($user->rights->user->user->lire || $user->admin) { $linkback = ''.$langs->trans("BackToList").''; } - + dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin); - + print '
'; - + print "
"; print ''; diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 8831b56f09a..81e8996aff2 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -79,7 +79,8 @@ $form = new Form($db); $formadmin=new FormAdmin($db); // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context -$hookmanager->initHooks(array('usercard','globalcard')); +$contextpage=array('usercard','userihm','globalcard'); +$hookmanager->initHooks($contextpage); /* @@ -188,9 +189,9 @@ if ($action == 'edit') if ($user->rights->user->user->lire || $user->admin) { $linkback = ''.$langs->trans("BackToList").''; } - + dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin); - + if (! empty($conf->use_javascript_ajax)) {/* print '';*/ - } + } if (! empty($conf->use_javascript_ajax)) { print ''; } - + clearstatcache(); $var=true; @@ -245,7 +246,7 @@ if ($action == 'edit') print ''.$langs->trans("Parameter").''.$langs->trans("DefaultValue").' '.$langs->trans("PersonalValue").''; // Landing page - + print ''.$langs->trans("LandingPage").''; print ''; print (empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE); @@ -257,9 +258,9 @@ if ($action == 'edit') print $form->selectarray('MAIN_LANDING_PAGE', $tmparray, (! empty($object->conf->MAIN_LANDING_PAGE)?$object->conf->MAIN_LANDING_PAGE:''), 0, 0, 0, '', 1); //print info_admin($langs->trans("WarningYouMayLooseAccess"), 0, 0, 0); print ''; - + // Langue par defaut - + print ''.$langs->trans("Language").''; print ''; $s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT); @@ -274,7 +275,7 @@ if ($action == 'edit') print ''; // Taille max des listes - + print ''.$langs->trans("MaxSizeList").''; print ''.$conf->global->MAIN_SIZE_LISTE_LIMIT.''; print 'conf->MAIN_SIZE_LISTE_LIMIT)?" checked":""); @@ -300,18 +301,18 @@ if ($action == 'edit') else { dol_fiche_head($head, 'guisetup', $title, -1, 'user'); - + $linkback = ''.$langs->trans("BackToList").''; - + dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin); - + $var=true; print ''; print ''; // Landing page - + print ''; print ''; - + // Language - + print ''; print ''; - + print ''; print ''; print ''; diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index 5de81b1dd26..e523d01009f 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -73,7 +73,7 @@ $object->getrights(); $entity=$conf->entity; // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context -$contextpage=array('usercard','globalcard'); +$contextpage=array('usercard','userperms','globalcard'); $hookmanager->initHooks($contextpage);
'.$langs->trans("Parameter").''.$langs->trans("DefaultValue").' '.$langs->trans("PersonalValue").'
'.$langs->trans("LandingPage").''; print (empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE); @@ -327,9 +328,9 @@ else else print $object->conf->MAIN_LANDING_PAGE; //print $form->selectarray('MAIN_LANDING_PAGE', $tmparray, (! empty($object->conf->MAIN_LANDING_PAGE)?$object->conf->MAIN_LANDING_PAGE:''), 0, 0, 0, '', 1); print '
'.$langs->trans("Language").''; $s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT); @@ -343,7 +344,7 @@ else print (isset($object->conf->MAIN_LANG_DEFAULT) && $object->conf->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):(! empty($object->conf->MAIN_LANG_DEFAULT)?$langs->trans("Language_".$object->conf->MAIN_LANG_DEFAULT):'')); print '
'.$langs->trans("MaxSizeList").''.(! empty($conf->global->MAIN_SIZE_LISTE_LIMIT)?$conf->global->MAIN_SIZE_LISTE_LIMIT:' ').'conf->MAIN_SIZE_LISTE_LIMIT)?" checked":"").'> '.$langs->trans("UsePersonalValue").'