alxarafe / alixar

dolibarr/htdocs/core/modules/modModuleBuilder.class.php

Indentation +10 added lines, -10 removed lines

@@ -31,24 +31,24 @@ 
 class modModuleBuilder extends DolibarrModules
 {
     /**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
      */
     function __construct($db)
     {
-    	global $langs,$conf;
+        global $langs,$conf;
 
         $this->db = $db;
         $this->numero = 3300;
 
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		// It is used to group modules in module setup page
+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+        // It is used to group modules in module setup page
         $this->family = "technic";
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
         $this->name = preg_replace('/^mod/i','',get_class($this));
         $this->description = "A RAD (Rapid Application Development) tool to help developers to build their own module.";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
@@ -64,10 +64,10 @@ 
 
         // Dependencies
         //-------------
-	    $this->hidden = false;	// A condition to disable module
-	    $this->depends = array();		// List of modules id that must be enabled if this module is enabled
+        $this->hidden = false;	// A condition to disable module
+        $this->depends = array();		// List of modules id that must be enabled if this module is enabled
         $this->requiredby = array();	// List of modules id to disable if this one is disabled
-	    $this->conflictwith = array();	// List of modules id this module is in conflict with
+        $this->conflictwith = array();	// List of modules id this module is in conflict with
         $this->langfiles = array();
 
         // Constants

Spacing +9 added lines, -9 removed lines

@@ -23,7 +23,7 @@ 
  *  \ingroup    blockedlog
  *  \brief      Description and activation file for module ModuleBuilder
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 /**
  *	Class to describe a ModuleBuilder module
@@ -37,7 +37,7 @@ 
      */
     function __construct($db)
     {
-    	global $langs,$conf;
+    	global $langs, $conf;
 
         $this->db = $db;
         $this->numero = 3300;
@@ -46,14 +46,14 @@ 
 		// It is used to group modules in module setup page
         $this->family = "technic";
         // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->name = preg_replace('/^mod/i', '', get_class($this));
         $this->description = "A RAD (Rapid Application Development) tool to help developers to build their own module.";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         // Name of image file used for this module.
-        $this->picto='technic';
+        $this->picto = 'technic';
 
         // Data directories to create when module is enabled
         $this->dirs = array();
@@ -64,10 +64,10 @@ 
 
         // Dependencies
         //-------------
-	    $this->hidden = false;	// A condition to disable module
-	    $this->depends = array();		// List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array();	// List of modules id to disable if this one is disabled
-	    $this->conflictwith = array();	// List of modules id this module is in conflict with
+	    $this->hidden = false; // A condition to disable module
+	    $this->depends = array(); // List of modules id that must be enabled if this module is enabled
+        $this->requiredby = array(); // List of modules id to disable if this one is disabled
+	    $this->conflictwith = array(); // List of modules id this module is in conflict with
         $this->langfiles = array();
 
         // Constants
@@ -86,7 +86,7 @@ 
         //------------------
         $this->menu = array();
 
-        $this->menu[$r]=array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',
+        $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',
             'type'=>'left',
             'titre'=>'ModuleBuilder',
             'mainmenu'=>'home',

dolibarr/htdocs/core/modules/syslog/mod_syslog_chromephp.php

Indentation +162 added lines, -162 removed lines

@@ -7,168 +7,168 @@
  */
 class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface
 {
-	var $code = 'chromephp';
-
-	/**
-	 * 	Return name of logger
-	 *
-	 * 	@return	string		Name of logger
-	 */
-	public function getName()
-	{
-		return 'ChromePHP';
-	}
-
-	/**
-	 * Version of the module ('x.y.z' or 'dolibarr' or 'experimental' or 'development')
-	 *
-	 * @return string
-	 */
-	public function getVersion()
-	{
-		return 'dolibarr';
-	}
-
-	/**
-	 * Content of the info tooltip.
-	 *
-	 * @return string
-	 */
-	public function getInfo()
-	{
-		return '';
-	}
-
-	/**
-	 * Return warning if something is wrong with logger
-	 *
-	 * @return string
-	 */
-	public function getWarning()
-	{
-		global $langs;
-
-		return ($this->isActive() == 1)?'':$langs->trans('ClassNotFoundIntoPathWarning','ChromePhp.class.php');
-	}
+    var $code = 'chromephp';
+
+    /**
+     * 	Return name of logger
+     *
+     * 	@return	string		Name of logger
+     */
+    public function getName()
+    {
+        return 'ChromePHP';
+    }
+
+    /**
+     * Version of the module ('x.y.z' or 'dolibarr' or 'experimental' or 'development')
+     *
+     * @return string
+     */
+    public function getVersion()
+    {
+        return 'dolibarr';
+    }
+
+    /**
+     * Content of the info tooltip.
+     *
+     * @return string
+     */
+    public function getInfo()
+    {
+        return '';
+    }
+
+    /**
+     * Return warning if something is wrong with logger
+     *
+     * @return string
+     */
+    public function getWarning()
+    {
+        global $langs;
+
+        return ($this->isActive() == 1)?'':$langs->trans('ClassNotFoundIntoPathWarning','ChromePhp.class.php');
+    }
 	
-	/**
-	 * Is the module active ?
-	 *
-	 * @return int         -1 if not active, 0 if active but lib/path not found, 1 if OK
-	 */
-	public function isActive()
-	{
-		global $conf;
-		try
-		{
-			if (empty($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH)) {
-				$conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH = DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/';
-			}
-			set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
-
-		    $res = @include_once 'ChromePhp.php';
-		    if (! $res) $res=@include_once 'ChromePhp.class.php';
-
-		    restore_include_path();
-
-		    if ($res)
-		    {
-        		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP to 1 to disable this loghandler
-		    }
-		    else
-		    {
-		        return 0;
-		    }
-		}
-		catch(Exception $e)
-		{
-		    print '<!-- ChromePHP not available into PHP -->'."\n";
-		}
-
-		return -1;
-	}
-
-	/**
-	 * 	Return array of configuration data
-	 *
-	 * 	@return	array		Return array of configuration data
-	 */
-	public function configure()
-	{
-		global $langs;
-
-		return array(
-			array(
-				'name' => $langs->trans('IncludePath','SYSLOG_CHROMEPHP_INCLUDEPATH'),
-				'constant' => 'SYSLOG_CHROMEPHP_INCLUDEPATH',
-				'default' => DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/',
-				'attr' => 'size="60"',
-			    'example' =>'/usr/share/php, '.DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/'
-			)
-		);
-	}
-
-	/**
-	 * 	Return if configuration is valid
-	 *
-	 * 	@return	array		Array of errors. Empty array if ok.
-	 */
-	public function checkConfiguration()
-	{
-		global $langs,$conf;
-
-		$errors = array();
-
-		if (! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.php') && ! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.class.php'))
-		{
-			$conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP = 1; // avoid infinite loop
-			if (is_object($langs))   // $langs may not be defined yet.
-			{
-				$errors[] = $langs->trans("ErrorFailedToOpenFile", 'ChromePhp.class.php or ChromePhp.php');
-			}
-			else
-			{
-				$errors[] = "ErrorFailedToOpenFile ChromePhp.class.php or ChromePhp.php";
-			}
-		}
-
-		return $errors;
-	}
-
-	/**
-	 * 	Output log content. We also start output buffering at first log write.
-	 *
-	 *	@param	array	$content	Content to log
-	 * 	@return	null|false
-	 */
-	public function export($content)
-	{
-		global $conf;
-
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP)) return;	// Global option to disable output of this handler
-
-		//We check the configuration to avoid showing PHP warnings
-		if (count($this->checkConfiguration()) > 0) return false;
-
-		try
-		{
-			// Warning ChromePHP must be into PHP include path. It is not possible to use into require_once a constant from
-			// database or config file because we must be able to log data before database or config file read.
-			$oldinclude=get_include_path();
-			set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
-		    $res = @include_once 'ChromePhp.php';
-		    if (! $res) $res=@include_once 'ChromePhp.class.php';
-			set_include_path($oldinclude);
+    /**
+     * Is the module active ?
+     *
+     * @return int         -1 if not active, 0 if active but lib/path not found, 1 if OK
+     */
+    public function isActive()
+    {
+        global $conf;
+        try
+        {
+            if (empty($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH)) {
+                $conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH = DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/';
+            }
+            set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
+
+            $res = @include_once 'ChromePhp.php';
+            if (! $res) $res=@include_once 'ChromePhp.class.php';
+
+            restore_include_path();
+
+            if ($res)
+            {
+                return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP to 1 to disable this loghandler
+            }
+            else
+            {
+                return 0;
+            }
+        }
+        catch(Exception $e)
+        {
+            print '<!-- ChromePHP not available into PHP -->'."\n";
+        }
+
+        return -1;
+    }
+
+    /**
+     * 	Return array of configuration data
+     *
+     * 	@return	array		Return array of configuration data
+     */
+    public function configure()
+    {
+        global $langs;
+
+        return array(
+            array(
+                'name' => $langs->trans('IncludePath','SYSLOG_CHROMEPHP_INCLUDEPATH'),
+                'constant' => 'SYSLOG_CHROMEPHP_INCLUDEPATH',
+                'default' => DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/',
+                'attr' => 'size="60"',
+                'example' =>'/usr/share/php, '.DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/'
+            )
+        );
+    }
+
+    /**
+     * 	Return if configuration is valid
+     *
+     * 	@return	array		Array of errors. Empty array if ok.
+     */
+    public function checkConfiguration()
+    {
+        global $langs,$conf;
+
+        $errors = array();
+
+        if (! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.php') && ! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.class.php'))
+        {
+            $conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP = 1; // avoid infinite loop
+            if (is_object($langs))   // $langs may not be defined yet.
+            {
+                $errors[] = $langs->trans("ErrorFailedToOpenFile", 'ChromePhp.class.php or ChromePhp.php');
+            }
+            else
+            {
+                $errors[] = "ErrorFailedToOpenFile ChromePhp.class.php or ChromePhp.php";
+            }
+        }
+
+        return $errors;
+    }
+
+    /**
+     * 	Output log content. We also start output buffering at first log write.
+     *
+     *	@param	array	$content	Content to log
+     * 	@return	null|false
+     */
+    public function export($content)
+    {
+        global $conf;
+
+        if (! empty($conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP)) return;	// Global option to disable output of this handler
+
+        //We check the configuration to avoid showing PHP warnings
+        if (count($this->checkConfiguration()) > 0) return false;
+
+        try
+        {
+            // Warning ChromePHP must be into PHP include path. It is not possible to use into require_once a constant from
+            // database or config file because we must be able to log data before database or config file read.
+            $oldinclude=get_include_path();
+            set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
+            $res = @include_once 'ChromePhp.php';
+            if (! $res) $res=@include_once 'ChromePhp.class.php';
+            set_include_path($oldinclude);
 			
-			ob_start();	// To be sure headers are not flushed until all page is completely processed
-			if ($content['level'] == LOG_ERR) ChromePhp::error($content['message']);
-			elseif ($content['level'] == LOG_WARNING) ChromePhp::warn($content['message']);
-			elseif ($content['level'] == LOG_INFO) ChromePhp::log($content['message']);
-			else ChromePhp::log($content['message']);
-		}
-		catch (Exception $e)
-		{
-			// Do not use dol_syslog here to avoid infinite loop
-		}
-	}
+            ob_start();	// To be sure headers are not flushed until all page is completely processed
+            if ($content['level'] == LOG_ERR) ChromePhp::error($content['message']);
+            elseif ($content['level'] == LOG_WARNING) ChromePhp::warn($content['message']);
+            elseif ($content['level'] == LOG_INFO) ChromePhp::log($content['message']);
+            else ChromePhp::log($content['message']);
+        }
+        catch (Exception $e)
+        {
+            // Do not use dol_syslog here to avoid infinite loop
+        }
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -48,7 +48,7 @@ 
 	{
 		global $langs;
 
-		return ($this->isActive() == 1)?'':$langs->trans('ClassNotFoundIntoPathWarning','ChromePhp.class.php');
+		return ($this->isActive() == 1) ? '' : $langs->trans('ClassNotFoundIntoPathWarning', 'ChromePhp.class.php');
 	}
 	
 	/**
@@ -62,25 +62,25 @@ 
 		try
 		{
 			if (empty($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH)) {
-				$conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH = DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/';
+				$conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH = DOL_DOCUMENT_ROOT.'/includes/ccampbell/chromephp/';
 			}
 			set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
 
 		    $res = @include_once 'ChromePhp.php';
-		    if (! $res) $res=@include_once 'ChromePhp.class.php';
+		    if (!$res) $res = @include_once 'ChromePhp.class.php';
 
 		    restore_include_path();
 
 		    if ($res)
 		    {
-        		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP to 1 to disable this loghandler
+        		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP) ? 1 : 0; // Set SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP to 1 to disable this loghandler
 		    }
 		    else
 		    {
 		        return 0;
 		    }
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 		    print '<!-- ChromePHP not available into PHP -->'."\n";
 		}
@@ -99,11 +99,11 @@ 
 
 		return array(
 			array(
-				'name' => $langs->trans('IncludePath','SYSLOG_CHROMEPHP_INCLUDEPATH'),
+				'name' => $langs->trans('IncludePath', 'SYSLOG_CHROMEPHP_INCLUDEPATH'),
 				'constant' => 'SYSLOG_CHROMEPHP_INCLUDEPATH',
-				'default' => DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/',
+				'default' => DOL_DOCUMENT_ROOT.'/includes/ccampbell/chromephp/',
 				'attr' => 'size="60"',
-			    'example' =>'/usr/share/php, '.DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/'
+			    'example' =>'/usr/share/php, '.DOL_DOCUMENT_ROOT.'/includes/ccampbell/chromephp/'
 			)
 		);
 	}
@@ -115,11 +115,11 @@ 
 	 */
 	public function checkConfiguration()
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 
 		$errors = array();
 
-		if (! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.php') && ! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.class.php'))
+		if (!file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.php') && !file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.class.php'))
 		{
 			$conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP = 1; // avoid infinite loop
 			if (is_object($langs))   // $langs may not be defined yet.
@@ -145,7 +145,7 @@ 
 	{
 		global $conf;
 
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP)) return;	// Global option to disable output of this handler
+		if (!empty($conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP)) return; // Global option to disable output of this handler
 
 		//We check the configuration to avoid showing PHP warnings
 		if (count($this->checkConfiguration()) > 0) return false;
@@ -154,13 +154,13 @@ 
 		{
 			// Warning ChromePHP must be into PHP include path. It is not possible to use into require_once a constant from
 			// database or config file because we must be able to log data before database or config file read.
-			$oldinclude=get_include_path();
+			$oldinclude = get_include_path();
 			set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
 		    $res = @include_once 'ChromePhp.php';
-		    if (! $res) $res=@include_once 'ChromePhp.class.php';
+		    if (!$res) $res = @include_once 'ChromePhp.class.php';
 			set_include_path($oldinclude);
 			
-			ob_start();	// To be sure headers are not flushed until all page is completely processed
+			ob_start(); // To be sure headers are not flushed until all page is completely processed
 			if ($content['level'] == LOG_ERR) ChromePhp::error($content['message']);
 			elseif ($content['level'] == LOG_WARNING) ChromePhp::warn($content['message']);
 			elseif ($content['level'] == LOG_INFO) ChromePhp::log($content['message']);

Braces +28 added lines, -16 removed lines

@@ -67,20 +67,20 @@ 
 			set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
 
 		    $res = @include_once 'ChromePhp.php';
-		    if (! $res) $res=@include_once 'ChromePhp.class.php';
+		    if (! $res) {
+		        $res=@include_once 'ChromePhp.class.php';
+		    }
 
 		    restore_include_path();
 
 		    if ($res)
 		    {
         		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP to 1 to disable this loghandler
-		    }
-		    else
+		    } else
 		    {
 		        return 0;
 		    }
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 		    print '<!-- ChromePHP not available into PHP -->'."\n";
 		}
@@ -122,11 +122,12 @@ 
 		if (! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.php') && ! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.class.php'))
 		{
 			$conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP = 1; // avoid infinite loop
-			if (is_object($langs))   // $langs may not be defined yet.
+			if (is_object($langs)) {
+			    // $langs may not be defined yet.
 			{
 				$errors[] = $langs->trans("ErrorFailedToOpenFile", 'ChromePhp.class.php or ChromePhp.php');
 			}
-			else
+			} else
 			{
 				$errors[] = "ErrorFailedToOpenFile ChromePhp.class.php or ChromePhp.php";
 			}
@@ -145,10 +146,15 @@ 
 	{
 		global $conf;
 
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP)) return;	// Global option to disable output of this handler
+		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP)) {
+		    return;
+		}
+		// Global option to disable output of this handler
 
 		//We check the configuration to avoid showing PHP warnings
-		if (count($this->checkConfiguration()) > 0) return false;
+		if (count($this->checkConfiguration()) > 0) {
+		    return false;
+		}
 
 		try
 		{
@@ -157,16 +163,22 @@ 
 			$oldinclude=get_include_path();
 			set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
 		    $res = @include_once 'ChromePhp.php';
-		    if (! $res) $res=@include_once 'ChromePhp.class.php';
+		    if (! $res) {
+		        $res=@include_once 'ChromePhp.class.php';
+		    }
 			set_include_path($oldinclude);
 			
 			ob_start();	// To be sure headers are not flushed until all page is completely processed
-			if ($content['level'] == LOG_ERR) ChromePhp::error($content['message']);
-			elseif ($content['level'] == LOG_WARNING) ChromePhp::warn($content['message']);
-			elseif ($content['level'] == LOG_INFO) ChromePhp::log($content['message']);
-			else ChromePhp::log($content['message']);
-		}
-		catch (Exception $e)
+			if ($content['level'] == LOG_ERR) {
+			    ChromePhp::error($content['message']);
+			} elseif ($content['level'] == LOG_WARNING) {
+			    ChromePhp::warn($content['message']);
+			} elseif ($content['level'] == LOG_INFO) {
+			    ChromePhp::log($content['message']);
+			} else {
+			    ChromePhp::log($content['message']);
+			}
+		} catch (Exception $e)
 		{
 			// Do not use dol_syslog here to avoid infinite loop
 		}

dolibarr/htdocs/core/modules/syslog/mod_syslog_syslog.php

Indentation +117 added lines, -117 removed lines

