lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Bad error management when enabling/disabling modules

Browse Source
This commit is contained in:
Laurent Destailleur 2012-03-21 13:50:59 +01:00
parent 89c906dde6
commit b098838b6f
7 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/skeletons/modMyModule.class.php
View File

@ -87,10 +87,6 @@ class modMyModule extends DolibarrModules
// Data directories to create when module is enabled. // Data directories to create when module is enabled.
// Example: this->dirs = array("/mymodule/temp"); // Example: this->dirs = array("/mymodule/temp");
$this->dirs = array(); $this->dirs = array();
$r=0;
// Relative path to module style sheet if exists. Example: '/mymodule/css/mycss.css'.
//$this->style_sheet = '/mymodule/mymodule.css.php';
// Config pages. Put here list of php page, stored into mymodule/admin directory, to use to setup module. // Config pages. Put here list of php page, stored into mymodule/admin directory, to use to setup module.
$this->config_page_url = array("mysetuppage.php@mymodule"); $this->config_page_url = array("mysetuppage.php@mymodule");

1
htdocs/core/lib/admin.lib.php
View File

@ -813,7 +813,6 @@ function unActivateModule($value, $requiredby=1)
// TODO Cannot instantiate abstract class // TODO Cannot instantiate abstract class
//$genericMod = new DolibarrModul($db); //$genericMod = new DolibarrModul($db);
//$genericMod->name=preg_replace('/^mod/i','',$modName); //$genericMod->name=preg_replace('/^mod/i','',$modName);
//$genericMod->style_sheet=1;
//$genericMod->rights_class=strtolower(preg_replace('/^mod/i','',$modName)); //$genericMod->rights_class=strtolower(preg_replace('/^mod/i','',$modName));
//$genericMod->const_name='MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',$modName)); //$genericMod->const_name='MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',$modName));
dol_syslog("modules::unActivateModule Failed to find module file, we use generic function with name " . $modName); dol_syslog("modules::unActivateModule Failed to find module file, we use generic function with name " . $modName);

18
htdocs/core/modules/DolibarrModules.class.php
View File

@ -1293,7 +1293,7 @@ abstract class DolibarrModules
{ {
global $conf; global $conf;
$err=0; $error=0;
$entity=$conf->entity; $entity=$conf->entity;
if (is_array($this->module_parts) && ! empty($this->module_parts)) if (is_array($this->module_parts) && ! empty($this->module_parts))
@ -1335,15 +1335,23 @@ abstract class DolibarrModules
$sql.= ")"; $sql.= ")";
dol_syslog(get_class($this)."::insert_const_".$key." sql=".$sql); dol_syslog(get_class($this)."::insert_const_".$key." sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql,1);
if (! $resql) if (! $resql)
{ {
$this->error=$this->db->lasterror(); if ($this->db->lasterrno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
dol_syslog(get_class($this)."::insert_const_".$key." ".$this->error); {
$error++;
$this->error=$this->db->lasterror();
dol_syslog(get_class($this)."::insert_const_".$key." ".$this->error, LOG_ERR);
}
else
{
dol_syslog(get_class($this)."::insert_const_".$key." Record already exists.", LOG_WARNING);
}
} }
} }
} }
return $err; return $error;
} }
/** /**

3
htdocs/core/modules/modCashDesk.class.php
View File

@ -61,9 +61,6 @@ class modCashDesk extends DolibarrModules
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array();
// Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'.
$this->style_sheet = '';
// Config pages. Put here list of php page names stored in admmin directory used to setup module. // Config pages. Put here list of php page names stored in admmin directory used to setup module.
$this->config_page_url = array("cashdesk.php@cashdesk"); $this->config_page_url = array("cashdesk.php@cashdesk");

3
htdocs/core/modules/modGravatar.class.php
View File

@ -69,9 +69,6 @@ class modGravatar extends DolibarrModules
$this->dirs = array(); $this->dirs = array();
$r=0; $r=0;
// Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'.
$this->style_sheet = '';
// Config pages. Put here list of php page names stored in admmin directory used to setup module. // Config pages. Put here list of php page names stored in admmin directory used to setup module.
$this->config_page_url = array(); $this->config_page_url = array();

3
htdocs/core/modules/modPaybox.class.php
View File

@ -67,9 +67,6 @@ class modPayBox extends DolibarrModules
// Data directories to create when module is enabled. // Data directories to create when module is enabled.
$this->dirs = array('/paybox/temp'); $this->dirs = array('/paybox/temp');
// Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'.
$this->style_sheet = '';
// Config pages. Put here list of php page names stored in admmin directory used to setup module. // Config pages. Put here list of php page names stored in admmin directory used to setup module.
$this->config_page_url = array("paybox.php@paybox"); $this->config_page_url = array("paybox.php@paybox");

3
htdocs/core/modules/modPaypal.class.php
View File

@ -68,9 +68,6 @@ class modPaypal extends DolibarrModules
// Data directories to create when module is enabled. // Data directories to create when module is enabled.
$this->dirs = array('/paypal/temp'); $this->dirs = array('/paypal/temp');
// Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'.
$this->style_sheet = '';
// Config pages. Put here list of php page names stored in admmin directory used to setup module. // Config pages. Put here list of php page names stored in admmin directory used to setup module.
$this->config_page_url = array("paypal.php@paypal"); $this->config_page_url = array("paypal.php@paypal");