diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index e90e0fc626ea7685cba928cdb9a5b2f17011902a..69ee6b7dbb8a3578d070082cb15fda45f719f017 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -158,7 +158,7 @@ class Categorie extends CommonObject $this->db->begin(); - dol_syslog(get_class($this).'::create sql='.$sql); + dol_syslog(get_class($this).'::create', LOG_DEBUG); $sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie ("; $sql.= "fk_parent,"; $sql.= " label,"; @@ -472,7 +472,7 @@ class Categorie extends CommonObject $sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".$type." (fk_categorie, fk_".$column_name.")"; $sql .= " VALUES (".$this->id.", ".$obj->id.")"; - dol_syslog(get_class($this).'::add_type sql='.$sql); + dol_syslog(get_class($this).'::add_type', LOG_DEBUG); if ($this->db->query($sql)) { if (! empty($conf->global->CATEGORIE_RECURSIV_ADD)) @@ -567,7 +567,7 @@ class Categorie extends CommonObject $sql .= " WHERE fk_categorie = ".$this->id; $sql .= " AND fk_".$column_name." = ".$obj->id; - dol_syslog(get_class($this).'::del_type sql='.$sql); + dol_syslog(get_class($this).'::del_type', LOG_DEBUG); if ($this->db->query($sql)) { // Save object we want to unlink category off into category instance to provide information to trigger @@ -1136,7 +1136,7 @@ class Categorie extends CommonObject $sql.= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".$table." = ".$id." AND c.type = ".$typeid; $sql.= " AND c.entity IN (".getEntity('category',1).")"; - dol_syslog(get_class($this).'::containing sql='.$sql); + dol_syslog(get_class($this).'::containing', LOG_DEBUG); $res = $this->db->query($sql); if ($res) { diff --git a/htdocs/comm/list.php b/htdocs/comm/list.php index 78d2b14c7bcb73ff1da4b00bff23d59753e47be7..18f03f28ca9f1ae48e8d11b59f1537cd0d55bc6a 100644 --- a/htdocs/comm/list.php +++ b/htdocs/comm/list.php @@ -149,7 +149,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($conf->liste_limit +1, $offset); -dol_syslog('comm/list.php: sql='.$sql,LOG_DEBUG); +dol_syslog('comm/list.php:', LOG_DEBUG); $result = $db->query($sql); if ($result) { diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 31b6fc67468963aca18b4b027f2b14b61b0ca829..52bc77afa714e6ca68f615d439f1289aa4585006 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1327,7 +1327,7 @@ class Propal extends CommonObject $sql.= " fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id; $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; - dol_syslog(get_class($this).'::valid sql='.$sql); + dol_syslog(get_class($this).'::valid', LOG_DEBUG); if ($this->db->query($sql)) { if (! $notrigger) @@ -2633,7 +2633,7 @@ class Propal extends CommonObject $sql.= ' WHERE pt.fk_propal = '.$this->id; $sql.= ' ORDER BY pt.rang ASC, pt.rowid'; - dol_syslog(get_class($this).'::getLinesArray sql='.$sql,LOG_DEBUG); + dol_syslog(get_class($this).'::getLinesArray', LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { @@ -2921,7 +2921,7 @@ class PropaleLigne extends CommonObject $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null"); $sql.= ')'; - dol_syslog(get_class($this).'::insert sql='.$sql, LOG_DEBUG); + dol_syslog(get_class($this).'::insert', LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php index 58a384df6d0b56e5f60939ceaafa5ad3ff398024..d4b47283bf396dba133263e5dbd288473b110abd 100644 --- a/htdocs/comm/prospect/list.php +++ b/htdocs/comm/prospect/list.php @@ -233,7 +233,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) $sql.= " ORDER BY $sortfield $sortorder, s.nom ASC"; $sql.= $db->plimit($conf->liste_limit+1, $offset); -dol_syslog('comm/prospect/list.php sql='.$sql,LOG_DEBUG); +dol_syslog('comm/prospect/list.php', LOG_DEBUG); $resql = $db->query($sql); if ($resql) { diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 71405a54feb253615c994a8a2f9f3ed1adc1adb9..d30c1519f10e6b6387b97d92a00dbfedd9d3c160 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -145,7 +145,7 @@ $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit+1,$offset); //print $sql; -dol_syslog('compta/bank/search.php:: sql='.$sql); +dol_syslog('compta/bank/search.php::', LOG_DEBUG); $resql = $db->query($sql); if ($resql) { diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index d46585c300dab5a47d3432771f21946da6da9b84..942ceb912c800925c32de02299a33d6f69e67739 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -415,7 +415,7 @@ class Deplacement extends CommonObject $sql.= ' FROM '.MAIN_DB_PREFIX.'deplacement as c'; $sql.= ' WHERE c.rowid = '.$id; - dol_syslog(get_class($this).'::info sql='.$sql); + dol_syslog(get_class($this).'::info', LOG_DEBUG); $result = $this->db->query($sql); if ($result) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 36ea7739652127d5951eb6da241078c35515f77f..d8b5914113df7e50fd97380de03042349a02ec83 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -955,7 +955,7 @@ class Facture extends CommonInvoice $sql.= ' WHERE l.fk_facture = '.$this->id; $sql.= ' ORDER BY l.rang'; - dol_syslog(get_class($this).'::fetch_lines sql='.$sql, LOG_DEBUG); + dol_syslog(get_class($this).'::fetch_lines', LOG_DEBUG); $result = $this->db->query($sql); if ($result) { diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 71c9dc44d8165381488548c07db62100c5764405..7e0626593cbfab4d76380ce88ee6d9d7e1f31962 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -177,7 +177,7 @@ class Paiement extends CommonObject $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiement_facture (fk_facture, fk_paiement, amount)'; $sql .= ' VALUES ('.$facid.', '. $this->id.', \''.$amount.'\')'; - dol_syslog(get_class($this).'::Create Amount line '.$key.' insert paiement_facture sql='.$sql); + dol_syslog(get_class($this).'::Create Amount line '.$key.' insert paiement_facture', LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { @@ -553,7 +553,7 @@ class Paiement extends CommonObject $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' set fk_bank = '.$id_bank; $sql.= ' WHERE rowid = '.$this->id; - dol_syslog(get_class($this).'::update_fk_bank sql='.$sql); + dol_syslog(get_class($this).'::update_fk_bank', LOG_DEBUG); $result = $this->db->query($sql); if ($result) { @@ -639,7 +639,7 @@ class Paiement extends CommonObject { $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET statut = 1 WHERE rowid = '.$this->id; - dol_syslog(get_class($this).'::valide sql='.$sql); + dol_syslog(get_class($this).'::valide', LOG_DEBUG); $result = $this->db->query($sql); if ($result) { @@ -663,7 +663,7 @@ class Paiement extends CommonObject $sql.= ' FROM '.MAIN_DB_PREFIX.'paiement as p'; $sql.= ' WHERE p.rowid = '.$id; - dol_syslog(get_class($this).'::info sql='.$sql); + dol_syslog(get_class($this).'::info', LOG_DEBUG); $result = $this->db->query($sql); if ($result) @@ -726,7 +726,7 @@ class Paiement extends CommonObject else { $this->error=$this->db->error(); - dol_syslog(get_class($this).'::getBillsArray Error '.$this->error.' - sql='.$sql); + dol_syslog(get_class($this).'::getBillsArray Error '.$this->error.' -', LOG_DEBUG); return -1; } } diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php index 3413548c1fdeee1cc7ff6c4cc899634771aeee2d..32038c619282acb922546d0d2e01761505b61193 100644 --- a/htdocs/core/boxes/box_ficheinter.php +++ b/htdocs/core/boxes/box_ficheinter.php @@ -79,7 +79,7 @@ class box_ficheinter extends ModeleBoxes $sql.= " ORDER BY f.tms DESC"; $sql.= $db->plimit($max, 0); - dol_syslog(get_class($this).'::loadBox sql='.$sql,LOG_DEBUG); + dol_syslog(get_class($this).'::loadBox', LOG_DEBUG); $resql = $db->query($sql); if ($resql) { diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 0c366cb561f04948a20be30fe4ae895823f454e6..8ff3b515d940f1cf55d53cc6bec7963b29ddb20d 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -653,7 +653,7 @@ abstract class CommonObject $sql = "SELECT rowid, code, libelle as label, coder"; $sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type"; $sql.= " WHERE rowid = ".$idtype; - dol_syslog(get_class($this).'::fetch_barcode sql='.$sql); + dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { @@ -739,7 +739,7 @@ abstract class CommonObject $sql.= " WHERE ".$field." = '".$key."'"; $sql.= " AND entity = ".$conf->entity; - dol_syslog(get_class($this).'::fetchObjectFrom sql='.$sql); + dol_syslog(get_class($this).'::fetchObjectFrom', LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { @@ -765,7 +765,7 @@ abstract class CommonObject $sql = "SELECT ".$field." FROM ".MAIN_DB_PREFIX.$table; $sql.= " WHERE rowid = ".$id; - dol_syslog(get_class($this).'::getValueFrom sql='.$sql); + dol_syslog(get_class($this).'::getValueFrom', LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { @@ -2484,7 +2484,7 @@ abstract class CommonObject $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."det"; $sql.= " WHERE ".$this->fk_element." = ".$this->id; - dol_syslog(get_class($this).'::getTotalDiscount sql='.$sql); + dol_syslog(get_class($this).'::getTotalDiscount', LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 84279b7eb9eef6c3e493d668909baeabb6008cd0..6ae98a3c8d2a7b1098f9b4589836ea9af4d7753f 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -399,7 +399,7 @@ class ExtraFields { $sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname; } - dol_syslog(get_class($this).'::update sql='.$sql); + dol_syslog(get_class($this).'::update', LOG_DEBUG); $resql=$this->db->query($sql,1,'dml'); return 1; } @@ -754,7 +754,7 @@ class ExtraFields $sql.=preg_replace('/^ AND /','',$sqlwhere); //print $sql; - dol_syslog(get_class($this).'::showInputField type=sellist sql='.$sql); + dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { @@ -964,7 +964,7 @@ class ExtraFields $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'"; //$sql.= ' AND entity = '.$conf->entity; - dol_syslog(get_class($this).':showOutputField:$type=sellist sql='.$sql); + dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index c83bbf6864cdde1771cc3e938ace2d1d69bc3b12..d6c1926361b896a8e4a1a9d30b540503133854de 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -604,7 +604,7 @@ class Form $sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees as c"; $sql.= " ORDER BY lower(c.libelle) ASC"; - dol_syslog(get_class($this).'::load_cache_types_fees sql='.$sql, LOG_DEBUG); + dol_syslog(get_class($this).'::load_cache_types_fees', LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { @@ -1554,7 +1554,7 @@ class Form $sql.= " ORDER BY date_price"; $sql.= " DESC LIMIT 1"; - dol_syslog(get_class($this).'::constructProductListOption search price for level '.$price_level.' sql='.$sql); + dol_syslog(get_class($this).'::constructProductListOption search price for level '.$price_level.'', LOG_DEBUG); $result2 = $this->db->query($sql); if ($result2) { @@ -2055,7 +2055,7 @@ class Form $sql.= " FROM ".MAIN_DB_PREFIX.'c_payment_term'; $sql.= " WHERE active=1"; $sql.= " ORDER BY sortorder"; - dol_syslog(get_class($this).'::load_cache_conditions_paiements sql='.$sql,LOG_DEBUG); + dol_syslog(get_class($this).'::load_cache_conditions_paiements', LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { @@ -2094,7 +2094,7 @@ class Form $sql.= " FROM ".MAIN_DB_PREFIX.'c_availability'; $sql.= " WHERE active=1"; $sql.= " ORDER BY rowid"; - dol_syslog(get_class($this).'::load_cache_availability sql='.$sql,LOG_DEBUG); + dol_syslog(get_class($this).'::load_cache_availability', LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php index 2f1be6d7d5652ba3bff8ae8cc82581ea521e3114..b970283cbf209893588fa30f6a782cbfe73a5067 100644 --- a/htdocs/core/class/html.formcompany.class.php +++ b/htdocs/core/class/html.formcompany.class.php @@ -65,7 +65,7 @@ class FormCompany $sql.= " WHERE active = 1"; if ($filter) $sql.=" ".$filter; $sql.= " ORDER by id"; - dol_syslog(get_class($this).'::typent_array sql='.$sql,LOG_DEBUG); + dol_syslog(get_class($this).'::typent_array', LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { @@ -104,7 +104,7 @@ class FormCompany $sql.= " WHERE active = 1"; if ($filter) $sql.=" ".$filter; $sql .= " ORDER BY id ASC"; - dol_syslog(get_class($this).'::effectif_array sql='.$sql,LOG_DEBUG); + dol_syslog(get_class($this).'::effectif_array', LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 35ebe48e168a7ba2ae53ebcef71c391106cf7874..f51cf060af898ad0c26b5cd102476f89066572b4 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -169,7 +169,7 @@ class FormOther $sql.= " WHERE e.active = 1 AND e.fk_pays = p.rowid"; $sql.= " ORDER BY pays, e.organization ASC, e.code ASC"; - dol_syslog(get_class($this).'::select_ecotaxes sql='.$sql); + dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { @@ -227,7 +227,7 @@ class FormOther $sql.= " WHERE r.active = 1 AND r.fk_pays = p.rowid"; $sql.= " AND p.code = '".$country_code."'"; - dol_syslog(get_class($this).'::select_revenue_stamp sql='.$sql); + dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php index 1ea498e19ddd7cdac03d589070e32d77f14f23cb..11e32ee8a84ff58cf048645404c658e4f2536985 100644 --- a/htdocs/core/class/html.formprojet.class.php +++ b/htdocs/core/class/html.formprojet.class.php @@ -197,7 +197,7 @@ class FormProjets $sql.= ' AND entity='.$conf->entity; $sql.= " ORDER BY ref DESC"; - dol_syslog(get_class($this).'::select_element sql='.$sql,LOG_DEBUG); + dol_syslog(get_class($this).'::select_element', LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index a7cabd9468d354941446e077b080b88ba3b052c1..d3ae00c495ee7db9cb767c0e49782ae370b995eb 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -674,7 +674,7 @@ class Translate $sql = "SELECT ".$fieldlabel." as label"; $sql.= " FROM ".MAIN_DB_PREFIX.$tablename; $sql.= " WHERE ".$fieldkey." = '".($keyforselect?$keyforselect:$key)."'"; - dol_syslog(get_class($this).'::getLabelFromKey sql='.$sql,LOG_DEBUG); + dol_syslog(get_class($this).'::getLabelFromKey', LOG_DEBUG); $resql = $db->query($sql); if ($resql) { @@ -754,7 +754,7 @@ class Translate if (! empty($currency_code)) $sql.=" AND code_iso = '".$currency_code."'"; //$sql.= " ORDER BY code_iso ASC"; // Not required, a sort is done later - dol_syslog(get_class($this).'::loadCacheCurrencies sql='.$sql, LOG_DEBUG); + dol_syslog(get_class($this).'::loadCacheCurrencies', LOG_DEBUG); $resql = $db->query($sql); if ($resql) { diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php index 02edeb7cf16e0fd294aa0282abcf60af31a0d0d8..01e16749f5ad8c4eeedf7a4ecd5d33c7f05d5def 100644 --- a/htdocs/core/db/mssql.class.php +++ b/htdocs/core/db/mssql.class.php @@ -372,7 +372,8 @@ class DoliDBMssql extends DoliDB $this->lastqueryerror = $query; $this->lasterror = $this->error(); $this->lasterrno = $row["code"]; - dol_syslog(get_class($this)."::query SQL error: ".$query, LOG_ERROR); + + dol_syslog(get_class($this)."::query SQL error: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERROR); } $this->lastquery=$query; $this->_results = $ret; diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php index 18e40264495a3a63bae8be572e1dfed8eaaa31a7..3f238739026e3c3848fa99f44221043351b0ccb6 100644 --- a/htdocs/core/db/mysql.class.php +++ b/htdocs/core/db/mysql.class.php @@ -273,7 +273,9 @@ class DoliDBMysql extends DoliDB $this->lastqueryerror = $query; $this->lasterror = $this->error(); $this->lasterrno = $this->errno(); - dol_syslog(get_class($this)."::query SQL error: ".$query." ".$this->lasterrno, LOG_ERROR); + + dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERROR); + dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERROR); } $this->lastquery=$query; $this->_results = $ret; @@ -829,21 +831,14 @@ class DoliDBMysql extends DoliDB { if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS') { - dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR); return -1; } - else - { - // If user already exists, we continue to set permissions - dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING); - } } $sql = "GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."' IDENTIFIED BY '".$this->escape($dolibarr_main_db_pass)."'"; dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log $resql=$this->query($sql); if (! $resql) { - dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR); return -1; } @@ -853,7 +848,6 @@ class DoliDBMysql extends DoliDB $resql=$this->query($sql); if (! $resql) { - dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR); return -1; } diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php index ed73d8621c0b41b9057ddba26e0f7ade975c1c96..60bef497f316f0c58b8cb2bd46e8f93eea3bfefa 100644 --- a/htdocs/core/db/mysqli.class.php +++ b/htdocs/core/db/mysqli.class.php @@ -275,7 +275,8 @@ class DoliDBMysqli extends DoliDB $this->lastqueryerror = $query; $this->lasterror = $this->error(); $this->lasterrno = $this->errno(); - dol_syslog(get_class($this)."::query SQL error: ".$query." ".$this->lasterrno, LOG_ERROR); + + dol_syslog(get_class($this)."::query SQL error: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERROR); } $this->lastquery=$query; $this->_results = $ret; @@ -833,21 +834,14 @@ class DoliDBMysqli extends DoliDB { if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS') { - dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR); return -1; } - else - { - // If user already exists, we continue to set permissions - dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING); - } } $sql = "GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."' IDENTIFIED BY '".$this->escape($dolibarr_main_db_pass)."'"; dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log $resql=$this->query($sql); if (! $resql) { - dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR); return -1; } @@ -857,7 +851,6 @@ class DoliDBMysqli extends DoliDB $resql=$this->query($sql); if (! $resql) { - dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR); return -1; } diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php index 8ce4e700d66b6f1e4d12f66c54173a760184b9ad..69e1a92717e280533965f96b41d978304577f2f0 100644 --- a/htdocs/core/db/pgsql.class.php +++ b/htdocs/core/db/pgsql.class.php @@ -506,9 +506,7 @@ class DoliDBPgsql extends DoliDB $this->lasterror = $this->error(); $this->lasterrno = $this->errno(); } - dol_syslog(get_class($this)."::query SQL error usesavepoint = ".$usesavepoint." - ".$query." - ".pg_last_error($this->db)." => ".$this->errno(), LOG_ERROR); - //print "\n>> ".$query."<br>\n"; - //print '>> '.$this->lasterrno.' - '.$this->lasterror.' - '.$this->lastqueryerror."<br>\n"; + dol_syslog(get_class($this)."::query SQL error usesavepoint = ".$usesavepoint." - ".$this->lasterror." (".$this->lasterrno.")", LOG_ERROR); if ($usesavepoint && $this->transaction_opened) // Warning, after that errno will be erased { diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php index 39f3334152695dc003ceb4193412f5e70d6ef2d4..37bbb91b390ff830a64f821597f1bd45a922d832 100644 --- a/htdocs/core/db/sqlite.class.php +++ b/htdocs/core/db/sqlite.class.php @@ -409,8 +409,14 @@ class DoliDBSqlite extends DoliDB $this->lastqueryerror = $query; $this->lasterror = $this->error(); $this->lasterrno = $this->errno(); - if (preg_match('/[0-9]/',$this->lasterrno)) dol_syslog(get_class($this)."::query SQL error: ".$query." ".$this->lasterrno." ".$this->lasterror, LOG_ERROR); - else dol_syslog(get_class($this)."::query SQL error: ".$query." ".$this->lasterrno, LOG_ERROR); + + $errormsg = get_class($this)."::query SQL error: ".$this->lasterror; + + if (preg_match('/[0-9]/',$this->lasterrno)) { + $errormsg .= ' ('.$this->lasterrno.')'; + } + + dol_syslog($errormsg, LOG_ERROR); } $this->lastquery=$query; $this->_results = $ret; @@ -972,7 +978,6 @@ class DoliDBSqlite extends DoliDB $resql=$this->query($sql); if (! $resql) { - dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR); return -1; } @@ -985,7 +990,6 @@ class DoliDBSqlite extends DoliDB $resql=$this->query($sql); if (! $resql) { - dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR); return -1; } @@ -995,7 +999,6 @@ class DoliDBSqlite extends DoliDB $resql=$this->query($sql); if (! $resql) { - dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR); return -1; } diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 9bf8bead0726e1d7c1daa9c54ff3c790b5a3d115..bd5f19e24014b3894959ef4e3135252d0b9cae2b 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -655,7 +655,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') if ($search_name) $sql .= " AND (p.lastname LIKE '%".$db->escape($search_name)."%' OR p.firstname LIKE '%".$db->escape($search_name)."%')"; $sql.= " ORDER BY $sortfield $sortorder"; - dol_syslog('core/lib/company.lib.php :: show_contacts sql='.$sql,LOG_DEBUG); + dol_syslog('core/lib/company.lib.php :: show_contacts', LOG_DEBUG); $result = $db->query($sql); $num = $db->num_rows($result); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 1cd4f58249437f76567ddb075a4c6381b02a4e7e..bcbfc62f3545310e309e42b2ed25134fd453670b 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4197,7 +4197,7 @@ function dol_getIdFromCode($db,$key,$tablename,$fieldkey='code',$fieldid='id') $sql = "SELECT ".$fieldid." as id"; $sql.= " FROM ".MAIN_DB_PREFIX.$tablename; $sql.= " WHERE ".$fieldkey." = '".$key."'"; - dol_syslog('dol_getIdFromCode sql='.$sql, LOG_DEBUG); + dol_syslog('dol_getIdFromCode', LOG_DEBUG); $resql = $db->query($sql); if ($resql) { diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index 606589971a9ca951ad2d8b78a440a8bca57adf42..e6a9e1391099cada85917d387ab073d9ba1b3a3c 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -1293,7 +1293,7 @@ function getListOfModels($db,$type,$maxfilenamelength=0) $sql.= " WHERE type = '".$type."'"; $sql.= " AND entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")"; - dol_syslog('/core/lib/function2.lib.php::getListOfModels sql='.$sql, LOG_DEBUG); + dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG); $resql = $db->query($sql); if ($resql) { diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php index fbf3cc5c6b019c98a1dd8e181d33b56a1300ed1e..8eb0c33d11f1014121b623e68baf4313b72e52e2 100644 --- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php @@ -302,7 +302,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p"; $sql .= " WHERE p.fk_soc = ".$object->id; - dol_syslog('doc_generic_odt :: sql='.$sql,LOG_DEBUG); + dol_syslog('doc_generic_odt ::', LOG_DEBUG); $result = $this->db->query($sql); $num = $this->db->num_rows($result); diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index d72291c6038b11452f8d3e3f932b03ed1f7dde49..03bfa9b9a71c502f40296996b51cc5255b15885d 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -201,7 +201,7 @@ class ProductFournisseur extends Product $sql.= " WHERE rowid = ".$this->product_fourn_price_id; // TODO Add price_base_type and price_ttc - dol_syslog(get_class($this).'::update_buyprice sql='.$sql); + dol_syslog(get_class($this).'::update_buyprice', LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { @@ -238,7 +238,7 @@ class ProductFournisseur extends Product // Delete price for this quantity $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price"; $sql.= " WHERE fk_soc = ".$fourn->id." AND ref_fourn = '".$this->db->escape($ref_fourn)."' AND quantity = ".$qty." AND entity = ".$conf->entity; - dol_syslog(get_class($this).'::update_buyprice sql='.$sql); + dol_syslog(get_class($this).'::update_buyprice', LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index 3daee0728860c4b1a8e9315373f8a0304d41e3e3..4d87adf424fa6a7c5bc88074d639c81a14ea572d 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -382,7 +382,7 @@ class PaiementFourn extends Paiement $sql.= ' WHERE pf.fk_facturefourn = f.rowid AND fk_paiementfourn = '.$this->id; if ($filter) $sql.= ' AND '.$filter; - dol_syslog(get_class($this).'::getBillsArray sql='.$sql,LOG_DEBUG); + dol_syslog(get_class($this).'::getBillsArray', LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { diff --git a/htdocs/fourn/liste.php b/htdocs/fourn/liste.php index 81837feb41f0e1702fbaeb6a069e776c21cf17e5..341f3ffca549a9060829566907abd5082d47eb9d 100644 --- a/htdocs/fourn/liste.php +++ b/htdocs/fourn/liste.php @@ -118,7 +118,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($conf->liste_limit+1, $offset); -dol_syslog('fourn/liste.php: sql='.$sql,LOG_DEBUG); +dol_syslog('fourn/liste.php:', LOG_DEBUG); $resql = $db->query($sql); if ($resql) { diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 995f33e62ff3b6a5a40093a7759433d917e7c1f4..1c90692d5a48ba289cb28d53c10be8e32640f37d 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -834,7 +834,7 @@ class Holiday extends CommonObject $sql.= " value = '".$value."'"; $sql.= " WHERE name = '".$name."'"; - dol_syslog(get_class($this).'::updateConfCP name='.$name.' sql='.$sql); + dol_syslog(get_class($this).'::updateConfCP name='.$name.'', LOG_DEBUG); $result = $this->db->query($sql); if($result) { return true; @@ -855,7 +855,7 @@ class Holiday extends CommonObject $sql.= " FROM ".MAIN_DB_PREFIX."holiday_config"; $sql.= " WHERE name = '".$name."'"; - dol_syslog(get_class($this).'::getConfCP name='.$name.' sql='.$sql); + dol_syslog(get_class($this).'::getConfCP name='.$name.'', LOG_DEBUG); $result = $this->db->query($sql); // Si pas d'erreur @@ -903,7 +903,7 @@ class Holiday extends CommonObject $sql.= " value = '".dol_print_date($now,'%Y%m%d%H%M%S')."'"; $sql.= " WHERE name = 'lastUpdate'"; - dol_syslog(get_class($this).'::updateSoldeCP sql='.$sql); + dol_syslog(get_class($this).'::updateSoldeCP', LOG_DEBUG); $result = $this->db->query($sql); // On ajoute x jours à chaque utilisateurs @@ -948,7 +948,7 @@ class Holiday extends CommonObject $sql.= " nb_holiday = ".$nbHoliday; $sql.= " WHERE fk_user = '".$userID."'"; - dol_syslog(get_class($this).'::updateSoldeCP sql='.$sql); + dol_syslog(get_class($this).'::updateSoldeCP', LOG_DEBUG); $result = $this->db->query($sql); if ($result) return 1; @@ -1040,7 +1040,7 @@ class Holiday extends CommonObject $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users"; $sql.= " WHERE fk_user = '".$user_id."'"; - dol_syslog(get_class($this).'::getCPforUser sql='.$sql); + dol_syslog(get_class($this).'::getCPforUser', LOG_DEBUG); $result = $this->db->query($sql); if($result) { $obj = $this->db->fetch_object($result); diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index f167422f503dc83028f6adef1c881aac21a82eac..9427a8615907da2db853dfb0321f961f0000d8ca 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -81,7 +81,7 @@ if ($action == 'update' && isset($_POST['update_cp'])) $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET"; $sql.= " value = '".dol_print_date($now,'%Y%m%d%H%M%S')."'"; $sql.= " WHERE name = 'lastUpdate' and value IS NULL"; // Add value IS NULL to be sure to update only at init. - dol_syslog('define_holiday update lastUpdate entry sql='.$sql); + dol_syslog('define_holiday update lastUpdate entry', LOG_DEBUG); $result = $db->query($sql); $mesg='<div class="ok">'.$langs->trans('UpdateConfCPOK').'</div>'; diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index 74b82cbcb3b207d7ec0848bb7f87e61b9ef5f90b..928f5563af733a3d4b703f7aadc3b6da5ce6635d 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -144,7 +144,7 @@ $sql.=$db->order($sortfield,$sortorder); // TODO: calculate total to display then restore pagination //$sql.= $db->plimit($conf->liste_limit +1, $offset); -dol_syslog('margin::agentMargins.php sql='.$sql,LOG_DEBUG); +dol_syslog('margin::agentMargins.php', LOG_DEBUG); $result = $db->query($sql); if ($result) { diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index 6675753d4d63729edf622317d983a58092e40213..6c1413c683a728af88465ab03ebd7ee69f6cfea9 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -188,7 +188,7 @@ $sql.=$db->order($sortfield,$sortorder); // TODO: calculate total to display then restore pagination //$sql.= $db->plimit($conf->liste_limit +1, $offset); -dol_syslog('margin::customerMargins.php sql='.$sql,LOG_DEBUG); +dol_syslog('margin::customerMargins.php', LOG_DEBUG); $result = $db->query($sql); if ($result) { diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index ca7b2c4845bfa3101a59de384c5c5c89b4b1f6d9..d5d8b616fb4325f00e63c5545ffbd8be7b4011b9 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -193,7 +193,7 @@ $sql.=$db->order($sortfield,$sortorder); // TODO: calculate total to display then restore pagination //$sql.= $db->plimit($conf->liste_limit +1, $offset); -dol_syslog('margin::productMargins.php sql='.$sql,LOG_DEBUG); +dol_syslog('margin::productMargins.php', LOG_DEBUG); $result = $db->query($sql); if ($result) { diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php index 825d204368394002ae3a0c0f057041803c23fa8a..49d61013d16150d5fd05a8eedbcde6c17fc05ba5 100644 --- a/htdocs/margin/tabs/productMargins.php +++ b/htdocs/margin/tabs/productMargins.php @@ -154,7 +154,7 @@ if ($id > 0 || ! empty($ref)) $sql.= " ORDER BY ".$sortfield." ".$sortorder; // TODO: calculate total to display then restore pagination //$sql.= $db->plimit($conf->liste_limit +1, $offset); - dol_syslog('margin:tabs:productMargins.php sql='.$sql,LOG_DEBUG); + dol_syslog('margin:tabs:productMargins.php', LOG_DEBUG); $result = $db->query($sql); if ($result) { diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php index 8e7807817a647502df6fe8c402028064399c4df4..06e2f4a81b3996f9c6367863588695b3ea2b34ed 100644 --- a/htdocs/margin/tabs/thirdpartyMargins.php +++ b/htdocs/margin/tabs/thirdpartyMargins.php @@ -147,7 +147,7 @@ if ($socid > 0) // TODO: calculate total to display then restore pagination //$sql.= $db->plimit($conf->liste_limit +1, $offset); - dol_syslog('margin:tabs:thirdpartyMargins.php sql='.$sql,LOG_DEBUG); + dol_syslog('margin:tabs:thirdpartyMargins.php', LOG_DEBUG); $result = $db->query($sql); if ($result) { diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php index bd302c422d9ff410a5cf448f0d308ce05aab457f..69e999b18ea408378d9ffdab3e11268d07a86e7c 100644 --- a/htdocs/product/class/html.formproduct.class.php +++ b/htdocs/product/class/html.formproduct.class.php @@ -76,7 +76,7 @@ class FormProduct $sql.= " AND e.statut = 1"; $sql.= " ORDER BY e.label"; - dol_syslog(get_class($this).'::loadWarehouses sql='.$sql,LOG_DEBUG); + dol_syslog(get_class($this).'::loadWarehouses', LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 1f320f28504cdadfa171f2df141db58e3b8a3c2a..7f3bf0d4dea5974683e4e1bb141ab9d0f58ba2fd 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -779,7 +779,7 @@ class Product extends CommonObject { $sql = "DELETE FROM ".MAIN_DB_PREFIX.$table; $sql.= " WHERE fk_product = ".$id; - dol_syslog(get_class($this).'::delete sql='.$sql, LOG_DEBUG); + dol_syslog(get_class($this).'::delete', LOG_DEBUG); $result = $this->db->query($sql); if (! $result) { @@ -2078,7 +2078,7 @@ class Product extends CommonObject $sql.= " WHERE fk_product_pere = ".$fk_parent; $sql.= " AND fk_product_fils = ".$fk_child; - dol_syslog(get_class($this).'::del_sousproduit sql='.$sql); + dol_syslog(get_class($this).'::del_sousproduit', LOG_DEBUG); if (! $this->db->query($sql)) { dol_print_error($this->db); @@ -2283,7 +2283,7 @@ class Product extends CommonObject $sql.= " FROM ".MAIN_DB_PREFIX."product_price "; $sql.= " WHERE fk_product = ". $fromId; - dol_syslog(get_class($this).'::clone_price sql='.$sql); + dol_syslog(get_class($this).'::clone_price', LOG_DEBUG); if (! $this->db->query($sql)) { $this->db->rollback(); @@ -2308,7 +2308,7 @@ class Product extends CommonObject $sql.= " SELECT null, $toId, fk_product_fils, qty FROM ".MAIN_DB_PREFIX."product_association"; $sql.= " WHERE fk_product_pere = '".$fromId."'"; - dol_syslog(get_class($this).'::clone_association sql='.$sql); + dol_syslog(get_class($this).'::clone_association', LOG_DEBUG); if (! $this->db->query($sql)) { $this->db->rollback(); @@ -2352,7 +2352,7 @@ class Product extends CommonObject $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price"; $sql.= " WHERE fk_product = ".$fromId; - dol_syslog(get_class($this).'::clone_fournisseurs sql='.$sql); + dol_syslog(get_class($this).'::clone_fournisseurs', LOG_DEBUG); $resql=$this->db->query($sql); if (! $resql) { @@ -2562,7 +2562,7 @@ class Product extends CommonObject $sql.= " AND pa.fk_product_pere = ".$id; $sql.= " AND pa.fk_product_fils != ".$id; // This should not happens, it is to avoid infinite loop if it happens - dol_syslog(get_class($this).'::getChildsArbo sql='.$sql); + dol_syslog(get_class($this).'::getChildsArbo', LOG_DEBUG); $res = $this->db->query($sql); if ($res) { diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index 2bdb24e355b4b4f982263868b3c8c306be6f4355..b79473ee1b14f3cb7eae58b6867403926fd47aca 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -412,7 +412,7 @@ class MouvementStock $sql.= ' WHERE fk_product = '.$productidselected; $sql.= " AND datem < '".$this->db->idate($datebefore)."'"; - dol_syslog(get_class($this).__METHOD__.' sql='.$sql); + dol_syslog(get_class($this).__METHOD__.'', LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php index 4a365e3e50b4fcefe02becb40b7280717cadbbca..ecc29a559279eca22b96c4abdd1e85eb7a3a27eb 100644 --- a/htdocs/product/stock/fiche.php +++ b/htdocs/product/stock/fiche.php @@ -390,7 +390,7 @@ else $sql.= " AND ps.fk_entrepot = ".$object->id; $sql.= $db->order($sortfield,$sortorder); - dol_syslog('List products sql='.$sql); + dol_syslog('List products', LOG_DEBUG); $resql = $db->query($sql); if ($resql) { diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index c833bcb2bb8d7564d590407049db9f0fb76f75a1..1525ef033b7ac799232d62fe313c0f4be3b17536 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -250,7 +250,7 @@ if ($salert == 'on') // Option to see when stock is lower than alert $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit + 1, $offset); -dol_syslog('Execute request sql='.$sql); +dol_syslog('Execute request', LOG_DEBUG); $resql = $db->query($sql); if (empty($resql)) { diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 1e6444b6f7880e02c0af6b6d42f0bece8329e826..035ceaf59246eaed963456530b49e37290890182 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -155,7 +155,7 @@ $sql.= " ORDER BY u.rowid, t.dateo, t.datee"; $userstatic=new User($db); -dol_syslog('projet:index.php: affectationpercent sql='.$sql,LOG_DEBUG); +dol_syslog('projet:index.php: affectationpercent', LOG_DEBUG); $resql = $db->query($sql); if ( $resql ) { diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php index af3c66003dfbabb86933aa031ff4f6bf344060b1..7d3f03f09d7b0cc969a2bca42a04789ecaeb0fc5 100644 --- a/htdocs/societe/class/address.class.php +++ b/htdocs/societe/class/address.class.php @@ -380,7 +380,7 @@ class Address } else { - dol_syslog('Erreur Societe::Fetch echec sql='.$sql); + dol_syslog('Erreur Societe::Fetch echec', LOG_DEBUG); dol_syslog('Erreur Societe::Fetch '.$this->db->error()); $this->error=$this->db->error(); $result = -3; diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 01415105c3ac0dadf32312f2e11057996be9b62e..ff9608300d9ebc3557a2f598052085520f8c1ad4 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -2272,7 +2272,7 @@ class Societe extends CommonObject $sql = "UPDATE ".MAIN_DB_PREFIX."societe"; $sql.= " SET parent = ".($id > 0 ? $id : "null"); $sql.= " WHERE rowid = " . $this->id; - dol_syslog(get_class($this).'::set_parent sql='.$sql); + dol_syslog(get_class($this).'::set_parent', LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index b6f7cc66bf5166cb8990cb19e51131614f43fde3..d96145c52f660fcbf1e4a8dfd09932bdbd082e45 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -260,7 +260,7 @@ class User extends CommonObject $sql = "SELECT param, value FROM ".MAIN_DB_PREFIX."user_param"; $sql.= " WHERE fk_user = ".$this->id; $sql.= " AND entity = ".$conf->entity; - //dol_syslog(get_class($this).'::fetch load personalized conf sql='.$sql, LOG_DEBUG); + //dol_syslog(get_class($this).'::fetch load personalized conf', LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { @@ -536,7 +536,7 @@ class User extends CommonObject $sql.= " AND r.perms IS NOT NULL"; if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'"; - dol_syslog(get_class($this).'::getrights sql='.$sql, LOG_DEBUG); + dol_syslog(get_class($this).'::getrights', LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { @@ -586,7 +586,7 @@ class User extends CommonObject $sql.= " AND r.perms IS NOT NULL"; if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'"; - dol_syslog(get_class($this).'::getrights sql='.$sql, LOG_DEBUG); + dol_syslog(get_class($this).'::getrights', LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { @@ -1616,7 +1616,7 @@ class User extends CommonObject $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_clicktodial"; $sql .= " WHERE fk_user = ".$this->id; - dol_syslog(get_class($this).'::update_clicktodial sql='.$sql); + dol_syslog(get_class($this).'::update_clicktodial', LOG_DEBUG); $result = $this->db->query($sql); $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_clicktodial"; @@ -1627,7 +1627,7 @@ class User extends CommonObject $sql .= ", '". $this->db->escape($this->clicktodial_password) ."'"; $sql .= ", '". $this->db->escape($this->clicktodial_poste) ."')"; - dol_syslog(get_class($this).'::update_clicktodial sql='.$sql); + dol_syslog(get_class($this).'::update_clicktodial', LOG_DEBUG); $result = $this->db->query($sql); if ($result) { diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index 84b0bd4cbb50e76e133b6561535e0ac2784007b0..b8edc88f958c2ad1e3a32599c12fa8d299315489 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -471,7 +471,7 @@ class UserGroup extends CommonObject $sql.= " AND r.perms IS NOT NULL"; if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'"; - dol_syslog(get_class($this).'::getrights sql='.$sql, LOG_DEBUG); + dol_syslog(get_class($this).'::getrights', LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) {