@@ -7,121 +7,121 @@
  */
 class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 {
-	var $code = 'syslog';
-
-	/**
-	 * 	Return name of logger
-	 *
-	 * 	@return	string		Name of logger
-	 */
-	public function getName()
-	{
-		return 'Syslog';
-	}
-
-	/**
-	 * Version of the module ('x.y.z' or 'dolibarr' or 'experimental' or 'development')
-	 *
-	 * @return string
-	 */
-	public function getVersion()
-	{
-		return 'dolibarr';
-	}
-
-	/**
-	 * Content of the info tooltip.
-	 *
-	 * @return false|string
-	 */
-	public function getInfo()
-	{
-		global $langs;
-
-		return $langs->trans('OnlyWindowsLOG_USER');
-	}
-
-	/**
-	 * Is the module active ?
-	 *
-	 * @return int
-	 */
-	public function isActive()
-	{
-	    global $conf;
-
-		// This function does not exists on some ISP (Ex: Free in France)
-		if (!function_exists('openlog')) return 0;
-
-		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_SYSLOG)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_SYSLOG to 1 to disable this loghandler
-	}
-
-	/**
-	 * 	Return array of configuration data
-	 *
-	 * 	@return	array		Return array of configuration data
-	 */
-	public function configure()
-	{
-		global $langs;
-
-		return array(
-			array(
-				'constant' => 'SYSLOG_FACILITY',
-				'name' => $langs->trans('SyslogFacility'),
-				'default' => 'LOG_USER'
-			)
-		);
-	}
-
-	/**
-	 * 	Return if configuration is valid
-	 *
-	 * 	@return	array		Array of errors. Empty array if ok.
-	 */
-	public function checkConfiguration()
-	{
-		global $conf, $langs;
-
-		$errors = array();
-
-	    $facility = constant($conf->global->SYSLOG_FACILITY);
-	    if ($facility)
-		{
-			// Only LOG_USER supported on Windows
-			if (! empty($_SERVER["WINDIR"])) $facility=constant('LOG_USER');
-
-			dol_syslog("admin/syslog: facility ".$facility);
-		}
-		else
-		{
-		    $errors[] = $langs->trans("ErrorUnknownSyslogConstant", $facility);
-		}
-
-		return $errors;
-	}
-
-	/**
-	 * Export the message
-	 *
-	 * @param  	array 	$content 	Array containing the info about the message
-	 * @return	void
-	 */
-	public function export($content)
-	{
-		global $conf;
-
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) return;	// Global option to disable output of this handler
-
-		if (! empty($conf->global->SYSLOG_FACILITY))  // Example LOG_USER
-		{
-			$facility = constant($conf->global->SYSLOG_FACILITY);
-		}
-		else $facility = constant('LOG_USER');
-
-		// (int) is required to avoid error parameter 3 expected to be long
-		openlog('dolibarr', LOG_PID | LOG_PERROR, (int) $facility);
-		syslog($content['level'], $content['message']);
-		closelog();
-	}
+    var $code = 'syslog';
+
+    /**
+     * 	Return name of logger
+     *
+     * 	@return	string		Name of logger
+     */
+    public function getName()
+    {
+        return 'Syslog';
+    }
+
+    /**
+     * Version of the module ('x.y.z' or 'dolibarr' or 'experimental' or 'development')
+     *
+     * @return string
+     */
+    public function getVersion()
+    {
+        return 'dolibarr';
+    }
+
+    /**
+     * Content of the info tooltip.
+     *
+     * @return false|string
+     */
+    public function getInfo()
+    {
+        global $langs;
+
+        return $langs->trans('OnlyWindowsLOG_USER');
+    }
+
+    /**
+     * Is the module active ?
+     *
+     * @return int
+     */
+    public function isActive()
+    {
+        global $conf;
+
+        // This function does not exists on some ISP (Ex: Free in France)
+        if (!function_exists('openlog')) return 0;
+
+        return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_SYSLOG)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_SYSLOG to 1 to disable this loghandler
+    }
+
+    /**
+     * 	Return array of configuration data
+     *
+     * 	@return	array		Return array of configuration data
+     */
+    public function configure()
+    {
+        global $langs;
+
+        return array(
+            array(
+                'constant' => 'SYSLOG_FACILITY',
+                'name' => $langs->trans('SyslogFacility'),
+                'default' => 'LOG_USER'
+            )
+        );
+    }
+
+    /**
+     * 	Return if configuration is valid
+     *
+     * 	@return	array		Array of errors. Empty array if ok.
+     */
+    public function checkConfiguration()
+    {
+        global $conf, $langs;
+
+        $errors = array();
+
+        $facility = constant($conf->global->SYSLOG_FACILITY);
+        if ($facility)
+        {
+            // Only LOG_USER supported on Windows
+            if (! empty($_SERVER["WINDIR"])) $facility=constant('LOG_USER');
+
+            dol_syslog("admin/syslog: facility ".$facility);
+        }
+        else
+        {
+            $errors[] = $langs->trans("ErrorUnknownSyslogConstant", $facility);
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Export the message
+     *
+     * @param  	array 	$content 	Array containing the info about the message
+     * @return	void
+     */
+    public function export($content)
+    {
+        global $conf;
+
+        if (! empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) return;	// Global option to disable output of this handler
+
+        if (! empty($conf->global->SYSLOG_FACILITY))  // Example LOG_USER
+        {
+            $facility = constant($conf->global->SYSLOG_FACILITY);
+        }
+        else $facility = constant('LOG_USER');
+
+        // (int) is required to avoid error parameter 3 expected to be long
+        openlog('dolibarr', LOG_PID | LOG_PERROR, (int) $facility);
+        syslog($content['level'], $content['message']);
+        closelog();
+    }
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
 		// This function does not exists on some ISP (Ex: Free in France)
 		if (!function_exists('openlog')) return 0;
 
-		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_SYSLOG)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_SYSLOG to 1 to disable this loghandler
+		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_SYSLOG) ? 1 : 0; // Set SYSLOG_DISABLE_LOGHANDLER_SYSLOG to 1 to disable this loghandler
 	}
 
 	/**
@@ -89,7 +89,7 @@ 
 	    if ($facility)
 		{
 			// Only LOG_USER supported on Windows
-			if (! empty($_SERVER["WINDIR"])) $facility=constant('LOG_USER');
+			if (!empty($_SERVER["WINDIR"])) $facility = constant('LOG_USER');
 
 			dol_syslog("admin/syslog: facility ".$facility);
 		}
@@ -111,9 +111,9 @@ 
 	{
 		global $conf;
 
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) return;	// Global option to disable output of this handler
+		if (!empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) return; // Global option to disable output of this handler
 
-		if (! empty($conf->global->SYSLOG_FACILITY))  // Example LOG_USER
+		if (!empty($conf->global->SYSLOG_FACILITY))  // Example LOG_USER
 		{
 			$facility = constant($conf->global->SYSLOG_FACILITY);
 		}

Braces +16 added lines, -7 removed lines

@@ -51,7 +51,9 @@ 
 	    global $conf;
 
 		// This function does not exists on some ISP (Ex: Free in France)
-		if (!function_exists('openlog')) return 0;
+		if (!function_exists('openlog')) {
+		    return 0;
+		}
 
 		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_SYSLOG)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_SYSLOG to 1 to disable this loghandler
 	}
@@ -89,11 +91,12 @@ 
 	    if ($facility)
 		{
 			// Only LOG_USER supported on Windows
-			if (! empty($_SERVER["WINDIR"])) $facility=constant('LOG_USER');
+			if (! empty($_SERVER["WINDIR"])) {
+			    $facility=constant('LOG_USER');
+			}
 
 			dol_syslog("admin/syslog: facility ".$facility);
-		}
-		else
+		} else
 		{
 		    $errors[] = $langs->trans("ErrorUnknownSyslogConstant", $facility);
 		}
@@ -111,13 +114,19 @@ 
 	{
 		global $conf;
 
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) return;	// Global option to disable output of this handler
+		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) {
+		    return;
+		}
+		// Global option to disable output of this handler
 
-		if (! empty($conf->global->SYSLOG_FACILITY))  // Example LOG_USER
+		if (! empty($conf->global->SYSLOG_FACILITY)) {
+		    // Example LOG_USER
 		{
 			$facility = constant($conf->global->SYSLOG_FACILITY);
 		}
-		else $facility = constant('LOG_USER');
+		} else {
+		    $facility = constant('LOG_USER');
+		}
 
 		// (int) is required to avoid error parameter 3 expected to be long
 		openlog('dolibarr', LOG_PID | LOG_PERROR, (int) $facility);

dolibarr/htdocs/core/modules/syslog/mod_syslog_firephp.php

Indentation +149 added lines, -149 removed lines

@@ -23,153 +23,153 @@
  */
 class mod_syslog_firephp extends LogHandler implements LogHandlerInterface
 {
-	public $code = 'firephp';
-	private static $firephp_include_path = '/includes/firephp/firephp-core/lib/';
-	private static $firephp_class_path = 'FirePHPCore/FirePHP.class.php';
-
-	/**
-	 * 	Return name of logger
-	 *
-	 * 	@return	string		Name of logger
-	 */
-	public function getName()
-	{
-		return 'FirePHP';
-	}
-
-	/**
-	 * Version of the module ('x.y.z' or 'dolibarr' or 'experimental' or 'development')
-	 *
-	 * @return string
-	 */
-	public function getVersion()
-	{
-		return 'dolibarr';
-	}
-
-	/**
-	 * Content of the info tooltip.
-	 *
-	 * @return false|string
-	 */
-	public function getInfo()
-	{
-		global $langs;
-
-		return ($this->isActive() == 1)?'':$langs->trans('ClassNotFoundIntoPathWarning', self::$firephp_class_path);
-	}
-
-	/**
-	 * Is the module active ?
-	 *
-	 * @return int
-	 */
-	public function isActive()
-	{
-		global $conf;
-		try
-		{
-			if (empty($conf->global->SYSLOG_FIREPHP_INCLUDEPATH)) {
-				$conf->global->SYSLOG_FIREPHP_INCLUDEPATH = DOL_DOCUMENT_ROOT . self::$firephp_include_path;
-			}
-			set_include_path($conf->global->SYSLOG_FIREPHP_INCLUDEPATH);
-			$res = @include_once self::$firephp_class_path;
-			restore_include_path();
-			if ($res) {
-        		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_FIREPHP)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_FIREPHP to 1 to disable this loghandler
-			} else {
-				return 0;
-			}
-		}
-		catch(Exception $e)
-		{
-			print '<!-- FirePHP not available into PHP -->'."\n";
-		}
-
-		return -1;
-	}
-
-	/**
-	 * Return array of configuration data
-	 *
-	 * @return array Return array of configuration data
-	 */
-	public function configure()
-	{
-		global $langs;
-
-		return array(
-			array(
-				'name' => $langs->trans('IncludePath', 'SYSLOG_FIREPHP_INCLUDEPATH'),
-				'constant' => 'SYSLOG_FIREPHP_INCLUDEPATH',
-				'default' => DOL_DOCUMENT_ROOT . self::$firephp_include_path,
-				'attr' => 'size="60"',
-				'example' => '/usr/share/php, ' . DOL_DOCUMENT_ROOT . self::$firephp_include_path
-			)
-		);
-	}
-
-	/**
-	 * 	Return if configuration is valid
-	 *
-	 * 	@return	array		Array of errors. Empty array if ok.
-	 */
-	public function checkConfiguration()
-	{
-		global $conf, $langs;
-
-		$errors = array();
-
-		if (!file_exists($conf->global->SYSLOG_FIREPHP_INCLUDEPATH . self::$firephp_class_path))
-		{
-			$conf->global->MAIN_SYSLOG_DISABLE_FIREPHP = 1; // avoid infinite loop
-			if (is_object($langs))   // $langs may not be defined yet.
-			{
-				$errors[] = $langs->trans("ErrorFailedToOpenFile", self::$firephp_class_path);
-			}
-			else
-			{
-				$errors[] = "ErrorFailedToOpenFile " . self::$firephp_class_path;
-			}
-		}
-
-		return $errors;
-	}
-
-	/**
-	 * 	Output log content
-	 *
-	 *	@param	array	$content	Content to log
-	 * 	@return	null|false
-	 */
-	public function export($content)
-	{
-		global $conf;
-
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_FIREPHP)) return;	// Global option to disable output of this handler
-
-		//We check the configuration to avoid showing PHP warnings
-		if (count($this->checkConfiguration())) return false;
-
-		try
-		{
-			// Warning FirePHPCore must be into PHP include path. It is not possible to use into require_once a constant from
-			// database or config file because we must be able to log data before database or config file read.
-			$oldinclude=get_include_path();
-			set_include_path($conf->global->SYSLOG_FIREPHP_INCLUDEPATH);
-			include_once self::$firephp_class_path;
-			set_include_path($oldinclude);
-			ob_start();	// To be sure headers are not flushed until all page is completely processed
-			$firephp = FirePHP::getInstance(true);
-			if ($content['level'] == LOG_ERR) $firephp->error($content['message']);
-			elseif ($content['level'] == LOG_WARNING) $firephp->warn($content['message']);
-			elseif ($content['level'] == LOG_INFO) $firephp->log($content['message']);
-			else $firephp->log($content['message']);
-		}
-		catch (Exception $e)
-		{
-			// Do not use dol_syslog here to avoid infinite loop
-			return false;
-		}
-	}
+    public $code = 'firephp';
+    private static $firephp_include_path = '/includes/firephp/firephp-core/lib/';
+    private static $firephp_class_path = 'FirePHPCore/FirePHP.class.php';
+
+    /**
+     * 	Return name of logger
+     *
+     * 	@return	string		Name of logger
+     */
+    public function getName()
+    {
+        return 'FirePHP';
+    }
+
+    /**
+     * Version of the module ('x.y.z' or 'dolibarr' or 'experimental' or 'development')
+     *
+     * @return string
+     */
+    public function getVersion()
+    {
+        return 'dolibarr';
+    }
+
+    /**
+     * Content of the info tooltip.
+     *
+     * @return false|string
+     */
+    public function getInfo()
+    {
+        global $langs;
+
+        return ($this->isActive() == 1)?'':$langs->trans('ClassNotFoundIntoPathWarning', self::$firephp_class_path);
+    }
+
+    /**
+     * Is the module active ?
+     *
+     * @return int
+     */
+    public function isActive()
+    {
+        global $conf;
+        try
+        {
+            if (empty($conf->global->SYSLOG_FIREPHP_INCLUDEPATH)) {
+                $conf->global->SYSLOG_FIREPHP_INCLUDEPATH = DOL_DOCUMENT_ROOT . self::$firephp_include_path;
+            }
+            set_include_path($conf->global->SYSLOG_FIREPHP_INCLUDEPATH);
+            $res = @include_once self::$firephp_class_path;
+            restore_include_path();
+            if ($res) {
+                return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_FIREPHP)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_FIREPHP to 1 to disable this loghandler
+            } else {
+                return 0;
+            }
+        }
+        catch(Exception $e)
+        {
+            print '<!-- FirePHP not available into PHP -->'."\n";
+        }
+
+        return -1;
+    }
+
+    /**
+     * Return array of configuration data
+     *
+     * @return array Return array of configuration data
+     */
+    public function configure()
+    {
+        global $langs;
+
+        return array(
+            array(
+                'name' => $langs->trans('IncludePath', 'SYSLOG_FIREPHP_INCLUDEPATH'),
+                'constant' => 'SYSLOG_FIREPHP_INCLUDEPATH',
+                'default' => DOL_DOCUMENT_ROOT . self::$firephp_include_path,
+                'attr' => 'size="60"',
+                'example' => '/usr/share/php, ' . DOL_DOCUMENT_ROOT . self::$firephp_include_path
+            )
+        );
+    }
+
+    /**
+     * 	Return if configuration is valid
+     *
+     * 	@return	array		Array of errors. Empty array if ok.
+     */
+    public function checkConfiguration()
+    {
+        global $conf, $langs;
+
+        $errors = array();
+
+        if (!file_exists($conf->global->SYSLOG_FIREPHP_INCLUDEPATH . self::$firephp_class_path))
+        {
+            $conf->global->MAIN_SYSLOG_DISABLE_FIREPHP = 1; // avoid infinite loop
+            if (is_object($langs))   // $langs may not be defined yet.
+            {
+                $errors[] = $langs->trans("ErrorFailedToOpenFile", self::$firephp_class_path);
+            }
+            else
+            {
+                $errors[] = "ErrorFailedToOpenFile " . self::$firephp_class_path;
+            }
+        }
+
+        return $errors;
+    }
+
+    /**
+     * 	Output log content
+     *
+     *	@param	array	$content	Content to log
+     * 	@return	null|false
+     */
+    public function export($content)
+    {
+        global $conf;
+
+        if (! empty($conf->global->MAIN_SYSLOG_DISABLE_FIREPHP)) return;	// Global option to disable output of this handler
+
+        //We check the configuration to avoid showing PHP warnings
+        if (count($this->checkConfiguration())) return false;
+
+        try
+        {
+            // Warning FirePHPCore must be into PHP include path. It is not possible to use into require_once a constant from
+            // database or config file because we must be able to log data before database or config file read.
+            $oldinclude=get_include_path();
+            set_include_path($conf->global->SYSLOG_FIREPHP_INCLUDEPATH);
+            include_once self::$firephp_class_path;
+            set_include_path($oldinclude);
+            ob_start();	// To be sure headers are not flushed until all page is completely processed
+            $firephp = FirePHP::getInstance(true);
+            if ($content['level'] == LOG_ERR) $firephp->error($content['message']);
+            elseif ($content['level'] == LOG_WARNING) $firephp->warn($content['message']);
+            elseif ($content['level'] == LOG_INFO) $firephp->log($content['message']);
+            else $firephp->log($content['message']);
+        }
+        catch (Exception $e)
+        {
+            // Do not use dol_syslog here to avoid infinite loop
+            return false;
+        }
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -56,7 +56,7 @@ 
 	{
 		global $langs;
 
-		return ($this->isActive() == 1)?'':$langs->trans('ClassNotFoundIntoPathWarning', self::$firephp_class_path);
+		return ($this->isActive() == 1) ? '' : $langs->trans('ClassNotFoundIntoPathWarning', self::$firephp_class_path);
 	}
 
 	/**
@@ -70,18 +70,18 @@ 
 		try
 		{
 			if (empty($conf->global->SYSLOG_FIREPHP_INCLUDEPATH)) {
-				$conf->global->SYSLOG_FIREPHP_INCLUDEPATH = DOL_DOCUMENT_ROOT . self::$firephp_include_path;
+				$conf->global->SYSLOG_FIREPHP_INCLUDEPATH = DOL_DOCUMENT_ROOT.self::$firephp_include_path;
 			}
 			set_include_path($conf->global->SYSLOG_FIREPHP_INCLUDEPATH);
 			$res = @include_once self::$firephp_class_path;
 			restore_include_path();
 			if ($res) {
-        		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_FIREPHP)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_FIREPHP to 1 to disable this loghandler
+        		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_FIREPHP) ? 1 : 0; // Set SYSLOG_DISABLE_LOGHANDLER_FIREPHP to 1 to disable this loghandler
 			} else {
 				return 0;
 			}
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			print '<!-- FirePHP not available into PHP -->'."\n";
 		}
@@ -102,9 +102,9 @@ 
 			array(
 				'name' => $langs->trans('IncludePath', 'SYSLOG_FIREPHP_INCLUDEPATH'),
 				'constant' => 'SYSLOG_FIREPHP_INCLUDEPATH',
-				'default' => DOL_DOCUMENT_ROOT . self::$firephp_include_path,
+				'default' => DOL_DOCUMENT_ROOT.self::$firephp_include_path,
 				'attr' => 'size="60"',
-				'example' => '/usr/share/php, ' . DOL_DOCUMENT_ROOT . self::$firephp_include_path
+				'example' => '/usr/share/php, '.DOL_DOCUMENT_ROOT.self::$firephp_include_path
 			)
 		);
 	}
@@ -120,7 +120,7 @@ 
 
 		$errors = array();
 
-		if (!file_exists($conf->global->SYSLOG_FIREPHP_INCLUDEPATH . self::$firephp_class_path))
+		if (!file_exists($conf->global->SYSLOG_FIREPHP_INCLUDEPATH.self::$firephp_class_path))
 		{
 			$conf->global->MAIN_SYSLOG_DISABLE_FIREPHP = 1; // avoid infinite loop
 			if (is_object($langs))   // $langs may not be defined yet.
@@ -129,7 +129,7 @@ 
 			}
 			else
 			{
-				$errors[] = "ErrorFailedToOpenFile " . self::$firephp_class_path;
+				$errors[] = "ErrorFailedToOpenFile ".self::$firephp_class_path;
 			}
 		}
 
@@ -146,7 +146,7 @@ 
 	{
 		global $conf;
 
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_FIREPHP)) return;	// Global option to disable output of this handler
+		if (!empty($conf->global->MAIN_SYSLOG_DISABLE_FIREPHP)) return; // Global option to disable output of this handler
 
 		//We check the configuration to avoid showing PHP warnings
 		if (count($this->checkConfiguration())) return false;
@@ -155,11 +155,11 @@ 
 		{
 			// Warning FirePHPCore must be into PHP include path. It is not possible to use into require_once a constant from
 			// database or config file because we must be able to log data before database or config file read.
-			$oldinclude=get_include_path();
+			$oldinclude = get_include_path();
 			set_include_path($conf->global->SYSLOG_FIREPHP_INCLUDEPATH);
 			include_once self::$firephp_class_path;
 			set_include_path($oldinclude);
-			ob_start();	// To be sure headers are not flushed until all page is completely processed
+			ob_start(); // To be sure headers are not flushed until all page is completely processed
 			$firephp = FirePHP::getInstance(true);
 			if ($content['level'] == LOG_ERR) $firephp->error($content['message']);
 			elseif ($content['level'] == LOG_WARNING) $firephp->warn($content['message']);

Braces +21 added lines, -12 removed lines

@@ -80,8 +80,7 @@ 
 			} else {
 				return 0;
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			print '<!-- FirePHP not available into PHP -->'."\n";
 		}
@@ -123,11 +122,12 @@ 
 		if (!file_exists($conf->global->SYSLOG_FIREPHP_INCLUDEPATH . self::$firephp_class_path))
 		{
 			$conf->global->MAIN_SYSLOG_DISABLE_FIREPHP = 1; // avoid infinite loop
-			if (is_object($langs))   // $langs may not be defined yet.
+			if (is_object($langs)) {
+			    // $langs may not be defined yet.
 			{
 				$errors[] = $langs->trans("ErrorFailedToOpenFile", self::$firephp_class_path);
 			}
-			else
+			} else
 			{
 				$errors[] = "ErrorFailedToOpenFile " . self::$firephp_class_path;
 			}
@@ -146,10 +146,15 @@ 
 	{
 		global $conf;
 
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_FIREPHP)) return;	// Global option to disable output of this handler
+		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_FIREPHP)) {
+		    return;
+		}
+		// Global option to disable output of this handler
 
 		//We check the configuration to avoid showing PHP warnings
-		if (count($this->checkConfiguration())) return false;
+		if (count($this->checkConfiguration())) {
+		    return false;
+		}
 
 		try
 		{
@@ -161,12 +166,16 @@ 
 			set_include_path($oldinclude);
 			ob_start();	// To be sure headers are not flushed until all page is completely processed
 			$firephp = FirePHP::getInstance(true);
-			if ($content['level'] == LOG_ERR) $firephp->error($content['message']);
-			elseif ($content['level'] == LOG_WARNING) $firephp->warn($content['message']);
-			elseif ($content['level'] == LOG_INFO) $firephp->log($content['message']);
-			else $firephp->log($content['message']);
-		}
-		catch (Exception $e)
+			if ($content['level'] == LOG_ERR) {
+			    $firephp->error($content['message']);
+			} elseif ($content['level'] == LOG_WARNING) {
+			    $firephp->warn($content['message']);
+			} elseif ($content['level'] == LOG_INFO) {
+			    $firephp->log($content['message']);
+			} else {
+			    $firephp->log($content['message']);
+			}
+		} catch (Exception $e)
 		{
 			// Do not use dol_syslog here to avoid infinite loop
 			return false;

dolibarr/htdocs/core/modules/modAdherent.class.php

Indentation +76 added lines, -76 removed lines

@@ -38,23 +38,23 @@ 
 {
 
     /**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
      */
     function __construct($db)
     {
-    	global $conf;
+        global $conf;
 
         $this->db = $db;
         $this->numero = 310;
 
         $this->family = "hr";
         $this->module_position = '55';
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
         $this->description = "Management of members of a foundation or association";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         $this->picto='user';
@@ -67,9 +67,9 @@ 
 
         // Dependencies
         $this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array('modMailmanSpip');	// List of module class names as string this module is in conflict with
+        $this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of module ids to disable if this one is disabled
+        $this->conflictwith = array('modMailmanSpip');	// List of module class names as string this module is in conflict with
         $this->langfiles = array("members","companies");
         $this->phpmin = array(5,4);		// Minimum version of PHP required by module
 
@@ -248,9 +248,9 @@ 
         $this->rights[$r][5] = 'creer';
 
 
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
 
 
         // Exports
@@ -269,36 +269,36 @@ 
         $this->export_label[$r]='MembersAndSubscriptions';
         $this->export_permission[$r]=array(array("adherent","export"));
         $this->export_fields_array[$r]=array(
-			'a.rowid'=>'Id','a.civility'=>"UserTitle",'a.lastname'=>"Lastname",'a.firstname'=>"Firstname",'a.login'=>"Login",'a.gender'=>"Gender",'a.morphy'=>'Nature',
-			'a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",'d.nom'=>"State",'co.code'=>"CountryCode",'co.label'=>"Country",
-			'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status",
-			'a.photo'=>"Photo",'a.note_public'=>"NotePublic",'a.note_private'=>"NotePrivate",'a.datec'=>'DateCreation','a.datevalid'=>'DateValidation',
-			'a.tms'=>'DateLastModification','a.datefin'=>'DateEndSubscription','ta.rowid'=>'MemberTypeId','ta.libelle'=>'MemberTypeLabel',
-			'c.rowid'=>'SubscriptionId','c.dateadh'=>'DateSubscription','c.subscription'=>'Amount'
-		);
+            'a.rowid'=>'Id','a.civility'=>"UserTitle",'a.lastname'=>"Lastname",'a.firstname'=>"Firstname",'a.login'=>"Login",'a.gender'=>"Gender",'a.morphy'=>'Nature',
+            'a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",'d.nom'=>"State",'co.code'=>"CountryCode",'co.label'=>"Country",
+            'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status",
+            'a.photo'=>"Photo",'a.note_public'=>"NotePublic",'a.note_private'=>"NotePrivate",'a.datec'=>'DateCreation','a.datevalid'=>'DateValidation',
+            'a.tms'=>'DateLastModification','a.datefin'=>'DateEndSubscription','ta.rowid'=>'MemberTypeId','ta.libelle'=>'MemberTypeLabel',
+            'c.rowid'=>'SubscriptionId','c.dateadh'=>'DateSubscription','c.subscription'=>'Amount'
+        );
         $this->export_TypeFields_array[$r]=array(
-			'a.civility'=>"Text",'a.lastname'=>"Text",'a.firstname'=>"Text",'a.login'=>"Text",'a.gender'=>'Text','a.morphy'=>'Text','a.societe'=>'Text','a.address'=>"Text",
-			'a.zip'=>"Text",'a.town'=>"Text",'d.nom'=>"Text",'co.code'=>'Text','co.label'=>"Text",'a.phone'=>"Text",'a.phone_perso'=>"Text",'a.phone_mobile'=>"Text",
-			'a.email'=>"Text",'a.birth'=>"Date",'a.statut'=>"Status",'a.note_public'=>"Text",'a.note_private'=>"Text",'a.datec'=>'Date','a.datevalid'=>'Date',
-			'a.tms'=>'Date','a.datefin'=>'Date','ta.rowid'=>'List:adherent_type:libelle','ta.libelle'=>'Text','c.rowid'=>'Numeric','c.dateadh'=>'Date','c.subscription'=>'Numeric'
-		);
+            'a.civility'=>"Text",'a.lastname'=>"Text",'a.firstname'=>"Text",'a.login'=>"Text",'a.gender'=>'Text','a.morphy'=>'Text','a.societe'=>'Text','a.address'=>"Text",
+            'a.zip'=>"Text",'a.town'=>"Text",'d.nom'=>"Text",'co.code'=>'Text','co.label'=>"Text",'a.phone'=>"Text",'a.phone_perso'=>"Text",'a.phone_mobile'=>"Text",
+            'a.email'=>"Text",'a.birth'=>"Date",'a.statut'=>"Status",'a.note_public'=>"Text",'a.note_private'=>"Text",'a.datec'=>'Date','a.datevalid'=>'Date',
+            'a.tms'=>'Date','a.datefin'=>'Date','ta.rowid'=>'List:adherent_type:libelle','ta.libelle'=>'Text','c.rowid'=>'Numeric','c.dateadh'=>'Date','c.subscription'=>'Numeric'
+        );
         $this->export_entities_array[$r]=array(
-			'a.rowid'=>'member','a.civility'=>"member",'a.lastname'=>"member",'a.firstname'=>"member",'a.login'=>"member",'a.gender'=>'member','a.morphy'=>'member',
-			'a.societe'=>'member','a.address'=>"member",'a.zip'=>"member",'a.town'=>"member",'d.nom'=>"member",'co.code'=>"member",'co.label'=>"member",
-			'a.phone'=>"member",'a.phone_perso'=>"member",'a.phone_mobile'=>"member",'a.email'=>"member",'a.birth'=>"member",'a.statut'=>"member",
-			'a.photo'=>"member",'a.note_public'=>"member",'a.note_private'=>"member",'a.datec'=>'member','a.datevalid'=>'member','a.tms'=>'member',
-			'a.datefin'=>'member','ta.rowid'=>'member_type','ta.libelle'=>'member_type','c.rowid'=>'subscription','c.dateadh'=>'subscription','c.subscription'=>'subscription'
-		);
+            'a.rowid'=>'member','a.civility'=>"member",'a.lastname'=>"member",'a.firstname'=>"member",'a.login'=>"member",'a.gender'=>'member','a.morphy'=>'member',
+            'a.societe'=>'member','a.address'=>"member",'a.zip'=>"member",'a.town'=>"member",'d.nom'=>"member",'co.code'=>"member",'co.label'=>"member",
+            'a.phone'=>"member",'a.phone_perso'=>"member",'a.phone_mobile'=>"member",'a.email'=>"member",'a.birth'=>"member",'a.statut'=>"member",
+            'a.photo'=>"member",'a.note_public'=>"member",'a.note_private'=>"member",'a.datec'=>'member','a.datevalid'=>'member','a.tms'=>'member',
+            'a.datefin'=>'member','ta.rowid'=>'member_type','ta.libelle'=>'member_type','c.rowid'=>'subscription','c.dateadh'=>'subscription','c.subscription'=>'subscription'
+        );
         // Add extra fields
         $keyforselect='adherent'; $keyforelement='member'; $keyforaliasextra='extra';
         include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		// End add axtra fields
