@@ -32,8 +32,8 @@ discard block |
||
32 | 32 | require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; |
33 | 33 | require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; |
34 | 34 | require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; |
35 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php'; |
|
36 | -require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php'; |
|
35 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php'; |
|
36 | +require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php'; |
|
37 | 37 | |
38 | 38 | |
39 | 39 | // Load translation files required by the page |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | $linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; |
151 | 151 | |
152 | 152 | $morehtmlref = '<div class="refid">'; |
153 | - $morehtmlref.= $object->label; |
|
153 | + $morehtmlref .= $object->label; |
|
154 | 154 | $morehtmlref .= '</div>'; |
155 | 155 | |
156 | 156 |
@@ -33,8 +33,8 @@ discard block |
||
33 | 33 | require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; |
34 | 34 | require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; |
35 | 35 | require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; |
36 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php'; |
|
37 | -require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php'; |
|
36 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php'; |
|
37 | +require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php'; |
|
38 | 38 | |
39 | 39 | // Load translation files required by the page |
40 | 40 | $langs->loadLangs(array("hrm", "companies", "other", "mails")); |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | $linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; |
131 | 131 | |
132 | 132 | $morehtmlref = '<div class="refid">'; |
133 | - $morehtmlref.= $object->label; |
|
133 | + $morehtmlref .= $object->label; |
|
134 | 134 | $morehtmlref .= '</div>'; |
135 | 135 | |
136 | 136 | dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref); |
@@ -102,7 +102,7 @@ |
||
102 | 102 | /** |
103 | 103 | * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor. |
104 | 104 | */ |
105 | - public $fields=array( |
|
105 | + public $fields = array( |
|
106 | 106 | 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"), |
107 | 107 | 'fk_skill' => array('type'=>'integer:Skill:/hrm/class/skill.class.php', 'label'=>'fk_skill', 'enabled'=>'1', 'position'=>5, 'notnull'=>1, 'visible'=>0,), |
108 | 108 | 'rankorder' => array('type'=>'integer', 'label'=>'rank', 'enabled'=>'1', 'position'=>10, 'notnull'=>0, 'visible'=>2,), |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | // Load Dolibarr environment |
30 | 30 | require '../main.inc.php'; |
31 | 31 | |
32 | -require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php'; |
|
33 | -require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php'; |
|
32 | +require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php'; |
|
33 | +require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php'; |
|
34 | 34 | |
35 | 35 | // Load translation files required by the page |
36 | 36 | $langs->loadLangs(array("hrm", "companies")); |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | $linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; |
104 | 104 | |
105 | 105 | $morehtmlref = '<div class="refid">'; |
106 | - $morehtmlref.= $object->label; |
|
106 | + $morehtmlref .= $object->label; |
|
107 | 107 | $morehtmlref .= '</div>'; |
108 | 108 | |
109 | 109 |
@@ -23,8 +23,8 @@ discard block |
||
23 | 23 | * \brief Page to export documents into a compressed file |
24 | 24 | */ |
25 | 25 | |
26 | -if (! defined('CSRFCHECK_WITH_TOKEN')) { |
|
27 | - define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET |
|
26 | +if (!defined('CSRFCHECK_WITH_TOKEN')) { |
|
27 | + define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | require '../../main.inc.php'; |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | |
128 | 128 | $utils = new Utils($db); |
129 | 129 | |
130 | -if ($export_type == 'externalmodule' && ! empty($what)) { |
|
130 | +if ($export_type == 'externalmodule' && !empty($what)) { |
|
131 | 131 | $fulldirtocompress = DOL_DOCUMENT_ROOT.'/custom/'.dol_sanitizeFileName($what); |
132 | 132 | } else { |
133 | 133 | $fulldirtocompress = DOL_DATA_ROOT; |
@@ -1804,7 +1804,7 @@ discard block |
||
1804 | 1804 | if (isset($object->table_element)) { |
1805 | 1805 | $ecmfile->src_object_type = $object->table_element; |
1806 | 1806 | } else { |
1807 | - dol_syslog('Error: object ' . get_class($object) . ' has no table_element attribute.'); |
|
1807 | + dol_syslog('Error: object '.get_class($object).' has no table_element attribute.'); |
|
1808 | 1808 | return -1; |
1809 | 1809 | } |
1810 | 1810 | if (isset($object->src_object_description)) $ecmfile->description = $object->src_object_description; |
@@ -2004,9 +2004,9 @@ discard block |
||
2004 | 2004 | // Skip directories (they would be added automatically) |
2005 | 2005 | if (!$file->isDir()) { |
2006 | 2006 | // Get real and relative path for current file |
2007 | - $filePath = $file->getPath(); // the full path with filename using the $inputdir root. |
|
2007 | + $filePath = $file->getPath(); // the full path with filename using the $inputdir root. |
|
2008 | 2008 | $fileName = $file->getFilename(); |
2009 | - $fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory. |
|
2009 | + $fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory. |
|
2010 | 2010 | |
2011 | 2011 | //$relativePath = substr($fileFullRealPath, strlen($rootPath) + 1); |
2012 | 2012 | $relativePath = substr(($filePath ? $filePath.'/' : '').$fileName, strlen($rootPath) + 1); |
@@ -2212,9 +2212,9 @@ discard block |
||
2212 | 2212 | // Skip directories (they would be added automatically) |
2213 | 2213 | if (!$file->isDir()) { |
2214 | 2214 | // Get real and relative path for current file |
2215 | - $filePath = $file->getPath(); // the full path with filename using the $inputdir root. |
|
2215 | + $filePath = $file->getPath(); // the full path with filename using the $inputdir root. |
|
2216 | 2216 | $fileName = $file->getFilename(); |
2217 | - $fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory. |
|
2217 | + $fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory. |
|
2218 | 2218 | |
2219 | 2219 | //$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($fileFullRealPath, strlen($inputdir) + 1); |
2220 | 2220 | $relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr(($filePath ? $filePath.'/' : '').$fileName, strlen($inputdir) + 1); |
@@ -132,13 +132,13 @@ discard block |
||
132 | 132 | |
133 | 133 | foreach ($object->multilangs as $key => $value) { // enregistrement des nouvelles valeurs dans l'objet |
134 | 134 | if ($key == $current_lang) { |
135 | - $object->label = GETPOST("libelle-" . $key); |
|
136 | - $object->description = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml')); |
|
137 | - $object->other = dol_htmlcleanlastbr(GETPOST("other-" . $key, 'restricthtml')); |
|
135 | + $object->label = GETPOST("libelle-".$key); |
|
136 | + $object->description = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml')); |
|
137 | + $object->other = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml')); |
|
138 | 138 | } else { |
139 | - $object->multilangs[$key]["label"] = GETPOST("libelle-" . $key); |
|
140 | - $object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml')); |
|
141 | - $object->multilangs[$key]["other"] = dol_htmlcleanlastbr(GETPOST("other-" . $key, 'restricthtml')); |
|
139 | + $object->multilangs[$key]["label"] = GETPOST("libelle-".$key); |
|
140 | + $object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml')); |
|
141 | + $object->multilangs[$key]["other"] = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml')); |
|
142 | 142 | } |
143 | 143 | } |
144 | 144 | |
@@ -231,9 +231,9 @@ discard block |
||
231 | 231 | if (empty($reshook)) { |
232 | 232 | if ($action == '') { |
233 | 233 | if ($user->rights->produit->creer || $user->rights->service->creer) { |
234 | - print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=add&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("Add") . '</a>'; |
|
234 | + print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=add&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Add").'</a>'; |
|
235 | 235 | if ($cnt_trans > 0) { |
236 | - print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=edit&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("Modify") . '</a>'; |
|
236 | + print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Modify").'</a>'; |
|
237 | 237 | } |
238 | 238 | } |
239 | 239 | } |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | $pdf->SetTextColor(0, 0, 0); |
324 | 324 | |
325 | 325 | $tab_top = 90; |
326 | - $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift: 10); |
|
326 | + $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10); |
|
327 | 327 | |
328 | 328 | $tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext; |
329 | 329 | |
@@ -365,7 +365,7 @@ discard block |
||
365 | 365 | // Tracking number |
366 | 366 | if (!empty($object->tracking_number)) { |
367 | 367 | $pdf->SetFont('', 'B', $default_font_size - 2); |
368 | - $pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber") . " : " . $object->tracking_number, 0, 1, false, true, 'L'); |
|
368 | + $pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L'); |
|
369 | 369 | |
370 | 370 | $tab_top_alt = $pdf->GetY(); |
371 | 371 | $object->getUrlTrackingStatus($object->tracking_number); |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | } |
263 | 263 | } |
264 | 264 | if (empty($error)) { |
265 | - header("Location: card.php?id=" . $object->id); |
|
265 | + header("Location: card.php?id=".$object->id); |
|
266 | 266 | exit; |
267 | 267 | } |
268 | 268 | } |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | } else { |
318 | 318 | $result = $object->fetch($id); |
319 | 319 | |
320 | - $object->amount = $amount; |
|
320 | + $object->amount = $amount; |
|
321 | 321 | |
322 | 322 | $result = $object->update($user); |
323 | 323 | if ($result <= 0) { |
@@ -480,7 +480,7 @@ discard block |
||
480 | 480 | |
481 | 481 | // Auto create payment |
482 | 482 | print '<tr><td><label for="auto_create_paiement">'.$langs->trans('AutomaticCreationPayment').'</label></td>'; |
483 | - print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_payment) ? '' : 'checked="checked"') . ' value="1"></td></tr>'."\n"; |
|
483 | + print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" '.(empty($auto_create_payment) ? '' : 'checked="checked"').' value="1"></td></tr>'."\n"; |
|
484 | 484 | |
485 | 485 | print '<tr class="hide_if_no_auto_create_payment">'; |
486 | 486 | print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>'; |
@@ -604,9 +604,9 @@ discard block |
||
604 | 604 | print '</td></tr>'; |
605 | 605 | |
606 | 606 | if ($action == 'edit') { |
607 | - print '<tr><td class="fieldrequired">' . $langs->trans("Amount") . '</td><td><input name="amount" size="10" value="' . price($object->amount) . '"></td></tr>'; |
|
607 | + print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.price($object->amount).'"></td></tr>'; |
|
608 | 608 | } else { |
609 | - print '<tr><td>' . $langs->trans("Amount") . '</td><td>' . price($object->amount) . '</td></tr>'; |
|
609 | + print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>'; |
|
610 | 610 | } |
611 | 611 | |
612 | 612 | // Mode of payment |