@@ -560,7 +560,7 @@ discard block |
||
| 560 | 560 | $newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile); |
| 561 | 561 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
| 562 | 562 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
| 563 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
| 563 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
| 564 | 564 | //$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt'; |
| 565 | 565 | // Get extension (ods or odt) |
| 566 | 566 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
@@ -569,11 +569,11 @@ discard block |
||
| 569 | 569 | if ($format == '1') { |
| 570 | 570 | $format = '%Y%m%d%H%M%S'; |
| 571 | 571 | } |
| 572 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
| 572 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
| 573 | 573 | } else { |
| 574 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
| 574 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
| 575 | 575 | } |
| 576 | - $file = $dir . '/' . $filename; |
|
| 576 | + $file = $dir.'/'.$filename; |
|
| 577 | 577 | //print "newdir=".$dir; |
| 578 | 578 | //print "newfile=".$newfile; |
| 579 | 579 | //print "file=".$file; |
@@ -582,7 +582,7 @@ discard block |
||
| 582 | 582 | dol_mkdir($conf->project->dir_temp); |
| 583 | 583 | if (!is_writable($conf->project->dir_temp)) { |
| 584 | 584 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->project->dir_temp); |
| 585 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
| 585 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
| 586 | 586 | return -1; |
| 587 | 587 | } |
| 588 | 588 | |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | $maxfilesizearray = getMaxFileSizeArray(); |
| 181 | 181 | $maxmin = $maxfilesizearray['maxmin']; |
| 182 | 182 | if ($maxmin > 0) { |
| 183 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 183 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 184 | 184 | } |
| 185 | 185 | $texte .= ' <input type="file" name="uploadfile">'; |
| 186 | 186 | $texte .= '<input type="hidden" value="BOM_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | $newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile); |
| 277 | 277 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
| 278 | 278 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
| 279 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
| 279 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
| 280 | 280 | //$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt'; |
| 281 | 281 | // Get extension (ods or odt) |
| 282 | 282 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
@@ -285,11 +285,11 @@ discard block |
||
| 285 | 285 | if ($format == '1') { |
| 286 | 286 | $format = '%Y%m%d%H%M%S'; |
| 287 | 287 | } |
| 288 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
| 288 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
| 289 | 289 | } else { |
| 290 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
| 290 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
| 291 | 291 | } |
| 292 | - $file = $dir . '/' . $filename; |
|
| 292 | + $file = $dir.'/'.$filename; |
|
| 293 | 293 | //print "newdir=".$dir; |
| 294 | 294 | //print "newfile=".$newfile; |
| 295 | 295 | //print "file=".$file; |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | dol_mkdir($conf->bom->dir_temp); |
| 299 | 299 | if (!is_writable($conf->bom->dir_temp)) { |
| 300 | 300 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->bom->dir_temp); |
| 301 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
| 301 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
| 302 | 302 | return -1; |
| 303 | 303 | } |
| 304 | 304 | |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | $newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile); |
| 270 | 270 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
| 271 | 271 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
| 272 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
| 272 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
| 273 | 273 | //$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt'; |
| 274 | 274 | // Get extension (ods or odt) |
| 275 | 275 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
@@ -278,11 +278,11 @@ discard block |
||
| 278 | 278 | if ($format == '1') { |
| 279 | 279 | $format = '%Y%m%d%H%M%S'; |
| 280 | 280 | } |
| 281 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
| 281 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
| 282 | 282 | } else { |
| 283 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
| 283 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
| 284 | 284 | } |
| 285 | - $file = $dir . '/' . $filename; |
|
| 285 | + $file = $dir.'/'.$filename; |
|
| 286 | 286 | //print "newdir=".$dir; |
| 287 | 287 | //print "newfile=".$newfile; |
| 288 | 288 | //print "file=".$file; |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | dol_mkdir($conf->mrp->dir_temp); |
| 292 | 292 | if (!is_writable($conf->mrp->dir_temp)) { |
| 293 | 293 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->mrp->dir_temp); |
| 294 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
| 294 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
| 295 | 295 | return -1; |
| 296 | 296 | } |
| 297 | 297 | |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | $maxfilesizearray = getMaxFileSizeArray(); |
| 188 | 188 | $maxmin = $maxfilesizearray['maxmin']; |
| 189 | 189 | if ($maxmin > 0) { |
| 190 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 190 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 191 | 191 | } |
| 192 | 192 | $texte .= ' <input type="file" name="uploadfile">'; |
| 193 | 193 | $texte .= '<input type="hidden" value="COMMANDE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | $newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile); |
| 283 | 283 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
| 284 | 284 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
| 285 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
| 285 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
| 286 | 286 | |
| 287 | 287 | // Get extension (ods or odt) |
| 288 | 288 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
@@ -291,11 +291,11 @@ discard block |
||
| 291 | 291 | if ($format == '1') { |
| 292 | 292 | $format = '%Y%m%d%H%M%S'; |
| 293 | 293 | } |
| 294 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
| 294 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
| 295 | 295 | } else { |
| 296 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
| 296 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
| 297 | 297 | } |
| 298 | - $file = $dir . '/' . $filename; |
|
| 298 | + $file = $dir.'/'.$filename; |
|
| 299 | 299 | //print "newdir=".$dir; |
| 300 | 300 | //print "newfile=".$newfile; |
| 301 | 301 | //print "file=".$file; |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | dol_mkdir($conf->commande->dir_temp); |
| 305 | 305 | if (!is_writable($conf->commande->dir_temp)) { |
| 306 | 306 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->commande->dir_temp); |
| 307 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
| 307 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
| 308 | 308 | return -1; |
| 309 | 309 | } |
| 310 | 310 | |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | $newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile); |
| 265 | 265 | $newfiletmp = preg_replace('/template_/i', '', $newfiletmp); |
| 266 | 266 | $newfiletmp = preg_replace('/modele_/i', '', $newfiletmp); |
| 267 | - $newfiletmp = $objectref . '_' . $newfiletmp; |
|
| 267 | + $newfiletmp = $objectref.'_'.$newfiletmp; |
|
| 268 | 268 | //$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt'; |
| 269 | 269 | // Get extension (ods or odt) |
| 270 | 270 | $newfileformat = substr($newfile, strrpos($newfile, '.') + 1); |
@@ -273,11 +273,11 @@ discard block |
||
| 273 | 273 | if ($format == '1') { |
| 274 | 274 | $format = '%Y%m%d%H%M%S'; |
| 275 | 275 | } |
| 276 | - $filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat; |
|
| 276 | + $filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat; |
|
| 277 | 277 | } else { |
| 278 | - $filename = $newfiletmp . '.' . $newfileformat; |
|
| 278 | + $filename = $newfiletmp.'.'.$newfileformat; |
|
| 279 | 279 | } |
| 280 | - $file = $dir . '/' . $filename; |
|
| 280 | + $file = $dir.'/'.$filename; |
|
| 281 | 281 | //print "newdir=".$dir; |
| 282 | 282 | //print "newfile=".$newfile; |
| 283 | 283 | //print "file=".$file; |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | dol_mkdir($conf->fournisseur->commande->dir_temp); |
| 287 | 287 | if (!is_writable($conf->fournisseur->commande->dir_temp)) { |
| 288 | 288 | $this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->fournisseur->commande->dir_temp); |
| 289 | - dol_syslog('Error in write_file: ' . $this->error, LOG_ERR); |
|
| 289 | + dol_syslog('Error in write_file: '.$this->error, LOG_ERR); |
|
| 290 | 290 | return -1; |
| 291 | 291 | } |
| 292 | 292 | |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $backtopage = GETPOST('backtopage', 'alpha'); |
| 50 | 50 | $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); |
| 51 | 51 | $TBomLineId = GETPOST('bomlineid', 'array'); |
| 52 | -$lineid = GETPOST('lineid', 'int'); |
|
| 52 | +$lineid = GETPOST('lineid', 'int'); |
|
| 53 | 53 | $socid = GETPOST("socid", 'int'); |
| 54 | 54 | |
| 55 | 55 | // Initialize technical objects |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | $objectbomchildline = new BOMLine($db); |
| 149 | 149 | |
| 150 | 150 | foreach ($TBomLineId as $id_bom_line) { |
| 151 | - $object = new Mo($db); // modified by the actions_addupdatedelete.inc.php |
|
| 151 | + $object = new Mo($db); // modified by the actions_addupdatedelete.inc.php |
|
| 152 | 152 | |
| 153 | 153 | $objectbomchildline->fetch($id_bom_line); |
| 154 | 154 | |
@@ -528,8 +528,8 @@ discard block |
||
| 528 | 528 | $mo_parent = $object->getMoParent(); |
| 529 | 529 | if (is_object($mo_parent)) { |
| 530 | 530 | print '<tr class="field_fk_mo_parent">'; |
| 531 | - print '<td class="titlefield fieldname_fk_mo_parent">' . $langs->trans('ParentMo') . '</td>'; |
|
| 532 | - print '<td class="valuefield fieldname_fk_mo_parent">' .$mo_parent->getNomUrl(1).'</td>'; |
|
| 531 | + print '<td class="titlefield fieldname_fk_mo_parent">'.$langs->trans('ParentMo').'</td>'; |
|
| 532 | + print '<td class="valuefield fieldname_fk_mo_parent">'.$mo_parent->getNomUrl(1).'</td>'; |
|
| 533 | 533 | print '</tr>'; |
| 534 | 534 | } |
| 535 | 535 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | // if we set another view list mode, we keep it (till we change one more time) |
| 48 | 48 | if (GETPOSTISSET('mode')) { |
| 49 | 49 | $mode = GETPOST('mode', 'alpha'); |
| 50 | - if ($mode =='common' || $mode =='commonkanban') |
|
| 50 | + if ($mode == 'common' || $mode == 'commonkanban') |
|
| 51 | 51 | dolibarr_set_const($db, "MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT", $mode, 'chaine', 0, '', $conf->entity); |
| 52 | 52 | } else { |
| 53 | 53 | $mode = (empty($conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT) ? 'commonkanban' : $conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT); |
@@ -483,7 +483,7 @@ discard block |
||
| 483 | 483 | print load_fiche_titre($langs->trans("ModulesSetup"), '', 'title_setup'); |
| 484 | 484 | |
| 485 | 485 | // Start to show page |
| 486 | -$deschelp = ''; |
|
| 486 | +$deschelp = ''; |
|
| 487 | 487 | if ($mode == 'common' || $mode == 'commonkanban') { |
| 488 | 488 | $desc = $langs->trans("ModulesDesc", '{picto}'); |
| 489 | 489 | $desc .= ' '.$langs->trans("ModulesDesc2", '{picto2}'); |
@@ -1068,7 +1068,7 @@ discard block |
||
| 1068 | 1068 | <div id="category-tree-left"> |
| 1069 | 1069 | <ul class="tree"> |
| 1070 | 1070 | <?php |
| 1071 | - echo $dolistore->get_categories(); // Do not use dol_escape_htmltag here, it is already a structured content |
|
| 1071 | + echo $dolistore->get_categories(); // Do not use dol_escape_htmltag here, it is already a structured content |
|
| 1072 | 1072 | ?> |
| 1073 | 1073 | </ul> |
| 1074 | 1074 | </div> |
@@ -69,8 +69,8 @@ discard block |
||
| 69 | 69 | */ |
| 70 | 70 | public function __toString() |
| 71 | 71 | { |
| 72 | - require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductAttributeValue.class.php'; |
|
| 73 | - require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductAttribute.class.php'; |
|
| 72 | + require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php'; |
|
| 73 | + require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php'; |
|
| 74 | 74 | |
| 75 | 75 | $prodattr = new ProductAttribute($this->db); |
| 76 | 76 | $prodattrval = new ProductAttributeValue($this->db); |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | $prodattr->fetch($this->fk_prod_attr); |
| 79 | 79 | $prodattrval->fetch($this->fk_prod_attr_val); |
| 80 | 80 | |
| 81 | - return $prodattr->label . ': ' . $prodattrval->value; |
|
| 81 | + return $prodattr->label.': '.$prodattrval->value; |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | /** |
@@ -89,14 +89,14 @@ discard block |
||
| 89 | 89 | */ |
| 90 | 90 | public function create($user) |
| 91 | 91 | { |
| 92 | - $sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_attribute_combination2val |
|
| 92 | + $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_combination2val |
|
| 93 | 93 | (fk_prod_combination, fk_prod_attr, fk_prod_attr_val) |
| 94 | - VALUES(" . (int) $this->fk_prod_combination . ", " . (int) $this->fk_prod_attr . ", " . (int) $this->fk_prod_attr_val . ")"; |
|
| 94 | + VALUES(" . (int) $this->fk_prod_combination.", ".(int) $this->fk_prod_attr.", ".(int) $this->fk_prod_attr_val.")"; |
|
| 95 | 95 | |
| 96 | 96 | $query = $this->db->query($sql); |
| 97 | 97 | |
| 98 | 98 | if ($query) { |
| 99 | - $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . 'product_attribute_combination2val'); |
|
| 99 | + $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_combination2val'); |
|
| 100 | 100 | |
| 101 | 101 | return 1; |
| 102 | 102 | } |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | c2v.fk_prod_attr_val, |
| 118 | 118 | c2v.fk_prod_attr, |
| 119 | 119 | c2v.fk_prod_combination |
| 120 | - FROM " . MAIN_DB_PREFIX . "product_attribute c LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr |
|
| 120 | + FROM " . MAIN_DB_PREFIX."product_attribute c LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr |
|
| 121 | 121 | WHERE c2v.fk_prod_combination = " . (int) $fk_combination; |
| 122 | 122 | |
| 123 | 123 | $sql .= $this->db->order('c.position', 'asc'); |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | */ |
| 152 | 152 | public function deleteByFkCombination($fk_combination) |
| 153 | 153 | { |
| 154 | - $sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_attribute_combination2val WHERE fk_prod_combination = " . (int) $fk_combination; |
|
| 154 | + $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_combination2val WHERE fk_prod_combination = ".(int) $fk_combination; |
|
| 155 | 155 | |
| 156 | 156 | if ($this->db->query($sql)) { |
| 157 | 157 | return 1; |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | $action = GETPOST('action', 'aZ09'); |
| 40 | 40 | $value = GETPOST('value', 'alpha'); |
| 41 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 41 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 42 | 42 | |
| 43 | 43 | $label = GETPOST('label', 'alpha'); |
| 44 | 44 | $scandir = GETPOST('scan_dir', 'alpha'); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php'; |
| 57 | 57 | |
| 58 | -$error=0; |
|
| 58 | +$error = 0; |
|
| 59 | 59 | |
| 60 | 60 | if ($action == 'updateMask') { |
| 61 | 61 | $maskconst = GETPOST('maskconstcontract', 'aZ09'); |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | setEventMessages($langs->trans('Error'), null, 'errors'); |
| 174 | 174 | } else { |
| 175 | 175 | setEventMessages($langs->trans('SetupSaved'), null, 'mesgs'); |
| 176 | - header("Location: " . $_SERVER["PHP_SELF"]); |
|
| 176 | + header("Location: ".$_SERVER["PHP_SELF"]); |
|
| 177 | 177 | exit(); |
| 178 | 178 | } |
| 179 | 179 | } elseif (preg_match('/del_(.*)/', $action, $reg)) { |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | setEventMessages($langs->trans('Error'), null, 'errors'); |
| 189 | 189 | } else { |
| 190 | 190 | setEventMessages($langs->trans('SetupSaved'), null, 'mesgs'); |
| 191 | - header("Location: " . $_SERVER["PHP_SELF"]); |
|
| 191 | + header("Location: ".$_SERVER["PHP_SELF"]); |
|
| 192 | 192 | exit(); |
| 193 | 193 | } |
| 194 | 194 | } |