@@ -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, |
@@ -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 |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | // About special settings |
| 311 | 311 | $dataFolderSettings = DB::queryFirstRow( |
| 312 | 312 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 313 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 313 | + FROM ' . prefixTable('nested_tree').' |
|
| 314 | 314 | WHERE id = %i', |
| 315 | 315 | $post_folder_id |
| 316 | 316 | ); |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | // Get folder complexity |
| 328 | 328 | $folderComplexity = DB::queryfirstrow( |
| 329 | 329 | 'SELECT valeur |
| 330 | - FROM ' . prefixTable('misc') . ' |
|
| 330 | + FROM ' . prefixTable('misc').' |
|
| 331 | 331 | WHERE type = %s AND intitule = %i', |
| 332 | 332 | 'complex', |
| 333 | 333 | $post_folder_id |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | $itemExists = 0; |
| 353 | 353 | $newID = ''; |
| 354 | 354 | $data = DB::queryfirstrow( |
| 355 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 355 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 356 | 356 | WHERE label = %s AND inactif = %i', |
| 357 | 357 | $post_label, |
| 358 | 358 | 0 |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | // should we encrypt the data |
| 479 | 479 | $dataTmp = DB::queryFirstRow( |
| 480 | 480 | 'SELECT encrypted_data |
| 481 | - FROM ' . prefixTable('categories') . ' |
|
| 481 | + FROM ' . prefixTable('categories').' |
|
| 482 | 482 | WHERE id = %i', |
| 483 | 483 | $field_data[0] |
| 484 | 484 | ); |
@@ -534,7 +534,7 @@ discard block |
||
| 534 | 534 | ) { |
| 535 | 535 | DB::queryFirstRow( |
| 536 | 536 | 'SELECT * |
| 537 | - FROM ' . prefixTable('templates') . ' |
|
| 537 | + FROM ' . prefixTable('templates').' |
|
| 538 | 538 | WHERE item_id = %i', |
| 539 | 539 | $newID |
| 540 | 540 | ); |
@@ -603,11 +603,11 @@ discard block |
||
| 603 | 603 | ) { |
| 604 | 604 | foreach ($post_restricted_to as $userRest) { |
| 605 | 605 | if (empty($userRest) === false) { |
| 606 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest); |
|
| 606 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest); |
|
| 607 | 607 | if (empty($listOfRestricted)) { |
| 608 | 608 | $listOfRestricted = $dataTmp['login']; |
| 609 | 609 | } else { |
| 610 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 610 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 611 | 611 | } |
| 612 | 612 | } |
| 613 | 613 | } |
@@ -620,11 +620,11 @@ discard block |
||
| 620 | 620 | if (empty($data['restricted_to']) === false) { |
| 621 | 621 | foreach (explode(';', $data['restricted_to']) as $userRest) { |
| 622 | 622 | if (empty($userRest) === false) { |
| 623 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
| 623 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
| 624 | 624 | if (empty($oldRestrictionList) === true) { |
| 625 | 625 | $oldRestrictionList = $dataTmp['login']; |
| 626 | 626 | } else { |
| 627 | - $oldRestrictionList .= ';' . $dataTmp['login']; |
|
| 627 | + $oldRestrictionList .= ';'.$dataTmp['login']; |
|
| 628 | 628 | } |
| 629 | 629 | } |
| 630 | 630 | } |
@@ -687,7 +687,7 @@ discard block |
||
| 687 | 687 | if (empty($post_uploaded_file_id) === false) { |
| 688 | 688 | $rows = DB::query( |
| 689 | 689 | 'SELECT id |
| 690 | - FROM ' . prefixTable('files') . ' |
|
| 690 | + FROM ' . prefixTable('files').' |
|
| 691 | 691 | WHERE id_item = %s', |
| 692 | 692 | $post_uploaded_file_id |
| 693 | 693 | ); |
@@ -727,14 +727,14 @@ discard block |
||
| 727 | 727 | langHdl('email_subject'), |
| 728 | 728 | str_replace( |
| 729 | 729 | array('#label', '#link'), |
| 730 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $post_folder_id . '&id=' . $newID . $txt['email_body3']), |
|
| 730 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$post_folder_id.'&id='.$newID.$txt['email_body3']), |
|
| 731 | 731 | langHdl('new_item_email_body') |
| 732 | 732 | ), |
| 733 | 733 | $emailAddress, |
| 734 | 734 | $SETTINGS, |
| 735 | 735 | str_replace( |
| 736 | 736 | array('#label', '#link'), |
| 737 | - array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $post_folder_id . '&id=' . $newID . $txt['email_body3']), |
|
| 737 | + array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$post_folder_id.'&id='.$newID.$txt['email_body3']), |
|
| 738 | 738 | langHdl('new_item_email_body') |
| 739 | 739 | ) |
| 740 | 740 | ); |
@@ -897,7 +897,7 @@ discard block |
||
| 897 | 897 | // About special settings |
| 898 | 898 | $dataFolderSettings = DB::queryFirstRow( |
| 899 | 899 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 900 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 900 | + FROM ' . prefixTable('nested_tree').' |
|
| 901 | 901 | WHERE id = %i', |
| 902 | 902 | $post_folder_id |
| 903 | 903 | ); |
@@ -913,7 +913,7 @@ discard block |
||
| 913 | 913 | // Get folder complexity |
| 914 | 914 | $folderComplexity = DB::queryfirstrow( |
| 915 | 915 | 'SELECT valeur |
| 916 | - FROM ' . prefixTable('misc') . ' |
|
| 916 | + FROM ' . prefixTable('misc').' |
|
| 917 | 917 | WHERE type = %s AND intitule = %i', |
| 918 | 918 | 'complex', |
| 919 | 919 | $post_folder_id |
@@ -952,8 +952,8 @@ discard block |
||
| 952 | 952 | // Get all informations for this item |
| 953 | 953 | $dataItem = DB::queryfirstrow( |
| 954 | 954 | 'SELECT * |
| 955 | - FROM ' . prefixTable('items') . ' as i |
|
| 956 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 955 | + FROM ' . prefixTable('items').' as i |
|
| 956 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 957 | 957 | WHERE i.id=%i AND l.action = %s', |
| 958 | 958 | $post_item_id, |
| 959 | 959 | 'at_creation' |
@@ -963,7 +963,7 @@ discard block |
||
| 963 | 963 | //db::debugmode(true); |
| 964 | 964 | DB::query( |
| 965 | 965 | 'SELECT * |
| 966 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 966 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 967 | 967 | WHERE object_id = %i AND user_id = %s', |
| 968 | 968 | $post_item_id, |
| 969 | 969 | $_SESSION['user_id'] |
@@ -1011,9 +1011,9 @@ discard block |
||
| 1011 | 1011 | '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, |
| 1012 | 1012 | 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, |
| 1013 | 1013 | u.login as user_login, u.email as user_email |
| 1014 | - FROM ' . prefixTable('items') . ' as i |
|
| 1015 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item) |
|
| 1016 | - INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user) |
|
| 1014 | + FROM ' . prefixTable('items').' as i |
|
| 1015 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item) |
|
| 1016 | + INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user) |
|
| 1017 | 1017 | WHERE i.id=%i', |
| 1018 | 1018 | $post_item_id |
| 1019 | 1019 | ); |
@@ -1021,7 +1021,7 @@ discard block |
||
| 1021 | 1021 | // Should we log a password change? |
| 1022 | 1022 | $userKey = DB::queryFirstRow( |
| 1023 | 1023 | 'SELECT share_key |
| 1024 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1024 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1025 | 1025 | WHERE user_id = %i AND object_id = %i', |
| 1026 | 1026 | $_SESSION['user_id'], |
| 1027 | 1027 | $post_item_id |
@@ -1080,7 +1080,7 @@ discard block |
||
| 1080 | 1080 | // Get list of tags |
| 1081 | 1081 | $itemTags = DB::queryFirstColumn( |
| 1082 | 1082 | 'SELECT tag |
| 1083 | - FROM ' . prefixTable('tags') . ' |
|
| 1083 | + FROM ' . prefixTable('tags').' |
|
| 1084 | 1084 | WHERE item_id = %i', |
| 1085 | 1085 | $post_item_id |
| 1086 | 1086 | ); |
@@ -1123,7 +1123,7 @@ discard block |
||
| 1123 | 1123 | $_SESSION['user_id'], |
| 1124 | 1124 | 'at_modification', |
| 1125 | 1125 | $_SESSION['login'], |
| 1126 | - 'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags |
|
| 1126 | + 'at_tag : '.implode(' ', $itemTags).' => '.$post_tags |
|
| 1127 | 1127 | ); |
| 1128 | 1128 | } |
| 1129 | 1129 | |
@@ -1160,8 +1160,8 @@ discard block |
||
| 1160 | 1160 | 'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv, |
| 1161 | 1161 | i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, |
| 1162 | 1162 | c.masked AS masked, i.id AS field_item_id |
| 1163 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 1164 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 1163 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 1164 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 1165 | 1165 | WHERE i.field_id = %i AND i.item_id = %i', |
| 1166 | 1166 | $field['id'], |
| 1167 | 1167 | $post_item_id |
@@ -1175,7 +1175,7 @@ discard block |
||
| 1175 | 1175 | // Perform new query |
| 1176 | 1176 | $dataTmpCat = DB::queryFirstRow( |
| 1177 | 1177 | 'SELECT id, title, encrypted_data, masked |
| 1178 | - FROM ' . prefixTable('categories') . ' |
|
| 1178 | + FROM ' . prefixTable('categories').' |
|
| 1179 | 1179 | WHERE id = %i', |
| 1180 | 1180 | $field['id'] |
| 1181 | 1181 | ); |
@@ -1247,7 +1247,7 @@ discard block |
||
| 1247 | 1247 | $_SESSION['user_id'], |
| 1248 | 1248 | 'at_modification', |
| 1249 | 1249 | $_SESSION['login'], |
| 1250 | - 'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value'] |
|
| 1250 | + 'at_field : '.$dataTmpCat['title'].' : '.$field['value'] |
|
| 1251 | 1251 | ); |
| 1252 | 1252 | } else { |
| 1253 | 1253 | // compare the old and new value |
@@ -1255,7 +1255,7 @@ discard block |
||
| 1255 | 1255 | // Get user sharekey for this field |
| 1256 | 1256 | $userKey = DB::queryFirstRow( |
| 1257 | 1257 | 'SELECT share_key |
| 1258 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 1258 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 1259 | 1259 | WHERE user_id = %i AND object_id = %i', |
| 1260 | 1260 | $_SESSION['user_id'], |
| 1261 | 1261 | $dataTmpCat['field_item_id'] |
@@ -1325,7 +1325,7 @@ discard block |
||
| 1325 | 1325 | $_SESSION['user_id'], |
| 1326 | 1326 | 'at_modification', |
| 1327 | 1327 | $_SESSION['login'], |
| 1328 | - 'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal |
|
| 1328 | + 'at_field : '.$dataTmpCat['title'].' => '.$oldVal |
|
| 1329 | 1329 | ); |
| 1330 | 1330 | } |
| 1331 | 1331 | } |
@@ -1350,7 +1350,7 @@ discard block |
||
| 1350 | 1350 | ) { |
| 1351 | 1351 | DB::queryFirstRow( |
| 1352 | 1352 | 'SELECT * |
| 1353 | - FROM ' . prefixTable('templates') . ' |
|
| 1353 | + FROM ' . prefixTable('templates').' |
|
| 1354 | 1354 | WHERE item_id = %i', |
| 1355 | 1355 | $post_item_id |
| 1356 | 1356 | ); |
@@ -1393,7 +1393,7 @@ discard block |
||
| 1393 | 1393 | // check if elem exists in Table. If not add it or update it. |
| 1394 | 1394 | DB::query( |
| 1395 | 1395 | 'SELECT * |
| 1396 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 1396 | + FROM ' . prefixTable('automatic_del').' |
|
| 1397 | 1397 | WHERE item_id = %i', |
| 1398 | 1398 | $post_item_id |
| 1399 | 1399 | ); |
@@ -1420,7 +1420,7 @@ discard block |
||
| 1420 | 1420 | // Store updates performed |
| 1421 | 1421 | array_push( |
| 1422 | 1422 | $arrayOfChanges, |
| 1423 | - langHdl('automatic_deletion_engaged') . ': ' . langHdl('enabled') |
|
| 1423 | + langHdl('automatic_deletion_engaged').': '.langHdl('enabled') |
|
| 1424 | 1424 | ); |
| 1425 | 1425 | |
| 1426 | 1426 | // update LOG |
@@ -1463,7 +1463,7 @@ discard block |
||
| 1463 | 1463 | // Store updates performed |
| 1464 | 1464 | array_push( |
| 1465 | 1465 | $arrayOfChanges, |
| 1466 | - langHdl('automatic_deletion_engaged') . ': ' . langHdl('disabled') |
|
| 1466 | + langHdl('automatic_deletion_engaged').': '.langHdl('disabled') |
|
| 1467 | 1467 | ); |
| 1468 | 1468 | |
| 1469 | 1469 | // update LOG |
@@ -1496,7 +1496,7 @@ discard block |
||
| 1496 | 1496 | if (empty($userId) === false) { |
| 1497 | 1497 | $dataTmp = DB::queryfirstrow( |
| 1498 | 1498 | 'SELECT id, name, lastname |
| 1499 | - FROM ' . prefixTable('users') . ' |
|
| 1499 | + FROM ' . prefixTable('users').' |
|
| 1500 | 1500 | WHERE id= %i', |
| 1501 | 1501 | $userId |
| 1502 | 1502 | ); |
@@ -1504,7 +1504,7 @@ discard block |
||
| 1504 | 1504 | // Add to array |
| 1505 | 1505 | array_push( |
| 1506 | 1506 | $arrayOfUsersRestriction, |
| 1507 | - $dataTmp['name'] . ' ' . $dataTmp['lastname'] |
|
| 1507 | + $dataTmp['name'].' '.$dataTmp['lastname'] |
|
| 1508 | 1508 | ); |
| 1509 | 1509 | array_push( |
| 1510 | 1510 | $arrayOfUsersIdRestriction, |
@@ -1535,8 +1535,8 @@ discard block |
||
| 1535 | 1535 | // get values before deleting them |
| 1536 | 1536 | $rows = DB::query( |
| 1537 | 1537 | 'SELECT t.title, t.id AS id |
| 1538 | - FROM ' . prefixTable('roles_title') . ' as t |
|
| 1539 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id) |
|
| 1538 | + FROM ' . prefixTable('roles_title').' as t |
|
| 1539 | + INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id) |
|
| 1540 | 1540 | WHERE r.item_id = %i |
| 1541 | 1541 | ORDER BY t.title ASC', |
| 1542 | 1542 | $post_item_id |
@@ -1570,7 +1570,7 @@ discard block |
||
| 1570 | 1570 | ); |
| 1571 | 1571 | $dataTmp = DB::queryfirstrow( |
| 1572 | 1572 | 'SELECT title |
| 1573 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1573 | + FROM ' . prefixTable('roles_title').' |
|
| 1574 | 1574 | WHERE id = %i', |
| 1575 | 1575 | $role |
| 1576 | 1576 | ); |
@@ -1611,8 +1611,8 @@ discard block |
||
| 1611 | 1611 | $_SESSION['user_id'], |
| 1612 | 1612 | 'at_modification', |
| 1613 | 1613 | $_SESSION['login'], |
| 1614 | - 'at_restriction : ' . (count($diffUsersRestiction) > 0 ? |
|
| 1615 | - implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1614 | + 'at_restriction : '.(count($diffUsersRestiction) > 0 ? |
|
| 1615 | + implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '') |
|
| 1616 | 1616 | ); |
| 1617 | 1617 | } |
| 1618 | 1618 | |
@@ -1632,7 +1632,7 @@ discard block |
||
| 1632 | 1632 | $_SESSION['user_id'], |
| 1633 | 1633 | 'at_modification', |
| 1634 | 1634 | $_SESSION['login'], |
| 1635 | - 'at_label : ' . $data['label'] . ' => ' . $post_label |
|
| 1635 | + 'at_label : '.$data['label'].' => '.$post_label |
|
| 1636 | 1636 | ); |
| 1637 | 1637 | } |
| 1638 | 1638 | // LOGIN |
@@ -1651,7 +1651,7 @@ discard block |
||
| 1651 | 1651 | $_SESSION['user_id'], |
| 1652 | 1652 | 'at_modification', |
| 1653 | 1653 | $_SESSION['login'], |
| 1654 | - 'at_login : ' . $data['login'] . ' => ' . $post_login |
|
| 1654 | + 'at_login : '.$data['login'].' => '.$post_login |
|
| 1655 | 1655 | ); |
| 1656 | 1656 | } |
| 1657 | 1657 | |
@@ -1670,7 +1670,7 @@ discard block |
||
| 1670 | 1670 | $_SESSION['user_id'], |
| 1671 | 1671 | 'at_modification', |
| 1672 | 1672 | $_SESSION['login'], |
| 1673 | - 'at_email : ' . $data['email'] . ' => ' . $post_email |
|
| 1673 | + 'at_email : '.$data['email'].' => '.$post_email |
|
| 1674 | 1674 | ); |
| 1675 | 1675 | } |
| 1676 | 1676 | // URL |
@@ -1689,7 +1689,7 @@ discard block |
||
| 1689 | 1689 | $_SESSION['user_id'], |
| 1690 | 1690 | 'at_modification', |
| 1691 | 1691 | $_SESSION['login'], |
| 1692 | - 'at_url : ' . $data['url'] . ' => ' . $post_url |
|
| 1692 | + 'at_url : '.$data['url'].' => '.$post_url |
|
| 1693 | 1693 | ); |
| 1694 | 1694 | } |
| 1695 | 1695 | // DESCRIPTION |
@@ -1714,7 +1714,7 @@ discard block |
||
| 1714 | 1714 | // FOLDER |
| 1715 | 1715 | if ($data['id_tree'] !== $post_folder_id) { |
| 1716 | 1716 | // Get name of folders |
| 1717 | - $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $post_folder_id)); |
|
| 1717 | + $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $post_folder_id)); |
|
| 1718 | 1718 | |
| 1719 | 1719 | // Store updates performed |
| 1720 | 1720 | array_push( |
@@ -1730,7 +1730,7 @@ discard block |
||
| 1730 | 1730 | $_SESSION['user_id'], |
| 1731 | 1731 | 'at_modification', |
| 1732 | 1732 | $_SESSION['login'], |
| 1733 | - 'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title'] |
|
| 1733 | + 'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title'] |
|
| 1734 | 1734 | ); |
| 1735 | 1735 | } |
| 1736 | 1736 | // ANYONE_CAN_MODIFY |
@@ -1738,7 +1738,7 @@ discard block |
||
| 1738 | 1738 | // Store updates performed |
| 1739 | 1739 | array_push( |
| 1740 | 1740 | $arrayOfChanges, |
| 1741 | - langHdl('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled')) |
|
| 1741 | + langHdl('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? langHdl('disabled') : langHdl('enabled')) |
|
| 1742 | 1742 | ); |
| 1743 | 1743 | |
| 1744 | 1744 | // Log |
@@ -1749,15 +1749,15 @@ discard block |
||
| 1749 | 1749 | $_SESSION['user_id'], |
| 1750 | 1750 | 'at_modification', |
| 1751 | 1751 | $_SESSION['login'], |
| 1752 | - 'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 1752 | + 'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled') |
|
| 1753 | 1753 | ); |
| 1754 | 1754 | } |
| 1755 | 1755 | |
| 1756 | 1756 | // Reload new values |
| 1757 | 1757 | $dataItem = DB::queryfirstrow( |
| 1758 | 1758 | 'SELECT * |
| 1759 | - FROM ' . prefixTable('items') . ' as i |
|
| 1760 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 1759 | + FROM ' . prefixTable('items').' as i |
|
| 1760 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 1761 | 1761 | WHERE i.id = %i AND l.action = %s', |
| 1762 | 1762 | $post_item_id, |
| 1763 | 1763 | 'at_creation' |
@@ -1766,8 +1766,8 @@ discard block |
||
| 1766 | 1766 | $history = ''; |
| 1767 | 1767 | $rows = DB::query( |
| 1768 | 1768 | 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login |
| 1769 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 1770 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 1769 | + FROM ' . prefixTable('log_items').' as l |
|
| 1770 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 1771 | 1771 | WHERE l.action <> %s AND id_item=%s', |
| 1772 | 1772 | 'at_shown', |
| 1773 | 1773 | $post_item_id |
@@ -1775,14 +1775,14 @@ discard block |
||
| 1775 | 1775 | foreach ($rows as $record) { |
| 1776 | 1776 | $reason = explode(':', $record['raison']); |
| 1777 | 1777 | if (count($reason) > 0) { |
| 1778 | - $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['date']) . ' - ' |
|
| 1779 | - . $record['login'] . ' - ' . langHdl($record['action']) . ' - ' |
|
| 1780 | - . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])) . ' : ' . $reason[1] |
|
| 1778 | + $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['date']).' - ' |
|
| 1779 | + . $record['login'].' - '.langHdl($record['action']).' - ' |
|
| 1780 | + . (empty($record['raison']) === false ? (count($reason) > 1 ? langHdl(trim($reason[0])).' : '.$reason[1] |
|
| 1781 | 1781 | : langHdl(trim($reason[0]))) : ''); |
| 1782 | 1782 | if (empty($history)) { |
| 1783 | 1783 | $history = $sentence; |
| 1784 | 1784 | } else { |
| 1785 | - $history .= '<br />' . $sentence; |
|
| 1785 | + $history .= '<br />'.$sentence; |
|
| 1786 | 1786 | } |
| 1787 | 1787 | } |
| 1788 | 1788 | } |
@@ -1904,7 +1904,7 @@ discard block |
||
| 1904 | 1904 | ) { |
| 1905 | 1905 | // load the original record into an array |
| 1906 | 1906 | $originalRecord = DB::queryfirstrow( |
| 1907 | - 'SELECT * FROM ' . prefixTable('items') . ' |
|
| 1907 | + 'SELECT * FROM '.prefixTable('items').' |
|
| 1908 | 1908 | WHERE id = %i', |
| 1909 | 1909 | $post_item_id |
| 1910 | 1910 | ); |
@@ -1923,7 +1923,7 @@ discard block |
||
| 1923 | 1923 | |
| 1924 | 1924 | // Load the destination folder record into an array |
| 1925 | 1925 | $dataDestination = DB::queryfirstrow( |
| 1926 | - 'SELECT personal_folder FROM ' . prefixTable('nested_tree') . ' |
|
| 1926 | + 'SELECT personal_folder FROM '.prefixTable('nested_tree').' |
|
| 1927 | 1927 | WHERE id = %i', |
| 1928 | 1928 | $post_dest_id |
| 1929 | 1929 | ); |
@@ -1931,7 +1931,7 @@ discard block |
||
| 1931 | 1931 | // Get the ITEM object key for the user |
| 1932 | 1932 | $userKey = DB::queryFirstRow( |
| 1933 | 1933 | 'SELECT share_key |
| 1934 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 1934 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 1935 | 1935 | WHERE user_id = %i AND object_id = %i', |
| 1936 | 1936 | $_SESSION['user_id'], |
| 1937 | 1937 | $post_item_id |
@@ -2003,7 +2003,7 @@ discard block |
||
| 2003 | 2003 | // Manage Custom Fields |
| 2004 | 2004 | $rows = DB::query( |
| 2005 | 2005 | 'SELECT * |
| 2006 | - FROM ' . prefixTable('categories_items') . ' |
|
| 2006 | + FROM ' . prefixTable('categories_items').' |
|
| 2007 | 2007 | WHERE item_id = %i', |
| 2008 | 2008 | $post_item_id |
| 2009 | 2009 | ); |
@@ -2051,15 +2051,15 @@ discard block |
||
| 2051 | 2051 | $rows = DB::query( |
| 2052 | 2052 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension, |
| 2053 | 2053 | f.size AS size, f.type AS type, s.share_key AS share_key |
| 2054 | - FROM ' . prefixTable('files') . ' AS f |
|
| 2055 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 2054 | + FROM ' . prefixTable('files').' AS f |
|
| 2055 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 2056 | 2056 | WHERE s.user_id = %i AND f.id_item = %i', |
| 2057 | 2057 | $_SESSION['user_id'], |
| 2058 | 2058 | $post_item_id |
| 2059 | 2059 | ); |
| 2060 | 2060 | foreach ($rows as $record) { |
| 2061 | 2061 | // Check if file still exists |
| 2062 | - if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) { |
|
| 2062 | + if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) { |
|
| 2063 | 2063 | // Step1 - decrypt the file |
| 2064 | 2064 | $fileContent = decryptFile( |
| 2065 | 2065 | $record['file'], |
@@ -2068,8 +2068,8 @@ discard block |
||
| 2068 | 2068 | ); |
| 2069 | 2069 | |
| 2070 | 2070 | // Step2 - create file |
| 2071 | - $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension']; |
|
| 2072 | - $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab'); |
|
| 2071 | + $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension']; |
|
| 2072 | + $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab'); |
|
| 2073 | 2073 | if ($outstream === false) { |
| 2074 | 2074 | echo prepareExchangedData( |
| 2075 | 2075 | array( |
@@ -2119,7 +2119,7 @@ discard block |
||
| 2119 | 2119 | |
| 2120 | 2120 | // ------------------------- |
| 2121 | 2121 | // Add specific restrictions |
| 2122 | - $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $post_item_id); |
|
| 2122 | + $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $post_item_id); |
|
| 2123 | 2123 | foreach ($rows as $record) { |
| 2124 | 2124 | DB::insert( |
| 2125 | 2125 | prefixTable('restriction_to_roles'), |
@@ -2131,7 +2131,7 @@ discard block |
||
| 2131 | 2131 | } |
| 2132 | 2132 | |
| 2133 | 2133 | // Add Tags |
| 2134 | - $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $post_item_id); |
|
| 2134 | + $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $post_item_id); |
|
| 2135 | 2135 | foreach ($rows as $record) { |
| 2136 | 2136 | DB::insert( |
| 2137 | 2137 | prefixTable('tags'), |
@@ -2161,7 +2161,7 @@ discard block |
||
| 2161 | 2161 | $_SESSION['login'] |
| 2162 | 2162 | ); |
| 2163 | 2163 | // reload cache table |
| 2164 | - include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 2164 | + include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 2165 | 2165 | updateCacheTable('reload', $SETTINGS, ''); |
| 2166 | 2166 | |
| 2167 | 2167 | echo (string) prepareExchangedData( |
@@ -2229,7 +2229,7 @@ discard block |
||
| 2229 | 2229 | // then we can show it |
| 2230 | 2230 | $item_deleted = DB::queryFirstRow( |
| 2231 | 2231 | 'SELECT * |
| 2232 | - FROM ' . prefixTable('log_items') . ' |
|
| 2232 | + FROM ' . prefixTable('log_items').' |
|
| 2233 | 2233 | WHERE id_item = %i AND action = %s |
| 2234 | 2234 | ORDER BY date DESC |
| 2235 | 2235 | LIMIT 0, 1', |
@@ -2240,7 +2240,7 @@ discard block |
||
| 2240 | 2240 | |
| 2241 | 2241 | $item_restored = DB::queryFirstRow( |
| 2242 | 2242 | 'SELECT * |
| 2243 | - FROM ' . prefixTable('log_items') . ' |
|
| 2243 | + FROM ' . prefixTable('log_items').' |
|
| 2244 | 2244 | WHERE id_item = %i AND action = %s |
| 2245 | 2245 | ORDER BY date DESC |
| 2246 | 2246 | LIMIT 0, 1', |
@@ -2264,8 +2264,8 @@ discard block |
||
| 2264 | 2264 | // Get all informations for this item |
| 2265 | 2265 | $dataItem = DB::queryfirstrow( |
| 2266 | 2266 | 'SELECT * |
| 2267 | - FROM ' . prefixTable('items') . ' as i |
|
| 2268 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 2267 | + FROM ' . prefixTable('items').' as i |
|
| 2268 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 2269 | 2269 | WHERE i.id = %i AND l.action = %s', |
| 2270 | 2270 | $post_id, |
| 2271 | 2271 | 'at_creation' |
@@ -2274,7 +2274,7 @@ discard block |
||
| 2274 | 2274 | // Notification |
| 2275 | 2275 | DB::queryfirstrow( |
| 2276 | 2276 | 'SELECT * |
| 2277 | - FROM ' . prefixTable('notification') . ' |
|
| 2277 | + FROM ' . prefixTable('notification').' |
|
| 2278 | 2278 | WHERE item_id = %i AND user_id = %i', |
| 2279 | 2279 | $post_id, |
| 2280 | 2280 | $_SESSION['user_id'] |
@@ -2321,13 +2321,13 @@ discard block |
||
| 2321 | 2321 | && (int) $SETTINGS['enable_email_notification_on_item_shown'] === 1 |
| 2322 | 2322 | && (int) $user['admin'] === 1 |
| 2323 | 2323 | ) { |
| 2324 | - $_SESSION['listNotificationEmails'] .= $user['email'] . ','; |
|
| 2324 | + $_SESSION['listNotificationEmails'] .= $user['email'].','; |
|
| 2325 | 2325 | } |
| 2326 | 2326 | } |
| 2327 | 2327 | |
| 2328 | 2328 | // manage case of API user |
| 2329 | 2329 | if ($dataItem['id_user'] === API_USER_ID) { |
| 2330 | - $arrData['author'] = 'API [' . $dataItem['description'] . ']'; |
|
| 2330 | + $arrData['author'] = 'API ['.$dataItem['description'].']'; |
|
| 2331 | 2331 | $arrData['id_user'] = API_USER_ID; |
| 2332 | 2332 | $arrData['author_email'] = ''; |
| 2333 | 2333 | $arrData['notification_status'] = false; |
@@ -2337,7 +2337,7 @@ discard block |
||
| 2337 | 2337 | $tags = array(); |
| 2338 | 2338 | $rows = DB::query( |
| 2339 | 2339 | 'SELECT tag |
| 2340 | - FROM ' . prefixTable('tags') . ' |
|
| 2340 | + FROM ' . prefixTable('tags').' |
|
| 2341 | 2341 | WHERE item_id = %i', |
| 2342 | 2342 | $post_id |
| 2343 | 2343 | ); |
@@ -2362,7 +2362,7 @@ discard block |
||
| 2362 | 2362 | // Check if user has a role that is accepted |
| 2363 | 2363 | $rows_tmp = DB::query( |
| 2364 | 2364 | 'SELECT role_id |
| 2365 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2365 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2366 | 2366 | WHERE item_id=%i', |
| 2367 | 2367 | $post_id |
| 2368 | 2368 | ); |
@@ -2376,7 +2376,7 @@ discard block |
||
| 2376 | 2376 | // Get the object key for the user |
| 2377 | 2377 | $userKey = DB::queryFirstRow( |
| 2378 | 2378 | 'SELECT share_key |
| 2379 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2379 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2380 | 2380 | WHERE user_id = %i AND object_id = %i', |
| 2381 | 2381 | $_SESSION['user_id'], |
| 2382 | 2382 | $post_id |
@@ -2461,8 +2461,8 @@ discard block |
||
| 2461 | 2461 | // Add restriction if item is restricted to roles |
| 2462 | 2462 | $rows = DB::query( |
| 2463 | 2463 | 'SELECT t.title, t.id |
| 2464 | - FROM ' . prefixTable('roles_title') . ' AS t |
|
| 2465 | - INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id) |
|
| 2464 | + FROM ' . prefixTable('roles_title').' AS t |
|
| 2465 | + INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id) |
|
| 2466 | 2466 | WHERE r.item_id = %i |
| 2467 | 2467 | ORDER BY t.title ASC', |
| 2468 | 2468 | $post_id |
@@ -2478,8 +2478,8 @@ discard block |
||
| 2478 | 2478 | $tmp = array(); |
| 2479 | 2479 | $rows = DB::query( |
| 2480 | 2480 | 'SELECT k.label, k.id |
| 2481 | - FROM ' . prefixTable('kb_items') . ' as i |
|
| 2482 | - INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id) |
|
| 2481 | + FROM ' . prefixTable('kb_items').' as i |
|
| 2482 | + INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id) |
|
| 2483 | 2483 | WHERE i.item_id = %i |
| 2484 | 2484 | ORDER BY k.label ASC', |
| 2485 | 2485 | $post_id |
@@ -2559,7 +2559,7 @@ discard block |
||
| 2559 | 2559 | $arrCatList = array(); |
| 2560 | 2560 | $rows_tmp = DB::query( |
| 2561 | 2561 | 'SELECT id_category |
| 2562 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 2562 | + FROM ' . prefixTable('categories_folders').' |
|
| 2563 | 2563 | WHERE id_folder=%i', |
| 2564 | 2564 | $post_folder_id |
| 2565 | 2565 | ); |
@@ -2574,8 +2574,8 @@ discard block |
||
| 2574 | 2574 | 'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id, |
| 2575 | 2575 | i.encryption_type AS encryption_type, c.encrypted_data, c.parent_id AS parent_id, |
| 2576 | 2576 | c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility |
| 2577 | - FROM ' . prefixTable('categories_items') . ' AS i |
|
| 2578 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id) |
|
| 2577 | + FROM ' . prefixTable('categories_items').' AS i |
|
| 2578 | + INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id) |
|
| 2579 | 2579 | WHERE i.item_id=%i AND c.parent_id IN %ls', |
| 2580 | 2580 | $post_id, |
| 2581 | 2581 | $arrCatList |
@@ -2586,11 +2586,11 @@ discard block |
||
| 2586 | 2586 | //db::debugmode(true); |
| 2587 | 2587 | $userKey = DB::queryFirstRow( |
| 2588 | 2588 | 'SELECT share_key |
| 2589 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2589 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2590 | 2590 | WHERE user_id = %i AND object_id = %i', |
| 2591 | 2591 | $_SESSION['user_id'], |
| 2592 | 2592 | $row['id'] |
| 2593 | - );//db::debugmode(false); |
|
| 2593 | + ); //db::debugmode(false); |
|
| 2594 | 2594 | $fieldText = []; |
| 2595 | 2595 | if (DB::count() === 0) { |
| 2596 | 2596 | // Not encrypted |
@@ -2632,7 +2632,7 @@ discard block |
||
| 2632 | 2632 | if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) { |
| 2633 | 2633 | $rows_tmp = DB::queryfirstrow( |
| 2634 | 2634 | 'SELECT category_id |
| 2635 | - FROM ' . prefixTable('templates') . ' |
|
| 2635 | + FROM ' . prefixTable('templates').' |
|
| 2636 | 2636 | WHERE item_id = %i', |
| 2637 | 2637 | $post_id |
| 2638 | 2638 | ); |
@@ -2657,7 +2657,7 @@ discard block |
||
| 2657 | 2657 | // Is the Item to be deleted? |
| 2658 | 2658 | $dataDelete = DB::queryfirstrow( |
| 2659 | 2659 | 'SELECT * |
| 2660 | - FROM ' . prefixTable('automatic_del') . ' |
|
| 2660 | + FROM ' . prefixTable('automatic_del').' |
|
| 2661 | 2661 | WHERE item_id = %i', |
| 2662 | 2662 | $post_id |
| 2663 | 2663 | ); |
@@ -2739,11 +2739,11 @@ discard block |
||
| 2739 | 2739 | if (empty($dataItem['restricted_to']) === false) { |
| 2740 | 2740 | foreach (explode(';', $dataItem['restricted_to']) as $userRest) { |
| 2741 | 2741 | if (empty($userRest) === false) { |
| 2742 | - $dataTmp = DB::queryfirstrow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= ' . $userRest); |
|
| 2742 | + $dataTmp = DB::queryfirstrow('SELECT login FROM '.prefixTable('users').' WHERE id= '.$userRest); |
|
| 2743 | 2743 | if (empty($listOfRestricted)) { |
| 2744 | 2744 | $listOfRestricted = $dataTmp['login']; |
| 2745 | 2745 | } else { |
| 2746 | - $listOfRestricted .= ';' . $dataTmp['login']; |
|
| 2746 | + $listOfRestricted .= ';'.$dataTmp['login']; |
|
| 2747 | 2747 | } |
| 2748 | 2748 | } |
| 2749 | 2749 | } |
@@ -2800,8 +2800,8 @@ discard block |
||
| 2800 | 2800 | // Load item data |
| 2801 | 2801 | $dataItem = DB::queryFirstRow( |
| 2802 | 2802 | 'SELECT i.*, n.title AS folder_title |
| 2803 | - FROM ' . prefixTable('items') . ' AS i |
|
| 2804 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 2803 | + FROM ' . prefixTable('items').' AS i |
|
| 2804 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 2805 | 2805 | WHERE i.id = %i', |
| 2806 | 2806 | $post_id |
| 2807 | 2807 | ); |
@@ -2823,7 +2823,7 @@ discard block |
||
| 2823 | 2823 | // Check if user has a role that is accepted |
| 2824 | 2824 | $rows_tmp = DB::query( |
| 2825 | 2825 | 'SELECT role_id |
| 2826 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 2826 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 2827 | 2827 | WHERE item_id=%i', |
| 2828 | 2828 | $post_id |
| 2829 | 2829 | ); |
@@ -2869,7 +2869,7 @@ discard block |
||
| 2869 | 2869 | // launch query |
| 2870 | 2870 | $rows = DB::query( |
| 2871 | 2871 | 'SELECT id, name, file, extension, size |
| 2872 | - FROM ' . prefixTable('files') . ' |
|
| 2872 | + FROM ' . prefixTable('files').' |
|
| 2873 | 2873 | WHERE id_item = %i AND confirmed = 1', |
| 2874 | 2874 | $post_id |
| 2875 | 2875 | ); |
@@ -2878,7 +2878,7 @@ discard block |
||
| 2878 | 2878 | $attachments, |
| 2879 | 2879 | array( |
| 2880 | 2880 | 'icon' => fileFormatImage(strtolower($record['extension'])), |
| 2881 | - 'filename' => basename($record['name'], '.' . $record['extension']), |
|
| 2881 | + 'filename' => basename($record['name'], '.'.$record['extension']), |
|
| 2882 | 2882 | 'extension' => $record['extension'], |
| 2883 | 2883 | 'size' => formatSizeUnits((int) $record['size']), |
| 2884 | 2884 | 'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0, |
@@ -2904,7 +2904,7 @@ discard block |
||
| 2904 | 2904 | array( |
| 2905 | 2905 | 'latest_items' => implode(';', $_SESSION['latest_items']), |
| 2906 | 2906 | ), |
| 2907 | - 'id=' . $_SESSION['user_id'] |
|
| 2907 | + 'id='.$_SESSION['user_id'] |
|
| 2908 | 2908 | ); |
| 2909 | 2909 | } |
| 2910 | 2910 | |
@@ -2913,8 +2913,8 @@ discard block |
||
| 2913 | 2913 | $listOptionsForRoles = array(); |
| 2914 | 2914 | $rows = DB::query( |
| 2915 | 2915 | 'SELECT r.role_id AS role_id, t.title AS title |
| 2916 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 2917 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 2916 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 2917 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 2918 | 2918 | WHERE r.folder_id = %i', |
| 2919 | 2919 | $dataItem['id_tree'] |
| 2920 | 2920 | ); |
@@ -2928,9 +2928,9 @@ discard block |
||
| 2928 | 2928 | ); |
| 2929 | 2929 | $rows2 = DB::query( |
| 2930 | 2930 | 'SELECT id, login, fonction_id, email, name, lastname |
| 2931 | - FROM ' . prefixTable('users') . ' |
|
| 2931 | + FROM ' . prefixTable('users').' |
|
| 2932 | 2932 | WHERE fonction_id LIKE %s', |
| 2933 | - '%' . $record['role_id'] . '%' |
|
| 2933 | + '%'.$record['role_id'].'%' |
|
| 2934 | 2934 | ); |
| 2935 | 2935 | foreach ($rows2 as $record2) { |
| 2936 | 2936 | foreach (explode(';', $record2['fonction_id']) as $role) { |
@@ -2943,7 +2943,7 @@ discard block |
||
| 2943 | 2943 | array( |
| 2944 | 2944 | 'id' => (int) $record2['id'], |
| 2945 | 2945 | 'login' => $record2['login'], |
| 2946 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 2946 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 2947 | 2947 | 'email' => $record2['email'], |
| 2948 | 2948 | ) |
| 2949 | 2949 | ); |
@@ -2962,16 +2962,16 @@ discard block |
||
| 2962 | 2962 | $path = ''; |
| 2963 | 2963 | foreach ($arbo as $elem) { |
| 2964 | 2964 | if (empty($path) === true) { |
| 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 | } else { |
| 2967 | - $path .= '→ ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 2967 | + $path .= '→ '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 2968 | 2968 | } |
| 2969 | 2969 | } |
| 2970 | 2970 | // Build text to show user |
| 2971 | 2971 | if (empty($path) === true) { |
| 2972 | 2972 | $path = addslashes($dataItem['label']); |
| 2973 | 2973 | } else { |
| 2974 | - $path = addslashes($dataItem['label']) . ' (' . $path . ')'; |
|
| 2974 | + $path = addslashes($dataItem['label']).' ('.$path.')'; |
|
| 2975 | 2975 | } |
| 2976 | 2976 | |
| 2977 | 2977 | // send back infos |
@@ -2985,7 +2985,7 @@ discard block |
||
| 2985 | 2985 | array( |
| 2986 | 2986 | addslashes($_SESSION['login']), |
| 2987 | 2987 | $path, |
| 2988 | - $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'], |
|
| 2988 | + $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'], |
|
| 2989 | 2989 | ), |
| 2990 | 2990 | langHdl('email_on_open_notification_mail') |
| 2991 | 2991 | ), |
@@ -2996,7 +2996,7 @@ discard block |
||
| 2996 | 2996 | } |
| 2997 | 2997 | |
| 2998 | 2998 | // has this item a change proposal |
| 2999 | - DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $post_id); |
|
| 2999 | + DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $post_id); |
|
| 3000 | 3000 | $returnArray['has_change_proposal'] = DB::count(); |
| 3001 | 3001 | |
| 3002 | 3002 | // Setting |
@@ -3087,7 +3087,7 @@ discard block |
||
| 3087 | 3087 | // Load item data |
| 3088 | 3088 | $data = DB::queryFirstRow( |
| 3089 | 3089 | 'SELECT id_tree |
| 3090 | - FROM ' . prefixTable('items') . ' |
|
| 3090 | + FROM ' . prefixTable('items').' |
|
| 3091 | 3091 | WHERE id = %i', |
| 3092 | 3092 | $post_item_id |
| 3093 | 3093 | ); |
@@ -3157,13 +3157,13 @@ discard block |
||
| 3157 | 3157 | |
| 3158 | 3158 | // Check if user is allowed to access this folder |
| 3159 | 3159 | if (!in_array($post_folder_id, $_SESSION['groupes_visibles'])) { |
| 3160 | - echo '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3160 | + echo '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3161 | 3161 | break; |
| 3162 | 3162 | } |
| 3163 | 3163 | |
| 3164 | 3164 | // Check if title doesn't contains html codes |
| 3165 | 3165 | if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) { |
| 3166 | - echo '[ { "error" : "' . langHdl('error_html_codes') . '" } ]'; |
|
| 3166 | + echo '[ { "error" : "'.langHdl('error_html_codes').'" } ]'; |
|
| 3167 | 3167 | break; |
| 3168 | 3168 | } |
| 3169 | 3169 | // check that title is not numeric |
@@ -3174,9 +3174,9 @@ discard block |
||
| 3174 | 3174 | |
| 3175 | 3175 | // Check if duplicate folders name are allowed |
| 3176 | 3176 | if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') { |
| 3177 | - $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title); |
|
| 3177 | + $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title); |
|
| 3178 | 3178 | if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) { |
| 3179 | - echo '[ { "error" : "' . langHdl('error_group_exist') . '" } ]'; |
|
| 3179 | + echo '[ { "error" : "'.langHdl('error_group_exist').'" } ]'; |
|
| 3180 | 3180 | break; |
| 3181 | 3181 | } |
| 3182 | 3182 | } |
@@ -3184,7 +3184,7 @@ discard block |
||
| 3184 | 3184 | // query on folder |
| 3185 | 3185 | $data = DB::queryfirstrow( |
| 3186 | 3186 | 'SELECT parent_id, personal_folder |
| 3187 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3187 | + FROM ' . prefixTable('nested_tree').' |
|
| 3188 | 3188 | WHERE id = %i', |
| 3189 | 3189 | $post_folder_id |
| 3190 | 3190 | ); |
@@ -3194,20 +3194,20 @@ discard block |
||
| 3194 | 3194 | if ($_SESSION['is_admin'] !== 1 && $_SESSION['user_manager'] !== 1 && $data['personal_folder'] === '0') { |
| 3195 | 3195 | $data = DB::queryfirstrow( |
| 3196 | 3196 | 'SELECT valeur |
| 3197 | - FROM ' . prefixTable('misc') . ' |
|
| 3197 | + FROM ' . prefixTable('misc').' |
|
| 3198 | 3198 | WHERE intitule = %i AND type = %s', |
| 3199 | 3199 | $data['parent_id'], |
| 3200 | 3200 | 'complex' |
| 3201 | 3201 | ); |
| 3202 | 3202 | if (intval($dataReceived['complexity']) < intval($data['valeur'])) { |
| 3203 | - echo '[ { "error" : "' . langHdl('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]'; |
|
| 3203 | + echo '[ { "error" : "'.langHdl('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]'; |
|
| 3204 | 3204 | break; |
| 3205 | 3205 | } |
| 3206 | 3206 | } |
| 3207 | 3207 | |
| 3208 | 3208 | // update Folders table |
| 3209 | 3209 | $tmp = DB::queryFirstRow( |
| 3210 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 3210 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 3211 | 3211 | $dataReceived['folder'] |
| 3212 | 3212 | ); |
| 3213 | 3213 | if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $_SESSION['user_id'] || $tmp['personal_folder'] !== 1) { |
@@ -3272,42 +3272,42 @@ discard block |
||
| 3272 | 3272 | in_array($post_target_folder_id, $_SESSION['groupes_visibles']) === false) && ($post_target_folder_id === '0' && |
| 3273 | 3273 | isset($SETTINGS['can_create_root_folder']) === true && (int) $SETTINGS['can_create_root_folder'] === 1) |
| 3274 | 3274 | ) { |
| 3275 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3275 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3276 | 3276 | echo $returnValues; |
| 3277 | 3277 | break; |
| 3278 | 3278 | } |
| 3279 | 3279 | |
| 3280 | 3280 | $tmp_source = DB::queryFirstRow( |
| 3281 | 3281 | 'SELECT title, parent_id, personal_folder |
| 3282 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3282 | + FROM ' . prefixTable('nested_tree').' |
|
| 3283 | 3283 | WHERE id = %i', |
| 3284 | 3284 | $post_source_folder_id |
| 3285 | 3285 | ); |
| 3286 | 3286 | |
| 3287 | 3287 | $tmp_target = DB::queryFirstRow( |
| 3288 | 3288 | 'SELECT title, parent_id, personal_folder |
| 3289 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 3289 | + FROM ' . prefixTable('nested_tree').' |
|
| 3290 | 3290 | WHERE id = %i', |
| 3291 | 3291 | $post_target_folder_id |
| 3292 | 3292 | ); |
| 3293 | 3293 | |
| 3294 | 3294 | // check if target is not a child of source |
| 3295 | 3295 | if ($tree->isChildOf($post_target_folder_id, $post_source_folder_id) === true) { |
| 3296 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3296 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3297 | 3297 | echo $returnValues; |
| 3298 | 3298 | break; |
| 3299 | 3299 | } |
| 3300 | 3300 | |
| 3301 | 3301 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3302 | 3302 | if ((int) $tmp_source['personal_folder'] === 1 || (int) $tmp_target['personal_folder'] === 1) { |
| 3303 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3303 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3304 | 3304 | echo $returnValues; |
| 3305 | 3305 | break; |
| 3306 | 3306 | } |
| 3307 | 3307 | |
| 3308 | 3308 | // check if source or target folder is PF. If Yes, then cancel operation |
| 3309 | 3309 | if ($tmp_source['title'] === $_SESSION['user_id'] || $tmp_target['title'] === $_SESSION['user_id']) { |
| 3310 | - $returnValues = '[{"error" : "' . langHdl('error_not_allowed_to') . '"}]'; |
|
| 3310 | + $returnValues = '[{"error" : "'.langHdl('error_not_allowed_to').'"}]'; |
|
| 3311 | 3311 | echo $returnValues; |
| 3312 | 3312 | break; |
| 3313 | 3313 | } |
@@ -3429,7 +3429,7 @@ discard block |
||
| 3429 | 3429 | foreach ($_SESSION['user_roles'] as $role) { |
| 3430 | 3430 | $roleQ = DB::queryfirstrow( |
| 3431 | 3431 | 'SELECT allow_pw_change |
| 3432 | - FROM ' . prefixTable('roles_title') . ' |
|
| 3432 | + FROM ' . prefixTable('roles_title').' |
|
| 3433 | 3433 | WHERE id = %i', |
| 3434 | 3434 | $role |
| 3435 | 3435 | ); |
@@ -3454,11 +3454,11 @@ discard block |
||
| 3454 | 3454 | |
| 3455 | 3455 | foreach ($_SESSION['user_roles'] as $role) { |
| 3456 | 3456 | $access = DB::queryFirstRow( |
| 3457 | - 'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i', |
|
| 3457 | + 'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i', |
|
| 3458 | 3458 | $role, |
| 3459 | 3459 | $post_id |
| 3460 | 3460 | ); |
| 3461 | - if (DB::count()>0) { |
|
| 3461 | + if (DB::count() > 0) { |
|
| 3462 | 3462 | if ($access['type'] === 'R') { |
| 3463 | 3463 | array_push($arrTmp, 10); |
| 3464 | 3464 | } elseif ($access['type'] === 'W') { |
@@ -3522,7 +3522,7 @@ discard block |
||
| 3522 | 3522 | } else { |
| 3523 | 3523 | DB::query( |
| 3524 | 3524 | 'SELECT * |
| 3525 | - FROM ' . prefixTable('items') . ' |
|
| 3525 | + FROM ' . prefixTable('items').' |
|
| 3526 | 3526 | WHERE inactif = %i', |
| 3527 | 3527 | 0 |
| 3528 | 3528 | ); |
@@ -3532,7 +3532,7 @@ discard block |
||
| 3532 | 3532 | |
| 3533 | 3533 | // Get folder complexity |
| 3534 | 3534 | $folderComplexity = DB::queryFirstRow( |
| 3535 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i', |
|
| 3535 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i', |
|
| 3536 | 3536 | 'complex', |
| 3537 | 3537 | $post_id |
| 3538 | 3538 | ); |
@@ -3544,7 +3544,7 @@ discard block |
||
| 3544 | 3544 | if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) { |
| 3545 | 3545 | $folderRow = DB::query( |
| 3546 | 3546 | 'SELECT id_category |
| 3547 | - FROM ' . prefixTable('categories_folders') . ' |
|
| 3547 | + FROM ' . prefixTable('categories_folders').' |
|
| 3548 | 3548 | WHERE id_folder = %i', |
| 3549 | 3549 | $post_id |
| 3550 | 3550 | ); |
@@ -3658,13 +3658,13 @@ discard block |
||
| 3658 | 3658 | // List all ITEMS |
| 3659 | 3659 | if ($folderIsPf === false) { |
| 3660 | 3660 | $where->add('i.inactif=%i', 0); |
| 3661 | - $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)"); |
|
| 3661 | + $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)"); |
|
| 3662 | 3662 | if (empty($limited_to_items) === false) { |
| 3663 | 3663 | $where->add('i.id IN %ls', explode(',', $limited_to_items)); |
| 3664 | 3664 | } |
| 3665 | 3665 | |
| 3666 | - $query_limit = ' LIMIT ' . |
|
| 3667 | - $start . ',' . |
|
| 3666 | + $query_limit = ' LIMIT '. |
|
| 3667 | + $start.','. |
|
| 3668 | 3668 | $post_nb_items_to_display_once; |
| 3669 | 3669 | //db::debugmode(true); |
| 3670 | 3670 | $rows = DB::query( |
@@ -3675,9 +3675,9 @@ discard block |
||
| 3675 | 3675 | MIN(l.action) AS log_action, |
| 3676 | 3676 | l.id_user AS log_user, |
| 3677 | 3677 | i.url AS link |
| 3678 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3679 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3680 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 3678 | + FROM ' . prefixTable('items').' AS i |
|
| 3679 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3680 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 3681 | 3681 | WHERE %l |
| 3682 | 3682 | GROUP BY i.id, l.date, l.id_user, l.action |
| 3683 | 3683 | ORDER BY i.label ASC, l.date DESC' . $query_limit, |
@@ -3696,9 +3696,9 @@ discard block |
||
| 3696 | 3696 | MIN(l.action) AS log_action, |
| 3697 | 3697 | l.id_user AS log_user, |
| 3698 | 3698 | i.url AS link |
| 3699 | - FROM ' . prefixTable('items') . ' AS i |
|
| 3700 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id) |
|
| 3701 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON (i.id = l.id_item) |
|
| 3699 | + FROM ' . prefixTable('items').' AS i |
|
| 3700 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id) |
|
| 3701 | + INNER JOIN ' . prefixTable('log_items').' AS l ON (i.id = l.id_item) |
|
| 3702 | 3702 | WHERE %l |
| 3703 | 3703 | GROUP BY i.id, l.date, l.id_user, l.action |
| 3704 | 3704 | ORDER BY i.label ASC, l.date DESC', |
@@ -3728,7 +3728,7 @@ discard block |
||
| 3728 | 3728 | $item_is_restricted_to_role = false; |
| 3729 | 3729 | DB::queryfirstrow( |
| 3730 | 3730 | 'SELECT role_id |
| 3731 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3731 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3732 | 3732 | WHERE item_id = %i', |
| 3733 | 3733 | $record['id'] |
| 3734 | 3734 | ); |
@@ -3740,7 +3740,7 @@ discard block |
||
| 3740 | 3740 | $user_is_included_in_role = false; |
| 3741 | 3741 | DB::query( |
| 3742 | 3742 | 'SELECT role_id |
| 3743 | - FROM ' . prefixTable('restriction_to_roles') . ' |
|
| 3743 | + FROM ' . prefixTable('restriction_to_roles').' |
|
| 3744 | 3744 | WHERE item_id = %i AND role_id IN %ls', |
| 3745 | 3745 | $record['id'], |
| 3746 | 3746 | $_SESSION['user_roles'] |
@@ -3944,9 +3944,9 @@ discard block |
||
| 3944 | 3944 | if ((int) $start === 0) { |
| 3945 | 3945 | DB::query( |
| 3946 | 3946 | 'SELECT i.id |
| 3947 | - FROM ' . prefixTable('items') . ' as i |
|
| 3948 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id) |
|
| 3949 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item) |
|
| 3947 | + FROM ' . prefixTable('items').' as i |
|
| 3948 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id) |
|
| 3949 | + INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item) |
|
| 3950 | 3950 | WHERE %l |
| 3951 | 3951 | ORDER BY i.label ASC, l.date DESC', |
| 3952 | 3952 | $where |
@@ -4010,8 +4010,8 @@ discard block |
||
| 4010 | 4010 | // Run query |
| 4011 | 4011 | $dataItem = DB::queryfirstrow( |
| 4012 | 4012 | 'SELECT i.pw AS pw, s.share_key AS share_key |
| 4013 | - FROM ' . prefixTable('items') . ' AS i |
|
| 4014 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id) |
|
| 4013 | + FROM ' . prefixTable('items').' AS i |
|
| 4014 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id) |
|
| 4015 | 4015 | WHERE user_id = %i AND i.id = %i', |
| 4016 | 4016 | $_SESSION['user_id'], |
| 4017 | 4017 | $post_item_id |
@@ -4054,7 +4054,7 @@ discard block |
||
| 4054 | 4054 | if (null !== $post_item_id && empty($post_item_id) === false) { |
| 4055 | 4055 | $dataItem = DB::queryfirstrow( |
| 4056 | 4056 | 'SELECT perso, anyone_can_modify |
| 4057 | - FROM ' . prefixTable('items') . ' |
|
| 4057 | + FROM ' . prefixTable('items').' |
|
| 4058 | 4058 | WHERE id=%i', |
| 4059 | 4059 | $post_item_id |
| 4060 | 4060 | ); |
@@ -4091,7 +4091,7 @@ discard block |
||
| 4091 | 4091 | */ |
| 4092 | 4092 | |
| 4093 | 4093 | // Lock Item (if already locked), go back and warn |
| 4094 | - $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', $post_item_id); |
|
| 4094 | + $dataTmp = DB::queryFirstRow('SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', $post_item_id); |
|
| 4095 | 4095 | |
| 4096 | 4096 | // If token is taken for this Item and delay is passed then delete it. |
| 4097 | 4097 | if ( |
@@ -4102,7 +4102,7 @@ discard block |
||
| 4102 | 4102 | DB::delete(prefixTable('items_edition'), 'item_id = %i', $post_item_id); |
| 4103 | 4103 | //reload the previous data |
| 4104 | 4104 | $dataTmp = DB::queryFirstRow( |
| 4105 | - 'SELECT timestamp, user_id FROM ' . prefixTable('items_edition') . ' WHERE item_id = %i', |
|
| 4105 | + 'SELECT timestamp, user_id FROM '.prefixTable('items_edition').' WHERE item_id = %i', |
|
| 4106 | 4106 | $post_item_id |
| 4107 | 4107 | ); |
| 4108 | 4108 | } |
@@ -4142,7 +4142,7 @@ discard block |
||
| 4142 | 4142 | // do query on this folder |
| 4143 | 4143 | $data_this_folder = DB::queryFirstRow( |
| 4144 | 4144 | 'SELECT id, personal_folder, title |
| 4145 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4145 | + FROM ' . prefixTable('nested_tree').' |
|
| 4146 | 4146 | WHERE id = %s', |
| 4147 | 4147 | $post_groupe |
| 4148 | 4148 | ); |
@@ -4179,8 +4179,8 @@ discard block |
||
| 4179 | 4179 | $visibilite = ''; |
| 4180 | 4180 | $data = DB::queryFirstRow( |
| 4181 | 4181 | 'SELECT m.valeur, n.personal_folder |
| 4182 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 4183 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id) |
|
| 4182 | + FROM ' . prefixTable('misc').' AS m |
|
| 4183 | + INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id) |
|
| 4184 | 4184 | WHERE type=%s AND intitule = %s', |
| 4185 | 4185 | 'complex', |
| 4186 | 4186 | $post_groupe |
@@ -4193,8 +4193,8 @@ discard block |
||
| 4193 | 4193 | // Prepare Item actual visibility (what Users/Roles can see it) |
| 4194 | 4194 | $rows = DB::query( |
| 4195 | 4195 | 'SELECT t.title |
| 4196 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 4197 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 4196 | + FROM ' . prefixTable('roles_values').' as v |
|
| 4197 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 4198 | 4198 | WHERE v.folder_id = %i |
| 4199 | 4199 | GROUP BY title', |
| 4200 | 4200 | $post_groupe |
@@ -4203,7 +4203,7 @@ discard block |
||
| 4203 | 4203 | if (empty($visibilite)) { |
| 4204 | 4204 | $visibilite = $record['title']; |
| 4205 | 4205 | } else { |
| 4206 | - $visibilite .= ' - ' . $record['title']; |
|
| 4206 | + $visibilite .= ' - '.$record['title']; |
|
| 4207 | 4207 | } |
| 4208 | 4208 | } |
| 4209 | 4209 | } else { |
@@ -4213,14 +4213,14 @@ discard block |
||
| 4213 | 4213 | // do new query to know if current folder is pf |
| 4214 | 4214 | $data_pf = DB::queryFirstRow( |
| 4215 | 4215 | 'SELECT personal_folder |
| 4216 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4216 | + FROM ' . prefixTable('nested_tree').' |
|
| 4217 | 4217 | WHERE id = %s', |
| 4218 | 4218 | $post_groupe |
| 4219 | 4219 | ); |
| 4220 | 4220 | |
| 4221 | 4221 | $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0; |
| 4222 | 4222 | |
| 4223 | - $visibilite = $_SESSION['name'] . ' ' . $_SESSION['lastname'] . ' (' . $_SESSION['login'] . ')'; |
|
| 4223 | + $visibilite = $_SESSION['name'].' '.$_SESSION['lastname'].' ('.$_SESSION['login'].')'; |
|
| 4224 | 4224 | } |
| 4225 | 4225 | |
| 4226 | 4226 | recupDroitCreationSansComplexite($post_groupe); |
@@ -4230,8 +4230,8 @@ discard block |
||
| 4230 | 4230 | $listOptionsForRoles = array(); |
| 4231 | 4231 | $rows = DB::query( |
| 4232 | 4232 | 'SELECT r.role_id AS role_id, t.title AS title |
| 4233 | - FROM ' . prefixTable('roles_values') . ' AS r |
|
| 4234 | - INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id) |
|
| 4233 | + FROM ' . prefixTable('roles_values').' AS r |
|
| 4234 | + INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id) |
|
| 4235 | 4235 | WHERE r.folder_id = %i', |
| 4236 | 4236 | $post_groupe |
| 4237 | 4237 | ); |
@@ -4245,7 +4245,7 @@ discard block |
||
| 4245 | 4245 | ); |
| 4246 | 4246 | $rows2 = DB::query( |
| 4247 | 4247 | 'SELECT id, login, fonction_id, email, name, lastname |
| 4248 | - FROM ' . prefixTable('users') . ' |
|
| 4248 | + FROM ' . prefixTable('users').' |
|
| 4249 | 4249 | WHERE admin = 0' |
| 4250 | 4250 | ); |
| 4251 | 4251 | foreach ($rows2 as $record2) { |
@@ -4259,7 +4259,7 @@ discard block |
||
| 4259 | 4259 | array( |
| 4260 | 4260 | 'id' => $record2['id'], |
| 4261 | 4261 | 'login' => $record2['login'], |
| 4262 | - 'name' => $record2['name'] . ' ' . $record2['lastname'], |
|
| 4262 | + 'name' => $record2['name'].' '.$record2['lastname'], |
|
| 4263 | 4263 | 'email' => $record2['email'], |
| 4264 | 4264 | ) |
| 4265 | 4265 | ); |
@@ -4276,13 +4276,13 @@ discard block |
||
| 4276 | 4276 | //db::debugmode(true); |
| 4277 | 4277 | $access = DB::queryFirstRow( |
| 4278 | 4278 | 'SELECT type |
| 4279 | - FROM ' . prefixTable('roles_values') . ' |
|
| 4279 | + FROM ' . prefixTable('roles_values').' |
|
| 4280 | 4280 | WHERE role_id = %i AND folder_id = %i', |
| 4281 | 4281 | $role, |
| 4282 | 4282 | $post_groupe |
| 4283 | 4283 | ); |
| 4284 | 4284 | //db::debugmode(false); |
| 4285 | - if (DB::count()>0) { |
|
| 4285 | + if (DB::count() > 0) { |
|
| 4286 | 4286 | if ($access['type'] === 'R') { |
| 4287 | 4287 | array_push($arrTmp, 10); |
| 4288 | 4288 | } elseif ($access['type'] === 'W') { |
@@ -4352,7 +4352,7 @@ discard block |
||
| 4352 | 4352 | // Get some info before deleting |
| 4353 | 4353 | $data = DB::queryFirstRow( |
| 4354 | 4354 | 'SELECT name, id_item, file |
| 4355 | - FROM ' . prefixTable('files') . ' |
|
| 4355 | + FROM ' . prefixTable('files').' |
|
| 4356 | 4356 | WHERE id = %i', |
| 4357 | 4357 | $fileId |
| 4358 | 4358 | ); |
@@ -4360,7 +4360,7 @@ discard block |
||
| 4360 | 4360 | // Load item data |
| 4361 | 4361 | $data_item = DB::queryFirstRow( |
| 4362 | 4362 | 'SELECT id_tree |
| 4363 | - FROM ' . prefixTable('items') . ' |
|
| 4363 | + FROM ' . prefixTable('items').' |
|
| 4364 | 4364 | WHERE id = %i', |
| 4365 | 4365 | $data['id_item'] |
| 4366 | 4366 | ); |
@@ -4387,7 +4387,7 @@ discard block |
||
| 4387 | 4387 | $_SESSION['user_id'], |
| 4388 | 4388 | 'at_modification', |
| 4389 | 4389 | $_SESSION['login'], |
| 4390 | - 'at_del_file : ' . $data['name'] |
|
| 4390 | + 'at_del_file : '.$data['name'] |
|
| 4391 | 4391 | ); |
| 4392 | 4392 | |
| 4393 | 4393 | // DElete sharekeys |
@@ -4398,7 +4398,7 @@ discard block |
||
| 4398 | 4398 | ); |
| 4399 | 4399 | |
| 4400 | 4400 | // Delete file from server |
| 4401 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']), $SETTINGS); |
|
| 4401 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']), $SETTINGS); |
|
| 4402 | 4402 | } |
| 4403 | 4403 | |
| 4404 | 4404 | echo (string) prepareExchangedData( |
@@ -4417,7 +4417,7 @@ discard block |
||
| 4417 | 4417 | case 'clear_html_tags': |
| 4418 | 4418 | // Get information for this item |
| 4419 | 4419 | $dataItem = DB::queryfirstrow( |
| 4420 | - 'SELECT description FROM ' . prefixTable('items') . ' WHERE id=%i', |
|
| 4420 | + 'SELECT description FROM '.prefixTable('items').' WHERE id=%i', |
|
| 4421 | 4421 | filter_input(INPUT_POST, 'id_item', FILTER_SANITIZE_NUMBER_INT) |
| 4422 | 4422 | ); |
| 4423 | 4423 | // Clean up the string |
@@ -4455,12 +4455,12 @@ discard block |
||
| 4455 | 4455 | // Update SESSION with this new favourite |
| 4456 | 4456 | $data = DB::queryfirstrow( |
| 4457 | 4457 | 'SELECT label,id_tree |
| 4458 | - FROM ' . prefixTable('items') . ' |
|
| 4458 | + FROM ' . prefixTable('items').' |
|
| 4459 | 4459 | WHERE id = ' . mysqli_real_escape_string($link, $post_item_id) |
| 4460 | 4460 | ); |
| 4461 | 4461 | $_SESSION['favourites_tab'][$post_item_id] = array( |
| 4462 | 4462 | 'label' => $data['label'], |
| 4463 | - 'url' => 'index.php?page=items&group=' . $data['id_tree'] . '&id=' . $post_item_id, |
|
| 4463 | + 'url' => 'index.php?page=items&group='.$data['id_tree'].'&id='.$post_item_id, |
|
| 4464 | 4464 | ); |
| 4465 | 4465 | } elseif ((int) filter_input(INPUT_POST, 'action', FILTER_SANITIZE_NUMBER_INT) === 1) { |
| 4466 | 4466 | // delete from session |
@@ -4529,8 +4529,8 @@ discard block |
||
| 4529 | 4529 | // get data about item |
| 4530 | 4530 | $dataSource = DB::queryfirstrow( |
| 4531 | 4531 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 4532 | - FROM ' . prefixTable('items') . ' as i |
|
| 4533 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 4532 | + FROM ' . prefixTable('items').' as i |
|
| 4533 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 4534 | 4534 | WHERE i.id=%i', |
| 4535 | 4535 | $post_item_id |
| 4536 | 4536 | ); |
@@ -4538,7 +4538,7 @@ discard block |
||
| 4538 | 4538 | // get data about new folder |
| 4539 | 4539 | $dataDestination = DB::queryfirstrow( |
| 4540 | 4540 | 'SELECT personal_folder, title |
| 4541 | - FROM ' . prefixTable('nested_tree') . ' |
|
| 4541 | + FROM ' . prefixTable('nested_tree').' |
|
| 4542 | 4542 | WHERE id = %i', |
| 4543 | 4543 | $post_folder_id |
| 4544 | 4544 | ); |
@@ -4590,7 +4590,7 @@ discard block |
||
| 4590 | 4590 | // Get fields for this Item |
| 4591 | 4591 | $rows = DB::query( |
| 4592 | 4592 | 'SELECT id |
| 4593 | - FROM ' . prefixTable('categories_items') . ' |
|
| 4593 | + FROM ' . prefixTable('categories_items').' |
|
| 4594 | 4594 | WHERE item_id = %i', |
| 4595 | 4595 | $post_item_id |
| 4596 | 4596 | ); |
@@ -4607,7 +4607,7 @@ discard block |
||
| 4607 | 4607 | // Get FILES for this Item |
| 4608 | 4608 | $rows = DB::query( |
| 4609 | 4609 | 'SELECT id |
| 4610 | - FROM ' . prefixTable('files') . ' |
|
| 4610 | + FROM ' . prefixTable('files').' |
|
| 4611 | 4611 | WHERE id_item = %i', |
| 4612 | 4612 | $post_item_id |
| 4613 | 4613 | ); |
@@ -4652,7 +4652,7 @@ discard block |
||
| 4652 | 4652 | // Get the ITEM object key for the user |
| 4653 | 4653 | $userKey = DB::queryFirstRow( |
| 4654 | 4654 | 'SELECT share_key |
| 4655 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 4655 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 4656 | 4656 | WHERE user_id = %i AND object_id = %i', |
| 4657 | 4657 | $_SESSION['user_id'], |
| 4658 | 4658 | $post_item_id |
@@ -4663,8 +4663,8 @@ discard block |
||
| 4663 | 4663 | // This is a public object |
| 4664 | 4664 | $users = DB::query( |
| 4665 | 4665 | 'SELECT id, public_key |
| 4666 | - FROM ' . prefixTable('users') . ' |
|
| 4667 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 4666 | + FROM ' . prefixTable('users').' |
|
| 4667 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 4668 | 4668 | AND public_key != ""' |
| 4669 | 4669 | ); |
| 4670 | 4670 | foreach ($users as $user) { |
@@ -4684,14 +4684,14 @@ discard block |
||
| 4684 | 4684 | // Get fields for this Item |
| 4685 | 4685 | $rows = DB::query( |
| 4686 | 4686 | 'SELECT id |
| 4687 | - FROM ' . prefixTable('categories_items') . ' |
|
| 4687 | + FROM ' . prefixTable('categories_items').' |
|
| 4688 | 4688 | WHERE item_id = %i', |
| 4689 | 4689 | $post_item_id |
| 4690 | 4690 | ); |
| 4691 | 4691 | foreach ($rows as $field) { |
| 4692 | 4692 | $userKey = DB::queryFirstRow( |
| 4693 | 4693 | 'SELECT share_key |
| 4694 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 4694 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 4695 | 4695 | WHERE user_id = %i AND object_id = %i', |
| 4696 | 4696 | $_SESSION['user_id'], |
| 4697 | 4697 | $field['id'] |
@@ -4702,8 +4702,8 @@ discard block |
||
| 4702 | 4702 | // This is a public object |
| 4703 | 4703 | $users = DB::query( |
| 4704 | 4704 | 'SELECT id, public_key |
| 4705 | - FROM ' . prefixTable('users') . ' |
|
| 4706 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 4705 | + FROM ' . prefixTable('users').' |
|
| 4706 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 4707 | 4707 | AND public_key != ""' |
| 4708 | 4708 | ); |
| 4709 | 4709 | foreach ($users as $user) { |
@@ -4724,14 +4724,14 @@ discard block |
||
| 4724 | 4724 | // Get FILES for this Item |
| 4725 | 4725 | $rows = DB::query( |
| 4726 | 4726 | 'SELECT id |
| 4727 | - FROM ' . prefixTable('files') . ' |
|
| 4727 | + FROM ' . prefixTable('files').' |
|
| 4728 | 4728 | WHERE id_item = %i', |
| 4729 | 4729 | $post_item_id |
| 4730 | 4730 | ); |
| 4731 | 4731 | foreach ($rows as $attachment) { |
| 4732 | 4732 | $userKey = DB::queryFirstRow( |
| 4733 | 4733 | 'SELECT share_key |
| 4734 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 4734 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 4735 | 4735 | WHERE user_id = %i AND object_id = %i', |
| 4736 | 4736 | $_SESSION['user_id'], |
| 4737 | 4737 | $attachment['id'] |
@@ -4742,8 +4742,8 @@ discard block |
||
| 4742 | 4742 | // This is a public object |
| 4743 | 4743 | $users = DB::query( |
| 4744 | 4744 | 'SELECT id, public_key |
| 4745 | - FROM ' . prefixTable('users') . ' |
|
| 4746 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 4745 | + FROM ' . prefixTable('users').' |
|
| 4746 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 4747 | 4747 | AND public_key != ""' |
| 4748 | 4748 | ); |
| 4749 | 4749 | foreach ($users as $user) { |
@@ -4780,7 +4780,7 @@ discard block |
||
| 4780 | 4780 | $_SESSION['user_id'], |
| 4781 | 4781 | 'at_modification', |
| 4782 | 4782 | $_SESSION['login'], |
| 4783 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 4783 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 4784 | 4784 | ); |
| 4785 | 4785 | |
| 4786 | 4786 | $returnValues = array( |
@@ -4833,8 +4833,8 @@ discard block |
||
| 4833 | 4833 | // get data about item |
| 4834 | 4834 | $dataSource = DB::queryfirstrow( |
| 4835 | 4835 | 'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label |
| 4836 | - FROM ' . prefixTable('items') . ' as i |
|
| 4837 | - INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id) |
|
| 4836 | + FROM ' . prefixTable('items').' as i |
|
| 4837 | + INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id) |
|
| 4838 | 4838 | WHERE i.id=%i', |
| 4839 | 4839 | $item_id |
| 4840 | 4840 | ); |
@@ -4856,7 +4856,7 @@ discard block |
||
| 4856 | 4856 | |
| 4857 | 4857 | // get data about new folder |
| 4858 | 4858 | $dataDestination = DB::queryfirstrow( |
| 4859 | - 'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 4859 | + 'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 4860 | 4860 | $post_folder_id |
| 4861 | 4861 | ); |
| 4862 | 4862 | |
@@ -4897,7 +4897,7 @@ discard block |
||
| 4897 | 4897 | // Get fields for this Item |
| 4898 | 4898 | $rows = DB::query( |
| 4899 | 4899 | 'SELECT id |
| 4900 | - FROM ' . prefixTable('categories_items') . ' |
|
| 4900 | + FROM ' . prefixTable('categories_items').' |
|
| 4901 | 4901 | WHERE item_id = %i', |
| 4902 | 4902 | $item_id |
| 4903 | 4903 | ); |
@@ -4914,7 +4914,7 @@ discard block |
||
| 4914 | 4914 | // Get FILES for this Item |
| 4915 | 4915 | $rows = DB::query( |
| 4916 | 4916 | 'SELECT id |
| 4917 | - FROM ' . prefixTable('files') . ' |
|
| 4917 | + FROM ' . prefixTable('files').' |
|
| 4918 | 4918 | WHERE id_item = %i', |
| 4919 | 4919 | $item_id |
| 4920 | 4920 | ); |
@@ -4967,7 +4967,7 @@ discard block |
||
| 4967 | 4967 | // Get the ITEM object key for the user |
| 4968 | 4968 | $userKey = DB::queryFirstRow( |
| 4969 | 4969 | 'SELECT share_key |
| 4970 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 4970 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 4971 | 4971 | WHERE user_id = %i AND object_id = %i', |
| 4972 | 4972 | $_SESSION['user_id'], |
| 4973 | 4973 | $item_id |
@@ -4978,8 +4978,8 @@ discard block |
||
| 4978 | 4978 | // This is a public object |
| 4979 | 4979 | $users = DB::query( |
| 4980 | 4980 | 'SELECT id, public_key |
| 4981 | - FROM ' . prefixTable('users') . ' |
|
| 4982 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 4981 | + FROM ' . prefixTable('users').' |
|
| 4982 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 4983 | 4983 | AND public_key != ""' |
| 4984 | 4984 | ); |
| 4985 | 4985 | foreach ($users as $user) { |
@@ -4999,14 +4999,14 @@ discard block |
||
| 4999 | 4999 | // Get fields for this Item |
| 5000 | 5000 | $rows = DB::query( |
| 5001 | 5001 | 'SELECT id |
| 5002 | - FROM ' . prefixTable('categories_items') . ' |
|
| 5002 | + FROM ' . prefixTable('categories_items').' |
|
| 5003 | 5003 | WHERE item_id = %i', |
| 5004 | 5004 | $item_id |
| 5005 | 5005 | ); |
| 5006 | 5006 | foreach ($rows as $field) { |
| 5007 | 5007 | $userKey = DB::queryFirstRow( |
| 5008 | 5008 | 'SELECT share_key |
| 5009 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 5009 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 5010 | 5010 | WHERE user_id = %i AND object_id = %i', |
| 5011 | 5011 | $_SESSION['user_id'], |
| 5012 | 5012 | $field['id'] |
@@ -5017,8 +5017,8 @@ discard block |
||
| 5017 | 5017 | // This is a public object |
| 5018 | 5018 | $users = DB::query( |
| 5019 | 5019 | 'SELECT id, public_key |
| 5020 | - FROM ' . prefixTable('users') . ' |
|
| 5021 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 5020 | + FROM ' . prefixTable('users').' |
|
| 5021 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 5022 | 5022 | AND public_key != ""' |
| 5023 | 5023 | ); |
| 5024 | 5024 | foreach ($users as $user) { |
@@ -5039,14 +5039,14 @@ discard block |
||
| 5039 | 5039 | // Get FILES for this Item |
| 5040 | 5040 | $rows = DB::query( |
| 5041 | 5041 | 'SELECT id |
| 5042 | - FROM ' . prefixTable('files') . ' |
|
| 5042 | + FROM ' . prefixTable('files').' |
|
| 5043 | 5043 | WHERE id_item = %i', |
| 5044 | 5044 | $item_id |
| 5045 | 5045 | ); |
| 5046 | 5046 | foreach ($rows as $attachment) { |
| 5047 | 5047 | $userKey = DB::queryFirstRow( |
| 5048 | 5048 | 'SELECT share_key |
| 5049 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 5049 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 5050 | 5050 | WHERE user_id = %i AND object_id = %i', |
| 5051 | 5051 | $_SESSION['user_id'], |
| 5052 | 5052 | $attachment['id'] |
@@ -5057,8 +5057,8 @@ discard block |
||
| 5057 | 5057 | // This is a public object |
| 5058 | 5058 | $users = DB::query( |
| 5059 | 5059 | 'SELECT id, public_key |
| 5060 | - FROM ' . prefixTable('users') . ' |
|
| 5061 | - WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '","' . $_SESSION['user_id'] . '") |
|
| 5060 | + FROM ' . prefixTable('users').' |
|
| 5061 | + WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'","'.$_SESSION['user_id'].'") |
|
| 5062 | 5062 | AND public_key != ""' |
| 5063 | 5063 | ); |
| 5064 | 5064 | foreach ($users as $user) { |
@@ -5094,13 +5094,13 @@ discard block |
||
| 5094 | 5094 | $_SESSION['user_id'], |
| 5095 | 5095 | 'at_modification', |
| 5096 | 5096 | $_SESSION['login'], |
| 5097 | - 'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title'] |
|
| 5097 | + 'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title'] |
|
| 5098 | 5098 | ); |
| 5099 | 5099 | } |
| 5100 | 5100 | } |
| 5101 | 5101 | |
| 5102 | 5102 | // reload cache table |
| 5103 | - require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php'; |
|
| 5103 | + require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php'; |
|
| 5104 | 5104 | updateCacheTable('reload', $SETTINGS, ''); |
| 5105 | 5105 | |
| 5106 | 5106 | echo (string) prepareExchangedData( |
@@ -5164,7 +5164,7 @@ discard block |
||
| 5164 | 5164 | // get info |
| 5165 | 5165 | $dataSource = DB::queryfirstrow( |
| 5166 | 5166 | 'SELECT label, id_tree |
| 5167 | - FROM ' . prefixTable('items') . ' |
|
| 5167 | + FROM ' . prefixTable('items').' |
|
| 5168 | 5168 | WHERE id=%i', |
| 5169 | 5169 | $item_id |
| 5170 | 5170 | ); |
@@ -5264,8 +5264,8 @@ discard block |
||
| 5264 | 5264 | $content = explode(',', filter_input(INPUT_POST, 'content', FILTER_SANITIZE_STRING)); |
| 5265 | 5265 | } |
| 5266 | 5266 | // Variables |
| 5267 | - $dataAuthor = DB::queryfirstrow('SELECT email,login FROM ' . prefixTable('users') . ' WHERE id= ' . $content[1]); |
|
| 5268 | - $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM ' . prefixTable('items') . ' WHERE id= ' . $content[0]); |
|
| 5267 | + $dataAuthor = DB::queryfirstrow('SELECT email,login FROM '.prefixTable('users').' WHERE id= '.$content[1]); |
|
| 5268 | + $dataItem = DB::queryfirstrow('SELECT label, id_tree FROM '.prefixTable('items').' WHERE id= '.$content[0]); |
|
| 5269 | 5269 | |
| 5270 | 5270 | // Get path |
| 5271 | 5271 | $path = geItemReadablePath( |
@@ -5279,7 +5279,7 @@ discard block |
||
| 5279 | 5279 | langHdl('email_request_access_subject'), |
| 5280 | 5280 | str_replace( |
| 5281 | 5281 | array('#tp_item_author#', '#tp_user#', '#tp_item#'), |
| 5282 | - array(' ' . addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path), |
|
| 5282 | + array(' '.addslashes($dataAuthor['login']), addslashes($_SESSION['login']), $path), |
|
| 5283 | 5283 | langHdl('email_request_access_mail') |
| 5284 | 5284 | ), |
| 5285 | 5285 | $dataAuthor['email'], |
@@ -5290,7 +5290,7 @@ discard block |
||
| 5290 | 5290 | } elseif ($post_cat === 'share_this_item') { |
| 5291 | 5291 | $dataItem = DB::queryfirstrow( |
| 5292 | 5292 | 'SELECT label,id_tree |
| 5293 | - FROM ' . prefixTable('items') . ' |
|
| 5293 | + FROM ' . prefixTable('items').' |
|
| 5294 | 5294 | WHERE id= %i', |
| 5295 | 5295 | $post_id |
| 5296 | 5296 | ); |
@@ -5314,7 +5314,7 @@ discard block |
||
| 5314 | 5314 | ), |
| 5315 | 5315 | array( |
| 5316 | 5316 | empty($SETTINGS['email_server_url']) === false ? |
| 5317 | - $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, |
|
| 5317 | + $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, |
|
| 5318 | 5318 | addslashes($_SESSION['login']), |
| 5319 | 5319 | addslashes($path), |
| 5320 | 5320 | ), |
@@ -5349,7 +5349,7 @@ discard block |
||
| 5349 | 5349 | if (filter_input(INPUT_POST, 'notify_type', FILTER_SANITIZE_STRING) === 'on_show') { |
| 5350 | 5350 | // Check if values already exist |
| 5351 | 5351 | $data = DB::queryfirstrow( |
| 5352 | - 'SELECT notification FROM ' . prefixTable('items') . ' WHERE id = %i', |
|
| 5352 | + 'SELECT notification FROM '.prefixTable('items').' WHERE id = %i', |
|
| 5353 | 5353 | $post_item_id |
| 5354 | 5354 | ); |
| 5355 | 5355 | $notifiedUsers = explode(';', $data['notification']); |
@@ -5360,8 +5360,8 @@ discard block |
||
| 5360 | 5360 | prefixTable('items'), |
| 5361 | 5361 | array( |
| 5362 | 5362 | 'notification' => empty($data['notification']) ? |
| 5363 | - filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT) . ';' |
|
| 5364 | - : $data['notification'] . filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
| 5363 | + filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT).';' |
|
| 5364 | + : $data['notification'].filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
| 5365 | 5365 | ), |
| 5366 | 5366 | 'id=%i', |
| 5367 | 5367 | $post_item_id |
@@ -5377,7 +5377,7 @@ discard block |
||
| 5377 | 5377 | array( |
| 5378 | 5378 | 'notification' => empty($data['notification']) ? |
| 5379 | 5379 | filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT) |
| 5380 | - : $data['notification'] . ';' . filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
| 5380 | + : $data['notification'].';'.filter_input(INPUT_POST, 'user_id', FILTER_SANITIZE_NUMBER_INT), |
|
| 5381 | 5381 | ), |
| 5382 | 5382 | 'id=%i', |
| 5383 | 5383 | $post_item_id |
@@ -5402,8 +5402,8 @@ discard block |
||
| 5402 | 5402 | // Get all informations for this item |
| 5403 | 5403 | $dataItem = DB::queryfirstrow( |
| 5404 | 5404 | 'SELECT * |
| 5405 | - FROM ' . prefixTable('items') . ' as i |
|
| 5406 | - INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id) |
|
| 5405 | + FROM ' . prefixTable('items').' as i |
|
| 5406 | + INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id) |
|
| 5407 | 5407 | WHERE i.id=%i AND l.action = %s', |
| 5408 | 5408 | $dataReceived['item_id'], |
| 5409 | 5409 | 'at_creation' |
@@ -5434,14 +5434,14 @@ discard block |
||
| 5434 | 5434 | ); |
| 5435 | 5435 | // Prepare new line |
| 5436 | 5436 | $data = DB::queryfirstrow( |
| 5437 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC', |
|
| 5437 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC', |
|
| 5438 | 5438 | $dataReceived['item_id'] |
| 5439 | 5439 | ); |
| 5440 | - $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $data['date']) . ' - ' . $_SESSION['login'] . ' - ' . langHdl($data['action']) . ' - ' . $data['raison']; |
|
| 5440 | + $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $data['date']).' - '.$_SESSION['login'].' - '.langHdl($data['action']).' - '.$data['raison']; |
|
| 5441 | 5441 | // send back |
| 5442 | 5442 | $data = array( |
| 5443 | 5443 | 'error' => '', |
| 5444 | - 'new_line' => '<br>' . addslashes($historic), |
|
| 5444 | + 'new_line' => '<br>'.addslashes($historic), |
|
| 5445 | 5445 | ); |
| 5446 | 5446 | echo (string) prepareExchangedData($data, 'encode'); |
| 5447 | 5447 | } else { |
@@ -5475,7 +5475,7 @@ discard block |
||
| 5475 | 5475 | */ |
| 5476 | 5476 | case 'is_item_changed': |
| 5477 | 5477 | $data = DB::queryFirstRow( |
| 5478 | - 'SELECT date FROM ' . prefixTable('log_items') . ' WHERE action = %s AND id_item = %i ORDER BY date DESC', |
|
| 5478 | + 'SELECT date FROM '.prefixTable('log_items').' WHERE action = %s AND id_item = %i ORDER BY date DESC', |
|
| 5479 | 5479 | 'at_modification', |
| 5480 | 5480 | $post_item_id |
| 5481 | 5481 | ); |
@@ -5499,7 +5499,7 @@ discard block |
||
| 5499 | 5499 | } |
| 5500 | 5500 | |
| 5501 | 5501 | // delete all existing old otv codes |
| 5502 | - $rows = DB::query('SELECT id FROM ' . prefixTable('otv') . ' WHERE timestamp < ' . (time() - $SETTINGS['otv_expiration_period'] * 86400)); |
|
| 5502 | + $rows = DB::query('SELECT id FROM '.prefixTable('otv').' WHERE timestamp < '.(time() - $SETTINGS['otv_expiration_period'] * 86400)); |
|
| 5503 | 5503 | foreach ($rows as $record) { |
| 5504 | 5504 | DB::delete(prefixTable('otv'), 'id=%i', $record['id']); |
| 5505 | 5505 | } |
@@ -5521,8 +5521,8 @@ discard block |
||
| 5521 | 5521 | // Should we log a password change? |
| 5522 | 5522 | $itemQ = DB::queryFirstRow( |
| 5523 | 5523 | 'SELECT s.share_key, i.pw |
| 5524 | - FROM ' . prefixTable('items') . ' AS i |
|
| 5525 | - INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id) |
|
| 5524 | + FROM ' . prefixTable('items').' AS i |
|
| 5525 | + INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id) |
|
| 5526 | 5526 | WHERE s.user_id = %i AND s.object_id = %i', |
| 5527 | 5527 | $_SESSION['user_id'], |
| 5528 | 5528 | $post_id |
@@ -5572,7 +5572,7 @@ discard block |
||
| 5572 | 5572 | if (isset($SETTINGS['otv_expiration_period']) === false) { |
| 5573 | 5573 | $SETTINGS['otv_expiration_period'] = 7; |
| 5574 | 5574 | } |
| 5575 | - $url = $SETTINGS['cpassman_url'] . '/index.php?otv=true&' . http_build_query($otv_session); |
|
| 5575 | + $url = $SETTINGS['cpassman_url'].'/index.php?otv=true&'.http_build_query($otv_session); |
|
| 5576 | 5576 | //$exp_date = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], time() + (intval($SETTINGS['otv_expiration_period']) * 86400)); |
| 5577 | 5577 | |
| 5578 | 5578 | echo json_encode( |
@@ -5610,8 +5610,8 @@ discard block |
||
| 5610 | 5610 | 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, |
| 5611 | 5611 | f.extension AS extension, f.type AS type, |
| 5612 | 5612 | s.share_key AS share_key |
| 5613 | - FROM ' . prefixTable('files') . ' AS f |
|
| 5614 | - INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id) |
|
| 5613 | + FROM ' . prefixTable('files').' AS f |
|
| 5614 | + INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id) |
|
| 5615 | 5615 | WHERE s.user_id = %i AND s.object_id = %i', |
| 5616 | 5616 | $_SESSION['user_id'], |
| 5617 | 5617 | $post_id |
@@ -5632,7 +5632,7 @@ discard block |
||
| 5632 | 5632 | //$fileName = basename($file_info['name'], '.'.$file_info['extension']); |
| 5633 | 5633 | |
| 5634 | 5634 | // prepare image info |
| 5635 | - $post_title = basename($file_info['name'], '.' . $file_info['extension']); |
|
| 5635 | + $post_title = basename($file_info['name'], '.'.$file_info['extension']); |
|
| 5636 | 5636 | $post_title = isBase64($post_title) === true ? |
| 5637 | 5637 | base64_decode($post_title) : $post_title; |
| 5638 | 5638 | $image_code = $file_info['file']; |
@@ -5649,7 +5649,7 @@ discard block |
||
| 5649 | 5649 | echo (string) prepareExchangedData( |
| 5650 | 5650 | array( |
| 5651 | 5651 | 'error' => false, |
| 5652 | - 'filename' => $post_title . '.' . $file_info['extension'], |
|
| 5652 | + 'filename' => $post_title.'.'.$file_info['extension'], |
|
| 5653 | 5653 | 'file_type' => $file_info['type'], |
| 5654 | 5654 | 'file_content' => $fileContent, |
| 5655 | 5655 | ), |
@@ -5670,11 +5670,11 @@ discard block |
||
| 5670 | 5670 | |
| 5671 | 5671 | // get file info |
| 5672 | 5672 | $result = DB::queryfirstrow( |
| 5673 | - 'SELECT file FROM ' . prefixTable('files') . ' WHERE id=%i', |
|
| 5673 | + 'SELECT file FROM '.prefixTable('files').' WHERE id=%i', |
|
| 5674 | 5674 | intval(substr(filter_input(INPUT_POST, 'uri', FILTER_SANITIZE_STRING), 1)) |
| 5675 | 5675 | ); |
| 5676 | 5676 | |
| 5677 | - fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $result['file'] . filter_input(INPUT_POST, 'file_suffix', FILTER_SANITIZE_STRING), $SETTINGS); |
|
| 5677 | + fileDelete($SETTINGS['path_to_upload_folder'].'/'.$result['file'].filter_input(INPUT_POST, 'file_suffix', FILTER_SANITIZE_STRING), $SETTINGS); |
|
| 5678 | 5678 | |
| 5679 | 5679 | break; |
| 5680 | 5680 | |
@@ -5697,16 +5697,16 @@ discard block |
||
| 5697 | 5697 | $idFolder = $dataReceived['idFolder']; |
| 5698 | 5698 | |
| 5699 | 5699 | // don't check if Personal Folder |
| 5700 | - $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $idFolder); |
|
| 5700 | + $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $idFolder); |
|
| 5701 | 5701 | if ($data['title'] === $_SESSION['user_id']) { |
| 5702 | 5702 | // send data |
| 5703 | - echo '[{"duplicate" : "' . $duplicate . '" , error" : ""}]'; |
|
| 5703 | + echo '[{"duplicate" : "'.$duplicate.'" , error" : ""}]'; |
|
| 5704 | 5704 | } else { |
| 5705 | 5705 | if (filter_input(INPUT_POST, 'option', FILTER_SANITIZE_STRING) === 'same_folder') { |
| 5706 | 5706 | // case unique folder |
| 5707 | 5707 | DB::query( |
| 5708 | 5708 | 'SELECT label |
| 5709 | - FROM ' . prefixTable('items') . ' |
|
| 5709 | + FROM ' . prefixTable('items').' |
|
| 5710 | 5710 | WHERE id_tree = %i AND label = %s', |
| 5711 | 5711 | $idFolder, |
| 5712 | 5712 | $label |
@@ -5718,7 +5718,7 @@ discard block |
||
| 5718 | 5718 | $arrayPf = array(); |
| 5719 | 5719 | if (empty($row['id']) === false) { |
| 5720 | 5720 | $rows = DB::query( |
| 5721 | - 'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', |
|
| 5721 | + 'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', |
|
| 5722 | 5722 | '1' |
| 5723 | 5723 | ); |
| 5724 | 5724 | foreach ($rows as $record) { |
@@ -5733,12 +5733,12 @@ discard block |
||
| 5733 | 5733 | $where->add('id_tree = %i', $idFolder); |
| 5734 | 5734 | $where->add('label = %s', $label); |
| 5735 | 5735 | if (empty($arrayPf) === false) { |
| 5736 | - $where->add('id_tree NOT IN (' . implode(',', $arrayPf) . ')'); |
|
| 5736 | + $where->add('id_tree NOT IN ('.implode(',', $arrayPf).')'); |
|
| 5737 | 5737 | } |
| 5738 | 5738 | |
| 5739 | 5739 | DB::query( |
| 5740 | 5740 | 'SELECT label |
| 5741 | - FROM ' . prefixTable('items') . ' |
|
| 5741 | + FROM ' . prefixTable('items').' |
|
| 5742 | 5742 | WHERE %l', |
| 5743 | 5743 | $where |
| 5744 | 5744 | ); |
@@ -5750,7 +5750,7 @@ discard block |
||
| 5750 | 5750 | } |
| 5751 | 5751 | |
| 5752 | 5752 | // send data |
| 5753 | - echo '[{"duplicate" : "' . $duplicate . '" , "error" : ""}]'; |
|
| 5753 | + echo '[{"duplicate" : "'.$duplicate.'" , "error" : ""}]'; |
|
| 5754 | 5754 | } |
| 5755 | 5755 | break; |
| 5756 | 5756 | |
@@ -5807,7 +5807,7 @@ discard block |
||
| 5807 | 5807 | } |
| 5808 | 5808 | |
| 5809 | 5809 | //Build tree |
| 5810 | - $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries'); |
|
| 5810 | + $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries'); |
|
| 5811 | 5811 | $tree->register(); |
| 5812 | 5812 | $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title'); |
| 5813 | 5813 | $tree->rebuild(); |
@@ -5858,7 +5858,7 @@ discard block |
||
| 5858 | 5858 | if (empty($arr_data['folders'][$inc]['path']) === true) { |
| 5859 | 5859 | $arr_data['folders'][$inc]['path'] = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
| 5860 | 5860 | } else { |
| 5861 | - $arr_data['folders'][$inc]['path'] .= ' / ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 5861 | + $arr_data['folders'][$inc]['path'] .= ' / '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES); |
|
| 5862 | 5862 | } |
| 5863 | 5863 | } |
| 5864 | 5864 | |
@@ -5924,8 +5924,8 @@ discard block |
||
| 5924 | 5924 | $rows_tmp = DB::query( |
| 5925 | 5925 | 'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory, |
| 5926 | 5926 | f.id_category AS category_id |
| 5927 | - FROM ' . prefixTable('categories_folders') . ' AS f |
|
| 5928 | - INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id) |
|
| 5927 | + FROM ' . prefixTable('categories_folders').' AS f |
|
| 5928 | + INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id) |
|
| 5929 | 5929 | WHERE id_folder=%i', |
| 5930 | 5930 | $folder |
| 5931 | 5931 | ); |
@@ -5952,7 +5952,7 @@ discard block |
||
| 5952 | 5952 | $valTemp = ''; |
| 5953 | 5953 | $data = DB::queryFirstRow( |
| 5954 | 5954 | 'SELECT valeur |
| 5955 | - FROM ' . prefixTable('misc') . ' |
|
| 5955 | + FROM ' . prefixTable('misc').' |
|
| 5956 | 5956 | WHERE type = %s AND intitule=%i', |
| 5957 | 5957 | 'complex', |
| 5958 | 5958 | $folder |
@@ -5969,14 +5969,14 @@ discard block |
||
| 5969 | 5969 | $valTemp = ''; |
| 5970 | 5970 | $rows_tmp = DB::query( |
| 5971 | 5971 | 'SELECT t.title |
| 5972 | - FROM ' . prefixTable('roles_values') . ' as v |
|
| 5973 | - INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id) |
|
| 5972 | + FROM ' . prefixTable('roles_values').' as v |
|
| 5973 | + INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id) |
|
| 5974 | 5974 | WHERE v.folder_id = %i |
| 5975 | 5975 | GROUP BY title', |
| 5976 | 5976 | $folder |
| 5977 | 5977 | ); |
| 5978 | 5978 | foreach ($rows_tmp as $record) { |
| 5979 | - $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title']; |
|
| 5979 | + $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title']; |
|
| 5980 | 5980 | } |
| 5981 | 5981 | $arr_data[$folder]['visibilityRoles'] = $valTemp; |
| 5982 | 5982 | } |
@@ -6004,7 +6004,7 @@ discard block |
||
| 6004 | 6004 | // get item info |
| 6005 | 6005 | $dataItem = DB::queryFirstRow( |
| 6006 | 6006 | 'SELECT * |
| 6007 | - FROM ' . prefixTable('items') . ' |
|
| 6007 | + FROM ' . prefixTable('items').' |
|
| 6008 | 6008 | WHERE id=%i', |
| 6009 | 6009 | $post_item_id |
| 6010 | 6010 | ); |
@@ -6014,8 +6014,8 @@ discard block |
||
| 6014 | 6014 | $rows = DB::query( |
| 6015 | 6015 | 'SELECT l.date as date, l.action as action, l.raison as raison, l.raison_iv AS raison_iv, |
| 6016 | 6016 | u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname |
| 6017 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 6018 | - LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 6017 | + FROM ' . prefixTable('log_items').' as l |
|
| 6018 | + LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 6019 | 6019 | WHERE id_item=%i AND action <> %s |
| 6020 | 6020 | ORDER BY date DESC', |
| 6021 | 6021 | $post_item_id, |
@@ -6030,7 +6030,7 @@ discard block |
||
| 6030 | 6030 | |
| 6031 | 6031 | // imported via API |
| 6032 | 6032 | if (empty($record['login'])) { |
| 6033 | - $record['login'] = langHdl('imported_via_api') . ' [' . $record['raison'] . ']'; |
|
| 6033 | + $record['login'] = langHdl('imported_via_api').' ['.$record['raison'].']'; |
|
| 6034 | 6034 | } |
| 6035 | 6035 | |
| 6036 | 6036 | if ( |
@@ -6041,13 +6041,13 @@ discard block |
||
| 6041 | 6041 | ) { |
| 6042 | 6042 | // Prepare avatar |
| 6043 | 6043 | if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) { |
| 6044 | - if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) { |
|
| 6045 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb']; |
|
| 6044 | + if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) { |
|
| 6045 | + $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb']; |
|
| 6046 | 6046 | } else { |
| 6047 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6047 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6048 | 6048 | } |
| 6049 | 6049 | } else { |
| 6050 | - $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg'; |
|
| 6050 | + $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg'; |
|
| 6051 | 6051 | } |
| 6052 | 6052 | |
| 6053 | 6053 | // Prepare action |
@@ -6064,19 +6064,19 @@ discard block |
||
| 6064 | 6064 | $action = langHdl($reason[0]); |
| 6065 | 6065 | if ($reason[0] === 'at_moved') { |
| 6066 | 6066 | $tmp = explode(' -> ', $reason[1]); |
| 6067 | - $detail = langHdl('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . langHdl('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>'; |
|
| 6067 | + $detail = langHdl('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.langHdl('to').' <span class="font-weight-light">'.$tmp[1].' </span>'; |
|
| 6068 | 6068 | } elseif ($reason[0] === 'at_field') { |
| 6069 | 6069 | $tmp = explode(' => ', $reason[1]); |
| 6070 | 6070 | if (count($tmp) > 1) { |
| 6071 | - $detail = '<b>' . trim($tmp[0]) . '</b> | ' . langHdl('previous_value') . |
|
| 6072 | - ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>'; |
|
| 6071 | + $detail = '<b>'.trim($tmp[0]).'</b> | '.langHdl('previous_value'). |
|
| 6072 | + ': <span class="font-weight-light">'.trim($tmp[1]).'</span>'; |
|
| 6073 | 6073 | } else { |
| 6074 | 6074 | $detail = trim($reason[1]); |
| 6075 | 6075 | } |
| 6076 | 6076 | } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) { |
| 6077 | 6077 | $tmp = explode(' => ', $reason[1]); |
| 6078 | 6078 | $detail = empty(trim($tmp[0])) === true ? |
| 6079 | - langHdl('no_previous_value') : langHdl('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>'; |
|
| 6079 | + langHdl('no_previous_value') : langHdl('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>'; |
|
| 6080 | 6080 | } elseif ($reason[0] === 'at_automatic_del') { |
| 6081 | 6081 | $detail = langHdl($reason[1]); |
| 6082 | 6082 | } elseif ($reason[0] === 'at_anyoneconmodify') { |
@@ -6085,7 +6085,7 @@ discard block |
||
| 6085 | 6085 | $tmp = explode(':', $reason[1]); |
| 6086 | 6086 | $tmp = explode('.', $tmp[0]); |
| 6087 | 6087 | $detail = isBase64($tmp[0]) === true ? |
| 6088 | - base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0]; |
|
| 6088 | + base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0]; |
|
| 6089 | 6089 | } elseif ($reason[0] === 'at_import') { |
| 6090 | 6090 | $detail = ''; |
| 6091 | 6091 | } elseif (in_array($reason[0], array('csv', 'pdf')) === true) { |
@@ -6104,8 +6104,8 @@ discard block |
||
| 6104 | 6104 | array( |
| 6105 | 6105 | 'avatar' => $avatar, |
| 6106 | 6106 | 'login' => $record['login'], |
| 6107 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 6108 | - 'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']), |
|
| 6107 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 6108 | + 'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']), |
|
| 6109 | 6109 | 'action' => $action, |
| 6110 | 6110 | 'detail' => $detail, |
| 6111 | 6111 | ) |
@@ -6186,18 +6186,18 @@ discard block |
||
| 6186 | 6186 | |
| 6187 | 6187 | // get some info to add to the notification email |
| 6188 | 6188 | $resp_user = DB::queryfirstrow( |
| 6189 | - 'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 6189 | + 'SELECT login FROM '.prefixTable('users').' WHERE id = %i', |
|
| 6190 | 6190 | $_SESSION['user_id'] |
| 6191 | 6191 | ); |
| 6192 | 6192 | $resp_folder = DB::queryfirstrow( |
| 6193 | - 'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6193 | + 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 6194 | 6194 | $folder |
| 6195 | 6195 | ); |
| 6196 | 6196 | |
| 6197 | 6197 | // notify Managers |
| 6198 | 6198 | $rows = DB::query( |
| 6199 | 6199 | 'SELECT email |
| 6200 | - FROM ' . prefixTable('users') . ' |
|
| 6200 | + FROM ' . prefixTable('users').' |
|
| 6201 | 6201 | WHERE `gestionnaire` = %i AND `email` IS NOT NULL', |
| 6202 | 6202 | 1 |
| 6203 | 6203 | ); |
@@ -6228,14 +6228,14 @@ discard block |
||
| 6228 | 6228 | // Get list of users |
| 6229 | 6229 | $usersList = array(); |
| 6230 | 6230 | $usersString = ''; |
| 6231 | - $rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC'); |
|
| 6231 | + $rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC'); |
|
| 6232 | 6232 | foreach ($rows as $record) { |
| 6233 | 6233 | $usersList[$record['login']] = array( |
| 6234 | 6234 | 'id' => $record['id'], |
| 6235 | 6235 | 'login' => $record['login'], |
| 6236 | 6236 | 'email' => $record['email'], |
| 6237 | 6237 | ); |
| 6238 | - $usersString .= $record['id'] . '#' . $record['login'] . ';'; |
|
| 6238 | + $usersString .= $record['id'].'#'.$record['login'].';'; |
|
| 6239 | 6239 | } |
| 6240 | 6240 | |
| 6241 | 6241 | $data = array( |
@@ -6269,7 +6269,7 @@ discard block |
||
| 6269 | 6269 | // Send email |
| 6270 | 6270 | $dataItem = DB::queryfirstrow( |
| 6271 | 6271 | 'SELECT label, id_tree |
| 6272 | - FROM ' . prefixTable('items') . ' |
|
| 6272 | + FROM ' . prefixTable('items').' |
|
| 6273 | 6273 | WHERE id = %i', |
| 6274 | 6274 | $post_item_id |
| 6275 | 6275 | ); |
@@ -6363,7 +6363,7 @@ discard block |
||
| 6363 | 6363 | |
| 6364 | 6364 | DB::query( |
| 6365 | 6365 | 'SELECT * |
| 6366 | - FROM ' . prefixTable('notification') . ' |
|
| 6366 | + FROM ' . prefixTable('notification').' |
|
| 6367 | 6367 | WHERE item_id = %i AND user_id = %i', |
| 6368 | 6368 | $post_item_id, |
| 6369 | 6369 | $_SESSION['user_id'] |
@@ -6429,7 +6429,7 @@ discard block |
||
| 6429 | 6429 | // And related logs |
| 6430 | 6430 | $rows = DB::query( |
| 6431 | 6431 | 'SELECT id, file AS filename |
| 6432 | - FROM ' . prefixTable('files') . ' |
|
| 6432 | + FROM ' . prefixTable('files').' |
|
| 6433 | 6433 | WHERE id_item = %i AND confirmed = %i', |
| 6434 | 6434 | $post_item_id, |
| 6435 | 6435 | 0 |
@@ -6443,12 +6443,12 @@ discard block |
||
| 6443 | 6443 | ); |
| 6444 | 6444 | |
| 6445 | 6445 | // Delete file on server |
| 6446 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename'])); |
|
| 6446 | + unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename'])); |
|
| 6447 | 6447 | |
| 6448 | 6448 | // Delete related logs |
| 6449 | 6449 | $logFile = DB::query( |
| 6450 | 6450 | 'SELECT increment_id, raison |
| 6451 | - FROM ' . prefixTable('log_items') . ' |
|
| 6451 | + FROM ' . prefixTable('log_items').' |
|
| 6452 | 6452 | WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"', |
| 6453 | 6453 | $post_item_id, |
| 6454 | 6454 | $_SESSION['user_id'], |
@@ -6501,7 +6501,7 @@ discard block |
||
| 6501 | 6501 | // Confirm attachments |
| 6502 | 6502 | $rows = DB::query( |
| 6503 | 6503 | 'SELECT id, file AS filename |
| 6504 | - FROM ' . prefixTable('files') . ' |
|
| 6504 | + FROM ' . prefixTable('files').' |
|
| 6505 | 6505 | WHERE id_item = %i AND confirmed = %i', |
| 6506 | 6506 | $post_item_id, |
| 6507 | 6507 | 0 |
@@ -6538,15 +6538,15 @@ discard block |
||
| 6538 | 6538 | case 'autocomplete_tags': |
| 6539 | 6539 | // Get a list off all existing TAGS |
| 6540 | 6540 | $listOfTags = ''; |
| 6541 | - $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $get['term']); |
|
| 6541 | + $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $get['term']); |
|
| 6542 | 6542 | foreach ($rows as $record) { |
| 6543 | 6543 | if (empty($listOfTags)) { |
| 6544 | - $listOfTags = '"' . $record['tag'] . '"'; |
|
| 6544 | + $listOfTags = '"'.$record['tag'].'"'; |
|
| 6545 | 6545 | } else { |
| 6546 | - $listOfTags .= ', "' . $record['tag'] . '"'; |
|
| 6546 | + $listOfTags .= ', "'.$record['tag'].'"'; |
|
| 6547 | 6547 | } |
| 6548 | 6548 | } |
| 6549 | - echo '[' . $listOfTags . ']'; |
|
| 6549 | + echo '['.$listOfTags.']'; |
|
| 6550 | 6550 | break; |
| 6551 | 6551 | } |
| 6552 | 6552 | } |
@@ -6562,7 +6562,7 @@ discard block |
||
| 6562 | 6562 | { |
| 6563 | 6563 | $data = DB::queryFirstRow( |
| 6564 | 6564 | 'SELECT bloquer_creation, bloquer_modification, personal_folder |
| 6565 | - FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 6565 | + FROM ' . prefixTable('nested_tree').' WHERE id = %i', |
|
| 6566 | 6566 | $groupe |
| 6567 | 6567 | ); |
| 6568 | 6568 | // Check if it's in a personal folder. If yes, then force complexity overhead. |
@@ -35,12 +35,12 @@ discard block |
||
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | // Do checks |
| 38 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php'; |
|
| 39 | -require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php'; |
|
| 38 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php'; |
|
| 39 | +require_once $SETTINGS['cpassman_dir'].'/sources/checks.php'; |
|
| 40 | 40 | if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'utilities.database', $SETTINGS) === false) { |
| 41 | 41 | // Not allowed page |
| 42 | 42 | $_SESSION['error']['code'] = ERR_NOT_ALLOWED; |
| 43 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 43 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 44 | 44 | exit(); |
| 45 | 45 | } |
| 46 | 46 | |
@@ -53,14 +53,14 @@ discard block |
||
| 53 | 53 | date_default_timezone_set('UTC'); |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | -require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php'; |
|
| 57 | -require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php'; |
|
| 56 | +require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php'; |
|
| 57 | +require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php'; |
|
| 58 | 58 | header('Content-type: text/html; charset=utf-8'); |
| 59 | 59 | header('Cache-Control: no-cache, must-revalidate'); |
| 60 | 60 | require_once 'main.functions.php'; |
| 61 | 61 | |
| 62 | 62 | //Connect to DB |
| 63 | -require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 63 | +require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php'; |
|
| 64 | 64 | if (defined('DB_PASSWD_CLEAR') === false) { |
| 65 | 65 | define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS)); |
| 66 | 66 | } |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | $arrFolders = array(); |
| 116 | 116 | $rows = DB::query( |
| 117 | 117 | 'SELECT valeur, intitule |
| 118 | - FROM ' . prefixTable('misc') . ' |
|
| 118 | + FROM ' . prefixTable('misc').' |
|
| 119 | 119 | WHERE type = %s', |
| 120 | 120 | 'folder_deleted' |
| 121 | 121 | ); |
@@ -136,10 +136,10 @@ discard block |
||
| 136 | 136 | 'SELECT u.login as login, u.name as name, u.lastname as lastname, |
| 137 | 137 | i.id as id, i.label as label, |
| 138 | 138 | i.id_tree as id_tree, l.date as date, n.title as folder_title |
| 139 | - FROM ' . prefixTable('log_items') . ' as l |
|
| 140 | - INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id) |
|
| 141 | - INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id) |
|
| 142 | - INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree=n.id) |
|
| 139 | + FROM ' . prefixTable('log_items').' as l |
|
| 140 | + INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id) |
|
| 141 | + INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id) |
|
| 142 | + INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree=n.id) |
|
| 143 | 143 | WHERE i.inactif = %i |
| 144 | 144 | AND l.action = %s', |
| 145 | 145 | 1, |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | 'label' => $record['label'], |
| 162 | 162 | 'date' => date($SETTINGS['date_format'], $record['date']), |
| 163 | 163 | 'login' => $record['login'], |
| 164 | - 'name' => $record['name'] . ' ' . $record['lastname'], |
|
| 164 | + 'name' => $record['name'].' '.$record['lastname'], |
|
| 165 | 165 | 'folder_label' => $record['folder_title'], |
| 166 | 166 | 'folder_deleted' => $thisFolder, |
| 167 | 167 | ) |
@@ -216,10 +216,10 @@ discard block |
||
| 216 | 216 | foreach ($post_folders as $folderId) { |
| 217 | 217 | $data = DB::queryfirstrow( |
| 218 | 218 | 'SELECT valeur |
| 219 | - FROM ' . prefixTable('misc') . " |
|
| 219 | + FROM ' . prefixTable('misc')." |
|
| 220 | 220 | WHERE type = 'folder_deleted' |
| 221 | 221 | AND intitule = %s", |
| 222 | - 'f' . $folderId |
|
| 222 | + 'f'.$folderId |
|
| 223 | 223 | ); |
| 224 | 224 | if ((int) $data['valeur'] !== 0) { |
| 225 | 225 | $folderData = explode(', ', $data['valeur']); |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | prefixTable('misc'), |
| 246 | 246 | 'type = %s AND intitule = %s', |
| 247 | 247 | 'folder_deleted', |
| 248 | - 'f' . $folderId |
|
| 248 | + 'f'.$folderId |
|
| 249 | 249 | ); |
| 250 | 250 | |
| 251 | 251 | // Restore all items in this folder |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | // Get list of all items in thos folder |
| 262 | 262 | $items = DB::query( |
| 263 | 263 | 'SELECT id |
| 264 | - FROM ' . prefixTable('items') . ' |
|
| 264 | + FROM ' . prefixTable('items').' |
|
| 265 | 265 | WHERE id_tree = %i', |
| 266 | 266 | $folderId |
| 267 | 267 | ); |
@@ -346,10 +346,10 @@ discard block |
||
| 346 | 346 | foreach ($post_folders as $folderId) { |
| 347 | 347 | $data = DB::queryfirstrow( |
| 348 | 348 | 'SELECT valeur |
| 349 | - FROM ' . prefixTable('misc') . " |
|
| 349 | + FROM ' . prefixTable('misc')." |
|
| 350 | 350 | WHERE type = 'folder_deleted' |
| 351 | 351 | AND intitule = %s", |
| 352 | - 'f' . $folderId |
|
| 352 | + 'f'.$folderId |
|
| 353 | 353 | ); |
| 354 | 354 | if ((int) $data['valeur'] !== 0) { |
| 355 | 355 | $folderData = explode(', ', $data['valeur']); |
@@ -381,7 +381,7 @@ discard block |
||
| 381 | 381 | prefixTable('misc'), |
| 382 | 382 | 'type = %s AND intitule = %s', |
| 383 | 383 | 'folder_deleted', |
| 384 | - 'f' . $folderData[0] |
|
| 384 | + 'f'.$folderData[0] |
|
| 385 | 385 | ); |
| 386 | 386 | |
| 387 | 387 | // Delete all items in this folder |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | // Get list of all items in thos folder |
| 396 | 396 | $items = DB::query( |
| 397 | 397 | 'SELECT id |
| 398 | - FROM ' . prefixTable('items') . ' |
|
| 398 | + FROM ' . prefixTable('items').' |
|
| 399 | 399 | WHERE id_tree = %i', |
| 400 | 400 | $folderData[0] |
| 401 | 401 | ); |
@@ -491,7 +491,7 @@ discard block |
||
| 491 | 491 | ) { |
| 492 | 492 | if ($post_log_type === 'items') { |
| 493 | 493 | DB::query( |
| 494 | - 'SELECT * FROM ' . prefixTable('log_items') . ' |
|
| 494 | + 'SELECT * FROM '.prefixTable('log_items').' |
|
| 495 | 495 | WHERE action=%s ' . 'AND date BETWEEN %i AND %i' |
| 496 | 496 | . ($post_filter_action === 'all' ? '' : ' AND action = %s') |
| 497 | 497 | . ($post_filter_user === -1 ? '' : ' AND id_user = %i'), |
@@ -513,7 +513,7 @@ discard block |
||
| 513 | 513 | } elseif ($post_log_type === 'connections') { |
| 514 | 514 | db::debugmode(true); |
| 515 | 515 | DB::query( |
| 516 | - 'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' . |
|
| 516 | + 'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '. |
|
| 517 | 517 | 'AND date BETWEEN %i AND %i', |
| 518 | 518 | 'user_connection', |
| 519 | 519 | $post_date_from, |
@@ -530,7 +530,7 @@ discard block |
||
| 530 | 530 | ); |
| 531 | 531 | } elseif ($post_log_type === 'errors') { |
| 532 | 532 | DB::query( |
| 533 | - 'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' . |
|
| 533 | + 'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '. |
|
| 534 | 534 | 'AND date BETWEEN %i AND %i', |
| 535 | 535 | 'error', |
| 536 | 536 | $post_date_from, |
@@ -547,7 +547,7 @@ discard block |
||
| 547 | 547 | ); |
| 548 | 548 | } elseif ($post_log_type === 'copy') { |
| 549 | 549 | DB::query( |
| 550 | - 'SELECT * FROM ' . prefixTable('log_items') . ' WHERE action=%s ' . |
|
| 550 | + 'SELECT * FROM '.prefixTable('log_items').' WHERE action=%s '. |
|
| 551 | 551 | 'AND date BETWEEN %i AND %i', |
| 552 | 552 | 'at_copy', |
| 553 | 553 | $post_date_from, |
@@ -564,7 +564,7 @@ discard block |
||
| 564 | 564 | ); |
| 565 | 565 | } elseif ($post_log_type === 'admin') { |
| 566 | 566 | DB::query( |
| 567 | - 'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' . |
|
| 567 | + 'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '. |
|
| 568 | 568 | 'AND date BETWEEN %i AND %i', |
| 569 | 569 | 'admin_action', |
| 570 | 570 | $post_date_from, |
@@ -581,7 +581,7 @@ discard block |
||
| 581 | 581 | ); |
| 582 | 582 | } elseif ($post_log_type === 'failed') { |
| 583 | 583 | DB::query( |
| 584 | - 'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' . |
|
| 584 | + 'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '. |
|
| 585 | 585 | 'AND date BETWEEN %i AND %i', |
| 586 | 586 | 'failed_auth', |
| 587 | 587 | $post_date_from, |