@@ -954,7 +954,7 @@ |
||
| 954 | 954 | } |
| 955 | 955 | $result .= $linkend; |
| 956 | 956 | global $action; |
| 957 | - $hookmanager->initHooks(array($this->element . 'dao')); |
|
| 957 | + $hookmanager->initHooks(array($this->element.'dao')); |
|
| 958 | 958 | $parameters = array('id'=>$this->id, 'getnomurl' => &$result); |
| 959 | 959 | $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks |
| 960 | 960 | if ($reshook > 0) { |
@@ -987,7 +987,7 @@ |
||
| 987 | 987 | $result .= $linkend; |
| 988 | 988 | |
| 989 | 989 | global $action; |
| 990 | - $hookmanager->initHooks(array($this->element . 'dao')); |
|
| 990 | + $hookmanager->initHooks(array($this->element.'dao')); |
|
| 991 | 991 | $parameters = array('id'=>$this->id, 'getnomurl' => &$result); |
| 992 | 992 | $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks |
| 993 | 993 | if ($reshook > 0) { |
@@ -987,7 +987,7 @@ |
||
| 987 | 987 | $result .= $linkend; |
| 988 | 988 | |
| 989 | 989 | global $action; |
| 990 | - $hookmanager->initHooks(array($this->element . 'dao')); |
|
| 990 | + $hookmanager->initHooks(array($this->element.'dao')); |
|
| 991 | 991 | $parameters = array('id'=>$this->id, 'getnomurl' => &$result); |
| 992 | 992 | $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks |
| 993 | 993 | if ($reshook > 0) { |
@@ -954,7 +954,7 @@ |
||
| 954 | 954 | } |
| 955 | 955 | $result .= $linkend; |
| 956 | 956 | global $action; |
| 957 | - $hookmanager->initHooks(array($this->element . 'dao')); |
|
| 957 | + $hookmanager->initHooks(array($this->element.'dao')); |
|
| 958 | 958 | $parameters = array('id'=>$this->id, 'getnomurl' => &$result); |
| 959 | 959 | $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks |
| 960 | 960 | if ($reshook > 0) { |
@@ -987,7 +987,7 @@ |
||
| 987 | 987 | $result .= $linkend; |
| 988 | 988 | |
| 989 | 989 | global $action; |
| 990 | - $hookmanager->initHooks(array($this->element . 'dao')); |
|
| 990 | + $hookmanager->initHooks(array($this->element.'dao')); |
|
| 991 | 991 | $parameters = array('id'=>$this->id, 'getnomurl' => &$result); |
| 992 | 992 | $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks |
| 993 | 993 | if ($reshook > 0) { |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | |
| 92 | 92 | // Object card |
| 93 | 93 | // ------------------------------------------------------------ |
| 94 | - $linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>'; |
|
| 94 | + $linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; |
|
| 95 | 95 | |
| 96 | 96 | $morehtmlref = '<div class="refidno">'; |
| 97 | 97 | $morehtmlref .= '</div>'; |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | |
| 106 | 106 | |
| 107 | 107 | $cssclass = "titlefield"; |
| 108 | - include DOL_DOCUMENT_ROOT . '/core/tpl/notes.tpl.php'; |
|
| 108 | + include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; |
|
| 109 | 109 | |
| 110 | 110 | print '</div>'; |
| 111 | 111 | |
@@ -91,7 +91,7 @@ |
||
| 91 | 91 | |
| 92 | 92 | // Object card |
| 93 | 93 | // ------------------------------------------------------------ |
| 94 | - $linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>'; |
|
| 94 | + $linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; |
|
| 95 | 95 | |
| 96 | 96 | $morehtmlref = '<div class="refidno">'; |
| 97 | 97 | $morehtmlref .= '</div>'; |
@@ -37,10 +37,10 @@ discard block |
||
| 37 | 37 | $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ? |
| 38 | 38 | $confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation |
| 39 | 39 | $cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button |
| 40 | -$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
| 40 | +$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list |
|
| 41 | 41 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'assetmodellist'; // To manage different context of search |
| 42 | 42 | $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page |
| 43 | -$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') |
|
| 43 | +$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') |
|
| 44 | 44 | |
| 45 | 45 | $id = GETPOST('id', 'int'); |
| 46 | 46 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | // Default sort order (if not yet defined by previous GETPOST) |
| 72 | 72 | if (!$sortfield) { |
| 73 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
| 73 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
| 74 | 74 | $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition. |
| 75 | 75 | } |
| 76 | 76 | if (!$sortorder) { |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | $sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'"; |
| 255 | 255 | } |
| 256 | 256 | if (preg_match('/_dtend$/', $key)) { |
| 257 | - $sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'"; |
|
| 257 | + $sql .= " AND t.".$columnName." <= '".$db->idate($search[$key])."'"; |
|
| 258 | 258 | } |
| 259 | 259 | } |
| 260 | 260 | } |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | if (!is_object($formadmin)) { |
| 38 | - require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php'; |
|
| 38 | + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; |
|
| 39 | 39 | $formadmin = new FormAdmin($db); |
| 40 | 40 | } |
| 41 | 41 | |
@@ -69,19 +69,19 @@ discard block |
||
| 69 | 69 | 'mode_key' => $info[0], |
| 70 | 70 | 'field_key' => $info[1], |
| 71 | 71 | 'value' => $info[2], |
| 72 | - 'target' => 'block_' . $mode_key, |
|
| 72 | + 'target' => 'block_'.$mode_key, |
|
| 73 | 73 | ); |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | $assetdepreciationoptions->setInfosForMode($mode_key, $class_type, true); |
| 77 | - $prefix_html_name = $mode_key . '_'; |
|
| 77 | + $prefix_html_name = $mode_key.'_'; |
|
| 78 | 78 | |
| 79 | - print '<div id="block_' . $mode_key . '">'; |
|
| 79 | + print '<div id="block_'.$mode_key.'">'; |
|
| 80 | 80 | print load_fiche_titre($langs->trans($mode_info['label']), '', ''); |
| 81 | 81 | print '<div class="fichecenter">'; |
| 82 | 82 | print '<div class="fichehalfleft">'; |
| 83 | 83 | print '<div class="underbanner clearboth"></div>'; |
| 84 | - print '<table class="border centpercent tableforfield">' . "\n"; |
|
| 84 | + print '<table class="border centpercent tableforfield">'."\n"; |
|
| 85 | 85 | $mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position'); |
| 86 | 86 | foreach ($mode_info['fields'] as $field_key => $field_info) { |
| 87 | 87 | // Discard if extrafield is a hidden field on form |
@@ -102,14 +102,14 @@ discard block |
||
| 102 | 102 | print '<table class="border centpercent tableforfield">'; |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - $html_name = $prefix_html_name . $field_key; |
|
| 105 | + $html_name = $prefix_html_name.$field_key; |
|
| 106 | 106 | if (!empty($field_info['enabled_field'])) { |
| 107 | 107 | $info = explode(':', $field_info['enabled_field']); |
| 108 | 108 | $enabled_field_info[] = array( |
| 109 | 109 | 'mode_key' => $info[0], |
| 110 | 110 | 'field_key' => $info[1], |
| 111 | 111 | 'value' => $info[2], |
| 112 | - 'target' => 'field_' . $html_name, |
|
| 112 | + 'target' => 'field_'.$html_name, |
|
| 113 | 113 | ); |
| 114 | 114 | } |
| 115 | 115 | |
@@ -121,8 +121,8 @@ discard block |
||
| 121 | 121 | $more_class .= ' tdtop'; |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | - print '<tr class="field_' . $html_name . '" id="field_' . $html_name . '"><td'; |
|
| 125 | - print ' class="titlefieldcreate' . $more_class . '">'; |
|
| 124 | + print '<tr class="field_'.$html_name.'" id="field_'.$html_name.'"><td'; |
|
| 125 | + print ' class="titlefieldcreate'.$more_class.'">'; |
|
| 126 | 126 | if (!empty($field_info['help'])) { |
| 127 | 127 | print $form->textwithpicto($langs->trans($field_info['label']), $langs->trans($field_info['help'])); |
| 128 | 128 | } else { |
@@ -221,7 +221,7 @@ |
||
| 221 | 221 | } |
| 222 | 222 | }); |
| 223 | 223 | </script> |
| 224 | -SCRIPT; |
|
| 224 | +script; |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | ?> |