@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | ) { |
74 | 74 | // Not allowed page |
75 | 75 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
76 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
76 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
77 | 77 | exit; |
78 | 78 | } |
79 | 79 | |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | // Is a date sent? |
99 | 99 | $dateCriteria = $request->query->get('dateCriteria'); |
100 | 100 | if ($dateCriteria !== null && !empty($dateCriteria)) { |
101 | - $sWhere .= ' AND a.del_value < ' . round(filter_var($dateCriteria, FILTER_SANITIZE_NUMBER_INT) / 1000, 0); |
|
101 | + $sWhere .= ' AND a.del_value < '.round(filter_var($dateCriteria, FILTER_SANITIZE_NUMBER_INT) / 1000, 0); |
|
102 | 102 | } |
103 | 103 | //echo $sWhere; |
104 | 104 | /* BUILD QUERY */ |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | $start = $request->query->getInt('start', 0); |
108 | 108 | $length = $request->query->getInt('length', -1); |
109 | 109 | if ($length !== -1) { |
110 | - $sLimit = ' LIMIT ' . $start . ', ' . $length; |
|
110 | + $sLimit = ' LIMIT '.$start.', '.$length; |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | //Ordering |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | $columnIndex = filter_var($order[0]['column'], FILTER_SANITIZE_NUMBER_INT); |
121 | 121 | |
122 | 122 | if (array_key_exists($columnIndex, $aColumns)) { |
123 | - $sOrder .= $aColumns[$columnIndex] . ' ' . $order[0]['dir']; |
|
123 | + $sOrder .= $aColumns[$columnIndex].' '.$order[0]['dir']; |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | // Supprimez la virgule finale si elle existe |
@@ -144,9 +144,9 @@ discard block |
||
144 | 144 | |
145 | 145 | if ($letter !== '' && $letter !== 'None') { |
146 | 146 | $sWhere .= ' AND '; |
147 | - $sWhere .= $aColumns[1] . " LIKE '" . $letter . "%' OR "; |
|
148 | - $sWhere .= $aColumns[2] . " LIKE '" . $letter . "%' OR "; |
|
149 | - $sWhere .= $aColumns[3] . " LIKE '" . $letter . "%' "; |
|
147 | + $sWhere .= $aColumns[1]." LIKE '".$letter."%' OR "; |
|
148 | + $sWhere .= $aColumns[2]." LIKE '".$letter."%' OR "; |
|
149 | + $sWhere .= $aColumns[3]." LIKE '".$letter."%' "; |
|
150 | 150 | } |
151 | 151 | } |
152 | 152 | |
@@ -157,26 +157,26 @@ discard block |
||
157 | 157 | |
158 | 158 | if ($searchValue !== '') { |
159 | 159 | $sWhere = ' AND '; |
160 | - $sWhere .= $aColumns[1] . " LIKE '" . $searchValue . "%' OR "; |
|
161 | - $sWhere .= $aColumns[2] . " LIKE '" . $searchValue . "%' OR "; |
|
162 | - $sWhere .= $aColumns[3] . " LIKE '" . $searchValue . "%' "; |
|
160 | + $sWhere .= $aColumns[1]." LIKE '".$searchValue."%' OR "; |
|
161 | + $sWhere .= $aColumns[2]." LIKE '".$searchValue."%' OR "; |
|
162 | + $sWhere .= $aColumns[3]." LIKE '".$searchValue."%' "; |
|
163 | 163 | } |
164 | 164 | } |
165 | 165 | } |
166 | 166 | |
167 | 167 | $rows = DB::query( |
168 | 168 | 'SELECT a.item_id, i.label, a.del_value, i.id_tree |
169 | - FROM ' . prefixTable('automatic_del') . ' AS a |
|
170 | - INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = a.item_id)' . |
|
169 | + FROM ' . prefixTable('automatic_del').' AS a |
|
170 | + INNER JOIN ' . prefixTable('items').' AS i ON (i.id = a.item_id)'. |
|
171 | 171 | $sWhere. |
172 | 172 | (string) $sOrder |
173 | 173 | ); |
174 | 174 | $iTotal = DB::count(); |
175 | 175 | $rows = DB::query( |
176 | 176 | 'SELECT a.item_id, i.label, a.del_value, i.id_tree |
177 | - FROM ' . prefixTable('automatic_del') . ' AS a |
|
178 | - INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = a.item_id)' . |
|
179 | - $sWhere . |
|
177 | + FROM ' . prefixTable('automatic_del').' AS a |
|
178 | + INNER JOIN ' . prefixTable('items').' AS i ON (i.id = a.item_id)'. |
|
179 | + $sWhere. |
|
180 | 180 | $sLimit |
181 | 181 | ); |
182 | 182 | $iFilteredTotal = DB::count(); |
@@ -194,18 +194,18 @@ discard block |
||
194 | 194 | // start the line |
195 | 195 | $sOutput .= '['; |
196 | 196 | // Column 1 |
197 | - $sOutput .= '"<i class=\"fas fa-external-link-alt pointer text-primary mr-2\" onclick=\"showItemCard($(this))\" data-item-id=\"' . $record['item_id'] . '\" data-item-tree-id=\"' . $record['id_tree'] . '\"></i>", '; |
|
197 | + $sOutput .= '"<i class=\"fas fa-external-link-alt pointer text-primary mr-2\" onclick=\"showItemCard($(this))\" data-item-id=\"'.$record['item_id'].'\" data-item-tree-id=\"'.$record['id_tree'].'\"></i>", '; |
|
198 | 198 | // Column 2 |
199 | - $sOutput .= '"' . $record['label'] . '", '; |
|
199 | + $sOutput .= '"'.$record['label'].'", '; |
|
200 | 200 | // Column 3 |
201 | - $sOutput .= '"' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['del_value']) . '", '; |
|
201 | + $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['del_value']).'", '; |
|
202 | 202 | // Column 4 |
203 | 203 | $path = []; |
204 | 204 | $treeDesc = $tree->getPath($record['id_tree'], true); |
205 | 205 | foreach ($treeDesc as $t) { |
206 | 206 | array_push($path, $t->title); |
207 | 207 | } |
208 | - $sOutput .= '"' . implode('<i class=\"fas fa-angle-right ml-1 mr-1\"></i>', $path) . '"],'; |
|
208 | + $sOutput .= '"'.implode('<i class=\"fas fa-angle-right ml-1 mr-1\"></i>', $path).'"],'; |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | if ($iTotal > 0) { |
@@ -218,4 +218,4 @@ discard block |
||
218 | 218 | } |
219 | 219 | |
220 | 220 | // finalize output |
221 | -echo '{"recordsTotal": ' . (int) $iTotal . ', "recordsFiltered": ' . (int) $iFilteredTotal . ', "data": ' . htmlspecialchars($sOutput); |
|
221 | +echo '{"recordsTotal": '.(int) $iTotal.', "recordsFiltered": '.(int) $iFilteredTotal.', "data": '.htmlspecialchars($sOutput); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | ) { |
70 | 70 | // Not allowed page |
71 | 71 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
72 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
72 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
73 | 73 | exit; |
74 | 74 | } |
75 | 75 | |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | ); |
451 | 451 | |
452 | 452 | // add new role to user |
453 | - $tmp = $data_tmp['fonction_id'] . (substr($data_tmp['fonction_id'], -1) == ';' ? $role_id : ';' . $role_id); |
|
453 | + $tmp = $data_tmp['fonction_id'].(substr($data_tmp['fonction_id'], -1) == ';' ? $role_id : ';'.$role_id); |
|
454 | 454 | $session->set('user-roles', str_replace(';;', ';', $tmp)); |
455 | 455 | |
456 | 456 | // store in DB |
@@ -722,7 +722,7 @@ discard block |
||
722 | 722 | $groupsData = $openLdapExtra->getADGroups($ldapConnection, $SETTINGS); |
723 | 723 | break; |
724 | 724 | default: |
725 | - throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']); |
|
725 | + throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']); |
|
726 | 726 | } |
727 | 727 | } catch (Exception $e) { |
728 | 728 | error_log('TEAMPASS Error - ldap - '.$e->getMessage()); |
@@ -740,7 +740,7 @@ discard block |
||
740 | 740 | // Handle successful retrieval of groups |
741 | 741 | // exists in Teampass |
742 | 742 | //error_log("Error: " . print_r($groupsData['userGroups'], true)); |
743 | - foreach($groupsData['userGroups'] as $key => $group) { |
|
743 | + foreach ($groupsData['userGroups'] as $key => $group) { |
|
744 | 744 | $role_detail = DB::queryfirstrow( |
745 | 745 | 'SELECT a.increment_id as increment_id, a.role_id as role_id, r.title as title |
746 | 746 | FROM '.prefixTable('ldap_groups_roles').' AS a |
@@ -765,7 +765,7 @@ discard block |
||
765 | 765 | |
766 | 766 | // Get all groups in Teampass |
767 | 767 | $teampassRoles = array(); |
768 | - $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title')); |
|
768 | + $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title')); |
|
769 | 769 | foreach ($rows as $record) { |
770 | 770 | array_push( |
771 | 771 | $teampassRoles, |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('backups') === false) { |
69 | 69 | // Not allowed page |
70 | 70 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
71 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
71 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
72 | 72 | exit; |
73 | 73 | } |
74 | 74 | ?> |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | // ERROR |
138 | 138 | toastr.remove(); |
139 | 139 | toastr.error( |
140 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error, |
|
140 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error, |
|
141 | 141 | '<?php echo $lang->get('error'); ?>', { |
142 | 142 | timeOut: 5000, |
143 | 143 | progressBar: true |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | // error |
165 | 165 | toastr.remove(); |
166 | 166 | toastr.error( |
167 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error, |
|
167 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error, |
|
168 | 168 | '<?php echo $lang->get('error'); ?>', { |
169 | 169 | timeOut: 5000, |
170 | 170 | progressBar: true |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | // ERROR |
272 | 272 | toastr.remove(); |
273 | 273 | toastr.error( |
274 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error, |
|
274 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error, |
|
275 | 275 | '<?php echo $lang->get('error'); ?>', { |
276 | 276 | timeOut: 5000, |
277 | 277 | progressBar: true |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | function updateProgressBar(offset, totalSize) { |
292 | 292 | // Show progress to user |
293 | 293 | var percentage = Math.round((offset / totalSize) * 100); |
294 | - //var message = '<i class="mr-2 fa-solid fa-rocket fa-beat"></i><?php echo $lang->get('restore_in_progress');?> <b>' + percentage + '%</b>'; |
|
294 | + //var message = '<i class="mr-2 fa-solid fa-rocket fa-beat"></i><?php echo $lang->get('restore_in_progress'); ?> <b>' + percentage + '%</b>'; |
|
295 | 295 | //console.log(message) |
296 | 296 | $('#onthefly-restore-progress-text').text(percentage); |
297 | 297 | } |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | // PREPARE UPLOADER with plupload |
308 | 308 | <?php |
309 | 309 | $maxFileSize = (strrpos($SETTINGS['upload_maxfilesize'], 'mb') === false) |
310 | - ? $SETTINGS['upload_maxfilesize'] . 'mb' |
|
310 | + ? $SETTINGS['upload_maxfilesize'].'mb' |
|
311 | 311 | : $SETTINGS['upload_maxfilesize']; |
312 | 312 | ?> |
313 | 313 |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('backups') === false) { |
69 | 69 | // Not allowed page |
70 | 70 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
71 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
71 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
72 | 72 | exit; |
73 | 73 | } |
74 | 74 | |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | </div> |
179 | 179 | <div class="alert alert-info ml-2 mt-3 mr-2 hidden" id="onthefly-restore-progress"> |
180 | 180 | <h5><i class="icon fa fa-info mr-2"></i><?php echo $lang->get('in_progress'); ?></h5> |
181 | - <i class="mr-2 fa-solid fa-rocket fa-beat"></i><?php echo $lang->get('restore_in_progress');?> <b><span id="onthefly-restore-progress-text">0</span>%</b> |
|
181 | + <i class="mr-2 fa-solid fa-rocket fa-beat"></i><?php echo $lang->get('restore_in_progress'); ?> <b><span id="onthefly-restore-progress-text">0</span>%</b> |
|
182 | 182 | </div> |
183 | 183 | <div class="row mt-3 hidden" id="onthefly-restore-finished"></div> |
184 | 184 | <div class="row mt-3"> |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | ) { |
70 | 70 | // Not allowed page |
71 | 71 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
72 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
72 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
73 | 73 | exit; |
74 | 74 | } |
75 | 75 | |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | } else { |
124 | 124 | // check if token is expired |
125 | 125 | $data = DB::queryFirstRow( |
126 | - 'SELECT end_timestamp FROM ' . prefixTable('tokens') . ' WHERE user_id = %i AND token = %s', |
|
126 | + 'SELECT end_timestamp FROM '.prefixTable('tokens').' WHERE user_id = %i AND token = %s', |
|
127 | 127 | $session->get('user-id'), |
128 | 128 | $post_user_token |
129 | 129 | ); |
@@ -147,12 +147,12 @@ discard block |
||
147 | 147 | |
148 | 148 | // HTTP headers for no cache etc |
149 | 149 | header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); |
150 | -header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); |
|
150 | +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); |
|
151 | 151 | header('Cache-Control: no-store, no-cache, must-revalidate'); |
152 | 152 | header('Cache-Control: post-check=0, pre-check=0', false); |
153 | 153 | |
154 | 154 | if (null !== $post_type_upload && $post_type_upload === 'upload_profile_photo') { |
155 | - $targetDir = realpath($SETTINGS['cpassman_dir'] . '/includes/avatars'); |
|
155 | + $targetDir = realpath($SETTINGS['cpassman_dir'].'/includes/avatars'); |
|
156 | 156 | } else { |
157 | 157 | $targetDir = realpath($SETTINGS['path_to_files_folder']); |
158 | 158 | } |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | // Validate file name (for our purposes we'll just remove invalid characters) |
214 | 214 | $file_name = preg_replace('/[^a-zA-Z0-9-_\.]/', '', strtolower(basename($_FILES['file']['name']))); |
215 | 215 | if (strlen($file_name) == 0 || strlen($file_name) > $MAX_FILENAME_LENGTH) { |
216 | - echo handleUploadError('Invalid file name: ' . $file_name . '.'); |
|
216 | + echo handleUploadError('Invalid file name: '.$file_name.'.'); |
|
217 | 217 | return false; |
218 | 218 | } |
219 | 219 | |
@@ -228,8 +228,8 @@ discard block |
||
228 | 228 | $ext, |
229 | 229 | explode( |
230 | 230 | ',', |
231 | - $SETTINGS['upload_docext'] . ',' . $SETTINGS['upload_imagesext'] . |
|
232 | - ',' . $SETTINGS['upload_pkgext'] . ',' . $SETTINGS['upload_otherext'] |
|
231 | + $SETTINGS['upload_docext'].','.$SETTINGS['upload_imagesext']. |
|
232 | + ','.$SETTINGS['upload_pkgext'].','.$SETTINGS['upload_otherext'] |
|
233 | 233 | ) |
234 | 234 | ) === false |
235 | 235 | && $post_type_upload !== 'import_items_from_keepass' |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | |
244 | 244 | // is destination folder writable |
245 | 245 | if (is_writable($SETTINGS['path_to_files_folder']) === false) { |
246 | - echo handleUploadError('Not enough permissions on folder ' . $SETTINGS['path_to_files_folder'] . '.'); |
|
246 | + echo handleUploadError('Not enough permissions on folder '.$SETTINGS['path_to_files_folder'].'.'); |
|
247 | 247 | return false; |
248 | 248 | } |
249 | 249 | |
@@ -251,19 +251,19 @@ discard block |
||
251 | 251 | $fileName = preg_replace('/[^a-zA-Z0-9-_\.]/', '', strtolower(basename($fileName))); |
252 | 252 | |
253 | 253 | // Make sure the fileName is unique but only if chunking is disabled |
254 | -if ($chunks < 2 && file_exists($targetDir . DIRECTORY_SEPARATOR . $fileName)) { |
|
254 | +if ($chunks < 2 && file_exists($targetDir.DIRECTORY_SEPARATOR.$fileName)) { |
|
255 | 255 | $fileNameA = substr($fileName, 0, strlen($ext)); |
256 | 256 | $fileNameB = substr($fileName, strlen($ext)); |
257 | 257 | |
258 | 258 | $count = 1; |
259 | - while (file_exists($targetDir . DIRECTORY_SEPARATOR . $fileNameA . '_' . $count . $fileNameB)) { |
|
259 | + while (file_exists($targetDir.DIRECTORY_SEPARATOR.$fileNameA.'_'.$count.$fileNameB)) { |
|
260 | 260 | ++$count; |
261 | 261 | } |
262 | 262 | |
263 | - $fileName = $fileNameA . '_' . $count . $fileNameB; |
|
263 | + $fileName = $fileNameA.'_'.$count.$fileNameB; |
|
264 | 264 | } |
265 | 265 | |
266 | -$filePath = $targetDir . DIRECTORY_SEPARATOR . $fileName; |
|
266 | +$filePath = $targetDir.DIRECTORY_SEPARATOR.$fileName; |
|
267 | 267 | |
268 | 268 | // Create target dir |
269 | 269 | if (!file_exists($targetDir)) { |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | // Remove old temp files |
278 | 278 | if ($cleanupTargetDir && is_dir($targetDir) && ($dir = opendir($targetDir))) { |
279 | 279 | while (($file = readdir($dir)) !== false) { |
280 | - $tmpfilePath = $targetDir . DIRECTORY_SEPARATOR . $file; |
|
280 | + $tmpfilePath = $targetDir.DIRECTORY_SEPARATOR.$file; |
|
281 | 281 | |
282 | 282 | // Remove temp file if it is older than the max age and is not the current file |
283 | 283 | if ( |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | |
292 | 292 | closedir($dir); |
293 | 293 | } else { |
294 | - echo handleUploadError('Not enough permissions on folder ' . $SETTINGS['path_to_files_folder'] . '.'); |
|
294 | + echo handleUploadError('Not enough permissions on folder '.$SETTINGS['path_to_files_folder'].'.'); |
|
295 | 295 | return false; |
296 | 296 | } |
297 | 297 | |
@@ -320,18 +320,18 @@ discard block |
||
320 | 320 | fwrite($out, $buff); |
321 | 321 | } |
322 | 322 | } else { |
323 | - echo handleUploadError('Failed to open input stream ' . $SETTINGS['path_to_files_folder'] . '.'); |
|
323 | + echo handleUploadError('Failed to open input stream '.$SETTINGS['path_to_files_folder'].'.'); |
|
324 | 324 | return false; |
325 | 325 | } |
326 | 326 | fclose($in); |
327 | 327 | fclose($out); |
328 | 328 | fileDelete($_FILES['file']['tmp_name'], $SETTINGS); |
329 | 329 | } else { |
330 | - echo handleUploadError('Failed to open output stream ' . $SETTINGS['path_to_files_folder'] . '.'); |
|
330 | + echo handleUploadError('Failed to open output stream '.$SETTINGS['path_to_files_folder'].'.'); |
|
331 | 331 | return false; |
332 | 332 | } |
333 | 333 | } else { |
334 | - echo handleUploadError('Failed to move uploaded file to ' . $SETTINGS['path_to_files_folder'] . '.'); |
|
334 | + echo handleUploadError('Failed to move uploaded file to '.$SETTINGS['path_to_files_folder'].'.'); |
|
335 | 335 | return false; |
336 | 336 | } |
337 | 337 | } else { |
@@ -347,14 +347,14 @@ discard block |
||
347 | 347 | fwrite($out, $buff); |
348 | 348 | } |
349 | 349 | } else { |
350 | - echo handleUploadError('Failed to open input stream ' . $SETTINGS['path_to_files_folder'] . '.'); |
|
350 | + echo handleUploadError('Failed to open input stream '.$SETTINGS['path_to_files_folder'].'.'); |
|
351 | 351 | return false; |
352 | 352 | } |
353 | 353 | |
354 | 354 | fclose($in); |
355 | 355 | fclose($out); |
356 | 356 | } else { |
357 | - echo handleUploadError('Failed to open output stream ' . $SETTINGS['path_to_files_folder'] . '.'); |
|
357 | + echo handleUploadError('Failed to open output stream '.$SETTINGS['path_to_files_folder'].'.'); |
|
358 | 358 | return false; |
359 | 359 | } |
360 | 360 | } |
@@ -379,7 +379,7 @@ discard block |
||
379 | 379 | ) { |
380 | 380 | rename( |
381 | 381 | $filePath, |
382 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName |
|
382 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName |
|
383 | 383 | ); |
384 | 384 | |
385 | 385 | // Add in DB |
@@ -408,7 +408,7 @@ discard block |
||
408 | 408 | ) { |
409 | 409 | rename( |
410 | 410 | $filePath, |
411 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName |
|
411 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName |
|
412 | 412 | ); |
413 | 413 | |
414 | 414 | // Add in DB |
@@ -441,13 +441,13 @@ discard block |
||
441 | 441 | // rename the file |
442 | 442 | rename( |
443 | 443 | $filePath, |
444 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName . '.' . $ext |
|
444 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName.'.'.$ext |
|
445 | 445 | ); |
446 | 446 | |
447 | 447 | // make thumbnail |
448 | 448 | $ret = makeThumbnail( |
449 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName . '.' . $ext, |
|
450 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName . '_thumb' . '.' . $ext, |
|
449 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName.'.'.$ext, |
|
450 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName.'_thumb'.'.'.$ext, |
|
451 | 451 | 40 |
452 | 452 | ); |
453 | 453 | |
@@ -458,21 +458,21 @@ discard block |
||
458 | 458 | } |
459 | 459 | |
460 | 460 | // get current avatar and delete it |
461 | - $data = DB::queryFirstRow('SELECT avatar, avatar_thumb FROM ' . prefixTable('users') . ' WHERE id=%i', $session->get('user-id')); |
|
462 | - fileDelete($targetDir . DIRECTORY_SEPARATOR . $data['avatar'], $SETTINGS); |
|
463 | - fileDelete($targetDir . DIRECTORY_SEPARATOR . $data['avatar_thumb'], $SETTINGS); |
|
461 | + $data = DB::queryFirstRow('SELECT avatar, avatar_thumb FROM '.prefixTable('users').' WHERE id=%i', $session->get('user-id')); |
|
462 | + fileDelete($targetDir.DIRECTORY_SEPARATOR.$data['avatar'], $SETTINGS); |
|
463 | + fileDelete($targetDir.DIRECTORY_SEPARATOR.$data['avatar_thumb'], $SETTINGS); |
|
464 | 464 | |
465 | 465 | // store in DB the new avatar |
466 | 466 | DB::query( |
467 | - 'UPDATE ' . prefixTable('users') . " |
|
468 | - SET avatar='" . $newFileName . '.' . $ext . "', avatar_thumb='" . $newFileName . '_thumb' . '.' . $ext . "' |
|
467 | + 'UPDATE '.prefixTable('users')." |
|
468 | + SET avatar='" . $newFileName.'.'.$ext."', avatar_thumb='".$newFileName.'_thumb'.'.'.$ext."' |
|
469 | 469 | WHERE id=%i", |
470 | 470 | $session->get('user-id') |
471 | 471 | ); |
472 | 472 | |
473 | 473 | // store in session |
474 | - $session->set('user-avatar', $newFileName . '.' . $ext); |
|
475 | - $session->set('user-avatar_thumb', $newFileName . '_thumb' . '.' . $ext); |
|
474 | + $session->set('user-avatar', $newFileName.'.'.$ext); |
|
475 | + $session->set('user-avatar_thumb', $newFileName.'_thumb'.'.'.$ext); |
|
476 | 476 | |
477 | 477 | // return info |
478 | 478 | echo prepareExchangedData( |
@@ -491,7 +491,7 @@ discard block |
||
491 | 491 | ) { |
492 | 492 | rename( |
493 | 493 | $filePath, |
494 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName |
|
494 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName |
|
495 | 495 | ); |
496 | 496 | |
497 | 497 | // Add in DB |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | filter_input(INPUT_GET, 'code', FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
87 | 87 | ); |
88 | 88 | |
89 | - if (DB::count() > 0 && (int) $data['timestamp'] === (int) filter_input(INPUT_GET, 'stamp', FILTER_VALIDATE_INT)) { |
|
89 | + if (DB::count() > 0 && (int) $data['timestamp'] === (int) filter_input(INPUT_GET, 'stamp', FILTER_VALIDATE_INT)) { |
|
90 | 90 | // otv is too old |
91 | 91 | if ($data['time_limit'] < time() || ($data['views'] + 1) > $data['max_views']) { |
92 | 92 | $html = '<div class="text-center text-danger"> |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | <tr><th>URL:</th><td>'.$url.'</td></tr> |
191 | 191 | </table></div> |
192 | 192 | <p class="mt-3 text-info"><i class="fas fa-info mr-2"></i>Copy carefully the data you need.<br>This page is visible until <b>'. |
193 | - date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $dataItem['time_limit']).'</b> OR <b>'.($dataItem['max_views'] - ($dataItem['views']+1)).' more time(s)</b>.</div> |
|
193 | + date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $dataItem['time_limit']).'</b> OR <b>'.($dataItem['max_views'] - ($dataItem['views'] + 1)).' more time(s)</b>.</div> |
|
194 | 194 | </div>'; |
195 | 195 | // log |
196 | 196 | logItems( |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('users') === false) { |
67 | 67 | // Not allowed page |
68 | 68 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
69 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
69 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
70 | 70 | exit; |
71 | 71 | } |
72 | 72 | |
@@ -89,24 +89,24 @@ discard block |
||
89 | 89 | // If administrator then all roles are shown |
90 | 90 | // else only the Roles the users is associated to. |
91 | 91 | if ((int) $session->get('user-admin') === 1) { |
92 | - $optionsManagedBy .= '<option value="0">' . $lang->get('administrators_only') . '</option>'; |
|
92 | + $optionsManagedBy .= '<option value="0">'.$lang->get('administrators_only').'</option>'; |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | $rows = DB::query( |
96 | 96 | 'SELECT id, title, creator_id |
97 | - FROM ' . prefixTable('roles_title') . ' |
|
97 | + FROM ' . prefixTable('roles_title').' |
|
98 | 98 | ORDER BY title ASC' |
99 | 99 | ); |
100 | 100 | foreach ($rows as $record) { |
101 | 101 | if ((int) $session->get('user-admin') === 1 || in_array($record['id'], $session->get('user-roles_array')) === true) { |
102 | - $optionsManagedBy .= '<option value="' . $record['id'] . '">' . $lang->get('managers_of') . ' ' . addslashes($record['title']) . '</option>'; |
|
102 | + $optionsManagedBy .= '<option value="'.$record['id'].'">'.$lang->get('managers_of').' '.addslashes($record['title']).'</option>'; |
|
103 | 103 | } |
104 | 104 | if ( |
105 | 105 | (int) $session->get('user-admin') === 1 |
106 | 106 | || (((int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1) |
107 | 107 | && (in_array($record['id'], $userRoles) === true) || (int) $record['creator_id'] === (int) $session->get('user-id')) |
108 | 108 | ) { |
109 | - $optionsRoles .= '<option value="' . $record['id'] . '">' . addslashes($record['title']) . '</option>'; |
|
109 | + $optionsRoles .= '<option value="'.$record['id'].'">'.addslashes($record['title']).'</option>'; |
|
110 | 110 | } |
111 | 111 | } |
112 | 112 | |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | for ($y = 1; $y < $t->nlevel; ++$y) { |
122 | 122 | $ident .= ' '; |
123 | 123 | } |
124 | - $foldersList .= '<option value="' . $t->id . '">' . $ident . htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8') . '</option>'; |
|
124 | + $foldersList .= '<option value="'.$t->id.'">'.$ident.htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8').'</option>'; |
|
125 | 125 | } |
126 | 126 | } |
127 | 127 | |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | </button><?php |
159 | 159 | echo isset($SETTINGS['ldap_mode']) === true && (int) $SETTINGS['ldap_mode'] === 1 && (int) $session->get('user-admin') === 1 ? |
160 | 160 | '<button type="button" class="btn btn-primary btn-sm tp-action mr-2" data-action="ldap-sync"> |
161 | - <i class="fa-solid fa-address-card mr-2"></i>' . $lang->get('ldap_synchronization') . ' |
|
161 | + <i class="fa-solid fa-address-card mr-2"></i>' . $lang->get('ldap_synchronization').' |
|
162 | 162 | </button>' : ''; |
163 | 163 | ?> |
164 | 164 | </h3> |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | |
167 | 167 | <!-- /.card-header --> |
168 | 168 | <div class="card-body form" id="users-list"> |
169 | - <label><input type="checkbox" id="warnings_display" class="tp-action pointer" data-action="refresh"><span class="ml-2 pointer"><?php echo $lang->get('display_warning_icons');?></span></label> |
|
169 | + <label><input type="checkbox" id="warnings_display" class="tp-action pointer" data-action="refresh"><span class="ml-2 pointer"><?php echo $lang->get('display_warning_icons'); ?></span></label> |
|
170 | 170 | <table id="table-users" class="table table-striped nowrap table-responsive-sm"> |
171 | 171 | <thead> |
172 | 172 | <tr> |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | <?php |
232 | 232 | foreach (TP_PW_COMPLEXITY as $entry) { |
233 | 233 | echo ' |
234 | - <option value="' . $entry[0] . '">' . addslashes($entry[1]) . '</option>'; |
|
234 | + <option value="' . $entry[0].'">'.addslashes($entry[1]).'</option>'; |
|
235 | 235 | } |
236 | 236 | ?> |
237 | 237 | </select> |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | |
57 | 57 | $subtask = DB::queryfirstrow( |
58 | 58 | 'SELECT * |
59 | - FROM ' . prefixTable('background_subtasks') . ' |
|
59 | + FROM ' . prefixTable('background_subtasks').' |
|
60 | 60 | WHERE process_id = %i AND finished_at IS NULL |
61 | 61 | ORDER BY increment_id ASC', |
62 | 62 | (int) $request->request->get('subTask') |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | |
65 | 65 | list($taskArguments) = DB::queryFirstField( |
66 | 66 | 'SELECT arguments |
67 | - FROM ' . prefixTable('background_tasks') . ' |
|
67 | + FROM ' . prefixTable('background_tasks').' |
|
68 | 68 | WHERE increment_id = %i', |
69 | 69 | $subtask['process_id'] |
70 | 70 | ); |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | // Loop on all files for this item |
76 | 76 | // and encrypt them for each user |
77 | 77 | if (WIP === true) provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS); |
78 | - foreach($args['files_keys'] as $file) { |
|
78 | + foreach ($args['files_keys'] as $file) { |
|
79 | 79 | storeUsersShareKey( |
80 | 80 | prefixTable('sharekeys_items'), |
81 | 81 | 0, |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | // Loop on all encrypted fields for this item |
93 | 93 | // and encrypt them for each user |
94 | 94 | if (WIP === true) provideLog('[DEBUG] '.print_r($args, true), $SETTINGS); |
95 | - foreach($args['fields_keys'] as $field) { |
|
95 | + foreach ($args['fields_keys'] as $field) { |
|
96 | 96 | storeUsersShareKey( |
97 | 97 | prefixTable('sharekeys_fields'), |
98 | 98 | 0, |
@@ -103,10 +103,10 @@ discard block |
||
103 | 103 | */ |
104 | 104 | function provideLog(string $message, array $SETTINGS) |
105 | 105 | { |
106 | - error_log((string) date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], time()) . ' - '.$message); |
|
106 | + error_log((string) date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], time()).' - '.$message); |
|
107 | 107 | } |
108 | 108 | |
109 | -function performVisibleFoldersHtmlUpdate (int $user_id) |
|
109 | +function performVisibleFoldersHtmlUpdate(int $user_id) |
|
110 | 110 | { |
111 | 111 | $html = []; |
112 | 112 | |
@@ -116,10 +116,10 @@ discard block |
||
116 | 116 | |
117 | 117 | // get current folders visible for user |
118 | 118 | $cache_tree = DB::queryFirstRow( |
119 | - 'SELECT increment_id, data FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', |
|
119 | + 'SELECT increment_id, data FROM '.prefixTable('cache_tree').' WHERE user_id = %i', |
|
120 | 120 | $user_id |
121 | 121 | ); |
122 | - $folders = json_decode($cache_tree['data'], true);//print_r($folders); |
|
122 | + $folders = json_decode($cache_tree['data'], true); //print_r($folders); |
|
123 | 123 | foreach ($folders as $folder) { |
124 | 124 | $idFolder = (int) explode("li_", $folder['id'])[1]; |
125 | 125 | |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | |
133 | 133 | // get folder info |
134 | 134 | $folder = DB::queryFirstRow( |
135 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
135 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
136 | 136 | $idFolder |
137 | 137 | ); |
138 | 138 | |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | function subTaskStatus($taskId) |
168 | 168 | { |
169 | 169 | $subTasks = DB::query( |
170 | - 'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i', |
|
170 | + 'SELECT * FROM '.prefixTable('background_subtasks').' WHERE task_id = %i', |
|
171 | 171 | $taskId |
172 | 172 | ); |
173 | 173 |