Fixed: Add opensurvey into list of reloaded modules for 3.7

This commit is contained in:
Laurent Destailleur 2015-01-07 11:11:40 +01:00
parent 4ee308c77b
commit f8792bdbc7

View File

@ -3634,137 +3634,170 @@ function migrate_delete_old_dir($db,$langs,$conf)
* We must do this when internal menu of module or permissions has changed * We must do this when internal menu of module or permissions has changed
* or when triggers have moved. * or when triggers have moved.
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
* @param Translate $langs Object langs * @param Translate $langs Object langs
* @param Conf $conf Object conf * @param Conf $conf Object conf
* @param array $listofmodule List of modules
* @return void * @return void
*/ */
function migrate_reload_modules($db,$langs,$conf) function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
{ {
dolibarr_install_syslog("upgrade2::migrate_reload_modules"); dolibarr_install_syslog("upgrade2::migrate_reload_modules");
if (! empty($conf->global->MAIN_MODULE_AGENDA)) // Module to reload if no info is provided
if (count($listofmodule) == 0)
{ {
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Agenda"); $listofmodule=array(
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modAgenda.class.php'; 'MAIN_MODULE_AGENDA',
if ($res) { 'MAIN_MODULE_SOCIETE',
$mod=new modAgenda($db); 'MAIN_MODULE_PRODUIT',
$mod->remove('noboxes'); 'MAIN_MODULE_SERVICE',
$mod->init('newboxdefonly'); 'MAIN_MODULE_COMMANDE',
} 'MAIN_MODULE_FACTURE',
} 'MAIN_MODULE_FOURNISSEUR',
if (! empty($conf->global->MAIN_MODULE_SOCIETE)) 'MAIN_MODULE_USER',
{ 'MAIN_MODULE_DEPLACEMENT',
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Societe"); 'MAIN_MODULE_DON',
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php'; 'MAIN_MODULE_ECM',
if ($res) { 'MAIN_MODULE_PAYBOX',
$mod=new modSociete($db); 'MAIN_MODULE_OPENSURVEY'
$mod->remove('noboxes'); );
$mod->init('newboxdefonly');
}
}
if (! empty($conf->global->MAIN_MODULE_PRODUIT)) // Permission has changed into 2.7
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Produit");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php';
if ($res) {
$mod=new modProduct($db);
//$mod->remove('noboxes');
$mod->init('newboxdefonly');
}
}
if (! empty($conf->global->MAIN_MODULE_SERVICE)) // Permission has changed into 2.7
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Service");
if ($res) {
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php';
$mod=new modService($db);
//$mod->remove('noboxes');
$mod->init('newboxdefonly');
}
}
if (! empty($conf->global->MAIN_MODULE_COMMANDE)) // Permission has changed into 2.9
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Commande");
if ($res) {
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php';
$mod=new modCommande($db);
//$mod->remove('noboxes');
$mod->init('newboxdefonly');
}
}
if (! empty($conf->global->MAIN_MODULE_FACTURE)) // Permission has changed into 2.9
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Facture");
if ($res) {
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php';
$mod=new modFacture($db);
//$mod->remove('noboxes');
$mod->init('newboxdefonly');
}
}
if (! empty($conf->global->MAIN_MODULE_FOURNISSEUR)) // Permission has changed into 2.9
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Fournisseur");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
if ($res) {
$mod=new modFournisseur($db);
//$mod->remove('noboxes');
$mod->init('newboxdefonly');
}
} }
if (! empty($conf->global->MAIN_MODULE_USER)) // Permission has changed into 3.0 foreach($listofmodule as $moduletoreload)
{ {
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module User"); if (! empty($conf->global->MAIN_MODULE_AGENDA))
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modUser.class.php'; {
if ($res) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Agenda");
$mod=new modUser($db); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modAgenda.class.php';
//$mod->remove('noboxes'); // We need to remove because id of module has changed if ($res) {
$mod->init('newboxdefonly'); $mod=new modAgenda($db);
} $mod->remove('noboxes');
} $mod->init('newboxdefonly');
if (! empty($conf->global->MAIN_MODULE_DEPLACEMENT)) // Permission has changed into 3.0 }
{ }
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Deplacement"); if (! empty($conf->global->MAIN_MODULE_SOCIETE))
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php'; {
if ($res) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Societe");
$mod=new modDeplacement($db); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php';
//$mod->remove('noboxes'); // We need to remove because a permission id has been removed if ($res) {
$mod->init('newboxdefonly'); $mod=new modSociete($db);
} $mod->remove('noboxes');
} $mod->init('newboxdefonly');
if (! empty($conf->global->MAIN_MODULE_DON)) // Permission has changed into 3.0 }
{ }
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Don"); if (! empty($conf->global->MAIN_MODULE_PRODUIT)) // Permission has changed into 2.7
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php'; {
if ($res) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Produit");
$mod=new modDon($db); $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php';
//$mod->remove('noboxes'); // We need to remove because a permission id has been removed if ($res) {
$mod->init('newboxdefonly'); $mod=new modProduct($db);
} //$mod->remove('noboxes');
} $mod->init('newboxdefonly');
if (! empty($conf->global->MAIN_MODULE_ECM)) // Permission has changed into 3.0 and 3.1 }
{ }
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ECM"); if (! empty($conf->global->MAIN_MODULE_SERVICE)) // Permission has changed into 2.7
if ($res) { {
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php'; dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Service");
$mod=new modECM($db); if ($res) {
$mod->remove('noboxes'); // We need to remove because a permission id has been removed $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php';
$mod->init('newboxdefonly'); $mod=new modService($db);
} //$mod->remove('noboxes');
} $mod->init('newboxdefonly');
if (! empty($conf->global->MAIN_MODULE_PAYBOX)) // Permission has changed into 3.0 }
{ }
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Paybox"); if (! empty($conf->global->MAIN_MODULE_COMMANDE)) // Permission has changed into 2.9
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php'; {
if ($res) { dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Commande");
$mod=new modPaybox($db); if ($res) {
$mod->remove('noboxes'); // We need to remove because id of module has changed $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php';
$mod->init('newboxdefonly'); $mod=new modCommande($db);
} //$mod->remove('noboxes');
} $mod->init('newboxdefonly');
}
}
if (! empty($conf->global->MAIN_MODULE_FACTURE)) // Permission has changed into 2.9
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Facture");
if ($res) {
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php';
$mod=new modFacture($db);
//$mod->remove('noboxes');
$mod->init('newboxdefonly');
}
}
if (! empty($conf->global->MAIN_MODULE_FOURNISSEUR)) // Permission has changed into 2.9
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Fournisseur");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
if ($res) {
$mod=new modFournisseur($db);
//$mod->remove('noboxes');
$mod->init('newboxdefonly');
}
}
if (! empty($conf->global->MAIN_MODULE_USER)) // Permission has changed into 3.0
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module User");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modUser.class.php';
if ($res) {
$mod=new modUser($db);
//$mod->remove('noboxes'); // We need to remove because id of module has changed
$mod->init('newboxdefonly');
}
}
if (! empty($conf->global->MAIN_MODULE_DEPLACEMENT)) // Permission has changed into 3.0
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Deplacement");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php';
if ($res) {
$mod=new modDeplacement($db);
//$mod->remove('noboxes'); // We need to remove because a permission id has been removed
$mod->init('newboxdefonly');
}
}
if (! empty($conf->global->MAIN_MODULE_DON)) // Permission has changed into 3.0
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Don");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php';
if ($res) {
$mod=new modDon($db);
//$mod->remove('noboxes'); // We need to remove because a permission id has been removed
$mod->init('newboxdefonly');
}
}
if (! empty($conf->global->MAIN_MODULE_ECM)) // Permission has changed into 3.0 and 3.1
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ECM");
if ($res) {
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php';
$mod=new modECM($db);
$mod->remove('noboxes'); // We need to remove because a permission id has been removed
$mod->init('newboxdefonly');
}
}
if (! empty($conf->global->MAIN_MODULE_PAYBOX)) // Permission has changed into 3.0
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Paybox");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php';
if ($res) {
$mod=new modPaybox($db);
$mod->remove('noboxes'); // We need to remove because id of module has changed
$mod->init('newboxdefonly');
}
}
if (! empty($conf->global->MAIN_MODULE_OPENSURVEY)) // Permission has changed into 3.0
{
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Opensurvey");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modOpenSurvey.class.php';
if ($res) {
$mod=new modOpenSurvey($db);
$mod->remove('noboxes'); // We need to remove because menu entries has changed
$mod->init('newboxdefonly');
}
}
}
} }