alxarafe / alixar

public/htdocs/user/group/perms.php

Spacing +3 added lines, -3 removed lines

@@ -153,8 +153,8 @@ 
     $sql .= " FROM " . MAIN_DB_PREFIX . "rights_def as r,";
     $sql .= " " . MAIN_DB_PREFIX . "usergroup_rights as gr";
     $sql .= " WHERE gr.fk_id = r.id";
-    $sql .= " AND gr.entity = " . ((int)$entity);
-    $sql .= " AND gr.fk_usergroup = " . ((int)$object->id);
+    $sql .= " AND gr.entity = " . ((int) $entity);
+    $sql .= " AND gr.fk_usergroup = " . ((int) $object->id);
 
     dol_syslog("get user perms", LOG_DEBUG);
     $result = $db->query($sql);
@@ -260,7 +260,7 @@ 
     $sql = "SELECT r.id, r.libelle as label, r.module, r.perms, r.subperms, r.module_position, r.bydefault";
     $sql .= " FROM " . MAIN_DB_PREFIX . "rights_def as r";
     $sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
-    $sql .= " AND r.entity = " . ((int)$entity);
+    $sql .= " AND r.entity = " . ((int) $entity);
     if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
         $sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is disable
     }

public/htdocs/core/lib/admin.lib.php

Spacing +12 added lines, -12 removed lines

@@ -317,8 +317,8 @@ 
             // with
             // 'INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1401 + 200100000, 'PCG99-ABREGE','CAPIT', '1234', 1400 + 200100000,...'
             // Note: string with 'PCG99-ABREGE','CAPIT', 1234  instead of  'PCG99-ABREGE','CAPIT', '1234' is also supported
-            $newsql = preg_replace('/VALUES\s*\(__ENTITY__, \s*(\d+)\s*,(\s*\'[^\',]*\'\s*,\s*\'[^\',]*\'\s*,\s*\'?[^\',]*\'?\s*),\s*\'?([^\',]*)\'?/ims', 'VALUES (__ENTITY__, \1 + ' . ((int)$offsetforchartofaccount) . ', \2, \3 + ' . ((int)$offsetforchartofaccount), $newsql);
-            $newsql = preg_replace('/([,\s])0 \+ ' . ((int)$offsetforchartofaccount) . '/ims', '\1 0', $newsql);
+            $newsql = preg_replace('/VALUES\s*\(__ENTITY__, \s*(\d+)\s*,(\s*\'[^\',]*\'\s*,\s*\'[^\',]*\'\s*,\s*\'?[^\',]*\'?\s*),\s*\'?([^\',]*)\'?/ims', 'VALUES (__ENTITY__, \1 + ' . ((int) $offsetforchartofaccount) . ', \2, \3 + ' . ((int) $offsetforchartofaccount), $newsql);
+            $newsql = preg_replace('/([,\s])0 \+ ' . ((int) $offsetforchartofaccount) . '/ims', '\1 0', $newsql);
             //var_dump($newsql);
             $arraysql[$i] = $newsql;
 
@@ -417,7 +417,7 @@ 
                 $sql = preg_replace('/__DATABASE__/i', $db->escape($database), $sql);
             }
 
-            $newsql = preg_replace('/__ENTITY__/i', (!empty($entity) ? $entity : (string)$conf->entity), $sql);
+            $newsql = preg_replace('/__ENTITY__/i', (!empty($entity) ? $entity : (string) $conf->entity), $sql);
 
             // Add log of request
             if (!$silent) {
@@ -594,11 +594,11 @@ 
     $sql = "DELETE FROM " . MAIN_DB_PREFIX . "const";
     $sql .= " WHERE (" . $db->decrypt('name') . " = '" . $db->escape($name) . "'";
     if (is_numeric($name)) {
-        $sql .= " OR rowid = " . ((int)$name);
+        $sql .= " OR rowid = " . ((int) $name);
     }
     $sql .= ")";
     if ($entity >= 0) {
-        $sql .= " AND entity = " . ((int)$entity);
+        $sql .= " AND entity = " . ((int) $entity);
     }
 
     dol_syslog("admin.lib::dolibarr_del_const", LOG_DEBUG);
@@ -629,7 +629,7 @@ 
     $sql = "SELECT " . $db->decrypt('value') . " as value";
     $sql .= " FROM " . MAIN_DB_PREFIX . "const";
     $sql .= " WHERE name = " . $db->encrypt($name);
-    $sql .= " AND entity = " . ((int)$entity);
+    $sql .= " AND entity = " . ((int) $entity);
 
     dol_syslog("admin.lib::dolibarr_get_const", LOG_DEBUG);
     $resql = $db->query($sql);
@@ -678,7 +678,7 @@ 
     $sql = "DELETE FROM " . MAIN_DB_PREFIX . "const";
     $sql .= " WHERE name = " . $db->encrypt($name);
     if ($entity >= 0) {
-        $sql .= " AND entity = " . ((int)$entity);
+        $sql .= " AND entity = " . ((int) $entity);
     }
 
     dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);