+        // End add axtra fields
         $this->export_sql_start[$r]='SELECT DISTINCT ';
         $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'adherent_type as ta, '.MAIN_DB_PREFIX.'adherent as a)';
         $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'adherent_extrafields as extra ON a.rowid = extra.fk_object';
         $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'subscription as c ON c.fk_adherent = a.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON a.state_id = d.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON a.country = co.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON a.state_id = d.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON a.country = co.rowid';
         $this->export_sql_end[$r] .=' WHERE a.fk_adherent_type = ta.rowid AND ta.entity IN ('.getEntity('member_type').') ';
         $this->export_dependencies_array[$r]=array('subscription'=>'c.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
@@ -317,54 +317,54 @@ 
         $this->import_tables_array[$r]=array('a'=>MAIN_DB_PREFIX.'adherent','extra'=>MAIN_DB_PREFIX.'adherent_extrafields');
         $this->import_tables_creator_array[$r]=array('a'=>'fk_user_author');    // Fields to store import user id
         $this->import_fields_array[$r]=array(
-			'a.civility'=>"UserTitle",'a.lastname'=>"Lastname*",'a.firstname'=>"Firstname",'a.gender'=>"Gender",'a.login'=>"Login*","a.pass"=>"Password",
-			"a.fk_adherent_type"=>"MemberType*",'a.morphy'=>'Nature*','a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",
-			'a.state_id'=>'StateId','a.country'=>"CountryId",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",
-			'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status*",'a.photo'=>"Photo",'a.note_public'=>"NotePublic",'a.note_private'=>"NotePrivate",
-			'a.datec'=>'DateCreation','a.datefin'=>'DateEndSubscription'
-		);
-		// Add extra fields
-		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'adherent' AND entity IN (0,".$conf->entity.")";
-		$resql=$this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
-		{
-		    while ($obj=$this->db->fetch_object($resql))
-		    {
-		        $fieldname='extra.'.$obj->name;
-		        $fieldlabel=ucfirst($obj->label);
-		        $this->import_fields_array[$r][$fieldname]=$fieldlabel.($obj->fieldrequired?'*':'');
-		    }
-		}
-		// End add extra fields
-		$this->import_fieldshidden_array[$r]=array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'adherent');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
-		$this->import_regex_array[$r]=array(
-			'a.civility'=>'code@'.MAIN_DB_PREFIX.'c_civility','a.fk_adherent_type'=>'rowid@'.MAIN_DB_PREFIX.'adherent_type','a.morphy'=>'(phy|mor)',
-			'a.statut'=>'^[0|1]','a.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','a.datefin'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
+            'a.civility'=>"UserTitle",'a.lastname'=>"Lastname*",'a.firstname'=>"Firstname",'a.gender'=>"Gender",'a.login'=>"Login*","a.pass"=>"Password",
+            "a.fk_adherent_type"=>"MemberType*",'a.morphy'=>'Nature*','a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",
+            'a.state_id'=>'StateId','a.country'=>"CountryId",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",
+            'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status*",'a.photo'=>"Photo",'a.note_public'=>"NotePublic",'a.note_private'=>"NotePrivate",
+            'a.datec'=>'DateCreation','a.datefin'=>'DateEndSubscription'
+        );
+        // Add extra fields
+        $sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'adherent' AND entity IN (0,".$conf->entity.")";
+        $resql=$this->db->query($sql);
+        if ($resql)    // This can fail when class is used on old database (during migration for example)
+        {
+            while ($obj=$this->db->fetch_object($resql))
+            {
+                $fieldname='extra.'.$obj->name;
+                $fieldlabel=ucfirst($obj->label);
+                $this->import_fields_array[$r][$fieldname]=$fieldlabel.($obj->fieldrequired?'*':'');
+            }
+        }
+        // End add extra fields
+        $this->import_fieldshidden_array[$r]=array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'adherent');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+        $this->import_regex_array[$r]=array(
+            'a.civility'=>'code@'.MAIN_DB_PREFIX.'c_civility','a.fk_adherent_type'=>'rowid@'.MAIN_DB_PREFIX.'adherent_type','a.morphy'=>'(phy|mor)',
+            'a.statut'=>'^[0|1]','a.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','a.datefin'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
         $this->import_examplevalues_array[$r]=array(
-			'a.civility'=>"MR",'a.lastname'=>'Smith','a.firstname'=>'John','a.login'=>'jsmith','a.pass'=>'passofjsmith','a.fk_adherent_type'=>'1',
-			'a.morphy'=>'"mor" or "phy"','a.societe'=>'JS company','a.address'=>'21 jump street','a.zip'=>'55000','a.town'=>'New York','a.country'=>'1',
-			'a.email'=>'jsmith@example.com','a.birth'=>'1972-10-10','a.statut'=>"0 or 1",'a.note_public'=>"This is a public comment on member",
-			'a.note_private'=>"This is private comment on member",'a.datec'=>dol_print_date($now,'%Y-%m__%d'),'a.datefin'=>dol_print_date(dol_time_plus_duree($now, 1, 'y'),'%Y-%m-%d')
-		);
+            'a.civility'=>"MR",'a.lastname'=>'Smith','a.firstname'=>'John','a.login'=>'jsmith','a.pass'=>'passofjsmith','a.fk_adherent_type'=>'1',
+            'a.morphy'=>'"mor" or "phy"','a.societe'=>'JS company','a.address'=>'21 jump street','a.zip'=>'55000','a.town'=>'New York','a.country'=>'1',
+            'a.email'=>'jsmith@example.com','a.birth'=>'1972-10-10','a.statut'=>"0 or 1",'a.note_public'=>"This is a public comment on member",
+            'a.note_private'=>"This is private comment on member",'a.datec'=>dol_print_date($now,'%Y-%m__%d'),'a.datefin'=>dol_print_date(dol_time_plus_duree($now, 1, 'y'),'%Y-%m-%d')
+        );
 
         // Cronjobs
         $arraydate=dol_getdate(dol_now());
         $datestart=dol_mktime(22, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
         $this->cronjobs = array(
-			0=>array(
-				'label'=>'SendReminderForExpiredSubscriptionTitle',
-				'jobtype'=>'method', 'class'=>'adherents/class/adherent.class.php',
-				'objectname'=>'Adherent',
-				'method'=>'sendReminderForExpiredSubscription',
-				'parameters'=>'10;0',
-				'comment'=>'SendReminderForExpiredSubscription',
-				'frequency'=>1,
-				'unitfrequency'=> 3600 * 24,
-				'priority'=>50,
-				'status'=>1,
-				'test'=>'$conf->adherent->enabled',
-				'datestart'=>$datestart
-			),
+            0=>array(
+                'label'=>'SendReminderForExpiredSubscriptionTitle',
+                'jobtype'=>'method', 'class'=>'adherents/class/adherent.class.php',
+                'objectname'=>'Adherent',
+                'method'=>'sendReminderForExpiredSubscription',
+                'parameters'=>'10;0',
+                'comment'=>'SendReminderForExpiredSubscription',
+                'frequency'=>1,
+                'unitfrequency'=> 3600 * 24,
+                'priority'=>50,
+                'status'=>1,
+                'test'=>'$conf->adherent->enabled',
+                'datestart'=>$datestart
+            ),
         );
     }
 

Spacing +78 added lines, -78 removed lines

