alxarafe / alixar

Dolibarr/Modules/Don.php

Spacing +2 added lines, -2 removed lines

@@ -163,8 +163,8 @@
         }
 
         $sql = array(
-            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[0][2]) . "' AND type = 'donation' AND entity = " . ((int)$conf->entity),
-            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[0][2]) . "','donation'," . ((int)$conf->entity) . ")",
+            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[0][2]) . "' AND type = 'donation' AND entity = " . ((int) $conf->entity),
+            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[0][2]) . "','donation'," . ((int) $conf->entity) . ")",
         );
 
         return $this->_init($sql, $options);

Dolibarr/Modules/Projet.php

Spacing +9 added lines, -9 removed lines

@@ -132,10 +132,10 @@ 
 
         // Boxes
         $this->boxes = array(
-            0 => array('file' => 'box_project.php', 'enabledbydefaulton' => 'Home'),  // open projects
-            1 => array('file' => 'box_project_opportunities.php', 'enabledbydefaulton' => 'Home'),    // open opportunities
+            0 => array('file' => 'box_project.php', 'enabledbydefaulton' => 'Home'), // open projects
+            1 => array('file' => 'box_project_opportunities.php', 'enabledbydefaulton' => 'Home'), // open opportunities
             2 => array('file' => 'box_task.php', 'enabledbydefaulton' => 'Home'),
-            3 => array('file' => 'box_validated_projects.php', 'enabledbydefaulton' => 'Home'),   // task without timespent
+            3 => array('file' => 'box_validated_projects.php', 'enabledbydefaulton' => 'Home'), // task without timespent
             4 => array('file' => 'box_funnel_of_prospection.php', 'enabledbydefaulton' => 'Home'),
         );
         // Cronjobs
@@ -413,12 +413,12 @@ 
         }
 
         $sql = array();
-        $sql[] = "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[3][2]) . "' AND type = 'task' AND entity = " . ((int)$conf->entity);
-        $sql[] = "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[3][2]) . "','task'," . ((int)$conf->entity) . ")";
-        $sql[] = "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'beluga' AND type = 'project' AND entity = " . ((int)$conf->entity);
-        $sql[] = "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('beluga','project'," . ((int)$conf->entity) . ")";
-        $sql[] = "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'baleine' AND type = 'project' AND entity = " . ((int)$conf->entity);
-        $sql[] = "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('baleine','project'," . ((int)$conf->entity) . ")";
+        $sql[] = "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[3][2]) . "' AND type = 'task' AND entity = " . ((int) $conf->entity);
+        $sql[] = "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[3][2]) . "','task'," . ((int) $conf->entity) . ")";
+        $sql[] = "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'beluga' AND type = 'project' AND entity = " . ((int) $conf->entity);
+        $sql[] = "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('beluga','project'," . ((int) $conf->entity) . ")";
+        $sql[] = "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'baleine' AND type = 'project' AND entity = " . ((int) $conf->entity);
+        $sql[] = "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('baleine','project'," . ((int) $conf->entity) . ")";
 
 
         return $this->_init($sql, $options);

Dolibarr/Modules/KnowledgeManagement.php

Spacing +4 added lines, -4 removed lines

@@ -472,10 +472,10 @@
                 }
 
                 $sql = array_merge($sql, array(
-                    "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'standard_" . strtolower($myTmpObjectKey) . "' AND type = '" . strtolower($myTmpObjectKey) . "' AND entity = " . ((int)$conf->entity),
-                    "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('standard_" . strtolower($myTmpObjectKey) . "','" . strtolower($myTmpObjectKey) . "'," . ((int)$conf->entity) . ")",
-                    "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'generic_" . strtolower($myTmpObjectKey) . "_odt' AND type = '" . strtolower($myTmpObjectKey) . "' AND entity = " . ((int)$conf->entity),
-                    "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('generic_" . strtolower($myTmpObjectKey) . "_odt', '" . strtolower($myTmpObjectKey) . "', " . ((int)$conf->entity) . ")"
+                    "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'standard_" . strtolower($myTmpObjectKey) . "' AND type = '" . strtolower($myTmpObjectKey) . "' AND entity = " . ((int) $conf->entity),
+                    "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('standard_" . strtolower($myTmpObjectKey) . "','" . strtolower($myTmpObjectKey) . "'," . ((int) $conf->entity) . ")",
+                    "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'generic_" . strtolower($myTmpObjectKey) . "_odt' AND type = '" . strtolower($myTmpObjectKey) . "' AND entity = " . ((int) $conf->entity),
+                    "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('generic_" . strtolower($myTmpObjectKey) . "_odt', '" . strtolower($myTmpObjectKey) . "', " . ((int) $conf->entity) . ")"
                 ));
             }
         }

