nilsteampassnet /
TeamPass
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | ) { |
| 81 | 81 | // Not allowed page |
| 82 | 82 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 83 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 83 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 84 | 84 | exit; |
| 85 | 85 | } |
| 86 | 86 | |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | $openLdapExtra = new OpenLdapExtra(); |
| 155 | 155 | break; |
| 156 | 156 | default: |
| 157 | - throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']); |
|
| 157 | + throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']); |
|
| 158 | 158 | } |
| 159 | 159 | } catch (Exception $e) { |
| 160 | 160 | if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | // 2- Get user info from AD |
| 174 | 174 | // We want to isolate attribute ldap_user_attribute or mostly samAccountName |
| 175 | 175 | $userADInfos = $ldapConnection->query() |
| 176 | - ->where((isset($SETTINGS['ldap_user_attribute']) ===true && empty($SETTINGS['ldap_user_attribute']) === false) ? $SETTINGS['ldap_user_attribute'] : 'samaccountname', '=', $post_username) |
|
| 176 | + ->where((isset($SETTINGS['ldap_user_attribute']) === true && empty($SETTINGS['ldap_user_attribute']) === false) ? $SETTINGS['ldap_user_attribute'] : 'samaccountname', '=', $post_username) |
|
| 177 | 177 | ->firstOrFail(); |
| 178 | 178 | |
| 179 | 179 | // Is user enabled? Only ActiveDirectory |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | } catch (\LdapRecord\Query\ObjectNotFoundException $e) { |
| 195 | 195 | $error = $e->getDetailedError(); |
| 196 | 196 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 197 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 197 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 198 | 198 | } |
| 199 | 199 | // deepcode ignore ServerLeak: No important data is sent and is encrypted before being sent |
| 200 | 200 | echo prepareExchangedData( |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | // For OpenLDAP and others, we use attribute dn |
| 214 | 214 | $userAuthAttempt = $ldapConnection->auth()->attempt( |
| 215 | 215 | $SETTINGS['ldap_type'] === 'ActiveDirectory' ? |
| 216 | - $userADInfos['userprincipalname'][0] : // refering to https://ldaprecord.com/docs/core/v2/authentication#basic-authentication |
|
| 216 | + $userADInfos['userprincipalname'][0] : // refering to https://ldaprecord.com/docs/core/v2/authentication#basic-authentication |
|
| 217 | 217 | $userADInfos['dn'], |
| 218 | 218 | $post_password |
| 219 | 219 | ); |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | } catch (\LdapRecord\Query\ObjectNotFoundException $e) { |
| 233 | 233 | $error = $e->getDetailedError(); |
| 234 | 234 | if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 235 | - error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage()); |
|
| 235 | + error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage()); |
|
| 236 | 236 | } |
| 237 | 237 | // deepcode ignore ServerLeak: No important data is sent and is encrypted before being sent |
| 238 | 238 | echo prepareExchangedData( |
@@ -102,11 +102,11 @@ discard block |
||
| 102 | 102 | function provideLog(string $message, array $SETTINGS) |
| 103 | 103 | { |
| 104 | 104 | if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 105 | - error_log((string) date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], time()) . ' - '.$message); |
|
| 105 | + error_log((string) date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], time()).' - '.$message); |
|
| 106 | 106 | } |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | -function performVisibleFoldersHtmlUpdate (int $user_id) |
|
| 109 | +function performVisibleFoldersHtmlUpdate(int $user_id) |
|
| 110 | 110 | { |
| 111 | 111 | $html = []; |
| 112 | 112 | |
@@ -116,10 +116,10 @@ discard block |
||
| 116 | 116 | |
| 117 | 117 | // get current folders visible for user |
| 118 | 118 | $cache_tree = DB::queryFirstRow( |
| 119 | - 'SELECT increment_id, data FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', |
|
| 119 | + 'SELECT increment_id, data FROM '.prefixTable('cache_tree').' WHERE user_id = %i', |
|
| 120 | 120 | $user_id |
| 121 | 121 | ); |
| 122 | - $folders = json_decode($cache_tree['data'], true);//print_r($folders); |
|
| 122 | + $folders = json_decode($cache_tree['data'], true); //print_r($folders); |
|
| 123 | 123 | foreach ($folders as $folder) { |
| 124 | 124 | $idFolder = (int) explode("li_", $folder['id'])[1]; |
| 125 | 125 | |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | |
| 133 | 133 | // get folder info |
| 134 | 134 | $folder = DB::queryFirstRow( |
| 135 | - 'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', |
|
| 135 | + 'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i', |
|
| 136 | 136 | $idFolder |
| 137 | 137 | ); |
| 138 | 138 | |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | function subTaskStatus($taskId) |
| 168 | 168 | { |
| 169 | 169 | $subTasks = DB::query( |
| 170 | - 'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i', |
|
| 170 | + 'SELECT * FROM '.prefixTable('background_subtasks').' WHERE task_id = %i', |
|
| 171 | 171 | $taskId |
| 172 | 172 | ); |
| 173 | 173 | |
@@ -149,8 +149,7 @@ |
||
| 149 | 149 | </div> |
| 150 | 150 | <?php |
| 151 | 151 | } |
| 152 | -} |
|
| 153 | -catch (Exception $e) { |
|
| 152 | +} catch (Exception $e) { |
|
| 154 | 153 | if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 155 | 154 | error_log('TEAMPASS Error - tasks page - '.$e->getMessage()); |
| 156 | 155 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('tasks') === false) { |
| 65 | 65 | // Not allowed page |
| 66 | 66 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 67 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 67 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 68 | 68 | exit; |
| 69 | 69 | } |
| 70 | 70 | |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | // Get last cron execution timestamp |
| 127 | 127 | $queryResults = DB::query( |
| 128 | 128 | 'SELECT valeur |
| 129 | - FROM ' . prefixTable('misc') . ' |
|
| 129 | + FROM ' . prefixTable('misc').' |
|
| 130 | 130 | WHERE type = %s AND intitule = %s and valeur >= %d', |
| 131 | 131 | 'admin', |
| 132 | 132 | 'last_cron_exec', |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | $task = isset($SETTINGS['users_personal_folder_task']) === true ? explode(";", $SETTINGS['users_personal_folder_task']) : []; |
| 235 | 235 | ?> |
| 236 | 236 | <input type='text' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'> |
| 237 | - <input type='hidden' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'> |
|
| 237 | + <input type='hidden' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'> |
|
| 238 | 238 | </div> |
| 239 | 239 | <div class='col-2'> |
| 240 | 240 | <button class="btn btn-primary task-define" data-task="users_personal_folder_task"> |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | $task = isset($SETTINGS['clean_orphan_objects_task']) === true ? explode(";", $SETTINGS['clean_orphan_objects_task']) : []; |
| 257 | 257 | ?> |
| 258 | 258 | <input type='text' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'> |
| 259 | - <input type='hidden' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'> |
|
| 259 | + <input type='hidden' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'> |
|
| 260 | 260 | </div> |
| 261 | 261 | <div class='col-2'> |
| 262 | 262 | <button class="btn btn-primary task-define" data-task="clean_orphan_objects_task"> |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | $task = isset($SETTINGS['purge_temporary_files_task']) === true ? explode(";", $SETTINGS['purge_temporary_files_task']) : []; |
| 279 | 279 | ?> |
| 280 | 280 | <input type='text' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'> |
| 281 | - <input type='hidden' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'> |
|
| 281 | + <input type='hidden' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'> |
|
| 282 | 282 | </div> |
| 283 | 283 | <div class='col-2'> |
| 284 | 284 | <button class="btn btn-primary task-define" data-task="purge_temporary_files_task"> |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | $task = isset($SETTINGS['reload_cache_table_task']) === true ? explode(";", $SETTINGS['reload_cache_table_task']) : []; |
| 301 | 301 | ?> |
| 302 | 302 | <input type='text' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'> |
| 303 | - <input type='hidden' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'> |
|
| 303 | + <input type='hidden' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'> |
|
| 304 | 304 | </div> |
| 305 | 305 | <div class='col-2'> |
| 306 | 306 | <button class="btn btn-primary task-define" data-task="reload_cache_table_task"> |
@@ -517,7 +517,7 @@ discard block |
||
| 517 | 517 | <h5><?php echo $lang->get('day_of_month'); ?></h5> |
| 518 | 518 | <select class='form-control form-control-sm no-save' id='task-define-modal-parameter-monthly-value' style="width:100%;"> |
| 519 | 519 | <?php |
| 520 | - for ($i=1; $i<=31; $i++) { |
|
| 520 | + for ($i = 1; $i <= 31; $i++) { |
|
| 521 | 521 | echo '<option value="'.$i.'">'.$lang->get('day').' '.$i.'</option>'; |
| 522 | 522 | } |
| 523 | 523 | ?> |
@@ -222,8 +222,7 @@ |
||
| 222 | 222 | </div> |
| 223 | 223 | <?php |
| 224 | 224 | } |
| 225 | -} |
|
| 226 | -catch (Exception $e) { |
|
| 225 | +} catch (Exception $e) { |
|
| 227 | 226 | if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) { |
| 228 | 227 | error_log('TEAMPASS Error - admin page - '.$e->getMessage()); |
| 229 | 228 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === false) { |
| 69 | 69 | // Not allowed page |
| 70 | 70 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 71 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 71 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 72 | 72 | exit; |
| 73 | 73 | } |
| 74 | 74 | |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | // Get last cron execution timestamp |
| 200 | 200 | DB::query( |
| 201 | 201 | 'SELECT valeur |
| 202 | - FROM ' . prefixTable('misc') . ' |
|
| 202 | + FROM ' . prefixTable('misc').' |
|
| 203 | 203 | WHERE type = %s AND intitule = %s and valeur >= %d', |
| 204 | 204 | 'admin', |
| 205 | 205 | 'last_cron_exec', |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | <div class="card-body"> |
| 271 | 271 | <?php |
| 272 | 272 | // Display information about server |
| 273 | - $dbSize = DB::queryFirstRow("SELECT ROUND(SUM(data_length + index_length) / 1024 / 1024, 2) AS 'size' FROM information_schema.TABLES WHERE table_schema = '" . DB_NAME . "'"); |
|
| 273 | + $dbSize = DB::queryFirstRow("SELECT ROUND(SUM(data_length + index_length) / 1024 / 1024, 2) AS 'size' FROM information_schema.TABLES WHERE table_schema = '".DB_NAME."'"); |
|
| 274 | 274 | |
| 275 | 275 | // Get OS |
| 276 | 276 | $uname = php_uname('s'); |
@@ -326,17 +326,17 @@ discard block |
||
| 326 | 326 | } |
| 327 | 327 | |
| 328 | 328 | echo |
| 329 | - '<p>' . $os. |
|
| 329 | + '<p>'.$os. |
|
| 330 | 330 | '<br><span class="ml-4"></span>'. |
| 331 | 331 | '</p>'. |
| 332 | 332 | $internetAccess. |
| 333 | - '<p><i class="fa-brands fa-php mr-2"></i>PHP version: ' . phpversion(). |
|
| 333 | + '<p><i class="fa-brands fa-php mr-2"></i>PHP version: '.phpversion(). |
|
| 334 | 334 | '<br><span class="ml-4">Memory limit: '.(ini_get('memory_limit')).'</span>'. |
| 335 | 335 | '<br><span class="ml-4">Memory usage: '.formatSizeUnits(memory_get_usage()).'</span>'. |
| 336 | 336 | '<br><span class="ml-4">Maximum time execution: '.ini_get('max_execution_time').'</span>'. |
| 337 | 337 | '<br><span class="ml-4">Maximum file size upload: '.ini_get('upload_max_filesize').'</span>'. |
| 338 | 338 | '</p>'. |
| 339 | - '<p><i class="fa-solid fa-server mr-2"></i>Server version: ' . DB::serverVersion(). |
|
| 339 | + '<p><i class="fa-solid fa-server mr-2"></i>Server version: '.DB::serverVersion(). |
|
| 340 | 340 | '<br><span class="ml-4">Database size: '.($dbSize['size']).'MB</span>'. |
| 341 | 341 | '</p>'; |
| 342 | 342 | |
@@ -344,11 +344,11 @@ discard block |
||
| 344 | 344 | $serverTime = localtime(time(), true); |
| 345 | 345 | echo '<div class="row">'. |
| 346 | 346 | '<div class="col-6"><i class="fa-solid fa-clock mr-2"></i>Server time:</div>'. |
| 347 | - '<div class="col-6"><span class="badge badge-info">' . |
|
| 348 | - str_pad(strval($serverTime['tm_hour']), 2, "0", STR_PAD_LEFT) . ':' . |
|
| 349 | - str_pad(strval($serverTime['tm_min']), 2, "0", STR_PAD_LEFT) . ':' . |
|
| 350 | - str_pad(strval($serverTime['tm_sec']), 2, "0", STR_PAD_LEFT) . |
|
| 351 | - '</span></div>' . |
|
| 347 | + '<div class="col-6"><span class="badge badge-info">'. |
|
| 348 | + str_pad(strval($serverTime['tm_hour']), 2, "0", STR_PAD_LEFT).':'. |
|
| 349 | + str_pad(strval($serverTime['tm_min']), 2, "0", STR_PAD_LEFT).':'. |
|
| 350 | + str_pad(strval($serverTime['tm_sec']), 2, "0", STR_PAD_LEFT). |
|
| 351 | + '</span></div>'. |
|
| 352 | 352 | '</div>'. |
| 353 | 353 | '<div class="row">'. |
| 354 | 354 | '<div class="col-6"><span class="ml-4">Timezone:</span></div>'. |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | // launched several times. |
| 70 | 70 | $record = DB::queryFirstRow( |
| 71 | 71 | 'SELECT * |
| 72 | - FROM ' . prefixTable('background_tasks') . ' |
|
| 72 | + FROM ' . prefixTable('background_tasks').' |
|
| 73 | 73 | WHERE is_in_progress = %i AND process_type = %s |
| 74 | 74 | ORDER BY increment_id ASC LIMIT 1', |
| 75 | 75 | 0, |
@@ -77,8 +77,9 @@ |
||
| 77 | 77 | ); |
| 78 | 78 | |
| 79 | 79 | // No more pending user_build_cache_tree tasks |
| 80 | - if (DB::count() === 0) |
|
| 81 | - exit; |
|
| 80 | + if (DB::count() === 0) { |
|
| 81 | + exit; |
|
| 82 | + } |
|
| 82 | 83 | |
| 83 | 84 | // get email properties |
| 84 | 85 | $arguments = json_decode($record['arguments'], true); |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('oauth') === false) { |
| 72 | 72 | // Not allowed page |
| 73 | 73 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 74 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 74 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 75 | 75 | exit; |
| 76 | 76 | } |
| 77 | 77 | ?> |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | }).fail(function(error) { |
| 216 | 216 | toastr.remove(); |
| 217 | 217 | toastr.error( |
| 218 | - '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + error, |
|
| 218 | + '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + error, |
|
| 219 | 219 | '', { |
| 220 | 220 | closeButton: true, |
| 221 | 221 | positionClass: 'toast-bottom-right' |
@@ -81,8 +81,9 @@ discard block |
||
| 81 | 81 | $session = SessionManager::getSession(); |
| 82 | 82 | |
| 83 | 83 | // Random encryption key |
| 84 | -if ($session->get('key') === null) |
|
| 84 | +if ($session->get('key') === null) { |
|
| 85 | 85 | $session->set('key', generateQuickPassword(30, false)); |
| 86 | +} |
|
| 86 | 87 | |
| 87 | 88 | $request = SymfonyRequest::createFromGlobals(); |
| 88 | 89 | $configManager = new ConfigManager(__DIR__, $request->getRequestUri()); |
@@ -943,7 +944,10 @@ discard block |
||
| 943 | 944 | <input type="password" class="form-control" id="dialog-ldap-user-build-keys-database-code"> |
| 944 | 945 | <br/> |
| 945 | 946 | </div> |
| 946 | - <div class="input-group mb-3<?php if ($session_auth_type === 'oauth2') echo ' hidden'; ?>"> |
|
| 947 | + <div class="input-group mb-3<?php if ($session_auth_type === 'oauth2') { |
|
| 948 | + echo ' hidden'; |
|
| 949 | +} |
|
| 950 | +?>"> |
|
| 947 | 951 | <div class="input-group-prepend"> |
| 948 | 952 | <span class="input-group-text"><?php echo $lang->get('provide_your_current_password'); ?></span> |
| 949 | 953 | </div> |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | csrfProtector::init(); |
| 73 | 73 | |
| 74 | 74 | // Load functions |
| 75 | -require_once __DIR__. '/includes/config/include.php'; |
|
| 75 | +require_once __DIR__.'/includes/config/include.php'; |
|
| 76 | 76 | require_once __DIR__.'/sources/main.functions.php'; |
| 77 | 77 | |
| 78 | 78 | // init |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | $SETTINGS = $antiXss->xss_clean($SETTINGS); |
| 107 | 107 | |
| 108 | 108 | // Load Core library |
| 109 | -require_once $SETTINGS['cpassman_dir'] . '/sources/core.php'; |
|
| 109 | +require_once $SETTINGS['cpassman_dir'].'/sources/core.php'; |
|
| 110 | 110 | // Prepare POST variables |
| 111 | 111 | $post_language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_FULL_SPECIAL_CHARS); |
| 112 | 112 | $session_user_language = $session->get('user-language'); |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | if ($hasSuperPrivilege > 0) { |
| 161 | 161 | if (defined('MYSQL_LOG') && MYSQL_LOG === true) { |
| 162 | 162 | DB::query("SET GLOBAL general_log = 'ON'"); |
| 163 | - DB::query("SET GLOBAL general_log_file = " . (defined('MYSQL_LOG_FILE') ? MYSQL_LOG_FILE : "'/var/log/teampass_mysql_query.log'")); |
|
| 163 | + DB::query("SET GLOBAL general_log_file = ".(defined('MYSQL_LOG_FILE') ? MYSQL_LOG_FILE : "'/var/log/teampass_mysql_query.log'")); |
|
| 164 | 164 | } else { |
| 165 | 165 | DB::query("SET GLOBAL general_log = 'OFF'"); |
| 166 | 166 | } |
@@ -171,8 +171,8 @@ discard block |
||
| 171 | 171 | //get default language |
| 172 | 172 | $dataLanguage = DB::queryFirstRow( |
| 173 | 173 | 'SELECT m.valeur AS valeur, l.flag AS flag |
| 174 | - FROM ' . prefixTable('misc') . ' AS m |
|
| 175 | - INNER JOIN ' . prefixTable('languages') . ' AS l ON (m.valeur = l.name) |
|
| 174 | + FROM ' . prefixTable('misc').' AS m |
|
| 175 | + INNER JOIN ' . prefixTable('languages').' AS l ON (m.valeur = l.name) |
|
| 176 | 176 | WHERE m.type=%s_type AND m.intitule=%s_intitule', |
| 177 | 177 | [ |
| 178 | 178 | 'type' => 'admin', |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | $session_user_language = $SETTINGS['default_language']; |
| 204 | 204 | } |
| 205 | 205 | } |
| 206 | -$lang = new Language($session_user_language, __DIR__. '/includes/language/'); |
|
| 206 | +$lang = new Language($session_user_language, __DIR__.'/includes/language/'); |
|
| 207 | 207 | |
| 208 | 208 | if (isset($SETTINGS['cpassman_dir']) === false || $SETTINGS['cpassman_dir'] === '') { |
| 209 | 209 | $SETTINGS['cpassman_dir'] = __DIR__; |
@@ -277,29 +277,29 @@ discard block |
||
| 277 | 277 | </script> |
| 278 | 278 | |
| 279 | 279 | <!-- IonIcons --> |
| 280 | - <link rel="stylesheet" href="includes/css/ionicons.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 280 | + <link rel="stylesheet" href="includes/css/ionicons.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 281 | 281 | <!-- Theme style --> |
| 282 | - <link rel="stylesheet" href="plugins/adminlte/css/adminlte.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 283 | - <link rel="stylesheet" href="plugins/pace-progress/themes/corner-indicator.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 284 | - <link rel="stylesheet" href="plugins/select2/css/select2.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 285 | - <link rel="stylesheet" href="plugins/select2/theme/select2-bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 282 | + <link rel="stylesheet" href="plugins/adminlte/css/adminlte.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 283 | + <link rel="stylesheet" href="plugins/pace-progress/themes/corner-indicator.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 284 | + <link rel="stylesheet" href="plugins/select2/css/select2.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 285 | + <link rel="stylesheet" href="plugins/select2/theme/select2-bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 286 | 286 | <!-- Theme style --> |
| 287 | - <link rel="stylesheet" href="includes/css/teampass.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 287 | + <link rel="stylesheet" href="includes/css/teampass.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 288 | 288 | <!-- Google Font: Source Sans Pro --> |
| 289 | - <link rel="stylesheet" type="text/css" href="includes/fonts/fonts.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 289 | + <link rel="stylesheet" type="text/css" href="includes/fonts/fonts.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 290 | 290 | <!-- Altertify --> |
| 291 | - <link rel="stylesheet" href="plugins/alertifyjs/css/alertify.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 292 | - <link rel="stylesheet" href="plugins/alertifyjs/css/themes/bootstrap.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 291 | + <link rel="stylesheet" href="plugins/alertifyjs/css/alertify.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 292 | + <link rel="stylesheet" href="plugins/alertifyjs/css/themes/bootstrap.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 293 | 293 | <!-- Toastr --> |
| 294 | - <link rel="stylesheet" href="plugins/toastr/toastr.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 294 | + <link rel="stylesheet" href="plugins/toastr/toastr.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 295 | 295 | <!-- favicon --> |
| 296 | - <link rel="shortcut icon" type="image/png" href="<?php echo $favicon;?>"/> |
|
| 296 | + <link rel="shortcut icon" type="image/png" href="<?php echo $favicon; ?>"/> |
|
| 297 | 297 | <!-- manifest (PWA) --> |
| 298 | - <link rel="manifest" href="manifest.json?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 298 | + <link rel="manifest" href="manifest.json?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 299 | 299 | <!-- Custom style --> |
| 300 | 300 | <?php |
| 301 | - if (file_exists(__DIR__ . '/includes/css/custom.css') === true) {?> |
|
| 302 | - <link rel="stylesheet" href="includes/css/custom.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 301 | + if (file_exists(__DIR__.'/includes/css/custom.css') === true) {?> |
|
| 302 | + <link rel="stylesheet" href="includes/css/custom.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 303 | 303 | <?php |
| 304 | 304 | } ?> |
| 305 | 305 | </head> |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | <div class="dropdown show"> |
| 347 | 347 | <a class="btn btn-primary dropdown-toggle" href="#" data-toggle="dropdown"> |
| 348 | 348 | <?php |
| 349 | - echo $session_name . ' ' . $session_lastname; ?> |
|
| 349 | + echo $session_name.' '.$session_lastname; ?> |
|
| 350 | 350 | </a> |
| 351 | 351 | |
| 352 | 352 | <div class="dropdown-menu dropdown-menu-right"> |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | </a> |
| 371 | 371 | <?php |
| 372 | 372 | } ?> |
| 373 | - <a class="dropdown-item user-menu<?php echo (int) $session_user_admin === 1 ? ' hidden' : '';?>" href="#" data-name="generate-new_keys"> |
|
| 373 | + <a class="dropdown-item user-menu<?php echo (int) $session_user_admin === 1 ? ' hidden' : ''; ?>" href="#" data-name="generate-new_keys"> |
|
| 374 | 374 | <i class="fa-solid fa-spray-can-sparkles fa-fw mr-2"></i><?php echo $lang->get('generate_new_keys'); ?> |
| 375 | 375 | </a> |
| 376 | 376 | |
@@ -404,7 +404,7 @@ discard block |
||
| 404 | 404 | <!-- Main Sidebar Container --> |
| 405 | 405 | <aside class="main-sidebar sidebar-dark-primary elevation-4"> |
| 406 | 406 | <!-- Brand Logo --> |
| 407 | - <a href="<?php echo $cpassman_url . '/index.php?page=' . ((int) $session_user_admin === 1 ? 'admin' : 'items'); ?>" class="brand-link"> |
|
| 407 | + <a href="<?php echo $cpassman_url.'/index.php?page='.((int) $session_user_admin === 1 ? 'admin' : 'items'); ?>" class="brand-link"> |
|
| 408 | 408 | <img src="includes/images/teampass-logo2-home.png" alt="Teampass Logo" class="brand-image"> |
| 409 | 409 | <span class="brand-text font-weight-light"><?php echo TP_TOOL_NAME; ?></span> |
| 410 | 410 | </a> |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | <a href="#" data-name="items" class="nav-link', $get['page'] === 'items' ? ' active' : '', '"> |
| 423 | 423 | <i class="nav-icon fa-solid fa-key"></i> |
| 424 | 424 | <p> |
| 425 | - ' . $lang->get('pw') . ' |
|
| 425 | + ' . $lang->get('pw').' |
|
| 426 | 426 | </p> |
| 427 | 427 | </a> |
| 428 | 428 | </li>'; |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | <a href="#" data-name="import" class="nav-link', $get['page'] === 'import' ? ' active' : '', '"> |
| 436 | 436 | <i class="nav-icon fa-solid fa-file-import"></i> |
| 437 | 437 | <p> |
| 438 | - ' . $lang->get('import') . ' |
|
| 438 | + ' . $lang->get('import').' |
|
| 439 | 439 | </p> |
| 440 | 440 | </a> |
| 441 | 441 | </li>'; |
@@ -456,7 +456,7 @@ discard block |
||
| 456 | 456 | <a href="#" data-name="export" class="nav-link', $get['page'] === 'export' ? ' active' : '', '"> |
| 457 | 457 | <i class="nav-icon fa-solid fa-file-export"></i> |
| 458 | 458 | <p> |
| 459 | - ' . $lang->get('export') . ' |
|
| 459 | + ' . $lang->get('export').' |
|
| 460 | 460 | </p> |
| 461 | 461 | </a> |
| 462 | 462 | </li>'; |
@@ -483,7 +483,7 @@ discard block |
||
| 483 | 483 | <a href="#" data-name="search" class="nav-link', $get['page'] === 'search' ? ' active' : '', '"> |
| 484 | 484 | <i class="nav-icon fa-solid fa-search"></i> |
| 485 | 485 | <p> |
| 486 | - ' . $lang->get('find') . ' |
|
| 486 | + ' . $lang->get('find').' |
|
| 487 | 487 | </p> |
| 488 | 488 | </a> |
| 489 | 489 | </li>'; |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | <a href="#" data-name="favourites" class="nav-link', $get['page'] === 'favourites' ? ' active' : '', '"> |
| 500 | 500 | <i class="nav-icon fa-solid fa-star"></i> |
| 501 | 501 | <p> |
| 502 | - ' . $lang->get('favorites') . ' |
|
| 502 | + ' . $lang->get('favorites').' |
|
| 503 | 503 | </p> |
| 504 | 504 | </a> |
| 505 | 505 | </li>'; |
@@ -529,7 +529,7 @@ discard block |
||
| 529 | 529 | <a href="#" data-name="suggestion" class="nav-link', $get['page'] === 'suggestion' ? ' active' : '', '"> |
| 530 | 530 | <i class="nav-icon fa-solid fa-lightbulb"></i> |
| 531 | 531 | <p> |
| 532 | - ' . $lang->get('suggestion_menu') . ' |
|
| 532 | + ' . $lang->get('suggestion_menu').' |
|
| 533 | 533 | </p> |
| 534 | 534 | </a> |
| 535 | 535 | </li>'; |
@@ -542,7 +542,7 @@ discard block |
||
| 542 | 542 | <a href="#" data-name="admin" class="nav-link', $get['page'] === 'admin' ? ' active' : '', '"> |
| 543 | 543 | <i class="nav-icon fa-solid fa-info"></i> |
| 544 | 544 | <p> |
| 545 | - ' . $lang->get('admin_main') . ' |
|
| 545 | + ' . $lang->get('admin_main').' |
|
| 546 | 546 | </p> |
| 547 | 547 | </a> |
| 548 | 548 | </li> |
@@ -550,7 +550,7 @@ discard block |
||
| 550 | 550 | <a href="#" class="nav-link"> |
| 551 | 551 | <i class="nav-icon fa-solid fa-wrench"></i> |
| 552 | 552 | <p> |
| 553 | - ' . $lang->get('admin_settings') . ' |
|
| 553 | + ' . $lang->get('admin_settings').' |
|
| 554 | 554 | <i class="fa-solid fa-angle-left right"></i> |
| 555 | 555 | </p> |
| 556 | 556 | </a> |
@@ -558,63 +558,63 @@ discard block |
||
| 558 | 558 | <li class="nav-item"> |
| 559 | 559 | <a href="#" data-name="options" class="nav-link', $get['page'] === 'options' ? ' active' : '', '"> |
| 560 | 560 | <i class="fa-solid fa-check-double nav-icon"></i> |
| 561 | - <p>' . $lang->get('options') . '</p> |
|
| 561 | + <p>' . $lang->get('options').'</p> |
|
| 562 | 562 | </a> |
| 563 | 563 | </li> |
| 564 | 564 | <li class="nav-item"> |
| 565 | 565 | <a href="#" data-name="2fa" class="nav-link', $get['page'] === '2fa' ? ' active' : '', '"> |
| 566 | 566 | <i class="fa-solid fa-qrcode nav-icon"></i> |
| 567 | - <p>' . $lang->get('mfa_short') . '</p> |
|
| 567 | + <p>' . $lang->get('mfa_short').'</p> |
|
| 568 | 568 | </a> |
| 569 | 569 | </li> |
| 570 | 570 | <li class="nav-item"> |
| 571 | 571 | <a href="#" data-name="api" class="nav-link', $get['page'] === 'api' ? ' active' : '', '"> |
| 572 | 572 | <i class="fa-solid fa-cubes nav-icon"></i> |
| 573 | - <p>' . $lang->get('api') . '</p> |
|
| 573 | + <p>' . $lang->get('api').'</p> |
|
| 574 | 574 | </a> |
| 575 | 575 | </li> |
| 576 | 576 | <li class="nav-item"> |
| 577 | 577 | <a href="#" data-name="backups" class="nav-link', $get['page'] === 'backups' ? ' active' : '', '"> |
| 578 | 578 | <i class="fa-solid fa-database nav-icon"></i> |
| 579 | - <p>' . $lang->get('backups') . '</p> |
|
| 579 | + <p>' . $lang->get('backups').'</p> |
|
| 580 | 580 | </a> |
| 581 | 581 | </li> |
| 582 | 582 | <li class="nav-item"> |
| 583 | 583 | <a href="#" data-name="emails" class="nav-link', $get['page'] === 'emails' ? ' active' : '', '"> |
| 584 | 584 | <i class="fa-solid fa-envelope nav-icon"></i> |
| 585 | - <p>' . $lang->get('emails') . '</p> |
|
| 585 | + <p>' . $lang->get('emails').'</p> |
|
| 586 | 586 | </a> |
| 587 | 587 | </li> |
| 588 | 588 | <li class="nav-item"> |
| 589 | 589 | <a href="#" data-name="fields" class="nav-link', $get['page'] === 'fields' ? ' active' : '', '"> |
| 590 | 590 | <i class="fa-solid fa-keyboard nav-icon"></i> |
| 591 | - <p>' . $lang->get('fields') . '</p> |
|
| 591 | + <p>' . $lang->get('fields').'</p> |
|
| 592 | 592 | </a> |
| 593 | 593 | </li> |
| 594 | 594 | <li class="nav-item"> |
| 595 | 595 | <a href="#" data-name="ldap" class="nav-link', $get['page'] === 'ldap' ? ' active' : '', '"> |
| 596 | 596 | <i class="fa-solid fa-id-card nav-icon"></i> |
| 597 | - <p>' . $lang->get('ldap') . '</p> |
|
| 597 | + <p>' . $lang->get('ldap').'</p> |
|
| 598 | 598 | </a> |
| 599 | 599 | </li> |
| 600 | 600 | |
| 601 | 601 | <li class="nav-item"> |
| 602 | 602 | <a href="#" data-name="oauth" class="nav-link', $get['page'] === 'oauth' ? ' active' : '', '"> |
| 603 | 603 | <i class="fa-solid fa-plug nav-icon"></i> |
| 604 | - <p>' . $lang->get('oauth') . '</p> |
|
| 604 | + <p>' . $lang->get('oauth').'</p> |
|
| 605 | 605 | </a> |
| 606 | 606 | </li> |
| 607 | 607 | |
| 608 | 608 | <li class="nav-item"> |
| 609 | 609 | <a href="#" data-name="uploads" class="nav-link', $get['page'] === 'uploads' ? ' active' : '', '"> |
| 610 | 610 | <i class="fa-solid fa-file-upload nav-icon"></i> |
| 611 | - <p>' . $lang->get('uploads') . '</p> |
|
| 611 | + <p>' . $lang->get('uploads').'</p> |
|
| 612 | 612 | </a> |
| 613 | 613 | </li> |
| 614 | 614 | <li class="nav-item"> |
| 615 | 615 | <a href="#" data-name="statistics" class="nav-link', $get['page'] === 'statistics' ? ' active' : '', '"> |
| 616 | 616 | <i class="fa-solid fa-chart-bar nav-icon"></i> |
| 617 | - <p>' . $lang->get('statistics') . '</p> |
|
| 617 | + <p>' . $lang->get('statistics').'</p> |
|
| 618 | 618 | </a> |
| 619 | 619 | </li> |
| 620 | 620 | </ul> |
@@ -625,7 +625,7 @@ discard block |
||
| 625 | 625 | <li class="nav-item"> |
| 626 | 626 | <a href="#" data-name="tasks" class="nav-link', $get['page'] === 'tasks' ? ' active' : '', '"> |
| 627 | 627 | <i class="fa-solid fa-tasks nav-icon"></i> |
| 628 | - <p>' . $lang->get('tasks') . '</p> |
|
| 628 | + <p>' . $lang->get('tasks').'</p> |
|
| 629 | 629 | </a> |
| 630 | 630 | </li>'; |
| 631 | 631 | } |
@@ -636,7 +636,7 @@ discard block |
||
| 636 | 636 | <a href="#" data-name="tools" class="nav-link', $get['page'] === 'tools' ? ' active' : '', '"> |
| 637 | 637 | <i class="nav-icon fa-solid fa-person-drowning"></i> |
| 638 | 638 | <p> |
| 639 | - ' . $lang->get('tools') . ' |
|
| 639 | + ' . $lang->get('tools').' |
|
| 640 | 640 | </p> |
| 641 | 641 | </a> |
| 642 | 642 | </li>'; |
@@ -653,7 +653,7 @@ discard block |
||
| 653 | 653 | <a href="#" data-name="folders" class="nav-link', $get['page'] === 'folders' ? ' active' : '', '"> |
| 654 | 654 | <i class="nav-icon fa-solid fa-folder-open"></i> |
| 655 | 655 | <p> |
| 656 | - ' . $lang->get('folders') . ' |
|
| 656 | + ' . $lang->get('folders').' |
|
| 657 | 657 | </p> |
| 658 | 658 | </a> |
| 659 | 659 | </li> |
@@ -661,7 +661,7 @@ discard block |
||
| 661 | 661 | <a href="#" data-name="roles" class="nav-link', $get['page'] === 'roles' ? ' active' : '', '"> |
| 662 | 662 | <i class="nav-icon fa-solid fa-graduation-cap"></i> |
| 663 | 663 | <p> |
| 664 | - ' . $lang->get('roles') . ' |
|
| 664 | + ' . $lang->get('roles').' |
|
| 665 | 665 | </p> |
| 666 | 666 | </a> |
| 667 | 667 | </li> |
@@ -669,38 +669,38 @@ discard block |
||
| 669 | 669 | <a href="#" data-name="users" class="nav-link', $get['page'] === 'users' ? ' active' : '', '"> |
| 670 | 670 | <i class="nav-icon fa-solid fa-users"></i> |
| 671 | 671 | <p> |
| 672 | - ' . $lang->get('users') . ' |
|
| 672 | + ' . $lang->get('users').' |
|
| 673 | 673 | </p> |
| 674 | 674 | </a> |
| 675 | 675 | </li> |
| 676 | 676 | <li class="nav-item has-treeview', $menuUtilities === true ? ' menu-open' : '', '"> |
| 677 | 677 | <a href="#" class="nav-link"> |
| 678 | 678 | <i class="nav-icon fa-solid fa-cubes"></i> |
| 679 | - <p>' . $lang->get('admin_views') . '<i class="fa-solid fa-angle-left right"></i></p> |
|
| 679 | + <p>' . $lang->get('admin_views').'<i class="fa-solid fa-angle-left right"></i></p> |
|
| 680 | 680 | </a> |
| 681 | 681 | <ul class="nav nav-treeview"> |
| 682 | 682 | <li class="nav-item"> |
| 683 | 683 | <a href="#" data-name="utilities.renewal" class="nav-link', $get['page'] === 'utilities.renewal' ? ' active' : '', '"> |
| 684 | 684 | <i class="far fa-calendar-alt nav-icon"></i> |
| 685 | - <p>' . $lang->get('renewal') . '</p> |
|
| 685 | + <p>' . $lang->get('renewal').'</p> |
|
| 686 | 686 | </a> |
| 687 | 687 | </li> |
| 688 | 688 | <li class="nav-item"> |
| 689 | 689 | <a href="#" data-name="utilities.deletion" class="nav-link', $get['page'] === 'utilities.deletion' ? ' active' : '', '"> |
| 690 | 690 | <i class="fa-solid fa-trash-alt nav-icon"></i> |
| 691 | - <p>' . $lang->get('deletion') . '</p> |
|
| 691 | + <p>' . $lang->get('deletion').'</p> |
|
| 692 | 692 | </a> |
| 693 | 693 | </li> |
| 694 | 694 | <li class="nav-item"> |
| 695 | 695 | <a href="#" data-name="utilities.logs" class="nav-link', $get['page'] === 'utilities.logs' ? ' active' : '', '"> |
| 696 | 696 | <i class="fa-solid fa-history nav-icon"></i> |
| 697 | - <p>' . $lang->get('logs') . '</p> |
|
| 697 | + <p>' . $lang->get('logs').'</p> |
|
| 698 | 698 | </a> |
| 699 | 699 | </li> |
| 700 | 700 | <li class="nav-item"> |
| 701 | 701 | <a href="#" data-name="utilities.database" class="nav-link', $get['page'] === 'utilities.database' ? ' active' : '', '"> |
| 702 | 702 | <i class="fa-solid fa-database nav-icon"></i> |
| 703 | - <p>' . $lang->get('database') . '</p> |
|
| 703 | + <p>' . $lang->get('database').'</p> |
|
| 704 | 704 | </a> |
| 705 | 705 | </li> |
| 706 | 706 | </ul> |
@@ -711,10 +711,10 @@ discard block |
||
| 711 | 711 | <!-- /.sidebar-menu --> |
| 712 | 712 | <div class="menu-footer"> |
| 713 | 713 | <div class="" id="sidebar-footer"> |
| 714 | - <i class="fa-solid fa-clock-o mr-2 infotip text-info pointer" title="<?php echo htmlspecialchars($lang->get('server_time') . ' ' . |
|
| 715 | - date($date_format, (int) $server['request_time']) . ' - ' . |
|
| 714 | + <i class="fa-solid fa-clock-o mr-2 infotip text-info pointer" title="<?php echo htmlspecialchars($lang->get('server_time').' '. |
|
| 715 | + date($date_format, (int) $server['request_time']).' - '. |
|
| 716 | 716 | date($time_format, (int) $server['request_time']), ENT_QUOTES, 'UTF-8'); ?>"></i> |
| 717 | - <i class="fa-solid fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online . ' ' . $lang->get('users_online'); ?>"></i> |
|
| 717 | + <i class="fa-solid fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online.' '.$lang->get('users_online'); ?>"></i> |
|
| 718 | 718 | <a href="<?php echo DOCUMENTATION_URL; ?>" target="_blank" class="text-info"><i class="fa-solid fa-book mr-2 infotip" title="<?php echo $lang->get('documentation_canal'); ?>"></i></a> |
| 719 | 719 | <a href="<?php echo HELP_URL; ?>" target="_blank" class="text-info"><i class="fa-solid fa-life-ring mr-2 infotip" title="<?php echo $lang->get('admin_help'); ?>"></i></a> |
| 720 | 720 | <?php if ($session_user_admin === 1) : ?><i class="fa-solid fa-bug infotip pointer text-info" title="<?php echo $lang->get('bugs_page'); ?>" onclick="generateBugReport()"></i><?php endif; ?> |
@@ -865,7 +865,7 @@ discard block |
||
| 865 | 865 | </div> |
| 866 | 866 | <div class="mt-3"> |
| 867 | 867 | <label> |
| 868 | - <span class="mr-2 pointer fw-normal"><i class="fa-solid fa-eye mr-2 text-orange"></i><?php echo $lang->get('show_user_password');?></span> |
|
| 868 | + <span class="mr-2 pointer fw-normal"><i class="fa-solid fa-eye mr-2 text-orange"></i><?php echo $lang->get('show_user_password'); ?></span> |
|
| 869 | 869 | <input type="checkbox" id="dialog-admin-change-user-password-do-show-password" class="pointer"> |
| 870 | 870 | </label> |
| 871 | 871 | </div> |
@@ -1032,34 +1032,34 @@ discard block |
||
| 1032 | 1032 | if ($get['page'] === 'items') { |
| 1033 | 1033 | // SHow page with Items |
| 1034 | 1034 | if ((int) $session_user_admin !== 1) { |
| 1035 | - include $SETTINGS['cpassman_dir'] . '/pages/items.php'; |
|
| 1035 | + include $SETTINGS['cpassman_dir'].'/pages/items.php'; |
|
| 1036 | 1036 | } elseif ((int) $session_user_admin === 1) { |
| 1037 | - include $SETTINGS['cpassman_dir'] . '/pages/admin.php'; |
|
| 1037 | + include $SETTINGS['cpassman_dir'].'/pages/admin.php'; |
|
| 1038 | 1038 | } else { |
| 1039 | 1039 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 1040 | 1040 | //not allowed page |
| 1041 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 1041 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 1042 | 1042 | } |
| 1043 | 1043 | } elseif (in_array($get['page'], array_keys($mngPages)) === true) { |
| 1044 | 1044 | // Define if user is allowed to see management pages |
| 1045 | 1045 | if ($session_user_admin === 1) { |
| 1046 | 1046 | // deepcode ignore FileInclusion: $get['page'] is secured through usage of array_keys test bellow |
| 1047 | - include $SETTINGS['cpassman_dir'] . '/pages/' . basename($mngPages[$get['page']]); |
|
| 1047 | + include $SETTINGS['cpassman_dir'].'/pages/'.basename($mngPages[$get['page']]); |
|
| 1048 | 1048 | } elseif ($session_user_manager === 1 || $session_user_human_resources === 1) { |
| 1049 | 1049 | if ($get['page'] === 'manage_main' || $get['page'] === 'manage_settings' |
| 1050 | 1050 | ) { |
| 1051 | 1051 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 1052 | 1052 | //not allowed page |
| 1053 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 1053 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 1054 | 1054 | } |
| 1055 | 1055 | } else { |
| 1056 | 1056 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 1057 | 1057 | //not allowed page |
| 1058 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 1058 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 1059 | 1059 | } |
| 1060 | - } elseif (empty($get['page']) === false && file_exists($SETTINGS['cpassman_dir'] . '/pages/' . $get['page'] . '.php') === true) { |
|
| 1060 | + } elseif (empty($get['page']) === false && file_exists($SETTINGS['cpassman_dir'].'/pages/'.$get['page'].'.php') === true) { |
|
| 1061 | 1061 | // deepcode ignore FileInclusion: $get['page'] is tested against file_exists just below |
| 1062 | - include $SETTINGS['cpassman_dir'] . '/pages/' . basename($get['page'] . '.php'); |
|
| 1062 | + include $SETTINGS['cpassman_dir'].'/pages/'.basename($get['page'].'.php'); |
|
| 1063 | 1063 | } else { |
| 1064 | 1064 | $session->set('system-array_roles', ERR_NOT_EXIST); |
| 1065 | 1065 | //page doesn't exist |
@@ -1088,7 +1088,7 @@ discard block |
||
| 1088 | 1088 | <footer class="main-footer"> |
| 1089 | 1089 | <!-- To the right --> |
| 1090 | 1090 | <div class="float-right d-none d-sm-inline"> |
| 1091 | - <?php echo $lang->get('version_alone'); ?> <?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?> |
|
| 1091 | + <?php echo $lang->get('version_alone'); ?> <?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?> |
|
| 1092 | 1092 | </div> |
| 1093 | 1093 | <!-- Default to the left --> |
| 1094 | 1094 | <strong>Copyright © <?php echo TP_COPYRIGHT; ?> <a href="<?php echo TEAMPASS_URL; ?>"><?php echo TP_TOOL_NAME; ?></a>.</strong> All rights reserved. |
@@ -1102,7 +1102,7 @@ discard block |
||
| 1102 | 1102 | echo ' |
| 1103 | 1103 | <input type="hidden" id="temps_restant" value="', $session->get('user-session_duration') ?? '', '" />'; |
| 1104 | 1104 | // display an item in the context of OTV link |
| 1105 | -} elseif ((null === $session->get('user-validite_pw')|| empty($session->get('user-validite_pw')) === true || empty($session->get('user-id')) === true) |
|
| 1105 | +} elseif ((null === $session->get('user-validite_pw') || empty($session->get('user-validite_pw')) === true || empty($session->get('user-id')) === true) |
|
| 1106 | 1106 | && empty($get['otv']) === false |
| 1107 | 1107 | ) { |
| 1108 | 1108 | // case where one-shot viewer |
@@ -1121,7 +1121,7 @@ discard block |
||
| 1121 | 1121 | FILTER_SANITIZE_URL |
| 1122 | 1122 | ) |
| 1123 | 1123 | ); |
| 1124 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 1124 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 1125 | 1125 | } |
| 1126 | 1126 | } elseif (//(empty($session->get('user-id')) === false && $session->get('user-id') !== null) || |
| 1127 | 1127 | empty($session->get('user-id')) === true |
@@ -1146,7 +1146,7 @@ discard block |
||
| 1146 | 1146 | } |
| 1147 | 1147 | |
| 1148 | 1148 | // LOGIN form |
| 1149 | - include $SETTINGS['cpassman_dir'] . '/includes/core/login.php'; |
|
| 1149 | + include $SETTINGS['cpassman_dir'].'/includes/core/login.php'; |
|
| 1150 | 1150 | |
| 1151 | 1151 | } else { |
| 1152 | 1152 | // Clear session |
@@ -1179,153 +1179,153 @@ discard block |
||
| 1179 | 1179 | <!-- REQUIRED SCRIPTS --> |
| 1180 | 1180 | |
| 1181 | 1181 | <!-- Font Awesome Icons --> |
| 1182 | - <link href="plugins/fontawesome-free-6/css/fontawesome.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1183 | - <link href="plugins/fontawesome-free-6/css/solid.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1184 | - <link href="plugins/fontawesome-free-6/css/regular.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1185 | - <link href="plugins/fontawesome-free-6/css/brands.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1186 | - <link href="plugins/fontawesome-free-6/css/v5-font-face.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet" /> |
|
| 1182 | + <link href="plugins/fontawesome-free-6/css/fontawesome.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1183 | + <link href="plugins/fontawesome-free-6/css/solid.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1184 | + <link href="plugins/fontawesome-free-6/css/regular.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1185 | + <link href="plugins/fontawesome-free-6/css/brands.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet"> |
|
| 1186 | + <link href="plugins/fontawesome-free-6/css/v5-font-face.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet" /> |
|
| 1187 | 1187 | <!-- jQuery --> |
| 1188 | - <script src="plugins/jquery/jquery.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1189 | - <script src="plugins/jquery/jquery.cookie.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1188 | + <script src="plugins/jquery/jquery.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1189 | + <script src="plugins/jquery/jquery.cookie.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1190 | 1190 | <!-- jQuery UI --> |
| 1191 | - <script src="plugins/jqueryUI/jquery-ui.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1192 | - <link rel="stylesheet" href="plugins/jqueryUI/jquery-ui.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1191 | + <script src="plugins/jqueryUI/jquery-ui.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1192 | + <link rel="stylesheet" href="plugins/jqueryUI/jquery-ui.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1193 | 1193 | <!-- Popper --> |
| 1194 | - <script src="plugins/popper/umd/popper.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1194 | + <script src="plugins/popper/umd/popper.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1195 | 1195 | <!-- Bootstrap --> |
| 1196 | - <script src="plugins/bootstrap/js/bootstrap.bundle.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1196 | + <script src="plugins/bootstrap/js/bootstrap.bundle.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1197 | 1197 | <!-- AdminLTE --> |
| 1198 | - <script src="plugins/adminlte/js/adminlte.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1198 | + <script src="plugins/adminlte/js/adminlte.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1199 | 1199 | <!-- Altertify --> |
| 1200 | 1200 | <!--<script type="text/javascript" src="plugins/alertifyjs/alertify.min.js"></script>--> |
| 1201 | 1201 | <!-- Toastr --> |
| 1202 | - <script type="text/javascript" src="plugins/toastr/toastr.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1202 | + <script type="text/javascript" src="plugins/toastr/toastr.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1203 | 1203 | <!-- STORE.JS --> |
| 1204 | - <script type="text/javascript" src="plugins/store.js/dist/store.everything.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1204 | + <script type="text/javascript" src="plugins/store.js/dist/store.everything.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1205 | 1205 | <!-- cryptojs-aesphp --> |
| 1206 | - <script type="text/javascript" src="includes/libraries/cryptojs/crypto-js.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1207 | - <script type="text/javascript" src="includes/libraries/cryptojs/encryption.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1206 | + <script type="text/javascript" src="includes/libraries/cryptojs/crypto-js.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1207 | + <script type="text/javascript" src="includes/libraries/cryptojs/encryption.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1208 | 1208 | <!-- pace --> |
| 1209 | - <script type="text/javascript" data-pace-options='{ "ajax": true, "eventLag": false }' src="plugins/pace-progress/pace.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1209 | + <script type="text/javascript" data-pace-options='{ "ajax": true, "eventLag": false }' src="plugins/pace-progress/pace.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1210 | 1210 | <!-- select2 --> |
| 1211 | - <script type="text/javascript" src="plugins/select2/js/select2.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1211 | + <script type="text/javascript" src="plugins/select2/js/select2.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1212 | 1212 | <!-- simplePassMeter --> |
| 1213 | - <link rel="stylesheet" href="plugins/simplePassMeter/simplePassMeter.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 1214 | - <script type="text/javascript" src="plugins/simplePassMeter/simplePassMeter.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1213 | + <link rel="stylesheet" href="plugins/simplePassMeter/simplePassMeter.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 1214 | + <script type="text/javascript" src="plugins/simplePassMeter/simplePassMeter.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1215 | 1215 | <!-- platform --> |
| 1216 | - <script type="text/javascript" src="plugins/platform/platform.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1216 | + <script type="text/javascript" src="plugins/platform/platform.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1217 | 1217 | <!-- radiobuttons --> |
| 1218 | - <link rel="stylesheet" href="plugins/radioforbuttons/bootstrap-buttons.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 1219 | - <script type="text/javascript" src="plugins/radioforbuttons/jquery.radiosforbuttons.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1218 | + <link rel="stylesheet" href="plugins/radioforbuttons/bootstrap-buttons.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" /> |
|
| 1219 | + <script type="text/javascript" src="plugins/radioforbuttons/jquery.radiosforbuttons.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1220 | 1220 | <!-- ICHECK --> |
| 1221 | 1221 | <!--<link rel="stylesheet" href="./plugins/icheck-material/icheck-material.min.css">--> |
| 1222 | - <link rel="stylesheet" href="./plugins/icheck/skins/all.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1223 | - <script type="text/javascript" src="./plugins/icheck/icheck.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1222 | + <link rel="stylesheet" href="./plugins/icheck/skins/all.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1223 | + <script type="text/javascript" src="./plugins/icheck/icheck.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1224 | 1224 | <!-- bootstrap-add-clear --> |
| 1225 | - <script type="text/javascript" src="plugins/bootstrap-add-clear/bootstrap-add-clear.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1225 | + <script type="text/javascript" src="plugins/bootstrap-add-clear/bootstrap-add-clear.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1226 | 1226 | <!-- DOMPurify --> |
| 1227 | - <script type="text/javascript" src="plugins/DOMPurify/purify.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1227 | + <script type="text/javascript" src="plugins/DOMPurify/purify.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1228 | 1228 | |
| 1229 | 1229 | <?php |
| 1230 | 1230 | $get['page'] = $request->query->filter('page', null, FILTER_SANITIZE_SPECIAL_CHARS); |
| 1231 | 1231 | if ($menuAdmin === true) { |
| 1232 | 1232 | ?> |
| 1233 | - <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1234 | - <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1235 | - <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1233 | + <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1234 | + <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1235 | + <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1236 | 1236 | <!-- InputMask --> |
| 1237 | - <script src="./plugins/inputmask/jquery.inputmask.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1237 | + <script src="./plugins/inputmask/jquery.inputmask.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1238 | 1238 | <!-- Sortable --> |
| 1239 | 1239 | <!--<script src="./plugins/sortable/jquery.sortable.js"></script>--> |
| 1240 | 1240 | <!-- PLUPLOAD --> |
| 1241 | - <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1241 | + <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1242 | 1242 | <!-- DataTables --> |
| 1243 | - <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1244 | - <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1245 | - <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1246 | - <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1247 | - <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1248 | - <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1249 | - <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1250 | - <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1251 | - <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1252 | - <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1243 | + <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1244 | + <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1245 | + <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1246 | + <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1247 | + <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1248 | + <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1249 | + <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1250 | + <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1251 | + <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1252 | + <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1253 | 1253 | <?php |
| 1254 | 1254 | } elseif (isset($get['page']) === true) { |
| 1255 | 1255 | if (in_array($get['page'], ['items', 'import']) === true) { |
| 1256 | 1256 | ?> |
| 1257 | - <link rel="stylesheet" href="./plugins/jstree/themes/default/style.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1258 | - <link rel="stylesheet" href="./plugins/jstree/themes/default-dark/style.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1259 | - <script src="./plugins/jstree/jstree.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1257 | + <link rel="stylesheet" href="./plugins/jstree/themes/default/style.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1258 | + <link rel="stylesheet" href="./plugins/jstree/themes/default-dark/style.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1259 | + <script src="./plugins/jstree/jstree.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1260 | 1260 | <!-- countdownTimer --> |
| 1261 | - <script src="./plugins/jquery.countdown360/jquery.countdown360.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1261 | + <script src="./plugins/jquery.countdown360/jquery.countdown360.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1262 | 1262 | <!-- SUMMERNOTE --> |
| 1263 | - <link rel="stylesheet" href="./plugins/summernote/summernote-bs4.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1264 | - <script src="./plugins/summernote/summernote-bs4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1263 | + <link rel="stylesheet" href="./plugins/summernote/summernote-bs4.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1264 | + <script src="./plugins/summernote/summernote-bs4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1265 | 1265 | <!-- date-picker --> |
| 1266 | - <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1267 | - <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1266 | + <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1267 | + <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1268 | 1268 | <!-- time-picker --> |
| 1269 | - <link rel="stylesheet" href="./plugins/timepicker/bootstrap-timepicker.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1270 | - <script src="./plugins/timepicker/bootstrap-timepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1269 | + <link rel="stylesheet" href="./plugins/timepicker/bootstrap-timepicker.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1270 | + <script src="./plugins/timepicker/bootstrap-timepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1271 | 1271 | <!-- PLUPLOAD --> |
| 1272 | - <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1272 | + <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1273 | 1273 | <!-- VALIDATE --> |
| 1274 | - <script type="text/javascript" src="plugins/jquery-validation/jquery.validate.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1274 | + <script type="text/javascript" src="plugins/jquery-validation/jquery.validate.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1275 | 1275 | <!-- PWSTRENGHT --> |
| 1276 | - <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1277 | - <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1276 | + <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1277 | + <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1278 | 1278 | <!-- TOGGLE --> |
| 1279 | - <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1280 | - <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" /> |
|
| 1281 | - <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1279 | + <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1280 | + <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" /> |
|
| 1281 | + <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script> |
|
| 1282 | 1282 | <?php |
| 1283 | 1283 | } elseif (in_array($get['page'], ['search', 'folders', 'users', 'roles', 'utilities.deletion', 'utilities.logs', 'utilities.database', 'utilities.renewal', 'tasks']) === true) { |
| 1284 | 1284 | ?> |
| 1285 | 1285 | <!-- DataTables --> |
| 1286 | - <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1287 | - <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1288 | - <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1289 | - <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1290 | - <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1291 | - <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1292 | - <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1293 | - <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1294 | - <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1295 | - <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1286 | + <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1287 | + <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1288 | + <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1289 | + <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1290 | + <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1291 | + <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1292 | + <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1293 | + <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1294 | + <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1295 | + <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1296 | 1296 | <!-- dater picker --> |
| 1297 | - <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1298 | - <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1297 | + <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1298 | + <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1299 | 1299 | <!-- daterange picker --> |
| 1300 | - <link rel="stylesheet" href="./plugins/daterangepicker/daterangepicker.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"> |
|
| 1301 | - <script src="./plugins/moment/moment.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1302 | - <script src="./plugins/daterangepicker/daterangepicker.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1300 | + <link rel="stylesheet" href="./plugins/daterangepicker/daterangepicker.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"> |
|
| 1301 | + <script src="./plugins/moment/moment.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1302 | + <script src="./plugins/daterangepicker/daterangepicker.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1303 | 1303 | <!-- SlimScroll --> |
| 1304 | - <script src="./plugins/slimScroll/jquery.slimscroll.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1304 | + <script src="./plugins/slimScroll/jquery.slimscroll.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1305 | 1305 | <!-- FastClick --> |
| 1306 | - <script src="./plugins/fastclick/fastclick.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1306 | + <script src="./plugins/fastclick/fastclick.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1307 | 1307 | <?php |
| 1308 | 1308 | } elseif ($get['page'] === 'profile') { |
| 1309 | 1309 | ?> |
| 1310 | 1310 | <!-- FILESAVER --> |
| 1311 | - <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1311 | + <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1312 | 1312 | <!-- PLUPLOAD --> |
| 1313 | - <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1313 | + <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1314 | 1314 | <?php |
| 1315 | 1315 | } elseif ($get['page'] === 'export') { |
| 1316 | 1316 | ?> |
| 1317 | 1317 | <!-- FILESAVER --> |
| 1318 | - <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1318 | + <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1319 | 1319 | <!-- PWSTRENGHT --> |
| 1320 | - <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1321 | - <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1320 | + <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1321 | + <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1322 | 1322 | <?php |
| 1323 | 1323 | } |
| 1324 | 1324 | } |
| 1325 | 1325 | ?> |
| 1326 | 1326 | <!-- functions --> |
| 1327 | - <script type="text/javascript" src="includes/js/functions.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1328 | - <script type="text/javascript" src="includes/js/CreateRandomString.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1327 | + <script type="text/javascript" src="includes/js/functions.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1328 | + <script type="text/javascript" src="includes/js/CreateRandomString.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1329 | 1329 | <input type="hidden" id="encryptClientServerStatus" value="<?php echo $SETTINGS['encryptClientServer'] ?? 1; ?>" /> |
| 1330 | 1330 | |
| 1331 | 1331 | </body> |
@@ -1367,7 +1367,7 @@ discard block |
||
| 1367 | 1367 | }; |
| 1368 | 1368 | </script> |
| 1369 | 1369 | |
| 1370 | -<script type="text/javascript" src="includes/js/secure-clipboard-cleaner.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script> |
|
| 1370 | +<script type="text/javascript" src="includes/js/secure-clipboard-cleaner.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script> |
|
| 1371 | 1371 | |
| 1372 | 1372 | <script> |
| 1373 | 1373 | $(document).ready(function() { |
@@ -1426,65 +1426,65 @@ discard block |
||
| 1426 | 1426 | |
| 1427 | 1427 | // Load links, css and javascripts |
| 1428 | 1428 | if (isset($SETTINGS['cpassman_dir']) === true) { |
| 1429 | - include_once $SETTINGS['cpassman_dir'] . '/includes/core/load.js.php'; |
|
| 1429 | + include_once $SETTINGS['cpassman_dir'].'/includes/core/load.js.php'; |
|
| 1430 | 1430 | if ($menuAdmin === true) { |
| 1431 | - include_once $SETTINGS['cpassman_dir'] . '/pages/admin.js.php'; |
|
| 1431 | + include_once $SETTINGS['cpassman_dir'].'/pages/admin.js.php'; |
|
| 1432 | 1432 | if ($get['page'] === '2fa') { |
| 1433 | - include_once $SETTINGS['cpassman_dir'] . '/pages/2fa.js.php'; |
|
| 1433 | + include_once $SETTINGS['cpassman_dir'].'/pages/2fa.js.php'; |
|
| 1434 | 1434 | } elseif ($get['page'] === 'api') { |
| 1435 | - include_once $SETTINGS['cpassman_dir'] . '/pages/api.js.php'; |
|
| 1435 | + include_once $SETTINGS['cpassman_dir'].'/pages/api.js.php'; |
|
| 1436 | 1436 | } elseif ($get['page'] === 'backups') { |
| 1437 | - include_once $SETTINGS['cpassman_dir'] . '/pages/backups.js.php'; |
|
| 1437 | + include_once $SETTINGS['cpassman_dir'].'/pages/backups.js.php'; |
|
| 1438 | 1438 | } elseif ($get['page'] === 'emails') { |
| 1439 | - include_once $SETTINGS['cpassman_dir'] . '/pages/emails.js.php'; |
|
| 1439 | + include_once $SETTINGS['cpassman_dir'].'/pages/emails.js.php'; |
|
| 1440 | 1440 | } elseif ($get['page'] === 'ldap') { |
| 1441 | - include_once $SETTINGS['cpassman_dir'] . '/pages/ldap.js.php'; |
|
| 1441 | + include_once $SETTINGS['cpassman_dir'].'/pages/ldap.js.php'; |
|
| 1442 | 1442 | } elseif ($get['page'] === 'uploads') { |
| 1443 | - include_once $SETTINGS['cpassman_dir'] . '/pages/uploads.js.php'; |
|
| 1443 | + include_once $SETTINGS['cpassman_dir'].'/pages/uploads.js.php'; |
|
| 1444 | 1444 | } elseif ($get['page'] === 'fields') { |
| 1445 | - include_once $SETTINGS['cpassman_dir'] . '/pages/fields.js.php'; |
|
| 1445 | + include_once $SETTINGS['cpassman_dir'].'/pages/fields.js.php'; |
|
| 1446 | 1446 | } elseif ($get['page'] === 'options') { |
| 1447 | - include_once $SETTINGS['cpassman_dir'] . '/pages/options.js.php'; |
|
| 1447 | + include_once $SETTINGS['cpassman_dir'].'/pages/options.js.php'; |
|
| 1448 | 1448 | } elseif ($get['page'] === 'statistics') { |
| 1449 | - include_once $SETTINGS['cpassman_dir'] . '/pages/statistics.js.php'; |
|
| 1449 | + include_once $SETTINGS['cpassman_dir'].'/pages/statistics.js.php'; |
|
| 1450 | 1450 | } elseif ($get['page'] === 'tasks') { |
| 1451 | - include_once $SETTINGS['cpassman_dir'] . '/pages/tasks.js.php'; |
|
| 1451 | + include_once $SETTINGS['cpassman_dir'].'/pages/tasks.js.php'; |
|
| 1452 | 1452 | } elseif ($get['page'] === 'oauth' && WIP === true) { |
| 1453 | - include_once $SETTINGS['cpassman_dir'] . '/pages/oauth.js.php'; |
|
| 1453 | + include_once $SETTINGS['cpassman_dir'].'/pages/oauth.js.php'; |
|
| 1454 | 1454 | } elseif ($get['page'] === 'tools') { |
| 1455 | - include_once $SETTINGS['cpassman_dir'] . '/pages/tools.js.php'; |
|
| 1455 | + include_once $SETTINGS['cpassman_dir'].'/pages/tools.js.php'; |
|
| 1456 | 1456 | } |
| 1457 | 1457 | } elseif (isset($get['page']) === true && $get['page'] !== '') { |
| 1458 | 1458 | if ($get['page'] === 'items') { |
| 1459 | - include_once $SETTINGS['cpassman_dir'] . '/pages/items.js.php'; |
|
| 1459 | + include_once $SETTINGS['cpassman_dir'].'/pages/items.js.php'; |
|
| 1460 | 1460 | } elseif ($get['page'] === 'import') { |
| 1461 | - include_once $SETTINGS['cpassman_dir'] . '/pages/import.js.php'; |
|
| 1461 | + include_once $SETTINGS['cpassman_dir'].'/pages/import.js.php'; |
|
| 1462 | 1462 | } elseif ($get['page'] === 'export') { |
| 1463 | - include_once $SETTINGS['cpassman_dir'] . '/pages/export.js.php'; |
|
| 1463 | + include_once $SETTINGS['cpassman_dir'].'/pages/export.js.php'; |
|
| 1464 | 1464 | } elseif ($get['page'] === 'offline') { |
| 1465 | - include_once $SETTINGS['cpassman_dir'] . '/pages/offline.js.php'; |
|
| 1465 | + include_once $SETTINGS['cpassman_dir'].'/pages/offline.js.php'; |
|
| 1466 | 1466 | } elseif ($get['page'] === 'search') { |
| 1467 | - include_once $SETTINGS['cpassman_dir'] . '/pages/search.js.php'; |
|
| 1467 | + include_once $SETTINGS['cpassman_dir'].'/pages/search.js.php'; |
|
| 1468 | 1468 | } elseif ($get['page'] === 'profile') { |
| 1469 | - include_once $SETTINGS['cpassman_dir'] . '/pages/profile.js.php'; |
|
| 1469 | + include_once $SETTINGS['cpassman_dir'].'/pages/profile.js.php'; |
|
| 1470 | 1470 | } elseif ($get['page'] === 'favourites') { |
| 1471 | - include_once $SETTINGS['cpassman_dir'] . '/pages/favorites.js.php'; |
|
| 1471 | + include_once $SETTINGS['cpassman_dir'].'/pages/favorites.js.php'; |
|
| 1472 | 1472 | } elseif ($get['page'] === 'folders') { |
| 1473 | - include_once $SETTINGS['cpassman_dir'] . '/pages/folders.js.php'; |
|
| 1473 | + include_once $SETTINGS['cpassman_dir'].'/pages/folders.js.php'; |
|
| 1474 | 1474 | } elseif ($get['page'] === 'users') { |
| 1475 | - include_once $SETTINGS['cpassman_dir'] . '/pages/users.js.php'; |
|
| 1475 | + include_once $SETTINGS['cpassman_dir'].'/pages/users.js.php'; |
|
| 1476 | 1476 | } elseif ($get['page'] === 'roles') { |
| 1477 | - include_once $SETTINGS['cpassman_dir'] . '/pages/roles.js.php'; |
|
| 1477 | + include_once $SETTINGS['cpassman_dir'].'/pages/roles.js.php'; |
|
| 1478 | 1478 | } elseif ($get['page'] === 'utilities.deletion') { |
| 1479 | - include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.deletion.js.php'; |
|
| 1479 | + include_once $SETTINGS['cpassman_dir'].'/pages/utilities.deletion.js.php'; |
|
| 1480 | 1480 | } elseif ($get['page'] === 'utilities.logs') { |
| 1481 | - include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.logs.js.php'; |
|
| 1481 | + include_once $SETTINGS['cpassman_dir'].'/pages/utilities.logs.js.php'; |
|
| 1482 | 1482 | } elseif ($get['page'] === 'utilities.database') { |
| 1483 | - include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.database.js.php'; |
|
| 1483 | + include_once $SETTINGS['cpassman_dir'].'/pages/utilities.database.js.php'; |
|
| 1484 | 1484 | } elseif ($get['page'] === 'utilities.renewal') { |
| 1485 | - include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.renewal.js.php'; |
|
| 1485 | + include_once $SETTINGS['cpassman_dir'].'/pages/utilities.renewal.js.php'; |
|
| 1486 | 1486 | } |
| 1487 | 1487 | } else { |
| 1488 | - include_once $SETTINGS['cpassman_dir'] . '/includes/core/login.js.php'; |
|
| 1488 | + include_once $SETTINGS['cpassman_dir'].'/includes/core/login.js.php'; |
|
| 1489 | 1489 | } |
| 1490 | 1490 | } |
@@ -2,7 +2,7 @@ |
||
| 2 | 2 | use TeampassClasses\OAuth2Controller\OAuth2Controller; |
| 3 | 3 | use TeampassClasses\SessionManager\SessionManager; |
| 4 | 4 | |
| 5 | -require_once __DIR__. '/../includes/config/include.php'; |
|
| 5 | +require_once __DIR__.'/../includes/config/include.php'; |
|
| 6 | 6 | require_once __DIR__.'/../sources/main.functions.php'; |
| 7 | 7 | |
| 8 | 8 | // init |
@@ -830,7 +830,7 @@ |
||
| 830 | 830 | 'encode' |
| 831 | 831 | ); |
| 832 | 832 | |
| 833 | - /* |
|
| 833 | + /* |
|
| 834 | 834 | * Generate BUG report |
| 835 | 835 | */ |
| 836 | 836 | case 'generate_bug_report'://action_system |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | ) { |
| 82 | 82 | // Not allowed page |
| 83 | 83 | $session->set('system-error_code', ERR_NOT_ALLOWED); |
| 84 | - include $SETTINGS['cpassman_dir'] . '/error.php'; |
|
| 84 | + include $SETTINGS['cpassman_dir'].'/error.php'; |
|
| 85 | 85 | exit; |
| 86 | 86 | } |
| 87 | 87 | |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | |
| 270 | 270 | // Get current user hash |
| 271 | 271 | $userHash = DB::queryFirstRow( |
| 272 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
| 272 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
| 273 | 273 | $session->get('user-id') |
| 274 | 274 | )['pw']; |
| 275 | 275 | |
@@ -324,7 +324,7 @@ discard block |
||
| 324 | 324 | * @param string $post_key |
| 325 | 325 | * @return string |
| 326 | 326 | */ |
| 327 | -function userHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS, string $post_key): string |
|
| 327 | +function userHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS, string $post_key): string |
|
| 328 | 328 | { |
| 329 | 329 | $session = SessionManager::getSession(); |
| 330 | 330 | |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | if (isset($dataReceived['user_id'])) { |
| 360 | 360 | // Get info about user to modify |
| 361 | 361 | $targetUserInfos = DB::queryFirstRow( |
| 362 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 362 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 363 | 363 | WHERE id = %i', |
| 364 | 364 | $dataReceived['user_id'] |
| 365 | 365 | ); |
@@ -508,7 +508,7 @@ discard block |
||
| 508 | 508 | case 'mail_me'://action_mail |
| 509 | 509 | // Get info about user to send email |
| 510 | 510 | $data_user = DB::queryFirstRow( |
| 511 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 511 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 512 | 512 | WHERE email = %s', |
| 513 | 513 | filter_var($dataReceived['receipt'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) |
| 514 | 514 | ); |
@@ -621,7 +621,7 @@ discard block |
||
| 621 | 621 | if (isset($dataReceived['user_id'])) { |
| 622 | 622 | // Get info about user to modify |
| 623 | 623 | $targetUserInfos = DB::queryFirstRow( |
| 624 | - 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . ' |
|
| 624 | + 'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').' |
|
| 625 | 625 | WHERE id = %i', |
| 626 | 626 | $dataReceived['user_id'] |
| 627 | 627 | ); |
@@ -700,7 +700,7 @@ discard block |
||
| 700 | 700 | |
| 701 | 701 | // Get current user hash |
| 702 | 702 | $userHash = DB::queryFirstRow( |
| 703 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
| 703 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
| 704 | 704 | $session->get('user-id') |
| 705 | 705 | )['pw']; |
| 706 | 706 | |
@@ -738,7 +738,7 @@ discard block |
||
| 738 | 738 | |
| 739 | 739 | // Get current user hash |
| 740 | 740 | $userHash = DB::queryFirstRow( |
| 741 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;", |
|
| 741 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;", |
|
| 742 | 742 | $session->get('user-id') |
| 743 | 743 | )['pw']; |
| 744 | 744 | |
@@ -782,7 +782,7 @@ discard block |
||
| 782 | 782 | |
| 783 | 783 | // Get current user hash |
| 784 | 784 | $userHash = DB::queryFirstRow( |
| 785 | - "SELECT pw FROM " . prefixtable('users') . " WHERE id = %i;", |
|
| 785 | + "SELECT pw FROM ".prefixtable('users')." WHERE id = %i;", |
|
| 786 | 786 | $session->get('user-id') |
| 787 | 787 | )['pw']; |
| 788 | 788 | |
@@ -826,7 +826,7 @@ discard block |
||
| 826 | 826 | * @param array $SETTINGS |
| 827 | 827 | * @return string |
| 828 | 828 | */ |
| 829 | -function systemHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string |
|
| 829 | +function systemHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string |
|
| 830 | 830 | { |
| 831 | 831 | $session = SessionManager::getSession(); |
| 832 | 832 | switch ($post_type) { |
@@ -927,7 +927,7 @@ discard block |
||
| 927 | 927 | ) |
| 928 | 928 | ); |
| 929 | 929 | |
| 930 | - return '[{"token" : "' . $token . '"}]'; |
|
| 930 | + return '[{"token" : "'.$token.'"}]'; |
|
| 931 | 931 | |
| 932 | 932 | /* |
| 933 | 933 | * Default case |
@@ -943,7 +943,7 @@ discard block |
||
| 943 | 943 | } |
| 944 | 944 | |
| 945 | 945 | |
| 946 | -function utilsHandler(string $post_type, array|null|string $dataReceived, array $SETTINGS): string |
|
| 946 | +function utilsHandler(string $post_type, array | null | string $dataReceived, array $SETTINGS): string |
|
| 947 | 947 | { |
| 948 | 948 | switch ($post_type) { |
| 949 | 949 | /* |
@@ -1012,7 +1012,7 @@ discard block |
||
| 1012 | 1012 | array( |
| 1013 | 1013 | 'error' => false, |
| 1014 | 1014 | 'timestamp' => $session->get('user-session_duration'), |
| 1015 | - 'max_time_to_add' => intdiv((($maximum_session_expiration_time*60) - ((int) $session->get('user-session_duration') - time())), 60), |
|
| 1015 | + 'max_time_to_add' => intdiv((($maximum_session_expiration_time * 60) - ((int) $session->get('user-session_duration') - time())), 60), |
|
| 1016 | 1016 | 'max_session_duration' => $maximum_session_expiration_time, |
| 1017 | 1017 | ), |
| 1018 | 1018 | 'encode' |
@@ -1064,7 +1064,7 @@ discard block |
||
| 1064 | 1064 | // get number of items |
| 1065 | 1065 | DB::queryFirstRow( |
| 1066 | 1066 | 'SELECT increment_id |
| 1067 | - FROM ' . prefixTable('sharekeys_items') . |
|
| 1067 | + FROM ' . prefixTable('sharekeys_items'). |
|
| 1068 | 1068 | ' WHERE user_id = %i', |
| 1069 | 1069 | $userId |
| 1070 | 1070 | ); |
@@ -1119,7 +1119,7 @@ discard block |
||
| 1119 | 1119 | // check if expected security level is reached |
| 1120 | 1120 | $dataUser = DB::queryFirstRow( |
| 1121 | 1121 | 'SELECT * |
| 1122 | - FROM ' . prefixTable('users') . ' WHERE id = %i', |
|
| 1122 | + FROM ' . prefixTable('users').' WHERE id = %i', |
|
| 1123 | 1123 | $post_user_id |
| 1124 | 1124 | ); |
| 1125 | 1125 | |
@@ -1140,8 +1140,8 @@ discard block |
||
| 1140 | 1140 | if (empty($dataUser['fonction_id']) === false) { |
| 1141 | 1141 | $data = DB::queryFirstRow( |
| 1142 | 1142 | 'SELECT complexity |
| 1143 | - FROM ' . prefixTable('roles_title') . ' |
|
| 1144 | - WHERE id IN (' . $dataUser['fonction_id'] . ') |
|
| 1143 | + FROM ' . prefixTable('roles_title').' |
|
| 1144 | + WHERE id IN (' . $dataUser['fonction_id'].') |
|
| 1145 | 1145 | ORDER BY complexity DESC' |
| 1146 | 1146 | ); |
| 1147 | 1147 | } else { |
@@ -1154,8 +1154,8 @@ discard block |
||
| 1154 | 1154 | return prepareExchangedData( |
| 1155 | 1155 | array( |
| 1156 | 1156 | 'error' => true, |
| 1157 | - 'message' => '<div style="margin:10px 0 10px 15px;">' . $lang->get('complexity_level_not_reached') . '.<br>' . |
|
| 1158 | - $lang->get('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>', |
|
| 1157 | + 'message' => '<div style="margin:10px 0 10px 15px;">'.$lang->get('complexity_level_not_reached').'.<br>'. |
|
| 1158 | + $lang->get('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>', |
|
| 1159 | 1159 | ), |
| 1160 | 1160 | 'encode' |
| 1161 | 1161 | ); |
@@ -1259,14 +1259,14 @@ discard block |
||
| 1259 | 1259 | // Get data about user |
| 1260 | 1260 | $dataUser = DB::queryFirstRow( |
| 1261 | 1261 | 'SELECT id, email, pw |
| 1262 | - FROM ' . prefixTable('users') . ' |
|
| 1262 | + FROM ' . prefixTable('users').' |
|
| 1263 | 1263 | WHERE login = %s', |
| 1264 | 1264 | $post_login |
| 1265 | 1265 | ); |
| 1266 | 1266 | } else { |
| 1267 | 1267 | $dataUser = DB::queryFirstRow( |
| 1268 | 1268 | 'SELECT id, login, email, pw |
| 1269 | - FROM ' . prefixTable('users') . ' |
|
| 1269 | + FROM ' . prefixTable('users').' |
|
| 1270 | 1270 | WHERE id = %i', |
| 1271 | 1271 | $post_id |
| 1272 | 1272 | ); |
@@ -1320,7 +1320,7 @@ discard block |
||
| 1320 | 1320 | // Check if token already used |
| 1321 | 1321 | $dataToken = DB::queryFirstRow( |
| 1322 | 1322 | 'SELECT end_timestamp, reason |
| 1323 | - FROM ' . prefixTable('tokens') . ' |
|
| 1323 | + FROM ' . prefixTable('tokens').' |
|
| 1324 | 1324 | WHERE token = %s AND user_id = %i', |
| 1325 | 1325 | $post_token, |
| 1326 | 1326 | $dataUser['id'] |
@@ -1331,11 +1331,11 @@ discard block |
||
| 1331 | 1331 | return prepareExchangedData( |
| 1332 | 1332 | array( |
| 1333 | 1333 | 'error' => true, |
| 1334 | - 'message' => 'TOKEN already used',//$lang->get('no_email_set'), |
|
| 1334 | + 'message' => 'TOKEN already used', //$lang->get('no_email_set'), |
|
| 1335 | 1335 | ), |
| 1336 | 1336 | 'encode' |
| 1337 | 1337 | ); |
| 1338 | - } elseif(DB::count() === 0) { |
|
| 1338 | + } elseif (DB::count() === 0) { |
|
| 1339 | 1339 | // Store token for this action |
| 1340 | 1340 | DB::insert( |
| 1341 | 1341 | prefixTable('tokens'), |
@@ -1397,7 +1397,7 @@ discard block |
||
| 1397 | 1397 | 'email' => $dataUser['email'], |
| 1398 | 1398 | 'email_result' => str_replace( |
| 1399 | 1399 | '#email#', |
| 1400 | - '<b>' . obfuscateEmail($dataUser['email']) . '</b>', |
|
| 1400 | + '<b>'.obfuscateEmail($dataUser['email']).'</b>', |
|
| 1401 | 1401 | addslashes($lang->get('admin_email_result_ok')) |
| 1402 | 1402 | ), |
| 1403 | 1403 | ), |
@@ -1413,7 +1413,7 @@ discard block |
||
| 1413 | 1413 | 'email' => $dataUser['email'], |
| 1414 | 1414 | 'email_result' => str_replace( |
| 1415 | 1415 | '#email#', |
| 1416 | - '<b>' . obfuscateEmail($dataUser['email']) . '</b>', |
|
| 1416 | + '<b>'.obfuscateEmail($dataUser['email']).'</b>', |
|
| 1417 | 1417 | addslashes($lang->get('admin_email_result_ok')) |
| 1418 | 1418 | ), |
| 1419 | 1419 | ), |
@@ -1430,7 +1430,7 @@ discard block |
||
| 1430 | 1430 | |
| 1431 | 1431 | if (isKeyExistingAndEqual('enable_send_email_on_user_login', 1, $SETTINGS) === true) { |
| 1432 | 1432 | $row = DB::queryFirstRow( |
| 1433 | - 'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s', |
|
| 1433 | + 'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s', |
|
| 1434 | 1434 | 'cron', |
| 1435 | 1435 | 'sending_emails' |
| 1436 | 1436 | ); |
@@ -1438,7 +1438,7 @@ discard block |
||
| 1438 | 1438 | if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) { |
| 1439 | 1439 | $rows = DB::query( |
| 1440 | 1440 | 'SELECT * |
| 1441 | - FROM ' . prefixTable('emails') . |
|
| 1441 | + FROM ' . prefixTable('emails'). |
|
| 1442 | 1442 | ' WHERE status != %s', |
| 1443 | 1443 | 'sent' |
| 1444 | 1444 | ); |
@@ -1490,8 +1490,8 @@ discard block |
||
| 1490 | 1490 | $arr_html = array(); |
| 1491 | 1491 | $rows = DB::query( |
| 1492 | 1492 | 'SELECT i.id AS id, i.label AS label, i.id_tree AS id_tree, l.date, i.perso AS perso, i.restricted_to AS restricted |
| 1493 | - FROM ' . prefixTable('log_items') . ' AS l |
|
| 1494 | - RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id) |
|
| 1493 | + FROM ' . prefixTable('log_items').' AS l |
|
| 1494 | + RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id) |
|
| 1495 | 1495 | WHERE l.action = %s AND l.id_user = %i |
| 1496 | 1496 | ORDER BY l.date DESC |
| 1497 | 1497 | LIMIT 0, 100', |
@@ -1523,7 +1523,7 @@ discard block |
||
| 1523 | 1523 | if (isKeyExistingAndEqual('enable_suggestion', 1, $SETTINGS) === true |
| 1524 | 1524 | && ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1) |
| 1525 | 1525 | ) { |
| 1526 | - DB::query('SELECT * FROM ' . prefixTable('suggestion')); |
|
| 1526 | + DB::query('SELECT * FROM '.prefixTable('suggestion')); |
|
| 1527 | 1527 | $nb_suggestions_waiting = DB::count(); |
| 1528 | 1528 | } |
| 1529 | 1529 | |
@@ -1558,13 +1558,13 @@ discard block |
||
| 1558 | 1558 | if ($data === 'stat_languages') { |
| 1559 | 1559 | $tmp = ''; |
| 1560 | 1560 | foreach ($stats_data[$data] as $key => $value) { |
| 1561 | - $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value; |
|
| 1561 | + $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value; |
|
| 1562 | 1562 | } |
| 1563 | 1563 | $statsToSend[$data] = $tmp; |
| 1564 | 1564 | } elseif ($data === 'stat_country') { |
| 1565 | 1565 | $tmp = ''; |
| 1566 | 1566 | foreach ($stats_data[$data] as $key => $value) { |
| 1567 | - $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value; |
|
| 1567 | + $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value; |
|
| 1568 | 1568 | } |
| 1569 | 1569 | $statsToSend[$data] = $tmp; |
| 1570 | 1570 | } else { |
@@ -1651,7 +1651,7 @@ discard block |
||
| 1651 | 1651 | $url_found = $value; |
| 1652 | 1652 | if (empty($url_found) === false) { |
| 1653 | 1653 | $tmp = parse_url($url_found); |
| 1654 | - $anonym_url = $tmp['scheme'] . '://<anonym_url>' . (isset($tmp['path']) === true ? $tmp['path'] : ''); |
|
| 1654 | + $anonym_url = $tmp['scheme'].'://<anonym_url>'.(isset($tmp['path']) === true ? $tmp['path'] : ''); |
|
| 1655 | 1655 | $value = $anonym_url; |
| 1656 | 1656 | } else { |
| 1657 | 1657 | $value = ''; |
@@ -1681,7 +1681,7 @@ discard block |
||
| 1681 | 1681 | $teampass_errors = ''; |
| 1682 | 1682 | $rows = DB::query( |
| 1683 | 1683 | 'SELECT label, date AS error_date |
| 1684 | - FROM ' . prefixTable('log_system') . " |
|
| 1684 | + FROM ' . prefixTable('log_system')." |
|
| 1685 | 1685 | WHERE `type` LIKE 'error' |
| 1686 | 1686 | ORDER BY `date` DESC |
| 1687 | 1687 | LIMIT 0, 10" |
@@ -1689,9 +1689,9 @@ discard block |
||
| 1689 | 1689 | if (DB::count() > 0) { |
| 1690 | 1690 | foreach ($rows as $record) { |
| 1691 | 1691 | if (empty($teampass_errors) === true) { |
| 1692 | - $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label']; |
|
| 1692 | + $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label']; |
|
| 1693 | 1693 | } else { |
| 1694 | - $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label']; |
|
| 1694 | + $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label']; |
|
| 1695 | 1695 | } |
| 1696 | 1696 | } |
| 1697 | 1697 | } |
@@ -1703,7 +1703,7 @@ discard block |
||
| 1703 | 1703 | |
| 1704 | 1704 | // Now prepare text |
| 1705 | 1705 | $txt = '### Page on which it happened |
| 1706 | -' . $data['current_page'] . ' |
|
| 1706 | +' . $data['current_page'].' |
|
| 1707 | 1707 | |
| 1708 | 1708 | ### Steps to reproduce |
| 1709 | 1709 | 1. |
@@ -1718,39 +1718,39 @@ discard block |
||
| 1718 | 1718 | Tell us what happens instead |
| 1719 | 1719 | |
| 1720 | 1720 | ### Server configuration |
| 1721 | -**Operating system**: ' . php_uname() . ' |
|
| 1721 | +**Operating system**: ' . php_uname().' |
|
| 1722 | 1722 | |
| 1723 | -**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . ' |
|
| 1723 | +**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].' |
|
| 1724 | 1724 | |
| 1725 | -**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)) . ' |
|
| 1725 | +**Database:** ' . ($link === false ? $lang->get('undefined') : mysqli_get_server_info($link)).' |
|
| 1726 | 1726 | |
| 1727 | -**PHP version:** ' . PHP_VERSION . ' |
|
| 1727 | +**PHP version:** ' . PHP_VERSION.' |
|
| 1728 | 1728 | |
| 1729 | -**Teampass version:** ' . TP_VERSION . '.' . TP_VERSION_MINOR . ' |
|
| 1729 | +**Teampass version:** ' . TP_VERSION.'.'.TP_VERSION_MINOR.' |
|
| 1730 | 1730 | |
| 1731 | 1731 | **Teampass configuration variables:** |
| 1732 | 1732 | ``` |
| 1733 | -' . $list_of_options . ' |
|
| 1733 | +' . $list_of_options.' |
|
| 1734 | 1734 | ``` |
| 1735 | 1735 | |
| 1736 | 1736 | **Updated from an older Teampass or fresh install:** |
| 1737 | 1737 | |
| 1738 | 1738 | ### Client configuration |
| 1739 | 1739 | |
| 1740 | -**Browser:** ' . $data['browser_name'] . ' - ' . $data['browser_version'] . ' |
|
| 1740 | +**Browser:** ' . $data['browser_name'].' - '.$data['browser_version'].' |
|
| 1741 | 1741 | |
| 1742 | -**Operating system:** ' . $data['os'] . ' - ' . $data['os_archi'] . 'bits |
|
| 1742 | +**Operating system:** ' . $data['os'].' - '.$data['os_archi'].'bits |
|
| 1743 | 1743 | |
| 1744 | 1744 | ### Logs |
| 1745 | 1745 | |
| 1746 | 1746 | #### Web server error log |
| 1747 | 1747 | ``` |
| 1748 | -' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ') |
|
| 1748 | +' . $err['message'].' - '.$err['file'].' ('.$err['line'].') |
|
| 1749 | 1749 | ``` |
| 1750 | 1750 | |
| 1751 | 1751 | #### Teampass 10 last system errors |
| 1752 | 1752 | ``` |
| 1753 | -' . $teampass_errors . ' |
|
| 1753 | +' . $teampass_errors.' |
|
| 1754 | 1754 | ``` |
| 1755 | 1755 | |
| 1756 | 1756 | #### Log from the web-browser developer console (CTRL + SHIFT + i) |
@@ -1790,7 +1790,7 @@ discard block |
||
| 1790 | 1790 | // Check if user exists |
| 1791 | 1791 | $userInfo = DB::queryFirstRow( |
| 1792 | 1792 | 'SELECT public_key, private_key, pw, auth_type |
| 1793 | - FROM ' . prefixTable('users') . ' |
|
| 1793 | + FROM ' . prefixTable('users').' |
|
| 1794 | 1794 | WHERE id = %i', |
| 1795 | 1795 | $post_user_id |
| 1796 | 1796 | ); |
@@ -1799,9 +1799,9 @@ discard block |
||
| 1799 | 1799 | // Get one item |
| 1800 | 1800 | $currentUserKey = DB::queryFirstRow( |
| 1801 | 1801 | 'SELECT object_id, share_key, increment_id |
| 1802 | - FROM ' . prefixTable('sharekeys_items') . ' AS si |
|
| 1803 | - INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = si.object_id) |
|
| 1804 | - INNER JOIN ' . prefixTable('nested_tree') . ' AS nt ON (i.id_tree = nt.id) |
|
| 1802 | + FROM ' . prefixTable('sharekeys_items').' AS si |
|
| 1803 | + INNER JOIN ' . prefixTable('items').' AS i ON (i.id = si.object_id) |
|
| 1804 | + INNER JOIN ' . prefixTable('nested_tree').' AS nt ON (i.id_tree = nt.id) |
|
| 1805 | 1805 | WHERE user_id = %i AND nt.personal_folder = %i', |
| 1806 | 1806 | $post_user_id, |
| 1807 | 1807 | 0 |
@@ -1895,7 +1895,7 @@ discard block |
||
| 1895 | 1895 | // Get user info |
| 1896 | 1896 | $userData = DB::queryFirstRow( |
| 1897 | 1897 | 'SELECT private_key |
| 1898 | - FROM ' . prefixTable('users') . ' |
|
| 1898 | + FROM ' . prefixTable('users').' |
|
| 1899 | 1899 | WHERE id = %i', |
| 1900 | 1900 | $post_user_id |
| 1901 | 1901 | ); |
@@ -1976,7 +1976,7 @@ discard block |
||
| 1976 | 1976 | // Get user info |
| 1977 | 1977 | $userData = DB::queryFirstRow( |
| 1978 | 1978 | 'SELECT email, auth_type, login |
| 1979 | - FROM ' . prefixTable('users') . ' |
|
| 1979 | + FROM ' . prefixTable('users').' |
|
| 1980 | 1980 | WHERE id = %i', |
| 1981 | 1981 | $post_user_id |
| 1982 | 1982 | ); |
@@ -2074,7 +2074,7 @@ discard block |
||
| 2074 | 2074 | // Get user info |
| 2075 | 2075 | $userData = DB::queryFirstRow( |
| 2076 | 2076 | 'SELECT email, auth_type, login |
| 2077 | - FROM ' . prefixTable('users') . ' |
|
| 2077 | + FROM ' . prefixTable('users').' |
|
| 2078 | 2078 | WHERE id = %i', |
| 2079 | 2079 | $post_user_id |
| 2080 | 2080 | ); |
@@ -2140,7 +2140,7 @@ discard block |
||
| 2140 | 2140 | // Check if user exists |
| 2141 | 2141 | DB::queryFirstRow( |
| 2142 | 2142 | 'SELECT * |
| 2143 | - FROM ' . prefixTable('users') . ' |
|
| 2143 | + FROM ' . prefixTable('users').' |
|
| 2144 | 2144 | WHERE id = %i', |
| 2145 | 2145 | $post_user_id |
| 2146 | 2146 | ); |
@@ -2210,7 +2210,7 @@ discard block |
||
| 2210 | 2210 | // Check if user exists |
| 2211 | 2211 | $userInfo = DB::queryFirstRow( |
| 2212 | 2212 | 'SELECT public_key |
| 2213 | - FROM ' . prefixTable('users') . ' |
|
| 2213 | + FROM ' . prefixTable('users').' |
|
| 2214 | 2214 | WHERE id = %i', |
| 2215 | 2215 | $post_user_id |
| 2216 | 2216 | ); |
@@ -2358,15 +2358,15 @@ discard block |
||
| 2358 | 2358 | // Loop on items |
| 2359 | 2359 | $rows = DB::query( |
| 2360 | 2360 | 'SELECT id, pw |
| 2361 | - FROM ' . prefixTable('items') . ' |
|
| 2361 | + FROM ' . prefixTable('items').' |
|
| 2362 | 2362 | WHERE perso = 0 |
| 2363 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2363 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2364 | 2364 | ); |
| 2365 | 2365 | foreach ($rows as $record) { |
| 2366 | 2366 | // Get itemKey from current user |
| 2367 | 2367 | $currentUserKey = DB::queryFirstRow( |
| 2368 | 2368 | 'SELECT share_key, increment_id |
| 2369 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2369 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2370 | 2370 | WHERE object_id = %i AND user_id = %i', |
| 2371 | 2371 | $record['id'], |
| 2372 | 2372 | $session->get('user-id') |
@@ -2398,7 +2398,7 @@ discard block |
||
| 2398 | 2398 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2399 | 2399 | $currentUserKey = DB::queryFirstRow( |
| 2400 | 2400 | 'SELECT increment_id |
| 2401 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2401 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2402 | 2402 | WHERE object_id = %i AND user_id = %i', |
| 2403 | 2403 | $record['id'], |
| 2404 | 2404 | $post_user_id |
@@ -2431,7 +2431,7 @@ discard block |
||
| 2431 | 2431 | // SHould we change step? |
| 2432 | 2432 | DB::query( |
| 2433 | 2433 | 'SELECT * |
| 2434 | - FROM ' . prefixTable('items') . ' |
|
| 2434 | + FROM ' . prefixTable('items').' |
|
| 2435 | 2435 | WHERE perso = 0' |
| 2436 | 2436 | ); |
| 2437 | 2437 | |
@@ -2456,15 +2456,15 @@ discard block |
||
| 2456 | 2456 | // Loop on logs |
| 2457 | 2457 | $rows = DB::query( |
| 2458 | 2458 | 'SELECT increment_id |
| 2459 | - FROM ' . prefixTable('log_items') . ' |
|
| 2459 | + FROM ' . prefixTable('log_items').' |
|
| 2460 | 2460 | WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes" |
| 2461 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2461 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2462 | 2462 | ); |
| 2463 | 2463 | foreach ($rows as $record) { |
| 2464 | 2464 | // Get itemKey from current user |
| 2465 | 2465 | $currentUserKey = DB::queryFirstRow( |
| 2466 | 2466 | 'SELECT share_key |
| 2467 | - FROM ' . prefixTable('sharekeys_logs') . ' |
|
| 2467 | + FROM ' . prefixTable('sharekeys_logs').' |
|
| 2468 | 2468 | WHERE object_id = %i AND user_id = %i', |
| 2469 | 2469 | $record['increment_id'], |
| 2470 | 2470 | $session->get('user-id') |
@@ -2496,7 +2496,7 @@ discard block |
||
| 2496 | 2496 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2497 | 2497 | $currentUserKey = DB::queryFirstRow( |
| 2498 | 2498 | 'SELECT increment_id |
| 2499 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2499 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2500 | 2500 | WHERE object_id = %i AND user_id = %i', |
| 2501 | 2501 | $record['id'], |
| 2502 | 2502 | $post_user_id |
@@ -2518,7 +2518,7 @@ discard block |
||
| 2518 | 2518 | // SHould we change step? |
| 2519 | 2519 | DB::query( |
| 2520 | 2520 | 'SELECT increment_id |
| 2521 | - FROM ' . prefixTable('log_items') . ' |
|
| 2521 | + FROM ' . prefixTable('log_items').' |
|
| 2522 | 2522 | WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"' |
| 2523 | 2523 | ); |
| 2524 | 2524 | |
@@ -2543,15 +2543,15 @@ discard block |
||
| 2543 | 2543 | // Loop on fields |
| 2544 | 2544 | $rows = DB::query( |
| 2545 | 2545 | 'SELECT id |
| 2546 | - FROM ' . prefixTable('categories_items') . ' |
|
| 2546 | + FROM ' . prefixTable('categories_items').' |
|
| 2547 | 2547 | WHERE encryption_type = "teampass_aes" |
| 2548 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2548 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2549 | 2549 | ); |
| 2550 | 2550 | foreach ($rows as $record) { |
| 2551 | 2551 | // Get itemKey from current user |
| 2552 | 2552 | $currentUserKey = DB::queryFirstRow( |
| 2553 | 2553 | 'SELECT share_key |
| 2554 | - FROM ' . prefixTable('sharekeys_fields') . ' |
|
| 2554 | + FROM ' . prefixTable('sharekeys_fields').' |
|
| 2555 | 2555 | WHERE object_id = %i AND user_id = %i', |
| 2556 | 2556 | $record['id'], |
| 2557 | 2557 | $session->get('user-id') |
@@ -2583,7 +2583,7 @@ discard block |
||
| 2583 | 2583 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2584 | 2584 | $currentUserKey = DB::queryFirstRow( |
| 2585 | 2585 | 'SELECT increment_id |
| 2586 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2586 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2587 | 2587 | WHERE object_id = %i AND user_id = %i', |
| 2588 | 2588 | $record['id'], |
| 2589 | 2589 | $post_user_id |
@@ -2605,7 +2605,7 @@ discard block |
||
| 2605 | 2605 | // SHould we change step? |
| 2606 | 2606 | DB::query( |
| 2607 | 2607 | 'SELECT * |
| 2608 | - FROM ' . prefixTable('categories_items') . ' |
|
| 2608 | + FROM ' . prefixTable('categories_items').' |
|
| 2609 | 2609 | WHERE encryption_type = "teampass_aes"' |
| 2610 | 2610 | ); |
| 2611 | 2611 | |
@@ -2630,14 +2630,14 @@ discard block |
||
| 2630 | 2630 | // Loop on suggestions |
| 2631 | 2631 | $rows = DB::query( |
| 2632 | 2632 | 'SELECT id |
| 2633 | - FROM ' . prefixTable('suggestion') . ' |
|
| 2634 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2633 | + FROM ' . prefixTable('suggestion').' |
|
| 2634 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2635 | 2635 | ); |
| 2636 | 2636 | foreach ($rows as $record) { |
| 2637 | 2637 | // Get itemKey from current user |
| 2638 | 2638 | $currentUserKey = DB::queryFirstRow( |
| 2639 | 2639 | 'SELECT share_key |
| 2640 | - FROM ' . prefixTable('sharekeys_suggestions') . ' |
|
| 2640 | + FROM ' . prefixTable('sharekeys_suggestions').' |
|
| 2641 | 2641 | WHERE object_id = %i AND user_id = %i', |
| 2642 | 2642 | $record['id'], |
| 2643 | 2643 | $session->get('user-id') |
@@ -2669,7 +2669,7 @@ discard block |
||
| 2669 | 2669 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2670 | 2670 | $currentUserKey = DB::queryFirstRow( |
| 2671 | 2671 | 'SELECT increment_id |
| 2672 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2672 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2673 | 2673 | WHERE object_id = %i AND user_id = %i', |
| 2674 | 2674 | $record['id'], |
| 2675 | 2675 | $post_user_id |
@@ -2715,15 +2715,15 @@ discard block |
||
| 2715 | 2715 | // Loop on files |
| 2716 | 2716 | $rows = DB::query( |
| 2717 | 2717 | 'SELECT id |
| 2718 | - FROM ' . prefixTable('files') . ' |
|
| 2719 | - WHERE status = "' . TP_ENCRYPTION_NAME . '" |
|
| 2720 | - LIMIT ' . $post_start . ', ' . $post_length |
|
| 2718 | + FROM ' . prefixTable('files').' |
|
| 2719 | + WHERE status = "' . TP_ENCRYPTION_NAME.'" |
|
| 2720 | + LIMIT ' . $post_start.', '.$post_length |
|
| 2721 | 2721 | ); //aes_encryption |
| 2722 | 2722 | foreach ($rows as $record) { |
| 2723 | 2723 | // Get itemKey from current user |
| 2724 | 2724 | $currentUserKey = DB::queryFirstRow( |
| 2725 | 2725 | 'SELECT share_key |
| 2726 | - FROM ' . prefixTable('sharekeys_files') . ' |
|
| 2726 | + FROM ' . prefixTable('sharekeys_files').' |
|
| 2727 | 2727 | WHERE object_id = %i AND user_id = %i', |
| 2728 | 2728 | $record['id'], |
| 2729 | 2729 | $session->get('user-id') |
@@ -2755,7 +2755,7 @@ discard block |
||
| 2755 | 2755 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2756 | 2756 | $currentUserKey = DB::queryFirstRow( |
| 2757 | 2757 | 'SELECT increment_id |
| 2758 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2758 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2759 | 2759 | WHERE object_id = %i AND user_id = %i', |
| 2760 | 2760 | $record['id'], |
| 2761 | 2761 | $post_user_id |
@@ -2777,8 +2777,8 @@ discard block |
||
| 2777 | 2777 | // SHould we change step? |
| 2778 | 2778 | DB::query( |
| 2779 | 2779 | 'SELECT * |
| 2780 | - FROM ' . prefixTable('files') . ' |
|
| 2781 | - WHERE status = "' . TP_ENCRYPTION_NAME . '"' |
|
| 2780 | + FROM ' . prefixTable('files').' |
|
| 2781 | + WHERE status = "' . TP_ENCRYPTION_NAME.'"' |
|
| 2782 | 2782 | ); |
| 2783 | 2783 | |
| 2784 | 2784 | $next_start = (int) $post_start + (int) $post_length; |
@@ -2811,9 +2811,9 @@ discard block |
||
| 2811 | 2811 | if (count($session->get('user-personal_folders')) > 0) { |
| 2812 | 2812 | $rows = DB::query( |
| 2813 | 2813 | 'SELECT id, pw |
| 2814 | - FROM ' . prefixTable('items') . ' |
|
| 2814 | + FROM ' . prefixTable('items').' |
|
| 2815 | 2815 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type = %s |
| 2816 | - LIMIT ' . $post_start . ', ' . $post_length, |
|
| 2816 | + LIMIT ' . $post_start.', '.$post_length, |
|
| 2817 | 2817 | $session->get('user-personal_folders'), |
| 2818 | 2818 | "defuse" |
| 2819 | 2819 | ); |
@@ -2821,7 +2821,7 @@ discard block |
||
| 2821 | 2821 | // Get itemKey from current user |
| 2822 | 2822 | $currentUserKey = DB::queryFirstRow( |
| 2823 | 2823 | 'SELECT share_key, increment_id |
| 2824 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2824 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2825 | 2825 | WHERE object_id = %i AND user_id = %i', |
| 2826 | 2826 | $record['id'], |
| 2827 | 2827 | $session->get('user-id') |
@@ -2848,7 +2848,7 @@ discard block |
||
| 2848 | 2848 | if ((int) $post_user_id !== (int) $session->get('user-id')) { |
| 2849 | 2849 | $currentUserKey = DB::queryFirstRow( |
| 2850 | 2850 | 'SELECT increment_id |
| 2851 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 2851 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 2852 | 2852 | WHERE object_id = %i AND user_id = %i', |
| 2853 | 2853 | $record['id'], |
| 2854 | 2854 | $post_user_id |
@@ -2871,7 +2871,7 @@ discard block |
||
| 2871 | 2871 | // SHould we change step? |
| 2872 | 2872 | DB::query( |
| 2873 | 2873 | 'SELECT * |
| 2874 | - FROM ' . prefixTable('items') . ' |
|
| 2874 | + FROM ' . prefixTable('items').' |
|
| 2875 | 2875 | WHERE perso = 0' |
| 2876 | 2876 | ); |
| 2877 | 2877 | |
@@ -2899,7 +2899,7 @@ discard block |
||
| 2899 | 2899 | // Check if user exists |
| 2900 | 2900 | $userInfo = DB::queryFirstRow( |
| 2901 | 2901 | 'SELECT public_key, encrypted_psk |
| 2902 | - FROM ' . prefixTable('users') . ' |
|
| 2902 | + FROM ' . prefixTable('users').' |
|
| 2903 | 2903 | WHERE id = %i', |
| 2904 | 2904 | $post_user_id |
| 2905 | 2905 | ); |
@@ -2925,7 +2925,7 @@ discard block |
||
| 2925 | 2925 | if ($post_counterItemsToTreat === -1) { |
| 2926 | 2926 | DB::query( |
| 2927 | 2927 | 'SELECT id |
| 2928 | - FROM ' . prefixTable('items') . ' |
|
| 2928 | + FROM ' . prefixTable('items').' |
|
| 2929 | 2929 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s', |
| 2930 | 2930 | $session->get('user-personal_folders'), |
| 2931 | 2931 | 'teampass_aes' |
@@ -2938,7 +2938,7 @@ discard block |
||
| 2938 | 2938 | // Loop on persoanl items |
| 2939 | 2939 | $rows = DB::query( |
| 2940 | 2940 | 'SELECT id, pw |
| 2941 | - FROM ' . prefixTable('items') . ' |
|
| 2941 | + FROM ' . prefixTable('items').' |
|
| 2942 | 2942 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s |
| 2943 | 2943 | LIMIT ' . $post_length, |
| 2944 | 2944 | $session->get('user-personal_folders'), |
@@ -2982,7 +2982,7 @@ discard block |
||
| 2982 | 2982 | // Loop on files |
| 2983 | 2983 | $rows = DB::query( |
| 2984 | 2984 | 'SELECT id, file |
| 2985 | - FROM ' . prefixTable('files') . ' |
|
| 2985 | + FROM ' . prefixTable('files').' |
|
| 2986 | 2986 | WHERE status != %s |
| 2987 | 2987 | AND id_item = %i', |
| 2988 | 2988 | TP_ENCRYPTION_NAME, |
@@ -2993,13 +2993,13 @@ discard block |
||
| 2993 | 2993 | // Now decrypt the file |
| 2994 | 2994 | prepareFileWithDefuse( |
| 2995 | 2995 | 'decrypt', |
| 2996 | - $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'], |
|
| 2997 | - $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete', |
|
| 2996 | + $SETTINGS['path_to_upload_folder'].'/'.$record2['file'], |
|
| 2997 | + $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete', |
|
| 2998 | 2998 | $post_user_psk |
| 2999 | 2999 | ); |
| 3000 | 3000 | |
| 3001 | 3001 | // Encrypt the file |
| 3002 | - $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']); |
|
| 3002 | + $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']); |
|
| 3003 | 3003 | |
| 3004 | 3004 | DB::update( |
| 3005 | 3005 | prefixTable('files'), |
@@ -3022,7 +3022,7 @@ discard block |
||
| 3022 | 3022 | ); |
| 3023 | 3023 | |
| 3024 | 3024 | // Unlink original file |
| 3025 | - unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']); |
|
| 3025 | + unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']); |
|
| 3026 | 3026 | } |
| 3027 | 3027 | } |
| 3028 | 3028 | |
@@ -3030,7 +3030,7 @@ discard block |
||
| 3030 | 3030 | $next_start = (int) $post_start + (int) $post_length; |
| 3031 | 3031 | DB::query( |
| 3032 | 3032 | 'SELECT id |
| 3033 | - FROM ' . prefixTable('items') . ' |
|
| 3033 | + FROM ' . prefixTable('items').' |
|
| 3034 | 3034 | WHERE perso = 1 AND id_tree IN %ls AND encryption_type != %s', |
| 3035 | 3035 | $session->get('user-personal_folders'), |
| 3036 | 3036 | 'teampass_aes' |
@@ -3100,7 +3100,7 @@ discard block |
||
| 3100 | 3100 | // Get user info |
| 3101 | 3101 | $userData = DB::queryFirstRow( |
| 3102 | 3102 | 'SELECT special, auth_type, is_ready_for_usage, ongoing_process_id, otp_provided, keys_recovery_time |
| 3103 | - FROM ' . prefixTable('users') . ' |
|
| 3103 | + FROM ' . prefixTable('users').' |
|
| 3104 | 3104 | WHERE id = %i', |
| 3105 | 3105 | $post_user_id |
| 3106 | 3106 | ); |
@@ -3147,7 +3147,7 @@ discard block |
||
| 3147 | 3147 | // Get user info |
| 3148 | 3148 | $userData = DB::queryFirstRow( |
| 3149 | 3149 | 'SELECT auth_type, login, private_key |
| 3150 | - FROM ' . prefixTable('users') . ' |
|
| 3150 | + FROM ' . prefixTable('users').' |
|
| 3151 | 3151 | WHERE id = %i', |
| 3152 | 3152 | $post_user_id |
| 3153 | 3153 | ); |
@@ -3197,7 +3197,7 @@ discard block |
||
| 3197 | 3197 | return prepareExchangedData( |
| 3198 | 3198 | array( |
| 3199 | 3199 | 'error' => false, |
| 3200 | - 'message' => $lang->get('done'),'', |
|
| 3200 | + 'message' => $lang->get('done'), '', |
|
| 3201 | 3201 | ), |
| 3202 | 3202 | 'encode' |
| 3203 | 3203 | ); |
@@ -3245,7 +3245,7 @@ discard block |
||
| 3245 | 3245 | // Get user info |
| 3246 | 3246 | $userData = DB::queryFirstRow( |
| 3247 | 3247 | 'SELECT auth_type, login, private_key, special |
| 3248 | - FROM ' . prefixTable('users') . ' |
|
| 3248 | + FROM ' . prefixTable('users').' |
|
| 3249 | 3249 | WHERE id = %i', |
| 3250 | 3250 | $post_user_id |
| 3251 | 3251 | ); |
@@ -3279,7 +3279,7 @@ discard block |
||
| 3279 | 3279 | return prepareExchangedData( |
| 3280 | 3280 | array( |
| 3281 | 3281 | 'error' => false, |
| 3282 | - 'message' => $lang->get('done'),'', |
|
| 3282 | + 'message' => $lang->get('done'), '', |
|
| 3283 | 3283 | ), |
| 3284 | 3284 | 'encode' |
| 3285 | 3285 | ); |
@@ -3301,8 +3301,8 @@ discard block |
||
| 3301 | 3301 | // Get one itemKey from current user |
| 3302 | 3302 | $currentUserKey = DB::queryFirstRow( |
| 3303 | 3303 | 'SELECT ski.share_key, ski.increment_id, l.id_user |
| 3304 | - FROM ' . prefixTable('sharekeys_items') . ' AS ski |
|
| 3305 | - INNER JOIN ' . prefixTable('log_items') . ' AS l ON ski.object_id = l.id_item |
|
| 3304 | + FROM ' . prefixTable('sharekeys_items').' AS ski |
|
| 3305 | + INNER JOIN ' . prefixTable('log_items').' AS l ON ski.object_id = l.id_item |
|
| 3306 | 3306 | WHERE ski.user_id = %i |
| 3307 | 3307 | ORDER BY RAND() |
| 3308 | 3308 | LIMIT 1', |
@@ -3392,7 +3392,7 @@ discard block |
||
| 3392 | 3392 | $session->get('user-id') |
| 3393 | 3393 | ); |
| 3394 | 3394 | // Return data |
| 3395 | - return '[{"new_value":"' . $session->get('user-session_duration') . '"}]'; |
|
| 3395 | + return '[{"new_value":"'.$session->get('user-session_duration').'"}]'; |
|
| 3396 | 3396 | } |
| 3397 | 3397 | |
| 3398 | 3398 | return '[{"new_value":"expired"}]'; |
