From 8d887ea81994db899078e40edd049fdd5422b595 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 15 Sep 2009 14:17:14 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20la=20fonction=20AES=5FENCRYPT=20ne=20doi?= =?UTF-8?q?t=20pas=20=90tre=20entre=20quote=20et=20le=20addslashes=20doit?= =?UTF-8?q?=20se=20faire=20sur=20la=20valeur=20et=20pas=20sur=20la=20total?= =?UTF-8?q?it=8E=20de=20la=20fonction?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/lib/admin.lib.php | 4 ++-- htdocs/lib/databases/mysqli.lib.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php index 62c28895d5f..95e8e01d378 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -390,8 +390,8 @@ function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $not { $sql = "INSERT INTO llx_const(name,value,type,visible,note,entity)"; $sql.= " VALUES ("; - $sql.= "'".addslashes($db->encrypt($name,$conf->db->dolibarr_main_db_encryption,$conf->db->dolibarr_main_db_cryptkey,0))."'"; - $sql.= ",'".addslashes($db->encrypt($value,$conf->db->dolibarr_main_db_encryption,$conf->db->dolibarr_main_db_cryptkey,0))."'"; + $sql.= $db->encrypt($name,$conf->db->dolibarr_main_db_encryption,$conf->db->dolibarr_main_db_cryptkey,1); + $sql.= ", ".$db->encrypt($value,$conf->db->dolibarr_main_db_encryption,$conf->db->dolibarr_main_db_cryptkey,1); $sql.= ",'".$type."',".$visible.",'".addslashes($note)."',".$entity.")"; dol_syslog("admin.lib::dolibarr_set_const sql=".$sql, LOG_DEBUG); diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php index fd62e6feb51..b29d0dcb9f9 100644 --- a/htdocs/lib/databases/mysqli.lib.php +++ b/htdocs/lib/databases/mysqli.lib.php @@ -712,7 +712,7 @@ class DoliDb } } - return ($withQuotes?"'":"").$return.($withQuotes?"'":""); + return $return; } /**