@@ -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->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 | |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | $maxfilesizearray = getMaxFileSizeArray(); |
| 217 | 217 | $maxmin = $maxfilesizearray['maxmin']; |
| 218 | 218 | if ($maxmin > 0) { |
| 219 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 219 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 220 | 220 | } |
| 221 | 221 | $texte .= ' <input type="file" name="uploadfile">'; |
| 222 | 222 | $texte .= '<input type="hidden" value="PROPALE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -311,7 +311,7 @@ discard block |
||
| 311 | 311 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
| 312 | 312 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
| 313 | 313 | |
| 314 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
| 314 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
| 315 | 315 | |
| 316 | 316 | // Get extension (ods or odt) |
| 317 | 317 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
@@ -320,11 +320,11 @@ discard block |
||
| 320 | 320 | if ($format == '1') { |
| 321 | 321 | $format = '%Y%m%d%H%M%S'; |
| 322 | 322 | } |
| 323 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
| 323 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
| 324 | 324 | } else { |
| 325 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
| 325 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
| 326 | 326 | } |
| 327 | - $file = $dir . '/' . $filename; |
|
| 327 | + $file = $dir.'/'.$filename; |
|
| 328 | 328 | //print "newdir=".$dir; |
| 329 | 329 | //print "newfile=".$newfile; |
| 330 | 330 | //print "file=".$file; |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | dol_mkdir($conf->propal->multidir_temp[$object->entity]); |
| 334 | 334 | if (!is_writable($conf->propal->dir_temp)) { |
| 335 | 335 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->propal->dir_temp); |
| 336 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
| 336 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
| 337 | 337 | return -1; |
| 338 | 338 | } |
| 339 | 339 | |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | $maxfilesizearray = getMaxFileSizeArray(); |
| 174 | 174 | $maxmin = $maxfilesizearray['maxmin']; |
| 175 | 175 | if ($maxmin > 0) { |
| 176 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 176 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 177 | 177 | } |
| 178 | 178 | $texte .= ' <input type="file" name="uploadfile">'; |
| 179 | 179 | $texte .= '<input type="hidden" value="MEMBER_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
| 269 | 269 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
| 270 | 270 | |
| 271 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
| 271 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
| 272 | 272 | |
| 273 | 273 | // Get extension (ods or odt) |
| 274 | 274 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
@@ -277,11 +277,11 @@ discard block |
||
| 277 | 277 | if ($format == '1') { |
| 278 | 278 | $format = '%Y%m%d%H%M%S'; |
| 279 | 279 | } |
| 280 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
| 280 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
| 281 | 281 | } else { |
| 282 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
| 282 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
| 283 | 283 | } |
| 284 | - $file = $dir . '/' . $filename; |
|
| 284 | + $file = $dir.'/'.$filename; |
|
| 285 | 285 | //print "newdir=".$dir; |
| 286 | 286 | //print "newfile=".$newfile; |
| 287 | 287 | //print "file=".$file; |
@@ -290,7 +290,7 @@ discard block |
||
| 290 | 290 | dol_mkdir($conf->adherent->dir_temp); |
| 291 | 291 | if (!is_writable($conf->adherent->dir_temp)) { |
| 292 | 292 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->adherent->dir_temp); |
| 293 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
| 293 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
| 294 | 294 | return -1; |
| 295 | 295 | } |
| 296 | 296 | |
@@ -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 | |
@@ -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 | } |
@@ -100,14 +100,14 @@ |
||
| 100 | 100 | |
| 101 | 101 | // Param |
| 102 | 102 | $label = $langs->trans($key); |
| 103 | - print '<td><label for="' . $key . '">' . $label . '</label></td>'; |
|
| 103 | + print '<td><label for="'.$key.'">'.$label.'</label></td>'; |
|
| 104 | 104 | |
| 105 | 105 | // Value |
| 106 | 106 | print '<td>'; |
| 107 | 107 | if (isModEnabled('accounting')) { |
| 108 | 108 | print $formaccounting->select_account(getDolGlobalString($key), $key, 1, '', 1, 1); |
| 109 | 109 | } else { |
| 110 | - print '<input type="text" size="20" id="' . $key . '" name="' . $key . '" value="' . getDolGlobalString($key) . '">'; |
|
| 110 | + print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.getDolGlobalString($key).'">'; |
|
| 111 | 111 | } |
| 112 | 112 | print '</td></tr>'; |
| 113 | 113 | } |