diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index 97704a3cf40..c98c25f0e08 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -219,8 +219,6 @@ else */ $head = group_prepare_head($group); $title = $langs->trans("Group"); - if (! $group->entity) $title = $langs->trans("GlobalGroup"); - dol_fiche_head($head, 'group', $title); @@ -296,24 +294,24 @@ else // On salectionne les users qui ne sont pas deja dans le groupe $userlistid = array(); $uss = array(); - + $sql = "SELECT ug.fk_user"; $sql.= " FROM ".MAIN_DB_PREFIX."usergroup_user as ug"; $sql.= ", ".MAIN_DB_PREFIX."user as u"; $sql.= " WHERE ug.fk_usergroup = ".$group->id; $sql.= " AND ug.fk_user = u.rowid"; $sql.= " AND u.entity IN (0,".$conf->entity.")"; - + $result = $db->query($sql); if ($result) { $num = $db->num_rows($result); $i = 0; - + while ($i < $num) { $obj = $db->fetch_object($result); - + $userlistid[]=$obj->fk_user; $i++; } @@ -321,9 +319,9 @@ else else { dol_print_error($db); } - + $idList = implode(",",$userlistid); - + if (!empty($idList)) { $sql = "SELECT u.rowid, u.login, u.name, u.firstname, u.admin"; @@ -331,7 +329,7 @@ else $sql.= " WHERE u.entity IN (0,".$conf->entity.")"; $sql.= " AND u.rowid NOT IN (".$idList.")"; $sql.= " ORDER BY u.name"; - + $result = $db->query($sql); if ($result) { @@ -357,7 +355,7 @@ else $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " WHERE u.entity IN (0,".$conf->entity.")"; $sql.= " ORDER BY u.name"; - + $result = $db->query($sql); if ($result) { diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index 4b46958c9a4..3133a48209f 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -74,8 +74,6 @@ if ($_GET["id"]) */ $head = group_prepare_head($fgroup); $title = $langs->trans("Group"); - if (!$fgroup->entity) $title = $langs->trans("GlobalGroup"); - dol_fiche_head($head, 'rights', $title); diff --git a/htdocs/user/info.php b/htdocs/user/info.php index 68d4f4b068c..df838a214a2 100644 --- a/htdocs/user/info.php +++ b/htdocs/user/info.php @@ -51,9 +51,7 @@ $fuser->info($_GET["id"]); $head = user_prepare_head($fuser); -$title = $fuser->admin ? $langs->trans("Administrator") : $langs->trans("User"); -$title = !$fuser->entity ? $langs->trans("SuperAdministrator") : $title; - +$title = $langs->trans("User"); dol_fiche_head($head, 'info', $title); diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index af2c24b0194..ae73cf993c8 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -92,9 +92,7 @@ $form = new Form($db); */ $head = user_prepare_head($fuser); -$title = $fuser->admin ? $langs->trans("Administrator") : $langs->trans("User"); -$title = !$fuser->entity ? $langs->trans("SuperAdministrator") : $title; - +$title = $langs->trans("User"); dol_fiche_head($head, 'ldap', $title); diff --git a/htdocs/user/note.php b/htdocs/user/note.php index 76c6b632cfa..1ef059e8273 100644 --- a/htdocs/user/note.php +++ b/htdocs/user/note.php @@ -55,7 +55,7 @@ if (($fuser->id != $user->id) && (! $user->rights->user->user->lire)) if ($_POST["action"] == 'update' && $user->rights->user->user->creer && ! $_POST["cancel"]) { $db->begin(); - + $res=$fuser->update_note($_POST["note"],$user); if ($res < 0) { @@ -81,16 +81,14 @@ $html = new Form($db); if ($id) { $head = user_prepare_head($fuser); - - $title = $fuser->admin ? $langs->trans("Administrator") : $langs->trans("User"); - $title = !$fuser->entity ? $langs->trans("SuperAdministrator") : $title; + $title = $langs->trans("User"); dol_fiche_head($head, 'note', $title); if ($msg) print '