Qual: Uniformize usage of array module_parts.

htdocs/.gitignore

@@ -2,3 +2,6 @@
 /custom*
 /bootstrap
 /multicompany
+/ovh
+/numberingpack
+/google

htdocs/admin/sms.php

@@ -154,7 +154,7 @@ print "<br>\n";
 dol_htmloutput_mesg($message);
 
 // List of sending methods
-$listofmethods=(is_array($conf->sms_engine_modules)?$conf->sms_engine_modules:array());
+$listofmethods=(is_array($conf->modules_parts['sms'])?$conf->modules_parts['sms']:array());
 asort($listofmethods);
 
 if ($action == 'edit')

htdocs/core/class/conf.class.php

@@ -52,13 +52,8 @@ class Conf
 	public $smart_menu;
 
 	public $modules					= array();	// List of activated modules
-	public $modules_parts			= array('css'=>array(), 'js'=>array(),'triggers'=>array(),'login'=>array(),'substitutions'=>array(),'menus'=>array(),'theme'=>array(),'tpl'=>array(),'barcode'=>array(),'models'=>array(),'hooks'=>array(),'dir'=>array());	// List of modules parts
-
-	// TODO Remove thoose arrays with generic module_parts
-	public $tabs_modules			= array();
-	public $sms_engine_modules		= array();
-	public $societe_modules	        = array();
-
+	public $modules_parts			= array('css'=>array(),'js'=>array(),'tabs'=>array(),'triggers'=>array(),'login'=>array(),'substitutions'=>array(),'menus'=>array(),'theme'=>array(),'sms'=>array(),'tpl'=>array(),'barcode'=>array(),'models'=>array(),'hooks'=>array(),'dir'=>array());
+	
 	var $logbuffer					= array();
 	var $loghandlers                = array();
 
@@ -160,20 +155,10 @@ class Conf
 						// If this is constant for a new tab page activated by a module.
 						if (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)_TABS_/i',$key))
 						{
+							$partname = 'tabs';
 							$params=explode(':',$value,2);
-							$this->tabs_modules[$params[0]][]=$value;				// Add this module in list of modules that provide tabs
-						}
-						// If this is constant for a sms engine
-						elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)_SMS$/i',$key,$reg))
-						{
-							$modulename=strtolower($reg[1]);
-							$this->sms_engine_modules[$modulename]=$modulename;		// Add this module in list of modules that provide SMS
-						}
-						// If this is constant for a societe submodule
-						elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)_SOCIETE$/i',$key,$reg))
-						{
-							$modulename=strtolower($reg[1]);
-							$this->societe_modules[$modulename]=$modulename;		// Add this module in list of modules that provide societe modules
+							if (! isset($this->modules_parts[$partname]) || ! is_array($this->modules_parts[$partname])) { $this->modules_parts[$partname] = array(); }
+							$this->modules_parts[$partname][$params[0]][]=$value;
 						}
 						// If this is constant for all generic part activated by a module
 						elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)_([A-Z]+)$/i',$key,$reg))
@@ -185,7 +170,8 @@ class Conf
 							if (is_array($arrValue) && ! empty($arrValue)) $value = $arrValue;
 							else if (in_array($partname,array('login','menus','substitutions','triggers','tpl','theme'))) $value = '/'.$modulename.'/core/'.$partname.'/';
 							else if (in_array($partname,array('models'))) $value = '/'.$modulename.'/';
-							else if ($value == 1) $value = '/'.$modulename.'/core/modules/'.$partname.'/';
+							else if (in_array($partname,array('sms'))) $value = $modulename;
+							else if ($value == 1) $value = '/'.$modulename.'/core/modules/'.$partname.'/';	// ex: partname = societe
 							$this->modules_parts[$partname] = array_merge($this->modules_parts[$partname], array($modulename => $value));
 						}
                         // If this is a module constant (must be at end)

htdocs/core/lib/functions.lib.php

