nilsteampassnet / TeamPass

pages/admin.js.php

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
                     // error
                     toastr.remove();
                     toastr.error(
-                        '<?php echo langHdl('server_answer_error') . '<br />' . langHdl('server_returned_data') . ':<br />'; ?>' + data.error,
+                        '<?php echo langHdl('server_answer_error').'<br />'.langHdl('server_returned_data').':<br />'; ?>' + data.error,
                         '', {
                             closeButton: true,
                             positionClass: 'toastr-top-right'
@@ -151,7 +151,7 @@ 
                     // error
                     toastr.remove();
                     toastr.error(
-                        '<?php echo langHdl('server_answer_error') . '<br />' . langHdl('server_returned_data') . ':<br />'; ?>' + data.error,
+                        '<?php echo langHdl('server_answer_error').'<br />'.langHdl('server_returned_data').':<br />'; ?>' + data.error,
                         '', {
                             closeButton: true,
                             positionClass: 'toastr-top-right'

pages/uploads.js.php

Spacing +2 added lines, -2 removed lines

@@ -35,10 +35,10 @@
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], '2fa', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 ?>

pages/uploads.php

Spacing +3 added lines, -3 removed lines

@@ -35,15 +35,15 @@
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'ldap', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
 // Load template
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 // LDAP type currently loaded
 $ldap_type = isset($SETTINGS['ldap_type']) ? $SETTINGS['ldap_type'] : '';

sources/upload.files.php

Spacing +32 added lines, -32 removed lines

@@ -55,16 +55,16 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (!checkUser($_SESSION['user_id'], $_SESSION['key'], 'items', $SETTINGS)) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
 // load functions
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 // Prepare POST variables
 $post_user_token = filter_input(INPUT_POST, 'user_token', FILTER_SANITIZE_STRING);
@@ -99,7 +99,7 @@ 
     } else {
         // check if token is expired
         $data = DB::queryFirstRow(
-            'SELECT end_timestamp FROM ' . prefixTable('tokens') . ' WHERE user_id = %i AND token = %s',
+            'SELECT end_timestamp FROM '.prefixTable('tokens').' WHERE user_id = %i AND token = %s',
             $_SESSION['user_id'],
             $post_user_token
         );
@@ -121,12 +121,12 @@ 
 
 // HTTP headers for no cache etc
 header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
 header('Cache-Control: no-store, no-cache, must-revalidate');
 header('Cache-Control: post-check=0, pre-check=0', false);
 
 if (null !== $post_type_upload && $post_type_upload === 'upload_profile_photo') {
-    $targetDir = $SETTINGS['cpassman_dir'] . '/includes/avatars';
+    $targetDir = $SETTINGS['cpassman_dir'].'/includes/avatars';
 } else {
     $targetDir = $SETTINGS['path_to_files_folder'];
 }
@@ -180,7 +180,7 @@ 
 
 // Validate file name (for our purposes we'll just remove invalid characters)
 $file_name = preg_replace(
-    '/[^' . $valid_chars_regex . '\.]/',
+    '/[^'.$valid_chars_regex.'\.]/',
     '',
     filter_var(
         strtolower(basename($_FILES['file']['name'])),
@@ -188,7 +188,7 @@ 
     )
 );
 if (strlen($file_name) == 0 || strlen($file_name) > $MAX_FILENAME_LENGTH) {
-    handleUploadError('Invalid file name: ' . $file_name . '.');
+    handleUploadError('Invalid file name: '.$file_name.'.');
 }
 
 // Validate file extension
@@ -202,8 +202,8 @@ 
         $ext,
         explode(
             ',',
-            $SETTINGS['upload_docext'] . ',' . $SETTINGS['upload_imagesext'] .
-                ',' . $SETTINGS['upload_pkgext'] . ',' . $SETTINGS['upload_otherext']
+            $SETTINGS['upload_docext'].','.$SETTINGS['upload_imagesext'].
+                ','.$SETTINGS['upload_pkgext'].','.$SETTINGS['upload_otherext']
         )
     ) === false
 ) {
@@ -212,27 +212,27 @@ 
 
 // is destination folder writable
 if (is_writable($SETTINGS['path_to_files_folder']) === false) {
-    handleUploadError('Not enough permissions on folder ' . $SETTINGS['path_to_files_folder'] . '.');
+    handleUploadError('Not enough permissions on folder '.$SETTINGS['path_to_files_folder'].'.');
 }
 
 // Clean the fileName for security reasons
 $fileName = preg_replace('/[^\w\.]+/', '_', $fileName);
-$fileName = preg_replace('/[^' . $valid_chars_regex . '\.]/', '', strtolower(basename($fileName)));
+$fileName = preg_replace('/[^'.$valid_chars_regex.'\.]/', '', strtolower(basename($fileName)));
 
 // Make sure the fileName is unique but only if chunking is disabled
-if ($chunks < 2 && file_exists($targetDir . DIRECTORY_SEPARATOR . $fileName)) {
+if ($chunks < 2 && file_exists($targetDir.DIRECTORY_SEPARATOR.$fileName)) {
     $fileNameA = substr($fileName, 0, strlen($ext));
     $fileNameB = substr($fileName, strlen($ext));
 
     $count = 1;
-    while (file_exists($targetDir . DIRECTORY_SEPARATOR . $fileNameA . '_' . $count . $fileNameB)) {
+    while (file_exists($targetDir.DIRECTORY_SEPARATOR.$fileNameA.'_'.$count.$fileNameB)) {
         ++$count;
     }
 
-    $fileName = $fileNameA . '_' . $count . $fileNameB;
+    $fileName = $fileNameA.'_'.$count.$fileNameB;
 }
 
-$filePath = $targetDir . DIRECTORY_SEPARATOR . $fileName;
+$filePath = $targetDir.DIRECTORY_SEPARATOR.$fileName;
 
 // Create target dir
 if (!file_exists($targetDir)) {
@@ -246,7 +246,7 @@ 
 // Remove old temp files
 if ($cleanupTargetDir && is_dir($targetDir) && ($dir = opendir($targetDir))) {
     while (($file = readdir($dir)) !== false) {
-        $tmpfilePath = $targetDir . DIRECTORY_SEPARATOR . $file;
+        $tmpfilePath = $targetDir.DIRECTORY_SEPARATOR.$file;
 
         // Remove temp file if it is older than the max age and is not the current file
         if (
@@ -336,7 +336,7 @@ 
 $newFileName = bin2hex(GenerateCryptKey(16, false, true, true, false, true, $SETTINGS));
 
 //Connect to mysql server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 DB::$host = DB_HOST;
 DB::$user = DB_USER;
 DB::$password = defuseReturnDecrypted(DB_PASSWD, $SETTINGS);
@@ -352,7 +352,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB
@@ -380,7 +380,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB
@@ -412,13 +412,13 @@ 
     // rename the file
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName . '.' . $ext
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName.'.'.$ext
     );
 
     // make thumbnail
     $ret = makeThumbnail(
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName . '.' . $ext,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName . '_thumb' . '.' . $ext,
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName.'.'.$ext,
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName.'_thumb'.'.'.$ext,
         40
     );
 
@@ -429,21 +429,21 @@ 
     }
 
     // get current avatar and delete it
-    $data = DB::queryFirstRow('SELECT avatar, avatar_thumb FROM ' . prefixTable('users') . ' WHERE id=%i', $_SESSION['user_id']);
-    fileDelete($targetDir . DIRECTORY_SEPARATOR . $data['avatar'], $SETTINGS);
-    fileDelete($targetDir . DIRECTORY_SEPARATOR . $data['avatar_thumb'], $SETTINGS);
+    $data = DB::queryFirstRow('SELECT avatar, avatar_thumb FROM '.prefixTable('users').' WHERE id=%i', $_SESSION['user_id']);
+    fileDelete($targetDir.DIRECTORY_SEPARATOR.$data['avatar'], $SETTINGS);
+    fileDelete($targetDir.DIRECTORY_SEPARATOR.$data['avatar_thumb'], $SETTINGS);
 
     // store in DB the new avatar
     DB::query(
-        'UPDATE ' . prefixTable('users') . "
-        SET avatar='" . $newFileName . '.' . $ext . "', avatar_thumb='" . $newFileName . '_thumb' . '.' . $ext . "'
+        'UPDATE '.prefixTable('users')."
+        SET avatar='" . $newFileName.'.'.$ext."', avatar_thumb='".$newFileName.'_thumb'.'.'.$ext."'
         WHERE id=%i",
         $_SESSION['user_id']
     );
 
     // store in session
-    $_SESSION['user_avatar'] = $newFileName . '.' . $ext;
-    $_SESSION['user_avatar_thumb'] = $newFileName . '_thumb' . '.' . $ext;
+    $_SESSION['user_avatar'] = $newFileName.'.'.$ext;
+    $_SESSION['user_avatar_thumb'] = $newFileName.'_thumb'.'.'.$ext;
 
     // return info
     echo prepareExchangedData(
@@ -461,7 +461,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB

sources/upload.attachments.php

Spacing +24 added lines, -24 removed lines

@@ -39,11 +39,11 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'items', $SETTINGS) !== true) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
@@ -69,7 +69,7 @@ 
 $post_isPersonal = filter_input(INPUT_POST, 'isPersonal', FILTER_SANITIZE_NUMBER_INT);
 
 // load functions
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 // Get parameters
 $chunk = isset($_REQUEST['chunk']) ? (int) $_REQUEST['chunk'] : 0;
@@ -82,8 +82,8 @@ 
     exit();
 } else {
     //Connect to mysql server
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -143,7 +143,7 @@ 
         // check if token is expired
         $data = DB::queryFirstRow(
             'SELECT end_timestamp
-            FROM ' . prefixTable('tokens') . '
+            FROM ' . prefixTable('tokens').'
             WHERE user_id = %i AND token = %s',
             $_SESSION['user_id'],
             $post_user_token
@@ -168,12 +168,12 @@ 
     }
 
     // Load Settings
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php';
 }
 
 // HTTP headers for no cache etc
 header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
 header('Cache-Control: no-store, no-cache, must-revalidate');
 header('Cache-Control: post-check=0, pre-check=0', false);
 
@@ -218,9 +218,9 @@ 
 }
 
 // Validate file name (for our purposes we'll just remove invalid characters)
-$file_name = preg_replace('[^' . $valid_chars_regex . ']', '', strtolower(basename($_FILES['file']['name'])));
+$file_name = preg_replace('[^'.$valid_chars_regex.']', '', strtolower(basename($_FILES['file']['name'])));
 if (strlen($file_name) == 0 || strlen($file_name) > $MAX_FILENAME_LENGTH) {
-    handleAttachmentError('Invalid file name: ' . $file_name . '.', 114);
+    handleAttachmentError('Invalid file name: '.$file_name.'.', 114);
 }
 
 // Validate file extension
@@ -230,8 +230,8 @@ 
         $ext,
         explode(
             ',',
-            $SETTINGS['upload_docext'] . ',' . $SETTINGS['upload_imagesext'] .
-                ',' . $SETTINGS['upload_pkgext'] . ',' . $SETTINGS['upload_otherext']
+            $SETTINGS['upload_docext'].','.$SETTINGS['upload_imagesext'].
+                ','.$SETTINGS['upload_pkgext'].','.$SETTINGS['upload_otherext']
         )
     ) === false
 ) {
@@ -243,24 +243,24 @@ 
 
 // Clean the fileName for security reasons
 $fileInfo = pathinfo($fileName);
-$fileName = base64_encode($fileInfo['filename']) . '.' . $fileInfo['extension'];
+$fileName = base64_encode($fileInfo['filename']).'.'.$fileInfo['extension'];
 $fileFullSize = 0;
 
 // Make sure the fileName is unique but only if chunking is disabled
-if ($chunks < 2 && file_exists($targetDir . DIRECTORY_SEPARATOR . $fileName)) {
+if ($chunks < 2 && file_exists($targetDir.DIRECTORY_SEPARATOR.$fileName)) {
     $ext = strrpos($fileName, '.');
     $fileNameA = substr($fileName, 0, $ext);
     $fileNameB = substr($fileName, $ext);
 
     $count = 1;
-    while (file_exists($targetDir . DIRECTORY_SEPARATOR . $fileNameA . '_' . $count . $fileNameB)) {
+    while (file_exists($targetDir.DIRECTORY_SEPARATOR.$fileNameA.'_'.$count.$fileNameB)) {
         ++$count;
     }
 
-    $fileName = $fileNameA . '_' . $count . $fileNameB;
+    $fileName = $fileNameA.'_'.$count.$fileNameB;
 }
 
-$filePath = $targetDir . DIRECTORY_SEPARATOR . $fileName;
+$filePath = $targetDir.DIRECTORY_SEPARATOR.$fileName;
 
 // Create target dir
 if (file_exists($targetDir) === false) {
@@ -274,7 +274,7 @@ 
 // Remove old temp files
 if ($cleanupTargetDir && is_dir($targetDir) && ($dir = opendir($targetDir))) {
     while (($file = readdir($dir)) !== false) {
-        $tmpfilePath = $targetDir . DIRECTORY_SEPARATOR . $file;
+        $tmpfilePath = $targetDir.DIRECTORY_SEPARATOR.$file;
 
         // Remove temp file if it is older than the max age and is not the current file
         if (
@@ -396,8 +396,8 @@ 
         // This is a public object
         $users = DB::query(
             'SELECT id, public_key
-            FROM ' . prefixTable('users') . '
-            WHERE id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '")
+            FROM ' . prefixTable('users').'
+            WHERE id NOT IN ("' . OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'")
             AND public_key != ""'
         );
         foreach ($users as $user) {
@@ -435,14 +435,14 @@ 
                 'date' => time(),
                 'id_user' => $_SESSION['user_id'],
                 'action' => 'at_modification',
-                'raison' => 'at_add_file : ' . $fileName . ':' . $newID,
+                'raison' => 'at_add_file : '.$fileName.':'.$newID,
             )
         );
     }
 }
 
 // Return JSON-RPC response
-die('{"jsonrpc" : "2.0", "result" : null, "id" : "' . $newID . '"}');
+die('{"jsonrpc" : "2.0", "result" : null, "id" : "'.$newID.'"}');
 
 /**
  * Undocumented function.
@@ -452,5 +452,5 @@ 
  */
 function handleAttachmentError($message, $code)
 {
-    echo '{"jsonrpc" : "2.0", "error" : {"code": ' . htmlentities($code, ENT_QUOTES) . ', "message": "' . htmlentities($message, ENT_QUOTES) . '"}, "id" : "id"}';
+    echo '{"jsonrpc" : "2.0", "error" : {"code": '.htmlentities($code, ENT_QUOTES).', "message": "'.htmlentities($message, ENT_QUOTES).'"}, "id" : "id"}';
 }

includes/core/load.js.php

Spacing +8 added lines, -8 removed lines

@@ -83,7 +83,7 @@ 
                                     console.log('User has to regenerate keys')
                                     // HIde
                                     $('.content-header, .content').addClass('hidden');
-                                    $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected');?>');
+                                    $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected'); ?>');
 
                                     // Show passwords inputs and form
                                     $('#dialog-user-temporary-code').removeClass('hidden');
@@ -97,7 +97,7 @@ 
 
                                     // Show passwords inputs and form
                                     $('#dialog-user-change-password-info')
-                                        .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('user_has_to_change_password_info');?>')
+                                        .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('user_has_to_change_password_info'); ?>')
                                         .removeClass('hidden');
                                     $('#dialog-user-change-password').removeClass('hidden');
 
@@ -110,7 +110,7 @@ 
 
                                     // Show passwords inputs and form
                                     $('#dialog-ldap-user-change-password-info')
-                                        .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password');?>')
+                                        .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password'); ?>')
                                         .removeClass('hidden');
                                     $('#dialog-ldap-user-change-password').removeClass('hidden');
                                     
@@ -181,7 +181,7 @@ 
         console.log('User has to regenerate keys')
         // HIde
         $('.content-header, .content').addClass('hidden');
-        $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected');?>');
+        $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected'); ?>');
 
         // Show passwords inputs and form
         $('#dialog-user-temporary-code').removeClass('hidden');
