From 808aa2a4807d755293896463db51f2b9f764afe5 Mon Sep 17 00:00:00 2001 From: opensides Date: Fri, 10 Sep 2004 22:23:40 +0000 Subject: [PATCH] ajout des copurights et cleanup du code --- .../modules/DolibarrModules.class.php | 9 ++++---- htdocs/includes/modules/modAdherent.class.php | 12 +++++----- htdocs/includes/modules/modBanque.class.php | 10 +++++---- htdocs/includes/modules/modBoutique.class.php | 2 ++ htdocs/includes/modules/modCaisse.class.php | 12 +++++----- htdocs/includes/modules/modCommande.class.php | 22 ++++++++++--------- .../includes/modules/modCommercial.class.php | 6 ++++- .../modules/modComptabilite.class.php | 12 +++++----- .../includes/modules/modExpedition.class.php | 12 +++++----- htdocs/includes/modules/modFacture.class.php | 20 ++++++++++------- .../includes/modules/modFicheinter.class.php | 2 ++ htdocs/includes/modules/modProduit.class.php | 10 +++++---- 12 files changed, 77 insertions(+), 52 deletions(-) diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index 323c1bc806e..1b693842606 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -1,5 +1,7 @@ + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier * * 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 @@ -51,11 +53,10 @@ class DolibarrModules { // Insère les constantes $err = 0; - $sql_del = "delete from ".MAIN_DB_PREFIX."const where name = '".$this->const_name."';"; + $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = '".$this->const_name."';"; $this->db->query($sql_del); - $sql ="insert into ".MAIN_DB_PREFIX."const (name,value,visible) values + $sql ="INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES ('".$this->const_name."','1',0);"; - //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."const SET name = '".$this->const_name."', value='1', visible = 0"; if (!$this->db->query($sql)) { @@ -75,7 +76,7 @@ class DolibarrModules $row = $this->db->fetch_row($sql); if ($row[0] == 0) { - $sql = "insert into ".MAIN_DB_PREFIX."boxes_def (name, file) values ('".$titre."','".$file."')"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (name, file) VALUES ('".$titre."','".$file."')"; if (! $this->db->query($sql) ) { $err++; diff --git a/htdocs/includes/modules/modAdherent.class.php b/htdocs/includes/modules/modAdherent.class.php index 99bdc3c8f83..46b8acad6da 100644 --- a/htdocs/includes/modules/modAdherent.class.php +++ b/htdocs/includes/modules/modAdherent.class.php @@ -2,6 +2,8 @@ /* Copyright (C) 2003 Rodolphe Quiedeville * Copyright (C) 2003 Jean-Louis Bergamo * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier * * 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 @@ -116,11 +118,11 @@ class modAdherent extends DolibarrModules */ $this->remove(); $sql = array( - "insert into ".MAIN_DB_PREFIX."rights_def values (70,'Tous les droits sur les adherents','adherent','a',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (71,'Lire les fiche adherents','adherent','r',1);", - "insert into ".MAIN_DB_PREFIX."rights_def values (72,'Créer modifier des adherents','adherent','w',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (73,'Modifier les adherents','adherent','m',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (74,'Supprimer les adherents','adherent','d',0);" + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (70,'Tous les droits sur les adherents','adherent','a',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (71,'Lire les fiche adherents','adherent','r',1);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (72,'Créer modifier des adherents','adherent','w',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (73,'Modifier les adherents','adherent','m',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (74,'Supprimer les adherents','adherent','d',0);" ); return $this->_init($sql); diff --git a/htdocs/includes/modules/modBanque.class.php b/htdocs/includes/modules/modBanque.class.php index cc534ea25b9..0aad484fa15 100644 --- a/htdocs/includes/modules/modBanque.class.php +++ b/htdocs/includes/modules/modBanque.class.php @@ -1,6 +1,8 @@ * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier * * 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 @@ -76,10 +78,10 @@ class modBanque extends DolibarrModules */ $this->remove(); $sql = array( - "insert into ".MAIN_DB_PREFIX."rights_def values (110,'Tous les droits sur les comptes bancaires','banque','a',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (111,'Lire les comptes','banque','r',1);", - "insert into ".MAIN_DB_PREFIX."rights_def values (112,'Créer modifier rapprocher transactions','banque','w',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (113,'Configurer les comptes (créer, gérer catégories)','banque','w',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (110,'Tous les droits sur les comptes bancaires','banque','a',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (111,'Lire les comptes','banque','r',1);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (112,'Créer modifier rapprocher transactions','banque','w',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (113,'Configurer les comptes (créer, gérer catégories)','banque','w',0);", ); return $this->_init($sql); diff --git a/htdocs/includes/modules/modBoutique.class.php b/htdocs/includes/modules/modBoutique.class.php index 74de324fdef..b27cf8012df 100644 --- a/htdocs/includes/modules/modBoutique.class.php +++ b/htdocs/includes/modules/modBoutique.class.php @@ -1,6 +1,8 @@ * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier * * 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 diff --git a/htdocs/includes/modules/modCaisse.class.php b/htdocs/includes/modules/modCaisse.class.php index 586eb8fd73a..64af38b66df 100644 --- a/htdocs/includes/modules/modCaisse.class.php +++ b/htdocs/includes/modules/modCaisse.class.php @@ -1,5 +1,7 @@ + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier * * 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 @@ -51,7 +53,7 @@ class modCaisse extends DolibarrModules $this->family = "financial"; $this->name = "Caisse"; - $this->description = "Gestion des comptes fincanciers de type Caisses liquides (pas encore opérationnel)"; + $this->description = "Gestion des comptes financiers de type Caisses liquides (pas encore opérationnel)"; $this->const_name = "MAIN_MODULE_CAISSE"; $this->const_config = MAIN_MODULE_CAISSE; @@ -75,10 +77,10 @@ class modCaisse extends DolibarrModules */ $this->remove(); $sql = array( - "insert into ".MAIN_DB_PREFIX."rights_def values (130,'Tous les droits sur les caisses','caisse','a',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (131,'Lire les caisses liquide','caisse','r',1);", - "insert into ".MAIN_DB_PREFIX."rights_def values (132,'Créer, supprimer transactions','caisse','r',1);", - "insert into ".MAIN_DB_PREFIX."rights_def values (133,'Configurer les caisses (créer, gérer catégories)','caisse','w',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (130,'Tous les droits sur les caisses','caisse','a',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (131,'Lire les caisses liquide','caisse','r',1);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (132,'Créer, supprimer transactions','caisse','r',1);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (133,'Configurer les caisses (créer, gérer catégories)','caisse','w',0);", ); return $this->_init($sql); diff --git a/htdocs/includes/modules/modCommande.class.php b/htdocs/includes/modules/modCommande.class.php index dc525eca16b..6a8edc73906 100644 --- a/htdocs/includes/modules/modCommande.class.php +++ b/htdocs/includes/modules/modCommande.class.php @@ -1,6 +1,8 @@ * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier * * 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 @@ -79,14 +81,16 @@ class modCommande extends DolibarrModules /* * Permissions */ - $this->remove(); + + $this->remove(); + $sql = array( - "insert into ".MAIN_DB_PREFIX."rights_def values (80,'Tous les droits sur les commandes','commande','a',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (81,'Lire les commandes','commande','r',1);", - "insert into ".MAIN_DB_PREFIX."rights_def values (82,'Créer modifier les commandes','commande','w',0);", - //"insert into ".MAIN_DB_PREFIX."rights_def values (83,'Modifier les commandes d\'autrui','commande','m',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (84,'Valider les commandes','commande','d',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (89,'Supprimer les commandes','commande','d',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (80,'Tous les droits sur les commandes','commande','a',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (81,'Lire les commandes','commande','r',1);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (82,'Créer modifier les commandes','commande','w',0);", + //"INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (83,'Modifier les commandes d\'autrui','commande','m',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (84,'Valider les commandes','commande','d',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (89,'Supprimer les commandes','commande','d',0);", ); return $this->_init($sql); @@ -97,9 +101,7 @@ class modCommande extends DolibarrModules */ function remove() { - $sql = array( - - ); + $sql = array(); return $this->_remove($sql); diff --git a/htdocs/includes/modules/modCommercial.class.php b/htdocs/includes/modules/modCommercial.class.php index 6ddac6cd78d..7b95bb88913 100644 --- a/htdocs/includes/modules/modCommercial.class.php +++ b/htdocs/includes/modules/modCommercial.class.php @@ -1,6 +1,8 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier * * 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 @@ -82,10 +84,12 @@ class modCommercial extends DolibarrModules return $this->_init($sql); } + /** suppression du module * * */ + function remove() { $sql = array(); diff --git a/htdocs/includes/modules/modComptabilite.class.php b/htdocs/includes/modules/modComptabilite.class.php index 32c30debec9..8713f3cb9f6 100644 --- a/htdocs/includes/modules/modComptabilite.class.php +++ b/htdocs/includes/modules/modComptabilite.class.php @@ -1,6 +1,8 @@ * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier * * 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 @@ -79,12 +81,12 @@ class modComptabilite extends DolibarrModules */ $this->remove(); $sql = array( - "insert into ".MAIN_DB_PREFIX."rights_def values (90,'Tous les droits sur la compta','compta','a',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (91,'Lire les charges','compta','r',1);", - "insert into ".MAIN_DB_PREFIX."rights_def values (92,'Créer modifier les charges','compta','w',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (93,'Supprimer les charges','compta','d',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (90,'Tous les droits sur la compta','compta','a',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (91,'Lire les charges','compta','r',1);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (92,'Créer modifier les charges','compta','w',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (93,'Supprimer les charges','compta','d',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (95,'Lire CA, bilans, résultats','compta','r',1);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (95,'Lire CA, bilans, résultats','compta','r',1);", ); return $this->_init($sql); diff --git a/htdocs/includes/modules/modExpedition.class.php b/htdocs/includes/modules/modExpedition.class.php index da81cf5f119..a410e6f74fd 100644 --- a/htdocs/includes/modules/modExpedition.class.php +++ b/htdocs/includes/modules/modExpedition.class.php @@ -79,12 +79,12 @@ class modExpedition extends DolibarrModules */ $this->remove(); $sql = array( - "insert into ".MAIN_DB_PREFIX."rights_def values (100,'Tous les droits sur les expeditions','expedition','a',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (101,'Lire les expeditions','expedition','r',1);", - "insert into ".MAIN_DB_PREFIX."rights_def values (102,'Créer modifier les expeditions','expedition','w',0);", - //"insert into ".MAIN_DB_PREFIX."rights_def values (83,'Modifier les expeditions d\'autrui','expedition','m',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (104,'Valider les expeditions','expedition','d',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (109,'Supprimer les expeditions','expedition','d',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (100,'Tous les droits sur les expeditions','expedition','a',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (101,'Lire les expeditions','expedition','r',1);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (102,'Créer modifier les expeditions','expedition','w',0);", + //"INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (83,'Modifier les expeditions d\'autrui','expedition','m',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (104,'Valider les expeditions','expedition','d',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (109,'Supprimer les expeditions','expedition','d',0);", ); return $this->_init($sql); diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/includes/modules/modFacture.class.php index 208a4c48fc9..6ad525b86a8 100644 --- a/htdocs/includes/modules/modFacture.class.php +++ b/htdocs/includes/modules/modFacture.class.php @@ -1,6 +1,8 @@ * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier * * 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 @@ -116,18 +118,19 @@ class modFacture extends DolibarrModules /*! \brief Fonction d'activation. Insère en base les constantes, boites et permissions du module */ + function init() { $this->remove(); $sql = array( - "insert into ".MAIN_DB_PREFIX."rights_def values (10,'Tous les droits sur les factures','facture','a',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (11,'Lire les factures','facture','r',1);", - "insert into ".MAIN_DB_PREFIX."rights_def values (12,'Créer modifier les factures','facture','w',0);", - //"insert into ".MAIN_DB_PREFIX."rights_def values (13,'Modifier les factures d\'autrui','facture','m',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (14,'Valider les factures','facture','d',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (15,'Envoyer les factures aux clients','facture','d',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (16,'Emettre des paiements sur les factures','facture','d',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (19,'Supprimer les factures','facture','d',0);" + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (10,'Tous les droits sur les factures','facture','a',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (11,'Lire les factures','facture','r',1);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (12,'Créer modifier les factures','facture','w',0);", + //"INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (13,'Modifier les factures d\'autrui','facture','m',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (14,'Valider les factures','facture','d',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (15,'Envoyer les factures aux clients','facture','d',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (16,'Emettre des paiements sur les factures','facture','d',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (19,'Supprimer les factures','facture','d',0);" ); return $this->_init($sql); @@ -135,6 +138,7 @@ class modFacture extends DolibarrModules /*! \brief Fonction de désactivation. Supprime de la base les constantes, boites et permissions du module */ + function remove() { $sql = array( diff --git a/htdocs/includes/modules/modFicheinter.class.php b/htdocs/includes/modules/modFicheinter.class.php index b5a9f462e29..d11ca6bd170 100644 --- a/htdocs/includes/modules/modFicheinter.class.php +++ b/htdocs/includes/modules/modFicheinter.class.php @@ -1,6 +1,8 @@ * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier * * 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 diff --git a/htdocs/includes/modules/modProduit.class.php b/htdocs/includes/modules/modProduit.class.php index 915d21f0d24..386fd7e19b0 100644 --- a/htdocs/includes/modules/modProduit.class.php +++ b/htdocs/includes/modules/modProduit.class.php @@ -1,6 +1,8 @@ * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier * * 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 @@ -81,10 +83,10 @@ class modProduit extends DolibarrModules */ $this->remove(); $sql = array( - "insert into ".MAIN_DB_PREFIX."rights_def values (30,'Tous les droits sur les produits/services','produit','a',0);", - "insert into ".MAIN_DB_PREFIX."rights_def values (31,'Lire les produits/services','produit','r',1);", - "insert into ".MAIN_DB_PREFIX."rights_def values (32,'Créer modifier les produits/services','produit','w',0);", - "insert INTO ".MAIN_DB_PREFIX."rights_def values (34,'Supprimer les produits/services','produit','d',0);" + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (30,'Tous les droits sur les produits/services','produit','a',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (31,'Lire les produits/services','produit','r',1);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (32,'Créer modifier les produits/services','produit','w',0);", + "INSERT INTO ".MAIN_DB_PREFIX."rights_def VALUES (34,'Supprimer les produits/services','produit','d',0);" ); return $this->_init($sql);