@@ -29,7 +29,7 @@ 
  *      \ingroup    member
  *      \brief      File descriptor or module Member
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 /**
  *  Class to describe and enable module Adherent
@@ -52,12 +52,12 @@ 
         $this->family = "hr";
         $this->module_position = '55';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
         $this->description = "Management of members of a foundation or association";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        $this->picto='user';
+        $this->picto = 'user';
 
         // Data directories to create when module is enabled
         $this->dirs = array("/adherent/temp");
@@ -66,16 +66,16 @@ 
         $this->config_page_url = array("adherent.php@adherents");
 
         // Dependencies
-        $this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array('modMailmanSpip');	// List of module class names as string this module is in conflict with
-        $this->langfiles = array("members","companies");
-        $this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array('modMailmanSpip'); // List of module class names as string this module is in conflict with
+        $this->langfiles = array("members", "companies");
+        $this->phpmin = array(5, 4); // Minimum version of PHP required by module
 
         // Constants
         $this->const = array();
-        $r=0;
+        $r = 0;
 
         $this->const[$r][0] = "ADHERENT_ADDON_PDF";
         $this->const[$r][1] = "chaine";
@@ -181,13 +181,13 @@ 
 
         // Boxes
         //-------
-        $this->boxes = array(0=>array('file'=>'box_members.php','enabledbydefaulton'=>'Home'));
+        $this->boxes = array(0=>array('file'=>'box_members.php', 'enabledbydefaulton'=>'Home'));
 
         // Permissions
         //------------
         $this->rights = array();
         $this->rights_class = 'adherent';
-        $r=0;
+        $r = 0;
 
         // $this->rights[$r][0]     Id permission (unique tous modules confondus)
         // $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
@@ -250,12 +250,12 @@ 
 
 		// Menus
 		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 
         // Exports
         //--------
-        $r=0;
+        $r = 0;
 
         // $this->export_code[$r]          Code unique identifiant l'export (tous modules confondus)
         // $this->export_label[$r]         Libelle par defaut si traduction de cle "ExportXXX" non trouvee (XXX = Code)
@@ -265,91 +265,91 @@ 
         // $this->export_sql[$r]           Requete sql qui offre les donnees a l'export
 
         $r++;
-        $this->export_code[$r]=$this->rights_class.'_'.$r;
-        $this->export_label[$r]='MembersAndSubscriptions';
-        $this->export_permission[$r]=array(array("adherent","export"));
-        $this->export_fields_array[$r]=array(
-			'a.rowid'=>'Id','a.civility'=>"UserTitle",'a.lastname'=>"Lastname",'a.firstname'=>"Firstname",'a.login'=>"Login",'a.gender'=>"Gender",'a.morphy'=>'Nature',
-			'a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",'d.nom'=>"State",'co.code'=>"CountryCode",'co.label'=>"Country",
-			'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status",
-			'a.photo'=>"Photo",'a.note_public'=>"NotePublic",'a.note_private'=>"NotePrivate",'a.datec'=>'DateCreation','a.datevalid'=>'DateValidation',
-			'a.tms'=>'DateLastModification','a.datefin'=>'DateEndSubscription','ta.rowid'=>'MemberTypeId','ta.libelle'=>'MemberTypeLabel',
-			'c.rowid'=>'SubscriptionId','c.dateadh'=>'DateSubscription','c.subscription'=>'Amount'
+        $this->export_code[$r] = $this->rights_class.'_'.$r;
+        $this->export_label[$r] = 'MembersAndSubscriptions';
+        $this->export_permission[$r] = array(array("adherent", "export"));
+        $this->export_fields_array[$r] = array(
+			'a.rowid'=>'Id', 'a.civility'=>"UserTitle", 'a.lastname'=>"Lastname", 'a.firstname'=>"Firstname", 'a.login'=>"Login", 'a.gender'=>"Gender", 'a.morphy'=>'Nature',
+			'a.societe'=>'Company', 'a.address'=>"Address", 'a.zip'=>"Zip", 'a.town'=>"Town", 'd.nom'=>"State", 'co.code'=>"CountryCode", 'co.label'=>"Country",
+			'a.phone'=>"PhonePro", 'a.phone_perso'=>"PhonePerso", 'a.phone_mobile'=>"PhoneMobile", 'a.email'=>"Email", 'a.birth'=>"Birthday", 'a.statut'=>"Status",
+			'a.photo'=>"Photo", 'a.note_public'=>"NotePublic", 'a.note_private'=>"NotePrivate", 'a.datec'=>'DateCreation', 'a.datevalid'=>'DateValidation',
+			'a.tms'=>'DateLastModification', 'a.datefin'=>'DateEndSubscription', 'ta.rowid'=>'MemberTypeId', 'ta.libelle'=>'MemberTypeLabel',
+			'c.rowid'=>'SubscriptionId', 'c.dateadh'=>'DateSubscription', 'c.subscription'=>'Amount'
 		);
-        $this->export_TypeFields_array[$r]=array(
-			'a.civility'=>"Text",'a.lastname'=>"Text",'a.firstname'=>"Text",'a.login'=>"Text",'a.gender'=>'Text','a.morphy'=>'Text','a.societe'=>'Text','a.address'=>"Text",
-			'a.zip'=>"Text",'a.town'=>"Text",'d.nom'=>"Text",'co.code'=>'Text','co.label'=>"Text",'a.phone'=>"Text",'a.phone_perso'=>"Text",'a.phone_mobile'=>"Text",
-			'a.email'=>"Text",'a.birth'=>"Date",'a.statut'=>"Status",'a.note_public'=>"Text",'a.note_private'=>"Text",'a.datec'=>'Date','a.datevalid'=>'Date',
-			'a.tms'=>'Date','a.datefin'=>'Date','ta.rowid'=>'List:adherent_type:libelle','ta.libelle'=>'Text','c.rowid'=>'Numeric','c.dateadh'=>'Date','c.subscription'=>'Numeric'
+        $this->export_TypeFields_array[$r] = array(
+			'a.civility'=>"Text", 'a.lastname'=>"Text", 'a.firstname'=>"Text", 'a.login'=>"Text", 'a.gender'=>'Text', 'a.morphy'=>'Text', 'a.societe'=>'Text', 'a.address'=>"Text",
+			'a.zip'=>"Text", 'a.town'=>"Text", 'd.nom'=>"Text", 'co.code'=>'Text', 'co.label'=>"Text", 'a.phone'=>"Text", 'a.phone_perso'=>"Text", 'a.phone_mobile'=>"Text",
+			'a.email'=>"Text", 'a.birth'=>"Date", 'a.statut'=>"Status", 'a.note_public'=>"Text", 'a.note_private'=>"Text", 'a.datec'=>'Date', 'a.datevalid'=>'Date',
+			'a.tms'=>'Date', 'a.datefin'=>'Date', 'ta.rowid'=>'List:adherent_type:libelle', 'ta.libelle'=>'Text', 'c.rowid'=>'Numeric', 'c.dateadh'=>'Date', 'c.subscription'=>'Numeric'
 		);
-        $this->export_entities_array[$r]=array(
-			'a.rowid'=>'member','a.civility'=>"member",'a.lastname'=>"member",'a.firstname'=>"member",'a.login'=>"member",'a.gender'=>'member','a.morphy'=>'member',
-			'a.societe'=>'member','a.address'=>"member",'a.zip'=>"member",'a.town'=>"member",'d.nom'=>"member",'co.code'=>"member",'co.label'=>"member",
-			'a.phone'=>"member",'a.phone_perso'=>"member",'a.phone_mobile'=>"member",'a.email'=>"member",'a.birth'=>"member",'a.statut'=>"member",
-			'a.photo'=>"member",'a.note_public'=>"member",'a.note_private'=>"member",'a.datec'=>'member','a.datevalid'=>'member','a.tms'=>'member',
-			'a.datefin'=>'member','ta.rowid'=>'member_type','ta.libelle'=>'member_type','c.rowid'=>'subscription','c.dateadh'=>'subscription','c.subscription'=>'subscription'
+        $this->export_entities_array[$r] = array(
+			'a.rowid'=>'member', 'a.civility'=>"member", 'a.lastname'=>"member", 'a.firstname'=>"member", 'a.login'=>"member", 'a.gender'=>'member', 'a.morphy'=>'member',
+			'a.societe'=>'member', 'a.address'=>"member", 'a.zip'=>"member", 'a.town'=>"member", 'd.nom'=>"member", 'co.code'=>"member", 'co.label'=>"member",
+			'a.phone'=>"member", 'a.phone_perso'=>"member", 'a.phone_mobile'=>"member", 'a.email'=>"member", 'a.birth'=>"member", 'a.statut'=>"member",
+			'a.photo'=>"member", 'a.note_public'=>"member", 'a.note_private'=>"member", 'a.datec'=>'member', 'a.datevalid'=>'member', 'a.tms'=>'member',
+			'a.datefin'=>'member', 'ta.rowid'=>'member_type', 'ta.libelle'=>'member_type', 'c.rowid'=>'subscription', 'c.dateadh'=>'subscription', 'c.subscription'=>'subscription'
 		);
         // Add extra fields
-        $keyforselect='adherent'; $keyforelement='member'; $keyforaliasextra='extra';
+        $keyforselect = 'adherent'; $keyforelement = 'member'; $keyforaliasextra = 'extra';
         include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		// End add axtra fields
-        $this->export_sql_start[$r]='SELECT DISTINCT ';
-        $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'adherent_type as ta, '.MAIN_DB_PREFIX.'adherent as a)';
-        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'adherent_extrafields as extra ON a.rowid = extra.fk_object';
-        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'subscription as c ON c.fk_adherent = a.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON a.state_id = d.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON a.country = co.rowid';
-        $this->export_sql_end[$r] .=' WHERE a.fk_adherent_type = ta.rowid AND ta.entity IN ('.getEntity('member_type').') ';
-        $this->export_dependencies_array[$r]=array('subscription'=>'c.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+        $this->export_sql_start[$r] = 'SELECT DISTINCT ';
+        $this->export_sql_end[$r]  = ' FROM ('.MAIN_DB_PREFIX.'adherent_type as ta, '.MAIN_DB_PREFIX.'adherent as a)';
+        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'adherent_extrafields as extra ON a.rowid = extra.fk_object';
+        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'subscription as c ON c.fk_adherent = a.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON a.state_id = d.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON a.country = co.rowid';
+        $this->export_sql_end[$r] .= ' WHERE a.fk_adherent_type = ta.rowid AND ta.entity IN ('.getEntity('member_type').') ';
+        $this->export_dependencies_array[$r] = array('subscription'=>'c.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
         // Imports
         //--------
-        $r=0;
+        $r = 0;
 
-        $now=dol_now();
+        $now = dol_now();
         require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
         $r++;
-        $this->import_code[$r]=$this->rights_class.'_'.$r;
-        $this->import_label[$r]="Members"; // Translation key
-        $this->import_icon[$r]=$this->picto;
-        $this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-        $this->import_tables_array[$r]=array('a'=>MAIN_DB_PREFIX.'adherent','extra'=>MAIN_DB_PREFIX.'adherent_extrafields');
-        $this->import_tables_creator_array[$r]=array('a'=>'fk_user_author');    // Fields to store import user id
-        $this->import_fields_array[$r]=array(
-			'a.civility'=>"UserTitle",'a.lastname'=>"Lastname*",'a.firstname'=>"Firstname",'a.gender'=>"Gender",'a.login'=>"Login*","a.pass"=>"Password",
-			"a.fk_adherent_type"=>"MemberType*",'a.morphy'=>'Nature*','a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",
-			'a.state_id'=>'StateId','a.country'=>"CountryId",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",
-			'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status*",'a.photo'=>"Photo",'a.note_public'=>"NotePublic",'a.note_private'=>"NotePrivate",
-			'a.datec'=>'DateCreation','a.datefin'=>'DateEndSubscription'
+        $this->import_code[$r] = $this->rights_class.'_'.$r;
+        $this->import_label[$r] = "Members"; // Translation key
+        $this->import_icon[$r] = $this->picto;
+        $this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+        $this->import_tables_array[$r] = array('a'=>MAIN_DB_PREFIX.'adherent', 'extra'=>MAIN_DB_PREFIX.'adherent_extrafields');
+        $this->import_tables_creator_array[$r] = array('a'=>'fk_user_author'); // Fields to store import user id
+        $this->import_fields_array[$r] = array(
+			'a.civility'=>"UserTitle", 'a.lastname'=>"Lastname*", 'a.firstname'=>"Firstname", 'a.gender'=>"Gender", 'a.login'=>"Login*", "a.pass"=>"Password",
+			"a.fk_adherent_type"=>"MemberType*", 'a.morphy'=>'Nature*', 'a.societe'=>'Company', 'a.address'=>"Address", 'a.zip'=>"Zip", 'a.town'=>"Town",
+			'a.state_id'=>'StateId', 'a.country'=>"CountryId", 'a.phone'=>"PhonePro", 'a.phone_perso'=>"PhonePerso", 'a.phone_mobile'=>"PhoneMobile",
+			'a.email'=>"Email", 'a.birth'=>"Birthday", 'a.statut'=>"Status*", 'a.photo'=>"Photo", 'a.note_public'=>"NotePublic", 'a.note_private'=>"NotePrivate",
+			'a.datec'=>'DateCreation', 'a.datefin'=>'DateEndSubscription'
 		);
 		// Add extra fields
-		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'adherent' AND entity IN (0,".$conf->entity.")";
-		$resql=$this->db->query($sql);
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'adherent' AND entity IN (0,".$conf->entity.")";
+		$resql = $this->db->query($sql);
 		if ($resql)    // This can fail when class is used on old database (during migration for example)
 		{
-		    while ($obj=$this->db->fetch_object($resql))
+		    while ($obj = $this->db->fetch_object($resql))
 		    {
-		        $fieldname='extra.'.$obj->name;
-		        $fieldlabel=ucfirst($obj->label);
-		        $this->import_fields_array[$r][$fieldname]=$fieldlabel.($obj->fieldrequired?'*':'');
+		        $fieldname = 'extra.'.$obj->name;
+		        $fieldlabel = ucfirst($obj->label);
+		        $this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
 		    }
 		}
 		// End add extra fields
-		$this->import_fieldshidden_array[$r]=array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'adherent');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
-		$this->import_regex_array[$r]=array(
-			'a.civility'=>'code@'.MAIN_DB_PREFIX.'c_civility','a.fk_adherent_type'=>'rowid@'.MAIN_DB_PREFIX.'adherent_type','a.morphy'=>'(phy|mor)',
-			'a.statut'=>'^[0|1]','a.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','a.datefin'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
-        $this->import_examplevalues_array[$r]=array(
-			'a.civility'=>"MR",'a.lastname'=>'Smith','a.firstname'=>'John','a.login'=>'jsmith','a.pass'=>'passofjsmith','a.fk_adherent_type'=>'1',
-			'a.morphy'=>'"mor" or "phy"','a.societe'=>'JS company','a.address'=>'21 jump street','a.zip'=>'55000','a.town'=>'New York','a.country'=>'1',
-			'a.email'=>'jsmith@example.com','a.birth'=>'1972-10-10','a.statut'=>"0 or 1",'a.note_public'=>"This is a public comment on member",
-			'a.note_private'=>"This is private comment on member",'a.datec'=>dol_print_date($now,'%Y-%m__%d'),'a.datefin'=>dol_print_date(dol_time_plus_duree($now, 1, 'y'),'%Y-%m-%d')
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'adherent'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+		$this->import_regex_array[$r] = array(
+			'a.civility'=>'code@'.MAIN_DB_PREFIX.'c_civility', 'a.fk_adherent_type'=>'rowid@'.MAIN_DB_PREFIX.'adherent_type', 'a.morphy'=>'(phy|mor)',
+			'a.statut'=>'^[0|1]', 'a.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 'a.datefin'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
+        $this->import_examplevalues_array[$r] = array(
+			'a.civility'=>"MR", 'a.lastname'=>'Smith', 'a.firstname'=>'John', 'a.login'=>'jsmith', 'a.pass'=>'passofjsmith', 'a.fk_adherent_type'=>'1',
+			'a.morphy'=>'"mor" or "phy"', 'a.societe'=>'JS company', 'a.address'=>'21 jump street', 'a.zip'=>'55000', 'a.town'=>'New York', 'a.country'=>'1',
+			'a.email'=>'jsmith@example.com', 'a.birth'=>'1972-10-10', 'a.statut'=>"0 or 1", 'a.note_public'=>"This is a public comment on member",
+			'a.note_private'=>"This is private comment on member", 'a.datec'=>dol_print_date($now, '%Y-%m__%d'), 'a.datefin'=>dol_print_date(dol_time_plus_duree($now, 1, 'y'), '%Y-%m-%d')
 		);
 
         // Cronjobs
-        $arraydate=dol_getdate(dol_now());
-        $datestart=dol_mktime(22, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
+        $arraydate = dol_getdate(dol_now());
+        $datestart = dol_mktime(22, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
         $this->cronjobs = array(
 			0=>array(
 				'label'=>'SendReminderForExpiredSubscriptionTitle',
@@ -377,9 +377,9 @@ 
      *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
      *      @return     int             	1 if OK, 0 if KO
      */
-    function init($options='')
+    function init($options = '')
     {
-        global $conf,$langs;
+        global $conf, $langs;
 
         // Permissions
         $this->remove($options);
@@ -408,6 +408,6 @@ 
             "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','member',".$conf->entity.")"
         );
 
-        return $this->_init($sql,$options);
+        return $this->_init($sql, $options);
     }
 }

Braces +3 added lines, -1 removed lines

@@ -326,11 +326,13 @@
 		// Add extra fields
 		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'adherent' AND entity IN (0,".$conf->entity.")";
 		$resql=$this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
+		if ($resql) {
+		    // This can fail when class is used on old database (during migration for example)
 		{
 		    while ($obj=$this->db->fetch_object($resql))
 		    {
 		        $fieldname='extra.'.$obj->name;
+		}
 		        $fieldlabel=ucfirst($obj->label);
 		        $this->import_fields_array[$r][$fieldname]=$fieldlabel.($obj->fieldrequired?'*':'');
 		    }

dolibarr/htdocs/core/modules/modCategorie.class.php

Indentation +394 added lines, -394 removed lines

@@ -32,157 +32,157 @@ 
  */
 class modCategorie extends DolibarrModules
 {
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-	    global $conf;
-
-		$this->db = $db;
-		$this->numero = 1780;
-
-		$this->family = "technic";
-		$this->module_position = '20';
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Gestion des categories (produits, clients, fournisseurs...)";
-
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto = 'category';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array();
-
-		// Dependencies
-		$this->depends = array();
-
-		// Config pages
-		$this->config_page_url = array('categorie.php@categories');
-		$this->langfiles = array("products","companies","categories","members");
-
-		// Constants
-		$this->const = array();
-		$r=0;
-		$this->const[$r][0] = "CATEGORIE_RECURSIV_ADD";
-		$this->const[$r][1] = "yesno";
-		$this->const[$r][2] = "0";
-		$this->const[$r][3] = 'Affect parent categories';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		// Boxes
-		$this->boxes = array();
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'categorie';
-
-		$r=0;
-
-		$this->rights[$r][0] = 241; // id de la permission
-		$this->rights[$r][1] = 'Lire les categories'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecated)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'lire';
-		$r++;
-
-		$this->rights[$r][0] = 242; // id de la permission
-		$this->rights[$r][1] = 'Creer/modifier les categories'; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecated)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'creer';
-		$r++;
-
-		$this->rights[$r][0] = 243; // id de la permission
-		$this->rights[$r][1] = 'Supprimer les categories'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecated)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'supprimer';
-		$r++;
-
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
-
-		// Exports
-		//--------
-		$r=0;
-
-		$r++;
-		$this->export_code[$r]='category_'.$r;
-		$this->export_label[$r]='CatSupList';
-		$this->export_icon[$r]='category';
-		$this->export_enabled[$r]='$conf->fournisseur->enabled';
-		$this->export_permission[$r]=array(array("categorie","lire"),array("fournisseur","lire"));
-		$this->export_fields_array[$r]=array(
-			'u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'s.rowid'=>'IdThirdParty','s.nom'=>'Name','s.prefix_comm'=>"Prefix",
-			's.client'=>"Customer",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.address'=>"Address",
-			's.zip'=>"Zip",'s.town'=>"Town",'c.label'=>"Country",'c.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",
-			's.siret'=>"ProfId1",'s.siren'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",
-			's.note_public'=>"NotePublic"
-		);
-		$this->export_TypeFields_array[$r]=array(
-			'u.label'=>"Text",'u.description'=>"Text",'s.rowid'=>'List:societe:nom','s.nom'=>'Text','s.prefix_comm'=>"Text",'s.client'=>"Text",'s.datec'=>"Date",
-			's.tms'=>"Date",'s.code_client'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",
-			's.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",
-			's.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_public'=>"Text"
-		);
-		$this->export_entities_array[$r]=array(
-			's.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",
-			's.code_client'=>"company",'s.address'=>"company",'s.zip'=>"company",'s.town'=>"company",'c.label'=>"company",'c.code'=>"company",
-			's.phone'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",
-			's.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note_public'=>"company"
-		);	// We define here only fields that use another picto
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, ';
-		$this->export_sql_end[$r] .= MAIN_DB_PREFIX.'categorie_fournisseur as cf, ';
-		$this->export_sql_end[$r] .= MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code';
-		$this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
-		$this->export_sql_end[$r] .=' AND u.type = 1';	// Supplier categories
-
-		$r++;
-		$this->export_code[$r]='category_'.$r;
-		$this->export_label[$r]='CatCusList';
-		$this->export_icon[$r]='category';
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf;
+
+        $this->db = $db;
+        $this->numero = 1780;
+
+        $this->family = "technic";
+        $this->module_position = '20';
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Gestion des categories (produits, clients, fournisseurs...)";
+
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto = 'category';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array();
+
+        // Dependencies
+        $this->depends = array();
+
+        // Config pages
+        $this->config_page_url = array('categorie.php@categories');
+        $this->langfiles = array("products","companies","categories","members");
+
+        // Constants
+        $this->const = array();
+        $r=0;
+        $this->const[$r][0] = "CATEGORIE_RECURSIV_ADD";
+        $this->const[$r][1] = "yesno";
+        $this->const[$r][2] = "0";
+        $this->const[$r][3] = 'Affect parent categories';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        // Boxes
+        $this->boxes = array();
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'categorie';
+
+        $r=0;
+
+        $this->rights[$r][0] = 241; // id de la permission
+        $this->rights[$r][1] = 'Lire les categories'; // libelle de la permission
+        $this->rights[$r][2] = 'r'; // type de la permission (deprecated)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'lire';
+        $r++;
+
+        $this->rights[$r][0] = 242; // id de la permission
+        $this->rights[$r][1] = 'Creer/modifier les categories'; // libelle de la permission
+        $this->rights[$r][2] = 'w'; // type de la permission (deprecated)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'creer';
+        $r++;
+
+        $this->rights[$r][0] = 243; // id de la permission
+        $this->rights[$r][1] = 'Supprimer les categories'; // libelle de la permission
+        $this->rights[$r][2] = 'd'; // type de la permission (deprecated)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'supprimer';
+        $r++;
+
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+
+
+        // Exports
+        //--------
+        $r=0;
+
+        $r++;
+        $this->export_code[$r]='category_'.$r;
+        $this->export_label[$r]='CatSupList';
+        $this->export_icon[$r]='category';
+        $this->export_enabled[$r]='$conf->fournisseur->enabled';
+        $this->export_permission[$r]=array(array("categorie","lire"),array("fournisseur","lire"));
+        $this->export_fields_array[$r]=array(
+            'u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'s.rowid'=>'IdThirdParty','s.nom'=>'Name','s.prefix_comm'=>"Prefix",
+            's.client'=>"Customer",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.address'=>"Address",
+            's.zip'=>"Zip",'s.town'=>"Town",'c.label'=>"Country",'c.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",
+            's.siret'=>"ProfId1",'s.siren'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",
+            's.note_public'=>"NotePublic"
+        );
+        $this->export_TypeFields_array[$r]=array(
+            'u.label'=>"Text",'u.description'=>"Text",'s.rowid'=>'List:societe:nom','s.nom'=>'Text','s.prefix_comm'=>"Text",'s.client'=>"Text",'s.datec'=>"Date",
+            's.tms'=>"Date",'s.code_client'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",
+            's.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",
+            's.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_public'=>"Text"
+        );
+        $this->export_entities_array[$r]=array(
+            's.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",
+            's.code_client'=>"company",'s.address'=>"company",'s.zip'=>"company",'s.town'=>"company",'c.label'=>"company",'c.code'=>"company",
+            's.phone'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",
+            's.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note_public'=>"company"
+        );	// We define here only fields that use another picto
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, ';
+        $this->export_sql_end[$r] .= MAIN_DB_PREFIX.'categorie_fournisseur as cf, ';
+        $this->export_sql_end[$r] .= MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code';
+        $this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_soc = s.rowid';
+        $this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
+        $this->export_sql_end[$r] .=' AND u.type = 1';	// Supplier categories
+
+        $r++;
+        $this->export_code[$r]='category_'.$r;
+        $this->export_label[$r]='CatCusList';
+        $this->export_icon[$r]='category';
         $this->export_enabled[$r]='$conf->societe->enabled';
-		$this->export_permission[$r]=array(array("categorie","lire"),array("societe","lire"));
-		$this->export_fields_array[$r]=array(
-			'u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'s.rowid'=>'IdThirdParty','s.nom'=>'Name','s.prefix_comm'=>"Prefix",
-			's.client'=>"Customer",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.address'=>"Address",
-			's.zip'=>"Zip",'s.town'=>"Town",'c.label'=>"Country",'c.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",
-			's.siret'=>"ProfId1",'s.siren'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",
-			's.note_public'=>"NotePublic",'s.fk_prospectlevel'=>'ProspectLevel','s.fk_stcomm'=>'ProspectStatus'
-		);
-		$this->export_TypeFields_array[$r]=array(
-			'u.label'=>"Text",'u.description'=>"Text",'s.rowid'=>'List:societe:nom','s.nom'=>'Text','s.prefix_comm'=>"Text",'s.client'=>"Text",
-			's.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",
-			'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",
-			's.idprof4'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_public'=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code',
-			's.fk_stcomm'=>'List:c_stcomm:libelle:code'
-		);
-		$this->export_entities_array[$r]=array(
-			's.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",
-			's.code_client'=>"company",'s.address'=>"company",'s.zip'=>"company",'s.town'=>"company",'c.label'=>"company",'c.code'=>"company",
-			's.phone'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",
-			's.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note_public'=>"company",'s.fk_prospectlevel'=>'company',
-			's.fk_stcomm'=>'company'
-		);	// We define here only fields that use another picto
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, ';
-		$this->export_sql_end[$r] .= MAIN_DB_PREFIX.'categorie_societe as cf, ';
-		$this->export_sql_end[$r] .= MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object ';
-		$this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
-		$this->export_sql_end[$r] .=' AND u.type = 2';	// Customer/Prospect categories
+        $this->export_permission[$r]=array(array("categorie","lire"),array("societe","lire"));
+        $this->export_fields_array[$r]=array(
+            'u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'s.rowid'=>'IdThirdParty','s.nom'=>'Name','s.prefix_comm'=>"Prefix",
+            's.client'=>"Customer",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.address'=>"Address",
+            's.zip'=>"Zip",'s.town'=>"Town",'c.label'=>"Country",'c.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",
+            's.siret'=>"ProfId1",'s.siren'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",
+            's.note_public'=>"NotePublic",'s.fk_prospectlevel'=>'ProspectLevel','s.fk_stcomm'=>'ProspectStatus'
+        );
+        $this->export_TypeFields_array[$r]=array(
+            'u.label'=>"Text",'u.description'=>"Text",'s.rowid'=>'List:societe:nom','s.nom'=>'Text','s.prefix_comm'=>"Text",'s.client'=>"Text",
+            's.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",
+            'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",
+            's.idprof4'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_public'=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code',
+            's.fk_stcomm'=>'List:c_stcomm:libelle:code'
+        );
+        $this->export_entities_array[$r]=array(
+            's.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",
+            's.code_client'=>"company",'s.address'=>"company",'s.zip'=>"company",'s.town'=>"company",'c.label'=>"company",'c.code'=>"company",
+            's.phone'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",
+            's.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note_public'=>"company",'s.fk_prospectlevel'=>'company',
+            's.fk_stcomm'=>'company'
+        );	// We define here only fields that use another picto
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, ';
+        $this->export_sql_end[$r] .= MAIN_DB_PREFIX.'categorie_societe as cf, ';
+        $this->export_sql_end[$r] .= MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object ';
+        $this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_soc = s.rowid';
+        $this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
+        $this->export_sql_end[$r] .=' AND u.type = 2';	// Customer/Prospect categories
 
         // Add extra fields
         $sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe'";