Dolibarr/Modules/Partnership.php

Spacing +5 added lines, -5 removed lines

@@ -224,7 +224,7 @@ 
             // Label of tables
             'tablib' => array("PartnershipType"),
             // Request to select fields
-            'tabsql' => array('SELECT f.rowid as rowid, f.code, f.label, f.keyword, f.active FROM ' . MAIN_DB_PREFIX . 'c_partnership_type as f WHERE f.entity = ' . ((int)$conf->entity)),
+            'tabsql' => array('SELECT f.rowid as rowid, f.code, f.label, f.keyword, f.active FROM ' . MAIN_DB_PREFIX . 'c_partnership_type as f WHERE f.entity = ' . ((int) $conf->entity)),
             // Sort order
             'tabsqlsort' => array("label ASC"),
             // List of fields (result of select to show dictionary)
@@ -488,10 +488,10 @@ 
                 }
 
                 $sql = array_merge($sql, array(
-                    "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'standard_" . strtolower($myTmpObjectKey) . "' AND type = '" . strtolower($myTmpObjectKey) . "' AND entity = " . ((int)$conf->entity),
-                    "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('standard_" . strtolower($myTmpObjectKey) . "','" . strtolower($myTmpObjectKey) . "'," . ((int)$conf->entity) . ")",
-                    "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'generic_" . strtolower($myTmpObjectKey) . "_odt' AND type = '" . strtolower($myTmpObjectKey) . "' AND entity = " . ((int)$conf->entity),
-                    "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('generic_" . strtolower($myTmpObjectKey) . "_odt', '" . strtolower($myTmpObjectKey) . "', " . ((int)$conf->entity) . ")"
+                    "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'standard_" . strtolower($myTmpObjectKey) . "' AND type = '" . strtolower($myTmpObjectKey) . "' AND entity = " . ((int) $conf->entity),
+                    "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('standard_" . strtolower($myTmpObjectKey) . "','" . strtolower($myTmpObjectKey) . "'," . ((int) $conf->entity) . ")",
+                    "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'generic_" . strtolower($myTmpObjectKey) . "_odt' AND type = '" . strtolower($myTmpObjectKey) . "' AND entity = " . ((int) $conf->entity),
+                    "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('generic_" . strtolower($myTmpObjectKey) . "_odt', '" . strtolower($myTmpObjectKey) . "', " . ((int) $conf->entity) . ")"
                 ));
             }
         }

Dolibarr/Modules/Societe.php

Spacing +3 added lines, -3 removed lines

@@ -207,7 +207,7 @@ 
         $this->rights[$r][0] = 130;
         $this->rights[$r][1] = 'Modify thirdparty information payment';
         $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'thirdparty_paymentinformation_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
+        $this->rights[$r][4] = 'thirdparty_paymentinformation_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
         $this->rights[$r][5] = 'write';
 
         // 262 : Restrict access to sales representative
