@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | $config->setIgnoreHeaderLine('true'); |
160 | 160 | // extract data from CSV file |
161 | 161 | $interpreter = new Interpreter(); |
162 | - $interpreter->addObserver(function (array $row) use (&$valuesToImport) { |
|
162 | + $interpreter->addObserver(function(array $row) use (&$valuesToImport) { |
|
163 | 163 | $valuesToImport[] = array( |
164 | 164 | 'Label' => $row[0], |
165 | 165 | 'Login' => $row[1], |
@@ -1135,7 +1135,7 @@ discard block |
||
1135 | 1135 | break; |
1136 | 1136 | } |
1137 | 1137 | |
1138 | -spl_autoload_register(function ($class) { |
|
1138 | +spl_autoload_register(function($class) { |
|
1139 | 1139 | $prefix = 'League\\Csv\\'; |
1140 | 1140 | $base_dir = __DIR__.'/src/'; |
1141 | 1141 | $len = strlen($prefix); |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | // error |
87 | 87 | toastr.remove(); |
88 | 88 | toastr.error( |
89 | - '<?php echo langHdl('server_answer_error') . '<br />' . langHdl('server_returned_data') . ':<br />'; ?>' + data.error, |
|
89 | + '<?php echo langHdl('server_answer_error').'<br />'.langHdl('server_returned_data').':<br />'; ?>' + data.error, |
|
90 | 90 | '', { |
91 | 91 | closeButton: true, |
92 | 92 | positionClass: 'toastr-top-right' |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | // error |
152 | 152 | toastr.remove(); |
153 | 153 | toastr.error( |
154 | - '<?php echo langHdl('server_answer_error') . '<br />' . langHdl('server_returned_data') . ':<br />'; ?>' + data.error, |
|
154 | + '<?php echo langHdl('server_answer_error').'<br />'.langHdl('server_returned_data').':<br />'; ?>' + data.error, |
|
155 | 155 | '', { |
156 | 156 | closeButton: true, |
157 | 157 | positionClass: 'toastr-top-right' |
@@ -35,10 +35,10 @@ |
||
35 | 35 | } |
36 | 36 | |
37 | 37 | /* do checks */ |
38 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
38 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
39 | 39 | if (checkUser($_SESSION['user_id'], $_SESSION['key'], '2fa', $SETTINGS) === false) { |
40 | 40 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page |
41 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
41 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
42 | 42 | exit(); |
43 | 43 | } |
44 | 44 | ?> |
@@ -35,15 +35,15 @@ |
||
35 | 35 | } |
36 | 36 | |
37 | 37 | /* do checks */ |
38 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
38 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
39 | 39 | if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'ldap', $SETTINGS) === false) { |
40 | 40 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
41 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
41 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
42 | 42 | exit(); |
43 | 43 | } |
44 | 44 | |
45 | 45 | // Load template |
46 | -require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
46 | +require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
47 | 47 | |
48 | 48 | // LDAP type currently loaded |
49 | 49 | $ldap_type = isset($SETTINGS['ldap_type']) ? $SETTINGS['ldap_type'] : ''; |
@@ -55,16 +55,16 @@ discard block |
||
55 | 55 | } |
56 | 56 | |
57 | 57 | /* do checks */ |
58 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
59 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
58 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
59 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
60 | 60 | if (!checkUser($_SESSION['user_id'], $_SESSION['key'], 'items', $SETTINGS)) { |
61 | 61 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page |
62 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
62 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
63 | 63 | exit(); |
64 | 64 | } |
65 | 65 | |
66 | 66 | // load functions |
67 | -require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
67 | +require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
68 | 68 | |
69 | 69 | // Prepare POST variables |
70 | 70 | $post_user_token = filter_input(INPUT_POST, 'user_token', FILTER_SANITIZE_STRING); |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | } else { |
100 | 100 | // check if token is expired |
101 | 101 | $data = DB::queryFirstRow( |
102 | - 'SELECT end_timestamp FROM ' . prefixTable('tokens') . ' WHERE user_id = %i AND token = %s', |
|
102 | + 'SELECT end_timestamp FROM '.prefixTable('tokens').' WHERE user_id = %i AND token = %s', |
|
103 | 103 | $_SESSION['user_id'], |
104 | 104 | $post_user_token |
105 | 105 | ); |
@@ -121,12 +121,12 @@ discard block |
||
121 | 121 | |
122 | 122 | // HTTP headers for no cache etc |
123 | 123 | header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); |
124 | -header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); |
|
124 | +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); |
|
125 | 125 | header('Cache-Control: no-store, no-cache, must-revalidate'); |
126 | 126 | header('Cache-Control: post-check=0, pre-check=0', false); |
127 | 127 | |
128 | 128 | if (null !== $post_type_upload && $post_type_upload === 'upload_profile_photo') { |
129 | - $targetDir = $SETTINGS['cpassman_dir'] . '/includes/avatars'; |
|
129 | + $targetDir = $SETTINGS['cpassman_dir'].'/includes/avatars'; |
|
130 | 130 | } else { |
131 | 131 | $targetDir = $SETTINGS['path_to_files_folder']; |
132 | 132 | } |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | |
181 | 181 | // Validate file name (for our purposes we'll just remove invalid characters) |
182 | 182 | $file_name = preg_replace( |
183 | - '/[^' . $valid_chars_regex . '\.]/', |
|
183 | + '/[^'.$valid_chars_regex.'\.]/', |
|
184 | 184 | '', |
185 | 185 | filter_var( |
186 | 186 | strtolower(basename($_FILES['file']['name'])), |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | ) |
189 | 189 | ); |
190 | 190 | if (strlen($file_name) == 0 || strlen($file_name) > $MAX_FILENAME_LENGTH) { |
191 | - handleUploadError('Invalid file name: ' . $file_name . '.'); |
|
191 | + handleUploadError('Invalid file name: '.$file_name.'.'); |
|
192 | 192 | } |
193 | 193 | |
194 | 194 | // Validate file extension |
@@ -202,8 +202,8 @@ discard block |
||
202 | 202 | $ext, |
203 | 203 | explode( |
204 | 204 | ',', |
205 | - $SETTINGS['upload_docext'] . ',' . $SETTINGS['upload_imagesext'] . |
|
206 | - ',' . $SETTINGS['upload_pkgext'] . ',' . $SETTINGS['upload_otherext'] |
|
205 | + $SETTINGS['upload_docext'].','.$SETTINGS['upload_imagesext']. |
|
206 | + ','.$SETTINGS['upload_pkgext'].','.$SETTINGS['upload_otherext'] |
|
207 | 207 | ) |
208 | 208 | ) === false |
209 | 209 | ) { |
@@ -212,27 +212,27 @@ discard block |
||
212 | 212 | |
213 | 213 | // is destination folder writable |
214 | 214 | if (is_writable($SETTINGS['path_to_files_folder']) === false) { |
215 | - handleUploadError('Not enough permissions on folder ' . $SETTINGS['path_to_files_folder'] . '.'); |
|
215 | + handleUploadError('Not enough permissions on folder '.$SETTINGS['path_to_files_folder'].'.'); |
|
216 | 216 | } |
217 | 217 | |
218 | 218 | // Clean the fileName for security reasons |
219 | 219 | $fileName = preg_replace('/[^\w\.]+/', '_', $fileName); |
220 | -$fileName = preg_replace('/[^' . $valid_chars_regex . '\.]/', '', strtolower(basename($fileName))); |
|
220 | +$fileName = preg_replace('/[^'.$valid_chars_regex.'\.]/', '', strtolower(basename($fileName))); |
|
221 | 221 | |
222 | 222 | // Make sure the fileName is unique but only if chunking is disabled |
223 | -if ($chunks < 2 && file_exists($targetDir . DIRECTORY_SEPARATOR . $fileName)) { |
|
223 | +if ($chunks < 2 && file_exists($targetDir.DIRECTORY_SEPARATOR.$fileName)) { |
|
224 | 224 | $fileNameA = substr($fileName, 0, strlen($ext)); |
225 | 225 | $fileNameB = substr($fileName, strlen($ext)); |
226 | 226 | |
227 | 227 | $count = 1; |
228 | - while (file_exists($targetDir . DIRECTORY_SEPARATOR . $fileNameA . '_' . $count . $fileNameB)) { |
|
228 | + while (file_exists($targetDir.DIRECTORY_SEPARATOR.$fileNameA.'_'.$count.$fileNameB)) { |
|
229 | 229 | ++$count; |
230 | 230 | } |
231 | 231 | |
232 | - $fileName = $fileNameA . '_' . $count . $fileNameB; |
|
232 | + $fileName = $fileNameA.'_'.$count.$fileNameB; |
|
233 | 233 | } |
234 | 234 | |
235 | -$filePath = $targetDir . DIRECTORY_SEPARATOR . $fileName; |
|
235 | +$filePath = $targetDir.DIRECTORY_SEPARATOR.$fileName; |
|
236 | 236 | |
237 | 237 | // Create target dir |
238 | 238 | if (!file_exists($targetDir)) { |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | // Remove old temp files |
247 | 247 | if ($cleanupTargetDir && is_dir($targetDir) && ($dir = opendir($targetDir))) { |
248 | 248 | while (($file = readdir($dir)) !== false) { |
249 | - $tmpfilePath = $targetDir . DIRECTORY_SEPARATOR . $file; |
|
249 | + $tmpfilePath = $targetDir.DIRECTORY_SEPARATOR.$file; |
|
250 | 250 | |
251 | 251 | // Remove temp file if it is older than the max age and is not the current file |
252 | 252 | if ( |
@@ -336,7 +336,7 @@ discard block |
||
336 | 336 | $newFileName = bin2hex(GenerateCryptKey(16, false, true, true, false, true, $SETTINGS)); |
337 | 337 | |
338 | 338 | //Connect to mysql server |
339 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
339 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
340 | 340 | DB::$host = DB_HOST; |
341 | 341 | DB::$user = DB_USER; |
342 | 342 | DB::$password = defuseReturnDecrypted(DB_PASSWD, $SETTINGS); |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | ) { |
353 | 353 | rename( |
354 | 354 | $filePath, |
355 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName |
|
355 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName |
|
356 | 356 | ); |
357 | 357 | |
358 | 358 | // Add in DB |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | ) { |
381 | 381 | rename( |
382 | 382 | $filePath, |
383 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName |
|
383 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName |
|
384 | 384 | ); |
385 | 385 | |
386 | 386 | // Add in DB |
@@ -412,13 +412,13 @@ discard block |
||
412 | 412 | // rename the file |
413 | 413 | rename( |
414 | 414 | $filePath, |
415 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName . '.' . $ext |
|
415 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName.'.'.$ext |
|
416 | 416 | ); |
417 | 417 | |
418 | 418 | // make thumbnail |
419 | 419 | $ret = makeThumbnail( |
420 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName . '.' . $ext, |
|
421 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName . '_thumb' . '.' . $ext, |
|
420 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName.'.'.$ext, |
|
421 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName.'_thumb'.'.'.$ext, |
|
422 | 422 | 40 |
423 | 423 | ); |
424 | 424 | |
@@ -429,21 +429,21 @@ discard block |
||
429 | 429 | } |
430 | 430 | |
431 | 431 | // get current avatar and delete it |
432 | - $data = DB::queryFirstRow('SELECT avatar, avatar_thumb FROM ' . prefixTable('users') . ' WHERE id=%i', $_SESSION['user_id']); |
|
433 | - fileDelete($targetDir . DIRECTORY_SEPARATOR . $data['avatar'], $SETTINGS); |
|
434 | - fileDelete($targetDir . DIRECTORY_SEPARATOR . $data['avatar_thumb'], $SETTINGS); |
|
432 | + $data = DB::queryFirstRow('SELECT avatar, avatar_thumb FROM '.prefixTable('users').' WHERE id=%i', $_SESSION['user_id']); |
|
433 | + fileDelete($targetDir.DIRECTORY_SEPARATOR.$data['avatar'], $SETTINGS); |
|
434 | + fileDelete($targetDir.DIRECTORY_SEPARATOR.$data['avatar_thumb'], $SETTINGS); |
|
435 | 435 | |
436 | 436 | // store in DB the new avatar |
437 | 437 | DB::query( |
438 | - 'UPDATE ' . prefixTable('users') . " |
|
439 | - SET avatar='" . $newFileName . '.' . $ext . "', avatar_thumb='" . $newFileName . '_thumb' . '.' . $ext . "' |
|
438 | + 'UPDATE '.prefixTable('users')." |
|
439 | + SET avatar='" . $newFileName.'.'.$ext."', avatar_thumb='".$newFileName.'_thumb'.'.'.$ext."' |
|
440 | 440 | WHERE id=%i", |
441 | 441 | $_SESSION['user_id'] |
442 | 442 | ); |
443 | 443 | |
444 | 444 | // store in session |
445 | - $_SESSION['user_avatar'] = $newFileName . '.' . $ext; |
|
446 | - $_SESSION['user_avatar_thumb'] = $newFileName . '_thumb' . '.' . $ext; |
|
445 | + $_SESSION['user_avatar'] = $newFileName.'.'.$ext; |
|
446 | + $_SESSION['user_avatar_thumb'] = $newFileName.'_thumb'.'.'.$ext; |
|
447 | 447 | |
448 | 448 | // return info |
449 | 449 | echo prepareExchangedData( |
@@ -461,7 +461,7 @@ discard block |
||
461 | 461 | ) { |
462 | 462 | rename( |
463 | 463 | $filePath, |
464 | - $targetDir . DIRECTORY_SEPARATOR . $newFileName |
|
464 | + $targetDir.DIRECTORY_SEPARATOR.$newFileName |
|
465 | 465 | ); |
466 | 466 | |
467 | 467 | // Add in DB |
@@ -39,11 +39,11 @@ discard block |
||
39 | 39 | } |
40 | 40 | |
41 | 41 | /* do checks */ |
42 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
43 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
42 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
43 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
44 | 44 | if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'items', $SETTINGS) !== true) { |
45 | 45 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page |
46 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
46 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
47 | 47 | exit(); |
48 | 48 | } |
49 | 49 | |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $post_isPersonal = filter_input(INPUT_POST, 'isPersonal', FILTER_SANITIZE_NUMBER_INT); |
70 | 70 | |
71 | 71 | // load functions |
72 | -require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
72 | +require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
73 | 73 | |
74 | 74 | // Get parameters |
75 | 75 | $chunk = isset($_REQUEST['chunk']) ? (int) $_REQUEST['chunk'] : 0; |
@@ -82,8 +82,8 @@ discard block |
||
82 | 82 | exit(); |
83 | 83 | } else { |
84 | 84 | //Connect to mysql server |
85 | - include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
86 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
85 | + include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
86 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
87 | 87 | if (defined('DB_PASSWD_CLEAR') === false) { |
88 | 88 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
89 | 89 | } |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | // check if token is expired |
144 | 144 | $data = DB::queryFirstRow( |
145 | 145 | 'SELECT end_timestamp |
146 | - FROM ' . prefixTable('tokens') . ' |
|
146 | + FROM ' . prefixTable('tokens').' |
|
147 | 147 | WHERE user_id = %i AND token = %s', |
148 | 148 | $_SESSION['user_id'], |
149 | 149 | $post_user_token |
@@ -168,12 +168,12 @@ discard block |
||
168 | 168 | } |
169 | 169 | |
170 | 170 | // Load Settings |
171 | - include_once $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php'; |
|
171 | + include_once $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php'; |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | // HTTP headers for no cache etc |
175 | 175 | header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); |
176 | -header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); |
|
176 | +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); |
|
177 | 177 | header('Cache-Control: no-store, no-cache, must-revalidate'); |
178 | 178 | header('Cache-Control: post-check=0, pre-check=0', false); |
179 | 179 | |
@@ -218,9 +218,9 @@ discard block |
||
218 | 218 | } |
219 | 219 | |
220 | 220 | // Validate file name (for our purposes we'll just remove invalid characters) |
221 | -$file_name = preg_replace('[^' . $valid_chars_regex . ']', '', strtolower(basename($_FILES['file']['name']))); |
|
221 | +$file_name = preg_replace('[^'.$valid_chars_regex.']', '', strtolower(basename($_FILES['file']['name']))); |
|
222 | 222 | if (strlen($file_name) == 0 || strlen($file_name) > $MAX_FILENAME_LENGTH) { |
223 | - handleAttachmentError('Invalid file name: ' . $file_name . '.', 114); |
|
223 | + handleAttachmentError('Invalid file name: '.$file_name.'.', 114); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | // Validate file extension |
@@ -230,8 +230,8 @@ discard block |
||
230 | 230 | $ext, |
231 | 231 | explode( |
232 | 232 | ',', |
233 | - $SETTINGS['upload_docext'] . ',' . $SETTINGS['upload_imagesext'] . |
|
234 | - ',' . $SETTINGS['upload_pkgext'] . ',' . $SETTINGS['upload_otherext'] |
|
233 | + $SETTINGS['upload_docext'].','.$SETTINGS['upload_imagesext']. |
|
234 | + ','.$SETTINGS['upload_pkgext'].','.$SETTINGS['upload_otherext'] |
|
235 | 235 | ) |
236 | 236 | ) === false |
237 | 237 | ) { |
@@ -243,24 +243,24 @@ discard block |
||
243 | 243 | |
244 | 244 | // Clean the fileName for security reasons |
245 | 245 | $fileInfo = pathinfo($fileName); |
246 | -$fileName = base64_encode($fileInfo['filename']) . '.' . $fileInfo['extension']; |
|
246 | +$fileName = base64_encode($fileInfo['filename']).'.'.$fileInfo['extension']; |
|
247 | 247 | $fileFullSize = 0; |
248 | 248 | |
249 | 249 | // Make sure the fileName is unique but only if chunking is disabled |
250 | -if ($chunks < 2 && file_exists($targetDir . DIRECTORY_SEPARATOR . $fileName)) { |
|
250 | +if ($chunks < 2 && file_exists($targetDir.DIRECTORY_SEPARATOR.$fileName)) { |
|
251 | 251 | $ext = strrpos($fileName, '.'); |
252 | 252 | $fileNameA = substr($fileName, 0, $ext); |
253 | 253 | $fileNameB = substr($fileName, $ext); |
254 | 254 | |
255 | 255 | $count = 1; |
256 | - while (file_exists($targetDir . DIRECTORY_SEPARATOR . $fileNameA . '_' . $count . $fileNameB)) { |
|
256 | + while (file_exists($targetDir.DIRECTORY_SEPARATOR.$fileNameA.'_'.$count.$fileNameB)) { |
|
257 | 257 | ++$count; |
258 | 258 | } |
259 | 259 | |
260 | - $fileName = $fileNameA . '_' . $count . $fileNameB; |
|
260 | + $fileName = $fileNameA.'_'.$count.$fileNameB; |
|
261 | 261 | } |
262 | 262 | |
263 | -$filePath = $targetDir . DIRECTORY_SEPARATOR . $fileName; |
|
263 | +$filePath = $targetDir.DIRECTORY_SEPARATOR.$fileName; |
|
264 | 264 | |
265 | 265 | // Create target dir |
266 | 266 | if (file_exists($targetDir) === false) { |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | // Remove old temp files |
275 | 275 | if ($cleanupTargetDir && is_dir($targetDir) && ($dir = opendir($targetDir))) { |
276 | 276 | while (($file = readdir($dir)) !== false) { |
277 | - $tmpfilePath = $targetDir . DIRECTORY_SEPARATOR . $file; |
|
277 | + $tmpfilePath = $targetDir.DIRECTORY_SEPARATOR.$file; |
|
278 | 278 | |
279 | 279 | // Remove temp file if it is older than the max age and is not the current file |
280 | 280 | if ( |
@@ -396,8 +396,8 @@ discard block |
||
396 | 396 | // This is a public object |
397 | 397 | $users = DB::query( |
398 | 398 | 'SELECT id, public_key |
399 | - FROM ' . prefixTable('users') . ' |
|
400 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '") |
|
399 | + FROM ' . prefixTable('users').' |
|
400 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'") |
|
401 | 401 | AND public_key != ""' |
402 | 402 | ); |
403 | 403 | foreach ($users as $user) { |
@@ -435,14 +435,14 @@ discard block |
||
435 | 435 | 'date' => time(), |
436 | 436 | 'id_user' => $_SESSION['user_id'], |
437 | 437 | 'action' => 'at_modification', |
438 | - 'raison' => 'at_add_file : ' . $fileName . ':' . $newID, |
|
438 | + 'raison' => 'at_add_file : '.$fileName.':'.$newID, |
|
439 | 439 | ) |
440 | 440 | ); |
441 | 441 | } |
442 | 442 | } |
443 | 443 | |
444 | 444 | // Return JSON-RPC response |
445 | -die('{"jsonrpc" : "2.0", "result" : null, "id" : "' . $newID . '"}'); |
|
445 | +die('{"jsonrpc" : "2.0", "result" : null, "id" : "'.$newID.'"}'); |
|
446 | 446 | |
447 | 447 | /** |
448 | 448 | * Undocumented function. |
@@ -452,5 +452,5 @@ discard block |
||
452 | 452 | */ |
453 | 453 | function handleAttachmentError($message, $code) |
454 | 454 | { |
455 | - echo '{"jsonrpc" : "2.0", "error" : {"code": ' . htmlentities($code, ENT_QUOTES) . ', "message": "' . htmlentities($message, ENT_QUOTES) . '"}, "id" : "id"}'; |
|
455 | + echo '{"jsonrpc" : "2.0", "error" : {"code": '.htmlentities($code, ENT_QUOTES).', "message": "'.htmlentities($message, ENT_QUOTES).'"}, "id" : "id"}'; |
|
456 | 456 | } |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | throw new Exception('Error file "/includes/config/tp.config.php" not exists', 1); |
32 | 32 | } |
33 | 33 | |
34 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
34 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
35 | 35 | |
36 | 36 | /* |
37 | 37 | Handle CASES |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $csrfp_array = include '../includes/libraries/csrfp/libs/csrfp.config.php'; |
52 | 52 | |
53 | 53 | // Send back CSRFP info |
54 | - echo $csrfp_array['CSRFP_TOKEN'] . ';' . filter_input(INPUT_POST, $csrfp_array['CSRFP_TOKEN'], FILTER_SANITIZE_STRING); |
|
54 | + echo $csrfp_array['CSRFP_TOKEN'].';'.filter_input(INPUT_POST, $csrfp_array['CSRFP_TOKEN'], FILTER_SANITIZE_STRING); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | break; |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | function curPage($SETTINGS) |
66 | 66 | { |
67 | 67 | // Load libraries |
68 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
68 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
69 | 69 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
70 | 70 | |
71 | 71 | // Parse the url |
@@ -125,11 +125,11 @@ discard block |
||
125 | 125 | $pageVisited = array($pageVisited); |
126 | 126 | |
127 | 127 | // Load |
128 | - include_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
129 | - include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
128 | + include_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
129 | + include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
130 | 130 | |
131 | 131 | // Load libraries |
132 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
132 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
133 | 133 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
134 | 134 | |
135 | 135 | // Securize language |
@@ -140,12 +140,12 @@ discard block |
||
140 | 140 | $superGlobal->put('user_language', 'english', 'SESSION'); |
141 | 141 | } |
142 | 142 | |
143 | - include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $superGlobal->get('user_language', 'SESSION') . '.php'; |
|
143 | + include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$superGlobal->get('user_language', 'SESSION').'.php'; |
|
144 | 144 | include_once 'SplClassLoader.php'; |
145 | 145 | include_once 'main.functions.php'; |
146 | 146 | |
147 | 147 | // Connect to mysql server |
148 | - include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
148 | + include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
149 | 149 | if (defined('DB_PASSWD_CLEAR') === false) { |
150 | 150 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
151 | 151 | } |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | |
159 | 159 | // load user's data |
160 | 160 | $data = DB::queryfirstrow( |
161 | - 'SELECT login, key_tempo, admin, gestionnaire, can_manage_all_users FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
161 | + 'SELECT login, key_tempo, admin, gestionnaire, can_manage_all_users FROM '.prefixTable('users').' WHERE id = %i', |
|
162 | 162 | $userId |
163 | 163 | ); |
164 | 164 |
@@ -951,7 +951,7 @@ discard block |
||
951 | 951 | ); |
952 | 952 | |
953 | 953 | // Does the user has the sharekey |
954 | - //db::debugmode(true); |
|
954 | + //db::debugmode(true); |
|
955 | 955 | DB::query( |
956 | 956 | 'SELECT * |
957 | 957 | FROM ' . prefixTable('sharekeys_items') . ' |
@@ -1090,7 +1090,7 @@ discard block |
||
1090 | 1090 | $postArrayTags = explode(' ', $post_tags); |
1091 | 1091 | foreach ($postArrayTags as $tag) { |
1092 | 1092 | if (empty($tag) === false) { |
1093 | - // save in DB |
|
1093 | + // save in DB |
|
1094 | 1094 | DB::insert( |
1095 | 1095 | prefixTable('tags'), |
1096 | 1096 | array( |
@@ -2601,7 +2601,7 @@ discard block |
||
2601 | 2601 | foreach ($rows_tmp as $row) { |
2602 | 2602 | // Uncrypt data |
2603 | 2603 | // Get the object key for the user |
2604 | - //db::debugmode(true); |
|
2604 | + //db::debugmode(true); |
|
2605 | 2605 | $userKey = DB::queryFirstRow( |
2606 | 2606 | 'SELECT share_key |
2607 | 2607 | FROM ' . prefixTable('sharekeys_fields') . ' |
@@ -4295,20 +4295,20 @@ discard block |
||
4295 | 4295 | } |
4296 | 4296 | } |
4297 | 4297 | |
4298 | - // Get access level for this folder |
|
4299 | - $accessLevel = 20; |
|
4300 | - if ($folder_is_personal === 0) { |
|
4301 | - $arrTmp = []; |
|
4302 | - foreach ($_SESSION['user_roles'] as $role) { |
|
4303 | - //db::debugmode(true); |
|
4304 | - $access = DB::queryFirstRow( |
|
4305 | - 'SELECT type |
|
4298 | + // Get access level for this folder |
|
4299 | + $accessLevel = 20; |
|
4300 | + if ($folder_is_personal === 0) { |
|
4301 | + $arrTmp = []; |
|
4302 | + foreach ($_SESSION['user_roles'] as $role) { |
|
4303 | + //db::debugmode(true); |
|
4304 | + $access = DB::queryFirstRow( |
|
4305 | + 'SELECT type |
|
4306 | 4306 | FROM ' . prefixTable('roles_values') . ' |
4307 | 4307 | WHERE role_id = %i AND folder_id = %i', |
4308 | - $role, |
|
4309 | - $post_groupe |
|
4310 | - ); |
|
4311 | - //db::debugmode(false); |
|
4308 | + $role, |
|
4309 | + $post_groupe |
|
4310 | + ); |
|
4311 | + //db::debugmode(false); |
|
4312 | 4312 | if (DB::count()>0) { |
4313 | 4313 | if ($access['type'] === 'R') { |
4314 | 4314 | array_push($arrTmp, 10); |
@@ -4329,12 +4329,12 @@ discard block |
||
4329 | 4329 | } |
4330 | 4330 | } |
4331 | 4331 | } |
4332 | - } |
|
4333 | - // 3.0.0.0 - changed MIN to MAX |
|
4334 | - $accessLevel = count($arrTmp) > 0 ? max($arrTmp) : $accessLevel; |
|
4335 | - } elseif ($folder_is_personal === 1) { |
|
4336 | - $accessLevel = 30; |
|
4337 | - } |
|
4332 | + } |
|
4333 | + // 3.0.0.0 - changed MIN to MAX |
|
4334 | + $accessLevel = count($arrTmp) > 0 ? max($arrTmp) : $accessLevel; |
|
4335 | + } elseif ($folder_is_personal === 1) { |
|
4336 | + $accessLevel = 30; |
|
4337 | + } |
|
4338 | 4338 | |
4339 | 4339 | $returnValues = array( |
4340 | 4340 | 'folderId' => (int) $post_groupe, |
@@ -1770,7 +1770,9 @@ |
||
1770 | 1770 | $post_item_id |
1771 | 1771 | ); |
1772 | 1772 | foreach ($rows as $record) { |
1773 | - if ($record['raison'] === NULL) continue; |
|
1773 | + if ($record['raison'] === NULL) { |
|
1774 | + continue; |
|
1775 | + } |
|
1774 | 1776 | $reason = explode(':', $record['raison']); |
1775 | 1777 | if (count($reason) > 0) { |
1776 | 1778 | $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
@@ -37,12 +37,12 @@ discard block |
||
37 | 37 | } |
38 | 38 | |
39 | 39 | // Do checks |
40 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
41 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
40 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
41 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
42 | 42 | if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'items', $SETTINGS) === false) { |
43 | 43 | // Not allowed page |
44 | 44 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
45 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
45 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
46 | 46 | exit; |
47 | 47 | } |
48 | 48 | |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | date_default_timezone_set('UTC'); |
56 | 56 | } |
57 | 57 | |
58 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
59 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
58 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
59 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
60 | 60 | header('Content-type: text/html; charset=utf-8'); |
61 | 61 | header('Cache-Control: no-cache, must-revalidate'); |
62 | 62 | require_once 'main.functions.php'; |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | } |
79 | 79 | |
80 | 80 | // Connect to mysql server |
81 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
81 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
82 | 82 | if (defined('DB_PASSWD_CLEAR') === false) { |
83 | 83 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
84 | 84 | } |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | DB::$encoding = DB_ENCODING; |
91 | 91 | |
92 | 92 | // Class loader |
93 | -require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php'; |
|
93 | +require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php'; |
|
94 | 94 | |
95 | 95 | // Load Tree |
96 | 96 | $tree = new SplClassLoader('Tree\NestedTree', '../includes/libraries'); |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
99 | 99 | |
100 | 100 | // Superglobal library |
101 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
101 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
102 | 102 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
103 | 103 | |
104 | 104 | // Prepare POST variables |
@@ -306,7 +306,7 @@ discard block |
||
306 | 306 | // About special settings |
307 | 307 | $dataFolderSettings = DB::queryFirstRow( |
308 | 308 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
309 | - FROM ' . prefixTable('nested_tree') . ' |
|
309 | + FROM ' . prefixTable('nested_tree').' |
|
310 | 310 | WHERE id = %i', |
311 | 311 | $post_folder_id |
312 | 312 | ); |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | // Get folder complexity |
324 | 324 | $folderComplexity = DB::queryfirstrow( |
325 | 325 | 'SELECT valeur |
326 | - FROM ' . prefixTable('misc') . ' |
|
326 | + FROM ' . prefixTable('misc').' |
|
327 | 327 | WHERE type = %s AND intitule = %i', |
328 | 328 | 'complex', |
329 | 329 | $post_folder_id |
@@ -348,7 +348,7 @@ discard block |
||
348 | 348 | $itemExists = 0; |
349 | 349 | $newID = ''; |
350 | 350 | $data = DB::queryfirstrow( |
351 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
351 | + 'SELECT * FROM '.prefixTable('items').' |
|
352 | 352 | WHERE label = %s AND inactif = %i', |
353 | 353 | $post_label, |
354 | 354 | 0 |
@@ -474,7 +474,7 @@ discard block |
||
474 | 474 | // should we encrypt the data |
475 | 475 | $dataTmp = DB::queryFirstRow( |
476 | 476 | 'SELECT encrypted_data |
477 | - FROM ' . prefixTable('categories') . ' |
|
477 | + FROM ' . prefixTable('categories').' |
|
478 | 478 | WHERE id = %i', |
479 | 479 | $field_data[0] |
480 | 480 | ); |
@@ -530,7 +530,7 @@ discard block |
||
530 | 530 | ) { |
531 | 531 | DB::queryFirstRow( |
532 | 532 | 'SELECT * |
533 | - FROM ' . prefixTable('templates') . ' |
|
533 | + FROM ' . prefixTable('templates').' |
|
534 | 534 | WHERE item_id = %i', |
535 | 535 | $newID |
536 | 536 | ); |
@@ -599,11 +599,11 @@ discard block |
||
599 | 599 | ) { |
600 | 600 | foreach ($post_restricted_to as $userRest) { |
601 | 601 | if (empty($userRest) === false) { |
602 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest); |
|
602 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest); |
|
603 | 603 | if (empty($listOfRestricted)) { |
604 | 604 | $listOfRestricted = $dataTmp['login']; |
605 | 605 | } else { |
606 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
606 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
607 | 607 | } |
608 | 608 | } |
609 | 609 | } |
@@ -617,11 +617,11 @@ discard block |
||
617 | 617 | if (empty($data['restricted_to']) === false) { |
618 | 618 | foreach (explode(';', $data['restricted_to']) as $userRest) { |
619 | 619 | if (empty($userRest) === false) { |
620 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
620 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
621 | 621 | if (empty($oldRestrictionList) === true) { |
622 | 622 | $oldRestrictionList = $dataTmp['login']; |
623 | 623 | } else { |
624 | - $oldRestrictionList .= ';' . $dataTmp['login']; |
|
624 | + $oldRestrictionList .= ';'.$dataTmp['login']; |
|
625 | 625 | } |
626 | 626 | } |
627 | 627 | } |
@@ -684,7 +684,7 @@ discard block |
||
684 | 684 | if (empty($post_uploaded_file_id) === false) { |
685 | 685 | $rows = DB::query( |
686 | 686 | 'SELECT id |
687 | - FROM ' . prefixTable('files') . ' |
|
687 | + FROM ' . prefixTable('files').' |
|
688 | 688 | WHERE id_item = %s', |
689 | 689 | $post_uploaded_file_id |
690 | 690 | ); |
@@ -724,14 +724,14 @@ discard block |
||
724 | 724 | langHdl('email_subject'), |
725 | 725 | str_replace( |
726 | 726 | array('#label', '#link'), |
727 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $post_folder_id . '&id=' . $newID . $txt['email_body3']), |
|
727 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$post_folder_id.'&id='.$newID.$txt['email_body3']), |
|
728 | 728 | langHdl('new_item_email_body') |
729 | 729 | ), |
730 | 730 | $emailAddress, |
731 | 731 | $SETTINGS, |
732 | 732 | str_replace( |
733 | 733 | array('#label', '#link'), |
734 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $post_folder_id . '&id=' . $newID . $txt['email_body3']), |
|
734 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$post_folder_id.'&id='.$newID.$txt['email_body3']), |
|
735 | 735 | langHdl('new_item_email_body') |
736 | 736 | ) |
737 | 737 | ); |
@@ -894,7 +894,7 @@ discard block |
||
894 | 894 | // About special settings |
895 | 895 | $dataFolderSettings = DB::queryFirstRow( |
896 | 896 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
897 | - FROM ' . prefixTable('nested_tree') . ' |
|
897 | + FROM ' . prefixTable('nested_tree').' |
|
898 | 898 | WHERE id = %i', |
899 | 899 | $post_folder_id |
900 | 900 | ); |
@@ -910,7 +910,7 @@ discard block |
||
910 | 910 | // Get folder complexity |
911 | 911 | $folderComplexity = DB::queryfirstrow( |
912 | 912 | 'SELECT valeur |
913 | - FROM ' . prefixTable('misc') . ' |
|
913 | + FROM ' . prefixTable('misc').' |
|
914 | 914 | WHERE type = %s AND intitule = %i', |
915 | 915 | 'complex', |
916 | 916 | $post_folder_id |
@@ -949,8 +949,8 @@ discard block |
||
949 | 949 | // Get all informations for this item |
950 | 950 | $dataItem = DB::queryfirstrow( |
951 | 951 | 'SELECT * |
952 | - FROM ' . prefixTable('items') . ' as i |
|
953 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
952 | + FROM ' . prefixTable('items').' as i |
|
953 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
954 | 954 | WHERE i.id=%i AND l.action = %s', |
955 | 955 | $post_item_id, |
956 | 956 | 'at_creation' |
@@ -960,7 +960,7 @@ discard block |
||
960 | 960 | //db::debugmode(true); |
961 | 961 | DB::query( |
962 | 962 | 'SELECT * |
963 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
963 | + FROM ' . prefixTable('sharekeys_items').' |
|
964 | 964 | WHERE object_id = %i AND user_id = %s', |
965 | 965 | $post_item_id, |
966 | 966 | $_SESSION['user_id'] |
@@ -1008,9 +1008,9 @@ discard block |
||
1008 | 1008 | 'SELECT i.id as id, i.label as label, i.description as description, i.pw as pw, i.url as url, i.id_tree as id_tree, i.perso as perso, i.login as login, |
1009 | 1009 | i.inactif as inactif, i.restricted_to as restricted_to, i.anyone_can_modify as anyone_can_modify, i.email as email, i.notification as notification, |
1010 | 1010 | u.login as user_login, u.email as user_email |
1011 | - FROM ' . prefixTable('items') . ' as i |
|
1012 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
1013 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
1011 | + FROM ' . prefixTable('items').' as i |
|
1012 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
1013 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
1014 | 1014 | WHERE i.id=%i', |
1015 | 1015 | $post_item_id |
1016 | 1016 | ); |
@@ -1018,7 +1018,7 @@ discard block |
||
1018 | 1018 | // Should we log a password change? |
1019 | 1019 | $userKey = DB::queryFirstRow( |
1020 | 1020 | 'SELECT share_key |
1021 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
1021 | + FROM ' . prefixTable('sharekeys_items').' |
|
1022 | 1022 | WHERE user_id = %i AND object_id = %i', |
1023 | 1023 | $_SESSION['user_id'], |
1024 | 1024 | $post_item_id |
@@ -1077,7 +1077,7 @@ discard block |
||
1077 | 1077 | // Get list of tags |
1078 | 1078 | $itemTags = DB::queryFirstColumn( |
1079 | 1079 | 'SELECT tag |
1080 | - FROM ' . prefixTable('tags') . ' |
|
1080 | + FROM ' . prefixTable('tags').' |
|
1081 | 1081 | WHERE item_id = %i', |
1082 | 1082 | $post_item_id |
1083 | 1083 | ); |
@@ -1120,7 +1120,7 @@ discard block |
||
1120 | 1120 | $_SESSION['user_id'], |
1121 | 1121 | 'at_modification', |
1122 | 1122 | $_SESSION['login'], |
1123 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
1123 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
1124 | 1124 | ); |
1125 | 1125 | } |
1126 | 1126 | |
@@ -1157,8 +1157,8 @@ discard block |
||
1157 | 1157 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
1158 | 1158 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
1159 | 1159 | c.masked AS masked, i.id AS field_item_id |
1160 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
1161 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
1160 | + FROM ' . prefixTable('categories_items').' AS i |
|
1161 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
1162 | 1162 | WHERE i.field_id = %i AND i.item_id = %i', |
1163 | 1163 | $field['id'], |
1164 | 1164 | $post_item_id |
@@ -1172,7 +1172,7 @@ discard block |
||
1172 | 1172 | // Perform new query |
1173 | 1173 | $dataTmpCat = DB::queryFirstRow( |
1174 | 1174 | 'SELECT id, title, encrypted_data, masked |
1175 | - FROM ' . prefixTable('categories') . ' |
|
1175 | + FROM ' . prefixTable('categories').' |
|
1176 | 1176 | WHERE id = %i', |
1177 | 1177 | $field['id'] |
1178 | 1178 | ); |
@@ -1244,7 +1244,7 @@ discard block |
||
1244 | 1244 | $_SESSION['user_id'], |
1245 | 1245 | 'at_modification', |
1246 | 1246 | $_SESSION['login'], |
1247 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
1247 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
1248 | 1248 | ); |
1249 | 1249 | } else { |
1250 | 1250 | // compare the old and new value |
@@ -1252,7 +1252,7 @@ discard block |
||
1252 | 1252 | // Get user sharekey for this field |
1253 | 1253 | $userKey = DB::queryFirstRow( |
1254 | 1254 | 'SELECT share_key |
1255 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
1255 | + FROM ' . prefixTable('sharekeys_fields').' |
|
1256 | 1256 | WHERE user_id = %i AND object_id = %i', |
1257 | 1257 | $_SESSION['user_id'], |
1258 | 1258 | $dataTmpCat['field_item_id'] |
@@ -1322,7 +1322,7 @@ discard block |
||
1322 | 1322 | $_SESSION['user_id'], |
1323 | 1323 | 'at_modification', |
1324 | 1324 | $_SESSION['login'], |
1325 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
1325 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
1326 | 1326 | ); |
1327 | 1327 | } |
1328 | 1328 | } |
@@ -1347,7 +1347,7 @@ discard block |
||
1347 | 1347 | ) { |
1348 | 1348 | DB::queryFirstRow( |
1349 | 1349 | 'SELECT * |
1350 | - FROM ' . prefixTable('templates') . ' |
|
1350 | + FROM ' . prefixTable('templates').' |
|
1351 | 1351 | WHERE item_id = %i', |
1352 | 1352 | $post_item_id |
1353 | 1353 | ); |
@@ -1390,7 +1390,7 @@ discard block |
||
1390 | 1390 | // check if elem exists in Table. If not add it or update it. |
1391 | 1391 | DB::query( |
1392 | 1392 | 'SELECT * |
1393 | - FROM ' . prefixTable('automatic_del') . ' |
|
1393 | + FROM ' . prefixTable('automatic_del').' |
|
1394 | 1394 | WHERE item_id = %i', |
1395 | 1395 | $post_item_id |
1396 | 1396 | ); |
@@ -1417,7 +1417,7 @@ discard block |
||
1417 | 1417 | // Store updates performed |
1418 | 1418 | array_push( |
1419 | 1419 | $arrayOfChanges, |
1420 | - langHdl('automatic_deletion_engaged') . ': ' . langHdl('enabled') |
|
1420 | + langHdl('automatic_deletion_engaged').': '.langHdl('enabled') |
|
1421 | 1421 | ); |
1422 | 1422 | |
1423 | 1423 | // update LOG |
@@ -1460,7 +1460,7 @@ discard block |
||
1460 | 1460 | // Store updates performed |
1461 | 1461 | array_push( |
1462 | 1462 | $arrayOfChanges, |
1463 | - langHdl('automatic_deletion_engaged') . ': ' . langHdl('disabled') |
|
1463 | + langHdl('automatic_deletion_engaged').': '.langHdl('disabled') |
|
1464 | 1464 | ); |
1465 | 1465 | |
1466 | 1466 | // update LOG |
@@ -1493,7 +1493,7 @@ discard block |
||
1493 | 1493 | if (empty($userId) === false) { |
1494 | 1494 | $dataTmp = DB::queryfirstrow( |
1495 | 1495 | 'SELECT id, name, lastname |
1496 | - FROM ' . prefixTable('users') . ' |
|
1496 | + FROM ' . prefixTable('users').' |
|
1497 | 1497 | WHERE id= %i', |
1498 | 1498 | $userId |
1499 | 1499 | ); |
@@ -1501,7 +1501,7 @@ discard block |
||
1501 | 1501 | // Add to array |
1502 | 1502 | array_push( |
1503 | 1503 | $arrayOfUsersRestriction, |
1504 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
1504 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
1505 | 1505 | ); |
1506 | 1506 | array_push( |
1507 | 1507 | $arrayOfUsersIdRestriction, |
@@ -1532,8 +1532,8 @@ discard block |
||
1532 | 1532 | // get values before deleting them |
1533 | 1533 | $rows = DB::query( |
1534 | 1534 | 'SELECT t.title, t.id AS id |
1535 | - FROM ' . prefixTable('roles_title') . ' as t |
|
1536 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
1535 | + FROM ' . prefixTable('roles_title').' as t |
|
1536 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
1537 | 1537 | WHERE r.item_id = %i |
1538 | 1538 | ORDER BY t.title ASC', |
1539 | 1539 | $post_item_id |
@@ -1567,7 +1567,7 @@ discard block |
||
1567 | 1567 | ); |
1568 | 1568 | $dataTmp = DB::queryfirstrow( |
1569 | 1569 | 'SELECT title |
1570 | - FROM ' . prefixTable('roles_title') . ' |
|
1570 | + FROM ' . prefixTable('roles_title').' |
|
1571 | 1571 | WHERE id = %i', |
1572 | 1572 | $role |
1573 | 1573 | ); |
@@ -1608,8 +1608,8 @@ discard block |
||
1608 | 1608 | $_SESSION['user_id'], |
1609 | 1609 | 'at_modification', |
1610 | 1610 | $_SESSION['login'], |
1611 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
1612 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
1611 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
1612 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
1613 | 1613 | ); |
1614 | 1614 | } |
1615 | 1615 | |
@@ -1629,7 +1629,7 @@ discard block |
||
1629 | 1629 | $_SESSION['user_id'], |
1630 | 1630 | 'at_modification', |
1631 | 1631 | $_SESSION['login'], |
1632 | - 'at_label : ' . $data['label'] . ' => ' . $post_label |
|
1632 | + 'at_label : '.$data['label'].' => '.$post_label |
|
1633 | 1633 | ); |
1634 | 1634 | } |
1635 | 1635 | // LOGIN |
@@ -1648,7 +1648,7 @@ discard block |
||
1648 | 1648 | $_SESSION['user_id'], |
1649 | 1649 | 'at_modification', |
1650 | 1650 | $_SESSION['login'], |
1651 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
1651 | + 'at_login : '.$data['login'].' => '.$post_login |
|
1652 | 1652 | ); |
1653 | 1653 | } |
1654 | 1654 | |
@@ -1667,7 +1667,7 @@ discard block |
||
1667 | 1667 | $_SESSION['user_id'], |
1668 | 1668 | 'at_modification', |
1669 | 1669 | $_SESSION['login'], |
1670 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
1670 | + 'at_email : '.$data['email'].' => '.$post_email |
|
1671 | 1671 | ); |
1672 | 1672 | } |
1673 | 1673 | // URL |
@@ -1686,7 +1686,7 @@ discard block |
||
1686 | 1686 | $_SESSION['user_id'], |
1687 | 1687 | 'at_modification', |
1688 | 1688 | $_SESSION['login'], |
1689 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
1689 | + 'at_url : '.$data['url'].' => '.$post_url |
|
1690 | 1690 | ); |
1691 | 1691 | } |
1692 | 1692 | // DESCRIPTION |
@@ -1711,7 +1711,7 @@ discard block |
||
1711 | 1711 | // FOLDER |
1712 | 1712 | if ((int) $data['id_tree'] !== (int) $post_folder_id) { |
1713 | 1713 | // Get name of folders |
1714 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $post_folder_id)); |
|
1714 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $post_folder_id)); |
|
1715 | 1715 | |
1716 | 1716 | // Store updates performed |
1717 | 1717 | array_push( |
@@ -1727,7 +1727,7 @@ discard block |
||
1727 | 1727 | $_SESSION['user_id'], |
1728 | 1728 | 'at_modification', |
1729 | 1729 | $_SESSION['login'], |
1730 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
1730 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
1731 | 1731 | ); |
1732 | 1732 | } |
1733 | 1733 | // ANYONE_CAN_MODIFY |
@@ -1735,7 +1735,7 @@ discard block |
||
1735 | 1735 | // Store updates performed |
1736 | 1736 | array_push( |
1737 | 1737 | $arrayOfChanges, |
1738 | - langHdl('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled')) |
|
1738 | + langHdl('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled')) |
|
1739 | 1739 | ); |
1740 | 1740 | |
1741 | 1741 | // Log |
@@ -1746,15 +1746,15 @@ discard block |
||
1746 | 1746 | $_SESSION['user_id'], |
1747 | 1747 | 'at_modification', |
1748 | 1748 | $_SESSION['login'], |
1749 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
1749 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
1750 | 1750 | ); |
1751 | 1751 | } |
1752 | 1752 | |
1753 | 1753 | // Reload new values |
1754 | 1754 | $dataItem = DB::queryfirstrow( |
1755 | 1755 | 'SELECT * |
1756 | - FROM ' . prefixTable('items') . ' as i |
|
1757 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
1756 | + FROM ' . prefixTable('items').' as i |
|
1757 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
1758 | 1758 | WHERE i.id = %i AND l.action = %s', |
1759 | 1759 | $post_item_id, |
1760 | 1760 | 'at_creation' |
@@ -1763,8 +1763,8 @@ discard block |
||
1763 | 1763 | $history = ''; |
1764 | 1764 | $rows = DB::query( |
1765 | 1765 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
1766 | - FROM ' . prefixTable('log_items') . ' as l |
|
1767 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
1766 | + FROM ' . prefixTable('log_items').' as l |
|
1767 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
1768 | 1768 | WHERE l.action <> %s AND id_item=%s', |
1769 | 1769 | 'at_shown', |
1770 | 1770 | $post_item_id |
@@ -1773,14 +1773,14 @@ discard block |
||
1773 | 1773 | if ($record['raison'] === NULL) continue; |
1774 | 1774 | $reason = explode(':', $record['raison']); |
1775 | 1775 | if (count($reason) > 0) { |
1776 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
|
1777 | - . $record['login'] . ' - ' . langHdl($record['action']) . ' - ' |
|
1778 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])) . ' : ' . $reason[1] |
|
1776 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - ' |
|
1777 | + . $record['login'].' - '.langHdl($record['action']).' - ' |
|
1778 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])).' : '.$reason[1] |
|
1779 | 1779 | : langHdl(trim($reason[0]))) : ''); |
1780 | 1780 | if (empty($history)) { |
1781 | 1781 | $history = $sentence; |
1782 | 1782 | } else { |
1783 | - $history .= '<br />' . $sentence; |
|
1783 | + $history .= '<br />'.$sentence; |
|
1784 | 1784 | } |
1785 | 1785 | } |
1786 | 1786 | } |
@@ -1902,7 +1902,7 @@ discard block |
||
1902 | 1902 | ) { |
1903 | 1903 | // load the original record into an array |
1904 | 1904 | $originalRecord = DB::queryfirstrow( |
1905 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
1905 | + 'SELECT * FROM '.prefixTable('items').' |
|
1906 | 1906 | WHERE id = %i', |
1907 | 1907 | $post_item_id |
1908 | 1908 | ); |
@@ -1921,7 +1921,7 @@ discard block |
||
1921 | 1921 | |
1922 | 1922 | // Load the destination folder record into an array |
1923 | 1923 | $dataDestination = DB::queryfirstrow( |
1924 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
1924 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
1925 | 1925 | WHERE id = %i', |
1926 | 1926 | $post_dest_id |
1927 | 1927 | ); |
@@ -1929,7 +1929,7 @@ discard block |
||
1929 | 1929 | // Get the ITEM object key for the user |
1930 | 1930 | $userKey = DB::queryFirstRow( |
1931 | 1931 | 'SELECT share_key |
1932 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
1932 | + FROM ' . prefixTable('sharekeys_items').' |
|
1933 | 1933 | WHERE user_id = %i AND object_id = %i', |
1934 | 1934 | $_SESSION['user_id'], |
1935 | 1935 | $post_item_id |
@@ -2001,7 +2001,7 @@ discard block |
||
2001 | 2001 | // Manage Custom Fields |
2002 | 2002 | $rows = DB::query( |
2003 | 2003 | 'SELECT * |
2004 | - FROM ' . prefixTable('categories_items') . ' |
|
2004 | + FROM ' . prefixTable('categories_items').' |
|
2005 | 2005 | WHERE item_id = %i', |
2006 | 2006 | $post_item_id |
2007 | 2007 | ); |
@@ -2049,15 +2049,15 @@ discard block |
||
2049 | 2049 | $rows = DB::query( |
2050 | 2050 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
2051 | 2051 | f.size AS size, f.type AS type, s.share_key AS share_key |
2052 | - FROM ' . prefixTable('files') . ' AS f |
|
2053 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
2052 | + FROM ' . prefixTable('files').' AS f |
|
2053 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
2054 | 2054 | WHERE s.user_id = %i AND f.id_item = %i', |
2055 | 2055 | $_SESSION['user_id'], |
2056 | 2056 | $post_item_id |
2057 | 2057 | ); |
2058 | 2058 | foreach ($rows as $record) { |
2059 | 2059 | // Check if file still exists |
2060 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
2060 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
2061 | 2061 | // Step1 - decrypt the file |
2062 | 2062 | $fileContent = decryptFile( |
2063 | 2063 | $record['file'], |
@@ -2066,8 +2066,8 @@ discard block |
||
2066 | 2066 | ); |
2067 | 2067 | |
2068 | 2068 | // Step2 - create file |
2069 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
2070 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
2069 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
2070 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
2071 | 2071 | if ($outstream === false) { |
2072 | 2072 | echo prepareExchangedData( |
2073 | 2073 | array( |
@@ -2117,7 +2117,7 @@ discard block |
||
2117 | 2117 | |
2118 | 2118 | // ------------------------- |
2119 | 2119 | // Add specific restrictions |
2120 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $post_item_id); |
|
2120 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $post_item_id); |
|
2121 | 2121 | foreach ($rows as $record) { |
2122 | 2122 | DB::insert( |
2123 | 2123 | prefixTable('restriction_to_roles'), |
@@ -2129,7 +2129,7 @@ discard block |
||
2129 | 2129 | } |
2130 | 2130 | |
2131 | 2131 | // Add Tags |
2132 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $post_item_id); |
|
2132 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $post_item_id); |
|
2133 | 2133 | foreach ($rows as $record) { |
2134 | 2134 | DB::insert( |
2135 | 2135 | prefixTable('tags'), |
@@ -2159,7 +2159,7 @@ discard block |
||
2159 | 2159 | $_SESSION['login'] |
2160 | 2160 | ); |
2161 | 2161 | // reload cache table |
2162 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
2162 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
2163 | 2163 | updateCacheTable('reload', $SETTINGS, null); |
2164 | 2164 | |
2165 | 2165 | echo (string) prepareExchangedData( |
@@ -2227,7 +2227,7 @@ discard block |
||
2227 | 2227 | // then we can show it |
2228 | 2228 | $item_deleted = DB::queryFirstRow( |
2229 | 2229 | 'SELECT * |
2230 | - FROM ' . prefixTable('log_items') . ' |
|
2230 | + FROM ' . prefixTable('log_items').' |
|
2231 | 2231 | WHERE id_item = %i AND action = %s |
2232 | 2232 | ORDER BY date DESC |
2233 | 2233 | LIMIT 0, 1', |
@@ -2238,7 +2238,7 @@ discard block |
||
2238 | 2238 | |
2239 | 2239 | $item_restored = DB::queryFirstRow( |
2240 | 2240 | 'SELECT * |
2241 | - FROM ' . prefixTable('log_items') . ' |
|
2241 | + FROM ' . prefixTable('log_items').' |
|
2242 | 2242 | WHERE id_item = %i AND action = %s |
2243 | 2243 | ORDER BY date DESC |
2244 | 2244 | LIMIT 0, 1', |
@@ -2262,8 +2262,8 @@ discard block |
||
2262 | 2262 | // Get all informations for this item |
2263 | 2263 | $dataItem = DB::queryfirstrow( |
2264 | 2264 | 'SELECT * |
2265 | - FROM ' . prefixTable('items') . ' as i |
|
2266 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
2265 | + FROM ' . prefixTable('items').' as i |
|
2266 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
2267 | 2267 | WHERE i.id = %i AND l.action = %s', |
2268 | 2268 | $post_id, |
2269 | 2269 | 'at_creation' |
@@ -2272,7 +2272,7 @@ discard block |
||
2272 | 2272 | // Notification |
2273 | 2273 | DB::queryfirstrow( |
2274 | 2274 | 'SELECT * |
2275 | - FROM ' . prefixTable('notification') . ' |
|
2275 | + FROM ' . prefixTable('notification').' |
|
2276 | 2276 | WHERE item_id = %i AND user_id = %i', |
2277 | 2277 | $post_id, |
2278 | 2278 | $_SESSION['user_id'] |
@@ -2319,13 +2319,13 @@ discard block |
||
2319 | 2319 | && (int) $SETTINGS['enable_email_notification_on_item_shown'] === 1 |
2320 | 2320 | && (int) $user['admin'] === 1 |
2321 | 2321 | ) { |
2322 | - $_SESSION['listNotificationEmails'] .= $user['email'] . ','; |
|
2322 | + $_SESSION['listNotificationEmails'] .= $user['email'].','; |
|
2323 | 2323 | } |
2324 | 2324 | } |
2325 | 2325 | |
2326 | 2326 | // manage case of API user |
2327 | 2327 | if ($dataItem['id_user'] === API_USER_ID) { |
2328 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
2328 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
2329 | 2329 | $arrData['id_user'] = API_USER_ID; |
2330 | 2330 | $arrData['author_email'] = ''; |
2331 | 2331 | $arrData['notification_status'] = false; |
@@ -2335,7 +2335,7 @@ discard block |
||
2335 | 2335 | $tags = array(); |
2336 | 2336 | $rows = DB::query( |
2337 | 2337 | 'SELECT tag |
2338 | - FROM ' . prefixTable('tags') . ' |
|
2338 | + FROM ' . prefixTable('tags').' |
|
2339 | 2339 | WHERE item_id = %i', |
2340 | 2340 | $post_id |
2341 | 2341 | ); |
@@ -2360,7 +2360,7 @@ discard block |
||
2360 | 2360 | // Check if user has a role that is accepted |
2361 | 2361 | $rows_tmp = DB::query( |
2362 | 2362 | 'SELECT role_id |
2363 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
2363 | + FROM ' . prefixTable('restriction_to_roles').' |
|
2364 | 2364 | WHERE item_id=%i', |
2365 | 2365 | $post_id |
2366 | 2366 | ); |
@@ -2374,7 +2374,7 @@ discard block |
||
2374 | 2374 | // Get the object key for the user |
2375 | 2375 | $userKey = DB::queryFirstRow( |
2376 | 2376 | 'SELECT share_key |
2377 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
2377 | + FROM ' . prefixTable('sharekeys_items').' |
|
2378 | 2378 | WHERE user_id = %i AND object_id = %i', |
2379 | 2379 | $_SESSION['user_id'], |
2380 | 2380 | $post_id |
@@ -2458,8 +2458,8 @@ discard block |
||
2458 | 2458 | // Add restriction if item is restricted to roles |
2459 | 2459 | $rows = DB::query( |
2460 | 2460 | 'SELECT t.title, t.id |
2461 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
2462 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
2461 | + FROM ' . prefixTable('roles_title').' AS t |
|
2462 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
2463 | 2463 | WHERE r.item_id = %i |
2464 | 2464 | ORDER BY t.title ASC', |
2465 | 2465 | $post_id |
@@ -2475,8 +2475,8 @@ discard block |
||
2475 | 2475 | $tmp = array(); |
2476 | 2476 | $rows = DB::query( |
2477 | 2477 | 'SELECT k.label, k.id |
2478 | - FROM ' . prefixTable('kb_items') . ' as i |
|
2479 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
2478 | + FROM ' . prefixTable('kb_items').' as i |
|
2479 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
2480 | 2480 | WHERE i.item_id = %i |
2481 | 2481 | ORDER BY k.label ASC', |
2482 | 2482 | $post_id |
@@ -2556,7 +2556,7 @@ discard block |
||
2556 | 2556 | $arrCatList = array(); |
2557 | 2557 | $rows_tmp = DB::query( |
2558 | 2558 | 'SELECT id_category |
2559 | - FROM ' . prefixTable('categories_folders') . ' |
|
2559 | + FROM ' . prefixTable('categories_folders').' |
|
2560 | 2560 | WHERE id_folder=%i', |
2561 | 2561 | $post_folder_id |
2562 | 2562 | ); |
@@ -2571,8 +2571,8 @@ discard block |
||
2571 | 2571 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
2572 | 2572 | i.encryption_type AS encryption_type, c.encrypted_data, c.parent_id AS parent_id, |
2573 | 2573 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
2574 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
2575 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
2574 | + FROM ' . prefixTable('categories_items').' AS i |
|
2575 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
2576 | 2576 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
2577 | 2577 | $post_id, |
2578 | 2578 | $arrCatList |
@@ -2583,11 +2583,11 @@ discard block |
||
2583 | 2583 | //db::debugmode(true); |
2584 | 2584 | $userKey = DB::queryFirstRow( |
2585 | 2585 | 'SELECT share_key |
2586 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
2586 | + FROM ' . prefixTable('sharekeys_fields').' |
|
2587 | 2587 | WHERE user_id = %i AND object_id = %i', |
2588 | 2588 | $_SESSION['user_id'], |
2589 | 2589 | $row['id'] |
2590 | - );//db::debugmode(false); |
|
2590 | + ); //db::debugmode(false); |
|
2591 | 2591 | $fieldText = []; |
2592 | 2592 | if (DB::count() === 0) { |
2593 | 2593 | // Not encrypted |
@@ -2629,7 +2629,7 @@ discard block |
||
2629 | 2629 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
2630 | 2630 | $rows_tmp = DB::queryfirstrow( |
2631 | 2631 | 'SELECT category_id |
2632 | - FROM ' . prefixTable('templates') . ' |
|
2632 | + FROM ' . prefixTable('templates').' |
|
2633 | 2633 | WHERE item_id = %i', |
2634 | 2634 | $post_id |
2635 | 2635 | ); |
@@ -2654,7 +2654,7 @@ discard block |
||
2654 | 2654 | // Is the Item to be deleted? |
2655 | 2655 | $dataDelete = DB::queryfirstrow( |
2656 | 2656 | 'SELECT * |
2657 | - FROM ' . prefixTable('automatic_del') . ' |
|
2657 | + FROM ' . prefixTable('automatic_del').' |
|
2658 | 2658 | WHERE item_id = %i', |
2659 | 2659 | $post_id |
2660 | 2660 | ); |
@@ -2736,11 +2736,11 @@ discard block |
||
2736 | 2736 | if (empty($dataItem['restricted_to']) === false) { |
2737 | 2737 | foreach (explode(';', $dataItem['restricted_to']) as $userRest) { |
2738 | 2738 | if (empty($userRest) === false) { |
2739 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
2739 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
2740 | 2740 | if (empty($listOfRestricted)) { |
2741 | 2741 | $listOfRestricted = $dataTmp['login']; |
2742 | 2742 | } else { |
2743 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
2743 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
2744 | 2744 | } |
2745 | 2745 | } |
2746 | 2746 | } |
@@ -2797,8 +2797,8 @@ discard block |
||
2797 | 2797 | // Load item data |
2798 | 2798 | $dataItem = DB::queryFirstRow( |
2799 | 2799 | 'SELECT i.*, n.title AS folder_title |
2800 | - FROM ' . prefixTable('items') . ' AS i |
|
2801 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
2800 | + FROM ' . prefixTable('items').' AS i |
|
2801 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
2802 | 2802 | WHERE i.id = %i', |
2803 | 2803 | $post_id |
2804 | 2804 | ); |
@@ -2820,7 +2820,7 @@ discard block |
||
2820 | 2820 | // Check if user has a role that is accepted |
2821 | 2821 | $rows_tmp = DB::query( |
2822 | 2822 | 'SELECT role_id |
2823 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
2823 | + FROM ' . prefixTable('restriction_to_roles').' |
|
2824 | 2824 | WHERE item_id=%i', |
2825 | 2825 | $post_id |
2826 | 2826 | ); |
@@ -2866,7 +2866,7 @@ discard block |
||
2866 | 2866 | // launch query |
2867 | 2867 | $rows = DB::query( |
2868 | 2868 | 'SELECT id, name, file, extension, size |
2869 | - FROM ' . prefixTable('files') . ' |
|
2869 | + FROM ' . prefixTable('files').' |
|
2870 | 2870 | WHERE id_item = %i AND confirmed = 1', |
2871 | 2871 | $post_id |
2872 | 2872 | ); |
@@ -2875,7 +2875,7 @@ discard block |
||
2875 | 2875 | $attachments, |
2876 | 2876 | array( |
2877 | 2877 | 'icon' => fileFormatImage(strtolower($record['extension'])), |
2878 | - 'filename' => basename($record['name'], '.' . $record['extension']), |
|
2878 | + 'filename' => basename($record['name'], '.'.$record['extension']), |
|
2879 | 2879 | 'extension' => $record['extension'], |
2880 | 2880 | 'size' => formatSizeUnits((int) $record['size']), |
2881 | 2881 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
@@ -2901,7 +2901,7 @@ discard block |
||
2901 | 2901 | array( |
2902 | 2902 | 'latest_items' => implode(';', $_SESSION['latest_items']), |
2903 | 2903 | ), |
2904 | - 'id=' . $_SESSION['user_id'] |
|
2904 | + 'id='.$_SESSION['user_id'] |
|
2905 | 2905 | ); |
2906 | 2906 | } |
2907 | 2907 | |
@@ -2910,8 +2910,8 @@ discard block |
||
2910 | 2910 | $listOptionsForRoles = array(); |
2911 | 2911 | $rows = DB::query( |
2912 | 2912 | 'SELECT r.role_id AS role_id, t.title AS title |
2913 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
2914 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
2913 | + FROM ' . prefixTable('roles_values').' AS r |
|
2914 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
2915 | 2915 | WHERE r.folder_id = %i', |
2916 | 2916 | $dataItem['id_tree'] |
2917 | 2917 | ); |
@@ -2925,9 +2925,9 @@ discard block |
||
2925 | 2925 | ); |
2926 | 2926 | $rows2 = DB::query( |
2927 | 2927 | 'SELECT id, login, fonction_id, email, name, lastname |
2928 | - FROM ' . prefixTable('users') . ' |
|
2928 | + FROM ' . prefixTable('users').' |
|
2929 | 2929 | WHERE fonction_id LIKE %s', |
2930 | - '%' . $record['role_id'] . '%' |
|
2930 | + '%'.$record['role_id'].'%' |
|
2931 | 2931 | ); |
2932 | 2932 | foreach ($rows2 as $record2) { |
2933 | 2933 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -2940,7 +2940,7 @@ discard block |
||
2940 | 2940 | array( |
2941 | 2941 | 'id' => (int) $record2['id'], |
2942 | 2942 | 'login' => $record2['login'], |
2943 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
2943 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
2944 | 2944 | 'email' => $record2['email'], |
2945 | 2945 | ) |
2946 | 2946 | ); |
@@ -2959,16 +2959,16 @@ discard block |
||
2959 | 2959 | $path = ''; |
2960 | 2960 | foreach ($arbo as $elem) { |
2961 | 2961 | if (empty($path) === true) { |
2962 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
2962 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
2963 | 2963 | } else { |
2964 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
2964 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
2965 | 2965 | } |
2966 | 2966 | } |
2967 | 2967 | // Build text to show user |
2968 | 2968 | if (empty($path) === true) { |
2969 | 2969 | $path = addslashes($dataItem['label']); |
2970 | 2970 | } else { |
2971 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
2971 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
2972 | 2972 | } |
2973 | 2973 | |
2974 | 2974 | // send back infos |
@@ -2982,7 +2982,7 @@ discard block |
||
2982 | 2982 | array( |
2983 | 2983 | addslashes($_SESSION['login']), |
2984 | 2984 | $path, |
2985 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
2985 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
2986 | 2986 | ), |
2987 | 2987 | langHdl('email_on_open_notification_mail') |
2988 | 2988 | ), |
@@ -2993,7 +2993,7 @@ discard block |
||
2993 | 2993 | } |
2994 | 2994 | |
2995 | 2995 | // has this item a change proposal |
2996 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $post_id); |
|
2996 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $post_id); |
|
2997 | 2997 | $returnArray['has_change_proposal'] = DB::count(); |
2998 | 2998 | |
2999 | 2999 | // Setting |
@@ -3084,7 +3084,7 @@ discard block |
||
3084 | 3084 | // Load item data |
3085 | 3085 | $data = DB::queryFirstRow( |
3086 | 3086 | 'SELECT id_tree |
3087 | - FROM ' . prefixTable('items') . ' |
|
3087 | + FROM ' . prefixTable('items').' |
|
3088 | 3088 | WHERE id = %i', |
3089 | 3089 | $post_item_id |
3090 | 3090 | ); |
@@ -3154,13 +3154,13 @@ discard block |
||
3154 | 3154 | |
3155 | 3155 | // Check if user is allowed to access this folder |
3156 | 3156 | if (!in_array($post_folder_id, $_SESSION['groupes_visibles'])) { |
3157 | - echo '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
3157 | + echo '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
3158 | 3158 | break; |
3159 | 3159 | } |
3160 | 3160 | |
3161 | 3161 | // Check if title doesn't contains html codes |
3162 | 3162 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
3163 | - echo '[ { "error" : "' . langHdl('error_html_codes') . '" } ]'; |
|
3163 | + echo '[ { "error" : "'.langHdl('error_html_codes').'" } ]'; |
|
3164 | 3164 | break; |
3165 | 3165 | } |
3166 | 3166 | // check that title is not numeric |
@@ -3171,9 +3171,9 @@ discard block |
||
3171 | 3171 | |
3172 | 3172 | // Check if duplicate folders name are allowed |
3173 | 3173 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
3174 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
3174 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
3175 | 3175 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
3176 | - echo '[ { "error" : "' . langHdl('error_group_exist') . '" } ]'; |
|
3176 | + echo '[ { "error" : "'.langHdl('error_group_exist').'" } ]'; |
|
3177 | 3177 | break; |
3178 | 3178 | } |
3179 | 3179 | } |
@@ -3181,7 +3181,7 @@ discard block |
||
3181 | 3181 | // query on folder |
3182 | 3182 | $data = DB::queryfirstrow( |
3183 | 3183 | 'SELECT parent_id, personal_folder |
3184 | - FROM ' . prefixTable('nested_tree') . ' |
|
3184 | + FROM ' . prefixTable('nested_tree').' |
|
3185 | 3185 | WHERE id = %i', |
3186 | 3186 | $post_folder_id |
3187 | 3187 | ); |
@@ -3191,20 +3191,20 @@ discard block |
||
3191 | 3191 | if ($_SESSION['is_admin'] !== 1 && $_SESSION['user_manager'] !== 1 && $data['personal_folder'] === '0') { |
3192 | 3192 | $data = DB::queryfirstrow( |
3193 | 3193 | 'SELECT valeur |
3194 | - FROM ' . prefixTable('misc') . ' |
|
3194 | + FROM ' . prefixTable('misc').' |
|
3195 | 3195 | WHERE intitule = %i AND type = %s', |
3196 | 3196 | $data['parent_id'], |
3197 | 3197 | 'complex' |
3198 | 3198 | ); |
3199 | 3199 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
3200 | - echo '[ { "error" : "' . langHdl('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
3200 | + echo '[ { "error" : "'.langHdl('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
3201 | 3201 | break; |
3202 | 3202 | } |
3203 | 3203 | } |
3204 | 3204 | |
3205 | 3205 | // update Folders table |
3206 | 3206 | $tmp = DB::queryFirstRow( |
3207 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
3207 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
3208 | 3208 | $dataReceived['folder'] |
3209 | 3209 | ); |
3210 | 3210 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $_SESSION['user_id'] || $tmp['personal_folder'] !== 1) { |
@@ -3269,42 +3269,42 @@ discard block |
||
3269 | 3269 | in_array($post_target_folder_id, $_SESSION['groupes_visibles']) === false) && ($post_target_folder_id === '0' && |
3270 | 3270 | isset($SETTINGS['can_create_root_folder']) === true && (int) $SETTINGS['can_create_root_folder'] === 1) |
3271 | 3271 | ) { |
3272 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
3272 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
3273 | 3273 | echo $returnValues; |
3274 | 3274 | break; |
3275 | 3275 | } |
3276 | 3276 | |
3277 | 3277 | $tmp_source = DB::queryFirstRow( |
3278 | 3278 | 'SELECT title, parent_id, personal_folder |
3279 | - FROM ' . prefixTable('nested_tree') . ' |
|
3279 | + FROM ' . prefixTable('nested_tree').' |
|
3280 | 3280 | WHERE id = %i', |
3281 | 3281 | $post_source_folder_id |
3282 | 3282 | ); |
3283 | 3283 | |
3284 | 3284 | $tmp_target = DB::queryFirstRow( |
3285 | 3285 | 'SELECT title, parent_id, personal_folder |
3286 | - FROM ' . prefixTable('nested_tree') . ' |
|
3286 | + FROM ' . prefixTable('nested_tree').' |
|
3287 | 3287 | WHERE id = %i', |
3288 | 3288 | $post_target_folder_id |
3289 | 3289 | ); |
3290 | 3290 | |
3291 | 3291 | // check if target is not a child of source |
3292 | 3292 | if ($tree->isChildOf($post_target_folder_id, $post_source_folder_id) === true) { |
3293 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
3293 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
3294 | 3294 | echo $returnValues; |
3295 | 3295 | break; |
3296 | 3296 | } |
3297 | 3297 | |
3298 | 3298 | // check if source or target folder is PF. If Yes, then cancel operation |
3299 | 3299 | if ((int) $tmp_source['personal_folder'] === 1 || (int) $tmp_target['personal_folder'] === 1) { |
3300 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
3300 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
3301 | 3301 | echo $returnValues; |
3302 | 3302 | break; |
3303 | 3303 | } |
3304 | 3304 | |
3305 | 3305 | // check if source or target folder is PF. If Yes, then cancel operation |
3306 | 3306 | if ($tmp_source['title'] === $_SESSION['user_id'] || $tmp_target['title'] === $_SESSION['user_id']) { |
3307 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
3307 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
3308 | 3308 | echo $returnValues; |
3309 | 3309 | break; |
3310 | 3310 | } |
@@ -3437,7 +3437,7 @@ discard block |
||
3437 | 3437 | foreach ($_SESSION['user_roles'] as $role) { |
3438 | 3438 | $roleQ = DB::queryfirstrow( |
3439 | 3439 | 'SELECT allow_pw_change |
3440 | - FROM ' . prefixTable('roles_title') . ' |
|
3440 | + FROM ' . prefixTable('roles_title').' |
|
3441 | 3441 | WHERE id = %i', |
3442 | 3442 | $role |
3443 | 3443 | ); |
@@ -3462,11 +3462,11 @@ discard block |
||
3462 | 3462 | |
3463 | 3463 | foreach ($_SESSION['user_roles'] as $role) { |
3464 | 3464 | $access = DB::queryFirstRow( |
3465 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
3465 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
3466 | 3466 | $role, |
3467 | 3467 | $post_id |
3468 | 3468 | ); |
3469 | - if (DB::count()>0) { |
|
3469 | + if (DB::count() > 0) { |
|
3470 | 3470 | if ($access['type'] === 'R') { |
3471 | 3471 | array_push($arrTmp, 10); |
3472 | 3472 | } elseif ($access['type'] === 'W') { |
@@ -3530,7 +3530,7 @@ discard block |
||
3530 | 3530 | } else { |
3531 | 3531 | DB::query( |
3532 | 3532 | 'SELECT * |
3533 | - FROM ' . prefixTable('items') . ' |
|
3533 | + FROM ' . prefixTable('items').' |
|
3534 | 3534 | WHERE inactif = %i', |
3535 | 3535 | 0 |
3536 | 3536 | ); |
@@ -3540,7 +3540,7 @@ discard block |
||
3540 | 3540 | |
3541 | 3541 | // Get folder complexity |
3542 | 3542 | $folderComplexity = DB::queryFirstRow( |
3543 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
3543 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
3544 | 3544 | 'complex', |
3545 | 3545 | $post_id |
3546 | 3546 | ); |
@@ -3552,7 +3552,7 @@ discard block |
||
3552 | 3552 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
3553 | 3553 | $folderRow = DB::query( |
3554 | 3554 | 'SELECT id_category |
3555 | - FROM ' . prefixTable('categories_folders') . ' |
|
3555 | + FROM ' . prefixTable('categories_folders').' |
|
3556 | 3556 | WHERE id_folder = %i', |
3557 | 3557 | $post_id |
3558 | 3558 | ); |
@@ -3666,13 +3666,13 @@ discard block |
||
3666 | 3666 | // List all ITEMS |
3667 | 3667 | if ($folderIsPf === false) { |
3668 | 3668 | $where->add('i.inactif=%i', 0); |
3669 | - $where->add('l.date=%l', '(SELECT date FROM ' . prefixTable('log_items') . " WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)"); |
|
3669 | + $where->add('l.date=%l', '(SELECT date FROM '.prefixTable('log_items')." WHERE action IN ('at_creation', 'at_modification') AND id_item=i.id ORDER BY date DESC LIMIT 1)"); |
|
3670 | 3670 | if (empty($limited_to_items) === false) { |
3671 | 3671 | $where->add('i.id IN %ls', explode(',', $limited_to_items)); |
3672 | 3672 | } |
3673 | 3673 | |
3674 | - $query_limit = ' LIMIT ' . |
|
3675 | - $start . ',' . |
|
3674 | + $query_limit = ' LIMIT '. |
|
3675 | + $start.','. |
|
3676 | 3676 | $post_nb_items_to_display_once; |
3677 | 3677 | //db::debugmode(true); |
3678 | 3678 | $rows = DB::query( |
@@ -3683,9 +3683,9 @@ discard block |
||
3683 | 3683 | MIN(l.action) AS log_action, |
3684 | 3684 | l.id_user AS log_user, |
3685 | 3685 | i.url AS link |
3686 | - FROM ' . prefixTable('items') . ' AS i |
|
3687 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
3688 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
3686 | + FROM ' . prefixTable('items').' AS i |
|
3687 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
3688 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
3689 | 3689 | WHERE %l |
3690 | 3690 | GROUP BY i.id, l.date, l.id_user, l.action |
3691 | 3691 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -3704,9 +3704,9 @@ discard block |
||
3704 | 3704 | MIN(l.action) AS log_action, |
3705 | 3705 | l.id_user AS log_user, |
3706 | 3706 | i.url AS link |
3707 | - FROM ' . prefixTable('items') . ' AS i |
|
3708 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
3709 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
3707 | + FROM ' . prefixTable('items').' AS i |
|
3708 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
3709 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
3710 | 3710 | WHERE %l |
3711 | 3711 | GROUP BY i.id, l.date, l.id_user, l.action |
3712 | 3712 | ORDER BY i.label ASC, l.date DESC', |
@@ -3736,7 +3736,7 @@ discard block |
||
3736 | 3736 | $item_is_restricted_to_role = false; |
3737 | 3737 | DB::queryfirstrow( |
3738 | 3738 | 'SELECT role_id |
3739 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
3739 | + FROM ' . prefixTable('restriction_to_roles').' |
|
3740 | 3740 | WHERE item_id = %i', |
3741 | 3741 | $record['id'] |
3742 | 3742 | ); |
@@ -3748,7 +3748,7 @@ discard block |
||
3748 | 3748 | $user_is_included_in_role = false; |
3749 | 3749 | DB::query( |
3750 | 3750 | 'SELECT role_id |
3751 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
3751 | + FROM ' . prefixTable('restriction_to_roles').' |
|
3752 | 3752 | WHERE item_id = %i AND role_id IN %ls', |
3753 | 3753 | $record['id'], |
3754 | 3754 | $_SESSION['user_roles'] |
@@ -3952,9 +3952,9 @@ discard block |
||
3952 | 3952 | if ((int) $start === 0) { |
3953 | 3953 | DB::query( |
3954 | 3954 | 'SELECT i.id |
3955 | - FROM ' . prefixTable('items') . ' as i |
|
3956 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
3957 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
3955 | + FROM ' . prefixTable('items').' as i |
|
3956 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
3957 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
3958 | 3958 | WHERE %l |
3959 | 3959 | ORDER BY i.label ASC, l.date DESC', |
3960 | 3960 | $where |
@@ -4018,8 +4018,8 @@ discard block |
||
4018 | 4018 | // Run query |
4019 | 4019 | $dataItem = DB::queryfirstrow( |
4020 | 4020 | 'SELECT i.pw AS pw, s.share_key AS share_key |
4021 | - FROM ' . prefixTable('items') . ' AS i |
|
4022 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
4021 | + FROM ' . prefixTable('items').' AS i |
|
4022 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
4023 | 4023 | WHERE user_id = %i AND i.id = %i', |
4024 | 4024 | $_SESSION['user_id'], |
4025 | 4025 | $post_item_id |
@@ -4062,7 +4062,7 @@ discard block |
||
4062 | 4062 | if (null !== $post_item_id && empty($post_item_id) === false) { |
4063 | 4063 | $dataItem = DB::queryfirstrow( |
4064 | 4064 | 'SELECT perso, anyone_can_modify |
4065 | - FROM ' . prefixTable('items') . ' |
|
4065 | + FROM ' . prefixTable('items').' |
|
4066 | 4066 | WHERE id=%i', |
4067 | 4067 | $post_item_id |
4068 | 4068 | ); |
@@ -4099,7 +4099,7 @@ discard block |
||
4099 | 4099 | */ |
4100 | 4100 | |
4101 | 4101 | // Lock Item (if already locked), go back and warn |
4102 | - $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', $post_item_id); |
|
4102 | + $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $post_item_id); |
|
4103 | 4103 | |
4104 | 4104 | // If token is taken for this Item and delay is passed then delete it. |
4105 | 4105 | if ( |
@@ -4110,7 +4110,7 @@ discard block |
||
4110 | 4110 | DB::delete(prefixTable('items_edition'), 'item_id = %i', $post_item_id); |
4111 | 4111 | //reload the previous data |
4112 | 4112 | $dataTmp = DB::queryFirstRow( |
4113 | - 'SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', |
|
4113 | + 'SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', |
|
4114 | 4114 | $post_item_id |
4115 | 4115 | ); |
4116 | 4116 | } |
@@ -4150,7 +4150,7 @@ discard block |
||
4150 | 4150 | // do query on this folder |
4151 | 4151 | $data_this_folder = DB::queryFirstRow( |
4152 | 4152 | 'SELECT id, personal_folder, title |
4153 | - FROM ' . prefixTable('nested_tree') . ' |
|
4153 | + FROM ' . prefixTable('nested_tree').' |
|
4154 | 4154 | WHERE id = %s', |
4155 | 4155 | $post_groupe |
4156 | 4156 | ); |
@@ -4187,8 +4187,8 @@ discard block |
||
4187 | 4187 | $visibilite = ''; |
4188 | 4188 | $data = DB::queryFirstRow( |
4189 | 4189 | 'SELECT m.valeur, n.personal_folder |
4190 | - FROM ' . prefixTable('misc') . ' AS m |
|
4191 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
4190 | + FROM ' . prefixTable('misc').' AS m |
|
4191 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
4192 | 4192 | WHERE type=%s AND intitule = %s', |
4193 | 4193 | 'complex', |
4194 | 4194 | $post_groupe |
@@ -4201,8 +4201,8 @@ discard block |
||
4201 | 4201 | // Prepare Item actual visibility (what Users/Roles can see it) |
4202 | 4202 | $rows = DB::query( |
4203 | 4203 | 'SELECT t.title |
4204 | - FROM ' . prefixTable('roles_values') . ' as v |
|
4205 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
4204 | + FROM ' . prefixTable('roles_values').' as v |
|
4205 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
4206 | 4206 | WHERE v.folder_id = %i |
4207 | 4207 | GROUP BY title', |
4208 | 4208 | $post_groupe |
@@ -4211,7 +4211,7 @@ discard block |
||
4211 | 4211 | if (empty($visibilite)) { |
4212 | 4212 | $visibilite = $record['title']; |
4213 | 4213 | } else { |
4214 | - $visibilite .= ' - ' . $record['title']; |
|
4214 | + $visibilite .= ' - '.$record['title']; |
|
4215 | 4215 | } |
4216 | 4216 | } |
4217 | 4217 | } else { |
@@ -4221,14 +4221,14 @@ discard block |
||
4221 | 4221 | // do new query to know if current folder is pf |
4222 | 4222 | $data_pf = DB::queryFirstRow( |
4223 | 4223 | 'SELECT personal_folder |
4224 | - FROM ' . prefixTable('nested_tree') . ' |
|
4224 | + FROM ' . prefixTable('nested_tree').' |
|
4225 | 4225 | WHERE id = %s', |
4226 | 4226 | $post_groupe |
4227 | 4227 | ); |
4228 | 4228 | |
4229 | 4229 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
4230 | 4230 | |
4231 | - $visibilite = $_SESSION['name'] . ' ' . $_SESSION['lastname'] . ' (' . $_SESSION['login'] . ')'; |
|
4231 | + $visibilite = $_SESSION['name'].' '.$_SESSION['lastname'].' ('.$_SESSION['login'].')'; |
|
4232 | 4232 | } |
4233 | 4233 | |
4234 | 4234 | recupDroitCreationSansComplexite($post_groupe); |
@@ -4238,8 +4238,8 @@ discard block |
||
4238 | 4238 | $listOptionsForRoles = array(); |
4239 | 4239 | $rows = DB::query( |
4240 | 4240 | 'SELECT r.role_id AS role_id, t.title AS title |
4241 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
4242 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
4241 | + FROM ' . prefixTable('roles_values').' AS r |
|
4242 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
4243 | 4243 | WHERE r.folder_id = %i', |
4244 | 4244 | $post_groupe |
4245 | 4245 | ); |
@@ -4253,7 +4253,7 @@ discard block |
||
4253 | 4253 | ); |
4254 | 4254 | $rows2 = DB::query( |
4255 | 4255 | 'SELECT id, login, fonction_id, email, name, lastname |
4256 | - FROM ' . prefixTable('users') . ' |
|
4256 | + FROM ' . prefixTable('users').' |
|
4257 | 4257 | WHERE admin = 0' |
4258 | 4258 | ); |
4259 | 4259 | foreach ($rows2 as $record2) { |
@@ -4267,7 +4267,7 @@ discard block |
||
4267 | 4267 | array( |
4268 | 4268 | 'id' => $record2['id'], |
4269 | 4269 | 'login' => $record2['login'], |
4270 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
4270 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
4271 | 4271 | 'email' => $record2['email'], |
4272 | 4272 | ) |
4273 | 4273 | ); |
@@ -4284,13 +4284,13 @@ discard block |
||
4284 | 4284 | //db::debugmode(true); |
4285 | 4285 | $access = DB::queryFirstRow( |
4286 | 4286 | 'SELECT type |
4287 | - FROM ' . prefixTable('roles_values') . ' |
|
4287 | + FROM ' . prefixTable('roles_values').' |
|
4288 | 4288 | WHERE role_id = %i AND folder_id = %i', |
4289 | 4289 | $role, |
4290 | 4290 | $post_groupe |
4291 | 4291 | ); |
4292 | 4292 | //db::debugmode(false); |
4293 | - if (DB::count()>0) { |
|
4293 | + if (DB::count() > 0) { |
|
4294 | 4294 | if ($access['type'] === 'R') { |
4295 | 4295 | array_push($arrTmp, 10); |
4296 | 4296 | } elseif ($access['type'] === 'W') { |
@@ -4360,7 +4360,7 @@ discard block |
||
4360 | 4360 | // Get some info before deleting |
4361 | 4361 | $data = DB::queryFirstRow( |
4362 | 4362 | 'SELECT name, id_item, file |
4363 | - FROM ' . prefixTable('files') . ' |
|
4363 | + FROM ' . prefixTable('files').' |
|
4364 | 4364 | WHERE id = %i', |
4365 | 4365 | $fileId |
4366 | 4366 | ); |
@@ -4368,7 +4368,7 @@ discard block |
||
4368 | 4368 | // Load item data |
4369 | 4369 | $data_item = DB::queryFirstRow( |
4370 | 4370 | 'SELECT id_tree |
4371 | - FROM ' . prefixTable('items') . ' |
|
4371 | + FROM ' . prefixTable('items').' |
|
4372 | 4372 | WHERE id = %i', |
4373 | 4373 | $data['id_item'] |
4374 | 4374 | ); |
@@ -4395,7 +4395,7 @@ discard block |
||
4395 | 4395 | $_SESSION['user_id'], |
4396 | 4396 | 'at_modification', |
4397 | 4397 | $_SESSION['login'], |
4398 | - 'at_del_file : ' . $data['name'] |
|
4398 | + 'at_del_file : '.$data['name'] |
|
4399 | 4399 | ); |
4400 | 4400 | |
4401 | 4401 | // DElete sharekeys |
@@ -4406,7 +4406,7 @@ discard block |
||
4406 | 4406 | ); |
4407 | 4407 | |
4408 | 4408 | // Delete file from server |
4409 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']), $SETTINGS); |
|
4409 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']), $SETTINGS); |
|
4410 | 4410 | } |
4411 | 4411 | |
4412 | 4412 | echo (string) prepareExchangedData( |
@@ -4425,7 +4425,7 @@ discard block |
||
4425 | 4425 | case 'clear_html_tags': |
4426 | 4426 | // Get information for this item |
4427 | 4427 | $dataItem = DB::queryfirstrow( |
4428 | - 'SELECT description FROM ' . prefixTable('items') . ' WHERE id=%i', |
|
4428 | + 'SELECT description FROM '.prefixTable('items').' WHERE id=%i', |
|
4429 | 4429 | filter_input(INPUT_POST, 'id_item', FILTER_SANITIZE_NUMBER_INT) |
4430 | 4430 | ); |
4431 | 4431 | // Clean up the string |
@@ -4463,12 +4463,12 @@ discard block |
||
4463 | 4463 | // Update SESSION with this new favourite |
4464 | 4464 | $data = DB::queryfirstrow( |
4465 | 4465 | 'SELECT label,id_tree |
4466 | - FROM ' . prefixTable('items') . ' |
|
4466 | + FROM ' . prefixTable('items').' |
|
4467 | 4467 | WHERE id = ' . mysqli_real_escape_string($link, $post_item_id) |
4468 | 4468 | ); |
4469 | 4469 | $_SESSION['favourites_tab'][$post_item_id] = array( |
4470 | 4470 | 'label' => $data['label'], |
4471 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $post_item_id, |
|
4471 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$post_item_id, |
|
4472 | 4472 | ); |
4473 | 4473 | } elseif ((int) filter_input(INPUT_POST, 'action', FILTER_SANITIZE_NUMBER_INT) === 1) { |
4474 | 4474 | // delete from session |
@@ -4537,8 +4537,8 @@ discard block |
||
4537 | 4537 | // get data about item |
4538 | 4538 | $dataSource = DB::queryfirstrow( |
4539 | 4539 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
4540 | - FROM ' . prefixTable('items') . ' as i |
|
4541 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
4540 | + FROM ' . prefixTable('items').' as i |
|
4541 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
4542 | 4542 | WHERE i.id=%i', |
4543 | 4543 | $post_item_id |
4544 | 4544 | ); |
@@ -4546,7 +4546,7 @@ discard block |
||
4546 | 4546 | // get data about new folder |
4547 | 4547 | $dataDestination = DB::queryfirstrow( |
4548 | 4548 | 'SELECT personal_folder, title |
4549 | - FROM ' . prefixTable('nested_tree') . ' |
|
4549 | + FROM ' . prefixTable('nested_tree').' |
|
4550 | 4550 | WHERE id = %i', |
4551 | 4551 | $post_folder_id |
4552 | 4552 | ); |
@@ -4598,7 +4598,7 @@ discard block |
||
4598 | 4598 | // Get fields for this Item |
4599 | 4599 | $rows = DB::query( |
4600 | 4600 | 'SELECT id |
4601 | - FROM ' . prefixTable('categories_items') . ' |
|
4601 | + FROM ' . prefixTable('categories_items').' |
|
4602 | 4602 | WHERE item_id = %i', |
4603 | 4603 | $post_item_id |
4604 | 4604 | ); |
@@ -4615,7 +4615,7 @@ discard block |
||
4615 | 4615 | // Get FILES for this Item |
4616 | 4616 | $rows = DB::query( |
4617 | 4617 | 'SELECT id |
4618 | - FROM ' . prefixTable('files') . ' |
|
4618 | + FROM ' . prefixTable('files').' |
|
4619 | 4619 | WHERE id_item = %i', |
4620 | 4620 | $post_item_id |
4621 | 4621 | ); |
@@ -4660,7 +4660,7 @@ discard block |
||
4660 | 4660 | // Get the ITEM object key for the user |
4661 | 4661 | $userKey = DB::queryFirstRow( |
4662 | 4662 | 'SELECT share_key |
4663 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
4663 | + FROM ' . prefixTable('sharekeys_items').' |
|
4664 | 4664 | WHERE user_id = %i AND object_id = %i', |
4665 | 4665 | $_SESSION['user_id'], |
4666 | 4666 | $post_item_id |
@@ -4671,8 +4671,8 @@ discard block |
||
4671 | 4671 | // This is a public object |
4672 | 4672 | $users = DB::query( |
4673 | 4673 | 'SELECT id, public_key |
4674 | - FROM ' . prefixTable('users') . ' |
|
4675 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
4674 | + FROM ' . prefixTable('users').' |
|
4675 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
4676 | 4676 | AND public_key != ""' |
4677 | 4677 | ); |
4678 | 4678 | foreach ($users as $user) { |
@@ -4692,14 +4692,14 @@ discard block |
||
4692 | 4692 | // Get fields for this Item |
4693 | 4693 | $rows = DB::query( |
4694 | 4694 | 'SELECT id |
4695 | - FROM ' . prefixTable('categories_items') . ' |
|
4695 | + FROM ' . prefixTable('categories_items').' |
|
4696 | 4696 | WHERE item_id = %i', |
4697 | 4697 | $post_item_id |
4698 | 4698 | ); |
4699 | 4699 | foreach ($rows as $field) { |
4700 | 4700 | $userKey = DB::queryFirstRow( |
4701 | 4701 | 'SELECT share_key |
4702 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
4702 | + FROM ' . prefixTable('sharekeys_fields').' |
|
4703 | 4703 | WHERE user_id = %i AND object_id = %i', |
4704 | 4704 | $_SESSION['user_id'], |
4705 | 4705 | $field['id'] |
@@ -4710,8 +4710,8 @@ discard block |
||
4710 | 4710 | // This is a public object |
4711 | 4711 | $users = DB::query( |
4712 | 4712 | 'SELECT id, public_key |
4713 | - FROM ' . prefixTable('users') . ' |
|
4714 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
4713 | + FROM ' . prefixTable('users').' |
|
4714 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
4715 | 4715 | AND public_key != ""' |
4716 | 4716 | ); |
4717 | 4717 | foreach ($users as $user) { |
@@ -4732,14 +4732,14 @@ discard block |
||
4732 | 4732 | // Get FILES for this Item |
4733 | 4733 | $rows = DB::query( |
4734 | 4734 | 'SELECT id |
4735 | - FROM ' . prefixTable('files') . ' |
|
4735 | + FROM ' . prefixTable('files').' |
|
4736 | 4736 | WHERE id_item = %i', |
4737 | 4737 | $post_item_id |
4738 | 4738 | ); |
4739 | 4739 | foreach ($rows as $attachment) { |
4740 | 4740 | $userKey = DB::queryFirstRow( |
4741 | 4741 | 'SELECT share_key |
4742 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
4742 | + FROM ' . prefixTable('sharekeys_files').' |
|
4743 | 4743 | WHERE user_id = %i AND object_id = %i', |
4744 | 4744 | $_SESSION['user_id'], |
4745 | 4745 | $attachment['id'] |
@@ -4750,8 +4750,8 @@ discard block |
||
4750 | 4750 | // This is a public object |
4751 | 4751 | $users = DB::query( |
4752 | 4752 | 'SELECT id, public_key |
4753 | - FROM ' . prefixTable('users') . ' |
|
4754 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
4753 | + FROM ' . prefixTable('users').' |
|
4754 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
4755 | 4755 | AND public_key != ""' |
4756 | 4756 | ); |
4757 | 4757 | foreach ($users as $user) { |
@@ -4788,7 +4788,7 @@ discard block |
||
4788 | 4788 | $_SESSION['user_id'], |
4789 | 4789 | 'at_modification', |
4790 | 4790 | $_SESSION['login'], |
4791 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
4791 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
4792 | 4792 | ); |
4793 | 4793 | |
4794 | 4794 | $returnValues = array( |
@@ -4841,8 +4841,8 @@ discard block |
||
4841 | 4841 | // get data about item |
4842 | 4842 | $dataSource = DB::queryfirstrow( |
4843 | 4843 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
4844 | - FROM ' . prefixTable('items') . ' as i |
|
4845 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
4844 | + FROM ' . prefixTable('items').' as i |
|
4845 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
4846 | 4846 | WHERE i.id=%i', |
4847 | 4847 | $item_id |
4848 | 4848 | ); |
@@ -4864,7 +4864,7 @@ discard block |
||
4864 | 4864 | |
4865 | 4865 | // get data about new folder |
4866 | 4866 | $dataDestination = DB::queryfirstrow( |
4867 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
4867 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
4868 | 4868 | $post_folder_id |
4869 | 4869 | ); |
4870 | 4870 | |
@@ -4905,7 +4905,7 @@ discard block |
||
4905 | 4905 | // Get fields for this Item |
4906 | 4906 | $rows = DB::query( |
4907 | 4907 | 'SELECT id |
4908 | - FROM ' . prefixTable('categories_items') . ' |
|
4908 | + FROM ' . prefixTable('categories_items').' |
|
4909 | 4909 | WHERE item_id = %i', |
4910 | 4910 | $item_id |
4911 | 4911 | ); |
@@ -4922,7 +4922,7 @@ discard block |
||
4922 | 4922 | // Get FILES for this Item |
4923 | 4923 | $rows = DB::query( |
4924 | 4924 | 'SELECT id |
4925 | - FROM ' . prefixTable('files') . ' |
|
4925 | + FROM ' . prefixTable('files').' |
|
4926 | 4926 | WHERE id_item = %i', |
4927 | 4927 | $item_id |
4928 | 4928 | ); |
@@ -4975,7 +4975,7 @@ discard block |
||
4975 | 4975 | // Get the ITEM object key for the user |
4976 | 4976 | $userKey = DB::queryFirstRow( |
4977 | 4977 | 'SELECT share_key |
4978 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
4978 | + FROM ' . prefixTable('sharekeys_items').' |
|
4979 | 4979 | WHERE user_id = %i AND object_id = %i', |
4980 | 4980 | $_SESSION['user_id'], |
4981 | 4981 | $item_id |
@@ -4986,8 +4986,8 @@ discard block |
||
4986 | 4986 | // This is a public object |
4987 | 4987 | $users = DB::query( |
4988 | 4988 | 'SELECT id, public_key |
4989 | - FROM ' . prefixTable('users') . ' |
|
4990 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
4989 | + FROM ' . prefixTable('users').' |
|
4990 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
4991 | 4991 | AND public_key != ""' |
4992 | 4992 | ); |
4993 | 4993 | foreach ($users as $user) { |
@@ -5007,14 +5007,14 @@ discard block |
||
5007 | 5007 | // Get fields for this Item |
5008 | 5008 | $rows = DB::query( |
5009 | 5009 | 'SELECT id |
5010 | - FROM ' . prefixTable('categories_items') . ' |
|
5010 | + FROM ' . prefixTable('categories_items').' |
|
5011 | 5011 | WHERE item_id = %i', |
5012 | 5012 | $item_id |
5013 | 5013 | ); |
5014 | 5014 | foreach ($rows as $field) { |
5015 | 5015 | $userKey = DB::queryFirstRow( |
5016 | 5016 | 'SELECT share_key |
5017 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
5017 | + FROM ' . prefixTable('sharekeys_fields').' |
|
5018 | 5018 | WHERE user_id = %i AND object_id = %i', |
5019 | 5019 | $_SESSION['user_id'], |
5020 | 5020 | $field['id'] |
@@ -5025,8 +5025,8 @@ discard block |
||
5025 | 5025 | // This is a public object |
5026 | 5026 | $users = DB::query( |
5027 | 5027 | 'SELECT id, public_key |
5028 | - FROM ' . prefixTable('users') . ' |
|
5029 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
5028 | + FROM ' . prefixTable('users').' |
|
5029 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
5030 | 5030 | AND public_key != ""' |
5031 | 5031 | ); |
5032 | 5032 | foreach ($users as $user) { |
@@ -5047,14 +5047,14 @@ discard block |
||
5047 | 5047 | // Get FILES for this Item |
5048 | 5048 | $rows = DB::query( |
5049 | 5049 | 'SELECT id |
5050 | - FROM ' . prefixTable('files') . ' |
|
5050 | + FROM ' . prefixTable('files').' |
|
5051 | 5051 | WHERE id_item = %i', |
5052 | 5052 | $item_id |
5053 | 5053 | ); |
5054 | 5054 | foreach ($rows as $attachment) { |
5055 | 5055 | $userKey = DB::queryFirstRow( |
5056 | 5056 | 'SELECT share_key |
5057 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
5057 | + FROM ' . prefixTable('sharekeys_files').' |
|
5058 | 5058 | WHERE user_id = %i AND object_id = %i', |
5059 | 5059 | $_SESSION['user_id'], |
5060 | 5060 | $attachment['id'] |
@@ -5065,8 +5065,8 @@ discard block |
||
5065 | 5065 | // This is a public object |
5066 | 5066 | $users = DB::query( |
5067 | 5067 | 'SELECT id, public_key |
5068 | - FROM ' . prefixTable('users') . ' |
|
5069 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
5068 | + FROM ' . prefixTable('users').' |
|
5069 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
5070 | 5070 | AND public_key != ""' |
5071 | 5071 | ); |
5072 | 5072 | foreach ($users as $user) { |
@@ -5102,13 +5102,13 @@ discard block |
||
5102 | 5102 | $_SESSION['user_id'], |
5103 | 5103 | 'at_modification', |
5104 | 5104 | $_SESSION['login'], |
5105 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
5105 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
5106 | 5106 | ); |
5107 | 5107 | } |
5108 | 5108 | } |
5109 | 5109 | |
5110 | 5110 | // reload cache table |
5111 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
5111 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
5112 | 5112 | updateCacheTable('reload', $SETTINGS, null); |
5113 | 5113 | |
5114 | 5114 | echo (string) prepareExchangedData( |
@@ -5172,7 +5172,7 @@ discard block |
||
5172 | 5172 | // get info |
5173 | 5173 | $dataSource = DB::queryfirstrow( |
5174 | 5174 | 'SELECT label, id_tree |
5175 | - FROM ' . prefixTable('items') . ' |
|
5175 | + FROM ' . prefixTable('items').' |
|
5176 | 5176 | WHERE id=%i', |
5177 | 5177 | $item_id |
5178 | 5178 | ); |
@@ -5272,8 +5272,8 @@ discard block |
||
5272 | 5272 | $content = explode(',', filter_input(INPUT_POST, 'content', FILTER_SANITIZE_STRING)); |
5273 | 5273 | } |
5274 | 5274 | // Variables |
5275 | - $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id= ' . $content[1]); |
|
5276 | - $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id= ' . $content[0]); |
|
5275 | + $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id= '.$content[1]); |
|
5276 | + $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id= '.$content[0]); |
|
5277 | 5277 | |
5278 | 5278 | // Get path |
5279 | 5279 | $path = geItemReadablePath( |
@@ -5287,7 +5287,7 @@ discard block |
||
5287 | 5287 | langHdl('email_request_access_subject'), |
5288 | 5288 | str_replace( |
5289 | 5289 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
5290 | - array(' ' . addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path), |
|
5290 | + array(' '.addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path), |
|
5291 | 5291 | langHdl('email_request_access_mail') |
5292 | 5292 | ), |
5293 | 5293 | $dataAuthor['email'], |
@@ -5298,7 +5298,7 @@ discard block |
||
5298 | 5298 | } elseif ($post_cat === 'share_this_item') { |
5299 | 5299 | $dataItem = DB::queryfirstrow( |
5300 | 5300 | 'SELECT label,id_tree |
5301 | - FROM ' . prefixTable('items') . ' |
|
5301 | + FROM ' . prefixTable('items').' |
|
5302 | 5302 | WHERE id= %i', |
5303 | 5303 | $post_id |
5304 | 5304 | ); |
@@ -5322,7 +5322,7 @@ discard block |
||
5322 | 5322 | ), |
5323 | 5323 | array( |
5324 | 5324 | empty($SETTINGS['email_server_url']) === false ? |
5325 | - $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $post_id : $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $post_id, |
|
5325 | + $SETTINGS['email_server_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$post_id : $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$post_id, |
|
5326 | 5326 | addslashes($_SESSION['login']), |
5327 | 5327 | addslashes($path), |
5328 | 5328 | ), |
@@ -5357,7 +5357,7 @@ discard block |
||
5357 | 5357 | if (filter_input(INPUT_POST, 'notify_type', FILTER_SANITIZE_STRING) === 'on_show') { |
5358 | 5358 | // Check if values already exist |
5359 | 5359 | $data = DB::queryfirstrow( |
5360 | - 'SELECT notification FROM ' . prefixTable('items') . ' WHERE id = %i', |
|
5360 | + 'SELECT notification FROM '.prefixTable('items').' WHERE id = %i', |
|
5361 | 5361 | $post_item_id |
5362 | 5362 | ); |
5363 | 5363 | $notifiedUsers = explode(';', $data['notification']); |
@@ -5368,8 +5368,8 @@ discard block |
||
5368 | 5368 | prefixTable('items'), |
5369 | 5369 | array( |
5370 | 5370 | 'notification' => empty($data['notification']) ? |
5371 | - filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT) . ';' |
|
5372 | - : $data['notification'] . filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
5371 | + filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT).';' |
|
5372 | + : $data['notification'].filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
5373 | 5373 | ), |
5374 | 5374 | 'id=%i', |
5375 | 5375 | $post_item_id |
@@ -5385,7 +5385,7 @@ discard block |
||
5385 | 5385 | array( |
5386 | 5386 | 'notification' => empty($data['notification']) ? |
5387 | 5387 | filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT) |
5388 | - : $data['notification'] . ';' . filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
5388 | + : $data['notification'].';'.filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
5389 | 5389 | ), |
5390 | 5390 | 'id=%i', |
5391 | 5391 | $post_item_id |
@@ -5410,8 +5410,8 @@ discard block |
||
5410 | 5410 | // Get all informations for this item |
5411 | 5411 | $dataItem = DB::queryfirstrow( |
5412 | 5412 | 'SELECT * |
5413 | - FROM ' . prefixTable('items') . ' as i |
|
5414 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
5413 | + FROM ' . prefixTable('items').' as i |
|
5414 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
5415 | 5415 | WHERE i.id=%i AND l.action = %s', |
5416 | 5416 | $dataReceived['item_id'], |
5417 | 5417 | 'at_creation' |
@@ -5442,14 +5442,14 @@ discard block |
||
5442 | 5442 | ); |
5443 | 5443 | // Prepare new line |
5444 | 5444 | $data = DB::queryfirstrow( |
5445 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
5445 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
5446 | 5446 | $dataReceived['item_id'] |
5447 | 5447 | ); |
5448 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $data['date']) . ' - ' . $_SESSION['login'] . ' - ' . langHdl($data['action']) . ' - ' . $data['raison']; |
|
5448 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $data['date']).' - '.$_SESSION['login'].' - '.langHdl($data['action']).' - '.$data['raison']; |
|
5449 | 5449 | // send back |
5450 | 5450 | $data = array( |
5451 | 5451 | 'error' => '', |
5452 | - 'new_line' => '<br>' . addslashes($historic), |
|
5452 | + 'new_line' => '<br>'.addslashes($historic), |
|
5453 | 5453 | ); |
5454 | 5454 | echo (string) prepareExchangedData($data, 'encode'); |
5455 | 5455 | } else { |
@@ -5483,7 +5483,7 @@ discard block |
||
5483 | 5483 | */ |
5484 | 5484 | case 'is_item_changed': |
5485 | 5485 | $data = DB::queryFirstRow( |
5486 | - 'SELECT date FROM ' . prefixTable('log_items') . ' WHERE action = %s AND id_item = %i ORDER BY date DESC', |
|
5486 | + 'SELECT date FROM '.prefixTable('log_items').' WHERE action = %s AND id_item = %i ORDER BY date DESC', |
|
5487 | 5487 | 'at_modification', |
5488 | 5488 | $post_item_id |
5489 | 5489 | ); |
@@ -5507,7 +5507,7 @@ discard block |
||
5507 | 5507 | } |
5508 | 5508 | |
5509 | 5509 | // delete all existing old otv codes |
5510 | - $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE timestamp < ' . (time() - $SETTINGS['otv_expiration_period'] * 86400)); |
|
5510 | + $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE timestamp < '.(time() - $SETTINGS['otv_expiration_period'] * 86400)); |
|
5511 | 5511 | foreach ($rows as $record) { |
5512 | 5512 | DB::delete(prefixTable('otv'), 'id=%i', $record['id']); |
5513 | 5513 | } |
@@ -5529,8 +5529,8 @@ discard block |
||
5529 | 5529 | // Should we log a password change? |
5530 | 5530 | $itemQ = DB::queryFirstRow( |
5531 | 5531 | 'SELECT s.share_key, i.pw |
5532 | - FROM ' . prefixTable('items') . ' AS i |
|
5533 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
5532 | + FROM ' . prefixTable('items').' AS i |
|
5533 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
5534 | 5534 | WHERE s.user_id = %i AND s.object_id = %i', |
5535 | 5535 | $_SESSION['user_id'], |
5536 | 5536 | $post_id |
@@ -5580,7 +5580,7 @@ discard block |
||
5580 | 5580 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
5581 | 5581 | $SETTINGS['otv_expiration_period'] = 7; |
5582 | 5582 | } |
5583 | - $url = $SETTINGS['cpassman_url'] . '/index.php?otv=true&' . http_build_query($otv_session); |
|
5583 | + $url = $SETTINGS['cpassman_url'].'/index.php?otv=true&'.http_build_query($otv_session); |
|
5584 | 5584 | //$exp_date = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], time() + (intval($SETTINGS['otv_expiration_period']) * 86400)); |
5585 | 5585 | |
5586 | 5586 | echo json_encode( |
@@ -5618,8 +5618,8 @@ discard block |
||
5618 | 5618 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
5619 | 5619 | f.extension AS extension, f.type AS type, |
5620 | 5620 | s.share_key AS share_key |
5621 | - FROM ' . prefixTable('files') . ' AS f |
|
5622 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
5621 | + FROM ' . prefixTable('files').' AS f |
|
5622 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
5623 | 5623 | WHERE s.user_id = %i AND s.object_id = %i', |
5624 | 5624 | $_SESSION['user_id'], |
5625 | 5625 | $post_id |
@@ -5640,7 +5640,7 @@ discard block |
||
5640 | 5640 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
5641 | 5641 | |
5642 | 5642 | // prepare image info |
5643 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
5643 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
5644 | 5644 | $post_title = isBase64($post_title) === true ? |
5645 | 5645 | base64_decode($post_title) : $post_title; |
5646 | 5646 | $image_code = $file_info['file']; |
@@ -5657,7 +5657,7 @@ discard block |
||
5657 | 5657 | echo (string) prepareExchangedData( |
5658 | 5658 | array( |
5659 | 5659 | 'error' => false, |
5660 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
5660 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
5661 | 5661 | 'file_type' => $file_info['type'], |
5662 | 5662 | 'file_content' => $fileContent, |
5663 | 5663 | ), |
@@ -5678,11 +5678,11 @@ discard block |
||
5678 | 5678 | |
5679 | 5679 | // get file info |
5680 | 5680 | $result = DB::queryfirstrow( |
5681 | - 'SELECT file FROM ' . prefixTable('files') . ' WHERE id=%i', |
|
5681 | + 'SELECT file FROM '.prefixTable('files').' WHERE id=%i', |
|
5682 | 5682 | intval(substr(filter_input(INPUT_POST, 'uri', FILTER_SANITIZE_STRING), 1)) |
5683 | 5683 | ); |
5684 | 5684 | |
5685 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $result['file'] . filter_input(INPUT_POST, 'file_suffix', FILTER_SANITIZE_STRING), $SETTINGS); |
|
5685 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.$result['file'].filter_input(INPUT_POST, 'file_suffix', FILTER_SANITIZE_STRING), $SETTINGS); |
|
5686 | 5686 | |
5687 | 5687 | break; |
5688 | 5688 | |
@@ -5705,16 +5705,16 @@ discard block |
||
5705 | 5705 | $idFolder = $dataReceived['idFolder']; |
5706 | 5706 | |
5707 | 5707 | // don't check if Personal Folder |
5708 | - $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $idFolder); |
|
5708 | + $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $idFolder); |
|
5709 | 5709 | if ($data['title'] === $_SESSION['user_id']) { |
5710 | 5710 | // send data |
5711 | - echo '[{"duplicate" : "' . $duplicate . '" , error" : ""}]'; |
|
5711 | + echo '[{"duplicate" : "'.$duplicate.'" , error" : ""}]'; |
|
5712 | 5712 | } else { |
5713 | 5713 | if (filter_input(INPUT_POST, 'option', FILTER_SANITIZE_STRING) === 'same_folder') { |
5714 | 5714 | // case unique folder |
5715 | 5715 | DB::query( |
5716 | 5716 | 'SELECT label |
5717 | - FROM ' . prefixTable('items') . ' |
|
5717 | + FROM ' . prefixTable('items').' |
|
5718 | 5718 | WHERE id_tree = %i AND label = %s', |
5719 | 5719 | $idFolder, |
5720 | 5720 | $label |
@@ -5726,7 +5726,7 @@ discard block |
||
5726 | 5726 | $arrayPf = array(); |
5727 | 5727 | if (empty($row['id']) === false) { |
5728 | 5728 | $rows = DB::query( |
5729 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
5729 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
5730 | 5730 | '1' |
5731 | 5731 | ); |
5732 | 5732 | foreach ($rows as $record) { |
@@ -5741,12 +5741,12 @@ discard block |
||
5741 | 5741 | $where->add('id_tree = %i', $idFolder); |
5742 | 5742 | $where->add('label = %s', $label); |
5743 | 5743 | if (empty($arrayPf) === false) { |
5744 | - $where->add('id_tree NOT IN (' . implode(',', $arrayPf) . ')'); |
|
5744 | + $where->add('id_tree NOT IN ('.implode(',', $arrayPf).')'); |
|
5745 | 5745 | } |
5746 | 5746 | |
5747 | 5747 | DB::query( |
5748 | 5748 | 'SELECT label |
5749 | - FROM ' . prefixTable('items') . ' |
|
5749 | + FROM ' . prefixTable('items').' |
|
5750 | 5750 | WHERE %l', |
5751 | 5751 | $where |
5752 | 5752 | ); |
@@ -5758,7 +5758,7 @@ discard block |
||
5758 | 5758 | } |
5759 | 5759 | |
5760 | 5760 | // send data |
5761 | - echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]'; |
|
5761 | + echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]'; |
|
5762 | 5762 | } |
5763 | 5763 | break; |
5764 | 5764 | |
@@ -5815,7 +5815,7 @@ discard block |
||
5815 | 5815 | } |
5816 | 5816 | |
5817 | 5817 | //Build tree |
5818 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
5818 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
5819 | 5819 | $tree->register(); |
5820 | 5820 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
5821 | 5821 | $tree->rebuild(); |
@@ -5866,7 +5866,7 @@ discard block |
||
5866 | 5866 | if (empty($arr_data['folders'][$inc]['path']) === true) { |
5867 | 5867 | $arr_data['folders'][$inc]['path'] = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
5868 | 5868 | } else { |
5869 | - $arr_data['folders'][$inc]['path'] .= ' / ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
5869 | + $arr_data['folders'][$inc]['path'] .= ' / '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
5870 | 5870 | } |
5871 | 5871 | } |
5872 | 5872 | |
@@ -5932,8 +5932,8 @@ discard block |
||
5932 | 5932 | $rows_tmp = DB::query( |
5933 | 5933 | 'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory, |
5934 | 5934 | f.id_category AS category_id |
5935 | - FROM ' . prefixTable('categories_folders') . ' AS f |
|
5936 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id) |
|
5935 | + FROM ' . prefixTable('categories_folders').' AS f |
|
5936 | + INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id) |
|
5937 | 5937 | WHERE id_folder=%i', |
5938 | 5938 | $folder |
5939 | 5939 | ); |
@@ -5960,7 +5960,7 @@ discard block |
||
5960 | 5960 | $valTemp = ''; |
5961 | 5961 | $data = DB::queryFirstRow( |
5962 | 5962 | 'SELECT valeur |
5963 | - FROM ' . prefixTable('misc') . ' |
|
5963 | + FROM ' . prefixTable('misc').' |
|
5964 | 5964 | WHERE type = %s AND intitule=%i', |
5965 | 5965 | 'complex', |
5966 | 5966 | $folder |
@@ -5977,14 +5977,14 @@ discard block |
||
5977 | 5977 | $valTemp = ''; |
5978 | 5978 | $rows_tmp = DB::query( |
5979 | 5979 | 'SELECT t.title |
5980 | - FROM ' . prefixTable('roles_values') . ' as v |
|
5981 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
5980 | + FROM ' . prefixTable('roles_values').' as v |
|
5981 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
5982 | 5982 | WHERE v.folder_id = %i |
5983 | 5983 | GROUP BY title', |
5984 | 5984 | $folder |
5985 | 5985 | ); |
5986 | 5986 | foreach ($rows_tmp as $record) { |
5987 | - $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title']; |
|
5987 | + $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title']; |
|
5988 | 5988 | } |
5989 | 5989 | $arr_data[$folder]['visibilityRoles'] = $valTemp; |
5990 | 5990 | } |
@@ -6012,7 +6012,7 @@ discard block |
||
6012 | 6012 | // get item info |
6013 | 6013 | $dataItem = DB::queryFirstRow( |
6014 | 6014 | 'SELECT * |
6015 | - FROM ' . prefixTable('items') . ' |
|
6015 | + FROM ' . prefixTable('items').' |
|
6016 | 6016 | WHERE id=%i', |
6017 | 6017 | $post_item_id |
6018 | 6018 | ); |
@@ -6022,8 +6022,8 @@ discard block |
||
6022 | 6022 | $rows = DB::query( |
6023 | 6023 | 'SELECT l.date as date, l.action as action, l.raison as raison, |
6024 | 6024 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname |
6025 | - FROM ' . prefixTable('log_items') . ' as l |
|
6026 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
6025 | + FROM ' . prefixTable('log_items').' as l |
|
6026 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
6027 | 6027 | WHERE id_item=%i AND action <> %s |
6028 | 6028 | ORDER BY date DESC', |
6029 | 6029 | $post_item_id, |
@@ -6038,7 +6038,7 @@ discard block |
||
6038 | 6038 | |
6039 | 6039 | // imported via API |
6040 | 6040 | if (empty($record['login'])) { |
6041 | - $record['login'] = langHdl('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
6041 | + $record['login'] = langHdl('imported_via_api').' ['.$record['raison'].']'; |
|
6042 | 6042 | } |
6043 | 6043 | |
6044 | 6044 | if ( |
@@ -6049,13 +6049,13 @@ discard block |
||
6049 | 6049 | ) { |
6050 | 6050 | // Prepare avatar |
6051 | 6051 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
6052 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
6053 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
6052 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
6053 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
6054 | 6054 | } else { |
6055 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
6055 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
6056 | 6056 | } |
6057 | 6057 | } else { |
6058 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
6058 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
6059 | 6059 | } |
6060 | 6060 | |
6061 | 6061 | // Prepare action |
@@ -6072,19 +6072,19 @@ discard block |
||
6072 | 6072 | $action = langHdl($reason[0]); |
6073 | 6073 | if ($reason[0] === 'at_moved') { |
6074 | 6074 | $tmp = explode(' -> ', $reason[1]); |
6075 | - $detail = langHdl('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . langHdl('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
6075 | + $detail = langHdl('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.langHdl('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
6076 | 6076 | } elseif ($reason[0] === 'at_field') { |
6077 | 6077 | $tmp = explode(' => ', $reason[1]); |
6078 | 6078 | if (count($tmp) > 1) { |
6079 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . langHdl('previous_value') . |
|
6080 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
6079 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.langHdl('previous_value'). |
|
6080 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
6081 | 6081 | } else { |
6082 | 6082 | $detail = trim($reason[1]); |
6083 | 6083 | } |
6084 | 6084 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
6085 | 6085 | $tmp = explode(' => ', $reason[1]); |
6086 | 6086 | $detail = empty(trim($tmp[0])) === true ? |
6087 | - langHdl('no_previous_value') : langHdl('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
6087 | + langHdl('no_previous_value') : langHdl('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
6088 | 6088 | } elseif ($reason[0] === 'at_automatic_del') { |
6089 | 6089 | $detail = langHdl($reason[1]); |
6090 | 6090 | } elseif ($reason[0] === 'at_anyoneconmodify') { |
@@ -6093,7 +6093,7 @@ discard block |
||
6093 | 6093 | $tmp = explode(':', $reason[1]); |
6094 | 6094 | $tmp = explode('.', $tmp[0]); |
6095 | 6095 | $detail = isBase64($tmp[0]) === true ? |
6096 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
6096 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
6097 | 6097 | } elseif ($reason[0] === 'at_import') { |
6098 | 6098 | $detail = ''; |
6099 | 6099 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6112,8 +6112,8 @@ discard block |
||
6112 | 6112 | array( |
6113 | 6113 | 'avatar' => $avatar, |
6114 | 6114 | 'login' => $record['login'], |
6115 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
6116 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
6115 | + 'name' => $record['name'].' '.$record['lastname'], |
|
6116 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
6117 | 6117 | 'action' => $action, |
6118 | 6118 | 'detail' => $detail, |
6119 | 6119 | ) |
@@ -6194,18 +6194,18 @@ discard block |
||
6194 | 6194 | |
6195 | 6195 | // get some info to add to the notification email |
6196 | 6196 | $resp_user = DB::queryfirstrow( |
6197 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
6197 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
6198 | 6198 | $_SESSION['user_id'] |
6199 | 6199 | ); |
6200 | 6200 | $resp_folder = DB::queryfirstrow( |
6201 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
6201 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
6202 | 6202 | $folder |
6203 | 6203 | ); |
6204 | 6204 | |
6205 | 6205 | // notify Managers |
6206 | 6206 | $rows = DB::query( |
6207 | 6207 | 'SELECT email |
6208 | - FROM ' . prefixTable('users') . ' |
|
6208 | + FROM ' . prefixTable('users').' |
|
6209 | 6209 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
6210 | 6210 | 1 |
6211 | 6211 | ); |
@@ -6236,14 +6236,14 @@ discard block |
||
6236 | 6236 | // Get list of users |
6237 | 6237 | $usersList = array(); |
6238 | 6238 | $usersString = ''; |
6239 | - $rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC'); |
|
6239 | + $rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC'); |
|
6240 | 6240 | foreach ($rows as $record) { |
6241 | 6241 | $usersList[$record['login']] = array( |
6242 | 6242 | 'id' => $record['id'], |
6243 | 6243 | 'login' => $record['login'], |
6244 | 6244 | 'email' => $record['email'], |
6245 | 6245 | ); |
6246 | - $usersString .= $record['id'] . '#' . $record['login'] . ';'; |
|
6246 | + $usersString .= $record['id'].'#'.$record['login'].';'; |
|
6247 | 6247 | } |
6248 | 6248 | |
6249 | 6249 | $data = array( |
@@ -6277,7 +6277,7 @@ discard block |
||
6277 | 6277 | // Send email |
6278 | 6278 | $dataItem = DB::queryfirstrow( |
6279 | 6279 | 'SELECT label, id_tree |
6280 | - FROM ' . prefixTable('items') . ' |
|
6280 | + FROM ' . prefixTable('items').' |
|
6281 | 6281 | WHERE id = %i', |
6282 | 6282 | $post_item_id |
6283 | 6283 | ); |
@@ -6371,7 +6371,7 @@ discard block |
||
6371 | 6371 | |
6372 | 6372 | DB::query( |
6373 | 6373 | 'SELECT * |
6374 | - FROM ' . prefixTable('notification') . ' |
|
6374 | + FROM ' . prefixTable('notification').' |
|
6375 | 6375 | WHERE item_id = %i AND user_id = %i', |
6376 | 6376 | $post_item_id, |
6377 | 6377 | $_SESSION['user_id'] |
@@ -6437,7 +6437,7 @@ discard block |
||
6437 | 6437 | // And related logs |
6438 | 6438 | $rows = DB::query( |
6439 | 6439 | 'SELECT id, file AS filename |
6440 | - FROM ' . prefixTable('files') . ' |
|
6440 | + FROM ' . prefixTable('files').' |
|
6441 | 6441 | WHERE id_item = %i AND confirmed = %i', |
6442 | 6442 | $post_item_id, |
6443 | 6443 | 0 |
@@ -6451,12 +6451,12 @@ discard block |
||
6451 | 6451 | ); |
6452 | 6452 | |
6453 | 6453 | // Delete file on server |
6454 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
6454 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
6455 | 6455 | |
6456 | 6456 | // Delete related logs |
6457 | 6457 | $logFile = DB::query( |
6458 | 6458 | 'SELECT increment_id, raison |
6459 | - FROM ' . prefixTable('log_items') . ' |
|
6459 | + FROM ' . prefixTable('log_items').' |
|
6460 | 6460 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
6461 | 6461 | $post_item_id, |
6462 | 6462 | $_SESSION['user_id'], |
@@ -6509,7 +6509,7 @@ discard block |
||
6509 | 6509 | // Confirm attachments |
6510 | 6510 | $rows = DB::query( |
6511 | 6511 | 'SELECT id, file AS filename |
6512 | - FROM ' . prefixTable('files') . ' |
|
6512 | + FROM ' . prefixTable('files').' |
|
6513 | 6513 | WHERE id_item = %i AND confirmed = %i', |
6514 | 6514 | $post_item_id, |
6515 | 6515 | 0 |
@@ -6546,15 +6546,15 @@ discard block |
||
6546 | 6546 | case 'autocomplete_tags': |
6547 | 6547 | // Get a list off all existing TAGS |
6548 | 6548 | $listOfTags = ''; |
6549 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $get['term']); |
|
6549 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $get['term']); |
|
6550 | 6550 | foreach ($rows as $record) { |
6551 | 6551 | if (empty($listOfTags)) { |
6552 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
6552 | + $listOfTags = '"'.$record['tag'].'"'; |
|
6553 | 6553 | } else { |
6554 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
6554 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
6555 | 6555 | } |
6556 | 6556 | } |
6557 | - echo '[' . $listOfTags . ']'; |
|
6557 | + echo '['.$listOfTags.']'; |
|
6558 | 6558 | break; |
6559 | 6559 | } |
6560 | 6560 | } |
@@ -6570,7 +6570,7 @@ discard block |
||
6570 | 6570 | { |
6571 | 6571 | $data = DB::queryFirstRow( |
6572 | 6572 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
6573 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
6573 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
6574 | 6574 | $groupe |
6575 | 6575 | ); |
6576 | 6576 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
@@ -48,7 +48,7 @@ |
||
48 | 48 | } else { |
49 | 49 | throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1); |
50 | 50 | } |
51 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
51 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php'; |
|
52 | 52 | $superGlobal = new protect\SuperGlobal\SuperGlobal(); |
53 | 53 | ?> |
54 | 54 | <body class="hold-transition otv-page"> |