Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop

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");

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");

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

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
 	 *

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');
 

htdocs/includes/modules/DolibarrModules.class.php

@@ -49,20 +49,7 @@ abstract class DolibarrModules
     //! Tableau des documents ???
     var $docs;
 
-    var $dbversion;
+    var $dbversion = "-";
-
-
-    /**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$DB      Database handler
-     */
-    function DolibarrModules($DB)
-    {
-        $this->db = $DB ;
-        $this->dbversion = "-";
-    }
-
 
     /**
      *      Fonction d'activation. Insere en base les constantes et boites du module

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='';
 

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='';
 

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='';
 

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='';
 

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='';
 

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
      */

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->phpmin = array(5,2);						// Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(3,0,-2);	// Minimum version of Dolibarr required by module
+        $this->need_dolibarr_version = array(3,0);		// Minimum version of Dolibarr required by module
         $this->langfiles = array("paypal");
 
         // Constants

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='';
 

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='';
 

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='';
 

htdocs/lib/admin.lib.php

@@ -789,13 +789,14 @@ function UnActivate($value, $requiredby=1)
     }
     else
     {
-        $genericMod = new DolibarrModules($db);
+        // TODO Cannot instantiate abstract class
-        $genericMod->name=preg_replace('/^mod/i','',$modName);
+    	//$genericMod = new DolibarrModul($db);
-        $genericMod->style_sheet=1;
+        //$genericMod->name=preg_replace('/^mod/i','',$modName);
-        $genericMod->rights_class=strtolower(preg_replace('/^mod/i','',$modName));
+        //$genericMod->style_sheet=1;
-        $genericMod->const_name='MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',$modName));
+        //$genericMod->rights_class=strtolower(preg_replace('/^mod/i','',$modName));
-        dol_syslog("modules::UnActivate Failed to find module file, we use generic function with name ".$genericMod->name);
+        //$genericMod->const_name='MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',$modName));
-        $genericMod->_remove();
+        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

htdocs/main.inc.php

@@ -362,16 +362,16 @@ if (! defined('NOLOGIN'))
 			}
 		}
 
-		$usertotest=$_POST["username"];
+		$usertotest		= (! empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : $_POST["username"]);
-		$passwordtotest=$_POST["password"];
+		$passwordtotest	= (! empty($_COOKIE['password_dolibarr']) ? $_COOKIE['password_dolibarr'] : $_POST["password"]);
-		$entitytotest=$_POST["entity"];
+		$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)
 		{

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

test/phpunit/hudson_phpunittest.xml

@@ -38,6 +38,7 @@
   <whitelist addUncoveredFilesFromWhitelist="true">
     <directory suffix=".class.php">../../htdocs/</directory>
     <directory suffix=".lib.php">../../htdocs/</directory>
+    <directory suffix=".inc.php">../../htdocs/</directory>
     <directory suffix=".modules.php">../../htdocs/</directory>
     <file>../../htdocs/includes/modules/facture/modules_facture.php</file>
     <file>../../htdocs/includes/modules/commande/modules_commande.php</file>
@@ -49,6 +50,10 @@
     <directory suffix=".php">../../dev/</directory>
     <directory suffix=".php">../../doc/</directory>
     <directory suffix=".php">../../test/</directory>
+    <directory suffix=".inc.php">../../htdocs/boutique/</directory>
+    <directory suffix=".inc.php">../../htdocs/compta/paiement/cheque/</directory>
+    <directory suffix=".inc.php">../../htdocs/compta/bank/</directory>
+    <directory suffix=".inc.php">../../htdocs/ftp/</directory>
     <directory suffix=".php">../../htdocs/core/filemanagerdol/</directory>
     <directory suffix=".php">../../htdocs/custom/</directory>
     <directory suffix=".php">../../htdocs/products/canvas/</directory>
@@ -70,4 +75,4 @@
     </exclude>
   </whitelist>
 </filter>
-</phpunit>
+</phpunit>