@@ -700,7 +700,7 @@ 
         $sql .= " VALUES (";
         $sql .= $db->encrypt($name);
         $sql .= ", " . $db->encrypt($newvalue);
-        $sql .= ", '" . $db->escape($type) . "', " . ((int)$visible) . ", '" . $db->escape($note) . "', " . ((int)$entity) . ")";
+        $sql .= ", '" . $db->escape($type) . "', " . ((int) $visible) . ", '" . $db->escape($note) . "', " . ((int) $entity) . ")";
 
         //print "sql".$value."-".pg_escape_string($value)."-".$sql;exit;
         //print "xx".$db->escape($value);
@@ -862,7 +862,7 @@ 
     $sql = "SELECT COUNT(r.id) as nb";
     $sql .= " FROM " . MAIN_DB_PREFIX . "rights_def as r";
     $sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
-    $sql .= " AND entity = " . ((int)$conf->entity);
+    $sql .= " AND entity = " . ((int) $conf->entity);
     $sql .= " AND bydefault = 1";
     if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
         $sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
@@ -1695,7 +1695,7 @@ 
             $obj = $db->fetch_object($result); // Take first result of select
 
             if (empty($obj)) {  // If not yet into table
-                $obj = (object)array('rowid' => '', 'name' => $const, 'value' => '', 'type' => $type, 'note' => '');
+                $obj = (object) array('rowid' => '', 'name' => $const, 'value' => '', 'type' => $type, 'note' => '');
             }
 
             if (empty($strictw3c)) {
@@ -1895,7 +1895,7 @@ 
     $db->begin();
 
     $sql = "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity, libelle, description)";
-    $sql .= " VALUES ('" . $db->escape($name) . "','" . $db->escape($type) . "'," . ((int)$conf->entity) . ", ";
+    $sql .= " VALUES ('" . $db->escape($name) . "','" . $db->escape($type) . "'," . ((int) $conf->entity) . ", ";
     $sql .= ($label ? "'" . $db->escape($label) . "'" : 'null') . ", ";
     $sql .= (!empty($description) ? "'" . $db->escape($description) . "'" : "null");
     $sql .= ")";
@@ -1928,7 +1928,7 @@ 
     $sql = "DELETE FROM " . MAIN_DB_PREFIX . "document_model";
     $sql .= " WHERE nom = '" . $db->escape($name) . "'";
     $sql .= " AND type = '" . $db->escape($type) . "'";
-    $sql .= " AND entity = " . ((int)$conf->entity);
+    $sql .= " AND entity = " . ((int) $conf->entity);
 
     dol_syslog("admin.lib::delDocumentModel", LOG_DEBUG);
     $resql = $db->query($sql);

Dolibarr/Modules/Api.php

Spacing +5 added lines, -5 removed lines

@@ -143,11 +143,11 @@ 
 
         // Add here list of permission defined by an id, a label, a boolean and two constant strings.
         // Example:
-        $this->rights[$r][0] = $this->numero + $r;  // Permission id (must not be already used)
+        $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
         $this->rights[$r][1] = 'Generate/modify users API key'; // Permission label
-        $this->rights[$r][3] = 0;                   // Permission by default for new user (0/1)
-        $this->rights[$r][4] = 'apikey';                // In php code, permission will be checked by test if ($user->hasRight('permkey','level1','level2'))
-        $this->rights[$r][5] = 'generate';              // In php code, permission will be checked by test if ($user->hasRight('permkey','level1','level2'))
+        $this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+        $this->rights[$r][4] = 'apikey'; // In php code, permission will be checked by test if ($user->hasRight('permkey','level1','level2'))
+        $this->rights[$r][5] = 'generate'; // In php code, permission will be checked by test if ($user->hasRight('permkey','level1','level2'))
         $r++;
 
 
@@ -230,7 +230,7 @@ 
     {
         // Remove old constants with entity fields different of 0
         $sql = array(
-            "DELETE FROM " . MAIN_DB_PREFIX . "const WHERE name = " . $this->db->encrypt('MAIN_MODULE_API'),      // API can't be enabled per environment. Why ?
+            "DELETE FROM " . MAIN_DB_PREFIX . "const WHERE name = " . $this->db->encrypt('MAIN_MODULE_API'), // API can't be enabled per environment. Why ?
             "DELETE FROM " . MAIN_DB_PREFIX . "const WHERE name = " . $this->db->encrypt('API_PRODUCTION_MODE')   // Not in production mode by default at activation
         );
 

Dolibarr/Modules/EventOrganization.php

Spacing +46 added lines, -46 removed lines

@@ -236,82 +236,82 @@ 
         /* END MODULEBUILDER TOPMENU */
         /* BEGIN MODULEBUILDER LEFTMENU CONFERENCEORBOOTH*/
         $this->menu[$r++] = array(
-            'fk_menu' => 'fk_mainmenu=project',     // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'type' => 'left',                           // This is a Left menu entry
+            'fk_menu' => 'fk_mainmenu=project', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+            'type' => 'left', // This is a Left menu entry
             'titre' => 'EventOrganizationMenuLeft',
             'prefix' => img_picto('', 'eventorganization', 'class="paddingright pictofixedwidth"'),
             'mainmenu' => 'project',
             'leftmenu' => 'eventorganization',
             'url' => '',
-            'langs' => 'eventorganization',         // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
             'position' => 1000 + $r,
-            'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-            'perms' => '$user->hasRight("eventorganization", "read")',                          // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+            'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+            'perms' => '$user->hasRight("eventorganization", "read")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
             'target' => '',
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
         );
         $this->menu[$r++] = array(
-            'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization',       // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'type' => 'left',                           // This is a Left menu entry
+            'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+            'type' => 'left', // This is a Left menu entry
             'titre' => 'New',
             'url' => '/projet/card.php?leftmenu=projects&action=create&usage_organize_event=1&usage_opportunity=0',
-            'langs' => 'eventorganization@eventorganization',           // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs' => 'eventorganization@eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
             'position' => 1000 + $r,
-            'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-            'perms' => '$user->hasRight("eventorganization", "write")',                         // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+            'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+            'perms' => '$user->hasRight("eventorganization", "write")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
             'target' => '',
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
         );
         $this->menu[$r++] = array(
-            'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization',       // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'type' => 'left',                           // This is a Left menu entry
+            'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+            'type' => 'left', // This is a Left menu entry
             'titre' => 'List',
             'url' => '/projet/list.php?search_usage_event_organization=1&search_status=99&mainmenu=project&contextpage=organizedevents',
-            'langs' => 'eventorganization@eventorganization',           // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs' => 'eventorganization@eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
             'position' => 1000 + $r,
-            'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-            'perms' => '$user->hasRight("eventorganization", "write")',                         // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+            'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+            'perms' => '$user->hasRight("eventorganization", "write")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
             'target' => '',
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
         );
         $this->menu[$r++] = array(
-            'fk_menu' => 'fk_mainmenu=project',     // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'type' => 'left',                           // This is a Left menu entry
+            'fk_menu' => 'fk_mainmenu=project', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+            'type' => 'left', // This is a Left menu entry
             'titre' => 'ConferenceOrBooth',
             'prefix' => img_picto('', 'conferenceorbooth', 'class="paddingright pictofixedwidth"'),
             'mainmenu' => 'project',
             'leftmenu' => 'eventorganizationconforbooth',
             'url' => '',
-            'langs' => 'eventorganization',         // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
             'position' => 1000 + $r,
-            'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-            'perms' => '$user->hasRight("eventorganization", "read")',                          // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+            'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+            'perms' => '$user->hasRight("eventorganization", "read")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
             'target' => '',
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
         );
         $this->menu[$r++] = array(
-            'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth',        // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'type' => 'left',                           // This is a Left menu entry
+            'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+            'type' => 'left', // This is a Left menu entry
             'titre' => 'New',
             'url' => '/eventorganization/conferenceorbooth_card.php?leftmenu=projects&action=create',
-            'langs' => 'eventorganization',         // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
             'position' => 1000 + $r,
-            'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-            'perms' => '$user->hasRight("eventorganization", "write")',                         // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+            'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+            'perms' => '$user->hasRight("eventorganization", "write")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
             'target' => '',
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
         );
         $this->menu[$r++] = array(
-            'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth',        // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'type' => 'left',                           // This is a Left menu entry
+            'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+            'type' => 'left', // This is a Left menu entry
             'titre' => 'List',
             'url' => '/eventorganization/conferenceorbooth_list.php?mainmenu=project',
-            'langs' => 'eventorganization',         // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
             'position' => 1000 + $r,
-            'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-            'perms' => '$user->hasRight("eventorganization", "read")',                          // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+            'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+            'perms' => '$user->hasRight("eventorganization", "read")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
             'target' => '',
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
         );
         /* END MODULEBUILDER LEFTMENU CONFERENCEORBOOTH */
 
@@ -329,8 +329,8 @@ 
         $keyforelement = 'conferenceorboothattendee';
         include DOL_DOCUMENT_ROOT . '/core/commonfieldsinexport.inc.php';
         $this->export_entities_array[$r]['t.fk_invoice'] = 'invoice';
-        unset($this->export_fields_array[$r]['t.fk_project']);  // Remove field so we can add it at end just after
-        unset($this->export_fields_array[$r]['t.fk_soc']);  // Remove field so we can add it at end just after
+        unset($this->export_fields_array[$r]['t.fk_project']); // Remove field so we can add it at end just after
+        unset($this->export_fields_array[$r]['t.fk_soc']); // Remove field so we can add it at end just after
         $this->export_fields_array[$r]['t.fk_invoice'] = 'InvoiceId';
         $this->export_fields_array[$r]['t.fk_project'] = 'ProjectId';
         $this->export_fields_array[$r]['p.ref'] = 'ProjectRef';
@@ -362,16 +362,16 @@ 
         /* BEGIN MODULEBUILDER EXPORT CONFERENCEORBOOTH */
         $langs->load("eventorganization");
         $this->export_code[$r] = $this->rights_class . '_' . $r;
-        $this->export_label[$r] = 'ListOfConfOrBoothOfEvent';   // Translation key (used only if key ExportDataset_xxx_z not found)
+        $this->export_label[$r] = 'ListOfConfOrBoothOfEvent'; // Translation key (used only if key ExportDataset_xxx_z not found)
         $this->export_icon[$r] = 'conferenceorbooth';
         // Define $this->export_fields_array, $this->export_TypeFields_array and $this->export_entities_array
         $keyforclass = 'ConferenceOrBooth';
         $keyforclassfile = '/eventorganization/class/conferenceorbooth.class.php';
         $keyforelement = 'conferenceorbooth';
         include DOL_DOCUMENT_ROOT . '/core/commonfieldsinexport.inc.php';
-        unset($this->export_fields_array[$r]['t.fk_action']);   // Remove field so we can add it at end just after
-        unset($this->export_fields_array[$r]['t.fk_project']);  // Remove field so we can add it at end just after
-        unset($this->export_fields_array[$r]['t.fk_soc']);  // Remove field so we can add it at end just after
+        unset($this->export_fields_array[$r]['t.fk_action']); // Remove field so we can add it at end just after
+        unset($this->export_fields_array[$r]['t.fk_project']); // Remove field so we can add it at end just after
+        unset($this->export_fields_array[$r]['t.fk_soc']); // Remove field so we can add it at end just after
         $this->export_fields_array[$r]['t.fk_action'] = 'ConferenceOrBoothFormatID';
         $this->export_fields_array[$r]['ca.code'] = 'ConferenceOrBoothFormatCode';
         $this->export_fields_array[$r]['ca.libelle'] = 'ConferenceOrBoothFormatLabel';
@@ -471,10 +471,10 @@ 
                 }
 
                 $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 = '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 = '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) . ")"
                 ));
             }
         }

