@@ -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 |
@@ -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 |
@@ -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 |
@@ -291,11 +291,11 @@ discard block |
||
291 | 291 | $sTime .= dol_print_date($iSecond, 'hourduration', true); |
292 | 292 | } |
293 | 293 | } elseif ($format == 'allhourminsec') { |
294 | - return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60))); |
|
294 | + return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60))); |
|
295 | 295 | } elseif ($format == 'allhourmin') { |
296 | - return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600)/60))); |
|
296 | + return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))); |
|
297 | 297 | } elseif ($format == 'allhour') { |
298 | - return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))); |
|
298 | + return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600))); |
|
299 | 299 | } |
300 | 300 | } elseif ($format == 'hour') { // only hour part |
301 | 301 | $sTime = dol_print_date($iSecond, '%H', true); |
@@ -906,7 +906,7 @@ discard block |
||
906 | 906 | $date_1sunsept = strtotime('next thursday', strtotime('next sunday', mktime(0, 0, 0, 9, 1, $annee))); |
907 | 907 | $jour_1sunsept = date("d", $date_1sunsept); |
908 | 908 | $mois_1sunsept = date("m", $date_1sunsept); |
909 | - if ($jour_1sunsept == $jour && $mois_1sunsept == $mois) $ferie=true; |
|
909 | + if ($jour_1sunsept == $jour && $mois_1sunsept == $mois) $ferie = true; |
|
910 | 910 | // Geneva fast in Switzerland |
911 | 911 | } |
912 | 912 | } |
@@ -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); |