diff --git a/htdocs/includes/menus/barre_left/auguria_backoffice.php b/htdocs/includes/menus/barre_left/auguria_backoffice.php index c6c158781e1..718dd5c83ac 100644 --- a/htdocs/includes/menus/barre_left/auguria_backoffice.php +++ b/htdocs/includes/menus/barre_left/auguria_backoffice.php @@ -46,10 +46,10 @@ class MenuLeft { /** * \brief Constructeur - * \param db Handler d'acc�s base de donn�e - * \param menu_array Tableau des entr�e de menu d�fini dans les fichier pre.inc.php + * \param db Handler d'acces base de donnee + * \param menu_array Tableau des entree de menu defini dans les fichier pre.inc.php */ - function MenuLeft($db,&$menu_array) + function MenuLeft($db,&$menu_array='') { $this->db=$db; $this->menu_array=$menu_array; @@ -142,7 +142,7 @@ class MenuLeft { // Affichage du menu $alt=0; - if (sizeof($this->menu_array)) + if (is_array($this->menu_array)) { $contenu = 0; for ($i = 0 ; $i < sizeof($this->menu_array) ; $i++) diff --git a/htdocs/includes/menus/barre_left/auguria_frontoffice.php b/htdocs/includes/menus/barre_left/auguria_frontoffice.php index 21012e06cf5..a7a5a3d3a73 100644 --- a/htdocs/includes/menus/barre_left/auguria_frontoffice.php +++ b/htdocs/includes/menus/barre_left/auguria_frontoffice.php @@ -46,10 +46,10 @@ class MenuLeft { /** * \brief Constructeur - * \param db Handler d'acc�s base de donn�e - * \param menu_array Tableau des entr�e de menu d�fini dans les fichier pre.inc.php + * \param db Handler d'acces base de donnee + * \param menu_array Tableau des entree de menu defini dans les fichier pre.inc.php */ - function MenuLeft($db,&$menu_array) + function MenuLeft($db,&$menu_array='') { $this->db=$db; $this->menu_array=$menu_array; @@ -142,7 +142,7 @@ class MenuLeft { // Affichage du menu $alt=0; - if (sizeof($this->menu_array)) + if (is_array($this->menu_array)) { $contenu = 0; for ($i = 0 ; $i < sizeof($this->menu_array) ; $i++) diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 7904d09bc8e..5b02c601bdd 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -47,7 +47,7 @@ class MenuLeft { * \param db Handler d'acces base de donnee * \param menu_array Tableau des entree de menu defini dans les fichier pre.inc.php */ - function MenuLeft($db,&$menu_array) + function MenuLeft($db,&$menu_array='') { $this->db=$db; $this->menu_array=$menu_array; @@ -906,7 +906,7 @@ class MenuLeft { // Affichage du menu $alt=0; - if (sizeof($this->menu_array)) + if (is_array($this->menu_array)) { $contenu = 0; for ($i = 0 ; $i < sizeof($this->menu_array) ; $i++) diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index 0fa2ba162bb..558a6927aeb 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -46,7 +46,7 @@ class MenuLeft { * \param db Handler d'acces base de donnee * \param menu_array Tableau des entree de menu defini dans les fichier pre.inc.php */ - function MenuLeft($db,&$menu_array) + function MenuLeft($db,&$menu_array='') { $this->db=$db; $this->menu_array=$menu_array; @@ -914,7 +914,7 @@ class MenuLeft { // Affichage du menu $alt=0; - if (sizeof($this->menu_array)) + if (is_array($this->menu_array)) { $contenu = 0; for ($i = 0 ; $i < sizeof($this->menu_array) ; $i++) diff --git a/htdocs/includes/menus/barre_left/empty.php b/htdocs/includes/menus/barre_left/empty.php index 2b6ff3233ed..8d96f07f83a 100644 --- a/htdocs/includes/menus/barre_left/empty.php +++ b/htdocs/includes/menus/barre_left/empty.php @@ -36,7 +36,7 @@ class MenuLeft { * \param db Dabatase handler * \param menu_array Menu array that you will override in showmenu() function */ - function MenuLeft($db,&$menu_array) + function MenuLeft($db,&$menu_array='') { $this->db=$db; $this->menu_array=$menu_array; diff --git a/htdocs/includes/menus/barre_left/rodolphe.php b/htdocs/includes/menus/barre_left/rodolphe.php index 4b71e266caa..765123e7ae1 100644 --- a/htdocs/includes/menus/barre_left/rodolphe.php +++ b/htdocs/includes/menus/barre_left/rodolphe.php @@ -43,10 +43,10 @@ class MenuLeft { /** * \brief Constructeur - * \param db Handler d'acc�s base de donn�e - * \param menu_array Tableau des entr�e de menu d�fini dans les fichier pre.inc.php + * \param db Handler d'acces base de donnee + * \param menu_array Tableau des entree de menu defini dans les fichier pre.inc.php */ - function MenuLeft($db,&$menu_array) + function MenuLeft($db,&$menu_array='') { $this->db=$db; $this->menu_array=$menu_array; diff --git a/htdocs/index.php b/htdocs/index.php index 27d1c842b2c..217468d866e 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -26,7 +26,7 @@ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. -require("./pre.inc.php"); +require("./main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/boxes.php"); @@ -42,6 +42,7 @@ $infobox=new InfoBox($db); // No actions + /* * View */ @@ -125,7 +126,7 @@ if ($user->societe_id == 0) ! empty($conf->facture->enabled) && $user->rights->facture->lire, ! empty($conf->telephonie->enabled) && $user->rights->telephonie->lire, ! empty($conf->societe->enabled) && $user->rights->contrat->activer); - // Class file containing the method load_state_board for each line + // Class file containing the method load_state_board for each line $includes=array(DOL_DOCUMENT_ROOT."/client.class.php", DOL_DOCUMENT_ROOT."/prospect.class.php", DOL_DOCUMENT_ROOT."/fourn/fournisseur.class.php", @@ -161,7 +162,7 @@ if ($user->societe_id == 0) 'invoices', 'sign', 'Contracts'); - // Dashboard Icon lines + // Dashboard Icon lines $icons=array('company', 'company', 'company', @@ -185,7 +186,7 @@ if ($user->societe_id == 0) "BillsCustomers", "Lignes de telephonie suivis", "Contracts"); - // Dashboard Link lines + // Dashboard Link lines $links=array(DOL_URL_ROOT.'/comm/clients.php', DOL_URL_ROOT.'/comm/prospect/prospects.php', DOL_URL_ROOT.'/fourn/index.php', diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 8b6cf2e0e0c..6c3b788f778 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -705,6 +705,131 @@ else } +/** + * \brief Show HTML header HTML + BODY + Top menu + left menu + DIV + * \param head + * \param title + * \param help_url + * \param target + * \param disablejs + * \param disablehead + * \param arrayofjs + * \param arrayofcss + */ +if (! function_exists("llxHeader")) +{ + function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='') + { + top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss); + left_menu('', $help_url); + } +} + + +/** + * \brief Show an HTML header + a BODY + The top menu bar + * \param head Lines in the HEAD + * \param title Title of web page + * \param target Target to use in menu links + * \param disablejs Do not output links to js (Ex: qd fonction utilisee par sous formulaire Ajax) + * \param disablehead Do not output head section + * \param arrayofjs Array of js files to add in header + * \param arrayofcss Array of css files to add in header + */ +function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='') +{ + global $user, $conf, $langs, $db, $dolibarr_main_authentication; + + if (! $conf->top_menu) $conf->top_menu ='eldy_backoffice.php'; + if (! $conf->left_menu) $conf->left_menu='eldy_backoffice.php'; + + top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers + + print '
'; + + /* + * Top menu + */ + print "\n".''."\n"; + print '\n\n"; +} + /** * \brief Show HTML header @@ -845,110 +970,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs } } -/** - * \brief Show an HTML header + a BODY + The top menu bar - * \param head Lines in the HEAD - * \param title Title of web page - * \param target Target to use in menu links - * \param disablejs Do not output links to js (Ex: qd fonction utilisee par sous formulaire Ajax) - * \param disablehead Do not output head section - * \param arrayofjs Array of js files to add in header - * \param arrayofcss Array of css files to add in header - */ -function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='') -{ - global $user, $conf, $langs, $db, $dolibarr_main_authentication; - - if (! $conf->top_menu) $conf->top_menu ='eldy_backoffice.php'; - if (! $conf->left_menu) $conf->left_menu='eldy_backoffice.php'; - - top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers - - print ''; - - /* - * Top menu - */ - print "\n".''."\n"; - print '\n\n"; -} - /** * \brief Show left menu bar