Dolibarr/Modules/Reception.php

Spacing +2 added lines, -2 removed lines

@@ -287,8 +287,8 @@
         $sql = array();
 
         $sql = array(
-            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[0][2]) . "' AND type = 'reception' AND entity = " . ((int)$conf->entity),
-            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[0][2]) . "','reception'," . ((int)$conf->entity) . ")",
+            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[0][2]) . "' AND type = 'reception' AND entity = " . ((int) $conf->entity),
+            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[0][2]) . "','reception'," . ((int) $conf->entity) . ")",
             //"DELETE FROM ".MAIN_DB_PREFIX."const WHERE name IN ('STOCK_CALCULATE_ON_SUPPLIER_BILL', 'STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER', 'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER', 'STOCK_CALCULATE_ON_RECEPTION', 'STOCK_CALCULATE_ON_RECEPTION_CLOSE') AND entity = ".((int) $conf->entity),
             //"INSERT INTO ".MAIN_DB_PREFIX."const (name, value, entity) VALUES ('STOCK_CALCULATE_ON_RECEPTION_CLOSE', 1, ".((int) $conf->entity).")"
         );

Dolibarr/Modules/Ficheinter.php

Spacing +2 added lines, -2 removed lines

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

Dolibarr/Modules/StockTransfer.php

