@@ -74,7 +74,7 @@ |
||
74 | 74 | } |
75 | 75 | $result = restrictedArea($user, 'deplacement', $id, ''); |
76 | 76 | |
77 | -$permissiontoadd = $user->rights->deplacement->creer; // Used by the include of actions_dellink.inc.php |
|
77 | +$permissiontoadd = $user->rights->deplacement->creer; // Used by the include of actions_dellink.inc.php |
|
78 | 78 | |
79 | 79 | |
80 | 80 | /* |
@@ -79,7 +79,7 @@ |
||
79 | 79 | } |
80 | 80 | $result = restrictedArea($user, 'tax', '', 'tva', 'charges'); |
81 | 81 | |
82 | -$permissiontoadd = $user->rights->tax->charges->creer; // Used by the include of actions_dellink.inc.php |
|
82 | +$permissiontoadd = $user->rights->tax->charges->creer; // Used by the include of actions_dellink.inc.php |
|
83 | 83 | |
84 | 84 | |
85 | 85 | /* |
@@ -69,7 +69,7 @@ |
||
69 | 69 | $upload_dir = $conf->bank->dir_output.'/'.dol_sanitizeFileName($object->id); |
70 | 70 | $modulepart = 'banque'; |
71 | 71 | |
72 | -$permissiontoadd = $user->rights->banque->modifier; // Used by the include of actions_dellink.inc.php |
|
72 | +$permissiontoadd = $user->rights->banque->modifier; // Used by the include of actions_dellink.inc.php |
|
73 | 73 | |
74 | 74 | |
75 | 75 |
@@ -120,7 +120,7 @@ |
||
120 | 120 | $found = true; |
121 | 121 | } |
122 | 122 | |
123 | -$permissiontoadd = $user->rights->banque->modifier; // Used by the include of actions_dellink.inc.php |
|
123 | +$permissiontoadd = $user->rights->banque->modifier; // Used by the include of actions_dellink.inc.php |
|
124 | 124 | |
125 | 125 | |
126 | 126 | /* |
@@ -74,7 +74,7 @@ |
||
74 | 74 | |
75 | 75 | $result = restrictedArea($user, 'banque', $object->id, 'bank_account', '', ''); |
76 | 76 | |
77 | -$permissiontoadd = $user->rights->banque->modifier; // Used by the include of actions_dellink.inc.php |
|
77 | +$permissiontoadd = $user->rights->banque->modifier; // Used by the include of actions_dellink.inc.php |
|
78 | 78 | |
79 | 79 | |
80 | 80 | /* |
@@ -94,7 +94,7 @@ |
||
94 | 94 | } |
95 | 95 | } |
96 | 96 | |
97 | -$permissiontoadd = $user->rights->expensereport->creer; // Used by the include of actions_dellink.inc.php |
|
97 | +$permissiontoadd = $user->rights->expensereport->creer; // Used by the include of actions_dellink.inc.php |
|
98 | 98 | |
99 | 99 | |
100 | 100 | /* |
@@ -128,7 +128,7 @@ |
||
128 | 128 | |
129 | 129 | // Array to add new pages in new tabs |
130 | 130 | $this->tabs = array(); |
131 | - $this->tabs[] = array('data'=>'user:+skill_tab:Skills:hrm:1:/hrm/skill_tab.php?id=__ID__&objecttype=user'); // To add a new tab identified by code tabname1 |
|
131 | + $this->tabs[] = array('data'=>'user:+skill_tab:Skills:hrm:1:/hrm/skill_tab.php?id=__ID__&objecttype=user'); // To add a new tab identified by code tabname1 |
|
132 | 132 | //$this->tabs[] = array('data'=>'job:+tabname1:Poste:mylangfile@hrm:1:/hrm/poste_list.php?fk_job=__ID__'); // To add a new tab identified by code tabname1 |
133 | 133 | // Example: |
134 | 134 | // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@hrm:$user->rights->hrm->read:/hrm/mynewtab1.php?id=__ID__'); // To add a new tab identified by code tabname1 |
@@ -48,7 +48,7 @@ |
||
48 | 48 | case 'sellist': |
49 | 49 | $tmp = ''; |
50 | 50 | $tmpparam = jsonOrUnserialize($obj->param); // $tmp may be array 'options' => array 'c_currencies:code_iso:code_iso' => null |
51 | - if (is_array($tmpparam) && array_key_exists('options', $tmpparam) && $tmpparam['options'] && is_array($tmpparam['options'])) { |
|
51 | + if (is_array($tmpparam) && array_key_exists('options', $tmpparam) && $tmpparam['options'] && is_array($tmpparam['options'])) { |
|
52 | 52 | $tmpkeys = array_keys($tmpparam['options']); |
53 | 53 | $tmp = array_shift($tmpkeys); |
54 | 54 | } |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | */ |
139 | 139 | |
140 | 140 | // If we have a hash public (hashp), we guess the original_file. |
141 | -$ecmfile=''; |
|
141 | +$ecmfile = ''; |
|
142 | 142 | if (!empty($hashp)) { |
143 | 143 | include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php'; |
144 | 144 | $ecmfile = new EcmFiles($db); |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | } |
197 | 197 | |
198 | 198 | // Security: Delete string ../ or ..\ into $original_file |
199 | -$original_file = preg_replace('/\.\.+/', '..', $original_file); // Replace '... or more' with '..' |
|
199 | +$original_file = preg_replace('/\.\.+/', '..', $original_file); // Replace '... or more' with '..' |
|
200 | 200 | $original_file = str_replace('../', '/', $original_file); |
201 | 201 | $original_file = str_replace('..\\', '/', $original_file); |
202 | 202 |