- global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';
@@ -307,22 +304,22 @@
if (is_array($moredata) && !empty($moredata['searchform'])) // searchform can contains select2 code or link to show old search form or link to switch on search page
{
- print "\n";
- print "\n";
- print ''."\n";
- print "\n";
+ print "\n";
+ print "\n";
+ print ''."\n";
+ print "\n";
}
if (is_array($moredata) && !empty($moredata['bookmarks']))
{
- print "\n";
- print "\n";
- print ''."\n";
- print "\n";
+ print "\n";
+ print "\n";
+ print ''."\n";
+ print "\n";
}
$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
@@ -334,7 +331,7 @@
// We update newmenu for special dynamic menus
if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank') // Entry for each bank account
{
- include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Required for to get Account::TYPE_CASH for example
+ include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Required for to get Account::TYPE_CASH for example
$sql = "SELECT rowid, label, courant, rappro, courant";
$sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
@@ -360,7 +357,8 @@
}
$i++;
}
- } else dol_print_error($db);
+ }
+ else dol_print_error($db);
$db->free($resql);
}
@@ -390,16 +388,13 @@
$nature = '';
// Must match array $sourceList defined into journals_list.php
- if ($objp->nature == 2 && !empty($conf->facture->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) $nature = "sells";
- if ($objp->nature == 3
- && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled))
- && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES))
- $nature = "purchases";
- if ($objp->nature == 4 && !empty($conf->banque->enabled)) $nature = "bank";
- if ($objp->nature == 5 && !empty($conf->expensereport->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) $nature = "expensereports";
- if ($objp->nature == 1) $nature = "various";
- if ($objp->nature == 8) $nature = "inventory";
- if ($objp->nature == 9) $nature = "hasnew";
+ if ($objp->nature == 2 && ! empty($conf->facture->enabled)) $nature="sells";
+ if ($objp->nature == 3 && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled))) $nature="purchases";
+ if ($objp->nature == 4 && ! empty($conf->banque->enabled)) $nature="bank";
+ if ($objp->nature == 5 && ! empty($conf->expensereport->enabled)) $nature="expensereports";
+ if ($objp->nature == 1) $nature="various";
+ if ($objp->nature == 8) $nature="inventory";
+ if ($objp->nature == 9) $nature="hasnew";
// To enable when page exists
if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL))
@@ -409,17 +404,20 @@
if ($nature)
{
- $langs->load('accountancy');
- $journallabel = $langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...
- $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);
+ $langs->load('accountancy');
+ $journallabel = $langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...
+ $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);
}
$i++;
}
- } else {
+ }
+ else
+ {
// Should not happend. Entries are added
$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
}
- } else dol_print_error($db);
+ }
+ else dol_print_error($db);
$db->free($resql);
}
@@ -470,12 +468,14 @@
$lastopened = true;
for ($j = ($i + 1); $j < $num; $j++)
{
- if (empty($menu_array[$j]['level'])) $lastopened = false;
+ if (empty($menu_array[$j]['level'])) $lastopened = false;
}
if ($altok % 2 == 0)
{
print '
'."\n";
- } else {
+ }
+ else
+ {
print ''."\n";
$lastlevel0 = 'enabled';
- } elseif ($showmenu) // Not enabled but visible (so greyed)
+ }
+ elseif ($showmenu) // Not enabled but visible (so greyed)
{
print ''."\n";
$lastlevel0 = 'greyed';
- } else {
- $lastlevel0 = 'hidden';
+ }
+ else
+ {
+ $lastlevel0 = 'hidden';
}
if ($showmenu)
{
@@ -556,14 +559,15 @@
{
print ''."\n";
- } elseif ($showmenu && $lastlevel0 == 'enabled') // Not enabled but visible (so greyed), except if parent was not enabled.
+ }
+ elseif ($showmenu && $lastlevel0 == 'enabled') // Not enabled but visible (so greyed), except if parent was not enabled.
{
print ''."\n";
}
--- /tmp/dsg/dolibarr/htdocs/core/menus/standard/github_auguria_menu.php
+++ /tmp/dsg/dolibarr/htdocs/core/menus/standard/client_auguria_menu.php
@@ -29,31 +29,31 @@
class MenuManager
{
/**
- * @var DoliDB Database handler.
- */
- public $db;
-
- public $type_user; // Put 0 for internal users, 1 for external users
- public $atarget = ""; // To store default target to use onto links
- public $name = "auguria";
-
- public $menu_array;
- public $menu_array_after;
-
- public $tabMenu;
-
-
- /**
- * Constructor
- *
+ * @var DoliDB Database handler.
+ */
+ public $db;
+
+ public $type_user; // Put 0 for internal users, 1 for external users
+ public $atarget = ""; // To store default target to use onto links
+ public $name = "auguria";
+
+ public $menu_array;
+ public $menu_array_after;
+
+ public $tabMenu;
+
+
+ /**
+ * Constructor
+ *
* @param DoliDB $db Database handler
- * @param int $type_user Type of user
- */
- public function __construct($db, $type_user)
- {
- $this->type_user = $type_user;
- $this->db = $db;
- }
+ * @param int $type_user Type of user
+ */
+ public function __construct($db, $type_user)
+ {
+ $this->type_user = $type_user;
+ $this->db = $db;
+ }
/**
@@ -65,252 +65,270 @@
*/
public function loadMenu($forcemainmenu = '', $forceleftmenu = '')
{
- global $conf, $user, $langs;
+ global $conf, $user, $langs;
// On sauve en session le menu principal choisi
- if (GETPOSTISSET("mainmenu")) $_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');
- if (GETPOSTISSET("idmenu")) $_SESSION["idmenu"] = GETPOST("idmenu", 'int');
-
- // Read mainmenu and leftmenu that define which menu to show
- if (GETPOSTISSET("mainmenu"))
- {
- // On sauve en session le menu principal choisi
- $mainmenu = GETPOST("mainmenu", 'aZ09');
- $_SESSION["mainmenu"] = $mainmenu;
- $_SESSION["leftmenuopened"] = "";
- } else {
- // On va le chercher en session si non defini par le lien
- $mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
- }
+ if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"] = $_GET["mainmenu"];
+ if (isset($_GET["idmenu"])) $_SESSION["idmenu"] = $_GET["idmenu"];
+
+ // Read mainmenu and leftmenu that define which menu to show
+ if (isset($_GET["mainmenu"]))
+ {
+ // On sauve en session le menu principal choisi
+ $mainmenu = $_GET["mainmenu"];
+ $_SESSION["mainmenu"] = $mainmenu;
+ $_SESSION["leftmenuopened"] = "";
+ }
+ else
+ {
+ // On va le chercher en session si non defini par le lien
+ $mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
+ }
if (!empty($forcemainmenu)) $mainmenu = $forcemainmenu;
- if (GETPOSTISSET("leftmenu"))
- {
- // On sauve en session le menu principal choisi
- $leftmenu = GETPOST("leftmenu", 'aZ09');
- $_SESSION["leftmenu"] = $leftmenu;
-
- if ($_SESSION["leftmenuopened"] == $leftmenu) // To collapse
- {
- //$leftmenu="";
- $_SESSION["leftmenuopened"] = "";
- } else {
- $_SESSION["leftmenuopened"] = $leftmenu;
- }
- } else {
- // On va le chercher en session si non defini par le lien
- $leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';
- }
- if (!empty($forceleftmenu)) $leftmenu = $forceleftmenu;
-
- require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
- $tabMenu = array();
- $menuArbo = new Menubase($this->db, 'auguria');
- $menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'auguria', $tabMenu);
- $this->tabMenu = $tabMenu;
- //var_dump($tabMenu);
-
- //if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
+ if (isset($_GET["leftmenu"]))
+ {
+ // On sauve en session le menu principal choisi
+ $leftmenu = $_GET["leftmenu"];
+ $_SESSION["leftmenu"] = $leftmenu;
+
+ if ($_SESSION["leftmenuopened"] == $leftmenu) // To collapse
+ {
+ //$leftmenu="";
+ $_SESSION["leftmenuopened"] = "";
+ }
+ else
+ {
+ $_SESSION["leftmenuopened"] = $leftmenu;
+ }
+ } else {
+ // On va le chercher en session si non defini par le lien
+ $leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';
+ }
+ if (!empty($forceleftmenu)) $leftmenu = $forceleftmenu;
+
+ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
+ $tabMenu = array();
+ $menuArbo = new Menubase($this->db, 'auguria');
+ $menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'auguria', $tabMenu);
+ $this->tabMenu = $tabMenu;
+ //var_dump($tabMenu);
+
+ //if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
}
- /**
- * Show menu.
- * Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.
- *
- * @param string $mode 'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
- * @param array $moredata An array with more data to output
- * @return int 0 or nb of top menu entries if $mode = 'topnb'
+ /**
+ * Show menu.
+ * Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.
+ *
+ * @param string $mode 'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
+ * @param array $moredata An array with more data to output
+ * @return int 0 or nb of top menu entries if $mode = 'topnb'
*/
public function showmenu($mode, $moredata = null)
{
- global $conf, $langs, $user;
-
- require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';
-
- if ($this->type_user == 1)
- {
- $conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;
- $conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;
- }
+ global $conf, $langs, $user;
+
+ require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';
+
+ if ($this->type_user == 1)
+ {
+ $conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;
+ $conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;
+ }
require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
- $this->menu = new Menu();
-
- if (empty($conf->global->MAIN_MENU_INVERT))
- {
- if ($mode == 'top') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
- if ($mode == 'left') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
- } else {
- $conf->global->MAIN_SHOW_LOGO = 0;
- if ($mode == 'top') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
- if ($mode == 'left') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
- }
+ $this->menu = new Menu();
+
+ if (empty($conf->global->MAIN_MENU_INVERT))
+ {
+ if ($mode == 'top') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+ if ($mode == 'left') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
+ }
+ else
+ {
+ $conf->global->MAIN_SHOW_LOGO = 0;
+ if ($mode == 'top') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
+ if ($mode == 'left') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+ }
if ($mode == 'topnb')
{
- print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);
- return $this->menu->getNbOfVisibleMenuEntries();
+ print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);
+ return $this->menu->getNbOfVisibleMenuEntries();
}
- if ($mode == 'jmobile') // Used to get menu in xml ul/li
- {
- print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);
-
- // $this->menu->liste is top menu
- //var_dump($this->menu->liste);exit;
- $lastlevel = array();
- print ''."\n";
- foreach ($this->menu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
- {
- print ''."\n";
- }
- }
-
- unset($this->menu);
-
- //print 'xx'.$mode;
- return 0;
- }
+ {
+ $substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
+ $substitarray['__USERID__'] = $user->id; // For backward compatibility
+ $val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__
+
+ if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
+ {
+ $relurl2 = dol_buildpath($val2['url'], 1);
+ }
+ else
+ {
+ $relurl2 = $val2['url'];
+ }
+ $canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
+ //var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
+ if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';
+
+ $disabled = '';
+ if (!$val2['enabled'])
+ {
+ $disabled = " vsmenudisabled";
+ }
+
+ print str_pad('', $val2['level'] + 1);
+ print ''."\n";
+ }
+ }
+ //var_dump($submenu);
+ print '';
+ }
+ if ($val['enabled'] == 2)
+ {
+ print ''.$val['titre'].'';
+ }
+ print '';
+ print ''."\n";
+ }
+ }
+
+ unset($this->menu);
+
+ //print 'xx'.$mode;
+ return 0;
+ }
}
--- /tmp/dsg/dolibarr/htdocs/core/menus/standard/github_eldy.lib.php
+++ /tmp/dsg/dolibarr/htdocs/core/menus/standard/client_eldy.lib.php
@@ -54,22 +54,21 @@
$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
- if (empty($noout)) {
- print_start_menu_array();
+ if (empty($noout)) print_start_menu_array();
+
+ $usemenuhider = 1;
+
+ // Show/Hide vertical menu. The hamburger icon for .menuhider action.
+ if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ {
+ $showmode = 1;
+ $classname = 'class="tmenu menuhider"';
+ $idsel = 'menu';
+
+ $menu->add('#', (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? '' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
}
- $usemenuhider = 1;
-
- // Show/Hide vertical menu. The hamburger icon for .menuhider action.
- if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
- $showmode = 1;
- $classname = 'class="tmenu menuhider"';
- $idsel = 'menu';
-
- $menu->add('#', (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? '' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
- }
-
- $menu_arr = array();
+ $menu_arr = array();
// Home
$menu_arr[] = array(
@@ -93,9 +92,9 @@
// Members
$tmpentry = array(
- 'enabled' => (!empty($conf->adherent->enabled)),
- 'perms' => (!empty($user->rights->adherent->lire)),
- 'module' => 'adherent'
+ 'enabled' => (!empty($conf->adherent->enabled)),
+ 'perms' => (!empty($user->rights->adherent->lire)),
+ 'module' => 'adherent'
);
$menu_arr[] = array(
'name' => 'Members',
@@ -118,13 +117,13 @@
// Third parties
$tmpentry = array(
- 'enabled'=> ((!empty($conf->societe->enabled) &&
- (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
- )
- || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
- ),
- 'perms'=> (!empty($user->rights->societe->lire) || !empty($user->rights->fournisseur->lire)),
- 'module'=>'societe|fournisseur'
+ 'enabled'=> ((!empty($conf->societe->enabled) &&
+ (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
+ )
+ || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
+ ),
+ 'perms'=> (!empty($user->rights->societe->lire) || !empty($user->rights->fournisseur->lire)),
+ 'module'=>'societe|fournisseur'
);
$menu_arr[] = array(
'name' => 'Companies',
@@ -149,7 +148,7 @@
$tmpentry = array(
'enabled'=> (!empty($conf->product->enabled) || !empty($conf->service->enabled) || !empty($conf->expedition->enabled)),
'perms'=> (!empty($user->rights->produit->lire) || !empty($user->rights->service->lire) || !empty($user->rights->expedition->lire)),
- 'module'=>'product|service'
+ 'module'=>'product|service'
);
$menu_arr[] = array(
'name' => 'Products',
@@ -158,7 +157,7 @@
? (array("TMenuProducts", " | ", "TMenuServices"))
: (!empty($conf->product->enabled) ? "TMenuProducts" : "TMenuServices"),
'level' => 0,
- 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+ 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
'target' => $atarget,
'mainmenu' => "products",
'leftmenu' => '',
@@ -172,36 +171,36 @@
'submenus' => array(),
);
- // MRP - GPAO
+ // MRP
$tmpentry = array(
- 'enabled'=>(!empty($conf->bom->enabled) || !empty($conf->mrp->enabled)),
- 'perms'=>(!empty($user->rights->bom->read) || !empty($user->rights->mrp->read)),
- 'module'=>'bom|mrp'
+ 'enabled'=>(!empty($conf->bom->enabled) || !empty($conf->mrp->enabled)),
+ 'perms'=>(!empty($user->rights->bom->read) || !empty($user->rights->mrp->read)),
+ 'module'=>'bom|mrp'
);
$menu_arr[] = array(
- 'name' => 'TMenuMRP',
- 'link' => '/mrp/index.php?mainmenu=mrp&leftmenu=',
- 'title' => "TMenuMRP",
- 'level' => 0,
- 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
- 'target' => $atarget,
- 'mainmenu' => "mrp",
- 'leftmenu' => '',
- 'position' => 31,
- 'id' => $id,
- 'idsel' => 'mrp',
- 'classname' => $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 'class="tmenusel"' : 'class="tmenu"',
- 'prefix' => '',
- 'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 0 : 1),
- 'loadLangs' => array("mrp"),
- 'submenus' => array(),
+ 'name' => 'TMenuMRP',
+ 'link' => '/mrp/index.php?mainmenu=mrp&leftmenu=',
+ 'title' => "TMenuMRP",
+ 'level' => 0,
+ 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+ 'target' => $atarget,
+ 'mainmenu' => "mrp",
+ 'leftmenu' => '',
+ 'position' => 30,
+ 'id' => $id,
+ 'idsel' => 'mrp',
+ 'classname' => $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 'class="tmenusel"' : 'class="tmenu"',
+ 'prefix' => '',
+ 'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 0 : 1),
+ 'loadLangs' => array("mrp"),
+ 'submenus' => array(),
);
// Projects
$tmpentry = array(
- 'enabled'=> (!empty($conf->projet->enabled) ? 1 : 0),
- 'perms'=> (!empty($user->rights->projet->lire) ? 1 : 0),
- 'module'=>'projet'
+ 'enabled'=> (!empty($conf->projet->enabled) ? 1 : 0),
+ 'perms'=> (!empty($user->rights->projet->lire) ? 1 : 0),
+ 'module'=>'projet'
);
$menu_arr[] = array(
'name' => 'Projet',
@@ -210,7 +209,7 @@
? (($conf->global->PROJECT_USE_OPPORTUNITIES == 2) ? "Leads" : "Projects")
: "Projects",
'level' => 0,
- 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+ 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
'target' => $atarget,
'mainmenu' => "project",
'leftmenu' => '',
@@ -224,23 +223,25 @@
'submenus' => array(),
);
- // Commercial (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)
+ // Commercial
$tmpentry = array(
- 'enabled'=>(!empty($conf->propal->enabled)
- || !empty($conf->commande->enabled)
- || !empty($conf->supplier_proposal->enabled)
- || !empty($conf->supplier_order->enabled)
- || !empty($conf->contrat->enabled)
- || !empty($conf->ficheinter->enabled)
- ) ? 1 : 0,
- 'perms'=>(!empty($user->rights->propal->lire)
- || !empty($user->rights->commande->lire)
- || !empty($user->rights->supplier_proposal->lire)
- || !empty($user->rights->supplier_order->lire)
- || !empty($user->rights->contrat->lire)
- || !empty($user->rights->ficheinter->lire)
- ),
- 'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'
+ 'enabled'=>(!empty($conf->propal->enabled) ||
+ !empty($conf->commande->enabled) ||
+ !empty($conf->fournisseur->enabled) ||
+ !empty($conf->supplier_proposal->enabled) ||
+ !empty($conf->supplier_order->enabled) ||
+ !empty($conf->contrat->enabled) ||
+ !empty($conf->ficheinter->enabled)
+ ) ? 1 : 0,
+ 'perms'=>(!empty($user->rights->propal->lire) ||
+ !empty($user->rights->commande->lire) ||
+ !empty($user->rights->fournisseur->lire) ||
+ !empty($user->rights->supplier_proposal->lire) ||
+ !empty($user->rights->supplier_order->lire) ||
+ !empty($user->rights->contrat->lire) ||
+ !empty($user->rights->ficheinter->lire)
+ ),
+ 'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'
);
$onlysupplierorder = !empty($user->rights->fournisseur->commande->lire) &&
@@ -256,7 +257,7 @@
'link' => ($onlysupplierorder ? '/fourn/commande/index.php?mainmenu=commercial&leftmenu=' : '/comm/index.php?mainmenu=commercial&leftmenu='),
'title' => "Commercial",
'level' => 0,
- 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+ 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
'target' => $atarget,
'mainmenu' => "commercial",
'leftmenu' => '',
@@ -272,25 +273,25 @@
// Billing - Financial
$tmpentry = array(
- 'enabled'=>(!empty($conf->facture->enabled) ||
- !empty($conf->don->enabled) ||
- !empty($conf->tax->enabled) ||
- !empty($conf->salaries->enabled) ||
- !empty($conf->supplier_invoice->enabled) ||
- !empty($conf->loan->enabled) ||
- !empty($conf->margins->enabled)
- ) ? 1 : 0,
- 'perms'=>(!empty($user->rights->facture->lire) || !empty($user->rights->don->contact->lire)
- || !empty($user->rights->tax->charges->lire) || !empty($user->rights->salaries->read)
- || !empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->loan->read) || !empty($user->rights->margins->liretous)),
- 'module'=>'facture|supplier_invoice|don|tax|salaries|loan'
+ 'enabled'=>(!empty($conf->facture->enabled) ||
+ !empty($conf->don->enabled) ||
+ !empty($conf->tax->enabled) ||
+ !empty($conf->salaries->enabled) ||
+ !empty($conf->supplier_invoice->enabled) ||
+ !empty($conf->loan->enabled) ||
+ !empty($conf->margins->enabled)
+ ) ? 1 : 0,
+ 'perms'=>(!empty($user->rights->facture->lire) || !empty($user->rights->don->contact->lire)
+ || !empty($user->rights->tax->charges->lire) || !empty($user->rights->salaries->read)
+ || !empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->loan->read) || !empty($user->rights->margins->liretous)),
+ 'module'=>'facture|supplier_invoice|don|tax|salaries|loan'
);
$menu_arr[] = array(
'name' => 'Compta',
'link' => '/compta/index.php?mainmenu=billing&leftmenu=',
'title' => "MenuFinancial",
'level' => 0,
- 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+ 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
'target' => $atarget,
'mainmenu' => "billing",
'leftmenu' => '',
@@ -306,16 +307,16 @@
// Bank
$tmpentry = array(
- 'enabled'=>(!empty($conf->banque->enabled) || !empty($conf->prelevement->enabled)),
+ 'enabled'=>(!empty($conf->banque->enabled) || !empty($conf->prelevement->enabled)),
'perms'=>(!empty($user->rights->banque->lire) || !empty($user->rights->prelevement->lire) || !empty($user->rights->paymentbybanktransfer->read)),
- 'module'=>'banque|prelevement|paymentbybanktransfer'
+ 'module'=>'banque|prelevement|paymentbybanktransfer'
);
$menu_arr[] = array(
'name' => 'Bank',
'link' => '/compta/bank/list.php?mainmenu=bank&leftmenu=',
'title' => "MenuBankCash",
'level' => 0,
- 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+ 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
'target' => $atarget,
'mainmenu' => "bank",
'leftmenu' => '',
@@ -333,16 +334,16 @@
// Accounting
$tmpentry = array(
- 'enabled'=>(!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled) || !empty($conf->asset->enabled) || !empty($conf->intracommreport->enabled)),
- 'perms'=>(!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read) || !empty($user->rights->intracommreport->read)),
- 'module'=>'comptabilite|accounting|asset|intracommreport'
+ 'enabled'=>(!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled) || !empty($conf->asset->enabled)),
+ 'perms'=>(!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read)),
+ 'module'=>'comptabilite|accounting|asset'
);
$menu_arr[] = array(
'name' => 'Accounting',
'link' => '/accountancy/index.php?mainmenu=accountancy&leftmenu=',
'title' => "MenuAccountancy",
'level' => 0,
- 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+ 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
'target' => $atarget,
'mainmenu' => "accountancy",
'leftmenu' => '',
@@ -354,23 +355,22 @@
'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") ? 0 : 1),
- 'loadLangs' => array("compta", "accountancy", "assets", "intracommreport"),
+ 'loadLangs' => array("compta", "accountancy", "assets"),
'submenus' => array(),
);
// HRM
$tmpentry = array(
- 'enabled'=>(!empty($conf->hrm->enabled) || (!empty($conf->holiday->enabled)) || !empty($conf->deplacement->enabled) || !empty($conf->expensereport->enabled) || !empty($conf->recruitment->enabled)),
- 'perms'=>(!empty($user->rights->hrm->employee->read) || !empty($user->rights->holiday->write) || !empty($user->rights->deplacement->lire) || !empty($user->rights->expensereport->lire) || !empty($user->rights->recruitment->recruitmentjobposition->read)),
- 'module'=>'hrm|holiday|deplacement|expensereport|recruitment'
- );
-
+ 'enabled'=>(!empty($conf->hrm->enabled) || !empty($conf->holiday->enabled) || !empty($conf->deplacement->enabled) || !empty($conf->expensereport->enabled)),
+ 'perms'=>(!empty($user->rights->hrm->employee->read) || !empty($user->rights->holiday->write) || !empty($user->rights->deplacement->lire) || !empty($user->rights->expensereport->lire)),
+ 'module'=>'hrm|holiday|deplacement|expensereport'
+ );
$menu_arr[] = array(
'name' => 'HRM',
'link' => '/hrm/index.php?mainmenu=hrm&leftmenu=',
'title' => "HRM",
'level' => 0,
- 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+ 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
'target' => $atarget,
'mainmenu' => "hrm",
'leftmenu' => '',
@@ -388,16 +388,16 @@
// Tools
$tmpentry = array(
- 'enabled'=>1,
- 'perms'=>1,
- 'module'=>''
+ 'enabled'=>1,
+ 'perms'=>1,
+ 'module'=>''
);
$menu_arr[] = array(
'name' => 'Tools',
'link' => '/core/tools.php?mainmenu=tools&leftmenu=',
'title' => "Tools",
'level' => 0,
- 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+ 'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
'target' => $atarget,
'mainmenu' => "tools",
'leftmenu' => '',
@@ -414,26 +414,34 @@
);
// Add menus
- foreach ($menu_arr as $key => $smenu) {
+ foreach ($menu_arr as $key => $smenu)
+ {
$smenu = (object) $smenu;
- if ($smenu->enabled) {
- if ($smenu->session) {
+ if ($smenu->enabled)
+ {
+ if ($smenu->session)
+ {
$_SESSION['idmenu'] = '';
}
// Load Langue
- if (!empty($smenu->loadLangs)) {
+ if (!empty($smenu->loadLangs))
+ {
$langs->loadLangs($smenu->loadLangs);
}
// Trans title
$mtitle = '';
- if (is_array($smenu->title)) {
- foreach ($smenu->title as $item) {
+ if (is_array($smenu->title))
+ {
+ foreach ($smenu->title as $item)
+ {
$mtitle .= $langs->trans($item);
}
- } else {
+ }
+ else
+ {
$mtitle = $langs->trans($smenu->title);
}
// Add item
@@ -443,70 +451,52 @@
// Show personalized menus
$menuArbo = new Menubase($db, 'eldy');
-
$newTabMenu = $menuArbo->menuTopCharger('', '', $type_user, 'eldy', $tabMenu); // Return tabMenu with only top entries
$num = count($newTabMenu);
- for ($i = 0; $i < $num; $i++) {
+ for ($i = 0; $i < $num; $i++)
+ {
//var_dump($type_user.' '.$newTabMenu[$i]['url'].' '.$showmode.' '.$newTabMenu[$i]['perms']);
$idsel = (empty($newTabMenu[$i]['mainmenu']) ? 'none' : $newTabMenu[$i]['mainmenu']);
- $newTabMenu[$i]['url'] = make_substitutions($newTabMenu[$i]['url'], $substitarray);
-
- // url = url from host, shorturl = relative path into dolibarr sources
- $url = $shorturl = $newTabMenu[$i]['url'];
- if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url'])) { // Do not change url content for external links
- $tmp = explode('?', $newTabMenu[$i]['url'], 2);
- $url = $shorturl = $tmp[0];
- $param = (isset($tmp[1]) ? $tmp[1] : '');
-
- if (!preg_match('/mainmenu/i', $param) || !preg_match('/leftmenu/i', $param)) {
- $param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
- }
- //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad
- $url = dol_buildpath($url, 1).($param ? '?'.$param : '');
- //$shorturl = $shorturl.($param?'?'.$param:'');
- $shorturl = $url;
- if (DOL_URL_ROOT) {
- $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl);
- }
+ $showmode = isVisibleToUserType($type_user, $newTabMenu[$i], $listofmodulesforexternal);
+ if ($showmode == 1)
+ {
+ $newTabMenu[$i]['url'] = make_substitutions($newTabMenu[$i]['url'], $substitarray);
+
+ // url = url from host, shorturl = relative path into dolibarr sources
+ $url = $shorturl = $newTabMenu[$i]['url'];
+ if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url'])) // Do not change url content for external links
+ {
+ $tmp = explode('?', $newTabMenu[$i]['url'], 2);
+ $url = $shorturl = $tmp[0];
+ $param = (isset($tmp[1]) ? $tmp[1] : '');
+
+ if (!preg_match('/mainmenu/i', $param) || !preg_match('/leftmenu/i', $param)) $param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
+ //$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad
+ $url = dol_buildpath($url, 1).($param ? '?'.$param : '');
+ //$shorturl = $shorturl.($param?'?'.$param:'');
+ $shorturl = $url;
+ if (DOL_URL_ROOT) $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl);
+ }
+
+ // Define the class (top menu selected or not)
+ if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname = 'class="tmenusel"';
+ elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname = 'class="tmenusel"';
+ else $classname = 'class="tmenu"';
}
-
- $showmode = isVisibleToUserType($type_user, $newTabMenu[$i], $listofmodulesforexternal);
- if ($showmode == 1) {
- // Define the class (top menu selected or not)
- if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) {
- $classname = 'class="tmenusel"';
- } elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) {
- $classname = 'class="tmenusel"';
- } else {
- $classname = 'class="tmenu"';
- }
- } elseif ($showmode == 2) {
- $classname = 'class="tmenu"';
- }
-
- $menu->add(
- $shorturl,
- $newTabMenu[$i]['titre'],
- 0,
- $showmode,
- ($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget),
- ($newTabMenu[$i]['mainmenu'] ? $newTabMenu[$i]['mainmenu'] : $newTabMenu[$i]['rowid']),
- ($newTabMenu[$i]['leftmenu'] ? $newTabMenu[$i]['leftmenu'] : ''),
- $newTabMenu[$i]['position'],
- $id,
- $idsel,
- $classname
- );
+ elseif ($showmode == 2) $classname = 'class="tmenu"';
+
+ $menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget), ($newTabMenu[$i]['mainmenu'] ? $newTabMenu[$i]['mainmenu'] : $newTabMenu[$i]['rowid']), ($newTabMenu[$i]['leftmenu'] ? $newTabMenu[$i]['leftmenu'] : ''), $newTabMenu[$i]['position'], $id, $idsel, $classname);
}
// Sort on position
$menu->liste = dol_sort_array($menu->liste, 'position');
- // Output menu entries
+ // Output menu entries
// Show logo company
- if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && !empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+ if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && !empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ {
//$mysoc->logo_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI);
$mysoc->logo_squarred_mini = (empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);
@@ -515,14 +505,16 @@
$logoContainerAdditionalClass = '';
}
- if (!empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {
+ if (!empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini))
+ {
$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
}
/*elseif (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
{
$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
}*/
- else {
+ else
+ {
$urllogo = DOL_URL_ROOT.'/theme/dolibarr_512x512_white.png';
$logoContainerAdditionalClass = '';
}
@@ -531,25 +523,26 @@
print "\n".''."\n";
print_start_menu_entry('companylogo', 'class="tmenu tmenucompanylogo nohover"', 1);
+
print '
'."\n";
print_end_menu_entry(4);
}
- if (empty($noout)) {
- foreach ($menu->liste as $menuval) {
- print_start_menu_entry($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
- print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
- print_end_menu_entry($menuval['enabled']);
- }
- }
+ if (empty($noout)) {
+ foreach ($menu->liste as $menuval) {
+ print_start_menu_entry($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
+ print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
+ print_end_menu_entry($menuval['enabled']);
+ }
+ }
$showmode = 1;
- if (empty($noout)) {
- print_start_menu_entry('', 'class="tmenuend"', $showmode);
- print_end_menu_entry($showmode);
- print_end_menu_array();
- }
+ if (empty($noout)) {
+ print_start_menu_entry('', 'class="tmenuend"', $showmode);
+ print_end_menu_entry($showmode);
+ print_end_menu_array();
+ }
return 0;
}
@@ -562,7 +555,7 @@
*/
function print_start_menu_array()
{
- global $conf;
+ global $conf;
print '