Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Add test if flush fails

Browse Source
This commit is contained in:
Laurent Destailleur
2010-01-19 23:53:13 +00:00
parent 0146ba83bf
commit 637712212b
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/lib/databases/mysql.lib.php
View File

@@ -698,13 +698,13 @@ class DoliDb
function encrypt($fieldorvalue, $withQuotes=0) function encrypt($fieldorvalue, $withQuotes=0)
{ {
global $conf; global $conf;
// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption) // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
$cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0); $cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
//Encryption key //Encryption key
$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:''); $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
$return = ($withQuotes?"'":"").addslashes($fieldorvalue).($withQuotes?"'":""); $return = ($withQuotes?"'":"").addslashes($fieldorvalue).($withQuotes?"'":"");
if ($cryptType && !empty($cryptKey)) if ($cryptType && !empty($cryptKey))
@@ -730,13 +730,13 @@ class DoliDb
function decrypt($value) function decrypt($value)
{ {
global $conf; global $conf;
// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption) // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
$cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0); $cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
//Encryption key //Encryption key
$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:''); $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
$return = $value; $return = $value;
if ($cryptType && !empty($cryptKey)) if ($cryptType && !empty($cryptKey))
@@ -1024,6 +1024,10 @@ class DoliDb
dol_syslog("mysql.lib::DDLCreateUser sql=".$sql,LOG_DEBUG); dol_syslog("mysql.lib::DDLCreateUser sql=".$sql,LOG_DEBUG);
$resql=$this->query($sql); $resql=$this->query($sql);
if (! $resql)
{
return -1;
}
return 1; return 1;
} }

3
htdocs/lib/databases/mysqli.lib.php
View File

@@ -1018,6 +1018,7 @@ class DoliDb
$resql=$this->query($sql); $resql=$this->query($sql);
if (! $resql) if (! $resql)
{ {
dol_syslog("mysqli.lib::DDLCreateUser sql=".$sql, LOG_ERR);
return -1; return -1;
} }
@@ -1030,6 +1031,7 @@ class DoliDb
$resql=$this->query($sql); $resql=$this->query($sql);
if (! $resql) if (! $resql)
{ {
dol_syslog("mysqli.lib::DDLCreateUser sql=".$sql, LOG_ERR);
return -1; return -1;
} }
@@ -1039,6 +1041,7 @@ class DoliDb
$resql=$this->query($sql); $resql=$this->query($sql);
if (! $resql) if (! $resql)
{ {
dol_syslog("mysqli.lib::DDLCreateUser sql=".$sql, LOG_ERR);
return -1; return -1;
} }