diff --git a/htdocs/compta/bank/pre.inc.php b/htdocs/compta/bank/pre.inc.php index 013dae99335..166d3c142e8 100644 --- a/htdocs/compta/bank/pre.inc.php +++ b/htdocs/compta/bank/pre.inc.php @@ -24,7 +24,7 @@ * \brief Fichier gestionnaire du menu compta banque */ -require_once("../../main.inc.php"); +require_once(realpath(dirname(__FILE__)) . "/../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); $langs->load("banks"); diff --git a/htdocs/compta/paiement/cheque/pre.inc.php b/htdocs/compta/paiement/cheque/pre.inc.php index 1041dc682e7..f0d49b6b3d1 100644 --- a/htdocs/compta/paiement/cheque/pre.inc.php +++ b/htdocs/compta/paiement/cheque/pre.inc.php @@ -23,7 +23,7 @@ * \brief Fichier gestionnaire du menu cheques */ -require_once("../../../main.inc.php"); +require_once(realpath(dirname(__FILE__)) . "/../../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); $langs->load("banks"); diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php index e7794e1fce4..4592072e9af 100644 --- a/htdocs/contact/canvas/actions_contactcard_common.class.php +++ b/htdocs/contact/canvas/actions_contactcard_common.class.php @@ -42,23 +42,6 @@ abstract class ActionsContactCardCommon //! Error array var $errors=array(); - /** - * Constructor - * - * @param DoliDB $DB Handler acces base de donnees - * @param string $dirmodule Name of directory of module - * @param string $targetmodule Name of directory where canvas is stored - * @param string $canvas Name of canvas - * @param string $card Name of tab (sub-canvas) - */ - function __construct($DB, $dirmodule, $targetmodule, $canvas, $card) - { - $this->db = $DB; - $this->dirmodule = $dirmodule; - $this->targetmodule = $targetmodule; - $this->canvas = $canvas; - $this->card = $card; - } /** * Instantiation of DAO class diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php index df1f7404e76..f6c0b0ca5f9 100644 --- a/htdocs/core/class/stats.class.php +++ b/htdocs/core/class/stats.class.php @@ -31,17 +31,6 @@ abstract class Stats protected $db; - /** - * Constructor - * - * @param DoliDB $DB Database handler - * @return Stats - */ - function Stats($DB) - { - $this->db = $DB; - } - /** * Return nb of entity by month for several years * diff --git a/htdocs/ftp/pre.inc.php b/htdocs/ftp/pre.inc.php index 84c9f1326dc..2fd4c498d2d 100644 --- a/htdocs/ftp/pre.inc.php +++ b/htdocs/ftp/pre.inc.php @@ -21,7 +21,7 @@ * \brief File to manage left menu for FTP module */ -require ("../main.inc.php"); +require (realpath(dirname(__FILE__)) . "/../main.inc.php"); $user->getrights('ecm'); diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index d3eecdc5668..bb5e7745995 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -49,20 +49,7 @@ abstract class DolibarrModules //! Tableau des documents ??? var $docs; - var $dbversion; - - - /** - * Constructor - * - * @param DoliDB $DB Database handler - */ - function DolibarrModules($DB) - { - $this->db = $DB ; - $this->dbversion = "-"; - } - + var $dbversion = "-"; /** * Fonction d'activation. Insere en base les constantes et boites du module diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php index 65a7344ba09..9992255fbb2 100644 --- a/htdocs/includes/modules/commande/modules_commande.php +++ b/htdocs/includes/modules/commande/modules_commande.php @@ -66,7 +66,7 @@ abstract class ModelePDFCommandes extends CommonDocGenerator * \brief Classe mere des modeles de numerotation des references de commandes */ -class ModeleNumRefCommandes +abstract class ModeleNumRefCommandes { var $error=''; diff --git a/htdocs/includes/modules/dons/modules_don.php b/htdocs/includes/modules/dons/modules_don.php index 4415e4f99d8..3d7d93e93aa 100644 --- a/htdocs/includes/modules/dons/modules_don.php +++ b/htdocs/includes/modules/dons/modules_don.php @@ -60,7 +60,7 @@ abstract class ModeleDon extends CommonDocGenerator * \class ModeleNumRefDons * \brief Classe mere des modeles de numerotation des references des dons */ -class ModeleNumRefDons +abstract class ModeleNumRefDons { var $error=''; diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php index b51b25eda7d..d0e9437bc99 100644 --- a/htdocs/includes/modules/facture/modules_facture.php +++ b/htdocs/includes/modules/facture/modules_facture.php @@ -61,7 +61,7 @@ abstract class ModelePDFFactures extends CommonDocGenerator * \class ModeleNumRefFactures * \brief Classe mere des modeles de numerotation des references de facture */ -class ModeleNumRefFactures +abstract class ModeleNumRefFactures { var $error=''; diff --git a/htdocs/includes/modules/fichinter/modules_fichinter.php b/htdocs/includes/modules/fichinter/modules_fichinter.php index 1f195731e8b..337ed19a406 100644 --- a/htdocs/includes/modules/fichinter/modules_fichinter.php +++ b/htdocs/includes/modules/fichinter/modules_fichinter.php @@ -60,7 +60,7 @@ abstract class ModelePDFFicheinter extends CommonDocGenerator * \class ModeleNumRefFicheinter * \brief Classe mere des modeles de numerotation des references de fiches d'intervention */ -class ModeleNumRefFicheinter +abstract class ModeleNumRefFicheinter { var $error=''; diff --git a/htdocs/includes/modules/livraison/modules_livraison.php b/htdocs/includes/modules/livraison/modules_livraison.php index 53b8fe14b43..7c71be292ab 100644 --- a/htdocs/includes/modules/livraison/modules_livraison.php +++ b/htdocs/includes/modules/livraison/modules_livraison.php @@ -61,7 +61,7 @@ abstract class ModelePDFDeliveryOrder extends CommonDocGenerator * \class ModeleNumRefDeliveryOrder * \brief Classe mere des modeles de numerotation des references de bon de livraison */ -class ModeleNumRefDeliveryOrder +abstract class ModeleNumRefDeliveryOrder { var $error=''; diff --git a/htdocs/includes/modules/mailings/modules_mailings.php b/htdocs/includes/modules/mailings/modules_mailings.php index 786999c6760..a8eae54a5fc 100644 --- a/htdocs/includes/modules/mailings/modules_mailings.php +++ b/htdocs/includes/modules/mailings/modules_mailings.php @@ -35,11 +35,6 @@ abstract class MailingTargets var $db=''; var $error=''; - function MailingTargets($DB) - { - $this->db=$DB; - } - /** \brief Renvoi un exemple de numerotation * \return string Retourne la traduction de la cle MailingModuleDescXXX ou XXX nom du module, ou $this->desc si non trouve */ diff --git a/htdocs/includes/modules/modPaypal.class.php b/htdocs/includes/modules/modPaypal.class.php index b7914787162..31abc711e94 100644 --- a/htdocs/includes/modules/modPaypal.class.php +++ b/htdocs/includes/modules/modPaypal.class.php @@ -77,8 +77,8 @@ class modPaypal extends DolibarrModules // Dependencies $this->depends = array(); // List of modules id that must be enabled if this module is enabled $this->requiredby = array('modPaypalPlus'); // List of modules id to disable if this one is disabled - $this->phpmin = array(4,1); // Minimum version of PHP required by module - $this->need_dolibarr_version = array(3,0,-2); // Minimum version of Dolibarr required by module + $this->phpmin = array(5,2); // Minimum version of PHP required by module + $this->need_dolibarr_version = array(3,0); // Minimum version of Dolibarr required by module $this->langfiles = array("paypal"); // Constants diff --git a/htdocs/includes/modules/project/modules_project.php b/htdocs/includes/modules/project/modules_project.php index 6218809a748..3702c6333cb 100644 --- a/htdocs/includes/modules/project/modules_project.php +++ b/htdocs/includes/modules/project/modules_project.php @@ -58,7 +58,7 @@ abstract class ModelePDFProjects extends CommonDocGenerator * \class ModeleNumRefProjects * \brief Classe mere des modeles de numerotation des references de projets */ -class ModeleNumRefProjects +abstract class ModeleNumRefProjects { var $error=''; diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php index 0ae70be6e0e..4be6dad6f77 100644 --- a/htdocs/includes/modules/propale/modules_propale.php +++ b/htdocs/includes/modules/propale/modules_propale.php @@ -61,7 +61,7 @@ abstract class ModelePDFPropales extends CommonDocGenerator * \class ModeleNumRefPropales * \brief Classe mere des modeles de numerotation des references de propales */ -class ModeleNumRefPropales +abstract class ModeleNumRefPropales { var $error=''; diff --git a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php index e54e109193a..001439747ee 100644 --- a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php +++ b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php @@ -65,7 +65,7 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator * \class ModeleNumRefSuppliersOrders * \brief Classe mere des modeles de numerotation des references de commandes fournisseurs */ -class ModeleNumRefSuppliersOrders +abstract class ModeleNumRefSuppliersOrders { var $error=''; diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php index d94fac368e7..1055b3a0ab9 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -789,13 +789,14 @@ function UnActivate($value, $requiredby=1) } else { - $genericMod = new DolibarrModules($db); - $genericMod->name=preg_replace('/^mod/i','',$modName); - $genericMod->style_sheet=1; - $genericMod->rights_class=strtolower(preg_replace('/^mod/i','',$modName)); - $genericMod->const_name='MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',$modName)); - dol_syslog("modules::UnActivate Failed to find module file, we use generic function with name ".$genericMod->name); - $genericMod->_remove(); + // TODO Cannot instantiate abstract class + //$genericMod = new DolibarrModul($db); + //$genericMod->name=preg_replace('/^mod/i','',$modName); + //$genericMod->style_sheet=1; + //$genericMod->rights_class=strtolower(preg_replace('/^mod/i','',$modName)); + //$genericMod->const_name='MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',$modName)); + dol_syslog("modules::UnActivate Failed to find module file, we use generic function with name " . $modName); + //$genericMod->_remove(); } // Desactivation des modules qui dependent de lui diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 59ca0510c23..39183b07f48 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -362,16 +362,16 @@ if (! defined('NOLOGIN')) } } - $usertotest=$_POST["username"]; - $passwordtotest=$_POST["password"]; - $entitytotest=$_POST["entity"]; + $usertotest = (! empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : $_POST["username"]); + $passwordtotest = (! empty($_COOKIE['password_dolibarr']) ? $_COOKIE['password_dolibarr'] : $_POST["password"]); + $entitytotest = (! empty($_POST["entity"]) ? $_POST["entity"] : 1); // Validation of login/pass/entity // If ok, the variable login will be returned // If error, we will put error message in session under the name dol_loginmesg $goontestloop=false; if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) $goontestloop=true; - if (isset($_POST["username"]) || GETPOST('openid_mode','alpha',1)) $goontestloop=true; + if (isset($_POST["username"]) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) $goontestloop=true; if ($test && $goontestloop) { diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 88b4d2b68a5..902af90022c 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -42,24 +42,7 @@ abstract class ActionsCardCommon var $error; //! Error array var $errors=array(); - - /** - * Constructor - * - * @param DoliDB $DB Database handler - * @param string $dirmodule Name of directory of module - * @param string $targetmodule Name of directory where canvas is stored - * @param string $canvas Name of canvas - * @param string $card Name of tab (sub-canvas) - */ - function __construct($DB, $dirmodule, $targetmodule, $canvas, $card) - { - $this->db = $DB; - $this->dirmodule = $dirmodule; - $this->targetmodule = $targetmodule; - $this->canvas = $canvas; - $this->card = $card; - } + /** * Instantiation of DAO class diff --git a/test/phpunit/hudson_phpunittest.xml b/test/phpunit/hudson_phpunittest.xml index 74483c13d3e..4720fa4ace8 100644 --- a/test/phpunit/hudson_phpunittest.xml +++ b/test/phpunit/hudson_phpunittest.xml @@ -38,6 +38,7 @@ ../../htdocs/ ../../htdocs/ + ../../htdocs/ ../../htdocs/ ../../htdocs/includes/modules/facture/modules_facture.php ../../htdocs/includes/modules/commande/modules_commande.php @@ -49,6 +50,10 @@ ../../dev/ ../../doc/ ../../test/ + ../../htdocs/boutique/ + ../../htdocs/compta/paiement/cheque/ + ../../htdocs/compta/bank/ + ../../htdocs/ftp/ ../../htdocs/core/filemanagerdol/ ../../htdocs/custom/ ../../htdocs/products/canvas/ @@ -70,4 +75,4 @@ - \ No newline at end of file +