@@ -356,7 +356,7 @@ 
         $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_incoterms as incoterm ON s.fk_incoterms = incoterm.rowid';
         $this->export_sql_end[$r] .= ' WHERE s.entity IN (' . getEntity('societe') . ')';
         if (is_object($user) && !$user->hasRight('societe', 'client', 'voir')) {
-            $this->export_sql_end[$r] .= ' AND (sc.fk_user = ' . ((int)$user->id) . ' ';
+            $this->export_sql_end[$r] .= ' AND (sc.fk_user = ' . ((int) $user->id) . ' ';
             if (getDolGlobalString('SOCIETE_EXPORT_SUBORDINATES_CHILDS')) {
                 $subordinatesids = $user->getAllChildIds();
                 $this->export_sql_end[$r] .= count($subordinatesids) > 0 ? ' OR (sc.fk_user IN (' . $this->db->sanitize(implode(',', $subordinatesids)) . ')' : '';
@@ -445,7 +445,7 @@ 
         $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_typent as t ON s.fk_typent = t.id';
         $this->export_sql_end[$r] .= ' WHERE c.entity IN (' . getEntity('contact') . ')';
         if (is_object($user) && !$user->hasRight('societe', 'client', 'voir')) {
-            $this->export_sql_end[$r] .= ' AND (sc.fk_user = ' . ((int)$user->id) . ' ';
+            $this->export_sql_end[$r] .= ' AND (sc.fk_user = ' . ((int) $user->id) . ' ';
             if (getDolGlobalString('SOCIETE_EXPORT_SUBORDINATES_CHILDS')) {
                 $subordinatesids = $user->getAllChildIds();
                 $this->export_sql_end[$r] .= count($subordinatesids) > 0 ? ' OR (sc.fk_user IN (' . $this->db->sanitize(implode(',', $subordinatesids)) . ')' : '';

Dolibarr/Modules/Mrp.php

Spacing +4 added lines, -4 removed lines

@@ -252,7 +252,7 @@ 
         $r = 1;
 
         $this->export_code[$r] = $this->rights_class . '_' . $r;
-        $this->export_label[$r] = 'MOs';  // Translation key (used only if key ExportDataset_xxx_z not found)
+        $this->export_label[$r] = 'MOs'; // Translation key (used only if key ExportDataset_xxx_z not found)
         $this->export_icon[$r] = 'mrp';
         $this->export_fields_array[$r] = array(
             'm.rowid' => "Id",
@@ -334,7 +334,7 @@ 
         /* END MODULEBUILDER IMPORT MO */
         $r++;
         $this->import_code[$r] = $this->rights_class . '_' . $r;
-        $this->import_label[$r] = 'MOs';  // Translation key (used only if key ExportDataset_xxx_z not found)
+        $this->import_label[$r] = 'MOs'; // Translation key (used only if key ExportDataset_xxx_z not found)
         $this->import_icon[$r] = 'mrp';
         $this->import_entities_array[$r] = array(); // We define here only fields that use a different icon from the one defined in import_icon
         $this->import_tables_array[$r] = array('m' => MAIN_DB_PREFIX . 'mrp_mo', 'extra' => MAIN_DB_PREFIX . 'mrp_mo_extrafields');
@@ -462,8 +462,8 @@ 
         }
 
         $sql = array(
-            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape('vinci') . "' AND type = 'mrp' AND entity = " . ((int)$conf->entity),
-            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape('vinci') . "','mrp'," . ((int)$conf->entity) . ")"
+            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape('vinci') . "' AND type = 'mrp' AND entity = " . ((int) $conf->entity),
+            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape('vinci') . "','mrp'," . ((int) $conf->entity) . ")"
         );
 
         return $this->_init($sql, $options);

Dolibarr/Modules/EmailCollector.php

Spacing +22 added lines, -22 removed lines

@@ -208,17 +208,17 @@ 
                 $descriptionA1 = $langs->trans('EmailCollectorExampleToCollectTicketRequestsDesc');
                 $label = $langs->trans('EmailCollectorExampleToCollectTicketRequests');
                 $sqlforexampleA1 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-                $sqlforexampleA1 .= " VALUES (" . $conf->entity . ", 'Collect_Ticket_Requests', '" . $this->db->escape($label) . "', '" . $this->db->escape($descriptionA1) . "', 'INBOX', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 0)";
+                $sqlforexampleA1 .= " VALUES (" . $conf->entity . ", 'Collect_Ticket_Requests', '" . $this->db->escape($label) . "', '" . $this->db->escape($descriptionA1) . "', 'INBOX', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 0)";
 
                 $sqlforexampleFilterA1 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-                $sqlforexampleFilterA1 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requests' and entity = " . $conf->entity . "), 'isnotanswer', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 1)";
+                $sqlforexampleFilterA1 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requests' and entity = " . $conf->entity . "), 'isnotanswer', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 1)";
                 //$sqlforexampleFilterA2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
                 //$sqlforexampleFilterA2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requests' and entity = ".$conf->entity."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
                 $sqlforexampleFilterA3 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollectorfilter (fk_emailcollector, type, rulevalue, date_creation, fk_user_creat, status)";
-                $sqlforexampleFilterA3 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requests' and entity = " . $conf->entity . "), 'to', 'support@example.com', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 1)";
+                $sqlforexampleFilterA3 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requests' and entity = " . $conf->entity . "), 'to', 'support@example.com', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 1)";
 
                 $sqlforexampleActionA1 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollectoraction (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-                $sqlforexampleActionA1 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requests' and entity = " . $conf->entity . "), 'ticket', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 1)";
+                $sqlforexampleActionA1 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requests' and entity = " . $conf->entity . "), 'ticket', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 1)";
 
                 $sql[] = $sqlforexampleA1;
 
@@ -239,15 +239,15 @@ 
                 $descriptionA1 = $langs->trans('EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware');
                 $label = $langs->trans('EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware');
                 $sqlforexampleA1 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-                $sqlforexampleA1 .= " VALUES (" . $conf->entity . ", 'Collect_Responses_Out', '" . $this->db->escape($label) . "', '" . $this->db->escape($descriptionA1) . "', 'Sent', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 0)";
+                $sqlforexampleA1 .= " VALUES (" . $conf->entity . ", 'Collect_Responses_Out', '" . $this->db->escape($label) . "', '" . $this->db->escape($descriptionA1) . "', 'Sent', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 0)";
 
                 $sqlforexampleFilterA1 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-                $sqlforexampleFilterA1 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = " . ((int)$conf->entity) . "), 'isanswer', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 1)";
+                $sqlforexampleFilterA1 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = " . ((int) $conf->entity) . "), 'isanswer', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 1)";
                 $sqlforexampleFilterA2 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-                $sqlforexampleFilterA2 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = " . ((int)$conf->entity) . "), 'withouttrackingidinmsgid', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 1)";
