From 1f59ae496c1e0ceb58456f6253046efc478fa5ef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 5 May 2009 17:06:05 +0000
Subject: [PATCH] Qual: Remove not used pages
---
htdocs/admin/menus/pre.inc.php | 201 ++++--------------
htdocs/core/conf.class.php | 6 +-
.../includes/modules/modCommercial.class.php | 2 +-
3 files changed, 42 insertions(+), 167 deletions(-)
diff --git a/htdocs/admin/menus/pre.inc.php b/htdocs/admin/menus/pre.inc.php
index 4d5cd0cb35c..7bf4c931e38 100644
--- a/htdocs/admin/menus/pre.inc.php
+++ b/htdocs/admin/menus/pre.inc.php
@@ -1,5 +1,7 @@
<?php
- /* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
+/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005 Simon Tosser <simon@kornog-computing.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,172 +18,49 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
/**
- \file htdocs/admin/menus/pre.inc.php
- \brief Fichier gestionnaire du menu de gauche de l'accueil
- \version $Id$
+ \file htdocs/admin/pre.inc.php
+ \brief Fichier gestionnaire du menu de gauche de l'espace configuration
+ \version $Id$
*/
-require ("../../main.inc.php");
-
-function llxHeader($head = "")
-{
- global $user, $conf, $langs;
-
- top_menu($head);
-
- $menu = new Menu();
-
- if ($conf->societe->enabled && $user->rights->societe->lire)
- {
- $langs->load("companies");
- $menu->add(DOL_URL_ROOT."/societe.php", $langs->trans("Companies"));
-
- if ($user->rights->societe->creer)
- {
- $menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create", $langs->trans("MenuNewCompany"));
- }
-
- if(is_dir("societe/groupe"))
- {
- $menu->add_submenu(DOL_URL_ROOT."/societe/groupe/index.php", $langs->trans("MenuSocGroup"));
- }
- $menu->add_submenu(DOL_URL_ROOT."/contact/index.php",$langs->trans("Contacts"));
- }
-
- if ($conf->commercial->enabled && $user->rights->commercial->main->lire)
- {
- $langs->load("commercial");
- $menu->add(DOL_URL_ROOT."/comm/index.php",$langs->trans("Commercial"));
-
- $menu->add_submenu(DOL_URL_ROOT."/comm/clients.php",$langs->trans("Customers"));
- $menu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php",$langs->trans("Prospects"));
-
- if ($user->rights->propale->lire)
- {
- $langs->load("propal");
- $menu->add_submenu(DOL_URL_ROOT."/comm/propal.php", $langs->trans("Prop"));
- }
- }
-
- if ($conf->compta->enabled || $conf->comptaexpert->enabled)
- {
- $langs->load("compta");
- $menu->add(DOL_URL_ROOT."/compta/index.php", $langs->trans("MenuFinancial"));
-
- if ($user->rights->facture->lire) {
- $langs->load("bills");
- $menu->add_submenu(DOL_URL_ROOT."/compta/facture.php", $langs->trans("Bills"));
- }
- }
-
- if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire)
- {
- $langs->trans("interventions");
- $menu->add(DOL_URL_ROOT."/fichinter/index.php", $langs->trans("Interventions"));
- }
-
- if (($conf->produit->enabled || $conf->service->enabled) && $user->rights->produit->lire)
- {
- $langs->load("products");
- $chaine="";
- if ($conf->produit->enabled) { $chaine.= $langs->trans("Products"); }
- if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
- if ($conf->service->enabled) { $chaine.= $langs->trans("Services"); }
- $menu->add(DOL_URL_ROOT."/product/index.php", "$chaine");
+$res=@include("../../main.inc.php");
-/*
- if ($conf->boutique->enabled)
- {
- if ($conf->boutique->livre->enabled)
- {
- $menu->add_submenu(DOL_URL_ROOT."/boutique/livre/index.php", "Livres");
- }
- if ($conf->boutique->album->enabled)
- {
- $menu->add_submenu(DOL_URL_ROOT."/product/album/index.php", "Albums");
- }
- }
-*/
- }
+$langs->load("admin");
- if ($conf->commande->enabled && $user->rights->commande->lire)
- {
- $langs->load("orders");
- $menu->add(DOL_URL_ROOT."/commande/index.php", $langs->trans("Orders"));
- }
-
- if ($conf->expedition->enabled && $user->rights->expedition->lire)
- {
- $langs->load("sendings");
- $menu->add(DOL_URL_ROOT."/expedition/index.php", $langs->trans("Sendings"));
- }
-
- if ($conf->mailing->enabled && $user->rights->mailing->lire)
- {
- $langs->load("mails");
- $menu->add(DOL_URL_ROOT."/comm/mailing/index.php",$langs->trans("EMailings"));
- }
-
- if ($conf->telephonie->enabled)
- {
- $menu->add(DOL_URL_ROOT."/telephonie/index.php", "T�l�phonie");
- }
-
- if ($conf->don->enabled)
- {
- $menu->add(DOL_URL_ROOT."/compta/dons/index.php", $langs->trans("Donations"));
- }
-
- if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire)
- {
- $langs->load("suppliers");
- $menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers"));
- }
-
- if ($conf->voyage->enabled && $user->societe_id == 0)
- {
- $menu->add(DOL_URL_ROOT."/compta/voyage/index.php","Voyages");
- $menu->add_submenu(DOL_URL_ROOT."/compta/voyage/index.php","Voyages");
- $menu->add_submenu(DOL_URL_ROOT."/compta/voyage/reduc.php","Reduc");
- }
-
- if ($conf->domaine->enabled)
- {
- $menu->add(DOL_URL_ROOT."/domain/index.php", "Domaines");
- }
-
- if ($conf->postnuke->enabled)
- {
- $menu->add(DOL_URL_ROOT."/postnuke/articles/index.php", "Editorial");
- }
-
- if ($conf->bookmark->enabled && $user->rights->bookmark->lire)
- {
- $menu->add(DOL_URL_ROOT."/bookmarks/liste.php", $langs->trans("Bookmarks"));
- }
-
- if ($conf->export->enabled)
- {
- $langs->load("exports");
- $menu->add(DOL_URL_ROOT."/exports/index.php", $langs->trans("Exports"));
- }
-
- if ($user->rights->user->user->lire || $user->admin)
- {
- $langs->load("users");
- $menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("MenuUsersAndGroups"));
- }
-
- if ($user->admin)
- {
- $menu->add(DOL_URL_ROOT."/admin/index.php", $langs->trans("Setup"));
- }
-
-
- left_menu($menu->liste);
+function llxHeader($head = '', $title='', $help_url='')
+{
+ global $conf, $user, $langs;
+
+ top_menu($head, $title, '');
+
+ $menuarray=array();
+
+ //if ($conf->left_menu == 'rodolphe.php')
+ //{
+ $langs->load("admin");
+ $langs->load("users");
+ $menu = new Menu();
+ $menu->add(DOL_URL_ROOT."/admin/company.php", $langs->trans("MenuCompanySetup"));
+ $menu->add(DOL_URL_ROOT."/admin/modules.php", $langs->trans("Modules"));
+ $menu->add(DOL_URL_ROOT."/admin/menus.php", $langs->trans("Menus"));
+ $menu->add(DOL_URL_ROOT."/admin/ihm.php", $langs->trans("GUISetup"));
+ $menu->add(DOL_URL_ROOT."/admin/boxes.php", $langs->trans("Boxes"));
+ $menu->add(DOL_URL_ROOT."/admin/delais.php",$langs->trans("Alerts"));
+ $menu->add(DOL_URL_ROOT."/admin/perms.php", $langs->trans("Security"));
+ $menu->add(DOL_URL_ROOT."/admin/mails.php", $langs->trans("EMails"));
+ $menu->add(DOL_URL_ROOT."/admin/limits.php", $langs->trans("Limits"));
+ $menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("MenuUsersAndGroups"));
+ $menu->add(DOL_URL_ROOT."/admin/dict.php", $langs->trans("DictionnarySetup"));
+ $menu->add(DOL_URL_ROOT."/admin/const.php", $langs->trans("OtherSetup"));
+ $menu->add(DOL_URL_ROOT."/admin/system/", $langs->trans("System"));
+ $menu->add(DOL_URL_ROOT."/admin/tools/", $langs->trans("Tools"));
+ $varmenuarray=$menu->liste;
+ //}
+
+ left_menu($varmenuarray, $help_url);
}
+
?>
diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php
index 7451303cea6..ada34ad52fc 100644
--- a/htdocs/core/conf.class.php
+++ b/htdocs/core/conf.class.php
@@ -79,7 +79,7 @@ class Conf
$sql = "SELECT name, value, entity";
$sql.= " FROM ".MAIN_DB_PREFIX."const";
$sql.= " WHERE entity IN (0,".$this->entity.")";
-
+
$result = $db->query($sql);
if ($result)
{
@@ -208,10 +208,6 @@ class Conf
$this->societe->dir_logos =$rootfordata."/societe/logos";
if (defined('SOCIETE_OUTPUTDIR') && SOCIETE_OUTPUTDIR) { $this->societe->dir_output=SOCIETE_OUTPUTDIR; } # Pour passer outre le rep par defaut
- // Module commercial
- $this->commercial->dir_output=$rootfordata."/comm";
- $this->commercial->dir_temp =$rootfordata."/comm/temp";
-
// Module taxes et charges sociales
$this->tax->dir_output=$rootfordata."/taxes";
$this->tax->dir_temp =$rootfordata."/taxes/temp";
diff --git a/htdocs/includes/modules/modCommercial.class.php b/htdocs/includes/modules/modCommercial.class.php
index c2f0aa889f9..934fc8ffbcb 100644
--- a/htdocs/includes/modules/modCommercial.class.php
+++ b/htdocs/includes/modules/modCommercial.class.php
@@ -62,7 +62,7 @@ class modCommercial extends DolibarrModules
$this->picto='commercial';
// Data directories to create when module is enabled
- $this->dirs = array("/comm/temp");
+ $this->dirs = array();
// Dependancies
$this->depends = array("modSociete");
--
GitLab