@@ -748,13 +748,13 @@ 
             //
 
             
-            $('#dialog-admin-change-user-password-info').html('<?php echo langHdl('sending_email_message');?>');
+            $('#dialog-admin-change-user-password-info').html('<?php echo langHdl('sending_email_message'); ?>');
             
             // Prepare data
             var data = {
                 'receipt': $('#temp-user-email').val(),
-                'subject': '[Teampass] <?php echo langHdl('temporary_encryption_code');?>',
-                'body': '<?php echo langHdl('email_body_temporary_encryption_code');?>',
+                'subject': '[Teampass] <?php echo langHdl('temporary_encryption_code'); ?>',
+                'body': '<?php echo langHdl('email_body_temporary_encryption_code'); ?>',
                 'pre_replace' : {
                     '#enc_code#' : $('#temp-user-pwd').val(),
                 }
@@ -1220,7 +1220,7 @@ 
             '#warningModal',
             '<i class="fas fa-clock fa-lg warning mr-2"></i><?php echo langHdl('index_add_one_hour'); ?>',
             '<div class="form-group">' +
-            '<label for="warningModal-input" class="col-form-label"><?php echo langHdl('index_session_duration') . ' (' . langHdl('minutes') . ')'; ?>:</label>' +
+            '<label for="warningModal-input" class="col-form-label"><?php echo langHdl('index_session_duration').' ('.langHdl('minutes').')'; ?>:</label>' +
             '<input type="text" class="form-control" id="warningModal-input" value="<?php echo isset($_SESSION['user']['session_duration']) === true ? (int) $_SESSION['user']['session_duration'] / 60 : 60; ?>">' +
             '</div>',
             '<?php echo langHdl('confirm'); ?>',

error.php

Spacing +7 added lines, -7 removed lines

@@ -54,12 +54,12 @@ 
     && filter_input(INPUT_POST, 'session', FILTER_SANITIZE_STRING) === 'expired'
 ) {
     //Include files
-    require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-    require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-    require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+    require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+    require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
     // connect to DB
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -69,7 +69,7 @@ 
     // Update table by deleting ID
     if (isset($_SESSION['user_id'])) {
         DB::update(
-            DB_PREFIX . 'users',
+            DB_PREFIX.'users',
             [
                 'key_tempo' => '',
             ],
@@ -83,7 +83,7 @@ 
         logEvents($SETTINGS, 'user_connection', 'disconnection', $_SESSION['user_id'], $_SESSION['login']);
     }
 } else {
-    require_once $SETTINGS['cpassman_dir'] . '/sources/main.queries.php';
+    require_once $SETTINGS['cpassman_dir'].'/sources/main.queries.php';
     $errorCode = '';
     if (@$_SESSION['error']['code'] === ERR_NOT_ALLOWED) {
         $errorCode = 'ERROR NOT ALLOWED';

index.php

Spacing +82 added lines, -82 removed lines

@@ -71,8 +71,8 @@ 
 }
 
 // Include files
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
 // Quick major version check -> upgrade needed?
 if (isset($SETTINGS['cpassman_version']) === true && version_compare(TP_VERSION, $SETTINGS['cpassman_version']) > 0) {
     // Perform redirection
@@ -85,7 +85,7 @@ 
     exit;
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
 $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
 if (isset($SETTINGS['cpassman_url']) === false || $SETTINGS['cpassman_url'] === '') {
@@ -93,8 +93,8 @@ 
 }
 
 // Include files
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 // Open MYSQL database connection
 require_once './includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
@@ -107,7 +107,7 @@ 
 DB::$port = DB_PORT;
 DB::$encoding = DB_ENCODING;
 // Load Core library
-require_once $SETTINGS['cpassman_dir'] . '/sources/core.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/core.php';
 // Prepare POST variables
 $post_language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
 // Prepare superGlobal variables
@@ -137,7 +137,7 @@ 
     // case of user has change language in the login page
     $dataLanguage = DB::queryFirstRow(
         'SELECT flag, name
-        FROM ' . prefixTable('languages') . '
+        FROM ' . prefixTable('languages').'
         WHERE name = %s',
         $get['language']
     );
@@ -147,8 +147,8 @@ 
     //get default language
     $dataLanguage = DB::queryFirstRow(
         'SELECT m.valeur AS valeur, l.flag AS flag
-        FROM ' . prefixTable('misc') . ' AS m
-        INNER JOIN ' . prefixTable('languages') . ' AS l ON (m.valeur = l.name)
+        FROM ' . prefixTable('misc').' AS m
+        INNER JOIN ' . prefixTable('languages').' AS l ON (m.valeur = l.name)
                                                                                                                                                                                                                                                                                                                                                                                                 WHERE m.type=%s_type AND m.intitule=%s_intitule',
         [
             'type' => 'admin',
@@ -190,23 +190,23 @@ 
 
 // Load user languages files
 if (in_array($session_user_language, $languagesList) === true) {
-    if (file_exists($SETTINGS['cpassman_dir'] . '/includes/language/' . $session_user_language . '.php') === true) {
-        $_SESSION['teampass']['lang'] = include $SETTINGS['cpassman_dir'] . '/includes/language/' . $session_user_language . '.php';
+    if (file_exists($SETTINGS['cpassman_dir'].'/includes/language/'.$session_user_language.'.php') === true) {
+        $_SESSION['teampass']['lang'] = include $SETTINGS['cpassman_dir'].'/includes/language/'.$session_user_language.'.php';
     }
 } else {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
     //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
 }
 
 // load 2FA Google
 if (isset($SETTINGS['google_authentication']) === true && $SETTINGS['google_authentication'] === '1') {
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
 }
 
 // load 2FA Yubico
 if (isset($SETTINGS['yubico_authentication']) === true && $SETTINGS['yubico_authentication'] === '1') {
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php';
 }
 
 // Some template adjust
@@ -263,7 +263,7 @@ 
     <!-- Toastr -->
     <link rel="stylesheet" href="plugins/toastr/toastr.min.css" />
     <!-- favicon -->
-    <link rel="shortcut icon" type="image/png" href="<?php echo $SETTINGS['favicon'];?>"/>
+    <link rel="shortcut icon" type="image/png" href="<?php echo $SETTINGS['favicon']; ?>"/>
 </head>
 
 
@@ -294,7 +294,7 @@ 
             ),
             'SESSION'
         );
-        include $SETTINGS['cpassman_dir'] . '/error.php';
+        include $SETTINGS['cpassman_dir'].'/error.php';
     }
 } elseif (
     $session_validite_pw !== null
@@ -338,7 +338,7 @@ 
                         <div class="dropdown show">
                             <a class="btn btn-primary dropdown-toggle" href="#" data-toggle="dropdown">
                                 <?php
-                                    echo $session_name . '&nbsp;' . $session_lastname; ?>
+                                    echo $session_name.'&nbsp;'.$session_lastname; ?>
                             </a>
 
                             <div class="dropdown-menu dropdown-menu-right">
@@ -376,7 +376,7 @@ 
             <!-- Main Sidebar Container -->
             <aside class="main-sidebar sidebar-dark-primary elevation-4">
                 <!-- Brand Logo -->
-                <a href="<?php echo $SETTINGS['cpassman_url'] . '/index.php?page=items'; ?>" class="brand-link">
+                <a href="<?php echo $SETTINGS['cpassman_url'].'/index.php?page=items'; ?>" class="brand-link">
                     <img src="includes/images/teampass-logo2-home.png" alt="Teampass Logo" class="brand-image">
                     <span class="brand-text font-weight-light"><?php echo TP_TOOL_NAME; ?></span>
                 </a>
@@ -394,7 +394,7 @@ 
                         <a href="#" data-name="items" class="nav-link', $get['page'] === 'items' ? ' active' : '', '">
                         <i class="nav-icon fas fa-key"></i>
                         <p>
-                            ' . langHdl('pw') . '
+                            ' . langHdl('pw').'
                         </p>
                         </a>
                     </li>';
@@ -410,7 +410,7 @@ 
                         <a href="#" data-name="import" class="nav-link', $get['page'] === 'import' ? ' active' : '', '">
                         <i class="nav-icon fas fa-file-import"></i>
                         <p>
-                            ' . langHdl('import') . '
+                            ' . langHdl('import').'
                         </p>
                         </a>
                     </li>';
@@ -431,7 +431,7 @@ 
                         <a href="#" data-name="export" class="nav-link', $get['page'] === 'export' ? ' active' : '', '">
                         <i class="nav-icon fas fa-file-export"></i>
                         <p>
-                            ' . langHdl('export') . '
+                            ' . langHdl('export').'
                         </p>
                         </a>
                     </li>';
@@ -458,7 +458,7 @@ 
                         <a href="#" data-name="search" class="nav-link', $get['page'] === 'search' ? ' active' : '', '">
                         <i class="nav-icon fas fa-search"></i>
                         <p>
-                            ' . langHdl('find') . '
+                            ' . langHdl('find').'
                         </p>
                         </a>
                     </li>';
@@ -475,7 +475,7 @@ 
                         <a href="#" data-name="favourites" class="nav-link', $get['page'] === 'admin' ? ' favourites' : '', '">
                         <i class="nav-icon fas fa-star"></i>
                         <p>
-                            ' . langHdl('favorites') . '
+                            ' . langHdl('favorites').'
                         </p>
                         </a>
                     </li>';
@@ -505,7 +505,7 @@ 
                         <a href="#" data-name="suggestion" class="nav-link', $get['page'] === 'suggestion' ? ' active' : '', '">
                         <i class="nav-icon fas fa-lightbulb"></i>
                         <p>
-                            ' . langHdl('suggestion_menu') . '
+                            ' . langHdl('suggestion_menu').'
                         </p>
                         </a>
                     </li>';
@@ -518,7 +518,7 @@ 
                         <a href="#" data-name="admin" class="nav-link', $get['page'] === 'admin' ? ' active' : '', '">
                         <i class="nav-icon fas fa-info"></i>
                         <p>
-                            ' . langHdl('admin_main') . '
+                            ' . langHdl('admin_main').'
                         </p>
                         </a>
                     </li>
@@ -526,7 +526,7 @@ 
                         <a href="#" class="nav-link">
                             <i class="nav-icon fas fa-wrench"></i>
                             <p>
-                                ' . langHdl('admin_settings') . '
+                                ' . langHdl('admin_settings').'
                                 <i class="fas fa-angle-left right"></i>
                             </p>
                         </a>
@@ -534,55 +534,55 @@ 
                             <li class="nav-item">
                                 <a href="#" data-name="options" class="nav-link', $get['page'] === 'options' ? ' active' : '', '">
                                     <i class="fas fa-check-double nav-icon"></i>
-                                    <p>' . langHdl('options') . '</p>
+                                    <p>' . langHdl('options').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="2fa" class="nav-link', $get['page'] === '2fa' ? ' active' : '', '">
                                     <i class="fas fa-qrcode nav-icon"></i>
-                                    <p>' . langHdl('mfa_short') . '</p>
+                                    <p>' . langHdl('mfa_short').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="api" class="nav-link', $get['page'] === 'api' ? ' active' : '', '">
                                     <i class="fas fa-cubes nav-icon"></i>
-                                    <p>' . langHdl('api') . '</p>
+                                    <p>' . langHdl('api').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="backups" class="nav-link', $get['page'] === 'backups' ? ' active' : '', '">
                                     <i class="fas fa-database nav-icon"></i>
-                                    <p>' . langHdl('backups') . '</p>
+                                    <p>' . langHdl('backups').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="emails" class="nav-link', $get['page'] === 'emails' ? ' active' : '', '">
                                     <i class="fas fa-envelope nav-icon"></i>
-                                    <p>' . langHdl('emails') . '</p>
+                                    <p>' . langHdl('emails').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="fields" class="nav-link', $get['page'] === 'fields' ? ' active' : '', '">
                                     <i class="fas fa-keyboard nav-icon"></i>
-                                    <p>' . langHdl('fields') . '</p>
+                                    <p>' . langHdl('fields').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="ldap" class="nav-link', $get['page'] === 'ldap' ? ' active' : '', '">
                                     <i class="fas fa-id-card nav-icon"></i>
-                                    <p>' . langHdl('ldap') . '</p>
+                                    <p>' . langHdl('ldap').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="uploads" class="nav-link', $get['page'] === 'uploads' ? ' active' : '', '">
                                     <i class="fas fa-file-upload nav-icon"></i>
-                                    <p>' . langHdl('uploads') . '</p>
+                                    <p>' . langHdl('uploads').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="statistics" class="nav-link', $get['page'] === 'statistics' ? ' active' : '', '">
                                     <i class="fas fa-chart-bar nav-icon"></i>
-                                    <p>' . langHdl('statistics') . '</p>
+                                    <p>' . langHdl('statistics').'</p>
                                 </a>
                             </li>
                         </ul>
@@ -591,7 +591,7 @@ 
                         <a href="#" data-name="actions" class="nav-link', $get['page'] === 'actions' ? ' active' : '', '">
                         <i class="nav-icon fas fa-cogs"></i>
                         <p>
-                            ' . langHdl('actions') . '
+                            ' . langHdl('actions').'
                         </p>
                         </a>
                     </li>';
@@ -607,7 +607,7 @@ 
                         <a href="#" data-name="folders" class="nav-link', $get['page'] === 'folders' ? ' active' : '', '">
                         <i class="nav-icon fas fa-folder-open"></i>
                         <p>
-                            ' . langHdl('folders') . '
+                            ' . langHdl('folders').'
                         </p>
                         </a>
                     </li>
@@ -615,7 +615,7 @@ 
                         <a href="#" data-name="roles" class="nav-link', $get['page'] === 'roles' ? ' active' : '', '">
                         <i class="nav-icon fas fa-graduation-cap"></i>
                         <p>
-                            ' . langHdl('roles') . '
+                            ' . langHdl('roles').'
                         </p>
                         </a>
                     </li>
@@ -623,38 +623,38 @@ 
                         <a href="#" data-name="users" class="nav-link', $get['page'] === 'users' ? ' active' : '', '">
                         <i class="nav-icon fas fa-users"></i>
                         <p>
-                            ' . langHdl('users') . '
+                            ' . langHdl('users').'
                         </p>
                         </a>
                     </li>
                     <li class="nav-item has-treeview', $menuUtilities === true ? ' menu-open' : '', '">
                         <a href="#" class="nav-link">
                         <i class="nav-icon fas fa-cubes"></i>
-                        <p>' . langHdl('admin_views') . '<i class="fas fa-angle-left right"></i></p>
+                        <p>' . langHdl('admin_views').'<i class="fas fa-angle-left right"></i></p>
                         </a>
                         <ul class="nav nav-treeview">
                           <li class="nav-item">
                             <a href="#" data-name="utilities.renewal" class="nav-link', $get['page'] === 'utilities.renewal' ? ' active' : '', '">
                               <i class="far fa-calendar-alt nav-icon"></i>
-                              <p>' . langHdl('renewal') . '</p>
+                              <p>' . langHdl('renewal').'</p>
                             </a>
                           </li>
                           <li class="nav-item">
                             <a href="#" data-name="utilities.deletion" class="nav-link', $get['page'] === 'utilities.deletion' ? ' active' : '', '">
                               <i class="fas fa-trash-alt nav-icon"></i>
-                              <p>' . langHdl('deletion') . '</p>
+                              <p>' . langHdl('deletion').'</p>
                             </a>
                           </li>
                           <li class="nav-item">
                             <a href="#" data-name="utilities.logs" class="nav-link', $get['page'] === 'utilities.logs' ? ' active' : '', '">
                               <i class="fas fa-history nav-icon"></i>
-                              <p>' . langHdl('logs') . '</p>
+                              <p>' . langHdl('logs').'</p>
                             </a>
                           </li>
                           <li class="nav-item">
                             <a href="#" data-name="utilities.database" class="nav-link', $get['page'] === 'utilities.database' ? ' active' : '', '">
                               <i class="fas fa-database nav-icon"></i>
-                              <p>' . langHdl('database') . '</p>
+                              <p>' . langHdl('database').'</p>
                             </a>
                           </li>
                         </ul>
@@ -665,10 +665,10 @@ 
                     <!-- /.sidebar-menu -->
                 <div class="menu-footer">
                     <div class="" id="sidebar-footer">
-                        <i class="fas fa-clock-o mr-2 infotip text-info pointer" title="<?php echo langHdl('server_time') . ' ' .
-                            date($SETTINGS['date_format'], $server['request_time']) . ' - ' .
+                        <i class="fas fa-clock-o mr-2 infotip text-info pointer" title="<?php echo langHdl('server_time').' '.
+                            date($SETTINGS['date_format'], $server['request_time']).' - '.
                             date($SETTINGS['time_format'], $server['request_time']); ?>"></i>
-                        <i class="fas fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online . ' ' . langHdl('users_online'); ?>"></i>
+                        <i class="fas fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online.' '.langHdl('users_online'); ?>"></i>
                         <a href="<?php echo READTHEDOC_URL; ?>" target="_blank" class="text-info"><i class="fas fa-book mr-2 infotip" title="<?php echo langHdl('documentation_canal'); ?> ReadTheDocs"></i></a>
                         <a href="<?php echo REDDIT_URL; ?>" target="_blank" class="text-info"><i class="fab fa-reddit-alien mr-2 infotip" title="<?php echo langHdl('admin_help'); ?>"></i></a>
                         <i class="fas fa-bug infotip pointer text-info" title="<?php echo langHdl('bugs_page'); ?>" onclick="generateBugReport()"></i>
@@ -971,18 +971,18 @@ 
                     } elseif ($get['page'] === 'items') {
                         // SHow page with Items
                         if ((int) $session_user_admin !== 1) {
-                            include $SETTINGS['cpassman_dir'] . '/pages/items.php';
+                            include $SETTINGS['cpassman_dir'].'/pages/items.php';
                         } elseif ((int) $session_user_admin === 1) {
-                            include $SETTINGS['cpassman_dir'] . '/pages/admin.php';
+                            include $SETTINGS['cpassman_dir'].'/pages/admin.php';
                         } else {
                             $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
                             //not allowed page
-                            include $SETTINGS['cpassman_dir'] . '/error.php';
+                            include $SETTINGS['cpassman_dir'].'/error.php';
                         }
                     } elseif (in_array($get['page'], array_keys($mngPages)) === true) {
                         // Define if user is allowed to see management pages
                         if ($session_user_admin === 1) {
-                            include $SETTINGS['cpassman_dir'] . '/pages/' . $mngPages[$get['page']];
+                            include $SETTINGS['cpassman_dir'].'/pages/'.$mngPages[$get['page']];
                         } elseif ($session_user_manager === 1 || $session_user_human_resources === 1) {
                             if ($get['page'] !== 'manage_main'
                                 && $get['page'] !== 'manage_settings'
@@ -991,15 +991,15 @@ 
                             } else {
                                 $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
                                 //not allowed page
-                                include $SETTINGS['cpassman_dir'] . '/error.php';
+                                include $SETTINGS['cpassman_dir'].'/error.php';
                             }
                         } else {
                             $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
                             //not allowed page
-                            include $SETTINGS['cpassman_dir'] . '/error.php';
+                            include $SETTINGS['cpassman_dir'].'/error.php';
                         }
                     } elseif (empty($get['page']) === false) {
-                        include $SETTINGS['cpassman_dir'] . '/pages/' . $get['page'] . '.php';
+                        include $SETTINGS['cpassman_dir'].'/pages/'.$get['page'].'.php';
                     } else {
                         $_SESSION['error']['code'] = ERR_NOT_EXIST;
                         //page doesn't exist
@@ -1089,7 +1089,7 @@ 
     $superGlobal->put('initialUrl', '', 'SESSION');
 
     // LOGIN form
-    include $SETTINGS['cpassman_dir'] . '/includes/core/login.php';
+    include $SETTINGS['cpassman_dir'].'/includes/core/login.php';
 }
 
     ?>
@@ -1275,61 +1275,61 @@ 
     isset($_SESSION['CPM']) === true
     && isset($SETTINGS['cpassman_dir']) === true
 ) {
-    include_once $SETTINGS['cpassman_dir'] . '/includes/core/load.js.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/core/load.js.php';
     if ($menuAdmin === true) {
-        include_once $SETTINGS['cpassman_dir'] . '/pages/admin.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/pages/admin.js.php';
         if ($get['page'] === '2fa') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/2fa.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/2fa.js.php';
         } elseif ($get['page'] === 'api') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/api.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/api.js.php';
         } elseif ($get['page'] === 'backups') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/backups.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/backups.js.php';
         } elseif ($get['page'] === 'emails') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/emails.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/emails.js.php';
         } elseif ($get['page'] === 'ldap') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/ldap.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/ldap.js.php';
         } elseif ($get['page'] === 'uploads') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/uploads.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/uploads.js.php';
         } elseif ($get['page'] === 'actions') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/actions.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/actions.js.php';
         } elseif ($get['page'] === 'fields') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/fields.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/fields.js.php';
         } elseif ($get['page'] === 'options') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/options.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/options.js.php';
         } elseif ($get['page'] === 'statistics') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/statistics.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/statistics.js.php';
         }
     } elseif (isset($get['page']) === true) {
         if ($get['page'] === 'items') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/items.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/items.js.php';
         } elseif ($get['page'] === 'import') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/import.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/import.js.php';
         } elseif ($get['page'] === 'export') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/export.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/export.js.php';
         } elseif ($get['page'] === 'offline') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/offline.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/offline.js.php';
         } elseif ($get['page'] === 'search') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/search.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/search.js.php';
         } elseif ($get['page'] === 'profile') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/profile.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/profile.js.php';
         } elseif ($get['page'] === 'favourites') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/favorites.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/favorites.js.php';
         } elseif ($get['page'] === 'folders') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/folders.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/folders.js.php';
         } elseif ($get['page'] === 'users') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/users.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/users.js.php';
         } elseif ($get['page'] === 'roles') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/roles.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/roles.js.php';
         } elseif ($get['page'] === 'utilities.deletion') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.deletion.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.deletion.js.php';
         } elseif ($get['page'] === 'utilities.logs') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.logs.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.logs.js.php';
         } elseif ($get['page'] === 'utilities.database') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.database.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.database.js.php';
         } elseif ($get['page'] === 'utilities.renewal') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.renewal.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.renewal.js.php';
         }
     } else {
-        include_once $SETTINGS['cpassman_dir'] . '/includes/core/login.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/core/login.js.php';
     }
 }

includes/core/otv.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 } else {
     throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
 }
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
 $superGlobal = new protect\SuperGlobal\SuperGlobal();
 ?>
 <body class="hold-transition otv-page">