+                $sqlforexampleFilterA2 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = " . ((int) $conf->entity) . "), 'withouttrackingidinmsgid', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 1)";
 
                 $sqlforexampleActionA1 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollectoraction (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-                $sqlforexampleActionA1 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = " . ((int)$conf->entity) . "), 'recordevent', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 1)";
+                $sqlforexampleActionA1 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = " . ((int) $conf->entity) . "), 'recordevent', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 1)";
 
                 $sql[] = $sqlforexampleA1;
 
@@ -258,20 +258,20 @@ 
             }
         }
 
-        $tmpsql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = " . ((int)$conf->entity);
+        $tmpsql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = " . ((int) $conf->entity);
         $tmpresql = $this->db->query($tmpsql);
         if ($tmpresql) {
             if ($this->db->num_rows($tmpresql) == 0) {
                 $descriptionB1 = $langs->trans('EmailCollectorExampleToCollectDolibarrAnswersDesc');
                 $label = $langs->trans('EmailCollectorExampleToCollectDolibarrAnswers');
                 $sqlforexampleB1 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-                $sqlforexampleB1 .= " VALUES (" . $conf->entity . ", 'Collect_Responses_In', '" . $this->db->escape($label) . "', '" . $this->db->escape($descriptionB1) . "', 'INBOX', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 0)";
+                $sqlforexampleB1 .= " VALUES (" . $conf->entity . ", 'Collect_Responses_In', '" . $this->db->escape($label) . "', '" . $this->db->escape($descriptionB1) . "', 'INBOX', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 0)";
 
                 $sqlforexampleFilterB2 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-                $sqlforexampleFilterB2 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = " . ((int)$conf->entity) . "), 'isanswer', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 1)";