Spacing +3 added lines, -3 removed lines

@@ -448,21 +448,21 @@
         $res = $this->db->fetch_object($resql);
         $nextid = $this->getNextId();
         if (empty($res)) {
-            $this->db->query("INSERT INTO " . MAIN_DB_PREFIX . "c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(" . ((int)$nextid) . ", 'stocktransfer', 'internal', 'STRESP', 'Responsible for stock transfers', 1, NULL, 0)");
+            $this->db->query("INSERT INTO " . MAIN_DB_PREFIX . "c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(" . ((int) $nextid) . ", 'stocktransfer', 'internal', 'STRESP', 'Responsible for stock transfers', 1, NULL, 0)");
         }
 
         $resql = $this->db->query("SELECT rowid FROM " . MAIN_DB_PREFIX . "c_type_contact WHERE code = 'STFROM' AND element = 'stocktransfer' AND source = 'external'");
         $res = $this->db->fetch_object($resql);
         $nextid = $this->getNextId();
         if (empty($res)) {
-            $this->db->query("INSERT INTO " . MAIN_DB_PREFIX . "c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(" . ((int)$nextid) . ", 'stocktransfer', 'external', 'STFROM', 'Contact sending the stock transfer', 1, NULL, 0)");
+            $this->db->query("INSERT INTO " . MAIN_DB_PREFIX . "c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(" . ((int) $nextid) . ", 'stocktransfer', 'external', 'STFROM', 'Contact sending the stock transfer', 1, NULL, 0)");
         }
 
         $resql = $this->db->query("SELECT rowid FROM " . MAIN_DB_PREFIX . "c_type_contact WHERE code = 'STDEST' AND element = 'stocktransfer' AND source = 'external'");
         $res = $this->db->fetch_object($resql);
         $nextid = $this->getNextId();
         if (empty($res)) {
-            $this->db->query("INSERT INTO " . MAIN_DB_PREFIX . "c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(" . ((int)$nextid) . ", 'stocktransfer', 'external', 'STDEST', 'Contact receiving the stock transfer', 1, NULL, 0)");
+            $this->db->query("INSERT INTO " . MAIN_DB_PREFIX . "c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES(" . ((int) $nextid) . ", 'stocktransfer', 'external', 'STDEST', 'Contact receiving the stock transfer', 1, NULL, 0)");
         }
 
         return $this->_init($sql, $options);

