@@ -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 | |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | || (($user->id != $id) && $user->hasRight("user", "user", "passsword"))); |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | -$permissiontoadd = $caneditfield; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles |
|
| 63 | +$permissiontoadd = $caneditfield; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles |
|
| 64 | 64 | $permtoedit = $caneditfield; |
| 65 | 65 | |
| 66 | 66 | // Security check |
@@ -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']) { |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | |
| 183 | 183 | $filetoread = realpath(dol_osencode($file)); // Chemin canonique absolu de l'image |
| 184 | 184 | |
| 185 | - $infoImg = getimagesize($filetoread); // Get data about src image |
|
| 185 | + $infoImg = getimagesize($filetoread); // Get data about src image |
|
| 186 | 186 | $imgWidth = $infoImg[0]; // Largeur de l'image |
| 187 | 187 | $imgHeight = $infoImg[1]; // Hauteur de l'image |
| 188 | 188 | |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | } |
| 302 | 302 | |
| 303 | 303 | // Set transparent color according to image extension |
| 304 | - $trans_colour = -1; // By default, undefined |
|
| 304 | + $trans_colour = -1; // By default, undefined |
|
| 305 | 305 | switch ($newExt) { |
| 306 | 306 | case 'gif': // Gif |
| 307 | 307 | $trans_colour = imagecolorallocate($imgTarget, 255, 255, 255); // On procede autrement pour le format GIF |
@@ -51,7 +51,9 @@ |
||
| 51 | 51 | |
| 52 | 52 | // Load object |
| 53 | 53 | include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals |
| 54 | -if ($id > 0 || !empty($ref)) $upload_dir = $conf->stocktransfer->multidir_output[$object->entity]."/".$object->id; |
|
| 54 | +if ($id > 0 || !empty($ref)) { |
|
| 55 | + $upload_dir = $conf->stocktransfer->multidir_output[$object->entity]."/".$object->id; |
|
| 56 | +} |
|
| 55 | 57 | |
| 56 | 58 | $permissionnote = $user->rights->stocktransfer->stocktransfer->write; // Used by the include of actions_setnotes.inc.php |
| 57 | 59 | $permissiontoadd = $user->rights->stocktransfer->stocktransfer->write; // Used by the include of actions_addupdatedelete.inc.php |
@@ -35,7 +35,9 @@ discard block |
||
| 35 | 35 | $action = GETPOST('action', 'alpha'); |
| 36 | 36 | |
| 37 | 37 | // Security check |
| 38 | -if ($user->socid) $socid = $user->socid; |
|
| 38 | +if ($user->socid) { |
|
| 39 | + $socid = $user->socid; |
|
| 40 | +} |
|
| 39 | 41 | |
| 40 | 42 | $result = restrictedArea($user, 'stocktransfer', $id, '', 'stocktransfer'); |
| 41 | 43 | |
@@ -175,7 +177,9 @@ discard block |
||
| 175 | 177 | $dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl')); |
| 176 | 178 | foreach ($dirtpls as $reldir) { |
| 177 | 179 | $res = @include dol_buildpath($reldir.'/contacts.tpl.php'); |
| 178 | - if ($res) break; |
|
| 180 | + if ($res) { |
|
| 181 | + break; |
|
| 182 | + } |
|
| 179 | 183 | } |
| 180 | 184 | } |
| 181 | 185 | |
@@ -131,7 +131,7 @@ |
||
| 131 | 131 | $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1); |
| 132 | 132 | // Thirdparty |
| 133 | 133 | if (!empty($object->thirdparty)) { |
| 134 | - $morehtmlref .= '<br>' . $langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'customer'); |
|
| 134 | + $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer'); |
|
| 135 | 135 | } |
| 136 | 136 | // Project |
| 137 | 137 | if (isModEnabled('project')) { |