alxarafe / alixar

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);

Dolibarr/Modules/Recruitment.php

Spacing +4 added lines, -4 removed lines

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

Dolibarr/Modules/Service.php

Spacing +2 added lines, -2 removed lines

@@ -272,7 +272,7 @@ 
         $this->export_sql_start[$r] = 'SELECT DISTINCT ';
         $this->export_sql_end[$r] = ' FROM ' . MAIN_DB_PREFIX . 'product as p';
         if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-            $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int)$conf->entity);
+            $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
         }
         if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
             $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'categorie_product as cp ON cp.fk_product = p.rowid LEFT JOIN ' . MAIN_DB_PREFIX . 'categorie as cat ON cp.fk_categorie = cat.rowid';
@@ -421,7 +421,7 @@ 
                 $this->export_sql_start[$r] = 'SELECT DISTINCT ';
                 $this->export_sql_end[$r] = ' FROM ' . MAIN_DB_PREFIX . 'product as p';
                 if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-                    $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pac ON pac.fk_product = p.rowid AND pac.entity = " . ((int)$conf->entity);
+                    $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pac ON pac.fk_product = p.rowid AND pac.entity = " . ((int) $conf->entity);
                 }
                 $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product_extrafields as extra ON p.rowid = extra.fk_object,';
                 $this->export_sql_end[$r] .= ' ' . MAIN_DB_PREFIX . 'product_association as pa, ' . MAIN_DB_PREFIX . 'product as p2';

Dolibarr/Modules/Contrat.php

Spacing +2 added lines, -2 removed lines

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

Dolibarr/Modules/MultiCurrency.php

Spacing +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
                 'priority' => 61,
                 'label' => 'MutltiCurrencyAutoUpdateCurrencies',
                 'jobtype' => 'method',
-                'class' => 'multicurrency/class/multicurrency.class.php',   // TODO: Review. Is correct? The file no longer exists!
+                'class' => 'multicurrency/class/multicurrency.class.php', // TODO: Review. Is correct? The file no longer exists!
                 'objectname' => 'MultiCurrency',
                 'method' => 'syncRates',
                 'parameters' => '0,0,cron',

Dolibarr/Modules/Facture.php

Spacing +3 added lines, -3 removed lines

@@ -656,7 +656,7 @@ 
         $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'facturedet_extrafields as extra2 on fd.rowid = extra2.fk_object';
         $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product as p on (fd.fk_product = p.rowid)';
         if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-            $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int)$conf->entity);
+            $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
         }
         $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product_extrafields as extra3 on p.rowid = extra3.fk_object';
         $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'accounting_account as aa on fd.fk_code_ventilation = aa.rowid';
@@ -793,8 +793,8 @@ 
         }
 
         $sql = array(
-            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[1][2]) . "' AND type = 'invoice' AND entity = " . ((int)$conf->entity),
-            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[1][2]) . "','invoice'," . ((int)$conf->entity) . ")"
+            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[1][2]) . "' AND type = 'invoice' AND entity = " . ((int) $conf->entity),
+            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[1][2]) . "','invoice'," . ((int) $conf->entity) . ")"
         );
 
         return $this->_init($sql, $options);

Dolibarr/Modules/ExpenseReport.php

Spacing +2 added lines, -2 removed lines

@@ -266,8 +266,8 @@
         $this->remove($options);
 
         $sql = array(
-            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'standard' AND type='expensereport' AND entity = " . ((int)$conf->entity),
-            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('standard','expensereport'," . ((int)$conf->entity) . ")"
+            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'standard' AND type='expensereport' AND entity = " . ((int) $conf->entity),
+            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('standard','expensereport'," . ((int) $conf->entity) . ")"
         );
 
         return $this->_init($sql, $options);