nilsteampassnet /
TeamPass
@@ -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 |
@@ -2459,8 +2459,8 @@ discard block |
||
| 2459 | 2459 | // Add restriction if item is restricted to roles |
| 2460 | 2460 | $rows = DB::query( |
| 2461 | 2461 | 'SELECT t.title, t.id |
| 2462 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
| 2463 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
| 2462 | + FROM ' . prefixTable('roles_title').' AS t |
|
| 2463 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
| 2464 | 2464 | WHERE r.item_id = %i |
| 2465 | 2465 | ORDER BY t.title ASC', |
| 2466 | 2466 | $post_id |
@@ -2476,8 +2476,8 @@ discard block |
||
| 2476 | 2476 | $tmp = array(); |
| 2477 | 2477 | $rows = DB::query( |
| 2478 | 2478 | 'SELECT k.label, k.id |
| 2479 | - FROM ' . prefixTable('kb_items') . ' as i |
|
| 2480 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
| 2479 | + FROM ' . prefixTable('kb_items').' as i |
|
| 2480 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
| 2481 | 2481 | WHERE i.item_id = %i |
| 2482 | 2482 | ORDER BY k.label ASC', |
| 2483 | 2483 | $post_id |
@@ -2557,7 +2557,7 @@ discard block |
||
| 2557 | 2557 | $arrCatList = array(); |
| 2558 | 2558 | $rows_tmp = DB::query( |
| 2559 | 2559 | 'SELECT id_category |
| 2560 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2560 | + FROM ' . prefixTable('categories_folders').' |
|
| 2561 | 2561 | WHERE id_folder=%i', |
| 2562 | 2562 | $post_folder_id |
| 2563 | 2563 | ); |
@@ -2572,8 +2572,8 @@ discard block |
||
| 2572 | 2572 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
| 2573 | 2573 | i.encryption_type AS encryption_type, c.encrypted_data, c.parent_id AS parent_id, |
| 2574 | 2574 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
| 2575 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 2576 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 2575 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 2576 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 2577 | 2577 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
| 2578 | 2578 | $post_id, |
| 2579 | 2579 | $arrCatList |
@@ -2584,11 +2584,11 @@ discard block |
||
| 2584 | 2584 | //db::debugmode(true); |
| 2585 | 2585 | $userKey = DB::queryFirstRow( |
| 2586 | 2586 | 'SELECT share_key |
| 2587 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2587 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2588 | 2588 | WHERE user_id = %i AND object_id = %i', |
| 2589 | 2589 | $_SESSION['user_id'], |
| 2590 | 2590 | $row['id'] |
| 2591 | - );//db::debugmode(false); |
|
| 2591 | + ); //db::debugmode(false); |
|
| 2592 | 2592 | $fieldText = []; |
| 2593 | 2593 | if (DB::count() === 0) { |
| 2594 | 2594 | // Not encrypted |
@@ -2630,7 +2630,7 @@ discard block |
||
| 2630 | 2630 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
| 2631 | 2631 | $rows_tmp = DB::queryfirstrow( |
| 2632 | 2632 | 'SELECT category_id |
| 2633 | - FROM ' . prefixTable('templates') . ' |
|
| 2633 | + FROM ' . prefixTable('templates').' |
|
| 2634 | 2634 | WHERE item_id = %i', |
| 2635 | 2635 | $post_id |
| 2636 | 2636 | ); |
@@ -2655,7 +2655,7 @@ discard block |
||
| 2655 | 2655 | // Is the Item to be deleted? |
| 2656 | 2656 | $dataDelete = DB::queryfirstrow( |
| 2657 | 2657 | 'SELECT * |
| 2658 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 2658 | + FROM ' . prefixTable('automatic_del').' |
|
| 2659 | 2659 | WHERE item_id = %i', |
| 2660 | 2660 | $post_id |
| 2661 | 2661 | ); |
@@ -2737,11 +2737,11 @@ discard block |
||
| 2737 | 2737 | if (empty($dataItem['restricted_to']) === false) { |
| 2738 | 2738 | foreach (explode(';', $dataItem['restricted_to']) as $userRest) { |
| 2739 | 2739 | if (empty($userRest) === false) { |
| 2740 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
| 2740 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
| 2741 | 2741 | if (empty($listOfRestricted)) { |
| 2742 | 2742 | $listOfRestricted = $dataTmp['login']; |
| 2743 | 2743 | } else { |
| 2744 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 2744 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 2745 | 2745 | } |
| 2746 | 2746 | } |
| 2747 | 2747 | } |
@@ -2798,8 +2798,8 @@ discard block |
||
| 2798 | 2798 | // Load item data |
| 2799 | 2799 | $dataItem = DB::queryFirstRow( |
| 2800 | 2800 | 'SELECT i.*, n.title AS folder_title |
| 2801 | - FROM ' . prefixTable('items') . ' AS i |
|
| 2802 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 2801 | + FROM ' . prefixTable('items').' AS i |
|
| 2802 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 2803 | 2803 | WHERE i.id = %i', |
| 2804 | 2804 | $post_id |
| 2805 | 2805 | ); |
@@ -2821,7 +2821,7 @@ discard block |
||
| 2821 | 2821 | // Check if user has a role that is accepted |
| 2822 | 2822 | $rows_tmp = DB::query( |
| 2823 | 2823 | 'SELECT role_id |
| 2824 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2824 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2825 | 2825 | WHERE item_id=%i', |
| 2826 | 2826 | $post_id |
| 2827 | 2827 | ); |
@@ -2867,7 +2867,7 @@ discard block |
||
| 2867 | 2867 | // launch query |
| 2868 | 2868 | $rows = DB::query( |
| 2869 | 2869 | 'SELECT id, name, file, extension, size |
| 2870 | - FROM ' . prefixTable('files') . ' |
|
| 2870 | + FROM ' . prefixTable('files').' |
|
| 2871 | 2871 | WHERE id_item = %i AND confirmed = 1', |
| 2872 | 2872 | $post_id |
| 2873 | 2873 | ); |
@@ -2876,7 +2876,7 @@ discard block |
||
| 2876 | 2876 | $attachments, |
| 2877 | 2877 | array( |
| 2878 | 2878 | 'icon' => fileFormatImage(strtolower($record['extension'])), |
| 2879 | - 'filename' => basename($record['name'], '.' . $record['extension']), |
|
| 2879 | + 'filename' => basename($record['name'], '.'.$record['extension']), |
|
| 2880 | 2880 | 'extension' => $record['extension'], |
| 2881 | 2881 | 'size' => formatSizeUnits((int) $record['size']), |
| 2882 | 2882 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
@@ -2902,7 +2902,7 @@ discard block |
||
| 2902 | 2902 | array( |
| 2903 | 2903 | 'latest_items' => implode(';', $_SESSION['latest_items']), |
| 2904 | 2904 | ), |
| 2905 | - 'id=' . $_SESSION['user_id'] |
|
| 2905 | + 'id='.$_SESSION['user_id'] |
|
| 2906 | 2906 | ); |
| 2907 | 2907 | } |
| 2908 | 2908 | |
@@ -2911,8 +2911,8 @@ discard block |
||
| 2911 | 2911 | $listOptionsForRoles = array(); |
| 2912 | 2912 | $rows = DB::query( |
| 2913 | 2913 | 'SELECT r.role_id AS role_id, t.title AS title |
| 2914 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 2915 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 2914 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 2915 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 2916 | 2916 | WHERE r.folder_id = %i', |
| 2917 | 2917 | $dataItem['id_tree'] |
| 2918 | 2918 | ); |
@@ -2926,9 +2926,9 @@ discard block |
||
| 2926 | 2926 | ); |
| 2927 | 2927 | $rows2 = DB::query( |
| 2928 | 2928 | 'SELECT id, login, fonction_id, email, name, lastname |
| 2929 | - FROM ' . prefixTable('users') . ' |
|
| 2929 | + FROM ' . prefixTable('users').' |
|
| 2930 | 2930 | WHERE fonction_id LIKE %s', |
| 2931 | - '%' . $record['role_id'] . '%' |
|
| 2931 | + '%'.$record['role_id'].'%' |
|
| 2932 | 2932 | ); |
| 2933 | 2933 | foreach ($rows2 as $record2) { |
| 2934 | 2934 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -2941,7 +2941,7 @@ discard block |
||
| 2941 | 2941 | array( |
| 2942 | 2942 | 'id' => (int) $record2['id'], |
| 2943 | 2943 | 'login' => $record2['login'], |
| 2944 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 2944 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 2945 | 2945 | 'email' => $record2['email'], |
| 2946 | 2946 | ) |
| 2947 | 2947 | ); |
@@ -2960,16 +2960,16 @@ discard block |
||
| 2960 | 2960 | $path = ''; |
| 2961 | 2961 | foreach ($arbo as $elem) { |
| 2962 | 2962 | if (empty($path) === true) { |
| 2963 | - $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' '; |
|
| 2963 | + $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' '; |
|
| 2964 | 2964 | } else { |
| 2965 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 2965 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 2966 | 2966 | } |
| 2967 | 2967 | } |
| 2968 | 2968 | // Build text to show user |
| 2969 | 2969 | if (empty($path) === true) { |
| 2970 | 2970 | $path = addslashes($dataItem['label']); |
| 2971 | 2971 | } else { |
| 2972 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
| 2972 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
| 2973 | 2973 | } |
| 2974 | 2974 | |
| 2975 | 2975 | // send back infos |
@@ -2983,7 +2983,7 @@ discard block |
||
| 2983 | 2983 | array( |
| 2984 | 2984 | addslashes($_SESSION['login']), |
| 2985 | 2985 | $path, |
| 2986 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
| 2986 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
| 2987 | 2987 | ), |
| 2988 | 2988 | langHdl('email_on_open_notification_mail') |
| 2989 | 2989 | ), |
@@ -2994,7 +2994,7 @@ discard block |
||
| 2994 | 2994 | } |
| 2995 | 2995 | |
| 2996 | 2996 | // has this item a change proposal |
| 2997 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $post_id); |
|
| 2997 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $post_id); |
|
| 2998 | 2998 | $returnArray['has_change_proposal'] = DB::count(); |
| 2999 | 2999 | |
| 3000 | 3000 | // Setting |
@@ -3085,7 +3085,7 @@ discard block |
||
| 3085 | 3085 | // Load item data |
| 3086 | 3086 | $data = DB::queryFirstRow( |
| 3087 | 3087 | 'SELECT id_tree |
| 3088 | - FROM ' . prefixTable('items') . ' |
|
| 3088 | + FROM ' . prefixTable('items').' |
|
| 3089 | 3089 | WHERE id = %i', |
| 3090 | 3090 | $post_item_id |
| 3091 | 3091 | ); |
@@ -3155,13 +3155,13 @@ discard block |
||
| 3155 | 3155 | |
| 3156 | 3156 | // Check if user is allowed to access this folder |
| 3157 | 3157 | if (!in_array($post_folder_id, $_SESSION['groupes_visibles'])) { |
| 3158 | - echo '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3158 | + echo '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3159 | 3159 | break; |
| 3160 | 3160 | } |
| 3161 | 3161 | |
| 3162 | 3162 | // Check if title doesn't contains html codes |
| 3163 | 3163 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
| 3164 | - echo '[ { "error" : "' . langHdl('error_html_codes') . '" } ]'; |
|
| 3164 | + echo '[ { "error" : "'.langHdl('error_html_codes').'" } ]'; |
|
| 3165 | 3165 | break; |
| 3166 | 3166 | } |
| 3167 | 3167 | // check that title is not numeric |
@@ -3172,9 +3172,9 @@ discard block |
||
| 3172 | 3172 | |
| 3173 | 3173 | // Check if duplicate folders name are allowed |
| 3174 | 3174 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
| 3175 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
| 3175 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
| 3176 | 3176 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
| 3177 | - echo '[ { "error" : "' . langHdl('error_group_exist') . '" } ]'; |
|
| 3177 | + echo '[ { "error" : "'.langHdl('error_group_exist').'" } ]'; |
|
| 3178 | 3178 | break; |
| 3179 | 3179 | } |
| 3180 | 3180 | } |
@@ -3182,7 +3182,7 @@ discard block |
||
| 3182 | 3182 | // query on folder |
| 3183 | 3183 | $data = DB::queryfirstrow( |
| 3184 | 3184 | 'SELECT parent_id, personal_folder |
| 3185 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3185 | + FROM ' . prefixTable('nested_tree').' |
|
| 3186 | 3186 | WHERE id = %i', |
| 3187 | 3187 | $post_folder_id |
| 3188 | 3188 | ); |
@@ -3192,20 +3192,20 @@ discard block |
||
| 3192 | 3192 | if ($_SESSION['is_admin'] !== 1 && $_SESSION['user_manager'] !== 1 && $data['personal_folder'] === '0') { |
| 3193 | 3193 | $data = DB::queryfirstrow( |
| 3194 | 3194 | 'SELECT valeur |
| 3195 | - FROM ' . prefixTable('misc') . ' |
|
| 3195 | + FROM ' . prefixTable('misc').' |
|
| 3196 | 3196 | WHERE intitule = %i AND type = %s', |
| 3197 | 3197 | $data['parent_id'], |
| 3198 | 3198 | 'complex' |
| 3199 | 3199 | ); |
| 3200 | 3200 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
| 3201 | - echo '[ { "error" : "' . langHdl('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
| 3201 | + echo '[ { "error" : "'.langHdl('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
| 3202 | 3202 | break; |
| 3203 | 3203 | } |
| 3204 | 3204 | } |
| 3205 | 3205 | |
| 3206 | 3206 | // update Folders table |
| 3207 | 3207 | $tmp = DB::queryFirstRow( |
| 3208 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 3208 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 3209 | 3209 | $dataReceived['folder'] |
| 3210 | 3210 | ); |
| 3211 | 3211 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $_SESSION['user_id'] || $tmp['personal_folder'] !== 1) { |
@@ -3270,42 +3270,42 @@ discard block |
||
| 3270 | 3270 | in_array($post_target_folder_id, $_SESSION['groupes_visibles']) === false) && ($post_target_folder_id === '0' && |
| 3271 | 3271 | isset($SETTINGS['can_create_root_folder']) === true && (int) $SETTINGS['can_create_root_folder'] === 1) |
| 3272 | 3272 | ) { |
| 3273 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3273 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3274 | 3274 | echo $returnValues; |
| 3275 | 3275 | break; |
| 3276 | 3276 | } |
| 3277 | 3277 | |
| 3278 | 3278 | $tmp_source = DB::queryFirstRow( |
| 3279 | 3279 | 'SELECT title, parent_id, personal_folder |
| 3280 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3280 | + FROM ' . prefixTable('nested_tree').' |
|
| 3281 | 3281 | WHERE id = %i', |
| 3282 | 3282 | $post_source_folder_id |
| 3283 | 3283 | ); |
| 3284 | 3284 | |
| 3285 | 3285 | $tmp_target = DB::queryFirstRow( |
| 3286 | 3286 | 'SELECT title, parent_id, personal_folder |
| 3287 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3287 | + FROM ' . prefixTable('nested_tree').' |
|
| 3288 | 3288 | WHERE id = %i', |
| 3289 | 3289 | $post_target_folder_id |
| 3290 | 3290 | ); |
| 3291 | 3291 | |
| 3292 | 3292 | // check if target is not a child of source |
| 3293 | 3293 | if ($tree->isChildOf($post_target_folder_id, $post_source_folder_id) === true) { |
| 3294 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3294 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3295 | 3295 | echo $returnValues; |
| 3296 | 3296 | break; |
| 3297 | 3297 | } |
| 3298 | 3298 | |
| 3299 | 3299 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3300 | 3300 | if ((int) $tmp_source['personal_folder'] === 1 || (int) $tmp_target['personal_folder'] === 1) { |
| 3301 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3301 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3302 | 3302 | echo $returnValues; |
| 3303 | 3303 | break; |
| 3304 | 3304 | } |
| 3305 | 3305 | |
| 3306 | 3306 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3307 | 3307 | if ($tmp_source['title'] === $_SESSION['user_id'] || $tmp_target['title'] === $_SESSION['user_id']) { |
| 3308 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3308 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3309 | 3309 | echo $returnValues; |
| 3310 | 3310 | break; |
| 3311 | 3311 | } |
@@ -3427,7 +3427,7 @@ discard block |
||
| 3427 | 3427 | foreach ($_SESSION['user_roles'] as $role) { |
| 3428 | 3428 | $roleQ = DB::queryfirstrow( |
| 3429 | 3429 | 'SELECT allow_pw_change |
| 3430 | - FROM ' . prefixTable('roles_title') . ' |
|
| 3430 | + FROM ' . prefixTable('roles_title').' |
|
| 3431 | 3431 | WHERE id = %i', |
| 3432 | 3432 | $role |
| 3433 | 3433 | ); |
@@ -3452,11 +3452,11 @@ discard block |
||
| 3452 | 3452 | |
| 3453 | 3453 | foreach ($_SESSION['user_roles'] as $role) { |
| 3454 | 3454 | $access = DB::queryFirstRow( |
| 3455 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 3455 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 3456 | 3456 | $role, |
| 3457 | 3457 | $post_id |
| 3458 | 3458 | ); |
| 3459 | - if (DB::count()>0) { |
|
| 3459 | + if (DB::count() > 0) { |
|
| 3460 | 3460 | if ($access['type'] === 'R') { |
| 3461 | 3461 | array_push($arrTmp, 10); |
| 3462 | 3462 | } elseif ($access['type'] === 'W') { |
@@ -3520,7 +3520,7 @@ discard block |
||
| 3520 | 3520 | } else { |
| 3521 | 3521 | DB::query( |
| 3522 | 3522 | 'SELECT * |
| 3523 | - FROM ' . prefixTable('items') . ' |
|
| 3523 | + FROM ' . prefixTable('items').' |
|
| 3524 | 3524 | WHERE inactif = %i', |
| 3525 | 3525 | 0 |
| 3526 | 3526 | ); |
@@ -3530,7 +3530,7 @@ discard block |
||
| 3530 | 3530 | |
| 3531 | 3531 | // Get folder complexity |
| 3532 | 3532 | $folderComplexity = DB::queryFirstRow( |
| 3533 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
| 3533 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
| 3534 | 3534 | 'complex', |
| 3535 | 3535 | $post_id |
| 3536 | 3536 | ); |
@@ -3542,7 +3542,7 @@ discard block |
||
| 3542 | 3542 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
| 3543 | 3543 | $folderRow = DB::query( |
| 3544 | 3544 | 'SELECT id_category |
| 3545 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 3545 | + FROM ' . prefixTable('categories_folders').' |
|
| 3546 | 3546 | WHERE id_folder = %i', |
| 3547 | 3547 | $post_id |
| 3548 | 3548 | ); |
@@ -3656,13 +3656,13 @@ discard block |
||
| 3656 | 3656 | // List all ITEMS |
| 3657 | 3657 | if ($folderIsPf === false) { |
| 3658 | 3658 | $where->add('i.inactif=%i', 0); |
| 3659 | - $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)"); |
|
| 3659 | + $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)"); |
|
| 3660 | 3660 | if (empty($limited_to_items) === false) { |
| 3661 | 3661 | $where->add('i.id IN %ls', explode(',', $limited_to_items)); |
| 3662 | 3662 | } |
| 3663 | 3663 | |
| 3664 | - $query_limit = ' LIMIT ' . |
|
| 3665 | - $start . ',' . |
|
| 3664 | + $query_limit = ' LIMIT '. |
|
| 3665 | + $start.','. |
|
| 3666 | 3666 | $post_nb_items_to_display_once; |
| 3667 | 3667 | //db::debugmode(true); |
| 3668 | 3668 | $rows = DB::query( |
@@ -3673,9 +3673,9 @@ discard block |
||
| 3673 | 3673 | MIN(l.action) AS log_action, |
| 3674 | 3674 | l.id_user AS log_user, |
| 3675 | 3675 | i.url AS link |
| 3676 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3677 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3678 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 3676 | + FROM ' . prefixTable('items').' AS i |
|
| 3677 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3678 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 3679 | 3679 | WHERE %l |
| 3680 | 3680 | GROUP BY i.id, l.date, l.id_user, l.action |
| 3681 | 3681 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -3694,9 +3694,9 @@ discard block |
||
| 3694 | 3694 | MIN(l.action) AS log_action, |
| 3695 | 3695 | l.id_user AS log_user, |
| 3696 | 3696 | i.url AS link |
| 3697 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3698 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3699 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 3697 | + FROM ' . prefixTable('items').' AS i |
|
| 3698 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3699 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 3700 | 3700 | WHERE %l |
| 3701 | 3701 | GROUP BY i.id, l.date, l.id_user, l.action |
| 3702 | 3702 | ORDER BY i.label ASC, l.date DESC', |
@@ -3726,7 +3726,7 @@ discard block |
||
| 3726 | 3726 | $item_is_restricted_to_role = false; |
| 3727 | 3727 | DB::queryfirstrow( |
| 3728 | 3728 | 'SELECT role_id |
| 3729 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3729 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3730 | 3730 | WHERE item_id = %i', |
| 3731 | 3731 | $record['id'] |
| 3732 | 3732 | ); |
@@ -3738,7 +3738,7 @@ discard block |
||
| 3738 | 3738 | $user_is_included_in_role = false; |
| 3739 | 3739 | DB::query( |
| 3740 | 3740 | 'SELECT role_id |
| 3741 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3741 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3742 | 3742 | WHERE item_id = %i AND role_id IN %ls', |
| 3743 | 3743 | $record['id'], |
| 3744 | 3744 | $_SESSION['user_roles'] |
@@ -3942,9 +3942,9 @@ discard block |
||
| 3942 | 3942 | if ((int) $start === 0) { |
| 3943 | 3943 | DB::query( |
| 3944 | 3944 | 'SELECT i.id |
| 3945 | - FROM ' . prefixTable('items') . ' as i |
|
| 3946 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 3947 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
| 3945 | + FROM ' . prefixTable('items').' as i |
|
| 3946 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 3947 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
| 3948 | 3948 | WHERE %l |
| 3949 | 3949 | ORDER BY i.label ASC, l.date DESC', |
| 3950 | 3950 | $where |
@@ -4008,8 +4008,8 @@ discard block |
||
| 4008 | 4008 | // Run query |
| 4009 | 4009 | $dataItem = DB::queryfirstrow( |
| 4010 | 4010 | 'SELECT i.pw AS pw, s.share_key AS share_key |
| 4011 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4012 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 4011 | + FROM ' . prefixTable('items').' AS i |
|
| 4012 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 4013 | 4013 | WHERE user_id = %i AND i.id = %i', |
| 4014 | 4014 | $_SESSION['user_id'], |
| 4015 | 4015 | $post_item_id |
@@ -4052,7 +4052,7 @@ discard block |
||
| 4052 | 4052 | if (null !== $post_item_id && empty($post_item_id) === false) { |
| 4053 | 4053 | $dataItem = DB::queryfirstrow( |
| 4054 | 4054 | 'SELECT perso, anyone_can_modify |
| 4055 | - FROM ' . prefixTable('items') . ' |
|
| 4055 | + FROM ' . prefixTable('items').' |
|
| 4056 | 4056 | WHERE id=%i', |
| 4057 | 4057 | $post_item_id |
| 4058 | 4058 | ); |
@@ -4089,7 +4089,7 @@ discard block |
||
| 4089 | 4089 | */ |
| 4090 | 4090 | |
| 4091 | 4091 | // Lock Item (if already locked), go back and warn |
| 4092 | - $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', $post_item_id); |
|
| 4092 | + $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $post_item_id); |
|
| 4093 | 4093 | |
| 4094 | 4094 | // If token is taken for this Item and delay is passed then delete it. |
| 4095 | 4095 | if ( |
@@ -4100,7 +4100,7 @@ discard block |
||
| 4100 | 4100 | DB::delete(prefixTable('items_edition'), 'item_id = %i', $post_item_id); |
| 4101 | 4101 | //reload the previous data |
| 4102 | 4102 | $dataTmp = DB::queryFirstRow( |
| 4103 | - 'SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', |
|
| 4103 | + 'SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', |
|
| 4104 | 4104 | $post_item_id |
| 4105 | 4105 | ); |
| 4106 | 4106 | } |
@@ -4140,7 +4140,7 @@ discard block |
||
| 4140 | 4140 | // do query on this folder |
| 4141 | 4141 | $data_this_folder = DB::queryFirstRow( |
| 4142 | 4142 | 'SELECT id, personal_folder, title |
| 4143 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4143 | + FROM ' . prefixTable('nested_tree').' |
|
| 4144 | 4144 | WHERE id = %s', |
| 4145 | 4145 | $post_groupe |
| 4146 | 4146 | ); |
@@ -4177,8 +4177,8 @@ discard block |
||
| 4177 | 4177 | $visibilite = ''; |
| 4178 | 4178 | $data = DB::queryFirstRow( |
| 4179 | 4179 | 'SELECT m.valeur, n.personal_folder |
| 4180 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 4181 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
| 4180 | + FROM ' . prefixTable('misc').' AS m |
|
| 4181 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
| 4182 | 4182 | WHERE type=%s AND intitule = %s', |
| 4183 | 4183 | 'complex', |
| 4184 | 4184 | $post_groupe |
@@ -4191,8 +4191,8 @@ discard block |
||
| 4191 | 4191 | // Prepare Item actual visibility (what Users/Roles can see it) |
| 4192 | 4192 | $rows = DB::query( |
| 4193 | 4193 | 'SELECT t.title |
| 4194 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 4195 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 4194 | + FROM ' . prefixTable('roles_values').' as v |
|
| 4195 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 4196 | 4196 | WHERE v.folder_id = %i |
| 4197 | 4197 | GROUP BY title', |
| 4198 | 4198 | $post_groupe |
@@ -4201,7 +4201,7 @@ discard block |
||
| 4201 | 4201 | if (empty($visibilite)) { |
| 4202 | 4202 | $visibilite = $record['title']; |
| 4203 | 4203 | } else { |
| 4204 | - $visibilite .= ' - ' . $record['title']; |
|
| 4204 | + $visibilite .= ' - '.$record['title']; |
|
| 4205 | 4205 | } |
| 4206 | 4206 | } |
| 4207 | 4207 | } else { |
@@ -4211,14 +4211,14 @@ discard block |
||
| 4211 | 4211 | // do new query to know if current folder is pf |
| 4212 | 4212 | $data_pf = DB::queryFirstRow( |
| 4213 | 4213 | 'SELECT personal_folder |
| 4214 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4214 | + FROM ' . prefixTable('nested_tree').' |
|
| 4215 | 4215 | WHERE id = %s', |
| 4216 | 4216 | $post_groupe |
| 4217 | 4217 | ); |
| 4218 | 4218 | |
| 4219 | 4219 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
| 4220 | 4220 | |
| 4221 | - $visibilite = $_SESSION['name'] . ' ' . $_SESSION['lastname'] . ' (' . $_SESSION['login'] . ')'; |
|
| 4221 | + $visibilite = $_SESSION['name'].' '.$_SESSION['lastname'].' ('.$_SESSION['login'].')'; |
|
| 4222 | 4222 | } |
| 4223 | 4223 | |
| 4224 | 4224 | recupDroitCreationSansComplexite($post_groupe); |
@@ -4228,8 +4228,8 @@ discard block |
||
| 4228 | 4228 | $listOptionsForRoles = array(); |
| 4229 | 4229 | $rows = DB::query( |
| 4230 | 4230 | 'SELECT r.role_id AS role_id, t.title AS title |
| 4231 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 4232 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 4231 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 4232 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 4233 | 4233 | WHERE r.folder_id = %i', |
| 4234 | 4234 | $post_groupe |
| 4235 | 4235 | ); |
@@ -4243,7 +4243,7 @@ discard block |
||
| 4243 | 4243 | ); |
| 4244 | 4244 | $rows2 = DB::query( |
| 4245 | 4245 | 'SELECT id, login, fonction_id, email, name, lastname |
| 4246 | - FROM ' . prefixTable('users') . ' |
|
| 4246 | + FROM ' . prefixTable('users').' |
|
| 4247 | 4247 | WHERE admin = 0' |
| 4248 | 4248 | ); |
| 4249 | 4249 | foreach ($rows2 as $record2) { |
@@ -4257,7 +4257,7 @@ discard block |
||
| 4257 | 4257 | array( |
| 4258 | 4258 | 'id' => $record2['id'], |
| 4259 | 4259 | 'login' => $record2['login'], |
| 4260 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 4260 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 4261 | 4261 | 'email' => $record2['email'], |
| 4262 | 4262 | ) |
| 4263 | 4263 | ); |
@@ -4274,13 +4274,13 @@ discard block |
||
| 4274 | 4274 | //db::debugmode(true); |
| 4275 | 4275 | $access = DB::queryFirstRow( |
| 4276 | 4276 | 'SELECT type |
| 4277 | - FROM ' . prefixTable('roles_values') . ' |
|
| 4277 | + FROM ' . prefixTable('roles_values').' |
|
| 4278 | 4278 | WHERE role_id = %i AND folder_id = %i', |
| 4279 | 4279 | $role, |
| 4280 | 4280 | $post_groupe |
| 4281 | 4281 | ); |
| 4282 | 4282 | //db::debugmode(false); |
| 4283 | - if (DB::count()>0) { |
|
| 4283 | + if (DB::count() > 0) { |
|
| 4284 | 4284 | if ($access['type'] === 'R') { |
| 4285 | 4285 | array_push($arrTmp, 10); |
| 4286 | 4286 | } elseif ($access['type'] === 'W') { |
@@ -4350,7 +4350,7 @@ discard block |
||
| 4350 | 4350 | // Get some info before deleting |
| 4351 | 4351 | $data = DB::queryFirstRow( |
| 4352 | 4352 | 'SELECT name, id_item, file |
| 4353 | - FROM ' . prefixTable('files') . ' |
|
| 4353 | + FROM ' . prefixTable('files').' |
|
| 4354 | 4354 | WHERE id = %i', |
| 4355 | 4355 | $fileId |
| 4356 | 4356 | ); |
@@ -4358,7 +4358,7 @@ discard block |
||
| 4358 | 4358 | // Load item data |
| 4359 | 4359 | $data_item = DB::queryFirstRow( |
| 4360 | 4360 | 'SELECT id_tree |
| 4361 | - FROM ' . prefixTable('items') . ' |
|
| 4361 | + FROM ' . prefixTable('items').' |
|
| 4362 | 4362 | WHERE id = %i', |
| 4363 | 4363 | $data['id_item'] |
| 4364 | 4364 | ); |
@@ -4385,7 +4385,7 @@ discard block |
||
| 4385 | 4385 | $_SESSION['user_id'], |
| 4386 | 4386 | 'at_modification', |
| 4387 | 4387 | $_SESSION['login'], |
| 4388 | - 'at_del_file : ' . $data['name'] |
|
| 4388 | + 'at_del_file : '.$data['name'] |
|
| 4389 | 4389 | ); |
| 4390 | 4390 | |
| 4391 | 4391 | // DElete sharekeys |
@@ -4396,7 +4396,7 @@ discard block |
||
| 4396 | 4396 | ); |
| 4397 | 4397 | |
| 4398 | 4398 | // Delete file from server |
| 4399 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']), $SETTINGS); |
|
| 4399 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']), $SETTINGS); |
|
| 4400 | 4400 | } |
| 4401 | 4401 | |
| 4402 | 4402 | echo (string) prepareExchangedData( |
@@ -4415,7 +4415,7 @@ discard block |
||
| 4415 | 4415 | case 'clear_html_tags': |
| 4416 | 4416 | // Get information for this item |
| 4417 | 4417 | $dataItem = DB::queryfirstrow( |
| 4418 | - 'SELECT description FROM ' . prefixTable('items') . ' WHERE id=%i', |
|
| 4418 | + 'SELECT description FROM '.prefixTable('items').' WHERE id=%i', |
|
| 4419 | 4419 | filter_input(INPUT_POST, 'id_item', FILTER_SANITIZE_NUMBER_INT) |
| 4420 | 4420 | ); |
| 4421 | 4421 | // Clean up the string |
@@ -4453,12 +4453,12 @@ discard block |
||
| 4453 | 4453 | // Update SESSION with this new favourite |
| 4454 | 4454 | $data = DB::queryfirstrow( |
| 4455 | 4455 | 'SELECT label,id_tree |
| 4456 | - FROM ' . prefixTable('items') . ' |
|
| 4456 | + FROM ' . prefixTable('items').' |
|
| 4457 | 4457 | WHERE id = ' . mysqli_real_escape_string($link, $post_item_id) |
| 4458 | 4458 | ); |
| 4459 | 4459 | $_SESSION['favourites_tab'][$post_item_id] = array( |
| 4460 | 4460 | 'label' => $data['label'], |
| 4461 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $post_item_id, |
|
| 4461 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$post_item_id, |
|
| 4462 | 4462 | ); |
| 4463 | 4463 | } elseif ((int) filter_input(INPUT_POST, 'action', FILTER_SANITIZE_NUMBER_INT) === 1) { |
| 4464 | 4464 | // delete from session |
@@ -4527,8 +4527,8 @@ discard block |
||
| 4527 | 4527 | // get data about item |
| 4528 | 4528 | $dataSource = DB::queryfirstrow( |
| 4529 | 4529 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 4530 | - FROM ' . prefixTable('items') . ' as i |
|
| 4531 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 4530 | + FROM ' . prefixTable('items').' as i |
|
| 4531 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 4532 | 4532 | WHERE i.id=%i', |
| 4533 | 4533 | $post_item_id |
| 4534 | 4534 | ); |
@@ -4536,7 +4536,7 @@ discard block |
||
| 4536 | 4536 | // get data about new folder |
| 4537 | 4537 | $dataDestination = DB::queryfirstrow( |
| 4538 | 4538 | 'SELECT personal_folder, title |
| 4539 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4539 | + FROM ' . prefixTable('nested_tree').' |
|
| 4540 | 4540 | WHERE id = %i', |
| 4541 | 4541 | $post_folder_id |
| 4542 | 4542 | ); |
@@ -4588,7 +4588,7 @@ discard block |
||
| 4588 | 4588 | // Get fields for this Item |
| 4589 | 4589 | $rows = DB::query( |
| 4590 | 4590 | 'SELECT id |
| 4591 | - FROM ' . prefixTable('categories_items') . ' |
|
| 4591 | + FROM ' . prefixTable('categories_items').' |
|
| 4592 | 4592 | WHERE item_id = %i', |
| 4593 | 4593 | $post_item_id |
| 4594 | 4594 | ); |
@@ -4605,7 +4605,7 @@ discard block |
||
| 4605 | 4605 | // Get FILES for this Item |
| 4606 | 4606 | $rows = DB::query( |
| 4607 | 4607 | 'SELECT id |
| 4608 | - FROM ' . prefixTable('files') . ' |
|
| 4608 | + FROM ' . prefixTable('files').' |
|
| 4609 | 4609 | WHERE id_item = %i', |
| 4610 | 4610 | $post_item_id |
| 4611 | 4611 | ); |
@@ -4650,7 +4650,7 @@ discard block |
||
| 4650 | 4650 | // Get the ITEM object key for the user |
| 4651 | 4651 | $userKey = DB::queryFirstRow( |
| 4652 | 4652 | 'SELECT share_key |
| 4653 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 4653 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 4654 | 4654 | WHERE user_id = %i AND object_id = %i', |
| 4655 | 4655 | $_SESSION['user_id'], |
| 4656 | 4656 | $post_item_id |
@@ -4661,8 +4661,8 @@ discard block |
||
| 4661 | 4661 | // This is a public object |
| 4662 | 4662 | $users = DB::query( |
| 4663 | 4663 | 'SELECT id, public_key |
| 4664 | - FROM ' . prefixTable('users') . ' |
|
| 4665 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 4664 | + FROM ' . prefixTable('users').' |
|
| 4665 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 4666 | 4666 | AND public_key != ""' |
| 4667 | 4667 | ); |
| 4668 | 4668 | foreach ($users as $user) { |
@@ -4682,14 +4682,14 @@ discard block |
||
| 4682 | 4682 | // Get fields for this Item |
| 4683 | 4683 | $rows = DB::query( |
| 4684 | 4684 | 'SELECT id |
| 4685 | - FROM ' . prefixTable('categories_items') . ' |
|
| 4685 | + FROM ' . prefixTable('categories_items').' |
|
| 4686 | 4686 | WHERE item_id = %i', |
| 4687 | 4687 | $post_item_id |
| 4688 | 4688 | ); |
| 4689 | 4689 | foreach ($rows as $field) { |
| 4690 | 4690 | $userKey = DB::queryFirstRow( |
| 4691 | 4691 | 'SELECT share_key |
| 4692 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 4692 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 4693 | 4693 | WHERE user_id = %i AND object_id = %i', |
| 4694 | 4694 | $_SESSION['user_id'], |
| 4695 | 4695 | $field['id'] |
@@ -4700,8 +4700,8 @@ discard block |
||
| 4700 | 4700 | // This is a public object |
| 4701 | 4701 | $users = DB::query( |
| 4702 | 4702 | 'SELECT id, public_key |
| 4703 | - FROM ' . prefixTable('users') . ' |
|
| 4704 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 4703 | + FROM ' . prefixTable('users').' |
|
| 4704 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 4705 | 4705 | AND public_key != ""' |
| 4706 | 4706 | ); |
| 4707 | 4707 | foreach ($users as $user) { |
@@ -4722,14 +4722,14 @@ discard block |
||
| 4722 | 4722 | // Get FILES for this Item |
| 4723 | 4723 | $rows = DB::query( |
| 4724 | 4724 | 'SELECT id |
| 4725 | - FROM ' . prefixTable('files') . ' |
|
| 4725 | + FROM ' . prefixTable('files').' |
|
| 4726 | 4726 | WHERE id_item = %i', |
| 4727 | 4727 | $post_item_id |
| 4728 | 4728 | ); |
| 4729 | 4729 | foreach ($rows as $attachment) { |
| 4730 | 4730 | $userKey = DB::queryFirstRow( |
| 4731 | 4731 | 'SELECT share_key |
| 4732 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 4732 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 4733 | 4733 | WHERE user_id = %i AND object_id = %i', |
| 4734 | 4734 | $_SESSION['user_id'], |
| 4735 | 4735 | $attachment['id'] |
@@ -4740,8 +4740,8 @@ discard block |
||
| 4740 | 4740 | // This is a public object |
| 4741 | 4741 | $users = DB::query( |
| 4742 | 4742 | 'SELECT id, public_key |
| 4743 | - FROM ' . prefixTable('users') . ' |
|
| 4744 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 4743 | + FROM ' . prefixTable('users').' |
|
| 4744 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 4745 | 4745 | AND public_key != ""' |
| 4746 | 4746 | ); |
| 4747 | 4747 | foreach ($users as $user) { |
@@ -4778,7 +4778,7 @@ discard block |
||
| 4778 | 4778 | $_SESSION['user_id'], |
| 4779 | 4779 | 'at_modification', |
| 4780 | 4780 | $_SESSION['login'], |
| 4781 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 4781 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 4782 | 4782 | ); |
| 4783 | 4783 | |
| 4784 | 4784 | $returnValues = array( |
@@ -4831,8 +4831,8 @@ discard block |
||
| 4831 | 4831 | // get data about item |
| 4832 | 4832 | $dataSource = DB::queryfirstrow( |
| 4833 | 4833 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 4834 | - FROM ' . prefixTable('items') . ' as i |
|
| 4835 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 4834 | + FROM ' . prefixTable('items').' as i |
|
| 4835 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 4836 | 4836 | WHERE i.id=%i', |
| 4837 | 4837 | $item_id |
| 4838 | 4838 | ); |
@@ -4854,7 +4854,7 @@ discard block |
||
| 4854 | 4854 | |
| 4855 | 4855 | // get data about new folder |
| 4856 | 4856 | $dataDestination = DB::queryfirstrow( |
| 4857 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 4857 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 4858 | 4858 | $post_folder_id |
| 4859 | 4859 | ); |
| 4860 | 4860 | |
@@ -4895,7 +4895,7 @@ discard block |
||
| 4895 | 4895 | // Get fields for this Item |
| 4896 | 4896 | $rows = DB::query( |
| 4897 | 4897 | 'SELECT id |
| 4898 | - FROM ' . prefixTable('categories_items') . ' |
|
| 4898 | + FROM ' . prefixTable('categories_items').' |
|
| 4899 | 4899 | WHERE item_id = %i', |
| 4900 | 4900 | $item_id |
| 4901 | 4901 | ); |
@@ -4912,7 +4912,7 @@ discard block |
||
| 4912 | 4912 | // Get FILES for this Item |
| 4913 | 4913 | $rows = DB::query( |
| 4914 | 4914 | 'SELECT id |
| 4915 | - FROM ' . prefixTable('files') . ' |
|
| 4915 | + FROM ' . prefixTable('files').' |
|
| 4916 | 4916 | WHERE id_item = %i', |
| 4917 | 4917 | $item_id |
| 4918 | 4918 | ); |
@@ -4965,7 +4965,7 @@ discard block |
||
| 4965 | 4965 | // Get the ITEM object key for the user |
| 4966 | 4966 | $userKey = DB::queryFirstRow( |
| 4967 | 4967 | 'SELECT share_key |
| 4968 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 4968 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 4969 | 4969 | WHERE user_id = %i AND object_id = %i', |
| 4970 | 4970 | $_SESSION['user_id'], |
| 4971 | 4971 | $item_id |
@@ -4976,8 +4976,8 @@ discard block |
||
| 4976 | 4976 | // This is a public object |
| 4977 | 4977 | $users = DB::query( |
| 4978 | 4978 | 'SELECT id, public_key |
| 4979 | - FROM ' . prefixTable('users') . ' |
|
| 4980 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 4979 | + FROM ' . prefixTable('users').' |
|
| 4980 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 4981 | 4981 | AND public_key != ""' |
| 4982 | 4982 | ); |
| 4983 | 4983 | foreach ($users as $user) { |
@@ -4997,14 +4997,14 @@ discard block |
||
| 4997 | 4997 | // Get fields for this Item |
| 4998 | 4998 | $rows = DB::query( |
| 4999 | 4999 | 'SELECT id |
| 5000 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5000 | + FROM ' . prefixTable('categories_items').' |
|
| 5001 | 5001 | WHERE item_id = %i', |
| 5002 | 5002 | $item_id |
| 5003 | 5003 | ); |
| 5004 | 5004 | foreach ($rows as $field) { |
| 5005 | 5005 | $userKey = DB::queryFirstRow( |
| 5006 | 5006 | 'SELECT share_key |
| 5007 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5007 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5008 | 5008 | WHERE user_id = %i AND object_id = %i', |
| 5009 | 5009 | $_SESSION['user_id'], |
| 5010 | 5010 | $field['id'] |
@@ -5015,8 +5015,8 @@ discard block |
||
| 5015 | 5015 | // This is a public object |
| 5016 | 5016 | $users = DB::query( |
| 5017 | 5017 | 'SELECT id, public_key |
| 5018 | - FROM ' . prefixTable('users') . ' |
|
| 5019 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 5018 | + FROM ' . prefixTable('users').' |
|
| 5019 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 5020 | 5020 | AND public_key != ""' |
| 5021 | 5021 | ); |
| 5022 | 5022 | foreach ($users as $user) { |
@@ -5037,14 +5037,14 @@ discard block |
||
| 5037 | 5037 | // Get FILES for this Item |
| 5038 | 5038 | $rows = DB::query( |
| 5039 | 5039 | 'SELECT id |
| 5040 | - FROM ' . prefixTable('files') . ' |
|
| 5040 | + FROM ' . prefixTable('files').' |
|
| 5041 | 5041 | WHERE id_item = %i', |
| 5042 | 5042 | $item_id |
| 5043 | 5043 | ); |
| 5044 | 5044 | foreach ($rows as $attachment) { |
| 5045 | 5045 | $userKey = DB::queryFirstRow( |
| 5046 | 5046 | 'SELECT share_key |
| 5047 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5047 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5048 | 5048 | WHERE user_id = %i AND object_id = %i', |
| 5049 | 5049 | $_SESSION['user_id'], |
| 5050 | 5050 | $attachment['id'] |
@@ -5055,8 +5055,8 @@ discard block |
||
| 5055 | 5055 | // This is a public object |
| 5056 | 5056 | $users = DB::query( |
| 5057 | 5057 | 'SELECT id, public_key |
| 5058 | - FROM ' . prefixTable('users') . ' |
|
| 5059 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 5058 | + FROM ' . prefixTable('users').' |
|
| 5059 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 5060 | 5060 | AND public_key != ""' |
| 5061 | 5061 | ); |
| 5062 | 5062 | foreach ($users as $user) { |
@@ -5092,13 +5092,13 @@ discard block |
||
| 5092 | 5092 | $_SESSION['user_id'], |
| 5093 | 5093 | 'at_modification', |
| 5094 | 5094 | $_SESSION['login'], |
| 5095 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5095 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5096 | 5096 | ); |
| 5097 | 5097 | } |
| 5098 | 5098 | } |
| 5099 | 5099 | |
| 5100 | 5100 | // reload cache table |
| 5101 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 5101 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 5102 | 5102 | updateCacheTable('reload', $SETTINGS, null); |
| 5103 | 5103 | |
| 5104 | 5104 | echo (string) prepareExchangedData( |
@@ -5162,7 +5162,7 @@ discard block |
||
| 5162 | 5162 | // get info |
| 5163 | 5163 | $dataSource = DB::queryfirstrow( |
| 5164 | 5164 | 'SELECT label, id_tree |
| 5165 | - FROM ' . prefixTable('items') . ' |
|
| 5165 | + FROM ' . prefixTable('items').' |
|
| 5166 | 5166 | WHERE id=%i', |
| 5167 | 5167 | $item_id |
| 5168 | 5168 | ); |
@@ -5262,8 +5262,8 @@ discard block |
||
| 5262 | 5262 | $content = explode(',', filter_input(INPUT_POST, 'content', FILTER_SANITIZE_STRING)); |
| 5263 | 5263 | } |
| 5264 | 5264 | // Variables |
| 5265 | - $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id= ' . $content[1]); |
|
| 5266 | - $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id= ' . $content[0]); |
|
| 5265 | + $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id= '.$content[1]); |
|
| 5266 | + $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id= '.$content[0]); |
|
| 5267 | 5267 | |
| 5268 | 5268 | // Get path |
| 5269 | 5269 | $path = geItemReadablePath( |
@@ -5277,7 +5277,7 @@ discard block |
||
| 5277 | 5277 | langHdl('email_request_access_subject'), |
| 5278 | 5278 | str_replace( |
| 5279 | 5279 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
| 5280 | - array(' ' . addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path), |
|
| 5280 | + array(' '.addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path), |
|
| 5281 | 5281 | langHdl('email_request_access_mail') |
| 5282 | 5282 | ), |
| 5283 | 5283 | $dataAuthor['email'], |
@@ -5288,7 +5288,7 @@ discard block |
||
| 5288 | 5288 | } elseif ($post_cat === 'share_this_item') { |
| 5289 | 5289 | $dataItem = DB::queryfirstrow( |
| 5290 | 5290 | 'SELECT label,id_tree |
| 5291 | - FROM ' . prefixTable('items') . ' |
|
| 5291 | + FROM ' . prefixTable('items').' |
|
| 5292 | 5292 | WHERE id= %i', |
| 5293 | 5293 | $post_id |
| 5294 | 5294 | ); |
@@ -5312,7 +5312,7 @@ discard block |
||
| 5312 | 5312 | ), |
| 5313 | 5313 | array( |
| 5314 | 5314 | empty($SETTINGS['email_server_url']) === false ? |
| 5315 | - $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, |
|
| 5315 | + $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, |
|
| 5316 | 5316 | addslashes($_SESSION['login']), |
| 5317 | 5317 | addslashes($path), |
| 5318 | 5318 | ), |
@@ -5347,7 +5347,7 @@ discard block |
||
| 5347 | 5347 | if (filter_input(INPUT_POST, 'notify_type', FILTER_SANITIZE_STRING) === 'on_show') { |
| 5348 | 5348 | // Check if values already exist |
| 5349 | 5349 | $data = DB::queryfirstrow( |
| 5350 | - 'SELECT notification FROM ' . prefixTable('items') . ' WHERE id = %i', |
|
| 5350 | + 'SELECT notification FROM '.prefixTable('items').' WHERE id = %i', |
|
| 5351 | 5351 | $post_item_id |
| 5352 | 5352 | ); |
| 5353 | 5353 | $notifiedUsers = explode(';', $data['notification']); |
@@ -5358,8 +5358,8 @@ discard block |
||
| 5358 | 5358 | prefixTable('items'), |
| 5359 | 5359 | array( |
| 5360 | 5360 | 'notification' => empty($data['notification']) ? |
| 5361 | - filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT) . ';' |
|
| 5362 | - : $data['notification'] . filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
| 5361 | + filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT).';' |
|
| 5362 | + : $data['notification'].filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
| 5363 | 5363 | ), |
| 5364 | 5364 | 'id=%i', |
| 5365 | 5365 | $post_item_id |
@@ -5375,7 +5375,7 @@ discard block |
||
| 5375 | 5375 | array( |
| 5376 | 5376 | 'notification' => empty($data['notification']) ? |
| 5377 | 5377 | filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT) |
| 5378 | - : $data['notification'] . ';' . filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
| 5378 | + : $data['notification'].';'.filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
| 5379 | 5379 | ), |
| 5380 | 5380 | 'id=%i', |
| 5381 | 5381 | $post_item_id |
@@ -5400,8 +5400,8 @@ discard block |
||
| 5400 | 5400 | // Get all informations for this item |
| 5401 | 5401 | $dataItem = DB::queryfirstrow( |
| 5402 | 5402 | 'SELECT * |
| 5403 | - FROM ' . prefixTable('items') . ' as i |
|
| 5404 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 5403 | + FROM ' . prefixTable('items').' as i |
|
| 5404 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 5405 | 5405 | WHERE i.id=%i AND l.action = %s', |
| 5406 | 5406 | $dataReceived['item_id'], |
| 5407 | 5407 | 'at_creation' |
@@ -5432,14 +5432,14 @@ discard block |
||
| 5432 | 5432 | ); |
| 5433 | 5433 | // Prepare new line |
| 5434 | 5434 | $data = DB::queryfirstrow( |
| 5435 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
| 5435 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
| 5436 | 5436 | $dataReceived['item_id'] |
| 5437 | 5437 | ); |
| 5438 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $data['date']) . ' - ' . $_SESSION['login'] . ' - ' . langHdl($data['action']) . ' - ' . $data['raison']; |
|
| 5438 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $data['date']).' - '.$_SESSION['login'].' - '.langHdl($data['action']).' - '.$data['raison']; |
|
| 5439 | 5439 | // send back |
| 5440 | 5440 | $data = array( |
| 5441 | 5441 | 'error' => '', |
| 5442 | - 'new_line' => '<br>' . addslashes($historic), |
|
| 5442 | + 'new_line' => '<br>'.addslashes($historic), |
|
| 5443 | 5443 | ); |
| 5444 | 5444 | echo (string) prepareExchangedData($data, 'encode'); |
| 5445 | 5445 | } else { |
@@ -5473,7 +5473,7 @@ discard block |
||
| 5473 | 5473 | */ |
| 5474 | 5474 | case 'is_item_changed': |
| 5475 | 5475 | $data = DB::queryFirstRow( |
| 5476 | - 'SELECT date FROM ' . prefixTable('log_items') . ' WHERE action = %s AND id_item = %i ORDER BY date DESC', |
|
| 5476 | + 'SELECT date FROM '.prefixTable('log_items').' WHERE action = %s AND id_item = %i ORDER BY date DESC', |
|
| 5477 | 5477 | 'at_modification', |
| 5478 | 5478 | $post_item_id |
| 5479 | 5479 | ); |
@@ -5497,7 +5497,7 @@ discard block |
||
| 5497 | 5497 | } |
| 5498 | 5498 | |
| 5499 | 5499 | // delete all existing old otv codes |
| 5500 | - $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE timestamp < ' . (time() - $SETTINGS['otv_expiration_period'] * 86400)); |
|
| 5500 | + $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE timestamp < '.(time() - $SETTINGS['otv_expiration_period'] * 86400)); |
|
| 5501 | 5501 | foreach ($rows as $record) { |
| 5502 | 5502 | DB::delete(prefixTable('otv'), 'id=%i', $record['id']); |
| 5503 | 5503 | } |
@@ -5519,8 +5519,8 @@ discard block |
||
| 5519 | 5519 | // Should we log a password change? |
| 5520 | 5520 | $itemQ = DB::queryFirstRow( |
| 5521 | 5521 | 'SELECT s.share_key, i.pw |
| 5522 | - FROM ' . prefixTable('items') . ' AS i |
|
| 5523 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
| 5522 | + FROM ' . prefixTable('items').' AS i |
|
| 5523 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
| 5524 | 5524 | WHERE s.user_id = %i AND s.object_id = %i', |
| 5525 | 5525 | $_SESSION['user_id'], |
| 5526 | 5526 | $post_id |
@@ -5570,7 +5570,7 @@ discard block |
||
| 5570 | 5570 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
| 5571 | 5571 | $SETTINGS['otv_expiration_period'] = 7; |
| 5572 | 5572 | } |
| 5573 | - $url = $SETTINGS['cpassman_url'] . '/index.php?otv=true&' . http_build_query($otv_session); |
|
| 5573 | + $url = $SETTINGS['cpassman_url'].'/index.php?otv=true&'.http_build_query($otv_session); |
|
| 5574 | 5574 | //$exp_date = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], time() + (intval($SETTINGS['otv_expiration_period']) * 86400)); |
| 5575 | 5575 | |
| 5576 | 5576 | echo json_encode( |
@@ -5608,8 +5608,8 @@ discard block |
||
| 5608 | 5608 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
| 5609 | 5609 | f.extension AS extension, f.type AS type, |
| 5610 | 5610 | s.share_key AS share_key |
| 5611 | - FROM ' . prefixTable('files') . ' AS f |
|
| 5612 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 5611 | + FROM ' . prefixTable('files').' AS f |
|
| 5612 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 5613 | 5613 | WHERE s.user_id = %i AND s.object_id = %i', |
| 5614 | 5614 | $_SESSION['user_id'], |
| 5615 | 5615 | $post_id |
@@ -5630,7 +5630,7 @@ discard block |
||
| 5630 | 5630 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
| 5631 | 5631 | |
| 5632 | 5632 | // prepare image info |
| 5633 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
| 5633 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
| 5634 | 5634 | $post_title = isBase64($post_title) === true ? |
| 5635 | 5635 | base64_decode($post_title) : $post_title; |
| 5636 | 5636 | $image_code = $file_info['file']; |
@@ -5647,7 +5647,7 @@ discard block |
||
| 5647 | 5647 | echo (string) prepareExchangedData( |
| 5648 | 5648 | array( |
| 5649 | 5649 | 'error' => false, |
| 5650 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
| 5650 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
| 5651 | 5651 | 'file_type' => $file_info['type'], |
| 5652 | 5652 | 'file_content' => $fileContent, |
| 5653 | 5653 | ), |
@@ -5668,11 +5668,11 @@ discard block |
||
| 5668 | 5668 | |
| 5669 | 5669 | // get file info |
| 5670 | 5670 | $result = DB::queryfirstrow( |
| 5671 | - 'SELECT file FROM ' . prefixTable('files') . ' WHERE id=%i', |
|
| 5671 | + 'SELECT file FROM '.prefixTable('files').' WHERE id=%i', |
|
| 5672 | 5672 | intval(substr(filter_input(INPUT_POST, 'uri', FILTER_SANITIZE_STRING), 1)) |
| 5673 | 5673 | ); |
| 5674 | 5674 | |
| 5675 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $result['file'] . filter_input(INPUT_POST, 'file_suffix', FILTER_SANITIZE_STRING), $SETTINGS); |
|
| 5675 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.$result['file'].filter_input(INPUT_POST, 'file_suffix', FILTER_SANITIZE_STRING), $SETTINGS); |
|
| 5676 | 5676 | |
| 5677 | 5677 | break; |
| 5678 | 5678 | |
@@ -5695,16 +5695,16 @@ discard block |
||
| 5695 | 5695 | $idFolder = $dataReceived['idFolder']; |
| 5696 | 5696 | |
| 5697 | 5697 | // don't check if Personal Folder |
| 5698 | - $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $idFolder); |
|
| 5698 | + $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $idFolder); |
|
| 5699 | 5699 | if ($data['title'] === $_SESSION['user_id']) { |
| 5700 | 5700 | // send data |
| 5701 | - echo '[{"duplicate" : "' . $duplicate . '" , error" : ""}]'; |
|
| 5701 | + echo '[{"duplicate" : "'.$duplicate.'" , error" : ""}]'; |
|
| 5702 | 5702 | } else { |
| 5703 | 5703 | if (filter_input(INPUT_POST, 'option', FILTER_SANITIZE_STRING) === 'same_folder') { |
| 5704 | 5704 | // case unique folder |
| 5705 | 5705 | DB::query( |
| 5706 | 5706 | 'SELECT label |
| 5707 | - FROM ' . prefixTable('items') . ' |
|
| 5707 | + FROM ' . prefixTable('items').' |
|
| 5708 | 5708 | WHERE id_tree = %i AND label = %s', |
| 5709 | 5709 | $idFolder, |
| 5710 | 5710 | $label |
@@ -5716,7 +5716,7 @@ discard block |
||
| 5716 | 5716 | $arrayPf = array(); |
| 5717 | 5717 | if (empty($row['id']) === false) { |
| 5718 | 5718 | $rows = DB::query( |
| 5719 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 5719 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 5720 | 5720 | '1' |
| 5721 | 5721 | ); |
| 5722 | 5722 | foreach ($rows as $record) { |
@@ -5731,12 +5731,12 @@ discard block |
||
| 5731 | 5731 | $where->add('id_tree = %i', $idFolder); |
| 5732 | 5732 | $where->add('label = %s', $label); |
| 5733 | 5733 | if (empty($arrayPf) === false) { |
| 5734 | - $where->add('id_tree NOT IN (' . implode(',', $arrayPf) . ')'); |
|
| 5734 | + $where->add('id_tree NOT IN ('.implode(',', $arrayPf).')'); |
|
| 5735 | 5735 | } |
| 5736 | 5736 | |
| 5737 | 5737 | DB::query( |
| 5738 | 5738 | 'SELECT label |
| 5739 | - FROM ' . prefixTable('items') . ' |
|
| 5739 | + FROM ' . prefixTable('items').' |
|
| 5740 | 5740 | WHERE %l', |
| 5741 | 5741 | $where |
| 5742 | 5742 | ); |
@@ -5748,7 +5748,7 @@ discard block |
||
| 5748 | 5748 | } |
| 5749 | 5749 | |
| 5750 | 5750 | // send data |
| 5751 | - echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]'; |
|
| 5751 | + echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]'; |
|
| 5752 | 5752 | } |
| 5753 | 5753 | break; |
| 5754 | 5754 | |
@@ -5805,7 +5805,7 @@ discard block |
||
| 5805 | 5805 | } |
| 5806 | 5806 | |
| 5807 | 5807 | //Build tree |
| 5808 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 5808 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 5809 | 5809 | $tree->register(); |
| 5810 | 5810 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 5811 | 5811 | $tree->rebuild(); |
@@ -5856,7 +5856,7 @@ discard block |
||
| 5856 | 5856 | if (empty($arr_data['folders'][$inc]['path']) === true) { |
| 5857 | 5857 | $arr_data['folders'][$inc]['path'] = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
| 5858 | 5858 | } else { |
| 5859 | - $arr_data['folders'][$inc]['path'] .= ' / ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 5859 | + $arr_data['folders'][$inc]['path'] .= ' / '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 5860 | 5860 | } |
| 5861 | 5861 | } |
| 5862 | 5862 | |
@@ -5922,8 +5922,8 @@ discard block |
||
| 5922 | 5922 | $rows_tmp = DB::query( |
| 5923 | 5923 | 'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory, |
| 5924 | 5924 | f.id_category AS category_id |
| 5925 | - FROM ' . prefixTable('categories_folders') . ' AS f |
|
| 5926 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id) |
|
| 5925 | + FROM ' . prefixTable('categories_folders').' AS f |
|
| 5926 | + INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id) |
|
| 5927 | 5927 | WHERE id_folder=%i', |
| 5928 | 5928 | $folder |
| 5929 | 5929 | ); |
@@ -5950,7 +5950,7 @@ discard block |
||
| 5950 | 5950 | $valTemp = ''; |
| 5951 | 5951 | $data = DB::queryFirstRow( |
| 5952 | 5952 | 'SELECT valeur |
| 5953 | - FROM ' . prefixTable('misc') . ' |
|
| 5953 | + FROM ' . prefixTable('misc').' |
|
| 5954 | 5954 | WHERE type = %s AND intitule=%i', |
| 5955 | 5955 | 'complex', |
| 5956 | 5956 | $folder |
@@ -5967,14 +5967,14 @@ discard block |
||
| 5967 | 5967 | $valTemp = ''; |
| 5968 | 5968 | $rows_tmp = DB::query( |
| 5969 | 5969 | 'SELECT t.title |
| 5970 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 5971 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 5970 | + FROM ' . prefixTable('roles_values').' as v |
|
| 5971 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 5972 | 5972 | WHERE v.folder_id = %i |
| 5973 | 5973 | GROUP BY title', |
| 5974 | 5974 | $folder |
| 5975 | 5975 | ); |
| 5976 | 5976 | foreach ($rows_tmp as $record) { |
| 5977 | - $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title']; |
|
| 5977 | + $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title']; |
|
| 5978 | 5978 | } |
| 5979 | 5979 | $arr_data[$folder]['visibilityRoles'] = $valTemp; |
| 5980 | 5980 | } |
@@ -6002,7 +6002,7 @@ discard block |
||
| 6002 | 6002 | // get item info |
| 6003 | 6003 | $dataItem = DB::queryFirstRow( |
| 6004 | 6004 | 'SELECT * |
| 6005 | - FROM ' . prefixTable('items') . ' |
|
| 6005 | + FROM ' . prefixTable('items').' |
|
| 6006 | 6006 | WHERE id=%i', |
| 6007 | 6007 | $post_item_id |
| 6008 | 6008 | ); |
@@ -6012,8 +6012,8 @@ discard block |
||
| 6012 | 6012 | $rows = DB::query( |
| 6013 | 6013 | 'SELECT l.date as date, l.action as action, l.raison as raison, l.raison_iv AS raison_iv, |
| 6014 | 6014 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname |
| 6015 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 6016 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 6015 | + FROM ' . prefixTable('log_items').' as l |
|
| 6016 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 6017 | 6017 | WHERE id_item=%i AND action <> %s |
| 6018 | 6018 | ORDER BY date DESC', |
| 6019 | 6019 | $post_item_id, |
@@ -6028,7 +6028,7 @@ discard block |
||
| 6028 | 6028 | |
| 6029 | 6029 | // imported via API |
| 6030 | 6030 | if (empty($record['login'])) { |
| 6031 | - $record['login'] = langHdl('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
| 6031 | + $record['login'] = langHdl('imported_via_api').' ['.$record['raison'].']'; |
|
| 6032 | 6032 | } |
| 6033 | 6033 | |
| 6034 | 6034 | if ( |
@@ -6039,13 +6039,13 @@ discard block |
||
| 6039 | 6039 | ) { |
| 6040 | 6040 | // Prepare avatar |
| 6041 | 6041 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
| 6042 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
| 6043 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
| 6042 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
| 6043 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
| 6044 | 6044 | } else { |
| 6045 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6045 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6046 | 6046 | } |
| 6047 | 6047 | } else { |
| 6048 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6048 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6049 | 6049 | } |
| 6050 | 6050 | |
| 6051 | 6051 | // Prepare action |
@@ -6062,19 +6062,19 @@ discard block |
||
| 6062 | 6062 | $action = langHdl($reason[0]); |
| 6063 | 6063 | if ($reason[0] === 'at_moved') { |
| 6064 | 6064 | $tmp = explode(' -> ', $reason[1]); |
| 6065 | - $detail = langHdl('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . langHdl('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
| 6065 | + $detail = langHdl('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.langHdl('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
| 6066 | 6066 | } elseif ($reason[0] === 'at_field') { |
| 6067 | 6067 | $tmp = explode(' => ', $reason[1]); |
| 6068 | 6068 | if (count($tmp) > 1) { |
| 6069 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . langHdl('previous_value') . |
|
| 6070 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
| 6069 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.langHdl('previous_value'). |
|
| 6070 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
| 6071 | 6071 | } else { |
| 6072 | 6072 | $detail = trim($reason[1]); |
| 6073 | 6073 | } |
| 6074 | 6074 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
| 6075 | 6075 | $tmp = explode(' => ', $reason[1]); |
| 6076 | 6076 | $detail = empty(trim($tmp[0])) === true ? |
| 6077 | - langHdl('no_previous_value') : langHdl('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
| 6077 | + langHdl('no_previous_value') : langHdl('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
| 6078 | 6078 | } elseif ($reason[0] === 'at_automatic_del') { |
| 6079 | 6079 | $detail = langHdl($reason[1]); |
| 6080 | 6080 | } elseif ($reason[0] === 'at_anyoneconmodify') { |
@@ -6083,7 +6083,7 @@ discard block |
||
| 6083 | 6083 | $tmp = explode(':', $reason[1]); |
| 6084 | 6084 | $tmp = explode('.', $tmp[0]); |
| 6085 | 6085 | $detail = isBase64($tmp[0]) === true ? |
| 6086 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
| 6086 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
| 6087 | 6087 | } elseif ($reason[0] === 'at_import') { |
| 6088 | 6088 | $detail = ''; |
| 6089 | 6089 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6102,8 +6102,8 @@ discard block |
||
| 6102 | 6102 | array( |
| 6103 | 6103 | 'avatar' => $avatar, |
| 6104 | 6104 | 'login' => $record['login'], |
| 6105 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 6106 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6105 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 6106 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6107 | 6107 | 'action' => $action, |
| 6108 | 6108 | 'detail' => $detail, |
| 6109 | 6109 | ) |
@@ -6184,18 +6184,18 @@ discard block |
||
| 6184 | 6184 | |
| 6185 | 6185 | // get some info to add to the notification email |
| 6186 | 6186 | $resp_user = DB::queryfirstrow( |
| 6187 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 6187 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
| 6188 | 6188 | $_SESSION['user_id'] |
| 6189 | 6189 | ); |
| 6190 | 6190 | $resp_folder = DB::queryfirstrow( |
| 6191 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6191 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 6192 | 6192 | $folder |
| 6193 | 6193 | ); |
| 6194 | 6194 | |
| 6195 | 6195 | // notify Managers |
| 6196 | 6196 | $rows = DB::query( |
| 6197 | 6197 | 'SELECT email |
| 6198 | - FROM ' . prefixTable('users') . ' |
|
| 6198 | + FROM ' . prefixTable('users').' |
|
| 6199 | 6199 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
| 6200 | 6200 | 1 |
| 6201 | 6201 | ); |
@@ -6226,14 +6226,14 @@ discard block |
||
| 6226 | 6226 | // Get list of users |
| 6227 | 6227 | $usersList = array(); |
| 6228 | 6228 | $usersString = ''; |
| 6229 | - $rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC'); |
|
| 6229 | + $rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC'); |
|
| 6230 | 6230 | foreach ($rows as $record) { |
| 6231 | 6231 | $usersList[$record['login']] = array( |
| 6232 | 6232 | 'id' => $record['id'], |
| 6233 | 6233 | 'login' => $record['login'], |
| 6234 | 6234 | 'email' => $record['email'], |
| 6235 | 6235 | ); |
| 6236 | - $usersString .= $record['id'] . '#' . $record['login'] . ';'; |
|
| 6236 | + $usersString .= $record['id'].'#'.$record['login'].';'; |
|
| 6237 | 6237 | } |
| 6238 | 6238 | |
| 6239 | 6239 | $data = array( |
@@ -6267,7 +6267,7 @@ discard block |
||
| 6267 | 6267 | // Send email |
| 6268 | 6268 | $dataItem = DB::queryfirstrow( |
| 6269 | 6269 | 'SELECT label, id_tree |
| 6270 | - FROM ' . prefixTable('items') . ' |
|
| 6270 | + FROM ' . prefixTable('items').' |
|
| 6271 | 6271 | WHERE id = %i', |
| 6272 | 6272 | $post_item_id |
| 6273 | 6273 | ); |
@@ -6361,7 +6361,7 @@ discard block |
||
| 6361 | 6361 | |
| 6362 | 6362 | DB::query( |
| 6363 | 6363 | 'SELECT * |
| 6364 | - FROM ' . prefixTable('notification') . ' |
|
| 6364 | + FROM ' . prefixTable('notification').' |
|
| 6365 | 6365 | WHERE item_id = %i AND user_id = %i', |
| 6366 | 6366 | $post_item_id, |
| 6367 | 6367 | $_SESSION['user_id'] |
@@ -6427,7 +6427,7 @@ discard block |
||
| 6427 | 6427 | // And related logs |
| 6428 | 6428 | $rows = DB::query( |
| 6429 | 6429 | 'SELECT id, file AS filename |
| 6430 | - FROM ' . prefixTable('files') . ' |
|
| 6430 | + FROM ' . prefixTable('files').' |
|
| 6431 | 6431 | WHERE id_item = %i AND confirmed = %i', |
| 6432 | 6432 | $post_item_id, |
| 6433 | 6433 | 0 |
@@ -6441,12 +6441,12 @@ discard block |
||
| 6441 | 6441 | ); |
| 6442 | 6442 | |
| 6443 | 6443 | // Delete file on server |
| 6444 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
| 6444 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
| 6445 | 6445 | |
| 6446 | 6446 | // Delete related logs |
| 6447 | 6447 | $logFile = DB::query( |
| 6448 | 6448 | 'SELECT increment_id, raison |
| 6449 | - FROM ' . prefixTable('log_items') . ' |
|
| 6449 | + FROM ' . prefixTable('log_items').' |
|
| 6450 | 6450 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
| 6451 | 6451 | $post_item_id, |
| 6452 | 6452 | $_SESSION['user_id'], |
@@ -6499,7 +6499,7 @@ discard block |
||
| 6499 | 6499 | // Confirm attachments |
| 6500 | 6500 | $rows = DB::query( |
| 6501 | 6501 | 'SELECT id, file AS filename |
| 6502 | - FROM ' . prefixTable('files') . ' |
|
| 6502 | + FROM ' . prefixTable('files').' |
|
| 6503 | 6503 | WHERE id_item = %i AND confirmed = %i', |
| 6504 | 6504 | $post_item_id, |
| 6505 | 6505 | 0 |
@@ -6536,15 +6536,15 @@ discard block |
||
| 6536 | 6536 | case 'autocomplete_tags': |
| 6537 | 6537 | // Get a list off all existing TAGS |
| 6538 | 6538 | $listOfTags = ''; |
| 6539 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $get['term']); |
|
| 6539 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $get['term']); |
|
| 6540 | 6540 | foreach ($rows as $record) { |
| 6541 | 6541 | if (empty($listOfTags)) { |
| 6542 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
| 6542 | + $listOfTags = '"'.$record['tag'].'"'; |
|
| 6543 | 6543 | } else { |
| 6544 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
| 6544 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
| 6545 | 6545 | } |
| 6546 | 6546 | } |
| 6547 | - echo '[' . $listOfTags . ']'; |
|
| 6547 | + echo '['.$listOfTags.']'; |
|
| 6548 | 6548 | break; |
| 6549 | 6549 | } |
| 6550 | 6550 | } |
@@ -6560,7 +6560,7 @@ discard block |
||
| 6560 | 6560 | { |
| 6561 | 6561 | $data = DB::queryFirstRow( |
| 6562 | 6562 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 6563 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6563 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
| 6564 | 6564 | $groupe |
| 6565 | 6565 | ); |
| 6566 | 6566 | // 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"> |
