diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php index 8128815ef3b..8a26b12f15b 100644 --- a/htdocs/bookmarks/bookmarks.lib.php +++ b/htdocs/bookmarks/bookmarks.lib.php @@ -24,16 +24,11 @@ /** * Add area with bookmarks in menu * - * @param DoliDb $aDb Database handler - * @param Translate $aLangs Object lang * @return string */ -function printBookmarksList($aDb, $aLangs) +function printBookmarksList() { - global $conf, $user; - - $db = $aDb; - $langs = $aLangs; + global $conf, $user, $db, $langs; $ret = ''."\n"; @@ -155,16 +150,11 @@ function printBookmarksList($aDb, $aLangs) /** * Add area with bookmarks in top menu * - * @param DoliDb $aDb Database handler - * @param Translate $aLangs Object lang * @return string */ -function printDropdownBookmarksList($aDb, $aLangs) +function printDropdownBookmarksList() { - global $conf, $user; - - $db = $aDb; - $langs = $aLangs; + global $conf, $user, $db, $langs; require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php'; if (! isset($conf->global->BOOKMARKS_SHOW_IN_MENU)) $conf->global->BOOKMARKS_SHOW_IN_MENU=5; @@ -271,7 +261,7 @@ function printDropdownBookmarksList($aDb, $aLangs) var filter = $(this).val(), count = 0; $("#dropdown-bookmarks-list .bookmark-item").each(function () { - + if ($(this).text().search(new RegExp(filter, "i")) < 0) { $(this).addClass("hidden-search-result"); } else { diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 4fc94feb1f4..f522ad29fa8 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1625,16 +1625,16 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)){ // Add search dropdown - $toprightmenu.= top_menu_search($user, $langs); + $toprightmenu.= top_menu_search(); } if (!empty($conf->global->MAIN_USE_TOP_MENU_BOOKMARK_DROPDOWN)) { // Add bookmark dropdown - $toprightmenu .= top_menu_bookmark($user, $langs); + $toprightmenu .= top_menu_bookmark(); } // Add user dropdown - $toprightmenu.= top_menu_user($user, $langs); + $toprightmenu.= top_menu_user(); $toprightmenu.=''; @@ -1747,11 +1747,9 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead /** * Build the tooltip on user login * - * @param user $user User object - * @param Translate $langs Language object * @return string HTML content */ -function top_menu_user(User $user, Translate $langs) +function top_menu_user() { global $langs, $conf, $db, $hookmanager, $user; global $dolibarr_main_authentication, $dolibarr_main_demo; @@ -1916,15 +1914,13 @@ function top_menu_user(User $user, Translate $langs) /** * Build the tooltip on top menu bookmark * - * @param user $user User object - * @param Translate $langs Language object * @return string HTML content */ -function top_menu_bookmark(User $user, Translate $langs) +function top_menu_bookmark() { - global $langs, $conf, $db, $hookmanager, $user; - global $menumanager; - $html = ''; + global $langs, $conf, $db, $user; + + $html = ''; // Define $bookmarks if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire) @@ -1938,7 +1934,7 @@ function top_menu_bookmark(User $user, Translate $langs) '; @@ -1984,15 +1980,13 @@ function top_menu_bookmark(User $user, Translate $langs) /** * Build the tooltip on top menu tsearch * - * @param user $user User object - * @param Translate $langs Language object * @return string HTML content */ -function top_menu_search(User $user, Translate $langs) +function top_menu_search() { - global $langs, $conf, $db, $hookmanager, $user; - global $menumanager; - $html = ''; + global $langs, $conf, $db, $user; + + $html = ''; $usedbyinclude=1; $arrayresult=null; @@ -2003,7 +1997,7 @@ function top_menu_search(User $user, Translate $langs) // Menu with all bookmarks foreach ($arrayresult as $keyItem => $item) { - if(empty($defaultAction)){ + if (empty($defaultAction)) { $defaultAction= $item['url']; } $buttonList.='