@@ -4022,7 +4022,7 @@ function picto_from_langcode($codelang)
 
 /**
  *  Complete or removed entries into a head array (used to build tabs) with value added by external modules.
- *  Such values are declared into $conf->tabs_modules.
+ *  Such values are declared into $conf->modules_parts['tab'].
  *
  *  @param	Conf		$conf           Object conf
  *  @param  Translate	$langs          Object langs
@@ -4047,9 +4047,9 @@ function picto_from_langcode($codelang)
  */
 function complete_head_from_modules($conf,$langs,$object,&$head,&$h,$type,$mode='add')
 {
-	if (isset($conf->tabs_modules[$type]) && is_array($conf->tabs_modules[$type]))
+	if (isset($conf->modules_parts['tabs'][$type]) && is_array($conf->modules_parts['tabs'][$type]))
 	{
-		foreach ($conf->tabs_modules[$type] as $value)
+		foreach ($conf->modules_parts['tabs'][$type] as $value)
 		{
 			$values=explode(':',$value);
 

htdocs/societe/admin/societe.php

@@ -235,8 +235,7 @@ dol_fiche_head($head, 'general', $langs->trans("ThirdParties"), 0, 'company');
 dol_htmloutput_mesg($mesg);
 
 
-$dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules);
-
+$dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
 
 // Module to manage customer/supplier code
 

htdocs/societe/canvas/actions_card_common.class.php

@@ -430,7 +430,7 @@ abstract class ActionsCardCommon
             {
                 $module = substr($module, 0, dol_strlen($module)-4);
             }
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules);
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$module.'.php');
@@ -467,7 +467,7 @@ abstract class ActionsCardCommon
             	{
             		$module = substr($module, 0, dol_strlen($module)-4);
             	}
-                $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules);
+                $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
                 foreach ($dirsociete as $dirroot)
                 {
                     $res=dol_include_once($dirroot.$module.'.php');

htdocs/societe/class/societe.class.php

@@ -1737,7 +1737,7 @@ class Societe extends CommonObject
         global $conf;
         if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
         {
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules);
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECLIENT_ADDON.'.php');
@@ -1766,7 +1766,7 @@ class Societe extends CommonObject
         global $conf;
         if (! empty($conf->global->SOCIETE_CODEFOURNISSEUR_ADDON))
         {
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules);
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON.'.php');
@@ -1792,7 +1792,7 @@ class Societe extends CommonObject
         global $conf;
         if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
         {
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules);
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECLIENT_ADDON.'.php');
@@ -1826,7 +1826,7 @@ class Societe extends CommonObject
         global $conf;
         if (! empty($conf->global->SOCIETE_CODEFOURNISSEUR_ADDON))
         {
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules);
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON.'.php');
@@ -1864,7 +1864,7 @@ class Societe extends CommonObject
         global $conf;
         if (! empty($conf->global->SOCIETE_CODECLIENT_ADDON))
         {
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules);
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECLIENT_ADDON.'.php');
@@ -1899,7 +1899,7 @@ class Societe extends CommonObject
         global $conf;
         if (! empty($conf->global->SOCIETE_CODEFOURNISSEUR_ADDON))
         {
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules);
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON.'.php');
@@ -1935,7 +1935,7 @@ class Societe extends CommonObject
         if (! empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
         {
         	$file='';
-            $dirsociete=array_merge(array('/core/modules/societe/'), $conf->societe_modules);
+            $dirsociete=array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
             	if (file_exists(DOL_DOCUMENT_ROOT.'/'.$dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.".php"))

htdocs/societe/soc.php

@@ -541,7 +541,7 @@ else
         {
             $module = substr($module, 0, dol_strlen($module)-4);
         }
-        $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules);
+        $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
         foreach ($dirsociete as $dirroot)
         {
             $res=dol_include_once($dirroot.$module.'.php');
@@ -554,7 +554,7 @@ else
         {
             $module = substr($module, 0, dol_strlen($module)-4);
         }
-        $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules);
+        $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
         foreach ($dirsociete as $dirroot)
         {
             $res=dol_include_once($dirroot.$module.'.php');
@@ -1039,7 +1039,7 @@ else
             {
                 $module = substr($module, 0, dol_strlen($module)-4);
             }
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules);
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$module.'.php');
@@ -1057,7 +1057,7 @@ else
             {
                 $module = substr($module, 0, dol_strlen($module)-4);
             }
-            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->societe_modules);
+            $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
             foreach ($dirsociete as $dirroot)
             {
                 $res=dol_include_once($dirroot.$module.'.php');

htdocs/theme/.gitignore

@@ -0,0 +1 @@
+/bootstrap