Dolibarr/Modules/Expedition.php

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
      */
     public function __construct($db)
     {
-        global $conf, $user;    // $conf is required by /core/extrafieldsinexport.inc.php
+        global $conf, $user; // $conf is required by /core/extrafieldsinexport.inc.php
 
         $this->db = $db;
         $this->numero = 80;
@@ -365,10 +365,10 @@ 
         $sql = array();
 
         $sql = array(
-            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[0][2]) . "' AND type = 'shipping' AND entity = " . ((int)$conf->entity),
-            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[0][2]) . "', 'shipping', " . ((int)$conf->entity) . ")",
-            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[3][2]) . "' AND type = 'delivery' AND entity = " . ((int)$conf->entity),
-            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[3][2]) . "', 'delivery', " . ((int)$conf->entity) . ")",
+            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[0][2]) . "' AND type = 'shipping' AND entity = " . ((int) $conf->entity),
+            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[0][2]) . "', 'shipping', " . ((int) $conf->entity) . ")",
+            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[3][2]) . "' AND type = 'delivery' AND entity = " . ((int) $conf->entity),
+            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[3][2]) . "', 'delivery', " . ((int) $conf->entity) . ")",
             //"DELETE FROM ".MAIN_DB_PREFIX."const WHERE name IN ('STOCK_CALCULATE_ON_BILL', 'STOCK_CALCULATE_ON_VALIDATE_ORDER', 'STOCK_CALCULATE_ON_SHIPMENT', 'STOCK_CALCULATE_ON_SHIPMENT_CLOSE') AND entity = ".((int) $conf->entity),
             //"INSERT INTO ".MAIN_DB_PREFIX."const (name, value, entity) VALUES ('STOCK_CALCULATE_ON_SHIPMENT_CLOSE', 1, ".((int) $conf->entity).")"
         );

Dolibarr/Modules/Workstation.php

Spacing +4 added lines, -4 removed lines

@@ -419,10 +419,10 @@
                 }
 
                 $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 = '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 = '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) . ")"
                 ));
             }
         }