Passed
Branch develop (3f4b05)
by Laurent
95:01
created
htdocs/core/boxes/box_shipments.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@
 block discarded – undo
109 109
 				$sql .= " AND e.fk_statut = 1";
110 110
 			}
111 111
 			if ($user->socid > 0) {
112
-				$sql.= " AND s.rowid = ".((int) $user->socid);
112
+				$sql .= " AND s.rowid = ".((int) $user->socid);
113 113
 			}
114 114
 			if (empty($user->rights->societe->client->voir) && !$user->socid) {
115 115
 				$sql .= " AND sc.fk_user = ".((int) $user->id);
Please login to merge, or discard this patch.
htdocs/core/boxes/box_contacts.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON sp.fk_pays = co.rowid";
102 102
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
103 103
 			if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
104
-				$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
104
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
105 105
 			}
106 106
 			if (empty($user->rights->societe->client->voir) && !$user->socid) {
107 107
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
Please login to merge, or discard this patch.
htdocs/viewimage.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -195,7 +195,7 @@
 block discarded – undo
195 195
 }
196 196
 
197 197
 // Security: Delete string ../ or ..\ into $original_file
198
-$original_file = preg_replace('/\.\.+/', '..', $original_file);	// Replace '... or more' with '..'
198
+$original_file = preg_replace('/\.\.+/', '..', $original_file); // Replace '... or more' with '..'
199 199
 $original_file = str_replace('../', '/', $original_file);
200 200
 $original_file = str_replace('..\\', '/', $original_file);
201 201
 
Please login to merge, or discard this patch.
htdocs/ticket/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
 	$upload_dir = $conf->ticket->dir_output."/".dol_sanitizeFileName($object->ref);
71 71
 }
72 72
 
73
-$permissiontoadd = $user->rights->ticket->write;	// Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
73
+$permissiontoadd = $user->rights->ticket->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
74 74
 
75 75
 // Security check - Protection if external user
76 76
 $result = restrictedArea($user, 'ticket', $object->id);
Please login to merge, or discard this patch.
htdocs/contact/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
 }
92 92
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
93 93
 
94
-$permissiontoadd = $user->rights->societe->contact->creer;	// Used by the include of actions_dellink.inc.php
94
+$permissiontoadd = $user->rights->societe->contact->creer; // Used by the include of actions_dellink.inc.php
95 95
 
96 96
 
97 97
 /*
Please login to merge, or discard this patch.
htdocs/multicurrency/class/multicurrency.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -644,7 +644,7 @@
 block discarded – undo
644 644
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
645 645
 
646 646
 		$urlendpoint = 'http://api.currencylayer.com/live?access_key='.$key;
647
-		$urlendpoint .= '&source=' . (empty($conf->global->MULTICURRENCY_APP_SOURCE) ? 'USD' : $conf->global->MULTICURRENCY_APP_SOURCE);
647
+		$urlendpoint .= '&source='.(empty($conf->global->MULTICURRENCY_APP_SOURCE) ? 'USD' : $conf->global->MULTICURRENCY_APP_SOURCE);
648 648
 
649 649
 		dol_syslog("Call url endpoint ".$urlendpoint);
650 650
 
Please login to merge, or discard this patch.
htdocs/contrat/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@
 block discarded – undo
84 84
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
85 85
 $hookmanager->initHooks(array('contractcard', 'globalcard'));
86 86
 
87
-$permissiontoadd = $user->rights->contrat->creer;	// Used by the include of actions_dellink.inc.php
87
+$permissiontoadd = $user->rights->contrat->creer; // Used by the include of actions_dellink.inc.php
88 88
 
89 89
 
90 90
 /*
Please login to merge, or discard this patch.
htdocs/core/tpl/extrafields_list_print_fields.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
 				$valuetoshow = $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey);
46 46
 				$title = dol_string_nohtmltag($valuetoshow);
47 47
 
48
-				print '<td'.($cssclass ? ' class="'.$cssclass.'"' : '');	// TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist'
48
+				print '<td'.($cssclass ? ' class="'.$cssclass.'"' : ''); // TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist'
49 49
 				print ' data-key="'.$extrafieldsobjectkey.'.'.$key.'"';
50 50
 				print ($title ? ' title="'.dol_escape_htmltag($title).'"' : '');
51 51
 				print '>';
Please login to merge, or discard this patch.
htdocs/expedition/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@
 block discarded – undo
76 76
 }
77 77
 $result = restrictedArea($user, 'expedition', $object->id, '');
78 78
 
79
-$permissiontoadd = $user->rights->expedition->creer;	// Used by the include of actions_dellink.inc.php
79
+$permissiontoadd = $user->rights->expedition->creer; // Used by the include of actions_dellink.inc.php
80 80
 
81 81
 
82 82
 /*
Please login to merge, or discard this patch.