diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 9c58ef9271b..7e07d70890b 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -603,7 +603,7 @@ Before=Avant After=Après IPAddress=Adresse IP Frequency=Fréquence -IM=Messagerie instantannée +IM=Messagerie instantanée NewAttribute=Nouvel attribut AttributeCode=Code de l'attribut OptionalFieldsSetup=Configuration des attributs complémentaires diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1d76e6782c1..e1705991b30 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -777,13 +777,15 @@ if (! function_exists("llxHeader")) * @param string $morequerystring Query string to add to the link "print" to get same parameters (use only if autodetect fails) * @return void */ - function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='') - { - top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers - top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring); - left_menu('', $help_url, '', '', 1, $title); - main_area($title); - } + function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='') + { + top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers + top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring); + if (empty($conf->global->MAIN_HIDE_LEFT_MENU)) { + left_menu('', $help_url, '', '', 1, $title); + } + main_area($title); + } } @@ -1172,11 +1174,10 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a /* * Top menu - */ + */ $top_menu=empty($conf->browser->phone)?$conf->top_menu:$conf->smart_menu; if (GETPOST('menu')) $top_menu=GETPOST('menu'); // menu=eldy_backoffice.php - // Load the top menu manager // Load the top menu manager (only if not already done) if (! class_exists('MenuTop')) { diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index 3cb1abffccb..0ee185c0432 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -46,7 +46,7 @@ if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS)) { $canreaduser=($user->admin || ($user->rights->user->user->lire && $user->rights->user->user_advance->readperms)); $caneditselfperms=($user->id == $id && $user->rights->user->self_advance->writeperms); - $caneditperms = (($caneditperms || $caneditselfperms) ? 0 : 1); + $caneditperms = (($caneditperms || $caneditselfperms) ? 1 : 0); } // Security check