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

try to apply the advice

Browse Source
This commit is contained in:
Frédéric FRANCE 2021-02-20 17:12:06 +01:00
parent ec1dd40a8a
commit 57e15eb46d
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
1 changed files with 77 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
htdocs/core/lib/company.lib.php
View File

@ -54,22 +54,12 @@ function societe_prepare_head(Societe $object)
if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->societe->contact->lire) { if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->societe->contact->lire) {
//$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external')); //$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
$nbContact = 0; $nbContact = 0;
if (!empty($conf->memcached->enabled) && !empty($conf->global->MEMCACHED_SERVER)) { $cachekey = 'thirdparty_countcontact_'.$object->id;
// Using a memcached/memcache server
$usecachekey = 'thirdparty_countcontact_'.$object->id;
} elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {
// Using cache with shmop
$usecachekey = 'thirdparty_countcontact_'.$object->id;
}
if ($usecachekey) {
require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
$dataretrieved = dol_getcache($usecachekey); $dataretrieved = dol_getcache($cachekey);
if (is_array($dataretrieved) && count($dataretrieved)) { if (is_array($dataretrieved) && count($dataretrieved)) {
$nbContact = $dataretrieved[$usecachekey]; $nbContact = $dataretrieved[$cachekey];
$found = true; } else {
}
}
if (!$found) {
$sql = "SELECT COUNT(p.rowid) as nb"; $sql = "SELECT COUNT(p.rowid) as nb";
$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p"; $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
$sql .= " WHERE p.fk_soc = ".$object->id; $sql .= " WHERE p.fk_soc = ".$object->id;
@ -78,16 +68,14 @@ function societe_prepare_head(Societe $object)
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$nbContact = $obj->nb; $nbContact = $obj->nb;
} }
if ($usecachekey) {
$datatocache = array(); $datatocache = array();
$datatocache[$usecachekey] = $nbContact; $datatocache[$cachekey] = $nbContact;
$res_setcache = dol_setcache($usecachekey, $datatocache); $res_setcache = dol_setcache($cachekey, $datatocache);
if ($res_setcache < 0) { if ($res_setcache < 0) {
$error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache; $error = 'Failed to set cache for cachekey='.$cachekey.' result='.$res_setcache;
dol_syslog($error, LOG_ERR); dol_syslog($error, LOG_ERR);
} }
} }
}
$head[$h][0] = DOL_URL_ROOT.'/societe/contact.php?socid='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/societe/contact.php?socid='.$object->id;
$head[$h][1] = $langs->trans('ContactsAddresses'); $head[$h][1] = $langs->trans('ContactsAddresses');
if ($nbContact > 0) { if ($nbContact > 0) {
@ -285,26 +273,14 @@ function societe_prepare_head(Societe $object)
if ($user->socid == 0) { if ($user->socid == 0) {
// Notifications // Notifications
if (!empty($conf->notification->enabled)) { if (!empty($conf->notification->enabled)) {
// Enable caching of thirdrparty count notifications
$usecachekey = '';
$found = false;
$nbNotif = 0; $nbNotif = 0;
if (!empty($conf->memcached->enabled) && !empty($conf->global->MEMCACHED_SERVER)) { // Enable caching of thirdrparty count notifications
// Using a memcached/memcache server $cachekey = 'thirdparty_countnotif_'.$object->id;
$usecachekey = 'thirdparty_countnotif_'.$object->id;
} elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {
// Using cache with shmop
$usecachekey = 'thirdparty_countnotif_'.$object->id;
}
if ($usecachekey) {
require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
$dataretrieved = dol_getcache($usecachekey); $dataretrieved = dol_getcache($cachekey);
if (is_array($dataretrieved) && count($dataretrieved)) { if (is_array($dataretrieved) && count($dataretrieved)) {
$nbNotif = $dataretrieved[$usecachekey]; $nbNotif = $dataretrieved[$cachekey];
$found = true; } else {
}
}
if (!$found) {
$sql = "SELECT COUNT(n.rowid) as nb"; $sql = "SELECT COUNT(n.rowid) as nb";
$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n"; $sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n";
$sql .= " WHERE fk_soc = ".$object->id; $sql .= " WHERE fk_soc = ".$object->id;
@ -315,17 +291,14 @@ function societe_prepare_head(Societe $object)
} else { } else {
dol_print_error($db); dol_print_error($db);
} }
if ($usecachekey) {
$datatocache = array(); $datatocache = array();
$datatocache[$usecachekey] = $nbNotif; $datatocache[$cachekey] = $nbNotif;
$res_setcache = dol_setcache($usecachekey, $datatocache); $res_setcache = dol_setcache($cachekey, $datatocache);
if ($res_setcache < 0) { if ($res_setcache < 0) {
$error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache; $error = 'Failed to set cache for cachekey='.$cachekey.' result='.$res_setcache;
dol_syslog($error, LOG_ERR); dol_syslog($error, LOG_ERR);
} }
} }
}
$head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.$object->id;
$head[$h][1] = $langs->trans("Notifications"); $head[$h][1] = $langs->trans("Notifications");
if ($nbNotif > 0) { if ($nbNotif > 0) {
@ -371,25 +344,13 @@ function societe_prepare_head(Societe $object)
$head[$h][1] = $langs->trans("Events"); $head[$h][1] = $langs->trans("Events");
if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) { if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
// Enable caching of thirdrparty count actioncomm // Enable caching of thirdrparty count actioncomm
$usecachekey = '';
$found = false;
$nbEvent = 0; $nbEvent = 0;
if (!empty($conf->memcached->enabled) && !empty($conf->global->MEMCACHED_SERVER)) { $cachekey = 'thirdparty_countevent_'.$object->id;
// Using a memcached/memcache server
$usecachekey = 'thirdparty_countevent_'.$object->id;
} elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {
// Using cache with shmop
$usecachekey = 'thirdparty_countevent_'.$object->id;
}
if ($usecachekey) {
require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
$dataretrieved = dol_getcache($usecachekey); $dataretrieved = dol_getcache($cachekey);
if (is_array($dataretrieved) && count($dataretrieved)) { if (is_array($dataretrieved) && count($dataretrieved)) {
$nbEvent = $dataretrieved[$usecachekey]; $nbEvent = $dataretrieved[$cachekey];
$found = true; } else {
}
}
if (!$found) {
$sql = "SELECT COUNT(id) as nb"; $sql = "SELECT COUNT(id) as nb";
$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm"; $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm";
$sql .= " WHERE fk_soc = ".$object->id; $sql .= " WHERE fk_soc = ".$object->id;
@ -400,16 +361,14 @@ function societe_prepare_head(Societe $object)
} else { } else {
dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR); dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);
} }
if ($usecachekey) {
$datatocache = array(); $datatocache = array();
$datatocache[$usecachekey] = $nbEvent; $datatocache[$cachekey] = $nbEvent;
$res_setcache = dol_setcache($usecachekey, $datatocache); $res_setcache = dol_setcache($cachekey, $datatocache);
if ($res_setcache < 0) { if ($res_setcache < 0) {
$error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache; $error = 'Failed to set cache for cachekey='.$cachekey.' result='.$res_setcache;
dol_syslog($error, LOG_ERR); dol_syslog($error, LOG_ERR);
} }
} }
}
$head[$h][1] .= '/'; $head[$h][1] .= '/';
$head[$h][1] .= $langs->trans("Agenda"); $head[$h][1] .= $langs->trans("Agenda");
if ($nbEvent > 0) { if ($nbEvent > 0) {
@ -521,16 +480,27 @@ function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '',
// Check parameters // Check parameters
if (empty($searchkey) && empty($searchlabel)) { if (empty($searchkey) && empty($searchlabel)) {
if ($withcode === 'all') return array('id'=>'', 'code'=>'', 'label'=>''); if ($withcode === 'all') {
else return ''; return array('id'=>'', 'code'=>'', 'label'=>'');
} else {
return '';
}
}
if (!is_object($dbtouse)) {
$dbtouse = $db;
}
if (!is_object($outputlangs)) {
$outputlangs = $langs;
} }
if (!is_object($dbtouse)) $dbtouse = $db;
if (!is_object($outputlangs)) $outputlangs = $langs;
$sql = "SELECT rowid, code, label FROM ".MAIN_DB_PREFIX."c_country"; $sql = "SELECT rowid, code, label FROM ".MAIN_DB_PREFIX."c_country";
if (is_numeric($searchkey)) $sql .= " WHERE rowid=".$searchkey; if (is_numeric($searchkey)) {
elseif (!empty($searchkey)) $sql .= " WHERE code='".$db->escape($searchkey)."'"; $sql .= " WHERE rowid=".$searchkey;
else $sql .= " WHERE label='".$db->escape($searchlabel)."'"; } elseif (!empty($searchkey)) {
$sql .= " WHERE code='".$db->escape($searchkey)."'";
} else {
$sql .= " WHERE label='".$db->escape($searchlabel)."'";
}
$resql = $dbtouse->query($sql); $resql = $dbtouse->query($sql);
if ($resql) { if ($resql) {
@ -542,11 +512,17 @@ function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '',
if ($entconv) $label = ($obj->code && ($outputlangs->trans("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->trans("Country".$obj->code) : $label; if ($entconv) $label = ($obj->code && ($outputlangs->trans("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->trans("Country".$obj->code) : $label;
else $label = ($obj->code && ($outputlangs->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->transnoentitiesnoconv("Country".$obj->code) : $label; else $label = ($obj->code && ($outputlangs->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->transnoentitiesnoconv("Country".$obj->code) : $label;
} }
if ($withcode == 1) $result = $label ? "$obj->code - $label" : "$obj->code"; if ($withcode == 1) {
elseif ($withcode == 2) $result = $obj->code; $result = $label ? "$obj->code - $label" : "$obj->code";
elseif ($withcode == 3) $result = $obj->rowid; } elseif ($withcode == 2) {
elseif ($withcode === 'all') $result = array('id'=>$obj->rowid, 'code'=>$obj->code, 'label'=>$label); $result = $obj->code;
else $result = $label; } elseif ($withcode == 3) {
$result = $obj->rowid;
} elseif ($withcode === 'all') {
$result = array('id'=>$obj->rowid, 'code'=>$obj->code, 'label'=>$label);
} else {
$result = $label;
}
} else { } else {
$result = 'NotDefined'; $result = 'NotDefined';
} }
@ -577,7 +553,9 @@ function getState($id, $withcode = '', $dbtouse = 0, $withregion = 0, $outputlan
{ {
global $db, $langs; global $db, $langs;
if (!is_object($dbtouse)) $dbtouse = $db; if (!is_object($dbtouse)) {
$dbtouse = $db;
}
$sql = "SELECT d.rowid as id, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.code_region as region_code, r.nom as region_name FROM"; $sql = "SELECT d.rowid as id, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.code_region as region_code, r.nom as region_name FROM";
$sql .= " ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c"; $sql .= " ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
@ -640,7 +618,9 @@ function currency_name($code_iso, $withcode = '', $outputlangs = null)
{ {
global $langs, $db; global $langs, $db;
if (empty($outputlangs)) $outputlangs = $langs; if (empty($outputlangs)) {
$outputlangs = $langs;
}
$outputlangs->load("dict"); $outputlangs->load("dict");
@ -660,8 +640,11 @@ function currency_name($code_iso, $withcode = '', $outputlangs = null)
if ($num) { if ($num) {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$label = ($obj->label != '-' ? $obj->label : ''); $label = ($obj->label != '-' ? $obj->label : '');
if ($withcode) return ($label == $code_iso) ? "$code_iso" : "$code_iso - $label"; if ($withcode) {
else return $label; return ($label == $code_iso) ? "$code_iso" : "$code_iso - $label";
} else {
return $label;
}
} else { } else {
return $code_iso; return $code_iso;
} }