From 52b6dd16da6617e86fd331068496f9796d2e1db1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Sep 2018 15:18:07 +0200
Subject: [PATCH 1/2] Standardize code

---
 htdocs/core/class/conf.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index db22d443c54..d6c768811c8 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -35,12 +35,12 @@ class Conf
 	/** \public */
 	//! To store properties found in conf file
 	var $file;
-	
+
 	/**
      * @var DoliDB Database handler.
      */
     public $db;
-    
+
 	//! To store properties found into database
 	var $global;
 	//! To store browser info
@@ -182,7 +182,7 @@ class Conf
 							if (is_array($arrValue) && ! empty($arrValue)) $value = $arrValue;
 							else if (in_array($partname,array('login','menus','substitutions','triggers','tpl'))) $value = '/'.$modulename.'/core/'.$partname.'/';
 							else if (in_array($partname,array('models','theme'))) $value = '/'.$modulename.'/';
-							else if (in_array($partname,array('sms'))) $value = $modulename;
+							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));	// $value may be a string or an array
 						}

From e2e335480753abd4dfb95d7901c0651b7e811927 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Sep 2018 16:35:38 +0200
Subject: [PATCH 2/2] Clean code

---
 htdocs/admin/index.php   | 8 ++++++++
 htdocs/admin/modules.php | 7 +++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index 2f64793c28b..be9859c1beb 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -89,6 +89,14 @@ print '<br>';
 
 // Show info setup module
 print img_picto('','puce').' '.$langs->trans("SetupDescription4", DOL_URL_ROOT.'/admin/modules.php?mainmenu=home', $langs->transnoentities("Setup"), $langs->transnoentities("Modules"));
+
+/*
+$nbofactivatedmodules=count($conf->modules);
+$moreinfo=$langs->trans("TotalNumberOfActivatedModules",($nbofactivatedmodules-1), count($modules));
+if ($nbofactivatedmodules <= 1) $moreinfo .= ' '.img_warning($langs->trans("YouMustEnableOneModule"));
+print '<br>'.$moreinfo;
+*/
+
 if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)?1:$conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING))	// If only user module enabled
 {
 	$langs->load("errors");
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 538fb86ce2e..7c9aff25977 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -272,14 +272,13 @@ $dirins_ok=(dol_is_dir($dirins));
 $help_url='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
 llxHeader('',$langs->trans("Setup"),$help_url, '', '', '', $morejs, $morecss, 0, 0);
 
-$arrayofnatures=array('core'=>$langs->transnoentitiesnoconv("Core"), 'external'=>$langs->transnoentitiesnoconv("External").' - '.$langs->trans("AllPublishers"));
-$arrayofwarnings=array();    // Array of warning each module want to show when activated
-$arrayofwarningsext=array();    // Array of warning each module want to show when we activate an external module
 
 // Search modules dirs
 $modulesdir = dolGetModulesDirs();
 
-
+$arrayofnatures=array('core'=>$langs->transnoentitiesnoconv("Core"), 'external'=>$langs->transnoentitiesnoconv("External").' - ['.$langs->trans("AllPublishers").']');
+$arrayofwarnings=array();    // Array of warning each module want to show when activated
+$arrayofwarningsext=array();    // Array of warning each module want to show when we activate an external module
 $filename = array();
 $modules = array();
 $orders = array();