@@ -226,270 +226,270 @@ 
 
 
 
-		$r++;
-		$this->export_code[$r]='category_'.$r;
-		$this->export_label[$r]='CatProdList';
-		$this->export_icon[$r]='category';
+        $r++;
+        $this->export_code[$r]='category_'.$r;
+        $this->export_label[$r]='CatProdList';
+        $this->export_icon[$r]='category';
         $this->export_enabled[$r]='$conf->produit->enabled';
-		$this->export_permission[$r]=array(array("categorie","lire"),array("produit","lire"));
-		$this->export_fields_array[$r]=array('u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'p.rowid'=>'ProductId','p.ref'=>'Ref');
-		$this->export_TypeFields_array[$r]=array('u.label'=>"Text",'u.description'=>"Text",'p.ref'=>'Text');
-		$this->export_entities_array[$r]=array('p.rowid'=>'product','p.ref'=>'product');	// We define here only fields that use another picto
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_product as cp, '.MAIN_DB_PREFIX.'product as p';
-		$this->export_sql_end[$r] .=' WHERE u.rowid = cp.fk_categorie AND cp.fk_product = p.rowid';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
-		$this->export_sql_end[$r] .=' AND u.type = 0';	// Supplier categories
-
-		$r++;
-		$this->export_code[$r]='category_'.$r;
-		$this->export_label[$r]='CatMemberList';
-		$this->export_icon[$r]='category';
+        $this->export_permission[$r]=array(array("categorie","lire"),array("produit","lire"));
+        $this->export_fields_array[$r]=array('u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'p.rowid'=>'ProductId','p.ref'=>'Ref');
+        $this->export_TypeFields_array[$r]=array('u.label'=>"Text",'u.description'=>"Text",'p.ref'=>'Text');
+        $this->export_entities_array[$r]=array('p.rowid'=>'product','p.ref'=>'product');	// We define here only fields that use another picto
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_product as cp, '.MAIN_DB_PREFIX.'product as p';
+        $this->export_sql_end[$r] .=' WHERE u.rowid = cp.fk_categorie AND cp.fk_product = p.rowid';
+        $this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
+        $this->export_sql_end[$r] .=' AND u.type = 0';	// Supplier categories
+
+        $r++;
+        $this->export_code[$r]='category_'.$r;
+        $this->export_label[$r]='CatMemberList';
+        $this->export_icon[$r]='category';
         $this->export_enabled[$r]='$conf->adherent->enabled';
-		$this->export_permission[$r]=array(array("categorie","lire"),array("adherent","lire"));
-		$this->export_fields_array[$r]=array('u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'p.rowid'=>'MemberId','p.lastname'=>'LastName','p.firstname'=>'Firstname');
-		$this->export_TypeFields_array[$r]=array('u.label'=>"Text",'u.description'=>"Text",'p.lastname'=>'Text','p.firstname'=>'Text');
-		$this->export_entities_array[$r]=array('p.rowid'=>'member','p.lastname'=>'member','p.firstname'=>'member');	// We define here only fields that use another picto
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_member as cp, '.MAIN_DB_PREFIX.'adherent as p';
-		$this->export_sql_end[$r] .=' WHERE u.rowid = cp.fk_categorie AND cp.fk_member = p.rowid';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
-		$this->export_sql_end[$r] .=' AND u.type = 3';	// Member categories
-
-		$r++;
-		$this->export_code[$r]='category_'.$r;
-		$this->export_label[$r]='CatContactList';
-		$this->export_icon[$r]='category';
-		$this->export_enabled[$r]='$conf->societe->enabled';
-		$this->export_permission[$r]=array(array("categorie", "lire"), array ("societe", "lire"));
-		$this->export_fields_array[$r]=array (
-			'u.rowid' => "CategId",
-			'u.label' => "Label",
-			'u.description' => "Description",
-			'p.rowid' => 'ContactId',
-			'p.civility' => 'UserTitle',
-			'p.lastname' => 'LastName',
-			'p.firstname' => 'Firstname',
-			'p.address' => 'Address',
-			'p.zip' => 'Zip',
-			'p.town' => 'Town',
-			'country.code' => 'CountryCode',
-			'country.label' => 'Country',
-			'p.birthday' => 'DateToBirth',
-			'p.poste' => 'PostOrFunction',
-			'p.phone' => 'Phone',
-			'p.phone_perso' => 'PhonePerso',
-			'p.phone_mobile' => 'PhoneMobile',
-			'p.fax' => 'Fax',
-			'p.email' => 'Email',
-			'p.note_private' => 'NotePrivate',
-			'p.note_public' => 'NotePublic',
+        $this->export_permission[$r]=array(array("categorie","lire"),array("adherent","lire"));
+        $this->export_fields_array[$r]=array('u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'p.rowid'=>'MemberId','p.lastname'=>'LastName','p.firstname'=>'Firstname');
+        $this->export_TypeFields_array[$r]=array('u.label'=>"Text",'u.description'=>"Text",'p.lastname'=>'Text','p.firstname'=>'Text');
+        $this->export_entities_array[$r]=array('p.rowid'=>'member','p.lastname'=>'member','p.firstname'=>'member');	// We define here only fields that use another picto
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_member as cp, '.MAIN_DB_PREFIX.'adherent as p';
+        $this->export_sql_end[$r] .=' WHERE u.rowid = cp.fk_categorie AND cp.fk_member = p.rowid';
+        $this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
+        $this->export_sql_end[$r] .=' AND u.type = 3';	// Member categories
+
+        $r++;
+        $this->export_code[$r]='category_'.$r;
+        $this->export_label[$r]='CatContactList';
+        $this->export_icon[$r]='category';
+        $this->export_enabled[$r]='$conf->societe->enabled';
+        $this->export_permission[$r]=array(array("categorie", "lire"), array ("societe", "lire"));
+        $this->export_fields_array[$r]=array (
+            'u.rowid' => "CategId",
+            'u.label' => "Label",
+            'u.description' => "Description",
+            'p.rowid' => 'ContactId',
+            'p.civility' => 'UserTitle',
+            'p.lastname' => 'LastName',
+            'p.firstname' => 'Firstname',
+            'p.address' => 'Address',
+            'p.zip' => 'Zip',
+            'p.town' => 'Town',
+            'country.code' => 'CountryCode',
+            'country.label' => 'Country',
+            'p.birthday' => 'DateToBirth',
+            'p.poste' => 'PostOrFunction',
+            'p.phone' => 'Phone',
+            'p.phone_perso' => 'PhonePerso',
+            'p.phone_mobile' => 'PhoneMobile',
+            'p.fax' => 'Fax',
+            'p.email' => 'Email',
+            'p.note_private' => 'NotePrivate',
+            'p.note_public' => 'NotePublic',
             'p.statut' => 'Status',
-			's.nom'=>"Name",
-			's.client'=>"Customer",
-			's.fournisseur'=>"Supplier",
-			's.status'=>"Status",
-			's.address'=>"Address",
-			's.zip'=>"Zip",
-			's.town'=>"Town",
-			's.phone'=>"Phone",
-			's.fax'=>"Fax",
-			's.url'=>"Url",
-			's.email'=>"Email"
-		);
-		$this->export_TypeFields_array[$r] = array (
-			'u.label' => "Text",
-			'u.description' => "Text",
-			'p.lastname' => 'Text',
-			'p.firstname' => 'Text',
+            's.nom'=>"Name",
+            's.client'=>"Customer",
+            's.fournisseur'=>"Supplier",
+            's.status'=>"Status",
+            's.address'=>"Address",
+            's.zip'=>"Zip",
+            's.town'=>"Town",
+            's.phone'=>"Phone",
+            's.fax'=>"Fax",
+            's.url'=>"Url",
+            's.email'=>"Email"
+        );
+        $this->export_TypeFields_array[$r] = array (
+            'u.label' => "Text",
+            'u.description' => "Text",
+            'p.lastname' => 'Text',
+            'p.firstname' => 'Text',
             'p.statut'=>"Numeric",
-			's.nom'=>"Text",
-			's.status'=>"Text",
-			's.address'=>"Text",
-			's.zip'=>"Text",
-			's.town'=>"Text",
-			's.phone'=>"Text",
-			's.fax'=>"Text",
-			's.url'=>"Text",
-			's.email'=>"Text"
-		);
-		$this->export_entities_array[$r] = array (
-			'u.rowid' => "category",
-			'u.label' => "category",
-			'u.description' => "category",
-			'p.rowid' => 'contact',
-			'p.civility' => 'contact',
-			'p.lastname' => 'contact',
-			'p.firstname' => 'contact',
-			'p.address' => 'contact',
-			'p.zip' => 'contact',
-			'p.town' => 'contact',
-			'country.code' => 'contact',
-			'country.label' => 'contact',
-			'p.birthday' => 'contact',
-			'p.poste' => 'contact',
-			'p.phone' => 'contact',
-			'p.phone_perso' => 'contact',
-			'p.phone_mobile' => 'contact',
-			'p.fax' => 'contact',
-			'p.email' => 'contact',
-			'p.note_private' => 'contact',
-			'p.note_public' => 'contact',
+            's.nom'=>"Text",
+            's.status'=>"Text",
+            's.address'=>"Text",
+            's.zip'=>"Text",
+            's.town'=>"Text",
+            's.phone'=>"Text",
+            's.fax'=>"Text",
+            's.url'=>"Text",
+            's.email'=>"Text"
+        );
+        $this->export_entities_array[$r] = array (
+            'u.rowid' => "category",
+            'u.label' => "category",
+            'u.description' => "category",
+            'p.rowid' => 'contact',
+            'p.civility' => 'contact',
+            'p.lastname' => 'contact',
+            'p.firstname' => 'contact',
+            'p.address' => 'contact',
+            'p.zip' => 'contact',
+            'p.town' => 'contact',
+            'country.code' => 'contact',
+            'country.label' => 'contact',
+            'p.birthday' => 'contact',
+            'p.poste' => 'contact',
+            'p.phone' => 'contact',
+            'p.phone_perso' => 'contact',
+            'p.phone_mobile' => 'contact',
+            'p.fax' => 'contact',
+            'p.email' => 'contact',
+            'p.note_private' => 'contact',
+            'p.note_public' => 'contact',
             'p.statut' => 'contact',
-			's.nom'=>"company",
-			's.client'=>"company",
-			's.fournisseur'=>"company",
-			's.status'=>"company",
-			's.address'=>"company",
-			's.zip'=>"company",
-			's.town'=>"company",
-			's.phone'=>"company",
-			's.fax'=>"company",
-			's.url'=>"company",
-			's.email'=>"company"
-		); // We define here only fields that use another picto
+            's.nom'=>"company",
+            's.client'=>"company",
+            's.fournisseur'=>"company",
+            's.status'=>"company",
+            's.address'=>"company",
+            's.zip'=>"company",
+            's.town'=>"company",
+            's.phone'=>"company",
+            's.fax'=>"company",
+            's.url'=>"company",
+            's.email'=>"company"
+        ); // We define here only fields that use another picto
 
         // Add extra fields
         $sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'socpeople'";
         $resql=$this->db->query($sql);
         if ($resql)    // This can fail when class is used on old database (during migration for example)
         {
-        	while ($obj=$this->db->fetch_object($resql))
-        	{
-        		$fieldname='extra.'.$obj->name;
-        		$fieldlabel=ucfirst($obj->label);
-        		$typeFilter="Text";
-        		switch($obj->type)
-        		{
-        			case 'int':
-        			case 'double':
-        			case 'price':
-        				$typeFilter="Numeric";
-        				break;
-        			case 'date':
-        			case 'datetime':
-        				$typeFilter="Date";
-        				break;
-        			case 'boolean':
-        				$typeFilter="Boolean";
-        				break;
-        			case 'sellist':
-        				$typeFilter="List:".$obj->param;
-        				break;
-					case 'select':
-						$typeFilter="Select:".$obj->param;
-						break;
-        		}
-        		$this->export_fields_array[$r][$fieldname]=$fieldlabel;
-        		$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
-        		$this->export_entities_array[$r][$fieldname]='contact';
-        	}
+            while ($obj=$this->db->fetch_object($resql))
+            {
+                $fieldname='extra.'.$obj->name;
+                $fieldlabel=ucfirst($obj->label);
+                $typeFilter="Text";
+                switch($obj->type)
+                {
+                    case 'int':
+                    case 'double':
+                    case 'price':
+                        $typeFilter="Numeric";
+                        break;
+                    case 'date':
+                    case 'datetime':
+                        $typeFilter="Date";
+                        break;
+                    case 'boolean':
+                        $typeFilter="Boolean";
+                        break;
+                    case 'sellist':
+                        $typeFilter="List:".$obj->param;
+                        break;
+                    case 'select':
+                        $typeFilter="Select:".$obj->param;
+                        break;
+                }
+                $this->export_fields_array[$r][$fieldname]=$fieldlabel;
+                $this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
+                $this->export_entities_array[$r][$fieldname]='contact';
+            }
         }
         // End add axtra fields
 
-		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
-		$this->export_sql_end[$r]  = ' FROM ' . MAIN_DB_PREFIX . 'categorie as u, '.MAIN_DB_PREFIX . 'categorie_contact as cp, '.MAIN_DB_PREFIX . 'socpeople as p';
-		$this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_country as country ON p.fk_pays = country.rowid';
-		$this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe as s ON s.rowid = p.fk_soc';
+        $this->export_sql_start[$r] = 'SELECT DISTINCT ';
+        $this->export_sql_end[$r]  = ' FROM ' . MAIN_DB_PREFIX . 'categorie as u, '.MAIN_DB_PREFIX . 'categorie_contact as cp, '.MAIN_DB_PREFIX . 'socpeople as p';
+        $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_country as country ON p.fk_pays = country.rowid';
+        $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe as s ON s.rowid = p.fk_soc';
         $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'socpeople_extrafields as extra ON extra.fk_object = p.rowid';
-		$this->export_sql_end[$r] .= ' WHERE u.rowid = cp.fk_categorie AND cp.fk_socpeople = p.rowid AND u.entity IN ('.getEntity('category').')';
-		$this->export_sql_end[$r] .= ' AND u.type = 4'; // contact categories
-
-		// Imports
-		//--------
-
-		$r=0;
-
-		$r++;
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
-		$this->import_label[$r]="CatList";	// Translation key
-		$this->import_icon[$r]=$this->picto;
-		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r]=array('ca'=>MAIN_DB_PREFIX.'categorie');
-		$this->import_fields_array[$r]=array('ca.label'=>"Label*",'ca.type'=>"Type*",'ca.description'=>"Description");
-
-		$this->import_regex_array[$r]=array('ca.type'=>'^[0|1|2|3]');
-		$typeexample="";
-		if ($conf->product->enabled)     { $typeexample.=($typeexample?"/":"")."0=Product"; }
-		if ($conf->fournisseur->enabled) { $typeexample.=($typeexample?"/":"")."1=Supplier"; }
-		if ($conf->societe->enabled)     { $typeexample.=($typeexample?"/":"")."2=Customer-Prospect"; }
-		if ($conf->adherent->enabled)    { $typeexample.=($typeexample?"/":"")."3=Member"; }
-		$this->import_examplevalues_array[$r]=array('ca.label'=>"Supplier Category",'ca.type'=>$typeexample,'ca.description'=>"Imported category");
-
-		if (! empty($conf->product->enabled))
-		{
-			//Products
-			$r++;
-			$this->import_code[$r]=$this->rights_class.'_'.$r;
-			$this->import_label[$r]="CatProdLinks";	// Translation key
-			$this->import_icon[$r]=$this->picto;
-			$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r]=array('cp'=>MAIN_DB_PREFIX.'categorie_product');
-			$this->import_fields_array[$r]=array('cp.fk_categorie'=>"Category*",'cp.fk_product'=>"Product*"
-			);
-
-			$this->import_convertvalue_array[$r]=array(
-					'cp.fk_categorie'=>array('rule'=>'fetchidfromref','classfile'=>'/categories/class/categorie.class.php','class'=>'Categorie','method'=>'fetch','element'=>'category'),
-					'cp.fk_product'=>array('rule'=>'fetchidfromref','classfile'=>'/product/class/product.class.php','class'=>'Product','method'=>'fetch','element'=>'product')
-			);
-			$this->import_examplevalues_array[$r]=array('cp.fk_categorie'=>"Imported category",'cp.fk_product'=>"PREF123456");
-		}
-
-		if (! empty($conf->societe->enabled))
-		{
-			//Customers
-			$r++;
-			$this->import_code[$r]=$this->rights_class.'_'.$r;
-			$this->import_label[$r]="CatCusLinks";	// Translation key
-			$this->import_icon[$r]=$this->picto;
-			$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r]=array('cs'=>MAIN_DB_PREFIX.'categorie_societe');
-			$this->import_fields_array[$r]=array('cs.fk_categorie'=>"Category*",'cs.fk_soc'=>"ThirdParty*"
-			);
-
-			$this->import_convertvalue_array[$r]=array(
-					'cs.fk_categorie'=>array('rule'=>'fetchidfromref','classfile'=>'/categories/class/categorie.class.php','class'=>'Categorie','method'=>'fetch','element'=>'category'),
-					'cs.fk_soc'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty')
-			);
-			$this->import_examplevalues_array[$r]=array('cs.fk_categorie'=>"Imported category",'cs.fk_soc'=>"MyBigCompany");
-		}
-
-		if (! empty($conf->fournisseur->enabled))
-		{
-			// Suppliers
-			$r++;
-			$this->import_code[$r]=$this->rights_class.'_'.$r;
-			$this->import_label[$r]="CatSupLinks";	// Translation key
-			$this->import_icon[$r]=$this->picto;
-			$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r]=array('cs'=>MAIN_DB_PREFIX.'categorie_fournisseur');
-			$this->import_fields_array[$r]=array('cs.fk_categorie'=>"Category*",'cs.fk_soc'=>"Supplier*"
-			);
-
-			$this->import_convertvalue_array[$r]=array(
-					'cs.fk_categorie'=>array('rule'=>'fetchidfromref','classfile'=>'/categories/class/categorie.class.php','class'=>'Categorie','method'=>'fetch','element'=>'category'),
-					'cs.fk_soc'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty')
-			);
-			$this->import_examplevalues_array[$r]=array('cs.fk_categorie'=>"Imported category",'cs.fk_soc'=>"MyBigCompany");
-		}
-	}
+        $this->export_sql_end[$r] .= ' WHERE u.rowid = cp.fk_categorie AND cp.fk_socpeople = p.rowid AND u.entity IN ('.getEntity('category').')';
+        $this->export_sql_end[$r] .= ' AND u.type = 4'; // contact categories
+
+        // Imports
+        //--------
+
+        $r=0;
+
+        $r++;
+        $this->import_code[$r]=$this->rights_class.'_'.$r;
+        $this->import_label[$r]="CatList";	// Translation key
+        $this->import_icon[$r]=$this->picto;
+        $this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
+        $this->import_tables_array[$r]=array('ca'=>MAIN_DB_PREFIX.'categorie');
+        $this->import_fields_array[$r]=array('ca.label'=>"Label*",'ca.type'=>"Type*",'ca.description'=>"Description");
+
+        $this->import_regex_array[$r]=array('ca.type'=>'^[0|1|2|3]');
+        $typeexample="";
+        if ($conf->product->enabled)     { $typeexample.=($typeexample?"/":"")."0=Product"; }
+        if ($conf->fournisseur->enabled) { $typeexample.=($typeexample?"/":"")."1=Supplier"; }
+        if ($conf->societe->enabled)     { $typeexample.=($typeexample?"/":"")."2=Customer-Prospect"; }
+        if ($conf->adherent->enabled)    { $typeexample.=($typeexample?"/":"")."3=Member"; }
+        $this->import_examplevalues_array[$r]=array('ca.label'=>"Supplier Category",'ca.type'=>$typeexample,'ca.description'=>"Imported category");
+
+        if (! empty($conf->product->enabled))
+        {
+            //Products
+            $r++;
+            $this->import_code[$r]=$this->rights_class.'_'.$r;
+            $this->import_label[$r]="CatProdLinks";	// Translation key
+            $this->import_icon[$r]=$this->picto;
+            $this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
+            $this->import_tables_array[$r]=array('cp'=>MAIN_DB_PREFIX.'categorie_product');
+            $this->import_fields_array[$r]=array('cp.fk_categorie'=>"Category*",'cp.fk_product'=>"Product*"
+            );
+
+            $this->import_convertvalue_array[$r]=array(
+                    'cp.fk_categorie'=>array('rule'=>'fetchidfromref','classfile'=>'/categories/class/categorie.class.php','class'=>'Categorie','method'=>'fetch','element'=>'category'),
+                    'cp.fk_product'=>array('rule'=>'fetchidfromref','classfile'=>'/product/class/product.class.php','class'=>'Product','method'=>'fetch','element'=>'product')
+            );
+            $this->import_examplevalues_array[$r]=array('cp.fk_categorie'=>"Imported category",'cp.fk_product'=>"PREF123456");
+        }
+
+        if (! empty($conf->societe->enabled))
+        {
+            //Customers
+            $r++;
+            $this->import_code[$r]=$this->rights_class.'_'.$r;
+            $this->import_label[$r]="CatCusLinks";	// Translation key
+            $this->import_icon[$r]=$this->picto;
+            $this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
+            $this->import_tables_array[$r]=array('cs'=>MAIN_DB_PREFIX.'categorie_societe');
+            $this->import_fields_array[$r]=array('cs.fk_categorie'=>"Category*",'cs.fk_soc'=>"ThirdParty*"
+            );
+
+            $this->import_convertvalue_array[$r]=array(
+                    'cs.fk_categorie'=>array('rule'=>'fetchidfromref','classfile'=>'/categories/class/categorie.class.php','class'=>'Categorie','method'=>'fetch','element'=>'category'),
+                    'cs.fk_soc'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty')
+            );
+            $this->import_examplevalues_array[$r]=array('cs.fk_categorie'=>"Imported category",'cs.fk_soc'=>"MyBigCompany");
+        }
+
+        if (! empty($conf->fournisseur->enabled))
+        {
+            // Suppliers
+            $r++;
+            $this->import_code[$r]=$this->rights_class.'_'.$r;
+            $this->import_label[$r]="CatSupLinks";	// Translation key
+            $this->import_icon[$r]=$this->picto;
+            $this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
+            $this->import_tables_array[$r]=array('cs'=>MAIN_DB_PREFIX.'categorie_fournisseur');
+            $this->import_fields_array[$r]=array('cs.fk_categorie'=>"Category*",'cs.fk_soc'=>"Supplier*"
+            );
+
+            $this->import_convertvalue_array[$r]=array(
+                    'cs.fk_categorie'=>array('rule'=>'fetchidfromref','classfile'=>'/categories/class/categorie.class.php','class'=>'Categorie','method'=>'fetch','element'=>'category'),
+                    'cs.fk_soc'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty')
+            );
+            $this->import_examplevalues_array[$r]=array('cs.fk_categorie'=>"Imported category",'cs.fk_soc'=>"MyBigCompany");
+        }
+    }
 
 
     /**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
+     *		Function called when module is enabled.
+     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *		It also creates data directories
+     *
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
+     *      @return     int             	1 if OK, 0 if KO
      */
