@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | $maxfilesizearray = getMaxFileSizeArray(); |
202 | 202 | $maxmin = $maxfilesizearray['maxmin']; |
203 | 203 | if ($maxmin > 0) { |
204 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
204 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
205 | 205 | } |
206 | 206 | $texte .= ' <input type="file" name="uploadfile">'; |
207 | 207 | $texte .= '<input type="hidden" value="USER_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -297,7 +297,7 @@ discard block |
||
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 |
||
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 |
||
319 | 319 | dol_mkdir($conf->user->dir_temp); |
320 | 320 | if (!is_writable($conf->user->dir_temp)) { |
321 | 321 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->user->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 |
@@ -188,11 +188,11 @@ |
||
188 | 188 | dol_mkdir($conf->barcode->dir_temp); |
189 | 189 | if (!is_writable($conf->barcode->dir_temp)) { |
190 | 190 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->barcode->dir_temp); |
191 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
191 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
192 | 192 | return -1; |
193 | 193 | } |
194 | 194 | |
195 | - $file = $conf->barcode->dir_temp . '/barcode_' . $code . '_' . $encoding . '.png'; |
|
195 | + $file = $conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png'; |
|
196 | 196 | |
197 | 197 | $filebarcode = $file; // global var to be used in barcode_outimage called by barcode_print in buildBarCode |
198 | 198 |
@@ -160,11 +160,11 @@ |
||
160 | 160 | dol_mkdir($conf->barcode->dir_temp); |
161 | 161 | if (!is_writable($conf->barcode->dir_temp)) { |
162 | 162 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->barcode->dir_temp); |
163 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
163 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
164 | 164 | return -1; |
165 | 165 | } |
166 | 166 | |
167 | - $file = $conf->barcode->dir_temp . '/barcode_' . $code . '_' . $encoding . '.png'; |
|
167 | + $file = $conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png'; |
|
168 | 168 | |
169 | 169 | $tcpdfEncoding = $this->getTcpdfEncodingType($encoding); |
170 | 170 | if (empty($tcpdfEncoding)) { |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | $maxfilesizearray = getMaxFileSizeArray(); |
171 | 171 | $maxmin = $maxfilesizearray['maxmin']; |
172 | 172 | if ($maxmin > 0) { |
173 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
173 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
174 | 174 | } |
175 | 175 | $texte .= ' <input type="file" name="uploadfile">'; |
176 | 176 | $texte .= '<input type="hidden" value="CONTRACT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
267 | 267 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
268 | 268 | |
269 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
269 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
270 | 270 | |
271 | 271 | // Get extension (ods or odt) |
272 | 272 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
@@ -275,11 +275,11 @@ discard block |
||
275 | 275 | if ($format == '1') { |
276 | 276 | $format = '%Y%m%d%H%M%S'; |
277 | 277 | } |
278 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
278 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
279 | 279 | } else { |
280 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
280 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
281 | 281 | } |
282 | - $file = $dir . '/' . $filename; |
|
282 | + $file = $dir.'/'.$filename; |
|
283 | 283 | //print "newdir=".$dir; |
284 | 284 | //print "newfile=".$newfile; |
285 | 285 | //print "file=".$file; |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | dol_mkdir($conf->contrat->dir_temp); |
289 | 289 | if (!is_writable($conf->contrat->dir_temp)) { |
290 | 290 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->contrat->dir_temp); |
291 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
291 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
292 | 292 | return -1; |
293 | 293 | } |
294 | 294 |
@@ -285,7 +285,7 @@ |
||
285 | 285 | dol_mkdir($conf->asset->dir_temp); |
286 | 286 | if (!is_writable($conf->asset->dir_temp)) { |
287 | 287 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->asset->dir_temp); |
288 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
288 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
289 | 289 | return -1; |
290 | 290 | } |
291 | 291 |
@@ -374,7 +374,7 @@ |
||
374 | 374 | echo <<<EOF |
375 | 375 | <script type="text/javascript"> |
376 | 376 | (function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})(); |
377 | -EOF; |
|
377 | +eof; |
|
378 | 378 | |
379 | 379 | if ($errorNumber && $errorNumber != 201) { |
380 | 380 | $fileUrl = ""; |
@@ -24,7 +24,7 @@ |
||
24 | 24 | |
25 | 25 | ob_start(); |
26 | 26 | |
27 | -require 'config.inc.php'; // This include the main.inc.php |
|
27 | +require 'config.inc.php'; // This include the main.inc.php |
|
28 | 28 | require 'connector.lib.php'; |
29 | 29 | |
30 | 30 | if (!$Config['Enabled']) { |
@@ -550,7 +550,7 @@ |
||
550 | 550 | $langs->load($reg[1]); |
551 | 551 | } |
552 | 552 | |
553 | - $labeltoshow = preg_replace('/:.*$/', '', $object->label); |
|
553 | + $labeltoshow = preg_replace('/:.*$/', '', $object->label); |
|
554 | 554 | |
555 | 555 | $morehtmlref = '<div class="refidno">'; |
556 | 556 | $morehtmlref .= $langs->trans($labeltoshow); |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | print '<tr class="oddeven value">'; |
279 | 279 | // Param |
280 | 280 | print '<td>'; |
281 | -print img_picto('', 'bill', 'class="pictofixedwidth"') . $langs->trans('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT'); |
|
281 | +print img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT'); |
|
282 | 282 | print '</td>'; |
283 | 283 | // Value |
284 | 284 | print '<td class="right">'; // Do not force class=right, or it align also the content of the select box |
@@ -288,13 +288,13 @@ discard block |
||
288 | 288 | |
289 | 289 | if (isModEnabled('societe') && getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT') && getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT') != '-1') { |
290 | 290 | print '<tr class="oddeven">'; |
291 | - print '<td>' . img_picto('', 'bill', 'class="pictofixedwidth"') . $langs->trans("UseAuxiliaryAccountOnCustomerDeposit") . '</td>'; |
|
291 | + print '<td>'.img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("UseAuxiliaryAccountOnCustomerDeposit").'</td>'; |
|
292 | 292 | if (getDolGlobalInt('ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT')) { |
293 | - print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=0">'; |
|
293 | + print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=0">'; |
|
294 | 294 | print img_picto($langs->trans("Activated"), 'switch_on', '', false, 0, 0, '', 'warning'); |
295 | 295 | print '</a></td>'; |
296 | 296 | } else { |
297 | - print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=1">'; |
|
297 | + print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=1">'; |
|
298 | 298 | print img_picto($langs->trans("Disabled"), 'switch_off'); |
299 | 299 | print '</a></td>'; |
300 | 300 | } |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | print '<tr class="oddeven value">'; |
306 | 306 | // Param |
307 | 307 | print '<td>'; |
308 | -print img_picto('', 'supplier_invoice', 'class="pictofixedwidth"') . $langs->trans('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT'); |
|
308 | +print img_picto('', 'supplier_invoice', 'class="pictofixedwidth"').$langs->trans('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT'); |
|
309 | 309 | print '</td>'; |
310 | 310 | // Value |
311 | 311 | print '<td class="right">'; // Do not force class=right, or it align also the content of the select box |
@@ -315,13 +315,13 @@ discard block |
||
315 | 315 | |
316 | 316 | if (isModEnabled('societe') && getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT') && getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT') != '-1') { |
317 | 317 | print '<tr class="oddeven">'; |
318 | - print '<td>' . img_picto('', 'supplier_invoice', 'class="pictofixedwidth"') . $langs->trans("UseAuxiliaryAccountOnSupplierDeposit") . '</td>'; |
|
318 | + print '<td>'.img_picto('', 'supplier_invoice', 'class="pictofixedwidth"').$langs->trans("UseAuxiliaryAccountOnSupplierDeposit").'</td>'; |
|
319 | 319 | if (getDolGlobalInt('ACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT')) { |
320 | - print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=0">'; |
|
320 | + print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=0">'; |
|
321 | 321 | print img_picto($langs->trans("Activated"), 'switch_on', '', false, 0, 0, '', 'warning'); |
322 | 322 | print '</a></td>'; |
323 | 323 | } else { |
324 | - print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=1">'; |
|
324 | + print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=1">'; |
|
325 | 325 | print img_picto($langs->trans("Disabled"), 'switch_off'); |
326 | 326 | print '</a></td>'; |
327 | 327 | } |