Completed
Branch develop (26ba86)
by
unknown
16:46
created
htdocs/compta/bank/annuel.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -214,8 +214,8 @@
 block discarded – undo
214 214
 // Total debit-credit
215 215
 print '<tr class="liste_total"><td><b>'.$langs->trans("Total")."</b></td>";
216 216
 for ($annee = $year_start; $annee <= $year_end; $annee++) {
217
-	print '<td class="right nowraponall"><b>'. (isset($totsorties[$annee]) ? price($totsorties[$annee]) : '') .'</b></td>';
218
-	print '<td class="right nowraponall"><b>'. (isset($totentrees[$annee]) ? price($totentrees[$annee]) : '') .'</b></td>';
217
+	print '<td class="right nowraponall"><b>'.(isset($totsorties[$annee]) ? price($totsorties[$annee]) : '').'</b></td>';
218
+	print '<td class="right nowraponall"><b>'.(isset($totentrees[$annee]) ? price($totentrees[$annee]) : '').'</b></td>';
219 219
 }
220 220
 print "</tr>\n";
221 221
 
Please login to merge, or discard this patch.
htdocs/core/modules/mailings/xinputfile.modules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@
 block discarded – undo
113 113
 		$maxfilesizearray = getMaxFileSizeArray();
114 114
 		$maxmin = $maxfilesizearray['maxmin'];
115 115
 		if ($maxmin > 0) {
116
-			$s .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
116
+			$s .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
117 117
 		}
118 118
 		$s .= '<input type="file" name="username" class="flat">';
119 119
 		return $s;
Please login to merge, or discard this patch.
htdocs/comm/index.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -552,9 +552,9 @@
 block discarded – undo
552 552
 			while ($i < $nbofloop) {
553 553
 				$obj = $db->fetch_object($resql);
554 554
 
555
-				$fichinterstatic->id=$obj->rowid;
556
-				$fichinterstatic->ref=$obj->ref;
557
-				$fichinterstatic->statut=$obj->fk_statut;
555
+				$fichinterstatic->id = $obj->rowid;
556
+				$fichinterstatic->ref = $obj->ref;
557
+				$fichinterstatic->statut = $obj->fk_statut;
558 558
 
559 559
 				$companystatic->id = $obj->socid;
560 560
 				$companystatic->name = $obj->name;
Please login to merge, or discard this patch.
htdocs/projet/tasks/note.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -115,9 +115,9 @@
 block discarded – undo
115 115
 
116 116
 $now = dol_now();
117 117
 
118
-$title = $object->ref . ' - ' . $langs->trans("Notes");
118
+$title = $object->ref.' - '.$langs->trans("Notes");
119 119
 if (!empty($withproject)) {
120
-	$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '')  ;
120
+	$title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '');
121 121
 }
122 122
 $help_url = '';
123 123
 
Please login to merge, or discard this patch.
htdocs/projet/tasks/document.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -121,9 +121,9 @@
 block discarded – undo
121 121
  */
122 122
 $form = new Form($db);
123 123
 
124
-$title = $object->ref . ' - ' . $langs->trans("Documents");
124
+$title = $object->ref.' - '.$langs->trans("Documents");
125 125
 if (!empty($withproject)) {
126
-	$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '')  ;
126
+	$title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '');
127 127
 }
128 128
 $help_url = '';
129 129
 
Please login to merge, or discard this patch.
htdocs/projet/tasks/contact.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -146,9 +146,9 @@
 block discarded – undo
146 146
 $userstatic = new User($db);
147 147
 $result = $projectstatic->fetch($object->fk_project);
148 148
 
149
-$title = $object->ref . ' - ' . $langs->trans("Contacts");
149
+$title = $object->ref.' - '.$langs->trans("Contacts");
150 150
 if (!empty($withproject)) {
151
-	$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '')  ;
151
+	$title .= ' | '.$langs->trans("Project").(!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '');
152 152
 }
153 153
 $help_url = '';
154 154
 
Please login to merge, or discard this patch.
htdocs/public/test/test_buttons.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 		$actionType = 'delete';
63 63
 		$n++;
64 64
 		$id = 'mybuttonid'.$n;
65
-		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
65
+		$url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id;
66 66
 		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
67 67
 
