diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 3e44624db93..0aaa572ed03 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -51,6 +51,7 @@ class Conf
//! Used to store current menu handlers
var $top_menu;
var $left_menu;
+ var $smart_menu;
//! Used to store entity for multi-company (default 1)
var $entity=1;
@@ -206,6 +207,8 @@ class Conf
if (! $this->global->MAIN_MENUFRONT_BARRETOP) $this->global->MAIN_MENUFRONT_BARRETOP="eldy_backoffice.php";
if (! $this->global->MAIN_MENU_BARRELEFT) $this->global->MAIN_MENU_BARRELEFT="eldy_backoffice.php";
if (! $this->global->MAIN_MENUFRONT_BARRELEFT) $this->global->MAIN_MENUFRONT_BARRELEFT="eldy_backoffice.php";
+ if (! $this->global->MAIN_MENU_SMARTPHONE) $this->global->MAIN_MENU_SMARTPHONE="iphone_backoffice.php";
+ if (! $this->global->MAIN_MENUFRONT_SMARTPHONE) $this->global->MAIN_MENUFRONT_SMARTPHONE="iphone_backoffice.php";
// Variable globales LDAP
if (empty($this->global->LDAP_FIELD_FULLNAME)) $this->global->LDAP_FIELD_FULLNAME='';
diff --git a/htdocs/includes/menus/smartphone/iphone.lib.php b/htdocs/includes/menus/smartphone/iphone.lib.php
index 564004bbafb..0d2c2257c18 100644
--- a/htdocs/includes/menus/smartphone/iphone.lib.php
+++ b/htdocs/includes/menus/smartphone/iphone.lib.php
@@ -34,6 +34,8 @@
*/
function print_iphone_menu($db,$atarget,$type_user)
{
+ require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php");
+
global $user,$conf,$langs,$dolibarr_main_db_name;
// On sauve en session le menu principal choisi
@@ -41,412 +43,19 @@ function print_iphone_menu($db,$atarget,$type_user)
if (isset($_GET["idmenu"])) $_SESSION["idmenu"]=$_GET["idmenu"];
$_SESSION["leftmenuopened"]="";
- $id='mainmenu';
+ $menuArbo = new Menubase($db,'iphone','top');
+ $tabMenu = $menuArbo->menuTopCharger($type_user,$_SESSION['mainmenu'], 'iphone');
print_start_menu_array();
- // Home
- $classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
- $idsel='home';
- print_start_menu_entry($idsel);
- print '';
- print '';
- print_text_menu_entry($langs->trans("Home"));
- print '';
- print_end_menu_entry();
-
-
- // Third parties
- if ($conf->societe->enabled || $conf->fournisseur->enabled)
- {
- $langs->load("companies");
- $langs->load("suppliers");
-
- $classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
-
- $idsel='companies';
- if (($conf->societe->enabled && $user->rights->societe->lire)
- || ($conf->fournisseur->enabled && $user->rights->fournisseur->lire))
- {
- print_start_menu_entry($idsel);
- print '';
- print '';
- print_text_menu_entry($langs->trans("ThirdParties"));
- print '';
- print_end_menu_entry();
- }
- else
- {
- if (! $type_user)
- {
- print_start_menu_entry($idsel);
- print '
';
- print '';
- print_text_menu_entry($langs->trans("ThirdParties"));
- print '';
- print_end_menu_entry();
- }
- }
- }
-
-
- // Products-Services
- if ($conf->product->enabled || $conf->service->enabled)
- {
- $langs->load("products");
-
- $classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
- $chaine="";
- if ($conf->product->enabled) { $chaine.=$langs->trans("Products"); }
- if ($conf->product->enabled && $conf->service->enabled) { $chaine.="/"; }
- if ($conf->service->enabled) { $chaine.=$langs->trans("Services"); }
-
- $idsel='products';
- if ($user->rights->produit->lire || $user->rights->service->lire)
- {
- print_start_menu_entry($idsel);
- print '';
- print '';
- print_text_menu_entry($chaine);
- print '';
- print_end_menu_entry();
- }
- else
- {
- if (! $type_user)
- {
- print_start_menu_entry($idsel);
- print '
';
- print '';
- print_text_menu_entry($chaine);
- print '';
- print_end_menu_entry();
- }
- }
- }
-
- // Commercial
- if ($conf->societe->enabled)
- {
- $langs->load("commercial");
-
- $classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
-
- $idsel='commercial';
- if($user->rights->societe->lire || $user->rights->societe->contact->lire)
- {
- print_start_menu_entry($idsel);
- print '';
- print '';
- print_text_menu_entry($langs->trans("Commercial"));
- print '';
- print_end_menu_entry();
- }
- else
- {
- if (! $type_user)
- {
- print_start_menu_entry($idsel);
- print '
';
- print '';
- print print_text_menu_entry($langs->trans("Commercial"));
- print '';
- print_end_menu_entry();
- }
- }
- }
-
- // Financial
- if ($conf->compta->enabled || $conf->accounting->enabled
- || $conf->facture->enabled || $conf->deplacement->enabled)
- {
- $langs->load("compta");
-
- $classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
-
- $idsel='accountancy';
- if ($user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire
- || $user->rights->facture->lire || $user->rights->banque->lire)
- {
- print_start_menu_entry($idsel);
- print '';
- print '';
- print_text_menu_entry($langs->trans("MenuFinancial"));
- print '';
- print_end_menu_entry();
- }
- else
- {
- if (! $type_user)
- {
- print_start_menu_entry($idsel);
- print '
';
- print '';
- print_text_menu_entry($langs->trans("MenuFinancial"));
- print '';
- print_end_menu_entry();
- }
- }
- }
-
- // Bank
- if ($conf->banque->enabled || $conf->prelevement->enabled)
- {
- $langs->load("compta");
- $langs->load("banks");
-
- $classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
-
- $idsel='bank';
- if ($user->rights->banque->lire)
- {
- print_start_menu_entry($idsel);
- print '';
- print '';
- print_text_menu_entry($langs->trans("MenuBankCash"));
- print '';
- print_end_menu_entry();
- }
- else
- {
- if (! $type_user)
- {
- print_start_menu_entry($idsel);
- print '
';
- print '';
- print_text_menu_entry($langs->trans("MenuBankCash"));
- print '';
- print_end_menu_entry();
- }
- }
- }
-
- // Projects
- if ($conf->projet->enabled)
- {
- $langs->load("projects");
-
- $classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
-
- $idsel='project';
- if ($user->rights->projet->lire)
- {
- print_start_menu_entry($idsel);
- print '';
- print '';
- print_text_menu_entry($langs->trans("Projects"));
- print '';
- print_end_menu_entry();
- }
- else
- {
- if (! $type_user)
- {
- print_start_menu_entry($idsel);
- print '
';
- print '';
- print_text_menu_entry($langs->trans("Projects"));
- print '';
- print_end_menu_entry();
- }
- }
- }
-
- // Tools
- if ($conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->global->MAIN_MODULE_DOMAIN)
- {
- $langs->load("other");
-
- $classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
-
- $idsel='tools';
- if ($user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire || $user->rights->import->run)
- {
- print_start_menu_entry($idsel);
- print '';
- print '';
- print_text_menu_entry($langs->trans("Tools"));
- print '';
- print_end_menu_entry();
- }
- else
- {
- if (! $type_user)
- {
- print_start_menu_entry($idsel);
- print '
';
- print '';
- print_text_menu_entry($langs->trans("Tools"));
- print '';
- print_end_menu_entry();
- }
- }
- }
-
- // OSCommerce 1
- if (! empty($conf->boutique->enabled))
- {
- $langs->load("shop");
-
- $classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
-
- $idsel='shop';
- print_start_menu_entry($idsel);
- print '';
- print '';
- print_text_menu_entry($langs->trans("OSCommerce"));
- print '';
- print_end_menu_entry();
- }
-
- // Members
- if ($conf->adherent->enabled)
- {
- // $langs->load("members"); Added in main file
-
- $classname="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members")
- {
- $classname='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $classname = 'class="tmenu"';
- }
-
- $idsel='members';
- if ($user->rights->adherent->lire)
- {
- print_start_menu_entry($idsel);
- print '';
- print '';
- print_text_menu_entry($langs->trans("MenuMembers"));
- print '';
- print_end_menu_entry();
- }
- else
- {
- if (! $type_user)
- {
- print_start_menu_entry($idsel);
- print '
';
- print '';
- print_text_menu_entry($langs->trans("MenuMembers"));
- print '';
- print_end_menu_entry();
- }
- }
- }
-
-
- // Show personalized menus
- require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php");
-
- $menuArbo = new Menubase($db,'eldy','top');
-
- $tabMenu = $menuArbo->menuTopCharger($type_user,$_SESSION['mainmenu'],'eldy');
-
for($i=0; $i