diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 583f60188147d3381664c41e56eec57a20082e17..86d002f55cb0b0fb7ef63cb53e4bd406961b4478 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -2,7 +2,7 @@ /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2003 Xavier Dutoit <doli@sydesy.com> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> - * Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr> + * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2006 Jean Heimburger <jean@tiaris.info> * * This program is free software; you can redistribute it and/or modify diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index c83120d719403e46433385cb13a52b5c2e56f503..876be43abf06c944357a24c5a02666d4a3c904c5 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1373,10 +1373,14 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me // Search form hook of thirdparty module if (! empty($object->hooks['searchform'])) { + $searchform.='<!-- Begin search form hook area -->'."\n"; + foreach($object->hooks['searchform'] as $module) { $searchform.=$module->printSearchForm(); } + + $searchform.="\n".'<!-- End of search form hook area -->'."\n"; } // Define $bookmarks @@ -1482,19 +1486,23 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me } print "\n"; + print "</div>\n"; + print "<!-- End left vertical menu -->\n"; + + print "\n"; + // Left block hook of thirdparty module if (! empty($object->hooks['leftblock'])) { + print '<!-- Begin left block hook area -->'."\n"; + foreach($object->hooks['leftblock'] as $module) { $module->printLeftBlock(); } + + print "\n".'<!-- End of left block hook area -->'."\n"; } - - print "</div>\n"; - print "<!-- End left vertical menu -->\n"; - - print "\n"; if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '</div> <!-- End left layout -->'."\n"; else print '</td>';