+                $sqlforexampleFilterB2 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = " . ((int) $conf->entity) . "), 'isanswer', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 1)";
 
                 $sqlforexampleActionB3 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollectoraction (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-                $sqlforexampleActionB3 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = " . ((int)$conf->entity) . "), 'recordevent', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 1)";
+                $sqlforexampleActionB3 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = " . ((int) $conf->entity) . "), 'recordevent', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 1)";
 
                 $sql[] = $sqlforexampleB1;
 
@@ -283,25 +283,25 @@ 
             dol_print_error($this->db);
         }
 
-        $tmpsql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = " . ((int)$conf->entity);
+        $tmpsql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = " . ((int) $conf->entity);
         $tmpresql = $this->db->query($tmpsql);
         if ($tmpresql) {
             if ($this->db->num_rows($tmpresql) == 0) {
                 $descriptionC1 = $langs->trans("EmailCollectorExampleToCollectLeadsDesc");
                 $label = $langs->trans('EmailCollectorExampleToCollectLeads');
                 $sqlforexampleC1 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-                $sqlforexampleC1 .= " VALUES (" . $conf->entity . ", 'Collect_Leads', '" . $this->db->escape($label) . "', '" . $this->db->escape($descriptionC1) . "', 'INBOX', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 0)";
+                $sqlforexampleC1 .= " VALUES (" . $conf->entity . ", 'Collect_Leads', '" . $this->db->escape($label) . "', '" . $this->db->escape($descriptionC1) . "', 'INBOX', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 0)";
 
                 $sqlforexampleFilterC1 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-                $sqlforexampleFilterC1 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = " . ((int)$conf->entity) . "), 'isnotanswer', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 1)";
+                $sqlforexampleFilterC1 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = " . ((int) $conf->entity) . "), 'isnotanswer', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 1)";
                 //$sqlforexampleFilterC2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
                 //$sqlforexampleFilterC2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".((int) $conf->entity)."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
                 $sqlforexampleFilterC3 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollectorfilter (fk_emailcollector, type, rulevalue, date_creation, fk_user_creat, status)";
-                $sqlforexampleFilterC3 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = " . ((int)$conf->entity) . "), 'to', 'sales@example.com', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 1)";
+                $sqlforexampleFilterC3 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = " . ((int) $conf->entity) . "), 'to', 'sales@example.com', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 1)";
 
                 $paramstring = 'tmp_from=EXTRACT:HEADER:^From:(.*)' . "\n" . 'socid=SETIFEMPTY:1' . "\n" . 'usage_opportunity=SET:1' . "\n" . 'description=EXTRACT:BODY:(.*)' . "\n" . 'title=SET:Lead or message from __tmp_from__ received by email';
                 $sqlforexampleActionC4 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollectoraction (fk_emailcollector, type, actionparam, date_creation, fk_user_creat, status)";
-                $sqlforexampleActionC4 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = " . ((int)$conf->entity) . "), 'project', '" . $this->db->escape($paramstring) . "', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 1)";
+                $sqlforexampleActionC4 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = " . ((int) $conf->entity) . "), 'project', '" . $this->db->escape($paramstring) . "', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 1)";
 
                 $sql[] = $sqlforexampleC1;
 
@@ -315,25 +315,25 @@ 
             dol_print_error($this->db);
         }
 