-	function init($options='')
-	{
-		// Permissions
-		$this->remove($options);
+    function init($options='')
+    {
+        // Permissions
+        $this->remove($options);
 
-		$sql = array();
+        $sql = array();
 
-		return $this->_init($sql,$options);
-	}
+        return $this->_init($sql,$options);
+    }
 }

Spacing +179 added lines, -179 removed lines

@@ -24,7 +24,7 @@ 
  *      \ingroup    category
  *      \brief      Fichier de description et activation du module Categorie
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -47,7 +47,7 @@ 
 		$this->family = "technic";
 		$this->module_position = '20';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Gestion des categories (produits, clients, fournisseurs...)";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
@@ -64,11 +64,11 @@ 
 
 		// Config pages
 		$this->config_page_url = array('categorie.php@categories');
-		$this->langfiles = array("products","companies","categories","members");
+		$this->langfiles = array("products", "companies", "categories", "members");
 
 		// Constants
 		$this->const = array();
-		$r=0;
+		$r = 0;
 		$this->const[$r][0] = "CATEGORIE_RECURSIV_ADD";
 		$this->const[$r][1] = "yesno";
 		$this->const[$r][2] = "0";
@@ -83,7 +83,7 @@ 
 		$this->rights = array();
 		$this->rights_class = 'categorie';
 
-		$r=0;
+		$r = 0;
 
 		$this->rights[$r][0] = 241; // id de la permission
 		$this->rights[$r][1] = 'Lire les categories'; // libelle de la permission
@@ -109,115 +109,115 @@ 
 
 		// Menus
 		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 
 		// Exports
 		//--------
-		$r=0;
+		$r = 0;
 
 		$r++;
