@@ -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 | |
@@ -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; |
@@ -28,9 +28,9 @@ |
||
| 28 | 28 | |
| 29 | 29 | // Load Dolibarr environment |
| 30 | 30 | require '../main.inc.php'; |
| 31 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php'; |
|
| 32 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php'; |
|
| 33 | -require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php'; |
|
| 31 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php'; |
|
| 32 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php'; |
|
| 33 | +require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php'; |
|
| 34 | 34 | |
| 35 | 35 | // Load translation files required by the page |
| 36 | 36 | $langs->loadLangs(array('hrm', 'companies')); |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | */ |
| 121 | 121 | public function formFilter() |
| 122 | 122 | { |
| 123 | - global $conf,$langs; |
|
| 123 | + global $conf, $langs; |
|
| 124 | 124 | |
| 125 | 125 | // Load translation files required by the page |
| 126 | 126 | $langs->loadLangs(array("commercial", "companies", "suppliers", "categories")); |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | $sql = "SELECT sp.poste, count(distinct(sp.email)) AS nb"; |
| 132 | 132 | $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp"; |
| 133 | 133 | $sql .= " WHERE sp.entity IN (".getEntity('contact').")"; |
| 134 | - $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
| 134 | + $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
| 135 | 135 | $sql .= " AND sp.statut = 1"; |
| 136 | 136 | $sql .= " AND (sp.poste IS NOT NULL AND sp.poste <> '')"; |
| 137 | 137 | $sql .= " GROUP BY sp.poste"; |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | $sql .= " ".MAIN_DB_PREFIX."categorie as c,"; |
| 167 | 167 | $sql .= " ".MAIN_DB_PREFIX."categorie_contact as cs"; |
| 168 | 168 | $sql .= " WHERE sp.entity IN (".getEntity('contact').")"; |
| 169 | - $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
| 169 | + $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
| 170 | 170 | $sql .= " AND sp.statut = 1"; |
| 171 | 171 | $sql .= " AND cs.fk_categorie = c.rowid"; |
| 172 | 172 | $sql .= " AND cs.fk_socpeople = sp.rowid"; |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | $sql .= " ".MAIN_DB_PREFIX."categorie as c,"; |
| 240 | 240 | $sql .= " ".MAIN_DB_PREFIX."categorie_societe as cs"; |
| 241 | 241 | $sql .= " WHERE sp.entity IN (".getEntity('contact').")"; |
| 242 | - $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
| 242 | + $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
| 243 | 243 | $sql .= " AND sp.statut = 1"; |
| 244 | 244 | $sql .= " AND cs.fk_categorie = c.rowid"; |
| 245 | 245 | $sql .= " AND cs.fk_soc = sp.fk_soc"; |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | $sql .= " ".MAIN_DB_PREFIX."categorie as c,"; |
| 277 | 277 | $sql .= " ".MAIN_DB_PREFIX."categorie_fournisseur as cs"; |
| 278 | 278 | $sql .= " WHERE sp.entity IN (".getEntity('contact').")"; |
| 279 | - $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
| 279 | + $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
| 280 | 280 | $sql .= " AND sp.statut = 1"; |
| 281 | 281 | $sql .= " AND cs.fk_categorie = c.rowid"; |
| 282 | 282 | $sql .= " AND cs.fk_soc = sp.fk_soc"; |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | |
| 435 | 435 | // Filter on job position |
| 436 | 436 | $key = $filter_jobposition; |
| 437 | - if (!empty($key) && $key != 'all' && $key != '-1') { |
|
| 437 | + if (!empty($key) && $key != 'all' && $key != '-1') { |
|
| 438 | 438 | $sql .= " AND sp.poste = '".$this->db->escape($key)."'"; |
| 439 | 439 | } |
| 440 | 440 | |
@@ -426,7 +426,7 @@ |
||
| 426 | 426 | $linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentcandidature_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; |
| 427 | 427 | |
| 428 | 428 | $morehtmlref = '<div class="refidno">'; |
| 429 | - $morehtmlref.= $object->getFullName('', 1); |
|
| 429 | + $morehtmlref .= $object->getFullName('', 1); |
|
| 430 | 430 | /* |
| 431 | 431 | // Ref customer |
| 432 | 432 | $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1); |
@@ -143,7 +143,7 @@ |
||
| 143 | 143 | $linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentcandidature_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; |
| 144 | 144 | |
| 145 | 145 | $morehtmlref = '<div class="refidno">'; |
| 146 | - $morehtmlref.= $object->getFullName('', 1); |
|
| 146 | + $morehtmlref .= $object->getFullName('', 1); |
|
| 147 | 147 | /* |
| 148 | 148 | // Ref customer |
| 149 | 149 | $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1); |