-        $tmpsql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = " . ((int)$conf->entity);
+        $tmpsql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = " . ((int) $conf->entity);
         $tmpresql = $this->db->query($tmpsql);
         if ($tmpresql) {
             if ($this->db->num_rows($tmpresql) == 0) {
                 $descriptionC1 = $langs->trans("EmailCollectorExampleToCollectJobCandidaturesDesc");
                 $label = $langs->trans('EmailCollectorExampleToCollectJobCandidatures');
                 $sqlforexampleC1 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-                $sqlforexampleC1 .= " VALUES (" . $conf->entity . ", 'Collect_Candidatures', '" . $this->db->escape($label) . "', '" . $this->db->escape($descriptionC1) . "', 'INBOX', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 0)";
+                $sqlforexampleC1 .= " VALUES (" . $conf->entity . ", 'Collect_Candidatures', '" . $this->db->escape($label) . "', '" . $this->db->escape($descriptionC1) . "', 'INBOX', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 0)";
 
                 $sqlforexampleFilterC1 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-                $sqlforexampleFilterC1 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = " . ((int)$conf->entity) . "), 'isnotanswer', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 1)";
+                $sqlforexampleFilterC1 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = " . ((int) $conf->entity) . "), 'isnotanswer', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 1)";
                 //$sqlforexampleFilterC2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
                 //$sqlforexampleFilterC2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = ".((int) $conf->entity)."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
                 $sqlforexampleFilterC3 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollectorfilter (fk_emailcollector, type, rulevalue, date_creation, fk_user_creat, status)";
-                $sqlforexampleFilterC3 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = " . ((int)$conf->entity) . "), 'to', 'jobs@example.com', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 1)";
+                $sqlforexampleFilterC3 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = " . ((int) $conf->entity) . "), 'to', 'jobs@example.com', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 1)";
 
                 $paramstring = 'tmp_from=EXTRACT:HEADER:^From:(.*)(<.*>)?' . "\n" . 'fk_recruitmentjobposition=EXTRACT:HEADER:^To:[^\n]*\+([^\n]*)' . "\n" . 'description=EXTRACT:BODY:(.*)' . "\n" . 'lastname=SET:__tmp_from__';
                 $sqlforexampleActionC4 = "INSERT INTO " . MAIN_DB_PREFIX . "emailcollector_emailcollectoraction (fk_emailcollector, type, actionparam, date_creation, fk_user_creat, status)";
-                $sqlforexampleActionC4 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = " . ((int)$conf->entity) . "), 'candidature', '" . $this->db->escape($paramstring) . "', '" . $this->db->idate(dol_now()) . "', " . ((int)$user->id) . ", 1)";
+                $sqlforexampleActionC4 .= " VALUES ((SELECT rowid FROM " . MAIN_DB_PREFIX . "emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = " . ((int) $conf->entity) . "), 'candidature', '" . $this->db->escape($paramstring) . "', '" . $this->db->idate(dol_now()) . "', " . ((int) $user->id) . ", 1)";
 
                 $sql[] = $sqlforexampleC1;
 

Dolibarr/Modules/Adherent.php

Spacing +2 added lines, -2 removed lines

@@ -456,8 +456,8 @@
         }*/
 
         $sql = array(
-            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[0][2]) . "' AND type='member' AND entity = " . ((int)$conf->entity),
-            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[0][2]) . "','member'," . ((int)$conf->entity) . ")"
+            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[0][2]) . "' AND type='member' AND entity = " . ((int) $conf->entity),
+            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[0][2]) . "','member'," . ((int) $conf->entity) . ")"
         );
 
         return $this->_init($sql, $options);

Dolibarr/Modules/Propale.php

Spacing +2 added lines, -2 removed lines

@@ -509,8 +509,8 @@
         }
 
         $sql = array(
-            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[0][2]) . "' AND type = 'propal' AND entity = " . ((int)$conf->entity),
-            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[0][2]) . "','propal'," . ((int)$conf->entity) . ")",
+            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[0][2]) . "' AND type = 'propal' AND entity = " . ((int) $conf->entity),
+            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[0][2]) . "','propal'," . ((int) $conf->entity) . ")",
         );
 
         return $this->_init($sql, $options);