68 68
 
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 		$actionType = 'danger';
71 71
 		$n++;
72 72
 		$id = 'mybuttonid'.$n;
73
-		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
73
+		$url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id;
74 74
 		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
75 75
 
76 76
 	?>
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 		$actionType = 'delete';
96 96
 		$n++;
97 97
 		$id = 'mybuttonid'.$n;
98
-		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
98
+		$url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id;
99 99
 		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
100 100
 
101 101
 
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 		$actionType = 'danger';
104 104
 		$n++;
105 105
 		$id = 'mybuttonid'.$n;
106
-		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
106
+		$url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id;
107 107
 		print dolGetButtonAction($label, $html, $actionType, $url, $id, $userRight);
108 108
 
109 109
 	?>
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 		$actionType = 'delete';
135 135
 		$n++;
136 136
 		$id = 'mybuttonid'.$n;
137
-		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
137
+		$url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id;
138 138
 
139 139
 		$params = array(
140 140
 			'confirm' => array(
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 		$actionType = 'delete';
174 174
 		$n++;
175 175
 		$id = 'mybuttonid'.$n;
176
-		$url = $_SERVER['PHP_SELF'] . '?token='.newToken().'#'.$id;
176
+		$url = $_SERVER['PHP_SELF'].'?token='.newToken().'#'.$id;
177 177
 
178 178
 		$params = array(
179 179
 			'confirm' => array(
Please login to merge, or discard this patch.
htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 		$maxfilesizearray = getMaxFileSizeArray();
182 182
 		$maxmin = $maxfilesizearray['maxmin'];
183 183
 		if ($maxmin > 0) {
184
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
184
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
185 185
 		}
186 186
 		$texte .= ' <input type="file" name="uploadfile">';
187 187
 		$texte .= '<input type="hidden" value="PRODUCT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
279 279
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
280 280
 
281
-				$newfiletmp = $objectref . '_' . $newfiletmp;
281
+				$newfiletmp = $objectref.'_'.$newfiletmp;
282 282
 
283 283
 				// Get extension (ods or odt)
284 284
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -287,11 +287,11 @@  discard block
 block discarded – undo
287 287
 					if ($format == '1') {
288 288
 						$format = '%Y%m%d%H%M%S';
289 289
 					}
290
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
290
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
291 291
 				} else {
292
-					$filename = $newfiletmp . '.' . $newfileformat;
292
+					$filename = $newfiletmp.'.'.$newfileformat;
293 293
 				}
294
-				$file = $dir . '/' . $filename;
294
+				$file = $dir.'/'.$filename;
295 295
 				//print "newdir=".$dir;
296 296
 				//print "newfile=".$newfile;
297 297
 				//print "file=".$file;
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
 				dol_mkdir($conf->product->dir_temp);
301 301
 				if (!is_writable($conf->product->dir_temp)) {
302 302
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->product->dir_temp);
303
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
303
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
304 304
 					return -1;
305 305
 				}
306 306
 
Please login to merge, or discard this patch.
modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
298 298
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
299 299
 
300
-				$newfiletmp = $objectref . '_' . $newfiletmp;
300
+				$newfiletmp = $objectref.'_'.$newfiletmp;
301 301
 
302 302
 				// Get extension (ods or odt)
303 303
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -306,11 +306,11 @@  discard block
 block discarded – undo
306 306
 					if ($format == '1') {
307 307
 						$format = '%Y%m%d%H%M%S';
308 308
 					}
309
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
309
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
310 310
 				} else {
311
-					$filename = $newfiletmp . '.' . $newfileformat;
311
+					$filename = $newfiletmp.'.'.$newfileformat;
312 312
 				}
313
-				$file = $dir . '/' . $filename;
313
+				$file = $dir.'/'.$filename;
314 314
 				//print "newdir=".$dir;
315 315
 				//print "newfile=".$newfile;
316 316
 				//print "file=".$file;
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 				dol_mkdir($conf->supplier_proposal->dir_temp);
320 320
 				if (!is_writable($conf->supplier_proposal->dir_temp)) {
321 321
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->supplier_proposal->dir_temp);
322
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
322
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
323 323
 					return -1;
324 324
 				}
325 325
 
Please login to merge, or discard this patch.