-		$this->export_code[$r]='category_'.$r;
-		$this->export_label[$r]='CatSupList';
-		$this->export_icon[$r]='category';
-		$this->export_enabled[$r]='$conf->fournisseur->enabled';
-		$this->export_permission[$r]=array(array("categorie","lire"),array("fournisseur","lire"));
-		$this->export_fields_array[$r]=array(
-			'u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'s.rowid'=>'IdThirdParty','s.nom'=>'Name','s.prefix_comm'=>"Prefix",
-			's.client'=>"Customer",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.address'=>"Address",
-			's.zip'=>"Zip",'s.town'=>"Town",'c.label'=>"Country",'c.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",
-			's.siret'=>"ProfId1",'s.siren'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",
+		$this->export_code[$r] = 'category_'.$r;
+		$this->export_label[$r] = 'CatSupList';
+		$this->export_icon[$r] = 'category';
+		$this->export_enabled[$r] = '$conf->fournisseur->enabled';
+		$this->export_permission[$r] = array(array("categorie", "lire"), array("fournisseur", "lire"));
+		$this->export_fields_array[$r] = array(
+			'u.rowid'=>"CategId", 'u.label'=>"Label", 'u.description'=>"Description", 's.rowid'=>'IdThirdParty', 's.nom'=>'Name', 's.prefix_comm'=>"Prefix",
+			's.client'=>"Customer", 's.datec'=>"DateCreation", 's.tms'=>"DateLastModification", 's.code_client'=>"CustomerCode", 's.address'=>"Address",
+			's.zip'=>"Zip", 's.town'=>"Town", 'c.label'=>"Country", 'c.code'=>"CountryCode", 's.phone'=>"Phone", 's.fax'=>"Fax", 's.url'=>"Url", 's.email'=>"Email",
+			's.siret'=>"ProfId1", 's.siren'=>"ProfId2", 's.ape'=>"ProfId3", 's.idprof4'=>"ProfId4", 's.tva_intra'=>"VATIntraShort", 's.capital'=>"Capital",
 			's.note_public'=>"NotePublic"
 		);
-		$this->export_TypeFields_array[$r]=array(
-			'u.label'=>"Text",'u.description'=>"Text",'s.rowid'=>'List:societe:nom','s.nom'=>'Text','s.prefix_comm'=>"Text",'s.client'=>"Text",'s.datec'=>"Date",
-			's.tms'=>"Date",'s.code_client'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",
-			's.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",
-			's.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_public'=>"Text"
+		$this->export_TypeFields_array[$r] = array(
+			'u.label'=>"Text", 'u.description'=>"Text", 's.rowid'=>'List:societe:nom', 's.nom'=>'Text', 's.prefix_comm'=>"Text", 's.client'=>"Text", 's.datec'=>"Date",
+			's.tms'=>"Date", 's.code_client'=>"Text", 's.address'=>"Text", 's.zip'=>"Text", 's.town'=>"Text", 'c.label'=>"List:c_country:label:label", 'c.code'=>"Text",
+			's.phone'=>"Text", 's.fax'=>"Text", 's.url'=>"Text", 's.email'=>"Text", 's.siret'=>"Text", 's.siren'=>"Text", 's.ape'=>"Text", 's.idprof4'=>"Text",
+			's.tva_intra'=>"Text", 's.capital'=>"Numeric", 's.note_public'=>"Text"
 		);
-		$this->export_entities_array[$r]=array(
-			's.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",
-			's.code_client'=>"company",'s.address'=>"company",'s.zip'=>"company",'s.town'=>"company",'c.label'=>"company",'c.code'=>"company",
-			's.phone'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",
-			's.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note_public'=>"company"
-		);	// We define here only fields that use another picto
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, ';
+		$this->export_entities_array[$r] = array(
+			's.rowid'=>'company', 's.nom'=>'company', 's.prefix_comm'=>"company", 's.client'=>"company", 's.datec'=>"company", 's.tms'=>"company",
+			's.code_client'=>"company", 's.address'=>"company", 's.zip'=>"company", 's.town'=>"company", 'c.label'=>"company", 'c.code'=>"company",
+			's.phone'=>"company", 's.fax'=>"company", 's.url'=>"company", 's.email'=>"company", 's.siret'=>"company", 's.siren'=>"company", 's.ape'=>"company",
+			's.idprof4'=>"company", 's.tva_intra'=>"company", 's.capital'=>"company", 's.note_public'=>"company"
+		); // We define here only fields that use another picto
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as u, ';
 		$this->export_sql_end[$r] .= MAIN_DB_PREFIX.'categorie_fournisseur as cf, ';
 		$this->export_sql_end[$r] .= MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code';
-		$this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
-		$this->export_sql_end[$r] .=' AND u.type = 1';	// Supplier categories
+		$this->export_sql_end[$r] .= ' WHERE u.rowid = cf.fk_categorie AND cf.fk_soc = s.rowid';
+		$this->export_sql_end[$r] .= ' AND u.entity IN ('.getEntity('category').')';
+		$this->export_sql_end[$r] .= ' AND u.type = 1'; // Supplier categories
 
 		$r++;
-		$this->export_code[$r]='category_'.$r;
-		$this->export_label[$r]='CatCusList';
-		$this->export_icon[$r]='category';
-        $this->export_enabled[$r]='$conf->societe->enabled';
-		$this->export_permission[$r]=array(array("categorie","lire"),array("societe","lire"));
-		$this->export_fields_array[$r]=array(
-			'u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'s.rowid'=>'IdThirdParty','s.nom'=>'Name','s.prefix_comm'=>"Prefix",
-			's.client'=>"Customer",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.address'=>"Address",
-			's.zip'=>"Zip",'s.town'=>"Town",'c.label'=>"Country",'c.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",
-			's.siret'=>"ProfId1",'s.siren'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",
-			's.note_public'=>"NotePublic",'s.fk_prospectlevel'=>'ProspectLevel','s.fk_stcomm'=>'ProspectStatus'
+		$this->export_code[$r] = 'category_'.$r;
+		$this->export_label[$r] = 'CatCusList';
+		$this->export_icon[$r] = 'category';
+        $this->export_enabled[$r] = '$conf->societe->enabled';
+		$this->export_permission[$r] = array(array("categorie", "lire"), array("societe", "lire"));
+		$this->export_fields_array[$r] = array(
+			'u.rowid'=>"CategId", 'u.label'=>"Label", 'u.description'=>"Description", 's.rowid'=>'IdThirdParty', 's.nom'=>'Name', 's.prefix_comm'=>"Prefix",
+			's.client'=>"Customer", 's.datec'=>"DateCreation", 's.tms'=>"DateLastModification", 's.code_client'=>"CustomerCode", 's.address'=>"Address",
+			's.zip'=>"Zip", 's.town'=>"Town", 'c.label'=>"Country", 'c.code'=>"CountryCode", 's.phone'=>"Phone", 's.fax'=>"Fax", 's.url'=>"Url", 's.email'=>"Email",
+			's.siret'=>"ProfId1", 's.siren'=>"ProfId2", 's.ape'=>"ProfId3", 's.idprof4'=>"ProfId4", 's.tva_intra'=>"VATIntraShort", 's.capital'=>"Capital",
+			's.note_public'=>"NotePublic", 's.fk_prospectlevel'=>'ProspectLevel', 's.fk_stcomm'=>'ProspectStatus'
 		);
-		$this->export_TypeFields_array[$r]=array(
-			'u.label'=>"Text",'u.description'=>"Text",'s.rowid'=>'List:societe:nom','s.nom'=>'Text','s.prefix_comm'=>"Text",'s.client'=>"Text",
-			's.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",
-			'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",
-			's.idprof4'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_public'=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code',
+		$this->export_TypeFields_array[$r] = array(
+			'u.label'=>"Text", 'u.description'=>"Text", 's.rowid'=>'List:societe:nom', 's.nom'=>'Text', 's.prefix_comm'=>"Text", 's.client'=>"Text",
+			's.datec'=>"Date", 's.tms'=>"Date", 's.code_client'=>"Text", 's.address'=>"Text", 's.zip'=>"Text", 's.town'=>"Text", 'c.label'=>"List:c_country:label:label",
+			'c.code'=>"Text", 's.phone'=>"Text", 's.fax'=>"Text", 's.url'=>"Text", 's.email'=>"Text", 's.siret'=>"Text", 's.siren'=>"Text", 's.ape'=>"Text",
+			's.idprof4'=>"Text", 's.tva_intra'=>"Text", 's.capital'=>"Numeric", 's.note_public'=>"Text", 's.fk_prospectlevel'=>'List:c_prospectlevel:label:code',
 			's.fk_stcomm'=>'List:c_stcomm:libelle:code'
 		);
-		$this->export_entities_array[$r]=array(
-			's.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",
-			's.code_client'=>"company",'s.address'=>"company",'s.zip'=>"company",'s.town'=>"company",'c.label'=>"company",'c.code'=>"company",
-			's.phone'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",
-			's.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note_public'=>"company",'s.fk_prospectlevel'=>'company',
+		$this->export_entities_array[$r] = array(
+			's.rowid'=>'company', 's.nom'=>'company', 's.prefix_comm'=>"company", 's.client'=>"company", 's.datec'=>"company", 's.tms'=>"company",
+			's.code_client'=>"company", 's.address'=>"company", 's.zip'=>"company", 's.town'=>"company", 'c.label'=>"company", 'c.code'=>"company",
+			's.phone'=>"company", 's.fax'=>"company", 's.url'=>"company", 's.email'=>"company", 's.siret'=>"company", 's.siren'=>"company", 's.ape'=>"company",
+			's.idprof4'=>"company", 's.tva_intra'=>"company", 's.capital'=>"company", 's.note_public'=>"company", 's.fk_prospectlevel'=>'company',
 			's.fk_stcomm'=>'company'
-		);	// We define here only fields that use another picto
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, ';
+		); // We define here only fields that use another picto
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as u, ';
 		$this->export_sql_end[$r] .= MAIN_DB_PREFIX.'categorie_societe as cf, ';
 		$this->export_sql_end[$r] .= MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object ';
-		$this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
-		$this->export_sql_end[$r] .=' AND u.type = 2';	// Customer/Prospect categories
+		$this->export_sql_end[$r] .= ' WHERE u.rowid = cf.fk_categorie AND cf.fk_soc = s.rowid';
+		$this->export_sql_end[$r] .= ' AND u.entity IN ('.getEntity('category').')';
+		$this->export_sql_end[$r] .= ' AND u.type = 2'; // Customer/Prospect categories
 
         // Add extra fields
-        $sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe'";
-        $resql=$this->db->query($sql);
+        $sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe'";
+        $resql = $this->db->query($sql);
         if ($resql)    // This can fail when class is used on old database (during migration for example)
         {
-            while ($obj=$this->db->fetch_object($resql))
+            while ($obj = $this->db->fetch_object($resql))
             {
-                $fieldname='extra.'.$obj->name;
-                $fieldlabel=ucfirst($obj->label);
-                $typeFilter="Text";
-                switch($obj->type)
+                $fieldname = 'extra.'.$obj->name;
+                $fieldlabel = ucfirst($obj->label);
+                $typeFilter = "Text";
+                switch ($obj->type)
                 {
                     case 'int':
                     case 'double':
                     case 'price':
-                        $typeFilter="Numeric";
+                        $typeFilter = "Numeric";
                         break;
                     case 'date':
                     case 'datetime':
-                        $typeFilter="Date";
+                        $typeFilter = "Date";
                         break;
                     case 'boolean':
-                        $typeFilter="Boolean";
+                        $typeFilter = "Boolean";
                         break;
                     case 'sellist':
-                        $typeFilter="List:".$obj->param;
+                        $typeFilter = "List:".$obj->param;
                         break;
                     case 'select':
-                        $typeFilter="Select:".$obj->param;
+                        $typeFilter = "Select:".$obj->param;
                         break;
                 }
-                $this->export_fields_array[$r][$fieldname]=$fieldlabel;
-                $this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
-                $this->export_entities_array[$r][$fieldname]='company';
+                $this->export_fields_array[$r][$fieldname] = $fieldlabel;
+                $this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
+                $this->export_entities_array[$r][$fieldname] = 'company';
             }
         }
         // End add axtra fields
@@ -227,42 +227,42 @@ 
 
 
 		$r++;
-		$this->export_code[$r]='category_'.$r;
-		$this->export_label[$r]='CatProdList';
-		$this->export_icon[$r]='category';
-        $this->export_enabled[$r]='$conf->produit->enabled';
-		$this->export_permission[$r]=array(array("categorie","lire"),array("produit","lire"));
-		$this->export_fields_array[$r]=array('u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'p.rowid'=>'ProductId','p.ref'=>'Ref');
-		$this->export_TypeFields_array[$r]=array('u.label'=>"Text",'u.description'=>"Text",'p.ref'=>'Text');
-		$this->export_entities_array[$r]=array('p.rowid'=>'product','p.ref'=>'product');	// We define here only fields that use another picto
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_product as cp, '.MAIN_DB_PREFIX.'product as p';
-		$this->export_sql_end[$r] .=' WHERE u.rowid = cp.fk_categorie AND cp.fk_product = p.rowid';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
-		$this->export_sql_end[$r] .=' AND u.type = 0';	// Supplier categories
+		$this->export_code[$r] = 'category_'.$r;
+		$this->export_label[$r] = 'CatProdList';
+		$this->export_icon[$r] = 'category';
+        $this->export_enabled[$r] = '$conf->produit->enabled';
+		$this->export_permission[$r] = array(array("categorie", "lire"), array("produit", "lire"));
+		$this->export_fields_array[$r] = array('u.rowid'=>"CategId", 'u.label'=>"Label", 'u.description'=>"Description", 'p.rowid'=>'ProductId', 'p.ref'=>'Ref');
+		$this->export_TypeFields_array[$r] = array('u.label'=>"Text", 'u.description'=>"Text", 'p.ref'=>'Text');
+		$this->export_entities_array[$r] = array('p.rowid'=>'product', 'p.ref'=>'product'); // We define here only fields that use another picto
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_product as cp, '.MAIN_DB_PREFIX.'product as p';
+		$this->export_sql_end[$r] .= ' WHERE u.rowid = cp.fk_categorie AND cp.fk_product = p.rowid';
+		$this->export_sql_end[$r] .= ' AND u.entity IN ('.getEntity('category').')';
+		$this->export_sql_end[$r] .= ' AND u.type = 0'; // Supplier categories
 
 		$r++;
-		$this->export_code[$r]='category_'.$r;
-		$this->export_label[$r]='CatMemberList';
-		$this->export_icon[$r]='category';
-        $this->export_enabled[$r]='$conf->adherent->enabled';
-		$this->export_permission[$r]=array(array("categorie","lire"),array("adherent","lire"));
-		$this->export_fields_array[$r]=array('u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'p.rowid'=>'MemberId','p.lastname'=>'LastName','p.firstname'=>'Firstname');
-		$this->export_TypeFields_array[$r]=array('u.label'=>"Text",'u.description'=>"Text",'p.lastname'=>'Text','p.firstname'=>'Text');
-		$this->export_entities_array[$r]=array('p.rowid'=>'member','p.lastname'=>'member','p.firstname'=>'member');	// We define here only fields that use another picto
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_member as cp, '.MAIN_DB_PREFIX.'adherent as p';
-		$this->export_sql_end[$r] .=' WHERE u.rowid = cp.fk_categorie AND cp.fk_member = p.rowid';
-		$this->export_sql_end[$r] .=' AND u.entity IN ('.getEntity('category').')';
-		$this->export_sql_end[$r] .=' AND u.type = 3';	// Member categories
+		$this->export_code[$r] = 'category_'.$r;
+		$this->export_label[$r] = 'CatMemberList';
+		$this->export_icon[$r] = 'category';
+        $this->export_enabled[$r] = '$conf->adherent->enabled';
+		$this->export_permission[$r] = array(array("categorie", "lire"), array("adherent", "lire"));
+		$this->export_fields_array[$r] = array('u.rowid'=>"CategId", 'u.label'=>"Label", 'u.description'=>"Description", 'p.rowid'=>'MemberId', 'p.lastname'=>'LastName', 'p.firstname'=>'Firstname');
+		$this->export_TypeFields_array[$r] = array('u.label'=>"Text", 'u.description'=>"Text", 'p.lastname'=>'Text', 'p.firstname'=>'Text');
+		$this->export_entities_array[$r] = array('p.rowid'=>'member', 'p.lastname'=>'member', 'p.firstname'=>'member'); // We define here only fields that use another picto
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_member as cp, '.MAIN_DB_PREFIX.'adherent as p';
+		$this->export_sql_end[$r] .= ' WHERE u.rowid = cp.fk_categorie AND cp.fk_member = p.rowid';
+		$this->export_sql_end[$r] .= ' AND u.entity IN ('.getEntity('category').')';
+		$this->export_sql_end[$r] .= ' AND u.type = 3'; // Member categories
 
 		$r++;
-		$this->export_code[$r]='category_'.$r;
-		$this->export_label[$r]='CatContactList';
-		$this->export_icon[$r]='category';
-		$this->export_enabled[$r]='$conf->societe->enabled';
-		$this->export_permission[$r]=array(array("categorie", "lire"), array ("societe", "lire"));
-		$this->export_fields_array[$r]=array (
+		$this->export_code[$r] = 'category_'.$r;
+		$this->export_label[$r] = 'CatContactList';
+		$this->export_icon[$r] = 'category';
+		$this->export_enabled[$r] = '$conf->societe->enabled';
+		$this->export_permission[$r] = array(array("categorie", "lire"), array("societe", "lire"));
+		$this->export_fields_array[$r] = array(
 			'u.rowid' => "CategId",
 			'u.label' => "Label",
 			'u.description' => "Description",
@@ -297,7 +297,7 @@ 
 			's.url'=>"Url",
 			's.email'=>"Email"
 		);
-		$this->export_TypeFields_array[$r] = array (
+		$this->export_TypeFields_array[$r] = array(
 			'u.label' => "Text",
 			'u.description' => "Text",
 			'p.lastname' => 'Text',
@@ -313,7 +313,7 @@ 
 			's.url'=>"Text",
 			's.email'=>"Text"
 		);
-		$this->export_entities_array[$r] = array (
+		$this->export_entities_array[$r] = array(
 			'u.rowid' => "category",
 			'u.label' => "category",
 			'u.description' => "category",
@@ -350,127 +350,127 @@ 
 		); // We define here only fields that use another picto
 
         // Add extra fields
-        $sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'socpeople'";
-        $resql=$this->db->query($sql);
+        $sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'socpeople'";
+        $resql = $this->db->query($sql);
         if ($resql)    // This can fail when class is used on old database (during migration for example)
         {
-        	while ($obj=$this->db->fetch_object($resql))
+        	while ($obj = $this->db->fetch_object($resql))
         	{
-        		$fieldname='extra.'.$obj->name;
-        		$fieldlabel=ucfirst($obj->label);
-        		$typeFilter="Text";
-        		switch($obj->type)
+        		$fieldname = 'extra.'.$obj->name;
+        		$fieldlabel = ucfirst($obj->label);
+        		$typeFilter = "Text";
+        		switch ($obj->type)
         		{
         			case 'int':
         			case 'double':
         			case 'price':
-        				$typeFilter="Numeric";
+        				$typeFilter = "Numeric";
         				break;
         			case 'date':
         			case 'datetime':
-        				$typeFilter="Date";
+        				$typeFilter = "Date";
         				break;
         			case 'boolean':
-        				$typeFilter="Boolean";
+        				$typeFilter = "Boolean";
         				break;
         			case 'sellist':
-        				$typeFilter="List:".$obj->param;
+        				$typeFilter = "List:".$obj->param;
         				break;
 					case 'select':
-						$typeFilter="Select:".$obj->param;
+						$typeFilter = "Select:".$obj->param;
 						break;
         		}
-        		$this->export_fields_array[$r][$fieldname]=$fieldlabel;
-        		$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
-        		$this->export_entities_array[$r][$fieldname]='contact';
+        		$this->export_fields_array[$r][$fieldname] = $fieldlabel;
+        		$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
+        		$this->export_entities_array[$r][$fieldname] = 'contact';
         	}
         }
         // End add axtra fields
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
-		$this->export_sql_end[$r]  = ' FROM ' . MAIN_DB_PREFIX . 'categorie as u, '.MAIN_DB_PREFIX . 'categorie_contact as cp, '.MAIN_DB_PREFIX . 'socpeople as p';
-		$this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_country as country ON p.fk_pays = country.rowid';
-		$this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe as s ON s.rowid = p.fk_soc';
-        $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'socpeople_extrafields as extra ON extra.fk_object = p.rowid';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_contact as cp, '.MAIN_DB_PREFIX.'socpeople as p';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as country ON p.fk_pays = country.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
+        $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = p.rowid';
 		$this->export_sql_end[$r] .= ' WHERE u.rowid = cp.fk_categorie AND cp.fk_socpeople = p.rowid AND u.entity IN ('.getEntity('category').')';
 		$this->export_sql_end[$r] .= ' AND u.type = 4'; // contact categories
 
 		// Imports
 		//--------
 
-		$r=0;
+		$r = 0;
 
 		$r++;
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
-		$this->import_label[$r]="CatList";	// Translation key
-		$this->import_icon[$r]=$this->picto;
-		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r]=array('ca'=>MAIN_DB_PREFIX.'categorie');
-		$this->import_fields_array[$r]=array('ca.label'=>"Label*",'ca.type'=>"Type*",'ca.description'=>"Description");
-
-		$this->import_regex_array[$r]=array('ca.type'=>'^[0|1|2|3]');
-		$typeexample="";
-		if ($conf->product->enabled)     { $typeexample.=($typeexample?"/":"")."0=Product"; }
-		if ($conf->fournisseur->enabled) { $typeexample.=($typeexample?"/":"")."1=Supplier"; }
-		if ($conf->societe->enabled)     { $typeexample.=($typeexample?"/":"")."2=Customer-Prospect"; }
-		if ($conf->adherent->enabled)    { $typeexample.=($typeexample?"/":"")."3=Member"; }
-		$this->import_examplevalues_array[$r]=array('ca.label'=>"Supplier Category",'ca.type'=>$typeexample,'ca.description'=>"Imported category");
-
-		if (! empty($conf->product->enabled))
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = "CatList"; // Translation key
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = array('ca'=>MAIN_DB_PREFIX.'categorie');
+		$this->import_fields_array[$r] = array('ca.label'=>"Label*", 'ca.type'=>"Type*", 'ca.description'=>"Description");
+
+		$this->import_regex_array[$r] = array('ca.type'=>'^[0|1|2|3]');
+		$typeexample = "";
+		if ($conf->product->enabled) { $typeexample .= ($typeexample ? "/" : "")."0=Product"; }
+		if ($conf->fournisseur->enabled) { $typeexample .= ($typeexample ? "/" : "")."1=Supplier"; }
+		if ($conf->societe->enabled) { $typeexample .= ($typeexample ? "/" : "")."2=Customer-Prospect"; }
+		if ($conf->adherent->enabled) { $typeexample .= ($typeexample ? "/" : "")."3=Member"; }
+		$this->import_examplevalues_array[$r] = array('ca.label'=>"Supplier Category", 'ca.type'=>$typeexample, 'ca.description'=>"Imported category");
+
+		if (!empty($conf->product->enabled))
 		{
 			//Products
 			$r++;
-			$this->import_code[$r]=$this->rights_class.'_'.$r;
-			$this->import_label[$r]="CatProdLinks";	// Translation key
-			$this->import_icon[$r]=$this->picto;
-			$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r]=array('cp'=>MAIN_DB_PREFIX.'categorie_product');
-			$this->import_fields_array[$r]=array('cp.fk_categorie'=>"Category*",'cp.fk_product'=>"Product*"
+			$this->import_code[$r] = $this->rights_class.'_'.$r;
+			$this->import_label[$r] = "CatProdLinks"; // Translation key
+			$this->import_icon[$r] = $this->picto;
+			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+			$this->import_tables_array[$r] = array('cp'=>MAIN_DB_PREFIX.'categorie_product');
+			$this->import_fields_array[$r] = array('cp.fk_categorie'=>"Category*", 'cp.fk_product'=>"Product*"
 			);
 
-			$this->import_convertvalue_array[$r]=array(
-					'cp.fk_categorie'=>array('rule'=>'fetchidfromref','classfile'=>'/categories/class/categorie.class.php','class'=>'Categorie','method'=>'fetch','element'=>'category'),
-					'cp.fk_product'=>array('rule'=>'fetchidfromref','classfile'=>'/product/class/product.class.php','class'=>'Product','method'=>'fetch','element'=>'product')
+			$this->import_convertvalue_array[$r] = array(
+					'cp.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
+					'cp.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'product')
 			);
-			$this->import_examplevalues_array[$r]=array('cp.fk_categorie'=>"Imported category",'cp.fk_product'=>"PREF123456");
+			$this->import_examplevalues_array[$r] = array('cp.fk_categorie'=>"Imported category", 'cp.fk_product'=>"PREF123456");
 		}
 
-		if (! empty($conf->societe->enabled))
+		if (!empty($conf->societe->enabled))
 		{
 			//Customers
 			$r++;
-			$this->import_code[$r]=$this->rights_class.'_'.$r;
-			$this->import_label[$r]="CatCusLinks";	// Translation key
-			$this->import_icon[$r]=$this->picto;
-			$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r]=array('cs'=>MAIN_DB_PREFIX.'categorie_societe');
-			$this->import_fields_array[$r]=array('cs.fk_categorie'=>"Category*",'cs.fk_soc'=>"ThirdParty*"
+			$this->import_code[$r] = $this->rights_class.'_'.$r;
+			$this->import_label[$r] = "CatCusLinks"; // Translation key
+			$this->import_icon[$r] = $this->picto;
+			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+			$this->import_tables_array[$r] = array('cs'=>MAIN_DB_PREFIX.'categorie_societe');
+			$this->import_fields_array[$r] = array('cs.fk_categorie'=>"Category*", 'cs.fk_soc'=>"ThirdParty*"
 			);
 
-			$this->import_convertvalue_array[$r]=array(
-					'cs.fk_categorie'=>array('rule'=>'fetchidfromref','classfile'=>'/categories/class/categorie.class.php','class'=>'Categorie','method'=>'fetch','element'=>'category'),
-					'cs.fk_soc'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty')
+			$this->import_convertvalue_array[$r] = array(
+					'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
+					'cs.fk_soc'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty')
 			);
-			$this->import_examplevalues_array[$r]=array('cs.fk_categorie'=>"Imported category",'cs.fk_soc'=>"MyBigCompany");
+			$this->import_examplevalues_array[$r] = array('cs.fk_categorie'=>"Imported category", 'cs.fk_soc'=>"MyBigCompany");
 		}
 
-		if (! empty($conf->fournisseur->enabled))
+		if (!empty($conf->fournisseur->enabled))
 		{
 			// Suppliers
 			$r++;
-			$this->import_code[$r]=$this->rights_class.'_'.$r;
-			$this->import_label[$r]="CatSupLinks";	// Translation key
-			$this->import_icon[$r]=$this->picto;
-			$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-			$this->import_tables_array[$r]=array('cs'=>MAIN_DB_PREFIX.'categorie_fournisseur');
-			$this->import_fields_array[$r]=array('cs.fk_categorie'=>"Category*",'cs.fk_soc'=>"Supplier*"
+			$this->import_code[$r] = $this->rights_class.'_'.$r;
+			$this->import_label[$r] = "CatSupLinks"; // Translation key
+			$this->import_icon[$r] = $this->picto;
+			$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+			$this->import_tables_array[$r] = array('cs'=>MAIN_DB_PREFIX.'categorie_fournisseur');
+			$this->import_fields_array[$r] = array('cs.fk_categorie'=>"Category*", 'cs.fk_soc'=>"Supplier*"
 			);
 
-			$this->import_convertvalue_array[$r]=array(
-					'cs.fk_categorie'=>array('rule'=>'fetchidfromref','classfile'=>'/categories/class/categorie.class.php','class'=>'Categorie','method'=>'fetch','element'=>'category'),
-					'cs.fk_soc'=>array('rule'=>'fetchidfromref','classfile'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty')
+			$this->import_convertvalue_array[$r] = array(
+					'cs.fk_categorie'=>array('rule'=>'fetchidfromref', 'classfile'=>'/categories/class/categorie.class.php', 'class'=>'Categorie', 'method'=>'fetch', 'element'=>'category'),
+					'cs.fk_soc'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty')
 			);
-			$this->import_examplevalues_array[$r]=array('cs.fk_categorie'=>"Imported category",'cs.fk_soc'=>"MyBigCompany");
+			$this->import_examplevalues_array[$r] = array('cs.fk_categorie'=>"Imported category", 'cs.fk_soc'=>"MyBigCompany");
 		}
 	}
 
@@ -483,13 +483,13 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
      */
-	function init($options='')
+	function init($options = '')
 	{
 		// Permissions
 		$this->remove($options);
 
 		$sql = array();
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

Braces +6 added lines, -2 removed lines

@@ -187,11 +187,13 @@ 
         // Add extra fields
         $sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe'";
         $resql=$this->db->query($sql);
-        if ($resql)    // This can fail when class is used on old database (during migration for example)
+        if ($resql) {
+            // This can fail when class is used on old database (during migration for example)
         {
             while ($obj=$this->db->fetch_object($resql))
             {
                 $fieldname='extra.'.$obj->name;
+        }
                 $fieldlabel=ucfirst($obj->label);
                 $typeFilter="Text";
                 switch($obj->type)
@@ -352,11 +354,13 @@ 
         // Add extra fields
         $sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'socpeople'";
         $resql=$this->db->query($sql);
-        if ($resql)    // This can fail when class is used on old database (during migration for example)
+        if ($resql) {
+            // This can fail when class is used on old database (during migration for example)
         {
         	while ($obj=$this->db->fetch_object($resql))
         	{
         		$fieldname='extra.'.$obj->name;
+        }
         		$fieldlabel=ucfirst($obj->label);
         		$typeFilter="Text";
         		switch($obj->type)

dolibarr/htdocs/core/modules/modDocumentGeneration.class.php

Indentation +76 added lines, -76 removed lines

@@ -34,84 +34,84 @@
 class modDocumentGeneration extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->numero = 1520;
-
-		$this->family = "technic";
-		$this->module_position = '80';
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Direct mail document generation";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'development';
-
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='email';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array("/documentgeneration/temp");
-
-		// Config pages
-		//$this->config_page_url = array("document.php");
-
-		// Dependencies
-		$this->depends = array();
-		$this->requiredby = array();
-		$this->conflictwith = array();
-		$this->langfiles = array("orders","bills","companies","mails");
-
-		// Constants
-
-		$this->const = array();
-
-		// Boxes
-		$this->boxes = array();
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'document';
-
-		$r=0;
-
-		$this->rights[$r][0] = 1521;
-		$this->rights[$r][1] = 'Lire les documents';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'lire';
-
-		$r++;
-		$this->rights[$r][0] = 1522;
-		$this->rights[$r][1] = 'Supprimer les documents clients';
-		$this->rights[$r][2] = 'd';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'supprimer';
-	}
-
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->numero = 1520;
+
+        $this->family = "technic";
+        $this->module_position = '80';
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Direct mail document generation";
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'development';
+
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='email';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array("/documentgeneration/temp");
+
+        // Config pages
+        //$this->config_page_url = array("document.php");
+
+        // Dependencies
+        $this->depends = array();
+        $this->requiredby = array();
+        $this->conflictwith = array();
+        $this->langfiles = array("orders","bills","companies","mails");
+
+        // Constants
+
+        $this->const = array();
+
+        // Boxes
+        $this->boxes = array();
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'document';
+
+        $r=0;
+
+        $this->rights[$r][0] = 1521;
+        $this->rights[$r][1] = 'Lire les documents';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'lire';
+
+        $r++;
+        $this->rights[$r][0] = 1522;
+        $this->rights[$r][1] = 'Supprimer les documents clients';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'supprimer';
+    }
+
+
+    /**
+     *		Function called when module is enabled.
+     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *		It also creates data directories
+     *
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		global $conf;
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        global $conf;
 
-		// Permissions
-		$this->remove($options);
+        // Permissions
+        $this->remove($options);
 
-		$sql = array();
+        $sql = array();
 
-		return $this->_init($sql,$options);
-	}
+        return $this->_init($sql,$options);
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -25,7 +25,7 @@ 
  *	\brief      	Fichier de description et activation du module Generation document
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -47,13 +47,13 @@ 
 		$this->family = "technic";
 		$this->module_position = '80';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Direct mail document generation";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'development';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='email';
+		$this->picto = 'email';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/documentgeneration/temp");
@@ -65,7 +65,7 @@ 
 		$this->depends = array();
 		$this->requiredby = array();
 		$this->conflictwith = array();
-		$this->langfiles = array("orders","bills","companies","mails");
+		$this->langfiles = array("orders", "bills", "companies", "mails");
 
 		// Constants
 
@@ -78,7 +78,7 @@ 
 		$this->rights = array();
 		$this->rights_class = 'document';
 
-		$r=0;
+		$r = 0;
 
 		$this->rights[$r][0] = 1521;
 		$this->rights[$r][1] = 'Lire les documents';
@@ -103,7 +103,7 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
 		global $conf;
 
@@ -112,6 +112,6 @@ 
 
 		$sql = array();
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

dolibarr/htdocs/core/modules/modMultiCurrency.class.php

Indentation +248 added lines, -248 removed lines

@@ -33,105 +33,105 @@ 
  */
 class modMultiCurrency extends DolibarrModules
 {
-	/**
-	 * Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 * @param DoliDB $db Database handler
-	 */
-	public function __construct($db)
-	{
+    /**
+     * Constructor. Define names, constants, directories, boxes, permissions
+     *
+     * @param DoliDB $db Database handler
+     */
+    public function __construct($db)
+    {
         global $langs, $conf;
 
         $this->db = $db;
 
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 40000;
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'multicurrency';
-
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		// It is used to group modules in module setup page
-		$this->family = "technic";
-		// Module position in the family
-		$this->module_position = '40';
-
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i', '', get_class($this));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Module to manage several foreign currencies in prices and documents";
-
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
-		$this->version = 'dolibarr';
-		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Name of image file used for this module.
-		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto = 'multicurrency';
-
-		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-		// for default path (eg: /multicurrency/core/xxxxx) (0=disable, 1=enable)
-		// for specific path of parts (eg: /multicurrency/core/modules/barcode)
-		// for specific css file (eg: /multicurrency/css/multicurrency.css.php)
-		$this->module_parts = array();
-
-		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/multicurrency/temp");
-		$this->dirs = array();
-
-		// Config pages. Put here list of php page, stored into multicurrency/admin directory, to use to setup module.
-		$this->config_page_url = array("multicurrency.php");
-
-		// Dependencies
-		$this->hidden = false; // A condition to hide module
-		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
-		$this->requiredby = array(); // List of modules id to disable if this one is disabled
-		$this->conflictwith = array(); // List of modules id this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
-		$this->langfiles = array("multicurrency");
-
-		// Constants
-		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-		// );
-		$this->const = array();
-
-		// Array to add new pages in new tabs
-		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@multicurrency:$user->rights->multicurrency->read:/multicurrency/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
+        // Id for module (must be unique).
+        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+        $this->numero = 40000;
+        // Key text used to identify module (for permissions, menus, etc...)
+        $this->rights_class = 'multicurrency';
+
+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+        // It is used to group modules in module setup page
+        $this->family = "technic";
+        // Module position in the family
+        $this->module_position = '40';
+
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i', '', get_class($this));
+        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+        $this->description = "Module to manage several foreign currencies in prices and documents";
+
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
+        $this->version = 'dolibarr';
+        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Name of image file used for this module.
+        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+        $this->picto = 'multicurrency';
+
+        // Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+        // for default path (eg: /multicurrency/core/xxxxx) (0=disable, 1=enable)
+        // for specific path of parts (eg: /multicurrency/core/modules/barcode)
+        // for specific css file (eg: /multicurrency/css/multicurrency.css.php)
+        $this->module_parts = array();
+
+        // Data directories to create when module is enabled.
+        // Example: this->dirs = array("/multicurrency/temp");
+        $this->dirs = array();
+
+        // Config pages. Put here list of php page, stored into multicurrency/admin directory, to use to setup module.
+        $this->config_page_url = array("multicurrency.php");
+
+        // Dependencies
+        $this->hidden = false; // A condition to hide module
+        $this->depends = array(); // List of modules id that must be enabled if this module is enabled
+        $this->requiredby = array(); // List of modules id to disable if this one is disabled
+        $this->conflictwith = array(); // List of modules id this module is in conflict with
+        $this->phpmin = array(5, 4); // Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
+        $this->langfiles = array("multicurrency");
+
+        // Constants
+        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+        // Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+        //                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+        // );
+        $this->const = array();
+
+        // Array to add new pages in new tabs
+        // Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@multicurrency:$user->rights->multicurrency->read:/multicurrency/mynewtab1.php?id=__ID__',  					// To add a new tab identified by code tabname1
         //                              'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@multicurrency:$user->rights->othermodule->read:/multicurrency/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
         //                              'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
-		// where objecttype can be
-		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-		// 'contact'          to add a tab in contact view
-		// 'contract'         to add a tab in contract view
-		// 'group'            to add a tab in group view
-		// 'intervention'     to add a tab in intervention view
-		// 'invoice'          to add a tab in customer invoice view
-		// 'invoice_supplier' to add a tab in supplier invoice view
-		// 'member'           to add a tab in fundation member view
-		// 'opensurveypoll'	  to add a tab in opensurvey poll view
-		// 'order'            to add a tab in customer order view
-		// 'order_supplier'   to add a tab in supplier order view
-		// 'payment'		  to add a tab in payment view
-		// 'payment_supplier' to add a tab in supplier payment view
-		// 'product'          to add a tab in product view
-		// 'propal'           to add a tab in propal view
-		// 'project'          to add a tab in project view
-		// 'stock'            to add a tab in stock view
-		// 'thirdparty'       to add a tab in third party view
-		// 'user'             to add a tab in user view
+        // where objecttype can be
+        // 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+        // 'contact'          to add a tab in contact view
+        // 'contract'         to add a tab in contract view
+        // 'group'            to add a tab in group view
+        // 'intervention'     to add a tab in intervention view
+        // 'invoice'          to add a tab in customer invoice view
+        // 'invoice_supplier' to add a tab in supplier invoice view
+        // 'member'           to add a tab in fundation member view
+        // 'opensurveypoll'	  to add a tab in opensurvey poll view
+        // 'order'            to add a tab in customer order view
+        // 'order_supplier'   to add a tab in supplier order view
+        // 'payment'		  to add a tab in payment view
+        // 'payment_supplier' to add a tab in supplier payment view
+        // 'product'          to add a tab in product view
+        // 'propal'           to add a tab in propal view
+        // 'project'          to add a tab in project view
+        // 'stock'            to add a tab in stock view
+        // 'thirdparty'       to add a tab in third party view
+        // 'user'             to add a tab in user view
         $this->tabs = array();
 
         // Dictionaries
-	    if (!isset($conf->multicurrency->enabled))
+        if (!isset($conf->multicurrency->enabled))
         {
-        	$conf->multicurrency = new stdClass();
-        	$conf->multicurrency->enabled = 0;
+            $conf->multicurrency = new stdClass();
+            $conf->multicurrency->enabled = 0;
         }
-		$this->dictionaries = array();
+        $this->dictionaries = array();
         /* Example:
         if (! isset($conf->multicurrency->enabled)) $conf->multicurrency->enabled=0;	// This is to avoid warnings
         $this->dictionaries=array(
@@ -150,169 +150,169 @@ 
         */
 
         // Boxes
-		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+        // Add here list of php file(s) stored in core/boxes that contains class to show a box.
         $this->boxes = array(); // List of boxes
-		// Example:
-		//$this->boxes=array(
-		//    0=>array('file'=>'myboxa.php@multicurrency','note'=>'','enabledbydefaulton'=>'Home'),
-		//    1=>array('file'=>'myboxb.php@multicurrency','note'=>''),
-		//    2=>array('file'=>'myboxc.php@multicurrency','note'=>'')
-		//);
-
-		// Permissions
-		$this->rights = array(); // Permission array used by this module
-		$r = 0;
-
-		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
-		// Example:
-		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		// $this->rights[$r][1] = 'Permision label';	// Permission label
-		// $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
-		// $r++;
-
-		// Main menu entries
-		$this->menu = array(); // List of menus to add
-		$r = 0;
-
-		// Add here entries to declare new menus
-		//
-		// Example to declare a new Top Menu entry and its Left menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-		//							'type'=>'top',			                // This is a Top menu entry
-		//							'titre'=>'MyModule top menu',
-		//							'mainmenu'=>'multicurrency',
-		//							'leftmenu'=>'multicurrency',
-		//							'url'=>'/multicurrency/pagetop.php',
-		//							'langs'=>'mylangfile@multicurrency',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->multicurrency->enabled',	// Define condition to show or hide menu entry. Use '$conf->multicurrency->enabled' if entry must be visible if module is enabled.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->multicurrency->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-		//
-		// Example to declare a Left Menu entry into an existing Top menu entry:
-		// $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-		//							'type'=>'left',			                // This is a Left menu entry
-		//							'titre'=>'MyModule left menu',
-		//							'mainmenu'=>'xxx',
-		//							'leftmenu'=>'multicurrency',
-		//							'url'=>'/multicurrency/pagelevel2.php',
-		//							'langs'=>'mylangfile@multicurrency',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//							'position'=>100,
-		//							'enabled'=>'$conf->multicurrency->enabled',  // Define condition to show or hide menu entry. Use '$conf->multicurrency->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-		//							'perms'=>'1',			                // Use 'perms'=>'$user->rights->multicurrency->level1->level2' if you want your menu with a permission rules
-		//							'target'=>'',
-		//							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		// $r++;
-
-
-		// Exports
-		$r = 1;
-
-		// Example:
-		// $this->export_code[$r]=$this->rights_class.'_'.$r;
-		// $this->export_label[$r]='MyModule';	// Translation key (used only if key ExportDataset_xxx_z not found)
+        // Example:
+        //$this->boxes=array(
+        //    0=>array('file'=>'myboxa.php@multicurrency','note'=>'','enabledbydefaulton'=>'Home'),
+        //    1=>array('file'=>'myboxb.php@multicurrency','note'=>''),
+        //    2=>array('file'=>'myboxc.php@multicurrency','note'=>'')
+        //);
+
+        // Permissions
+        $this->rights = array(); // Permission array used by this module
+        $r = 0;
+
+        // Add here list of permission defined by an id, a label, a boolean and two constant strings.
+        // Example:
+        // $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
+        // $this->rights[$r][1] = 'Permision label';	// Permission label
+        // $this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
+        // $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        // $this->rights[$r][5] = 'level2';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+        // $r++;
+
+        // Main menu entries
+        $this->menu = array(); // List of menus to add
+        $r = 0;
+
+        // Add here entries to declare new menus
+        //
+        // Example to declare a new Top Menu entry and its Left menu entry:
+        // $this->menu[$r]=array(	'fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+        //							'type'=>'top',			                // This is a Top menu entry
+        //							'titre'=>'MyModule top menu',
+        //							'mainmenu'=>'multicurrency',
+        //							'leftmenu'=>'multicurrency',
+        //							'url'=>'/multicurrency/pagetop.php',
+        //							'langs'=>'mylangfile@multicurrency',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+        //							'position'=>100,
+        //							'enabled'=>'$conf->multicurrency->enabled',	// Define condition to show or hide menu entry. Use '$conf->multicurrency->enabled' if entry must be visible if module is enabled.
+        //							'perms'=>'1',			                // Use 'perms'=>'$user->rights->multicurrency->level1->level2' if you want your menu with a permission rules
+        //							'target'=>'',
+        //							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+        // $r++;
+        //
+        // Example to declare a Left Menu entry into an existing Top menu entry:
+        // $this->menu[$r]=array(	'fk_menu'=>'fk_mainmenu=xxx',		    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+        //							'type'=>'left',			                // This is a Left menu entry
+        //							'titre'=>'MyModule left menu',
+        //							'mainmenu'=>'xxx',
+        //							'leftmenu'=>'multicurrency',
+        //							'url'=>'/multicurrency/pagelevel2.php',
+        //							'langs'=>'mylangfile@multicurrency',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+        //							'position'=>100,
+        //							'enabled'=>'$conf->multicurrency->enabled',  // Define condition to show or hide menu entry. Use '$conf->multicurrency->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+        //							'perms'=>'1',			                // Use 'perms'=>'$user->rights->multicurrency->level1->level2' if you want your menu with a permission rules
+        //							'target'=>'',
+        //							'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
+        // $r++;
+
+
+        // Exports
+        $r = 1;
+
+        // Example:
+        // $this->export_code[$r]=$this->rights_class.'_'.$r;
+        // $this->export_label[$r]='MyModule';	// Translation key (used only if key ExportDataset_xxx_z not found)
         // $this->export_enabled[$r]='1';                               // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
         // $this->export_icon[$r]='generic:MyModule';
-		// $this->export_permission[$r]=array(array("multicurrency","level1","level2"));
-		// $this->export_fields_array[$r]=array(
-		//	's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
-		//	's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode',
-		//	's.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",
-		//	'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus',
-		//	'f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",
-		//	'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",
-		//	'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef'
-		//);
-		// $this->export_TypeFields_array[$r]=array(
-		//	't.date'=>'Date', 't.qte'=>'Numeric', 't.poids'=>'Numeric', 't.fad'=>'Numeric', 't.paq'=>'Numeric', 't.stockage'=>'Numeric', 't.fadparliv'=>'Numeric',
-		//	't.livau100'=>'Numeric', 't.forfait'=>'Numeric', 's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text',
-		//	's.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text',
-		//	'f.ref'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",
-		//	'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.subprice'=>"Numeric",
-		//	'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",
-		//	'fd.date_end'=>"Date",'fd.special_code'=>'Numeric','fd.product_type'=>"Numeric",'fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text',
-		//	'p.accountancy_code_sell'=>'Text'
-		//);
-		// $this->export_entities_array[$r]=array(
-		//	's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company',
-		//	's.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company',
-		//	'f.rowid'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",
-		//	'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",
-		//	'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",
-		//	'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product'
-		//);
-		// $this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		// $this->export_sql_start[$r]='SELECT DISTINCT ';
-		// $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
-		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
-		// $this->export_sql_order[$r] .=' ORDER BY s.nom';
-		// $r++;
-	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
+        // $this->export_permission[$r]=array(array("multicurrency","level1","level2"));
+        // $this->export_fields_array[$r]=array(
+        //	's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
+        //	's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode',
+        //	's.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",
+        //	'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus',
+        //	'f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",
+        //	'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",
+        //	'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef'
+        //);
+        // $this->export_TypeFields_array[$r]=array(
+        //	't.date'=>'Date', 't.qte'=>'Numeric', 't.poids'=>'Numeric', 't.fad'=>'Numeric', 't.paq'=>'Numeric', 't.stockage'=>'Numeric', 't.fadparliv'=>'Numeric',
+        //	't.livau100'=>'Numeric', 't.forfait'=>'Numeric', 's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text',
+        //	's.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text',
+        //	'f.ref'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",
+        //	'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.subprice'=>"Numeric",
+        //	'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",
+        //	'fd.date_end'=>"Date",'fd.special_code'=>'Numeric','fd.product_type'=>"Numeric",'fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text',
+        //	'p.accountancy_code_sell'=>'Text'
+        //);
+        // $this->export_entities_array[$r]=array(
+        //	's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company',
+        //	's.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company',
+        //	'f.rowid'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",
+        //	'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",
+        //	'fd.price'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",
+        //	'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product'
+        //);
+        // $this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+        // $this->export_sql_start[$r]='SELECT DISTINCT ';
+        // $this->export_sql_end[$r]  =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
+        // $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+        // $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
+        // $this->export_sql_order[$r] .=' ORDER BY s.nom';
+        // $r++;
+    }
+
+    /**
+     *		Function called when module is enabled.
+     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *		It also creates data directories
+     *
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	public function init($options = '')
-	{
-		$sql = array();
-
-		//$this->_load_tables('/multicurrency/sql/');
-		$res = $this->_init($sql, $options);
-
-		if ($res)
-		{
-			$this->createFirstCurrency();
-		}
-
-		return $res;
-	}
-
-	/**
-	 * Function called when module is disabled.
-	 * Remove from database constants, boxes and permissions from Dolibarr database.
-	 * Data directories are not deleted
-	 *
-	 * @param      string	$options    Options when enabling module ('', 'noboxes')
-	 * @return     int             	1 if OK, 0 if KO
-	 */
-	public function remove($options = '')
-	{
-		$sql = array();
-
-		return $this->_remove($sql, $options);
-	}
-
-	/**
-	 * Function called when module is enabled
-	 * Create the currency from general setting
-	 *
-	 * @return 	int		1 if OK, 0 if KO
-	 */
-	private function createFirstCurrency()
-	{
-		global $conf, $user, $langs;
-
-		if (!MultiCurrency::checkCodeAlreadyExists($conf->currency))
-		{
-			$langs->loadCacheCurrencies('');
-
-			$multicurrency = new MultiCurrency($this->db);
-			$multicurrency->code = $conf->currency;
-			$multicurrency->name = $langs->cache_currencies[$conf->currency]['label'].' ('.$langs->getCurrencySymbol($conf->currency).')';
-			$r = $multicurrency->create($user);
-
-			if ($r > 0)	$multicurrency->addRate(1);
-		}
-	}
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    public function init($options = '')
+    {
+        $sql = array();
+
+        //$this->_load_tables('/multicurrency/sql/');
+        $res = $this->_init($sql, $options);
+
+        if ($res)
+        {
+            $this->createFirstCurrency();
+        }
+
+        return $res;
+    }
+
+    /**
+     * Function called when module is disabled.
+     * Remove from database constants, boxes and permissions from Dolibarr database.
+     * Data directories are not deleted
+     *
+     * @param      string	$options    Options when enabling module ('', 'noboxes')
+     * @return     int             	1 if OK, 0 if KO
+     */
+    public function remove($options = '')
+    {
+        $sql = array();
+
+        return $this->_remove($sql, $options);
+    }
+
+    /**
+     * Function called when module is enabled
+     * Create the currency from general setting
+     *
+     * @return 	int		1 if OK, 0 if KO
+     */
+    private function createFirstCurrency()
+    {
+        global $conf, $user, $langs;
+
+        if (!MultiCurrency::checkCodeAlreadyExists($conf->currency))
+        {
+            $langs->loadCacheCurrencies('');
+
+            $multicurrency = new MultiCurrency($this->db);
+            $multicurrency->code = $conf->currency;
+            $multicurrency->name = $langs->cache_currencies[$conf->currency]['label'].' ('.$langs->getCurrencySymbol($conf->currency).')';
+            $r = $multicurrency->create($user);
+
+            if ($r > 0)	$multicurrency->addRate(1);
+        }
+    }
 }
 

Braces +3 added lines, -1 removed lines

@@ -311,7 +311,9 @@
 			$multicurrency->name = $langs->cache_currencies[$conf->currency]['label'].' ('.$langs->getCurrencySymbol($conf->currency).')';
 			$r = $multicurrency->create($user);
 
-			if ($r > 0)	$multicurrency->addRate(1);
+			if ($r > 0) {
+			    $multicurrency->addRate(1);
+			}
 		}
 	}
 }

dolibarr/htdocs/core/modules/modIncoterm.class.php

Indentation +48 added lines, -48 removed lines

@@ -33,60 +33,60 @@ 
  */
 class modIncoterm extends DolibarrModules
 {
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
         global $langs,$conf;
 
         $this->db = $db;
 
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 62000;
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'incoterm';
+        // Id for module (must be unique).
+        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+        $this->numero = 62000;
+        // Key text used to identify module (for permissions, menus, etc...)
+        $this->rights_class = 'incoterm';
 
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		$this->family = "srm";
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Incoterm management";
-		$this->version = 'dolibarr';
-		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='generic';
+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+        $this->family = "srm";
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Incoterm management";
+        $this->version = 'dolibarr';
+        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='generic';
 
-		$this->module_parts = array();
-		$this->dirs = array();
+        $this->module_parts = array();
+        $this->dirs = array();
 
-		$this->config_page_url = array();
+        $this->config_page_url = array();
 
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("incoterm");
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of module ids to disable if this one is disabled
+        $this->conflictwith = array();	// List of module class names as string this module is in conflict with
+        $this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+        $this->langfiles = array("incoterm");
 
-		$this->const = array(
-			array('INCOTERM_ACTIVATE', 'chaine', 0, 'Description de INCOTERM_ACTIVATE')
-		);
+        $this->const = array(
+            array('INCOTERM_ACTIVATE', 'chaine', 0, 'Description de INCOTERM_ACTIVATE')
+        );
 
         $this->tabs = array();
 
         // Dictionaries
-		if (! isset($conf->incoterm->enabled))
+        if (! isset($conf->incoterm->enabled))
         {
-        	$conf->incoterm=new stdClass();
-        	$conf->incoterm->enabled=0;
+            $conf->incoterm=new stdClass();
+            $conf->incoterm->enabled=0;
         }
-		$this->dictionaries=array(
-			'langs'=>'incoterm',
+        $this->dictionaries=array(
+            'langs'=>'incoterm',
             'tabname'=>array(MAIN_DB_PREFIX."c_incoterms"),		// List of tables we want to see into dictonnary editor
             'tablib'=>array("Incoterms"),													// Label of tables
             'tabsql'=>array('SELECT rowid, code, libelle, active FROM '.MAIN_DB_PREFIX.'c_incoterms'),	// Request to select fields
@@ -96,17 +96,17 @@ 
             'tabfieldinsert'=>array("code,libelle"),													// List of fields (list of fields for insert)
             'tabrowid'=>array("rowid"),																	// Name of columns with primary key (try to always name it 'rowid')
             'tabcond'=>array($conf->incoterm->enabled)
-		);
+        );
 
         $this->boxes = array();			// List of boxes
-		$r=0;
+        $r=0;
 
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
+        $r=0;
 
-		// Main menu entries
-		$this->menus = array();			// List of menus to add
-		$r=0;
-	}
+        // Main menu entries
+        $this->menus = array();			// List of menus to add
+        $r=0;
+    }
 }

Spacing +28 added lines, -28 removed lines

@@ -25,7 +25,7 @@ 
  *  \ingroup    mymodule
  *  \brief      Description and activation file for module MyModule
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -40,7 +40,7 @@ 
 	 */
 	function __construct($db)
 	{
-        global $langs,$conf;
+        global $langs, $conf;
 
         $this->db = $db;
 
@@ -52,12 +52,12 @@ 
 
 		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
 		$this->family = "srm";
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Incoterm management";
 		$this->version = 'dolibarr';
 		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='generic';
+		$this->picto = 'generic';
 
 		$this->module_parts = array();
 		$this->dirs = array();
@@ -65,12 +65,12 @@ 
 		$this->config_page_url = array();
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("incoterm");
 
 		$this->const = array(
@@ -80,33 +80,33 @@ 
         $this->tabs = array();
 
         // Dictionaries
-		if (! isset($conf->incoterm->enabled))
+		if (!isset($conf->incoterm->enabled))
         {
-        	$conf->incoterm=new stdClass();
-        	$conf->incoterm->enabled=0;
+        	$conf->incoterm = new stdClass();
+        	$conf->incoterm->enabled = 0;
         }
-		$this->dictionaries=array(
+		$this->dictionaries = array(
 			'langs'=>'incoterm',
-            'tabname'=>array(MAIN_DB_PREFIX."c_incoterms"),		// List of tables we want to see into dictonnary editor
-            'tablib'=>array("Incoterms"),													// Label of tables
-            'tabsql'=>array('SELECT rowid, code, libelle, active FROM '.MAIN_DB_PREFIX.'c_incoterms'),	// Request to select fields
-            'tabsqlsort'=>array("rowid ASC"),															// Sort order
-            'tabfield'=>array("code,libelle"),															// List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array("code,libelle"),														// List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array("code,libelle"),													// List of fields (list of fields for insert)
-            'tabrowid'=>array("rowid"),																	// Name of columns with primary key (try to always name it 'rowid')
+            'tabname'=>array(MAIN_DB_PREFIX."c_incoterms"), // List of tables we want to see into dictonnary editor
+            'tablib'=>array("Incoterms"), // Label of tables
+            'tabsql'=>array('SELECT rowid, code, libelle, active FROM '.MAIN_DB_PREFIX.'c_incoterms'), // Request to select fields
+            'tabsqlsort'=>array("rowid ASC"), // Sort order
+            'tabfield'=>array("code,libelle"), // List of fields (result of select to show dictionary)
+            'tabfieldvalue'=>array("code,libelle"), // List of fields (list of fields to edit a record)
+            'tabfieldinsert'=>array("code,libelle"), // List of fields (list of fields for insert)
+            'tabrowid'=>array("rowid"), // Name of columns with primary key (try to always name it 'rowid')
             'tabcond'=>array($conf->incoterm->enabled)
 		);
 
-        $this->boxes = array();			// List of boxes
-		$r=0;
+        $this->boxes = array(); // List of boxes
+		$r = 0;
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
 		// Main menu entries
-		$this->menus = array();			// List of menus to add
-		$r=0;
+		$this->menus = array(); // List of menus to add
+		$r = 0;
 	}
 }