diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 46fe3aed185fd..6249325261af2 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -184,7 +184,7 @@ class EmailCollector extends CommonObject
*/
public function __construct(DoliDB $db)
{
- global $conf, $langs, $user;
+ global $conf, $langs;
$this->db = $db;
@@ -234,7 +234,7 @@ public function create(User $user, $notrigger = false)
*/
public function createFromClone(User $user, $fromid)
{
- global $langs, $hookmanager, $extrafields;
+ global $langs, $extrafields;
$error = 0;
dol_syslog(__METHOD__, LOG_DEBUG);
@@ -337,8 +337,6 @@ public function fetchAll(User $user, $activeOnly = 0, $sortfield = 's.rowid', $s
$obj_ret = array();
- $socid = $user->societe_id ? $user->societe_id : '';
-
$sql = "SELECT s.rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector as s";
$sql.= ' WHERE s.entity IN ('.getEntity('emailcollector').')';
@@ -358,6 +356,7 @@ public function fetchAll(User $user, $activeOnly = 0, $sortfield = 's.rowid', $s
$result = $this->db->query($sql);
if ($result) {
$num = $this->db->num_rows($result);
+ $i = 0;
while ($i < $num)
{
$obj = $this->db->fetch_object($result);
@@ -415,14 +414,11 @@ public function delete(User $user, $notrigger = false)
*/
public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
{
- global $db, $conf, $langs, $hookmanager;
- global $dolibarr_main_authentication, $dolibarr_main_demo;
- global $menumanager;
+ global $conf, $langs, $hookmanager;
if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips
$result = '';
- $companylink = '';
$label = '' . $langs->trans("EmailCollector") . '';
$label.= '
';
@@ -1023,6 +1019,7 @@ public function doCollectOneCollector()
function createPartArray($structure, $prefix = "")
{
//print_r($structure);
+ $part_array=array();
if (count($structure->parts) > 0) { // There some sub parts
foreach ($structure->parts as $count => $part) {
add_part_to_array($part, $prefix.($count+1), $part_array);
@@ -1348,7 +1345,7 @@ function addPartToArray($obj, $partno, &$part_array)
else
{
// Nothing can be done for this param
- $errorforaction++;
+ $errorforactions++;
$this->error = 'The extract rule to use to load thirdparty has on an unknown source (must be HEADER, SUBJECT or BODY)';
$this->errors[] = $this->error;
}
@@ -1361,7 +1358,7 @@ function addPartToArray($obj, $partno, &$part_array)
}
else
{
- $errorforaction++;
+ $errorforactions++;
$this->error = 'Bad syntax for description of action parameters: '.$actionparam;
$this->errors[] = $this->error;
break;
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 3371beb97f8c9..27cda79aa8405 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -202,7 +202,7 @@ class MyObject extends CommonObject
*/
public function __construct(DoliDB $db)
{
- global $conf, $langs, $user;
+ global $conf, $langs;
$this->db = $db;
@@ -252,7 +252,7 @@ public function create(User $user, $notrigger = false)
*/
public function createFromClone(User $user, $fromid)
{
- global $langs, $hookmanager, $extrafields;
+ global $langs, $extrafields;
$error = 0;
dol_syslog(__METHOD__, LOG_DEBUG);
@@ -392,9 +392,11 @@ public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset =
$resql = $this->db->query($sql);
if ($resql) {
$num = $this->db->num_rows($resql);
-
- while ($obj = $this->db->fetch_object($resql))
+ $i = 0;
+ while ($i < min($limit, $num))
{
+ $obj = $this->db->fetch_object($resql);
+
$record = new self($this->db);
$record->id = $obj->rowid;
@@ -402,6 +404,8 @@ public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset =
//var_dump($record->id);
$records[$record->id] = $record;
+
+ $i++;
}
$this->db->free($resql);
@@ -451,9 +455,7 @@ public function delete(User $user, $notrigger = false)
*/
public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
{
- global $db, $conf, $langs, $hookmanager;
- global $dolibarr_main_authentication, $dolibarr_main_demo;
- global $menumanager;
+ global $conf, $langs, $hookmanager;
if (! empty($conf->dol_no_mouse_hover)) $notooltip=1; // Force disable tooltips