nilsteampassnet / TeamPass

sources/import.queries.php

Spacing +2 added lines, -2 removed lines

@@ -159,7 +159,7 @@ 
             $config->setIgnoreHeaderLine('true');
             // extract data from CSV file
             $interpreter = new Interpreter();
-            $interpreter->addObserver(function (array $row) use (&$valuesToImport) {
+            $interpreter->addObserver(function(array $row) use (&$valuesToImport) {
                 $valuesToImport[] = array(
                     'Label' => $row[0],
                     'Login' => $row[1],
@@ -1135,7 +1135,7 @@ 
         break;
 }
 
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     $prefix = 'League\\Csv\\';
     $base_dir = __DIR__.'/src/';
     $len = strlen($prefix);

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"}';
 }

sources/checks.php

Spacing +9 added lines, -9 removed lines

@@ -31,7 +31,7 @@ 
     throw new Exception('Error file "/includes/config/tp.config.php" not exists', 1);
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
 
 /*
 Handle CASES
@@ -51,7 +51,7 @@ 
             $csrfp_array = include '../includes/libraries/csrfp/libs/csrfp.config.php';
 
             // Send back CSRFP info
-            echo $csrfp_array['CSRFP_TOKEN'] . ';' . filter_input(INPUT_POST, $csrfp_array['CSRFP_TOKEN'], FILTER_SANITIZE_STRING);
+            echo $csrfp_array['CSRFP_TOKEN'].';'.filter_input(INPUT_POST, $csrfp_array['CSRFP_TOKEN'], FILTER_SANITIZE_STRING);
         }
 
         break;
@@ -65,7 +65,7 @@ 
 function curPage($SETTINGS)
 {
     // Load libraries
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // Parse the url
@@ -125,11 +125,11 @@ 
     $pageVisited = array($pageVisited);
 
     // Load
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 
     // Load libraries
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // Securize language
@@ -140,12 +140,12 @@ 
         $superGlobal->put('user_language', 'english', 'SESSION');
     }
 
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $superGlobal->get('user_language', 'SESSION') . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$superGlobal->get('user_language', 'SESSION').'.php';
     include_once 'SplClassLoader.php';
     include_once 'main.functions.php';
 
     // Connect to mysql server
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.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));
     }
@@ -158,7 +158,7 @@ 
 
     // load user's data
     $data = DB::queryfirstrow(
-        'SELECT login, key_tempo, admin, gestionnaire, can_manage_all_users FROM ' . prefixTable('users') . ' WHERE id = %i',
+        'SELECT login, key_tempo, admin, gestionnaire, can_manage_all_users FROM '.prefixTable('users').' WHERE id = %i',
         $userId
     );
 

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">

includes/core/login.php

Spacing +31 added lines, -31 removed lines

@@ -48,13 +48,13 @@ 
     <div class="login-logo">',
     isset($SETTINGS['custom_logo']) === true
         && empty($SETTINGS['custom_logo']) === false ?
-        '<img src="' . (string) $SETTINGS['custom_logo'] . '" alt="" style="text-align:center;" />' : '',
+        '<img src="'.(string) $SETTINGS['custom_logo'].'" alt="" style="text-align:center;" />' : '',
     '
         <div style="margin-top:20px;">
             <img src="includes/images/teampass-logo2-login.png" alt="Teampass Logo">
         </div>
         <div style="font-weight:bold;">
-            ' . TP_TOOL_NAME . '
+            ' . TP_TOOL_NAME.'
         </div>
     </div>
 
@@ -77,7 +77,7 @@ 
     isset($SETTINGS['enable_http_request_login']) === true
     && (int) $SETTINGS['enable_http_request_login'] === 1
     && $superGlobal('PHP_AUTH_USER', 'SERVER') !== null
-    && ! (isset($SETTINGS['maintenance_mode']) === true
+    && !(isset($SETTINGS['maintenance_mode']) === true
         && (int) $SETTINGS['maintenance_mode'] === 1)
 ) {
     if (strpos($superGlobal('PHP_AUTH_USER', 'SERVER'), '@') !== false) {
@@ -91,22 +91,22 @@ 
             <input type="text" id="login" class="form-control" placeholder="', filter_var($username, FILTER_SANITIZE_STRING), '" readonly>';
 } else {
     echo '
-            <input type="text" id="login" class="form-control" placeholder="' . langHdl('index_login') . '">';
+            <input type="text" id="login" class="form-control" placeholder="' . langHdl('index_login').'">';
 }
 
 echo '
         </div>';
-if (! (isset($SETTINGS['enable_http_request_login']) === true
+if (!(isset($SETTINGS['enable_http_request_login']) === true
     && (int) $SETTINGS['enable_http_request_login'] === 1
     && $superGlobal('PHP_AUTH_USER', 'SERVER') !== null
-    && ! (isset($SETTINGS['maintenance_mode']) === true
+    && !(isset($SETTINGS['maintenance_mode']) === true
         && (int) $SETTINGS['maintenance_mode'] === 1))) {
     echo '
         <div class="input-group has-feedback mb-2">
             <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fas fa-lock fa-fw"></i></span>
             </div>
-            <input type="password" id="pw" class="form-control submit-button" placeholder="' . langHdl('index_password') . '">
+            <input type="password" id="pw" class="form-control submit-button" placeholder="' . langHdl('index_password').'">
         </div>';
 }
 
@@ -116,7 +116,7 @@ 
                 <span class="input-group-text"><i class="fas fa-clock fa-fw"></i></span>
             </div>
             <input type="text" id="session_duration" class="form-control submit-button" 
-            placeholder="' . langHdl('index_session_duration') .'&nbsp;(' . langHdl('minutes') . ')" 
+            placeholder="' . langHdl('index_session_duration').'&nbsp;('.langHdl('minutes').')" 
             value="', isset($SETTINGS['default_session_expiration_time']) === true ? $SETTINGS['default_session_expiration_time'] : '', '">
         </div>';
 // 2FA auth selector
@@ -129,7 +129,7 @@ 
     '" />
         <div class="row mb-3 hidden" id="2fa_methods_selector">
             <div class="col-12">
-                <h8 class="login-box-msg">' . langHdl('2fa_authentication_selector') . '</h8>
+                <h8 class="login-box-msg">' . langHdl('2fa_authentication_selector').'</h8>
                 <div class="2fa-methods text-center mt-2">',
     isset($SETTINGS['google_authentication']) === true && (int) $SETTINGS['google_authentication'] === 1 ?
         '
@@ -177,11 +177,11 @@ 
                 <div class="col-1">
                 </div>
                 <div class="col-8">
-                    <input type="text" id="ga_code" class="form-control submit-button" placeholder="' . langHdl('ga_identification_code') . '" />
+                    <input type="text" id="ga_code" class="form-control submit-button" placeholder="' . langHdl('ga_identification_code').'" />
                 </div>
                 <div class="col-1">
                     <i class="fas fa-envelope form-control-feedback pointer infotip text-info" 
-                    title="' . langHdl('i_need_to_generate_new_ga_code') . '" onclick="send_user_new_temporary_ga_code()"></i>
+                    title="' . langHdl('i_need_to_generate_new_ga_code').'" onclick="send_user_new_temporary_ga_code()"></i>
                 </div>
             </div>
             <div id="div-2fa-google-qr" class="row mt-2 "></div>
@@ -198,7 +198,7 @@ 
 <script>
 var seconds = 1;
 function updateLogonButton(timeToGo){
-    document.getElementById("but_identify_user").value = "' . langHdl('duration_login_attempt') . ' " + timeToGo;
+    document.getElementById("but_identify_user").value = "' . langHdl('duration_login_attempt').' " + timeToGo;
 }
 $( window ).on( "load", function() {
     updateLogonButton(seconds);
@@ -207,7 +207,7 @@ 
         if (seconds >= 0) {
             updateLogonButton(seconds);
         } else if(seconds === 0) {
-            launchIdentify("", "' . $nextUrl . '");
+            launchIdentify("", "' . $nextUrl.'");
         }
         updateLogonButton(seconds);
     },
@@ -228,15 +228,15 @@ 
             <div class="col-8">
                 <div id="yubiko-new-key" class="alert alert-info hidden">
                     <p>
-                        <input type="text" size="10" id="yubico_user_id" class="form-control" placeholder="' . langHdl('yubico_user_id') . '">
+                        <input type="text" size="10" id="yubico_user_id" class="form-control" placeholder="' . langHdl('yubico_user_id').'">
                     </p>
                     <p>
-                    <input type="text" size="10" id="yubico_user_key" class="form-control" placeholder="' . langHdl('yubico_user_key') . '">
+                    <input type="text" size="10" id="yubico_user_key" class="form-control" placeholder="' . langHdl('yubico_user_key').'">
                     </p>
                 </div>
-                <input autocomplete="off" type="text" id="yubico_key" class="form-control submit-button" placeholder="' . langHdl('press_your_yubico_key') . '">
+                <input autocomplete="off" type="text" id="yubico_key" class="form-control submit-button" placeholder="' . langHdl('press_your_yubico_key').'">
                 <div class="row">
-                    <span class="ml-2 mt-1 font-weight-light small pointer" id="register-yubiko-key">' . langHdl('register_new_yubiko_key') . '</span>
+                    <span class="ml-2 mt-1 font-weight-light small pointer" id="register-yubiko-key">' . langHdl('register_new_yubiko_key').'</span>
                 </div>
             </div>
         </div>';
@@ -245,22 +245,22 @@ 
 echo '
         <div class="row mb-3 mt-5">
             <div class="col-12">
-                <button id="but_identify_user" class="btn btn-primary btn-block">' . langHdl('log_in') . '</button>
+                <button id="but_identify_user" class="btn btn-primary btn-block">' . langHdl('log_in').'</button>
                 
                 <!-- In case of upgrade, the user has to provide his One Time Code -->
                 <div class="card-body user-one-time-code-card-body hidden">
-                    <h5 class="login-box-msg">' . langHdl('provide_personal_one_time_code') . '</h5>
+                    <h5 class="login-box-msg">' . langHdl('provide_personal_one_time_code').'</h5>
 
                     <div class="input-group has-feedback mb-2 mt-4">
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fas fa-unlock-alt"></i></span>
                         </div>
-                        <input type="password" id="user-one-time-code" class="form-control" placeholder="' . langHdl('one_time_code') . '">
+                        <input type="password" id="user-one-time-code" class="form-control" placeholder="' . langHdl('one_time_code').'">
                     </div>
 
                     <div class="row mb-3">
                         <div class="col-12">
-                            <button id="but_confirm_otc" class="btn btn-primary btn-block">' . langHdl('confirm') . '</button>
+                            <button id="but_confirm_otc" class="btn btn-primary btn-block">' . langHdl('confirm').'</button>
                         </div>
                     </div>
                 </div>
@@ -275,10 +275,10 @@ 
 // In case of password change
 echo '
     <div class="card-body confirm-password-card-body hidden">
-        <h5 class="login-box-msg">' . langHdl('new_password_required') . '</h5>
+        <h5 class="login-box-msg">' . langHdl('new_password_required').'</h5>
 
         <div class="alert alert-info">
-            <div class="text-center"><i class="icon fa fa-info"></i>' . langHdl('password_strength') . '
+            <div class="text-center"><i class="icon fa fa-info"></i>' . langHdl('password_strength').'
             <span id="confirm-password-level" class="ml-2 font-weight-bold"></span></div>
         </div>
 
@@ -288,20 +288,20 @@ 
                     <div class="input-group-prepend">
                         <span class="input-group-text"><i class="fa fa-key"></i></span>
                     </div>
-                    <input type="password" id="current-user-password" class="form-control" placeholder="' . langHdl('current_password') . '">
+                    <input type="password" id="current-user-password" class="form-control" placeholder="' . langHdl('current_password').'">
                 </div>
             </div>
             <div class="input-group has-feedback mb-2 mt-4">
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-key"></i></span>
                 </div>
-                <input type="password" id="new-user-password" class="form-control" placeholder="' . langHdl('index_new_pw') . '">
+                <input type="password" id="new-user-password" class="form-control" placeholder="' . langHdl('index_new_pw').'">
             </div>
             <div class="input-group has-feedback mb-2">
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-key"></i></span>
                 </div>
-                <input type="password" id="new-user-password-confirm" class="form-control" placeholder="' . langHdl('index_change_pw_confirmation') . '">
+                <input type="password" id="new-user-password-confirm" class="form-control" placeholder="' . langHdl('index_change_pw_confirmation').'">
             </div>
             <div class="row mb-3">
                 <div class="col-md-12 offset-sm-4 text-center">
@@ -312,7 +312,7 @@ 
             </div>
             <div class="row mb-3">
                 <div class="col-12">
-                    <button id="but_confirm_new_password" class="btn btn-primary btn-block">' . langHdl('confirm') . '</button>
+                    <button id="but_confirm_new_password" class="btn btn-primary btn-block">' . langHdl('confirm').'</button>
                 </div>
             </div>
         </div>
@@ -320,20 +320,20 @@ 
 
     <div class="card-body hidden" id="card-user-treat-psk">
         <div class="alert alert-info">
-            <div class="text-center"><i class="icon fa fa-info"></i>' . langHdl('user_has_psk_info') . '</div>
+            <div class="text-center"><i class="icon fa fa-info"></i>' . langHdl('user_has_psk_info').'</div>
         </div>
         <div class="input-group has-feedback mb-2">
             <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-key"></i></span>
             </div>
-            <input type="password" id="user-old-defuse-psk" class="form-control" placeholder="' . langHdl('home_personal_saltkey') . '">
+            <input type="password" id="user-old-defuse-psk" class="form-control" placeholder="' . langHdl('home_personal_saltkey').'">
         </div>
         <div class="row mb-3 mt-4">
             <div class="col-12">
-                <button id="but_confirm_defuse_psk" class="btn btn-primary btn-block">' . langHdl('launch') . '</button>
+                <button id="but_confirm_defuse_psk" class="btn btn-primary btn-block">' . langHdl('launch').'</button>
             </div>
             <div class="col-12 mt-3">
-                <button id="but_confirm_forgot_defuse_psk" class="btn btn-danger btn-block text-bold">' . langHdl('i_cannot_remember') . '</button>
+                <button id="but_confirm_forgot_defuse_psk" class="btn btn-danger btn-block text-bold">' . langHdl('i_cannot_remember').'</button>
             </div>
         </div>
     </div>